Fix MCE handling on AMD hosts
PATCH v3 2/3 i386: Explicitly ignore unsupported BUS_MCEERR_AO MCE on AMD guest
In reply to John AllenFrom: William Roche <[email protected]>
AMD guests can't currently deal with BUS_MCEERR_AO MCE injection as it panics the VM kernel. We filter this event and provide a warning message.
---
v3:
- New patch
--- target/i386/kvm/kvm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
target/i386/kvm/kvm.c +10 -3
@@ -604,6 +604,10 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code) mcg_status |=MCG_STATUS_RIPV ; } }else { +if (code ==BUS_MCEERR_AO ) { +/* XXX we don't support BUS_MCEERR_AO injection on AMD yet */ +return ; + } mcg_status |=MCG_STATUS_EIPV |MCG_STATUS_RIPV ; }
@@ -655,7 +659,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)if (ram_addr !=RAM_ADDR_INVALID &&kvm_physical_memory_addr_from_host (c->kvm_state, addr, &paddr)) {kvm_hwpoison_page_add (ram_addr); -kvm_mce_inject (cpu, paddr, code); +if (!IS_AMD_CPU (env) || code !=BUS_MCEERR_AO ) { +kvm_mce_inject (cpu, paddr, code); + }/* * Use different logging severity based on error type.
@@ -668,8 +674,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) addr, paddr, "BUS_MCEERR_AR"); }else {warn_report ("Guest MCE Memory Error at QEMU addr %p and " -"GUEST addr 0x%" HWADDR_PRIx" of type %s injected" , - addr, paddr,"BUS_MCEERR_AO" ); +"GUEST addr 0x%" HWADDR_PRIx" of type %s %s" , + addr, paddr,"BUS_MCEERR_AO" , +IS_AMD_CPU (env) ?"ignored on AMD guest" :"injected" ); }return ;
Signature · 1 line
2.39.3
PATCH v3 3/3 i386: Add support for SUCCOR feature
In reply to John AllenAdd cpuid bit definition for the SUCCOR feature. This cpuid bit is required to be exposed to guests to allow them to handle machine check exceptions on AMD hosts.
----
v2:
- Add "succor" feature word.
- Add case to kvm_arch_get_supported_cpuid for the SUCCOR feature.
--- target/i386/cpu.c | 18 +++++++++++++++++- target/i386/cpu.h | 4 ++++ target/i386/kvm/kvm.c | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-)
target/i386/cpu.c +17 -1
@@ -1029,6 +1029,22 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .tcg_features = TCG_APM_FEATURES, .unmigratable_flags = CPUID_APM_INVTSC, }, + [FEAT_8000_0007_EBX] = { + .type = CPUID_FEATURE_WORD, + .feat_names = { +NULL ,"succor" ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , +NULL ,NULL ,NULL ,NULL , + NULL, NULL, NULL, NULL, + }, + .cpuid = { .eax = 0x80000007, .reg = R_EBX, }, + .tcg_features =0 , + .unmigratable_flags = 0, + }, [FEAT_8000_0008_EBX] = { .type =CPUID_FEATURE_WORD , .feat_names = {
@@ -6554,7 +6570,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,break ;case 0x80000007 : *eax =0 ; - *ebx =0 ; + *ebx = env->features[FEAT_8000_0007_EBX ]; *ecx =0 ; *edx = env->features[FEAT_8000_0007_EDX ];break ;
target/i386/cpu.h +4 -0
@@ -598,6 +598,7 @@ typedef enum FeatureWord {FEAT_7_1_EAX ,/* CPUID[EAX=7,ECX=1].EAX */ FEAT_8000_0001_EDX ,/* CPUID[8000_0001].EDX */ FEAT_8000_0001_ECX ,/* CPUID[8000_0001].ECX */ +FEAT_8000_0007_EBX ,/* CPUID[8000_0007].EBX */ FEAT_8000_0007_EDX ,/* CPUID[8000_0007].EDX */ FEAT_8000_0008_EBX ,/* CPUID[8000_0008].EBX */ FEAT_8000_0021_EAX, /* CPUID[8000_0021].EAX */
@@ -942,6 +943,9 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,/* Packets which contain IP payload have LIP values */ #define CPUID_14_0_ECX_LIP (1U << 31) +/* RAS Features */ +#define CPUID_8000_0007_EBX_SUCCOR (1U << 1) +/* CLZERO instruction */ #define CPUID_8000_0008_EBX_CLZERO (1U << 0)/* Always save/restore FP error pointers */
target/i386/kvm/kvm.c +2 -0
@@ -477,6 +477,8 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,*/ cpuid_1_edx =kvm_arch_get_supported_cpuid (s,1 ,0 ,R_EDX ); ret |= cpuid_1_edx &CPUID_EXT2_AMD_ALIASES ; + }else if (function ==0x80000007 && reg ==R_EBX ) { + ret |=CPUID_8000_0007_EBX_SUCCOR ; }else if (function ==KVM_CPUID_FEATURES && reg ==R_EAX ) {/* kvm_pv_unhalt is reported by GET_SUPPORTED_CPUID, but it can't * be enabled without the in-kernel irqchip
Signature · 1 line
2.39.3
v3 cover Fix MCE handling on AMD hosts
In the event that a guest process attempts to access memory that has been poisoned in response to a deferred uncorrected MCE, an AMD system will currently generate a SIGBUS error which will result in the entire guest being shutdown. Ideally, we only want to kill the guest process that accessed poisoned memory in this case.
This support has been included in qemu for Intel hosts for a long time, but there are a couple of changes needed for AMD hosts. First, we will need to expose the SUCCOR cpuid bit to guests. Second, we need to modify the MCE injection code to avoid Intel specific behavior when we are running on an AMD host.
v2:
- Add "succor" feature word.
- Add case to kvm_arch_get_supported_cpuid for the SUCCOR feature.
v3:
- Reorder series. Only enable SUCCOR after bugs have been fixed.
- Introduce new patch ignoring AO errors.
John Allen (2):
i386: Fix MCE support for AMD hosts
i386: Add support for SUCCOR feature
William Roche (1):
i386: Explicitly ignore unsupported BUS_MCEERR_AO MCE on AMD guest
target/i386/cpu.c | 18 +++++++++++++++++- target/i386/cpu.h | 4 ++++ target/i386/helper.c | 4 ++++ target/i386/kvm/kvm.c | 34 ++++++++++++++++++++++++---------- 4 files changed, 49 insertions(+), 11 deletions(-)
Signature · 1 line
2.39.3
PATCH v3 1/3 i386: Fix MCE support for AMD hosts
For the most part, AMD hosts can use the same MCE injection code as Intel but, there are instances where the qemu implementation is Intel specific. First, MCE deliviery works differently on AMD and does not support broadcast. Second, kvm_mce_inject generates MCEs that include a number of Intel specific status bits. Modify kvm_mce_inject to properly generate MCEs on AMD platforms.
---
v3:
- Update to latest qemu code that introduces using MCG_STATUS_RIPV in the case of a BUS_MCEERR_AR on a non-AMD machine.
--- target/i386/helper.c | 4 ++++ target/i386/kvm/kvm.c | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)
target/i386/helper.c +4 -0
@@ -91,6 +91,10 @@ int cpu_x86_support_mca_broadcast(CPUX86State *env)int family =0 ;int model =0 ; +if (IS_AMD_CPU (env)) { +return 0 ; + } +cpu_x86_version (env, &family, &model);if ((family ==6 && model >=14 ) || family >6 ) {return 1 ;
target/i386/kvm/kvm.c +11 -6
@@ -590,16 +590,21 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code)CPUState *cs =CPU (cpu);CPUX86State *env = &cpu->env;uint64_t status =MCI_STATUS_VAL |MCI_STATUS_UC |MCI_STATUS_EN | -MCI_STATUS_MISCV |MCI_STATUS_ADDRV |MCI_STATUS_S ; +MCI_STATUS_MISCV |MCI_STATUS_ADDRV ;uint64_t mcg_status =MCG_STATUS_MCIP ;int flags =0 ; -if (code ==BUS_MCEERR_AR ) { - status |=MCI_STATUS_AR |0x134 ; - mcg_status |=MCG_STATUS_RIPV |MCG_STATUS_EIPV ; +if (!IS_AMD_CPU (env)) { + status |=MCI_STATUS_S ; +if (code ==BUS_MCEERR_AR ) { + status |=MCI_STATUS_AR |0x134 ; + mcg_status |=MCG_STATUS_RIPV |MCG_STATUS_EIPV ; + }else { + status |=0xc0 ; + mcg_status |=MCG_STATUS_RIPV ; + } }else { - status |=0xc0 ; - mcg_status |=MCG_STATUS_RIPV ; + mcg_status |=MCG_STATUS_EIPV |MCG_STATUS_RIPV ; } flags =cpu_x86_support_mca_broadcast (env) ?MCE_INJECT_BROADCAST :0 ;
Signature · 1 line
2.39.3
Re: [PATCH v3 2/3] i386: Explicitly ignore unsupported BUS_MCEERR_AO MCE on AMD guest
In reply to John AllenQuoted 30 lines · John Allen
From: William Roche <[email protected]>
AMD guests can't currently deal with
BUS_MCEERR_AOMCE injection as it panics the VM kernel. We filter this event and provide a warning message.Signed-off-by William Roche <[email protected]>---
v3:
- New patch--- target/i386/kvm/kvm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)target/i386/kvm/kvm.c +4
-0@@ -604,6 +604,10 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code) mcg_status |=MCG_STATUS_RIPV ; } }else { +if (code ==BUS_MCEERR_AO ) { +/* XXX we don't support BUS_MCEERR_AO injection on AMD yet */ +return ; + } mcg_status |=MCG_STATUS_EIPV |MCG_STATUS_RIPV ; }
target/i386/kvm/kvm.c void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) · line 662
Quoted 5 lines
target/i386/kvm/kvm.c +1
-1@@ -655,7 +659,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)if (ram_addr !=RAM_ADDR_INVALID &&kvm_physical_memory_addr_from_host (c->kvm_state, addr, &paddr)) {kvm_hwpoison_page_add (ram_addr); -kvm_mce_inject (cpu, paddr, code); +if (!IS_AMD_CPU (env) || code !=BUS_MCEERR_AO ) {
Isn't the 'optional' case we already handle inside kvm_mce_inject()? So this check seems repetitive to me.
Thanks,
Pankaj
Quoted 17 lines
target/i386/kvm/kvm.c +5
-2+kvm_mce_inject (cpu, paddr, code); + }/* * Use different logging severity based on error type. @@ -668,8 +674,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) addr, paddr, "BUS_MCEERR_AR"); }else {warn_report ("Guest MCE Memory Error at QEMU addr %p and " -"GUEST addr 0x%" HWADDR_PRIx" of type %s injected" , - addr, paddr,"BUS_MCEERR_AO" ); +"GUEST addr 0x%" HWADDR_PRIx" of type %s %s" , + addr, paddr,"BUS_MCEERR_AO" , +IS_AMD_CPU (env) ?"ignored on AMD guest" :"injected" ); }return ;
Re: [PATCH v3 2/3] i386: Explicitly ignore unsupported BUS_MCEERR_AO MCE on AMD guest
Quoted 20 lines · Pankaj
Quoted 20 lines
target/i386/kvm/kvm.c +2
-0@@ -604,6 +604,10 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code) mcg_status |= MCG_STATUS_RIPV; } } else { + if (code == BUS_MCEERR_AO) { + /* XXX we don't support BUS_MCEERR_AO injection on AMDyet */
+ return;
+ }
mcg_status|=MCG_STATUS_EIPV|MCG_STATUS_RIPV; }target/i386/kvm/kvm.c +0
-0@@ -655,7 +659,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)
Quoted 8 lines
Quoted 5 lines
if (
ram_addr!=RAM_ADDR_INVALID&&kvm_physical_memory_addr_from_host(c->kvm_state, addr, &paddr)) {kvm_hwpoison_page_add(ram_addr);
-kvm_mce_inject(cpu, paddr, code);
+ if (!IS_AMD_CPU(env) || code !=BUS_MCEERR_AO) {Isn't the 'optional' case we already handle inside
kvm_mce_inject()? So this check seems repetitive to me.
You are right, it is repetitive, but can be considered as a reminder of the situation and an explanation of the "ignored on AMD guest" message later in this function.
Of course it can be removed if you think that the code is easier to read without it. When the AMD BUS_MCEERR_AO support is integrated, both locations would need to be cleared, but this sounds reasonable to me.
John, it's up to you.
William.
Re: [PATCH v3 2/3] i386: Explicitly ignore unsupported BUS_MCEERR_AO MCE on AMD guest
Quoted 28 lines
Quoted 19 lines
Quoted 19 lines
target/i386/kvm/kvm.c +2
-0@@ -604,6 +604,10 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code) mcg_status |= MCG_STATUS_RIPV; } } else { + if (code == BUS_MCEERR_AO) { + /* XXX we don't support BUS_MCEERR_AO injection on AMDyet */
+ return;
+ }
mcg_status|=MCG_STATUS_EIPV|MCG_STATUS_RIPV; }target/i386/kvm/kvm.c +0
-0@@ -655,7 +659,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)Quoted 8 lines
Quoted 5 lines
if (
ram_addr!=RAM_ADDR_INVALID&&kvm_physical_memory_addr_from_host(c->kvm_state, addr, &paddr)) {kvm_hwpoison_page_add(ram_addr);
-kvm_mce_inject(cpu, paddr, code);
+ if (!IS_AMD_CPU(env) || code !=BUS_MCEERR_AO) {Isn't the 'optional' case we already handle inside
kvm_mce_inject()? So this check seems repetitive to me.
Quoted 3 lines
You are right, it is repetitive, but can be considered as a reminder of the situation and an explanation of the "ignored on AMD guest" message later in this function.
Of course it can be removed if you think that the code is easier to read without it. When the AMD
BUS_MCEERR_AOsupport is integrated, both locations would need to be cleared, but this sounds reasonable to me.
Yes, I think it helps to read the code better and less conditional.
Thanks,
Pankaj
Quoted 4 lines
John, it's up to you.
William.