cpu_map.xml: add cmt/mbm feature to x86

Some Intel processor families (e.g. the Intel Xeon processor E5 v3
family) introduced some PQos (Platform Qos) features, including CMT
(Cache Monitoring technology) and MBM (Memory Bandwidth Monitoring),
to monitor or control shared resource. This patch add them into x86
part of cpu_map.xml to be used for applications based on libvirt to
get cpu capabilities. For example, Nova in OpenStack schedules guests
based on the CPU features that the host has.

Signed-off-by: Qiaowei Ren <qiaowei.ren@intel.com>

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index bf2dfc6a7648b6a6ff158cb795398a20c55813bf..6da8321a69681e7a78ade6b7c5c9c871813bd5d8 100644 (file)
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -224,6 +224,9 @@
     <feature name='rtm'>
       <cpuid eax_in='0x07' ebx='0x00000800'/>
     </feature>
+    <feature name='cmt'>
+      <cpuid eax_in='0x07' ebx='0x00001000'/>
+    </feature>
     <feature name='mpx'>
       <cpuid eax_in='0x07' ebx='0x00004000'/>
     </feature>
@@ -266,6 +269,14 @@
       <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000008'/>
     </feature>
 
+    <!-- cpuid level 0x0000000f:1 (edx) -->
+    <feature name='mbm_total'> <!-- LLC Total MBM monitoring -->
+      <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000002'/>
+    </feature>
+    <feature name='mbm_local'> <!-- LLC Local MBM monitoring -->
+      <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000004'/>
+    </feature>
+
     <!-- extended features, EDX -->
     <feature name='syscall'> <!-- CPUID_EXT2_SYSCALL -->
       <cpuid eax_in='0x80000001' edx='0x00000800'/>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
index 9ff63d72c6c0646ed491a6ca81eecc8ae0d9ff4e..b02d963c156b4c1381971345dddcdd22b2f8f7a9 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
@@ -24,6 +24,7 @@
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
index a65168372c8ce49dab62d17047afadb77b9e3468..431a737a44c703ca86ab5e4b048193e1f7b83aee 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
@@ -24,6 +24,7 @@
   <feature name='rdrand'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
+  <feature name='cmt'/>
   <feature name='xsaveopt'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
index 9ff63d72c6c0646ed491a6ca81eecc8ae0d9ff4e..b02d963c156b4c1381971345dddcdd22b2f8f7a9 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
@@ -24,6 +24,7 @@
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>

diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
index a65168372c8ce49dab62d17047afadb77b9e3468..431a737a44c703ca86ab5e4b048193e1f7b83aee 100644 (file)
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
@@ -24,6 +24,7 @@
   <feature name='rdrand'/>
   <feature name='arat'/>
   <feature name='tsc_adjust'/>
+  <feature name='cmt'/>
   <feature name='xsaveopt'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>