cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-target-i386-set-the-CPUID-level-to-0x14-on-old-machi.patch

902636
From 72a1827006be22791017ff2b671eac1c96be5d12 Mon Sep 17 00:00:00 2001
902636
From: "plai@redhat.com" <plai@redhat.com>
902636
Date: Thu, 7 May 2020 22:09:23 +0100
902636
Subject: [PATCH 01/26] target/i386: set the CPUID level to 0x14 on old
902636
 machine-type
902636
902636
RH-Author: plai@redhat.com
902636
Message-id: <20200507220923.13723-1-plai@redhat.com>
902636
Patchwork-id: 96347
902636
O-Subject: [RHEL8.2.1 AV qemu-kvm PATCH RESEND] target/i386: set the CPUID level to 0x14 on old machine-type
902636
Bugzilla: 1513681
902636
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
902636
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
902636
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
902636
902636
From: Luwei Kang <luwei.kang@intel.com>
902636
902636
BZ https://bugzilla.redhat.com/show_bug.cgi?id=1513681
902636
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=28146304
902636
Branch: rhel-av-8.2.1
902636
902636
Tested on intel-icelake-y-01.ml3.eng.bos.redhat.com.
902636
902636
The CPUID level need to be set to 0x14 manually on old
902636
machine-type if Intel PT is enabled in guest. E.g. the
902636
CPUID[0].EAX(level)=7 and CPUID[7].EBX[25](intel-pt)=1 when the
902636
Qemu with "-machine pc-i440fx-3.1 -cpu qemu64,+intel-pt" parameter.
902636
902636
Some Intel PT capabilities are exposed by leaf 0x14 and the
902636
missing capabilities will cause some MSRs access failed.
902636
This patch add a warning message to inform the user to extend
902636
the CPUID level.
902636
902636
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
902636
Signed-off-by: Luwei Kang <luwei.kang@intel.com>
902636
Message-Id: <1584031686-16444-1-git-send-email-luwei.kang@intel.com>
902636
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
902636
(cherry picked from commit ddc2fc9e4e42ebce48b088963dc7fbd1c08d5f33)
902636
Signed-off-by: Paul Lai <plai@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 target/i386/cpu.c | 11 ++++++++---
902636
 1 file changed, 8 insertions(+), 3 deletions(-)
902636
902636
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
902636
index 1685a8c..0f0a2db 100644
902636
--- a/target/i386/cpu.c
902636
+++ b/target/i386/cpu.c
902636
@@ -6206,9 +6206,14 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
902636
         x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE);
902636
 
902636
         /* Intel Processor Trace requires CPUID[0x14] */
902636
-        if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT) &&
902636
-             kvm_enabled() && cpu->intel_pt_auto_level) {
902636
-            x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14);
902636
+        if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT)) {
902636
+            if (cpu->intel_pt_auto_level) {
902636
+                x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14);
902636
+            } else if (cpu->env.cpuid_min_level < 0x14) {
902636
+                mark_unavailable_features(cpu, FEAT_7_0_EBX,
902636
+                    CPUID_7_0_EBX_INTEL_PT,
902636
+                    "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,+intel-pt,level=0x14\"");
902636
+            }
902636
         }
902636
 
902636
         /* CPU topology with multi-dies support requires CPUID[0x1F] */
902636
-- 
902636
1.8.3.1
902636