Commit db3685b4 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

net: remove obsolete members from struct net 



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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1379940b

include/net/net_namespace.h

+0 −9
Original line number Diff line number Diff line
@@ -142,15 +142,6 @@ struct net { 
#if defined(CONFIG_NF_TABLES) || defined(CONFIG_NF_TABLES_MODULE)

	struct netns_nftables	nft;

#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

#ifdef CONFIG_WEXT_CORE

	struct sk_buff_head	wext_nlevents;

include/net/netns/conntrack.h

+0 −4
Original line number Diff line number Diff line
@@ -96,13 +96,9 @@ struct netns_ct { 
	atomic_t		count;

	unsigned int		expect_count;

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	struct delayed_work ecache_dwork;

	bool ecache_dwork_pending;

#endif

	bool			auto_assign_helper_warned;

#ifdef CONFIG_SYSCTL

	struct ctl_table_header	*sysctl_header;

#endif

	unsigned int		sysctl_log_invalid; /* Log invalid packets */

	int			sysctl_events;

	int			sysctl_acct;

include/net/netns/netfilter.h

+0 −6
Original line number Diff line number Diff line
@@ -28,11 +28,5 @@ struct netns_nf { 
#if IS_ENABLED(CONFIG_DECNET)

	struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];

#endif

#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)

	bool			defrag_ipv4;

#endif

#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)

	bool			defrag_ipv6;

#endif

};

#endif

include/net/netns/nftables.h

+0 −7
Original line number Diff line number Diff line
@@ -5,14 +5,7 @@ 
#include <linux/list.h>



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			validate_state;

};



#endif

include/net/netns/x_tables.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
struct ebt_table;



struct netns_xt {

	struct list_head tables[NFPROTO_NUMPROTO];

	bool notrack_deprecated_warning;

	bool clusterip_deprecated_warning;

#if defined(CONFIG_BRIDGE_NF_EBTABLES) || \