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

Commit 64a919f7 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: nVMX: move host EFER consistency checks to VMFail path 



Invalid host state related to loading EFER on VMExit causes a
VMFail(VMXERR_ENTRY_INVALID_HOST_STATE_FIELD), not a VMExit.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 31fc4f95

arch/x86/kvm/vmx.c

+16 −15
Original line number Diff line number Diff line
@@ -12400,6 +12400,7 @@ static int nested_vmx_check_nmi_controls(struct vmcs12 *vmcs12) 
static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	bool ia32e;



	if (vmcs12->guest_activity_state != GUEST_ACTIVITY_ACTIVE &&

	    vmcs12->guest_activity_state != GUEST_ACTIVITY_HLT)
@@ -12473,6 +12474,21 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
	    !nested_cr3_valid(vcpu, vmcs12->host_cr3))

		return VMXERR_ENTRY_INVALID_HOST_STATE_FIELD;



	/*

	 * If the load IA32_EFER VM-exit control is 1, bits reserved in the

	 * IA32_EFER MSR must be 0 in the field for that register. In addition,

	 * the values of the LMA and LME bits in the field must each be that of

	 * the host address-space size VM-exit control.

	 */

	if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_EFER) {

		ia32e = (vmcs12->vm_exit_controls &

			 VM_EXIT_HOST_ADDR_SPACE_SIZE) != 0;

		if (!kvm_valid_efer(vcpu, vmcs12->host_ia32_efer) ||

		    ia32e != !!(vmcs12->host_ia32_efer & EFER_LMA) ||

		    ia32e != !!(vmcs12->host_ia32_efer & EFER_LME))

			return VMXERR_ENTRY_INVALID_HOST_STATE_FIELD;

	}



	/*

	 * From the Intel SDM, volume 3:

	 * Fields relevant to VM-entry event injection must be set properly.
@@ -12594,21 +12610,6 @@ static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
			return 1;

	}



	/*

	 * If the load IA32_EFER VM-exit control is 1, bits reserved in the

	 * IA32_EFER MSR must be 0 in the field for that register. In addition,

	 * the values of the LMA and LME bits in the field must each be that of

	 * the host address-space size VM-exit control.

	 */

	if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_EFER) {

		ia32e = (vmcs12->vm_exit_controls &

			 VM_EXIT_HOST_ADDR_SPACE_SIZE) != 0;

		if (!kvm_valid_efer(vcpu, vmcs12->host_ia32_efer) ||

		    ia32e != !!(vmcs12->host_ia32_efer & EFER_LMA) ||

		    ia32e != !!(vmcs12->host_ia32_efer & EFER_LME))

			return 1;

	}



	if ((vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS) &&

		(is_noncanonical_address(vmcs12->guest_bndcfgs & PAGE_MASK, vcpu) ||

		(vmcs12->guest_bndcfgs & MSR_IA32_BNDCFGS_RSVD)))