From 877f609b8c971e5a8bc59cda844bf9f860b395ad Mon Sep 17 00:00:00 2001 From: Tim Wiederhake <twiederh@redhat.com> Date: Wed, 24 May 2023 09:25:05 +0200 Subject: [PATCH] cpu_map: Add missing feature "flush-l1d" Signed-off-by: Tim Wiederhake <twiederh@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> --- src/cpu_map/x86_features.xml | 3 +++ tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml | 1 + 37 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index c0f6a3c6d0..e4056ef1a0 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -399,6 +399,9 @@ <feature name='stibp'> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/> </feature> + <feature name='flush-l1d'> + <cpuid eax_in='0x07' ecx_in='0x00' edx='0x10000000'/> + </feature> <feature name='arch-capabilities'> <alias name='arch_capabilities' source='linux'/> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml index dad3c90e6b..fab2d4d85c 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml @@ -1,7 +1,7 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x080041dc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000020' edx='0x40000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000020' edx='0x50000000'/> <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x80000000' edx='0x00000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml index a21d044bd4..c595f04e32 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml @@ -24,6 +24,7 @@ <feature policy='require' name='rdpid'/> <feature policy='require' name='md-clear'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> <feature policy='require' name='mbm_local'/> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml index 9712ecaf63..074342911a 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml @@ -47,6 +47,7 @@ <feature name='movdir64b'/> <feature name='md-clear'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='arch-capabilities'/> <feature name='core-capability'/> <feature name='ssbd'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml index e7c59cef1e..3b9ca13ad4 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml @@ -1,7 +1,7 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x10000000'/> <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml index f169458399..ff516a47c7 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml @@ -24,6 +24,7 @@ <feature policy='require' name='intel-pt'/> <feature policy='require' name='ospke'/> <feature policy='require' name='md-clear'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> <feature policy='require' name='mbm_local'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml index 6ac4ad55ef..8dfc62a5c1 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml @@ -26,6 +26,7 @@ <feature name='intel-pt'/> <feature name='ospke'/> <feature name='md-clear'/> + <feature name='flush-l1d'/> <feature name='xsaves'/> <feature name='mbm_total'/> <feature name='mbm_local'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml index 2b9aef78a2..7eece82aff 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml @@ -1,6 +1,6 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x00000000' edx='0x08000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x00000000' edx='0x18000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml index 5cf7778d55..b6e643cd08 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml @@ -22,6 +22,7 @@ <feature policy='require' name='clflushopt'/> <feature policy='require' name='intel-pt'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml index fa51fcdd0c..2a7493f941 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml @@ -24,6 +24,7 @@ <feature name='clflushopt'/> <feature name='intel-pt'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='ssbd'/> <feature name='xsaves'/> <feature name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml index 910f466b98..b6daaf2e50 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml @@ -1,6 +1,6 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c19c' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x00000000' edx='0x10000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml index 1d93d13aaa..5ed8ac37a3 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml @@ -22,6 +22,7 @@ <feature policy='require' name='intel-pt'/> <feature policy='require' name='md-clear'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml index 8e32872bf2..805a31411d 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml @@ -24,6 +24,7 @@ <feature name='intel-pt'/> <feature name='md-clear'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='ssbd'/> <feature name='xsaves'/> <feature name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml index bffdae01da..fd9b8435ab 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml @@ -1,6 +1,6 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x40000000' edx='0x08000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x40000000' edx='0x18000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml index 99874701de..6cedb93633 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml @@ -23,6 +23,7 @@ <feature policy='require' name='intel-pt'/> <feature policy='require' name='sgxlc'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml index 8e5cab50bb..0cc65b4322 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml @@ -25,6 +25,7 @@ <feature name='intel-pt'/> <feature name='sgxlc'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='ssbd'/> <feature name='xsaves'/> <feature name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml index 2769427a85..2f15f36fd1 100644 --- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml @@ -1,7 +1,7 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0x40400010' edx='0x00000010'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0x40400010' edx='0x10000010'/> <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml index 13147e354e..38d95680d3 100644 --- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml @@ -29,6 +29,7 @@ <feature policy='require' name='sgxlc'/> <feature policy='require' name='fsrm'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml index aa2514eb60..ccb74f41ef 100644 --- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml @@ -31,6 +31,7 @@ <feature name='sgxlc'/> <feature name='fsrm'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='arch-capabilities'/> <feature name='xsaves'/> <feature name='mbm_total'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml index 9e83f4c534..fb9a4988ad 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml @@ -1,7 +1,7 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x00000000' edx='0x10000000'/> <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml index 7555bc075e..ea1c79c0df 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml @@ -23,6 +23,7 @@ <feature policy='require' name='intel-pt'/> <feature policy='require' name='md-clear'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml index 1d257a0828..d7a7f30b9e 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml @@ -25,6 +25,7 @@ <feature name='intel-pt'/> <feature name='md-clear'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='ssbd'/> <feature name='xsaves'/> <feature name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml index d9538892eb..0b2719826b 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml @@ -1,5 +1,6 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x10000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml index e507642df1..db1efe0549 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml @@ -22,6 +22,7 @@ <feature policy='require' name='osxsave'/> <feature policy='require' name='arat'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaveopt'/> <feature policy='require' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml index 628900fd2c..6f2de0ca5b 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml @@ -24,6 +24,7 @@ <feature name='osxsave'/> <feature name='arat'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='ssbd'/> <feature name='xsaveopt'/> <feature name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml index 49737fbdb1..d69b7df095 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml @@ -1,5 +1,6 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0004c1bc' edx='0xb0600000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x10000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml index fc3e95253b..fbc05fe0d8 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml @@ -19,6 +19,7 @@ <feature policy='require' name='dca'/> <feature policy='require' name='x2apic'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='rdtscp'/> <feature policy='require' name='invtsc'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml index ee526e7119..15fea29e06 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml @@ -21,6 +21,7 @@ <feature name='dca'/> <feature name='x2apic'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='ssbd'/> <feature name='rdtscp'/> <feature name='invtsc'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml index e7c59cef1e..3b9ca13ad4 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml @@ -1,7 +1,7 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x10000000'/> <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml index c21cb1e600..f4f0199607 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml @@ -26,6 +26,7 @@ <feature policy='require' name='ospke'/> <feature policy='require' name='md-clear'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml index fba4ccf506..325c2fe26f 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml @@ -28,6 +28,7 @@ <feature name='ospke'/> <feature name='md-clear'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='ssbd'/> <feature name='xsaves'/> <feature name='mbm_total'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml index 7d719a8b52..8e4e478cf1 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml @@ -1,7 +1,7 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x28000400'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x38000400'/> <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> <msr index='0x10a' edx='0x00000000' eax='0x00000020'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml index 988fb1dbdc..8fd1611842 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml @@ -25,6 +25,7 @@ <feature policy='require' name='ospke'/> <feature policy='require' name='md-clear'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml index 96effe5684..7055c72112 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml @@ -27,6 +27,7 @@ <feature name='ospke'/> <feature name='md-clear'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='arch-capabilities'/> <feature name='xsaves'/> <feature name='mbm_total'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml index e7c59cef1e..3b9ca13ad4 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml @@ -1,7 +1,7 @@ <!-- Features disabled by QEMU --> <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x10000000'/> <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml index faabdde8a0..88c2d84d65 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml @@ -25,6 +25,7 @@ <feature policy='require' name='ospke'/> <feature policy='require' name='md-clear'/> <feature policy='require' name='stibp'/> + <feature policy='require' name='flush-l1d'/> <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml index ea51fc40a1..5e59520919 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml @@ -27,6 +27,7 @@ <feature name='ospke'/> <feature name='md-clear'/> <feature name='stibp'/> + <feature name='flush-l1d'/> <feature name='arch-capabilities'/> <feature name='xsaves'/> <feature name='mbm_total'/>