diff options
| author | Tao Su <tao1.su@linux.intel.com> | 2024-03-19 11:11:11 +0800 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2024-04-08 14:22:10 -0700 |
| commit | 7f2817ef52a1cc3ee0ace35eb8df7a39bd4fc9b7 (patch) | |
| tree | 99ce25db819e4c4b17b175a1c507774cf29a4e82 /arch | |
| parent | 449c0811d8729068646e1a270be72bf2da2e66f3 (diff) | |
| download | linux-stable-7f2817ef52a1cc3ee0ace35eb8df7a39bd4fc9b7.tar.gz linux-stable-7f2817ef52a1cc3ee0ace35eb8df7a39bd4fc9b7.tar.bz2 linux-stable-7f2817ef52a1cc3ee0ace35eb8df7a39bd4fc9b7.zip | |
KVM: VMX: Ignore MKTME KeyID bits when intercepting #PF for allow_smaller_maxphyaddr
Use the raw/true host.MAXPHYADDR when deciding whether or not KVM must
intercept #PFs when allow_smaller_maxphyaddr is enabled, as any adjustments
the kernel makes to boot_cpu_data.x86_phys_bits to account for MKTME KeyID
bits do not apply to the guest physical address space. I.e. the KeyID are
off-limits for host physical addresses, but are not reserved for GPAs as
far as hardware is concerned.
Signed-off-by: Tao Su <tao1.su@linux.intel.com>
Link: https://lore.kernel.org/r/20240319031111.495006-1-tao1.su@linux.intel.com
[sean: massage changelog]
Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/vmx/vmx.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h index 65786dbe7d60..1742c88ba9c8 100644 --- a/arch/x86/kvm/vmx/vmx.h +++ b/arch/x86/kvm/vmx/vmx.h @@ -15,6 +15,7 @@ #include "vmx_ops.h" #include "../cpuid.h" #include "run_flags.h" +#include "../mmu.h" #define MSR_TYPE_R 1 #define MSR_TYPE_W 2 @@ -719,7 +720,8 @@ static inline bool vmx_need_pf_intercept(struct kvm_vcpu *vcpu) if (!enable_ept) return true; - return allow_smaller_maxphyaddr && cpuid_maxphyaddr(vcpu) < boot_cpu_data.x86_phys_bits; + return allow_smaller_maxphyaddr && + cpuid_maxphyaddr(vcpu) < kvm_get_shadow_phys_bits(); } static inline bool is_unrestricted_guest(struct kvm_vcpu *vcpu) |