From nobody Fri Mar 21 05:25:28 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 4ZJrWD6s3cz5rrwJ; Fri, 21 Mar 2025 05:25:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJrWD5pgXz3n5n; Fri, 21 Mar 2025 05:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742534728; 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=AM5qx0lVfxD7GhVNUwsPk+1mXT8v+NuD/m0BHoeU/NQ=; b=Y+8vwewsG71B7bD6ljmOVo2OZrF0rJzAnzW8oXRspsV916V1O58We5N1JnYf/cnEl6nHdu RNmwoDzRFTnXQRKSzZwQim7Ds0/uRMv8oRW2BS9qO/L8JsW6w4/ZbWYUZXBfruSiYQU1Pz T27aK9NjTQyRxtWkVWOEbBpaACN33cIncwsbf9CNDkNWilQMnKBZMl6quEtN64l5/SE94E WlOJLT6E4qAnxMGGa6pYeTILYYdvTqn32n0BYXAjcYam9uKZNZeP0OjH1Jw5wD6HzxqJua 6fYdXbuCS/bALIJ2uh3fHPYjNGwo0GAC1uwPOFahu0NAjQDSp75DlG+kVGBGxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742534728; a=rsa-sha256; cv=none; b=hajaPvzB9u002SpxzTimspRPkdp2Ij+MApWUvV49DHTty0EEVrhTnoB3txQ03kXV6K1l7+ PQEz2h9xn1rqJeBB+tKBAmYI7hVn12wPVm5/3VdUcs9aC34lOfEz/bGo/Wzl4E15LZqFS1 h6l31UHpagUtybAYmzfUeimcVzcgk67vFjiSbvxtq2lPBER+jjFgEEERAmGE+Loe698RjV hDt1zZmf6uuK3yRbjpkBoP7r2DfEvMSNzb54gmv+x5KrAOgpAXJoAAl5PytsGX8kQCcZ9Q ZMh2EWBROOLEqQf4N3Cv0lttA0AHqFCh17Qghpptii5S5T07XVkaSYUhVK8IFQ== 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=1742534728; 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=AM5qx0lVfxD7GhVNUwsPk+1mXT8v+NuD/m0BHoeU/NQ=; b=Q6wPBqMmIrTPxptxF/L7GOlfP1SyBs87whTGlfdIZMJQygN5b8w+RKaqngfhwqNOKcMIGL pLUUfKagkJWytnpq3mpv49qh98nwGMN2pgiaiIuQNZr9w82misjkXCcahIxsqY0TNh8ljC nhQmxAFzWfiQ83Sz4uu94C/2+TwLdkE0w5FSXdoAyTkkIe/CtWOgTAhG68YoVKS7KfwKGs HP2gicafI7RIn04uWn6CM2Bp/qXaf4BuAzxmJ2hyArQU7OAor2cY0ycDvCrqNdoPD7Cjfh PWlByyiplgE/MyQT3zlyYJ/0daSN6zHbr8G+0XNn13Yw41/U0Ga/Jcda49ep/g== 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 4ZJrWD4xdrz6QW; Fri, 21 Mar 2025 05:25:28 +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 52L5PS0A032621; Fri, 21 Mar 2025 05:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L5PSj7032618; Fri, 21 Mar 2025 05:25:28 GMT (envelope-from git) Date: Fri, 21 Mar 2025 05:25:28 GMT Message-Id: <202503210525.52L5PSj7032618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 6f6c07813b38 - main - tcp: fix reverting of spurious timeouts (RTO) 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 commit 6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 Author: Richard Scheffenegger AuthorDate: 2025-03-21 04:23:30 +0000 Commit: Richard Scheffenegger CommitDate: 2025-03-21 04:28:31 +0000 tcp: fix reverting of spurious timeouts (RTO) One variable that became critical to correctly calculate the cwnd during limited transmit was not properly reverted on detection of spurious timeouts. PR: 282605 Reviewed By: cc, tuexen, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D48652 --- sys/netinet/tcp_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8f50843d940d..2fc1e0deea16 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -465,6 +465,7 @@ cc_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type) ENTER_CONGRECOVERY(tp->t_flags); tp->snd_nxt = tp->snd_max; tp->t_flags &= ~TF_PREVVALID; + tp->t_rxtshift = 0; tp->t_badrxtwin = 0; break; }