mac80211: cancel/restart all timers across suspend/resume
Johannes Berg
maintainerPATCH 1/1 mac80211: cancel/restart all timers across suspend/resume
We forgot to cancel all timers in mac80211 when suspending. In particular we forgot to deal with some things that can cause hardware reconfiguration -- while it is down.
While at it we go ahead and add a warning in ieee80211_sta_work() if its run while the suspend->resume cycle is in effect. This should not happen and if it does it would indicate there is a bug lurking in either mac80211 or mac80211 drivers.
With this now wpa_supplicant doesn't blink when I go to suspend and resume where as before there where issues with some timers running during the suspend->resume cycle. This caused a lot of incorrect assumptions and would at times bring back the device in an incoherent, but mostly recoverable, state.
--- net/mac80211/ibss.c | 29 ++++++++++++++++ net/mac80211/ieee80211_i.h | 26 ++++++++++++++ net/mac80211/mesh.c | 40 ++++++++++++++++++++++ net/mac80211/mesh.h | 12 ++++++ net/mac80211/mesh_hwmp.c | 8 +++- net/mac80211/mesh_plink.c | 21 +++++++++++ net/mac80211/mlme.c | 59 +++++++++++++++++++++++++++++++++ net/mac80211/pm.c | 80 ++++++++++++++++++++++++++++++++++----------- net/mac80211/scan.c | 18 ++++++++++ net/mac80211/sta_info.c | 3 + net/mac80211/sta_info.h | 1 net/mac80211/util.c | 43 ++++++++++++++++++++++++ 12 files changed, 321 insertions(+), 19 deletions(-)
net/mac80211/ieee80211_i.h +26 -0
@@ -293,6 +293,7 @@ struct ieee80211_if_managed {int auth_tries;/* retries for auth req */ int assoc_tries;/* retries for assoc req */ +unsigned long timers_running;/* used for quiesce/restart */ bool powersave;/* powersave requested for this iface */ unsigned long request;
@@ -333,6 +334,9 @@ struct ieee80211_if_ibss {unsigned long request;unsigned long last_scan_completed; + +bool timer_running; +bool fixed_bssid;bool fixed_channel;
@@ -358,6 +362,8 @@ struct ieee80211_if_mesh {struct timer_list mesh_path_timer;struct sk_buff_head skb_queue; +unsigned long timers_running; +bool housekeeping;u8 mesh_id[IEEE80211_MAX_MESH_ID_LEN ];
@@ -609,6 +615,21 @@ struct ieee80211_local {unsigned int filter_flags;/* FIF_* */ struct iw_statistics wstats;bool tim_in_locked_section;/* see ieee80211_beacon_get() */ + +/* +* suspended is true if we finished all the suspend _and_ we have +* not yet come up from resume. This is to be used by mac80211 +* to ensure driver sanity during suspend and mac80211's own +* sanity. It can eventually be used for WoW as well. +*/ +bool suspended; + +/* +* quiescing is true during the suspend process _only_ to +* ease timer cancelling etc. +*/ +bool quiescing; +int tx_headroom;/* required headroom for hardware/radiotap */ /* Tasklet and skb queue to process calls from IRQ mode. All frames
@@ -941,6 +962,8 @@ int ieee80211_max_network_latency(structvoid ieee80211_sta_process_chanswitch (struct ieee80211_sub_if_data *sdata,struct ieee80211_channel_sw_ie *sw_elem,struct ieee80211_bss *bss); +void ieee80211_sta_quiesce (struct ieee80211_sub_if_data *sdata); +void ieee80211_sta_restart (struct ieee80211_sub_if_data *sdata);/* IBSS code */ void ieee80211_ibss_notify_scan_completed (struct ieee80211_local *local);
@@ -953,6 +976,8 @@ struct sta_info *ieee80211_ibss_add_sta(int ieee80211_ibss_join (struct ieee80211_sub_if_data *sdata,struct cfg80211_ibss_params *params);int ieee80211_ibss_leave (struct ieee80211_sub_if_data *sdata); +void ieee80211_ibss_quiesce (struct ieee80211_sub_if_data *sdata); +void ieee80211_ibss_restart (struct ieee80211_sub_if_data *sdata);/* scan/BSS handling */ void ieee80211_scan_work (struct work_struct *work);
@@ -963,6 +988,7 @@ int ieee80211_request_scan(struct ieee80int ieee80211_scan_results (struct ieee80211_local *local,struct iw_request_info *info,char *buf,size_t len); +void ieee80211_scan_cancel (struct ieee80211_local *local); ieee80211_rx_result ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
net/mac80211/mlme.c +59 -0
95 lines not on this page · raw message
net/mac80211/pm.c +62 -18
118 lines not on this page · raw message
net/mac80211/util.c +43 -0
60 lines not on this page · raw message
net/mac80211/ibss.c +29 -0
@@ -737,6 +737,9 @@ static void ieee80211_ibss_work(struct wstruct ieee80211_if_ibss *ifibss;struct sk_buff *skb; +if (WARN_ON (local->suspended)) +return ; +if (!netif_running (sdata->dev))return ;
@@ -773,10 +776,36 @@ static void ieee80211_ibss_timer(unsignestruct ieee80211_if_ibss *ifibss = &sdata->u.ibss;struct ieee80211_local *local = sdata->local; +if (local->quiescing) { + ifibss->timer_running = true; +return ; + } +set_bit (IEEE80211_IBSS_REQ_RUN , &ifibss->request);queue_work (local->hw.workqueue, &ifibss->work); } +#ifdef CONFIG_PM +void ieee80211_ibss_quiesce (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; + +cancel_work_sync (&ifibss->work); +if (del_timer_sync (&ifibss->timer)) + ifibss->timer_running = true; +} + +void ieee80211_ibss_restart (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; + +if (ifibss->timer_running) { +add_timer (&ifibss->timer); + ifibss->timer_running = false; + } +} +#endif +void ieee80211_ibss_setup_sdata (struct ieee80211_sub_if_data *sdata) {struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
net/mac80211/mesh.h +12 -0
@@ -267,6 +267,8 @@ void mesh_path_timer(unsigned long data)void mesh_path_flush_by_nexthop (struct sta_info *sta);void mesh_path_discard_frame (struct sk_buff *skb,struct ieee80211_sub_if_data *sdata); +void mesh_path_quiesce (struct ieee80211_sub_if_data *sdata); +void mesh_path_restart (struct ieee80211_sub_if_data *sdata);#ifdef CONFIG_MAC80211_MESH extern int mesh_allocated;
@@ -294,10 +296,20 @@ static inline void mesh_path_activate(stvoid ieee80211_mesh_notify_scan_completed (struct ieee80211_local *local); +void ieee80211_mesh_quiesce (struct ieee80211_sub_if_data *sdata); +void ieee80211_mesh_restart (struct ieee80211_sub_if_data *sdata); +void mesh_plink_quiesce (struct sta_info *sta); +void mesh_plink_restart (struct sta_info *sta);#else #define mesh_allocated 0static inline void ieee80211_mesh_notify_scan_completed (struct ieee80211_local *local) {} +static inline void ieee80211_mesh_quiesce (struct ieee80211_sub_if_data *sdata) +{} +static inline void ieee80211_mesh_restart (struct ieee80211_sub_if_data *sdata) +{} +static inline void mesh_plink_quiesce (struct sta_info *sta) {} +static inline void mesh_plink_restart (struct sta_info *sta) {}#endif #endif /* IEEE80211S_H */
net/mac80211/mesh.c +40 -0
@@ -21,6 +21,9 @@#define CAPAB_OFFSET 17#define ACCEPT_PLINKS 0x80 +#define TMR_RUNNING_HK 0 +#define TMR_RUNNING_MP 1 +int mesh_allocated;static struct kmem_cache *rm_cache;
@@ -45,6 +48,12 @@ static void ieee80211_mesh_housekeeping_struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; ifmsh->housekeeping = true; + +if (local->quiescing) { +set_bit (TMR_RUNNING_HK , &ifmsh->timers_running); +return ; + } +queue_work (local->hw.workqueue, &ifmsh->work); }
@@ -343,6 +352,11 @@ static void ieee80211_mesh_path_timer(unstruct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;struct ieee80211_local *local = sdata->local; +if (local->quiescing) { +set_bit (TMR_RUNNING_MP , &ifmsh->timers_running); +return ; + } +queue_work (local->hw.workqueue, &ifmsh->work); }
@@ -424,6 +438,32 @@ static void ieee80211_mesh_housekeeping( round_jiffies(jiffies + IEEE80211_MESH_HOUSEKEEPING_INTERVAL)); } +#ifdef CONFIG_PM +void ieee80211_mesh_quiesce (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + +/* might restart the timer but that doesn't matter */ +cancel_work_sync (&ifmsh->work); + +/* use atomic bitops in case both timers fire at the same time */ + +if (del_timer_sync (&ifmsh->housekeeping_timer)) +set_bit (TMR_RUNNING_HK , &ifmsh->timers_running); +if (del_timer_sync (&ifmsh->mesh_path_timer)) +set_bit (TMR_RUNNING_MP , &ifmsh->timers_running); +} + +void ieee80211_mesh_restart (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + +if (test_and_clear_bit (TMR_RUNNING_HK , &ifmsh->timers_running)) +add_timer (&ifmsh->housekeeping_timer); +if (test_and_clear_bit (TMR_RUNNING_MP , &ifmsh->timers_running)) +add_timer (&ifmsh->mesh_path_timer); +} +#endif void ieee80211_start_mesh (struct ieee80211_sub_if_data *sdata) {
net/mac80211/scan.c +18 -0
@@ -631,3 +631,21 @@ int ieee80211_request_internal_scan(strumutex_unlock (&local->scan_mtx);return ret; } + +void ieee80211_scan_cancel (struct ieee80211_local *local) +{ +bool swscan; + +cancel_delayed_work_sync (&local->scan_work); + +/* +* Only call this function when a scan can't be +* queued -- mostly at suspend under RTNL. +*/ +mutex_lock (&local->scan_mtx); + swscan = local->sw_scanning; +mutex_unlock (&local->scan_mtx); + +if (swscan) +ieee80211_scan_completed (&local->hw, true); +}
net/mac80211/sta_info.c +3 -0
@@ -608,6 +608,9 @@ static void sta_info_cleanup(unsigned losta_info_cleanup_expire_buffered (local, sta);rcu_read_unlock (); +if (local->quiescing) +return ; + local->sta_cleanup.expires =round_jiffies (jiffies +STA_INFO_CLEANUP_INTERVAL );add_timer (&local->sta_cleanup);
net/mac80211/mesh_plink.c +21 -0
@@ -266,6 +266,11 @@ static void mesh_plink_timer(unsigned lo*/ sta = (struct sta_info *) data; +if (sta->sdata->local->quiescing) { + sta->plink_timer_was_running = true; +return ; + } +spin_lock_bh (&sta->lock);if (sta->ignore_plink_timer) { sta->ignore_plink_timer = false;
@@ -322,6 +327,22 @@ static void mesh_plink_timer(unsigned lo } } +#ifdef CONFIG_PM +void mesh_plink_quiesce (struct sta_info *sta) +{ +if (del_timer_sync (&sta->plink_timer)) + sta->plink_timer_was_running = true; +} + +void mesh_plink_restart (struct sta_info *sta) +{ +if (sta->plink_timer_was_running) { +add_timer (&sta->plink_timer); + sta->plink_timer_was_running = false; + } +} +#endif +static inline void mesh_plink_timer_set (struct sta_info *sta,int timeout) { sta->plink_timer.expires = jiffies + (HZ * timeout /1000 );
net/mac80211/sta_info.h +1 -0
@@ -293,6 +293,7 @@ struct sta_info {__le16 reason;u8 plink_retries;bool ignore_plink_timer; +bool plink_timer_was_running;enum plink_state plink_state;u32 plink_timeout;struct timer_list plink_timer;
net/mac80211/mesh_hwmp.c +7 -1
@@ -836,8 +836,14 @@ void mesh_path_timer(unsigned long data) mpath =rcu_dereference (mpath);if (!mpath) goto endmpathtimer; -spin_lock_bh (&mpath->state_lock); sdata = mpath->sdata; + +if (sdata->local->quiescing) { +rcu_read_unlock (); +return ; + } + +spin_lock_bh (&mpath->state_lock);if (mpath->flags &MESH_PATH_RESOLVED || (!(mpath->flags &MESH_PATH_RESOLVING ))) mpath->flags &= ~(MESH_PATH_RESOLVING |MESH_PATH_RESOLVED );
net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 line 41
Quoted 8 lines · Johannes Berg
net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 renamed from net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 +2
-0@@ -37,6 +37,9 @@ #define IEEE80211_PROBE_IDLE_TIME (60 * HZ) #define IEEE80211_RETRY_AUTH_INTERVAL (1 * HZ) +#define TMR_RUNNING_TIMER 1 +#define TMR_RUNNING_CHANSW 1
Typo?
Luis
Johannes Berg
maintainerQuoted 9 lines · Luis R. Rodriguez
Quoted 6 lines · Johannes Berg
net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 renamed from net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 +0
-0@@ -37,6 +37,9 @@ #define IEEE80211_PROBE_IDLE_TIME (60 * HZ) #define IEEE80211_RETRY_AUTH_INTERVAL (1 * HZ)
Quoted 4 lines
net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 line 41
Quoted 2 lines
net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 renamed from net/mac80211/mlme.c 2009-05-15 12:43:11.000000000 +0200 +2
-0+#define TMR_RUNNING_TIMER 1 +#define TMR_RUNNING_CHANSW 1Typo?
Damn, yes, thanks for catching that, will repost.
johannes
Johannes Berg
maintainerPATCH v2 1/1 mac80211: cancel/restart all timers across suspend/resume
In reply to Johannes BergWe forgot to cancel all timers in mac80211 when suspending. In particular we forgot to deal with some things that can cause hardware reconfiguration -- while it is down.
While at it we go ahead and add a warning in ieee80211_sta_work() if its run while the suspend->resume cycle is in effect. This should not happen and if it does it would indicate there is a bug lurking in either mac80211 or mac80211 drivers.
With this now wpa_supplicant doesn't blink when I go to suspend and resume where as before there where issues with some timers running during the suspend->resume cycle. This caused a lot of incorrect assumptions and would at times bring back the device in an incoherent, but mostly recoverable, state.
---
v2: fix bit number confusion Luis found
net/mac80211/ibss.c | 29 ++++++++++++++++ net/mac80211/ieee80211_i.h | 26 ++++++++++++++ net/mac80211/mesh.c | 40 ++++++++++++++++++++++ net/mac80211/mesh.h | 12 ++++++ net/mac80211/mesh_hwmp.c | 8 +++- net/mac80211/mesh_plink.c | 21 +++++++++++ net/mac80211/mlme.c | 59 +++++++++++++++++++++++++++++++++ net/mac80211/pm.c | 80 ++++++++++++++++++++++++++++++++++----------- net/mac80211/scan.c | 18 ++++++++++ net/mac80211/sta_info.c | 3 + net/mac80211/sta_info.h | 1 net/mac80211/util.c | 43 ++++++++++++++++++++++++ 12 files changed, 321 insertions(+), 19 deletions(-)
net/mac80211/ieee80211_i.h +26 -0
@@ -293,6 +293,7 @@ struct ieee80211_if_managed {int auth_tries;/* retries for auth req */ int assoc_tries;/* retries for assoc req */ +unsigned long timers_running;/* used for quiesce/restart */ bool powersave;/* powersave requested for this iface */ unsigned long request;
@@ -333,6 +334,9 @@ struct ieee80211_if_ibss {unsigned long request;unsigned long last_scan_completed; + +bool timer_running; +bool fixed_bssid;bool fixed_channel;
@@ -358,6 +362,8 @@ struct ieee80211_if_mesh {struct timer_list mesh_path_timer;struct sk_buff_head skb_queue; +unsigned long timers_running; +bool housekeeping;u8 mesh_id[IEEE80211_MAX_MESH_ID_LEN ];
@@ -609,6 +615,21 @@ struct ieee80211_local {unsigned int filter_flags;/* FIF_* */ struct iw_statistics wstats;bool tim_in_locked_section;/* see ieee80211_beacon_get() */ + +/* +* suspended is true if we finished all the suspend _and_ we have +* not yet come up from resume. This is to be used by mac80211 +* to ensure driver sanity during suspend and mac80211's own +* sanity. It can eventually be used for WoW as well. +*/ +bool suspended; + +/* +* quiescing is true during the suspend process _only_ to +* ease timer cancelling etc. +*/ +bool quiescing; +int tx_headroom;/* required headroom for hardware/radiotap */ /* Tasklet and skb queue to process calls from IRQ mode. All frames
@@ -941,6 +962,8 @@ int ieee80211_max_network_latency(structvoid ieee80211_sta_process_chanswitch (struct ieee80211_sub_if_data *sdata,struct ieee80211_channel_sw_ie *sw_elem,struct ieee80211_bss *bss); +void ieee80211_sta_quiesce (struct ieee80211_sub_if_data *sdata); +void ieee80211_sta_restart (struct ieee80211_sub_if_data *sdata);/* IBSS code */ void ieee80211_ibss_notify_scan_completed (struct ieee80211_local *local);
@@ -953,6 +976,8 @@ struct sta_info *ieee80211_ibss_add_sta(int ieee80211_ibss_join (struct ieee80211_sub_if_data *sdata,struct cfg80211_ibss_params *params);int ieee80211_ibss_leave (struct ieee80211_sub_if_data *sdata); +void ieee80211_ibss_quiesce (struct ieee80211_sub_if_data *sdata); +void ieee80211_ibss_restart (struct ieee80211_sub_if_data *sdata);/* scan/BSS handling */ void ieee80211_scan_work (struct work_struct *work);
@@ -963,6 +988,7 @@ int ieee80211_request_scan(struct ieee80int ieee80211_scan_results (struct ieee80211_local *local,struct iw_request_info *info,char *buf,size_t len); +void ieee80211_scan_cancel (struct ieee80211_local *local); ieee80211_rx_result ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
net/mac80211/mlme.c +59 -0
95 lines not on this page · raw message
net/mac80211/pm.c +62 -18
118 lines not on this page · raw message
net/mac80211/util.c +43 -0
60 lines not on this page · raw message
net/mac80211/ibss.c +29 -0
@@ -737,6 +737,9 @@ static void ieee80211_ibss_work(struct wstruct ieee80211_if_ibss *ifibss;struct sk_buff *skb; +if (WARN_ON (local->suspended)) +return ; +if (!netif_running (sdata->dev))return ;
@@ -773,10 +776,36 @@ static void ieee80211_ibss_timer(unsignestruct ieee80211_if_ibss *ifibss = &sdata->u.ibss;struct ieee80211_local *local = sdata->local; +if (local->quiescing) { + ifibss->timer_running = true; +return ; + } +set_bit (IEEE80211_IBSS_REQ_RUN , &ifibss->request);queue_work (local->hw.workqueue, &ifibss->work); } +#ifdef CONFIG_PM +void ieee80211_ibss_quiesce (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; + +cancel_work_sync (&ifibss->work); +if (del_timer_sync (&ifibss->timer)) + ifibss->timer_running = true; +} + +void ieee80211_ibss_restart (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; + +if (ifibss->timer_running) { +add_timer (&ifibss->timer); + ifibss->timer_running = false; + } +} +#endif +void ieee80211_ibss_setup_sdata (struct ieee80211_sub_if_data *sdata) {struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
net/mac80211/mesh.h +12 -0
@@ -267,6 +267,8 @@ void mesh_path_timer(unsigned long data)void mesh_path_flush_by_nexthop (struct sta_info *sta);void mesh_path_discard_frame (struct sk_buff *skb,struct ieee80211_sub_if_data *sdata); +void mesh_path_quiesce (struct ieee80211_sub_if_data *sdata); +void mesh_path_restart (struct ieee80211_sub_if_data *sdata);#ifdef CONFIG_MAC80211_MESH extern int mesh_allocated;
@@ -294,10 +296,20 @@ static inline void mesh_path_activate(stvoid ieee80211_mesh_notify_scan_completed (struct ieee80211_local *local); +void ieee80211_mesh_quiesce (struct ieee80211_sub_if_data *sdata); +void ieee80211_mesh_restart (struct ieee80211_sub_if_data *sdata); +void mesh_plink_quiesce (struct sta_info *sta); +void mesh_plink_restart (struct sta_info *sta);#else #define mesh_allocated 0static inline void ieee80211_mesh_notify_scan_completed (struct ieee80211_local *local) {} +static inline void ieee80211_mesh_quiesce (struct ieee80211_sub_if_data *sdata) +{} +static inline void ieee80211_mesh_restart (struct ieee80211_sub_if_data *sdata) +{} +static inline void mesh_plink_quiesce (struct sta_info *sta) {} +static inline void mesh_plink_restart (struct sta_info *sta) {}#endif #endif /* IEEE80211S_H */
net/mac80211/mesh.c +40 -0
@@ -21,6 +21,9 @@#define CAPAB_OFFSET 17#define ACCEPT_PLINKS 0x80 +#define TMR_RUNNING_HK 0 +#define TMR_RUNNING_MP 1 +int mesh_allocated;static struct kmem_cache *rm_cache;
@@ -45,6 +48,12 @@ static void ieee80211_mesh_housekeeping_struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; ifmsh->housekeeping = true; + +if (local->quiescing) { +set_bit (TMR_RUNNING_HK , &ifmsh->timers_running); +return ; + } +queue_work (local->hw.workqueue, &ifmsh->work); }
@@ -343,6 +352,11 @@ static void ieee80211_mesh_path_timer(unstruct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;struct ieee80211_local *local = sdata->local; +if (local->quiescing) { +set_bit (TMR_RUNNING_MP , &ifmsh->timers_running); +return ; + } +queue_work (local->hw.workqueue, &ifmsh->work); }
@@ -424,6 +438,32 @@ static void ieee80211_mesh_housekeeping( round_jiffies(jiffies + IEEE80211_MESH_HOUSEKEEPING_INTERVAL)); } +#ifdef CONFIG_PM +void ieee80211_mesh_quiesce (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + +/* might restart the timer but that doesn't matter */ +cancel_work_sync (&ifmsh->work); + +/* use atomic bitops in case both timers fire at the same time */ + +if (del_timer_sync (&ifmsh->housekeeping_timer)) +set_bit (TMR_RUNNING_HK , &ifmsh->timers_running); +if (del_timer_sync (&ifmsh->mesh_path_timer)) +set_bit (TMR_RUNNING_MP , &ifmsh->timers_running); +} + +void ieee80211_mesh_restart (struct ieee80211_sub_if_data *sdata) +{ +struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + +if (test_and_clear_bit (TMR_RUNNING_HK , &ifmsh->timers_running)) +add_timer (&ifmsh->housekeeping_timer); +if (test_and_clear_bit (TMR_RUNNING_MP , &ifmsh->timers_running)) +add_timer (&ifmsh->mesh_path_timer); +} +#endif void ieee80211_start_mesh (struct ieee80211_sub_if_data *sdata) {
net/mac80211/scan.c +18 -0
@@ -631,3 +631,21 @@ int ieee80211_request_internal_scan(strumutex_unlock (&local->scan_mtx);return ret; } + +void ieee80211_scan_cancel (struct ieee80211_local *local) +{ +bool swscan; + +cancel_delayed_work_sync (&local->scan_work); + +/* +* Only call this function when a scan can't be +* queued -- mostly at suspend under RTNL. +*/ +mutex_lock (&local->scan_mtx); + swscan = local->sw_scanning; +mutex_unlock (&local->scan_mtx); + +if (swscan) +ieee80211_scan_completed (&local->hw, true); +}
net/mac80211/sta_info.c +3 -0
@@ -608,6 +608,9 @@ static void sta_info_cleanup(unsigned losta_info_cleanup_expire_buffered (local, sta);rcu_read_unlock (); +if (local->quiescing) +return ; + local->sta_cleanup.expires =round_jiffies (jiffies +STA_INFO_CLEANUP_INTERVAL );add_timer (&local->sta_cleanup);
net/mac80211/mesh_plink.c +21 -0
@@ -266,6 +266,11 @@ static void mesh_plink_timer(unsigned lo*/ sta = (struct sta_info *) data; +if (sta->sdata->local->quiescing) { + sta->plink_timer_was_running = true; +return ; + } +spin_lock_bh (&sta->lock);if (sta->ignore_plink_timer) { sta->ignore_plink_timer = false;
@@ -322,6 +327,22 @@ static void mesh_plink_timer(unsigned lo } } +#ifdef CONFIG_PM +void mesh_plink_quiesce (struct sta_info *sta) +{ +if (del_timer_sync (&sta->plink_timer)) + sta->plink_timer_was_running = true; +} + +void mesh_plink_restart (struct sta_info *sta) +{ +if (sta->plink_timer_was_running) { +add_timer (&sta->plink_timer); + sta->plink_timer_was_running = false; + } +} +#endif +static inline void mesh_plink_timer_set (struct sta_info *sta,int timeout) { sta->plink_timer.expires = jiffies + (HZ * timeout /1000 );
net/mac80211/sta_info.h +1 -0
@@ -293,6 +293,7 @@ struct sta_info {__le16 reason;u8 plink_retries;bool ignore_plink_timer; +bool plink_timer_was_running;enum plink_state plink_state;u32 plink_timeout;struct timer_list plink_timer;
net/mac80211/mesh_hwmp.c +7 -1
@@ -836,8 +836,14 @@ void mesh_path_timer(unsigned long data) mpath =rcu_dereference (mpath);if (!mpath) goto endmpathtimer; -spin_lock_bh (&mpath->state_lock); sdata = mpath->sdata; + +if (sdata->local->quiescing) { +rcu_read_unlock (); +return ; + } + +spin_lock_bh (&mpath->state_lock);if (mpath->flags &MESH_PATH_RESOLVED || (!(mpath->flags &MESH_PATH_RESOLVING ))) mpath->flags &= ~(MESH_PATH_RESOLVING |MESH_PATH_RESOLVED );
Quoted 3 lines · Johannes Berg
We forgot to cancel all timers in mac80211 when suspending. In particular we forgot to deal with some things that can cause hardware reconfiguration -- while it is down.
This is breaking suspend on my iBook.
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Johannes Berg
maintainerQuoted 8 lines · Andreas Schwab
Quoted 3 lines · Johannes Berg
We forgot to cancel all timers in mac80211 when suspending. In particular we forgot to deal with some things that can cause hardware reconfiguration -- while it is down.
This is breaking suspend on my iBook.
Yeah, bug 13337, we've figured out why too, I need two or three days to figure out whether it's race-free, but the fix at
http://mid.gmane.org/[email protected] works.
johannes
Quoted 11 lines · Johannes Berg
Quoted 8 lines · Andreas Schwab
Quoted 3 lines · Johannes Berg
We forgot to cancel all timers in mac80211 when suspending. In particular we forgot to deal with some things that can cause hardware reconfiguration -- while it is down.
This is breaking suspend on my iBook.
Yeah, bug 13337,
Thanks, I missed that one.
Quoted 2 lines
but the fix at
http://mid.gmane.org/[email protected] works.
With that patch suspend works here too, but resume hangs halfway through.
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Johannes Berg
maintainerQuoted 14 lines · Andreas Schwab
Quoted 11 lines · Johannes Berg
Quoted 8 lines · Andreas Schwab
Quoted 3 lines · Johannes Berg
We forgot to cancel all timers in mac80211 when suspending. In particular we forgot to deal with some things that can cause hardware reconfiguration -- while it is down.
This is breaking suspend on my iBook.
Yeah, bug 13337,
Quoted 7 lines
Thanks, I missed that one.
Quoted 2 lines
but the fix at
http://mid.gmane.org/[email protected] works.With that patch suspend works here too, but resume hangs halfway through.
Odd, do you get console output before it hangs so you could add printks to figure out where? Jan said that just fixed it for him.
johannes
Quoted 2 lines · Johannes Berg
Odd, do you get console output before it hangs so you could add printks to figure out where? Jan said that just fixed it for him.
Just to clarify, the hanging resume is a different bug. When applying the patch on top of 5bb644a0f both suspend and resume work.
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Johannes Berg
maintainerQuoted 7 lines · Andreas Schwab
Quoted 2 lines · Johannes Berg
Odd, do you get console output before it hangs so you could add printks to figure out where? Jan said that just fixed it for him.
Just to clarify, the hanging resume is a different bug. When applying the patch on top of
5bb644a0fboth suspend and resume work.
Alright, thanks, that's good to know. I'll submit a fix for this issue tomorrow, I hope.
johannes