diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2008-06-06 21:37:36 +0200 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-06-24 11:16:59 +0200 |
commit | 06e05645661211b9eaadaf6344c335d2e80f0ba2 (patch) | |
tree | 8846d2a5052aec44141e811c0a76fdb39c2e77ca /include | |
parent | KVM: Fix race between timer migration and vcpu migration (diff) | |
download | linux-06e05645661211b9eaadaf6344c335d2e80f0ba2.tar.xz linux-06e05645661211b9eaadaf6344c335d2e80f0ba2.zip |
KVM: close timer injection race window in __vcpu_run
If a timer fires after kvm_inject_pending_timer_irqs() but before
local_irq_disable() the code will enter guest mode and only inject such
timer interrupt the next time an unrelated event causes an exit.
It would be simpler if the timer->pending irq conversion could be done
with IRQ's disabled, so that the above problem cannot happen.
For now introduce a new vcpu requests bit to cancel guest entry.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 092b1b25291d..de9d1df4bba2 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -33,6 +33,7 @@ #define KVM_REQ_REPORT_TPR_ACCESS 2 #define KVM_REQ_MMU_RELOAD 3 #define KVM_REQ_TRIPLE_FAULT 4 +#define KVM_REQ_PENDING_TIMER 5 struct kvm_vcpu; extern struct kmem_cache *kvm_vcpu_cache; |