Commit 071ccde6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tcp-dccp-remove-16-bytes-from-icsk' 

Eric Dumazet says:

====================
tcp/dccp: remove 16 bytes from icsk

icsk->icsk_timeout and icsk->icsk_ack.timeout can be removed.

They mirror existing fields in icsk->icsk_retransmit_timer and
icsk->icsk_retransmit_timer.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7bd2e6b7 f1e30061

Documentation/networking/net_cachelines/inet_connection_sock.rst

+1 −3
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ struct inet_sock icsk_inet read_mostly r 
struct request_sock_queue           icsk_accept_queue

struct inet_bind_bucket             icsk_bind_hash         read_mostly                             tcp_set_state

struct inet_bind2_bucket            icsk_bind2_hash        read_mostly                             tcp_set_state,inet_put_port

unsigned_long                       icsk_timeout           read_mostly                             inet_csk_reset_xmit_timer,tcp_connect

struct timer_list                   icsk_retransmit_timer  read_mostly                             inet_csk_reset_xmit_timer,tcp_connect

struct timer_list                   icsk_retransmit_timer  read_write                              inet_csk_reset_xmit_timer,tcp_connect

struct timer_list                   icsk_delack_timer      read_mostly                             inet_csk_reset_xmit_timer,tcp_connect

u32                                 icsk_rto               read_write                              tcp_cwnd_validate,tcp_schedule_loss_probe,tcp_connect_init,tcp_connect,tcp_write_xmit,tcp_push_one

u32                                 icsk_rto_min
@@ -39,7 +38,6 @@ struct icsk_ack_u8 quick read_write w 
struct icsk_ack_u8                  pingpong

struct icsk_ack_u8                  retry                  write_mostly        read_write          inet_csk_clear_xmit_timer,tcp_rearm_rto,tcp_event_new_data_sent,tcp_write_xmit,__tcp_send_ack,tcp_send_ack,

struct icsk_ack_u8                  ato                    read_mostly         write_mostly        tcp_dec_quickack_mode,tcp_event_ack_sent,__tcp_transmit_skb,__tcp_send_ack,tcp_send_ack

struct icsk_ack_unsigned_long       timeout                read_write          read_write          inet_csk_reset_xmit_timer,tcp_connect

struct icsk_ack_u32                 lrcvtime               read_write                              tcp_finish_connect,tcp_connect,tcp_event_data_sent,__tcp_transmit_skb

struct icsk_ack_u16                 rcv_mss                write_mostly        read_mostly         __tcp_select_window,__tcp_cleanup_rbuf,tcp_initialize_rcv_mss,tcp_connect_init

struct icsk_mtup_int                search_high            read_write                              tcp_mtup_init,tcp_sync_mss,tcp_connect_init,tcp_mtu_check_reprobe,tcp_write_xmit

include/net/inet_connection_sock.h

