Commit 88656040 authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

KVM: nVMX: Unrestricted guest mode requires EPT 



As specified in Intel's SDM, do not allow the L1 hypervisor to launch
an L2 guest with the VM-execution controls for "unrestricted guest" or
"mode-based execute control for EPT" set and the VM-execution control
for "enable EPT" clear.

Note that the VM-execution control for "mode-based execute control for
EPT" is not yet virtualized by kvm.

Reported-by: default avatarAndrew Thornton <andrewth@google.com>
Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Reviewed-by: default avatarPeter Shier <pshier@google.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarWanpeng Li <wanpengli@tencent.com>
Reviewed-by: default avatarLiran Alon <liran.alon@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 09f70c3b

arch/x86/include/asm/vmx.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
#define SECONDARY_EXEC_RDSEED_EXITING		0x00010000

#define SECONDARY_EXEC_ENABLE_PML               0x00020000

#define SECONDARY_EXEC_XSAVES			0x00100000

#define SECONDARY_EXEC_MODE_BASED_EPT_EXEC	0x00400000

#define SECONDARY_EXEC_TSC_SCALING              0x02000000



#define PIN_BASED_EXT_INTR_MASK                 0x00000001

arch/x86/kvm/vmx.c

+24 −0
Original line number Diff line number Diff line
@@ -12308,6 +12308,24 @@ static int nested_vmx_check_pml_controls(struct kvm_vcpu *vcpu, 
	return 0;

}



static int nested_vmx_check_unrestricted_guest_controls(struct kvm_vcpu *vcpu,

							struct vmcs12 *vmcs12)

{

	if (nested_cpu_has2(vmcs12, SECONDARY_EXEC_UNRESTRICTED_GUEST) &&

	    !nested_cpu_has_ept(vmcs12))

		return -EINVAL;

	return 0;

}



static int nested_vmx_check_mode_based_ept_exec_controls(struct kvm_vcpu *vcpu,

							 struct vmcs12 *vmcs12)

{

	if (nested_cpu_has2(vmcs12, SECONDARY_EXEC_MODE_BASED_EPT_EXEC) &&

	    !nested_cpu_has_ept(vmcs12))

		return -EINVAL;

	return 0;

}



static int nested_vmx_check_shadow_vmcs_controls(struct kvm_vcpu *vcpu,

						 struct vmcs12 *vmcs12)

{
@@ -13036,6 +13054,12 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
	if (nested_vmx_check_pml_controls(vcpu, vmcs12))

		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;



	if (nested_vmx_check_unrestricted_guest_controls(vcpu, vmcs12))

		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;



	if (nested_vmx_check_mode_based_ept_exec_controls(vcpu, vmcs12))

		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;



	if (nested_vmx_check_shadow_vmcs_controls(vcpu, vmcs12))

		return VMXERR_ENTRY_INVALID_CONTROL_FIELD;

CRA Git | Maintained and supported by SUSTech CRA and CCSE