From nobody Thu Oct 22 17:31:51 2026 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 4j9Y9g52Zmz6xP21 for ; Thu, 22 Oct 2026 17:31:51 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9Y9g0xztz3Ggr for ; Thu, 22 Oct 2026 17:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690311; 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=qwL3WaUBnP6cVjgGcVTUG/Rkq+ZHww4pXlqK2ke9ln0=; b=fGEFP4H2xt7IHlpDSlzBn1WIH6+1W0BbdRJ6lTbLAjaL9PyVq47Yce7DSkWR3lp53KDdow NZnfMDF3BIO2QpcuqMltALDt4Of1CNZktHNlzFYa8VA/vv1jau1VJXEauFp2drb+eEBWiU GQNLe9GsYtKpJFAdQKyh65OFNFqblx/+sNDBW0q5WhlYb9ORkc1QA+xUzgnZ5djyYI1rzA xlnlo8nz2MUUJ9jOE1naOIaiIFI48xRc7qa5TUi0oDn10Tx8ev9Syi6v+WPshHY0GOU0eK cXfUIrUnhfyXd7MTvSXSOKR4btIXkFfRt6DUU3RtMI4auLByWvLw9Kgxs0qtBw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690311; b=lMwWaUyFbF1TlGhhtGss5gJAWj+C9S2vglghqP3C3B9a4N0hFZ24i/XyfdYNxOxyYwmpHJ WJHibDi2LZNLlYIy0SHtoP4YIgzCBSmQCbOYlb/92qEvJKXQODeX/vDpSBtQEkBFka5Vk2 kfMPyrACQZbYa9s81kX6w2lqy75IhoxEmeJ87M50bsjxY44oV0Yb+dq8OMCRCOvb1kXHNn oWK1bg+SjxCp7idnXCgFMz7u/+/fpw/ObSBNDrSTRriof0TVhhiur2JpgBs9htjz8u6TjL 5I61WUbD1YCk1jpxyezhug6ASvUt8tF9OOC+U9OeNZVG5516qS2Wwi09FteS8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690311; 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=qwL3WaUBnP6cVjgGcVTUG/Rkq+ZHww4pXlqK2ke9ln0=; b=Xrl+M6MB+bdxIBTSHMgDZ4rs4KaOg0I8vT4WcyMB9tsBUwdEYCHEDKUJiniTVdJ8agMA7Z 4OBLcZd3C/3oX6xzegtgLkDZndvV3LwSkC1Lm0a7HXCPFWKX+Z2/heUAjsMx8CPKykokGt VHhsE6q5OXTHHS4h+vpAQ9RS7Utfeie4i+iZpzvFhwWj+N4V6tlnPtCNXDCjTc2mURyeQl auctGlCIPnvesbSzfMLEZ/YKMoikKUA0kNE4Dy3UvvMF7iPvtdrpLl+t+PiwGt8/nE6Hb9 PmeepX8gp511VjMjXQKoC8+tp5V7GDMe/3Zvhbg3M3ve0LH60ftK3KyRrJ5Kmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j9Y9g0KhpzrnQ for ; Thu, 22 Oct 2026 17:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:31:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Benjamin Jacobs From: Mark Johnston Subject: git: 88092966381c - stable/15 - dtrace/arm: Really trap translation faults List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 88092966381c760a5e36cdaead4347250d36251e Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:31:51 +0000 Message-Id: <6ada4887.3cf4c.6222444c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=88092966381c760a5e36cdaead4347250d36251e commit 88092966381c760a5e36cdaead4347250d36251e Author: Benjamin Jacobs AuthorDate: 2026-09-03 13:52:24 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:40 +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 (cherry picked from commit 00678f5e5c08ec7949e2f57d78faeaf266a0f17a) --- 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;