From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756105AbcIAP2D (ORCPT ); Thu, 1 Sep 2016 11:28:03 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33872 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754991AbcIAP17 (ORCPT ); Thu, 1 Sep 2016 11:27:59 -0400 From: Manfred Spraul To: benh@kernel.crashing.org, paulmck@linux.vnet.ibm.com, Ingo Molnar , Boqun Feng , Peter Zijlstra , Andrew Morton Cc: LKML , will.deacon@arm.com, 1vier1@web.de, Davidlohr Bueso , Manfred Spraul , Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Subject: [PATCH 8/7] net/netfilter/nf_conntrack_core: Remove another memory barrier Date: Thu, 1 Sep 2016 17:27:52 +0200 Message-Id: <1472743673-15585-1-git-send-email-manfred@colorfullife.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since spin_unlock_wait() is defined as equivalent to spin_lock(); spin_unlock(), the memory barrier before spin_unlock_wait() is also not required. Not for stable! Signed-off-by: Manfred Spraul Cc: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org --- net/netfilter/nf_conntrack_core.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 7a3b5e6..0591a25 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -139,13 +139,7 @@ static void nf_conntrack_all_lock(void) spin_lock(&nf_conntrack_locks_all_lock); - /* - * Order the store of 'nf_conntrack_locks_all' against - * the spin_unlock_wait() loads below, such that if - * nf_conntrack_lock() observes 'nf_conntrack_locks_all' - * we must observe nf_conntrack_locks[] held: - */ - smp_store_mb(nf_conntrack_locks_all, true); + nf_conntrack_locks_all = true; for (i = 0; i < CONNTRACK_LOCKS; i++) { spin_unlock_wait(&nf_conntrack_locks[i]); -- 2.7.4