| Message ID | 4AF2A3B0.4030100@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 2009-11-05 at 11:06 +0100, Eric Dumazet wrote: > Speedup ieee80211_remove_interfaces() by factorizing synchronize_rcu() calls Jouni will be pleased for his testing... :) Looks good to me. Nice simplification too. Reviewed-by: Johannes Berg <johannes@sipsolutions.net> johannes > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> > --- > net/mac80211/iface.c | 14 +++++--------- > 1 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c > index 14f10eb..a445f50 100644 > --- a/net/mac80211/iface.c > +++ b/net/mac80211/iface.c > @@ -852,22 +852,18 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) > void ieee80211_remove_interfaces(struct ieee80211_local *local) > { > struct ieee80211_sub_if_data *sdata, *tmp; > + LIST_HEAD(unreg_list); > > ASSERT_RTNL(); > > + mutex_lock(&local->iflist_mtx); > list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { > - /* > - * we cannot hold the iflist_mtx across unregister_netdevice, > - * but we only need to hold it for list modifications to lock > - * out readers since we're under the RTNL here as all other > - * writers. > - */ > - mutex_lock(&local->iflist_mtx); > list_del(&sdata->list); > - mutex_unlock(&local->iflist_mtx); > > - unregister_netdevice(sdata->dev); > + unregister_netdevice_queue(sdata->dev, &unreg_list); > } > + mutex_unlock(&local->iflist_mtx); > + unregister_netdevice_many(&unreg_list); > } > > static u32 ieee80211_idle_off(struct ieee80211_local *local, > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
From: Johannes Berg <johannes@sipsolutions.net> Date: Thu, 05 Nov 2009 19:40:07 +0100 > On Thu, 2009-11-05 at 11:06 +0100, Eric Dumazet wrote: >> Speedup ieee80211_remove_interfaces() by factorizing synchronize_rcu() calls > > Jouni will be pleased for his testing... :) > > Looks good to me. Nice simplification too. > > Reviewed-by: Johannes Berg <johannes@sipsolutions.net> > I'll leave it to John to integrate this, thanks guys. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 14f10eb..a445f50 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -852,22 +852,18 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; + LIST_HEAD(unreg_list); ASSERT_RTNL(); + mutex_lock(&local->iflist_mtx); list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { - /* - * we cannot hold the iflist_mtx across unregister_netdevice, - * but we only need to hold it for list modifications to lock - * out readers since we're under the RTNL here as all other - * writers. - */ - mutex_lock(&local->iflist_mtx); list_del(&sdata->list); - mutex_unlock(&local->iflist_mtx); - unregister_netdevice(sdata->dev); + unregister_netdevice_queue(sdata->dev, &unreg_list); } + mutex_unlock(&local->iflist_mtx); + unregister_netdevice_many(&unreg_list); } static u32 ieee80211_idle_off(struct ieee80211_local *local,
Speedup ieee80211_remove_interfaces() by factorizing synchronize_rcu() calls Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> --- net/mac80211/iface.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html