From nobody Sat Apr 18 19:09:57 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 4fyhCH2f83z6WrYr for ; Sat, 18 Apr 2026 19:10:03 +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 4fyhCH0wL4z432j for ; Sat, 18 Apr 2026 19:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776539403; 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=kjncSr/XxcqsTp7RUGtgJ8RASCr1RiBoRY7/UNJBemU=; b=n1R9sep2ZBl4fnPYSTxGZ1IDWS8MSTA+jgesmLUTGrfBwx/njIiGdskplhwmEaXs60qGBT 6hNjtPmrHE8xH1Og5lQNfSbJdEwDvh2tecVltAQd3BijT3J1htLQfgFZmPoRlsk5wOOQOb zbyaArw6GSCwxP3wYsyhpo2gLajvpxUj0dwzANl+GwUmqBUdPO4rxu2M4AVgTy9ULzJiG7 j1MMg1S86M7BCM7WKZ0Y6hwqf9LKCv8PHkHW5pZPBTIKhtnnwp5taVCtoP7PBIFUp3nK8z XZTrJJpq1FkvViqvBf0IUqfKvZVwbTzQH5eIIW/K3uzAPkmT/W60/L2Nlj7MeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776539403; a=rsa-sha256; cv=none; b=infQnQWnx5/i1lbWQlhMnakMLnUu4kcZXgUhcfBLA5O0YWL//kWfDjaIdQQcQXmi3lwkVn WpW4y6jQ+b05C/ogLN/CmGYKlwvgo9VSZS1Pg5O4Fm/5nxXMuGjLXv6lMfCMjM+jTsFmHK 1ChWLC/7XYsHW6/Un8EjDiLWL/aBx3fQkeRsz5shFNXx7sWfuonFX0jsaTPhmEZUdaNGb1 WgL961FW4bGIzPeQHi19Sip3H3s/xkChGpBIG1kmjegf3j/7kCkRP/h0ZYAqQvg/TLv7Az +N0BxNqhoRCHTdZLj0my44KANTUJByGn7Ff9xh8rs2psLfUfkayPfERbir6ZLw== 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=1776539403; 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=kjncSr/XxcqsTp7RUGtgJ8RASCr1RiBoRY7/UNJBemU=; b=d0uBBeECrCCopO/9CubmNNxJbL+4UVwI9FVJHLtrcMWzQ8/ejjvyalwT0V0LY8ixtJC400 ycvgBBVxEffXEBJTXxi3qURKSu1HmzFaMS2b5LUSFW1pfb8ysksMFsEUThyC5HbEGgy8kY /Vad55Mavzs94i0Jwu0rOiMPQWWhmQot16bmuVyEkHOOXpvZwLCKWJysnLLf8SZ4CjOt4G hz1nQpOwphRYv1odHaiXmeBrbSvEqiEk9jyHjRs81e+kai92ID8g4LQu8nBUUwVmFv4tJ0 LWr7FMHyK9Q5Lqze75JSB8gqt6Dk+9TxpRtcrfhmxH4MuZ8s4qSkT2Pfpg3bAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyhCG6MJVzsFp for ; Sat, 18 Apr 2026 19:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47a27 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 19:09:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 29336f1c9d25 - main - tcp: Allocate t_tcpreq_info on demand 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29336f1c9d25c32896620a00a6218c332b37c4b7 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 19:09:57 +0000 Message-Id: <69e3d705.47a27.44829a14@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=29336f1c9d25c32896620a00a6218c332b37c4b7 commit 29336f1c9d25c32896620a00a6218c332b37c4b7 Author: Andrew Gallatin AuthorDate: 2026-04-17 20:01:36 +0000 Commit: Andrew Gallatin CommitDate: 2026-04-18 19:04:05 +0000 tcp: Allocate t_tcpreq_info on demand When TCP_REQUEST_TRK is enabled, the tcb grows by 600 bytes to accommodate the t_tcpreq_info[MAX_TCP_TRK_REQ] array. Even when the option is enabled, not every connection is using this feature. So let's allocate it on-demand, and save 600 bytes in the common case. Sponsored by: Netflix Reviewed by: rrs, tuexen Differential Revision: https://reviews.freebsd.org/D56484 --- sys/netinet/tcp_subr.c | 17 +++++++++++++++++ sys/netinet/tcp_var.h | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 4adc8d859f3e..9844ba176237 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1133,6 +1133,9 @@ tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged) MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers"); MALLOC_DEFINE(M_TCPFUNCTIONS, "tcpfunc", "TCP function set memory"); +#ifdef TCP_REQUEST_TRK +MALLOC_DEFINE(M_TCPREQTRK, "tcpreqtrk", "TCP request tracking"); +#endif static struct mtx isn_mtx; @@ -2445,6 +2448,12 @@ tcp_discardcb(struct tcpcb *tp) #ifdef STATS stats_blob_destroy(tp->t_stats); #endif +#ifdef TCP_REQUEST_TRK + if (tp->t_tcpreq_info != NULL) { + free(tp->t_tcpreq_info, M_TCPREQTRK); + tp->t_tcpreq_info = NULL; + } +#endif CC_ALGO(tp) = NULL; if ((m = STAILQ_FIRST(&tp->t_inqueue)) != NULL) { @@ -4890,6 +4899,14 @@ tcp_req_alloc_req_full(struct tcpcb *tp, struct tcp_snd_req *req, uint64_t ts, i struct tcp_sendfile_track *fil; int i, allocated; + /* Allocate the request tracking array on demand */ + if (tp->t_tcpreq_info == NULL) { + tp->t_tcpreq_info = malloc( + sizeof(*tp->t_tcpreq_info) * MAX_TCP_TRK_REQ, + M_TCPREQTRK, M_NOWAIT | M_ZERO); + if (tp->t_tcpreq_info == NULL) + return (NULL); + } /* In case the stack does not check for completions do so now */ tcp_req_check_for_comp(tp, tp->snd_una); /* Check for stale entries */ diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 987bb98c19af..a1b0519ceac3 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -493,7 +493,7 @@ struct tcpcb { uint32_t tcp_hybrid_start; /* Num of times we started hybrid pacing */ uint32_t tcp_hybrid_stop; /* Num of times we stopped hybrid pacing */ uint32_t tcp_hybrid_error; /* Num of times we failed to start hybrid pacing */ - struct tcp_sendfile_track t_tcpreq_info[MAX_TCP_TRK_REQ]; + struct tcp_sendfile_track *t_tcpreq_info; #endif #ifdef TCP_ACCOUNTING uint64_t tcp_cnt_counters[TCP_NUM_CNT_COUNTERS];