From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Stanislaw Gruszka <sgruszka@redhat.com>,
Wey-Yi Guy <wey-yi.w.guy@intel.com>,
"John W. Linville" <linville@tuxdriver.com>
Subject: [88/89] iwlagn: fix channel switch locking
Date: Wed, 15 Jun 2011 17:00:51 -0700 [thread overview]
Message-ID: <20110616000237.567987743@clark.kroah.org> (raw)
In-Reply-To: <20110616000258.GA14529@kroah.com>
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------
From: Stanislaw Gruszka <sgruszka@redhat.com>
commit 6f213ff1919fab6f8244ceae55631b5d6ef750a7 upstream.
We use priv->mutex to avoid race conditions between iwl_chswitch_done()
and iwlagn_mac_channel_switch(), when marking channel switch in
progress. But iwl_chswitch_done() can be called in atomic context
from iwl_rx_csa() or with mutex already taken from iwlagn_commit_rxon().
These bugs were introduced by:
commit 79d07325502e73508f917475bc1617b60979dd94
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Thu May 6 08:54:11 2010 -0700
iwlwifi: support channel switch offload in driver
To fix remove mutex from iwl_chswitch_done() and use atomic bitops for
marking channel switch pending.
Also remove iwl2030_hw_channel_switch() since 2000 series adapters are
2.4GHz only devices.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/net/wireless/iwlwifi/iwl-2000.c | 74 ----------------------------
drivers/net/wireless/iwlwifi/iwl-5000.c | 2
drivers/net/wireless/iwlwifi/iwl-6000.c | 2
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 19 +++----
drivers/net/wireless/iwlwifi/iwl-core.c | 6 --
drivers/net/wireless/iwlwifi/iwl-core.h | 2
drivers/net/wireless/iwlwifi/iwl-dev.h | 13 ----
drivers/net/wireless/iwlwifi/iwl-rx.c | 24 ++++-----
9 files changed, 28 insertions(+), 120 deletions(-)
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -181,79 +181,6 @@ static int iwl2000_hw_set_hw_params(stru
return 0;
}
-static int iwl2030_hw_channel_switch(struct iwl_priv *priv,
- struct ieee80211_channel_switch *ch_switch)
-{
- /*
- * MULTI-FIXME
- * See iwl_mac_channel_switch.
- */
- struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
- struct iwl6000_channel_switch_cmd cmd;
- const struct iwl_channel_info *ch_info;
- u32 switch_time_in_usec, ucode_switch_time;
- u16 ch;
- u32 tsf_low;
- u8 switch_count;
- u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
- struct ieee80211_vif *vif = ctx->vif;
- struct iwl_host_cmd hcmd = {
- .id = REPLY_CHANNEL_SWITCH,
- .len = sizeof(cmd),
- .flags = CMD_SYNC,
- .data = &cmd,
- };
-
- cmd.band = priv->band == IEEE80211_BAND_2GHZ;
- ch = ch_switch->channel->hw_value;
- IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
- ctx->active.channel, ch);
- cmd.channel = cpu_to_le16(ch);
- cmd.rxon_flags = ctx->staging.flags;
- cmd.rxon_filter_flags = ctx->staging.filter_flags;
- switch_count = ch_switch->count;
- tsf_low = ch_switch->timestamp & 0x0ffffffff;
- /*
- * calculate the ucode channel switch time
- * adding TSF as one of the factor for when to switch
- */
- if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
- if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
- beacon_interval)) {
- switch_count -= (priv->ucode_beacon_time -
- tsf_low) / beacon_interval;
- } else
- switch_count = 0;
- }
- if (switch_count <= 1)
- cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
- else {
- switch_time_in_usec =
- vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
- ucode_switch_time = iwl_usecs_to_beacons(priv,
- switch_time_in_usec,
- beacon_interval);
- cmd.switch_time = iwl_add_beacon_time(priv,
- priv->ucode_beacon_time,
- ucode_switch_time,
- beacon_interval);
- }
- IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
- cmd.switch_time);
- ch_info = iwl_get_channel_info(priv, priv->band, ch);
- if (ch_info)
- cmd.expect_beacon = is_channel_radar(ch_info);
- else {
- IWL_ERR(priv, "invalid channel switch from %u to %u\n",
- ctx->active.channel, ch);
- return -EFAULT;
- }
- priv->switch_rxon.channel = cmd.channel;
- priv->switch_rxon.switch_in_progress = true;
-
- return iwl_send_cmd_sync(priv, &hcmd);
-}
-
static struct iwl_lib_ops iwl2000_lib = {
.set_hw_params = iwl2000_hw_set_hw_params,
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
@@ -277,7 +204,6 @@ static struct iwl_lib_ops iwl2000_lib =
.alive_notify = iwlagn_alive_notify,
.send_tx_power = iwlagn_send_tx_power,
.update_chain_flags = iwl_update_chain_flags,
- .set_channel_switch = iwl2030_hw_channel_switch,
.apm_ops = {
.init = iwl_apm_init,
.config = iwl2000_nic_config,
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -337,8 +337,6 @@ static int iwl5000_hw_channel_switch(str
ctx->active.channel, ch);
return -EFAULT;
}
- priv->switch_rxon.channel = cmd.channel;
- priv->switch_rxon.switch_in_progress = true;
return iwl_send_cmd_sync(priv, &hcmd);
}
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -277,8 +277,6 @@ static int iwl6000_hw_channel_switch(str
ctx->active.channel, ch);
return -EFAULT;
}
- priv->switch_rxon.channel = cmd.channel;
- priv->switch_rxon.switch_in_progress = true;
return iwl_send_cmd_sync(priv, &hcmd);
}
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -197,10 +197,10 @@ int iwlagn_commit_rxon(struct iwl_priv *
* receive commit_rxon request
* abort any previous channel switch if still in process
*/
- if (priv->switch_rxon.switch_in_progress &&
- (priv->switch_rxon.channel != ctx->staging.channel)) {
+ if (test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status) &&
+ (priv->switch_channel != ctx->staging.channel)) {
IWL_DEBUG_11H(priv, "abort channel switch on %d\n",
- le16_to_cpu(priv->switch_rxon.channel));
+ le16_to_cpu(priv->switch_channel));
iwl_chswitch_done(priv, false);
}
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3461,16 +3461,13 @@ void iwlagn_mac_channel_switch(struct ie
goto out_exit;
if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
- test_bit(STATUS_SCANNING, &priv->status))
+ test_bit(STATUS_SCANNING, &priv->status) ||
+ test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
goto out_exit;
if (!iwl_is_associated_ctx(ctx))
goto out_exit;
- /* channel switch in progress */
- if (priv->switch_rxon.switch_in_progress == true)
- goto out_exit;
-
mutex_lock(&priv->mutex);
if (priv->cfg->ops->lib->set_channel_switch) {
@@ -3520,16 +3517,20 @@ void iwlagn_mac_channel_switch(struct ie
* at this point, staging_rxon has the
* configuration for channel switch
*/
+ set_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
+ priv->switch_channel = cpu_to_le16(ch);
if (priv->cfg->ops->lib->set_channel_switch(priv,
- ch_switch))
- priv->switch_rxon.switch_in_progress = false;
+ ch_switch)) {
+ clear_bit(STATUS_CHANNEL_SWITCH_PENDING,
+ &priv->status);
+ priv->switch_channel = 0;
+ ieee80211_chswitch_done(ctx->vif, false);
+ }
}
}
out:
mutex_unlock(&priv->mutex);
out_exit:
- if (!priv->switch_rxon.switch_in_progress)
- ieee80211_chswitch_done(ctx->vif, false);
IWL_DEBUG_MAC80211(priv, "leave\n");
}
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -861,12 +861,8 @@ void iwl_chswitch_done(struct iwl_priv *
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return;
- if (priv->switch_rxon.switch_in_progress) {
+ if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
ieee80211_chswitch_done(ctx->vif, is_success);
- mutex_lock(&priv->mutex);
- priv->switch_rxon.switch_in_progress = false;
- mutex_unlock(&priv->mutex);
- }
}
#ifdef CONFIG_IWLWIFI_DEBUG
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -662,7 +662,7 @@ void iwlcore_free_geos(struct iwl_priv *
#define STATUS_SCAN_HW 15
#define STATUS_POWER_PMI 16
#define STATUS_FW_ERROR 17
-
+#define STATUS_CHANNEL_SWITCH_PENDING 19
static inline int iwl_is_ready(struct iwl_priv *priv)
{
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1037,17 +1037,6 @@ struct traffic_stats {
};
/*
- * iwl_switch_rxon: "channel switch" structure
- *
- * @ switch_in_progress: channel switch in progress
- * @ channel: new channel
- */
-struct iwl_switch_rxon {
- bool switch_in_progress;
- __le16 channel;
-};
-
-/*
* schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds
* to perform continuous uCode event logging operation if enabled
*/
@@ -1344,7 +1333,7 @@ struct iwl_priv {
struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];
- struct iwl_switch_rxon switch_rxon;
+ __le16 switch_channel;
/* 1st responses from initialize and runtime uCode images.
* _agn's initialize alive response contains some calibration data. */
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -299,19 +299,19 @@ static void iwl_rx_csa(struct iwl_priv *
struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
struct iwl_rxon_cmd *rxon = (void *)&ctx->active;
- if (priv->switch_rxon.switch_in_progress) {
- if (!le32_to_cpu(csa->status) &&
- (csa->channel == priv->switch_rxon.channel)) {
- rxon->channel = csa->channel;
- ctx->staging.channel = csa->channel;
- IWL_DEBUG_11H(priv, "CSA notif: channel %d\n",
- le16_to_cpu(csa->channel));
- iwl_chswitch_done(priv, true);
- } else {
- IWL_ERR(priv, "CSA notif (fail) : channel %d\n",
+ if (!test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
+ return;
+
+ if (!le32_to_cpu(csa->status) && csa->channel == priv->switch_channel) {
+ rxon->channel = csa->channel;
+ ctx->staging.channel = csa->channel;
+ IWL_DEBUG_11H(priv, "CSA notif: channel %d\n",
le16_to_cpu(csa->channel));
- iwl_chswitch_done(priv, false);
- }
+ iwl_chswitch_done(priv, true);
+ } else {
+ IWL_ERR(priv, "CSA notif (fail) : channel %d\n",
+ le16_to_cpu(csa->channel));
+ iwl_chswitch_done(priv, false);
}
}
next prev parent reply other threads:[~2011-06-16 7:02 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 0:02 [00/89] 2.6.39.2-stable review Greg KH
2011-06-15 23:59 ` [01/89] lguest: fix timer interrupt setup Greg KH
2011-06-15 23:59 ` [02/89] intel-iommu: Flush unmaps at domain_exit Greg KH
2011-06-15 23:59 ` [03/89] intel-iommu: Only unlink device domains from iommu Greg KH
2011-06-15 23:59 ` [04/89] intel-iommu: Check for identity mapping candidate using Greg KH
2011-06-15 23:59 ` [05/89] intel-iommu: Speed up processing of the identity_mapping Greg KH
2011-06-15 23:59 ` [06/89] intel-iommu: Dont cache iova above 32bit Greg KH
2011-06-15 23:59 ` [07/89] intel-iommu: Use coherent DMA mask when requested Greg KH
2011-06-15 23:59 ` [08/89] intel-iommu: Remove Host Bridge devices from identity Greg KH
2011-06-15 23:59 ` [09/89] intel-iommu: Add domain check in domain_remove_one_dev_info Greg KH
2011-06-15 23:59 ` [10/89] powerpc/4xx: Fix regression in SMP on 476 Greg KH
2011-06-15 23:59 ` [11/89] arch/tile: allocate PCI IRQs later in boot Greg KH
2011-06-15 23:59 ` [12/89] UBIFS: fix shrinker object count reports Greg KH
2011-06-15 23:59 ` [13/89] UBIFS: fix memory leak on error path Greg KH
2011-06-15 23:59 ` [14/89] block: blkdev_get() should access ->bd_disk only after Greg KH
2011-06-15 23:59 ` [15/89] nbd: limit module parameters to a sane value Greg KH
2011-06-15 23:59 ` [16/89] [SCSI] Fix oops caused by queue refcounting failure Greg KH
2011-06-15 23:59 ` [17/89] ath9k: Reset chip on baseband hang Greg KH
2011-06-15 23:59 ` [18/89] ath9k: set 40 Mhz rate only if hw is configured in ht40 Greg KH
2011-06-15 23:59 ` [19/89] ath9k: fix two more bugs in tx power Greg KH
2011-06-15 23:59 ` [20/89] hwmon: (coretemp) Fix TjMax detection for older CPUs Greg KH
2011-06-15 23:59 ` [21/89] hwmon: (coretemp) Relax target temperature range check Greg KH
2011-06-15 23:59 ` [22/89] iwl4965: fix 5GHz operation Greg KH
2011-06-15 23:59 ` [23/89] iwl4965: correctly validate temperature value Greg KH
2011-06-15 23:59 ` [24/89] zd1211rw: fix to work on OHCI Greg KH
2011-06-15 23:59 ` [25/89] mm: fix ENOSPC returned by handle_mm_fault() Greg KH
2011-06-15 23:59 ` [26/89] serial: core, move termios handling to uart_startup Greg KH
2011-06-15 23:59 ` [27/89] serial: core, do not set DTR/RTS twice on startup Greg KH
2011-06-15 23:59 ` [28/89] serial: core, remove uart_update_termios Greg KH
2011-06-15 23:59 ` [29/89] PCI: Set PCIE maxpayload for card during hotplug insertion Greg KH
2011-06-15 23:59 ` [30/89] powerpc: Fix 32-bit SMP build Greg KH
2011-06-15 23:59 ` [31/89] asus-wmi: Remove __init from asus_wmi_platform_init Greg KH
2011-06-15 23:59 ` [32/89] nl80211: fix check for valid SSID size in scan operations Greg KH
2011-06-15 23:59 ` [33/89] block: export blk_{get,put}_queue() Greg KH
2011-06-15 23:59 ` [34/89] usbnet/cdc_ncm: add missing .reset_resume hook Greg KH
2011-06-15 23:59 ` [35/89] lockdep: Fix lock_is_held() on recursion Greg KH
2011-06-15 23:59 ` [36/89] drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007 Greg KH
2011-06-16 0:00 ` [37/89] drm/radeon/kms: viewport height has to be even Greg KH
2011-06-16 0:00 ` [38/89] drm/radeon/kms: fix for radeon on systems >4GB without Greg KH
2011-06-16 0:00 ` [39/89] fat: Fix corrupt inode flags when remove ATTR_SYS flag Greg KH
2011-06-16 0:00 ` [40/89] xen: off by one errors in multicalls.c Greg KH
2011-06-16 0:00 ` [51/89] option: add Zoom 4597 modem USB IDs Greg KH
2011-06-16 0:00 ` [52/89] option: add Alcatel X200 to sendsetup blacklist Greg KH
2011-06-16 0:00 ` [53/89] option: add Prolink PH300 modem IDs Greg KH
2011-06-16 0:00 ` [54/89] USB: option Add blacklist for ZTE K3765-Z (19d2:2002) Greg KH
2011-06-16 0:00 ` [55/89] Revert "USB: option: add ID for ZTE MF 330" Greg KH
2011-06-16 0:00 ` [56/89] USB: core: Tolerate protocol stall during hub and port Greg KH
2011-06-16 0:00 ` [57/89] USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver Greg KH
2011-06-16 0:00 ` [58/89] usb-storage: redo incorrect reads Greg KH
2011-06-16 0:00 ` [59/89] Revert "x86, efi: Retain boot service code until after switching to virtual mode" Greg KH
2011-06-16 0:00 ` [60/89] xhci: Add defines for hardcoded slot states Greg KH
2011-06-16 0:00 ` [61/89] xhci: Do not issue device reset when device is not setup Greg KH
2011-06-16 0:00 ` [62/89] xhci: Disable MSI for some Fresco Logic hosts Greg KH
2011-06-16 0:00 ` [63/89] USB: xhci - fix interval calculation for FS isoc endpoints Greg KH
2011-06-16 0:00 ` [64/89] AppArmor: Fix sleep in invalid context from task_setrlimit Greg KH
2011-06-16 0:00 ` [65/89] cifs: dont allow cifs_reconnect to exit with NULL socket Greg KH
2011-06-16 0:00 ` [66/89] ASoC: AD1836: Fix setting the PCM format Greg KH
2011-06-16 0:00 ` [67/89] ASoC: Fix WM8962 headphone volume update for use of advanced Greg KH
2011-06-16 0:00 ` [68/89] ASoC: WM8804 does not support sample rates below 32kHz Greg KH
2011-06-16 0:00 ` [69/89] ASoC: snd_soc_new_{mixer,mux,pga} make sure to use right Greg KH
2011-06-16 0:00 ` [70/89] ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON Greg KH
2011-06-16 0:00 ` [71/89] ALSA: hda: Fix quirk for Dell Inspiron 910 Greg KH
2011-06-16 0:00 ` [72/89] oprofile: Free potentially owned tasks in case of errors Greg KH
2011-06-16 0:00 ` [73/89] oprofile: Fix locking dependency in sync_start() Greg KH
2011-06-16 0:00 ` [74/89] oprofile, dcookies: Fix possible circular locking dependency Greg KH
2011-06-16 0:00 ` [75/89] drm/radeon/kms: do bounds checking for 3D_LOAD_VBPNTR and Greg KH
2011-06-16 0:00 ` [76/89] iwlagn: use cts-to-self protection on 5000 adapters series Greg KH
2011-06-16 0:00 ` [77/89] iwl4965: set tx power after rxon_assoc Greg KH
2011-06-16 0:00 ` [78/89] igb: fix i350 SR-IOV failture Greg KH
2011-06-16 0:00 ` [79/89] mac80211: fix IBSS teardown race Greg KH
2011-06-16 0:00 ` [80/89] x86: devicetree: Add missing early_init_dt_setup_initrd_arch Greg KH
2011-06-16 0:00 ` [81/89] x86: cpu-hotplug: Prevent softirq wakeup on wrong CPU Greg KH
2011-06-16 0:00 ` [82/89] CPUFREQ: Remove cpufreq_stats sysfs entries on module unload Greg KH
2011-06-16 0:00 ` [83/89] TOMOYO: Fix oops in tomoyo_mount_acl() Greg KH
2011-06-16 0:00 ` [84/89] md: check ->hot_remove_disk when removing disk Greg KH
2011-06-16 0:00 ` [85/89] md/raid5: fix raid5_set_bi_hw_segments Greg KH
2011-06-16 0:00 ` [86/89] md/raid5: fix FUA request handling in ops_run_io() Greg KH
2011-06-16 0:00 ` [87/89] iwlagn: send tx power command if defer cause by RXON not Greg KH
2011-06-16 0:00 ` Greg KH [this message]
2011-06-16 0:00 ` [89/89] iwlegacy: fix channel switch locking Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110616000237.567987743@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=sgruszka@redhat.com \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=wey-yi.w.guy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®