Skip to content

Commit c4a37ac

Browse files
committed
KVM: x86: Drop pending_smi vs. INIT_RECEIVED check when setting MP_STATE
Allow userspace to set a vCPU's mp_state to INIT_RECEIVED in conjunction with a pending SMI, as rejecting that combination could result in KVM disallowing reflecting the output from KVM_GET_VCPU_EVENTS back into KVM via KVM_SET_VCPU_EVENTS. At the time the check was added, smi_pending could only be set in the context of KVM_RUN, with the vCPU in the RUNNABLE state. I.e. it was impossible for KVM to save vCPU state such that userspace could see a pending SMI for a vCPU in WFS. That no longer holds true now that KVM processes requested SMIs during KVM_GET_VCPU_EVENTS, e.g. if a vCPU receives an SMI while in WFS, and then userspace saves vCPU state. Note, this may partially re-open the user-triggerable WARN that was mostly closed by commit 28bf288 ("KVM: x86: fix user triggerable warning in kvm_apic_accept_events()"), but that WARN can already be triggered in several other ways, e.g. if userspace stuffs VMXON=1 after putting the vCPU into WFS. That issue will be addressed in an upcoming commit, in a more robust fashion (hopefully). Fixes: 1f7becf ("KVM: x86: get smi pending status correctly") Link: https://lore.kernel.org/r/20250605195018.539901-2-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 0792c71 commit c4a37ac

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

arch/x86/kvm/x86.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11916,10 +11916,9 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
1191611916
/*
1191711917
* Pending INITs are reported using KVM_SET_VCPU_EVENTS, disallow
1191811918
* forcing the guest into INIT/SIPI if those events are supposed to be
11919-
* blocked. KVM prioritizes SMI over INIT, so reject INIT/SIPI state
11920-
* if an SMI is pending as well.
11919+
* blocked.
1192111920
*/
11922-
if ((!kvm_apic_init_sipi_allowed(vcpu) || vcpu->arch.smi_pending) &&
11921+
if (!kvm_apic_init_sipi_allowed(vcpu) &&
1192311922
(mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||
1192411923
mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))
1192511924
goto out;

0 commit comments

Comments
 (0)