Skip to contentSkip to conversation

mac80211: add ieee80211_rx_ni()

PATCH In review Kalle Valo 2 participants 6 messages Oct 13, 2009 – Oct 14, 2009

Subsystems (2)
lore
Share & tools
lore

Kalle Valo

author
#0 lore raw

PATCH 1/2 mac80211: add ieee80211_rx_ni()

From: Kalle Valo <[email protected]>

ieee80211_rx() must be called with bottom halves disabled. To simplify driver development implement ieee80211_rx_ni() which disables BH. This function must be used when in process context.

---

 include/net/mac80211.h |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)
include/net/mac80211.h +26 -6
index c75b960..c42c4a8 100644
@@ -1665,11 +1665,11 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);
  * header if %RX_FLAG_RADIOTAP is set in the @status flags.
  *
  * This function may not be called in IRQ context. Calls to this function
- * for a single hardware must be synchronized against each other. Calls
- * to this function and ieee80211_rx_irqsafe() may not be mixed for a
- * single hardware.
+ * for a single hardware must be synchronized against each other. Calls to
+ * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
+ * mixed for a single hardware.
  *
- * Note that right now, this function must be called with softirqs disabled.
+ * In process context use instead ieee80211_rx_ni().
  *
  * @hw: the hardware this frame came in on
  * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1682,8 +1682,8 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
  * Like ieee80211_rx() but can be called in IRQ context
  * (internally defers to a tasklet.)
  *
- * Calls to this function and ieee80211_rx() may not be mixed for a
- * single hardware.
+ * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not
+ * be mixed for a single hardware.
  *
  * @hw: the hardware this frame came in on
  * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1691,6 +1691,26 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
 void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb);
 
 /**
+ * ieee80211_rx_ni - receive frame (in process context)
+ *
+ * Like ieee80211_rx() but can be called in process context
+ * (internally disables bottom halves).
+ *
+ * Calls to this function, ieee80211_rx() and ieee80211_rx_irqsafe() may
+ * not be mixed for a single hardware.
+ *
+ * @hw: the hardware this frame came in on
+ * @skb: the buffer to receive, owned by mac80211 after this call
+ */
+static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
+				   struct sk_buff *skb)
+{
+	local_bh_disable();
+	ieee80211_rx(hw, skb);
+	local_bh_enable();
+}
+
+/**
  * ieee80211_tx_status - transmit status callback
  *
  * Call this function for all transmitted frames after they have been
author
#1 lore raw

PATCH 2/2 wl1251: use ieee80211_rx_ni()

From: Kalle Valo <[email protected]>

Because of SPI and SDIO wl1251 does everything in a workqueue, including calling ieee80211_rx() which should be called with bottom halves disabled. An error message is emitted because of this:

NOHZ: local_softirq_pending 08

Fix this by using ieee80211_rx_ni().

---

 drivers/net/wireless/wl12xx/wl1251_rx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/wl12xx/wl1251_rx.c +1 -1
index 17c54b5..601fe0d 100644
@@ -153,7 +153,7 @@ static void wl1251_rx_body(struct wl1251 *wl,
 		     beacon ? "beacon" : "");
 
 	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
-	ieee80211_rx(wl->hw, skb);
+	ieee80211_rx_ni(wl->hw, skb);
 }
 
 static void wl1251_rx_ack(struct wl1251 *wl)
#2 lore raw
In reply to Kalle Valo
Quoted 26 lines · Kalle Valo

From: Kalle Valo <[email protected]>

ieee80211_rx() must be called with bottom halves disabled. To simplify driver development implement ieee80211_rx_ni() which disables BH. This function must be used when in process context.

---

 include/net/mac80211.h |   32 ++++++++++++++++++++++++++------

 1 files changed, 26 insertions(+), 6 deletions(-)
include/net/mac80211.h +3 -3
index c75b960..c42c4a8 100644
@@ -1665,11 +1665,11 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);
  * header if %RX_FLAG_RADIOTAP is set in the @status flags.
  *
  * This function may not be called in IRQ context. Calls to this function
- * for a single hardware must be synchronized against each other. Calls
- * to this function and ieee80211_rx_irqsafe() may not be mixed for a
- * single hardware.
+ * for a single hardware must be synchronized against each other. Calls to
+ * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
+ * mixed for a single hardware.

[snip]

Quoted 4 lines

- * Calls to this function and ieee80211_rx() may not be mixed for a
- * single hardware.
+ * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not
+ * be mixed for a single hardware.

You missed out ieee80211_rx_irqsafe() here.

Thanks,

Signature · 4 lines
Julian Calaby

Email: [email protected]
.Plan: http://sites.google.com/site/juliancalaby/
author
#3 lore raw
Quoted 6 lines · Julian Calaby
Quoted 4 lines

- * Calls to this function and ieee80211_rx() may not be mixed for a
- * single hardware.
+ * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not
+ * be mixed for a single hardware.

You missed out ieee80211_rx_irqsafe() here.

Here "this function" refer to ieee80211_rx_irqsafe(). But I can also write it like this:

Calls to ieee80211_rx_irqsafe(), ieee80211_rx() or ieee80211_rx_ni() may not be mixed for a single hardware.

Is that any better?

Signature · 1 line
Kalle Valo
#4 lore raw
Quoted 9 lines · Kalle Valo
Quoted 6 lines · Julian Calaby
Quoted 4 lines

- * Calls to this function and ieee80211_rx() may not be mixed for a
- * single hardware.
+ * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not
+ * be mixed for a single hardware.

You missed out ieee80211_rx_irqsafe() here.

Quoted 7 lines

Here "this function" refer to ieee80211_rx_irqsafe(). But I can also write it like this:

 Calls to ieee80211_rx_irqsafe(), ieee80211_rx() or ieee80211_rx_ni() may not be mixed for a single hardware.

Is that any better?

Smacks self upside the head.

This is what I get for commenting on patches in the morning.

Sorry for the noise.

Thanks,

Signature · 4 lines
Julian Calaby

Email: [email protected]
.Plan: http://sites.google.com/site/juliancalaby/
author
#5 lore raw
Quoted 8 lines · Julian Calaby
Quoted 8 lines
Quoted 1 line

You missed out ieee80211_rx_irqsafe() here.

Here "this function" refer to ieee80211_rx_irqsafe(). But I can also write it like this:

 Calls to ieee80211_rx_irqsafe(), ieee80211_rx() or ieee80211_rx_ni() may not be mixed for a single hardware.

Quoted 7 lines
Quoted 1 line

Is that any better?

Smacks self upside the head.

This is what I get for commenting on patches in the morning.

Sorry for the noise.

No problem at all, thank you for the review.

Signature · 1 line
Kalle Valo