x86/mce: Do not overwrite MCi_STATUS in mce_no_way_out()
Borislav Petkov
maintainerPATCH 1/1 x86/mce: Do not overwrite MCi_STATUS in mce_no_way_out()
From: Borislav Petkov <[email protected]>
mce_no_way_out() does a quick check during #MC to see whether some of the MCEs logged would require the kernel to panic immediately. And it passes a struct mce where MCi_STATUS gets written.
However, after having saved a valid status value, the next iteration of the loop which goes over the MCA banks on the CPU, overwrites the valid status value because we're using struct mce as storage instead of a temporary variable.
Which leads to MCE records with an empty status value:
mce: [Hardware Error]: CPU 0: Machine Check Exception: 6 Bank 0: 0000000000000000
mce: [Hardware Error]: RIP 10:<ffffffffbd42fbd7> {trigger_mce+0x7/0x10}
Change it to use a temporary variable and save to mce.status only when valid. It will still overwrite the old status value if more than one MCEs are logged, which warrants the second change in this patch:
Return immediately when severity is a panic one so that we can panic immediately with the first fatal MCE logged.
--- arch/x86/kernel/cpu/mcheck/mce.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +6 -3
@@ -772,12 +772,15 @@ EXPORT_SYMBOL_GPL(machine_check_poll);static int mce_no_way_out (struct mce *m,char **msg,unsigned long *validp,struct pt_regs *regs) { +u64 mci_status;int i, ret =0 ;char *tmp;for (i =0 ; i < mca_cfg.banks; i++) { - m->status =mce_rdmsrl (msr_ops.status (i)); -if (m->status &MCI_STATUS_VAL ) { + mci_status =mce_rdmsrl (msr_ops.status (i)); +if (mci_status &MCI_STATUS_VAL ) { + m->status = mci_status; +__set_bit (i, validp);if (quirk_no_way_out)quirk_no_way_out (i, m, regs);
@@ -785,7 +788,7 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp,if (mce_severity (m, mca_cfg.tolerant, &tmp, true) >=MCE_PANIC_SEVERITY ) { *msg = tmp; - ret =1 ; +return 1 ; } }return ret;
Signature · 1 line
2.17.0.582.gccdcbd54c
Counter proposal. We don't need the temp mci_status because we exit the loop early. Nor the "ret" variable.
How does this look?
-Tony
---
arch/x86/kernel/cpu/mcheck/mce.c +8 -8
@@ -772,23 +772,23 @@ EXPORT_SYMBOL_GPL(machine_check_poll);static int mce_no_way_out (struct mce *m,char **msg,unsigned long *validp,struct pt_regs *regs) { -int i, ret =0 ; +int i;char *tmp;for (i =0 ; i < mca_cfg.banks; i++) { m->status =mce_rdmsrl (msr_ops.status (i)); -if (m->status &MCI_STATUS_VAL ) { -__set_bit (i, validp); -if (quirk_no_way_out) -quirk_no_way_out (i, m, regs); - } +if (!(m->status &MCI_STATUS_VAL )) +continue ; +__set_bit (i, validp); +if (quirk_no_way_out) +quirk_no_way_out (i, m, regs);if (mce_severity (m, mca_cfg.tolerant, &tmp, true) >=MCE_PANIC_SEVERITY ) { *msg = tmp; - ret =1 ; +return 1 ; } } -return ret; +return 0 ; }/*
Borislav Petkov
maintainerQuoted 5 lines · Tony
Counter proposal. We don't need the temp
mci_statusbecause we exit the loop early. Nor the "ret" variable.How does this look?
Yap, better. I'll test it later or tomorrow:
---
From: Borislav Petkov <[email protected]>
Date: Thu, 21 Jun 2018 14:18:47 +0200
Subject: [PATCH] x86/mce: Do not overwrite MCi_STATUS in mce_no_way_out()
mce_no_way_out() does a quick check during #MC to see whether some of the MCEs logged would require the kernel to panic immediately. And it passes a struct mce where MCi_STATUS gets written.
However, after having saved a valid status value, the next iteration of the loop which goes over the MCA banks on the CPU, overwrites the valid status value because we're using struct mce as storage instead of a temporary variable.
Which leads to MCE records with an empty status value:
mce: [Hardware Error]: CPU 0: Machine Check Exception: 6 Bank 0: 0000000000000000
mce: [Hardware Error]: RIP 10:<ffffffffbd42fbd7> {trigger_mce+0x7/0x10}
In order to prevent the loss of the status register value, return immediately when severity is a panic one so that we can panic immediately with the first fatal MCE logged. This is also the intention of this function and not to noodle over the banks while a fatal MCE is already logged.
--- arch/x86/kernel/cpu/mcheck/mce.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +9 -8
@@ -772,23 +772,24 @@ EXPORT_SYMBOL_GPL(machine_check_poll);static int mce_no_way_out (struct mce *m,char **msg,unsigned long *validp,struct pt_regs *regs) { -int i, ret =0 ;char *tmp; +int i;for (i =0 ; i < mca_cfg.banks; i++) { m->status =mce_rdmsrl (msr_ops.status (i)); -if (m->status &MCI_STATUS_VAL ) { -__set_bit (i, validp); -if (quirk_no_way_out) -quirk_no_way_out (i, m, regs); - } +if (!(m->status &MCI_STATUS_VAL )) +continue ; + +__set_bit (i, validp); +if (quirk_no_way_out) +quirk_no_way_out (i, m, regs);if (mce_severity (m, mca_cfg.tolerant, &tmp, true) >=MCE_PANIC_SEVERITY ) { *msg = tmp; - ret =1 ; +return 1 ; } } -return ret; +return 0 ; }/*
Signature · 7 lines
2.17.0.582.gccdcbd54c
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Quoted 9 lines · Borislav Petkov
Quoted 5 lines · Tony
Counter proposal. We don't need the temp
mci_statusbecause we exit the loop early. Nor the "ret" variable.How does this look?
Yap, better. I'll test it later or tomorrow:
Or even better. Just adds the "mce_read_aux()" to check ADDRV and MISCV and populate more of the struct mce.
-Tony
arch/x86/kernel/cpu/mcheck/mce.c +9 -8
@@ -772,23 +772,24 @@ EXPORT_SYMBOL_GPL(machine_check_poll);static int mce_no_way_out (struct mce *m,char **msg,unsigned long *validp,struct pt_regs *regs) { -int i, ret =0 ; +int i;char *tmp;for (i =0 ; i < mca_cfg.banks; i++) { m->status =mce_rdmsrl (msr_ops.status (i)); -if (m->status &MCI_STATUS_VAL ) { -__set_bit (i, validp); -if (quirk_no_way_out) -quirk_no_way_out (i, m, regs); - } +if (!(m->status &MCI_STATUS_VAL )) +continue ; +__set_bit (i, validp); +if (quirk_no_way_out) +quirk_no_way_out (i, m, regs);if (mce_severity (m, mca_cfg.tolerant, &tmp, true) >=MCE_PANIC_SEVERITY ) { +mce_read_aux (m, i); *msg = tmp; - ret =1 ; +return 1 ; } } -return ret; +return 0 ; }/*
Borislav Petkov
maintainerQuoted 6 lines · Tony
Quoted 5 lines · Borislav Petkov
Quoted 4 lines · Tony
Counter proposal. We don't need the temp
mci_statusbecause we exit the loop early. Nor the "ret" variable.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
How does this look?
Yap, better. I'll test it later or tomorrow:
Or even better. Just adds the "
mce_read_aux()" to check ADDRV and MISCV and populate more of the struct mce.
I thought about it but decided to leave it for another day. But ok, it is a one more line and I guess it is ok to have it in the same patch, I'll add it.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.