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

tcp: move sysctl_tcp_l3mdev_accept to netns_ipv4_read_rx 



sysctl_tcp_l3mdev_accept is read from TCP receive fast path from
tcp_v6_early_demux(),
 __inet6_lookup_established,
  inet_request_bound_dev_if().

Move it to netns_ipv4_read_rx.

Remove the '#ifdef CONFIG_NET_L3_MASTER_DEV' that was guarding
its definition.

Note this adds a hole of three bytes that could be filled later.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Cc: Wei Wang <weiwan@google.com>
Cc: Coco Li <lixiaoyan@google.com>
Link: https://patch.msgid.link/20241010034100.320832-1-edumazet@google.com


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

Documentation/networking/net_cachelines/netns_ipv4_sysctl.rst

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ u8 sysctl_udp_early_demux 
u8                              sysctl_nexthop_compat_mode

u8                              sysctl_fwmark_reflect

u8                              sysctl_tcp_fwmark_accept

u8                              sysctl_tcp_l3mdev_accept

u8                              sysctl_tcp_l3mdev_accept                                         read_mostly         __inet6_lookup_established/inet_request_bound_dev_if

u8                              sysctl_tcp_mtu_probing

int                             sysctl_tcp_mtu_probe_floor

int                             sysctl_tcp_base_mss

include/net/netns/ipv4.h

+2 −3
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ struct netns_ipv4 { 
	__cacheline_group_begin(netns_ipv4_read_rx);

	u8 sysctl_ip_early_demux;

	u8 sysctl_tcp_early_demux;

	u8 sysctl_tcp_l3mdev_accept;

	/* 3 bytes hole, try to pack */

	int sysctl_tcp_reordering;

	int sysctl_tcp_rmem[3];

	__cacheline_group_end(netns_ipv4_read_rx);
@@ -151,9 +153,6 @@ struct netns_ipv4 { 


	u8 sysctl_fwmark_reflect;

	u8 sysctl_tcp_fwmark_accept;

#ifdef CONFIG_NET_L3_MASTER_DEV

	u8 sysctl_tcp_l3mdev_accept;

#endif

	u8 sysctl_tcp_mtu_probing;

	int sysctl_tcp_mtu_probe_floor;

	int sysctl_tcp_base_mss;

net/core/net_namespace.c

+3 −1
Original line number Diff line number Diff line
@@ -1159,11 +1159,13 @@ static void __init netns_ipv4_struct_check(void) 
				      sysctl_ip_early_demux);

	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,

				      sysctl_tcp_early_demux);

	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,

				      sysctl_tcp_l3mdev_accept);

	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,

				      sysctl_tcp_reordering);

	CACHELINE_ASSERT_GROUP_MEMBER(struct netns_ipv4, netns_ipv4_read_rx,

				      sysctl_tcp_rmem);

	CACHELINE_ASSERT_GROUP_SIZE(struct netns_ipv4, netns_ipv4_read_rx, 18);

	CACHELINE_ASSERT_GROUP_SIZE(struct netns_ipv4, netns_ipv4_read_rx, 22);

}

#endif