Commit 7baa0301 authored by Eric Dumazet's avatar Eric Dumazet Committed by Paolo Abeni
Browse files

tcp: add a @pace_delay parameter to tcp_reset_xmit_timer() 



We want to factorize calls to inet_csk_reset_xmit_timer(),
to ease TCP_RTO_MAX change.

Current users want to add tcp_pacing_delay(sk)
to the timeout.

Remaining calls to inet_csk_reset_xmit_timer()
do not add the pacing delay. Following patch
will convert them, passing false for @pace_delay.

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 0fed4637

include/net/tcp.h

+6 −4
Original line number Diff line number Diff line
@@ -1423,10 +1423,12 @@ static inline unsigned long tcp_pacing_delay(const struct sock *sk) 


static inline void tcp_reset_xmit_timer(struct sock *sk,

					const int what,

					unsigned long when)

					unsigned long when,

					bool pace_delay)

{

	inet_csk_reset_xmit_timer(sk, what, when + tcp_pacing_delay(sk),

				  TCP_RTO_MAX);

	if (pace_delay)

		when += tcp_pacing_delay(sk);

	inet_csk_reset_xmit_timer(sk, what, when, TCP_RTO_MAX);

}



/* Something is really bad, we could not queue an additional packet,
@@ -1455,7 +1457,7 @@ static inline void tcp_check_probe_timer(struct sock *sk) 
{

	if (!tcp_sk(sk)->packets_out && !inet_csk(sk)->icsk_pending)

		tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0,

				     tcp_probe0_base(sk));

				     tcp_probe0_base(sk), true);

}



static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq)

net/ipv4/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -3282,7 +3282,7 @@ void tcp_rearm_rto(struct sock *sk) 
			 */

			rto = usecs_to_jiffies(max_t(int, delta_us, 1));

		}

		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto);

		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto, true);

	}

}
@@ -3562,7 +3562,7 @@ static void tcp_ack_probe(struct sock *sk) 
		unsigned long when = tcp_probe0_when(sk, TCP_RTO_MAX);



		when = tcp_clamp_probe0_to_user_timeout(sk, when);

		tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when);

		tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when, true);

	}

}

net/ipv4/tcp_output.c

+3 −3
Original line number Diff line number Diff line
@@ -2910,7 +2910,7 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto) 
	if (rto_delta_us > 0)

		timeout = min_t(u32, timeout, usecs_to_jiffies(rto_delta_us));



	tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout);

	tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout, true);

	return true;

}
@@ -3544,7 +3544,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk) 
	}

	if (rearm_timer)

		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

				     inet_csk(sk)->icsk_rto);

				     inet_csk(sk)->icsk_rto, true);

}



/* We allow to exceed memory limits for FIN packets to expedite
@@ -4400,7 +4400,7 @@ void tcp_send_probe0(struct sock *sk) 
	}



	timeout = tcp_clamp_probe0_to_user_timeout(sk, timeout);

	tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout);

	tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout, true);

}



int tcp_rtx_synack(const struct sock *sk, struct request_sock *req)