Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e13bcef authored Mar 22, 2017 by Eric Dumazet Committed by Greg Kroah-Hartman Mar 30, 2017

tcp: initialize icsk_ack.lrcvtime at session start time



[ Upstream commit 15bb7745e94a665caf42bfaabf0ce062845b533b ]

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a53ea605

net/ipv4/tcp_input.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5571,6 +5571,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) {
		icsk->icsk_af_ops->sk_rx_dst_set(sk, skb);
		@@ -5789,7 +5790,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);

net/ipv4/tcp_minisocks.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -466,6 +466,7 @@ struct sock tcp_create_openreq_child(const struct sock sk,
		newtp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);
		minmax_reset(&newtp->rtt_min, tcp_time_stamp, ~0U);
		newicsk->icsk_rto = TCP_TIMEOUT_INIT;
		newicsk->icsk_ack.lrcvtime = tcp_time_stamp;

		newtp->packets_out = 0;
		newtp->retrans_out = 0;