Skip to content

Commit ab2ee21

Browse files
committed
KVM: x86: Save/restore all NMIs when multiple NMIs are pending
Save all pending NMIs in KVM_GET_VCPU_EVENTS, and queue KVM_REQ_NMI if one or more NMIs are pending after KVM_SET_VCPU_EVENTS in order to re-evaluate pending NMIs with respect to NMI blocking. KVM allows multiple NMIs to be pending in order to faithfully emulate bare metal handling of simultaneous NMIs (on bare metal, truly simultaneous NMIs are impossible, i.e. one will always arrive first and be consumed). Support for simultaneous NMIs botched the save/restore though. KVM only saves one pending NMI, but allows userspace to restore 255 pending NMIs as kvm_vcpu_events.nmi.pending is a u8, and KVM's internal state is stored in an unsigned int. Fixes: 7460fb4 ("KVM: Fix simultaneous NMIs") Signed-off-by: Santosh Shukla <Santosh.Shukla@amd.com> Link: https://lore.kernel.org/r/20230227084016.3368-8-santosh.shukla@amd.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 400fee8 commit ab2ee21

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

arch/x86/kvm/x86.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5125,7 +5125,7 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,
51255125
events->interrupt.shadow = static_call(kvm_x86_get_interrupt_shadow)(vcpu);
51265126

51275127
events->nmi.injected = vcpu->arch.nmi_injected;
5128-
events->nmi.pending = vcpu->arch.nmi_pending != 0;
5128+
events->nmi.pending = vcpu->arch.nmi_pending;
51295129
events->nmi.masked = static_call(kvm_x86_get_nmi_mask)(vcpu);
51305130

51315131
/* events->sipi_vector is never valid when reporting to user space */
@@ -5212,8 +5212,11 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
52125212
events->interrupt.shadow);
52135213

52145214
vcpu->arch.nmi_injected = events->nmi.injected;
5215-
if (events->flags & KVM_VCPUEVENT_VALID_NMI_PENDING)
5215+
if (events->flags & KVM_VCPUEVENT_VALID_NMI_PENDING) {
52165216
vcpu->arch.nmi_pending = events->nmi.pending;
5217+
if (vcpu->arch.nmi_pending)
5218+
kvm_make_request(KVM_REQ_NMI, vcpu);
5219+
}
52175220
static_call(kvm_x86_set_nmi_mask)(vcpu, events->nmi.masked);
52185221

52195222
if (events->flags & KVM_VCPUEVENT_VALID_SIPI_VECTOR &&

0 commit comments

Comments
 (0)