From patchwork Thu Sep 1 15:27:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manfred Spraul X-Patchwork-Id: 664954 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 3sQ5kr2mkWz9sDG for ; Fri, 2 Sep 2016 01:28:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=colorfullife-com.20150623.gappssmtp.com header.i=@colorfullife-com.20150623.gappssmtp.com header.b=z4ZR8o65; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755598AbcIAP2A (ORCPT ); Thu, 1 Sep 2016 11:28:00 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35784 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755209AbcIAP17 (ORCPT ); Thu, 1 Sep 2016 11:27:59 -0400 Received: by mail-wm0-f66.google.com with SMTP id c133so4255280wmd.2 for ; Thu, 01 Sep 2016 08:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=colorfullife-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=LJxTA9HEvnqMbQpCetnPJ+5ykf2WcavZs8+9Pghvo5w=; b=z4ZR8o65YuK8P3oZxDW0dGZdgfb+oWQJzpbBeWt3k6QYfGGOocwJC8Ckcz0yvUNKoL 3YdKgdZcwAqIJCx/4WCXvT6pSdWAo5QkE9mDDNkzS+ZZUJqzouILhfZKI9iFAhCtr5CR CLuc5Mcdr5Hu2ZNzovTv+iBV8Szg/JXsVRRFG1VEnNGSfsep0adrnKIsgep/dXTEopjZ w/WMPShUJMv2K5h/qt1l91i7qQahzFe9x6fpF8Myj3tFMdXR+DBlRnXKlXU0Mc36To9v J+gORSQZveEvVNb1r0D3KuGy8DmyXsp67lEJxkU7n6ifqLd5JABle9R46TrEVlM/uhzM XiSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LJxTA9HEvnqMbQpCetnPJ+5ykf2WcavZs8+9Pghvo5w=; b=BcGQ0E/m3PF9UNpxYcCWhwHRBDCXpI/IFknLoTiw00xOnt8vnbLNNGWz5bmfgRNd6h AFID9j+tPJxaIcL+JsMhztskgfjDTJweT76MKv9AY2Y3Uhp7EBXO3DXunxx82zrNx0ec KmJUsNdkM/mq9kqyS25Jp1BDWoGkbawFEVeDfyYPEJNKLOcdAJ4VW7+wrMQh6o/iyF7H MD/e3wMh1PHILPjneU9PBzD+LLm46qk9zkUbhwUadLY4Uxb6RVN5BtBkqbSGnsXUtL3t KrbDJ3hOyX6TT3wMMZGRJ7YUh1FhT31rxN0GkcBaXB8IBOOi6EuOGiGxfxg+YWEEj2zu XfYQ== X-Gm-Message-State: AE9vXwPGd6wBrzq/a8n2J8mwpJCgCzjXcbWyG9aij/Z/viZJ3j5kHTFDWkGTjZSvvLFJaw== X-Received: by 10.194.248.165 with SMTP id yn5mr11769023wjc.177.1472743677926; Thu, 01 Sep 2016 08:27:57 -0700 (PDT) Received: from localhost.localdomain (dslc-082-083-023-103.pools.arcor-ip.net. [82.83.23.103]) by smtp.googlemail.com with ESMTPSA id lv9sm5846241wjb.22.2016.09.01.08.27.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Sep 2016 08:27:56 -0700 (PDT) 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: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@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]);