cpumap: Add support for ibrs CPU feature

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 5cfa07502a1ebcfaf4f792b89871eb540545057b..b03a6b065d53e76402103819ef4717130317ff7f 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -507,6 +507,9 @@
   <feature name='ibpb'>
     <cpuid eax_in='0x80000008' ebx='0x00001000'/>
   </feature>
+  <feature name='ibrs'>
+    <cpuid eax_in='0x80000008' ebx='0x00004000'/>
+  </feature>
   <feature name='amd-stibp'>
     <cpuid eax_in='0x80000008' ebx='0x00008000'/>
   </feature>

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 6d95b508b234c0900b57043cd46dacf6292516b8..40e791239881095d531d8cc7383b459c33f1ded1 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
@@ -17,6 +17,7 @@
   <feature policy='require' name='topoext'/>
   <feature policy='require' name='perfctr_nb'/>
   <feature policy='require' name='invtsc'/>
+  <feature policy='require' name='ibrs'/>
   <feature policy='require' name='amd-ssbd'/>
   <feature policy='require' name='lbrv'/>
   <feature policy='require' name='svm-lock'/>

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 65eaeabdd019ccc17c3f2a328ea664af4aa1253c..9f8108cdaaf09eec127025807cb0e21b3a82945c 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
@@ -18,6 +18,7 @@
   <feature name='topoext'/>
   <feature name='perfctr_nb'/>
   <feature name='invtsc'/>
+  <feature name='ibrs'/>
   <feature name='amd-ssbd'/>
   <feature name='lbrv'/>
   <feature name='svm-lock'/>