lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 229/280] powerpc/traps: fix recoverability of machine check handling on book3s/32
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe Leroy <christophe.leroy@c-s.fr>

    commit 0bbea75c476b77fa7d7811d6be911cc7583e640f upstream.

    Looks like book3s/32 doesn't set RI on machine check, so
    checking RI before calling die() will always be fatal
    allthought this is not an issue in most cases.

    Fixes: b96672dd840f ("powerpc: Machine check interrupt is a non-maskable interrupt")
    Fixes: daf00ae71dad ("powerpc/traps: restore recoverability of machine_check interrupts")
    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    Cc: stable@vger.kernel.org
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/kernel/traps.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/arch/powerpc/kernel/traps.c
    +++ b/arch/powerpc/kernel/traps.c
    @@ -767,15 +767,15 @@ void machine_check_exception(struct pt_r
    if (check_io_access(regs))
    goto bail;

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

    die("Machine check", regs, SIGBUS);

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

    bail:

    \
     
     \ /
      Last update: 2019-03-22 13:39    [W:4.023 / U:0.560 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site