|
 |
d65131c |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d65131c |
Date: Tue, 9 Jan 2018 13:45:17 -0200
|
|
 |
a056f39 |
Subject: [PATCH] i386: Add new -IBRS versions of Intel CPU models
|
|
|
d65131c |
|
|
|
d65131c |
The new MSR IA32_SPEC_CTRL MSR was introduced by a recent Intel
|
|
|
d65131c |
microcode updated and can be used by OSes to mitigate
|
|
|
d65131c |
CVE-2017-5715. Unfortunately we can't change the existing CPU
|
|
|
d65131c |
models without breaking existing setups, so users need to
|
|
|
d65131c |
explicitly update their VM configuration to use the new *-IBRS
|
|
|
d65131c |
CPU model if they want to expose IBRS to guests.
|
|
|
d65131c |
|
|
|
d65131c |
The new CPU models are simple copies of the existing CPU models,
|
|
|
d65131c |
with just CPUID_7_0_EDX_SPEC_CTRL added and model_id updated.
|
|
|
d65131c |
|
|
|
d65131c |
Cc: Jiri Denemark <jdenemar@redhat.com>
|
|
|
d65131c |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d65131c |
Message-Id: <20180109154519.25634-6-ehabkost@redhat.com>
|
|
|
d65131c |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d65131c |
(cherry picked from commit ac96c41354b7e4c70b756342d9b686e31ab87458)
|
|
|
d65131c |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
d65131c |
(cherry picked from commit 61efbbf869293f1deb9ee39d44bd4e635de59fa7)
|
|
|
d65131c |
---
|
|
|
d65131c |
target/i386/cpu.c | 379 +++++++++++++++++++++++++++++++++++++++++++++-
|
|
|
d65131c |
1 file changed, 378 insertions(+), 1 deletion(-)
|
|
|
d65131c |
|
|
|
d65131c |
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
|
d65131c |
index 47c7e9db0e..dbe3393b1c 100644
|
|
|
d65131c |
--- a/target/i386/cpu.c
|
|
|
d65131c |
+++ b/target/i386/cpu.c
|
|
|
d65131c |
@@ -1080,6 +1080,31 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Core i7 9xx (Nehalem Class Core i7)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Nehalem-IBRS",
|
|
|
d65131c |
+ .level = 11,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 26,
|
|
|
d65131c |
+ .stepping = 3,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
d65131c |
+ CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_SSE3,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_LAHF_LM,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Core i7 9xx (Nehalem Core i7, IBRS update)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "Westmere",
|
|
|
d65131c |
.level = 11,
|
|
|
d65131c |
@@ -1106,6 +1131,34 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Westmere-IBRS",
|
|
|
d65131c |
+ .level = 11,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 44,
|
|
|
d65131c |
+ .stepping = 1,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AES | CPUID_EXT_POPCNT | CPUID_EXT_SSE42 |
|
|
|
d65131c |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
d65131c |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_LAHF_LM,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Westmere E56xx/L56xx/X56xx (IBRS update)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "SandyBridge",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
@@ -1137,6 +1190,39 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Xeon E312xx (Sandy Bridge)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "SandyBridge-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 42,
|
|
|
d65131c |
+ .stepping = 1,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_POPCNT |
|
|
|
d65131c |
+ CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
d65131c |
+ CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ |
|
|
|
d65131c |
+ CPUID_EXT_SSE3,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
d65131c |
+ CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_LAHF_LM,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Xeon E312xx (Sandy Bridge, IBRS update)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "IvyBridge",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
@@ -1171,6 +1257,42 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "IvyBridge-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 58,
|
|
|
d65131c |
+ .stepping = 9,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_POPCNT |
|
|
|
d65131c |
+ CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
d65131c |
+ CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ |
|
|
|
d65131c |
+ CPUID_EXT_SSE3 | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
d65131c |
+ .features[FEAT_7_0_EBX] =
|
|
|
d65131c |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_SMEP |
|
|
|
d65131c |
+ CPUID_7_0_EBX_ERMS,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
d65131c |
+ CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_LAHF_LM,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge, IBRS)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "Haswell-noTSX",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
@@ -1206,7 +1328,46 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
CPUID_6_EAX_ARAT,
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Core Processor (Haswell, no TSX)",
|
|
|
d65131c |
- }, {
|
|
|
d65131c |
+ },
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Haswell-noTSX-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 60,
|
|
|
d65131c |
+ .stepping = 1,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
d65131c |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
d65131c |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
d65131c |
+ CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
d65131c |
+ CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_7_0_EBX] =
|
|
|
d65131c |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
d65131c |
+ CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
d65131c |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID,
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Core Processor (Haswell, no TSX, IBRS)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
+ {
|
|
|
d65131c |
.name = "Haswell",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
@@ -1243,6 +1404,45 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Core Processor (Haswell)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Haswell-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 60,
|
|
|
d65131c |
+ .stepping = 4,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
d65131c |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
d65131c |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
d65131c |
+ CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
d65131c |
+ CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_7_0_EBX] =
|
|
|
d65131c |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
d65131c |
+ CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
d65131c |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
d65131c |
+ CPUID_7_0_EBX_RTM,
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Core Processor (Haswell, IBRS)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "Broadwell-noTSX",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
@@ -1281,6 +1481,46 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Core Processor (Broadwell, no TSX)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Broadwell-noTSX-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 61,
|
|
|
d65131c |
+ .stepping = 2,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
d65131c |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
d65131c |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
d65131c |
+ CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
d65131c |
+ CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_7_0_EBX] =
|
|
|
d65131c |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
d65131c |
+ CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
d65131c |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
d65131c |
+ CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
|
|
|
d65131c |
+ CPUID_7_0_EBX_SMAP,
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Core Processor (Broadwell, no TSX, IBRS)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "Broadwell",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
@@ -1319,6 +1559,46 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Core Processor (Broadwell)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Broadwell-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 61,
|
|
|
d65131c |
+ .stepping = 2,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
d65131c |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
d65131c |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
d65131c |
+ CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
d65131c |
+ CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_7_0_EBX] =
|
|
|
d65131c |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
d65131c |
+ CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
d65131c |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
d65131c |
+ CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
|
|
|
d65131c |
+ CPUID_7_0_EBX_SMAP,
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Core Processor (Broadwell, IBRS)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "Skylake-Client",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
@@ -1364,6 +1644,53 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Core Processor (Skylake)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Skylake-Client-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 94,
|
|
|
d65131c |
+ .stepping = 3,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
d65131c |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
d65131c |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
d65131c |
+ CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
d65131c |
+ CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_7_0_EBX] =
|
|
|
d65131c |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
d65131c |
+ CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
d65131c |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
d65131c |
+ CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
|
|
|
d65131c |
+ CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX,
|
|
|
d65131c |
+ /* Missing: XSAVES (not supported by some Linux versions,
|
|
|
d65131c |
+ * including v4.1 to v4.12).
|
|
|
d65131c |
+ * KVM doesn't yet expose any XSAVES state save component,
|
|
|
d65131c |
+ * and the only one defined in Skylake (processor tracing)
|
|
|
d65131c |
+ * probably will block migration anyway.
|
|
|
d65131c |
+ */
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
|
|
|
d65131c |
+ CPUID_XSAVE_XGETBV1,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Core Processor (Skylake, IBRS)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "Skylake-Server",
|
|
|
d65131c |
.level = 0xd,
|
|
|
d65131c |
@@ -1412,6 +1739,56 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d65131c |
.xlevel = 0x80000008,
|
|
|
d65131c |
.model_id = "Intel Xeon Processor (Skylake)",
|
|
|
d65131c |
},
|
|
|
d65131c |
+ {
|
|
|
d65131c |
+ .name = "Skylake-Server-IBRS",
|
|
|
d65131c |
+ .level = 0xd,
|
|
|
d65131c |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
d65131c |
+ .family = 6,
|
|
|
d65131c |
+ .model = 85,
|
|
|
d65131c |
+ .stepping = 4,
|
|
|
d65131c |
+ .features[FEAT_1_EDX] =
|
|
|
d65131c |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
d65131c |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
d65131c |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
d65131c |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
d65131c |
+ CPUID_DE | CPUID_FP87,
|
|
|
d65131c |
+ .features[FEAT_1_ECX] =
|
|
|
d65131c |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
d65131c |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
d65131c |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
d65131c |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
d65131c |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
d65131c |
+ CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
d65131c |
+ CPUID_EXT2_LM | CPUID_EXT2_PDPE1GB | CPUID_EXT2_RDTSCP |
|
|
|
d65131c |
+ CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
|
|
|
d65131c |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
d65131c |
+ CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
|
|
|
d65131c |
+ .features[FEAT_7_0_EDX] =
|
|
|
d65131c |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
d65131c |
+ .features[FEAT_7_0_EBX] =
|
|
|
d65131c |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
d65131c |
+ CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
d65131c |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
d65131c |
+ CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
|
|
|
d65131c |
+ CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_CLWB |
|
|
|
d65131c |
+ CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |
|
|
|
d65131c |
+ CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |
|
|
|
d65131c |
+ CPUID_7_0_EBX_AVX512VL,
|
|
|
d65131c |
+ /* Missing: XSAVES (not supported by some Linux versions,
|
|
|
d65131c |
+ * including v4.1 to v4.12).
|
|
|
d65131c |
+ * KVM doesn't yet expose any XSAVES state save component,
|
|
|
d65131c |
+ * and the only one defined in Skylake (processor tracing)
|
|
|
d65131c |
+ * probably will block migration anyway.
|
|
|
d65131c |
+ */
|
|
|
d65131c |
+ .features[FEAT_XSAVE] =
|
|
|
d65131c |
+ CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
|
|
|
d65131c |
+ CPUID_XSAVE_XGETBV1,
|
|
|
d65131c |
+ .features[FEAT_6_EAX] =
|
|
|
d65131c |
+ CPUID_6_EAX_ARAT,
|
|
|
d65131c |
+ .xlevel = 0x80000008,
|
|
|
d65131c |
+ .model_id = "Intel Xeon Processor (Skylake, IBRS)",
|
|
|
d65131c |
+ },
|
|
|
d65131c |
{
|
|
|
d65131c |
.name = "Opteron_G1",
|
|
|
d65131c |
.level = 5,
|