Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tcp: adjust rto_base in retransmits_timed_out()

Browse source 
The cited commit exposed an old retransmits_timed_out() bug
which assumed it could call tcp_model_timeout() with
TCP_RTO_MIN as rto_base for all states.

But flows in SYN_SENT or SYN_RECV state uses a different
RTO base (1 sec instead of 200 ms, unless BPF choses
another value).

This caused a reduction of SYN retransmits from 6 to 4 with
the default /proc/sys/net/ipv4/tcp_syn_retries value.

Change-Id: I424b7a716ceee8d455701f6470b0688e1fa1dc5a
Fixes: a41e8a88b06e ("tcp: better handle TCP_USER_TIMEOUT in SYN_SENT state")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Marek Majkowski <marek@cloudflare.com>
Git-Commit: 3256a2d6ab1f71f9a1bd2d7f6f18eb8108c48d17
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Kaustubh Pandey <kapandey@codeaurora.org>
This commit is contained in:
Eric Dumazet 2019-09-30 15:44:44 -07:00 committed by Kaustubh Pandey
parent 8591132ecd
commit 961e9a1d2d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/ipv4/tcp_timer.c
View file

@ -229,8 +229,13 @@ static bool retransmits_timed_out(struct sock *sk,
return false; return false;
start_ts = tcp_sk(sk)->retrans_stamp; start_ts = tcp_sk(sk)->retrans_stamp;
if (likely(timeout == 0)) if (likely(timeout == 0)) {
timeout = tcp_model_timeout(sk, boundary, TCP_RTO_MIN); unsigned int rto_base = TCP_RTO_MIN;
if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))
rto_base = tcp_timeout_init(sk);
timeout = tcp_model_timeout(sk, boundary, rto_base);
}
return (s32)(tcp_time_stamp(tcp_sk(sk)) - start_ts - timeout) >= 0; return (s32)(tcp_time_stamp(tcp_sk(sk)) - start_ts - timeout) >= 0;
} }