From nobody Fri Apr 24 17:55:56 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 4g2LH04hzjz6ZxKc for ; Fri, 24 Apr 2026 17:55:56 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2LH00hnkz3q84 for ; Fri, 24 Apr 2026 17:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053356; 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=7ShnQO5Qxxiqyva5gKkjwMXdBgEAOs500od8rCQ/oiE=; b=oVnwgfDaPnE4S2bcE4YmCQsxMNu12uM4IvByM676YMZ0Ew+0QsgF8DAIJXkslzcKI2eGgH b3+RHVYX8Q/OWgJ6IAGYHZDEJUtoHVyyA1l+4dPF8eZ8s+CLXNec5/0+oFv2b9qW6cyut5 LGysGC8UIuDgDBtUACG41VyB+hihIl2GaZ3Icqjsr2nCJfGb35VuRTBPsuUisaRq6CtElb dN2koigfyY0VhFjePcKEPbRrpqJOWCClzxKa+V5/hHlc0WcU46KerbPznKlJA8WkjCyAte CCP9CHufcE7U5PelnHZaD28MTN2b77Teb0aTro1ZCNwRXqr8wxygmHPZ1l7Y8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053356; a=rsa-sha256; cv=none; b=MIrLW8QDGfD4yAxAxRtoksaDhcB3uefFVszMRaXXWPKLJtU+i22a/JAUllFfU9f2rLkYkN Z3oMhJJ/wu5Da1x3kYlrZCqrLQ0J5PB2OxyImVhBAucogsoSSssXxJtypt85BHHxabq5rt /FxvYBF+9EVeFHGznliSu1HbF030UyZ2dx4M1EPqD6DxezI3bXhQpUKtiAaPaHN8Izo5Fs 0AiG6AO9w+4pwg/d8Dd2kjKCRHcrykL2Tp6pbsZTQxwkWrGu/SYxrld99W4Tm31ie4WDog OEqS4KywoyILvzVQtkZh3qeeXYrBP+V4Vw1t2hCNbFPxmg4tAxsYWQXFnahGQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053356; 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=7ShnQO5Qxxiqyva5gKkjwMXdBgEAOs500od8rCQ/oiE=; b=Cn3+tk36RA0xxEW80GojzlTq+QetLkE/LlRTbjQQuT5WtynMBZsvFcHcVIH7oEXsClKxDG l1WH4+O6V2EShYvsvkfUVv0Q7lmHGUzYq29o+WW9UPxXUaAJDalhtBUywf8IFng+bkRU/Z ZozqW52p4WM1JcHKlEWxZYh1bKfFnpyMFvE4Y4J98P8i0pcABkoNHdPolD2v5CVDLHXNFf HarxQE9OstmkLxvQcS98JlxXlNkwQSe80kYGZEuzrZyTYf2hR3juqZyudf+847GLw1T25e Rl6YBYTnJsveHEXQRinez+5D2ZQt0FWZkoaYnpzquZOSc+GzchtaNNQYvVfiiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LH00FkNz1CQ5 for ; Fri, 24 Apr 2026 17:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:55:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9c6f96d18998 - stable/15 - sctp: Use __sdt_used for variables only used by SDT probes 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c6f96d18998f7a3fbeb9e2fbce020e6d2b8b65b Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:55:56 +0000 Message-Id: <69ebaeac.1e1e6.2c54bc3b@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c6f96d18998f7a3fbeb9e2fbce020e6d2b8b65b commit 9c6f96d18998f7a3fbeb9e2fbce020e6d2b8b65b Author: John Baldwin AuthorDate: 2026-02-09 16:27:55 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:33:36 +0000 sctp: Use __sdt_used for variables only used by SDT probes Previously this used a home-rolled version. Reviewed by: tuexen, imp, markj Differential Revision: https://reviews.freebsd.org/D55165 (cherry picked from commit d4d735b26537662565001d86685080256cf95758) --- sys/netinet/sctp_cc_functions.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index 1a252da31b27..db46f5e34195 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -51,12 +51,6 @@ #define SHIFT_MPTCP_MULTI_Z 16 #define SHIFT_MPTCP_MULTI 8 -#ifdef KDTRACE_HOOKS -#define __dtrace -#else -#define __dtrace __unused -#endif - static void sctp_enforce_cwnd_limit(struct sctp_association *assoc, struct sctp_nets *net) { @@ -255,7 +249,7 @@ static int cc_bw_same(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t rtt_offset, uint64_t vtag, uint8_t inst_ind) { - uint64_t oth __dtrace, probepoint __dtrace; + uint64_t oth __sdt_used, probepoint __sdt_used; probepoint = (((uint64_t)net->cwnd) << 32); if (net->rtt > net->cc_mod.rtcc.lbw_rtt + rtt_offset) { @@ -390,7 +384,7 @@ static int cc_bw_decrease(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t rtt_offset, uint64_t vtag, uint8_t inst_ind) { - uint64_t oth __dtrace, probepoint __dtrace; + uint64_t oth __sdt_used, probepoint __sdt_used; /* Bandwidth decreased. */ probepoint = (((uint64_t)net->cwnd) << 32); @@ -530,7 +524,7 @@ out_decision: static int cc_bw_increase(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t vtag) { - uint64_t oth __dtrace, probepoint __dtrace; + uint64_t oth __sdt_used, probepoint __sdt_used; /* * BW increased, so update and return 0, since all actions in our @@ -574,7 +568,7 @@ static int cc_bw_limit(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw) { uint64_t bw_offset, rtt_offset; - uint64_t probepoint __dtrace, rtt, vtag; + uint64_t probepoint __sdt_used, rtt, vtag; uint64_t bytes_for_this_rtt, inst_bw; uint64_t div, inst_off; int bw_shift; @@ -687,7 +681,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, int accum_moved, int reneged_all SCTP_UNUSED, int will_exit, int use_rtcc) { struct sctp_nets *net; - int old_cwnd __dtrace; + int old_cwnd __sdt_used; uint32_t t_ssthresh, incr; uint64_t t_ucwnd_sbw; uint64_t t_path_mptcp; @@ -800,7 +794,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, continue; } } else { - uint64_t vtag __dtrace, probepoint __dtrace; + uint64_t vtag __sdt_used, probepoint __sdt_used; probepoint = (((uint64_t)net->cwnd) << 32); probepoint |= ((0xa << 16) | 0); @@ -998,7 +992,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, static void sctp_cwnd_update_exit_pf_common(struct sctp_tcb *stcb, struct sctp_nets *net) { - int old_cwnd __dtrace; + int old_cwnd __sdt_used; old_cwnd = net->cwnd; net->cwnd = net->mtu; @@ -1339,7 +1333,7 @@ static void sctp_cwnd_new_rtcc_transmission_begins(struct sctp_tcb *stcb, struct sctp_nets *net) { - uint64_t vtag __dtrace, probepoint __dtrace; + uint64_t vtag __sdt_used, probepoint __sdt_used; if (net->cc_mod.rtcc.lbw) { /* Clear the old bw.. we went to 0 in-flight */ @@ -1402,7 +1396,7 @@ static void sctp_set_rtcc_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net) { - uint64_t vtag __dtrace, probepoint __dtrace; + uint64_t vtag __sdt_used, probepoint __sdt_used; sctp_set_initial_cc_param(stcb, net); stcb->asoc.use_precise_time = 1;