i386/cpu: Add support for perfmon-v2, RAS bits and EPYC-Turin CPU model
v2 cover i386/cpu: Add support for perfmon-v2, RAS bits and EPYC-Turin CPU model
This series adds the support for following features in qemu.
1. RAS feature bits (SUCCOR, McaOverflowRecov)
2. perfmon-v2
3. Update EPYC-Genoa to support perfmon-v2 and RAS bits
4. Add support for EPYC-Turin
---
v2: Fixed couple of typos.
Added Reviewed-by tag from Zhao.
Rebased on top of 6d00c6f98256 ("Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging")
v1: https://lore.kernel.org/qemu-devel/[email protected]/
Signature · 18 lines
2.34.1 Babu Moger (3): i386/cpu: Add RAS feature bits on EPYC CPU models i386/cpu: Enable perfmon-v2 and RAS feature bits on EPYC-Genoa i386/cpu: Add support for EPYC-Turin model Sandipan Das (1): i386/cpu: Add PerfMonV2 feature bit target/i386/cpu.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++ target/i386/cpu.h | 4 + 2 files changed, 206 insertions(+) -- 2.34.1
PATCH v2 1/4 i386/cpu: Add RAS feature bits on EPYC CPU models
Add the support for following RAS features bits on AMD guests.
SUCCOR: Software uncorrectable error containment and recovery capability.
The processor supports software containment of uncorrectable errors through context synchronizing data poisoning and deferred error interrupts.
McaOverflowRecov: MCA overflow recovery support.
---
v2: Just added reviewed by from Zhao.
--- target/i386/cpu.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
target/i386/cpu.c +30 -0
@@ -4968,6 +4968,16 @@ static const X86CPUDefinition builtin_x86_defs[] = { }, .cache_info = &epyc_v4_cache_info }, + { + .version = 5, + .props = (PropValue[]) { + { "overflow-recov", "on" }, + { "succor", "on" }, + { "model-id", + "AMD EPYC-v5 Processor" }, + { /* end of list */ } + }, + }, {/* end of list */ } } },
@@ -5106,6 +5116,16 @@ static const X86CPUDefinition builtin_x86_defs[] = { {/* end of list */ } }, }, + { + .version = 5, + .props = (PropValue[]) { + { "overflow-recov", "on" }, + { "succor", "on" }, + { "model-id", + "AMD EPYC-Rome-v5 Processor" }, + { /* end of list */ } + }, + }, {/* end of list */ } } },
@@ -5181,6 +5201,16 @@ static const X86CPUDefinition builtin_x86_defs[] = { }, .cache_info = &epyc_milan_v2_cache_info }, + { + .version = 3, + .props = (PropValue[]) { + { "overflow-recov", "on" }, + { "succor", "on" }, + { "model-id", + "AMD EPYC-Milan-v3 Processor" }, + { /* end of list */ } + }, + }, {/* end of list */ } } },
Signature · 1 line
2.34.1
PATCH v2 2/4 i386/cpu: Add PerfMonV2 feature bit
In reply to Babu MogerFrom: Sandipan Das <[email protected]>
CPUID leaf 0x80000022, i.e. ExtPerfMonAndDbg, advertises new performance monitoring features for AMD processors. Bit 0 of EAX indicates support for Performance Monitoring Version 2 (PerfMonV2) features. If found to be set during PMU initialization, the EBX bits can be used to determine the number of available counters for different PMUs. It also denotes the availability of global control and status registers.
Add the required CPUID feature word and feature bit to allow guests to make use of the PerfMonV2 features.
---
v2: Used OR instead of overwrite for eax and ebx.
Added Zhao's Reviewed-by.
--- target/i386/cpu.c | 26 ++++++++++++++++++++++++++ target/i386/cpu.h | 4 ++++ 2 files changed, 30 insertions(+)
target/i386/cpu.c +26 -0
@@ -1228,6 +1228,22 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .tcg_features = 0, .unmigratable_flags = 0, }, + [FEAT_8000_0022_EAX] = { + .type = CPUID_FEATURE_WORD, + .feat_names = { +"perfmon-v2" ,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 ,NULL , + NULL, NULL, NULL, NULL, + }, + .cpuid = { .eax = 0x80000022, .reg = R_EAX, }, + .tcg_features =0 , + .unmigratable_flags = 0, + }, [FEAT_XSAVE] = { .type =CPUID_FEATURE_WORD , .feat_names = {
@@ -7038,6 +7054,16 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx =0 ; }break ; +case 0x80000022 : + *eax = *ebx = *ecx = *edx =0 ; +/* AMD Extended Performance Monitoring and Debug */ +if (kvm_enabled () && cpu->enable_pmu && + (env->features[FEAT_8000_0022_EAX ] &CPUID_8000_0022_EAX_PERFMON_V2 )) { + *eax |=CPUID_8000_0022_EAX_PERFMON_V2 ; + *ebx |=kvm_arch_get_supported_cpuid (cs->kvm_state, index, count, +R_EBX ) &0xf ; + } +break ;case 0xC0000000 : *eax = env->cpuid_xlevel2; *ebx =0 ;
target/i386/cpu.h +4 -0
@@ -638,6 +638,7 @@ typedef enum FeatureWord {FEAT_8000_0007_EDX ,/* CPUID[8000_0007].EDX */ FEAT_8000_0008_EBX ,/* CPUID[8000_0008].EBX */ FEAT_8000_0021_EAX ,/* CPUID[8000_0021].EAX */ +FEAT_8000_0022_EAX ,/* CPUID[8000_0022].EAX */ FEAT_C000_0001_EDX ,/* CPUID[C000_0001].EDX */ FEAT_KVM ,/* CPUID[4000_0001].EAX (KVM_CPUID_FEATURES) */ FEAT_KVM_HINTS, /* CPUID[4000_0001].EDX */
@@ -1022,6 +1023,9 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *cpu, FeatureWord w);/* Automatic IBRS */ #define CPUID_8000_0021_EAX_AUTO_IBRS (1U << 8) +/* Performance Monitoring Version 2 */ +#define CPUID_8000_0022_EAX_PERFMON_V2 (1U << 0) +#define CPUID_XSAVE_XSAVEOPT (1U << 0)#define CPUID_XSAVE_XSAVEC (1U << 1)#define CPUID_XSAVE_XGETBV1 (1U << 2)
Signature · 1 line
2.34.1
PATCH v2 3/4 i386/cpu: Enable perfmon-v2 and RAS feature bits on EPYC-Genoa
In reply to Babu MogerFollowing feature bits are added on EPYC-Genoa-v2 model.
perfmon-v2: Allow guests to make use of the PerfMonV2 features.
SUCCOR: Software uncorrectable error containment and recovery capability.
The processor supports software containment of uncorrectable errors through context synchronizing data poisoning and deferred error interrupts.
McaOverflowRecov: MCA overflow recovery support.
The feature details are available in APM listed below [1].
[1] AMD64 Architecture Programmer's Manual Volume 2: System Programming Publication # 24593 Revision 3.41.
---
v2: Minor typo.
Added Reviewed-by from Zhao.
--- target/i386/cpu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
target/i386/cpu.c +15 -0
@@ -5301,6 +5301,21 @@ static const X86CPUDefinition builtin_x86_defs[] = { .xlevel = 0x80000022, .model_id = "AMD EPYC-Genoa Processor", .cache_info = &epyc_genoa_cache_info, + .versions = (X86CPUVersionDefinition []) { + { .version =1 }, + { + .version =2 , + .props = (PropValue []) { + {"overflow-recov" ,"on" }, + {"succor" ,"on" }, + {"perfmon-v2" ,"on" }, + {"model-id" , +"AMD EPYC-Genoa-v2 Processor" }, + {/* end of list */ } + }, + }, + {/* end of list */ } + } }, };
Signature · 1 line
2.34.1
PATCH v2 4/4 i386/cpu: Add support for EPYC-Turin model
In reply to Babu MogerAdd the support for AMD EPYC zen 5 processors(EPYC-Turin).
Add the following new feature bits on top of the feature bits from the previous generation EPYC models.
movdiri : Move Doubleword as Direct Store Instruction
movdir64b : Move 64 Bytes as Direct Store Instruction
avx512-vp2intersect: AVX512 Vector Pair Intersection to a Pair
of Mask Register
avx-vnni : AVX VNNI Instruction
---
v2: Fixed minor typo.
Added Zhao's Reviewed-by.
--- target/i386/cpu.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+)
target/i386/cpu.c +131 -0
@@ -2399,6 +2399,60 @@ static const CPUCaches epyc_genoa_cache_info = { }, }; +static const CPUCaches epyc_turin_cache_info = { + .l1d_cache = &(CPUCacheInfo ) { + .type =DATA_CACHE , + .level =1 , + .size =48 * KiB, + .line_size =64 , + .associativity =12 , + .partitions =1 , + .sets =64 , + .lines_per_tag =1 , + .self_init =1 , + .no_invd_sharing = true, + .share_level =CPU_TOPO_LEVEL_CORE , + }, + .l1i_cache = &(CPUCacheInfo ) { + .type =INSTRUCTION_CACHE , + .level =1 , + .size =32 * KiB, + .line_size =64 , + .associativity =8 , + .partitions =1 , + .sets =64 , + .lines_per_tag =1 , + .self_init =1 , + .no_invd_sharing = true, + .share_level =CPU_TOPO_LEVEL_CORE , + }, + .l2_cache = &(CPUCacheInfo ) { + .type =UNIFIED_CACHE , + .level =2 , + .size =1 * MiB, + .line_size =64 , + .associativity =16 , + .partitions =1 , + .sets =1024 , + .lines_per_tag =1 , + .share_level =CPU_TOPO_LEVEL_CORE , + }, + .l3_cache = &(CPUCacheInfo ) { + .type =UNIFIED_CACHE , + .level =3 , + .size =32 * MiB, + .line_size =64 , + .associativity =16 , + .partitions =1 , + .sets =32768 , + .lines_per_tag =1 , + .self_init = true, + .inclusive = true, + .complex_indexing = false, + .share_level =CPU_TOPO_LEVEL_DIE , + }, +}; +/* The following VMX features are not supported by KVM and are left out in the * CPU definitions: *
@@ -5317,6 +5371,83 @@ static const X86CPUDefinition builtin_x86_defs[] = { {/* end of list */ } } }, + { + .name = "EPYC-Turin", + .level = 0xd, + .vendor = CPUID_VENDOR_AMD, + .family = 26, + .model = 0, + .stepping = 0, + .features[FEAT_1_ECX ] = +CPUID_EXT_RDRAND |CPUID_EXT_F16C |CPUID_EXT_AVX | +CPUID_EXT_XSAVE |CPUID_EXT_AES |CPUID_EXT_POPCNT | +CPUID_EXT_MOVBE |CPUID_EXT_SSE42 |CPUID_EXT_SSE41 | +CPUID_EXT_PCID |CPUID_EXT_CX16 |CPUID_EXT_FMA | +CPUID_EXT_SSSE3 |CPUID_EXT_MONITOR |CPUID_EXT_PCLMULQDQ | + CPUID_EXT_SSE3, + .features[FEAT_1_EDX ] = +CPUID_SSE2 |CPUID_SSE |CPUID_FXSR |CPUID_MMX |CPUID_CLFLUSH | +CPUID_PSE36 |CPUID_PAT |CPUID_CMOV |CPUID_MCA |CPUID_PGE | +CPUID_MTRR |CPUID_SEP |CPUID_APIC |CPUID_CX8 |CPUID_MCE | +CPUID_PAE |CPUID_MSR |CPUID_TSC |CPUID_PSE |CPUID_DE | + CPUID_VME | CPUID_FP87, + .features[FEAT_6_EAX ] = + CPUID_6_EAX_ARAT, + .features[FEAT_7_0_EBX ] = +CPUID_7_0_EBX_FSGSBASE |CPUID_7_0_EBX_BMI1 |CPUID_7_0_EBX_AVX2 | +CPUID_7_0_EBX_SMEP |CPUID_7_0_EBX_BMI2 |CPUID_7_0_EBX_ERMS | +CPUID_7_0_EBX_INVPCID |CPUID_7_0_EBX_AVX512F | +CPUID_7_0_EBX_AVX512DQ |CPUID_7_0_EBX_RDSEED |CPUID_7_0_EBX_ADX | +CPUID_7_0_EBX_SMAP |CPUID_7_0_EBX_AVX512IFMA | +CPUID_7_0_EBX_CLFLUSHOPT |CPUID_7_0_EBX_CLWB | +CPUID_7_0_EBX_AVX512CD |CPUID_7_0_EBX_SHA_NI | + CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512VL, + .features[FEAT_7_0_ECX ] = +CPUID_7_0_ECX_AVX512_VBMI |CPUID_7_0_ECX_UMIP |CPUID_7_0_ECX_PKU | +CPUID_7_0_ECX_AVX512_VBMI2 |CPUID_7_0_ECX_GFNI | +CPUID_7_0_ECX_VAES |CPUID_7_0_ECX_VPCLMULQDQ | +CPUID_7_0_ECX_AVX512VNNI |CPUID_7_0_ECX_AVX512BITALG | +CPUID_7_0_ECX_AVX512_VPOPCNTDQ |CPUID_7_0_ECX_LA57 | +CPUID_7_0_ECX_RDPID |CPUID_7_0_ECX_MOVDIRI | + CPUID_7_0_ECX_MOVDIR64B, + .features[FEAT_7_0_EDX ] = + CPUID_7_0_EDX_FSRM | CPUID_7_0_EDX_AVX512_VP2INTERSECT, + .features[FEAT_7_1_EAX ] = + CPUID_7_1_EAX_AVX_VNNI | CPUID_7_1_EAX_AVX512_BF16, + .features[FEAT_8000_0001_ECX ] = +CPUID_EXT3_OSVW |CPUID_EXT3_3DNOWPREFETCH | +CPUID_EXT3_MISALIGNSSE |CPUID_EXT3_SSE4A |CPUID_EXT3_ABM | +CPUID_EXT3_CR8LEG |CPUID_EXT3_SVM |CPUID_EXT3_LAHF_LM | + CPUID_EXT3_TOPOEXT | CPUID_EXT3_PERFCORE, + .features[FEAT_8000_0001_EDX ] = +CPUID_EXT2_LM |CPUID_EXT2_RDTSCP |CPUID_EXT2_PDPE1GB | +CPUID_EXT2_FFXSR |CPUID_EXT2_MMXEXT |CPUID_EXT2_NX | + CPUID_EXT2_SYSCALL, + .features[FEAT_8000_0007_EBX ] = + CPUID_8000_0007_EBX_OVERFLOW_RECOV | CPUID_8000_0007_EBX_SUCCOR, + .features[FEAT_8000_0008_EBX ] = +CPUID_8000_0008_EBX_CLZERO |CPUID_8000_0008_EBX_XSAVEERPTR | +CPUID_8000_0008_EBX_WBNOINVD |CPUID_8000_0008_EBX_IBPB | +CPUID_8000_0008_EBX_IBRS |CPUID_8000_0008_EBX_STIBP | +CPUID_8000_0008_EBX_STIBP_ALWAYS_ON | + CPUID_8000_0008_EBX_AMD_SSBD | CPUID_8000_0008_EBX_AMD_PSFD, + .features[FEAT_8000_0021_EAX ] = + CPUID_8000_0021_EAX_No_NESTED_DATA_BP | +CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING | +CPUID_8000_0021_EAX_NULL_SEL_CLR_BASE | + CPUID_8000_0021_EAX_AUTO_IBRS, + .features[FEAT_8000_0022_EAX ] = + CPUID_8000_0022_EAX_PERFMON_V2, + .features[FEAT_XSAVE ] = +CPUID_XSAVE_XSAVEOPT |CPUID_XSAVE_XSAVEC | + CPUID_XSAVE_XGETBV1 | CPUID_XSAVE_XSAVES, + .features[FEAT_SVM ] = +CPUID_SVM_NPT |CPUID_SVM_NRIPSAVE |CPUID_SVM_VNMI | + CPUID_SVM_SVME_ADDR_CHK, + .xlevel = 0x80000022, + .model_id = "AMD EPYC-Turin Processor", + .cache_info = &epyc_turin_cache_info, + }, };/*
Signature · 1 line
2.34.1
Working v3 to add few more bits. Will post it sometime next week.
Quoted 13 lines · Babu Moger
This series adds the support for following features in qemu.
1. RAS feature bits (SUCCOR, McaOverflowRecov)
2. perfmon-v2
3. Update EPYC-Genoa to support perfmon-v2 and RAS bits
4. Add support for EPYC-Turin---
v2: Fixed couple of typos.
Added Reviewed-by tag from Zhao.
Rebased on top of6d00c6f98256("Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging")
Signature · 1 line
- Babu Moger