cpu_map: Add gmet and vmx-mbec features for nested virtualization

QEMU commits 746a823a17f25393cc8c0cd1257f6dcef757bc09 and
bfff4b2ae5452463ab8c14b4a8a020288b5ff5d8

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 2a2ac57f90763501942ef59133971d73d9d70b10..05912ba3af95fb7205a8ac0dbee73a94ba66ca26 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -792,6 +792,9 @@
   <feature name='vgif'>
     <cpuid eax_in='0x8000000a' edx='0x00010000'/>
   </feature>
+  <feature name='gmet'>
+    <cpuid eax_in='0x8000000a' edx='0x00020000'/>
+  </feature>
   <feature name='vnmi'>
     <cpuid eax_in='0x8000000a' edx='0x02000000'/>
   </feature>
@@ -1038,6 +1041,9 @@
   <feature name='vmx-xsaves'>
     <msr index='0x0000048b' edx='0x00100000' eax='0x00000000'/>
   </feature>
+  <feature name='vmx-mbec'>
+    <msr index='0x0000048b' edx='0x00400000' eax='0x00000000'/>
+  </feature>
   <feature name='vmx-tsc-scaling'>
     <msr index='0x0000048b' edx='0x02000000' eax='0x00000000'/>
   </feature>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml
index 5ff0ff0f3339a5a87fc71d060409e0e5a67c73bd..0ad406e30a7cf7fa4c74da95641152c30669952e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml
@@ -6,5 +6,5 @@
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000003' ecx='0x00000000' edx='0x00000100'/>
   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x00004000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0001b4f6'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0003b4f6'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
index ffd6093d411e4ad73e61ea7c00259a05a52862e0..5edeb953300747c0d36fe8d9f95333e05c70fc95 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
@@ -32,6 +32,7 @@
   <feature policy='require' name='avic'/>
   <feature policy='require' name='v-vmsave-vmload'/>
   <feature policy='require' name='vgif'/>
+  <feature policy='require' name='gmet'/>
   <feature policy='require' name='rdctl-no'/>
   <feature policy='require' name='skip-l1dfl-vmentry'/>
   <feature policy='require' name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
index 14e0861f0deffb22cf7e7527e2a2c2e4162a4128..023ce6541d5c9ab4763621d3152395f62a149b97 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
@@ -22,6 +22,7 @@
   <feature name='svm-lock'/>
   <feature name='decodeassists'/>
   <feature name='avic'/>
+  <feature name='gmet'/>
   <feature name='rdctl-no'/>
   <feature name='skip-l1dfl-vmentry'/>
   <feature name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml
index 6caad4fbf5c4cd4c82303aa393d58ee94a9bc26f..b6507fe6b71befa4e93c2cb351e02c18df6f06e6 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml
@@ -6,6 +6,6 @@
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000003' ecx='0x00000000' edx='0x00000100'/>
   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x10024000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x100194f6'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x100394f6'/>
   <cpuid eax_in='0x80000021' ecx_in='0x00' eax='0x00000045' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml
index 9c3582145e0ad9a52c8e4ee37dcc1bb4f49e659f..42d9e148f71f569d0ec5fd60b37b5a2b84ecc79b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml
@@ -34,6 +34,7 @@
   <feature policy='require' name='pfthreshold'/>
   <feature policy='require' name='v-vmsave-vmload'/>
   <feature policy='require' name='vgif'/>
+  <feature policy='require' name='gmet'/>
   <feature policy='require' name='no-nested-data-bp'/>
   <feature policy='require' name='lfence-always-serializing'/>
   <feature policy='require' name='null-sel-clr-base'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml
index 8701cd41ba8c42090645cab50897d0ffc7e934ce..db3d78dd5b5d58874ddaa62ec94cd25296961498 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml
@@ -22,6 +22,7 @@
   <feature name='invtsc'/>
   <feature name='svm-lock'/>
   <feature name='decodeassists'/>
+  <feature name='gmet'/>
   <feature name='rdctl-no'/>
   <feature name='skip-l1dfl-vmentry'/>
   <feature name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml
index a5f3f1ba1dc5cf3a523a4682ac58ab53db73fafe..0f9c7000b9f222690c9419d6a40f308afc99a9d6 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml
@@ -5,6 +5,6 @@
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00002084'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00022084'/>
   <cpuid eax_in='0x80000021' ecx_in='0x00' eax='0x00000002' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml
index 1ef9a4a365628bba31ee023ead4398fc01b58bcb..07b1e59bc215664d72de37cb54dadca411871726 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml
@@ -32,6 +32,7 @@
   <feature policy='require' name='avic'/>
   <feature policy='require' name='v-vmsave-vmload'/>
   <feature policy='require' name='vgif'/>
