| From 41f035a86b5b72a4f947c38e94239d20d595352a Mon Sep 17 00:00:00 2001 |
| From: Tony Luck <tony.luck@intel.com> |
| Date: Mon, 25 Feb 2019 12:59:40 -0800 |
| Subject: x86/mce: Improve error message when kernel cannot recover, p2 |
| |
| From: Tony Luck <tony.luck@intel.com> |
| |
| commit 41f035a86b5b72a4f947c38e94239d20d595352a upstream. |
| |
| In |
| |
| c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover") |
| |
| a case was added for a machine check caused by a DATA access to poison |
| memory from the kernel. A case should have been added also for an |
| uncorrectable error during an instruction fetch in the kernel. |
| |
| Add that extra case so the error message now reads: |
| |
| mce: [Hardware Error]: Machine check: Instruction fetch error in kernel |
| |
| Fixes: c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover") |
| Signed-off-by: Tony Luck <tony.luck@intel.com> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Cc: "H. Peter Anvin" <hpa@zytor.com> |
| Cc: Ingo Molnar <mingo@redhat.com> |
| Cc: Pu Wen <puwen@hygon.cn> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: x86-ml <x86@kernel.org> |
| Link: https://lkml.kernel.org/r/20190225205940.15226-1-tony.luck@intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kernel/cpu/mce/severity.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/arch/x86/kernel/cpu/mce/severity.c |
| +++ b/arch/x86/kernel/cpu/mce/severity.c |
| @@ -165,6 +165,11 @@ static struct severity { |
| SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA), |
| KERNEL |
| ), |
| + MCESEV( |
| + PANIC, "Instruction fetch error in kernel", |
| + SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR), |
| + KERNEL |
| + ), |
| #endif |
| MCESEV( |
| PANIC, "Action required: unknown MCACOD", |
