[PATCH net-next-2.6] mac80211: Speedup ieee80211_remove_interfaces()

Previous thread: [PATCH v2] TI DaVinci EMAC: Add suspend/resume capability by Ranjith Lohithakshan on Wednesday, November 4, 2009 - 9:41 pm. (2 messages)

Next thread: Re: [PATCH] tcp: set SPLICE_F_NONBLOCK after first buffer has been spliced by Eric Dumazet on Thursday, November 5, 2009 - 3:30 am. (6 messages)
From: Eric Dumazet
Date: Thursday, November 5, 2009 - 3:06 am

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(-)

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,
--

From: Johannes Berg
Date: Thursday, November 5, 2009 - 11:40 am

Jouni will be pleased for his testing... :)

Looks good to me. Nice simplification too.

Reviewed-by: Johannes Berg <johannes@sipsolutions.net>


From: David Miller
Date: Friday, November 6, 2009 - 1:44 am

From: Johannes Berg <johannes@sipsolutions.net>

I'll leave it to John to integrate this, thanks guys.
--

Previous thread: [PATCH v2] TI DaVinci EMAC: Add suspend/resume capability by Ranjith Lohithakshan on Wednesday, November 4, 2009 - 9:41 pm. (2 messages)

Next thread: Re: [PATCH] tcp: set SPLICE_F_NONBLOCK after first buffer has been spliced by Eric Dumazet on Thursday, November 5, 2009 - 3:30 am. (6 messages)