9c6c51
From 28c9a09d1f42513344c546ac344f90ae3280fd5b Mon Sep 17 00:00:00 2001
9c6c51
Message-Id: <28c9a09d1f42513344c546ac344f90ae3280fd5b@dist-git>
9c6c51
From: Jiri Denemark <jdenemar@redhat.com>
9c6c51
Date: Fri, 5 Apr 2019 15:11:20 +0200
9c6c51
Subject: [PATCH] cpu_map: Define md-clear CPUID bit
9c6c51
MIME-Version: 1.0
9c6c51
Content-Type: text/plain; charset=UTF-8
9c6c51
Content-Transfer-Encoding: 8bit
9c6c51
9c6c51
CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
9c6c51
9c6c51
The bit is set when microcode provides the mechanism to invoke a flush
9c6c51
of various exploitable CPU buffers by invoking the VERW instruction.
9c6c51
9c6c51
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
9c6c51
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
9c6c51
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
9c6c51
(cherry picked from commit 538d873571d7a682852dc1d70e5f4478f4d64e85)
9c6c51
9c6c51
Conflicts:
9c6c51
	src/cpu_map/x86_features.xml
9c6c51
            - no CPU map split downstream
9c6c51
9c6c51
	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
9c6c51
	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
9c6c51
            - test data missing downstream
9c6c51
9c6c51
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
9c6c51
---
9c6c51
 src/cpu/cpu_map.xml                                        | 3 +++
9c6c51
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml | 2 +-
9c6c51
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml   | 1 +
9c6c51
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml    | 1 +
9c6c51
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml    | 1 +
9c6c51
 5 files changed, 7 insertions(+), 1 deletion(-)
9c6c51
9c6c51
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
9c6c51
index 79c40cff34..ceee0ae489 100644
9c6c51
--- a/src/cpu/cpu_map.xml
9c6c51
+++ b/src/cpu/cpu_map.xml
9c6c51
@@ -325,6 +325,9 @@
9c6c51
     <feature name='avx512-4fmaps'>
9c6c51
       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
9c6c51
     </feature>
9c6c51
+    <feature name='md-clear'> 
9c6c51
+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
9c6c51
+    </feature>
9c6c51
     <feature name='pconfig'>
9c6c51
       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
9c6c51
     </feature>
9c6c51
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
9c6c51
index 0deca9fba6..74763a462b 100644
9c6c51
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
9c6c51
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
9c6c51
@@ -2,7 +2,7 @@
9c6c51
 <cpudata arch='x86'>
9c6c51
   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
9c6c51
   <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
9c6c51
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
9c6c51
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000400'/>
9c6c51
   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
9c6c51
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
9c6c51
 </cpudata>
9c6c51
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
9c6c51
index 70a0fc3286..867970d2c7 100644
9c6c51
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
9c6c51
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
9c6c51
@@ -20,6 +20,7 @@
9c6c51
   <feature policy='require' name='tsc_adjust'/>
9c6c51
   <feature policy='require' name='clflushopt'/>
9c6c51
   <feature policy='require' name='intel-pt'/>
9c6c51
+  <feature policy='require' name='md-clear'/>
9c6c51
   <feature policy='require' name='stibp'/>
9c6c51
   <feature policy='require' name='ssbd'/>
9c6c51
   <feature policy='require' name='xsaves'/>
9c6c51
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
9c6c51
index bbdfb6aa61..e7ced42797 100644
9c6c51
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
9c6c51
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
9c6c51
@@ -21,6 +21,7 @@
9c6c51
   <feature name='tsc_adjust'/>
9c6c51
   <feature name='clflushopt'/>
9c6c51
   <feature name='intel-pt'/>
9c6c51
+  <feature name='md-clear'/>
9c6c51
   <feature name='stibp'/>
9c6c51
   <feature name='ssbd'/>
9c6c51
   <feature name='xsaves'/>
9c6c51
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
9c6c51
index 1f321db273..a5591278df 100644
9c6c51
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
9c6c51
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
9c6c51
@@ -5,6 +5,7 @@
9c6c51
   <feature policy='require' name='hypervisor'/>
9c6c51
   <feature policy='require' name='tsc_adjust'/>
9c6c51
   <feature policy='require' name='clflushopt'/>
9c6c51
+  <feature policy='require' name='md-clear'/>
9c6c51
   <feature policy='require' name='stibp'/>
9c6c51
   <feature policy='require' name='ssbd'/>
9c6c51
   <feature policy='require' name='pdpe1gb'/>
9c6c51
-- 
9c6c51
2.21.0
9c6c51