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

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

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: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 679972f3

include/linux/netfilter/x_tables.h

+1 −5
Original line number Diff line number Diff line
@@ -430,11 +430,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)

net/ipv4/netfilter/arp_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -439,7 +439,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;

}
@@ -519,7 +519,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

net/ipv4/netfilter/ip_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -582,7 +582,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;

}
@@ -670,7 +670,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

net/ipv6/netfilter/ip6_tables.c

+2 −3
Original line number Diff line number Diff line
@@ -612,7 +612,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;

}
@@ -699,8 +699,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

net/netfilter/x_tables.c

+9 −0
Original line number Diff line number Diff line
@@ -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;