lkml.org 
[lkml]   [2017]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 198/268] tcp: initialize icsk_ack.lrcvtime at session start time
    Date
    From: Eric Dumazet <edumazet@google.com>

    commit 15bb7745e94a665caf42bfaabf0ce062845b533b upstream.

    icsk_ack.lrcvtime has a 0 value at socket creation time.

    tcpi_last_data_recv can have bogus value if no payload is ever received.

    This patch initializes icsk_ack.lrcvtime for active sessions
    in tcp_finish_connect(), and for passive sessions in
    tcp_create_openreq_child()

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Acked-by: Neal Cardwell <ncardwell@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    net/ipv4/tcp_input.c | 2 +-
    net/ipv4/tcp_minisocks.c | 1 +
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
    index f3b15bb..0680058 100644
    --- a/net/ipv4/tcp_input.c
    +++ b/net/ipv4/tcp_input.c
    @@ -5335,6 +5335,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)
    struct inet_connection_sock *icsk = inet_csk(sk);

    tcp_set_state(sk, TCP_ESTABLISHED);
    + icsk->icsk_ack.lrcvtime = tcp_time_stamp;

    if (skb != NULL) {
    icsk->icsk_af_ops->sk_rx_dst_set(sk, skb);
    @@ -5535,7 +5536,6 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
    * to stand against the temptation 8) --ANK
    */
    inet_csk_schedule_ack(sk);
    - icsk->icsk_ack.lrcvtime = tcp_time_stamp;
    tcp_enter_quickack_mode(sk);
    inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
    TCP_DELACK_MAX, TCP_RTO_MAX);
    diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
    index 0f01788..914a55d 100644
    --- a/net/ipv4/tcp_minisocks.c
    +++ b/net/ipv4/tcp_minisocks.c
    @@ -405,6 +405,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
    newtp->srtt = 0;
    newtp->mdev = TCP_TIMEOUT_INIT;
    newicsk->icsk_rto = TCP_TIMEOUT_INIT;
    + newicsk->icsk_ack.lrcvtime = tcp_time_stamp;

    newtp->packets_out = 0;
    newtp->retrans_out = 0;
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-06-19 21:02    [W:4.158 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site