From nobody Sun Nov 15 19:03:14 2026 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 4jSL431y9Gz70w0f for ; Sun, 15 Nov 2026 19:03:15 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSL426w6Fz4sP9 for ; Sun, 15 Nov 2026 19:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794769395; 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=2d3+0vZQoGVvsya3kqs8M8B+jgoiwJK0wzPR4/ffHkk=; b=giMzEYh1R/a57sAH342IM24+ZCbwK8C+SdMNLjuwB/PJx/089uRjXhmi0If5Cf5e58qn/a obcZp+XbecbRWESoc2QArQQS1OxKxL9VsXk98/aD3Hs6jrBCMzoWfS5fteE4RupULcXQPt hEPATeXpSYjAjNS4hz9Hb1nBp5lVsA5iMQrWOPzl/Cnf517ALka6nCSAhTTd0CYiLPlXp3 R0+b8KeGbtqDck+XoubWSTUbO0yCIOjp4YZ7kGPLJGN+dnN/4IGPEDIbgOBc0+cFzhqiUi I7G/FNy7pGxrTFCQduML+tZCDf0cwACelsKLYCHQCn7FiFszC+cNM4L8U1OWfg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794769395; b=o62/xvuYQuXLf5PavBgQzHLHRNWOhx0KilnJU7LrfposIiD3NUgbr2Sf7Xwb9fgl3/gODy UbTqINRzxDP07WzOINfwvs5djf8nhU76c0240J3MzYKMvIo1opvwkWFtvdA6HeevVeFZqM XObbECbumBbLwKBqboVJWmOi3KkExCiH02fbjujInS4b8SFeWXVMdtIoNV16NQ+5Hf9Dir 5H39wbmT/lBXYTKvukMh+r1FD3LSWiXDb2PUTO1E+/3W6puLOTym7KLAZAKdKQg9Um80Jm W/10hA4vZ/vEe1NgTELxY+ikthtQ3qtj8+9yJAeBDyqwail+gYefmgFI5s+KYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794769395; 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=2d3+0vZQoGVvsya3kqs8M8B+jgoiwJK0wzPR4/ffHkk=; b=eV5Z8SSmwF4aAjQceZrghucYUSoWf3oi+RdwoJVm2fn9KVgw9Ob0by0U33JWV6z9dIPV+p dz/hPxH6f88Bsh+O7WgkEaGJOXjkbBkwSf6bmVQJLfCWJcHkeF/ZjPxNFDKnmOW+6pXy0x Io1UNMqdrU9pxbmcudg3jMcW8jFmwBiNgQRyCR21HKW6/B6Yc8ZAs3Mug6uBt9/65vckG3 KK7EH7SinBfuWgBJEYNeVVkNeNJ8cxG1vxqTbb2eJbKU3RdYvHhvrA/a/jSPCPbH5GbULw vpbXUx8s6WGEgKNlVrX/X3tZfzS2S12p4pEjX0ogXyxEWp14RHr+LIdRiNDYKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSL426bMMzKS4 for ; Sun, 15 Nov 2026 19:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 149d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 19:03:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 7659a4f98c6c - main - Revert "tcp bbr: improve retransmit timout calculation" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 7659a4f98c6c8e9f38b8fffba43d17f67a56acd1 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 19:03:14 +0000 Message-Id: <6afa01f2.149d6.13214c7c@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7659a4f98c6c8e9f38b8fffba43d17f67a56acd1 commit 7659a4f98c6c8e9f38b8fffba43d17f67a56acd1 Author: Michael Tuexen AuthorDate: 2026-11-15 19:01:56 +0000 Commit: Michael Tuexen CommitDate: 2026-11-15 19:01:56 +0000 Revert "tcp bbr: improve retransmit timout calculation" This reverts commit 47ef696a769644e7ca1f2a3129818f39640b30a9. I referenced the wrong review. --- sys/netinet/tcp_stacks/bbr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 49b5902f5ee4..7e3023c02179 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -594,7 +594,8 @@ activate_rxt: if (tp->t_srtt == 0) tov = BBR_INITIAL_RTO; else - tov = TICKS_2_USEC(tp->t_srtt + (tp->t_rttvar << (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))) >> TCP_RTT_SHIFT; + tov = ((uint64_t)(TICKS_2_USEC(tp->t_srtt) + + ((uint64_t)TICKS_2_USEC(tp->t_rttvar) * (uint64_t)4)) >> TCP_RTT_SHIFT); if (tp->t_rxtshift) tov *= tcp_backoff[tp->t_rxtshift]; if (tov > time_since_sent)