[libvirt] [PATCH 16/17] cpu: Add Skylake-Server-IBRS CPU model

This is a variant of Skylake-Server with indirect branch prediction protection. The only difference between Skylake-Server and Skylake-Server-IBRS is the added "spec-ctrl" feature. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu/cpu_map.xml | 76 ++++++++++++++++++++++ .../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 3 +- .../x86_64-cpuid-Xeon-Gold-5115-host.xml | 3 +- .../x86_64-cpuid-Xeon-Gold-5115-json.xml | 3 +- 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index ccc01ba0b0..25289d94ed 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1837,6 +1837,82 @@ <feature name='xsaveopt'/> </model> + <model name='Skylake-Server-IBRS'> + <signature family='6' model='85'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512vl'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='mpx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> + <!-- AMD CPUs --> <model name='athlon'> <vendor name='AMD'/> 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 5a7f3beee8..5f51dea631 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml @@ -1,5 +1,5 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>Skylake-Server</model> + <model fallback='forbid'>Skylake-Server-IBRS</model> <vendor>Intel</vendor> <feature policy='require' name='ds'/> <feature policy='require' name='acpi'/> @@ -22,7 +22,6 @@ <feature policy='require' name='cmt'/> <feature policy='require' name='clflushopt'/> <feature policy='require' name='pku'/> - <feature policy='require' name='spec-ctrl'/> <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 15f2fa72d5..a11b31369d 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Server</model> + <model>Skylake-Server-IBRS</model> <vendor>Intel</vendor> <feature name='ds'/> <feature name='acpi'/> @@ -23,7 +23,6 @@ <feature name='cmt'/> <feature name='clflushopt'/> <feature name='pku'/> - <feature name='spec-ctrl'/> <feature name='xsaves'/> <feature name='mbm_total'/> <feature name='mbm_local'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml index 866528c957..7c7e95ce0d 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml @@ -1,9 +1,8 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>Skylake-Server</model> + <model fallback='forbid'>Skylake-Server-IBRS</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='clflushopt'/> - <feature policy='require' name='spec-ctrl'/> </cpu> -- 2.15.1