tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets
Subsystems (3)
Neal Cardwell
maintainerPATCH 1/1 tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets
Currently if BBR congestion control is initialized after more than 2B packets have been delivered, depending on the phase of the tp->delivered counter the tracking of BBR round trips can get stuck.
The bug arises because if tp->delivered is between 2^31 and 2^32 at the time the BBR congestion control module is initialized, then the initialization of bbr->next_rtt_delivered to 0 will cause the logic to believe that the end of the round trip is still billions of packets in the future. More specifically, the following check will fail repeatedly:
!before(rs->prior_delivered, bbr->next_rtt_delivered)
and thus the connection will take up to 2B packets delivered before that check will pass and the connection will set:
bbr->round_start = 1;
This could cause many mechanisms in BBR to fail to trigger, for example bbr_check_full_bw_reached() would likely never exit STARTUP.
This bug is 5 years old and has not been observed, and as a practical matter this would likely rarely trigger, since it would require transferring at least 2B packets, or likely more than 3 terabytes of data, before switching congestion control algorithms to BBR.
This patch is a stable candidate for kernels as far back as v4.9, when tcp_bbr.c was added.
--- net/ipv4/tcp_bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_bbr.c +1 -1
@@ -1041,7 +1041,7 @@ static void bbr_init(struct sock *sk) bbr->prior_cwnd =0 ; tp->snd_ssthresh =TCP_INFINITE_SSTHRESH ; bbr->rtt_cnt =0 ; - bbr->next_rtt_delivered =0 ; + bbr->next_rtt_delivered = tp->delivered; bbr->prev_ca_state = TCP_CA_Open; bbr->packet_conservation =0 ;
Signature · 1 line
2.32.0.605.g8dce9f2422-goog
Quoted 26 lines · Neal Cardwell
Currently if BBR congestion control is initialized after more than 2B packets have been delivered, depending on the phase of the
tp->deliveredcounter the tracking of BBR round trips can get stuck.The bug arises because if
tp->deliveredis between 2^31 and 2^32 at the time the BBR congestion control module is initialized, then the initialization ofbbr->next_rtt_deliveredto 0 will cause the logic to believe that the end of the round trip is still billions of packets in the future. More specifically, the following check will fail repeatedly:!before(rs->prior_delivered,
bbr->next_rtt_delivered)and thus the connection will take up to 2B packets delivered before that check will pass and the connection will set:
bbr->round_start = 1;This could cause many mechanisms in BBR to fail to trigger, for example
bbr_check_full_bw_reached()would likely never exit STARTUP.This bug is 5 years old and has not been observed, and as a practical matter this would likely rarely trigger, since it would require transferring at least 2B packets, or likely more than 3 terabytes of data, before switching congestion control algorithms to BBR.
Quoted 7 lines
This patch is a stable candidate for kernels as far back as v4.9, when
tcp_bbr.cwas added.Fixes 0f8782ea1497 ("tcp_bbr: add BBR congestion control")Signed-off-by Neal Cardwell <[email protected]>Reviewed-by Yuchung Cheng <[email protected]>Reviewed-by Kevin Yang <[email protected]>
Nice catch :(
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 4 lines · On Tue, 10 Aug 2021 22:40:56 -0400 you wrote:
Currently if BBR congestion control is initialized after more than 2B packets have been delivered, depending on the phase of the
tp->deliveredcounter the tracking of BBR round trips can get stuck.
Quoted 8 lines
The bug arises because if
tp->deliveredis between 2^31 and 2^32 at the time the BBR congestion control module is initialized, then the initialization ofbbr->next_rtt_deliveredto 0 will cause the logic to believe that the end of the round trip is still billions of packets in the future. More specifically, the following check will fail repeatedly:[...]
Here is the summary with links:
- [net] tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets
https://git.kernel.org/netdev/net/c/6de035fec045
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html