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

Commit 0bcd13a0 authored Dec 06, 2014 by Bandan Das Committed by Greg Kroah-Hartman Jan 27, 2015

KVM: nVMX: Disable unrestricted mode if ept=0



commit 78051e3b7e35722ad3f31dd611f1b34770bddab8 upstream.

If L0 has disabled EPT, don't advertise unrestricted
mode at all since it depends on EPT to run real mode code.

Fixes: 92fbc7b1
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3e038e9d

arch/x86/kvm/vmx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2377,12 +2377,12 @@ static __init void nested_vmx_setup_ctls_msrs(void)
		nested_vmx_secondary_ctls_low = 0;
		nested_vmx_secondary_ctls_high &=
		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES \|
		SECONDARY_EXEC_UNRESTRICTED_GUEST \|
		SECONDARY_EXEC_WBINVD_EXITING;

		if (enable_ept) {
		/* nested EPT: emulate EPT also to L1 */
		nested_vmx_secondary_ctls_high \|= SECONDARY_EXEC_ENABLE_EPT;
		nested_vmx_secondary_ctls_high \|= SECONDARY_EXEC_ENABLE_EPT \|
		SECONDARY_EXEC_UNRESTRICTED_GUEST;
		nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT \|
		VMX_EPTP_WB_BIT \| VMX_EPT_2MB_PAGE_BIT \|
		VMX_EPT_INVEPT_BIT;