From nobody Thu May 1 16:14:53 2025 X-Original-To: dev-commits-src-main@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 4ZpJzf0RzGz5vNKS; Thu, 01 May 2025 16:14:54 +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 4ZpJzd75hsz3w97; Thu, 01 May 2025 16:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746116094; 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=ZbHrTKYLmska0QIYetQKnjIoNmTNajLt/RDXIxOQ+Ns=; b=ptdAgonf8oOU3EtA2FFNfjI8DCDWglFZvJye1t/XZCGh5VooZFrxt85+THMBEnXyZuvFx+ P/hNnUjGk76jhVVdo7tNVO9jNVzzQFpCcN0+bg2D4JdZ105Kms7lOs1EQZsXycIIBRYDft VzSdUSb7QN4TflB0JI0C4bEzm5xtt8aEIVl+8BqjziDA5eHUUD+anyo83y5uaCbT0m04K6 gvjk2tHsKqDtUQG1SOqtF3mfC3sqzJPxOC756NuL+WVXMiWL7VBXw/JbAKP3/sQ+aKRLwM KMN1o/EdpoV2kMOzIJtYzASH/Cx2kKgPJzroUCPAnZJp4ETx4t8wxaGuEcytbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746116094; 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=ZbHrTKYLmska0QIYetQKnjIoNmTNajLt/RDXIxOQ+Ns=; b=hWrrF0JHLWf3s/azu9ziJKbA9fKLGUqUnkfzi2VsPRrKpmpbrq5zml2aBNtObA/LS7Kn7b +9q1NeBBG2pSGZsaOTg4blqK4q9YGzFs/iTOViKdqRrXDJHCO78D7SecrBmv5Zu3lL46Vr NZPFHClQBO4tc1JRpRgvX0/SxFpbw/snv/qI+xNGErtho2bX1ADc/lquzpBUg2F8NW2ZwW xmgmsRF329buZAZLZOQCr8Wfqp2frsRuC3Dq5yvgf31cFtZyTiPeqsItvxg+wvPnF16Czi qZWC3Jfm+vs63i6nj9rtLh2q69z0U6P77pcFANE1a8VK0J7J5A5cVW8w71TgVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746116094; a=rsa-sha256; cv=none; b=kvnBLdkVEueuXvKAj5VblLBimyiDXMB2Uz2dJE1h0sfEoBmeo3PH1b1yWGJJggK1ZnuQZZ 9qCTjYYx5o1p1BSTkq3xoUsNRs67pWdkfpPVxdfAAckCAXke5m6pKJX2q6SOlZyHjJyHlq lzwffYFazYeffcIGK+AYrOLjrepLUjhTXX2X6Gbj/Ej536RxTHtzUMlZrSYm+PQnsFfGfP dwk8Se2322xO1x5LYFnJ5/Cc4rwLMN6tcvTTLO7BAugWCVkHbTIdBFEHRn8DNZz3nS/nuN lgET/15YdwuuSi3IUEqh5ucHGpHfy1BmO7Extf2uAXzdTAGDV/aGHqSNWRs+eA== 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 4ZpJzd6QpSzbkH; Thu, 01 May 2025 16:14:53 +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 541GErVm058578; Thu, 1 May 2025 16:14:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541GErsu058575; Thu, 1 May 2025 16:14:53 GMT (envelope-from git) Date: Thu, 1 May 2025 16:14:53 GMT Message-Id: <202505011614.541GErsu058575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 934caaec3afc - main - tcp: improve KASSERT in limited retransmit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 934caaec3afc43638c2a1da8fbe3b672566db4fe Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=934caaec3afc43638c2a1da8fbe3b672566db4fe commit 934caaec3afc43638c2a1da8fbe3b672566db4fe Author: Michael Tuexen AuthorDate: 2025-05-01 16:11:03 +0000 Commit: Michael Tuexen CommitDate: 2025-05-01 16:11:03 +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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49922 --- 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 a9b5f5374503..817079dfe6c8 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2815,9 +2815,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;