target/i386: define a new MSR based feature word - FEAT_CORE_CAPABILITY
PATCH v2 1/1 target/i386: define a new MSR based feature word - FEAT_CORE_CAPABILITY
MSR IA32_CORE_CAPABILITY is a feature-enumerating MSR, which only enumerates the feature split lock detection (via bit 5) by now.
The existence of MSR IA32_CORE_CAPABILITY is enumerated by CPUID.7_0:EDX[30].
The latest kernel patches about them can be found here:
https://lkml.org/lkml/2019/4/24/1909
---
Changelog:
v2
Add definition of MSR_CORE_CAP_SPLIT_LOCK_DETECT for SNR cpu model
--- target/i386/cpu.c | 22 +++++++++++++++++++++- target/i386/cpu.h | 5 +++++ target/i386/kvm.c | 9 +++++++++ 3 files changed, 35 insertions(+), 1 deletion(-)
target/i386/cpu.c +21 -1
@@ -1085,7 +1085,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,"spec-ctrl" ,"stibp" , - NULL, "arch-capabilities", NULL, "ssbd", + NULL, "arch-capabilities", "core-capability", "ssbd", }, .cpuid = { .eax = 7,
@@ -1203,6 +1203,26 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { } }, }, + [FEAT_CORE_CAPABILITY ] = { + .type =MSR_FEATURE_WORD , + .feat_names = { +NULL ,NULL ,NULL ,NULL , +NULL ,"split-lock-detect" ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , + }, + .msr = { + .index =MSR_IA32_CORE_CAPABILITY , + .cpuid_dep = { +FEAT_7_0_EDX , +CPUID_7_0_EDX_CORE_CAPABILITY , + }, + }, + }, }; typedef struct X86RegisterInfo32 {
target/i386/cpu.h +5 -0
@@ -345,6 +345,7 @@ typedef enum X86Seg {#define MSR_IA32_SPEC_CTRL 0x48#define MSR_VIRT_SSBD 0xc001011f#define MSR_IA32_PRED_CMD 0x49 +#define MSR_IA32_CORE_CAPABILITY 0xcf#define MSR_IA32_ARCH_CAPABILITIES 0x10a#define MSR_IA32_TSCDEADLINE 0x6e0
@@ -496,6 +497,7 @@ typedef enum FeatureWord {FEAT_XSAVE_COMP_LO ,/* CPUID[EAX=0xd,ECX=0].EAX */ FEAT_XSAVE_COMP_HI ,/* CPUID[EAX=0xd,ECX=0].EDX */ FEAT_ARCH_CAPABILITIES , +FEAT_CORE_CAPABILITY ,FEATURE_WORDS , } FeatureWord;
@@ -687,6 +689,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];#define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3)/* AVX512 Multiply Accumulation Single Precision */ #define CPUID_7_0_EDX_SPEC_CTRL (1U << 26)/* Speculation Control */ #define CPUID_7_0_EDX_ARCH_CAPABILITIES (1U << 29)/*Arch Capabilities*/ +#define CPUID_7_0_EDX_CORE_CAPABILITY (1U << 30)/*Core Capability*/ #define CPUID_7_0_EDX_SPEC_CTRL_SSBD (1U << 31)/* Speculative Store Bypass Disable */ #define CPUID_8000_0008_EBX_WBNOINVD (1U << 9)/* Write back and
@@ -734,6 +737,8 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];#define MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY (1U << 3)#define MSR_ARCH_CAP_SSB_NO (1U << 4) +#define MSR_CORE_CAP_SPLIT_LOCK_DETECT (1U << 5) +#ifndef HYPERV_SPINLOCK_NEVER_RETRY #define HYPERV_SPINLOCK_NEVER_RETRY 0xFFFFFFFF#endif
target/i386/kvm.c +9 -0
@@ -95,6 +95,7 @@ static bool has_msr_spec_ctrl;static bool has_msr_virt_ssbd;static bool has_msr_smi_count;static bool has_msr_arch_capabs; +static bool has_msr_core_capabs;static uint32_t has_architectural_pmu_version;static uint32_t num_architectural_pmu_gp_counters;
@@ -1515,6 +1516,9 @@ static int kvm_get_supported_msrs(KVMState *s)case MSR_IA32_ARCH_CAPABILITIES : has_msr_arch_capabs = true;break ; +case MSR_IA32_CORE_CAPABILITY : + has_msr_core_capabs = true; +break ; } } }
@@ -2041,6 +2045,11 @@ static int kvm_put_msrs(X86CPU *cpu, int level) env->features[FEAT_ARCH_CAPABILITIES]); } +if (has_msr_core_capabs) { +kvm_msr_entry_add (cpu,MSR_IA32_CORE_CAPABILITY , + env->features[FEAT_CORE_CAPABILITY ]); + } +/* * The following MSRs have side effects on the guest or are too heavy * for normal writeback. Limit them to reset or full state updates.
Signature · 1 line
2.19.1
Quoted 121 lines · Xiaoyao Li
MSR
IA32_CORE_CAPABILITYis a feature-enumerating MSR, which only enumerates the feature split lock detection (via bit 5) by now.The existence of MSR
IA32_CORE_CAPABILITYis enumerated by CPUID.7_0:EDX[30].The latest kernel patches about them can be found here:
https://lkml.org/lkml/2019/4/24/1909Signed-off-by Xiaoyao Li <[email protected]>---
Changelog:
v2
Add definition ofMSR_CORE_CAP_SPLIT_LOCK_DETECTfor SNR cpu model--- target/i386/cpu.c | 22 +++++++++++++++++++++- target/i386/cpu.h | 5 +++++ target/i386/kvm.c | 9 +++++++++ 3 files changed, 35 insertions(+), 1 deletion(-)target/i386/cpu.c +21
-1@@ -1085,7 +1085,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,"spec-ctrl" ,"stibp" , - NULL, "arch-capabilities", NULL, "ssbd", + NULL, "arch-capabilities", "core-capability", "ssbd", }, .cpuid = { .eax = 7,@@ -1203,6 +1203,26 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { } }, }, + [FEAT_CORE_CAPABILITY ] = { + .type =MSR_FEATURE_WORD , + .feat_names = { +NULL ,NULL ,NULL ,NULL , +NULL ,"split-lock-detect" ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , + }, + .msr = { + .index =MSR_IA32_CORE_CAPABILITY , + .cpuid_dep = { +FEAT_7_0_EDX , +CPUID_7_0_EDX_CORE_CAPABILITY , + }, + }, + }, }; typedef struct X86RegisterInfo32 {target/i386/cpu.h +5
-0@@ -345,6 +345,7 @@ typedef enum X86Seg {#define MSR_IA32_SPEC_CTRL 0x48#define MSR_VIRT_SSBD 0xc001011f#define MSR_IA32_PRED_CMD 0x49 +#define MSR_IA32_CORE_CAPABILITY 0xcf#define MSR_IA32_ARCH_CAPABILITIES 0x10a#define MSR_IA32_TSCDEADLINE 0x6e0@@ -496,6 +497,7 @@ typedef enum FeatureWord {FEAT_XSAVE_COMP_LO ,/* CPUID[EAX=0xd,ECX=0].EAX */ FEAT_XSAVE_COMP_HI ,/* CPUID[EAX=0xd,ECX=0].EDX */ FEAT_ARCH_CAPABILITIES , +FEAT_CORE_CAPABILITY ,FEATURE_WORDS , } FeatureWord;@@ -687,6 +689,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];#define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3)/* AVX512 Multiply Accumulation Single Precision */ #define CPUID_7_0_EDX_SPEC_CTRL (1U << 26)/* Speculation Control */ #define CPUID_7_0_EDX_ARCH_CAPABILITIES (1U << 29)/*Arch Capabilities*/ +#define CPUID_7_0_EDX_CORE_CAPABILITY (1U << 30)/*Core Capability*/ #define CPUID_7_0_EDX_SPEC_CTRL_SSBD (1U << 31)/* Speculative Store Bypass Disable */ #define CPUID_8000_0008_EBX_WBNOINVD (1U << 9)/* Write back and @@ -734,6 +737,8 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];#define MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY (1U << 3)#define MSR_ARCH_CAP_SSB_NO (1U << 4) +#define MSR_CORE_CAP_SPLIT_LOCK_DETECT (1U << 5) +#ifndef HYPERV_SPINLOCK_NEVER_RETRY #define HYPERV_SPINLOCK_NEVER_RETRY 0xFFFFFFFF#endif target/i386/kvm.c +4
-0@@ -95,6 +95,7 @@ static bool has_msr_spec_ctrl;static bool has_msr_virt_ssbd;static bool has_msr_smi_count;static bool has_msr_arch_capabs; +static bool has_msr_core_capabs;static uint32_t has_architectural_pmu_version;static uint32_t num_architectural_pmu_gp_counters;@@ -1515,6 +1516,9 @@ static int kvm_get_supported_msrs(KVMState *s)case MSR_IA32_ARCH_CAPABILITIES : has_msr_arch_capabs = true;break ; +case MSR_IA32_CORE_CAPABILITY : + has_msr_core_capabs = true; +break ; } } }@@ -2041,6 +2045,11 @@ static int kvm_put_msrs(X86CPU *cpu, int level) env->features[FEAT_ARCH_CAPABILITIES]);
target/i386/kvm.c static int kvm_put_msrs(X86CPU *cpu, int level) · line 2055
Quoted 10 lines
target/i386/kvm.c +5
-0} +if (has_msr_core_capabs) { +kvm_msr_entry_add (cpu,MSR_IA32_CORE_CAPABILITY , + env->features[FEAT_CORE_CAPABILITY ]); + } +/* * The following MSRs have side effects on the guest or are too heavy * for normal writeback. Limit them to reset or full state updates.
Queued, thanks.
Paolo