Skip to content
Commit a41e8a88 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: better handle TCP_USER_TIMEOUT in SYN_SENT state



Yuchung Cheng and Marek Majkowski independently reported a weird
behavior of TCP_USER_TIMEOUT option when used at connect() time.

When the TCP_USER_TIMEOUT is reached, tcp_write_timeout()
believes the flow should live, and the following condition
in tcp_clamp_rto_to_user_timeout() programs one jiffie timers :

    remaining = icsk->icsk_user_timeout - elapsed;
    if (remaining <= 0)
        return 1; /* user timeout has passed; fire ASAP */

This silly situation ends when the max syn rtx count is reached.

This patch makes sure we honor both TCP_SYNCNT and TCP_USER_TIMEOUT,
avoiding these spurious SYN packets.

Fixes: b701a99e ("tcp: Add tcp_clamp_rto_to_user_timeout() helper to improve accuracy")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarYuchung Cheng <ycheng@google.com>
Reported-by: default avatarMarek Majkowski <marek@cloudflare.com>
Cc: Jon Maxwell <jmaxwell37@gmail.com>
Link: https://marc.info/?l=linux-netdev&m=156940118307949&w=2


Acked-by: default avatarJon Maxwell <jmaxwell37@gmail.com>
Tested-by: default avatarMarek Majkowski <marek@cloudflare.com>
Signed-off-by: default avatarMarek Majkowski <marek@cloudflare.com>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 174e2381
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment