104 lines
5.5 KiB
Diff
104 lines
5.5 KiB
Diff
|
From 1ffeb321151b3878bcbb2229639456c0677305f5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "plai@redhat.com" <plai@redhat.com>
|
||
|
|
Date: Fri, 15 May 2020 18:02:43 +0100
|
||
|
|
Subject: [PATCH 17/17] target/i386: Add missed features to Cooperlake CPU
|
||
|
|
model
|
||
|
|
|
||
|
|
RH-Author: plai@redhat.com
|
||
|
|
Message-id: <20200515180243.17488-5-plai@redhat.com>
|
||
|
|
Patchwork-id: 96611
|
||
|
|
O-Subject: [RHEL8.2.1 AV qemu-kvm PATCH 4/4] target/i386: Add missed features to Cooperlake CPU model
|
||
|
|
Bugzilla: 1769912
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
|
||
|
|
From: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
|
||
|
|
It lacks VMX features and two security feature bits (disclosed recently) in
|
||
|
|
MSR_IA32_ARCH_CAPABILITIES in current Cooperlake CPU model, so add them.
|
||
|
|
|
||
|
|
Fixes: 22a866b6166d ("i386: Add new CPU model Cooperlake")
|
||
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
Message-Id: <20191225063018.20038-3-xiaoyao.li@intel.com>
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
(cherry picked from commit 2dea9d9ca4ea7e9afe83d0b4153b21a16987e866)
|
||
|
|
Signed-off-by: Paul Lai <plai@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
target/i386/cpu.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||
|
|
1 file changed, 50 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||
|
|
index 996a74f..b763adc 100644
|
||
|
|
--- a/target/i386/cpu.c
|
||
|
|
+++ b/target/i386/cpu.c
|
||
|
|
@@ -3202,7 +3202,8 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
||
|
|
CPUID_7_0_EDX_SPEC_CTRL_SSBD | CPUID_7_0_EDX_ARCH_CAPABILITIES,
|
||
|
|
.features[FEAT_ARCH_CAPABILITIES] =
|
||
|
|
MSR_ARCH_CAP_RDCL_NO | MSR_ARCH_CAP_IBRS_ALL |
|
||
|
|
- MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO,
|
||
|
|
+ MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO |
|
||
|
|
+ MSR_ARCH_CAP_PSCHANGE_MC_NO | MSR_ARCH_CAP_TAA_NO,
|
||
|
|
.features[FEAT_7_1_EAX] =
|
||
|
|
CPUID_7_1_EAX_AVX512_BF16,
|
||
|
|
/*
|
||
|
|
@@ -3217,6 +3218,54 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
||
|
|
CPUID_XSAVE_XGETBV1,
|
||
|
|
.features[FEAT_6_EAX] =
|
||
|
|
CPUID_6_EAX_ARAT,
|
||
|
|
+ /* Missing: Mode-based execute control (XS/XU), processor tracing, TSC scaling */
|
||
|
|
+ .features[FEAT_VMX_BASIC] = MSR_VMX_BASIC_INS_OUTS |
|
||
|
|
+ MSR_VMX_BASIC_TRUE_CTLS,
|
||
|
|
+ .features[FEAT_VMX_ENTRY_CTLS] = VMX_VM_ENTRY_IA32E_MODE |
|
||
|
|
+ VMX_VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | VMX_VM_ENTRY_LOAD_IA32_PAT |
|
||
|
|
+ VMX_VM_ENTRY_LOAD_DEBUG_CONTROLS | VMX_VM_ENTRY_LOAD_IA32_EFER,
|
||
|
|
+ .features[FEAT_VMX_EPT_VPID_CAPS] = MSR_VMX_EPT_EXECONLY |
|
||
|
|
+ MSR_VMX_EPT_PAGE_WALK_LENGTH_4 | MSR_VMX_EPT_WB | MSR_VMX_EPT_2MB |
|
||
|
|
+ MSR_VMX_EPT_1GB | MSR_VMX_EPT_INVEPT |
|
||
|
|
+ MSR_VMX_EPT_INVEPT_SINGLE_CONTEXT | MSR_VMX_EPT_INVEPT_ALL_CONTEXT |
|
||
|
|
+ MSR_VMX_EPT_INVVPID | MSR_VMX_EPT_INVVPID_SINGLE_ADDR |
|
||
|
|
+ MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT | MSR_VMX_EPT_INVVPID_ALL_CONTEXT |
|
||
|
|
+ MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT_NOGLOBALS | MSR_VMX_EPT_AD_BITS,
|
||
|
|
+ .features[FEAT_VMX_EXIT_CTLS] =
|
||
|
|
+ VMX_VM_EXIT_ACK_INTR_ON_EXIT | VMX_VM_EXIT_SAVE_DEBUG_CONTROLS |
|
||
|
|
+ VMX_VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL |
|
||
|
|
+ VMX_VM_EXIT_LOAD_IA32_PAT | VMX_VM_EXIT_LOAD_IA32_EFER |
|
||
|
|
+ VMX_VM_EXIT_SAVE_IA32_PAT | VMX_VM_EXIT_SAVE_IA32_EFER |
|
||
|
|
+ VMX_VM_EXIT_SAVE_VMX_PREEMPTION_TIMER,
|
||
|
|
+ .features[FEAT_VMX_MISC] = MSR_VMX_MISC_ACTIVITY_HLT |
|
||
|
|
+ MSR_VMX_MISC_STORE_LMA | MSR_VMX_MISC_VMWRITE_VMEXIT,
|
||
|
|
+ .features[FEAT_VMX_PINBASED_CTLS] = VMX_PIN_BASED_EXT_INTR_MASK |
|
||
|
|
+ VMX_PIN_BASED_NMI_EXITING | VMX_PIN_BASED_VIRTUAL_NMIS |
|
||
|
|
+ VMX_PIN_BASED_VMX_PREEMPTION_TIMER | VMX_PIN_BASED_POSTED_INTR,
|
||
|
|
+ .features[FEAT_VMX_PROCBASED_CTLS] = VMX_CPU_BASED_VIRTUAL_INTR_PENDING |
|
||
|
|
+ VMX_CPU_BASED_USE_TSC_OFFSETING | VMX_CPU_BASED_HLT_EXITING |
|
||
|
|
+ VMX_CPU_BASED_INVLPG_EXITING | VMX_CPU_BASED_MWAIT_EXITING |
|
||
|
|
+ VMX_CPU_BASED_RDPMC_EXITING | VMX_CPU_BASED_RDTSC_EXITING |
|
||
|
|
+ VMX_CPU_BASED_CR8_LOAD_EXITING | VMX_CPU_BASED_CR8_STORE_EXITING |
|
||
|
|
+ VMX_CPU_BASED_TPR_SHADOW | VMX_CPU_BASED_MOV_DR_EXITING |
|
||
|
|
+ VMX_CPU_BASED_UNCOND_IO_EXITING | VMX_CPU_BASED_USE_IO_BITMAPS |
|
||
|
|
+ VMX_CPU_BASED_MONITOR_EXITING | VMX_CPU_BASED_PAUSE_EXITING |
|
||
|
|
+ VMX_CPU_BASED_VIRTUAL_NMI_PENDING | VMX_CPU_BASED_USE_MSR_BITMAPS |
|
||
|
|
+ VMX_CPU_BASED_CR3_LOAD_EXITING | VMX_CPU_BASED_CR3_STORE_EXITING |
|
||
|
|
+ VMX_CPU_BASED_MONITOR_TRAP_FLAG |
|
||
|
|
+ VMX_CPU_BASED_ACTIVATE_SECONDARY_CONTROLS,
|
||
|
|
+ .features[FEAT_VMX_SECONDARY_CTLS] =
|
||
|
|
+ VMX_SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
|
||
|
|
+ VMX_SECONDARY_EXEC_WBINVD_EXITING | VMX_SECONDARY_EXEC_ENABLE_EPT |
|
||
|
|
+ VMX_SECONDARY_EXEC_DESC | VMX_SECONDARY_EXEC_RDTSCP |
|
||
|
|
+ VMX_SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE |
|
||
|
|
+ VMX_SECONDARY_EXEC_ENABLE_VPID | VMX_SECONDARY_EXEC_UNRESTRICTED_GUEST |
|
||
|
|
+ VMX_SECONDARY_EXEC_APIC_REGISTER_VIRT |
|
||
|
|
+ VMX_SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |
|
||
|
|
+ VMX_SECONDARY_EXEC_RDRAND_EXITING | VMX_SECONDARY_EXEC_ENABLE_INVPCID |
|
||
|
|
+ VMX_SECONDARY_EXEC_ENABLE_VMFUNC | VMX_SECONDARY_EXEC_SHADOW_VMCS |
|
||
|
|
+ VMX_SECONDARY_EXEC_RDSEED_EXITING | VMX_SECONDARY_EXEC_ENABLE_PML,
|
||
|
|
+ .features[FEAT_VMX_VMFUNC] = MSR_VMX_VMFUNC_EPT_SWITCHING,
|
||
|
|
.xlevel = 0x80000008,
|
||
|
|
.model_id = "Intel Xeon Processor (Cooperlake)",
|
||
|
|
},
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|