modify CPU model info
v2 cover modify CPU model info
Add the missing VMX features in Skylake-Server, Cascadelake-Server and Icelake-Server CPU models. In Icelake-Server CPU model, it also lacks sha_ni, avx512ifma, rdpid and fsrm. The model numbers of Icelake-Client and Icelake-Server need to be fixed.
Changes in v2:
- add missing features as a new version of CPU model
- add the support of FSRM
Chenyi Qiang (4):
target/i386: add missing vmx features for several CPU models target/i386: add fast short REP MOV support
target/i386: add the missing features for Icelake-Server CPU model target/i386: modify Icelake-Client and Icelake-Server CPU model number
target/i386/cpu.c | 22 ++++++++++++++++++---- target/i386/cpu.h | 2 ++ 2 files changed, 20 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/4 target/i386: add missing vmx features for several CPU models
Add some missing VMX features in Skylake-Server, Cascadelake-Server and Icelake-Server CPU models based on the output of Paolo's script.
--- target/i386/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
target/i386/cpu.c +5 -1
@@ -3059,6 +3059,7 @@ static X86CPUDefinition builtin_x86_defs[] = {VMX_SECONDARY_EXEC_RDRAND_EXITING |VMX_SECONDARY_EXEC_ENABLE_INVPCID |VMX_SECONDARY_EXEC_ENABLE_VMFUNC |VMX_SECONDARY_EXEC_SHADOW_VMCS | VMX_SECONDARY_EXEC_RDSEED_EXITING | VMX_SECONDARY_EXEC_ENABLE_PML, + .features[FEAT_VMX_VMFUNC] = MSR_VMX_VMFUNC_EPT_SWITCHING, .xlevel = 0x80000008, .model_id = "Intel Xeon Processor (Skylake)", .versions = (X86CPUVersionDefinition []) {
@@ -3187,6 +3188,7 @@ static X86CPUDefinition builtin_x86_defs[] = {VMX_SECONDARY_EXEC_RDRAND_EXITING |VMX_SECONDARY_EXEC_ENABLE_INVPCID |VMX_SECONDARY_EXEC_ENABLE_VMFUNC |VMX_SECONDARY_EXEC_SHADOW_VMCS | VMX_SECONDARY_EXEC_RDSEED_EXITING | VMX_SECONDARY_EXEC_ENABLE_PML, + .features[FEAT_VMX_VMFUNC] = MSR_VMX_VMFUNC_EPT_SWITCHING, .xlevel = 0x80000008, .model_id = "Intel Xeon Processor (Cascadelake)", .versions = (X86CPUVersionDefinition []) {
@@ -3534,7 +3536,9 @@ static X86CPUDefinition builtin_x86_defs[] = {VMX_SECONDARY_EXEC_APIC_REGISTER_VIRT |VMX_SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |VMX_SECONDARY_EXEC_RDRAND_EXITING |VMX_SECONDARY_EXEC_ENABLE_INVPCID | - VMX_SECONDARY_EXEC_ENABLE_VMFUNC | VMX_SECONDARY_EXEC_SHADOW_VMCS, +VMX_SECONDARY_EXEC_ENABLE_VMFUNC |VMX_SECONDARY_EXEC_SHADOW_VMCS | + VMX_SECONDARY_EXEC_RDSEED_EXITING | VMX_SECONDARY_EXEC_ENABLE_PML, + .features[FEAT_VMX_VMFUNC] = MSR_VMX_VMFUNC_EPT_SWITCHING, .xlevel = 0x80000008, .model_id = "Intel Xeon Processor (Icelake)", .versions = (X86CPUVersionDefinition []) {
Signature · 1 line
2.17.1
PATCH v2 2/4 target/i386: add fast short REP MOV support
In reply to Chenyi QiangFor CPUs support fast short REP MOV[CPUID.(EAX=7,ECX=0):EDX(bit4)], e.g Icelake and Tigerlake, expose it to the guest VM.
--- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
target/i386/cpu.c +1 -1
@@ -1077,7 +1077,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .type = CPUID_FEATURE_WORD, .feat_names = {NULL ,NULL ,"avx512-4vnniw" ,"avx512-4fmaps" , -NULL ,NULL ,NULL ,NULL , +"fsrm" ,NULL ,NULL ,NULL ,NULL ,NULL ,"md-clear" ,NULL ,NULL ,NULL ,NULL ,NULL , NULL, NULL, NULL /* pconfig */, NULL,
target/i386/cpu.h +2 -0
@@ -770,6 +770,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) +/* Fast Short Rep Mov */ +#define CPUID_7_0_EDX_FSRM (1U << 4)/* Speculation Control */ #define CPUID_7_0_EDX_SPEC_CTRL (1U << 26)/* Single Thread Indirect Branch Predictors */
Signature · 1 line
2.17.1
PATCH v2 3/4 target/i386: add the missing features for Icelake-Server CPU model
In reply to Chenyi QiangAdd the SHA_NI and AVX512IFMA feature bits in FEAT_7_0_EBX, RDPID feature bit in FEAT_7_0_ECX and FSRM feature bit in FEAT_7_0_EDX.
--- target/i386/cpu.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
target/i386/cpu.c +10 -0
@@ -3552,6 +3552,16 @@ static X86CPUDefinition builtin_x86_defs[] = { {/* end of list */ } }, }, + { + .version = 3, + .props = (PropValue[]) { + { "sha-ni", "on" }, + { "avx512ifma", "on" }, + { "rdpid", "on" }, + { "fsrm", "on" }, + { /* end of list */ } + }, + }, {/* end of list */ } } },
Signature · 1 line
2.17.1
Re: [PATCH v2 3/4] target/i386: add the missing features for Icelake-Server CPU model
Quoted 13 lines · Chenyi Qiang
Add the
SHA_NIand AVX512IFMA feature bits inFEAT_7_0_EBX, RDPID feature bit inFEAT_7_0_ECXand FSRM feature bit inFEAT_7_0_EDX.Signed-off-by Chenyi Qiang <[email protected]>--- target/i386/cpu.c | 10 ++++++++++ 1 file changed, 10 insertions(+)target/i386/cpu.c +0
-0
target/i386/cpu.c static X86CPUDefinition builtin_x86_defs[] = { · line 3556
Quoted 5 lines
target/i386/cpu.c +2
-0@@ -3552,6 +3552,16 @@ static X86CPUDefinition builtin_x86_defs[] = { {/* end of list */ } }, }, + { + .version = 3,
Maybe you need to make it as version = 4, since 3 is used to add ARCH_CAPABILITIES bits and the Patch is queued:
Quoted 12 lines
target/i386/cpu.c +8
-0+ .props = (PropValue[]) { + { "sha-ni", "on" }, + { "avx512ifma", "on" }, + { "rdpid", "on" }, + { "fsrm", "on" }, + { /* end of list */ } + }, + }, {/* end of list */ } } },
Re: [PATCH v2 3/4] target/i386: add the missing features for Icelake-Server CPU model
In reply to Chenyi QiangQuoted 17 lines · Chenyi Qiang
Add the
SHA_NIand AVX512IFMA feature bits inFEAT_7_0_EBX, RDPID feature bit inFEAT_7_0_ECXand FSRM feature bit inFEAT_7_0_EDX.Signed-off-by Chenyi Qiang <[email protected]>--- target/i386/cpu.c | 10 ++++++++++ 1 file changed, 10 insertions(+)target/i386/cpu.c +1
-0@@ -3552,6 +3552,16 @@ static X86CPUDefinition builtin_x86_defs[] = { {/* end of list */ } }, }, + {
target/i386/cpu.c static X86CPUDefinition builtin_x86_defs[] = { · line 3565
Quoted 10 lines
target/i386/cpu.c +9
-0+ .version = 3, + .props = (PropValue[]) { + { "sha-ni", "on" }, + { "avx512ifma", "on" }, + { "rdpid", "on" }, + { "fsrm", "on" }, + { /* end of list */ } + }, + }, {/* end of list */ }
I think these 4 new CPUIDs addition is to catch up latest
https://software.intel.com/sites/default/files/managed/c5/15/architecture-instruction-set-extensions-programming-reference.pdf
on updates.
This is actually fix to previous v1 definitions.
So my 2 cents:
1. add 1 more version: include v2's hle and rtm properties off
2. make the hle-rtm-disable inclusion version or this v3 default version of icelake.
Anyway, v1 is not suitable for default choice.
Then questions comes to how to make non-v1 default. Perhaps:
target/i386/cpu.c +0 -0
@@ -5453,7 +5453,7 @@ static void
x86_register_cpudef_types(X86CPUDefinition *def)
/* Unversioned model: */
m = g_new0(X86CPUModel, 1);
m->cpudef = def;
- m->version = CPU_VERSION_AUTO;
+ m->version = CPU_VERSION_LATEST;
m->is_alias = true;
x86_register_cpu_model_type(def->name, m);I think for builtin_x86_defs[] definitions, latest version is usually preferable/suitable.
How would Paolo, Eduardo like it?
Quoted 2 lines
target/i386/cpu.c +0
-0} },
PATCH v2 4/4 target/i386: modify Icelake-Client and Icelake-Server CPU model number
In reply to Chenyi QiangAccording to the Intel Icelake family list, Icelake-Client uses model number 125(0x7D) and Icelake-Server uses model number 106(0x6A).
--- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/i386/cpu.c +2 -2
@@ -3328,7 +3328,7 @@ static X86CPUDefinition builtin_x86_defs[] = { .level = 0xd, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 126, + .model = 125, .stepping = 0, .features[FEAT_1_EDX ] = CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
@@ -3441,7 +3441,7 @@ static X86CPUDefinition builtin_x86_defs[] = { .level = 0xd, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 134, + .model = 106, .stepping = 0, .features[FEAT_1_EDX ] = CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
Signature · 1 line
2.17.1
Ping for comments.
Hi Paolo and Eduardo,
ARCH_CAPABILITIES has been added into Icelake-Server CPU model. What your opinion of the missing feature bits in this patch set?
Thanks
Chenyi
Quoted 19 lines · Chenyi Qiang
Add the missing VMX features in Skylake-Server, Cascadelake-Server and Icelake-Server CPU models. In Icelake-Server CPU model, it also lacks
sha_ni, avx512ifma, rdpid and fsrm. The model numbers of Icelake-Client and Icelake-Server need to be fixed.Changes in v2:
- add missing features as a new version of CPU model
- add the support of FSRMChenyi Qiang (4):
target/i386: add missing vmx features for several CPU models target/i386: add fast short REP MOV support
target/i386: add the missing features for Icelake-Server CPU model target/i386: modify Icelake-Client and Icelake-Server CPU model numbertarget/i386/cpu.c | 22 ++++++++++++++++++---- target/i386/cpu.h | 2 ++ 2 files changed, 20 insertions(+), 4 deletions(-)