linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3.3] rt2x00: fix random stalls
@ 2012-03-05 16:48 Stanislaw Gruszka
  2012-03-05 19:27 ` [rt2x00-users] " Ivo Van Doorn
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Stanislaw Gruszka @ 2012-03-05 16:48 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-wireless, users

Is possible that we stop queue and then do not wake up it again,
especially when packets are transmitted fast. That can be easily
reproduced with modified tx queue entry_num to some small value e.g. 16.

If mac80211 already hold local->queue_stop_reason_lock, then we can wait
on that lock in both rt2x00queue_pause_queue() and
rt2x00queue_unpause_queue(). After drooping ->queue_stop_reason_lock
is possible that __ieee80211_wake_queue() will be performed before
__ieee80211_stop_queue(), hence we stop queue and newer wake up it
again.

To prevent stalls serialize pause/unpause by queue->tx_lock.

Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 drivers/net/wireless/rt2x00/rt2x00dev.c |   10 ++++++++--
 drivers/net/wireless/rt2x00/rt2x00mac.c |   10 +++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 49a51b4..6c64658 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -430,10 +430,16 @@ void rt2x00lib_txdone(struct queue_entry *entry,
 	/*
 	 * If the data queue was below the threshold before the txdone
 	 * handler we must make sure the packet queue in the mac80211 stack
-	 * is reenabled when the txdone handler has finished.
+	 * is reenabled when the txdone handler has finished. This has to be
+	 * serialized with rt2x00mac_tx, otherwise we can wake up mac80211
+	 * queue before it was stopped if someone else hold mac80211 internal
+	 * local->queue_stop_reason_lock .
 	 */
-	if (!rt2x00queue_threshold(entry->queue))
+	if (!rt2x00queue_threshold(entry->queue)) {
+		spin_lock_irq(&entry->queue->tx_lock);
 		rt2x00queue_unpause_queue(entry->queue);
+		spin_unlock_irq(&entry->queue->tx_lock);
+	}
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_txdone);
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index ede3c58..2880512 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -152,13 +152,21 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 	if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
 		goto exit_fail;
 
-	if (rt2x00queue_threshold(queue))
+	/*
+	 * Pausing queue has to be serialized with rt2x00lib_txdone .
+	 */
+	if (rt2x00queue_threshold(queue)) {
+		spin_lock(&queue->tx_lock);
 		rt2x00queue_pause_queue(queue);
+		spin_unlock(&queue->tx_lock);
+	}
 
 	return;
 
  exit_fail:
+	spin_lock(&queue->tx_lock);
 	rt2x00queue_pause_queue(queue);
+	spin_unlock(&queue->tx_lock);
  exit_free_skb:
 	ieee80211_free_txskb(hw, skb);
 }
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2012-03-11  9:53 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-05 16:48 [PATCH 3.3] rt2x00: fix random stalls Stanislaw Gruszka
2012-03-05 19:27 ` [rt2x00-users] " Ivo Van Doorn
2012-03-05 19:54 ` Gertjan van Wingerde
2012-03-06  6:53   ` Stanislaw Gruszka
2012-03-06  7:45 ` Helmut Schaa
2012-03-06 11:53   ` Stanislaw Gruszka
2012-03-06 12:08     ` Gertjan van Wingerde
2012-03-07 18:25       ` Stanislaw Gruszka
     [not found] ` <4F564CDC.5040808@gmail.com>
2012-03-06 21:37   ` Martin Hundebøll
2012-03-07 18:46   ` Stanislaw Gruszka
2012-03-11  9:53     ` Martin Hundebøll

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