Skip to contentSkip to conversation

modify CPU model info

PATCH Superseded Chenyi Qiang 3 participants 10 messages May 20, 2020 – Jun 11, 2020

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v4 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 lacks sha_ni, avx512ifma, rdpid and fsrm. The model number of Icelake-Server also needs to be fixed.
Remove the Icelake-Client CPU model due to no Icelake Desktop products in the market.

Changes in v4:
- remove the Icelake-Client CPU model

Changes in v3:
- change the missing features of Icelake-Server from v3 to v4

Changes in v2:
- add missing features as a new version of CPU model
- add the support of FSRM
- add New CPUID of FSRM and RDPID in Icelake-Server CPU model

Chenyi Qiang (5):
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-Server CPU model number target/i386: remove Icelake-Client CPU model

 hw/i386/pc.c      |   1 -
 target/i386/cpu.c | 133 ++++++----------------------------------------
 target/i386/cpu.h |   2 +
 3 files changed, 19 insertions(+), 117 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v4 1/5 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
index 7a4a8e3847..2b653a0161 100644
@@ -2982,6 +2982,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[]) {
@@ -3110,6 +3111,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[]) {
@@ -3457,7 +3459,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
#2 lore raw

PATCH v4 2/5 target/i386: add fast short REP MOV support

In reply to Chenyi Qiang

For 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
index 2b653a0161..52f5aa5418 100644
@@ -984,7 +984,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
index 408392dbf6..142256017b 100644
@@ -772,6 +772,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
#3 lore raw

PATCH v4 3/5 target/i386: add the missing features for Icelake-Server CPU model

In reply to Chenyi Qiang

Add the missing features(sha-ni, avx512ifma, rdpid, fsrm) in the Icelake-Server CPU model.

---
 target/i386/cpu.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
target/i386/cpu.c +10 -0
index 52f5aa5418..b4697b0148 100644
@@ -3488,6 +3488,16 @@ static X86CPUDefinition builtin_x86_defs[] = {
                     { /* end of list */ }
                 },
             },
+            {
+                .version = 4,
+                .props = (PropValue[]) {
+                    { "sha-ni", "on" },
+                    { "avx512ifma", "on" },
+                    { "rdpid", "on" },
+                    { "fsrm", "on" },
+                    { /* end of list */ }
+                },
+            },
             { /* end of list */ }
         }
     },
Signature · 1 line
2.17.1
#4 lore raw

PATCH v4 4/5 target/i386: modify Icelake-Server CPU model number

In reply to Chenyi Qiang

According to the Intel Icelake family list, Icelake-Server uses model number 106(0x6A).

---
 target/i386/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/i386/cpu.c +1 -1
index b4697b0148..d59698710e 100644
@@ -3364,7 +3364,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
#5 lore raw

PATCH v4 5/5 target/i386: remove Icelake-Client CPU model

In reply to Chenyi Qiang

There are no Icelake Desktop products in the market. Remove the Icelake-Client CPU model.

---
 hw/i386/pc.c      |   1 -
 target/i386/cpu.c | 113 ----------------------------------------------
 2 files changed, 114 deletions(-)
