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

net: move sk_dst_pending_confirm and sk_pacing_status to sock_read_tx group 



These two fields are mostly read in TCP tx path, move them
in an more appropriate group for better cache locality.

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


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

include/net/sock.h

+2 −2
Original line number Diff line number Diff line
@@ -481,8 +481,6 @@ struct sock { 
		struct rb_root	tcp_rtx_queue;

	};

	struct sk_buff_head	sk_write_queue;

	u32			sk_dst_pending_confirm;

	u32			sk_pacing_status; /* see enum sk_pacing */

	struct page_frag	sk_frag;

	struct timer_list	sk_timer;
@@ -493,6 +491,8 @@ struct sock { 
	__cacheline_group_end(sock_write_tx);



	__cacheline_group_begin(sock_read_tx);

	u32			sk_dst_pending_confirm;

	u32			sk_pacing_status; /* see enum sk_pacing */

	unsigned long		sk_max_pacing_rate;

	long			sk_sndtimeo;

	u32			sk_priority;

net/core/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -4519,14 +4519,14 @@ static int __init sock_struct_check(void) 
	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_send_head);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_write_queue);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_write_pending);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_dst_pending_confirm);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_pacing_status);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_frag);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_timer);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_pacing_rate);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_zckey);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_tx, sk_tskey);



	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_dst_pending_confirm);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_pacing_status);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_max_pacing_rate);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_sndtimeo);

	CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_tx, sk_priority);