releases/5.0.14/x86-mce-improve-error-message-when-kernel-cannot-recover-p2.patch

   1 From 41f035a86b5b72a4f947c38e94239d20d595352a Mon Sep 17 00:00:00 2001
   2 From: Tony Luck <tony.luck@intel.com>
   3 Date: Mon, 25 Feb 2019 12:59:40 -0800
   4 Subject: x86/mce: Improve error message when kernel cannot recover, p2
   5
   6 From: Tony Luck <tony.luck@intel.com>
   7
   8 commit 41f035a86b5b72a4f947c38e94239d20d595352a upstream.
   9
  10 In
  11
  12   c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover")
  13
  14 a case was added for a machine check caused by a DATA access to poison
  15 memory from the kernel. A case should have been added also for an
  16 uncorrectable error during an instruction fetch in the kernel.
  17
  18 Add that extra case so the error message now reads:
  19
  20   mce: [Hardware Error]: Machine check: Instruction fetch error in kernel
  21
  22 Fixes: c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover")
  23 Signed-off-by: Tony Luck <tony.luck@intel.com>
  24 Signed-off-by: Borislav Petkov <bp@suse.de>
  25 Cc: "H. Peter Anvin" <hpa@zytor.com>
  26 Cc: Ingo Molnar <mingo@redhat.com>
  27 Cc: Pu Wen <puwen@hygon.cn>
  28 Cc: Thomas Gleixner <tglx@linutronix.de>
  29 Cc: x86-ml <x86@kernel.org>
  30 Link: https://lkml.kernel.org/r/20190225205940.15226-1-tony.luck@intel.com
  31 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  32
  33 ---
  34  arch/x86/kernel/cpu/mce/severity.c |    5 +++++
  35  1 file changed, 5 insertions(+)
  36
  37 --- a/arch/x86/kernel/cpu/mce/severity.c
  38 +++ b/arch/x86/kernel/cpu/mce/severity.c
  39 @@ -165,6 +165,11 @@ static struct severity {
  40                 SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA),
  41                 KERNEL
  42                 ),
  43 +       MCESEV(
  44 +               PANIC, "Instruction fetch error in kernel",
  45 +               SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR),
  46 +               KERNEL
  47 +               ),
  48  #endif
  49         MCESEV(
  50                 PANIC, "Action required: unknown MCACOD",