From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 0CF7DC38A2A for ; Fri, 8 May 2020 13:58:53 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C205206B8 for ; Fri, 8 May 2020 13:58:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="SzYUwsfW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C205206B8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49JX486lsYzDr6v for ; Fri, 8 May 2020 23:58:48 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49JWd75n6HzDqss for ; Fri, 8 May 2020 23:38:51 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=SzYUwsfW; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49JWd53Jnvz9sTD; Fri, 8 May 2020 23:38:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1588945129; bh=+hsFPwLpyTJR+eNp78c6m1vf1CCo7+iBJW35LinLb8E=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=SzYUwsfWCq82xxHh1kq234hD9GOf/dtNilBE6Uzp06zLnJFiahWQzOYU0uWfmBa3L 7Li3gfLvgn5+UZVNrpdly0NCEIkJHlDCq28WmeSeIBuuWBf3hAXoaXEmSfuHRKaYHc Xj7QLdE0y2gkZQq6vhBbcXAOklohZdMsicYDVWHwWhs58168w3syIM9mVyFzJ9vcU2 rCeiiJ0tP7vFsHiPjFu1xgST36yWQu9xAqtQgw7p5b8DiMumcR08cn/l5aq3NZARq/ r80nHHgSCUZpL2chGhCT62ZxJJbZQ+ho+u/25Y+LwfRwlZP0p6aIDiskZdo7HvGYv9 RNOGSXzpL6t2g== From: Michael Ellerman To: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v4 04/16] powerpc/64s/exceptions: machine check reconcile irq state In-Reply-To: <20200508043408.886394-5-npiggin@gmail.com> References: <20200508043408.886394-1-npiggin@gmail.com> <20200508043408.886394-5-npiggin@gmail.com> Date: Fri, 08 May 2020 23:39:03 +1000 Message-ID: <878si2czrc.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Nicholas Piggin writes: > pseries fwnmi machine check code pops the soft-irq checks in rtas_call > (after the previous patch to remove rtas_token from this call path). ^ I changed this to "next" which I think is what you meant? cheers > Rather than play whack a mole with these and forever having fragile > code, it seems better to have the early machine check handler perform > the same kind of reconcile as the other NMI interrupts. > > WARNING: CPU: 0 PID: 493 at arch/powerpc/kernel/irq.c:343 > CPU: 0 PID: 493 Comm: a Tainted: G W > NIP: c00000000001ed2c LR: c000000000042c40 CTR: 0000000000000000 > REGS: c0000001fffd38b0 TRAP: 0700 Tainted: G W > MSR: 8000000000021003 CR: 28000488 XER: 00000000 > CFAR: c00000000001ec90 IRQMASK: 0 > GPR00: c000000000043820 c0000001fffd3b40 c0000000012ba300 0000000000000000 > GPR04: 0000000048000488 0000000000000000 0000000000000000 00000000deadbeef > GPR08: 0000000000000080 0000000000000000 0000000000000000 0000000000001001 > GPR12: 0000000000000000 c0000000014a0000 0000000000000000 0000000000000000 > GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR24: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR28: 0000000000000000 0000000000000001 c000000001360810 0000000000000000 > NIP [c00000000001ed2c] arch_local_irq_restore.part.0+0xac/0x100 > LR [c000000000042c40] unlock_rtas+0x30/0x90 > Call Trace: > [c0000001fffd3b40] [c000000001360810] 0xc000000001360810 (unreliable) > [c0000001fffd3b60] [c000000000043820] rtas_call+0x1c0/0x280 > [c0000001fffd3bb0] [c0000000000dc328] fwnmi_release_errinfo+0x38/0x70 > [c0000001fffd3c10] [c0000000000dcd8c] pseries_machine_check_realmode+0x1dc/0x540 > [c0000001fffd3cd0] [c00000000003fe04] machine_check_early+0x54/0x70 > [c0000001fffd3d00] [c000000000008384] machine_check_early_common+0x134/0x1f0 > --- interrupt: 200 at 0x13f1307c8 > LR = 0x7fff888b8528 > Instruction dump: > 60000000 7d2000a6 71298000 41820068 39200002 7d210164 4bffff9c 60000000 > 60000000 7d2000a6 71298000 4c820020 <0fe00000> 4e800020 60000000 60000000 > > Signed-off-by: Nicholas Piggin > --- > arch/powerpc/kernel/exceptions-64s.S | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S > index a42b73efb1a9..072772803b7c 100644 > --- a/arch/powerpc/kernel/exceptions-64s.S > +++ b/arch/powerpc/kernel/exceptions-64s.S > @@ -1116,11 +1116,30 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE) > li r10,MSR_RI > mtmsrd r10,1 > > + /* > + * Set IRQS_ALL_DISABLED and save PACAIRQHAPPENED (see > + * system_reset_common) > + */ > + li r10,IRQS_ALL_DISABLED > + stb r10,PACAIRQSOFTMASK(r13) > + lbz r10,PACAIRQHAPPENED(r13) > + std r10,RESULT(r1) > + ori r10,r10,PACA_IRQ_HARD_DIS > + stb r10,PACAIRQHAPPENED(r13) > + > addi r3,r1,STACK_FRAME_OVERHEAD > bl machine_check_early > std r3,RESULT(r1) /* Save result */ > ld r12,_MSR(r1) > > + /* > + * Restore soft mask settings. > + */ > + ld r10,RESULT(r1) > + stb r10,PACAIRQHAPPENED(r13) > + ld r10,SOFTE(r1) > + stb r10,PACAIRQSOFTMASK(r13) > + > #ifdef CONFIG_PPC_P7_NAP > /* > * Check if thread was in power saving mode. We come here when any > -- > 2.23.0