shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: x_tables: pass xt_counters struct instead of packet counter

Browse Source 
commit 4d31eef517 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Florian Westphal
2016-11-22 14:44:17 +01:00
committed by Greg Kroah-Hartman
parent 60962e98c3
commit 61346e20c0
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netfilter/x_tables.h
View File

@@ -402,11 +402,7 @@ static inline unsigned long xt_percpu_counter_alloc(void)
return 0;
}
static inline void xt_percpu_counter_free(u64 pcnt)
{
if (nr_cpu_ids > 1)
free_percpu((void __percpu *) (unsigned long) pcnt);
}
void xt_percpu_counter_free(struct xt_counters *cnt);
static inline struct xt_counters *
xt_get_this_cpu_counter(struct xt_counters *cnt)

4
net/ipv4/netfilter/arp_tables.c
View File

@@ -447,7 +447,7 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size)
err:
module_put(t->u.kernel.target->me);
out:
xt_percpu_counter_free(e->counters.pcnt);
xt_percpu_counter_free(&e->counters);
return ret;
}
@@ -527,7 +527,7 @@ static inline void cleanup_entry(struct arpt_entry *e)
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
xt_percpu_counter_free(e->counters.pcnt);
xt_percpu_counter_free(&e->counters);
}
/* Checks and translates the user-supplied table segment (held in

4
net/ipv4/netfilter/ip_tables.c
View File

@@ -591,7 +591,7 @@ find_check_entry(struct ipt_entry *e, struct net *net, const char *name,
cleanup_match(ematch, net);
}
xt_percpu_counter_free(e->counters.pcnt);
xt_percpu_counter_free(&e->counters);
return ret;
}
@@ -679,7 +679,7 @@ cleanup_entry(struct ipt_entry *e, struct net *net)
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
xt_percpu_counter_free(e->counters.pcnt);
xt_percpu_counter_free(&e->counters);
}
/* Checks and translates the user-supplied table segment (held in

5
net/ipv6/netfilter/ip6_tables.c
View File

@@ -620,7 +620,7 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name,
cleanup_match(ematch, net);
}
xt_percpu_counter_free(e->counters.pcnt);
xt_percpu_counter_free(&e->counters);
return ret;
}
@@ -707,8 +707,7 @@ static void cleanup_entry(struct ip6t_entry *e, struct net *net)
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
xt_percpu_counter_free(e->counters.pcnt);
xt_percpu_counter_free(&e->counters);
}
/* Checks and translates the user-supplied table segment (held in

9
net/netfilter/x_tables.c
View File

@@ -1619,6 +1619,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;