mac80211/drivers: add new mac80211 workqueue API
PATCH 1/1 mac80211/drivers: add new mac80211 workqueue API
This set move the mac80211 workqueue struct privately into mac80211 and exposes it only through helpers. We do this to aid proper suspend support, these could eventually be extended for further sanity checkings or considerations.
We also fix two initial warnings we hit with this, one on mac80211, the other on ath9k.
Luis R. Rodriguez (3):
mac80211: redefine usage of the mac80211 workqueue
mac80211: do not queue work after suspend in the dynamic ps timer
ath9k: cancel xmit poll work at stop() callback
drivers/net/wireless/at76c50x-usb.c | 12 +++--- drivers/net/wireless/ath/ar9170/led.c | 11 +++-- drivers/net/wireless/ath/ar9170/main.c | 28 +++++++----- drivers/net/wireless/ath/ath9k/main.c | 17 ++++--- drivers/net/wireless/ath/ath9k/virtual.c | 17 ++++---- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- drivers/net/wireless/b43/main.c | 8 ++-- drivers/net/wireless/b43/phy_common.c | 2 +- drivers/net/wireless/b43/pio.c | 2 +- drivers/net/wireless/b43legacy/main.c | 8 ++-- drivers/net/wireless/p54/led.c | 5 +- drivers/net/wireless/p54/main.c | 2 +- drivers/net/wireless/p54/p54spi.c | 4 +- drivers/net/wireless/p54/txrx.c | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- drivers/net/wireless/rt2x00/rt2x00link.c | 8 ++-- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 2 +- drivers/net/wireless/rtl818x/rtl8187_leds.c | 10 ++-- include/net/mac80211.h | 61 +++++++++++++++++++++++---- net/mac80211/ibss.c | 6 +- net/mac80211/ieee80211_i.h | 6 +++ net/mac80211/iface.c | 4 +- net/mac80211/main.c | 8 ++-- net/mac80211/mesh.c | 10 ++-- net/mac80211/mesh_hwmp.c | 4 +- net/mac80211/mlme.c | 50 ++++++++++------------ net/mac80211/pm.c | 4 +- net/mac80211/scan.c | 8 ++-- net/mac80211/tx.c | 2 +- net/mac80211/util.c | 49 +++++++++++++++++++++ 31 files changed, 231 insertions(+), 125 deletions(-)
PATCH 1/1 mac80211: redefine usage of the mac80211 workqueue
The mac80211 workqueue exists to enable mac80211 and drivers to queue their own work on a single threaded workqueue. mac80211 takes care to flush the workqueue during suspend but we never really had requirements on drivers for how they should use the workqueue in consideration for suspend.
We extend mac80211 to document how the mac80211 workqueue should be used, how it should not be used and finally move raw access to the workqueue to mac80211 only. Drivers and mac80211 use helpers to queue work and flush the mac80211 workqueue:
* ieee80211_queue_work()
* ieee80211_queue_delayed_work()
* ieee80211_flush_workqueue()
These helpers will now warn if mac80211 already completed its suspend cycle and someone is trying to queue work. mac80211 flushes the mac80211 workqueue prior to suspend a few times, but we haven't taken the care to ensure drivers won't add more work after suspend. To help with this we add a warning when someone tries to add work and mac80211 already completed the suspend cycle.
Drivers should ensure they cancel any work or delayed work in the mac80211 stop() callback. Drivers not using the mac80211 workqueue will need to review proper sanity checking themselves. mac80211 drivers that *do not* use the mac80211 workqueue and invented their own (and that this patch does not touch) and could be changed to do so:
* iwlwifi/*
* libertas_tf
* mwl8k
* zd1211rw
--- drivers/net/wireless/at76c50x-usb.c | 12 +++--- drivers/net/wireless/ath/ar9170/led.c | 11 +++-- drivers/net/wireless/ath/ar9170/main.c | 28 +++++++----- drivers/net/wireless/ath/ath9k/main.c | 15 ++++--- drivers/net/wireless/ath/ath9k/virtual.c | 17 ++++---- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- drivers/net/wireless/b43/main.c | 8 ++-- drivers/net/wireless/b43/phy_common.c | 2 +- drivers/net/wireless/b43/pio.c | 2 +- drivers/net/wireless/b43legacy/main.c | 8 ++-- drivers/net/wireless/p54/led.c | 5 +- drivers/net/wireless/p54/main.c | 2 +- drivers/net/wireless/p54/p54spi.c | 4 +- drivers/net/wireless/p54/txrx.c | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- drivers/net/wireless/rt2x00/rt2x00link.c | 8 ++-- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 2 +- drivers/net/wireless/rtl818x/rtl8187_leds.c | 10 ++-- include/net/mac80211.h | 61 +++++++++++++++++++++++---- net/mac80211/ibss.c | 6 +- net/mac80211/ieee80211_i.h | 6 +++ net/mac80211/iface.c | 4 +- net/mac80211/main.c | 8 ++-- net/mac80211/mesh.c | 10 ++-- net/mac80211/mesh_hwmp.c | 4 +- net/mac80211/mlme.c | 48 ++++++++++----------- net/mac80211/pm.c | 4 +- net/mac80211/scan.c | 8 ++-- net/mac80211/tx.c | 2 +- net/mac80211/util.c | 49 +++++++++++++++++++++ 31 files changed, 228 insertions(+), 124 deletions(-)
drivers/net/wireless/at76c50x-usb.c +6 -6
@@ -1872,8 +1872,8 @@ static void at76_dwork_hw_scan(struct work_struct *work)/* FIXME: add maximum time for scan to complete */ if (ret !=CMD_STATUS_COMPLETE ) { -queue_delayed_work (priv->hw->workqueue, &priv->dwork_hw_scan, -SCAN_POLL_INTERVAL ); +ieee80211_queue_delayed_work (priv->hw, &priv->dwork_hw_scan, +SCAN_POLL_INTERVAL );mutex_unlock (&priv->mtx);return ; }
@@ -1934,8 +1934,8 @@ static int at76_hw_scan(struct ieee80211_hw *hw, goto exit; } -queue_delayed_work (priv->hw->workqueue, &priv->dwork_hw_scan, -SCAN_POLL_INTERVAL ); +ieee80211_queue_delayed_work (priv->hw, &priv->dwork_hw_scan, +SCAN_POLL_INTERVAL ); exit:mutex_unlock (&priv->mtx);
@@ -2024,7 +2024,7 @@ static void at76_configure_filter(struct ieee80211_hw *hw, }else return ; -queue_work (hw->workqueue, &priv->work_set_promisc); +ieee80211_queue_work (hw, &priv->work_set_promisc); } static int at76_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
@@ -2297,7 +2297,7 @@ static void at76_delete_device(struct at76_priv *priv)if (priv->mac80211_registered) {cancel_delayed_work (&priv->dwork_hw_scan); -flush_workqueue (priv->hw->workqueue); +ieee80211_flush_workqueue (priv->hw);ieee80211_unregister_hw (priv->hw); }
drivers/net/wireless/ath/ar9170/led.c +7 -4
@@ -90,9 +90,12 @@ static void ar9170_update_leds(struct work_struct *work)ar9170_set_leds_state (ar, led_val);mutex_unlock (&ar->mutex); -if (rerun) -queue_delayed_work (ar->hw->workqueue, &ar->led_work, -msecs_to_jiffies (blink_delay)); +if (!rerun) +return ; + +ieee80211_queue_delayed_work (ar->hw, + &ar->led_work, +msecs_to_jiffies (blink_delay)); } static void ar9170_led_brightness_set(struct led_classdev *led,
@@ -110,7 +113,7 @@ static void ar9170_led_brightness_set(struct led_classdev *led, }if (likely (IS_ACCEPTING_CMD (ar) && arl->toggled)) -queue_delayed_work (ar->hw->workqueue, &ar->led_work,HZ /10 ); +ieee80211_queue_delayed_work (ar->hw, &ar->led_work,HZ /10 ); } static int ar9170_register_led(struct ar9170 *ar, int i, char *name,
drivers/net/wireless/ath/ar9170/main.c +16 -12
@@ -595,10 +595,12 @@ static void ar9170_tx_janitor(struct work_struct *work)ar9170_tx_fake_ampdu_status (ar); -if (resched) -queue_delayed_work (ar->hw->workqueue, - &ar->tx_janitor, -msecs_to_jiffies (AR9170_JANITOR_DELAY )); +if (!resched) +return ; + +ieee80211_queue_delayed_work (ar->hw, + &ar->tx_janitor, +msecs_to_jiffies (AR9170_JANITOR_DELAY )); }void ar9170_handle_command_response (struct ar9170 *ar,void *buf,u32 len)
@@ -648,7 +650,7 @@ void ar9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)* pre-TBTT event */ if (ar->vif && ar->vif->type ==NL80211_IFTYPE_AP ) -queue_work (ar->hw->workqueue, &ar->beacon_work); +ieee80211_queue_work (ar->hw, &ar->beacon_work);break ;case 0xc2 :
@@ -1290,7 +1292,7 @@ static void ar9170_op_stop(struct ieee80211_hw *hw)if (IS_STARTED (ar)) ar->state =AR9170_IDLE ; -flush_workqueue (ar->hw->workqueue); +ieee80211_flush_workqueue (ar->hw);cancel_delayed_work_sync (&ar->tx_janitor);cancel_delayed_work_sync (&ar->led_work);
@@ -1824,10 +1826,12 @@ static void ar9170_tx(struct ar9170 *ar) } } -if (schedule_garbagecollector) -queue_delayed_work (ar->hw->workqueue, - &ar->tx_janitor, -msecs_to_jiffies (AR9170_JANITOR_DELAY )); +if (!schedule_garbagecollector) +return ; + +ieee80211_queue_delayed_work (ar->hw, + &ar->tx_janitor, +msecs_to_jiffies (AR9170_JANITOR_DELAY )); }static bool ar9170_tx_ampdu_queue (struct ar9170 *ar,struct sk_buff *skb)
@@ -2156,7 +2160,7 @@ static void ar9170_op_configure_filter(struct ieee80211_hw *hw, }if (likely (IS_STARTED (ar))) -queue_work (ar->hw->workqueue, &ar->filter_config_work); +ieee80211_queue_work (ar->hw, &ar->filter_config_work); } static void ar9170_op_bss_info_changed(struct ieee80211_hw *hw,
@@ -2414,7 +2418,7 @@ static void ar9170_sta_notify(struct ieee80211_hw *hw, }if (IS_STARTED (ar) && ar->filter_changed) -queue_work (ar->hw->workqueue, &ar->filter_config_work); +ieee80211_queue_work (ar->hw, &ar->filter_config_work); } static int ar9170_get_stats(struct ieee80211_hw *hw,
drivers/net/wireless/ath/ath9k/main.c +8 -7
@@ -976,10 +976,11 @@ static void ath_led_blink_work(struct work_struct *work)ath9k_hw_set_gpio (sc->sc_ah,ATH_LED_PIN , (sc->sc_flags &SC_OP_LED_ON ) ?1 :0 ); -queue_delayed_work (sc->hw->workqueue, &sc->ath_led_blink_work, - (sc->sc_flags &SC_OP_LED_ON ) ? -msecs_to_jiffies (sc->led_off_duration) : -msecs_to_jiffies (sc->led_on_duration)); +ieee80211_queue_delayed_work (sc->hw, + &sc->ath_led_blink_work, + (sc->sc_flags &SC_OP_LED_ON ) ? +msecs_to_jiffies (sc->led_off_duration) : +msecs_to_jiffies (sc->led_on_duration)); sc->led_on_duration = sc->led_on_cnt ? max((ATH_LED_ON_DURATION_IDLE - sc->led_on_cnt), 25) :
@@ -1016,8 +1017,8 @@ static void ath_led_brightness(struct led_classdev *led_cdev,case LED_FULL :if (led->led_type ==ATH_LED_ASSOC ) { sc->sc_flags |=SC_OP_LED_ASSOCIATED ; -queue_delayed_work (sc->hw->workqueue, - &sc->ath_led_blink_work,0 ); +ieee80211_queue_delayed_work (sc->hw, + &sc->ath_led_blink_work,0 ); }else if (led->led_type ==ATH_LED_RADIO ) {ath9k_hw_set_gpio (sc->sc_ah,ATH_LED_PIN ,0 ); sc->sc_flags |=SC_OP_LED_ON ;
@@ -1978,7 +1979,7 @@ static int ath9k_start(struct ieee80211_hw *hw)ieee80211_wake_queues (hw); -queue_delayed_work (sc->hw->workqueue, &sc->tx_complete_work,0 ); +ieee80211_queue_delayed_work (sc->hw, &sc->tx_complete_work,0 ); mutex_unlock:mutex_unlock (&sc->mutex);
drivers/net/wireless/ath/ath9k/virtual.c +9 -8
@@ -351,7 +351,7 @@ void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)* Drop from tasklet to work to allow mutex for channel * change. */ -queue_work (aphy->sc->hw->workqueue, +ieee80211_queue_work (aphy->sc->hw, &aphy->sc->chan_work); } }
@@ -367,7 +367,7 @@ static void ath9k_mark_paused(struct ath_wiphy *aphy)struct ath_softc *sc = aphy->sc; aphy->state =ATH_WIPHY_PAUSED ;if (!__ath9k_wiphy_pausing (sc)) -queue_work (sc->hw->workqueue, &sc->chan_work); +ieee80211_queue_work (sc->hw, &sc->chan_work); }static void ath9k_pause_iter (void *data,u8 *mac,struct ieee80211_vif *vif)
@@ -521,7 +521,7 @@ int ath9k_wiphy_select(struct ath_wiphy *aphy)spin_unlock_bh (&sc->wiphy_lock);ath_radio_disable (sc);ath_radio_enable (sc); -queue_work (aphy->sc->hw->workqueue, +ieee80211_queue_work (aphy->sc->hw, &aphy->sc->chan_work);return -EBUSY ;/* previous select still in progress */ }
@@ -541,7 +541,7 @@ int ath9k_wiphy_select(struct ath_wiphy *aphy)if (now) {/* Ready to request channel change immediately */ -queue_work (aphy->sc->hw->workqueue, &aphy->sc->chan_work); +ieee80211_queue_work (aphy->sc->hw, &aphy->sc->chan_work); }/*
@@ -648,8 +648,9 @@ try_again: "change\n"); } -queue_delayed_work (sc->hw->workqueue, &sc->wiphy_work, - sc->wiphy_scheduler_int); +ieee80211_queue_delayed_work (sc->hw, + &sc->wiphy_work, + sc->wiphy_scheduler_int); }void ath9k_wiphy_set_scheduler (struct ath_softc *sc,unsigned int msec_int)
@@ -657,8 +658,8 @@ void ath9k_wiphy_set_scheduler(struct ath_softc *sc, unsigned int msec_int)cancel_delayed_work_sync (&sc->wiphy_work); sc->wiphy_scheduler_int =msecs_to_jiffies (msec_int);if (sc->wiphy_scheduler_int) -queue_delayed_work (sc->hw->workqueue, &sc->wiphy_work, - sc->wiphy_scheduler_int); +ieee80211_queue_delayed_work (sc->hw, &sc->wiphy_work, + sc->wiphy_scheduler_int); }/* caller must hold wiphy_lock */
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -2055,7 +2055,7 @@ static void ath_tx_complete_poll_work(struct work_struct *work)ath_reset (sc, false); } -queue_delayed_work (sc->hw->workqueue, &sc->tx_complete_work, +ieee80211_queue_delayed_work (sc->hw, &sc->tx_complete_work,msecs_to_jiffies (ATH_TX_COMPLETE_POLL_INT )); }
drivers/net/wireless/b43/main.c +4 -4
@@ -1654,7 +1654,7 @@ static void b43_update_templates(struct b43_wl *wl) wl->current_beacon = beacon; wl->beacon0_uploaded =0 ; wl->beacon1_uploaded =0 ; -queue_work (wl->hw->workqueue, &wl->beacon_update_trigger); +ieee80211_queue_work (wl->hw, &wl->beacon_update_trigger); }static void b43_set_beacon_int (struct b43_wldev *dev,u16 beacon_int)
@@ -2914,7 +2914,7 @@ out_requeue: delay =msecs_to_jiffies (50 ); else delay =round_jiffies_relative (HZ *15 ); -queue_delayed_work (wl->hw->workqueue, &dev->periodic_work, delay); +ieee80211_queue_delayed_work (wl->hw, &dev->periodic_work, delay); out:mutex_unlock (&wl->mutex); }
@@ -2925,7 +2925,7 @@ static void b43_periodic_tasks_setup(struct b43_wldev *dev) dev->periodic_state =0 ;INIT_DELAYED_WORK (work, b43_periodic_work_handler); -queue_delayed_work (dev->wl->hw->workqueue, work,0 ); +ieee80211_queue_delayed_work (dev->wl->hw, work,0 ); }/* Check if communication with the device works correctly. */
@@ -4871,7 +4871,7 @@ void b43_controller_restart(struct b43_wldev *dev, const char *reason)if (b43_status (dev) <B43_STAT_INITIALIZED )return ;b43info (dev->wl,"Controller RESET (%s) ...\n" , reason); -queue_work (dev->wl->hw->workqueue, &dev->restart_work); +ieee80211_queue_work (dev->wl->hw, &dev->restart_work); }#ifdef CONFIG_PM
drivers/net/wireless/b43/phy_common.c +1 -1
@@ -352,7 +352,7 @@ void b43_phy_txpower_check(struct b43_wldev *dev, unsigned int flags)/* We must adjust the transmission power in hardware. * Schedule b43_phy_txpower_adjust_work(). */ -queue_work (dev->wl->hw->workqueue, &dev->wl->txpower_adjust_work); +ieee80211_queue_work (dev->wl->hw, &dev->wl->txpower_adjust_work); }int b43_phy_shm_tssi_read (struct b43_wldev *dev,u16 shm_offset)
drivers/net/wireless/b43/pio.c +1 -1
@@ -783,7 +783,7 @@ void b43_pio_rx(struct b43_pio_rxqueue *q) {/* Due to latency issues we must run the RX path in * a workqueue to be able to schedule between packets. */ -queue_work (q->dev->wl->hw->workqueue, &q->rx_work); +ieee80211_queue_work (q->dev->wl->hw, &q->rx_work); }static void b43_pio_tx_suspend_queue (struct b43_pio_txqueue *q)
drivers/net/wireless/b43legacy/main.c +4 -4
@@ -1252,7 +1252,7 @@ static void b43legacy_update_templates(struct b43legacy_wl *wl) wl->current_beacon = beacon; wl->beacon0_uploaded =0 ; wl->beacon1_uploaded =0 ; -queue_work (wl->hw->workqueue, &wl->beacon_update_trigger); +ieee80211_queue_work (wl->hw, &wl->beacon_update_trigger); } static void b43legacy_set_beacon_int(struct b43legacy_wldev *dev,
@@ -2300,7 +2300,7 @@ out_requeue: delay =msecs_to_jiffies (50 ); else delay =round_jiffies_relative (HZ *15 ); -queue_delayed_work (wl->hw->workqueue, &dev->periodic_work, delay); +ieee80211_queue_delayed_work (wl->hw, &dev->periodic_work, delay); out:mutex_unlock (&wl->mutex); }
@@ -2311,7 +2311,7 @@ static void b43legacy_periodic_tasks_setup(struct b43legacy_wldev *dev) dev->periodic_state =0 ;INIT_DELAYED_WORK (work, b43legacy_periodic_work_handler); -queue_delayed_work (dev->wl->hw->workqueue, work,0 ); +ieee80211_queue_delayed_work (dev->wl->hw, work,0 ); }/* Validate access to the chip (SHM) */
@@ -3885,7 +3885,7 @@ void b43legacy_controller_restart(struct b43legacy_wldev *dev,if (b43legacy_status (dev) < B43legacy_STAT_INITIALIZED)return ;b43legacyinfo (dev->wl,"Controller RESET (%s) ...\n" , reason); -queue_work (dev->wl->hw->workqueue, &dev->restart_work); +ieee80211_queue_work (dev->wl->hw, &dev->restart_work); }#ifdef CONFIG_PM
drivers/net/wireless/p54/led.c +2 -3
@@ -61,7 +61,7 @@ static void p54_update_leds(struct work_struct *work) wiphy_name(priv->hw->wiphy), err);if (rerun) -queue_delayed_work (priv->hw->workqueue, &priv->led_work, +ieee80211_queue_delayed_work (priv->hw, &priv->led_work,msecs_to_jiffies (blink_delay)); }
@@ -78,8 +78,7 @@ static void p54_led_brightness_set(struct led_classdev *led_dev,if ((brightness) && (led->registered)) { led->toggled++; -queue_delayed_work (priv->hw->workqueue, &priv->led_work, -HZ /10 ); +ieee80211_queue_delayed_work (priv->hw, &priv->led_work,HZ /10 ); } }
drivers/net/wireless/p54/main.c +1 -1
@@ -180,7 +180,7 @@ static int p54_start(struct ieee80211_hw *dev) goto out; } -queue_delayed_work (dev->workqueue, &priv->work,0 ); +ieee80211_queue_delayed_work (dev, &priv->work,0 ); priv->softled_state =0 ; err =p54_set_leds (priv);
drivers/net/wireless/p54/p54spi.c +2 -2
@@ -391,7 +391,7 @@ static irqreturn_t p54spi_interrupt(int irq, void *config)struct spi_device *spi = config;struct p54s_priv *priv =dev_get_drvdata (&spi->dev); -queue_work (priv->hw->workqueue, &priv->work); +ieee80211_queue_work (priv->hw, &priv->work);return IRQ_HANDLED ; }
@@ -479,7 +479,7 @@ static void p54spi_op_tx(struct ieee80211_hw *dev, struct sk_buff *skb)list_add_tail (&di->tx_list, &priv->tx_pending);spin_unlock_irqrestore (&priv->tx_lock, flags); -queue_work (priv->hw->workqueue, &priv->work); +ieee80211_queue_work (priv->hw, &priv->work); }static void p54spi_work (struct work_struct *work)
drivers/net/wireless/p54/txrx.c +1 -1
@@ -380,7 +380,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb)ieee80211_rx_irqsafe (priv->hw, skb); -queue_delayed_work (priv->hw->workqueue, &priv->work, +ieee80211_queue_delayed_work (priv->hw, &priv->work,msecs_to_jiffies (P54_STATISTICS_UPDATE ));return -1 ;
drivers/net/wireless/rt2x00/rt2x00dev.c +1 -1
@@ -215,7 +215,7 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev) rt2x00lib_beacondone_iter, rt2x00dev); -queue_work (rt2x00dev->hw->workqueue, &rt2x00dev->intf_work); +ieee80211_queue_work (rt2x00dev->hw, &rt2x00dev->intf_work); }EXPORT_SYMBOL_GPL (rt2x00lib_beacondone);
drivers/net/wireless/rt2x00/rt2x00link.c +4 -4
@@ -351,8 +351,8 @@ void rt2x00link_start_tuner(struct rt2x00_dev *rt2x00dev)rt2x00link_reset_tuner (rt2x00dev, false); -queue_delayed_work (rt2x00dev->hw->workqueue, - &link->work,LINK_TUNE_INTERVAL ); +ieee80211_queue_delayed_work (rt2x00dev->hw, + &link->work,LINK_TUNE_INTERVAL ); }void rt2x00link_stop_tuner (struct rt2x00_dev *rt2x00dev)
@@ -461,8 +461,8 @@ static void rt2x00link_tuner(struct work_struct *work)* Increase tuner counter, and reschedule the next link tuner run. */ link->count++; -queue_delayed_work (rt2x00dev->hw->workqueue, - &link->work,LINK_TUNE_INTERVAL ); +ieee80211_queue_delayed_work (rt2x00dev->hw, + &link->work,LINK_TUNE_INTERVAL ); }void rt2x00link_register (struct rt2x00_dev *rt2x00dev)
drivers/net/wireless/rt2x00/rt2x00mac.c +1 -1
@@ -431,7 +431,7 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,if (!test_bit (DRIVER_REQUIRE_SCHEDULED , &rt2x00dev->flags)) rt2x00dev->ops->lib->config_filter (rt2x00dev, *total_flags);else -queue_work (rt2x00dev->hw->workqueue, &rt2x00dev->filter_work); +ieee80211_queue_work (rt2x00dev->hw, &rt2x00dev->filter_work); }EXPORT_SYMBOL_GPL (rt2x00mac_configure_filter);
drivers/net/wireless/rtl818x/rtl8187_dev.c +1 -1
@@ -220,7 +220,7 @@ static void rtl8187_tx_cb(struct urb *urb)* reading a register in the device. We are in interrupt mode * here, thus queue the skb and finish on a work queue. */ skb_queue_tail (&priv->b_tx_status.queue, skb); -queue_delayed_work (hw->workqueue, &priv->work,0 ); +ieee80211_queue_delayed_work (hw, &priv->work,0 ); } }
drivers/net/wireless/rtl818x/rtl8187_leds.c +5 -5
@@ -108,11 +108,11 @@ static void rtl8187_led_brightness_set(struct led_classdev *led_dev,struct rtl8187_priv *priv = hw->priv;if (brightness ==LED_OFF ) { -queue_delayed_work (hw->workqueue, &priv->led_off,0 ); +ieee80211_queue_delayed_work (hw, &priv->led_off,0 );/* The LED is off for 1/20 sec so that it just blinks. */ -queue_delayed_work (hw->workqueue, &priv->led_on,HZ /20 ); +ieee80211_queue_delayed_work (hw, &priv->led_on,HZ /20 ); }else -queue_delayed_work (hw->workqueue, &priv->led_on,0 ); +ieee80211_queue_delayed_work (hw, &priv->led_on,0 ); } static int rtl8187_register_led(struct ieee80211_hw *dev,
@@ -193,7 +193,7 @@ void rtl8187_leds_init(struct ieee80211_hw *dev, u16 custid) err =rtl8187_register_led (dev, &priv->led_rx, name,ieee80211_get_rx_led_name (dev), ledpin);if (!err) { -queue_delayed_work (dev->workqueue, &priv->led_on,0 ); +ieee80211_queue_delayed_work (dev, &priv->led_on,0 );return ; }/* registration of RX LED failed - unregister TX */
@@ -209,7 +209,7 @@ void rtl8187_leds_exit(struct ieee80211_hw *dev)struct rtl8187_priv *priv = dev->priv;/* turn the LED off before exiting */ -queue_delayed_work (dev->workqueue, &priv->led_off,0 ); +ieee80211_queue_delayed_work (dev, &priv->led_off,0 );cancel_delayed_work_sync (&priv->led_off);cancel_delayed_work_sync (&priv->led_on);rtl8187_unregister_led (&priv->led_rx);
include/net/mac80211.h +53 -8
91 lines not on this page · raw message
net/mac80211/ibss.c +3 -3
@@ -781,7 +781,7 @@ static void ieee80211_ibss_timer(unsigned long data) }set_bit (IEEE80211_IBSS_REQ_RUN , &ifibss->request); -queue_work (local->hw.workqueue, &ifibss->work); +ieee80211_queue_work (&local->hw, &ifibss->work); }#ifdef CONFIG_PM
@@ -853,7 +853,7 @@ ieee80211_ibss_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)case IEEE80211_STYPE_PROBE_REQ :case IEEE80211_STYPE_AUTH :skb_queue_tail (&sdata->u.ibss.skb_queue, skb); -queue_work (local->hw.workqueue, &sdata->u.ibss.work); +ieee80211_queue_work (&local->hw, &sdata->u.ibss.work);return RX_QUEUED ; }
@@ -912,7 +912,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,ieee80211_recalc_idle (sdata->local);set_bit (IEEE80211_IBSS_REQ_RUN , &sdata->u.ibss.request); -queue_work (sdata->local->hw.workqueue, &sdata->u.ibss.work); +ieee80211_queue_work (&sdata->local->hw, &sdata->u.ibss.work);return 0 ; }
net/mac80211/ieee80211_i.h +6 -0
@@ -615,6 +615,12 @@ struct ieee80211_local {const struct ieee80211_ops *ops; +/* +* private workqueue to mac80211. mac80211 makes this accessible +* via ieee80211_queue_work() +*/ +struct workqueue_struct *workqueue; +unsigned long queue_stop_reasons[IEEE80211_MAX_QUEUES ];/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock;
net/mac80211/iface.c +2 -2
@@ -312,7 +312,7 @@ static int ieee80211_open(struct net_device *dev)* to fix this. */ if (sdata->vif.type ==NL80211_IFTYPE_STATION ) -queue_work (local->hw.workqueue, &sdata->u.mgd.work); +ieee80211_queue_work (&local->hw, &sdata->u.mgd.work);netif_tx_start_all_queues (dev);
@@ -541,7 +541,7 @@ static int ieee80211_stop(struct net_device *dev)ieee80211_led_radio (local, false); -flush_workqueue (local->hw.workqueue); +ieee80211_flush_workqueue (&local->hw);tasklet_disable (&local->tx_pending_tasklet);tasklet_disable (&local->tasklet);
net/mac80211/main.c +4 -4
@@ -794,9 +794,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)if (hw->queues >IEEE80211_MAX_QUEUES ) hw->queues =IEEE80211_MAX_QUEUES ; - local->hw.workqueue = + local->workqueue =create_singlethread_workqueue (wiphy_name (local->hw.wiphy)); -if (!local->hw.workqueue) { +if (!local->workqueue) { result = -ENOMEM ; goto fail_workqueue; }
@@ -886,7 +886,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)sta_info_stop (local); fail_sta_info:debugfs_hw_del (local); -destroy_workqueue (local->hw.workqueue); +destroy_workqueue (local->workqueue); fail_workqueue:wiphy_unregister (local->hw.wiphy); fail_wiphy_register:
@@ -928,7 +928,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)skb_queue_purge (&local->skb_queue);skb_queue_purge (&local->skb_queue_unreliable); -destroy_workqueue (local->hw.workqueue); +destroy_workqueue (local->workqueue);wiphy_unregister (local->hw.wiphy);ieee80211_wep_free (local);ieee80211_led_exit (local);
net/mac80211/mesh.c +5 -5
@@ -54,7 +54,7 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data)return ; } -queue_work (local->hw.workqueue, &ifmsh->work); +ieee80211_queue_work (local->hw.workqueue, &ifmsh->work); }/**
@@ -357,7 +357,7 @@ static void ieee80211_mesh_path_timer(unsigned long data)return ; } -queue_work (local->hw.workqueue, &ifmsh->work); +ieee80211_queue_work (local->hw.workqueue, &ifmsh->work); }struct mesh_table *mesh_table_grow (struct mesh_table *tbl)
@@ -471,7 +471,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)struct ieee80211_local *local = sdata->local; ifmsh->housekeeping = true; -queue_work (local->hw.workqueue, &ifmsh->work); +ieee80211_queue_work (local->hw.workqueue, &ifmsh->work);ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON |BSS_CHANGED_BEACON_ENABLED ); }
@@ -619,7 +619,7 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)rcu_read_lock ();list_for_each_entry_rcu (sdata, &local->interfaces, list)if (ieee80211_vif_is_mesh (&sdata->vif)) -queue_work (local->hw.workqueue, &sdata->u.mesh.work); +ieee80211_queue_work (local->hw.workqueue, &sdata->u.mesh.work);rcu_read_unlock (); }
@@ -692,7 +692,7 @@ ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)case IEEE80211_STYPE_PROBE_RESP :case IEEE80211_STYPE_BEACON :skb_queue_tail (&ifmsh->skb_queue, skb); -queue_work (local->hw.workqueue, &ifmsh->work); +ieee80211_queue_work (local->hw.workqueue, &ifmsh->work);return RX_QUEUED ; }
net/mac80211/mesh_hwmp.c +2 -2
@@ -660,14 +660,14 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)spin_unlock (&ifmsh->mesh_preq_queue_lock);if (time_after (jiffies, ifmsh->last_preq +min_preq_int_jiff (sdata))) -queue_work (sdata->local->hw.workqueue, &ifmsh->work); +ieee80211_queue_work (sdata->local->hw.workqueue, &ifmsh->work);else if (time_before (jiffies, ifmsh->last_preq)) {/* avoid long wait if did not send preqs for a long time * and jiffies wrapped around */ ifmsh->last_preq = jiffies -min_preq_int_jiff (sdata) -1 ; -queue_work (sdata->local->hw.workqueue, &ifmsh->work); +ieee80211_queue_work (sdata->local->hw.workqueue, &ifmsh->work); }else mod_timer (&ifmsh->mesh_path_timer, ifmsh->last_preq +min_preq_int_jiff (sdata));
net/mac80211/mlme.c +22 -26
147 lines not on this page · raw message
net/mac80211/pm.c +2 -2
@@ -26,7 +26,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)/* make quiescing visible to timers everywhere */ mb (); -flush_workqueue (local->hw.workqueue); +ieee80211_flush_workqueue (hw);/* Don't try to run timers while suspended. */ del_timer_sync (&local->sta_cleanup);
@@ -56,7 +56,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)rcu_read_unlock ();/* flush again, in case driver queued work */ -flush_workqueue (local->hw.workqueue); +ieee80211_flush_workqueue (hw);/* stop hardware - this must stop RX */ if (local->open_count) {
net/mac80211/scan.c +4 -4
@@ -386,8 +386,9 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)spin_unlock_bh (&local->filter_lock);/* TODO: start scan as soon as all nullfunc frames are ACKed */ -queue_delayed_work (local->hw.workqueue, &local->scan_work, -IEEE80211_CHANNEL_TIME ); +ieee80211_queue_delayed_work (&local->hw, + &local->scan_work, +IEEE80211_CHANNEL_TIME );return 0 ; }
@@ -713,8 +714,7 @@ void ieee80211_scan_work(struct work_struct *work) } }while (next_delay ==0 ); -queue_delayed_work (local->hw.workqueue, &local->scan_work, - next_delay); +ieee80211_queue_delayed_work (&local->hw, &local->scan_work, next_delay); } int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
net/mac80211/tx.c +1 -1
@@ -1400,7 +1400,7 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,if (local->hw.conf.flags &IEEE80211_CONF_PS ) {ieee80211_stop_queues_by_reason (&local->hw,IEEE80211_QUEUE_STOP_REASON_PS ); -queue_work (local->hw.workqueue, +ieee80211_queue_work (&local->hw, &local->dynamic_ps_disable_work); }
net/mac80211/util.c +49 -0
58 lines not on this page · raw message
Signature · 1 line
1.6.0.4
Johannes Berg
maintainerPATCH 1/1 mac80211: redefine usage of the mac80211 workqueue
Quoted 6 lines · Luis R. Rodriguez
The mac80211 workqueue exists to enable mac80211 and drivers to queue their own work on a single threaded workqueue. mac80211 takes care to flush the workqueue during suspend but we never really had requirements on drivers for how they should use the workqueue in consideration for suspend.
Quoted 8 lines
We extend mac80211 to document how the mac80211 workqueue should be used, how it should not be used and finally move raw access to the workqueue to mac80211 only. Drivers and mac80211 use helpers to queue work and flush the mac80211 workqueue:
*
ieee80211_queue_work()
*ieee80211_queue_delayed_work()
*ieee80211_flush_workqueue()
I would prefer to have wait_on_work() and/or cancel_work_sync() instead of flushing? It's often preferable due to locking constraints to cancel_work_sync() instead of flush_workqueue(). Do people really need flush_workqueue()?
johannes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part
Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20090725/0386a56d/attachment.pgp
PATCH 1/1 mac80211: redefine usage of the mac80211 workqueue
Quoted 12 lines · Johannes Berg
Quoted 11 lines · Luis R. Rodriguez
The mac80211 workqueue exists to enable mac80211 and drivers to queue their own work on a single threaded workqueue. mac80211 takes care to flush the workqueue during suspend but we never really had requirements on drivers for how they should use the workqueue in consideration for suspend.
We extend mac80211 to document how the mac80211 workqueue should be used, how it should not be used and finally move raw access to the workqueue to mac80211 only. Drivers and mac80211 use helpers to queue work and flush the mac80211 workqueue:
Quoted 5 lines
Quoted 3 lines
? *
ieee80211_queue_work()
? *ieee80211_queue_delayed_work()
? *ieee80211_flush_workqueue()I would prefer to have
wait_on_work()
That's currently static.
Quoted 2 lines
and/or
cancel_work_sync()instead
of flushing?
That's fine but currently drivers are issuing flush_workqueue() directly.
Quoted 3 lines
It's often preferable due to locking constraints to
cancel_work_sync()instead offlush_workqueue(). Do people really needflush_workqueue()?
Yeah good point, so I see 2 users of flush_workqueue, one in at76 and another on ar9170.
at76: at76_delete_device()
This is used at usb disconnect and probe failure. cancel_work_sync() definitely seems more appropriate.
ar9170: ar9170_op_stop()
same here, but seems we could add the flush on mac80211 prior to calling the drv_stop() currently we call it after.
Luis
PATCH 1/1 mac80211: do not queue work after suspend in the dynamic ps timer
In reply to Luis R. RodriguezThis fixes this warning during suspend <--> resume:
WARNING: at net/mac80211/util.c:511 ieee80211_queue_work+0x3a/0x40 [mac80211]() Hardware name: 6460DWU queueing ieee80211 work while going to suspend Modules linked in: <--snip--> Pid: 0, comm: swapper Not tainted 2.6.31-rc3-wl #4 Call Trace: <IRQ> [<ffffffffa0139d0a>] ? ieee80211_queue_work+0x3a/0x40 [mac80211] [<ffffffff810552b8>] warn_slowpath_common+0x78/0xd0 [<ffffffffa012a580>] ? ieee80211_dynamic_ps_timer+0x0/0x30 [mac80211] [<ffffffff81055394>] warn_slowpath_fmt+0x64/0x70 [<ffffffff810188a9>] ? sched_clock+0x9/0x10 [<ffffffff8107800c>] ? getnstimeofday+0x5c/0xf0 [<ffffffff810188a9>] ? sched_clock+0x9/0x10 [<ffffffff81074625>] ? sched_clock_cpu+0x75/0x240 [<ffffffffa0139d0a>] ieee80211_queue_work+0x3a/0x40 [mac80211] [<ffffffffa012a59c>] ieee80211_dynamic_ps_timer+0x1c/0x30 [mac80211] ... etc
--- net/mac80211/mlme.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/mac80211/mlme.c +1 -1
@@ -760,7 +760,7 @@ void ieee80211_dynamic_ps_timer(unsigned long data) {struct ieee80211_local *local = (void *) data; -if (local->quiescing) +if (local->quiescing || local->suspended)return ;ieee80211_queue_work (&local->hw, &local->dynamic_ps_enable_work);
Signature · 1 line
1.6.0.4
PATCH 1/1 mac80211: do not queue work after suspend in the dynamic ps timer
Quoted 3 lines · Luis R. Rodriguez
This fixes this warning during suspend <--> resume:
WARNING: at net/mac80211/util.c:511 ieee80211_queue_work+0x3a/0x40 [mac80211]()
Please ignore, I'll be sending this without depending on the other patches, separately.
Luis
PATCH 1/1 ath9k: cancel xmit poll work at stop() callback
In reply to Luis R. RodriguezWe forgot to cancel this work at the stop() callback.
------------[ cut here ]------------ WARNING: at net/mac80211/util.c:511 ieee80211_queue_delayed_work+0x3a/0x40 [mac80211]() Hardware name: 6460DWU queueing ieee80211 work while going to suspend Modules linked in: <-- snip --> Pid: 5124, comm: phy0 Tainted: G W 2.6.31-rc3-wl #4 Call Trace: [<ffffffffa03adcda>] ? ieee80211_queue_delayed_work+0x3a/0x40 [mac80211] [<ffffffff810552b8>] warn_slowpath_common+0x78/0xd0 [<ffffffff81055394>] warn_slowpath_fmt+0x64/0x70 [<ffffffff814ed2c9>] ? thread_return+0x3e/0x635 [<ffffffffa03adcda>] ieee80211_queue_delayed_work+0x3a/0x40 [mac80211] [<ffffffffa0297690>] ath_tx_complete_poll_work+0xc0/0x100 [ath9k] [<ffffffffa02975d0>] ? ath_tx_complete_poll_work+0x0/0x100 [ath9k] [<ffffffff81069b68>] worker_thread+0x178/0x260 [<ffffffff8106ecc0>] ? autoremove_wake_function+0x0/0x40 [<ffffffff810699f0>] ? worker_thread+0x0/0x260 [<ffffffff8106e89e>] kthread+0x9e/0xb0 [<ffffffff8101302a>] child_rip+0xa/0x20 [<ffffffff8106e800>] ? kthread+0x0/0xb0 [<ffffffff81013020>] ? child_rip+0x0/0x20
--- drivers/net/wireless/ath/ath9k/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +2 -0
@@ -2100,6 +2100,8 @@ static void ath9k_stop(struct ieee80211_hw *hw)mutex_lock (&sc->mutex); +cancel_delayed_work_sync (&sc->tx_complete_work); +if (ath9k_wiphy_started (sc)) {mutex_unlock (&sc->mutex);return ;/* another wiphy still in use */
Signature · 1 line
1.6.0.4
PATCH 1/1 ath9k: cancel xmit poll work at stop() callback
Quoted 2 lines · Luis R. Rodriguez
We forgot to cancel this work at the
stop()callback.
<-- snip -->
Quoted 12 lines
drivers/net/wireless/ath/ath9k/main.c +2
-0@@ -2100,6 +2100,8 @@ static void ath9k_stop(struct ieee80211_hw *hw) ? ? ? ?mutex_lock(&sc->mutex); + ? ? ? cancel_delayed_work_sync(&sc->tx_complete_work); + ? ? ? ?if (ath9k_wiphy_started(sc)) { ? ? ? ? ? ? ? ?mutex_unlock(&sc->mutex);
Quoted 1 line
? ? ? ? ? ? ? ?return; /* another wiphy still in use */
This is in the right place but I see we call it upon detach. That is a wrong place for this stuff... as well as the other cancels. Due to virtual stuff this is more involved. We'll have to clean this better.
Luis
PATCH 1/1 mac80211/drivers: add new mac80211 workqueue API
In reply to Luis R. RodriguezForgot to specify the order. The order is:
1/3?mac80211: redefine usage of the mac80211 workqueue 2/3?mac80211: do not queue work after suspend in the dynamic ps timer 3/3?ath9k: cancel xmit poll work at stop() callback
Luis