+  <feature policy='require' name='gmet'/>
   <feature policy='require' name='fs-gs-base-ns'/>
   <feature policy='require' name='perfmon-v2'/>
   <feature policy='require' name='rdctl-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml
index 973dbd601b4d573289ed236f851c3e17f17fb85c..70307f485586f51dc4c04c8753fc7edf466e6881 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml
@@ -24,6 +24,7 @@
   <feature name='svm-lock'/>
   <feature name='decodeassists'/>
   <feature name='avic'/>
+  <feature name='gmet'/>
   <feature name='rdctl-no'/>
   <feature name='skip-l1dfl-vmentry'/>
   <feature name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-disabled.xml
index e05ce9a0ef144e6a221b1838c4f98c10321c3286..65cf589253ef42f0642e8c69193f6127d35d8d98 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-disabled.xml
@@ -5,5 +5,5 @@
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000003' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0001b4f6'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0003b4f6'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-guest.xml
index ffd6093d411e4ad73e61ea7c00259a05a52862e0..5edeb953300747c0d36fe8d9f95333e05c70fc95 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-guest.xml
@@ -32,6 +32,7 @@
   <feature policy='require' name='avic'/>
   <feature policy='require' name='v-vmsave-vmload'/>
   <feature policy='require' name='vgif'/>
+  <feature policy='require' name='gmet'/>
   <feature policy='require' name='rdctl-no'/>
   <feature policy='require' name='skip-l1dfl-vmentry'/>
   <feature policy='require' name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-host.xml
index 05254a62dd3d45ae06363605f83e6a6ca2018d96..df54b1418541e3c38d3bc518a2db397d155df896 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-host.xml
@@ -22,6 +22,7 @@
   <feature name='svm-lock'/>
   <feature name='decodeassists'/>
   <feature name='avic'/>
+  <feature name='gmet'/>
   <feature name='rdctl-no'/>
   <feature name='skip-l1dfl-vmentry'/>
   <feature name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
index 58e289491660d26152839e8aa51a2c4dcd9cc2af..e05b2a65775a41e106a7272a54844e6b020dab37 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
@@ -6,5 +6,5 @@
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000003' ecx='0x00000000' edx='0x00000100'/>
   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x00008000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0001b4f6'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0003b4f6'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index 6dfad0096e58f5603e4ca0997ae4a94411307103..ac7df2bab487495c5bc85d73935bc57a364689f2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -31,6 +31,7 @@
   <feature policy='require' name='avic'/>
   <feature policy='require' name='v-vmsave-vmload'/>
   <feature policy='require' name='vgif'/>
+  <feature policy='require' name='gmet'/>
   <feature policy='require' name='rdctl-no'/>
   <feature policy='require' name='skip-l1dfl-vmentry'/>
   <feature policy='require' name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index 4775f657d172bc90f33f478dcef6dcbcf4327b76..52ba6f97015752024f908336e1362d81f0576ae5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -27,6 +27,7 @@
   <feature name='svm-lock'/>
   <feature name='decodeassists'/>
   <feature name='avic'/>
+  <feature name='gmet'/>
   <feature name='rdctl-no'/>
   <feature name='skip-l1dfl-vmentry'/>
   <feature name='mds-no'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml
index 952c58d796af9c88a4472641e2ed0e98d9590dc7..60880acf30b881ebb178b2e4c745f07d5da951bd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml
@@ -5,7 +5,7 @@
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00002084'/>
+  <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00022084'/>
   <cpuid eax_in='0x80000021' ecx_in='0x00' eax='0x01000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
   <msr index='0x10a' edx='0x40000000' eax='0x0c000069'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml
index c685a4d34b2fe25d710a316576744bffad04b169..f405fed9955df3400ce596d0926df45605bcdce1 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml
@@ -23,6 +23,7 @@
   <feature policy='require' name='svm-lock'/>
   <feature policy='require' name='decodeassists'/>
   <feature policy='require' name='avic'/>
+  <feature policy='require' name='gmet'/>
   <feature policy='require' name='eraps'/>
   <feature policy='require' name='rdctl-no'/>
   <feature policy='require' name='skip-l1dfl-vmentry'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml
index a33ea91ff998a57ea055cd9b369be11e80bf729c..48e5e03f037b84f26a96407094975d4d172ca7ca 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml
@@ -51,6 +51,7 @@
   <feature name='svm-lock'/>
   <feature name='decodeassists'/>
   <feature name='avic'/>
+  <feature name='gmet'/>
   <feature name='vnmi'/>
   <feature name='svme-addr-chk'/>
   <feature name='no-nested-data-bp'/>