]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: x86: Nullify irqfd->producer after updating IRTEs
authorSean Christopherson <seanjc@google.com>
Wed, 11 Jun 2025 22:45:30 +0000 (15:45 -0700)
committerSean Christopherson <seanjc@google.com>
Mon, 23 Jun 2025 16:50:28 +0000 (09:50 -0700)
Nullify irqfd->producer (when it's going away) _after_ updating IRTEs so
that the producer can be queried during the update.

Link: https://lore.kernel.org/r/20250611224604.313496-29-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/irq.c

index f34c2deedf78202955926a848ee258536076017f..b3ae9e43a25475e93cc52d23916377b2495130ec 100644 (file)
@@ -549,7 +549,6 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,
         * KVM must relinquish control of the IRTE.
         */
        spin_lock_irq(&kvm->irqfds.lock);
-       irqfd->producer = NULL;
 
        if (irqfd->irq_entry.type == KVM_IRQ_ROUTING_MSI) {
                ret = kvm_x86_call(pi_update_irte)(irqfd, irqfd->kvm, prod->irq,
@@ -558,10 +557,10 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,
                        pr_info("irq bypass consumer (eventfd %p) unregistration fails: %d\n",
                                irqfd->consumer.eventfd, ret);
        }
+       irqfd->producer = NULL;
 
        spin_unlock_irq(&kvm->irqfds.lock);
 
-
        kvm_arch_end_assignment(irqfd->kvm);
 }