Commit 48b69b4c authored by Eric Dumazet's avatar Eric Dumazet Committed by Paolo Abeni
Browse files

tcp: use tcp_reset_xmit_timer() 



In order to reduce TCP_RTO_MAX occurrences, replace:

    inet_csk_reset_xmit_timer(sk, what, when, TCP_RTO_MAX)

With:

    tcp_reset_xmit_timer(sk, what, when, false);

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarJason Xing <kerneljasonxing@gmail.com>
Reviewed-by: default avatarNeal Cardwell <ncardwell@google.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 7baa0301

net/ipv4/tcp_fastopen.c

+2 −2
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk, 
	 * because it's been added to the accept queue directly.

	 */

	req->timeout = tcp_timeout_init(child);

	inet_csk_reset_xmit_timer(child, ICSK_TIME_RETRANS,

				  req->timeout, TCP_RTO_MAX);

	tcp_reset_xmit_timer(child, ICSK_TIME_RETRANS,

			     req->timeout, false);



	refcount_set(&req->rsk_refcnt, 2);

net/ipv4/tcp_input.c

+5 −7
Original line number Diff line number Diff line
@@ -2252,8 +2252,7 @@ static bool tcp_check_sack_reneging(struct sock *sk, int *ack_flag) 
		unsigned long delay = max(usecs_to_jiffies(tp->srtt_us >> 4),

					  msecs_to_jiffies(10));



		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

					  delay, TCP_RTO_MAX);

		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, delay, false);

		*ack_flag &= ~FLAG_SET_XMIT_TIMER;

		return true;

	}
@@ -6468,9 +6467,8 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
		    after(TCP_SKB_CB(skb)->ack_seq, tp->snd_nxt)) {

			/* Previous FIN/ACK or RST/ACK might be ignored. */

			if (icsk->icsk_retransmits == 0)

				inet_csk_reset_xmit_timer(sk,

						ICSK_TIME_RETRANS,

						TCP_TIMEOUT_MIN, TCP_RTO_MAX);

				tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

						     TCP_TIMEOUT_MIN, false);

			SKB_DR_SET(reason, TCP_INVALID_ACK_SEQUENCE);

			goto reset_and_undo;

		}
@@ -6585,8 +6583,8 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
			 */

			inet_csk_schedule_ack(sk);

			tcp_enter_quickack_mode(sk, TCP_MAX_QUICKACKS);

			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,

						  TCP_DELACK_MAX, TCP_RTO_MAX);

			tcp_reset_xmit_timer(sk, ICSK_TIME_DACK,

					     TCP_DELACK_MAX, false);

			goto consume;

		}

		tcp_send_ack(sk);

net/ipv4/tcp_ipv4.c

+1 −2
Original line number Diff line number Diff line
@@ -465,8 +465,7 @@ void tcp_ld_RTO_revert(struct sock *sk, u32 seq) 
	remaining = icsk->icsk_rto - usecs_to_jiffies(delta_us);



	if (remaining > 0) {

		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

					  remaining, TCP_RTO_MAX);

		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, remaining, false);

	} else {

		/* RTO revert clocked out retransmission.

		 * Will retransmit now.

net/ipv4/tcp_output.c

+3 −3
Original line number Diff line number Diff line
@@ -4161,8 +4161,8 @@ int tcp_connect(struct sock *sk) 
	TCP_INC_STATS(sock_net(sk), TCP_MIB_ACTIVEOPENS);



	/* Timer for repeating the SYN until an answer. */

	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

				  inet_csk(sk)->icsk_rto, TCP_RTO_MAX);

	tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

			     inet_csk(sk)->icsk_rto, false);

	return 0;

}

EXPORT_SYMBOL(tcp_connect);
@@ -4255,7 +4255,7 @@ void __tcp_send_ack(struct sock *sk, u32 rcv_nxt) 
			icsk->icsk_ack.retry++;

		inet_csk_schedule_ack(sk);

		icsk->icsk_ack.ato = TCP_ATO_MIN;

		inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK, delay, TCP_RTO_MAX);

		tcp_reset_xmit_timer(sk, ICSK_TIME_DACK, delay, false);

		return;

	}

net/ipv4/tcp_timer.c

+7 −7
Original line number Diff line number Diff line
@@ -481,8 +481,8 @@ static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req) 
	tcp_update_rto_stats(sk);

	if (!tp->retrans_stamp)

		tp->retrans_stamp = tcp_time_stamp_ts(tp);

	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

			  req->timeout << req->num_timeout, TCP_RTO_MAX);

	tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

			  req->timeout << req->num_timeout, false);

}



static bool tcp_rtx_probe0_timed_out(const struct sock *sk,
@@ -626,9 +626,9 @@ void tcp_retransmit_timer(struct sock *sk) 
		/* Retransmission failed because of local congestion,

		 * Let senders fight for local resources conservatively.

		 */

		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

				     TCP_RESOURCE_PROBE_INTERVAL,

					  TCP_RTO_MAX);

				     false);

		goto out;

	}
@@ -675,8 +675,8 @@ void tcp_retransmit_timer(struct sock *sk) 
		icsk->icsk_backoff++;

		icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);

	}

	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

				  tcp_clamp_rto_to_user_timeout(sk), TCP_RTO_MAX);

	tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

			     tcp_clamp_rto_to_user_timeout(sk), false);

	if (retransmits_timed_out(sk, READ_ONCE(net->ipv4.sysctl_tcp_retries1) + 1, 0))

		__sk_dst_reset(sk);