target/i386: add support for LAM in CPUID enumeration
v2 cover target/i386: add support for LAM in CPUID enumeration
Linear-address masking (LAM) [1], modifies the checking that is applied to *64-bit* linear addresses, allowing software to use of the untranslated address bits for metadata and masks the metadata bits before using them as linear addresses to access memory.
When the feature is virtualized and exposed to guest, it can be used for efficient address sanitizers (ASAN) implementation and for optimizations in JITs and virtual machines.
[1] Intel ISE https://cdrdv2.intel.com/v1/dl/getContent/671368
Chapter Linear Address Masking (LAM)
---
Changelog
v2:
- Add macro of CPUID definition for LAM bit
v1:
- https://lists.gnu.org/archive/html/qemu-devel/2023-02/msg08036.html
Robert Hoo (1):
target/i386: add support for LAM in CPUID enumeration
target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
base-commit: 51bdb0b57a2d9e84d6915fbae7b5d76c8820cf3c
Signature · 1 line
2.25.1
PATCH v2 1/1 target/i386: add support for LAM in CPUID enumeration
From: Robert Hoo <[email protected]>
Linear Address Masking (LAM) is a new Intel CPU feature, which allows software to use of the untranslated address bits for metadata.
The bit definition:
CPUID.(EAX=7,ECX=1):EAX[26]
Add CPUID definition for LAM.
More info can be found in Intel ISE Chapter "LINEAR ADDRESS MASKING (LAM)"
https://cdrdv2.intel.com/v1/dl/getContent/671368
--- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
target/i386/cpu.c +1 -1
@@ -881,7 +881,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {"fsrc" ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,"amx-fp16" ,NULL ,"avx-ifma" , -NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,"lam" ,NULL , NULL, NULL, NULL, NULL, }, .cpuid = {
target/i386/cpu.h +2 -0
@@ -924,6 +924,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,#define CPUID_7_1_EAX_AMX_FP16 (1U << 21)/* Support for VPMADD52[H,L]UQ */ #define CPUID_7_1_EAX_AVX_IFMA (1U << 23) +/* Linear Address Masking */ +#define CPUID_7_1_EAX_LAM (1U << 26)/* Support for VPDPB[SU,UU,SS]D[,S] */ #define CPUID_7_1_EDX_AVX_VNNI_INT8 (1U << 4)
Signature · 1 line
2.25.1
Quoted 5 lines · Binbin Wu
From: Robert Hoo <[email protected]>
Linear Address Masking (LAM) is a new Intel CPU feature, which allows software to use of the untranslated address bits for metadata.
Quoted 7 lines
The bit definition:
CPUID.(EAX=7,ECX=1):EAX[26]Add CPUID definition for LAM.
More info can be found in Intel ISE Chapter "LINEAR ADDRESS MASKING (LAM)"
https://cdrdv2.intel.com/v1/dl/getContent/671368
LAM defines new bits in CR3 and CR4. I think it needs corresponding support in QEMU as well.
Quoted 34 lines
Signed-off-by Robert Hoo <[email protected]>Co-developed-by Binbin Wu <[email protected]>Signed-off-by Binbin Wu <[email protected]>--- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)target/i386/cpu.c +1
-1@@ -881,7 +881,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {"fsrc" ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,"amx-fp16" ,NULL ,"avx-ifma" , -NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,"lam" ,NULL , NULL, NULL, NULL, NULL, }, .cpuid = {target/i386/cpu.h +2
-0@@ -924,6 +924,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,#define CPUID_7_1_EAX_AMX_FP16 (1U << 21)/* Support for VPMADD52[H,L]UQ */ #define CPUID_7_1_EAX_AVX_IFMA (1U << 23) +/* Linear Address Masking */ +#define CPUID_7_1_EAX_LAM (1U << 26)/* Support for VPDPB[SU,UU,SS]D[,S] */ #define CPUID_7_1_EDX_AVX_VNNI_INT8 (1U << 4)
Quoted 9 lines · Xiaoyao Li
Quoted 8 lines · Binbin Wu
From: Robert Hoo <[email protected]>
Linear Address Masking (LAM) is a new Intel CPU feature, which allows software to use of the untranslated address bits for metadata.
The bit definition:
CPUID.(EAX=7,ECX=1):EAX[26]
Quoted 6 lines
Quoted 4 lines
Add CPUID definition for LAM.
More info can be found in Intel ISE Chapter "LINEAR ADDRESS MASKING (LAM)"
https://cdrdv2.intel.com/v1/dl/getContent/671368LAM defines new bits in CR3 and CR4. I think it needs corresponding support in QEMU as well.
In QEMU, there are several callers call cpu_x86_update_{cr3,cr4}().
* target/i386/tcg
If there is no objection, LAM feature will not be supported for TCG of target-i386.
LAM CPUID bit will not be added to TCG_7_1_EAX_FEATURES.
helper_write_crN() and helper_vmrun() check CR4 reserved bit before calling cpu_x86_update_cr4(), i.e. CR4 LAM bit is not allowed to be set in TCG.
helper_write_crN() and helper_vmrun() check max physcial address bits before calling cpu_x86_update_cr3(), no change needed, i.e. CR3 LAM bits are not allowed to be set in TCG.
About CR4 reserved bits, although QEMU code only uses cr4_reserved_bits() in target/i386/tcg, still want to do the following changes:
target/i386/cpu.h +0 -0
@@ -261,6 +261,7 @@ typedef enum X86Seg {
#define CR4_SMAP_MASK (1U << 21)
#define CR4_PKE_MASK (1U << 22)
#define CR4_PKS_MASK (1U << 24)
+#define CR4_LAM_SUP_MASK (1U << 28)
#define CR4_RESERVED_MASK \
(~(target_ulong)(CR4_VME_MASK | CR4_PVI_MASK | CR4_TSD_MASK \
@@ -269,7 +270,8 @@ typedef enum X86Seg {
| CR4_OSFXSR_MASK | CR4_OSXMMEXCPT_MASK | CR4_UMIP_MASK \ | CR4_LA57_MASK \ | CR4_FSGSBASE_MASK | CR4_PCIDE_MASK | CR4_OSXSAVE_MASK \ - | CR4_SMEP_MASK | CR4_SMAP_MASK | CR4_PKE_MASK | CR4_PKS_MASK)) + | CR4_SMEP_MASK | CR4_SMAP_MASK | CR4_PKE_MASK | CR4_PKS_MASK \ + | CR4_LAM_SUP_MASK))
#define DR6_BD (1 << 13)
#define DR6_BS (1 << 14)
@@ -2469,6 +2471,9 @@ static inline uint64_t cr4_reserved_bits(CPUX86State *env) if (!(env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_PKS)) { reserved_bits |= CR4_PKS_MASK;
}
+ if (!(env->features[FEAT_7_1_EAX] & CPUID_7_1_EAX_LAM)) {
+ reserved_bits |= CR4_LAM_SUP_MASK;
+ }
return reserved_bits;
}
* target/i386/gdbstub
x86_cpu_gdb_write_register() will call cpu_x86_update_cr3() to update cr3/cr4. Allow gdb to set the LAM bit(s) to CR3/CR4, if vcpu doesn't support LAM, set sregs will fail in KVM.
* target/i386/cpu
x86_cpu_reset_hold() will call cpu_x86_update_cr4() to reset cr4, it should be OK.
Quoted 36 lines
Quoted 35 lines
Signed-off-by Robert Hoo <[email protected]>Co-developed-by Binbin Wu <[email protected]>Signed-off-by Binbin Wu <[email protected]>---
target/i386/cpu.c| 2 +-
target/i386/cpu.h| 2 ++2 files changed, 3 insertions(+), 1 deletion(-)target/i386/cpu.c +1
-1@@ -881,7 +881,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = { "fsrc", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "amx-fp16", NULL, "avx-ifma", - NULL, NULL, NULL, NULL, + NULL, NULL, "lam", NULL, NULL, NULL, NULL, NULL, }, .cpuid = {target/i386/cpu.h +2
-0@@ -924,6 +924,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w, #define CPUID_7_1_EAX_AMX_FP16 (1U << 21) /* Support for VPMADD52[H,L]UQ */ #define CPUID_7_1_EAX_AVX_IFMA (1U << 23) +/* Linear Address Masking */ +#define CPUID_7_1_EAX_LAM (1U << 26) /* Support for VPDPB[SU,UU,SS]D[,S] */ #define CPUID_7_1_EDX_AVX_VNNI_INT8 (1U << 4)