tcp: remove tcp_reset_xmit_timer() @max_when argument

atenart · atenart · commit 27bee107f45b · 2025-09-22T15:46:11.000+02:00
JIRA: https://issues.redhat.com/browse/RHEL-115393 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
@@ -1439,11 +1439,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,
@@ -1472,7 +1471,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
@@ -3290,8 +3290,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);
 	}
 }
 
@@ -3571,7 +3570,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
@@ -2913,7 +2913,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;
 }
 
@@ -3549,8 +3549,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
@@ -4402,7 +4401,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
`@@ -1439,11 +1439,10 @@ static inline unsigned long tcp_pacing_delay(const struct sock *sk)`
`1439`	`1439`
`1440`	`1440`	`static inline void tcp_reset_xmit_timer(struct sock *sk,`
`1441`	`1441`	`const int what,`
`1442`		`- unsigned long when,`
`1443`		`- const unsigned long max_when)`
	`1442`	`+ unsigned long when)`
`1444`	`1443`	`{`
`1445`	`1444`	`inet_csk_reset_xmit_timer(sk, what, when + tcp_pacing_delay(sk),`
`1446`		`- max_when);`
	`1445`	`+ TCP_RTO_MAX);`
`1447`	`1446`	`}`
`1448`	`1447`
`1449`	`1448`	`/* Something is really bad, we could not queue an additional packet,`
`@@ -1472,7 +1471,7 @@ static inline void tcp_check_probe_timer(struct sock *sk)`
`1472`	`1471`	`{`
`1473`	`1472`	`if (!tcp_sk(sk)->packets_out && !inet_csk(sk)->icsk_pending)`
`1474`	`1473`	`tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0,`
`1475`		`- tcp_probe0_base(sk), TCP_RTO_MAX);`
	`1474`	`+ tcp_probe0_base(sk));`
`1476`	`1475`	`}`
`1477`	`1476`
`1478`	`1477`	`static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq)`
Original file line number	Diff line number	Diff line change
`@@ -3290,8 +3290,7 @@ void tcp_rearm_rto(struct sock *sk)`
`3290`	`3290`	`*/`
`3291`	`3291`	`rto = usecs_to_jiffies(max_t(int, delta_us, 1));`
`3292`	`3292`	`}`
`3293`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,`
`3294`		`- TCP_RTO_MAX);`
	`3293`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto);`
`3295`	`3294`	`}`
`3296`	`3295`	`}`
`3297`	`3296`
`@@ -3571,7 +3570,7 @@ static void tcp_ack_probe(struct sock *sk)`
`3571`	`3570`	`unsigned long when = tcp_probe0_when(sk, TCP_RTO_MAX);`
`3572`	`3571`
`3573`	`3572`	`when = tcp_clamp_probe0_to_user_timeout(sk, when);`
`3574`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when, TCP_RTO_MAX);`
	`3573`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, when);`
`3575`	`3574`	`}`
`3576`	`3575`	`}`
`3577`	`3576`
Original file line number	Diff line number	Diff line change
`@@ -2913,7 +2913,7 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto)`
`2913`	`2913`	`if (rto_delta_us > 0)`
`2914`	`2914`	`timeout = min_t(u32, timeout, usecs_to_jiffies(rto_delta_us));`
`2915`	`2915`
`2916`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout, TCP_RTO_MAX);`
	`2916`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout);`
`2917`	`2917`	`return true;`
`2918`	`2918`	`}`
`2919`	`2919`
`@@ -3549,8 +3549,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk)`
`3549`	`3549`	`}`
`3550`	`3550`	`if (rearm_timer)`
`3551`	`3551`	`tcp_reset_xmit_timer(sk, ICSK_TIME_RETRANS,`
`3552`		`- inet_csk(sk)->icsk_rto,`
`3553`		`- TCP_RTO_MAX);`
	`3552`	`+ inet_csk(sk)->icsk_rto);`
`3554`	`3553`	`}`
`3555`	`3554`
`3556`	`3555`	`/* We allow to exceed memory limits for FIN packets to expedite`
`@@ -4402,7 +4401,7 @@ void tcp_send_probe0(struct sock *sk)`
`4402`	`4401`	`}`
`4403`	`4402`
`4404`	`4403`	`timeout = tcp_clamp_probe0_to_user_timeout(sk, timeout);`
`4405`		`- tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout, TCP_RTO_MAX);`
	`4404`	`+ tcp_reset_xmit_timer(sk, ICSK_TIME_PROBE0, timeout);`
`4406`	`4405`	`}`
`4407`	`4406`
`4408`	`4407`	`int tcp_rtx_synack(const struct sock sk, struct request_sock req)`