From patchwork Wed Sep 21 03:31:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 12983178 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AFA3FC32771 for ; Wed, 21 Sep 2022 03:33:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Et3KK8Hmo4+GmslEwHsCBC9ApGnH1rd/ZtT1ZJcTuyI=; b=WUUH4XD8BmfZnO OkdtxRNSQ/4ZCTaFebwTKjb4NOHHpjvkzmEAQlc6+qMwiWFnifToNE04H+0p18Y69lrfrbFSGkVpu 8dBM+8snpOfRxR94LVggBHVdwvoG7t48vj3WuEjt2zjVmwfT/k4/qXJTJZZ9T/xqAPoNtWfjDS6YA PqjBo/FIDLaucd4OYhPseaOY9TFgFKY6jThe0ScsnlvG78OIwxwjsmrljbuH88G285K3Xd9u1Wwv5 DI+8+SOIjqmx10Av9Zy93fodGBotfqWrzDrUBlg+G0vlfH5InrHkFwDlNvlCNGvdLW/nfTgsmBFky 8tlJiUgzRCXDPdE23KLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oaqT5-008Z4n-QY; Wed, 21 Sep 2022 03:32:11 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oaqSs-008YzA-49; Wed, 21 Sep 2022 03:32:01 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B2BBA62F2C; Wed, 21 Sep 2022 03:31:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C2B5C433B5; Wed, 21 Sep 2022 03:31:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663731117; bh=xstK3zkOHtc6QOgvpFphVjtbdDCoP5sViwZUf0BdeYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GCIcStlo/ud0blWsY+b5muH6E9HgVU6Q/HPMLkLjstBxUGGP7AT5zICnTh76hNBHz WwGZAOLN+Ngb0fqg1Q//ZFaEeZGfC4qKE8sCVK/TlGvFpnsekN7tbJA3gCjmDiWwkS MOtO1uVLOrgoJ9quvaS5neP8VtVZk0vQtLNpFH/MWBzGJ7v3MmHvAH2n1ZbFJ4821Y XbZbYlKb68m1VsC9EQidtMUohg/j9KkGTn40jEz5/k+g5sG5gW/9PT1fuFnzA8Pw7P c7QisY5HWUvowUOJgjSYNxb6urZHaWGi1uDA3q/NPtJzUjiBYmZKfMtw93qfYFzH/q D/DYk21slivpw== From: guoren@kernel.org To: xianting.tian@linux.alibaba.com, palmer@dabbelt.com, palmer@rivosinc.com, heiko@sntech.de, liaochang1@huawei.com, jszhang@kernel.org, arnd@arndb.de Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, Guo Ren , Guo Ren , Nick Kossifidis Subject: [PATCH V4 1/3] riscv: kexec: Fixup irq controller broken in kexec crash path Date: Tue, 20 Sep 2022 23:31:32 -0400 Message-Id: <20220921033134.3133319-2-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220921033134.3133319-1-guoren@kernel.org> References: <20220921033134.3133319-1-guoren@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220920_203158_288397_63228F7D X-CRM114-Status: GOOD ( 15.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Guo Ren If a crash happens on cpu3 and all interrupts are binding on cpu0, the bad irq routing will cause a crash kernel which can't receive any irq. Because crash kernel won't clean up all harts' PLIC enable bits in enable registers. This patch is similar to 9141a003a491 ("ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path") and 78fd584cdec0 ("arm64: kdump: implement machine_crash_shutdown()"), and PowerPC also has the same mechanism. Fixes: fba8a8674f68 ("RISC-V: Add kexec support") Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Xianting Tian Cc: Nick Kossifidis Cc: Palmer Dabbelt --- arch/riscv/kernel/machine_kexec.c | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/arch/riscv/kernel/machine_kexec.c b/arch/riscv/kernel/machine_kexec.c index ee79e6839b86..db41c676e5a2 100644 --- a/arch/riscv/kernel/machine_kexec.c +++ b/arch/riscv/kernel/machine_kexec.c @@ -15,6 +15,8 @@ #include /* For unreachable() */ #include /* For cpu_down() */ #include +#include +#include /* * kexec_image_info - Print received image details @@ -154,6 +156,37 @@ void crash_smp_send_stop(void) cpus_stopped = 1; } +static void machine_kexec_mask_interrupts(void) +{ + unsigned int i; + struct irq_desc *desc; + + for_each_irq_desc(i, desc) { + struct irq_chip *chip; + int ret; + + chip = irq_desc_get_chip(desc); + if (!chip) + continue; + + /* + * First try to remove the active state. If this + * fails, try to EOI the interrupt. + */ + ret = irq_set_irqchip_state(i, IRQCHIP_STATE_ACTIVE, false); + + if (ret && irqd_irq_inprogress(&desc->irq_data) && + chip->irq_eoi) + chip->irq_eoi(&desc->irq_data); + + if (chip->irq_mask) + chip->irq_mask(&desc->irq_data); + + if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data)) + chip->irq_disable(&desc->irq_data); + } +} + /* * machine_crash_shutdown - Prepare to kexec after a kernel crash * @@ -169,6 +202,8 @@ machine_crash_shutdown(struct pt_regs *regs) crash_smp_send_stop(); crash_save_cpu(regs, smp_processor_id()); + machine_kexec_mask_interrupts(); + pr_info("Starting crashdump kernel...\n"); }