|
 |
4cd28d |
From b3505e6f099cf4af35e254e077bb61cf62f035ed Mon Sep 17 00:00:00 2001
|
|
|
4cd28d |
Message-Id: <b3505e6f099cf4af35e254e077bb61cf62f035ed@dist-git>
|
|
|
4cd28d |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4cd28d |
Date: Tue, 12 Dec 2017 16:23:42 +0100
|
|
|
4cd28d |
Subject: [PATCH] cpu: add CPU features and model for indirect branch
|
|
|
4cd28d |
prediction protection
|
|
|
4cd28d |
|
|
|
4cd28d |
CVE-2017-5715
|
|
|
4cd28d |
|
|
|
4cd28d |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4cd28d |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
4cd28d |
|
|
|
4cd28d |
Conflicts:
|
|
|
4cd28d |
src/cpu/cpu_map.xml
|
|
|
4cd28d |
- no Skylake-Server and EPYC CPU models
|
|
|
4cd28d |
---
|
|
|
4cd28d |
src/cpu/cpu_map.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
4cd28d |
1 file changed, 50 insertions(+)
|
|
|
4cd28d |
|
|
|
4cd28d |
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
|
|
|
4cd28d |
index 29b5b596f4..7fbba9f0d8 100644
|
|
|
4cd28d |
--- a/src/cpu/cpu_map.xml
|
|
|
4cd28d |
+++ b/src/cpu/cpu_map.xml
|
|
|
4cd28d |
@@ -283,6 +283,15 @@
|
|
|
4cd28d |
<feature name='avx512-4fmaps'>
|
|
|
4cd28d |
<cpuid eax_in='0x07' edx='0x00000008'/>
|
|
|
4cd28d |
</feature>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'>
|
|
|
4cd28d |
+ <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
|
|
|
4cd28d |
+ </feature>
|
|
|
4cd28d |
+ <feature name='stibp'>
|
|
|
4cd28d |
+ <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
|
|
|
4cd28d |
+ </feature>
|
|
|
4cd28d |
+ <feature name='arch-facilities'>
|
|
|
4cd28d |
+ <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
|
|
|
4cd28d |
+ </feature>
|
|
|
4cd28d |
|
|
|
4cd28d |
|
|
|
4cd28d |
<feature name='xsaveopt'>
|
|
|
4cd28d |
@@ -411,6 +420,11 @@
|
|
|
4cd28d |
<cpuid eax_in='0x80000007' edx='0x00000100'/>
|
|
|
4cd28d |
</feature>
|
|
|
4cd28d |
|
|
|
4cd28d |
+
|
|
|
4cd28d |
+ <feature name='ibpb'>
|
|
|
4cd28d |
+ <cpuid eax_in='0x80000008' ebx='0x00001000'/>
|
|
|
4cd28d |
+ </feature>
|
|
|
4cd28d |
+
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='486'>
|
|
|
4cd28d |
<feature name='fpu'/>
|
|
|
4cd28d |
@@ -857,6 +871,10 @@
|
|
|
4cd28d |
<feature name='syscall'/>
|
|
|
4cd28d |
<feature name='tsc'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='Nehalem-IBRS'>
|
|
|
4cd28d |
+ <model name='Nehalem'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='Westmere'>
|
|
|
4cd28d |
<signature family='6' model='44'/>
|
|
|
4cd28d |
@@ -894,6 +912,10 @@
|
|
|
4cd28d |
<feature name='syscall'/>
|
|
|
4cd28d |
<feature name='tsc'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='Westmere-IBRS'>
|
|
|
4cd28d |
+ <model name='Westmere'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='SandyBridge'>
|
|
|
4cd28d |
<signature family='6' model='42'/>
|
|
|
4cd28d |
@@ -937,6 +959,10 @@
|
|
|
4cd28d |
<feature name='x2apic'/>
|
|
|
4cd28d |
<feature name='xsave'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='SandyBridge-IBRS'>
|
|
|
4cd28d |
+ <model name='SandyBridge'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='IvyBridge'>
|
|
|
4cd28d |
<signature family='6' model='58'/>
|
|
|
4cd28d |
@@ -986,6 +1012,10 @@
|
|
|
4cd28d |
<feature name='x2apic'/>
|
|
|
4cd28d |
<feature name='xsave'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='IvyBridge-IBRS'>
|
|
|
4cd28d |
+ <model name='IvyBridge'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='Haswell-noTSX'>
|
|
|
4cd28d |
<signature family='6' model='60'/>
|
|
|
4cd28d |
@@ -1039,6 +1069,10 @@
|
|
|
4cd28d |
<feature name='x2apic'/>
|
|
|
4cd28d |
<feature name='xsave'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='Haswell-noTSX-IBRS'>
|
|
|
4cd28d |
+ <model name='Haswell-noTSX'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='Haswell'>
|
|
|
4cd28d |
<signature family='6' model='60'/>
|
|
|
4cd28d |
@@ -1094,6 +1128,10 @@
|
|
|
4cd28d |
<feature name='x2apic'/>
|
|
|
4cd28d |
<feature name='xsave'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='Haswell-IBRS'>
|
|
|
4cd28d |
+ <model name='Haswell'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='Broadwell-noTSX'>
|
|
|
4cd28d |
<signature family='6' model='61'/>
|
|
|
4cd28d |
@@ -1151,6 +1189,10 @@
|
|
|
4cd28d |
<feature name='x2apic'/>
|
|
|
4cd28d |
<feature name='xsave'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='Broadwell-noTSX-IBRS'>
|
|
|
4cd28d |
+ <model name='Broadwell-noTSX'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='Broadwell'>
|
|
|
4cd28d |
<signature family='6' model='61'/>
|
|
|
4cd28d |
@@ -1210,6 +1252,10 @@
|
|
|
4cd28d |
<feature name='x2apic'/>
|
|
|
4cd28d |
<feature name='xsave'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='Broadwell-IBRS'>
|
|
|
4cd28d |
+ <model name='Broadwell'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='Skylake-Client'>
|
|
|
4cd28d |
<signature family='6' model='94'/>
|
|
|
4cd28d |
@@ -1278,6 +1324,10 @@
|
|
|
4cd28d |
<feature name='xsavec'/>
|
|
|
4cd28d |
<feature name='xsaveopt'/>
|
|
|
4cd28d |
</model>
|
|
|
4cd28d |
+ <model name='Skylake-Client-IBRS'>
|
|
|
4cd28d |
+ <model name='Skylake-Client'/>
|
|
|
4cd28d |
+ <feature name='spec-ctrl'/>
|
|
|
4cd28d |
+ </model>
|
|
|
4cd28d |
|
|
|
4cd28d |
|
|
|
4cd28d |
<model name='athlon'>
|
|
|
4cd28d |
--
|
|
|
4cd28d |
2.15.1
|
|
|
4cd28d |
|