From nobody Sun Nov 15 20:24:48 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 4jSMt90XGKz715Hw for ; Sun, 15 Nov 2026 20:24:49 +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 4jSMt905Kkz3K1h for ; Sun, 15 Nov 2026 20:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794774289; 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=BGUWsrpBTte00PteGAyF2IpzklqafhwPgx0Ry8NZ3Ds=; b=fcAnzKNGhM++NTnxwsU0Lk+WQbCuCE9t1i0jxTCkSUOYv+KTehGnZbqWmuHR9BZFNi/rPt Yu4iFfmLntMJcUgMJjlGnrorWHsMF4vPjuSIy7uRTLt+ZJ1I+WYP8GTHeMHUCdSS8gkKvV u+a28Q9K4XmTeqKL43c5cv143QYGhiBC+kp4mS54Q9d0vZzn1EFEJlZr85sPzHFhf2bEKX EI39pZ2fyinouM8UWbavlICeY6FnBOB8Gwfd1TRB8zcarP+wGCqDXDnP7cprCcjVqwC26S mFkgDutoUv1a5w6jPcUprkY+UEsi1+tAFx0Ykz6eo87zsqfI5pQrGTzk4QRLBg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794774289; b=IwQChTfGPxEOIpMcpafqmZ331K8QP8+CkymRX+qmnGze9D9OhV8LA+g6eF03XT8g+whbXG C6bsSrCjXhI232PSjE9wGKJfd1RZyqSI/9loVC4N/4vnDQpyrK4+l+yeFlBLgmcDuVFUII GhftJvTsRSogBfpqopBMt5t3SbbLphWaQjfJSZv55b4e9GmrT517pvDomSWWZGuV4yENWE rDWYrbX3LNv+hfdLzrNaMY13lv3VuJeIDlAKsFxn4f5Q01M7C+eGG/pmDqjJvpuTTL5cxM WL60V59TKpaYv24dLc2yvTZD7AsuBo9Pk5wMfwyO77F76uh+wX771oR6BeU3qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794774289; 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=BGUWsrpBTte00PteGAyF2IpzklqafhwPgx0Ry8NZ3Ds=; b=t4RQ9GH+RT++tuJ2MhYaT1aca1TEJz/OzAkc21yEUp0TSjxGMbPdm4XmXjot+A+r6nrOQs ENJ+Ne9Vz08YTbJyPv4RmpEPDkZQLR1LSimbkX4xNywbG5AcZvYZ9c0Fq3Wd7wj8uWgk3D AkrC3O+OBmG418PxmPN4hvnXRHjoG9XWLQ/tLkQTJ8+fiCYQ2V2lh8Htwop0zIt1aSGQek AUk46hk4s0GG5PLfXf9dvbjAqhusjTVoQFpVv610b3JOe/IJ5ONpn5nDYxHjQBh106hc33 L4XHzlPQpB/FzJrWe6TdSQ7EyUrsuZR5uANPwNcpGmw0cLM6TLQ26pdmitBgCA== 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 4jSMt86MF9zM23 for ; Sun, 15 Nov 2026 20:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d4b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 20:24:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 751882926dc0 - main - tcp bbr: improve persits timeout computation 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: 751882926dc0bb1f7a4834c4b5e8d951cee61c7c Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 20:24:48 +0000 Message-Id: <6afa1510.1d4b3.5ef7c622@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=751882926dc0bb1f7a4834c4b5e8d951cee61c7c commit 751882926dc0bb1f7a4834c4b5e8d951cee61c7c Author: Michael Tuexen AuthorDate: 2026-11-15 20:21:14 +0000 Commit: Michael Tuexen CommitDate: 2026-11-15 20:21:14 +0000 tcp bbr: improve persits timeout computation t_srtt and t_rttvar use different lengths of fractions, therefore use the appropriate shift value. Reviewed by: Peter Lei MFC after: 3 days MFC to: stable/15 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D61600 --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 49b5902f5ee4..3b9a06bd7ad1 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -540,7 +540,7 @@ bbr_get_persists_timer_val(struct tcpcb *tp, struct tcp_bbr *bbr) var = 0; } else { srtt = ((uint64_t)TICKS_2_USEC(tp->t_srtt) >> TCP_RTT_SHIFT); - var = ((uint64_t)TICKS_2_USEC(tp->t_rttvar) >> TCP_RTT_SHIFT); + var = ((uint64_t)TICKS_2_USEC(tp->t_rttvar) >> TCP_RTTVAR_SHIFT); } TCPT_RANGESET_NOSLOP(ret_val, ((srtt + var) * tcp_backoff[tp->t_rxtshift]), bbr_persist_min, bbr_persist_max);