From f294b83ee632a6330f3a3045fbb5bcb9d9951c03 Mon Sep 17 00:00:00 2001
From: Qiaowei Ren <qiaowei.ren@intel.com>
Date: Fri, 24 Jun 2016 08:44:50 +0800
Subject: [PATCH] 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>
---
 src/cpu/cpu_map.xml                                | 11 +++++++++++
 tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml  |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml  |  1 +
 5 files changed, 15 insertions(+)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index bf2dfc6a76..6da8321a69 100644
--- 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 9ff63d72c6..b02d963c15 100644
--- 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 a65168372c..431a737a44 100644
--- 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 9ff63d72c6..b02d963c15 100644
--- 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 a65168372c..431a737a44 100644
--- 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'/>
-- 
2.39.5