+15 −7
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ struct inet_connection_sock_af_ops { 
 * @icsk_accept_queue:	   FIFO of established children

 * @icsk_bind_hash:	   Bind node

 * @icsk_bind2_hash:	   Bind node in the bhash2 table

 * @icsk_timeout:	   Timeout

 * @icsk_retransmit_timer: Resend (no ack)

 * @icsk_rto:		   Retransmit timeout

 * @icsk_pmtu_cookie	   Last pmtu seen by socket
@@ -82,7 +81,6 @@ struct inet_connection_sock { 
	struct request_sock_queue icsk_accept_queue;

	struct inet_bind_bucket	  *icsk_bind_hash;

	struct inet_bind2_bucket  *icsk_bind2_hash;

	unsigned long		  icsk_timeout;

 	struct timer_list	  icsk_retransmit_timer;

 	struct timer_list	  icsk_delack_timer;

	__u32			  icsk_rto;
@@ -115,7 +113,6 @@ struct inet_connection_sock { 
				  lrcv_flowlabel:20, /* last received ipv6 flowlabel	   */

				  dst_quick_ack:1, /* cache dst RTAX_QUICKACK		   */

				  unused:3;

		unsigned long	  timeout;	 /* Currently scheduled timeout		   */

		__u32		  lrcvtime;	 /* timestamp of last received data packet */

		__u16		  last_seg_size; /* Size of last incoming segment	   */

		__u16		  rcv_mss;	 /* MSS used for delayed ACK decisions	   */
@@ -187,6 +184,18 @@ static inline void inet_csk_delack_init(struct sock *sk) 
	memset(&inet_csk(sk)->icsk_ack, 0, sizeof(inet_csk(sk)->icsk_ack));

}



static inline unsigned long

icsk_timeout(const struct inet_connection_sock *icsk)

{

	return READ_ONCE(icsk->icsk_retransmit_timer.expires);

}



static inline unsigned long

icsk_delack_timeout(const struct inet_connection_sock *icsk)

{

	return READ_ONCE(icsk->icsk_delack_timer.expires);

}



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

{

	struct inet_connection_sock *icsk = inet_csk(sk);
@@ -222,16 +231,15 @@ static inline void inet_csk_reset_xmit_timer(struct sock *sk, const int what, 
		when = max_when;

	}



	when += jiffies;

	if (what == ICSK_TIME_RETRANS || what == ICSK_TIME_PROBE0 ||

	    what == ICSK_TIME_LOSS_PROBE || what == ICSK_TIME_REO_TIMEOUT) {

		smp_store_release(&icsk->icsk_pending, what);

		icsk->icsk_timeout = jiffies + when;

		sk_reset_timer(sk, &icsk->icsk_retransmit_timer, icsk->icsk_timeout);

		sk_reset_timer(sk, &icsk->icsk_retransmit_timer, when);

	} else if (what == ICSK_TIME_DACK) {

		smp_store_release(&icsk->icsk_ack.pending,

				  icsk->icsk_ack.pending | ICSK_ACK_TIMER);

		icsk->icsk_ack.timeout = jiffies + when;

		sk_reset_timer(sk, &icsk->icsk_delack_timer, icsk->icsk_ack.timeout);

		sk_reset_timer(sk, &icsk->icsk_delack_timer, when);

	} else {

		pr_debug("inet_csk BUG: unknown timer value\n");

	}

net/dccp/output.c

+2 −3
Original line number Diff line number Diff line
@@ -627,11 +627,10 @@ void dccp_send_delayed_ack(struct sock *sk) 
			return;

		}



		if (!time_before(timeout, icsk->icsk_ack.timeout))

			timeout = icsk->icsk_ack.timeout;

		if (!time_before(timeout, icsk_delack_timeout(icsk)))

			timeout = icsk_delack_timeout(icsk);

	}

	icsk->icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER;

	icsk->icsk_ack.timeout = timeout;

	sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout);

}

#endif

net/dccp/timer.c

+4 −4
Original line number Diff line number Diff line
@@ -139,9 +139,9 @@ static void dccp_write_timer(struct timer_list *t) 
	if (sk->sk_state == DCCP_CLOSED || !icsk->icsk_pending)

		goto out;



	if (time_after(icsk->icsk_timeout, jiffies)) {

	if (time_after(icsk_timeout(icsk), jiffies)) {

		sk_reset_timer(sk, &icsk->icsk_retransmit_timer,

			       icsk->icsk_timeout);

			       icsk_timeout(icsk));

		goto out;

	}
@@ -185,9 +185,9 @@ static void dccp_delack_timer(struct timer_list *t) 
	if (sk->sk_state == DCCP_CLOSED ||

	    !(icsk->icsk_ack.pending & ICSK_ACK_TIMER))

		goto out;

	if (time_after(icsk->icsk_ack.timeout, jiffies)) {

	if (time_after(icsk_delack_timeout(icsk), jiffies)) {

		sk_reset_timer(sk, &icsk->icsk_delack_timer,

			       icsk->icsk_ack.timeout);

			       icsk_delack_timeout(icsk));

		goto out;

	}

net/ipv4/inet_diag.c

+2 −2
Original line number Diff line number Diff line
@@ -315,12 +315,12 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
		r->idiag_timer = 1;

		r->idiag_retrans = icsk->icsk_retransmits;

		r->idiag_expires =

			jiffies_delta_to_msecs(icsk->icsk_timeout - jiffies);

			jiffies_delta_to_msecs(icsk_timeout(icsk) - jiffies);

	} else if (icsk_pending == ICSK_TIME_PROBE0) {

		r->idiag_timer = 4;

		r->idiag_retrans = icsk->icsk_probes_out;

		r->idiag_expires =

			jiffies_delta_to_msecs(icsk->icsk_timeout - jiffies);

			jiffies_delta_to_msecs(icsk_timeout(icsk) - jiffies);

	} else if (timer_pending(&sk->sk_timer)) {

		r->idiag_timer = 2;

		r->idiag_retrans = icsk->icsk_probes_out;