git: e3483dbc91b5 - main - tcp: improve consistency

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Tue, 17 Nov 2026 19:55:00 UTC
The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=e3483dbc91b59b5b2c73a4bc792fbb834c3dc111

commit e3483dbc91b59b5b2c73a4bc792fbb834c3dc111
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2026-11-17 19:42:36 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2026-11-17 19:46:28 +0000

    tcp: improve consistency
    
    Use an inline function tcp_adapt_iss_check() to perform the check
    consistently instead of replicating the code multiple times. These
    checks already became inconsistent.
    A fix for PR 298560 requires more calls to tcp_adapt_iss_check().
    
    Reviewed by:            Peter Lei
    Fixes:                  fa2ad70a4511 ("tcp: make ghost ACK handling more conformant")
    MFC after:              3 days
    MFC to:                 stable/14
    MFC to:                 stable/15
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D61685
---
 sys/netinet/tcp_input.c       |  5 +----
 sys/netinet/tcp_stacks/bbr.c  |  5 +----
 sys/netinet/tcp_stacks/rack.c |  5 +----
 sys/netinet/tcp_var.h         | 10 ++++++++++
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 1a775f988be3..92fd7ae50a50 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2424,10 +2424,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th,
 	/*
 	 * Ack processing.
 	 */
-	if (SEQ_GT(tp->snd_una, tp->iss + (TCP_MAXWIN << tp->snd_scale))) {
-		/* Checking SEG.ACK against ISS is definitely redundant. */
-		tp->t_flags2 |= TF2_NO_ISS_CHECK;
-	}
+	tcp_adapt_iss_check(tp);
 	if (!V_tcp_insecure_ack) {
 		tcp_seq seq_min;
 		bool ghost_ack_check;
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 0cef2cb49ec0..1a6d59111494 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -7681,10 +7681,7 @@ bbr_process_ack(struct mbuf *m, struct tcphdr *th, struct socket *so,
 	bbr = (struct tcp_bbr *)tp->t_fb_ptr;
 	lost = bbr->r_ctl.rc_lost;
 	nsegs = max(1, m->m_pkthdr.lro_nsegs);
-	if (SEQ_GEQ(tp->snd_una, tp->iss + (65535 << tp->snd_scale))) {
-		/* Checking SEG.ACK against ISS is definitely redundant. */
-		tp->t_flags2 |= TF2_NO_ISS_CHECK;
-	}
+	tcp_adapt_iss_check(tp);
 	if (!V_tcp_insecure_ack) {
 		tcp_seq seq_min;
 		bool ghost_ack_check;
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index b27c1e3e9809..b4ff35b3acfe 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -11701,10 +11701,7 @@ rack_process_ack(struct mbuf *m, struct tcphdr *th, struct socket *so,
 	INP_WLOCK_ASSERT(tptoinpcb(tp));
 
 	rack = (struct tcp_rack *)tp->t_fb_ptr;
-	if (SEQ_GEQ(tp->snd_una, tp->iss + (65535 << tp->snd_scale))) {
-		/* Checking SEG.ACK against ISS is definitely redundant. */
-		tp->t_flags2 |= TF2_NO_ISS_CHECK;
-	}
+	tcp_adapt_iss_check(tp);
 	if (!V_tcp_insecure_ack) {
 		tcp_seq seq_min;
 		bool ghost_ack_check;
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index ffd8f755bcb0..fc26baade54b 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -34,6 +34,7 @@
 
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
+#include <netinet/tcp_seq.h>
 
 #ifdef _KERNEL
 #include <net/vnet.h>
@@ -1625,6 +1626,15 @@ tcp_fields_to_net(struct tcphdr *th)
 	th->th_win = htons(th->th_win);
 	th->th_urp = htons(th->th_urp);
 }
+
+static inline void
+tcp_adapt_iss_check(struct tcpcb *tp)
+{
+	if (SEQ_GT(tp->snd_una, tp->iss + (TCP_MAXWIN << tp->snd_scale))) {
+		/* Checking SEG.ACK against ISS is definitely redundant. */
+		tp->t_flags2 |= TF2_NO_ISS_CHECK;
+	}
+}
 #endif /* _KERNEL */
 
 #endif /* _NETINET_TCP_VAR_H_ */