summary refs log tree commit diff stats
path: root/hw/apic.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-07-09 16:42:32 +0200
committerAvi Kivity <avi@redhat.com>2012-07-10 11:31:09 +0300
commit5d62c43a17edaa7f6a88821c9086e6c8e0e5327d (patch)
tree3a87b9355b9fce43838e803a38591bb0e4bb908e /hw/apic.c
parenta94820ddc36f8c452b37f9dcb323f55ffdbc75f9 (diff)
downloadfocaccia-qemu-5d62c43a17edaa7f6a88821c9086e6c8e0e5327d.tar.gz
focaccia-qemu-5d62c43a17edaa7f6a88821c9086e6c8e0e5327d.zip
apic: Defer interrupt updates to VCPU thread
KVM performs TPR raising asynchronously to QEMU, specifically outside
QEMU's global lock. When an interrupt is injected into the APIC and TPR
is checked to decide if this can be delivered, a stale TPR value may be
used, causing spurious interrupts in the end.

Fix this by deferring apic_update_irq to the context of the target VCPU.
We introduce a new interrupt flag for this, CPU_INTERRUPT_POLL. When it
is set, the VCPU calls apic_poll_irq before checking for further pending
interrupts. To avoid special-casing KVM, we also implement this logic
for TCG mode.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/apic.c')
-rw-r--r--hw/apic.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/apic.c b/hw/apic.c
index 5b8f3e8150..385555eb43 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -16,6 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
+#include "qemu-thread.h"
 #include "apic_internal.h"
 #include "apic.h"
 #include "ioapic.h"
@@ -361,7 +362,9 @@ static void apic_update_irq(APICCommonState *s)
     if (!(s->spurious_vec & APIC_SV_ENABLE)) {
         return;
     }
-    if (apic_irq_pending(s) > 0) {
+    if (!qemu_cpu_is_self(s->cpu_env)) {
+        cpu_interrupt(s->cpu_env, CPU_INTERRUPT_POLL);
+    } else if (apic_irq_pending(s) > 0) {
         cpu_interrupt(s->cpu_env, CPU_INTERRUPT_HARD);
     }
 }