Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c761e586 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

Revert "KVM: Fix race between nmi injection and enabling nmi window" 



This reverts commit f8636849.

Simpler fix to follow.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 32918924

arch/x86/kvm/x86.c

+1 −3
Original line number Diff line number Diff line
@@ -361,8 +361,8 @@ void kvm_propagate_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault) 


void kvm_inject_nmi(struct kvm_vcpu *vcpu)

{

	kvm_make_request(KVM_REQ_NMI, vcpu);

	kvm_make_request(KVM_REQ_EVENT, vcpu);

	vcpu->arch.nmi_pending = 1;

}

EXPORT_SYMBOL_GPL(kvm_inject_nmi);
@@ -5208,8 +5208,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
			r = 1;

			goto out;

		}

		if (kvm_check_request(KVM_REQ_NMI, vcpu))

			vcpu->arch.nmi_pending = true;

	}



	r = kvm_mmu_reload(vcpu);

include/linux/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#define KVM_REQ_DEACTIVATE_FPU    10

#define KVM_REQ_EVENT             11

#define KVM_REQ_APF_HALT          12

#define KVM_REQ_NMI               13



#define KVM_USERSPACE_IRQ_SOURCE_ID	0