2024-03-01 10:15:04

by Gerd Hoffmann

[permalink] [raw]
Subject: [PATCH 2/3] kvm/vmx: limit guest_phys_bits to 48 without 5-level ept

If EPT has no support for 5-level paging the guest physical address
space is limited to 48 bits. Adjust kvm_caps.guest_phys_bits
accordingly.

Signed-off-by: Gerd Hoffmann <[email protected]>
---
arch/x86/kvm/vmx/vmx.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 1111d9d08903..8bd644a5022d 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7899,6 +7899,11 @@ static __init void vmx_set_cpu_caps(void)

if (cpu_has_vmx_waitpkg())
kvm_cpu_cap_check_and_set(X86_FEATURE_WAITPKG);
+
+ if (enable_ept &&
+ !cpu_has_vmx_ept_5levels() &&
+ kvm_caps.guest_phys_bits > 48)
+ kvm_caps.guest_phys_bits = 48;
}

static void vmx_request_immediate_exit(struct kvm_vcpu *vcpu)
--
2.44.0