* [PATCH] x86/mce: Improve error message when kernel cannot recover (part 2)
@ 2019-02-25 20:59 Tony Luck
2019-02-25 22:44 ` [tip:ras/core] x86/mce: Improve error message when kernel cannot recover, p2 tip-bot for Tony Luck
0 siblings, 1 reply; 2+ messages in thread
From: Tony Luck @ 2019-02-25 20:59 UTC (permalink / raw)
To: Borislav Petkov; +Cc: Tony Luck, x86, linux-kernel
In c7d606f560e4:
("x86/mce: Improve error message when kernel cannot recover")
we added a case for a machine check caused by a DATA access to poison
memory from the kernel. We should also have added a case for an
uncorrectable error during an instruction fetch in the kernel.
Add the 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>
---
arch/x86/kernel/cpu/mce/severity.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c
index dc3e26e905a3..65201e180fe0 100644
--- 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",
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:ras/core] x86/mce: Improve error message when kernel cannot recover, p2
2019-02-25 20:59 [PATCH] x86/mce: Improve error message when kernel cannot recover (part 2) Tony Luck
@ 2019-02-25 22:44 ` tip-bot for Tony Luck
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Tony Luck @ 2019-02-25 22:44 UTC (permalink / raw)
To: linux-tip-commits
Cc: x86, puwen, bp, tony.luck, tglx, hpa, mingo, mingo, linux-kernel
Commit-ID: 41f035a86b5b72a4f947c38e94239d20d595352a
Gitweb: https://git.kernel.org/tip/41f035a86b5b72a4f947c38e94239d20d595352a
Author: Tony Luck <tony.luck@intel.com>
AuthorDate: Mon, 25 Feb 2019 12:59:40 -0800
Committer: Borislav Petkov <bp@suse.de>
CommitDate: Mon, 25 Feb 2019 23:21:35 +0100
x86/mce: Improve error message when kernel cannot recover, p2
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
---
arch/x86/kernel/cpu/mce/severity.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c
index dc3e26e905a3..65201e180fe0 100644
--- 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",
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-25 22:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-25 20:59 [PATCH] x86/mce: Improve error message when kernel cannot recover (part 2) Tony Luck
2019-02-25 22:44 ` [tip:ras/core] x86/mce: Improve error message when kernel cannot recover, p2 tip-bot for Tony Luck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).