tcp_bbr: fix to zero idle_restart only upon S/ACKed data
Subsystems (3)
Neal Cardwell
maintainerPATCH 1/1 tcp_bbr: fix to zero idle_restart only upon S/ACKed data
Previously the bbr->idle_restart tracking was zeroing out the bbr->idle_restart bit upon ACKs that did not SACK or ACK anything, e.g. receiving incoming data or receiver window updates. In such situations BBR would forget that this was a restart-from-idle situation, and if the min_rtt had expired it would unnecessarily enter PROBE_RTT (even though we were actually restarting from idle but had merely forgotten that fact).
The fix is simple: we need to remember we are restarting from idle until we receive a S/ACK for some data (a S/ACK for the first flight of data we send as we are restarting).
This commit is a stable candidate for kernels back as far as 4.9.
--- net/ipv4/tcp_bbr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/tcp_bbr.c +3 -1
@@ -806,7 +806,9 @@ static void bbr_update_min_rtt(struct sock *sk, const struct rate_sample *rs) } } } - bbr->idle_restart =0 ; +/* Restart after idle ends only once we process a new S/ACK for data */ +if (rs->delivered >0 ) + bbr->idle_restart =0 ; }static void bbr_update_model (struct sock *sk,const struct rate_sample *rs)
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
David Miller
maintainerFrom: Neal Cardwell <[email protected]>
Date: Tue, 1 May 2018 21:45:41 -0400
Quoted 12 lines
Previously the
bbr->idle_restarttracking was zeroing out thebbr->idle_restartbit upon ACKs that did not SACK or ACK anything, e.g. receiving incoming data or receiver window updates. In such situations BBR would forget that this was a restart-from-idle situation, and if themin_rtthad expired it would unnecessarily enterPROBE_RTT(even though we were actually restarting from idle but had merely forgotten that fact).The fix is simple: we need to remember we are restarting from idle until we receive a S/ACK for some data (a S/ACK for the first flight of data we send as we are restarting).
Quoted 8 lines
This commit is a stable candidate for kernels back as far as 4.9.
Fixes 0f8782ea1497 ("tcp_bbr: add BBR congestion control")Signed-off-by Neal Cardwell <[email protected]>Signed-off-by Yuchung Cheng <[email protected]>Signed-off-by Soheil Hassas Yeganeh <[email protected]>Signed-off-by Priyaranjan Jha <[email protected]>Signed-off-by Yousuk Seung <[email protected]>
Applied and queued up for -stable.