niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: remove obsolete members from struct net

Browse source 
all have been moved to generic_net infra. On x86_64, this reduces
struct net size from 70 to 63 cache lines (4480 to 4032 byte).

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2021-04-01 16:11:14 +02:00 • committed by Pablo Neira Ayuso
parent 1379940bf8
commit db3685b404
5 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/net/net_namespace.h
View file

@ -142,15 +142,6 @@ struct net {
#if defined(CONFIG_NF_TABLES) || defined(CONFIG_NF_TABLES_MODULE) #if defined(CONFIG_NF_TABLES) || defined(CONFIG_NF_TABLES_MODULE)
struct netns_nftables nft; struct netns_nftables nft;
#endif #endif
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
struct netns_nf_frag nf_frag;
struct ctl_table_header *nf_frag_frags_hdr;
#endif
struct sock *nfnl;
struct sock *nfnl_stash;
#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
struct list_head nfct_timeout_list;
#endif
#endif #endif
#ifdef CONFIG_WEXT_CORE #ifdef CONFIG_WEXT_CORE
struct sk_buff_head wext_nlevents; struct sk_buff_head wext_nlevents;

4
include/net/netns/conntrack.h
View file

@ -96,13 +96,9 @@ struct netns_ct {
atomic_t count; atomic_t count;
unsigned int expect_count; unsigned int expect_count;
#ifdef CONFIG_NF_CONNTRACK_EVENTS #ifdef CONFIG_NF_CONNTRACK_EVENTS
struct delayed_work ecache_dwork;
bool ecache_dwork_pending; bool ecache_dwork_pending;
#endif #endif
bool auto_assign_helper_warned; bool auto_assign_helper_warned;
#ifdef CONFIG_SYSCTL
struct ctl_table_header *sysctl_header;
#endif
unsigned int sysctl_log_invalid; /* Log invalid packets */ unsigned int sysctl_log_invalid; /* Log invalid packets */
int sysctl_events; int sysctl_events;
int sysctl_acct; int sysctl_acct;

6
include/net/netns/netfilter.h
View file

@ -28,11 +28,5 @@ struct netns_nf {
#if IS_ENABLED(CONFIG_DECNET) #if IS_ENABLED(CONFIG_DECNET)
struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS]; struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];
#endif #endif
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)
bool defrag_ipv4;
#endif
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
bool defrag_ipv6;
#endif
}; };
#endif #endif

7
include/net/netns/nftables.h
View file

@ -5,14 +5,7 @@
#include <linux/list.h> #include <linux/list.h>
struct netns_nftables { struct netns_nftables {
struct list_head tables;
struct list_head commit_list;
struct list_head module_list;
struct list_head notify_list;
struct mutex commit_mutex;
unsigned int base_seq;
u8 gencursor; u8 gencursor;
u8 validate_state;
}; };
#endif #endif

1
include/net/netns/x_tables.h
View file

@ -8,7 +8,6 @@
struct ebt_table; struct ebt_table;
struct netns_xt { struct netns_xt {
struct list_head tables[NFPROTO_NUMPROTO];
bool notrack_deprecated_warning; bool notrack_deprecated_warning;
bool clusterip_deprecated_warning; bool clusterip_deprecated_warning;
#if defined(CONFIG_BRIDGE_NF_EBTABLES) || \ #if defined(CONFIG_BRIDGE_NF_EBTABLES) || \