Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tcp: tcp_moderate_rcvbuf is only used in rx path

sysctl_tcp_moderate_rcvbuf is only used from tcp_rcvbuf_grow().

Move it to netns_ipv4_read_rx group.

Remove various CACHELINE_ASSERT_GROUP_SIZE() from netns_ipv4_struct_check(),
as they have no real benefit but cause pain for all changes.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20251119084813.3684576-2-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Eric Dumazet and committed by
Jakub Kicinski
6d5dea68 738cd803

+4 -9
+1 -1
Documentation/networking/net_cachelines/netns_ipv4_sysctl.rst
··· 102 102 u8 sysctl_tcp_frto tcp_enter_loss 103 103 u8 sysctl_tcp_nometrics_save TCP_LAST_ACK/tcp_update_metrics 104 104 u8 sysctl_tcp_no_ssthresh_metrics_save TCP_LAST_ACK/tcp_(update/init)_metrics 105 - u8 sysctl_tcp_moderate_rcvbuf read_mostly read_mostly tcp_tso_should_defer(tx);tcp_rcv_space_adjust(rx) 105 + u8 sysctl_tcp_moderate_rcvbuf read_mostly tcp_rcvbuf_grow() 106 106 u8 sysctl_tcp_tso_win_divisor read_mostly tcp_tso_should_defer(tcp_write_xmit) 107 107 u8 sysctl_tcp_workaround_signed_windows tcp_select_window 108 108 int sysctl_tcp_limit_output_bytes read_mostly tcp_small_queue_check(tcp_write_xmit)
+1 -1
include/net/netns/ipv4.h
··· 74 74 75 75 /* TXRX readonly hotpath cache lines */ 76 76 __cacheline_group_begin(netns_ipv4_read_txrx); 77 - u8 sysctl_tcp_moderate_rcvbuf; 78 77 __cacheline_group_end(netns_ipv4_read_txrx); 79 78 80 79 /* RX readonly hotpath cache line */ 81 80 __cacheline_group_begin(netns_ipv4_read_rx); 81 + u8 sysctl_tcp_moderate_rcvbuf; 82 82 u8 sysctl_ip_early_demux; 83 83 u8 sysctl_tcp_early_demux; 84 84 u8 sysctl_tcp_l3mdev_accept;
+2 -7
net/core/net_namespace.c
··· 1223 1223 sysctl_tcp_wmem); 1224 1224 CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_tx, 1225 1225 sysctl_ip_fwd_use_pmtu); 1226 - CACHELINE_ASSERT_GROUP_SIZE(struct netns_ipv4, netns_ipv4_read_tx, 33); 1227 - 1228 - /* TXRX readonly hotpath cache lines */ 1229 - CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_txrx, 1230 - sysctl_tcp_moderate_rcvbuf); 1231 - CACHELINE_ASSERT_GROUP_SIZE(struct netns_ipv4, netns_ipv4_read_txrx, 1); 1232 1226 1233 1227 /* RX readonly hotpath cache line */ 1228 + CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx, 1229 + sysctl_tcp_moderate_rcvbuf); 1234 1230 CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx, 1235 1231 sysctl_ip_early_demux); 1236 1232 CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx, ··· 1237 1241 sysctl_tcp_reordering); 1238 1242 CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx, 1239 1243 sysctl_tcp_rmem); 1240 - CACHELINE_ASSERT_GROUP_SIZE(struct netns_ipv4, netns_ipv4_read_rx, 22); 1241 1244 } 1242 1245 #endif 1243 1246