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

Commit 20f65983 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Move "exit due to NMI" handling into vmx_complete_interrupts() 



To save us one reading of VM_EXIT_INTR_INFO.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 8db3baa2

arch/x86/kvm/vmx.c

+10 −11
Original line number Diff line number Diff line
@@ -3261,8 +3261,17 @@ static void vmx_complete_interrupts(struct vcpu_vmx *vmx) 
	int type;

	bool idtv_info_valid;



	idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK;

	exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);



	/* We need to handle NMIs before interrupts are enabled */

	if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &&

	    (exit_intr_info & INTR_INFO_VALID_MASK)) {

		KVMTRACE_0D(NMI, &vmx->vcpu, handler);

		asm("int $2");

	}



	idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK;



	if (cpu_has_virtual_nmis()) {

		unblock_nmi = (exit_intr_info & INTR_INFO_UNBLOCK_NMI) != 0;

		vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
@@ -3363,7 +3372,6 @@ static void fixup_rmode_irq(struct vcpu_vmx *vmx) 
static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	u32 intr_info;



	/* Record the guest's net vcpu time for enforced NMI injections. */

	if (unlikely(!cpu_has_virtual_nmis() && vmx->soft_vnmi_blocked))
@@ -3490,15 +3498,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));

	vmx->launched = 1;



	intr_info = vmcs_read32(VM_EXIT_INTR_INFO);



	/* We need to handle NMIs before interrupts are enabled */

	if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &&

	    (intr_info & INTR_INFO_VALID_MASK)) {

		KVMTRACE_0D(NMI, vcpu, handler);

		asm("int $2");

	}



	vmx_complete_interrupts(vmx);

}