tcp: apply a floor of 1 for RTT samples from TCP timestamps
Subsystems (3)
PATCH 1/1 tcp: apply a floor of 1 for RTT samples from TCP timestamps
For retransmitted packets, TCP needs to resort to using TCP timestamps for computing RTT samples. In the common case where the data and ACK fall in the same 1-millisecond interval, TCP senders with millisecond- granularity TCP timestamps compute a ca_rtt_us of 0. This ca_rtt_us of 0 propagates to rs->rtt_us.
This value of 0 can cause performance problems for congestion control modules. For example, in BBR, the zero min_rtt sample can bring the min_rtt and BDP estimate down to 0, reduce snd_cwnd and result in a low throughput. It would be hard to mitigate this with filtering in the congestion control module, because the proper floor to apply would depend on the method of RTT sampling (using timestamp options or internally-saved transmission timestamps).
This fix applies a floor of 1 for the RTT sample delta from TCP timestamps, so that seq_rtt_us, ca_rtt_us, and rs->rtt_us will be at least 1 * (USEC_PER_SEC / TCP_TS_HZ).
Note that the receiver RTT computation in tcp_rcv_rtt_measure() and min_rtt computation in tcp_update_rtt_min() both already apply a floor of 1 timestamp tick, so this commit makes the code more consistent in avoiding this edge case of a value of 0.
--- net/ipv4/tcp_input.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/tcp_input.c +2 -0
@@ -2950,6 +2950,8 @@ static bool tcp_ack_update_rtt(struct sock *sk, const int flag,u32 delta =tcp_time_stamp (tp) - tp->rx_opt.rcv_tsecr;if (likely (delta <INT_MAX / (USEC_PER_SEC /TCP_TS_HZ ))) { +if (!delta) + delta =1 ; seq_rtt_us = delta * (USEC_PER_SEC /TCP_TS_HZ ); ca_rtt_us = seq_rtt_us; }
Signature · 1 line
2.28.0.163.g6104cc2f0b6-goog
Neal Cardwell
maintainerQuoted 24 lines · Jianfeng Wang
For retransmitted packets, TCP needs to resort to using TCP timestamps for computing RTT samples. In the common case where the data and ACK fall in the same 1-millisecond interval, TCP senders with millisecond- granularity TCP timestamps compute a
ca_rtt_usof 0. Thisca_rtt_usof 0 propagates tors->rtt_us.This value of 0 can cause performance problems for congestion control modules. For example, in BBR, the zero
min_rttsample can bring themin_rttand BDP estimate down to 0, reducesnd_cwndand result in a low throughput. It would be hard to mitigate this with filtering in the congestion control module, because the proper floor to apply would depend on the method of RTT sampling (using timestamp options or internally-saved transmission timestamps).This fix applies a floor of 1 for the RTT sample delta from TCP timestamps, so that
seq_rtt_us,ca_rtt_us, andrs->rtt_uswill be at least 1 * (USEC_PER_SEC/TCP_TS_HZ).Note that the receiver RTT computation in
tcp_rcv_rtt_measure()andmin_rttcomputation intcp_update_rtt_min()both already apply a floor of 1 timestamp tick, so this commit makes the code more consistent in avoiding this edge case of a value of 0.
Quoted 6 lines
Signed-off-by Jianfeng Wang <[email protected]>Signed-off-by Neal Cardwell <[email protected]>Signed-off-by Eric Dumazet <[email protected]>Acked-by Kevin Yang <[email protected]>Acked-by Yuchung Cheng <[email protected]>---
One extra note on this patch: IMHO this is a bug fix that is worth backporting to stable releases. Normally we would submit a patch like this to the net branch, but we submitted this to the net-next branch since Eric advised that this was the best approach, given how late it is in the v5.8 development cycle.
Apologies that a note to this effect is not in the commit message itself.
best,
neal
David Miller
maintainerFrom: Jianfeng Wang <[email protected]>
Date: Thu, 30 Jul 2020 23:49:16 +0000
Quoted 23 lines
For retransmitted packets, TCP needs to resort to using TCP timestamps for computing RTT samples. In the common case where the data and ACK fall in the same 1-millisecond interval, TCP senders with millisecond- granularity TCP timestamps compute a
ca_rtt_usof 0. Thisca_rtt_usof 0 propagates tors->rtt_us.This value of 0 can cause performance problems for congestion control modules. For example, in BBR, the zero
min_rttsample can bring themin_rttand BDP estimate down to 0, reducesnd_cwndand result in a low throughput. It would be hard to mitigate this with filtering in the congestion control module, because the proper floor to apply would depend on the method of RTT sampling (using timestamp options or internally-saved transmission timestamps).This fix applies a floor of 1 for the RTT sample delta from TCP timestamps, so that
seq_rtt_us,ca_rtt_us, andrs->rtt_uswill be at least 1 * (USEC_PER_SEC/TCP_TS_HZ).Note that the receiver RTT computation in
tcp_rcv_rtt_measure()andmin_rttcomputation intcp_update_rtt_min()both already apply a floor of 1 timestamp tick, so this commit makes the code more consistent in avoiding this edge case of a value of 0.
Quoted 5 lines
Signed-off-by Jianfeng Wang <[email protected]>Signed-off-by Neal Cardwell <[email protected]>Signed-off-by Eric Dumazet <[email protected]>Acked-by Kevin Yang <[email protected]>Acked-by Yuchung Cheng <[email protected]>
Applied and queued up for -stable, thanks.