diff options
| author | Sean Christopherson <[email protected]> | 2025-06-11 22:45:55 +0000 |
|---|---|---|
| committer | Sean Christopherson <[email protected]> | 2025-06-23 16:50:46 +0000 |
| commit | 99836eb9c5dcae1f0e64da2cb6f7e0bb9151f95d (patch) | |
| tree | c60664e996ce09ba2b6af0c0c99387d391f99520 | |
| parent | KVM: x86: WARN if IRQ bypass routing is updated without in-kernel local APIC (diff) | |
| download | kernel-99836eb9c5dcae1f0e64da2cb6f7e0bb9151f95d.tar.gz kernel-99836eb9c5dcae1f0e64da2cb6f7e0bb9151f95d.zip | |
KVM: SVM: WARN if ir_list is non-empty at vCPU free
Now that AVIC IRTE tracking is in a mostly sane state, WARN if a vCPU is
freed with ir_list entries, i.e. if KVM leaves a dangling IRTE.
Initialize the per-vCPU interrupt remapping list and its lock even if AVIC
is disabled so that the WARN doesn't hit false positives (and so that KVM
doesn't need to call into AVIC code for a simple sanity check).
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Sean Christopherson <[email protected]>
| -rw-r--r-- | arch/x86/kvm/svm/avic.c | 5 | ||||
| -rw-r--r-- | arch/x86/kvm/svm/svm.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index eaf793a28127..4b359a4a7e40 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -705,6 +705,9 @@ int avic_init_vcpu(struct vcpu_svm *svm) int ret; struct kvm_vcpu *vcpu = &svm->vcpu; + INIT_LIST_HEAD(&svm->ir_list); + spin_lock_init(&svm->ir_list_lock); + if (!enable_apicv || !irqchip_in_kernel(vcpu->kvm)) return 0; @@ -712,8 +715,6 @@ int avic_init_vcpu(struct vcpu_svm *svm) if (ret) return ret; - INIT_LIST_HEAD(&svm->ir_list); - spin_lock_init(&svm->ir_list_lock); svm->dfr_reg = APIC_DFR_FLAT; return ret; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 68b6a1922078..7f0df9dbc232 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -1491,6 +1491,8 @@ static void svm_vcpu_free(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); + WARN_ON_ONCE(!list_empty(&svm->ir_list)); + svm_leave_nested(vcpu); svm_free_nested(svm); |
