c313de
From acc51748038a8074fe3a7c769b101455afd64eb7 Mon Sep 17 00:00:00 2001
c313de
Message-Id: <acc51748038a8074fe3a7c769b101455afd64eb7@dist-git>
c313de
From: Jiri Denemark <jdenemar@redhat.com>
c313de
Date: Fri, 13 Dec 2019 14:28:08 +0100
c313de
Subject: [PATCH] cpu_map: Add TSX_CTRL bit for IA32_ARCH_CAPABILITIES MSR
c313de
MIME-Version: 1.0
c313de
Content-Type: text/plain; charset=UTF-8
c313de
Content-Transfer-Encoding: 8bit
c313de
c313de
CVE-2019-11135
c313de
c313de
When TSX_CTRL bit of IA32_ARCH_CAPABILITIES MSR is set to 1, the CPU
c313de
supports IA32_TSX_CTRL MSR which can be used to disable and/or mask TSX.
c313de
c313de
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
(cherry picked from commit f411b7ef68221e82dec0129aaf2f2a26a8987504)
c313de
c313de
Conflicts:
c313de
	src/cpu_map/x86_features.xml
c313de
            - cpu_map is still monolithic downstream
c313de
c313de
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
c313de
Message-Id: <cb4f05c8c84ed910bcd4bceae58f6fd090684031.1576243094.git.jdenemar@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
---
c313de
 src/cpu/cpu_map.xml | 3 +++
c313de
 1 file changed, 3 insertions(+)
c313de
c313de
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
c313de
index c2b3fca47a..9609ce71a7 100644
c313de
--- a/src/cpu/cpu_map.xml
c313de
+++ b/src/cpu/cpu_map.xml
c313de
@@ -501,6 +501,9 @@
c313de
     <feature name='mds-no'>
c313de
       <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
c313de
     </feature>
c313de
+    <feature name='tsx-ctrl'>
c313de
+      <msr index='0x10a' edx='0x00000000' eax='0x00000080'/>
c313de
+    </feature>
c313de
     <feature name='taa-no'>
c313de
       <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>
c313de
     </feature>
c313de
-- 
c313de
2.24.1
c313de