git: 3c6fd437b182 - main - tcp bbr: improve handling of retransmissions in LAST-ACK

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Sun, 15 Nov 2026 21:41:22 UTC
The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=3c6fd437b1824caeddb5f0d4570d43cf0c999c14

commit 3c6fd437b1824caeddb5f0d4570d43cf0c999c14
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2026-11-15 21:13:50 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2026-11-15 21:17:07 +0000

    tcp bbr: improve handling of retransmissions in LAST-ACK
    
    When performing a timer based retransmission, clear the
    BBR_RWND_COLLAPSED flag. If it sticks, t_rxtshift is never incremented
    resulting in unlimited retransmissions in the LAST-ACK state.
    
    Reported by:            Illia Vynohradov
    Reviewed by:            Peter Lei
    MFC after:              3 days
    MFC to:                 stable/15
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D61586
---
 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 3b9a06bd7ad1..0cef2cb49ec0 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -4908,7 +4908,7 @@ bbr_remxt_tmr(struct tcpcb *tp)
 				rsm->r_flags &= ~BBR_SACK_PASSED;
 			}
 			rsm->r_flags |= BBR_MARKED_LOST;
-			rsm->r_flags &= ~BBR_WAS_SACKPASS;
+			rsm->r_flags &= ~(BBR_WAS_SACKPASS | BBR_RWND_COLLAPSED);
 		}
 		trsm = rsm;
 	}