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 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 33C1FC00A5A for ; Thu, 19 Jan 2023 07:49:20 +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=VTvFOE1P4aX+OtPdIvgJrkwpvMsHWqHQPKaqdB+M9jA=; b=VJTJ76B4WIx6g7 Ju5hh4j7+75RrmE/qYGksjCH8syITK8XIkdkRabLGrVESu6cj20SHbGVvs/P0fyO4asJh/h1a+cAn NQqWby1jKqbc6cDHe5i84qnDFJbvFpNMa4c13iTSeilAoYtm1c5Nj0bgtkVehb7JLMhP20UwW+zVO 1uy2rMzfcS1RanshxVWyUgQXtWZJbUNc78yTRfOU/KvjJMkeDxBu2qE0UMTH4XFkIKLQMnHJX7VoR K8rby7S0Ablf/Frf4yYkM/f+pag5F9od26xygCPwjJfhziD3Iz5oY7FTNQGIhIvRWyh0qc+ZTV0Ax cQO/jLIA1FTTrD2cZ4Jg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIPfc-003wIE-6i; Thu, 19 Jan 2023 07:49:12 +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 1pIPee-003vus-5v for linux-riscv@lists.infradead.org; Thu, 19 Jan 2023 07:48:13 +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 9265261BA6; Thu, 19 Jan 2023 07:48:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD978C433F0; Thu, 19 Jan 2023 07:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674114491; bh=x+6hysZetLjXNJoPmPem8KkgdCayvnvdD0vD47hnXTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OCKr7WQy84g91clObcCPN4ujLE8G6ryfwyrIb5kQIjfphSjUsiJwo8tCw/cjD6DMa bVtPv9K1Gig0mN0oAsG2pyKregWutfWQ37Hx4kc3B95uR0V/nTMMJU6VkcnluddWi7 oXpAwRGF5pQnalavt9hFymGUXIwrnDHCdxCs1tYcuAZMLF98Mda1apRykl3jicBKA8 cerShorkhdTiuHpSQCh/dO/yDv2KjkxGcMUN0V4YKB6tqaB4Er3hd3Nl6a2rkdp44T P6H6mED9rtxyyE9FBsrDmSpLN4hFGddeBxEKvwB0gn7ARk+aKnjWk1R9I4MrFwJz5S wjIykZaESbsjg== From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Andreas Schwab , Geert Uytterhoeven , linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] riscv: Add instruction dump to RISC-V splats Date: Thu, 19 Jan 2023 08:47:37 +0100 Message-Id: <20230119074738.708301-2-bjorn@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230119074738.708301-1-bjorn@kernel.org> References: <20230119074738.708301-1-bjorn@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_234812_408287_A96D2567 X-CRM114-Status: GOOD ( 15.68 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org RnJvbTogQmrDtnJuIFTDtnBlbCA8Ympvcm5Acml2b3NpbmMuY29tPgoKQWRkIGluc3RydWN0aW9u IGR1bXAgKENvZGU6KSBvdXRwdXQgdG8gUklTQy1WIHNwbGF0cy4gRHVtcCAxNmIKcGFyY2Vscy4K CkFuIGV4YW1wbGU6CiAgVW5hYmxlIHRvIGhhbmRsZSBrZXJuZWwgTlVMTCBwb2ludGVyIGRlcmVm ZXJlbmNlIGF0IHZpcnR1YWwgYWRkcmVzcyAwMDAwMDAwMDAwMDAwMDAwCiAgT29wcyBbIzFdCiAg TW9kdWxlcyBsaW5rZWQgaW46CiAgQ1BVOiAwIFBJRDogMSBDb21tOiBzd2FwcGVyLzAgTm90IHRh aW50ZWQgNi4yLjAtcmMzLTAwMzAyLWc4NDBmZjQ0YzU3MWQtZGlydHkgIzI3CiAgSGFyZHdhcmUg bmFtZTogcmlzY3YtdmlydGlvLHFlbXUgKERUKQogIGVwYyA6IGtlcm5lbF9pbml0KzB4YzgvMHgx MGUKICAgcmEgOiBrZXJuZWxfaW5pdCsweDcwLzB4MTBlCiAgZXBjIDogZmZmZmZmZmY4MGJkOWE0 MCByYSA6IGZmZmZmZmZmODBiZDk5ZTggc3AgOiBmZjIwMDAwMDAwNjBiZWMwCiAgIGdwIDogZmZm ZmZmZmY4MTczMGIyOCB0cCA6IGZmNjAwMDAwN2ZmMDAwMDAgdDAgOiA3OTc0Njk3Mjc1NjM2NTcz CiAgIHQxIDogMDAwMDAwMDAwMDAwMDAwMCB0MiA6IDMwMzAzMDMyNzAzOTNkNmUgczAgOiBmZjIw MDAwMDAwNjBiZWUwCiAgIHMxIDogZmZmZmZmZmY4MTczMjAyOCBhMCA6IDAwMDAwMDAwMDAwMDAw MDAgYTEgOiBmZjYwMDAwMDgwZGQxNzgwCiAgIGEyIDogMDAwMDAwMDAwMDAwMDAwMiBhMyA6IGZm ZmZmZmZmODE3NmE0NzAgYTQgOiAwMDAwMDAwMDAwMDAwMDAwCiAgIGE1IDogMDAwMDAwMDAwMDAw MDAwYSBhNiA6IDAwMDAwMDAwMDAwMDAwODEgYTcgOiBmZjYwMDAwMDgwZGQxNzgwCiAgIHMyIDog MDAwMDAwMDAwMDAwMDAwMCBzMyA6IDAwMDAwMDAwMDAwMDAwMDAgczQgOiAwMDAwMDAwMDAwMDAw MDAwCiAgIHM1IDogMDAwMDAwMDAwMDAwMDAwMCBzNiA6IDAwMDAwMDAwMDAwMDAwMDAgczcgOiAw MDAwMDAwMDAwMDAwMDAwCiAgIHM4IDogMDAwMDAwMDAwMDAwMDAwMCBzOSA6IDAwMDAwMDAwMDAw MDAwMDAgczEwOiAwMDAwMDAwMDAwMDAwMDAwCiAgIHMxMTogMDAwMDAwMDAwMDAwMDAwMCB0MyA6 IGZmZmZmZmZmODExODYwMTggdDQgOiAwMDAwMDAwMDAwMDAwMDIyCiAgIHQ1IDogMDAwMDAwMDAw MDAwMDAzZCB0NiA6IDAwMDAwMDAwMDAwMDAwMDAKICBzdGF0dXM6IDAwMDAwMDAyMDAwMDAxMjAg YmFkYWRkcjogMDAwMDAwMDAwMDAwMDAwMCBjYXVzZTogMDAwMDAwMDAwMDAwMDAwZgogIFs8ZmZm ZmZmZmY4MDAwMzUyOD5dIHJldF9mcm9tX2V4Y2VwdGlvbisweDAvMHgxNgogIENvZGU6IDg2MmEg ZDE3OSA2MDhjIGE1MTcgMDA2OSAwNTEzIDJiZTUgZDBlZiBkYjJlIDQ3YTkgKGMxMWMpIGE1MTcK ICAtLS1bIGVuZCB0cmFjZSAwMDAwMDAwMDAwMDAwMDAwIF0tLS0KICBLZXJuZWwgcGFuaWMgLSBu b3Qgc3luY2luZzogQXR0ZW1wdGVkIHRvIGtpbGwgaW5pdCEgZXhpdGNvZGU9MHgwMDAwMDAwYgog IFNNUDogc3RvcHBpbmcgc2Vjb25kYXJ5IENQVXMKICAtLS1bIGVuZCBLZXJuZWwgcGFuaWMgLSBu b3Qgc3luY2luZzogQXR0ZW1wdGVkIHRvIGtpbGwgaW5pdCEgZXhpdGNvZGU9MHgwMDAwMDAwYiBd LS0tCgpTaWduZWQtb2ZmLWJ5OiBCasO2cm4gVMO2cGVsIDxiam9ybkByaXZvc2luYy5jb20+Ci0t LQogYXJjaC9yaXNjdi9rZXJuZWwvdHJhcHMuYyB8IDI1ICsrKysrKysrKysrKysrKysrKysrKysr Ky0KIDEgZmlsZSBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZm IC0tZ2l0IGEvYXJjaC9yaXNjdi9rZXJuZWwvdHJhcHMuYyBiL2FyY2gvcmlzY3Yva2VybmVsL3Ry YXBzLmMKaW5kZXggNTQ5YmRlNWM5NzBhLi5mYmRjZGJjNzkyZDMgMTAwNjQ0Ci0tLSBhL2FyY2gv cmlzY3Yva2VybmVsL3RyYXBzLmMKKysrIGIvYXJjaC9yaXNjdi9rZXJuZWwvdHJhcHMuYwpAQCAt MjksNiArMjksMjcgQEAgaW50IHNob3dfdW5oYW5kbGVkX3NpZ25hbHMgPSAxOwogCiBzdGF0aWMg REVGSU5FX1NQSU5MT0NLKGRpZV9sb2NrKTsKIAorc3RhdGljIHZvaWQgZHVtcF9rZXJuZWxfaW5z dHIoY29uc3QgY2hhciAqbG9nbHZsLCBzdHJ1Y3QgcHRfcmVncyAqcmVncykKK3sKKwljaGFyIHN0 cltzaXplb2YoIjAwMDAgIikgKiAxMiArIDIgKyAxXSwgKnAgPSBzdHI7CisJY29uc3QgdTE2ICpp bnNucyA9ICh1MTYgKilpbnN0cnVjdGlvbl9wb2ludGVyKHJlZ3MpOworCWxvbmcgYmFkOworCXUx NiB2YWw7CisJaW50IGk7CisKKwlmb3IgKGkgPSAtMTA7IGkgPCAyOyBpKyspIHsKKwkJYmFkID0g Z2V0X2tlcm5lbF9ub2ZhdWx0KHZhbCwgJmluc25zW2ldKTsKKwkJaWYgKCFiYWQpIHsKKwkJCXAg Kz0gc3ByaW50ZihwLCBpID09IDAgPyAiKCUwNGh4KSAiIDogIiUwNGh4ICIsIHZhbCk7CisJCX0g ZWxzZSB7CisJCQlwcmludGsoIiVzQ29kZTogVW5hYmxlIHRvIGFjY2VzcyBpbnN0cnVjdGlvbiBh dCAweCVweC5cbiIsCisJCQkgICAgICAgbG9nbHZsLCAmaW5zbnNbaV0pOworCQkJcmV0dXJuOwor CQl9CisJfQorCXByaW50aygiJXNDb2RlOiAlc1xuIiwgbG9nbHZsLCBzdHIpOworfQorCiB2b2lk IGRpZShzdHJ1Y3QgcHRfcmVncyAqcmVncywgY29uc3QgY2hhciAqc3RyKQogewogCXN0YXRpYyBp bnQgZGllX2NvdW50ZXI7CkBAIC00Myw4ICs2NCwxMCBAQCB2b2lkIGRpZShzdHJ1Y3QgcHRfcmVn cyAqcmVncywgY29uc3QgY2hhciAqc3RyKQogCiAJcHJfZW1lcmcoIiVzIFsjJWRdXG4iLCBzdHIs ICsrZGllX2NvdW50ZXIpOwogCXByaW50X21vZHVsZXMoKTsKLQlpZiAocmVncykKKwlpZiAocmVn cykgewogCQlzaG93X3JlZ3MocmVncyk7CisJCWR1bXBfa2VybmVsX2luc3RyKEtFUk5fRU1FUkcs IHJlZ3MpOworCX0KIAogCWNhdXNlID0gcmVncyA/IHJlZ3MtPmNhdXNlIDogLTE7CiAJcmV0ID0g bm90aWZ5X2RpZShESUVfT09QUywgc3RyLCByZWdzLCAwLCBjYXVzZSwgU0lHU0VHVik7Ci0tIAoy LjM3LjIKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwps aW51eC1yaXNjdiBtYWlsaW5nIGxpc3QKbGludXgtcmlzY3ZAbGlzdHMuaW5mcmFkZWFkLm9yZwpo dHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXJpc2N2Cg== 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 338FAC38142 for ; Thu, 19 Jan 2023 07:51:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230241AbjASHvf (ORCPT ); Thu, 19 Jan 2023 02:51:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230345AbjASHuP (ORCPT ); Thu, 19 Jan 2023 02:50:15 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 621812715 for ; Wed, 18 Jan 2023 23:48:12 -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 dfw.source.kernel.org (Postfix) with ESMTPS id F3CAA61B9D for ; Thu, 19 Jan 2023 07:48:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD978C433F0; Thu, 19 Jan 2023 07:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674114491; bh=x+6hysZetLjXNJoPmPem8KkgdCayvnvdD0vD47hnXTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OCKr7WQy84g91clObcCPN4ujLE8G6ryfwyrIb5kQIjfphSjUsiJwo8tCw/cjD6DMa bVtPv9K1Gig0mN0oAsG2pyKregWutfWQ37Hx4kc3B95uR0V/nTMMJU6VkcnluddWi7 oXpAwRGF5pQnalavt9hFymGUXIwrnDHCdxCs1tYcuAZMLF98Mda1apRykl3jicBKA8 cerShorkhdTiuHpSQCh/dO/yDv2KjkxGcMUN0V4YKB6tqaB4Er3hd3Nl6a2rkdp44T P6H6mED9rtxyyE9FBsrDmSpLN4hFGddeBxEKvwB0gn7ARk+aKnjWk1R9I4MrFwJz5S wjIykZaESbsjg== From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Andreas Schwab , Geert Uytterhoeven , linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] riscv: Add instruction dump to RISC-V splats Date: Thu, 19 Jan 2023 08:47:37 +0100 Message-Id: <20230119074738.708301-2-bjorn@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230119074738.708301-1-bjorn@kernel.org> References: <20230119074738.708301-1-bjorn@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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..fbdcdbc792d3 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; + const u16 *insns = (u16 *)instruction_pointer(regs); + long bad; + u16 val; + int i; + + for (i = -10; i < 2; i++) { + bad = get_kernel_nofault(val, &insns[i]); + if (!bad) { + p += sprintf(p, i == 0 ? "(%04hx) " : "%04hx ", val); + } else { + printk("%sCode: Unable to access instruction at 0x%px.\n", + loglvl, &insns[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); -- 2.37.2