Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: x86: Don't disable IRQs when unregistering user-return notifier

Remove the code to disable IRQs when unregistering KVM's user-return
notifier now that KVM doesn't invoke kvm_on_user_return() when disabling
virtualization via IPI function call, i.e. now that there's no need to
guard against re-entrancy via IPI callback.

Note, disabling IRQs has largely been unnecessary since commit
a377ac1cd9d7b ("x86/entry: Move user return notifier out of loop") moved
fire_user_return_notifiers() into the section with IRQs disabled. In doing
so, the commit somewhat inadvertently fixed the underlying issue that
was papered over by commit 1650b4ebc99d ("KVM: Disable irq while
unregistering user notifier"). I.e. in practice, the code and comment
has been stale since commit a377ac1cd9d7b.

Signed-off-by: Hou Wenlong <houwenlong.hwl@antgroup.com>
[sean: rewrite changelog after rebasing, drop lockdep assert]
Reviewed-by: Kai Huang <kai.huang@intel.com>
Link: https://patch.msgid.link/20251030191528.3380553-5-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

authored by

Hou Wenlong and committed by
Sean Christopherson
995d5041 2baa33a8

+3 -11
+3 -11
arch/x86/kvm/x86.c
··· 602 602 struct kvm_user_return_msrs *msrs 603 603 = container_of(urn, struct kvm_user_return_msrs, urn); 604 604 struct kvm_user_return_msr_values *values; 605 - unsigned long flags; 606 605 607 - /* 608 - * Disabling irqs at this point since the following code could be 609 - * interrupted and executed through kvm_arch_disable_virtualization_cpu() 610 - */ 611 - local_irq_save(flags); 612 - if (msrs->registered) { 613 - msrs->registered = false; 614 - user_return_notifier_unregister(urn); 615 - } 616 - local_irq_restore(flags); 606 + msrs->registered = false; 607 + user_return_notifier_unregister(urn); 608 + 617 609 for (slot = 0; slot < kvm_nr_uret_msrs; ++slot) { 618 610 values = &msrs->values[slot]; 619 611 if (values->host != values->curr) {