rpms/kernel/F-10 linux-2.6-wireless-iwlagn-avoid-sleep-in-softirq.patch, NONE, 1.1 kernel.spec, 1.1131, 1.1132

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26479

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-wireless-iwlagn-avoid-sleep-in-softirq.patch 
Log Message:
Fix "scheduling from idle thread" bug (#468896)

linux-2.6-wireless-iwlagn-avoid-sleep-in-softirq.patch:

--- NEW FILE linux-2.6-wireless-iwlagn-avoid-sleep-in-softirq.patch ---
From: John W. Linville <linville at tuxdriver.com>
Date: Thu, 30 Oct 2008 18:12:21 +0000 (-0400)
Subject: iwlagn: avoid sleep in softirq context
X-Git-Tag: v2.6.28-rc4~22^2^2~6
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=964d2777438bf7687324243d38ade538d9bbfe3c

iwlagn: avoid sleep in softirq context

__ieee80211_tasklet_handler -> __ieee80211_rx ->
	__ieee80211_rx_handle_packet -> ieee80211_invoke_rx_handlers ->
	ieee80211_rx_h_decrypt -> ieee80211_crypto_tkip_decrypt ->
	ieee80211_tkip_decrypt_data -> iwl4965_mac_update_tkip_key ->
	iwl_scan_cancel_timeout -> msleep

Ooops!

Avoid the sleep by changing iwl_scan_cancel_timeout with
iwl_scan_cancel and simply returning on failure if the scan persists.
This will cause hardware decryption to fail and we'll handle a few more
frames with software decryption.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 321dbc8..8d690a0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3252,7 +3252,11 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
 		return;
 	}
 
-	iwl_scan_cancel_timeout(priv, 100);
+	if (iwl_scan_cancel(priv)) {
+		/* cancel scan failed, just live w/ bad key and rely
+		   briefly on SW decryption */
+		return;
+	}
 
 	key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
 	key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -r1.1131 -r1.1132
--- kernel.spec	10 Nov 2008 22:04:47 -0000	1.1131
+++ kernel.spec	10 Nov 2008 23:25:36 -0000	1.1132
@@ -639,6 +639,7 @@
 Patch682: linux-2.6-iwl3945-ibss-tsf-fix.patch
 Patch683: linux-2.6-hostap-skb-cb-hack.patch
 Patch690: linux-2.6-at76.patch
+Patch691: linux-2.6-wireless-iwlagn-avoid-sleep-in-softirq.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1243,6 +1244,9 @@
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
+# fix sleep-in-softirq that caused 'scheduling from idle thread'
+ApplyPatch linux-2.6-wireless-iwlagn-avoid-sleep-in-softirq.patch
+
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1899,6 +1903,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Nov 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-96
+- Fix "scheduling from idle thread" bug (#468896)
+
 * Mon Nov 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-95
 - Build a list of modules that do kernel modesetting
   (modules.modesetting) (#470907)