|
 |
169b9a |
From 9349e4be5ecf8b70dfc36f6cad56297cd7aa5fc9 Mon Sep 17 00:00:00 2001
|
|
|
169b9a |
From: "plai@redhat.com" <plai@redhat.com>
|
|
|
169b9a |
Date: Wed, 27 Jun 2018 07:53:07 +0200
|
|
|
169b9a |
Subject: [PATCH 02/17] target-i386: Add support for UMIP and RDPID CPUID bits
|
|
|
169b9a |
|
|
|
169b9a |
RH-Author: plai@redhat.com
|
|
|
169b9a |
Message-id: <1526495303-9837-1-git-send-email-plai@redhat.com>
|
|
|
169b9a |
Patchwork-id: 80372
|
|
|
169b9a |
O-Subject: [RHEL7.6 PATCH BZ 1526638] target-i386: Add support for UMIP and RDPID CPUID bits
|
|
|
169b9a |
Bugzilla: 1526638
|
|
|
169b9a |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
169b9a |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
169b9a |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
169b9a |
|
|
|
169b9a |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
169b9a |
|
|
|
169b9a |
Tested by Intel OTC QA on icelake client hw.
|
|
|
169b9a |
Tested by Intel OTC Virtualization QA. Test Result:
|
|
|
169b9a |
XEN_UMIP_ENABLE : Check if UMIP has been enabled on the feature supported machine / PASS
|
|
|
169b9a |
XEN_UMIP_DISABLE: Verify if the UMIP can be turned off by boot. / PASS
|
|
|
169b9a |
XEN_UMIP_TEST : Check if the protection effect on the instructions of sgdt/sidt/sldt/smsw/str / PASS
|
|
|
169b9a |
XEN_UMIP_EX_TEST :Check if the protection effects on instruction of str, sldtand smsw for register and memory operands. /PASS
|
|
|
169b9a |
XEN_UMIP_TEST: Check if the protection effect on the instructions of sgdt/sidt/sldt/smsw/str / PASS
|
|
|
169b9a |
XEN_UMIP_EX_TEST: Check if the protection effects on instruction of str, sldtand smsw for register and memory operands / PASS
|
|
|
169b9a |
XEN_UMIP_LDT: Verify all the possible 32-bit address encodings / PASS
|
|
|
169b9a |
|
|
|
169b9a |
These are both stored in CPUID[EAX=7,EBX=0].ECX. KVM is going to
|
|
|
169b9a |
be able to emulate both (albeit with a performance loss in the case
|
|
|
169b9a |
of RDPID, which therefore will be in KVM_GET_EMULATED_CPUID rather
|
|
|
169b9a |
than KVM_GET_SUPPORTED_CPUID).
|
|
|
169b9a |
|
|
|
169b9a |
It's also possible to implement both in TCG, but this is for 2.8.
|
|
|
169b9a |
|
|
|
169b9a |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
169b9a |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
169b9a |
(cherry picked from commit c2f193b538032accb9db504998bf2ea7c0ef65af)
|
|
|
169b9a |
Signed-off-by: Paul Lai <plai@redhat.com>
|
|
|
169b9a |
|
|
|
169b9a |
Resolved Conflicts:
|
|
|
169b9a |
target-i386/cpu.c
|
|
|
169b9a |
---
|
|
|
169b9a |
target-i386/cpu.c | 4 ++--
|
|
|
169b9a |
target-i386/cpu.h | 2 ++
|
|
|
169b9a |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
169b9a |
|
|
|
169b9a |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
169b9a |
index 48a5507..0254747 100644
|
|
|
169b9a |
--- a/target-i386/cpu.c
|
|
|
169b9a |
+++ b/target-i386/cpu.c
|
|
|
169b9a |
@@ -155,12 +155,12 @@ static const char *cpuid_7_0_ebx_feature_name[] = {
|
|
|
169b9a |
};
|
|
|
169b9a |
|
|
|
169b9a |
static const char *cpuid_7_0_ecx_feature_name[] = {
|
|
|
169b9a |
- NULL, "avx512vbmi", NULL, "pku",
|
|
|
169b9a |
+ NULL, "avx512vbmi", "umip", "pku",
|
|
|
169b9a |
"ospke", NULL, "avx512vbmi2", NULL,
|
|
|
169b9a |
"gfni", "vaes", "vpclmulqdq", "avx512vnni",
|
|
|
169b9a |
"avx512bitalg", NULL, "avx512-vpopcntdq", NULL,
|
|
|
169b9a |
NULL, NULL, NULL, NULL,
|
|
|
169b9a |
- NULL, NULL, NULL, NULL,
|
|
|
169b9a |
+ NULL, NULL, "rdpid", NULL,
|
|
|
169b9a |
NULL, NULL, NULL, NULL,
|
|
|
169b9a |
NULL, NULL, NULL, NULL,
|
|
|
169b9a |
};
|
|
|
169b9a |
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
|
|
|
169b9a |
index a781639..c72b545 100644
|
|
|
169b9a |
--- a/target-i386/cpu.h
|
|
|
169b9a |
+++ b/target-i386/cpu.h
|
|
|
169b9a |
@@ -600,8 +600,10 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];
|
|
|
169b9a |
|
|
|
169b9a |
#define CPUID_8000_0008_EBX_IBPB (1U << 12) /* Indirect Branch Prediction Barrier */
|
|
|
169b9a |
|
|
|
169b9a |
+#define CPUID_7_0_ECX_UMIP (1U << 2)
|
|
|
169b9a |
#define CPUID_7_0_ECX_PKU (1U << 3)
|
|
|
169b9a |
#define CPUID_7_0_ECX_OSPKE (1U << 4)
|
|
|
169b9a |
+#define CPUID_7_0_ECX_RDPID (1U << 22)
|
|
|
169b9a |
|
|
|
169b9a |
#define CPUID_XSAVE_XSAVEOPT (1U << 0)
|
|
|
169b9a |
#define CPUID_XSAVE_XSAVEC (1U << 1)
|
|
|
169b9a |
--
|
|
|
169b9a |
1.8.3.1
|
|
|
169b9a |
|