|
 |
1b1826 |
From d4caecffd38c2a9c16ea717e9c863d3214093b32 Mon Sep 17 00:00:00 2001
|
|
|
1b1826 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1b1826 |
Date: Wed, 13 Dec 2017 15:42:57 -0200
|
|
|
1b1826 |
Subject: [PATCH 3/3] target-i386: cpu: add new CPU models for indirect branch
|
|
|
1b1826 |
predictor restrictions
|
|
|
1b1826 |
|
|
|
1b1826 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1b1826 |
Message-id: <20171213174257.20475-4-ehabkost@redhat.com>
|
|
|
1b1826 |
Patchwork-id: n/a
|
|
|
1b1826 |
O-Subject: [CONFIDENTIAL][RHEL-7.4.z qemu-kvm PATCH v2 3/3] target-i386: cpu: add
|
|
|
1b1826 |
new CPU models for indirect branch predictor restrictions
|
|
|
1b1826 |
Bugzilla: CVE-2017-5715
|
|
|
1b1826 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
1b1826 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1b1826 |
RH-Acked-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
|
|
1b1826 |
|
|
|
1b1826 |
To ensure the New CPU models won't introduce any unexpected
|
|
|
1b1826 |
changes except for the spec-ctrl feature (even if people are
|
|
|
1b1826 |
running older machine-types), copy all compat_props entries for
|
|
|
1b1826 |
existing CPU models to their *-IBRS versions.
|
|
|
1b1826 |
|
|
|
1b1826 |
The only entries that are not being copied are the ones touching
|
|
|
1b1826 |
"(min-)level" and "(min-)xlevel" because it's an expected result
|
|
|
1b1826 |
of the CPU model change (otherwise the spec-ctrl feature would
|
|
|
1b1826 |
remain unavailable to the guest).
|
|
|
1b1826 |
|
|
|
1b1826 |
The entries that had to be copied can be found using:
|
|
|
1b1826 |
$ git grep -E 'Nehalem|Westmere|SandyBridge|IvyBridge|Haswell-noTSX|Haswell|Broadwell-noTSX|Broadwell|Skylake-Client|Skylake-Server|EPYC'
|
|
|
1b1826 |
|
|
|
1b1826 |
Note that the upstream-only PC_COMPAT_* macros are not being
|
|
|
1b1826 |
touched as they are not used by the RHEL machine-types.
|
|
|
1b1826 |
---
|
|
|
1b1826 |
hw/i386/pc_piix.c | 17 ++++
|
|
|
1b1826 |
hw/i386/pc_q35.c | 1 +
|
|
|
1b1826 |
target-i386/cpu.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
1b1826 |
target-i386/cpu.h | 3 +
|
|
|
1b1826 |
4 files changed, 257 insertions(+)
|
|
|
1b1826 |
|
|
|
1b1826 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
1b1826 |
index b043124..c53a6d4 100644
|
|
|
1b1826 |
--- a/hw/i386/pc_piix.c
|
|
|
1b1826 |
+++ b/hw/i386/pc_piix.c
|
|
|
1b1826 |
@@ -753,7 +753,9 @@ static void pc_compat_rhel700(QEMUMachineInitArgs *args)
|
|
|
1b1826 |
x86_cpu_compat_set_features("Conroe", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Penryn", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Nehalem", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Nehalem-IBRS", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Westmere-IBRS", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
/* SandyBridge and Haswell already have x2apic enabled */
|
|
|
1b1826 |
x86_cpu_compat_set_features("Opteron_G1", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Opteron_G2", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
@@ -928,18 +930,31 @@ static void pc_compat_rhel660(QEMUMachineInitArgs *args)
|
|
|
1b1826 |
x86_cpu_compat_set_features("Conroe", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Penryn", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Nehalem", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Nehalem-IBRS", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Westmere-IBRS", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Westmere-IBRS", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Westmere", FEAT_8000_0001_EDX,
|
|
|
1b1826 |
CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_PAT |
|
|
|
1b1826 |
CPUID_EXT2_CMOV | CPUID_EXT2_PGE | CPUID_EXT2_APIC |
|
|
|
1b1826 |
CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR |
|
|
|
1b1826 |
CPUID_EXT2_TSC | CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
1b1826 |
0);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Westmere-IBRS", FEAT_8000_0001_EDX,
|
|
|
1b1826 |
+ CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_PAT |
|
|
|
1b1826 |
+ CPUID_EXT2_CMOV | CPUID_EXT2_PGE | CPUID_EXT2_APIC |
|
|
|
1b1826 |
+ CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR |
|
|
|
1b1826 |
+ CPUID_EXT2_TSC | CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
1b1826 |
+ 0);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Broadwell", FEAT_8000_0001_EDX,
|
|
|
1b1826 |
0, CPUID_EXT2_RDTSCP);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Broadwell-IBRS", FEAT_8000_0001_EDX,
|
|
|
1b1826 |
+ 0, CPUID_EXT2_RDTSCP);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Broadwell", FEAT_7_0_EBX,
|
|
|
1b1826 |
0, CPUID_7_0_EBX_SMAP);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Broadwell-IBRS", FEAT_7_0_EBX,
|
|
|
1b1826 |
+ 0, CPUID_7_0_EBX_SMAP);
|
|
|
1b1826 |
|
|
|
1b1826 |
/* RHEL-6 kernel never supported exposing RDTSCP */
|
|
|
1b1826 |
x86_cpu_compat_set_features(NULL, FEAT_8000_0001_EDX, 0, CPUID_EXT2_RDTSCP);
|
|
|
1b1826 |
@@ -1122,6 +1137,8 @@ static void pc_compat_rhel630(QEMUMachineInitArgs *args)
|
|
|
1b1826 |
enable_compat_apic_id_mode();
|
|
|
1b1826 |
x86_cpu_compat_set_features("SandyBridge", FEAT_1_ECX,
|
|
|
1b1826 |
0, CPUID_EXT_TSC_DEADLINE_TIMER);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("SandyBridge-IBRS", FEAT_1_ECX,
|
|
|
1b1826 |
+ 0, CPUID_EXT_TSC_DEADLINE_TIMER);
|
|
|
1b1826 |
}
|
|
|
1b1826 |
|
|
|
1b1826 |
static void pc_init_rhel630(QEMUMachineInitArgs *args)
|
|
|
1b1826 |
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
|
1b1826 |
index 850a25a..e6043df 100644
|
|
|
1b1826 |
--- a/hw/i386/pc_q35.c
|
|
|
1b1826 |
+++ b/hw/i386/pc_q35.c
|
|
|
1b1826 |
@@ -228,6 +228,7 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
|
|
|
1b1826 |
{
|
|
|
1b1826 |
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
|
|
|
1b1826 |
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
|
|
|
1b1826 |
+ x86_cpu_compat_set_features("Westmere-IBRS", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
|
|
|
1b1826 |
pc_q35_init_1_5(args);
|
|
|
1b1826 |
}
|
|
|
1b1826 |
|
|
|
1b1826 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
1b1826 |
index 400a7ab..9e238ba 100644
|
|
|
1b1826 |
--- a/target-i386/cpu.c
|
|
|
1b1826 |
+++ b/target-i386/cpu.c
|
|
|
1b1826 |
@@ -882,6 +882,31 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
1b1826 |
.model_id = "Intel Core i7 9xx (Nehalem Class Core i7)",
|
|
|
1b1826 |
},
|
|
|
1b1826 |
{
|
|
|
1b1826 |
+ .name = "Nehalem-IBRS",
|
|
|
1b1826 |
+ .level = 11,
|
|
|
1b1826 |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
+ .family = 6,
|
|
|
1b1826 |
+ .model = 26,
|
|
|
1b1826 |
+ .stepping = 3,
|
|
|
1b1826 |
+ .features[FEAT_1_EDX] =
|
|
|
1b1826 |
+ CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
1b1826 |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
1b1826 |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
1b1826 |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
1b1826 |
+ CPUID_DE | CPUID_FP87,
|
|
|
1b1826 |
+ .features[FEAT_1_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
1b1826 |
+ CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_SSE3,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EDX] =
|
|
|
1b1826 |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
1b1826 |
+ CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT3_LAHF_LM,
|
|
|
1b1826 |
+ .xlevel = 0x80000008,
|
|
|
1b1826 |
+ .model_id = "Intel Core i7 9xx (Nehalem Core i7, IBRS update)",
|
|
|
1b1826 |
+ },
|
|
|
1b1826 |
+ {
|
|
|
1b1826 |
.name = "Westmere",
|
|
|
1b1826 |
.level = 11,
|
|
|
1b1826 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
@@ -906,6 +931,32 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
1b1826 |
.model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)",
|
|
|
1b1826 |
},
|
|
|
1b1826 |
{
|
|
|
1b1826 |
+ .name = "Westmere-IBRS",
|
|
|
1b1826 |
+ .level = 11,
|
|
|
1b1826 |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
+ .family = 6,
|
|
|
1b1826 |
+ .model = 44,
|
|
|
1b1826 |
+ .stepping = 1,
|
|
|
1b1826 |
+ .features[FEAT_1_EDX] =
|
|
|
1b1826 |
+ CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
1b1826 |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
1b1826 |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
1b1826 |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
1b1826 |
+ CPUID_DE | CPUID_FP87,
|
|
|
1b1826 |
+ .features[FEAT_1_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT_AES | CPUID_EXT_POPCNT | CPUID_EXT_SSE42 |
|
|
|
1b1826 |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
1b1826 |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
1b1826 |
+ CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT3_LAHF_LM,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EDX] =
|
|
|
1b1826 |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
1b1826 |
+ .xlevel = 0x80000008,
|
|
|
1b1826 |
+ .model_id = "Westmere E56xx/L56xx/X56xx (IBRS update)",
|
|
|
1b1826 |
+ },
|
|
|
1b1826 |
+ {
|
|
|
1b1826 |
.name = "SandyBridge",
|
|
|
1b1826 |
.level = 0xd,
|
|
|
1b1826 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
@@ -935,6 +986,37 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
1b1826 |
.model_id = "Intel Xeon E312xx (Sandy Bridge)",
|
|
|
1b1826 |
},
|
|
|
1b1826 |
{
|
|
|
1b1826 |
+ .name = "SandyBridge-IBRS",
|
|
|
1b1826 |
+ .level = 0xd,
|
|
|
1b1826 |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
+ .family = 6,
|
|
|
1b1826 |
+ .model = 42,
|
|
|
1b1826 |
+ .stepping = 1,
|
|
|
1b1826 |
+ .features[FEAT_1_EDX] =
|
|
|
1b1826 |
+ CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
1b1826 |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
1b1826 |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
1b1826 |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
1b1826 |
+ CPUID_DE | CPUID_FP87,
|
|
|
1b1826 |
+ .features[FEAT_1_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
1b1826 |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_POPCNT |
|
|
|
1b1826 |
+ CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
1b1826 |
+ CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ |
|
|
|
1b1826 |
+ CPUID_EXT_SSE3,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
1b1826 |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
1b1826 |
+ CPUID_EXT2_SYSCALL,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT3_LAHF_LM,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EDX] =
|
|
|
1b1826 |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
1b1826 |
+ .features[FEAT_XSAVE] =
|
|
|
1b1826 |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
1b1826 |
+ .xlevel = 0x80000008,
|
|
|
1b1826 |
+ .model_id = "Intel Xeon E312xx (Sandy Bridge, IBRS update)",
|
|
|
1b1826 |
+ },
|
|
|
1b1826 |
+ {
|
|
|
1b1826 |
.name = "IvyBridge",
|
|
|
1b1826 |
.level = 0xd,
|
|
|
1b1826 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
@@ -967,6 +1049,40 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
1b1826 |
.model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge)",
|
|
|
1b1826 |
},
|
|
|
1b1826 |
{
|
|
|
1b1826 |
+ .name = "IvyBridge-IBRS",
|
|
|
1b1826 |
+ .level = 0xd,
|
|
|
1b1826 |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
+ .family = 6,
|
|
|
1b1826 |
+ .model = 58,
|
|
|
1b1826 |
+ .stepping = 9,
|
|
|
1b1826 |
+ .features[FEAT_1_EDX] =
|
|
|
1b1826 |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
1b1826 |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
1b1826 |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
1b1826 |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
1b1826 |
+ CPUID_DE | CPUID_FP87,
|
|
|
1b1826 |
+ .features[FEAT_1_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
1b1826 |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_POPCNT |
|
|
|
1b1826 |
+ CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
|
|
|
1b1826 |
+ CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ |
|
|
|
1b1826 |
+ CPUID_EXT_SSE3 | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EBX] =
|
|
|
1b1826 |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_SMEP |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_ERMS,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
1b1826 |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
1b1826 |
+ CPUID_EXT2_SYSCALL,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT3_LAHF_LM,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EDX] =
|
|
|
1b1826 |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
1b1826 |
+ .features[FEAT_XSAVE] =
|
|
|
1b1826 |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
1b1826 |
+ .xlevel = 0x80000008,
|
|
|
1b1826 |
+ .model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge, IBRS)",
|
|
|
1b1826 |
+ },
|
|
|
1b1826 |
+ {
|
|
|
1b1826 |
.name = "Haswell",
|
|
|
1b1826 |
.level = 0xd,
|
|
|
1b1826 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
@@ -1002,6 +1118,43 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
1b1826 |
.model_id = "Intel Core Processor (Haswell)",
|
|
|
1b1826 |
},
|
|
|
1b1826 |
{
|
|
|
1b1826 |
+ .name = "Haswell-IBRS",
|
|
|
1b1826 |
+ .level = 0xd,
|
|
|
1b1826 |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
+ .family = 6,
|
|
|
1b1826 |
+ .model = 60,
|
|
|
1b1826 |
+ .stepping = 4,
|
|
|
1b1826 |
+ .features[FEAT_1_EDX] =
|
|
|
1b1826 |
+ CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
1b1826 |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
1b1826 |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
1b1826 |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
1b1826 |
+ CPUID_DE | CPUID_FP87,
|
|
|
1b1826 |
+ .features[FEAT_1_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
1b1826 |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
1b1826 |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
1b1826 |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
1b1826 |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
1b1826 |
+ CPUID_EXT_PCID,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
1b1826 |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
1b1826 |
+ CPUID_EXT2_SYSCALL,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT3_LAHF_LM,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EDX] =
|
|
|
1b1826 |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EBX] =
|
|
|
1b1826 |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_RTM,
|
|
|
1b1826 |
+ .features[FEAT_XSAVE] =
|
|
|
1b1826 |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
1b1826 |
+ .xlevel = 0x80000008,
|
|
|
1b1826 |
+ .model_id = "Intel Core Processor (Haswell, IBRS)",
|
|
|
1b1826 |
+ },
|
|
|
1b1826 |
+ {
|
|
|
1b1826 |
.name = "Broadwell",
|
|
|
1b1826 |
.level = 0xd,
|
|
|
1b1826 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
@@ -1038,6 +1191,44 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
1b1826 |
.model_id = "Intel Core Processor (Broadwell)",
|
|
|
1b1826 |
},
|
|
|
1b1826 |
{
|
|
|
1b1826 |
+ .name = "Broadwell-IBRS",
|
|
|
1b1826 |
+ .level = 0xd,
|
|
|
1b1826 |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
+ .family = 6,
|
|
|
1b1826 |
+ .model = 61,
|
|
|
1b1826 |
+ .stepping = 2,
|
|
|
1b1826 |
+ .features[FEAT_1_EDX] =
|
|
|
1b1826 |
+ CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
1b1826 |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
1b1826 |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
1b1826 |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
1b1826 |
+ CPUID_DE | CPUID_FP87,
|
|
|
1b1826 |
+ .features[FEAT_1_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
1b1826 |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
1b1826 |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
1b1826 |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
1b1826 |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
1b1826 |
+ CPUID_EXT_PCID,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
1b1826 |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
1b1826 |
+ CPUID_EXT2_SYSCALL,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EDX] =
|
|
|
1b1826 |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EBX] =
|
|
|
1b1826 |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_SMAP,
|
|
|
1b1826 |
+ .features[FEAT_XSAVE] =
|
|
|
1b1826 |
+ CPUID_XSAVE_XSAVEOPT,
|
|
|
1b1826 |
+ .xlevel = 0x80000008,
|
|
|
1b1826 |
+ .model_id = "Intel Core Processor (Broadwell, IBRS)",
|
|
|
1b1826 |
+ },
|
|
|
1b1826 |
+ {
|
|
|
1b1826 |
.name = "Skylake-Client",
|
|
|
1b1826 |
.level = 0xd,
|
|
|
1b1826 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
@@ -1081,6 +1272,51 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
1b1826 |
.model_id = "Intel Core Processor (Skylake)",
|
|
|
1b1826 |
},
|
|
|
1b1826 |
{
|
|
|
1b1826 |
+ .name = "Skylake-Client-IBRS",
|
|
|
1b1826 |
+ .level = 0xd,
|
|
|
1b1826 |
+ .vendor = CPUID_VENDOR_INTEL,
|
|
|
1b1826 |
+ .family = 6,
|
|
|
1b1826 |
+ .model = 94,
|
|
|
1b1826 |
+ .stepping = 3,
|
|
|
1b1826 |
+ .features[FEAT_1_EDX] =
|
|
|
1b1826 |
+ CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
|
|
|
1b1826 |
+ CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
|
|
|
1b1826 |
+ CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
|
|
|
1b1826 |
+ CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
|
|
|
1b1826 |
+ CPUID_DE | CPUID_FP87,
|
|
|
1b1826 |
+ .features[FEAT_1_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
|
|
|
1b1826 |
+ CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
|
|
|
1b1826 |
+ CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
|
|
|
1b1826 |
+ CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
|
|
|
1b1826 |
+ CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |
|
|
|
1b1826 |
+ CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_EDX] =
|
|
|
1b1826 |
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
|
|
|
1b1826 |
+ CPUID_EXT2_SYSCALL,
|
|
|
1b1826 |
+ .features[FEAT_8000_0001_ECX] =
|
|
|
1b1826 |
+ CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EDX] =
|
|
|
1b1826 |
+ CPUID_7_0_EDX_SPEC_CTRL,
|
|
|
1b1826 |
+ .features[FEAT_7_0_EBX] =
|
|
|
1b1826 |
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
|
|
|
1b1826 |
+ CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX,
|
|
|
1b1826 |
+ /* Missing: XSAVES (not supported by some Linux versions,
|
|
|
1b1826 |
+ * including v4.1 to v4.12).
|
|
|
1b1826 |
+ * KVM doesn't yet expose any XSAVES state save component,
|
|
|
1b1826 |
+ * and the only one defined in Skylake (processor tracing)
|
|
|
1b1826 |
+ * probably will block migration anyway.
|
|
|
1b1826 |
+ */
|
|
|
1b1826 |
+ .features[FEAT_XSAVE] =
|
|
|
1b1826 |
+ CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
|
|
|
1b1826 |
+ CPUID_XSAVE_XGETBV1,
|
|
|
1b1826 |
+ .xlevel = 0x80000008,
|
|
|
1b1826 |
+ .model_id = "Intel Core Processor (Skylake, IBRS)",
|
|
|
1b1826 |
+ },
|
|
|
1b1826 |
+ {
|
|
|
1b1826 |
.name = "Opteron_G1",
|
|
|
1b1826 |
.level = 5,
|
|
|
1b1826 |
.vendor = CPUID_VENDOR_AMD,
|
|
|
1b1826 |
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
|
|
|
1b1826 |
index b23242d..9353b48 100644
|
|
|
1b1826 |
--- a/target-i386/cpu.h
|
|
|
1b1826 |
+++ b/target-i386/cpu.h
|
|
|
1b1826 |
@@ -587,6 +587,9 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];
|
|
|
1b1826 |
|
|
|
1b1826 |
#define CPUID_7_0_EDX_AVX512_4VNNIW (1U << 2) /* AVX512 Neural Network Instructions */
|
|
|
1b1826 |
#define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) /* AVX512 Multiply Accumulation Single Precision */
|
|
|
1b1826 |
+#define CPUID_7_0_EDX_SPEC_CTRL (1U << 26) /* Indirect Branch - Restrict Speculation */
|
|
|
1b1826 |
+
|
|
|
1b1826 |
+#define CPUID_8000_0008_EBX_IBPB (1U << 12) /* Indirect Branch Prediction Barrier */
|
|
|
1b1826 |
|
|
|
1b1826 |
#define CPUID_XSAVE_XSAVEOPT (1U << 0)
|
|
|
1b1826 |
#define CPUID_XSAVE_XSAVEC (1U << 1)
|
|
|
1b1826 |
--
|
|
|
1b1826 |
1.8.3.1
|
|
|
1b1826 |
|