]> err.no Git - linux-2.6/commit
KVM: fix kvm_vcpu_kick vs __vcpu_run race
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 11 Apr 2008 18:01:22 +0000 (15:01 -0300)
committerAvi Kivity <avi@qumranet.com>
Sun, 27 Apr 2008 15:21:32 +0000 (18:21 +0300)
commite9571ed54b2a290d61b98ad6f369f963159fe6da
tree8767ba834196c08da817e545542ff5a681df96e8
parent62d9f0dbc92d7e398fde53fc6021338393522e68
KVM: fix kvm_vcpu_kick vs __vcpu_run race

There is a window open between testing of pending IRQ's
and assignment of guest_mode in __vcpu_run.

Injection of IRQ's can race with __vcpu_run as follows:

CPU0                                CPU1
kvm_x86_ops->run()
vcpu->guest_mode = 0                SET_IRQ_LINE ioctl
..
kvm_x86_ops->inject_pending_irq
kvm_cpu_has_interrupt()

                                    apic_test_and_set_irr()
                                    kvm_vcpu_kick
                                    if (vcpu->guest_mode)
                                        send_ipi()

vcpu->guest_mode = 1

So move guest_mode=1 assignment before ->inject_pending_irq, and make
sure that it won't reorder after it.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
arch/x86/kvm/x86.c