From nobody Thu Nov 12 23:41:55 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 4jQcP029YPz6xnCF for ; Thu, 12 Nov 2026 23:41: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQcNz71csz4Rfq for ; Thu, 12 Nov 2026 23:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794526916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jdvuQgfSwx1+FGnjXh35aWcWD5PRjS6Qoyy5snXPq8U=; b=ZIxZeA8jotcyZPjCJlFNBMX2OuX8LvV06ErrWFoPYMlUJf//R2XASBtspYUu2zivyyg+SP 1BOKegu/Q1wtYebBU9hEk63epIbzTAqeM5ZxuEH9ypD35KicYCR3UcrjavBMqgKJ+uH3pT G5cGgU1cIZhKT3cCUySMJAP7fLwEFyEt4MA8y+nTi3AwwWN+XO2t8yDttb8HNYio6a3HLX hQ2hGlB+gZp7mrvIxxhOfrUhpoL33IvRI8t03Qc4lSLO6q2wkCbYh5duTwI+WJntkEHVQe +Psi3wOqzmwymDL0oWBWQypj7sD+Q5tisTpQENn0/E7W5ABvvQGIcya6KoxfgQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794526916; b=r0F7srOgwC6DltGz0T7FMAXveTlCkAasYwafRoUAM4w/LBBdJFoE2DFKEuL2li74F9gDae YemAMJpJpjguoRzQrrCV5tBQJ9G0MKbwqx/kzyekWizDgxTNMETnGjTIqsZP9+9x0TT0dn axLKjARWDDOc9nJDlWjewuOgDxIQK1sYhylwYYj3YmJ17dGFrml9Bltz3Gk3InO8XYz78X SM1xIuWvQQmUfdUJ/7PSi4AGwP3BijZloHG6uvV0Q8ICdbEGp9C2cx36BfBGiBl8kALeD4 VzPbjZLK/eu7Wp3whztYGfQBQ4eeX9Csn8dW+B1XCuXdScrkTpTFCp3BVkruDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794526916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jdvuQgfSwx1+FGnjXh35aWcWD5PRjS6Qoyy5snXPq8U=; b=eU1TCCeyAdgy88WP34yHqOVQoDQPV5+oGbffNOAAR54Wef+MjA2OrWZpWdjYBR8/sNfC7Z txMvVRcahS/iZS6B37sj0mk8HLPrvZ1Sq3rd4OwzdiWV1KTKDpn9iYPhNyJy737heRGFqP ttW6Ca2VSUX2Ac4iS0yES/QSh5t4hhVFitpoOayfcWXDXISFU9hgBYo1Z5V9Q3nLt/Tno2 Zf2kR+nNeQz/eZiNVOIYBQ05jb2V7ddUb4BXEuebDL7TFrhhOBzs4MxarRu7pMBZ/sipkj +b8qUP20+Trc3q6D7cXhrPCtTjNyDOoaGWgYAIl23omcVdym4ujVsOJ1YMkC+Q== 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 4jQcNz6gwNz1NrF for ; Thu, 12 Nov 2026 23:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 102c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 23:41:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michael Tuexen From: Colin Percival Subject: git: fada8b742e8e - releng/15.2 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: fada8b742e8e197a855f1ab1617638d0b3873f88 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 23:41:55 +0000 Message-Id: <6af64ec3.102c8.12c951e1@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fada8b742e8e197a855f1ab1617638d0b3873f88 commit fada8b742e8e197a855f1ab1617638d0b3873f88 Author: Michael Tuexen AuthorDate: 2026-11-07 13:33:45 +0000 Commit: Colin Percival CommitDate: 2026-11-12 23:41:34 +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. Approved by: re (cperciva) PR: 297006 Reviewed by: rrs, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D61149 (cherry picked from commit ff066579fd7719a6361e7ce8cc9ade47517d242d) (cherry picked from commit d40890ffbd8bcacfc4e24c37daad931db8f31804) --- 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;