From a78de7a89d92b651e1a8ef52083f3721e467dde7 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 4 Feb 2013 09:49:15 -0500 Subject: [PATCH] Fix rtlwifi scheduling while atomic from Larry Finger (rhbz 903881) --- kernel.spec | 7 ++ rtlwifi-Fix-scheduling-while-atomic-bug.patch | 65 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 rtlwifi-Fix-scheduling-while-atomic-bug.patch diff --git a/kernel.spec b/kernel.spec index da2d8b4d6..fd524a8c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -752,6 +752,9 @@ Patch21242: criu-no-expert.patch Patch21243: mac80211-improve-latency-and-throughput-while-software.patch Patch21244: iwlegacy-add-flush-callback.patch +#rhbz 903881 +Patch21246: rtlwifi-Fix-scheduling-while-atomic-bug.patch + # END OF PATCH DEFINITIONS %endif @@ -1454,6 +1457,9 @@ ApplyPatch criu-no-expert.patch ApplyPatch mac80211-improve-latency-and-throughput-while-software.patch ApplyPatch iwlegacy-add-flush-callback.patch +#rhbz 903881 +ApplyPatch rtlwifi-Fix-scheduling-while-atomic-bug.patch + # END OF PATCH APPLICATIONS %endif @@ -2312,6 +2318,7 @@ fi * Mon Feb 04 2013 Josh Boyer - 3.8.0-0.rc6.git1.1 - Linux v3.8-rc6-22-g6edacf0 - Enable CONFIG_EXT4_DEBUG +- Fix rtlwifi scheduling while atomic from Larry Finger (rhbz 903881) * Fri Feb 01 2013 Josh Boyer - 3.8.0-0.rc6.git0.1 - Linux v3.8-rc6 diff --git a/rtlwifi-Fix-scheduling-while-atomic-bug.patch b/rtlwifi-Fix-scheduling-while-atomic-bug.patch new file mode 100644 index 000000000..d05b104b5 --- /dev/null +++ b/rtlwifi-Fix-scheduling-while-atomic-bug.patch @@ -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 +Reported-and-tested-by: Nathaniel Doherty +Cc: Nathaniel Doherty +Cc: Stanislaw Gruszka +Cc: Stable +--- + +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 \ No newline at end of file