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

tcp: move icsk_clean_acked to a better location 



As a followup of my presentation in Zagreb for netdev 0x19:

icsk_clean_acked is only used by TCP when/if CONFIG_TLS_DEVICE
is enabled from tcp_ack().

Rename it to tcp_clean_acked, move it to tcp_sock structure
in the tcp_sock_read_rx for better cache locality in TCP
fast path.

Define this field only when CONFIG_TLS_DEVICE is enabled
saving 8 bytes on configs not using it.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarNeal Cardwell <ncardwell@google.com>
Reviewed-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250317085313.2023214-1-edumazet@google.com


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

Documentation/networking/net_cachelines/tcp_sock.rst

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ u32 dsack_dups 
u32                           snd_una                 read_mostly         read_write          tcp_wnd_end,tcp_urg_mode,tcp_minshall_check,tcp_cwnd_validate(tx);tcp_ack,tcp_may_update_window,tcp_clean_rtx_queue(write),tcp_ack_tstamp(rx)

u32                           snd_sml                 read_write                              tcp_minshall_check,tcp_minshall_update

u32                           rcv_tstamp                                  read_mostly         tcp_ack

void *                        tcp_clean_acked                             read_mostly         tcp_ack

u32                           lsndtime                read_write                              tcp_slow_start_after_idle_check,tcp_event_data_sent

u32                           last_oow_ack_time

u32                           compressed_ack_rcv_nxt

include/linux/tcp.h

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ struct tcp_sock { 
	struct  minmax rtt_min;

	/* OOO segments go in this rbtree. Socket lock must be held. */

	struct rb_root	out_of_order_queue;

#if defined(CONFIG_TLS_DEVICE)

	void (*tcp_clean_acked)(struct sock *sk, u32 acked_seq);

#endif

	u32	snd_ssthresh;	/* Slow start size threshold		*/

	u8	recvmsg_inq : 1;/* Indicate # of bytes in queue upon recvmsg */

	__cacheline_group_end(tcp_sock_read_rx);

include/net/inet_connection_sock.h

+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ struct inet_connection_sock_af_ops { 
 * @icsk_af_ops		   Operations which are AF_INET{4,6} specific

 * @icsk_ulp_ops	   Pluggable ULP control hook

 * @icsk_ulp_data	   ULP private data

 * @icsk_clean_acked	   Clean acked data hook

 * @icsk_ca_state:	   Congestion control state

 * @icsk_retransmits:	   Number of unrecovered [RTO] timeouts

 * @icsk_pending:	   Scheduled timer event
@@ -97,7 +96,6 @@ struct inet_connection_sock { 
	const struct inet_connection_sock_af_ops *icsk_af_ops;

	const struct tcp_ulp_ops  *icsk_ulp_ops;

	void __rcu		  *icsk_ulp_data;

	void (*icsk_clean_acked)(struct sock *sk, u32 acked_seq);

	unsigned int		  (*icsk_sync_mss)(struct sock *sk, u32 pmtu);

	__u8			  icsk_ca_state:5,

				  icsk_ca_initialized:1,

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -2815,9 +2815,9 @@ extern struct static_key_false tcp_have_smc; 
#endif



#if IS_ENABLED(CONFIG_TLS_DEVICE)

void clean_acked_data_enable(struct inet_connection_sock *icsk,

void clean_acked_data_enable(struct tcp_sock *tp,

			     void (*cad)(struct sock *sk, u32 ack_seq));

void clean_acked_data_disable(struct inet_connection_sock *icsk);

void clean_acked_data_disable(struct tcp_sock *tp);

void clean_acked_data_flush(void);

#endif

net/ipv4/tcp.c

+5 −0
Original line number Diff line number Diff line
@@ -5026,7 +5026,12 @@ static void __init tcp_struct_check(void) 
	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, rtt_min);

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, out_of_order_queue);

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, snd_ssthresh);

#if IS_ENABLED(CONFIG_TLS_DEVICE)

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, tcp_clean_acked);

	CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_read_rx, 77);

#else

	CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_read_rx, 69);

#endif



	/* TX read-write hotpath cache lines */

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, segs_out);