diff options
| author | Sean Christopherson <sean.j.christopherson@intel.com> | 2019-04-16 13:32:44 -0700 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-04-30 21:32:15 +0200 |
| commit | ee66e453db13d4837a0dcf9d43efa7a88603161b (patch) | |
| tree | 8cea01dbd8e86c1451a9d1e73df6de887a7037ab /arch/x86 | |
| parent | 6c6a2ab962af8f197984c45d585814f9839e86d5 (diff) | |
| download | linux-stable-ee66e453db13d4837a0dcf9d43efa7a88603161b.tar.gz linux-stable-ee66e453db13d4837a0dcf9d43efa7a88603161b.tar.bz2 linux-stable-ee66e453db13d4837a0dcf9d43efa7a88603161b.zip | |
KVM: lapic: Busy wait for timer to expire when using hv_timer
...now that VMX's preemption timer, i.e. the hv_timer, also adjusts its
programmed time based on lapic_timer_advance_ns. Without the delay, a
guest can see a timer interrupt arrive before the requested time when
KVM is using the hv_timer to emulate the guest's interrupt.
Fixes: c5ce8235cffa0 ("KVM: VMX: Optimize tscdeadline timer latency")
Cc: <stable@vger.kernel.org>
Cc: Wanpeng Li <wanpengli@tencent.com>
Reviewed-by: Liran Alon <liran.alon@oracle.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 9bf70cf84564..7eef076bc5ee 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1455,7 +1455,7 @@ static void apic_timer_expired(struct kvm_lapic *apic) if (swait_active(q)) swake_up_one(q); - if (apic_lvtt_tscdeadline(apic)) + if (apic_lvtt_tscdeadline(apic) || ktimer->hv_timer_in_use) ktimer->expired_tscdeadline = ktimer->tscdeadline; } |