hw/i386/pc.c +0 -1
index 2128f3d6fe..ecc5ab022b 100644
@@ -127,7 +127,6 @@ GlobalProperty pc_compat_3_1[] = {
     { "Skylake-Server" "-" TYPE_X86_CPU,      "mpx", "on" },
     { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },
     { "Cascadelake-Server" "-" TYPE_X86_CPU,  "mpx", "on" },
-    { "Icelake-Client" "-" TYPE_X86_CPU,      "mpx", "on" },
     { "Icelake-Server" "-" TYPE_X86_CPU,      "mpx", "on" },
     { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" },
     { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" },
target/i386/cpu.c +0 -113

119 lines not on this page · raw message

Signature · 1 line
2.17.1
#6 lore raw

Re: [PATCH v4 5/5] target/i386: remove Icelake-Client CPU model

Quoted 2 lines · Chenyi Qiang

There are no Icelake Desktop products in the market. Remove the Icelake-Client CPU model.

QEMU has been shipping this CPU model for 2 years now. Regardless of what CPUs Intel are selling, it is possible for users to be running VMs with Icelake-Client CPU if their host satisfies the listed features. So I don't think it is valid to remove this.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#7 lore raw

Re: [PATCH v4 5/5] target/i386: remove Icelake-Client CPU model

Quoted 9 lines · Daniel P. Berrangé
Quoted 2 lines · Chenyi Qiang

There are no Icelake Desktop products in the market. Remove the Icelake-Client CPU model.

QEMU has been shipping this CPU model for 2 years now. Regardless of what CPUs Intel are selling, it is possible for users to be running VMs with Icelake-Client CPU if their host satisfies the listed features. So I don't think it is valid to remove this.

This 'Icelake-Client' actually doesn't exist. How do we define its feature list? and who will be using it? If any special feature tailor requirement, it can be simply achieved by '-cpu Icelake,+/-' features, this is the correct way.

I think we should remove it. When we realize something's not correct, we should fix it ASAP. Leaving it there will only cause more serious issue in the future.

Quoted 2 lines

Regards,
Daniel

#8 lore raw

Re: [PATCH v4 5/5] target/i386: remove Icelake-Client CPU model

Quoted 10 lines · Robert Hoo
Quoted 9 lines · Daniel P. Berrangé
Quoted 2 lines · Chenyi Qiang

There are no Icelake Desktop products in the market. Remove the Icelake-Client CPU model.

QEMU has been shipping this CPU model for 2 years now. Regardless of what CPUs Intel are selling, it is possible for users to be running VMs with Icelake-Client CPU if their host satisfies the listed features. So I don't think it is valid to remove this.

Quoted 4 lines

This 'Icelake-Client' actually doesn't exist. How do we define its feature list? and who will be using it? If any special feature tailor requirement, it can be simply achieved by '-cpu Icelake,+/-' features, this is the correct way.

Well its feature list is defined by what exists in QEMU code right now. Presumably was based off some silicon that did exist in Intel at some point, or it would not have been added to QEMU in the first place ?

Changing guests to use "-cpu Icelake-Server,+/-" would be a guest ABI change because of the different model number IIUC

Quoted 3 lines

I think we should remove it. When we realize something's not correct, we should fix it ASAP. Leaving it there will only cause more serious issue in the future.

We have versioned CPU models so that we can fix mistakes in previously defined CPU model features, without causing breakage for anything that is using the previous incorrectly defined model. We can't version the deletion of a CPU model though. I'm not seeing the serious harm that's caused by the Icelake-Client CPU model existing though, and deleting it will definitely cause harm to the config of anything that currently happens to use it.

Maybe Icelake-Client could be turned into a deprecated alias for a version of Icelake-Server that has the cutdown feature list ?

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#9 lore raw
In reply to Chenyi Qiang

Ping for comments.
Ignore the last patch("remove Icelake-Client CPU model"). Robert is working on the CPU model deprecation API in
https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg03109.html

Quoted 30 lines · Chenyi Qiang

Add the missing VMX features in Skylake-Server, Cascadelake-Server and Icelake-Server CPU models. In Icelake-Server CPU model, it lacks sha_ni, avx512ifma, rdpid and fsrm. The model number of Icelake-Server also needs to be fixed.
Remove the Icelake-Client CPU model due to no Icelake Desktop products in the market.

Changes in v4:
- remove the Icelake-Client CPU model

Changes in v3:
- change the missing features of Icelake-Server from v3 to v4

Changes in v2:
- add missing features as a new version of CPU model
- add the support of FSRM
- add New CPUID of FSRM and RDPID in Icelake-Server CPU model

Chenyi Qiang (5):
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-Server CPU model number target/i386: remove Icelake-Client CPU model

  hw/i386/pc.c      |   1 -
  target/i386/cpu.c | 133 ++++++----------------------------------------
  target/i386/cpu.h |   2 +
  3 files changed, 19 insertions(+), 117 deletions(-)