Skip to content

Commit 1b9e2a8

Browse files
sharpellettikuba-moo
authored andcommitted
tcp: only postpone PROBE_RTT if RTT is < current min_rtt estimate
During loss recovery, retransmitted packets are forced to use TCP timestamps to calculate the RTT samples, which have a millisecond granularity. BBR is designed using a microsecond granularity. As a result, multiple RTT samples could be truncated to the same RTT value during loss recovery. This is problematic, as BBR will not enter PROBE_RTT if the RTT sample is <= the current min_rtt sample, meaning that if there are persistent losses, PROBE_RTT will constantly be pushed off and potentially never re-entered. This patch makes sure that BBR enters PROBE_RTT by checking if RTT sample is < the current min_rtt sample, rather than <=. The Netflix transport/TCP team discovered this bug in the Linux TCP BBR code during lab tests. Fixes: 0f8782e ("tcp_bbr: add BBR congestion control") Signed-off-by: Ryan Sharpelletti <[email protected]> Signed-off-by: Neal Cardwell <[email protected]> Signed-off-by: Soheil Hassas Yeganeh <[email protected]> Signed-off-by: Yuchung Cheng <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 3d51794 commit 1b9e2a8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/ipv4/tcp_bbr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ static void bbr_update_min_rtt(struct sock *sk, const struct rate_sample *rs)
945945
filter_expired = after(tcp_jiffies32,
946946
bbr->min_rtt_stamp + bbr_min_rtt_win_sec * HZ);
947947
if (rs->rtt_us >= 0 &&
948-
(rs->rtt_us <= bbr->min_rtt_us ||
948+
(rs->rtt_us < bbr->min_rtt_us ||
949949
(filter_expired && !rs->is_ack_delayed))) {
950950
bbr->min_rtt_us = rs->rtt_us;
951951
bbr->min_rtt_stamp = tcp_jiffies32;

0 commit comments

Comments
 (0)