diff options
author | Florian Westphal <fw@strlen.de> | 2016-11-22 14:44:17 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-06 21:42:17 +0100 |
commit | 4d31eef5176df06f218201bc9c0ce40babb41660 (patch) | |
tree | eaf55a61ced414ba986204d40fa3e8edf8e306c8 /net/netfilter | |
parent | 679972f3bef8df7aa04cc99b46f71392ebf0b5f8 (diff) | |
download | linux-4d31eef5176df06f218201bc9c0ce40babb41660.tar.gz linux-4d31eef5176df06f218201bc9c0ce40babb41660.tar.bz2 linux-4d31eef5176df06f218201bc9c0ce40babb41660.zip |
netfilter: x_tables: pass xt_counters struct instead of packet counter
On SMP we overload the packet counter (unsigned long) to contain
percpu offset. Hide this from callers and pass xt_counters address
instead.
Preparation patch to allocate the percpu counters in page-sized batch
chunks.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/x_tables.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index ad818e52859b..0580029eb0ee 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -1615,6 +1615,15 @@ void xt_proto_fini(struct net *net, u_int8_t af) } EXPORT_SYMBOL_GPL(xt_proto_fini); +void xt_percpu_counter_free(struct xt_counters *counters) +{ + unsigned long pcnt = counters->pcnt; + + if (nr_cpu_ids > 1) + free_percpu((void __percpu *)pcnt); +} +EXPORT_SYMBOL_GPL(xt_percpu_counter_free); + static int __net_init xt_net_init(struct net *net) { int i; |