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