From nobody Tue Jun 20 14:54:22 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 4QlqR31K9Yz4gTPs; Tue, 20 Jun 2023 14:54:23 +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 4QlqR30sD5z4MLp; Tue, 20 Jun 2023 14:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687272863; 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=wIyJvAJOslTury1S2IvJDcK9+0mOrJuTQnma5COGZW8=; b=hU9gSsBGhse1OADslB2pYvzIVmhbhrA00kAX9Ya/RgdC8KP2gXvgoxla9welQno7ph/A7k OO6dhQlHVdHLb8P1cm8WCWSyBOyznEoiVlyPYndRhaIk6XBdkV4yezj1ooXE4lLB6bt7ap bcMBt3sfkRwJA72mZIMr6NZCzo5eRtzCDCgayNE/a7cQY0hWQUBynNZ1QxGe7rcHETWiqw gEPkSSNppE9SkI4QMKrJ+ffv79ADTJKSO6xqNf5SonwmZjXD2T+L+/vsbmMPFL5ePp9PXI yz0ZMDH+6RrLF9Vwrlsyjl3QSTMcw8AnFYC9tFAzkh6AxVcgzHmEz1Um/dS3+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687272863; 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=wIyJvAJOslTury1S2IvJDcK9+0mOrJuTQnma5COGZW8=; b=rN+vlnQDoxOtDnIantDwZZeyC4PgoqizH3+KD/H9W7Nq71pCPwWs6ncW6jRu8z8tIGK6x+ /kFWy3NqX0Ac9JSiF6t6Y6eyQNwapB2e82Tk52/VmR2hR05ZYFdduB7R5D+Im9V6AyYORn lUaEx/P//dCWf8pJCZX577fwLPkFW7iOUNw8vxULaxNVUP/BP00dYDuSX9iwMR0K32r/2+ 5QVhMN1R/DbV80bZfUqUliu0oFT+cDOMkkwlNlPXQbHKLLNBICF9GDWDzzR0C+DVk6WzmL 3u3k7b4/X49jpIAocmO66ycQ7+9OtmppRdcgDZLnCmpgdl3gJQOlZHQxmDshjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687272863; a=rsa-sha256; cv=none; b=TvqUXjiRd3cNhjovDzaXXZZaVy+8m1cFdXQBYXIlS6ybBCbCzV+1FyafbdYpSgtL8PM7f1 7Couj6LSTDuHNIRvCio+ynCxSThUo1iAA0K4Hy7QGaonYLxTazMhAv8eRwbT+8JwpPUIXw etnseac+RE0lEEnuTpBdsjvSJuFGNbceNqNX/jy3Lf3CJtkKDN9KjZ6jpMspClx7r5fidQ K4Rnor6lX4zciUJNNk544XyWwJvDbvM6vonrrm83WLxGpf7jB08H7dswGqtyVKmzMyy5jD 7KcrNPY0zf7td+UNTjYSy4vCJhBa0GngVyVIRP9VH7WGPR6rlu/WCgNig5AqLg== 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 4QlqR272zQz13Z8; Tue, 20 Jun 2023 14:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KEsMOb095453; Tue, 20 Jun 2023 14:54:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KEsMHY095451; Tue, 20 Jun 2023 14:54:22 GMT (envelope-from git) Date: Tue, 20 Jun 2023 14:54:22 GMT Message-Id: <202306201454.35KEsMHY095451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 7756232199ad - main - riscv: improve KTR_TRAP trace entries 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7756232199adf60343ae0b940e2b27fe363905bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7756232199adf60343ae0b940e2b27fe363905bc commit 7756232199adf60343ae0b940e2b27fe363905bc Author: Mitchell Horne AuthorDate: 2023-06-20 14:52:26 +0000 Commit: Mitchell Horne CommitDate: 2023-06-20 14:54:14 +0000 riscv: improve KTR_TRAP trace entries For more informative records of exceptions, include key details such as the exception code and stval register contents. Remove the curthread argument as it is redundant (saved with every ktr entry), and the trapframe as it is somewhat meaningless. Add a new KTR_TRAP trace record for interrupts. Reviewed by: markj, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40584 --- sys/riscv/riscv/intr_machdep.c | 3 +++ sys/riscv/riscv/trap.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/riscv/riscv/intr_machdep.c b/sys/riscv/riscv/intr_machdep.c index d84f4ea1cb91..1ee2c0984205 100644 --- a/sys/riscv/riscv/intr_machdep.c +++ b/sys/riscv/riscv/intr_machdep.c @@ -163,6 +163,9 @@ riscv_cpu_intr(struct trapframe *frame) active_irq = frame->tf_scause & SCAUSE_CODE; + CTR3(KTR_TRAP, "%s: irq=%d, umode=%d", __func__, active_irq, + TRAPF_USERMODE(frame)); + switch (active_irq) { case IRQ_SOFTWARE_USER: case IRQ_SOFTWARE_SUPERVISOR: diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index 11ecfa702054..ac481c313e15 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -291,8 +291,8 @@ do_trap_supervisor(struct trapframe *frame) return; #endif - CTR3(KTR_TRAP, "do_trap_supervisor: curthread: %p, sepc: %lx, frame: %p", - curthread, frame->tf_sepc, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + exception, frame->tf_sepc, frame->tf_stval); switch (exception) { case SCAUSE_LOAD_ACCESS_FAULT: @@ -365,8 +365,8 @@ do_trap_user(struct trapframe *frame) } intr_enable(); - CTR3(KTR_TRAP, "do_trap_user: curthread: %p, sepc: %lx, frame: %p", - curthread, frame->tf_sepc, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + exception, frame->tf_sepc, frame->tf_stval); switch (exception) { case SCAUSE_LOAD_ACCESS_FAULT: