From nobody Sun Nov 15 19:00:23 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 4jSL0l6Fmvz70vMj for ; Sun, 15 Nov 2026 19:00:23 +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 4jSL0l3sZxz4rHM for ; Sun, 15 Nov 2026 19:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794769223; 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=ucgzX/MvZXzqYFqPZVv+Gj1PBUpcAUF2La8JV1HMwh4=; b=BNLwuQ/vHi37mQsd3UjQQ7a3184e3YSz5/aqHHfE8YSO9zLIVLbJaqw9cZWuRXLQxVi0xl 679KyMIXM82FLrdK+nqhF+Fm5NAqlejCs4C40UU6eCUxJ+BTf75IC/eonVjewtGt5S5NzX +3pRpCLIR05fakTkTHhmkCd0uAqLS8C6lH1Vvg6xLSAWpSB1k9pwZQfXe2wijPWX+ahjO7 6V1LXhUtXDbn3D9heImEOO30U6H7W4bIPCgbvRrl00oxrRZGEhPFuNvGZUINJkf4wFrpIE DmV68a7/RK70EAvrZZh8rRKIOD8N1WbvfVo1Zq39T4BljNZMXDYtUHDHBPcBpg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794769223; b=XVWg4PLAmaP4mtpsln0HjKhc3IunW7OR1twaOxisptUOqk6aZcxRN6y4CrNOwdWMHXB7LW 1WQwYFspY8e0zncQjexl+DRi8UIWG/Lnc2OlkE9LcedB8GqLIk7OhwWq3lHXHClDqWwqtm kv53wS9H1JjPWxNb6wVL3uMpPxus9Ofm9AclQNOtKOhipQUjYyaCUeSNRMFmv7vJfBoFRP qBKIF0lvcKJjMJirtIq2zTKa9GKW6K+EVkmsFUgtOuJe9Ybmuxy0dmbKNrtmuCIL8J/07u lF6KGGQvd8uzG2Q7BqmhGuxeJ00o+lvaBVfc3jrikVuNI203TpStvh1th2VbDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794769223; 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=ucgzX/MvZXzqYFqPZVv+Gj1PBUpcAUF2La8JV1HMwh4=; b=Lco4OFEEett7AH2SWMUwI1dM7hvpJp8240x3ujUhnO2mx1F8DHx3c26nP+UdrN5THYMswx yzd7Ugg6xC9UnwOXHc0taBF8TsCbZgtth+937bwr/2zBLL1U/W+3YyWPhuO8bdG6JW8Bt7 TXsSDM5VZs6Ov4kaLAsDi00mgMQWgMDtptQsc9Oj1TFAQuqpw3TlT2laNpemf8MiPIlBuV 9aICttB+yeQR7r2Agg0/hlsind3jCHqM6sZp1BTzwydd6UqTM051rlij3w931d+R6JedbZ 5l1expDCtE+DqmdYe5SxNsRfRNlP8Q2HNGKVbwoMJYdoCjYxz7Amiexgf9vZ0w== 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 4jSL0l3X2CzJGC for ; Sun, 15 Nov 2026 19:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 154b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Nov 2026 19:00:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 8018d75601df - main - tcp bbr: improve invalidating rtt 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: 8018d75601dfe804a8d70f4f08bdb0e4e3a8c5c9 Auto-Submitted: auto-generated Date: Sun, 15 Nov 2026 19:00:23 +0000 Message-Id: <6afa0147.154b0.6ac740c5@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8018d75601dfe804a8d70f4f08bdb0e4e3a8c5c9 commit 8018d75601dfe804a8d70f4f08bdb0e4e3a8c5c9 Author: Michael Tuexen AuthorDate: 2026-11-15 18:56:25 +0000 Commit: Michael Tuexen CommitDate: 2026-11-15 18:56:25 +0000 tcp bbr: improve invalidating rtt Invalidate the rtt based on t_rxtshift instead of resetting t_srtt to 0, because using the latter also affects the retransmission timeout. Reviewed by: Peter Lei MFC after: Netflix, Inc. MFC to: stable/15 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D61585 --- sys/netinet/tcp_stacks/bbr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 8b293208c282..49b5902f5ee4 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5145,15 +5145,13 @@ bbr_timeout_rxt(struct tcpcb *tp, struct tcp_bbr *bbr, uint32_t cts) * move the current srtt into rttvar to keep the current retransmit * times until then. */ - if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) { + if (tp->t_rxtshift > TCP_RTT_INVALIDATE) { #ifdef INET6 if (bbr->r_is_v6) in6_losing(inp); else #endif in_losing(inp); - tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT); - tp->t_srtt = 0; } sack_filter_clear(&bbr->r_ctl.bbr_sf, tp->snd_una); tp->snd_recover = tp->snd_max; @@ -6309,7 +6307,7 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts) } /* Round it up */ rtt_ticks = USEC_2_TICKS((rtt + (USECS_IN_MSEC - 1))); - if (tp->t_srtt != 0) { + if (tp->t_srtt != 0 && tp->t_rxtshift <= TCP_RTT_INVALIDATE) { /* * srtt is stored as fixed point with 5 bits after the * binary point (i.e., scaled by 8). The following magic is