From nobody Wed Feb 05 20:30:38 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 4YpBgy3y23z5mLrL; Wed, 05 Feb 2025 20:30:38 +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 4YpBgy3Bzhz3DH6; Wed, 05 Feb 2025 20:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787438; 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=SfEiEOyBWqyCKEak7bfMoJH/TUjyXcUXd6kohBWVkCI=; b=slZlPFvgu/CxrCDIjUChOqJRhQMT0QhIr7yp1JtECeOkwd3ZUcF4ihjmY0n0PQ2TTe169t 1co16MhZfbOgx7Af0+a9TG8VK13LSijEoQ64+etlgW+XwMkYPAP8GCemNabiZjjQVXv9Qo Svpc72lwMtPjSVqQmtaz3DT1tYL0KgNP1EgHvxTm3VlUl9Z6riGZsS0f2YkGVnyY6+IHqD ZwjieOQ/P8p6KzAHM1yw1Jlmb3mhV+v9NxdIktv/ORH5QReL88J8DHkgrXj+vCTQ7t6uCg APjdEFzMsyhR9rOi69XyCm9Ew4WphXxyOCDlchICjzv4ZLkMcpbuapNI7jSbqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787438; 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=SfEiEOyBWqyCKEak7bfMoJH/TUjyXcUXd6kohBWVkCI=; b=YYgobJAg9K6KYqqai6RvnLllgAq6IXuyKflRcIICqfRGx01l8Eoo67EkhPzDuokL99OaRx n5mHlMoDzIiNvAw4TsVAEEA+W4hQQTKiO+gc/0alzUXWyudAHdTWYAyWWoBrhIewjgLl90 23lgyYoVtLDcgL/bQnAqm81nj9G4RV99V08bfqVgH4WO0PCz70OZwe+V1w8IrVFgkpX7pZ za7TT9q7jCw0XSvzKNlDL6OlZJNEg08R4nIHAPPwDG06EAUNvUmW//vqq9rA32uny4dXto owUK/3nu33gszzVblt3i5QF1wR4a/7RO1WQuRSvwKb6M4DZC8I/GFv3P7eaY8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787438; a=rsa-sha256; cv=none; b=DBoS0JE2q52vOtWQlzVhrMWtkxfbgYdBaS3ueVhls9SHWloTI8TwpMbtTtv7AOCvHfCsMs 6rg7UjWGkDXw2dbSbwoW2he3eUoqcEnQ/Qx0Jox4VmtIcwka2clnz9V6NefhQNbrfrttaB 4e9pdfKVUeKoszG+4b3IrcayoZeM8WuK8dtnJdipff1CUghMcTP281FH2sCJxV5ctPqCYc SBjmEJqFXDWL3O7Tx6xk/8Zb25Vz7k5pG0hDh4NV+Otlrn4q+t+6nG4/qhyjrIryIAp8oD makqhjXaH0sPiZCVsCkeSS+bm8Z1MGGN79T9o9pc11c/RaCll6+ZfT/AG9BPVw== 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 4YpBgy2ppjz16NC; Wed, 05 Feb 2025 20:30:38 +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 515KUcqX055326; Wed, 5 Feb 2025 20:30:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KUc7j055323; Wed, 5 Feb 2025 20:30:38 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:30:38 GMT Message-Id: <202502052030.515KUc7j055323@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: 8ef4a2cfb30d - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 8ef4a2cfb30d2f980cfd330853b1963ce03892cb Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef4a2cfb30d2f980cfd330853b1963ce03892cb commit 8ef4a2cfb30d2f980cfd330853b1963ce03892cb Author: Michael Tuexen AuthorDate: 2024-12-31 21:03:13 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:31:01 +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 47b4a1bddc6c..b9cfdf312c8c 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -4613,7 +4613,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) {