diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2021-01-30 23:08:35 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-17 16:43:46 +0100 |
| commit | b960e8dc768be3a0de10a0f17a7e4d60b7a5460c (patch) | |
| tree | 306e80eb6fd1729a832dc83f8270a7834f624485 | |
| parent | 2f43ab9673662124074f7265cf9cec37ce174fab (diff) | |
| download | linux-stable-b960e8dc768be3a0de10a0f17a7e4d60b7a5460c.tar.gz linux-stable-b960e8dc768be3a0de10a0f17a7e4d60b7a5460c.tar.bz2 linux-stable-b960e8dc768be3a0de10a0f17a7e4d60b7a5460c.zip | |
powerpc: improve handling of unrecoverable system reset
[ Upstream commit 11cb0a25f71818ca7ab4856548ecfd83c169aa4d ]
If an unrecoverable system reset hits in process context, the system
does not have to panic. Similar to machine check, call nmi_exit()
before die().
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-26-npiggin@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 1b2d84cb373b..2379c4bf3979 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -433,8 +433,11 @@ out: die("Unrecoverable nested System Reset", regs, SIGABRT); #endif /* Must die if the interrupt is not recoverable */ - if (!(regs->msr & MSR_RI)) + if (!(regs->msr & MSR_RI)) { + /* For the reason explained in die_mce, nmi_exit before die */ + nmi_exit(); die("Unrecoverable System Reset", regs, SIGABRT); + } if (!nested) nmi_exit(); |