From patchwork Mon Jan 16 07:38:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 44005 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1066797wrn; Sun, 15 Jan 2023 23:45:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXsekgat6LmlSr7nxLEWW8qlupwvwqKX6fSa0gorbAs6/nz5G5YJPnlQlbp0/brCNJGFqG3K X-Received: by 2002:a17:903:404d:b0:194:91e6:1e69 with SMTP id n13-20020a170903404d00b0019491e61e69mr2949376pla.12.1673855126965; Sun, 15 Jan 2023 23:45:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673855126; cv=none; d=google.com; s=arc-20160816; b=sBTODBl07hqlZTJxTxUYdpdospGVLlvMN9QfFb74BYU7K3pXGMDaj7Og59eIPoFayM E75cixKNoQJ6k30NkDQHaFiGTnGIxHPc5PR6LCjN40hZxfrVSRsowPes1cDP6C0005AO i6w1sa98LN8k8H/GH7k5dD74S0Q1eB9hTuW2JN/naRXw+64fN5VB/8GJoW1AEhZUPRtC yuQ8yLtNu8byNePTe8/6+Tviy7eEFy5kfbBjaCd9Ao7egB6wzi898Fy+rzQOHJthJxKW FHeRyUHpuJHx642SwuxULeyDx2CW6S7ZONVqAhWjXIbI1rzUDHRr5+6gjjNMsNTwhFZ5 VkuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/oP7yeHUbsphmRj1PPRfu7Gdn8DHI1UqHszw/uzPIrE=; b=iNcWMj0OALHR3ycXm4g1O8HfLToXFHHXOKHSCVfCgB6PExoIZDccFp4LCdV5RvOTDo AWJSwH+SA6qvc9nUOTSyjQtei81gaM2QFp4DA61m+qutzibKXC+gTD7tCqF7u+10kNWK ukPlApMz+PMhpOp2tHR9w5+Ht+TkM6ctVzF5PvWx47ror5Mg5r3TVOLOuWmBaxFQ20B6 CMc1qQgu5ktEqI8aGwHOaE0ap6dPlxMoO2LtFLfqdypkf45/VaQ7faHfcNgvVzGmGJY/ 8PhZDk2a/vWS+iCuIVf7cq3YducgY7KqaWXmAksmxlYgUyxhWgckpqyu91LgysD0lRtj FX4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=em9uypzz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u69-20020a638548000000b0049bb86670d0si8475422pgd.290.2023.01.15.23.45.14; Sun, 15 Jan 2023 23:45:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=em9uypzz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231713AbjAPHjM (ORCPT + 99 others); Mon, 16 Jan 2023 02:39:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231951AbjAPHjB (ORCPT ); Mon, 16 Jan 2023 02:39:01 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17976E397 for ; Sun, 15 Jan 2023 23:39:00 -0800 (PST) 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 BF891B80D58 for ; Mon, 16 Jan 2023 07:38:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB0CAC433F0; Mon, 16 Jan 2023 07:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673854737; bh=GRifVG8QQU3bI8YFwJPVwBl3vn/mY1G/0lBs8bIH0oI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=em9uypzzHGPvaNWOz7teN9KlBmzxP3upD3xcgjrQ7YYhMhdRamJWXJHaM/kQ0spLe MLY9n7CUhvc/zwYxxk2uktB+paiXu/SAyOH0m1OE1eCU0ObNQBjaXbu594R0P1lbby xZ1SLHwcK1gmlf5re16DScRSe8cJLKZLeelsCA9/ao6OcPVBf5hfsWnvf0Kgz/H/4K hWNGBn+HGpsWiV3EroSE1cA7s0rxjaokTnCdpnYagBZ/1WWqSuStoNwH3FwSu6oR6z c+gC2WCXU5eqFQR0Ru8zPEWq1hrDJVsVbZjK+QGZC1VPApdZ31XxYlos24ihjler2s V5/BK0vsMKPOA== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Andreas Schwab , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] riscv: Add instruction dump to RISC-V splats Date: Mon, 16 Jan 2023 08:38:33 +0100 Message-Id: <20230116073834.333129-2-bjorn@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230116073834.333129-1-bjorn@kernel.org> References: <20230116073834.333129-1-bjorn@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755164313641251961?= X-GMAIL-MSGID: =?utf-8?q?1755164313641251961?= From: Björn Töpel Add instruction dump (Code:) output to RISC-V splats. Dump 16b parcels. An example: Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 Oops [#1] Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.2.0-rc3-00302-g840ff44c571d-dirty #27 Hardware name: riscv-virtio,qemu (DT) epc : kernel_init+0xc8/0x10e ra : kernel_init+0x70/0x10e epc : ffffffff80bd9a40 ra : ffffffff80bd99e8 sp : ff2000000060bec0 gp : ffffffff81730b28 tp : ff6000007ff00000 t0 : 7974697275636573 t1 : 0000000000000000 t2 : 3030303270393d6e s0 : ff2000000060bee0 s1 : ffffffff81732028 a0 : 0000000000000000 a1 : ff60000080dd1780 a2 : 0000000000000002 a3 : ffffffff8176a470 a4 : 0000000000000000 a5 : 000000000000000a a6 : 0000000000000081 a7 : ff60000080dd1780 s2 : 0000000000000000 s3 : 0000000000000000 s4 : 0000000000000000 s5 : 0000000000000000 s6 : 0000000000000000 s7 : 0000000000000000 s8 : 0000000000000000 s9 : 0000000000000000 s10: 0000000000000000 s11: 0000000000000000 t3 : ffffffff81186018 t4 : 0000000000000022 t5 : 000000000000003d t6 : 0000000000000000 status: 0000000200000120 badaddr: 0000000000000000 cause: 000000000000000f [] ret_from_exception+0x0/0x16 Code: 862a d179 608c a517 0069 0513 2be5 d0ef db2e 47a9 (c11c) a517 ---[ end trace 0000000000000000 ]--- Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b SMP: stopping secondary CPUs ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b ]--- Signed-off-by: Björn Töpel --- arch/riscv/kernel/traps.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 549bde5c970a..b8f0ea8a9568 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -29,6 +29,27 @@ int show_unhandled_signals = 1; static DEFINE_SPINLOCK(die_lock); +static void dump_kernel_instr(const char *loglvl, struct pt_regs *regs) +{ + char str[sizeof("0000 ") * 12 + 2 + 1], *p = str; + unsigned long addr = regs->epc; + long bad; + u16 val; + int i; + + for (i = -10; i < 2; i++) { + bad = get_kernel_nofault(val, &((u16 *)addr)[i]); + if (!bad) { + p += sprintf(p, i == 0 ? "(%04hx) " : "%04hx ", val); + } else { + printk("%sCode: Unable to access instruction at 0x%lx.\n", + loglvl, (long)&((u16 *)addr)[i]); + return; + } + } + printk("%sCode: %s\n", loglvl, str); +} + void die(struct pt_regs *regs, const char *str) { static int die_counter; @@ -43,8 +64,10 @@ void die(struct pt_regs *regs, const char *str) pr_emerg("%s [#%d]\n", str, ++die_counter); print_modules(); - if (regs) + if (regs) { show_regs(regs); + dump_kernel_instr(KERN_EMERG, regs); + } cause = regs ? regs->cause : -1; ret = notify_die(DIE_OOPS, str, regs, 0, cause, SIGSEGV);