p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Florian Westphal 2016-11-22 14:44:17 +01:00 committed by Pablo Neira Ayuso
parent 679972f3be
commit 4d31eef517
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

9
net/netfilter/x_tables.c
View File

@ -1615,6 +1615,15 @@ void xt_proto_fini(struct net *net, u_int8_t af)
} }
EXPORT_SYMBOL_GPL(xt_proto_fini); 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) static int __net_init xt_net_init(struct net *net)
{ {
int i; int i;