From patchwork Sat Jul 2 10:59:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 643457 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rhVg2717Sz9s9d for ; Sat, 2 Jul 2016 21:00:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=S5T4qzU7; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751212AbcGBLAN (ORCPT ); Sat, 2 Jul 2016 07:00:13 -0400 Received: from m12-16.163.com ([220.181.12.16]:58710 "EHLO m12-16.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751161AbcGBLAJ (ORCPT ); Sat, 2 Jul 2016 07:00:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=54WoZdw6FzAZorZZc1 ibSzJ4I96I1bR+yRUwad9qmYY=; b=S5T4qzU7CMgvZPDCluwJlF7hLIOGf3RrnI lyGap20DoK6KK2onXL7CMpU4KXA0BeQk52TDCemIB+1FDLzT1tsucNEBW+fUUG0L wr+Xeu2jD7fEXQKm8vnIRZd0x8+LupCy4PCYZpIYrhSJUQT1pCiK3wiNrtkml2HR RGyZH/S7s= Received: from MiWiFi-R2D-srv.localdomain (unknown [180.170.252.41]) by smtp12 (Coremail) with SMTP id EMCowABXmaWnnndXXtNsAg--.15306S5; Sat, 02 Jul 2016 19:00:04 +0800 (CST) From: Liping Zhang To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Liping Zhang Subject: [PATCH nf 3/3] netfilter: nf_ct_helper: unlink helper again when hash resize happen Date: Sat, 2 Jul 2016 18:59:27 +0800 Message-Id: <1467457167-5363-4-git-send-email-zlpnobody@163.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467457167-5363-1-git-send-email-zlpnobody@163.com> References: <1467457167-5363-1-git-send-email-zlpnobody@163.com> X-CM-TRANSID: EMCowABXmaWnnndXXtNsAg--.15306S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7CFy3XrWfJF4kJr4DCFyfZwb_yoW8Ww47p3 WFgry3tw4xXF4Fva1jg3s7AF45J393u3WF9rnrAa4rA3Zrtw13ua1UKr17uF98Jr4xXr43 Zr4Yvr17CFWrAaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jXcTPUUUUU= X-Originating-IP: [180.170.252.41] X-CM-SenderInfo: x2os00perg5qqrwthudrp/xtbBURWal1aDqlx0zwAAsR Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Liping Zhang Similar to ctnl_untimeout, when hash resize happened, we should try to do unhelp from the 0# bucket again. Signed-off-by: Liping Zhang --- net/netfilter/nf_conntrack_helper.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c index 196cb39..9d02b75 100644 --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -392,6 +392,8 @@ static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me, struct nf_conntrack_expect *exp; const struct hlist_node *next; const struct hlist_nulls_node *nn; + unsigned int sequence; + spinlock_t *lock; unsigned int i; int cpu; @@ -422,14 +424,22 @@ static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me, unhelp(h, me); spin_unlock_bh(&pcpu->lock); } + local_bh_disable(); +restart: + sequence = read_seqcount_begin(&nf_conntrack_generation); for (i = 0; i < nf_conntrack_htable_size; i++) { - nf_conntrack_lock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]); + lock = &nf_conntrack_locks[i % CONNTRACK_LOCKS]; + nf_conntrack_lock(lock); + if (read_seqcount_retry(&nf_conntrack_generation, sequence)) { + spin_unlock(lock); + goto restart; + } if (i < nf_conntrack_htable_size) { hlist_nulls_for_each_entry(h, nn, &nf_conntrack_hash[i], hnnode) unhelp(h, me); } - spin_unlock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]); + spin_unlock(lock); } local_bh_enable(); }