From nobody Sun Apr 26 07:59:17 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 4g3Jxf13Ndz6bCKj for ; Sun, 26 Apr 2026 07:59:18 +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 4g3Jxd5f5Mz43RN for ; Sun, 26 Apr 2026 07:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777190357; 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=YghWCoVwTeayfncRz3NLzQoUMQYv+CJfC5RPrnAZBrY=; b=u7CMJWmU06esrKwXEHB1HbzeRfkpQqcnHwROBNxI6gN7eOgDDfKA/Rqq+8+OYfw18a3FOG 6kWzMQo/4iCSZgTol5cKBXHwQopDj80bwm3LjAlbqj44K4lLPNdHuJ6V7ecJFi6LLVUXzU AzpWGojKFgs3J0+StXATKD0CJXxRhxvS0GYT6p7ZH3yVhtVwrgqYyO722JQdIxJkjQKub9 1hROPIfVrYO0JSKM7znBHEUiKF1812ImZ3OyzZE+B93YX1cjPBTy7WlAsVCAACmbV7FkSo l1tmOel4ghJpc9nX9hcN6TYC7loalIkOLSwEUB+1SiCWmaiIbehrto5BSMIz1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777190357; a=rsa-sha256; cv=none; b=MhTMwGCx0bYpcwQXMCaZFujzuPgJ5Xdq6Hh/aQZEOgEo/06hR04f7FFDONigaCl8bdC/8q lAkEsGZTSWHEu0NGswhgTSZ5VfS5smgTf2Oog8pRrexWhhanX3YYQeOROVzYDZIAmXx2Mx ZYHobeqikJbgdKpZTAair+POatA48V6qQnenb9bhc9ieGM06Nqiq5AhsrhM3rhFb/oliuS w9mIs6NOd8mLtW8i0uLybzhzipKtnGhooWSjYQzawRafYKyYZ2N+iSVU88OJfl2HqrTEex HZlW3HlaydE1LLqFmoK7NIPSx5MXezPm3GPwxbSoPQMSuBkhVBlTQTDfwRNFRg== 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=1777190357; 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=YghWCoVwTeayfncRz3NLzQoUMQYv+CJfC5RPrnAZBrY=; b=PPigj/8tN3lKvqNIUgi4/0WoioXhwKRHibsry9dVJ77zTDEwc9AFBHXNKvAPSCwbOGLf/4 9WLtNkqwFhGx80D98vnXs3oQD7SX6+A4z+3Xz+aUfQ7qgAvC9Xdulrr5p6+A07n3dmwxoh hcgKyCOr0Xs8PBYxcE3uQbqBdHDTLB9GAGBlwGFhtADxgDhY3dk2epXM8oXMHjLW5fw+yl vQFN7ywYFHg+NS/t3kpH17SWnfK9Y6IAyZG24Cw/oT9oMNOrPr2Guv66Uj1fcQv1MLMgeE asSSPRs1zPbu0KUtaTIGYUtcR4EFmj8Tki35JI2AFCZsrX5akr819BnylR2luw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3Jxd5DZFz1B1J for ; Sun, 26 Apr 2026 07:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26d14 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 07:59:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 88603890a770 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 88603890a7702464af837cf373e792697c5335e9 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 07:59:17 +0000 Message-Id: <69edc5d5.26d14.3aa23795@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=88603890a7702464af837cf373e792697c5335e9 commit 88603890a7702464af837cf373e792697c5335e9 Author: Michael Tuexen AuthorDate: 2026-02-25 13:06:15 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:57:44 +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 2026 (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 5032f5bf4c28..66103f8d0b11 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -330,7 +330,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);