On Tue, Aug 27, 2024, Greg Kroah-Hartman wrote:
6.1-stable review patch. If anyone has any objections, please let me know.
Purely to try and avoid more confusion,
Acked-by: Sean Christopherson seanjc@google.com
as the fix that needs to be paired with this commit has already landed in 6.1.y as 7545ddda9c98 ("KVM: x86: Fix lapic timer interrupt lost after loading a snapshot.")
From: Li RongQing lirongqing@baidu.com
commit 8e6ed96cdd5001c55fccc80a17f651741c1ca7d2 upstream.
when the vCPU was migrated, if its timer is expired, KVM _should_ fire the timer ASAP, zeroing the deadline here will cause the timer to immediately fire on the destination
Cc: Sean Christopherson seanjc@google.com Cc: Peter Shier pshier@google.com Cc: Jim Mattson jmattson@google.com Cc: Wanpeng Li wanpengli@tencent.com Cc: Paolo Bonzini pbonzini@redhat.com Signed-off-by: Li RongQing lirongqing@baidu.com Link: https://lore.kernel.org/r/20230106040625.8404-1-lirongqing@baidu.com Signed-off-by: Sean Christopherson seanjc@google.com Signed-off-by: David Hunter david.hunter.linux@gmail.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
arch/x86/kvm/lapic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
--- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1843,8 +1843,12 @@ static bool set_target_expiration(struct if (unlikely(count_reg != APIC_TMICT)) { deadline = tmict_to_ns(apic, kvm_lapic_get_reg(apic, count_reg));
if (unlikely(deadline <= 0))deadline = apic->lapic_timer.period;
if (unlikely(deadline <= 0)) {if (apic_lvtt_period(apic))deadline = apic->lapic_timer.period;elsedeadline = 0;} else if (unlikely(deadline > apic->lapic_timer.period)) { pr_info_ratelimited( "kvm: vcpu %i: requested lapic timer restore with "