Commit ce5c6600 authored by Robert Hoo's avatar Robert Hoo Committed by Zhiquan Li
Browse files

KVM: x86: Advertise and enable LAM (user and supervisor) 

mainline inclusion
from mainline-v6.8-rc1
commit 703d794cb8cb28c07b22c1c845f5c4d4c419aff7
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I94GWL
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=703d794cb8cb28c07b22c1c845f5c4d4c419aff7



--------------------------------

LAM is enumerated by CPUID.7.1:EAX.LAM[bit 26]. Advertise the feature to
userspace and enable it as the final step after the LAM virtualization
support for supervisor and user pointers.

SGX LAM support is not advertised yet. SGX LAM support is enumerated in
SGX's own CPUID and there's no hard requirement that it must be supported
when LAM is reported in CPUID leaf 0x7.

Intel-SIG: commit 703d794cb8cb KVM: x86: Advertise and enable LAM (user
and supervisor)
Backport KVM Linear Address Masking (LAM) support.

Signed-off-by: default avatarRobert Hoo <robert.hu@linux.intel.com>
Signed-off-by: default avatarBinbin Wu <binbin.wu@linux.intel.com>
Reviewed-by: default avatarJingqi Liu <jingqi.liu@intel.com>
Reviewed-by: default avatarChao Gao <chao.gao@intel.com>
Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Tested-by: default avatarXuelian Guo <xuelian.guo@intel.com>
Link: https://lore.kernel.org/r/20230913124227.12574-13-binbin.wu@linux.intel.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
[ Zhiquan Li: amend commit log ]
Signed-off-by: default avatarZhiquan Li <zhiquan1.li@intel.com>
parent 6b4ce369

arch/x86/kvm/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ void kvm_set_cpu_caps(void) 
	kvm_cpu_cap_mask(CPUID_7_1_EAX,

		F(AVX_VNNI) | F(AVX512_BF16) | F(CMPCCXADD) |

		F(FZRM) | F(FSRS) | F(FSRC) |

		F(AMX_FP16) | F(AVX_IFMA)

		F(AMX_FP16) | F(AVX_IFMA) | F(LAM)

	);



	kvm_cpu_cap_init_kvm_defined(CPUID_7_1_EDX,