]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
KVM: LAPIC: Accurately guarantee busy wait for timer to expire when using hv_timer
authorWanpeng Li <wanpengli@tencent.com>
Wed, 28 Apr 2021 11:08:02 +0000 (19:08 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:29:50 +0000 (10:29 +0200)
commitd59b53f583fd788c89661ec84cb294735b831ccd
tree0937e5beaf6f69ca042d336cc0038dafebecc4d5
parentc53f8654e39329c4bc7915985cdd150ff5295300
KVM: LAPIC: Accurately guarantee busy wait for timer to expire when using hv_timer

[ Upstream commit d981dd15498b188636ec5a7d8ad485e650f63d8d ]

Commit ee66e453db13d (KVM: lapic: Busy wait for timer to expire when
using hv_timer) tries to set ktime->expired_tscdeadline by checking
ktime->hv_timer_in_use since lapic timer oneshot/periodic modes which
are emulated by vmx preemption timer also get advanced, they leverage
the same vmx preemption timer logic with tsc-deadline mode. However,
ktime->hv_timer_in_use is cleared before apic_timer_expired() handling,
let's delay this clearing in preemption-disabled region.

Fixes: ee66e453db13d ("KVM: lapic: Busy wait for timer to expire when using hv_timer")
Reviewed-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Message-Id: <1619608082-4187-1-git-send-email-wanpengli@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kvm/lapic.c