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

Commit 7cdc2d62 authored by Jim Mattson's avatar Jim Mattson Committed by Radim Krčmář
Browse files

kvm: nVMX: Don't set vmcs12 to "launched" when VMLAUNCH fails 



The VMCS launch state is not set to "launched" unless the VMLAUNCH
actually succeeds. VMLAUNCH failure includes VM-exits with bit 31 set.

Note that this change does not address the general problem that a
failure to launch/resume vmcs02 (i.e. vmx->fail) is not handled
correctly.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8c61af9e

arch/x86/kvm/vmx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -10435,8 +10435,6 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry) 
		return 1;

		return 1;

	}

	}





	vmcs12->launch_state = 1;



	/*

	/*

	 * Note no nested_vmx_succeed or nested_vmx_fail here. At this point

	 * Note no nested_vmx_succeed or nested_vmx_fail here. At this point

	 * we are no longer running L1, and VMLAUNCH/VMRESUME has not yet

	 * we are no longer running L1, and VMLAUNCH/VMRESUME has not yet
@@ -10810,6 +10808,8 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
	vmcs12->vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);

	vmcs12->vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);





	if (!(vmcs12->vm_exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY)) {

	if (!(vmcs12->vm_exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY)) {

		vmcs12->launch_state = 1;



		/* vm_entry_intr_info_field is cleared on exit. Emulate this

		/* vm_entry_intr_info_field is cleared on exit. Emulate this

		 * instead of reading the real value. */

		 * instead of reading the real value. */

		vmcs12->vm_entry_intr_info_field &= ~INTR_INFO_VALID_MASK;

		vmcs12->vm_entry_intr_info_field &= ~INTR_INFO_VALID_MASK;