QEMU commit v3.1.0-4-g0e89165829 KVM patch: https://lore.kernel.org/lkml/20181205191956.31480-1-ehabkost@redhat.com/ Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 3 +++ tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml | 1 + 13 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index f835b02b02..59236456d6 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -323,6 +323,9 @@ <feature name='spec-ctrl'> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/> </feature> + <feature name='stibp'> + <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/> + </feature> <feature name='ssbd'> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/> </feature> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml index e033bb141f..5c9cfa9bd6 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-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='0x00000000' ecx='0x00000000' edx='0x04000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0c000000'/> <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-5600U-ibrs-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml index 4fa4770208..5d3093cec1 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml @@ -23,6 +23,7 @@ <feature policy='require' name='arat'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='intel-pt'/> + <feature policy='require' name='stibp'/> <feature policy='require' name='xsaveopt'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml index 25690c099c..a534d2dec5 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml @@ -24,6 +24,7 @@ <feature name='arat'/> <feature name='tsc_adjust'/> <feature name='intel-pt'/> + <feature name='stibp'/> <feature name='xsaveopt'/> <feature name='pdpe1gb'/> <feature name='abm'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml index aacc7a2b14..ec299652f7 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-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='0x0804c1fc' edx='0xb0600000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x08000000'/> <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-2609-v3-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml index a66c7a5644..d8aaaad29d 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml @@ -24,6 +24,7 @@ <feature policy='require' name='arat'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='cmt'/> + <feature policy='require' name='stibp'/> <feature policy='require' name='xsaveopt'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml index 624d71db20..9bac4b4648 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml @@ -25,6 +25,7 @@ <feature name='arat'/> <feature name='tsc_adjust'/> <feature name='cmt'/> + <feature name='stibp'/> <feature name='xsaveopt'/> <feature name='pdpe1gb'/> <feature name='abm'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml index d904808cec..85369d755c 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-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='0x00001000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x08000000'/> <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-E5-2623-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml index 7b93df3f1b..7718d7ca59 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml @@ -21,6 +21,7 @@ <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='cmt'/> <feature policy='require' name='intel-pt'/> + <feature policy='require' name='stibp'/> <feature policy='require' name='mbm_total'/> <feature policy='require' name='mbm_local'/> <feature policy='require' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml index 5078420c7a..43a0b93ab4 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml @@ -26,6 +26,7 @@ <feature name='tsc_adjust'/> <feature name='cmt'/> <feature name='intel-pt'/> + <feature name='stibp'/> <feature name='xsaveopt'/> <feature name='mbm_total'/> <feature name='mbm_local'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml index b5c70a9dc4..a5b85a15c2 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-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='0x00001000' ecx='0x00000008' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000008' edx='0x08000000'/> <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> <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'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml index 480127f341..8f014f6e28 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml @@ -23,6 +23,7 @@ <feature policy='require' name='clflushopt'/> <feature policy='require' name='intel-pt'/> <feature policy='require' name='pku'/> + <feature policy='require' name='stibp'/> <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-Xeon-Gold-5115-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml index 680b10acef..9de76fd640 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml @@ -24,6 +24,7 @@ <feature name='clflushopt'/> <feature name='intel-pt'/> <feature name='pku'/> + <feature name='stibp'/> <feature name='xsaves'/> <feature name='mbm_total'/> <feature name='mbm_local'/> -- 2.20.1