Blame SOURCES/kvm-target-i386-Add-ARCH_CAPABILITIES-related-bits-into-.patch

77c23f
From 4c9201a83e3ff48d2a55e45a34eb27966a1e4ab0 Mon Sep 17 00:00:00 2001
77c23f
From: "plai@redhat.com" <plai@redhat.com>
77c23f
Date: Fri, 5 Jun 2020 18:37:33 -0400
77c23f
Subject: [PATCH 3/3] target/i386: Add ARCH_CAPABILITIES related bits into
77c23f
 Icelake-Server CPU model
77c23f
MIME-Version: 1.0
77c23f
Content-Type: text/plain; charset=UTF-8
77c23f
Content-Transfer-Encoding: 8bit
77c23f
77c23f
RH-Author: plai@redhat.com
77c23f
Message-id: <20200605183733.8269-1-plai@redhat.com>
77c23f
Patchwork-id: 97380
77c23f
O-Subject: [RHEL8.2.1 AV qemu-kvm PATCH] target/i386: Add ARCH_CAPABILITIES related bits into Icelake-Server CPU model
77c23f
Bugzilla: 1840342
77c23f
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
77c23f
RH-Acked-by: Bandan Das <bsd@redhat.com>
77c23f
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
77c23f
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
77c23f
77c23f
From: Xiaoyao Li <xiaoyao.li@intel.com>
77c23f
77c23f
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1840342
77c23f
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=28983822
77c23f
Branch: rhel-av-8.2.1
77c23f
77c23f
Tested on HOST: intel-whitley-09.khw1.lab.eng.bos.redhat.com
77c23f
77c23f
1. qemu-kvm -cpu host …
77c23f
        VM guest does have arch_capabilities in cpuinfo/flags.
77c23f
	[Expected success]
77c23f
77c23f
2. qemu-kvm -cpu Icelake-Server …
77c23f
        VM guest does NOT have arch_capabilities in cpuinfo/flags.
77c23f
	[Expected failure]
77c23f
77c23f
3. qemu-kvm -cpu Icelake-Server-v3 …
77c23f
        VM guest does have arch_capabilities in cpuinfo/flags.
77c23f
	[Expected success]
77c23f
77c23f
---
77c23f
77c23f
Current Icelake-Server CPU model lacks all the features enumerated by
77c23f
MSR_IA32_ARCH_CAPABILITIES.
77c23f
77c23f
Add them, so that guest of "Icelake-Server" can see all of them.
77c23f
77c23f
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
77c23f
Message-Id: <20200316095605.12318-1-xiaoyao.li@intel.com>
77c23f
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
77c23f
(cherry picked from commit d965dc35592d24c0c1519f1c566223c6277cb80e)
77c23f
Signed-off-by: Paul Lai <plai@redhat.com>
77c23f
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
77c23f
---
77c23f
 target/i386/cpu.c | 13 +++++++++++++
77c23f
 1 file changed, 13 insertions(+)
77c23f
77c23f
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
77c23f
index b763adcdc5..7d7b016bb7 100644
77c23f
--- a/target/i386/cpu.c
77c23f
+++ b/target/i386/cpu.c
77c23f
@@ -3496,6 +3496,19 @@ static X86CPUDefinition builtin_x86_defs[] = {
77c23f
                     { /* end of list */ }
77c23f
                 },
77c23f
             },
77c23f
+            {
77c23f
+                .version = 3,
77c23f
+                .props = (PropValue[]) {
77c23f
+                    { "arch-capabilities", "on" },
77c23f
+                    { "rdctl-no", "on" },
77c23f
+                    { "ibrs-all", "on" },
77c23f
+                    { "skip-l1dfl-vmentry", "on" },
77c23f
+                    { "mds-no", "on" },
77c23f
+                    { "pschange-mc-no", "on" },
77c23f
+                    { "taa-no", "on" },
77c23f
+                    { /* end of list */ }
77c23f
+                },
77c23f
+            },
77c23f
             { /* end of list */ }
77c23f
         }
77c23f
     },
77c23f
-- 
77c23f
2.27.0
77c23f