Commit be258f65 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

tcp: rename inet_csk_{delete|reset}_keepalive_timer() 



inet_csk_delete_keepalive_timer() and inet_csk_reset_keepalive_timer()
are only used from core TCP, there is no need to export them.

Replace their prefix by tcp.

Move them to net/ipv4/tcp_timer.c and make tcp_delete_keepalive_timer()
static.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarJason Xing <kerneljasonxing@gmail.com>
Reviewed-by: default avatarJoe Damato <jdamato@fastly.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250206094605.2694118-1-edumazet@google.com


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

include/net/inet_connection_sock.h

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ static inline void inet_csk_delack_init(struct sock *sk) 
	memset(&inet_csk(sk)->icsk_ack, 0, sizeof(inet_csk(sk)->icsk_ack));

}



void inet_csk_delete_keepalive_timer(struct sock *sk);

void inet_csk_reset_keepalive_timer(struct sock *sk, unsigned long timeout);



static inline void inet_csk_clear_xmit_timer(struct sock *sk, const int what)

{

	struct inet_connection_sock *icsk = inet_csk(sk);

include/net/tcp.h

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
		      sockptr_t optval, unsigned int optlen);

int tcp_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,

		   unsigned int optlen);

void tcp_reset_keepalive_timer(struct sock *sk, unsigned long timeout);

void tcp_set_keepalive(struct sock *sk, int val);

void tcp_syn_ack_timeout(const struct request_sock *req);

int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

net/ipv4/inet_connection_sock.c

+0 −12
Original line number Diff line number Diff line
@@ -799,18 +799,6 @@ void inet_csk_clear_xmit_timers_sync(struct sock *sk) 
	sk_stop_timer_sync(sk, &sk->sk_timer);

}



void inet_csk_delete_keepalive_timer(struct sock *sk)

{

	sk_stop_timer(sk, &sk->sk_timer);

}

EXPORT_SYMBOL(inet_csk_delete_keepalive_timer);



void inet_csk_reset_keepalive_timer(struct sock *sk, unsigned long len)

{

	sk_reset_timer(sk, &sk->sk_timer, jiffies + len);

}

EXPORT_SYMBOL(inet_csk_reset_keepalive_timer);



struct dst_entry *inet_csk_route_req(const struct sock *sk,

				     struct flowi4 *fl4,

				     const struct request_sock *req)

net/ipv4/tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -3179,7 +3179,7 @@ void __tcp_close(struct sock *sk, long timeout) 
			const int tmo = tcp_fin_time(sk);



			if (tmo > TCP_TIMEWAIT_LEN) {

				inet_csk_reset_keepalive_timer(sk,

				tcp_reset_keepalive_timer(sk,

						tmo - TCP_TIMEWAIT_LEN);

			} else {

				tcp_time_wait(sk, TCP_FIN_WAIT2, tmo);
@@ -3632,7 +3632,7 @@ int tcp_sock_set_keepidle_locked(struct sock *sk, int val) 
			elapsed = tp->keepalive_time - elapsed;

		else

			elapsed = 0;

		inet_csk_reset_keepalive_timer(sk, elapsed);

		tcp_reset_keepalive_timer(sk, elapsed);

	}



	return 0;

net/ipv4/tcp_input.c

+3 −3
Original line number Diff line number Diff line
@@ -6346,7 +6346,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb) 
	tp->lsndtime = tcp_jiffies32;



	if (sock_flag(sk, SOCK_KEEPOPEN))

		inet_csk_reset_keepalive_timer(sk, keepalive_time_when(tp));

		tcp_reset_keepalive_timer(sk, keepalive_time_when(tp));



	if (!tp->rx_opt.snd_wscale)

		__tcp_fast_path_on(tp, tp->snd_wnd);
@@ -6921,7 +6921,7 @@ tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) 


		tmo = tcp_fin_time(sk);

		if (tmo > TCP_TIMEWAIT_LEN) {

			inet_csk_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN);

			tcp_reset_keepalive_timer(sk, tmo - TCP_TIMEWAIT_LEN);

		} else if (th->fin || sock_owned_by_user(sk)) {

			/* Bad case. We could lose such FIN otherwise.

			 * It is not a big problem, but it looks confusing
@@ -6929,7 +6929,7 @@ tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) 
			 * if it spins in bh_lock_sock(), but it is really

			 * marginal case.

			 */

			inet_csk_reset_keepalive_timer(sk, tmo);

			tcp_reset_keepalive_timer(sk, tmo);

		} else {

			tcp_time_wait(sk, TCP_FIN_WAIT2, tmo);

			goto consume;