From patchwork Tue Sep 29 11:00:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 290793 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B19ACC4727F for ; Tue, 29 Sep 2020 12:34:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A14A20789 for ; Tue, 29 Sep 2020 12:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601382897; bh=F5fsPoQoK52QDFt2GqrgIu6mAIg8STbXDPiQwngkJUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aCixo+fcDmJTQCugcM+PMYUnIwWvF2hTDi3fnnchPRDtoFYKlbxEjdJe/4g4P/ETp XDsT5fzg8fkT6BmvdOq7jv5UHz6Oqf1F2mh7qroTN/bdAABUKESVDvyPzCTMsYYDRk 8Pi6H0YZO0hmdYn7andg1l93AkjnIhq/Yj5eprlM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729840AbgI2Meo (ORCPT ); Tue, 29 Sep 2020 08:34:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:35542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729614AbgI2LVZ (ORCPT ); Tue, 29 Sep 2020 07:21:25 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3582823A53; Tue, 29 Sep 2020 11:19:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378372; bh=F5fsPoQoK52QDFt2GqrgIu6mAIg8STbXDPiQwngkJUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BMtZlaFVTSpW9E1Jd8NmT16XWztmXDw/jPMvblMsbj8zlNM35ObyRoiIkfN+PaGNf Yffw3X1OUd9Wcmt8Wz4gNfPmDIKTO7soWROg8hJE5fSKatBQjPnWXj2OmynWAGDbiZ r+CIsfCGvpWP7sJRtzxUie5ROHtTddj2E6b/EUKo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Piggin , Michael Ellerman , Christophe Leroy , Sasha Levin Subject: [PATCH 4.14 118/166] powerpc/traps: Make unrecoverable NMIs die instead of panic Date: Tue, 29 Sep 2020 13:00:30 +0200 Message-Id: <20200929105941.083823192@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicholas Piggin [ 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 Signed-off-by: Michael Ellerman Reviewed-by: Christophe Leroy Link: https://lore.kernel.org/r/20200508043408.886394-16-npiggin@gmail.com Signed-off-by: Sasha Levin --- 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;