From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric W. Biederman" Subject: [PATCH net-next 43/43] netfilter: Skip unnecessary calls to synchronize_net Date: Wed, 17 Jun 2015 10:28:52 -0500 Message-ID: <1434554932-4552-43-git-send-email-ebiederm@xmission.com> References: <87r3pae5hn.fsf@x220.int.ebiederm.org> Cc: , netfilter-devel@vger.kernel.org, Stephen Hemminger , Juanjo Ciarlante , Wensong Zhang , Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , Jamal Hadi Salim , Steffen Klassert , Herbert Xu To: David Miller Return-path: Received: from out03.mta.xmission.com ([166.70.13.233]:39986 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757408AbbFQPic (ORCPT ); Wed, 17 Jun 2015 11:38:32 -0400 In-Reply-To: <87r3pae5hn.fsf@x220.int.ebiederm.org> Sender: netfilter-devel-owner@vger.kernel.org List-ID: From: Eric W Biederman Signed-off-by: "Eric W. Biederman" --- net/netfilter/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 95456c09cf69..1b4eadc9c030 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -134,7 +134,9 @@ void nf_unregister_hook(struct net *net, const struct nf_hook_ops *reg) #ifdef HAVE_JUMP_LABEL static_key_slow_dec(&nf_hooks_needed[reg->pf][reg->hooknum]); #endif - synchronize_net(); + /* Don't wait if there are no packets in flight */ + if (net->loopback_dev) + synchronize_net(); kfree(elem); } EXPORT_SYMBOL(nf_unregister_hook); -- 2.2.1