From: "Jan H. Schönherr" <jschoenh@amazon.de>
To: Tony Luck <tony.luck@intel.com>, Borislav Petkov <bp@alien8.de>
Cc: "Jan H. Schönherr" <jschoenh@amazon.de>,
linux-edac@vger.kernel.org,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Subject: [PATCH 5/6] x86/mce: Pass MCE message to mce_panic() on failed kernel recovery
Date: Tue, 10 Dec 2019 01:07:32 +0100 [thread overview]
Message-ID: <20191210000733.17979-6-jschoenh@amazon.de> (raw)
In-Reply-To: <20191210000733.17979-1-jschoenh@amazon.de>
In commit b2f9d678e28c ("x86/mce: Check for faults tagged in
EXTABLE_CLASS_FAULT exception table entries") another call to mce_panic()
was introduced. Pass the message of the handled MCE to that instance
of mce_panic() as well, as there doesn't seem to be a reason not to.
Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
---
arch/x86/kernel/cpu/mce/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index b11a74e3fea9..677e9079e5ba 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -1351,7 +1351,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)
ist_end_non_atomic();
} else {
if (!fixup_exception(regs, X86_TRAP_MC, error_code, 0))
- mce_panic("Failed kernel mode recovery", &m, NULL);
+ mce_panic("Failed kernel mode recovery", &m, msg);
}
out_ist:
--
2.22.0.3.gb49bb57c8208.dirty
next prev parent reply other threads:[~2019-12-10 0:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 0:07 [PATCH 0/6] x86/mce: Various fixes and cleanups for MCE handling Jan H. Schönherr
2019-12-10 0:07 ` [PATCH 1/6] x86/mce: Take action on UCNA/Deferred errors again Jan H. Schönherr
2019-12-10 0:07 ` [PATCH 2/6] x86/mce: Make mce=nobootlog work again Jan H. Schönherr
2019-12-16 17:15 ` Borislav Petkov
2019-12-10 0:07 ` [PATCH 3/6] x86/mce: Fix possibly incorrect severity calculation on AMD Jan H. Schönherr
2019-12-16 17:26 ` Borislav Petkov
2019-12-16 17:35 ` Ghannam, Yazen
2019-12-10 0:07 ` [PATCH 4/6] x86/mce: Fix handling of optional message string Jan H. Schönherr
2019-12-16 17:37 ` Borislav Petkov
2019-12-19 17:49 ` Jan H. Schönherr
2019-12-20 10:01 ` Borislav Petkov
2019-12-10 0:07 ` Jan H. Schönherr [this message]
2019-12-10 0:07 ` [PATCH 6/6] x86/mce: Remove mce_inject_log() in favor of mce_log() Jan H. Schönherr
2019-12-11 0:25 ` [PATCH 0/6] x86/mce: Various fixes and cleanups for MCE handling Luck, Tony
2019-12-12 12:25 ` Jan H. Schönherr
2019-12-16 16:52 ` Borislav Petkov
2019-12-16 21:59 ` Luck, Tony
2019-12-17 1:19 ` Ghannam, Yazen
2019-12-17 7:34 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210000733.17979-6-jschoenh@amazon.de \
--to=jschoenh@amazon.de \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).