mac80211: cancel scan_work in ieee80211_unregister_hw

Commit Message

Rajkumar Manoharan May 13, 2011, 5:18 p.m. UTC

On Fri, May 13, 2011 at 09:13:36PM +0530, Johannes Berg wrote:
> On Fri, 2011-05-13 at 11:05 +0530, Rajkumar Manoharan wrote:
> 
> > > How did you come to that conclusion? ieee80211_do_stop() does stop the
> > > scan.
> > >
> > True. But Sometimes ieee80211_scan_cancel is waiting for mutex where
> > the lock was already aquired by scan work and scan_work never releases
> > the lock till scan completion whenever next_delay == 0.
> 
> But that shouldn't take a long time. And if it's "stuck" there, then
> cancel_delayed_work_sync() will also wait for it.
>
Agree. cancel_delayed_work_sync does not help to abort scan when
scan_work is in next_scan_state loop.

> > This scenario was observed while unplug the card during scan.
> 
> If this happens then mac80211 will still make calls to the driver, I
> don't think we can avoid this and drivers will need to handle it. Maybe
> the driver is repeatedly timing out somewhere?
>
These unneccesary driver calls has to be avoided. How about the following
change to abort scan during scan loop.


--
Rajkumar
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Johannes Berg May 13, 2011, 5:39 p.m. UTC | #1

On Fri, 2011-05-13 at 22:48 +0530, Rajkumar Manoharan wrote:

> These unneccesary driver calls has to be avoided. How about the following
> change to abort scan during scan loop.
> 
> diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
> index 4054399..9d18c43 100644
> --- a/net/mac80211/iface.c
> +++ b/net/mac80211/iface.c
> @@ -384,11 +384,11 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
>         int i;
>         enum nl80211_channel_type orig_ct;
>  
> +       clear_bit(SDATA_STATE_RUNNING, &sdata->state);
> +
>         if (local->scan_sdata == sdata)
>                 ieee80211_scan_cancel(local);
>  
> -       clear_bit(SDATA_STATE_RUNNING, &sdata->state);
> -
>         /*
>          * Stop TX on this interface first.
>          */
> diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
> index ea44a8e..6353f93 100644
> --- a/net/mac80211/scan.c
> +++ b/net/mac80211/scan.c
> @@ -719,6 +719,11 @@ void ieee80211_scan_work(struct work_struct *work)
>          * without scheduling a new work
>          */
>         do {
> +               if (!test_bit(SDATA_STATE_RUNNING, &sdata->state)) {
> +                       aborted = true;
> +                       goto out_complete;
> +               }
> +

Seems reasonable, but you should use ieee80211_sdata_running().

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 4054399..9d18c43 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -384,11 +384,11 @@  static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
        int i;
        enum nl80211_channel_type orig_ct;
 
+       clear_bit(SDATA_STATE_RUNNING, &sdata->state);
+
        if (local->scan_sdata == sdata)
                ieee80211_scan_cancel(local);
 
-       clear_bit(SDATA_STATE_RUNNING, &sdata->state);
-
        /*
         * Stop TX on this interface first.
         */
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index ea44a8e..6353f93 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -719,6 +719,11 @@  void ieee80211_scan_work(struct work_struct *work)
         * without scheduling a new work
         */
        do {
+               if (!test_bit(SDATA_STATE_RUNNING, &sdata->state)) {
+                       aborted = true;
+                       goto out_complete;
+               }
+
                switch (local->next_scan_state) {
                case SCAN_DECISION:
                        /* if no more bands/channels left, complete scan */