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

tcp: move tcp_clean_acked to tcp_sock_read_tx group 



tp->tcp_clean_acked is fetched in tx path when snd_una is updated.

This field thus belongs to tcp_sock_read_tx group.

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


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

include/linux/tcp.h

+3 −3
Original line number Diff line number Diff line
@@ -215,6 +215,9 @@ struct tcp_sock { 
	u16	gso_segs;	/* Max number of segs per GSO packet	*/

	/* from STCP, retrans queue hinting */

	struct sk_buff *retransmit_skb_hint;

#if defined(CONFIG_TLS_DEVICE)

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

#endif

	__cacheline_group_end(tcp_sock_read_tx);



	/* TXRX read-mostly hotpath cache lines */
@@ -250,9 +253,6 @@ 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

	__cacheline_group_end(tcp_sock_read_rx);



	/* TX read-write hotpath cache lines */

net/ipv4/tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -5101,6 +5101,9 @@ static void __init tcp_struct_check(void) 
	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, notsent_lowat);

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, gso_segs);

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, retransmit_skb_hint);

#if IS_ENABLED(CONFIG_TLS_DEVICE)

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_tx, tcp_clean_acked);

#endif



	/* TXRX read-mostly hotpath cache lines */

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, tsoffset);
@@ -5124,9 +5127,6 @@ 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);

#endif



	/* TX read-write hotpath cache lines */

	CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_write_tx, segs_out);

Documentation/networking/net_cachelines/tcp_sock.rst

+1 −1

File changed.

Contains only whitespace changes.