rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix rtlwifi scheduling while atomic from Larry Finger (rhbz 903881)

Browse Source
This commit is contained in:
Josh Boyer 2013-02-04 09:49:15 -05:00
parent b5da79f835
commit a78de7a89d
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -752,6 +752,9 @@ Patch21242: criu-no-expert.patch
Patch21243: mac80211-improve-latency-and-throughput-while-software.patch Patch21243: mac80211-improve-latency-and-throughput-while-software.patch
Patch21244: iwlegacy-add-flush-callback.patch Patch21244: iwlegacy-add-flush-callback.patch
#rhbz 903881
Patch21246: rtlwifi-Fix-scheduling-while-atomic-bug.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
%endif %endif
@ -1454,6 +1457,9 @@ ApplyPatch criu-no-expert.patch
ApplyPatch mac80211-improve-latency-and-throughput-while-software.patch ApplyPatch mac80211-improve-latency-and-throughput-while-software.patch
ApplyPatch iwlegacy-add-flush-callback.patch ApplyPatch iwlegacy-add-flush-callback.patch
#rhbz 903881
ApplyPatch rtlwifi-Fix-scheduling-while-atomic-bug.patch
# END OF PATCH APPLICATIONS # END OF PATCH APPLICATIONS
%endif %endif
@ -2312,6 +2318,7 @@ fi
* Mon Feb 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git1.1 * Mon Feb 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git1.1
- Linux v3.8-rc6-22-g6edacf0 - Linux v3.8-rc6-22-g6edacf0
- Enable CONFIG_EXT4_DEBUG - Enable CONFIG_EXT4_DEBUG
- Fix rtlwifi scheduling while atomic from Larry Finger (rhbz 903881)
* Fri Feb 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git0.1 * Fri Feb 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git0.1
- Linux v3.8-rc6 - Linux v3.8-rc6

65
rtlwifi-Fix-scheduling-while-atomic-bug.patch Normal file
View File

@ -0,0 +1,65 @@
Kernel commits 41affd5 and 6539306 changed the locking in rtl_lps_leave()
from a spinlock to a mutex by doing the calls indirectly from a work queue
to reduce the time that interrupts were disabled. This change was fine for
most systems; however a scheduling while atomic bug was reported in
https://bugzilla.redhat.com/show_bug.cgi?id=903881. The backtrace indicates
that routine rtl_is_special(), which calls rtl_lps_leave() in three places
was entered in atomic context. These direct calls are replaced by putting a
request on the appropriate work queue.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Reported-and-tested-by: Nathaniel Doherty <ntdoherty@gmail.com>
Cc: Nathaniel Doherty <ntdoherty@gmail.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Stable <stable@vger.kernel.org>
---
John,
If DaveM will still accept bug fixes for 3.8, please push this one. It
is unlikely to have any side effects.
Thanks,
Larry
---
base.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/base.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
@@ -1004,7 +1004,8 @@ u8 rtl_is_special_data(struct ieee80211_
is_tx ? "Tx" : "Rx");
if (is_tx) {
- rtl_lps_leave(hw);
+ schedule_work(&rtlpriv->
+ works.lps_leave_work);
ppsc->last_delaylps_stamp_jiffies =
jiffies;
}
@@ -1014,7 +1015,7 @@ u8 rtl_is_special_data(struct ieee80211_
}
} else if (ETH_P_ARP == ether_type) {
if (is_tx) {
- rtl_lps_leave(hw);
+ schedule_work(&rtlpriv->works.lps_leave_work);
ppsc->last_delaylps_stamp_jiffies = jiffies;
}
@@ -1024,7 +1025,7 @@ u8 rtl_is_special_data(struct ieee80211_
"802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx");
if (is_tx) {
- rtl_lps_leave(hw);
+ schedule_work(&rtlpriv->works.lps_leave_work);
ppsc->last_delaylps_stamp_jiffies = jiffies;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html