From nobody Tue Sep 30 15:23:51 2025 X-Original-To: dev-commits-src-branches@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 4cbhfc4LbPz69F0f; Tue, 30 Sep 2025 15:23:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbhfb6VY4z3MFR; Tue, 30 Sep 2025 15:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245832; 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=jRd/XqFDnjreOMlvIWyUKFjOWbukIdc169ReXR4MIwk=; b=Okf8L1MxbqWpLVsyJjrymv6Het4dV7F4XIeSt3PSUahbs4C/NXqEqRWyW+Dk16yhDILoD+ yETyW6PppFpG++dC0eEhE+FYd9ry152SPx91T/tlbRIrt8cIhhG/twFJrJhQ7meKuGsLJO vHqsdl+gLiARTlD51M5UZosFTSsxf1GiqdwZaMms3alz8/Ynu30DnizAek6bG0wPYoOBhd RcOX6LLCvKoqVkItib3Ob72Klj2X4toUsLOUl8Vs+DPTXu+JSOiiCm96+p5ZlYUNgprXFi 3S0/z2wW7zUTC3gVPRuz34AWRF1pWMby5JIxcsoEHyI1XeliJmjpMrxla87Gnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245832; 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=jRd/XqFDnjreOMlvIWyUKFjOWbukIdc169ReXR4MIwk=; b=lSRULRhYoXsyhBa67rtGnPUl8ilikXH2paVdBsILzaJeE6fpF5PYzpE1+WrYoukB/o1RLx lKh+DiJG2czEzVJzeWiPtV2ryUWfp6QOLs+VSpHuyL+yRQe5eD1kY97gOhr6cusuVBwM6Q gocgt8UdAK6IuCzidx5JvcCrTRXJYkApAlSbBD7dgd2r6vw87fNIDWUSOSH45pMON5+Oya 5oJAEiDlhhZYXIcW2YOYcZd/FROdoEmMF9PjwUFNFZx5uRPABwozzVB/d6864aYouSKW6+ FK850/53/aAZqmjC9sLbY1oV3TjdZx8z26uZoNntNbP3DjAdievACMq0q1WXag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759245832; a=rsa-sha256; cv=none; b=rN9CO0ey9mvhCequujfP2p3/vsDL/T0MYxRwdziwJ1h1JUv4PkdiuolWDF9FAoItzr1O1W 9ibQDHMn7wNwJLkv6MwCLJh4/WCr8AH6xJAa4WRKXEOopJ/Ljs+1n4NF3IXxatx0ios24+ NzxnmZFB7DO2GDwgGVywbSXGRqg4TEgkoL/q74BbXozFkav7k08xCYJiueFQwgl9c4rzGR CO5C0mTZ4qmkCwtQYbAC6d/KKTUHc380PGbfw1RnPbQLlWPb76bk0/t6T2eE0iHhEsyPI+ yq8YdsLMTkgAEyoeUCkOLmRizthzqOOmQnXPGFNJF3Ylb+YHYaWzADmjJG6sjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cbhfb5tM5zj08; Tue, 30 Sep 2025 15:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58UFNpN6046122; Tue, 30 Sep 2025 15:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFNpV2046119; Tue, 30 Sep 2025 15:23:51 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:23:51 GMT Message-Id: <202509301523.58UFNpV2046119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 053b8cb7602c - stable/15 - dtrace: Use a size_t to represent a buffer size in the printm action List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 053b8cb7602cf1246f6c37b8db8dfdffd331af48 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=053b8cb7602cf1246f6c37b8db8dfdffd331af48 commit 053b8cb7602cf1246f6c37b8db8dfdffd331af48 Author: Mark Johnston AuthorDate: 2025-09-10 14:33:58 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 09:43:08 +0000 dtrace: Use a size_t to represent a buffer size in the printm action printm is specific to the FreeBSD dtrace port. I believe it's effectively the same as tracemem(), though printm apparently predates it. It stores the size of the buffer of traced data inline. Currently it represents that size using a uintptr_t, which isn't really right and poses challenges when porting to CHERI because `DTRACE_STORE(uintptr_t, ...` requires the destination to be suitably aligned, but this isn't necessary since we're just storing a size. Convert to using a size_t. This should be a no-op since sizeof(uintptr_t) == sizeof(size_t) on non-CHERI platforms (and besides that I don't see a reason to use printm() when tracemem() is available and is simpler to use.) Reviewed by: Domagoj Stolfa, avg MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D52055 (cherry picked from commit 3877025f52ee205fe99ad4ff68229933d57e4bcb) --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c | 9 ++++----- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 11 ++++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c index 385c9d78bdfc..b311b5425587 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c @@ -2242,11 +2242,10 @@ dt_format_bytes_get(dtrace_hdl_t *dtp, caddr_t addr, size_t nbytes) static int dt_format_memory(dtrace_hdl_t *dtp, caddr_t addr) { - - size_t nbytes = *((uintptr_t *) addr); + size_t nbytes = *((size_t *) addr); char *s; - s = dt_format_bytes_get(dtp, addr + sizeof(uintptr_t), nbytes); + s = dt_format_bytes_get(dtp, addr + sizeof(size_t), nbytes); if (s == NULL) return (-1); @@ -2260,9 +2259,9 @@ static int dt_print_memory(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr) { int quiet = (dtp->dt_options[DTRACEOPT_QUIET] != DTRACEOPT_UNSET); - size_t nbytes = *((uintptr_t *) addr); + size_t nbytes = *((size_t *) addr); - return (dt_print_bytes(dtp, fp, addr + sizeof(uintptr_t), + return (dt_print_bytes(dtp, fp, addr + sizeof(size_t), nbytes, 50, quiet, 1)); } diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 7192df200ae2..8078f3f6d4b1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -7761,7 +7761,8 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1, uintptr_t *memref = (uintptr_t *)(uintptr_t) val; if (!DTRACE_INSCRATCHPTR(&mstate, - (uintptr_t)memref, 2 * sizeof(uintptr_t))) { + (uintptr_t) memref, + sizeof (uintptr_t) + sizeof (size_t))) { *flags |= CPU_DTRACE_BADADDR; continue; } @@ -7773,21 +7774,21 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1, * Check if the size exceeds the allocated * buffer size. */ - if (size + sizeof(uintptr_t) > dp->dtdo_rtype.dtdt_size) { + if (size + sizeof (size_t) > + dp->dtdo_rtype.dtdt_size) { /* Flag a drop! */ *flags |= CPU_DTRACE_DROP; continue; } /* Store the size in the buffer first. */ - DTRACE_STORE(uintptr_t, tomax, - valoffs, size); + DTRACE_STORE(size_t, tomax, valoffs, size); /* * Offset the buffer address to the start * of the data. */ - valoffs += sizeof(uintptr_t); + valoffs += sizeof(size_t); /* * Reset to the memory address rather than