Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

netfilter: reduce hook array sizes to what is needed 



Not all families share the same hook count, adjust sizes to what is
needed.

struct net before:
/* size: 6592, cachelines: 103, members: 46 */
after:
/* size: 5952, cachelines: 93, members: 46 */

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e58f33cc

include/net/netns/netfilter.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -17,11 +17,11 @@ struct netns_nf { 
#ifdef CONFIG_SYSCTL

#ifdef CONFIG_SYSCTL

	struct ctl_table_header *nf_log_dir_header;

	struct ctl_table_header *nf_log_dir_header;

#endif

#endif

	struct nf_hook_entries __rcu *hooks_ipv4[NF_MAX_HOOKS];

	struct nf_hook_entries __rcu *hooks_ipv4[NF_INET_NUMHOOKS];

	struct nf_hook_entries __rcu *hooks_ipv6[NF_MAX_HOOKS];

	struct nf_hook_entries __rcu *hooks_ipv6[NF_INET_NUMHOOKS];

	struct nf_hook_entries __rcu *hooks_arp[NF_MAX_HOOKS];

	struct nf_hook_entries __rcu *hooks_arp[NF_ARP_NUMHOOKS];

	struct nf_hook_entries __rcu *hooks_bridge[NF_MAX_HOOKS];

	struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS];

	struct nf_hook_entries __rcu *hooks_decnet[NF_MAX_HOOKS];

	struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];

#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)

#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)

	bool			defrag_ipv4;

	bool			defrag_ipv4;

#endif

#endif

net/netfilter/core.c

+17 −7
Original line number Original line Diff line number Diff line
@@ -268,14 +268,24 @@ static struct nf_hook_entries __rcu **nf_hook_entry_head(struct net *net, const 
	case NFPROTO_NETDEV:

	case NFPROTO_NETDEV:

		break;

		break;

	case NFPROTO_ARP:

	case NFPROTO_ARP:

		if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_arp) <= reg->hooknum))

			return NULL;

		return net->nf.hooks_arp + reg->hooknum;

		return net->nf.hooks_arp + reg->hooknum;

	case NFPROTO_BRIDGE:

	case NFPROTO_BRIDGE:

		if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_bridge) <= reg->hooknum))

			return NULL;

		return net->nf.hooks_bridge + reg->hooknum;

		return net->nf.hooks_bridge + reg->hooknum;

	case NFPROTO_IPV4:

	case NFPROTO_IPV4:

		if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv4) <= reg->hooknum))

			return NULL;

		return net->nf.hooks_ipv4 + reg->hooknum;

		return net->nf.hooks_ipv4 + reg->hooknum;

	case NFPROTO_IPV6:

	case NFPROTO_IPV6:

		if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv6) <= reg->hooknum))

			return NULL;

		return net->nf.hooks_ipv6 + reg->hooknum;

		return net->nf.hooks_ipv6 + reg->hooknum;

	case NFPROTO_DECNET:

	case NFPROTO_DECNET:

		if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_decnet) <= reg->hooknum))

			return NULL;

		return net->nf.hooks_decnet + reg->hooknum;

		return net->nf.hooks_decnet + reg->hooknum;

	default:

	default:

		WARN_ON_ONCE(1);

		WARN_ON_ONCE(1);
@@ -549,21 +559,21 @@ void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *); 
EXPORT_SYMBOL(nf_nat_decode_session_hook);

EXPORT_SYMBOL(nf_nat_decode_session_hook);

#endif

#endif





static void __net_init __netfilter_net_init(struct nf_hook_entries *e[NF_MAX_HOOKS])

static void __net_init __netfilter_net_init(struct nf_hook_entries **e, int max)

{

{

	int h;

	int h;





	for (h = 0; h < NF_MAX_HOOKS; h++)

	for (h = 0; h < max; h++)

		RCU_INIT_POINTER(e[h], NULL);

		RCU_INIT_POINTER(e[h], NULL);

}

}





static int __net_init netfilter_net_init(struct net *net)

static int __net_init netfilter_net_init(struct net *net)

{

{

	__netfilter_net_init(net->nf.hooks_ipv4);

	__netfilter_net_init(net->nf.hooks_ipv4, ARRAY_SIZE(net->nf.hooks_ipv4));

	__netfilter_net_init(net->nf.hooks_ipv6);

	__netfilter_net_init(net->nf.hooks_ipv6, ARRAY_SIZE(net->nf.hooks_ipv6));

	__netfilter_net_init(net->nf.hooks_arp);

	__netfilter_net_init(net->nf.hooks_arp, ARRAY_SIZE(net->nf.hooks_arp));

	__netfilter_net_init(net->nf.hooks_bridge);

	__netfilter_net_init(net->nf.hooks_bridge, ARRAY_SIZE(net->nf.hooks_bridge));

	__netfilter_net_init(net->nf.hooks_decnet);

	__netfilter_net_init(net->nf.hooks_decnet, ARRAY_SIZE(net->nf.hooks_decnet));





#ifdef CONFIG_PROC_FS

#ifdef CONFIG_PROC_FS

	net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",

	net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",