summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Christopherson <seanjc@google.com>2025-06-11 15:45:30 -0700
committerSean Christopherson <seanjc@google.com>2025-06-23 09:50:28 -0700
commit9517aedecd0e73716b766f5c603518fd6e383454 (patch)
tree03095f8f40200339dcdc8a6fd4d21a42cb91f2b3
parentf5369619f7f8add44fc5e3d05364d2ed293995fa (diff)
KVM: x86: Nullify irqfd->producer after updating IRTEs
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>
-rw-r--r--arch/x86/kvm/irq.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index f34c2deedf78..b3ae9e43a254 100644
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
@@ -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);
}