Commit 207ce0f6 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

tcp: Remove timeout arg from reqsk_timeout(). 



reqsk_timeout() is always called with @timeout being TCP_RTO_MAX.

Let's remove the arg.

As a prep for the next patch, reqsk_timeout() is moved to tcp.h
and renamed to tcp_reqsk_timeout().

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20251106003357.273403-5-kuniyu@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6fbf648d

include/net/inet_connection_sock.h

+0 −8
Original line number Diff line number Diff line
@@ -290,14 +290,6 @@ static inline int inet_csk_reqsk_queue_is_full(const struct sock *sk) 
bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req);

void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req);



static inline unsigned long

reqsk_timeout(struct request_sock *req, unsigned long max_timeout)

{

	u64 timeout = (u64)req->timeout << req->num_timeout;



	return (unsigned long)min_t(u64, timeout, max_timeout);

}



void inet_csk_destroy_sock(struct sock *sk);

void inet_csk_prepare_for_destroy_sock(struct sock *sk);

void inet_csk_prepare_forced_close(struct sock *sk);

include/net/tcp.h

+7 −0
Original line number Diff line number Diff line
@@ -841,6 +841,13 @@ static inline u32 __tcp_set_rto(const struct tcp_sock *tp) 
	return usecs_to_jiffies((tp->srtt_us >> 3) + tp->rttvar_us);

}



static inline unsigned long tcp_reqsk_timeout(struct request_sock *req)

{

	u64 timeout = (u64)req->timeout << req->num_timeout;



	return (unsigned long)min_t(u64, timeout, TCP_RTO_MAX);

}



u32 tcp_delack_max(const struct sock *sk);



/* Compute the actual rto_min value */

net/ipv4/inet_connection_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static void reqsk_timer_handler(struct timer_list *t) 
	     inet_rsk(req)->acked)) {

		if (req->num_timeout++ == 0)

			atomic_dec(&queue->young);

		mod_timer(&req->rsk_timer, jiffies + reqsk_timeout(req, TCP_RTO_MAX));

		mod_timer(&req->rsk_timer, jiffies + tcp_reqsk_timeout(req));



		if (!nreq)

			return;

net/ipv4/tcp_minisocks.c

+3 −2
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, 
			 * it can be estimated (approximately)

			 * from another data.

			 */

			tmp_opt.ts_recent_stamp = ktime_get_seconds() - reqsk_timeout(req, TCP_RTO_MAX) / HZ;

			tmp_opt.ts_recent_stamp = ktime_get_seconds() -

				tcp_reqsk_timeout(req) / HZ;

			paws_reject = tcp_paws_reject(&tmp_opt, th->rst);

		}

	}
@@ -753,7 +754,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, 
		    !tcp_rtx_synack(sk, req)) {

			unsigned long expires = jiffies;



			expires += reqsk_timeout(req, TCP_RTO_MAX);

			expires += tcp_reqsk_timeout(req);

			if (!fastopen)

				mod_timer_pending(&req->rsk_timer, expires);

			else