[PATCH 03/14] cpu_map: Add gmet and vmx-mbec features for nested virtualization

From: Jiri Denemark <jdenemar@redhat.com> QEMU commits 746a823a17f25393cc8c0cd1257f6dcef757bc09 and bfff4b2ae5452463ab8c14b4a8a020288b5ff5d8 Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu_map/x86_features.xml | 6 ++++++ .../cputestdata/x86_64-cpuid-EPYC-7502-32-Core-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 + .../cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml | 1 + .../cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml | 1 + ...64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-disabled.xml | 2 +- ...86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-guest.xml | 1 + ...x86_64-cpuid-Ryzen-5-5500U-with-Radeon-Graphics-host.xml | 1 + .../x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml | 2 +- .../x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 1 + .../cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 1 + .../x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml | 2 +- .../x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml | 1 + .../cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml | 1 + 19 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 2a2ac57f90..05912ba3af 100644 --- 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 5ff0ff0f33..0ad406e30a 100644 --- 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 ffd6093d41..5edeb95330 100644 --- 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 14e0861f0d..023ce6541d 100644 --- 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 6caad4fbf5..b6507fe6b7 100644 --- 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 9c3582145e..42d9e148f7 100644 --- 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 8701cd41ba..db3d78dd5b 100644 --- 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 a5f3f1ba1d..0f9c7000b9 100644 --- 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 1ef9a4a365..07b1e59bc2 100644 --- 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 973dbd601b..70307f4855 100644 --- 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 e05ce9a0ef..65cf589253 100644 --- 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 ffd6093d41..5edeb95330 100644 --- 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 05254a62dd..df54b14185 100644 --- 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 58e2894916..e05b2a6577 100644 --- 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 6dfad0096e..ac7df2bab4 100644 --- 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 4775f657d1..52ba6f9701 100644 --- 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 952c58d796..60880acf30 100644 --- 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 c685a4d34b..f405fed995 100644 --- 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 a33ea91ff9..48e5e03f03 100644 --- 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'/> -- 2.54.0