From: Yuchung Cheng Date: Tue, 1 Aug 2017 20:22:32 +0000 (-0700) Subject: tcp: avoid setting cwnd to invalid ssthresh after cwnd reduction states X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=37cb36243061666f8bd44fdc51229ca6896effa3;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git tcp: avoid setting cwnd to invalid ssthresh after cwnd reduction states commit ed254971edea92c3ac5c67c6a05247a92aa6075e upstream. If the sender switches the congestion control during ECN-triggered cwnd-reduction state (CA_CWR), upon exiting recovery cwnd is set to the ssthresh value calculated by the previous congestion control. If the previous congestion control is BBR that always keep ssthresh to TCP_INIFINITE_SSTHRESH, cwnd ends up being infinite. The safe step is to avoid assigning invalid ssthresh value when recovery ends. Signed-off-by: Yuchung Cheng Signed-off-by: Neal Cardwell Acked-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Willy Tarreau --- diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 70f217cb3a1b..828835cb0708 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2554,8 +2554,8 @@ static inline void tcp_end_cwnd_reduction(struct sock *sk) struct tcp_sock *tp = tcp_sk(sk); /* Reset cwnd to ssthresh in CWR or Recovery (unless it's undone) */ - if (inet_csk(sk)->icsk_ca_state == TCP_CA_CWR || - (tp->undo_marker && tp->snd_ssthresh < TCP_INFINITE_SSTHRESH)) { + if (tp->snd_ssthresh < TCP_INFINITE_SSTHRESH && + (inet_csk(sk)->icsk_ca_state == TCP_CA_CWR || tp->undo_marker)) { tp->snd_cwnd = tp->snd_ssthresh; tp->snd_cwnd_stamp = tcp_time_stamp; }