From nobody Sun Nov 15 18:55:10 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 4jSKtk24ZFz70ty7 for ; Sun, 15 Nov 2026 18:55:10 +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 4jSKtk17DPz4q2f for ; Sun, 15 Nov 2026 18:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794768910; 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=tJnBvmHKSBOOcpQQLSfltei/zzDKu93URSRpni510t8=; b=EYljIvgsW+Zj3KF8DUr7/XbfBfnGhFW/A+BNkPb0idSyixAKrVkpiCcEBgzOVStn0e0jiP U87IemDOxZmLgQ11R8kh1GjzTJ9HOewbmm1uJHtRvtXw1Gw66qeBajCbG7c7kiiAO0PJ+c 2BgIZNrXMDZgg3H28mtny8ROGCBJJMGuCntWtIOFDcPZ6UuJq+0744vbHdu/kw1OsuAR58 pYPr9NAwXv0mU8n0TtLUVv760PzWRw7V0l5EvIFeLK+bTgGJ2jVJdf4jKdy5F0uuG9gs/X xvElbM87zv51W5MT50biD1HLFuOINtb2o35fOCJsA/m0/SKY6HuLzVuLPFxreg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794768910; b=mkK9XNmdmpDBclLB9z2CSNFDRFFzKkY/IuUptGNJZtnHK8zccLPttFdsPhmKaooDO03yl/ VtjjrR4HYnUT6pxTADp4pL+5V4sbUOr/BfWjxtwBXCZVeTa57npgwJNVw00UWvqtexlArX u0/aEOrcbBImAtxVA8ehyRxUU6bPCvBgRH2zFH40QJh2OX/WQZqCnbOQ+37STodPXzx78N //Dt/Q9XKb1yLgutwUMNbaUqJQJQ/7YaX1KfTvLBaY7NvyjhmwSonxvDybmECfIwVNOIWu kI4glGvX/iDY1YeWpl9yQwoC+Dumxp+wvsujKC+MzrY271RyKznygTphogLqJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794768910; 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=tJnBvmHKSBOOcpQQLSfltei/zzDKu93URSRpni510t8=; b=tufK6vXo5gELSMbBCpxQqP7HK1PHKxYLO/EWAhnpmcMXKmpPGlyR2UlVKWSaoFiEaSHYX4 cc/As0NUzViymz6fKS6oOEPbVhaj3AykkK+3unpdkDfBGelQSp45UIab6yelJWFRy2Tbh8 WVHz2H/rPeJIzeyKkOOS/7K9/g5juTLF4vA7ktLfwMLd8CiB090LqfWpdYnmJO04nRU3z0 5tF4BKguWGRTzAif9bY5MWDgMY6aDILChErKp8fVxYLoGXkJ8YRFIv4ykaoPcqpIm7z1QE g8QsTe72TIGqWvf6QqxP3ZTfEhiUYWyGna+f64AIS2trw3uKjmkRqSiERzDQog== 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 4jSKtk0nflzKGB for ; Sun, 15 Nov 2026 18:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1492f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 18:55:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 47ef696a7696 - main - 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: 47ef696a769644e7ca1f2a3129818f39640b30a9 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 18:55:10 +0000 Message-Id: <6afa000e.1492f.548706e8@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=47ef696a769644e7ca1f2a3129818f39640b30a9 commit 47ef696a769644e7ca1f2a3129818f39640b30a9 Author: Michael Tuexen AuthorDate: 2026-11-15 08:38:45 +0000 Commit: Michael Tuexen CommitDate: 2026-11-15 18:53:59 +0000 tcp bbr: improve retransmit timout calculation The retransmission timeout should the srtt + 4 * rttvar. The srtt is using 5 bits of fractions and rttvar is using 4 bits of fractions, some specific shifting is required. Reviewed by: Peter Lei MFC after: 3 days MFC to: stable/15 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D61586 --- sys/netinet/tcp_stacks/bbr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 38b2d1665d4e..8b293208c282 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -594,8 +594,7 @@ activate_rxt: if (tp->t_srtt == 0) tov = BBR_INITIAL_RTO; else - tov = ((uint64_t)(TICKS_2_USEC(tp->t_srtt) + - ((uint64_t)TICKS_2_USEC(tp->t_rttvar) * (uint64_t)4)) >> TCP_RTT_SHIFT); + tov = TICKS_2_USEC(tp->t_srtt + (tp->t_rttvar << (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))) >> TCP_RTT_SHIFT; if (tp->t_rxtshift) tov *= tcp_backoff[tp->t_rxtshift]; if (tov > time_since_sent)