From: Sasha Levin <sashal@kernel.org>
Date: Thu, 20 Feb 2020 11:54:06 +0000 (-0500)
Subject: Revert "KVM: nVMX: Use correct root level for nested EPT shadow page tables"
X-Git-Tag: v4.19.106~178
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=249387d71931e6ce1c4e8f6869ec47e4af0fdbf2;p=thirdparty%2Fkernel%2Fstable.git

Revert "KVM: nVMX: Use correct root level for nested EPT shadow page tables"

This reverts commit 740d876bd9565857a695ce7c05efda4eba5bc585.

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 997926a9121c0..3791ce8d269e0 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -2968,9 +2968,6 @@ void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 
 static int get_ept_level(struct kvm_vcpu *vcpu)
 {
-	/* Nested EPT currently only supports 4-level walks. */
-	if (is_guest_mode(vcpu) && nested_cpu_has_ept(get_vmcs12(vcpu)))
-		return 4;
 	if (cpu_has_vmx_ept_5levels() && (cpuid_maxphyaddr(vcpu) > 48))
 		return 5;
 	return 4;