tcp: move tp->scaling_ratio to tcp_sock_read_txrx group

tp->scaling_ratio is a read mostly field, used in rx and tx fast paths. Fixes: d5fed5a ("tcp: reorganize tcp_sock fast path variables") Signed-off-by: Eric Dumazet <[email protected]> Cc: Coco Li <[email protected]> Cc: Wei Wang <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
torvalds · Feb 12, 2024 · 119ff04 · 119ff04
1 parent 78e563f
commit 119ff04
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Documentation/networking/net_cachelines/tcp_sock.rst b/Documentation/networking/net_cachelines/tcp_sock.rst
@@ -38,7 +38,7 @@ u32 max_window read_mostly -
 u32 mss_cache read_mostly read_mostly tcp_rate_check_app_limited,tcp_current_mss,tcp_sync_mss,tcp_sndbuf_expand,tcp_tso_should_defer(tx);tcp_update_pacing_rate,tcp_clean_rtx_queue(rx)
 u32 window_clamp read_mostly read_write tcp_rcv_space_adjust,__tcp_select_window
 u32 rcv_ssthresh read_mostly - __tcp_select_window
-u82 scaling_ratio  
+u8  scaling_ratio read_mostly read_mostly tcp_win_from_space
 struct tcp_rack 
 u16 advmss - read_mostly tcp_rcv_space_adjust
 u8 compressed_ack 

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
@@ -221,6 +221,7 @@ struct tcp_sock {
  u32 lost_out; /* Lost packets */
  u32 sacked_out; /* SACK'd packets */
  u16 tcp_header_len; /* Bytes of tcp header to send */
+ u8 scaling_ratio; /* see tcp_win_from_space() */
  u8 chrono_type : 2, /* current chronograph type */
  repair : 1,
  is_sack_reneg:1, /* in recovery from loss with SACK reneg? */
@@ -352,7 +353,6 @@ struct tcp_sock {
  u32 compressed_ack_rcv_nxt;
  struct list_head tsq_node; /* anchor in tsq_tasklet.head list */
 
- u8 scaling_ratio; /* see tcp_win_from_space() */
  /* Information of the most recently (s)acked skb */
  struct tcp_rack {
  u64 mstamp; /* (Re)sent time of the skb */

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
@@ -4615,7 +4615,8 @@ static void __init tcp_struct_check(void)
  CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, prr_out);
  CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, lost_out);
  CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, sacked_out);
- CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_read_txrx, 31);
+ CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, scaling_ratio);
+ CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_read_txrx, 32);
 
  /* RX read-mostly hotpath cache lines */
  CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, copied_seq);