From patchwork Mon Mar 18 21:03:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 2295041 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 12C9C3FD8C for ; Mon, 18 Mar 2013 20:37:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754962Ab3CRUhU (ORCPT ); Mon, 18 Mar 2013 16:37:20 -0400 Received: from sabertooth02.qualcomm.com ([65.197.215.38]:45484 "EHLO sabertooth02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754054Ab3CRUhS (ORCPT ); Mon, 18 Mar 2013 16:37:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1363639037; x=1395175037; h=cc:date:from:to:subject:message-id:references: mime-version:in-reply-to; bh=MkCy5W1SYBQWp/6bECLP1QDTmCqqvsfYigpFcxPIRGQ=; b=wjBoeD5AlJSYewcVsJ3V+JCLR3VD5DsZLZJN33Sa3+Zeyek33XbJSeks s6B2jll7UG1FG4h8UXdAnFpUdd/vX3Mz6TlxTOhPVUbCMJTQtGrOOi3ca mDZPZjP1/nc+IHkm8bnBvQurHtzP8OnSmYY26QMwyhZ3SOn03Cy2EjSXw 0=; X-IronPort-AV: E=Sophos;i="4.84,865,1355126400"; d="scan'208";a="30534289" Received: from ironmsg01-lv.qualcomm.com ([10.47.202.180]) by sabertooth02.qualcomm.com with ESMTP; 18 Mar 2013 13:37:17 -0700 Cc: Parag Warudkar , "Luis R. Rodriguez" , Jouni Malinen , Vasanthakumar Thiagarajan , , , , LKML , Received: from nasanexhc04.na.qualcomm.com ([172.30.48.17]) by ironmsg01-lv.qualcomm.com with ESMTP/TLS/RC4-SHA; 18 Mar 2013 13:37:16 -0700 Received: from pogo (172.30.48.1) by qcmail1.qualcomm.com (172.30.48.17) with Microsoft SMTP Server (TLS) id 14.2.318.4; Mon, 18 Mar 2013 13:37:14 -0700 Received: by pogo (sSMTP sendmail emulation); Mon, 18 Mar 2013 14:03:08 -0700 Date: Mon, 18 Mar 2013 14:03:08 -0700 From: "Luis R. Rodriguez" To: "John W. Linville" Subject: Re: [PATCH] ath9k : Fix ieee80211 work while going to suspend Message-ID: <20130318210308.GD32416@pogo> References: <20130318191340.GA28919@tuxdriver.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130318191340.GA28919@tuxdriver.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-Originating-IP: [172.30.48.1] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Mon, Mar 18, 2013 at 03:13:41PM -0400, John W. Linville wrote: > Any comments from the ath9k folks? > > On Sat, Mar 16, 2013 at 12:38:14PM -0400, Parag Warudkar wrote: > > During suspend below warning is seen when ath9k is active. Attached > > patch fixes the warning for me. Tested to work across few > > suspend-resume cycles. > > > > > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.642939] WARNING: at > > net/mac80211/util.c:599 ieee80211_can_queue_work.isra.7+0x32/0x40 > > [mac80211]() > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.642940] Hardware name: iMac12,1 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.642941] queueing ieee80211 > > work while going to suspend > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.642972] Modules linked in: > > joydev hid_logitech_dj zfs(POF) bridge stp llc zunicode(POF) zavl(POF) > > zcommon(POF) znvpair(POF) spl(OF) zlib_deflate be2iscsi > > iscsi_boot_sysfs bnx2i cnic uio cxgb4i cxgb4 cxgb3i cxgb3 mdio > > libcxgbi ib_iser rdma_cm ib_addr iw_cm ib_cm ib_sa ib_mad ib_core > > iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi rfcomm bnep > > nls_utf8 hfsplus btusb uvcvideo videobuf2_vmalloc videobuf2_memops > > videobuf2_core videodev bluetooth media coretemp snd_hda_codec_hdmi > > snd_hda_codec_cirrus snd_hda_intel snd_hda_codec snd_hwdep snd_seq > > snd_seq_device snd_pcm snd_page_alloc snd_timer snd soundcore arc4 > > ath9k ath9k_common microcode ath9k_hw ath mac80211 iTCO_wdt > > iTCO_vendor_support cfg80211 lpc_ich mei mfd_core rfkill i2c_i801 > > applesmc apple_bl input_polldev vhost_net tun macvtap macvlan > > kvm_intel kvm binfmt_misc uinput usb_storage crc32c_intel radeon ttm > > i915 ghash_clmulni_intel firewire_ohci firewire_core i2c_algo_bit > > drm_kms_helper crc_itu_t drm tg3 ptp pps_core i2c_core video sunrpc > > [last unloaded: iptable_mangle] > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.642985] Pid: 0, comm: > > swapper/0 Tainted: PF O 3.8.2-206.fc18.x86_64 #1 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.642986] Call Trace: > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.642992] > > [] warn_slowpath_common+0x7f/0xc0 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643009] > > [] ? ath_start_rx_poll+0x70/0x70 [ath9k] > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643011] > > [] warn_slowpath_fmt+0x46/0x50 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643018] > > [] ieee80211_can_queue_work.isra.7+0x32/0x40 > > [mac80211] > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643024] > > [] ieee80211_queue_work+0x2e/0x50 [mac80211] > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643027] > > [] ath_rx_poll+0x18/0x20 [ath9k] > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643029] > > [] call_timer_fn+0x3a/0x120 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643032] > > [] ? ath_start_rx_poll+0x70/0x70 [ath9k] > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643034] > > [] ? cpufreq_p4_target+0x120/0x120 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643035] > > [] run_timer_softirq+0x1fe/0x2b0 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643037] > > [] ? cpufreq_p4_target+0x120/0x120 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643038] > > [] __do_softirq+0xd0/0x210 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643040] > > [] ? native_sched_clock+0x13/0x80 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643041] > > [] ? cpufreq_p4_target+0x120/0x120 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643043] > > [] call_softirq+0x1c/0x30 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643045] > > [] do_softirq+0x75/0xb0 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643046] > > [] irq_exit+0xb5/0xc0 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643048] > > [] smp_apic_timer_interrupt+0x6e/0x99 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643049] > > [] apic_timer_interrupt+0x6d/0x80 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643052] > > [] ? __hrtimer_start_range_ns+0x1be/0x400 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643053] > > [] ? cpuidle_wrap_enter+0x50/0xa0 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643054] > > [] ? cpuidle_wrap_enter+0x49/0xa0 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643056] > > [] cpuidle_enter_tk+0x10/0x20 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643057] > > [] cpuidle_idle_call+0xa9/0x260 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643058] > > [] cpu_idle+0xaf/0x120 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643061] > > [] rest_init+0x72/0x80 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643063] > > [] start_kernel+0x3d1/0x3de > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643065] > > [] ? repair_env_string+0x5e/0x5e > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643066] > > [] x86_64_start_reservations+0x131/0x135 > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643068] > > [] x86_64_start_kernel+0x100/0x10f > > Mar 16 09:39:17 Parags-iMac kernel: [ 3993.643068] ---[ end trace > > 5595a7f5dd9a2949 ]--- > > > > Signed-off-by: Parag Warudkar > > > > diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h > > b/drivers/net/wireless/ath/ath9k/ath9k.h > > index a56b241..b3088a1 100644 > > --- a/drivers/net/wireless/ath/ath9k/ath9k.h > > +++ b/drivers/net/wireless/ath/ath9k/ath9k.h > > @@ -764,6 +764,7 @@ struct ath_softc { > > atomic_t wow_got_bmiss_intr; > > atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */ > > u32 wow_intr_before_sleep; > > + bool suspending; > > #endif > > }; > > > > diff --git a/drivers/net/wireless/ath/ath9k/link.c > > b/drivers/net/wireless/ath/ath9k/link.c > > index ade3afb..fa77e19 100644 > > --- a/drivers/net/wireless/ath/ath9k/link.c > > +++ b/drivers/net/wireless/ath/ath9k/link.c > > @@ -158,7 +158,8 @@ void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon) > > { > > if (!AR_SREV_9300(sc->sc_ah)) > > return; > > - > > + if (sc->suspending) > > + return; Thanks for the patch! Please note the style issue here, you should use a tab, but other than that lets review what happened. > > if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) > > return; Note that what this will do is call later mod_timer() for rx_poll_timer, the right thing to do then, which would be equivalent to your patch is to modify the ath_start_rx_poll() to instead use the new API mod_timer_pending() added on v2.6.30 via commit 74019224. This would not re-arm the timer if it was previously removed. commit 74019224ac34b044b44a31dd89a54e3477db4896 Author: Ingo Molnar Date: Wed Feb 18 12:23:29 2009 +0100 timers: add mod_timer_pending() Impact: new timer API Based on an idea from Martin Josefsson with the help of Patrick McHardy and Stephen Hemminger: introduce the mod_timer_pending() API which is a mod_timer() offspring that is an invariant on already removed timers. (regular mod_timer() re-activates non-pending timers.) This is useful for the networking code in that it can allow unserialized mod_timer_pending() timer-forwarding calls, but a single del_timer*() will stop the timer from being reactivated again. Also while at it: - optimize the regular mod_timer() path some more, the timer-stat and a debug check was needlessly duplicated in __mod_timer(). - make the exports come straight after the function, as most other exports in timer.c already did. - eliminate __mod_timer() as an external API, change the users to mod_timer(). The regular mod_timer() code path is not impacted significantly, due to inlining optimizations and due to the simplifications. Based-on-patch-from: Stephen Hemminger Acked-by: Stephen Hemminger Cc: "David S. Miller" Cc: Patrick McHardy Cc: netdev@vger.kernel.org Cc: Oleg Nesterov Cc: Andrew Morton Signed-off-by: Ingo Molnar > > > > diff --git a/drivers/net/wireless/ath/ath9k/main.c > > b/drivers/net/wireless/ath/ath9k/main.c > > index 6e66f9c..0cf88b7 100644 > > --- a/drivers/net/wireless/ath/ath9k/main.c > > +++ b/drivers/net/wireless/ath/ath9k/main.c > > @@ -2150,7 +2150,7 @@ static int ath9k_suspend(struct ieee80211_hw *hw, > > int ret = 0; > > > > mutex_lock(&sc->mutex); > > - > > + sc->suspending = 1; > > ath_cancel_work(sc); > > ath_stop_ani(sc); > > del_timer_sync(&sc->rx_poll_timer); See here we use del_timer_sync(). Can you try this instead for example: Looking at this makes me think we should review all usage of mod_timer all over our 802.11 drivers, and mac80211, cfg80211 as well. Luis --- 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 diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c index ade3afb..fbd8b4c 100644 --- a/drivers/net/wireless/ath/ath9k/link.c +++ b/drivers/net/wireless/ath/ath9k/link.c @@ -162,8 +162,8 @@ void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon) if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) return; - mod_timer(&sc->rx_poll_timer, jiffies + msecs_to_jiffies - (nbeacon * sc->cur_beacon_conf.beacon_interval)); + mod_timer_pending(&sc->rx_poll_timer, jiffies + msecs_to_jiffies + (nbeacon * sc->cur_beacon_conf.beacon_interval)); } void ath_rx_poll(unsigned long data)