]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: x86: WARN if hrtimer callback for periodic APIC timer fires with period=0
authorSean Christopherson <seanjc@google.com>
Thu, 13 Nov 2025 20:51:11 +0000 (12:51 -0800)
committerSean Christopherson <seanjc@google.com>
Mon, 17 Nov 2025 15:50:21 +0000 (07:50 -0800)
WARN and don't restart the hrtimer if KVM's callback runs with the guest's
APIC timer in periodic mode but with a period of '0', as not advancing the
hrtimer's deadline would put the CPU into an infinite loop of hrtimer
events.  Observing a period of '0' should be impossible, even when the
hrtimer is running on a different CPU than the vCPU, as KVM is supposed to
cancel the hrtimer before changing (or zeroing) the period, e.g. when
switching from periodic to one-shot.

Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20251113205114.1647493-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/lapic.c

index 0ae7f913d7826ac0c1be3db8156e9568daa098b9..78b74ba17592bec81408a83baacddc750a12ab61 100644 (file)
@@ -2970,7 +2970,7 @@ static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)
 
        apic_timer_expired(apic, true);
 
-       if (lapic_is_periodic(apic)) {
+       if (lapic_is_periodic(apic) && !WARN_ON_ONCE(!apic->lapic_timer.period)) {
                advance_periodic_target_expiration(apic);
                hrtimer_add_expires_ns(&ktimer->timer, ktimer->period);
                return HRTIMER_RESTART;