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

Commit 78051e3b authored by Bandan Das's avatar Bandan Das Committed by Paolo Bonzini
Browse files

KVM: nVMX: Disable unrestricted mode if ept=0 



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

Fixes: 92fbc7b1
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarBandan Das <bsd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 64a38292

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -2399,13 +2399,13 @@ 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 |

		SECONDARY_EXEC_XSAVES;



	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;