From nobody Tue May 6 21:58:20 2025 X-Original-To: dev-commits-src-branches@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 4ZsXMd1wplz5vW5v; Tue, 06 May 2025 21:58:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXMd1M0qz3KRf; Tue, 06 May 2025 21:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568701; 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=vPQPxofjpC94Jnw3JIQw6ry71sOUVTbCyDAD2jWOtaA=; b=xXkPQBIvg/FR0eA5r9YVytIGp2TIwrnBCq6V4fqwuQaK4ya41ebemjmNzFJLc3Geq4d+DY p2O6R4Lm83wobPbjD189LleDLgvbB7lFXP4AKnSU4rZG/CmC6WaNbiATjljkMKAwFKj9le IH5r9a7bH1qKE2BEBcYfJK4FpzCtd4u58hQlI/H7bOrPvDMsCCO0KPcYK83EZH3ABUtII7 H3Uz5vq1Zu8O/Ox4vUiBycDj4XC5gbSiN+ZCArznDgYe++wJczM6W20zHVZux95UeQorJ8 RyiPdfxftz410S/+Bw1KDD3eJ8sb3OBhPOOlY5wg/l8wPQ128gySIUpdARgrrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568701; 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=vPQPxofjpC94Jnw3JIQw6ry71sOUVTbCyDAD2jWOtaA=; b=CcuDmNKzaOGP5Lse/hEHaym1LnuhCLEQmqxEAp7flg6DV8MroD/GX85V8Mx42ZSvZd++do tBQv9apC3bdUTItus3zxGrP45Ixuswa+nSU6RJMOgR5bIz6CW3btUVvelraP2smmGna+Xf uga1r0ntvwzb1uqDZ1/c9MpcTAR+YKpbhpjYtMnc+UTgWWtcOVB4eaHNHk8g1olXRivJdE azXMvvJ2dYpWzFCrROx0fhX1HmTe+HWvyFZccP8h+kSgGdhU2C/jEUziHG3Y39PDZuxQjW uxSI+g5TJMTKv/FqU2qq8K4moe2b8q/AcS7/AGEWOKJOn7Xi3fDXYfwxsdADvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568701; a=rsa-sha256; cv=none; b=jVi96dFFoC3oUpUUIXIeOBz+zKFTbeKohthccjGj+nir/ENZUCssO9BGAuaSyuDst07GFw IHwwR6Yml1H/ymyZ73SM/orkb0FLa9MQxzwJi6J8r2Eq87rUFJ6So9hyKL6IBJnEx+O3F6 q4W/G6A2l+wzzizpAA1532gFk9XSraAziQ2lZwzyGveYiTlcwVLXngqHHnq/xhk28Xyl+U wc+SmKeYvBtKcYFc8pFk5vRz4ARvUfS2Afo9ldjYXwajAq7J3TEzJLa4cuJ+TyH9l3ZC78 TH5cDtcTnIFTeVf7EfzbPYzZitrGms4URwWBvghtp5vZoKzmw+dfjr1Q32YlJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsXMd0jdVz1Gqm; Tue, 06 May 2025 21:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546LwL28024371; Tue, 6 May 2025 21:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546LwK9E024368; Tue, 6 May 2025 21:58:20 GMT (envelope-from git) Date: Tue, 6 May 2025 21:58:20 GMT Message-Id: <202505062158.546LwK9E024368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 976aa65e3ea4 - releng/14.3 - tcp: improve KASSERT in limited retransmit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 976aa65e3ea48f8864149dcbfc6f912a7ca2b67a Auto-Submitted: auto-generated The branch releng/14.3 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=976aa65e3ea48f8864149dcbfc6f912a7ca2b67a commit 976aa65e3ea48f8864149dcbfc6f912a7ca2b67a Author: Michael Tuexen AuthorDate: 2025-05-01 16:11:03 +0000 Commit: Michael Tuexen CommitDate: 2025-05-06 19:18:24 +0000 tcp: improve KASSERT in limited retransmit When doing a limited retransmit, allow up to 2 * MSS - 1 if the Nagle algorithm has been disabled. PR: 282605 Approved by: re (cperciva) Reviewed by: cc, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49922 (cherry picked from commit 934caaec3afc43638c2a1da8fbe3b672566db4fe) (cherry picked from commit 0906658c3409996b26518e67df48c01052ef934c) --- sys/netinet/tcp_input.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index bd491a116fff..b4c77c303df7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2794,9 +2794,11 @@ enter_recovery: KASSERT((tp->t_dupacks == 2 && tp->snd_limited == 0) || (sent == maxseg + 1 && - tp->t_flags & TF_SENTFIN), - ("%s: sent too much", - __func__)); + tp->t_flags & TF_SENTFIN) || + (sent < 2 * maxseg && + tp->t_flags & TF_NODELAY), + ("%s: sent too much: %u>%u", + __func__, sent, maxseg)); tp->snd_limited = 2; } else if (sent > 0) ++tp->snd_limited;