From nobody Mon Mar 24 05:57:04 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 4ZLj4K1Ylkz5rRS0; Mon, 24 Mar 2025 05:57:05 +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 4ZLj4J6V1dz3brM; Mon, 24 Mar 2025 05:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742795824; 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=FGXtFD0o1/CffaglwG0bPHdjmqaOUR0xo5U+ncHpxHU=; b=yHQkbxlM4VQzQYqxaSWs5W9L8lwnAwOgRzaiKnXtqpWlO2jer03GzsN/5K9DWM2GsB4y6l 8NDscxyKYGOSknjYEl0xyc3JBQy56IVFl/QTxfrdz/Sj2T4kJeRJadja6y0vsZEqd8ewBk 4LNPEFl+IpF4fNNh4waPPhCwqDIOofPa04i4ok3tMl/J1AJyVaADDpuwvg9XrTqCe0XMqT Wwk7DNxbqrxKULQZhegrfVhHflHD3f+7/YvlA6/Pb8HOrcfv9dOZLoiuYvwKMB1Suo+Z8x M/9xkcBQ2KPcJfUtxLP3WQTRFhbNyLAYhvNELCdovRcvY6jTLOQN/mT+QFhm/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742795824; a=rsa-sha256; cv=none; b=ZFfL0l9ydqtGNxZVnhZPHFnGENkGI0uR0s3xYmg1rfUlRsTzwqitF0J7M5csQ6W346voiS +18zY7GWrT2xiJmP8yOjHzeMz0JOw2HEoKAMd3JbmrYNEebF8Ug0Svn3gMIJ6tLQmtymut p5yq6kDnQ9Q+353Lz1QIns+910tb7PLyERX/iaBr4T+mnkCaqyrkV1xg7sab9Guia/EW9Q cw0rYUoUB3daAe2dpJtsXg0UzyYGWWndYsf/1dpU5AilNlMEWJ6pRlB3QbTWj/cejSRufo yndh/o8RB+VUF4drVl0xDe2Acz20UVyopOHd82IfUi+yTZsqm765d87P9ba4hw== 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=1742795824; 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=FGXtFD0o1/CffaglwG0bPHdjmqaOUR0xo5U+ncHpxHU=; b=hC2E/3W0NoMY39OiwWu4/yx022dIByQq+Y9BS5qL5ZD9uceAUSzmqguvRTZmjXmpDckkCd XalmurfYuuUcr8LL8mL+HfhEC7Nf39Lsim8FHOrHVrUVlPotE8MCyQyGw+uYfFDOtZb/i1 StVG6uYhpHRHBsqDdqSvS1e9V2AvoiyLfhTWNFvczxjL18AjZZCNbQmhD1Xl6D9NYXBbx9 mzOccHzYUlrrdTvZu7WpEkPqsytlcnMZBNeQaP2L3uLqTDV0pVRI5MAvnS5nOwATUqGXyL aFHf+9U6x6s+qMmDORr+vm1jXS5GVX14QnsPY7EBnUP/vAso054p1GmzgmaIxQ== 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 4ZLj4J60s1zhxQ; Mon, 24 Mar 2025 05:57:04 +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 52O5v4su064467; Mon, 24 Mar 2025 05:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52O5v4pY064464; Mon, 24 Mar 2025 05:57:04 GMT (envelope-from git) Date: Mon, 24 Mar 2025 05:57:04 GMT Message-Id: <202503240557.52O5v4pY064464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 4a328b804996 - stable/14 - tcp: fix reverting of spurious timeouts (RTO) 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a328b8049962976d13b8fb9abe2d9a488f2a894 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=4a328b8049962976d13b8fb9abe2d9a488f2a894 commit 4a328b8049962976d13b8fb9abe2d9a488f2a894 Author: Richard Scheffenegger AuthorDate: 2025-03-21 04:23:30 +0000 Commit: Richard Scheffenegger CommitDate: 2025-03-24 05:35:43 +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 (cherry picked from commit 6f6c07813b38ab04d8b1b2bb87c0291dbae25a25) --- 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 fe67710fadd6..c868ba648bd7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -472,6 +472,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; }