lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 561/772] KVM: LAPIC: Drop pending LAPIC timer injection when canceling the timer
    Date
    From: Wanpeng Li <wanpengli@tencent.com>

    [ Upstream commit 619f51da097952194a5d4d6a6c5f9ef3b9d1b25a ]

    The timer is disarmed when switching between TSC deadline and other modes;
    however, the pending timer is still in-flight, so let's accurately remove
    any traces of the previous mode.

    Fixes: 4427593258 ("KVM: x86: thoroughly disarm LAPIC timer around TSC deadline switch")
    Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kvm/lapic.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
    index 970d5c740b00..dd12c15b69e6 100644
    --- a/arch/x86/kvm/lapic.c
    +++ b/arch/x86/kvm/lapic.c
    @@ -1508,6 +1508,7 @@ static void cancel_apic_timer(struct kvm_lapic *apic)
    if (apic->lapic_timer.hv_timer_in_use)
    cancel_hv_timer(apic);
    preempt_enable();
    + atomic_set(&apic->lapic_timer.pending, 0);
    }

    static void apic_update_lvtt(struct kvm_lapic *apic)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:33    [W:3.793 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site