From patchwork Sat Jul 16 11:50:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12920100 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 E7075C433EF for ; Sat, 16 Jul 2022 12:00:16 +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=Ili9ZQumZDU7C6ah8hwzaO8NJi1dEvg4r5wdOP4UGUI=; b=jH/TdndCBTduAy pKgcKg7zzeqdZIVe8D+DWBoc2dhjW0V1Iq/9n1ALci2ucdIbCjbBsYwFNTaUXhYNt9EESkPIkzV9t sY6iGzRKBTl4vnOpH9LjVnENmbOJK/0sVbPNm2YGgbDLKRG57mJFWoyBGFmNsVUqQwPcLgor+PuSg AunCfu1fRv77OjSSDp8qOj3wkFRpBZO97JJkhf3yEpzArSVK0KxnGM8sqQnJrwK1zndgQ+lhgQvzC Jz0Oq+3/HS7nrSQDcAVpN32YCUBXntDiEJWEUCqnOYeFQndvu0pK+wNnR1NEQOaqplaRCHnE5Z0V3 v6VLUdP9upSGc8tWkMKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCgSt-00FtbV-4y; Sat, 16 Jul 2022 12:00:07 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCgSq-00FtZp-Qg for linux-riscv@lists.infradead.org; Sat, 16 Jul 2022 12:00:06 +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 ams.source.kernel.org (Postfix) with ESMTPS id 7D623B80022; Sat, 16 Jul 2022 12:00:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02EBCC34115; Sat, 16 Jul 2022 11:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657972802; bh=YUhixDNi1KCSLXxkbbdwq4C/qBo/zV52buAYC20HAIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZDDi5kb7n+T0GrIaSJbujYSplT2v5vZatC9rqWzMmJfIjEsV3WW5eBSE3R13Xoq3V Wf//r8gpGNcdeFsLobewz2ozV9s8fObyPqYb1CmdZSGnnpHpVEjGiwq722QUem1z+N AaxgSo8U76duzhTUm4SjH+UMr8LdjN7mGcSKmLb00ZdXf6cYnC5WDYpRLReURCOred waxRhBADTW5uo1agC88nn+EdebcySRmpr7WZhLbtU3oEIUzwJDSX+QgTEG8029T8Uq X/+emtAYGbw3Ll2hW2C0i2rVvkypzUTF1s7f0vjrkTm1LU9K3lTo6LwbR7eyhbxrwi R0TIqx5IYjslw== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Alexandre Ghiti , Emil Renner Berthing Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Anup Patel , Atish Patra Subject: [PATCH v6 1/2] riscv: move sbi_init() earlier before jump_label_init() Date: Sat, 16 Jul 2022 19:50:58 +0800 Message-Id: <20220716115059.3509-2-jszhang@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220716115059.3509-1-jszhang@kernel.org> References: <20220716115059.3509-1-jszhang@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220716_050005_169368_A5B6FAE9 X-CRM114-Status: GOOD ( 11.93 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org We call jump_label_init() in setup_arch() is to use static key mechanism earlier, but riscv jump label relies on the sbi functions, If we enable static key before sbi_init(), the code path looks like: static_branch_enable() .. arch_jump_label_transform() patch_text_nosync() flush_icache_range() flush_icache_all() sbi_remote_fence_i() for CONFIG_RISCV_SBI case __sbi_rfence() Since sbi isn't initialized, so NULL deference! Here is a typical panic log: [ 0.000000] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 0.000000] Oops [#1] [ 0.000000] Modules linked in: [ 0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0-rc7+ #79 [ 0.000000] Hardware name: riscv-virtio,qemu (DT) [ 0.000000] epc : 0x0 [ 0.000000] ra : sbi_remote_fence_i+0x1e/0x26 [ 0.000000] epc : 0000000000000000 ra : ffffffff80005826 sp : ffffffff80c03d50 [ 0.000000] gp : ffffffff80ca6178 tp : ffffffff80c0ad80 t0 : 6200000000000000 [ 0.000000] t1 : 0000000000000000 t2 : 62203a6b746e6972 s0 : ffffffff80c03d60 [ 0.000000] s1 : ffffffff80001af6 a0 : 0000000000000000 a1 : 0000000000000000 [ 0.000000] a2 : 0000000000000000 a3 : 0000000000000000 a4 : 0000000000000000 [ 0.000000] a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000000080200 [ 0.000000] s2 : ffffffff808b3e48 s3 : ffffffff808bf698 s4 : ffffffff80cb2818 [ 0.000000] s5 : 0000000000000001 s6 : ffffffff80c9c345 s7 : ffffffff80895aa0 [ 0.000000] s8 : 0000000000000001 s9 : 000000000000007f s10: 0000000000000000 [ 0.000000] s11: 0000000000000000 t3 : ffffffff80824d08 t4 : 0000000000000022 [ 0.000000] t5 : 000000000000003d t6 : 0000000000000000 [ 0.000000] status: 0000000000000100 badaddr: 0000000000000000 cause: 000000000000000c [ 0.000000] ---[ end trace 0000000000000000 ]--- [ 0.000000] Kernel panic - not syncing: Attempted to kill the idle task! [ 0.000000] ---[ end Kernel panic - not syncing: Attempted to kill the idle task! ]--- Fix this issue by moving sbi_init() earlier before jump_label_init() Signed-off-by: Jisheng Zhang Reviewed-by: Anup Patel Reviewed-by: Atish Patra --- arch/riscv/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index f0f36a4a0e9b..f5762f7b982d 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -269,6 +269,7 @@ void __init setup_arch(char **cmdline_p) *cmdline_p = boot_command_line; early_ioremap_setup(); + sbi_init(); jump_label_init(); parse_early_param(); @@ -285,7 +286,6 @@ void __init setup_arch(char **cmdline_p) misc_mem_init(); init_resources(); - sbi_init(); #ifdef CONFIG_KASAN kasan_init();