From nobody Thu Oct 22 17:32:09 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 4j9YB21zqQz6xNyc for ; Thu, 22 Oct 2026 17:32:10 +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 4j9YB152LWz3H2p for ; Thu, 22 Oct 2026 17:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690329; 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=hAyT/uta9jPCF0LJiSYlCn12bWK4Ete3XRA5mJnDgfE=; b=utl5WNWzhu09GnewVKpTHKuRo9kojCFCiuwjeBpTb1MX/HyGA4KrXKbL+vmLs5jC8NLCfg aFcfmYksvgsY1xW4JGg/zM1It2nAZaNBoB+NmRrxuq7J7oliERzM1ImIaTKxbnwDnZumjY Q8CpxlrJlejQZPVqdVgRb68JwmMF9d+D9NOzcskUGN0MXkNdHzYG8TT1EmcGLiLPe3uyPr 2g3OoozFVJza9HOIf4h8+1a8hFPgHwDwQLYRJW9mDenxg4nLGHV+sgmxs3AfDraTXcbVw8 2+CZddL40gIApaJvb7CG0vwW+TWnjTQjJ1Ha+nLiMBldzig5VfFIW/gFVBKEfQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690329; b=T6CmCtUvKjl95A6cbe8PJiFFOcXdXlbrFiOdK2G64XqR4CD8PsA/a7vj5Pta21ALSN4U/X c2bcaE5gTkROnL2dLzaxktWi0T2Fa/fDdEFg1xIa5Ct2peX1KbL9P8NVTwTsmpTvb4UKQc CYJ+XfwJJa7iw+kjSSlganWzD7qNoc5WDdyQC+bOi7rDp6bMcye9DuQ13YJnRmdsLLcJYQ A4Tjx2Xgs9FXXbMf24j6zPnsGNdmr67z31crz+A5qXfVcBSX47ij85qIgkOD/dhiPi99m5 9fy1Q7Ddvzoe3QGyRg0yDKBYnv+KejdLVYz1KVRCYGPkl9U1wVBUKyqqEnLSKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690329; 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=hAyT/uta9jPCF0LJiSYlCn12bWK4Ete3XRA5mJnDgfE=; b=opbKVP71zbZqgRDZlT3KN3qDPCBzqh3FAVsO42bN91MQ0BkbYiWk5y9UtxZdY7e2ficg7V RcXJw4ZeeqHF/XwIdar1hxnODVqwISpnBgkgegfCqnYKAZitLq5fU61n6SWwY3E/edfYEC 8jqAxR/PGxxuM9ZOExovNDXKouvsZ0szIa9S70ExOc+RVZKj47B/eEu9ECpmhavSnOvdtT 8xocoqsa2ufhP4szCBjHiU/lZ1OegEdXWrUu9jzP8X9TgsC/ZajeY9tBPU/x9KjtHs1Q5j Y2taFy8kHSvW72OWsrfCLRp0nKZInpQzpZQWaQd5LuguaDHavPIMJSDEtyJ6wg== 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 4j9YB14gb7zsVh for ; Thu, 22 Oct 2026 17:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e16b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:09 +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: 5a5c0b5f2ed1 - stable/15 - dtrace/arm64: Fix copyout and copyoutstr 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: 5a5c0b5f2ed1245ecd189f99811656eeb7d26a45 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:09 +0000 Message-Id: <6ada4899.3e16b.71ae5d5a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5a5c0b5f2ed1245ecd189f99811656eeb7d26a45 commit 5a5c0b5f2ed1245ecd189f99811656eeb7d26a45 Author: Benjamin Jacobs AuthorDate: 2026-09-16 13:07:01 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:41 +0000 dtrace/arm64: Fix copyout and copyoutstr Calling dtrace_copy and dtrace_copystr with the kaddr and uaddr arguments inversed does not work with PAN. Rename them dtrace_copyin_pan and dtrace_copyinstr_pan, respectively, and implement dtrace_copyout_pan and dtrace_copyoutstr_pan. Avoid excessive faulting by checkin DTrace's CPU flags. Implement the trick from OpenSolaris/Illumos of only checking the flags when crossing into a new page, altough more effectively by examining the vaddr instead of the count. Reviewed by: markj MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D59449 (cherry picked from commit a6deeaa2fb3b28a61ae56a85f2275f67fcf23262) --- .../opensolaris/uts/common/sys/dtrace_impl.h | 10 ++-- sys/cddl/dev/dtrace/aarch64/dtrace_asm.S | 68 ++++++++++++++++++++-- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 8 +-- 3 files changed, 71 insertions(+), 15 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h index 10ba0d37ac1b..88d3d88ddfcb 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h @@ -1302,11 +1302,11 @@ extern int dtrace_attached(void); extern hrtime_t dtrace_gethrestime(void); #endif -#ifdef __sparc -extern void dtrace_flush_windows(void); -extern void dtrace_flush_user_windows(void); -extern uint_t dtrace_getotherwin(void); -extern uint_t dtrace_getfprs(void); +#if defined(__aarch64__) +extern void dtrace_copyin_pan(uintptr_t, uintptr_t, size_t); +extern void dtrace_copyinstr_pan(uintptr_t, uintptr_t, size_t); +extern void dtrace_copyout_pan(uintptr_t, uintptr_t, size_t, volatile uint16_t *); +extern void dtrace_copyoutstr_pan(uintptr_t, uintptr_t, size_t, volatile uint16_t *); #else extern void dtrace_copy(uintptr_t, uintptr_t, size_t); extern void dtrace_copystr(uintptr_t, uintptr_t, size_t, volatile uint16_t *); diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S index decca6f79e0c..e27974eecc8f 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S @@ -104,9 +104,9 @@ END(dtrace_fuword64_nocheck) /* void -dtrace_copy(uintptr_t uaddr, uintptr_t kaddr, size_t size) +dtrace_copyin_pan(uintptr_t uaddr, uintptr_t kaddr, size_t size) */ -ENTRY(dtrace_copy) +ENTRY(dtrace_copyin_pan) cbz x2, 2f /* If len == 0 then skip loop */ 1: mvn x4, xzr /* Set all bits */ @@ -119,13 +119,13 @@ ENTRY(dtrace_copy) cbnz x2, 1b 2: RET -END(dtrace_copy) +END(dtrace_copyin_pan) /* void -dtrace_copystr(uintptr_t uaddr, uintptr_t kaddr, size_t size) +dtrace_copyinstr_pan(uintptr_t uaddr, uintptr_t kaddr, size_t size) */ -ENTRY(dtrace_copystr) +ENTRY(dtrace_copyinstr_pan) cbz x2, 2f /* If len == 0 then skip loop */ 1: mvn x4, xzr /* Set all bits */ @@ -139,7 +139,63 @@ ENTRY(dtrace_copystr) cbnz x2, 1b 2: RET -END(dtrace_copystr) +END(dtrace_copyinstr_pan) + +/* +void +dtrace_copyout_pan(uintptr_t kaddr, uintptr_t uaddr, size_t size, + volatile uint16_t *flags) +*/ +ENTRY(dtrace_copyout_pan) + cbz x2, 4f /* If len == 0 then skip loop */ + ldrb w4, [x0], #1 /* Load from kaddr */ + sttrb w4, [x1] /* Store in uaddr or raise data abort */ + b 2f /* Check fault */ +1: + ldrb w4, [x0], #1 /* Load from kaddr */ + sttrb w4, [x1] /* Store in uaddr or raise data abort */ + tst x1, #0xfff /* uaddr & 2^12-1 */ + bne 3f /* If not 4k aligned then skip check */ +2: + ldrh w5, [x3] /* Load cpu flags */ + tst w5, #CPU_DTRACE_BADADDR + bne 4f /* If flags&CPU_DTRACE_BADADDR != 0 then break */ +3: + add x1, x1, #1 /* uaddr++ */ + sub x2, x2, #1 /* len-- */ + cbnz x2, 1b +4: + RET +END(dtrace_copyout_pan) + + +/* +void +dtrace_copyoutstr_pan(uintptr_t kaddr, uintptr_t uaddr, size_t size, + volatile uint16_t *flags) +*/ +ENTRY(dtrace_copyoutstr_pan) + cbz x2, 4f /* If len == 0 then skip loop */ + ldrb w4, [x0], #1 /* Load from kaddr */ + sttrb w4, [x1] /* Store in uaddr or raise data abort */ + b 2f /* Check fault */ +1: + ldrb w4, [x0], #1 /* Load from kaddr */ + sttrb w4, [x1] /* Store in uaddr or raise data abort */ + tst x1, #0xfff /* uaddr & 2^12-1 */ + bne 3f /* If not 4k aligned then skip check */ +2: + ldrh w5, [x3] /* Load cpu flags */ + tst w5, #CPU_DTRACE_BADADDR + bne 4f /* If flags&CPU_DTRACE_BADADDR != 0 then break */ +3: + cbz w4, 4f /* If == 0 then break */ + add x1, x1, #1 /* uaddr++ */ + sub x2, x2, #1 /* len-- */ + cbnz x2, 1b +4: + RET +END(dtrace_copyoutstr_pan) /* uintptr_t diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index 037d4734659e..80998af3f0f4 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -351,7 +351,7 @@ dtrace_copyin(uintptr_t uaddr, uintptr_t kaddr, size_t size, { if (dtrace_copycheck(uaddr, kaddr, size)) - dtrace_copy(uaddr, kaddr, size); + dtrace_copyin_pan(uaddr, kaddr, size); } void @@ -360,7 +360,7 @@ dtrace_copyout(uintptr_t kaddr, uintptr_t uaddr, size_t size, { if (dtrace_copycheck(uaddr, kaddr, size)) - dtrace_copy(kaddr, uaddr, size); + dtrace_copyout_pan(kaddr, uaddr, size, flags); } void @@ -369,7 +369,7 @@ dtrace_copyinstr(uintptr_t uaddr, uintptr_t kaddr, size_t size, { if (dtrace_copycheck(uaddr, kaddr, size)) - dtrace_copystr(uaddr, kaddr, size, flags); + dtrace_copyinstr_pan(uaddr, kaddr, size); } void @@ -378,7 +378,7 @@ dtrace_copyoutstr(uintptr_t kaddr, uintptr_t uaddr, size_t size, { if (dtrace_copycheck(uaddr, kaddr, size)) - dtrace_copystr(kaddr, uaddr, size, flags); + dtrace_copyoutstr_pan(kaddr, uaddr, size, flags); } uint8_t