From nobody Thu Nov 12 18:10:40 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 4jQT2m6RYmz711Lt for ; Thu, 12 Nov 2026 18:10:40 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQT2m5rrRz4j19 for ; Thu, 12 Nov 2026 18:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794507040; 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=MvyIFQ5uGrkxGxGSlToOwnJiHTveqdHdGrQTjBT/QDI=; b=uBR0K3+XsfyUL0xB2HYGHs4/TES6T1hepbvp6byM1nqYNCKb/FuZskNy5wp/kyGDTvKyOE d9CptsWGFH0dBdlarEcdKnYl0WDt4yNYoffDv1tc8YE5eRk+nZX2ySCgY6bQFxvxKRI7FG KJEDzB8FVVtj55VFZcCKYMnOppCw3vnbSC84xXjKabNgbJcAwKcGl3R2IZCqKP3thLKNLL aT6Sf5zp0vnO/rdEaj+TNFyXjfP+yvQ7Ly9U6u1jn50ubmSCalWIDD+Qh1qjl2fKKA9EUL tHjRS90UVcSbGqclbD1V3F5ZLEH3OMkoE7phdvR9D6oAMajKp/GsXk6JK7BB5Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794507040; b=Lc+uswuwl1BwcxvlWljtqBAfG3AJBrR7WchvVIiHTpd8j2QcKAJdSUUiK1eoNFuCq4oJq0 Z/Fdoe09Xa1btZbIFfPWDseeJBCPjXsc/2tQoSluzj0auuCSipYfASIAeqeyzQpTBa1MVX ePT67iUOKctrrONvq3FO6s91wfynTEDGGPti0Q7M++AHQbwgBOJvAhCgD5pfEXqPzc7sZB fam1afQCjkaR9KcnF2TYNcyW8Lkv3Lh1O/a222o2CnwYzISdR5RaRGaVWmBvgc9NLTSPw/ Hw6co3aOBOk8LY5Bjo+jf9W/BvEeKxYkjEGqHBmL/KBiJHLMdEOr220jspUebg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794507040; 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=MvyIFQ5uGrkxGxGSlToOwnJiHTveqdHdGrQTjBT/QDI=; b=VoqnuUB14mUm4r9i752o0/zNwTAvVEzI/5w+/0dzyrQA+CRbXbKyRYp67nZLo/WqTHdKqR pj+AyTiLniC3ckZnLkGELWAmblgWP7+dslKA+9HybHgPMCDq5JYTLNjn7r1s8InLtJudR6 i81npbWURP0wenZu+bnRBk2tL5Dvtv/C/t4uKkX2RacPi2SXlaicrKtTF8twRQpo9a6Wje 68q924+K06MxMK3lQ/6kQKdxQASyTQ/zh+2o8KV1Je0Gat3fEmVvIcE40AHyOTeXsceApz Ce13yISY4K2lfCqpNA7bTDzuuamIimE7ctkWA78R1nwZHjdQMUHtKCtBRZk1oQ== 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 4jQT2m5PzGz1Cl2 for ; Thu, 12 Nov 2026 18:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e01d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 18:10:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: d40890ffbd8b - stable/15 - TCP RACK: fix RSM computation for TCP fast open List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d40890ffbd8bcacfc4e24c37daad931db8f31804 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 18:10:40 +0000 Message-Id: <6af60120.e01d.79116a19@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d40890ffbd8bcacfc4e24c37daad931db8f31804 commit d40890ffbd8bcacfc4e24c37daad931db8f31804 Author: Michael Tuexen AuthorDate: 2026-11-07 13:33:45 +0000 Commit: Michael Tuexen CommitDate: 2026-11-12 18:06:42 +0000 TCP RACK: fix RSM computation for TCP fast open When spitting an RSM containing the SYN and data, honor the sequence number used by the SYN flag when computing the offset in the socket buffer. PR: 297006 Reviewed by: rrs, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D61149 (cherry picked from commit ff066579fd7719a6361e7ce8cc9ade47517d242d) --- sys/netinet/tcp_stacks/rack.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 91aa589bce74..1f64f7487463 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -6829,7 +6829,7 @@ static void rack_setup_offset_for_rsm(struct tcp_rack *rack, struct rack_sendmap *src_rsm, struct rack_sendmap *rsm) { struct mbuf *m; - uint32_t soff; + uint32_t soff, start; if (src_rsm->m && ((src_rsm->orig_m_len != src_rsm->m->m_len) || @@ -6838,7 +6838,10 @@ rack_setup_offset_for_rsm(struct tcp_rack *rack, struct rack_sendmap *src_rsm, s rack_adjust_orig_mlen(src_rsm); } m = src_rsm->m; - soff = src_rsm->soff + (src_rsm->r_end - src_rsm->r_start); + start = src_rsm->r_start; + if ((src_rsm->r_flags & RACK_HAS_SYN) != 0) + start++; + soff = src_rsm->soff + (src_rsm->r_end - start); while (soff >= m->m_len) { /* Move out past this mbuf */ soff -= m->m_len; @@ -6861,6 +6864,14 @@ rack_setup_offset_for_rsm(struct tcp_rack *rack, struct rack_sendmap *src_rsm, s return; } } + if ((src_rsm->r_flags & RACK_HAS_SYN) != 0 && + src_rsm->r_end == src_rsm->r_start + 1) { + /* src_rsm is a SYN segment without data */ + src_rsm->m = NULL; + src_rsm->soff = 0; + src_rsm->orig_m_len = 0; + src_rsm->orig_t_space = 0; + } rsm->m = m; rsm->soff = soff; rsm->orig_m_len = m->m_len;