Pablo Greco 40546a
From 06a798d6c6283b7041ec8fd631c1289b6fc1b29c Mon Sep 17 00:00:00 2001
Pablo Greco 40546a
Message-Id: <06a798d6c6283b7041ec8fd631c1289b6fc1b29c@dist-git>
Pablo Greco 40546a
From: Jiri Denemark <jdenemar@redhat.com>
Pablo Greco 40546a
Date: Fri, 13 Dec 2019 14:28:07 +0100
Pablo Greco 40546a
Subject: [PATCH] cpu_map: Add TAA_NO bit for IA32_ARCH_CAPABILITIES MSR
Pablo Greco 40546a
MIME-Version: 1.0
Pablo Greco 40546a
Content-Type: text/plain; charset=UTF-8
Pablo Greco 40546a
Content-Transfer-Encoding: 8bit
Pablo Greco 40546a
Pablo Greco 40546a
CVE-2019-11135
Pablo Greco 40546a
Pablo Greco 40546a
CPUs with TAA_NO bit of IA32_ARCH_CAPABILITIES MSR set to 1 are not
Pablo Greco 40546a
vulnerable to TSX Asynchronous Abort and passing this bit to a guest
Pablo Greco 40546a
may avoid unnecessary mitigations.
Pablo Greco 40546a
Pablo Greco 40546a
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Pablo Greco 40546a
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Pablo Greco 40546a
(cherry picked from commit 07aaced4e6ea6db8b27f44636f51cafa6f1847a8)
Pablo Greco 40546a
Pablo Greco 40546a
Conflicts:
Pablo Greco 40546a
	src/cpu_map/x86_features.xml
Pablo Greco 40546a
            - cpu_map is still monolithic downstream
Pablo Greco 40546a
Pablo Greco 40546a
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Pablo Greco 40546a
Message-Id: <0ff574a85f1cc7b53140d41a6a62254bea08a06f.1576243094.git.jdenemar@redhat.com>
Pablo Greco 40546a
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Pablo Greco 40546a
---
Pablo Greco 40546a
 src/cpu/cpu_map.xml | 3 +++
Pablo Greco 40546a
 1 file changed, 3 insertions(+)
Pablo Greco 40546a
Pablo Greco 40546a
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
Pablo Greco 40546a
index 7b9f8bb452..c2b3fca47a 100644
Pablo Greco 40546a
--- a/src/cpu/cpu_map.xml
Pablo Greco 40546a
+++ b/src/cpu/cpu_map.xml
Pablo Greco 40546a
@@ -501,6 +501,9 @@
Pablo Greco 40546a
     <feature name='mds-no'>
Pablo Greco 40546a
       <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
Pablo Greco 40546a
     </feature>
Pablo Greco 40546a
+    <feature name='taa-no'>
Pablo Greco 40546a
+      <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>
Pablo Greco 40546a
+    </feature>
Pablo Greco 40546a
 
Pablo Greco 40546a
     
Pablo Greco 40546a
     <model name='486'>
Pablo Greco 40546a
-- 
Pablo Greco 40546a
2.24.1
Pablo Greco 40546a