Misc patches for core_capabilites and split lock detection
cover Misc patches for core_capabilites and split lock detection
Patch 1 renames core_capability to core_capabilities to align with the latest SDM.
Patch 2 adds MSR_TEST_CTRL support.
Patch 3 prints info when guest is going to be killed due to split lock #AC
Xiaoyao Li (3):
target/i386: Rename CORE_CAPABILITY to CORE_CAPABILITIES target/i386: Add support for TEST_CTRL MSR target/i386: Tell why guest exits to user space due to #AC
target/i386/cpu.c | 12 ++++++------ target/i386/cpu.h | 8 +++++--- target/i386/kvm.c | 30 +++++++++++++++++++++++++----- target/i386/machine.c | 20 ++++++++++++++++++++ 4 files changed, 56 insertions(+), 14 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 target/i386: Rename CORE_CAPABILITY to CORE_CAPABILITIES
Intel SDM updates the name of MSR CORE_CAPABILITY to CORE_CAPABILITIES, so updating it QEMU.
--- target/i386/cpu.c | 12 ++++++------ target/i386/cpu.h | 6 +++--- target/i386/kvm.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-)
target/i386/cpu.c +6 -6
@@ -1216,7 +1216,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .index = MSR_IA32_ARCH_CAPABILITIES, }, }, - [FEAT_CORE_CAPABILITY ] = { + [FEAT_CORE_CAPABILITIES ] = { .type =MSR_FEATURE_WORD , .feat_names = {NULL ,NULL ,NULL ,NULL ,
@@ -1229,7 +1229,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { NULL, NULL, NULL, NULL, }, .msr = { - .index = MSR_IA32_CORE_CAPABILITY, + .index = MSR_IA32_CORE_CAPABILITIES, }, },
@@ -1406,8 +1406,8 @@ static FeatureDep feature_dependencies[] = { .to = { FEAT_ARCH_CAPABILITIES, ~0ull }, }, { - .from = { FEAT_7_0_EDX, CPUID_7_0_EDX_CORE_CAPABILITY }, - .to = { FEAT_CORE_CAPABILITY, ~0ull }, + .from = { FEAT_7_0_EDX, CPUID_7_0_EDX_CORE_CAPABILITIES }, + .to = { FEAT_CORE_CAPABILITIES, ~0ull }, }, { .from = { FEAT_1_ECX, CPUID_EXT_VMX },
@@ -3709,8 +3709,8 @@ static X86CPUDefinition builtin_x86_defs[] = { .features[FEAT_7_0_EDX] =CPUID_7_0_EDX_SPEC_CTRL |CPUID_7_0_EDX_ARCH_CAPABILITIES |CPUID_7_0_EDX_SPEC_CTRL_SSBD | - CPUID_7_0_EDX_CORE_CAPABILITY, - .features[FEAT_CORE_CAPABILITY ] = + CPUID_7_0_EDX_CORE_CAPABILITIES, + .features[FEAT_CORE_CAPABILITIES ] = MSR_CORE_CAP_SPLIT_LOCK_DETECT,/* * Missing: XSAVES (not supported by some Linux versions,
target/i386/cpu.h +3 -3
@@ -349,7 +349,7 @@ typedef enum X86Seg {#define MSR_VIRT_SSBD 0xc001011f#define MSR_IA32_PRED_CMD 0x49#define MSR_IA32_UCODE_REV 0x8b -#define MSR_IA32_CORE_CAPABILITY 0xcf +#define MSR_IA32_CORE_CAPABILITIES 0xcf#define MSR_IA32_ARCH_CAPABILITIES 0x10a#define ARCH_CAP_TSX_CTRL_MSR (1<<7)
@@ -526,7 +526,7 @@ typedef enum FeatureWord {FEAT_XSAVE_COMP_LO ,/* CPUID[EAX=0xd,ECX=0].EAX */ FEAT_XSAVE_COMP_HI ,/* CPUID[EAX=0xd,ECX=0].EDX */ FEAT_ARCH_CAPABILITIES , -FEAT_CORE_CAPABILITY , +FEAT_CORE_CAPABILITIES ,FEAT_VMX_PROCBASED_CTLS ,FEAT_VMX_SECONDARY_CTLS , FEAT_VMX_PINBASED_CTLS,
@@ -777,7 +777,7 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS];/* Arch Capabilities */ #define CPUID_7_0_EDX_ARCH_CAPABILITIES (1U << 29)/* Core Capability */ -#define CPUID_7_0_EDX_CORE_CAPABILITY (1U << 30) +#define CPUID_7_0_EDX_CORE_CAPABILITIES (1U << 30)/* Speculative Store Bypass Disable */ #define CPUID_7_0_EDX_SPEC_CTRL_SSBD (1U << 31)
target/i386/kvm.c +3 -3
@@ -2051,7 +2051,7 @@ static int kvm_get_supported_msrs(KVMState *s)case MSR_IA32_ARCH_CAPABILITIES : has_msr_arch_capabs = true;break ; -case MSR_IA32_CORE_CAPABILITY : +case MSR_IA32_CORE_CAPABILITIES : has_msr_core_capabs = true;break ;case MSR_IA32_VMX_VMFUNC :
@@ -2696,8 +2696,8 @@ static void kvm_init_msrs(X86CPU *cpu) }if (has_msr_core_capabs) { -kvm_msr_entry_add (cpu,MSR_IA32_CORE_CAPABILITY , - env->features[FEAT_CORE_CAPABILITY ]); +kvm_msr_entry_add (cpu,MSR_IA32_CORE_CAPABILITIES , + env->features[FEAT_CORE_CAPABILITIES ]); }if (has_msr_ucode_rev) {
Signature · 1 line
2.20.1
PATCH 2/3 target/i386: Add support for TEST_CTRL MSR
In reply to Xiaoyao LiFrom: Xiaoyao Li <[email protected]>
MSR_TEST_CTRL is needed and accessed by feature split lock detection.
--- target/i386/cpu.h | 2 ++ target/i386/kvm.c | 13 +++++++++++++ target/i386/machine.c | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+)
target/i386/cpu.h +2 -0
@@ -343,6 +343,7 @@ typedef enum X86Seg {#define MSR_IA32_APICBASE_ENABLE (1<<11)#define MSR_IA32_APICBASE_EXTD (1 << 10)#define MSR_IA32_APICBASE_BASE (0xfffffU<<12) +#define MSR_TEST_CTRL 0x33#define MSR_IA32_FEATURE_CONTROL 0x0000003a#define MSR_TSC_ADJUST 0x0000003b#define MSR_IA32_SPEC_CTRL 0x48
@@ -1466,6 +1467,7 @@ typedef struct CPUX86State {uint64_t spec_ctrl;uint64_t virt_ssbd; +uint64_t msr_test_ctrl;/* End of state preserved by INIT (dummy marker). */ struct {} end_init_save;
target/i386/kvm.c +13 -0
@@ -101,6 +101,7 @@ static bool has_msr_umwait;static bool has_msr_spec_ctrl;static bool has_msr_tsx_ctrl;static bool has_msr_virt_ssbd; +static bool has_msr_test_ctrl;static bool has_msr_smi_count;static bool has_msr_arch_capabs;static bool has_msr_core_capabs;
@@ -2048,6 +2049,9 @@ static int kvm_get_supported_msrs(KVMState *s)case MSR_VIRT_SSBD : has_msr_virt_ssbd = true;break ; +case MSR_TEST_CTRL : + has_msr_test_ctrl = true; +break ;case MSR_IA32_ARCH_CAPABILITIES : has_msr_arch_capabs = true;break ;
@@ -2766,6 +2770,9 @@ static int kvm_put_msrs(X86CPU *cpu, int level)if (has_msr_virt_ssbd) {kvm_msr_entry_add (cpu,MSR_VIRT_SSBD , env->virt_ssbd); } +if (has_msr_test_ctrl) { +kvm_msr_entry_add (cpu,MSR_TEST_CTRL , env->msr_test_ctrl); + }#ifdef TARGET_X86_64 if (lm_capable_kernel) {
@@ -3154,6 +3161,9 @@ static int kvm_get_msrs(X86CPU *cpu)if (has_msr_virt_ssbd) {kvm_msr_entry_add (cpu,MSR_VIRT_SSBD ,0 ); } +if (has_msr_test_ctrl) { +kvm_msr_entry_add (cpu,MSR_TEST_CTRL ,0 ); + }if (!env->tsc_valid) {kvm_msr_entry_add (cpu,MSR_IA32_TSC ,0 ); env->tsc_valid = !runstate_is_running ();
@@ -3549,6 +3559,9 @@ static int kvm_get_msrs(X86CPU *cpu)case MSR_VIRT_SSBD : env->virt_ssbd = msrs[i].data;break ; +case MSR_TEST_CTRL : + env->msr_test_ctrl = msrs[i].data; +break ;case MSR_IA32_RTIT_CTL : env->msr_rtit_ctrl = msrs[i].data;break ;
target/i386/machine.c +20 -0
@@ -1252,6 +1252,25 @@ static const VMStateDescription vmstate_msr_virt_ssbd = { } }; +static bool msr_test_ctrl_needed (void *opaque) +{ +X86CPU *cpu = opaque; +CPUX86State *env = &cpu->env; + +return env->msr_test_ctrl !=0 ; +} + +static const VMStateDescription vmstate_msr_test_ctrl = { + .name ="cpu/msr_test_ctrl" , + .version_id =1 , + .minimum_version_id =1 , + .needed = msr_test_ctrl_needed, + .fields = (VMStateField []){ +VMSTATE_UINT64 (env.msr_test_ctrl,X86CPU ), +VMSTATE_END_OF_LIST () + } +}; +static bool svm_npt_needed (void *opaque) {X86CPU *cpu = opaque;
@@ -1439,6 +1458,7 @@ VMStateDescription vmstate_x86_cpu = { &vmstate_mcg_ext_ctl, &vmstate_msr_intel_pt, &vmstate_msr_virt_ssbd, + &vmstate_msr_test_ctrl, &vmstate_svm_npt, #ifndef TARGET_X86_64 &vmstate_efer32,
Signature · 1 line
2.20.1
PATCH 3/3 target/i386: Tell why guest exits to user space due to #AC
In reply to Xiaoyao LiTell why guest exits from kvm to user space due to #AC, so user knows what happened.
--- target/i386/kvm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
target/i386/kvm.c +9 -2
@@ -4464,8 +4464,15 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) ret =-1 ;break ;case KVM_EXIT_EXCEPTION : -fprintf (stderr,"KVM: exception %d exit (error code 0x%x)\n" , - run->ex.exception, run->ex.error_code); +if (run->ex.exception ==AC_VECTOR ) { +fprintf (stderr,"Guest encounters an #AC due to split lock. Because " +"guest doesn't expect this split lock #AC (it doesn't set " +"msr_test_ctrl.split_lock_detect) and host sets " +"split_lock_detect=fatal, guest has to be killed.\n" ); + }else { +fprintf (stderr,"KVM: exception %d exit (error code 0x%x)\n" , + run->ex.exception, run->ex.error_code); + } ret =-1 ;break ;case KVM_EXIT_DEBUG :
Signature · 1 line
2.20.1