]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: x86: Drop ASSERT()s on APIC/vCPU being non-NULL
authorSean Christopherson <seanjc@google.com>
Sat, 6 Dec 2025 00:43:03 +0000 (16:43 -0800)
committerSean Christopherson <seanjc@google.com>
Mon, 12 Jan 2026 17:31:37 +0000 (09:31 -0800)
Remove ASSERT()s on vCPU and APIC structures being non-NULL in the local
APIC code as the DEBUG=1 path of ASSERT() ends with BUG(), i.e. isn't
meaningfully better for debugging than a NULL pointer dereference.

For all intents and purposes, no functional change intended.

Link: https://patch.msgid.link/20251206004311.479939-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/lapic.c

index 1597dd0b0cc664f87dfb81edb763a32e70b8b753..558adcb6717112b1b2cd2c8f55059561cdf7f0b5 100644 (file)
@@ -1048,7 +1048,6 @@ bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
        struct kvm_lapic *target = vcpu->arch.apic;
        u32 mda = kvm_apic_mda(vcpu, dest, source, target);
 
-       ASSERT(target);
        switch (shorthand) {
        case APIC_DEST_NOSHORT:
                if (dest_mode == APIC_DEST_PHYSICAL)
@@ -1607,8 +1606,6 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic)
        ktime_t remaining, now;
        s64 ns;
 
-       ASSERT(apic != NULL);
-
        /* if initial count is 0, current count should also be 0 */
        if (kvm_lapic_get_reg(apic, APIC_TMICT) == 0 ||
                apic->lapic_timer.period == 0)
@@ -3000,8 +2997,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
 {
        struct kvm_lapic *apic;
 
-       ASSERT(vcpu != NULL);
-
        if (!irqchip_in_kernel(vcpu->kvm)) {
                static_branch_inc(&kvm_has_noapic_vcpu);
                return 0;