tcp: remove tcp_reset_xmit_timer() @max_when argument

atenart · atenart · commit dba39f567d9f · 2025-09-22T10:52:12.000+02:00
JIRA: https://issues.redhat.com/browse/RHEL-115191 Upstream Status: linux.git commit 0fed463 Author: Eric Dumazet <edumazet@google.com> Date: Fri Feb 7 15:28:26 2025 +0000 tcp: remove tcp_reset_xmit_timer() @max_when argument All callers use TCP_RTO_MAX, we can factorize this constant, becoming a variable soon. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Jason Xing <kerneljasonxing@gmail.com> Reviewed-by: Neal Cardwell <ncardwell@google.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Antoine Tenart <atenart@redhat.com>
diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -1354,11 +1354,10 @@ 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,
-					const unsigned long max_when)
+					unsigned long when)
 {
 	inet_csk_reset_xmit_timer(sk, what, when + tcp_pacing_delay(sk),
-				  max_when);
+				  TCP_RTO_MAX);
 }
 
 /* Something is really bad, we could not queue an additional packet,
@@ -1387,7 +1386,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_RTO_MAX);
+				     tcp_probe0_base(sk));
 }
 
 static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
@@ -3231,8 +3231,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_RTO_MAX);
+		tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto);
 	}
 }
 
@@ -3513,7 +3512,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_RTO_MAX);
+		tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when);
 	}
 }
 
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
@@ -2787,7 +2787,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_RTO_MAX);
+	tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout);
 	return true;
 }
 
@@ -3424,8 +3424,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,
-				     TCP_RTO_MAX);
+				     inet_csk(sk)->icsk_rto);
 }
 
 /* We allow to exceed memory limits for FIN packets to expedite
@@ -4177,7 +4176,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_RTO_MAX);
+	tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout);
 }
 
 int tcp_rtx_synack(const struct sock *sk, struct request_sock *req)

Original file line number	Diff line number	Diff line change
`@@ -1354,11 +1354,10 @@ static inline unsigned long tcp_pacing_delay(const struct sock *sk)`
`1354`	`1354`
`1355`	`1355`	`static inline void tcp_reset_xmit_timer(struct sock *sk,`
`1356`	`1356`	`const int what,`
`1357`		`- unsigned long when,`
`1358`		`- const unsigned long max_when)`
	`1357`	`+ unsigned long when)`
`1359`	`1358`	`{`
`1360`	`1359`	`inet_csk_reset_xmit_timer(sk, what, when + tcp_pacing_delay(sk),`
`1361`		`- max_when);`
	`1360`	`+ TCP_RTO_MAX);`
`1362`	`1361`	`}`
`1363`	`1362`
`1364`	`1363`	`/* Something is really bad, we could not queue an additional packet,`
`@@ -1387,7 +1386,7 @@ static inline void tcp_check_probe_timer(struct sock *sk)`
`1387`	`1386`	`{`
`1388`	`1387`	`if (!tcp_sk(sk)->packets_out && !inet_csk(sk)->icsk_pending)`
`1389`	`1388`	`tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0,`
`1390`		`- tcp_probe0_base(sk), TCP_RTO_MAX);`
	`1389`	`+ tcp_probe0_base(sk));`
`1391`	`1390`	`}`
`1392`	`1391`
`1393`	`1392`	`static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq)`
Original file line number	Diff line number	Diff line change
`@@ -3231,8 +3231,7 @@ void tcp_rearm_rto(struct sock *sk)`
`3231`	`3231`	`*/`
`3232`	`3232`	`rto = usecs_to_jiffies(max_t(int, delta_us, 1));`
`3233`	`3233`	`}`
`3234`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,`
`3235`		`- TCP_RTO_MAX);`
	`3234`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto);`
`3236`	`3235`	`}`
`3237`	`3236`	`}`
`3238`	`3237`
`@@ -3513,7 +3512,7 @@ static void tcp_ack_probe(struct sock *sk)`
`3513`	`3512`	`unsigned long when = tcp_probe0_when(sk, TCP_RTO_MAX);`
`3514`	`3513`
`3515`	`3514`	`when = tcp_clamp_probe0_to_user_timeout(sk, when);`
`3516`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when, TCP_RTO_MAX);`
	`3515`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when);`
`3517`	`3516`	`}`
`3518`	`3517`	`}`
`3519`	`3518`
Original file line number	Diff line number	Diff line change
`@@ -2787,7 +2787,7 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)`
`2787`	`2787`	`if (rto_delta_us > 0)`
`2788`	`2788`	`timeout = min_t(u32, timeout, usecs_to_jiffies(rto_delta_us));`
`2789`	`2789`
`2790`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout, TCP_RTO_MAX);`
	`2790`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout);`
`2791`	`2791`	`return true;`
`2792`	`2792`	`}`
`2793`	`2793`
`@@ -3424,8 +3424,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk)`
`3424`	`3424`	`}`
`3425`	`3425`	`if (rearm_timer)`
`3426`	`3426`	`tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,`
`3427`		`- inet_csk(sk)->icsk_rto,`
`3428`		`- TCP_RTO_MAX);`
	`3427`	`+ inet_csk(sk)->icsk_rto);`
`3429`	`3428`	`}`
`3430`	`3429`
`3431`	`3430`	`/* We allow to exceed memory limits for FIN packets to expedite`
`@@ -4177,7 +4176,7 @@ void tcp_send_probe0(struct sock *sk)`
`4177`	`4176`	`}`
`4178`	`4177`
`4179`	`4178`	`timeout = tcp_clamp_probe0_to_user_timeout(sk, timeout);`
`4180`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout, TCP_RTO_MAX);`
	`4179`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout);`
`4181`	`4180`	`}`
`4182`	`4181`
`4183`	`4182`	`int tcp_rtx_synack(const struct sock sk, struct request_sock req)`