From nobody Tue Dec 31 21:06:28 2024 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 4YN59x0yHtz5k1Yx; Tue, 31 Dec 2024 21:06:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YN59x0L0Gz4ypl; Tue, 31 Dec 2024 21:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735679189; 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=RG728KwphI+VAV97dinr11JR2ZIl5dOMj6K+8w444Hs=; b=iM27TCOm+JhqVvlOhsKW2aBUnNpxOq3Mfmw7qBYsQAxl1ZN4DN9eIQae/+sDaMhNKbEIdx h0Sd5jdmMri30MGFXGaqHBrTmaP/BkaGQkE2iOiqbsEODjQ9p2ABpYbdsZygHE/ggor1AO /l7pCSCZ4WyK8OwEU6l3vM36dM6tNKQhSEwB+YWWhW9+LeLk5exV99eiuQUcVI9lBmtXl3 iVK+2SBgx5jHdf4ecLwUtXtvGYdE0xdoSpLM1DYJqgI/rUBFbbrptdIM5N04uTj+uWh3EN 9/HXE95br8Vagv1I4JQ5bUUX8xOSQCGHPUYS+6rIZTzlTm8+wzxSsHmy+Dzvmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735679189; 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=RG728KwphI+VAV97dinr11JR2ZIl5dOMj6K+8w444Hs=; b=NcwHmERvGrY5NX6K1K5Zh/GvXjXDP5Y97ptAMgyehlbI9RyCYKcWxUu7QdckViPgJQrAmU tNacfiJeKi4KMROEONQ6k/D2mLJjvuOPZ7wakisAqjrqDJUxWTX86nX8Cou3y1qzTnM9SA YpsX0nOmicbMcYBIV+l22+664wxchhgs5TiczJVGYf/ysis1xfy9K+w7DldsF30uXEa4/f VVRlCUJAkssgeuruHwZ7dHO2vTGq3MucotiHO4Agt1knI6ToqEwLZklfvatX8opOmphHEn iT+KICWEU30OB/qp6EyssbkY3cS6MVZxY3RKmOZ+e/rAyJ04LQNqTB2pUjS1lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735679189; a=rsa-sha256; cv=none; b=SdHbcub7Zci+jNdx6WMLzsaqtpXZ+9dDk0BQgUJa+OM6Z1bvPhLoKT8QnkMV5xBUwM9b8n YzjjTTlVtwg1qhcgcM/fFdIlbHTvhFzVFxyUtwpYzafFEvCbXo7X6xHnRoWggPI7j3mHTv szDWmQlteslyO/5o+GPtHX3wZzkseHQwtIY1bC+tNELurCUQfZAZ2K5PTV+j7zpu4SOPM9 sbYTCFF1W8yV19xUPsYVZmq7WFV/7Ja11M6G0SRiEaImcf6qXcgh1jmKCfg6dYrOqamnKa 7nS4QtN9kTAhHmPCrFd5j3vIys/a9d4x5xC9wD39xv9B6BFUgy3sQq4qp5msOA== 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 4YN59w6pBWzwKj; Tue, 31 Dec 2024 21:06:28 +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 4BVL6SQS067826; Tue, 31 Dec 2024 21:06:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVL6SHY067823; Tue, 31 Dec 2024 21:06:28 GMT (envelope-from git) Date: Tue, 31 Dec 2024 21:06:28 GMT Message-Id: <202412312106.4BVL6SHY067823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 5ec914e06c96 - main - TCP BBR: fix condition when sending a tail loss probe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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: 5ec914e06c96ff40bf0e6567359c0de039b59ed2 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5ec914e06c96ff40bf0e6567359c0de039b59ed2 commit 5ec914e06c96ff40bf0e6567359c0de039b59ed2 Author: Michael Tuexen AuthorDate: 2024-12-31 21:03:13 +0000 Commit: Michael Tuexen CommitDate: 2024-12-31 21:03:13 +0000 TCP BBR: fix condition when sending a tail loss probe Reviewed by: rrs CID: 1523793 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48274 --- 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 f440573ace30..3c5864007986 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -4614,7 +4614,7 @@ need_retran: */ if (collapsed_win == 0) { rsm = TAILQ_LAST_FAST(&bbr->r_ctl.rc_map, bbr_sendmap, r_next); - if (rsm && (BBR_ACKED | BBR_HAS_FIN)) { + if (rsm && (rsm->r_flags & (BBR_ACKED | BBR_HAS_FIN))) { rsm = bbr_find_high_nonack(bbr, rsm); } if (rsm == NULL) {