From fe32595ee94a3d500e814728f54bad3edc4409e7 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 29 Nov 2011 10:29:39 -0500 Subject: [PATCH] Add patch to fix deadlock in rtlwifi (rhbz #755154) --- kernel.spec | 7 + rtlwifi-fix-lps_lock-deadlock.patch | 224 ++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+) create mode 100644 rtlwifi-fix-lps_lock-deadlock.patch diff --git a/kernel.spec b/kernel.spec index 7dd3adda4..0a28afa9b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -716,6 +716,9 @@ Patch21091: pci-Rework-ASPM-disable-code.patch #rhbz 753236 Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch +#rhbz 755154 +Patch21200: rtlwifi-fix-lps_lock-deadlock.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1376,6 +1379,9 @@ ApplyPatch pci-Rework-ASPM-disable-code.patch #rhbz 753236 ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch +#rhbz 755154 +ApplyPatch rtlwifi-fix-lps_lock-deadlock.patch + # END OF PATCH APPLICATIONS %endif @@ -2172,6 +2178,7 @@ fi * Tue Nov 29 2011 Josh Boyer - Add modules-extra subpackage - Drop drm-intel-make-lvds-work.patch (rhbz #731296) +- Add patch to fix deadlock in rtlwifi (rhbz #755154) * Tue Nov 29 2011 Josh Boyer 3.2.0-0.rc3.git1.1 - Linux 3.2-rc3-git1 diff --git a/rtlwifi-fix-lps_lock-deadlock.patch b/rtlwifi-fix-lps_lock-deadlock.patch new file mode 100644 index 000000000..4e31ee9b7 --- /dev/null +++ b/rtlwifi-fix-lps_lock-deadlock.patch @@ -0,0 +1,224 @@ +Path: news.gmane.org!not-for-mail +From: Stanislaw Gruszka +Newsgroups: gmane.linux.kernel.wireless.general +Subject: [PATCH v2] rtlwifi: fix lps_lock deadlock +Date: Mon, 28 Nov 2011 10:33:40 +0100 +Lines: 169 +Approved: news@gmane.org +Message-ID: <20111128093339.GC2372@redhat.com> +References: <1322219327-23148-1-git-send-email-sgruszka@redhat.com> + <4ECFD1BF.4070503@lwfinger.net> + <20111128092308.GB2372@redhat.com> +NNTP-Posting-Host: lo.gmane.org +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Trace: dough.gmane.org 1322472712 10173 80.91.229.12 (28 Nov 2011 09:31:52 GMT) +X-Complaints-To: usenet@dough.gmane.org +NNTP-Posting-Date: Mon, 28 Nov 2011 09:31:52 +0000 (UTC) +Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, + Chaoming Li +To: Larry Finger , + "John W. Linville" +Original-X-From: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Mon Nov 28 10:31:45 2011 +Return-path: +Envelope-to: glkwg-linux-wireless-1dZseelyfdZg9hUCZPvPmw@public.gmane.org +Original-Received: from vger.kernel.org ([209.132.180.67]) + by lo.gmane.org with esmtp (Exim 4.69) + (envelope-from ) + id 1RUxYu-0002H1-AY + for glkwg-linux-wireless-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Mon, 28 Nov 2011 10:31:44 +0100 +Original-Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand + id S1751698Ab1K1Jbm (ORCPT + ); + Mon, 28 Nov 2011 04:31:42 -0500 +Original-Received: from mx1.redhat.com ([209.132.183.28]:62078 "EHLO mx1.redhat.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751434Ab1K1Jbl (ORCPT ); + Mon, 28 Nov 2011 04:31:41 -0500 +Original-Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) + by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pAS9VSak003418 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Mon, 28 Nov 2011 04:31:28 -0500 +Original-Received: from localhost (vpn1-4-194.ams2.redhat.com [10.36.4.194]) + by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pAS9VQNG013260; + Mon, 28 Nov 2011 04:31:27 -0500 +Content-Disposition: inline +In-Reply-To: <20111128092308.GB2372-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +User-Agent: Mutt/1.5.20 (2009-12-10) +X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 +Original-Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Xref: news.gmane.org gmane.linux.kernel.wireless.general:81657 +Archived-At: + +rtl_lps_leave can be called from interrupt context, so we have to +disable interrupts when taking lps_lock. + +Below is full lockdep info about deadlock: + +[ 93.815269] ================================= +[ 93.815390] [ INFO: inconsistent lock state ] +[ 93.815472] 2.6.41.1-3.offch.fc15.x86_64.debug #1 +[ 93.815556] --------------------------------- +[ 93.815635] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. +[ 93.815743] swapper/0 [HC0[0]:SC1[1]:HE1:SE0] takes: +[ 93.815832] (&(&rtlpriv->locks.lps_lock)->rlock){+.?...}, at: [] rtl_lps_leave+0x26/0x103 [rtlwifi] +[ 93.815947] {SOFTIRQ-ON-W} state was registered at: +[ 93.815947] [] __lock_acquire+0x369/0xd0c +[ 93.815947] [] lock_acquire+0xf3/0x13e +[ 93.815947] [] _raw_spin_lock+0x45/0x79 +[ 93.815947] [] rtl_swlps_rf_awake+0x5a/0x76 [rtlwifi] +[ 93.815947] [] rtl_op_config+0x12a/0x32a [rtlwifi] +[ 93.815947] [] ieee80211_hw_config+0x124/0x129 [mac80211] +[ 93.815947] [] ieee80211_dynamic_ps_disable_work+0x32/0x47 [mac80211] +[ 93.815947] [] process_one_work+0x205/0x3e7 +[ 93.815947] [] worker_thread+0xda/0x15d +[ 93.815947] [] kthread+0xa8/0xb0 +[ 93.815947] [] kernel_thread_helper+0x4/0x10 +[ 93.815947] irq event stamp: 547822 +[ 93.815947] hardirqs last enabled at (547822): [] _raw_spin_unlock_irqrestore+0x45/0x61 +[ 93.815947] hardirqs last disabled at (547821): [] _raw_spin_lock_irqsave+0x22/0x8e +[ 93.815947] softirqs last enabled at (547790): [] _local_bh_enable+0x13/0x15 +[ 93.815947] softirqs last disabled at (547791): [] call_softirq+0x1c/0x30 +[ 93.815947] +[ 93.815947] other info that might help us debug this: +[ 93.815947] Possible unsafe locking scenario: +[ 93.815947] +[ 93.815947] CPU0 +[ 93.815947] ---- +[ 93.815947] lock(&(&rtlpriv->locks.lps_lock)->rlock); +[ 93.815947] +[ 93.815947] lock(&(&rtlpriv->locks.lps_lock)->rlock); +[ 93.815947] +[ 93.815947] *** DEADLOCK *** +[ 93.815947] +[ 93.815947] no locks held by swapper/0. +[ 93.815947] +[ 93.815947] stack backtrace: +[ 93.815947] Pid: 0, comm: swapper Not tainted 2.6.41.1-3.offch.fc15.x86_64.debug #1 +[ 93.815947] Call Trace: +[ 93.815947] [] print_usage_bug+0x1e7/0x1f8 +[ 93.815947] [] ? save_stack_trace+0x2c/0x49 +[ 93.815947] [] ? print_irq_inversion_bug.part.18+0x1a0/0x1a0 +[ 93.815947] [] mark_lock+0x106/0x220 +[ 93.815947] [] __lock_acquire+0x2f5/0xd0c +[ 93.815947] [] ? native_sched_clock+0x34/0x36 +[ 93.830125] [] ? sched_clock+0x9/0xd +[ 93.830125] [] ? sched_clock_local+0x12/0x75 +[ 93.830125] [] ? rtl_lps_leave+0x26/0x103 [rtlwifi] +[ 93.830125] [] lock_acquire+0xf3/0x13e +[ 93.830125] [] ? rtl_lps_leave+0x26/0x103 [rtlwifi] +[ 93.830125] [] _raw_spin_lock+0x45/0x79 +[ 93.830125] [] ? rtl_lps_leave+0x26/0x103 [rtlwifi] +[ 93.830125] [] ? skb_dequeue+0x62/0x6d +[ 93.830125] [] rtl_lps_leave+0x26/0x103 [rtlwifi] +[ 93.830125] [] _rtl_pci_ips_leave_tasklet+0xe/0x10 [rtlwifi] +[ 93.830125] [] tasklet_action+0x8d/0xee +[ 93.830125] [] __do_softirq+0x112/0x25a +[ 93.830125] [] call_softirq+0x1c/0x30 +[ 93.830125] [] do_softirq+0x4b/0xa1 +[ 93.830125] [] irq_exit+0x5d/0xcf +[ 93.830125] [] do_IRQ+0x8e/0xa5 +[ 93.830125] [] common_interrupt+0x73/0x73 +[ 93.830125] [] ? trace_hardirqs_off+0xd/0xf +[ 93.830125] [] ? intel_idle+0xe5/0x10c +[ 93.830125] [] ? intel_idle+0xe1/0x10c +[ 93.830125] [] cpuidle_idle_call+0x11c/0x1fe +[ 93.830125] [] cpu_idle+0xab/0x101 +[ 93.830125] [] rest_init+0xd7/0xde +[ 93.830125] [] ? csum_partial_copy_generic+0x16c/0x16c +[ 93.830125] [] start_kernel+0x3dd/0x3ea +[ 93.830125] [] x86_64_start_reservations+0xaf/0xb3 +[ 93.830125] [] ? early_idt_handlers+0x140/0x140 +[ 93.830125] [] x86_64_start_kernel+0x102/0x111 + +Resolves: +https://bugzilla.redhat.com/show_bug.cgi?id=755154 + +Reported-by: vjain02-9geRo0GdX4mblYp+tMVdN4dd74u8MsAO@public.gmane.org +Reported-and-tested-by: Oliver Paukstadt +Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Acked-by: Larry Finger +Signed-off-by: Stanislaw Gruszka +--- +v1 -> v2: add bug report reference + + drivers/net/wireless/rtlwifi/ps.c | 17 +++++++++-------- + 1 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c +index db52628..55c8e50 100644 +--- a/drivers/net/wireless/rtlwifi/ps.c ++++ b/drivers/net/wireless/rtlwifi/ps.c +@@ -395,7 +395,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw) + if (mac->link_state != MAC80211_LINKED) + return; + +- spin_lock(&rtlpriv->locks.lps_lock); ++ spin_lock_irq(&rtlpriv->locks.lps_lock); + + /* Idle for a while if we connect to AP a while ago. */ + if (mac->cnt_after_linked >= 2) { +@@ -407,7 +407,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw) + } + } + +- spin_unlock(&rtlpriv->locks.lps_lock); ++ spin_unlock_irq(&rtlpriv->locks.lps_lock); + } + + /*Leave the leisure power save mode.*/ +@@ -416,8 +416,9 @@ void rtl_lps_leave(struct ieee80211_hw *hw) + struct rtl_priv *rtlpriv = rtl_priv(hw); + struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); + struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); ++ unsigned long flags; + +- spin_lock(&rtlpriv->locks.lps_lock); ++ spin_lock_irqsave(&rtlpriv->locks.lps_lock, flags); + + if (ppsc->fwctrl_lps) { + if (ppsc->dot11_psmode != EACTIVE) { +@@ -438,7 +439,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw) + rtl_lps_set_psmode(hw, EACTIVE); + } + } +- spin_unlock(&rtlpriv->locks.lps_lock); ++ spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flags); + } + + /* For sw LPS*/ +@@ -539,9 +540,9 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw) + RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM); + } + +- spin_lock(&rtlpriv->locks.lps_lock); ++ spin_lock_irq(&rtlpriv->locks.lps_lock); + rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS); +- spin_unlock(&rtlpriv->locks.lps_lock); ++ spin_unlock_irq(&rtlpriv->locks.lps_lock); + } + + void rtl_swlps_rfon_wq_callback(void *data) +@@ -574,9 +575,9 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw) + if (rtlpriv->link_info.busytraffic) + return; + +- spin_lock(&rtlpriv->locks.lps_lock); ++ spin_lock_irq(&rtlpriv->locks.lps_lock); + rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS); +- spin_unlock(&rtlpriv->locks.lps_lock); ++ spin_unlock_irq(&rtlpriv->locks.lps_lock); + + if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM && + !RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) { +-- +1.7.1 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-wireless" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +