From nobody Tue Jan 13 17:11:07 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 4drG3v4WHvz6NR6D for ; Tue, 13 Jan 2026 17:11:07 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drG3v1Jnjz3hK2 for ; Tue, 13 Jan 2026 17:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768324267; 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=3iqjLrCP8cQtKBG4FPk4LMxh4TrD31jetHvRudA3+ug=; b=N7GNew9VRf0xi57O7Z3tDJZT8Zls/2LGUSyokHfA5z565A1+6p8DH1yMCSE3WYncWxALq1 bSKxL/zyZHFxgg/rWZNqeUz//J0sO/hrD+9uaEYNVOZypkODAUEK67VH9EkttRGB0u4d30 HoBMrXo9lYWZiq5UL+VtRqDYytwSvfrV9IHBst26I8QmXXmMOw944rT5SAq0J+1dqeO0/C 7Z+r7H1hvL91vtzHzlK2SN3qHmQdTbQXtb+UnWC5V6Ywhr3K2iDlWNC4C/CkFTeyimXB3J 1lojf65Y2Vi1F2kYnY+OKsLWJX3BIDQ7zLmCGAwLNnJ7mcU6nK8B0we6D2yivA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768324267; 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=3iqjLrCP8cQtKBG4FPk4LMxh4TrD31jetHvRudA3+ug=; b=Iz8WzyPG2ufJazT3vXUnOHncv7C0Ztcl1pRNvpz50+bDLypcVyh/YIIDa5nEsaI1HB5QLR ZTGpSuE1PKhECTMyVBbL0Gh/Zh6vAziVYaO155OLI39smdv6AnR3Ej8ErhyAEgylCdlFv3 n1Zx99At7TocyA36Kb/9OXXwe8pt4KbYxQt9icZGncwFebj8vI0mhcxA1rY2fHSrF2lspC n13bgZKjvC50vlXNIO6RElsZQpTMNPpfamNdIMQLv0BEff+WGZqXYE3aHzRhZGwJi+Tb1T zFaI95NP/xqEK3j8Sb0pFt+mE9Ka8VRM7gL06si5xnaLmGn9gS3Ty9AjmsoiUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768324267; a=rsa-sha256; cv=none; b=nhFYma8Etytu3rBeuWMafYQgBCZSe6SKwP7d+xbc5NHU/Gr3a9BoMk1eN9HNO2CXHcFztm G0db8tHe2hKVRdK3DT6YLjnfbDutkvdnlH+GftjglIPS3Pq/dVFWUFDhxWRoNVdCENtWvM NHZkzWeXPA9JoJWfc1OgjesJGvg1+wYFZT+s4ZA+7D0YtsJl33WJvOFYIGPQITrGBSKit7 wgOfWgGGZ28xRrX0xRgHOuH3XaBcIRyxmVC9gtQHIGXfMK8R9L990BgKy0x/KTTogm4OcG JAop/xl8tWktWCFIFsLCr2hLUT7gQsbTjdEwZMIxJzhxQlTkQgCmef3W0PPwMg== 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 4drG3v0Hcpz6JM for ; Tue, 13 Jan 2026 17:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34ac7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 17:11:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 66eedcb0224d - main - sdt: Fix the probe ID type in struct sdt_probe 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 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: 66eedcb0224df03e56513f3caf1df93a52b6a919 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 17:11:07 +0000 Message-Id: <69667cab.34ac7.24378ab8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66eedcb0224df03e56513f3caf1df93a52b6a919 commit 66eedcb0224df03e56513f3caf1df93a52b6a919 Author: Mark Johnston AuthorDate: 2026-01-13 15:35:05 +0000 Commit: Mark Johnston CommitDate: 2026-01-13 17:07:37 +0000 sdt: Fix the probe ID type in struct sdt_probe This is supposed to be a dtrace_id_t, which is a uint32_t, while id_t is a uint64_t. sdt.h avoids depending on dtrace.h so we can't use dtrace_id_t directly. Bump __FreeBSD_version since the layout of structures in the SDT probe linker set has changed. Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. --- sys/cddl/dev/sdt/sdt.c | 3 +++ sys/sys/param.h | 2 +- sys/sys/sdt.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/sdt/sdt.c b/sys/cddl/dev/sdt/sdt.c index 0a9059104671..97ef2de18525 100644 --- a/sys/cddl/dev/sdt/sdt.c +++ b/sys/cddl/dev/sdt/sdt.c @@ -60,6 +60,9 @@ #include +_Static_assert(sizeof((struct sdt_probe *)NULL)->id == sizeof(dtrace_id_t), + "sdt_probe.id and dtrace_id_t size mismatch"); + /* DTrace methods. */ static void sdt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); static uint64_t sdt_getargval(void *, dtrace_id_t, void *, int, int); diff --git a/sys/sys/param.h b/sys/sys/param.h index 3b56c582be0e..d228859575c7 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600007 +#define __FreeBSD_version 1600008 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h index cd45bc1a1ffd..f705be915684 100644 --- a/sys/sys/sdt.h +++ b/sys/sys/sdt.h @@ -447,7 +447,7 @@ struct sdt_probe { const char *mod; const char *func; const char *name; - id_t id; /* DTrace probe ID. */ + uint32_t id; /* DTrace probe ID. */ int n_args; /* Number of arguments. */ struct linker_file *sdtp_lf; /* Module in which we're defined. */ };