KVM: nVMX: Use correct root level for nested EPT shadow page tables
commit5.4-rM2-2.2.x-imx-squashed148d735eb5
upstream. Hardcode the EPT page-walk level for L2 to be 4 levels, as KVM's MMU currently also hardcodes the page walk level for nested EPT to be 4 levels. The L2 guest is all but guaranteed to soft hang on its first instruction when L1 is using EPT, as KVM will construct 4-level page tables and then tell hardware to use 5-level page tables. Fixes:855feb6736
("KVM: MMU: Add 5 level EPT & Shadow page table support.") Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
ce8b9b8032
commit
db6f68908b
|
@ -2975,6 +2975,9 @@ void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
|
||||||
|
|
||||||
static int get_ept_level(struct kvm_vcpu *vcpu)
|
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))
|
if (cpu_has_vmx_ept_5levels() && (cpuid_maxphyaddr(vcpu) > 48))
|
||||||
return 5;
|
return 5;
|
||||||
return 4;
|
return 4;
|
||||||
|
|
Loading…
Reference in New Issue