From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Mahesh Jagannath Salgaonkar <mahesh@linux.vnet.ibm.com>
Subject: [PATCH v2 3/3] powerpc: machine check interrupt is a non-maskable interrupt
Date: Wed, 19 Jul 2017 16:59:12 +1000 [thread overview]
Message-ID: <20170719065912.19183-4-npiggin@gmail.com> (raw)
In-Reply-To: <20170719065912.19183-1-npiggin@gmail.com>
Use nmi_enter similarly to system reset interrupts. This uses NMI
printk NMI buffers and turns off various debugging facilities that
helps avoid tripping on ourselves or other CPUs.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/traps.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 2849c4f50324..6d31f9d7c333 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -789,8 +789,10 @@ int machine_check_generic(struct pt_regs *regs)
void machine_check_exception(struct pt_regs *regs)
{
- enum ctx_state prev_state = exception_enter();
int recover = 0;
+ bool nested = in_nmi();
+ if (!nested)
+ nmi_enter();
__this_cpu_inc(irq_stat.mce_exceptions);
@@ -820,10 +822,11 @@ void machine_check_exception(struct pt_regs *regs)
/* Must die if the interrupt is not recoverable */
if (!(regs->msr & MSR_RI))
- panic("Unrecoverable Machine check");
+ nmi_panic(regs, "Unrecoverable Machine check");
bail:
- exception_exit(prev_state);
+ if (!nested)
+ nmi_exit();
}
void SMIException(struct pt_regs *regs)
--
2.11.0
next prev parent reply other threads:[~2017-07-19 6:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-19 6:59 [PATCH v2 0/3] machine check handling improvements Nicholas Piggin
2017-07-19 6:59 ` [PATCH v2 1/3] powerpc/powernv: handle the platform error reboot in ppc_md.restart Nicholas Piggin
2017-07-19 7:16 ` Nicholas Piggin
2017-07-20 5:39 ` Mahesh Jagannath Salgaonkar
2017-08-31 11:36 ` [v2, " Michael Ellerman
2017-07-19 6:59 ` [PATCH v2 2/3] powerpc/powernv: machine check use kernel crash path Nicholas Piggin
2017-07-20 7:14 ` Mahesh Jagannath Salgaonkar
2017-07-19 6:59 ` Nicholas Piggin [this message]
2018-10-08 15:39 ` [PATCH v2 3/3] powerpc: machine check interrupt is a non-maskable interrupt Christophe LEROY
2018-10-09 4:32 ` Nicholas Piggin
2018-10-09 4:46 ` Christophe LEROY
2018-10-09 5:30 ` Nicholas Piggin
2018-10-09 9:36 ` Christophe Leroy
2018-10-09 11:16 ` Nicholas Piggin
2018-10-09 12:01 ` Christophe LEROY
2018-10-09 12:14 ` Nicholas Piggin
2018-10-11 14:23 ` Christophe LEROY
2018-10-11 14:31 ` Christophe LEROY
2018-10-13 8:29 ` Christophe Leroy
2018-10-13 8:48 ` Nicholas Piggin
2018-10-13 8:56 ` Christophe LEROY
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=20170719065912.19183-4-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mahesh@linux.vnet.ibm.com \
--cc=mpe@ellerman.id.au \
/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).