linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: Jiri Benc <jbenc@suse.cz>, Michael Wu <flamingice@sourmilk.net>,
	linux-wireless@vger.kernel.org
Subject: [PATCH 03/27] mac80211: avoid copying packets to interfaces that  are down
Date: Tue, 21 Aug 2007 16:59:08 +0200	[thread overview]
Message-ID: <20070821150039.396311000@sipsolutions.net> (raw)
In-Reply-To: 20070821145905.689978000@sipsolutions.net

David Woodhouse noticed that under some circumstances the number of slab
allocations kept growing. After looking a bit, this seemed to happen
when you had a management mode interface that was *down*.

The reason for this is that when the device is down, all management
frames get queued to the in-kernel MLME (via ieee80211_sta_rx_mgmt) but
then the sta work is invoked but doesn't run when the netif is down.
When you then bring the interface up, all such frames are freed, but if
you change the mode all of them are lost because the skb queue is
reinitialised as soon as you go back to managed mode. The skb queue is
correctly cleared when the interface is brought down, but the code
doesn't account for the fact that it may be filled while it is not up.

This patch should fix the issue by simply ignoring all interfaces that
are down when going through the RX handlers.

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

---
 net/mac80211/ieee80211.c |    9 +++++++++
 net/mac80211/rx.c        |    3 +++
 2 files changed, 12 insertions(+)

--- wireless-dev.orig/net/mac80211/rx.c	2007-08-21 14:39:40.425923881 +0200
+++ wireless-dev/net/mac80211/rx.c	2007-08-21 14:39:42.675923881 +0200
@@ -1521,6 +1521,9 @@ void __ieee80211_rx(struct ieee80211_hw 
 	list_for_each_entry(sdata, &local->sub_if_list, list) {
 		rx.u.rx.ra_match = 1;
 
+		if (!netif_running(sdata->dev))
+			continue;
+
 		prepres = prepare_for_handlers(sdata, bssid, &rx, hdr);
 		/* prepare_for_handlers can change sta */
 		sta = rx.sta;
--- wireless-dev.orig/net/mac80211/ieee80211.c	2007-08-21 14:39:41.445923881 +0200
+++ wireless-dev/net/mac80211/ieee80211.c	2007-08-21 14:39:42.675923881 +0200
@@ -494,7 +494,16 @@ static void ieee80211_if_shutdown(struct
 		sdata->u.sta.state = IEEE80211_DISABLED;
 		del_timer_sync(&sdata->u.sta.timer);
 		del_timer_sync(&sdata->u.sta.admit_timer);
+		/*
+		 * Holding the sub_if_lock for writing here blocks
+		 * out the receive path and makes sure it's not
+		 * currently processing a packet that may get
+		 * added to the queue.
+		 */
+		write_lock_bh(&local->sub_if_lock);
 		skb_queue_purge(&sdata->u.sta.skb_queue);
+		write_unlock_bh(&local->sub_if_lock);
+
 		if (!local->ops->hw_scan &&
 		    local->scan_dev == sdata->dev) {
 			local->sta_scanning = 0;

-- 


  parent reply	other threads:[~2007-08-21 15:10 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-21 14:59 [PATCH 00/27] various cleanups and fixes for mac80211 and drivers Johannes Berg
2007-08-21 14:59 ` [PATCH 01/27] mac80211: fix showing transmitted frames on multiple monitor interfaces Johannes Berg
2007-08-21 14:59 ` [PATCH 02/27] mac80211: fix preamble setting Johannes Berg
2007-08-21 14:59 ` Johannes Berg [this message]
2007-08-21 14:59 ` [PATCH 04/27] mac80211: fix key debugfs Johannes Berg
2007-08-21 14:59 ` [PATCH 05/27] mac80211, drivers: remove reset callback Johannes Berg
2007-08-21 14:59 ` [PATCH 06/27] ralink drivers: remove IEEE80211_HW_HOST_GEN_BEACON flag Johannes Berg
2007-08-21 14:59 ` [PATCH 07/27] mac80211: " Johannes Berg
2007-08-21 14:59 ` [PATCH 08/27] mac80211: remove PRISM2_PARAM_RADIO_ENABLED Johannes Berg
2007-08-21 14:59 ` [PATCH 09/27] mac80211: remove PRISM2_HOSTAPD_SET_GENERIC_INFO_ELEM Johannes Berg
2007-08-21 14:59 ` [PATCH 10/27] ralink drivers: remove IEEE80211_HW_DATA_NULLFUNC_ACK Johannes Berg
2007-08-21 14:59 ` [PATCH 11/27] rtl8187: " Johannes Berg
2007-08-21 14:59 ` [PATCH 12/27] p54: " Johannes Berg
2007-08-21 14:59 ` [PATCH 13/27] mac80211: " Johannes Berg
2007-08-21 14:59 ` [PATCH 14/27] mac80211: ratelimit some RX messages Johannes Berg
2007-08-21 14:59 ` [PATCH 15/27] mac80211: remove ieee80211_msg_wep_frame_unknown_key Johannes Berg
2007-08-21 14:59 ` [PATCH 16/27] mac80211: remove radar stuff Johannes Berg
2007-08-21 14:59 ` [PATCH 17/27] mac80211: remove scan struct from hostapd_param Johannes Berg
2007-08-21 14:59 ` [PATCH 18/27] mac80211: fix software decryption Johannes Berg
2007-08-21 14:59 ` [PATCH 19/27] cfg80211: extend radiotap parser by all remaining fields Johannes Berg
2007-08-21 14:59 ` [PATCH 20/27] mac80211: remove unused ioctls (1) Johannes Berg
2007-08-21 14:59 ` [PATCH 21/27] mac80211: remove unused ioctls (2) Johannes Berg
2007-08-21 14:59 ` [PATCH 22/27] mac80211: remove unused ioctls (3) Johannes Berg
2007-08-21 14:59 ` [PATCH 23/27] mac80211: remove unused ioctls (4) Johannes Berg
2007-08-21 14:59 ` [PATCH 24/27] mac80211: remove PRISM2_PARAM_KEY_MGMT Johannes Berg
2007-08-21 14:59 ` [PATCH 25/27] mac80211: kill key_mgmt, use key_management_enabled Johannes Berg
2007-08-21 14:59 ` [PATCH 26/27] mac80211: refactor event sending Johannes Berg
2007-08-23 22:16   ` Michael Wu
2007-08-24 10:10     ` Johannes Berg
2007-08-21 14:59 ` [PATCH 27/27] mac80211: use switch statement in tx code Johannes Berg
2007-08-22  4:21 ` [PATCH 00/27] various cleanups and fixes for mac80211 and drivers Michael Wu
2007-08-23 20:54 ` John W. Linville

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070821150039.396311000@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=flamingice@sourmilk.net \
    --cc=jbenc@suse.cz \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).