Commit 680367bc authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tcp-remove-rtx_syn_ack-and-inet_rtx_syn_ack' 

Eric Dumazet says:

====================
tcp: remove rtx_syn_ack and inet_rtx_syn_ack()

After DCCP removal, we can cleanup SYNACK retransmits a bit.
====================

Link: https://patch.msgid.link/20250626153017.2156274-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents bf3b1d39 cf56a982

include/net/request_sock.h

+0 −4
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ struct request_sock_ops { 
	unsigned int	obj_size;

	struct kmem_cache	*slab;

	char		*slab_name;

	int		(*rtx_syn_ack)(const struct sock *sk,

				       struct request_sock *req);

	void		(*send_ack)(const struct sock *sk, struct sk_buff *skb,

				    struct request_sock *req);

	void		(*send_reset)(const struct sock *sk,
@@ -41,8 +39,6 @@ struct request_sock_ops { 
	void		(*syn_ack_timeout)(const struct request_sock *req);

};



int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req);



struct saved_syn {

	u32 mac_hdrlen;

	u32 network_hdrlen;

net/ipv4/inet_connection_sock.c

+1 −10
Original line number Diff line number Diff line
@@ -884,15 +884,6 @@ static void syn_ack_recalc(struct request_sock *req, 
		  req->num_timeout >= rskq_defer_accept - 1;

}



int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req)

{

	int err = req->rsk_ops->rtx_syn_ack(parent, req);



	if (!err)

		req->num_retrans++;

	return err;

}



static struct request_sock *

reqsk_alloc_noprof(const struct request_sock_ops *ops, struct sock *sk_listener,

		   bool attach_listener)
@@ -1132,7 +1123,7 @@ static void reqsk_timer_handler(struct timer_list *t) 
	req->rsk_ops->syn_ack_timeout(req);

	if (!expire &&

	    (!resend ||

	     !inet_rtx_syn_ack(sk_listener, req) ||

	     !tcp_rtx_synack(sk_listener, req) ||

	     inet_rsk(req)->acked)) {

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

			atomic_dec(&queue->young);

net/ipv4/tcp_ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -1703,7 +1703,6 @@ static struct dst_entry *tcp_v4_route_req(const struct sock *sk, 
struct request_sock_ops tcp_request_sock_ops __read_mostly = {

	.family		=	PF_INET,

	.obj_size	=	sizeof(struct tcp_request_sock),

	.rtx_syn_ack	=	tcp_rtx_synack,

	.send_ack	=	tcp_v4_reqsk_send_ack,

	.destructor	=	tcp_v4_reqsk_destructor,

	.send_reset	=	tcp_v4_send_reset,

net/ipv4/tcp_minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, 
					  LINUX_MIB_TCPACKSKIPPEDSYNRECV,

					  &tcp_rsk(req)->last_oow_ack_time) &&



		    !inet_rtx_syn_ack(sk, req)) {

		    !tcp_rtx_synack(sk, req)) {

			unsigned long expires = jiffies;



			expires += reqsk_timeout(req, TCP_RTO_MAX);

net/ipv4/tcp_output.c

+1 −0
Original line number Diff line number Diff line
@@ -4425,6 +4425,7 @@ int tcp_rtx_synack(const struct sock *sk, struct request_sock *req) 
			tcp_sk_rw(sk)->total_retrans++;

		}

		trace_tcp_retransmit_synack(sk, req);

		req->num_retrans++;

	}

	return res;

}