* [PATCH net-next] netfilter: nf_conntrack.h: use this_cpu_inc()
@ 2012-04-18 4:36 Eric Dumazet
2012-04-18 13:44 ` Christoph Lameter
2012-04-19 18:16 ` Pablo Neira Ayuso
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2012-04-18 4:36 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: linux-kernel, netdev, Christoph Lameter, Tejun Heo,
Patrick McHardy
From: Eric Dumazet <edumazet@google.com>
this_cpu_inc() is IRQ safe and faster than
local_bh_disable()/__this_cpu_inc()/local_bh_enable(), at least on x86.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Christoph Lameter <cl@linux.com>
Cc: Tejun Heo <tj@kernel.org>
---
include/net/netfilter/nf_conntrack.h | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index ab86036..cce7f6a 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -321,14 +321,8 @@ extern unsigned int nf_conntrack_max;
extern unsigned int nf_conntrack_hash_rnd;
void init_nf_conntrack_hash_rnd(void);
-#define NF_CT_STAT_INC(net, count) \
- __this_cpu_inc((net)->ct.stat->count)
-#define NF_CT_STAT_INC_ATOMIC(net, count) \
-do { \
- local_bh_disable(); \
- __this_cpu_inc((net)->ct.stat->count); \
- local_bh_enable(); \
-} while (0)
+#define NF_CT_STAT_INC(net, count) __this_cpu_inc((net)->ct.stat->count)
+#define NF_CT_STAT_INC_ATOMIC(net, count) this_cpu_inc((net)->ct.stat->count)
#define MODULE_ALIAS_NFCT_HELPER(helper) \
MODULE_ALIAS("nfct-helper-" helper)
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] netfilter: nf_conntrack.h: use this_cpu_inc()
2012-04-18 4:36 [PATCH net-next] netfilter: nf_conntrack.h: use this_cpu_inc() Eric Dumazet
@ 2012-04-18 13:44 ` Christoph Lameter
2012-04-19 18:16 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Lameter @ 2012-04-18 13:44 UTC (permalink / raw)
To: Eric Dumazet
Cc: Pablo Neira Ayuso, linux-kernel, netdev, Tejun Heo,
Patrick McHardy
Ok.
Reviewed-by: Christoph Lameter <cl@linux.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] netfilter: nf_conntrack.h: use this_cpu_inc()
2012-04-18 4:36 [PATCH net-next] netfilter: nf_conntrack.h: use this_cpu_inc() Eric Dumazet
2012-04-18 13:44 ` Christoph Lameter
@ 2012-04-19 18:16 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2012-04-19 18:16 UTC (permalink / raw)
To: Eric Dumazet
Cc: linux-kernel, netdev, Christoph Lameter, Tejun Heo,
Patrick McHardy, Netfilter Development Mailing list
On Wed, Apr 18, 2012 at 06:36:40AM +0200, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> this_cpu_inc() is IRQ safe and faster than
> local_bh_disable()/__this_cpu_inc()/local_bh_enable(), at least on x86.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Patrick McHardy <kaber@trash.net>
> Cc: Christoph Lameter <cl@linux.com>
> Cc: Tejun Heo <tj@kernel.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-19 18:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-18 4:36 [PATCH net-next] netfilter: nf_conntrack.h: use this_cpu_inc() Eric Dumazet
2012-04-18 13:44 ` Christoph Lameter
2012-04-19 18:16 ` Pablo Neira Ayuso
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).