iwl3945: queue the right work if the scan needs to be aborted
Subsystems (3)
PATCH 1/1 iwl3945: queue the right work if the scan needs to be aborted
commit e7ee762cf074b0fd8eec483d0cef8fdbf0d04b81
Begin forwarded message:
Date: Mon, 27 Sep 2010 13:11:54 -0700
From: "Guy, Wey-Yi" <[email protected]>
To: Florian Mickler <[email protected]>
Cc: "[email protected]" <[email protected]>, "Chatre, Reinette" <[email protected]>, Intel Linux Wireless <ilw-VuQAYsv1563Yd54FQh9/[email protected]>, "John W. Linville" <[email protected]>, "Berg, Johannes" <[email protected]>, Zhu Yi <[email protected]>, "Cahill, Ben M" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]> Subject: Re: [PATCH] iwl3945: queue the
right work if the scan needs to be aborted
Quoted 14 lines · Florian Mickler
iwl3945's
scan_completedcalls into the mac80211 stack which triggers a warn on if there is no scan outstanding.This can be avoided by not calling
scan_completedbutabort_scaniniwl3945_request_scanin the done: branch of the function which is used as an error out.The done: branch seems to be an error-out branch, as, for example, if
iwl_is_ready(priv)returns false the done: branch is executed.NOTE:
I'm not familiar with the driver at all.
I just quickly scanned as a reaction to
Quoted 6 lines
https://bugzilla.kernel.org/show_bug.cgi?id=17722
the users of
scan_completedin the iwl3945 driver and noted the odd discrepancy between the comment above this instance and the comment in mac80211scan_completedfunction.Signed-off-by Florian Mickler <[email protected]>
Quoted 1 line
---
go into wireless-2.6 and stable only, scan fix already in wireless-next-2.6
Thanks
Wey
Quoted 22 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1
-1@@ -1411,7 +1411,7 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)clear_bit (STATUS_SCAN_HW , &priv->status);clear_bit (STATUS_SCANNING , &priv->status);/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->scan_completed); +queue_work (priv->workqueue, &priv->abort_scan); } int iwlagn_manage_ibss_station(struct iwl_priv *priv,drivers/net/wireless/iwlwifi/iwl3945-base.c +0
-0
drivers/net/wireless/iwlwifi/iwl3945-base.c void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) · line 3024
Quoted 8 lines
drivers/net/wireless/iwlwifi/iwl3945-base.c +1
-1@@ -3018,7 +3018,7 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)clear_bit (STATUS_SCANNING , &priv->status);/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->scan_completed); +queue_work (priv->workqueue, &priv->abort_scan); }static void iwl3945_bg_restart (struct work_struct *data)
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 38 lines · Florian Mickler
commit
e7ee762cf074b0fd8eec483d0cef8fdbf0d04b81Begin forwarded message:
Quoted 14 lines · Florian Mickler
iwl3945's
scan_completedcalls into the mac80211 stack which triggers a warn on if there is no scan outstanding.This can be avoided by not calling
scan_completedbutabort_scaniniwl3945_request_scanin the done: branch of the function which is used as an error out.The done: branch seems to be an error-out branch, as, for example, if
iwl_is_ready(priv)returns false the done: branch is executed.NOTE:
I'm not familiar with the driver at all.
I just quickly scanned as a reaction toQuoted 6 lines
https://bugzilla.kernel.org/show_bug.cgi?id=17722
the users of
scan_completedin the iwl3945 driver and noted the odd discrepancy between the comment above this instance and the comment in mac80211scan_completedfunction.Signed-off-by Florian Mickler <[email protected]>Acked-by Wey-Yi Guy <[email protected]>Quoted 1 line
---
go into wireless-2.6 and stable only, scan fix already in wireless-next-2.6
Thanks
WeyQuoted 4 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) · line 1414
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1
-1@@ -1411,7 +1411,7 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)clear_bit (STATUS_SCAN_HW , &priv->status);clear_bit (STATUS_SCANNING , &priv->status);/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->scan_completed); +queue_work (priv->workqueue, &priv->abort_scan);
Unfortunately this patch is not right thing to do. If you look at abort_scan work, it do nothing if STATUS_SCAN_ABORTING bit is not set. That's wrong because we have to complete scan (with abort == true). If STATUS_SCAN_ABORTING will be set, abort_work will send scan cancel commands to hardware what is wrong if scan was not started yet.
What we can eventually do, except apply iwl-scan rewrite from wireless-testing, is something like that:
iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
clear_bit(STATUS_SCAN_HW, &priv->status); clear_bit(STATUS_SCANNING, &priv->status); /* inform mac80211 scan aborted */ set_bit(STATUS_SCAN_ABORTING, &priv->status); queue_work(priv->workqueue, &priv->scan_completed);
ieee80211_scan_completed
if (!internal) {
bool aborted = test_bit(STATUS_SCAN_ABORTING, &priv->status);
ieee80211_scan_completed(priv->hw, aborted);
}However, I do not think we should go with that to -stable (below 2.6.36). IIRC warnings showed up in current 2.6.36-rc, because of some other changes in the code.
Stanislaw
Quoted 75 lines · On Tue, 5 Oct 2010 10:57:17 +0200 Stanislaw Gruszka <[email protected]> wrote:
Quoted 38 lines · Florian Mickler
commit
e7ee762cf074b0fd8eec483d0cef8fdbf0d04b81Begin forwarded message:
Quoted 14 lines · Florian Mickler
iwl3945's
scan_completedcalls into the mac80211 stack which triggers a warn on if there is no scan outstanding.This can be avoided by not calling
scan_completedbutabort_scaniniwl3945_request_scanin the done: branch of the function which is used as an error out.The done: branch seems to be an error-out branch, as, for example, if
iwl_is_ready(priv)returns false the done: branch is executed.NOTE:
I'm not familiar with the driver at all.
I just quickly scanned as a reaction toQuoted 6 lines
https://bugzilla.kernel.org/show_bug.cgi?id=17722
the users of
scan_completedin the iwl3945 driver and noted the odd discrepancy between the comment above this instance and the comment in mac80211scan_completedfunction.Signed-off-by Florian Mickler <[email protected]>Acked-by Wey-Yi Guy <[email protected]>Quoted 1 line
---
go into wireless-2.6 and stable only, scan fix already in wireless-next-2.6
Thanks
WeyQuoted 4 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) · line 1414
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1
-1@@ -1411,7 +1411,7 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)clear_bit (STATUS_SCAN_HW , &priv->status);clear_bit (STATUS_SCANNING , &priv->status);/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->scan_completed); +queue_work (priv->workqueue, &priv->abort_scan);Unfortunately this patch is not right thing to do. If you look at
abort_scanwork, it do nothing ifSTATUS_SCAN_ABORTINGbit is not set. That's wrong because we have to complete scan (with abort == true). IfSTATUS_SCAN_ABORTINGwill be set,abort_workwill send scan cancel commands to hardware what is wrong if scan was not started yet.What we can eventually do, except apply iwl-scan rewrite from wireless-testing, is something like that:
iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)clear_bit(STATUS_SCAN_HW, &priv->status); clear_bit(STATUS_SCANNING, &priv->status); /* inform mac80211 scan aborted */ set_bit(STATUS_SCAN_ABORTING, &priv->status); queue_work(priv->workqueue, &priv->scan_completed);
ieee80211_scan_completedif (!internal) { bool aborted = test_bit(STATUS_SCAN_ABORTING, &priv->status); ieee80211_scan_completed(priv->hw, aborted); }
Quoted 5 lines
However, I do not think we should go with that to -stable (below 2.6.36). IIRC warnings showed up in current 2.6.36-rc, because of some other changes in the code.
Stanislaw
Thx for looking at this. I suspect you know the code better than I do.. what is about the first jump to :done in iwlagn_request_scan()
if (!iwl_is_ready(priv)) {
IWL_WARN(priv, "request scan called when driver not ready.\n");
goto done;
}Does abort_scan need to do anything in that case?
I can't see where we set up the hardware for scanning in that case. (I've gone through the codepath coming from the mac80211 hw_scan)
Regards,
Flo
Quoted 34 lines · Florian Mickler
Quoted 25 lines
Unfortunately this patch is not right thing to do. If you look at
abort_scanwork, it do nothing ifSTATUS_SCAN_ABORTINGbit is not set. That's wrong because we have to complete scan (with abort == true). IfSTATUS_SCAN_ABORTINGwill be set,abort_workwill send scan cancel commands to hardware what is wrong if scan was not started yet.What we can eventually do, except apply iwl-scan rewrite from wireless-testing, is something like that:
iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)clear_bit(STATUS_SCAN_HW, &priv->status); clear_bit(STATUS_SCANNING, &priv->status); /* inform mac80211 scan aborted */ set_bit(STATUS_SCAN_ABORTING, &priv->status); queue_work(priv->workqueue, &priv->scan_completed);
ieee80211_scan_completedif (!internal) { bool aborted = test_bit(STATUS_SCAN_ABORTING, &priv->status); ieee80211_scan_completed(priv->hw, aborted); }Quoted 5 lines
However, I do not think we should go with that to -stable (below 2.6.36). IIRC warnings showed up in current 2.6.36-rc, because of some other changes in the code.
Stanislaw
Thx for looking at this. I suspect you know the code better than I do.. what is about the first jump to :done in
iwlagn_request_scan()
Quoted 6 lines
if (!iwl_is_ready(priv)) { IWL_WARN(priv, "request scan called when driver not ready.\n"); goto done; }Does
abort_scanneed to do anything in that case?
Yes, because we do not return value to mac80211 about .hw_scan failure, we always return 0, what is completely wrong. And yes, return error can be done instead of queueing scan_completed to improve situation - this is one of the thing, we do in wireless-testing.
Quoted 2 lines
I can't see where we set up the hardware for scanning in that case. (I've gone through the codepath coming from the mac80211
hw_scan)
.hw_scan = iwl_mac_hw_scan -> iwl_scan_initiate ->
"priv->cfg->ops->utils->request_scan" = {iwl3945,iwlang}_request_scan
Stanislaw
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · On Tue, 5 Oct 2010 12:43:58 +0200 Stanislaw Gruszka…
Quoted 6 lines
Quoted 6 lines
However, I do not think we should go with that to -stable (below 2.6.36). IIRC warnings showed up in current 2.6.36-rc, because of some other changes in the code.
Stanislaw
Hello stable,
scrap this. I handed out a brown paper bag bug fix and if that doesn't get into 2.6.36, it probably should go into 2.6.36.y. But let's see...
Regards,
Flo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 iwlwifi: fix iwlwifi scanning corner cases
In reply to Stanislaw GruszkaStanislaw Gruszka pointed out, that commit
"iwl3945: queue the right work if the scan needs to be aborted" has an awkward definition of "right". Specifically the abort_scan work doesn't notify the generic wireless stack that the scan was aborted.
In order to get rid of the warning in bug
https://bugzilla.kernel.org/show_bug.cgi?id=17722
we inform ieee80211_scan_completed that we are aborting the scan by setting the apropriate status bit in request_scan and pass it into ieee80211_scan_completed.
---
Hi John!
Here is the fix that Stanislaw described.
(Yes, it is in a brown paper bag.) Please wait for him to review this.
Another option would be to just revert my previous patch and live with the warning until the scanning rework hit's mainline.
Regards,
Flo
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 4 +++- drivers/net/wireless/iwlwifi/iwl-scan.c | 6 ++++-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-)
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +3 -1
@@ -1410,8 +1410,10 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)*/ clear_bit (STATUS_SCAN_HW , &priv->status);clear_bit (STATUS_SCANNING , &priv->status); +/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->abort_scan); +set_bit (STATUS_SCAN_ABORTING , &priv->status); +queue_work (priv->workqueue, &priv->scan_completed); } int iwlagn_manage_ibss_station(struct iwl_priv *priv,
drivers/net/wireless/iwlwifi/iwl-scan.c +4 -2
@@ -552,8 +552,10 @@ void iwl_bg_scan_completed(struct work_struct *work)* into driver again into functions that will attempt to take * mutex. */ -if (!internal) -ieee80211_scan_completed (priv->hw, false); +if (!internal) { +bool aborted =test_bit (STATUS_SCAN_ABORTING , &priv->status); +ieee80211_scan_completed (priv->hw, aborted); + } }EXPORT_SYMBOL (iwl_bg_scan_completed);
drivers/net/wireless/iwlwifi/iwl3945-base.c +2 -1
@@ -3018,7 +3018,8 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)clear_bit (STATUS_SCANNING , &priv->status);/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->abort_scan); +set_bit (STATUS_SCAN_ABORTING , &priv->status); +queue_work (priv->workqueue, &priv->scan_completed); }static void iwl3945_bg_restart (struct work_struct *data)
Signature · 6 lines
1.7.3 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] iwlwifi: fix iwlwifi scanning corner cases
Hi Florian
Quoted 14 lines · Florian Mickler
Stanislaw Gruszka pointed out, that commit
"iwl3945: queue the right work if the scan needs to be aborted" has an awkward definition of "right". Specifically theabort_scanwork doesn't notify the generic wireless stack that the scan was aborted.In order to get rid of the warning in bug
https://bugzilla.kernel.org/show_bug.cgi?id=17722
we informieee80211_scan_completedthat we are aborting the scan by setting the apropriate status bit inrequest_scanand pass it intoieee80211_scan_completed.Signed-off-by Florian Mickler <[email protected]>---
Quoted 7 lines
Hi John!
Here is the fix that Stanislaw described.
(Yes, it is in a brown paper bag.) Please wait for him to review this.Another option would be to just revert my previous patch and live with the warning until the scanning rework hit's mainline.
This patch is not so bad, but better would be just return value from {iwlagn,iwl3945}_request_scan instead of queuing anything. I will prepare patch(s) today or tomorrow.
Stanislaw
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 iwlwifi: return error when fail to start scanning
This is stable friendly backport of wireless-testing commit 3eecce527c7434dfd16517ce08b49632c8a26717 "iwlwifi: unify scan start checks". Wireless-testing version include also a lot of cleanups.
On error case in {iwl3945,iwlagn}_request_scan we queue abort_scan work, which in a fact do nothing, so we never complete the scan. Thats gives "WARNING: at net/wireless/core.c:614 wdev_cleanup_work" and stopped network connection until reload iwlwifi modules. Return of -EIO, and stopping queuing any work is a fix.
Note there are still many cases when we can get:
WARNING: at net/wireless/core.c:614 wdev_cleanup_work WARNING: at net/mac80211/scan.c:266 ieee80211_scan_completed WARNING: at net/mac80211/scan.c:269 ieee80211_scan_complete
which are not fixed. Unfortunately does not exist single, small fix for that problems, and we probably will see some more bug reports with scan warnings. As solution we rewrite iwl-scan.c code to avoid all possible race conditions. That quite big patch set is queued for 2.6.37 .
---
Patch is intended for wireless-2.6, or in case when it does not make 2.6.36 release, for -stable 2.6.36.y
drivers/net/wireless/iwlwifi/iwl-3945.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 18 ++++++------------ drivers/net/wireless/iwlwifi/iwl-agn.h | 2 +- drivers/net/wireless/iwlwifi/iwl-core.h | 2 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 14 +++++++++++--- drivers/net/wireless/iwlwifi/iwl3945-base.c | 19 ++++++------------- 6 files changed, 26 insertions(+), 31 deletions(-)
drivers/net/wireless/iwlwifi/iwl-3945.h +1 -1
@@ -295,7 +295,7 @@ extern const struct iwl_channel_info *iwl3945_get_channel_info(extern int iwl3945_rs_next_rate (struct iwl_priv *priv,int rate);/* scanning */ -void iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif); +int iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif);/* Requires full declaration of iwl_priv before including */ #include "iwl-io.h"
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +6 -12
@@ -1147,7 +1147,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,return added; } -void iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) +int iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) {struct iwl_host_cmd cmd = { .id =REPLY_SCAN_CMD ,
@@ -1394,24 +1394,18 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) scan->len =cpu_to_le16 (cmd.len);set_bit (STATUS_SCAN_HW , &priv->status); -if (iwl_send_cmd_sync (priv, &cmd)) +if (iwl_send_cmd_sync (priv, &cmd)) { +clear_bit (STATUS_SCAN_HW , &priv->status); goto done; + }queue_delayed_work (priv->workqueue, &priv->scan_check,IWL_SCAN_CHECK_WATCHDOG ); -return ; +return 0 ; done: -/* Cannot perform scan. Make sure we clear scanning -* bits from status so next scan request can be performed. -* If we don't clear scanning status bit here all next scan -* will fail -*/ -clear_bit (STATUS_SCAN_HW , &priv->status); -clear_bit (STATUS_SCANNING , &priv->status); -/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->abort_scan); +return -EIO ; } int iwlagn_manage_ibss_station(struct iwl_priv *priv,
drivers/net/wireless/iwlwifi/iwl-agn.h +1 -1
@@ -216,7 +216,7 @@ void iwl_reply_statistics(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);/* scan */ -void iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif); +int iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif);/* station mgmt */ int iwlagn_manage_ibss_station(struct iwl_priv *priv,
drivers/net/wireless/iwlwifi/iwl-core.h +1 -1
@@ -109,7 +109,7 @@ struct iwl_hcmd_utils_ops { __le16 fc, __le32 *tx_flags);int (*calc_rssi)(struct iwl_priv *priv,struct iwl_rx_phy_res *rx_resp); -void (*request_scan)(struct iwl_priv *priv,struct ieee80211_vif *vif); +int (*request_scan)(struct iwl_priv *priv,struct ieee80211_vif *vif); };struct iwl_apm_ops {
drivers/net/wireless/iwlwifi/iwl-scan.c +11 -3
@@ -298,6 +298,7 @@ EXPORT_SYMBOL(iwl_init_scan_params);static int iwl_scan_initiate (struct iwl_priv *priv,struct ieee80211_vif *vif) { +int ret;lockdep_assert_held (&priv->mutex);IWL_DEBUG_INFO (priv,"Starting scan...\n" );
@@ -308,9 +309,11 @@ static int iwl_scan_initiate(struct iwl_priv *priv, struct ieee80211_vif *vif)if (WARN_ON (!priv->cfg->ops->utils->request_scan))return -EOPNOTSUPP ; - priv->cfg->ops->utils->request_scan (priv, vif); + ret = priv->cfg->ops->utils->request_scan (priv, vif); +if (ret) +clear_bit (STATUS_SCANNING , &priv->status); +return ret; -return 0 ; } int iwl_mac_hw_scan(struct ieee80211_hw *hw,
@@ -380,6 +383,7 @@ void iwl_internal_short_hw_scan(struct iwl_priv *priv)void iwl_bg_start_internal_scan (struct work_struct *work) { +int ret;struct iwl_priv *priv = container_of(work, struct iwl_priv, start_internal_scan);
@@ -414,7 +418,11 @@ void iwl_bg_start_internal_scan(struct work_struct *work)if (WARN_ON (!priv->cfg->ops->utils->request_scan)) goto unlock; - priv->cfg->ops->utils->request_scan (priv,NULL ); + ret = priv->cfg->ops->utils->request_scan (priv,NULL ); +if (ret) { +clear_bit (STATUS_SCANNING , &priv->status); + priv->is_internal_short_scan = false; + } unlock:mutex_unlock (&priv->mutex); }
drivers/net/wireless/iwlwifi/iwl3945-base.c +6 -13
@@ -2799,7 +2799,7 @@ static void iwl3945_rfkill_poll(struct work_struct *data) } -void iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) +int iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) {struct iwl_host_cmd cmd = { .id =REPLY_SCAN_CMD ,
@@ -3000,25 +3000,18 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) scan->len =cpu_to_le16 (cmd.len);set_bit (STATUS_SCAN_HW , &priv->status); -if (iwl_send_cmd_sync (priv, &cmd)) +if (iwl_send_cmd_sync (priv, &cmd)) { +clear_bit (STATUS_SCAN_HW , &priv->status); goto done; + }queue_delayed_work (priv->workqueue, &priv->scan_check,IWL_SCAN_CHECK_WATCHDOG ); -return ; +return 0 ; done: -/* can not perform scan make sure we clear scanning -* bits from status so next scan request can be performed. -* if we dont clear scanning status bit here all next scan -* will fail -*/ -clear_bit (STATUS_SCAN_HW , &priv->status); -clear_bit (STATUS_SCANNING , &priv->status); - -/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->abort_scan); +return -EIO ; }static void iwl3945_bg_restart (struct work_struct *data)
Signature · 1 line
1.7.1
Re: [PATCH wireless-2.6 or stable] iwlwifi: return error when fail to start scanning
Hi Gruszka,
Quoted 22 lines · Stanislaw Gruszka
This is stable friendly backport of wireless-testing commit
3eecce527c7434dfd16517ce08b49632c8a26717"iwlwifi: unify scan start checks". Wireless-testing version include also a lot of cleanups.On error case in {iwl3945,iwlagn}_request_scan we queue
abort_scanwork, which in a fact do nothing, so we never complete the scan. Thats gives "WARNING: atnet/wireless/core.c:614wdev_cleanup_work" and stopped network connection until reload iwlwifi modules. Return of-EIO, and stopping queuing any work is a fix.Note there are still many cases when we can get:
WARNING: at net/wireless/core.c:614 wdev_cleanup_work WARNING: at net/mac80211/scan.c:266 ieee80211_scan_completed WARNING: at net/mac80211/scan.c:269 ieee80211_scan_completewhich are not fixed. Unfortunately does not exist single, small fix for that problems, and we probably will see some more bug reports with scan warnings. As solution we rewrite
iwl-scan.ccode to avoid all possible race conditions. That quite big patch set is queued for 2.6.37 .
Quoted 5 lines
Signed-off-by Stanislaw Gruszka <[email protected]>---
Patch is intended for wireless-2.6, or in case when it does not make 2.6.36 release, for -stable 2.6.36.y
Is this the replacement for Mickler's patch?
Thanks
Wey
Re: [PATCH wireless-2.6 or stable] iwlwifi: return error when fail to start scanning
Quoted 31 lines · Wey-Yi
Hi Gruszka,
Quoted 22 lines · Stanislaw Gruszka
This is stable friendly backport of wireless-testing commit
3eecce527c7434dfd16517ce08b49632c8a26717"iwlwifi: unify scan start checks". Wireless-testing version include also a lot of cleanups.On error case in {iwl3945,iwlagn}_request_scan we queue
abort_scanwork, which in a fact do nothing, so we never complete the scan. Thats gives "WARNING: atnet/wireless/core.c:614wdev_cleanup_work" and stopped network connection until reload iwlwifi modules. Return of-EIO, and stopping queuing any work is a fix.Note there are still many cases when we can get:
WARNING: at net/wireless/core.c:614 wdev_cleanup_work WARNING: at net/mac80211/scan.c:266 ieee80211_scan_completed WARNING: at net/mac80211/scan.c:269 ieee80211_scan_completewhich are not fixed. Unfortunately does not exist single, small fix for that problems, and we probably will see some more bug reports with scan warnings. As solution we rewrite
iwl-scan.ccode to avoid all possible race conditions. That quite big patch set is queued for 2.6.37 .Quoted 5 lines
Signed-off-by Stanislaw Gruszka <[email protected]>---
Patch is intended for wireless-2.6, or in case when it does not make 2.6.36 release, for -stable 2.6.36.y
Quoted 5 lines
Is this the replacement for Mickler's patch?
Thanks
Wey
This is on top of current mainline, as far as I see. (And it replaces the patch I sent few hours ago)
Regards,
Flo
Re: [PATCH wireless-2.6 or stable] iwlwifi: return error when fail to start scanning
In reply to Stanislaw GruszkaHi Stanislaw!
Quoted 16 lines · On Wed, 6 Oct 2010 18:04:35 +0200 Stanislaw Gruszka…
This is stable friendly backport of wireless-testing commit
3eecce527c7434dfd16517ce08b49632c8a26717"iwlwifi: unify scan start checks". Wireless-testing version include also a lot of cleanups.On error case in {iwl3945,iwlagn}_request_scan we queue
abort_scanwork, which in a fact do nothing, so we never complete the scan. Thats gives "WARNING: atnet/wireless/core.c:614wdev_cleanup_work" and stopped network connection until reload iwlwifi modules. Return of-EIO, and stopping queuing any work is a fix.Note there are still many cases when we can get:
WARNING: at net/wireless/core.c:614 wdev_cleanup_work WARNING: at net/mac80211/scan.c:266 ieee80211_scan_completed WARNING: at net/mac80211/scan.c:269 ieee80211_scan_complete
Quoted 8 lines
which are not fixed. Unfortunately does not exist single, small fix for that problems, and we probably will see some more bug reports with scan warnings. As solution we rewrite
iwl-scan.ccode to avoid all possible race conditions. That quite big patch set is queued for 2.6.37 .Signed-off-by Stanislaw Gruszka <[email protected]>---
Not that it matters much, but I've looked through it and couldn't find anything wrong with it.
Regards,
Flo
Quoted 174 lines
Patch is intended for wireless-2.6, or in case when it does not make 2.6.36 release, for -stable 2.6.36.y
drivers/net/wireless/iwlwifi/iwl-3945.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 18 ++++++------------ drivers/net/wireless/iwlwifi/iwl-agn.h | 2 +- drivers/net/wireless/iwlwifi/iwl-core.h | 2 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 14 +++++++++++--- drivers/net/wireless/iwlwifi/iwl3945-base.c | 19 ++++++------------- 6 files changed, 26 insertions(+), 31 deletions(-)drivers/net/wireless/iwlwifi/iwl-3945.h +1
-1@@ -295,7 +295,7 @@ extern const struct iwl_channel_info *iwl3945_get_channel_info(extern int iwl3945_rs_next_rate (struct iwl_priv *priv,int rate);/* scanning */ -void iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif); +int iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif);/* Requires full declaration of iwl_priv before including */ #include "iwl-io.h" drivers/net/wireless/iwlwifi/iwl-agn-lib.c +6
-12@@ -1147,7 +1147,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,return added; } -void iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) +int iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) {struct iwl_host_cmd cmd = { .id =REPLY_SCAN_CMD ,@@ -1394,24 +1394,18 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) scan->len =cpu_to_le16 (cmd.len);set_bit (STATUS_SCAN_HW , &priv->status); -if (iwl_send_cmd_sync (priv, &cmd)) +if (iwl_send_cmd_sync (priv, &cmd)) { +clear_bit (STATUS_SCAN_HW , &priv->status); goto done; + }queue_delayed_work (priv->workqueue, &priv->scan_check,IWL_SCAN_CHECK_WATCHDOG ); -return ; +return 0 ; done: -/* Cannot perform scan. Make sure we clear scanning -* bits from status so next scan request can be performed. -* If we don't clear scanning status bit here all next scan -* will fail -*/ -clear_bit (STATUS_SCAN_HW , &priv->status); -clear_bit (STATUS_SCANNING , &priv->status); -/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->abort_scan); +return -EIO ; } int iwlagn_manage_ibss_station(struct iwl_priv *priv,drivers/net/wireless/iwlwifi/iwl-agn.h +1
-1@@ -216,7 +216,7 @@ void iwl_reply_statistics(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);/* scan */ -void iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif); +int iwlagn_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif);/* station mgmt */ int iwlagn_manage_ibss_station(struct iwl_priv *priv,drivers/net/wireless/iwlwifi/iwl-core.h +1
-1@@ -109,7 +109,7 @@ struct iwl_hcmd_utils_ops { __le16 fc, __le32 *tx_flags);int (*calc_rssi)(struct iwl_priv *priv,struct iwl_rx_phy_res *rx_resp); -void (*request_scan)(struct iwl_priv *priv,struct ieee80211_vif *vif); +int (*request_scan)(struct iwl_priv *priv,struct ieee80211_vif *vif); };struct iwl_apm_ops {drivers/net/wireless/iwlwifi/iwl-scan.c +11
-3@@ -298,6 +298,7 @@ EXPORT_SYMBOL(iwl_init_scan_params);static int iwl_scan_initiate (struct iwl_priv *priv,struct ieee80211_vif *vif) { +int ret;lockdep_assert_held (&priv->mutex);IWL_DEBUG_INFO (priv,"Starting scan...\n" );@@ -308,9 +309,11 @@ static int iwl_scan_initiate(struct iwl_priv *priv, struct ieee80211_vif *vif)if (WARN_ON (!priv->cfg->ops->utils->request_scan))return -EOPNOTSUPP ; - priv->cfg->ops->utils->request_scan (priv, vif); + ret = priv->cfg->ops->utils->request_scan (priv, vif); +if (ret) +clear_bit (STATUS_SCANNING , &priv->status); +return ret; -return 0 ; } int iwl_mac_hw_scan(struct ieee80211_hw *hw,@@ -380,6 +383,7 @@ void iwl_internal_short_hw_scan(struct iwl_priv *priv)void iwl_bg_start_internal_scan (struct work_struct *work) { +int ret;struct iwl_priv *priv = container_of(work, struct iwl_priv, start_internal_scan);@@ -414,7 +418,11 @@ void iwl_bg_start_internal_scan(struct work_struct *work)if (WARN_ON (!priv->cfg->ops->utils->request_scan)) goto unlock; - priv->cfg->ops->utils->request_scan (priv,NULL ); + ret = priv->cfg->ops->utils->request_scan (priv,NULL ); +if (ret) { +clear_bit (STATUS_SCANNING , &priv->status); + priv->is_internal_short_scan = false; + } unlock:mutex_unlock (&priv->mutex); }drivers/net/wireless/iwlwifi/iwl3945-base.c +5
-7@@ -2799,7 +2799,7 @@ static void iwl3945_rfkill_poll(struct work_struct *data) } -void iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) +int iwl3945_request_scan (struct iwl_priv *priv,struct ieee80211_vif *vif) {struct iwl_host_cmd cmd = { .id =REPLY_SCAN_CMD ,@@ -3000,25 +3000,18 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) scan->len =cpu_to_le16 (cmd.len);set_bit (STATUS_SCAN_HW , &priv->status); -if (iwl_send_cmd_sync (priv, &cmd)) +if (iwl_send_cmd_sync (priv, &cmd)) { +clear_bit (STATUS_SCAN_HW , &priv->status); goto done; + }queue_delayed_work (priv->workqueue, &priv->scan_check,IWL_SCAN_CHECK_WATCHDOG ); -return ; +return 0 ; done: -/* can not perform scan make sure we clear scanning -* bits from status so next scan request can be performed. -* if we dont clear scanning status bit here all next scan -* will fail
drivers/net/wireless/iwlwifi/iwl3945-base.c void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) · line 3017
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl3945-base.c +1
-6-*/ -clear_bit (STATUS_SCAN_HW , &priv->status); -clear_bit (STATUS_SCANNING , &priv->status); - -/* inform mac80211 scan aborted */ -queue_work (priv->workqueue, &priv->abort_scan); +return -EIO ; }static void iwl3945_bg_restart (struct work_struct *data)
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH wireless-2.6 or stable] iwlwifi: return error when fail to start scanning
Quoted 28 lines · Florian Mickler
Hi Stanislaw!
Quoted 23 lines · On Wed, 6 Oct 2010 18:04:35 +0200 Stanislaw Gruszka <[email protected]> wrote:
This is stable friendly backport of wireless-testing commit
3eecce527c7434dfd16517ce08b49632c8a26717"iwlwifi: unify scan start checks". Wireless-testing version include also a lot of cleanups.On error case in {iwl3945,iwlagn}_request_scan we queue
abort_scanwork, which in a fact do nothing, so we never complete the scan. Thats gives "WARNING: atnet/wireless/core.c:614wdev_cleanup_work" and stopped network connection until reload iwlwifi modules. Return of-EIOand stopping queuing any work is a fix.Note there are still many cases when we can get:
WARNING: at net/wireless/core.c:614 wdev_cleanup_work WARNING: at net/mac80211/scan.c:266 ieee80211_scan_completed WARNING: at net/mac80211/scan.c:269 ieee80211_scan_completewhich are not fixed. Unfortunately does not exist single, small fix for that problems, and we probably will see some more bug reports with scan warnings. As solution we rewrite
iwl-scan.ccode to avoid all possible race conditions. That quite big patch set is queued for 2.6.37 .Signed-off-by Stanislaw Gruszka <[email protected]>
looks good to me
Thanks
Wey
Re: [PATCH wireless-2.6 or stable] iwlwifi: return error when fail to start scanning
In reply to Stanislaw GruszkaQuoted 22 lines · Stanislaw Gruszka
This is stable friendly backport of wireless-testing commit
3eecce527c7434dfd16517ce08b49632c8a26717"iwlwifi: unify scan start checks". Wireless-testing version include also a lot of cleanups.On error case in {iwl3945,iwlagn}_request_scan we queue
abort_scanwork, which in a fact do nothing, so we never complete the scan. Thats gives "WARNING: atnet/wireless/core.c:614wdev_cleanup_work" and stopped network connection until reload iwlwifi modules. Return of-EIO, and stopping queuing any work is a fix.Note there are still many cases when we can get:
WARNING: at net/wireless/core.c:614 wdev_cleanup_work WARNING: at net/mac80211/scan.c:266 ieee80211_scan_completed WARNING: at net/mac80211/scan.c:269 ieee80211_scan_completewhich are not fixed. Unfortunately does not exist single, small fix for that problems, and we probably will see some more bug reports with scan warnings. As solution we rewrite
iwl-scan.ccode to avoid all possible race conditions. That quite big patch set is queued for 2.6.37 .
Quoted 4 lines
Signed-off-by Stanislaw Gruszka <[email protected]>---
Patch is intended for wireless-2.6, or in case when it does not make 2.6.36 release, for -stable 2.6.36.y
I'm fine with this patch for -stable, but I'm not sure it is worthwhile to rush it into 2.6.36. The problem it fixes is intermittent and not always very severe, and we've already been living with it for 4 releases.
John
Signature · 6 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html