Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp975309ybt; Wed, 17 Jun 2020 19:38:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaiZUJCaI8+HiqwuDIm3kQsALe6apWwdNBTpaFYQp55egNqa4CvnfGP8AZsNbfB++55DUS X-Received: by 2002:aa7:d2d9:: with SMTP id k25mr2072128edr.43.1592447889561; Wed, 17 Jun 2020 19:38:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592447889; cv=none; d=google.com; s=arc-20160816; b=fK9Qk4HG8tMZeHuNB7nLpiX7S6mhCmELFbt/Y54P549CWofo4hKd8SsETjoJn96MgC u99aVTMYjsi2aDbJ+zIBbZuVIJ/iX3c1HCRfMzp7J4TMCHCsMluivMUolCz+IAHd+WDD tTm+1cycyb/EFgXg2G/XJfCJyD+MIOenKzGF9XXdMmxMsk9hIEKPgeTVKCWGZPNGRUPH oM/GXjWUhfTEjGrQWBuYRFHgUcUs8GPcihBDk4StrYMvnWFYYfd4p/PbwATs8FR3e8zr lT0cffC4K4g1rI81ADic8+bEhR+PsNy09Uv7jSCN0HndU0xu2GOWewRksv99csmwrgZG TosA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HqXMTrUlrgoTw4BrNhrKqFHjWuEtx0frgPo5pXO30d0=; b=wK/LjwqWgnXzRqtgio/Ub/Dd5OE6wqsgt7/YcaBD1c9q4svghVLppBj0rTFcIpKIPU r3JUp8h4/oMcwmFpPXSUbQAG4o2VgkqZPkoH/PwqNQTGJ9Wv6O1a5useHl4rssEf2H8G /tbye9p8z6uGV5VC5fTy6z6SjE7IgDPOfxpn/zPLCde1DqioWC7wlgJ6JaFLfl6PKeSK aH+hNmRAnDwjhnsTdUc47lt4vtiK3YQJfRRJpEDl2B+LIja5PwmzyaekWfUToduTkM/0 wvSBRE8woBF3wolY+MiK1KjY/ARJ0O6dG51GHai9CaTC+ntIHtBwgqrQ7uKOoODNWZ64 qwBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=P3ACGsSv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y7si1131406edo.382.2020.06.17.19.37.47; Wed, 17 Jun 2020 19:38:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=P3ACGsSv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729261AbgFRBOB (ORCPT + 99 others); Wed, 17 Jun 2020 21:14:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:41716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728063AbgFRBMw (ORCPT ); Wed, 17 Jun 2020 21:12:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D5CA920CC7; Thu, 18 Jun 2020 01:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442771; bh=OqayClWImIhBqOFAFtfiY7UDh3l2XDUGo57JCkuN/ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P3ACGsSvpQSqSMQlxwp264AhcoQFGqKloK7cudLfxgSocd6N/OocM0Ibne9HDVUWf 2mfRNnIpnIab/aGFARaPcDlpQ8ow2PmbGRbmHMG2A2zHfESJcn7YEx4pr/5m8/QCdb jJ26Skal4fDNpbpRnKzncFM8yUZbQqRYpayANF98= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicholas Piggin , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.7 219/388] powerpc/64s/exceptions: Machine check reconcile irq state Date: Wed, 17 Jun 2020 21:05:16 -0400 Message-Id: <20200618010805.600873-219-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicholas Piggin [ Upstream commit f0fd9dd3c213c947dfb5bc2cad3ef5e30d3258ec ] pseries fwnmi machine check code pops the soft-irq checks in rtas_call (after the next patch to remove rtas_token from this call path). 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 Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200508043408.886394-5-npiggin@gmail.com Signed-off-by: Sasha Levin --- 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 463372046169..d3e19934cca9 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1117,11 +1117,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.25.1