From nobody Tue Nov 17 19:55:00 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 4jTb6r3y6dz71ltK for ; Tue, 17 Nov 2026 19:55:00 +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 4jTb6r2xNxz3KPv for ; Tue, 17 Nov 2026 19:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945300; 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=fNZoGYPSXBKxR32kfHTJCo8QErA+EUskUOf3gJV/QaU=; b=WW8+SudoOx6mKWFzOxBcYzvku3cZDc8Rert7JH5SWQFbeew5a9BAm68hDrz5nmrW8Lj/bG sn+CU4C1u3YN+hDnnfwDKJ21jYpG1Ggu5hnuRLvoSA2MnE3Eskrp9Gp2y5bCz+ytx6iwVV jNFVJyhy+0J6NL72wt1pWP79pCrz10wA1aGvJxz9HCBCJePATPVX5GS/dZ9AGz9Hcg65eR YUBF8M99Dz9Z8Jvv3S7pd2Z6sCITMRK0vXSiapmBe3nYnvB/+a2kdsGhrn7U6kWWtk/Bew FeqSD/7nJFC1KRjuhayKZEhyVYpo6tSU02scftKWK4dzJJtC5zoH2n+rrpL7og== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794945300; b=rqiThGUnYZlExEgxR3KTc9Fy+jN1Qt8Ou3oTdZHvfY/GJu8+U93RHds4eKoh2/7C/wctDi uF0uyzjY7xuG0qYRAgLwhqDqFmTC+cB5NDBLbSBcrR36xw0vfi24pJD5bjlxXkdRM7eSQE l14Ph4H7G7wyGPdH3SYmvQPx/A1BN307+nypC4hQJ8j0oIXuwK0Isfbzk3SkGiNA6GDf2V ivXCwNunK0eyJdVEmMZr9e7GbIGDAjfx2pUQ582LC6HbWsyAvCKDkYFvyDJZZwBH5rxH5a ymkhXbHG1XKJ0hacfn/iH9nRZHgAnqf/tqoq4zPf3hq+sfG19XWsicskTQMaPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945300; 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=fNZoGYPSXBKxR32kfHTJCo8QErA+EUskUOf3gJV/QaU=; b=IxxIN7SGKENrDq7byC82RWaqv1HGVENMSodcdDHVP462wrDA2SrRRMwKyoz22N+Jo58thv 2Hkx/j+kc0lu6tvQWE9gK75WY9YMAuV+ZUcErVxrprhmaTAXrlhJE/4x/b4Xmdd7BBwPPo VOznKf8pEnOYzanvIOwF20woa1EC8CKSHhS+U+x71H/7mblLeaj4WprpRg3zLYFpVdZBkK t4EISXXSjIjhNXqNkv0MJeIaiXf1SbTviUnp4I8qr8QGM6ymj3Ck2gAE6aN8NNXRRLvU2h r3lchNFNjxqZRK0CflvN+LyHoipRHN6LWi28z2dj0DT+mzYSv1b/r9P4rGLOhg== 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 4jTb6r2c73zxSp for ; Tue, 17 Nov 2026 19:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 11ba7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 19:55:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e3483dbc91b5 - main - tcp: improve consistency 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/main X-Git-Reftype: branch X-Git-Commit: e3483dbc91b59b5b2c73a4bc792fbb834c3dc111 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 19:55:00 +0000 Message-Id: <6afcb114.11ba7.5aac2a2f@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e3483dbc91b59b5b2c73a4bc792fbb834c3dc111 commit e3483dbc91b59b5b2c73a4bc792fbb834c3dc111 Author: Michael Tuexen AuthorDate: 2026-11-17 19:42:36 +0000 Commit: Michael Tuexen 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 #include +#include #ifdef _KERNEL #include @@ -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_ */