From nobody Wed Feb 05 20:31:06 2025 X-Original-To: dev-commits-src-branches@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 4YpBhW19RDz5mLv2; Wed, 05 Feb 2025 20:31:07 +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 4YpBhW01ccz3FJ6; Wed, 05 Feb 2025 20:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787467; 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=MFXob1d/gI/6pgEhg1UuRWOTZrDKeQ4YSwYmvdAHF2I=; b=qCPr5G8hLafliVhN7/rKGWUrGl2c+y0hcNiHnOZe9WTvsmzwCNK5PHwBvZQaERZt8tapN7 VMln1d5a/VXUMj/FZcU1IUPMx5Zq/xV2R+B50G65gjlm/KnKEpeQx/by6tJsJrARVbPnWW 3IWW7HQIzP+70IQMC+lZcm72wtxe/T056+SkXqVxB2v6heq9LA3f6pf8UNBSaeJBxs4oaq Ogcb1VGk5Cv8Ovak6kYCRAa+gihtd1RoTvKhMAVmUFX7VJjK1Vu0Y3B79jri8PSijpVsfg AwJwB10HY/VlpzAQG76ZOHEZGlBlQYkZt/rbmkg6ctyE0D49nFExC3zgHluxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787467; 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=MFXob1d/gI/6pgEhg1UuRWOTZrDKeQ4YSwYmvdAHF2I=; b=MRNyKdiqzkHINbhn0IMLivkf/qkG1moHA3OvLcitHLfnMVtwkHUF9LTZ4pvVHHPwyirrYk 1gOhFXGfvoPDgR7lbv38OwRLAUGP149xMESpGPSSRxv7FMCnnvfzUMFWHVfAph6ui6s+xJ HkzC51edixP12s6/qxTOzD+GfcFZvZwFSXCkm7wVbFKwghKh32P2GHbspeIp4qd5ZUNRm1 DjsORF7N3a2VGyS5qpcfD+7VsDB/xm8ICqGp2rO1f2KwAt3fYGjwTja3/jZ/M6MQO59bcC 2b/0hcqbbrgLephV6Vzxx2WX9ef/q80DymEnoiMWJztpULHila3C/f1PnLVv/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787467; a=rsa-sha256; cv=none; b=i9EEdmPs+J9e1QZ+HCZ/PX3ZnaboaMSGth7LropPuvgXs4+hEnJnyu93BQgL6vwn8us/KX 6nyWU4gIZsOW4ps1wTsETWvltlCe6Vw4i8gQmnfYdhXpmiYpMT37YsuXFRdtzlXYCsltoW lcNhKcEZiKB7FMw/dR/IeNEMES7oEeQeX3ATHAZ9joKXkFAb6UHgho5gpYixUsxVg1l4lG M4+FLLpt1kbQHxXrJCQrw/UrKFw7y0H/WUM78qwRAEV/Q5c2Kt9gfx/xn2XBSd1/PsKDqM 8+SR95o38mwBC2rGQCn8FNbNWOH+EZZfjzxA7BghWCIPinl9KcmA7ydL0bBadA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBhV6h3Vz16Qv; Wed, 05 Feb 2025 20:31:06 +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 515KV6O4057432; Wed, 5 Feb 2025 20:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KV6s0057429; Wed, 5 Feb 2025 20:31:06 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:31:06 GMT Message-Id: <202502052031.515KV6s0057429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 699d5634661d - stable/13 - TCP BBR: fix condition when sending a tail loss probe List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 699d5634661da034ba6a97b7cb4e2fab41d84779 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=699d5634661da034ba6a97b7cb4e2fab41d84779 commit 699d5634661da034ba6a97b7cb4e2fab41d84779 Author: Michael Tuexen AuthorDate: 2024-12-31 21:03:13 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:16:23 +0000 TCP BBR: fix condition when sending a tail loss probe Reviewed by: rrs CID: 1523793 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48274 (cherry picked from commit 5ec914e06c96ff40bf0e6567359c0de039b59ed2) --- 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 1a67bbbdd08f..732879dfab47 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -4629,7 +4629,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) {