From nobody Sun Apr 26 09:13:52 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 4g3Lbn53J1z6bKfZ for ; Sun, 26 Apr 2026 09:13:57 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3Lbn3tfVz4JH2 for ; Sun, 26 Apr 2026 09:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777194837; 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=CaVPekPnERRD95+cnax14P25Dkfs4oIlH7+Cxmz+5og=; b=WuiKMeyM9fzOrVpVnvmTLaCKoS/BC0g1yfZlBl7M7rscN/YGnHTRld2L5AT18HaMj+9lQZ g80akcShk7Me/1fY4oufeAAZuI12Mat/8b6AZv9IiZUsLutGgZAWreQpR/foYSPK6MDRVb O0hM6eUyjcrXxt3RUhuyeSoFlDC1nIUJ8r68An0G5jBuoJxZ3RVQl3duC0ArNTNwCuzu4O k6rhOUITi2Zh3zrRWf4LWXIw6IFTFccxOPuGWIobqadG2NPCmPHYqae7L42m1aTLtw8l3k so1AYwqy5QF9M8PKa8wL78xTw5G1WGHb0kUisSMuSqLn+9iHzyLURlrc9gGkCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777194837; a=rsa-sha256; cv=none; b=OsRdSsYq6K4dCkP+/n6FBHZ45zU10UkjmCMUWM/rc5cS9kYAvFeFSPXPDv3KcvCF9fUDmF 0VoV3yG/in6iZlpT7i3Jl8WOV5Q3xnjU1dS428xYoJKoj4bhwtr05nwdhJ2PhWQoOQPPag z/N3rVSfF8zoJY8cKrGnYhlNcXuHdCas0vFEjMr/ewQC+m1qY/+kJRgmMeqPyKig2wFnVA rFY7UMc42i+phd6MGPafktqWMyukfW/j0+yEsT2JMtipLm2gc0YwYN4gJKKqEkAfk/6zIv MEhYTE8RRLJ/D5G2bYrL9AlxPQugkdFn8pazK6xi2aS0P4A2d/rP0WZr+xjhKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777194837; 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=CaVPekPnERRD95+cnax14P25Dkfs4oIlH7+Cxmz+5og=; b=vpBgaxTc8vb2K0BGgf0UMFyu0/DoxSHAn03GRJjd4JBjMDK+RWD4xv/9IwWg4WjcS1sQ1I SFUNxky+EvnkbFA2erpWr9gzXTAXOWAkGX9OLUE/qdHr6hEyLKaJZiPQsapjS8oNN/D+xg XZhJ9gzXfmEbCLl671LmV+M6HnIJIsXBgzhkvoB0lVycWiQ3MeXxD7L/fgMyXoLlGATr76 25b5+tBkGNl6e3Ku8lDt137x8+A5EkNPsOMx0HNWa+eWa/jHUYGtIEXgy3/kjYXyKdfzOp JEWq0LYyfdXgyq7O8bMJVEX+KqHdJ5V0Yajhzql6nHnFw/NXOZC7Gt1vhh/24w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3Lbn3VQjz1CYw for ; Sun, 26 Apr 2026 09:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36f6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 09:13:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 53d8d57fa5e2 - stable/14 - tcp: improve handling of segments in TIME WAIT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 53d8d57fa5e2e9eaa03f44c24afddc1f3d09e26d Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 09:13:52 +0000 Message-Id: <69edd750.36f6c.63c0d3e4@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=53d8d57fa5e2e9eaa03f44c24afddc1f3d09e26d commit 53d8d57fa5e2e9eaa03f44c24afddc1f3d09e26d Author: Michael Tuexen AuthorDate: 2026-02-25 13:06:15 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:12:28 +0000 tcp: improve handling of segments in TIME WAIT The check for excluding duplicate ACKs needs to consider only TH_SYN and TH_FIN. We know that TH_ACK is set and TH_RST is cleared. All other flags, in particular TH_ECE, TH_CWR, and TH_AE needs to be ignored for the check. PR: 292293 Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55489 Event: Wiesbaden Hackathon (cherry picked from commit f3364d3c8c876074a9a6f68168e5eb8bd60207de) --- sys/netinet/tcp_timewait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index fbabca5554ba..a833248cd468 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -291,7 +291,7 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, /* * Acknowledge the segment if it has data or is not a duplicate ACK. */ - if (thflags != TH_ACK || tlen != 0 || + if ((thflags & (TH_SYN | TH_FIN)) != 0 || tlen != 0 || th->th_seq != tp->rcv_nxt || th->th_ack != tp->snd_nxt) { TCP_LOG_EVENT(tp, th, NULL, NULL, TCP_LOG_IN, 0, tlen, NULL, true);