git: fada8b742e8e - releng/15.2 - TCP RACK: fix RSM computation for TCP fast open
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Nov 2026 23:41:55 UTC
The branch releng/15.2 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=fada8b742e8e197a855f1ab1617638d0b3873f88
commit fada8b742e8e197a855f1ab1617638d0b3873f88
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2026-11-07 13:33:45 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
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;