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

Commit c0d1c770 authored by Jan Kiszka's avatar Jan Kiszka Committed by Gleb Natapov
Browse files

KVM: nVMX: Avoid reading VM_EXIT_INTR_ERROR_CODE needlessly on nested exits 



We only need to update vm_exit_intr_error_code if there is a valid exit
interruption information and it comes with a valid error code.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent e8457c67

arch/x86/kvm/vmx.c

+5 −1
Original line number Diff line number Diff line
@@ -7426,7 +7426,11 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
	vmcs12->exit_qualification = vmcs_readl(EXIT_QUALIFICATION);



	vmcs12->vm_exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);

	vmcs12->vm_exit_intr_error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE);

	if ((vmcs12->vm_exit_intr_info &

	     (INTR_INFO_VALID_MASK | INTR_INFO_DELIVER_CODE_MASK)) ==

	    (INTR_INFO_VALID_MASK | INTR_INFO_DELIVER_CODE_MASK))

		vmcs12->vm_exit_intr_error_code =

			vmcs_read32(VM_EXIT_INTR_ERROR_CODE);

	vmcs12->idt_vectoring_info_field = 0;

	vmcs12->vm_exit_instruction_len = vmcs_read32(VM_EXIT_INSTRUCTION_LEN);

	vmcs12->vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);