lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 102/127] powerpc/traps: Make unrecoverable NMIs die instead of panic
    Date
    From: Nicholas Piggin <npiggin@gmail.com>

    [ Upstream commit 265d6e588d87194c2fe2d6c240247f0264e0c19b ]

    System Reset and Machine Check interrupts that are not recoverable due
    to being nested or interrupting when RI=0 currently panic. This is not
    necessary, and can often just kill the current context and recover.

    Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
    Link: https://lore.kernel.org/r/20200508043408.886394-16-npiggin@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kernel/traps.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
    index 3c9457420aee8..0f1a888c04a84 100644
    --- a/arch/powerpc/kernel/traps.c
    +++ b/arch/powerpc/kernel/traps.c
    @@ -357,11 +357,11 @@ out:
    #ifdef CONFIG_PPC_BOOK3S_64
    BUG_ON(get_paca()->in_nmi == 0);
    if (get_paca()->in_nmi > 1)
    - nmi_panic(regs, "Unrecoverable nested System Reset");
    + die("Unrecoverable nested System Reset", regs, SIGABRT);
    #endif
    /* Must die if the interrupt is not recoverable */
    if (!(regs->msr & MSR_RI))
    - nmi_panic(regs, "Unrecoverable System Reset");
    + die("Unrecoverable System Reset", regs, SIGABRT);

    if (!nested)
    nmi_exit();
    @@ -701,7 +701,7 @@ void machine_check_exception(struct pt_regs *regs)

    /* Must die if the interrupt is not recoverable */
    if (!(regs->msr & MSR_RI))
    - nmi_panic(regs, "Unrecoverable Machine check");
    + die("Unrecoverable Machine check", regs, SIGBUS);

    return;

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 04:32    [W:2.475 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site