73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
|
From 04f34e7c0b0fada186ca7012f5f4168f46483c5f Mon Sep 17 00:00:00 2001
|
||
|
|
From: "plai@redhat.com" <plai@redhat.com>
|
||
|
|
Date: Mon, 1 Jul 2019 16:17:34 +0100
|
||
|
|
Subject: [PATCH 05/39] i386: Disable OSPKE on CPU model definitions
|
||
|
|
|
||
|
|
RH-Author: plai@redhat.com
|
||
|
|
Message-id: <1561997854-9646-6-git-send-email-plai@redhat.com>
|
||
|
|
Patchwork-id: 89334
|
||
|
|
O-Subject: [RHEL8.1 qemu-kvm PATCH v6 5/5] i386: Disable OSPKE on CPU model definitions
|
||
|
|
Bugzilla: 1629906
|
||
|
|
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
||
|
|
|
||
|
|
From: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
|
||
|
|
Currently, the Cascadelake-Server, Icelake-Client, and
|
||
|
|
Icelake-Server are always generating the following warning:
|
||
|
|
|
||
|
|
qemu-system-x86_64: warning: \
|
||
|
|
host doesn't support requested feature: CPUID.07H:ECX [bit 4]
|
||
|
|
|
||
|
|
This happens because OSPKE was never returned by
|
||
|
|
GET_SUPPORTED_CPUID or x86_cpu_get_supported_feature_word().
|
||
|
|
OSPKE is a runtime flag automatically set by the KVM module or by
|
||
|
|
TCG code, was always cleared by x86_cpu_filter_features(), and
|
||
|
|
was not supposed to appear on the CPU model table.
|
||
|
|
|
||
|
|
Remove the OSPKE flag from the CPU model table entries, to avoid
|
||
|
|
the bogus warning and avoid returning invalid feature data on
|
||
|
|
query-cpu-* QMP commands. As OSPKE was always cleared by
|
||
|
|
x86_cpu_filter_features(), this won't have any guest-visible
|
||
|
|
impact.
|
||
|
|
|
||
|
|
Include a test case that should detect the problem if we introduce
|
||
|
|
a similar bug again.
|
||
|
|
|
||
|
|
Fixes: c7a88b52f62b ("i386: Add new model of Cascadelake-Server")
|
||
|
|
Fixes: 8a11c62da914 ("i386: Add new CPU model Icelake-{Server,Client}")
|
||
|
|
Cc: Tao Xu <tao3.xu@intel.com>
|
||
|
|
Cc: Robert Hoo <robert.hu@linux.intel.com>
|
||
|
|
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
Message-Id: <20190319200515.14999-1-ehabkost@redhat.com>
|
||
|
|
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
(cherry picked from commit bb4928c7cafe50ab2137a0034e350ef1bfa044d9)
|
||
|
|
Signed-off-by: Paul Lai <plai@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
target/i386/cpu.c
|
||
|
|
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
target/i386/cpu.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||
|
|
index 2538d82..af62281 100644
|
||
|
|
--- a/target/i386/cpu.c
|
||
|
|
+++ b/target/i386/cpu.c
|
||
|
|
@@ -2517,7 +2517,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
||
|
|
CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |
|
||
|
|
CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT,
|
||
|
|
.features[FEAT_7_0_ECX] =
|
||
|
|
- CPUID_7_0_ECX_PKU | CPUID_7_0_ECX_OSPKE |
|
||
|
|
+ CPUID_7_0_ECX_PKU |
|
||
|
|
CPUID_7_0_ECX_AVX512VNNI,
|
||
|
|
.features[FEAT_7_0_EDX] =
|
||
|
|
CPUID_7_0_EDX_SPEC_CTRL | CPUID_7_0_EDX_SPEC_CTRL_SSBD,
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|