From nobody Wed Oct 11 21:21:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S5Qgw5FF9z4wkM3; Wed, 11 Oct 2023 21:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S5Qgw4jNLz3Psm; Wed, 11 Oct 2023 21:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697059308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iIsOetJKXKuCj2BnNT1M5rFMJYJvXdyJ3XvGrSzzuuc=; b=hAs2rcYjnrDzWGc/9UDBBrihm/y7hRiAo3uG6uUooHAiyHGvijJnEKinygV/F7mgJ22J4Q QPujMtOMAWi+fqvEWZcx5a0xv6iFETVoFuRt6QcsxEfIJiuAZjCoroA23eRpczZq+3ay41 DR1BZcgUhT+VbU2HzL1UkII7i95bpdNIWVZDDamOrxP4MVL+mxsYCxHbAU28/IbHN7cL/i HUKhYDRhnY+o8jEZ+BuxO5E0oFEcHx8KWYaeGIcuxZbtRdXllLK3ZBAiMVT35wUlIztBXl 91KYsxDLqs7mwiFqF2eCOpKBVY05oZTdsn87DRf/oDNJZE0HeOyJIbu4tdfySg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697059308; a=rsa-sha256; cv=none; b=MWgnYGO4XVZuobNxgGuR6qc6eMxANKvcewG+Wmhm8jCoOpJa+mKD6NJZoYscXIgYUsfAwg bN4p7/Iwsi4mON8dEp8o/gfX/sQ5EPo1bJHGcQOykf+O+brVD7N5twmPLmM1iOWJLJboEC nBukA3ZCKkEWV1ITVWtcVf5jV8bPS8PeCVojEYLzqNMhvqjnIEEBO7TujAYE1jdwxq8dxc KEtzDPF8aBnctu9mofnrU1aeYilyr+Uoq14MjVT+aYdZoQWUoiWxSVtMPJY9gaTwfHaerW BQ8at9csBKy9vLuqQAzNoRl4ijkC7pZNsIflfVWSjhj6qjCb7pm7HmSoIkZU4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697059308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iIsOetJKXKuCj2BnNT1M5rFMJYJvXdyJ3XvGrSzzuuc=; b=Hk3moPzKgQ0xmWvdg6bb8NOsxG0GaDfw79Ycw3/wy+JuhT2+9USRs/FyGWLvG1XNg5DmfD PE6KYZrRqPrcfqPjl+9WSAIxJymDfZjrL1hOxsBwI16DBkuyyYhoRgeQvfokDJzIMepSPq jJTlgEon61WLsMePPjZP8FqtNHijJdu3SCU53/WEO7RQn0cIonCtZIVVq8DA1GQ9nQZlw1 qrYtUZ2G0a/zIQPtxKf1va6l72Anm6rxIGFn7SN9NhWjjQHtKw1sOtQArTzV1Mc5AHYYgY D3SJJtwIf+C5mO1ZSQAdTux9tnb/F6WlpvvjaHezr3tWwpsG9nLZvD5ZkTvCZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S5Qgw3n2jzd3w; Wed, 11 Oct 2023 21:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39BLLmDo089072; Wed, 11 Oct 2023 21:21:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BLLmJ6089070; Wed, 11 Oct 2023 21:21:48 GMT (envelope-from git) Date: Wed, 11 Oct 2023 21:21:48 GMT Message-Id: <202310112121.39BLLmJ6089070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ff79f35bdae5 - main - riscv: Tidy panic messages for exceptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff79f35bdae5742f4e56e1dc18fffc5d9ea98876 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ff79f35bdae5742f4e56e1dc18fffc5d9ea98876 commit ff79f35bdae5742f4e56e1dc18fffc5d9ea98876 Author: John Baldwin AuthorDate: 2023-10-11 21:21:12 +0000 Commit: John Baldwin CommitDate: 2023-10-11 21:21:12 +0000 riscv: Tidy panic messages for exceptions - Remove trailing newlines - Be consistent about the format used to print pointer values - Print the trap value for access faults (it is the faulting address if non-zero) and illegal instructions (it is the first N bytes of the decoded instruction if non-zero) Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41786 --- sys/riscv/riscv/trap.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index ea48b02ba29b..f54efc324942 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -299,7 +299,7 @@ fatal: return; } #endif - panic("Fatal page fault at %#lx: %#016lx", frame->tf_sepc, stval); + panic("Fatal page fault at %#lx: %#lx", frame->tf_sepc, stval); } void @@ -326,7 +326,7 @@ do_trap_supervisor(struct trapframe *frame) return; #endif - CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%#lx, stval=%#lx", __func__, exception, frame->tf_sepc, frame->tf_stval); switch (exception) { @@ -334,13 +334,14 @@ do_trap_supervisor(struct trapframe *frame) case SCAUSE_STORE_ACCESS_FAULT: case SCAUSE_INST_ACCESS_FAULT: dump_regs(frame); - panic("Memory access exception at 0x%016lx\n", frame->tf_sepc); + panic("Memory access exception at %#lx: %#lx", + frame->tf_sepc, frame->tf_stval); break; case SCAUSE_LOAD_MISALIGNED: case SCAUSE_STORE_MISALIGNED: case SCAUSE_INST_MISALIGNED: dump_regs(frame); - panic("Misaligned address exception at %#016lx: %#016lx\n", + panic("Misaligned address exception at %#lx: %#lx", frame->tf_sepc, frame->tf_stval); break; case SCAUSE_STORE_PAGE_FAULT: @@ -358,16 +359,18 @@ do_trap_supervisor(struct trapframe *frame) kdb_trap(exception, 0, frame); #else dump_regs(frame); - panic("No debugger in kernel.\n"); + panic("No debugger in kernel."); #endif break; case SCAUSE_ILLEGAL_INSTRUCTION: dump_regs(frame); - panic("Illegal instruction at 0x%016lx\n", frame->tf_sepc); + panic("Illegal instruction 0x%0*lx at %#lx", + (frame->tf_stval & 0x3) != 0x3 ? 4 : 8, + frame->tf_stval, frame->tf_sepc); break; default: dump_regs(frame); - panic("Unknown kernel exception %lx trap value %lx\n", + panic("Unknown kernel exception %#lx trap value %#lx", exception, frame->tf_stval); } } @@ -400,7 +403,7 @@ do_trap_user(struct trapframe *frame) } intr_enable(); - CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%#lx, stval=%#lx", __func__, exception, frame->tf_sepc, frame->tf_stval); switch (exception) { @@ -450,7 +453,7 @@ do_trap_user(struct trapframe *frame) break; default: dump_regs(frame); - panic("Unknown userland exception %lx, trap value %lx\n", + panic("Unknown userland exception %#lx, trap value %#lx", exception, frame->tf_stval); } }