From nobody Thu Sep 03 15:05:35 2026 X-Original-To: dev-commits-src-main@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 4hbNFW6MVCz6rPDN for ; Thu, 03 Sep 2026 15:05:35 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hbNFW2wjLz43PQ for ; Thu, 03 Sep 2026 15:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788447935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qoCX0zV6APc2kGDt9/mJxEJAx3pqjNHRjRf1AkX4kUw=; b=MfiyIzSYJVYBmL7G1UUWp6nxgFMGfgIeyomvo8ZjeNAN6krC0Y4mkV/j7u/2m033uxFIhj xwzxuhr6w4flgzFuu6CAJ+Iyz/cLLccKruAKCUnbLVLB1AiGca+1pNKlWnc6aFZ9VN+JQf 6spLbtX1eWoVaAHKi7cw/3r7BZXz1J/7U1ax4gGl4xfa/YPbhIkpvnZTw4MgVSsedDnfsD 5BWk6y+aCjJ7QKHwmM73+IYDK9v13AqB4IRwQxqkc5WafdbqrLgCCtrxMxi3lo+G6S21Oi 7ioz+Ax01nenu4deEbpBj0ah1qnf21ZFbAi2V9JpG4Jc4OIFs1PWC5QamnDHkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788447935; a=rsa-sha256; cv=none; b=Y2kS4HMsKDBhSj6LtIYSbmk7tp0NPETFuJQElcmTJrGTQf5Y3hfd4pRqJaURqa8/kGRXdK emW1DjLM99My4XpPJnK8Cym3n2xZeZGFm4dLlMi50lGcuseJicMR1vXFxYJwv+Dm2Qze0Z PqWxMAFozdXFooMl7/Lo0K1fgRVR/sHmDEY6st40LIUKKZ+rM/T9rXCHDwTB1DVsF672ps 3LMOffD/JFRNj5RzTQqyYBS2FDXphZ3nrhiF0d2jS6k7rMTiqNTMrg/3Xl2MA9x7w7x1Bx MFMjCBpYDHlqAcGIcq1+tAkNG2nGr2pr8RwJksx8IiqixSl2+Gvh6tFdtw/p2A== 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=1788447935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qoCX0zV6APc2kGDt9/mJxEJAx3pqjNHRjRf1AkX4kUw=; b=RiA7/ijfz+Dxux0f3KSX+pC+tFXMzZPpWyTjod6YZz17dtqG35AAmC/vVaaJwQrT5yXqvF zvCztLIps97Wj/ayKxKoagoSg1t52oJ0aB4jkBbR2WPRIvk8P+HwKcixdgu8TubTN/YBca dhEMNJclh785ZxMZklyr8n6JFfMJHX1OoaPSQykfsBDzYjn+J5SGtaQVxWtxiWDnwsWRQ/ xlmLT1Qb0IDziSuDX5bpKg7fZDcc8m+LtudX5vNu+Dkf+9z0Gw7IrRSbjLvHKm30UdEP26 i5J4gt2dJK4F4ceDmuXyU7DXWKJdPBTwN/6yZPg0aEtb4mekzP41/iA2qtr6kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbNFW1k5lz3dC for ; Thu, 03 Sep 2026 15:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26acf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 03 Sep 2026 15:05:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Benjamin Jacobs From: Mark Johnston Subject: git: 00678f5e5c08 - main - dtrace/arm: Really trap translation faults List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00678f5e5c08ec7949e2f57d78faeaf266a0f17a Auto-Submitted: auto-generated Date: Thu, 03 Sep 2026 15:05:35 +0000 Message-Id: <6a998cbf.26acf.9a9b47f@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=00678f5e5c08ec7949e2f57d78faeaf266a0f17a commit 00678f5e5c08ec7949e2f57d78faeaf266a0f17a Author: Benjamin Jacobs AuthorDate: 2026-09-03 13:52:24 +0000 Commit: Mark Johnston CommitDate: 2026-09-03 15:05:03 +0000 dtrace/arm: Really trap translation faults Fix the constant case label to properly handle translation faults caused by DTrace probes. Alignment errors are not expected to be generated, so stop handling them. While at it, correct an amd64-specific comment and add a comment regarding the missing faulting address which could be addressed by a later improvement. PR: 298064 MFC after: 1 month Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D59281 --- sys/cddl/dev/dtrace/arm/dtrace_subr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/dtrace/arm/dtrace_subr.c b/sys/cddl/dev/dtrace/arm/dtrace_subr.c index 10e9281709b6..2cf308fb9f77 100644 --- a/sys/cddl/dev/dtrace/arm/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/arm/dtrace_subr.c @@ -166,7 +166,7 @@ dtrace_gethrestime(void) return (current_time.tv_sec * 1000000000UL + current_time.tv_nsec); } -/* Function to handle DTrace traps during probes. See amd64/amd64/trap.c */ +/* Function to handle DTrace traps during probes. See arm/arm/trap-v6.c */ int dtrace_trap(struct trapframe *frame, u_int type) { @@ -187,8 +187,12 @@ dtrace_trap(struct trapframe *frame, u_int type) */ switch (type) { /* Page fault. */ - case FAULT_ALIGN: + case FAULT_PERM_L1: + case FAULT_PERM_L2: + case FAULT_TRAN_L1: + case FAULT_TRAN_L2: /* Flag a bad address. */ + /* XXX FAR is missing from the trapframe */ cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_BADADDR; cpu_core[curcpu].cpuc_dtrace_illval = 0;