From nobody Mon Sep 21 00:05:13 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 4hp3QR0Qq9z6swS8 for ; Mon, 21 Sep 2026 00:05:19 +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 4hp3QQ5Vt8z3DhG for ; Mon, 21 Sep 2026 00:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789949118; 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=Sxhy1vJZOpuLSqkaZQi43tAq5TyDAPtemCWpM3R4BaU=; b=JGzkpenCkZd/oMGm3E+vq6Zto62ANXukEcUasJ2h4sRorPYaocthv0uQnR9fJDcrQMT+qN x5u/rjtFciyhkI6p2XaOweFflQQmlwG4DTY77JfH1zDidO098Ck3yq5tSHyDv2JQkrjmnx MmyvnVUIcs7/t3kaRfiGoUvnSVkPT4uOCC4BBOUkfGgsg2Rhu6e7xBxIas38xZkygkHpKP OuNWVe0E60JTBngyQvubBxTCDFLjRQHVAHkUqhOYeef3k4cygUFvpvTwVHOV/iUq+vkj82 8nj92bxnvHAgAZ7NIO7cgleSZQcTlJtWB63r4CVvMj+Zn9zdqmoeWQ8Z8M/eDA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789949118; b=VmicnWFtNsCXwGnejUjhrSX3ncyHwe0Cb76pM16pFXfNLjetkxAJsAiHsGMp702EMFFiEf mkxEMGzgPw4vHI8uQjPBtY3SQgQ8aq723691ugFq0zJX5DCdH2dmMgp0aIsci9QQxiqKHW F/xyaF0+JohDv2jWjlXiz3x1WWQIEm3fcb+tkP4AyXjcIcr4x3aFwpFROX/1gyvl/5jDG1 WI12H68UkPsCqlnz1lDpNU+/wPVQfwl8AkY+lD0tajcIJ+u3jTpUHcQUMTpCpkK9Xo++PK KxeDo2BDnkt43Zxd2Shzbo2CRFaRIQvLCdByRhW479yaaQgNg0ooI7I/alPAYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789949118; 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=Sxhy1vJZOpuLSqkaZQi43tAq5TyDAPtemCWpM3R4BaU=; b=nP6fAQABZlGOAsWy4quktjQinvJFMG0SoptCOZJEHaob86lrpmP6GbLevJFv4vG0PNnV/t 4XZoNh3A2qXa9eE4UF3OqvBO1Rvb66EfqySpowW9D4CNqnrKq6Te/q77H2N10wU0rKbtM5 6IaBFrzCln/6QySW2ujIvvdmonoxJbodjgkDWh4lsGIPZVGzjnViaLymKH7rjav4jOW3VY TJjR9dEkPBFgr+8bvA+1PFFVlZZ+IMScrw4a9wMgPpx3Sf5BJ7naPV0a59a67s7vBmyQGZ 7Zs0TzjcDQm/f8Kq7qkC5Nz+19B69xThMkfO0b4/hrPGZ01y8/s07fEut6tvTg== 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 4hp3QQ4Z7pzwXd for ; Mon, 21 Sep 2026 00:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eb1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 00:05:13 +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: a6deeaa2fb3b - main - dtrace/arm64: Fix copyout and copyoutstr 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a6deeaa2fb3b28a61ae56a85f2275f67fcf23262 Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 00:05:13 +0000 Message-Id: <6ab074b9.3eb1f.18524b19@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a6deeaa2fb3b28a61ae56a85f2275f67fcf23262 commit a6deeaa2fb3b28a61ae56a85f2275f67fcf23262 Author: Benjamin Jacobs AuthorDate: 2026-09-16 13:07:01 +0000 Commit: Mark Johnston CommitDate: 2026-09-21 00:04:43 +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 --- .../opensolaris/uts/common/sys/dtrace_impl.h | 7 +++ sys/cddl/dev/dtrace/aarch64/dtrace_asm.S | 68 ++++++++++++++++++++-- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 8 +-- 3 files changed, 73 insertions(+), 10 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 c26956a646ff..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,8 +1302,15 @@ extern int dtrace_attached(void); extern hrtime_t dtrace_gethrestime(void); #endif +#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 *); +#endif /* * DTrace Assertions 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