From nobody Tue May 6 19:16:45 2025 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 4ZsSnB0lFbz5vHfb; Tue, 06 May 2025 19:16:46 +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 4ZsSn946Tpz3f4L; Tue, 06 May 2025 19:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746559005; 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=ujZD17JTS7gb6gsxof3mslO7dXah85s+lc/k310Vnhc=; b=E20PAQswI11i4LpLwAUiRFo3v4fsz8k/xc7kySjDHvKeaFOe4k3kO6YhV4zAB0O2JfQyd6 R2Dc/IuRC1Tbco1/12Q+W75vOiy2VuIge6JqLaxreGO35GEw6/fHzG0mBdbUs/z2o8imEw uPRxcPbbzxibiOZkbAU1k1PuVo/E/j/DE5GDyuDXAAFWCwmHl6yfZfDOg8NGoxAf7csK2C iOjyX3OGf58MFs5TSIetXOHyiDhUyKKup0NHyQlsppEhWEK688/wtutRrGlakkBTS5jcMR TuVOH+Wj0COlBCntZnhnMb9hDNp/gbmC0hmqWPTmDsBK1khvOX+hMqYu//fTKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746559005; 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=ujZD17JTS7gb6gsxof3mslO7dXah85s+lc/k310Vnhc=; b=phLXjcwrqV82pGynOQh2eB+RmT7ol1DwgEAbaVva1B4nqcMwJ6+c2vhCtWBtDCI60NaW7Z ElXbIQlwf/zGWtOu3NN1lgL+y/xu2xaH1m/gPts/A+UMtcQpfc69Kn/7MTeshz+BfOL5rx jbXRsnLkWp4PeTq3d4IiPu1OUynEvwtOaMzWvb3neGMrEWHN6mlysSxl1qCAHD/B0JZK2c j7Wgak2ALukqghOPfKeCL/taXDNGDLCwJXtZqKfJOol/0Bn8zI+fd8z0bySz2Vu4BFN7by 9EBkja6Jn0E7IWtGTjgAG+TkMRmKGQwHfjIrbr4ud3vrrXs60PFXt1PU9fvcVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746559005; a=rsa-sha256; cv=none; b=BgYFL286RZ/O/wXr4GCbxADK+riD8N6OTDA3x8Xcw/vAi0hstFKNtMe/p1iFL7q6N3JeKi fg9TH6pkTdTYAp32vau3EDPdmKy+pN10jbg1DZsmHwxg9SWwfcbrRjiEBU5xrvskEDr41v WTOqHoMVXZolifH0ZOteE38YwGmRbxKXMmhQSaJsvB+qWsRgKM3v0xA0dD+Kb2EgHzAaHL 04xzdvFhs4KQRCCRj8Jh4ZyMMAj6mcSryjPhFGzup0b5EQfUgkh7OEfgip1PFurz4qEYd4 KlumcMaPj4aoHEbKgs+uOzqEkvcdZrQBbMExLLJFrlznKAqg43/5TFadZI3I3g== 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 4ZsSn92QKJz1BpH; Tue, 06 May 2025 19:16:45 +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 546JGjlG018267; Tue, 6 May 2025 19:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546JGjAX018264; Tue, 6 May 2025 19:16:45 GMT (envelope-from git) Date: Tue, 6 May 2025 19:16:45 GMT Message-Id: <202505061916.546JGjAX018264@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: 0906658c3409 - stable/14 - tcp: improve KASSERT in limited retransmit 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: 0906658c3409996b26518e67df48c01052ef934c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0906658c3409996b26518e67df48c01052ef934c commit 0906658c3409996b26518e67df48c01052ef934c Author: Michael Tuexen AuthorDate: 2025-05-01 16:11:03 +0000 Commit: Michael Tuexen CommitDate: 2025-05-06 19:15:39 +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 Reviewed by: cc, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49922 (cherry picked from commit 934caaec3afc43638c2a1da8fbe3b672566db4fe) --- 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;