Enable CET support for guest
v5 cover Enable CET support for guest
Control-flow Enforcement Technology (CET) provides protection against return/jump-oriented programming (ROP/JOP). It includes two
sub-features: Shadow Stack(SHSTK) and Indirect Branch Tracking(IBT). This patchset is to enable CET related CPUID report, XSAVES/XRSTORS support and MSR access etc. for guest.
CET KVM patches:
https://lkml.kernel.org/r/[email protected]
CET kernel patches:
https://lkml.kernel.org/r/[email protected]
v5:
- Checked CET states before access related MSRs.
- Added new MSR MSR_KVM_GUEST_SSP for live-migration.
- Refactored patches to make them more structured.
v4:
- Added MSR read/write interface for PL1_SSP/PL2_SSP.
- Removed CET structures from X86XSaveArea.
- Cleared ebx in return of CPUID.(EAX=d, ECX=1).
v3:
- Add CET MSR save/restore support for live-migration.
v2:
- In CPUID.(EAX=d, ECX=1), set return ECX[n] = 0 if bit n corresponds to a bit in MSR_IA32_XSS.
- In CPUID.(EAX=d, ECX=n), set return ECX = 1 if bit n corresponds to a bit in MSR_IA32_XSS.
- Skip Supervisor mode xsave component when calculate User mode xave component size in xsave_area_size() and x86_cpu_reset().
Yang Weijiang (4):
x86/cpu: Add CET CPUID/XSAVES flags and data structures x86/cpuid: Add XSAVES feature words and CET related state bits x86/cpuid: Add support for XSAVES dependent feature enumeration x86/cpu: Add user space access interface for CET MSRs
target/i386/cpu.c | 57 ++++++++++++++- target/i386/cpu.h | 53 ++++++++++++++ target/i386/kvm.c | 73 +++++++++++++++++++ target/i386/machine.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 341 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.2
PATCH v5 1/4 x86/cpu: Add CET CPUID/XSAVES flags and data structures
CET feature SHSTK and IBT are enumerated via CPUID(EAX=0x7,0):ECX[bit 7] and EDX[bit 20] respectively. Two CET bits (bit 11 and 12) are defined in MSR_IA32_XSS to support XSAVES/XRSTORS. CPUID(EAX=0xd, 1):ECX[bit 11] and ECX[bit 12] correspond to CET states in user and supervisor mode respectively.
--- target/i386/cpu.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
target/i386/cpu.h +35 -0
@@ -489,6 +489,9 @@ typedef enum X86Seg {#define XSTATE_ZMM_Hi256_BIT 6#define XSTATE_Hi16_ZMM_BIT 7#define XSTATE_PKRU_BIT 9 +#define XSTATE_RESERVED_BIT 10 +#define XSTATE_CET_U_BIT 11 +#define XSTATE_CET_S_BIT 12#define XSTATE_FP_MASK (1ULL << XSTATE_FP_BIT)#define XSTATE_SSE_MASK (1ULL << XSTATE_SSE_BIT)
@@ -499,6 +502,19 @@ typedef enum X86Seg {#define XSTATE_ZMM_Hi256_MASK (1ULL << XSTATE_ZMM_Hi256_BIT)#define XSTATE_Hi16_ZMM_MASK (1ULL << XSTATE_Hi16_ZMM_BIT)#define XSTATE_PKRU_MASK (1ULL << XSTATE_PKRU_BIT) +#define XSTATE_RESERVED_MASK (1ULL << XSTATE_RESERVED_BIT) +#define XSTATE_CET_U_MASK (1ULL << XSTATE_CET_U_BIT) +#define XSTATE_CET_S_MASK (1ULL << XSTATE_CET_S_BIT) + +/* CPUID feature bits available in XCR0 */ +#define CPUID_XSTATE_USER_MASK (XSTATE_FP_MASK | XSTATE_SSE_MASK | \ + XSTATE_YMM_MASK | XSTATE_BNDREGS_MASK | \ + XSTATE_BNDCSR_MASK | XSTATE_OPMASK_MASK | \ + XSTATE_ZMM_Hi256_MASK | \ + XSTATE_Hi16_ZMM_MASK | XSTATE_PKRU_MASK) + +/* CPUID feature bits available in XSS */ +#define CPUID_XSTATE_KERNEL_MASK (XSTATE_CET_U_MASK)/* CPUID feature words */ typedef enum FeatureWord {
@@ -536,6 +552,8 @@ typedef enum FeatureWord {FEAT_VMX_EPT_VPID_CAPS ,FEAT_VMX_BASIC ,FEAT_VMX_VMFUNC , +FEAT_XSAVES_LO ,/* CPUID[EAX=0xd,ECX=1].ECX */ +FEAT_XSAVES_HI ,/* CPUID[EAX=0xd,ECX=1].EDX */ FEATURE_WORDS , } FeatureWord;
@@ -743,6 +761,8 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS];#define CPUID_7_0_ECX_WAITPKG (1U << 5)/* Additional AVX-512 Vector Byte Manipulation Instruction */ #define CPUID_7_0_ECX_AVX512_VBMI2 (1U << 6) +/* CET SHSTK feature */ +#define CPUID_7_0_ECX_CET_SHSTK (1U << 7)/* Galois Field New Instructions */ #define CPUID_7_0_ECX_GFNI (1U << 8)/* Vector AES Instructions */
@@ -770,6 +790,8 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS];#define CPUID_7_0_EDX_AVX512_4VNNIW (1U << 2)/* AVX512 Multiply Accumulation Single Precision */ #define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) +/* CET IBT feature */ +#define CPUID_7_0_EDX_CET_IBT (1U << 20)/* Speculation Control */ #define CPUID_7_0_EDX_SPEC_CTRL (1U << 26)/* Single Thread Indirect Branch Predictors */
@@ -1260,6 +1282,19 @@ typedef struct XSavePKRU {uint32_t padding; } XSavePKRU; +/* Ext. save area 11: User mode CET state */ +typedef struct XSavesCETU { +uint64_t u_cet; +uint64_t user_ssp; +}XSavesCETU ; + +/* Ext. save area 12: Supervisor mode CET state */ +typedef struct XSavesCETS { +uint64_t kernel_ssp; +uint64_t pl1_ssp; +uint64_t pl2_ssp; +}XSavesCETS ; + typedef struct X86XSaveArea { X86LegacyXSaveArea legacy; X86XSaveHeader header;
Signature · 1 line
2.17.2
Re: [Qemu-devel][PATCH v5 1/4] x86/cpu: Add CET CPUID/XSAVES flags and data structures
Quoted 16 lines · Yang Weijiang
CET feature SHSTK and IBT are enumerated via CPUID(EAX=0x7,0):ECX[bit 7] and EDX[bit 20] respectively. Two CET bits (bit 11 and 12) are defined in
MSR_IA32_XSSto support XSAVES/XRSTORS.CPUID(EAX=0xd, 1):ECX[bit 11] and ECX[bit 12] correspond to CET states in user and supervisor mode respectively.Signed-off-by Zhang Yi <[email protected]>Signed-off-by Yang Weijiang <[email protected]>--- target/i386/cpu.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)target/i386/cpu.h +0
-0
target/i386/cpu.h typedef enum X86Seg { · line 492
Quoted 4 lines
target/i386/cpu.h +1
-0@@ -489,6 +489,9 @@ typedef enum X86Seg {#define XSTATE_ZMM_Hi256_BIT 6#define XSTATE_Hi16_ZMM_BIT 7#define XSTATE_PKRU_BIT 9 +#define XSTATE_RESERVED_BIT 10
I think this is unnecessary. bit 8 and so many other undefined bits are reserved too.
target/i386/cpu.h typedef enum X86Seg { · line 505
Quoted 10 lines
target/i386/cpu.h +3
-0+#define XSTATE_CET_U_BIT 11 +#define XSTATE_CET_S_BIT 12#define XSTATE_FP_MASK (1ULL << XSTATE_FP_BIT)#define XSTATE_SSE_MASK (1ULL << XSTATE_SSE_BIT)@@ -499,6 +502,19 @@ typedef enum X86Seg {#define XSTATE_ZMM_Hi256_MASK (1ULL << XSTATE_ZMM_Hi256_BIT)#define XSTATE_Hi16_ZMM_MASK (1ULL << XSTATE_Hi16_ZMM_BIT)#define XSTATE_PKRU_MASK (1ULL << XSTATE_PKRU_BIT) +#define XSTATE_RESERVED_MASK (1ULL << XSTATE_RESERVED_BIT)
Ditto.
target/i386/cpu.h typedef enum X86Seg { · line 517
Quoted 12 lines
target/i386/cpu.h +12
-0+#define XSTATE_CET_U_MASK (1ULL << XSTATE_CET_U_BIT) +#define XSTATE_CET_S_MASK (1ULL << XSTATE_CET_S_BIT) + +/* CPUID feature bits available in XCR0 */ +#define CPUID_XSTATE_USER_MASK (XSTATE_FP_MASK | XSTATE_SSE_MASK | \ + XSTATE_YMM_MASK | XSTATE_BNDREGS_MASK | \ + XSTATE_BNDCSR_MASK | XSTATE_OPMASK_MASK | \ + XSTATE_ZMM_Hi256_MASK | \ + XSTATE_Hi16_ZMM_MASK | XSTATE_PKRU_MASK) + +/* CPUID feature bits available in XSS */ +#define CPUID_XSTATE_KERNEL_MASK (XSTATE_CET_U_MASK)
How about we name it XSTATE_XCR0_MASK and XSTATE_XSS_MASK.
They are not CPUID feature bit, at least the CPUID_ prefix needs to be removed.
target/i386/cpu.h typedef enum FeatureWord { · line 556
Quoted 9 lines
target/i386/cpu.h +2
-0/* CPUID feature words */ typedef enum FeatureWord {@@ -536,6 +552,8 @@ typedef enum FeatureWord {FEAT_VMX_EPT_VPID_CAPS ,FEAT_VMX_BASIC ,FEAT_VMX_VMFUNC , +FEAT_XSAVES_LO ,/* CPUID[EAX=0xd,ECX=1].ECX */ + FEAT_XSAVES_HI, /* CPUID[EAX=0xd,ECX=1].EDX */
I don't think *XSAVES* is a good name, because XSAVES and manipulate the features masked by XCR0 | MSR_IA32_XSS. But this CPUID leaf only enumerated XSTATE features for XSS.
How about name it FEAT_XSS_LO/HI? or FEAT_XSAVES_XSS_HO/HI
Quoted 42 lines
target/i386/cpu.h +17
-0FEATURE_WORDS, } FeatureWord;@@ -743,6 +761,8 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS];#define CPUID_7_0_ECX_WAITPKG (1U << 5)/* Additional AVX-512 Vector Byte Manipulation Instruction */ #define CPUID_7_0_ECX_AVX512_VBMI2 (1U << 6) +/* CET SHSTK feature */ +#define CPUID_7_0_ECX_CET_SHSTK (1U << 7)/* Galois Field New Instructions */ #define CPUID_7_0_ECX_GFNI (1U << 8)/* Vector AES Instructions */ @@ -770,6 +790,8 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS];#define CPUID_7_0_EDX_AVX512_4VNNIW (1U << 2)/* AVX512 Multiply Accumulation Single Precision */ #define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) +/* CET IBT feature */ +#define CPUID_7_0_EDX_CET_IBT (1U << 20)/* Speculation Control */ #define CPUID_7_0_EDX_SPEC_CTRL (1U << 26)/* Single Thread Indirect Branch Predictors */ @@ -1260,6 +1282,19 @@ typedef struct XSavePKRU {uint32_t padding; } XSavePKRU; +/* Ext. save area 11: User mode CET state */ +typedef struct XSavesCETU { +uint64_t u_cet; +uint64_t user_ssp; +}XSavesCETU ; + +/* Ext. save area 12: Supervisor mode CET state */ +typedef struct XSavesCETS { +uint64_t kernel_ssp; +uint64_t pl1_ssp; +uint64_t pl2_ssp; +}XSavesCETS ; + typedef struct X86XSaveArea { X86LegacyXSaveArea legacy; X86XSaveHeader header;
PATCH v5 2/4 x86/cpuid: Add XSAVES feature words and CET related state bits
In reply to Yang WeijiangCET SHSTK/IBT MSRs can be saved/restored with XSAVES/XRSTORS, but currently the related feature words are not supported, so add the new entries. XSAVES/RSTORS always use compacted storage format, which means the supervisor states' offsets are always 0, ignore them while calculating stardard format storage size.
--- target/i386/cpu.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
target/i386/cpu.c +36 -2
@@ -965,7 +965,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .type = CPUID_FEATURE_WORD, .feat_names = {NULL ,"avx512vbmi" ,"umip" ,"pku" , -NULL /* ospke */ ,"waitpkg" ,"avx512vbmi2" ,NULL , +NULL /* ospke */ ,"waitpkg" ,"avx512vbmi2" ,"shstk" ,"gfni" ,"vaes" ,"vpclmulqdq" ,"avx512vnni" ,"avx512bitalg" ,NULL ,"avx512-vpopcntdq" ,NULL , "la57", NULL, NULL, NULL,
@@ -988,7 +988,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {NULL ,NULL ,"md-clear" ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL /* pconfig */ ,NULL , -NULL ,NULL ,NULL ,NULL , +"ibt" ,NULL ,NULL ,NULL ,NULL ,NULL ,"spec-ctrl" ,"stibp" , NULL, "arch-capabilities", "core-capability", "ssbd", },
@@ -1069,6 +1069,26 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { }, .tcg_features = TCG_XSAVE_FEATURES, }, +/* Below are xsaves feature words */ + [FEAT_XSAVES_LO] = { + .type = CPUID_FEATURE_WORD, + .cpuid = { + .eax = 0xD, + .needs_ecx = true, + .ecx = 1, + .reg = R_ECX, + }, + .migratable_flags = XSTATE_CET_U_MASK, + }, + [FEAT_XSAVES_HI] = { + .type = CPUID_FEATURE_WORD, + .cpuid = { + .eax = 0xD, + .needs_ecx = true, + .ecx = 1, + .reg =R_EDX + }, + }, [FEAT_6_EAX] = { .type = CPUID_FEATURE_WORD, .feat_names = {
@@ -1455,6 +1475,14 @@ static const ExtSaveArea x86_ext_save_areas[] = { { .feature = FEAT_7_0_ECX, .bits = CPUID_7_0_ECX_PKU, .offset = offsetof(X86XSaveArea, pkru_state), .size = sizeof(XSavePKRU) }, + [XSTATE_CET_U_BIT ] = { + .feature =FEAT_7_0_ECX , .bits =CPUID_7_0_ECX_CET_SHSTK , + .offset =0 /*supervisor mode component, offset = 0 */ , + .size = sizeof(XSavesCETU) }, + [XSTATE_CET_S_BIT ] = { + .feature =FEAT_7_0_ECX , .bits =CPUID_7_0_ECX_CET_SHSTK , + .offset =0 /*supervisor mode component, offset = 0 */ , + .size = sizeof(XSavesCETS) }, };static uint32_t xsave_area_size (uint64_t mask)
@@ -1465,6 +1493,9 @@ static uint32_t xsave_area_size(uint64_t mask)for (i =0 ; i <ARRAY_SIZE (x86_ext_save_areas); i++) {const ExtSaveArea *esa = &x86_ext_save_areas[i];if ((mask >> i) &1 ) { +if (i >=2 && !esa->offset) { +continue ; + } ret =MAX (ret, esa->offset + esa->size); } }
@@ -6008,6 +6039,9 @@ static void x86_cpu_reset(DeviceState *dev) }for (i =2 ; i <ARRAY_SIZE (x86_ext_save_areas); i++) {const ExtSaveArea *esa = &x86_ext_save_areas[i]; +if (!esa->offset) { +continue ; + }if (env->features[esa->feature] & esa->bits) { xcr0 |=1ull << i; }
Signature · 1 line
2.17.2
Re: [Qemu-devel][PATCH v5 2/4] x86/cpuid: Add XSAVES feature words and CET related state bits
Quoted 38 lines · Yang Weijiang
CET SHSTK/IBT MSRs can be saved/restored with XSAVES/XRSTORS, but currently the related feature words are not supported, so add the new entries. XSAVES/RSTORS always use compacted storage format, which means the supervisor states' offsets are always 0, ignore them while calculating stardard format storage size.
Signed-off-by Zhang Yi <[email protected]>Signed-off-by Yang Weijiang <[email protected]>--- target/i386/cpu.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)target/i386/cpu.c +2
-2@@ -965,7 +965,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .type = CPUID_FEATURE_WORD, .feat_names = {NULL ,"avx512vbmi" ,"umip" ,"pku" , -NULL /* ospke */ ,"waitpkg" ,"avx512vbmi2" ,NULL , +NULL /* ospke */ ,"waitpkg" ,"avx512vbmi2" ,"shstk" ,"gfni" ,"vaes" ,"vpclmulqdq" ,"avx512vnni" ,"avx512bitalg" ,NULL ,"avx512-vpopcntdq" ,NULL , "la57", NULL, NULL, NULL,@@ -988,7 +988,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {NULL ,NULL ,"md-clear" ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL /* pconfig */ ,NULL , -NULL ,NULL ,NULL ,NULL , +"ibt" ,NULL ,NULL ,NULL ,NULL ,NULL ,"spec-ctrl" ,"stibp" , NULL, "arch-capabilities", "core-capability", "ssbd", },@@ -1069,6 +1069,26 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { }, .tcg_features = TCG_XSAVE_FEATURES, },
target/i386/cpu.c static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { · line 1081
Quoted 10 lines
target/i386/cpu.c +10
-0+ /* Below are xsaves feature words */ + [FEAT_XSAVES_LO] = { + .type = CPUID_FEATURE_WORD, + .cpuid = { + .eax = 0xD, + .needs_ecx = true, + .ecx = 1, + .reg = R_ECX, + }, + .migratable_flags = XSTATE_CET_U_MASK,
why exclude XSTATE_CET_S_MASK? Is any reason why it not migratable?
Quoted 49 lines
target/i386/cpu.c +24
-0+ }, + [FEAT_XSAVES_HI] = { + .type = CPUID_FEATURE_WORD, + .cpuid = { + .eax = 0xD, + .needs_ecx = true, + .ecx = 1, + .reg = R_EDX + }, + }, [FEAT_6_EAX] = { .type = CPUID_FEATURE_WORD, .feat_names = {@@ -1455,6 +1475,14 @@ static const ExtSaveArea x86_ext_save_areas[] = { { .feature = FEAT_7_0_ECX, .bits = CPUID_7_0_ECX_PKU, .offset = offsetof(X86XSaveArea, pkru_state), .size = sizeof(XSavePKRU) }, + [XSTATE_CET_U_BIT ] = { + .feature =FEAT_7_0_ECX , .bits =CPUID_7_0_ECX_CET_SHSTK , + .offset =0 /*supervisor mode component, offset = 0 */ , + .size = sizeof(XSavesCETU) }, + [XSTATE_CET_S_BIT ] = { + .feature =FEAT_7_0_ECX , .bits =CPUID_7_0_ECX_CET_SHSTK , + .offset =0 /*supervisor mode component, offset = 0 */ , + .size = sizeof(XSavesCETS) }, };static uint32_t xsave_area_size (uint64_t mask)@@ -1465,6 +1493,9 @@ static uint32_t xsave_area_size(uint64_t mask)for (i =0 ; i <ARRAY_SIZE (x86_ext_save_areas); i++) {const ExtSaveArea *esa = &x86_ext_save_areas[i];if ((mask >> i) &1 ) { +if (i >=2 && !esa->offset) { +continue ; + } ret =MAX (ret, esa->offset + esa->size); } }@@ -6008,6 +6039,9 @@ static void x86_cpu_reset(DeviceState *dev) }for (i =2 ; i <ARRAY_SIZE (x86_ext_save_areas); i++) {const ExtSaveArea *esa = &x86_ext_save_areas[i]; +if (!esa->offset) { +continue ; + }if (env->features[esa->feature] & esa->bits) { xcr0 |=1ull << i; }
PATCH v5 3/4 x86/cpuid: Add support for XSAVES dependent feature enumeration
In reply to Yang WeijiangCurrently XSAVES dependent features are not supported in CPUID enumeration, update CPUID(0xD,n>=1) to enable it.
CET XSAVES related enumeration includes:
CPUID(0xD,1):ECX[bit 11]: user mode CET state, controls bit 11 in XSS. CPUID(0xD,1):ECX[bit 12]: supervisor mode CET state, controls bit 12 in XSS. CPUID(0xD,11): user mode CET state sub-leaf, reports the state size. CPUID(0xD,12): supervisor mode CE state sub-leaf, reports the state size.
--- target/i386/cpu.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
target/i386/cpu.c +18 -1
@@ -1513,6 +1513,12 @@ static inline uint64_t x86_cpu_xsave_components(X86CPU *cpu) cpu->env.features[FEAT_XSAVE_COMP_LO ]; } +static inline uint64_t x86_cpu_xsave_sv_components (X86CPU *cpu) +{ +return ((uint64_t )cpu->env.features[FEAT_XSAVES_HI ]) <<32 | + cpu->env.features[FEAT_XSAVES_LO ]; +} +const char *get_register_name_32 (unsigned int reg) {if (reg >=CPU_NB_REGS32 ) {
@@ -5722,13 +5728,22 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,*/ *ebx =kvm_enabled () ? *ecx :xsave_area_size (env->xcr0); }else if (count ==1 ) { +/* ebx is updated in kvm.*/ *eax = env->features[FEAT_XSAVE ]; + *ecx = env->features[FEAT_XSAVES_LO ]; + *edx = env->features[FEAT_XSAVES_HI ]; }else if (count <ARRAY_SIZE (x86_ext_save_areas)) {if ((x86_cpu_xsave_components (cpu) >> count) &1 ) {const ExtSaveArea *esa = &x86_ext_save_areas[count]; *eax = esa->size; *ebx = esa->offset; } +if ((x86_cpu_xsave_sv_components (cpu) >> count) &1 ) { +const ExtSaveArea *esa_sv = &x86_ext_save_areas[count]; + *eax = esa_sv->size; + *ebx =0 ; + *ecx =1 ; + } }break ; }
@@ -6280,8 +6295,10 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) } } - env->features[FEAT_XSAVE_COMP_LO ] = mask; + env->features[FEAT_XSAVE_COMP_LO ] = mask &CPUID_XSTATE_USER_MASK ; env->features[FEAT_XSAVE_COMP_HI ] = mask >>32 ; + env->features[FEAT_XSAVES_LO ] = mask &CPUID_XSTATE_KERNEL_MASK ; + env->features[FEAT_XSAVES_HI ] = mask >>32 ; }/***** Steps involved on loading and filtering CPUID data
Signature · 1 line
2.17.2
PATCH v5 4/4 x86/cpu: Add user space access interface for CET MSRs
In reply to Yang WeijiangAdded interface for CET MSR_IA32_{U,S}_CET, MSR_IA32_PL{0,1,2,3}_SSP, MSR_IA32_INTR_SSP_TBL and MSR_KVM_GUEST_SSP save/restore. Check if corresponding CET features are available before access the MSRs.
--- target/i386/cpu.h | 18 +++++ target/i386/kvm.c | 73 +++++++++++++++++++ target/i386/machine.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 252 insertions(+)
target/i386/cpu.h +18 -0
@@ -480,6 +480,15 @@ typedef enum X86Seg {#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490#define MSR_IA32_VMX_VMFUNC 0x00000491 +#define MSR_IA32_U_CET 0x6a0 +#define MSR_IA32_S_CET 0x6a2 +#define MSR_IA32_PL0_SSP 0x6a4 +#define MSR_IA32_PL1_SSP 0x6a5 +#define MSR_IA32_PL2_SSP 0x6a6 +#define MSR_IA32_PL3_SSP 0x6a7 +#define MSR_IA32_SSP_TBL 0x6a8 +#define MSR_KVM_GUEST_SSP 0x4b564d06 +#define XSTATE_FP_BIT 0#define XSTATE_SSE_BIT 1#define XSTATE_YMM_BIT 2
@@ -1567,6 +1576,15 @@ typedef struct CPUX86State {uintptr_t retaddr; +uint64_t u_cet; +uint64_t s_cet; +uint64_t pl0_ssp; +uint64_t pl1_ssp; +uint64_t pl2_ssp; +uint64_t pl3_ssp; +uint64_t ssp_tbl; +uint64_t guest_ssp; +/* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields;
target/i386/kvm.c +73 -0
91 lines not on this page · raw message
target/i386/machine.c +161 -0
173 lines not on this page · raw message
Signature · 1 line
2.17.2