From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nf-next 1/3] netfilter: reduce hook array sizes to what is needed
Date: Thu, 7 Dec 2017 14:14:30 +0100 [thread overview]
Message-ID: <20171207131430.GA24920@salvia> (raw)
In-Reply-To: <20171207130620.7585-2-fw@strlen.de>
On Thu, Dec 07, 2017 at 02:06:18PM +0100, Florian Westphal wrote:
> Not all families share the same hook count.
>
> Can't use the corresponding ARP, BRIDGE, DECNET defines because they are
> defined in uapi headers and including them causes build failures.
>
> struct net before:
> /* size: 6592, cachelines: 103, members: 46 */
> after:
> /* size: 5952, cachelines: 93, members: 46 */
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> include/net/netns/netfilter.h | 13 ++++++++-----
> net/netfilter/core.c | 10 ++++++++++
> 2 files changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/include/net/netns/netfilter.h b/include/net/netns/netfilter.h
> index b39c563c2fce..46842a1f77fb 100644
> --- a/include/net/netns/netfilter.h
> +++ b/include/net/netns/netfilter.h
> @@ -17,11 +17,14 @@ struct netns_nf {
> #ifdef CONFIG_SYSCTL
> struct ctl_table_header *nf_log_dir_header;
> #endif
> - struct nf_hook_entries __rcu *hooks_ipv4[NF_MAX_HOOKS];
> - struct nf_hook_entries __rcu *hooks_ipv6[NF_MAX_HOOKS];
> - struct nf_hook_entries __rcu *hooks_arp[NF_MAX_HOOKS];
> - struct nf_hook_entries __rcu *hooks_bridge[NF_MAX_HOOKS];
> - struct nf_hook_entries __rcu *hooks_decnet[NF_MAX_HOOKS];
> + struct nf_hook_entries __rcu *hooks_ipv4[NF_INET_NUMHOOKS];
> + struct nf_hook_entries __rcu *hooks_ipv6[NF_INET_NUMHOOKS];
> + /* in/out/forward only */
> + struct nf_hook_entries __rcu *hooks_arp[3];
> + /* note: 'BROUTE' isn't a real hook (called via function pointer) */
> + struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS];
> + /* also supports a 'HELLO' and 'ROUTE' type */
> + struct nf_hook_entries __rcu *hooks_decnet[NF_INET_NUMHOOKS + 2];
Just a suggestion, for a follow up patch: Get rid of magic numbers and
add some NF_ARP_NUMHOOKS and NF_DECNET_NUMHOOKS too, so similar
definition.
Make sense to you?
next prev parent reply other threads:[~2017-12-07 13:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 13:06 [PATCH nf-next 0/3] netfilter: reduce hook array sizes to what is needed Florian Westphal
2017-12-07 13:06 ` [PATCH nf-next 1/3] " Florian Westphal
2017-12-07 13:14 ` Pablo Neira Ayuso [this message]
2017-12-07 13:24 ` Florian Westphal
2017-12-07 13:06 ` [PATCH nf-next 2/3] netfilter: don't allocate space for decnet hooks unless needed Florian Westphal
2017-12-07 13:06 ` [PATCH nf-next 3/3] netfilter: don't allocate space for arp/bridge " Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171207131430.GA24920@salvia \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).