From patchwork Thu Apr 18 22:26:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Copeland X-Patchwork-Id: 2462801 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 52A143FD8C for ; Thu, 18 Apr 2013 22:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936492Ab3DRW1V (ORCPT ); Thu, 18 Apr 2013 18:27:21 -0400 Received: from mail-ia0-f175.google.com ([209.85.210.175]:64147 "EHLO mail-ia0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752689Ab3DRW1V (ORCPT ); Thu, 18 Apr 2013 18:27:21 -0400 Received: by mail-ia0-f175.google.com with SMTP id e16so2929929iaa.34 for ; Thu, 18 Apr 2013 15:27:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=xzf/Tk4Vdiu9WlY3L+6sTbzLcUHP64L9nGP0h9sAl6c=; b=PMueno7G21RgHrhrD+7dRSQ5oGKqslryEC6sJVtiRYNsuqHrE0VP8ViSADlblhnmgQ tRn+wvAW2J6IDypJ1xz+s3lTQQP1LJFsLfwbkxz85QVcQ5E3x82YpA3Eyr5fnI45TgzT 71G7HXmsDq8Mcms5DBad2fYEvfmy3zrRqpqTLo5j1CRriMVp7L4+C5sT30PpPlDI9o5F ZnFPX8KLh1arfMv1Ny4xh9SP6T9aAp7zygqzhIoJ1V7Zj9zRKFdQUpVsEH8YPlUY/pop erxedZc5kD7/+VpPuPtMtfnF0555sNzkl6YFO8Hna1zTorZWnGOHg8EsWfpMncVG+UYE Uztw== X-Received: by 10.50.57.78 with SMTP id g14mr1943754igq.87.1366324040551; Thu, 18 Apr 2013 15:27:20 -0700 (PDT) Received: from hash.lan (CPE0018e7fe5281-CM78cd8ec60a0d.cpe.net.cable.rogers.com. [99.242.255.161]) by mx.google.com with ESMTPSA id d4sm118248igc.3.2013.04.18.15.27.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Apr 2013 15:27:19 -0700 (PDT) Received: from bob by hash.lan with local (Exim 4.72) (envelope-from ) id 1USxIB-0000pj-SW; Thu, 18 Apr 2013 18:26:59 -0400 Date: Thu, 18 Apr 2013 18:26:49 -0400 From: Bob Copeland To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, paulmck@linux.vnet.ibm.com Subject: [PATCH v2] mac80211: use synchronize_rcu() with rcu_barrier() Message-ID: <20130418222649.GC3759@localhost> References: <20130418220443.GB3759@localhost> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130418220443.GB3759@localhost> User-Agent: Mutt/1.5.20 (2009-06-14) X-Gm-Message-State: ALoCoQk2qHIjfZW6Uqsllzxrhy2tLZJQ18sW7uNTeqncux8bsO/Ok6RJYJvIzWvjJ9JcFTmk5zQd Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The RCU docs used to state that rcu_barrier() included a wait for an RCU grace period; however the comments for rcu_barrier() as of commit f0a0e6f... "rcu: Clarify memory-ordering properties of grace-period primitives" contradict this. So add back synchronize_{rcu,net}() to where they once were, but keep the rcu_barrier()s for the call_rcu() callbacks. Cc: stable Signed-off-by: Bob Copeland --- v2: also in cfg.c net/mac80211/cfg.c | 1 + net/mac80211/iface.c | 5 +++-- net/mac80211/pm.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 72ab1c0..dcffca4 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1043,6 +1043,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) sta_info_flush_defer(vlan); sta_info_flush_defer(sdata); + synchronize_net(); rcu_barrier(); list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) { sta_info_flush_cleanup(vlan); diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index b6abaaa..c634aff 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -836,11 +836,12 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, * * sta_info_flush_cleanup() requires rcu_barrier() * first to wait for the station call_rcu() calls - * to complete, here we need at least sychronize_rcu() - * it to wait for the RX path in case it is using the + * to complete, and we also need synchronize_rcu() + * to wait for the RX path in case it is using the * interface and enqueuing frames at this very time on * another CPU. */ + synchronize_rcu(); rcu_barrier(); sta_info_flush_cleanup(sdata); diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 4431f0f..7fc5d0d 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -38,6 +38,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) IEEE80211_QUEUE_STOP_REASON_SUSPEND); /* flush out all packets and station cleanup call_rcu()s */ + synchronize_net(); rcu_barrier(); ieee80211_flush_queues(local, NULL);