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

Commit 00eba012 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: VMX: Refactor vmx_complete_atomic_exit() 



Move the exit reason checks to the front of the function, for early
exit in the common case.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent f9902069

arch/x86/kvm/vmx.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -3896,17 +3896,20 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr) 




static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)

static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)

{

{

	u32 exit_intr_info = vmx->exit_intr_info;

	u32 exit_intr_info;



	if (!(vmx->exit_reason == EXIT_REASON_MCE_DURING_VMENTRY

	      || vmx->exit_reason == EXIT_REASON_EXCEPTION_NMI))

		return;



	exit_intr_info = vmx->exit_intr_info;





	/* Handle machine checks before interrupts are enabled */

	/* Handle machine checks before interrupts are enabled */

	if ((vmx->exit_reason == EXIT_REASON_MCE_DURING_VMENTRY)

	if (is_machine_check(exit_intr_info))

	    || (vmx->exit_reason == EXIT_REASON_EXCEPTION_NMI

		&& is_machine_check(exit_intr_info)))

		kvm_machine_check();

		kvm_machine_check();





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

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

	if (vmx->exit_reason == EXIT_REASON_EXCEPTION_NMI &&

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

	    (exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &&

	    (exit_intr_info & INTR_INFO_VALID_MASK)) {

	    (exit_intr_info & INTR_INFO_VALID_MASK)) {

		kvm_before_handle_nmi(&vmx->vcpu);

		kvm_before_handle_nmi(&vmx->vcpu);

		asm("int $2");

		asm("int $2");