From patchwork Mon Nov 10 16:08:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathy Vanhoef X-Patchwork-Id: 5266871 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B581BC11AC for ; Mon, 10 Nov 2014 16:14:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BC6F20158 for ; Mon, 10 Nov 2014 16:14:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E47AF2017E for ; Mon, 10 Nov 2014 16:14:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753261AbaKJQNu (ORCPT ); Mon, 10 Nov 2014 11:13:50 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:60519 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753252AbaKJQNs (ORCPT ); Mon, 10 Nov 2014 11:13:48 -0500 Received: by mail-wg0-f44.google.com with SMTP id x12so9313147wgg.31 for ; Mon, 10 Nov 2014 08:13:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=y0a+9beFtU7ut7UGiseN1DYyCs2EqYUz6uBNK05cMr0=; b=CJheWWWqSRmi+SMptURey2PW2cLUax741TuAOU8li94zTTSD/JR2+yJ5C1RwG1T78+ VDmiTzBLLvvl0itD5uoVwU2SXpfISVnjSSZhlazVfrIdiC57NkQMyTkm8/6gIbthoUA6 NW/sRhZLX/XS0OJxf9/qEwtdy6v8PcX5Izc0CsR2UqNRCGHS75PYtniZsYlVJFSoF9ng ZiRHgR7oXhBRTa2YZbqTP7fSOdePt9mozPeen6gmDY1mDXMdZ/oxoRJEbyxiLmHhTkmn EPj4Lp+ue9qQnmZ3kKTGcdGO6vaRAsFO9SNfy6D/PhQcIvFlE7n5fgbQUflk/ZwPk1Rx kYyg== X-Received: by 10.180.107.136 with SMTP id hc8mr31342515wib.78.1415635706647; Mon, 10 Nov 2014 08:08:26 -0800 (PST) Received: from [192.168.80.131] (ip-62-235-229-218.dsl.scarlet.be. [62.235.229.218]) by mx.google.com with ESMTPSA id m6sm13941191wiy.16.2014.11.10.08.08.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Nov 2014 08:08:25 -0800 (PST) Message-ID: <5460E2FA.40201@gmail.com> Date: Mon, 10 Nov 2014 11:08:26 -0500 From: Mathy Vanhoef User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Icedove/31.2.0 MIME-Version: 1.0 To: Arend van Spriel , brudley@broadcom.com, frankyl@broadcom.com, meuleman@broadcom.com, linville@tuxdriver.com, pieterpg@broadcom.com, linux-wireless@vger.kernel.org, brcm80211-dev-list@broadcom.com, netdev@vger.kernel.org, Oliver Neukum Subject: Re: [PATCH] brcmfmac: unlink URB when request timed out References: <545FAE05.2030701@gmail.com> <54609F09.6070807@broadcom.com> In-Reply-To: <54609F09.6070807@broadcom.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 11/10/2014 06:18 AM, Arend van Spriel wrote: > On 09-11-14 19:10, Mathy Vanhoef wrote: >> From: Mathy Vanhoef >> >> Unlink the submitted URB in brcmf_usb_dl_cmd if the request timed out. This >> assures the URB is never submitted twice, preventing a driver crash. > > Hi Mathy, > > What driver crash are you referring to? The log only shows the WARNING > ending in a USB disconnect but no actual crash. Does your patch get the > driver running properly or does it only avoid the warning. Hi Arend, It shows a warning, after which the device doesn't work (but the computer is still usable). But I've noticed that when *unplugging* the USB cable the OS may freeze. This doesn't always happen though, sometimes unplugging works OK. The patch both avoids the warning, and gets the device/driver running properly (unplugging also works OK). > > With that said, it seems there is some need for improvement, but I also > notice you are running this on a virtual machine so could that affect > the timeout to kick in before completion. Could you try to increase the > timeout. Still when a timeout occurs this needs to be handled properly. > Could you also try the following patch? I did a few additional tests: 1. When increasing IOCTL_RESP_TIMEOUT to 20000 (ten times the normal value) the timeout and warning still occur. Device/driver doesn't work. 2. When increasing BRCMF_USB_RESET_GETVER_SPINWAIT to 1000 (ten timers the normal value) everything works. Device/driver works. 3. Quick test using backports-3.18-rc1-1 (aka unpatched driver) on a non- virtualized Linux install: In that case everything worked fine. So the bug may only be triggered in a virtualized environment / VMWare. 4. When applying your patch, the driver stops early during initialization of the device. I included a WARN_ONCE before returning EINVAL and got the output below. Kind regards, Mathy --- [ 220.955647] usb 1-1: new high-speed USB device number 3 using ehci-pci [ 221.487797] usb 1-1: New USB device found, idVendor=043e, idProduct=3004 [ 221.487802] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 221.487804] usb 1-1: Product: Remote Download Wireless Adapter [ 221.487806] usb 1-1: Manufacturer: Broadcom [ 221.487808] usb 1-1: SerialNumber: 000000000001 [ 221.490472] brcmfmac: brcmf_usb_probe Enter 0x043e:0x3004 [ 221.490476] brcmfmac: brcmf_usb_probe Broadcom high speed USB WLAN interface detected [ 221.490477] brcmfmac: brcmf_usb_probe_cb Enter [ 221.490480] brcmfmac: brcmf_usb_attach Enter [ 221.490494] brcmfmac: brcmf_usb_dlneeded Enter [ 221.490495] ------------[ cut here ]------------ [ 221.490503] WARNING: CPU: 0 PID: 100 at drivers/net/wireless/brcm80211/brcmfmac/usb.c:716 brcmf_usb_dl_cmd+0x75/0x1a0 [brcmfmac]() [ 221.490505] EINVAL devinfo=c0044000 ctl_rub=ef898380 completed=0 [ 221.490506] Modules linked in: brcmfmac brcmutil vmw_pvscsi pcnet32 mptspi mptscsih mptbase [ 221.490514] CPU: 0 PID: 100 Comm: kworker/0:1 Not tainted 3.18.0-rc3-wl+ #2 [ 221.490515] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/31/2013 [ 221.490528] Workqueue: usb_hub_wq hub_event [ 221.490530] 00000000 00000000 eecffb58 c1711f4a eecffb98 eecffb88 c103edaf f11cbc58 [ 221.490534] eecffbb4 00000064 f11cbc84 000002cc f11c1595 f11c1595 c0044000 ffffffea [ 221.490537] ef726000 eecffba0 c103ee4e 00000009 eecffb98 f11cbc58 eecffbb4 eecffbd0 [ 221.490541] Call Trace: [ 221.490550] [] dump_stack+0x41/0x52 [ 221.490558] [] warn_slowpath_common+0x7f/0xa0 [ 221.490563] [] ? brcmf_usb_dl_cmd+0x75/0x1a0 [brcmfmac] [ 221.490567] [] ? brcmf_usb_dl_cmd+0x75/0x1a0 [brcmfmac] [ 221.490570] [] warn_slowpath_fmt+0x2e/0x30 [ 221.490575] [] brcmf_usb_dl_cmd+0x75/0x1a0 [brcmfmac] [ 221.490580] [] brcmf_usb_probe+0x3c8/0x640 [brcmfmac] [ 221.490583] [] ? mutex_lock+0x13/0x32 [ 221.490586] [] usb_probe_interface+0xa3/0x180 [ 221.490590] [] ? __driver_attach+0x90/0x90 [ 221.490592] [] driver_probe_device+0x5e/0x1f0 [ 221.490595] [] ? __driver_attach+0x90/0x90 [ 221.490597] [] __device_attach+0x39/0x50 [ 221.490600] [] bus_for_each_drv+0x34/0x70 [ 221.490602] [] device_attach+0x7b/0x90 [ 221.490604] [] ? __driver_attach+0x90/0x90 [ 221.490607] [] bus_probe_device+0x6f/0x90 [ 221.490609] [] device_add+0x426/0x520 [ 221.490611] [] ? usb_control_msg+0xb3/0xd0 [ 221.490614] [] ? mutex_lock+0x13/0x32 [ 221.490627] [] usb_set_configuration+0x3f8/0x700 [ 221.490630] [] ? __driver_attach+0x90/0x90 [ 221.490633] [] generic_probe+0x2b/0x90 [ 221.490637] [] ? sysfs_create_link+0x20/0x40 [ 221.490639] [] usb_probe_device+0xc/0x10 [ 221.490641] [] driver_probe_device+0x5e/0x1f0 [ 221.490644] [] ? __driver_attach+0x90/0x90 [ 221.490646] [] __device_attach+0x39/0x50 [ 221.490649] [] bus_for_each_drv+0x34/0x70 [ 221.490651] [] device_attach+0x7b/0x90 [ 221.490653] [] ? __driver_attach+0x90/0x90 [ 221.490656] [] bus_probe_device+0x6f/0x90 [ 221.490658] [] device_add+0x426/0x520 [ 221.490661] [] ? usb_new_device+0x16e/0x3a0 [ 221.490663] [] usb_new_device+0x217/0x3a0 [ 221.490666] [] hub_event+0xa17/0xda0 [ 221.490668] [] ? __schedule+0x2f8/0x710 [ 221.490672] [] ? pwq_dec_nr_in_flight+0x3c/0x90 [ 221.490674] [] process_one_work+0x11e/0x360 [ 221.490677] [] worker_thread+0xf0/0x3c0 [ 221.490680] [] ? __wake_up_locked+0x1a/0x20 [ 221.490682] [] ? process_scheduled_works+0x30/0x30 [ 221.490685] [] kthread+0x96/0xb0 [ 221.490687] [] ? put_unbound_pool+0x110/0x170 [ 221.490691] [] ret_from_kernel_thread+0x21/0x30 [ 221.490693] [] ? kthread_worker_fn+0x110/0x110 [ 221.490695] ---[ end trace 9befd914693f3083 ]--- [ 221.490697] brcmfmac: brcmf_usb_dlneeded chip 57005 rev 0xf11cfcec [ 221.490699] brcmfmac: brcmf_fw_get_firmwares enter: dev=1-1 > > Regards, > Arend > --- > drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c > b/drivers/net/wireles > index dc13591..786c40b 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c > @@ -640,7 +640,7 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info > *devinf > char *tmpbuf; > u16 size; > > - if ((!devinfo) || (devinfo->ctl_urb == NULL)) > + if (!devinfo || !devinfo->ctl_urb || !devinfo->ctl_completed) > return -EINVAL; > > tmpbuf = kmalloc(buflen, GFP_ATOMIC); > >> Signed-off-by: Mathy Vanhoef >> --- >> Currently brcmfmac may crash when a USB device is attached (tested with a LG >> TWFM-B003D). In particular it fails on the second call to brcmf_usb_dl_cmd in >> the while loop of brcmf_usb_resetcfg. The problem is that an URB is being >> submitted twice: >> >> [ 169.861800] brcmfmac: brcmf_usb_dl_writeimage Enter, fw f14db000, len 348160 >> [ 171.787791] brcmfmac: brcmf_usb_dl_writeimage Exit, err=0 >> [ 171.787797] brcmfmac: brcmf_usb_dlstart Exit, err=0 >> [ 171.787799] brcmfmac: brcmf_usb_dlrun Enter >> [ 171.791794] brcmfmac: brcmf_usb_resetcfg Enter >> [ 173.988072] ------------[ cut here ]------------ >> [ 173.988083] WARNING: CPU: 0 PID: 369 at drivers/usb/core/urb.c:339 usb_submit_urb+0x4e6/0x500() >> [ 173.988085] URB eaf45f00 submitted while active >> [ 173.988086] Modules linked in: brcmfmac brcmutil vmw_pvscsi pcnet32 mptspi mptscsih mptbase >> [ 173.988100] CPU: 0 PID: 369 Comm: kworker/0:2 Not tainted 3.18.0-rc3-wl #1 >> [ 173.988102] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/31/2013 >> [ 173.988106] Workqueue: events request_firmware_work_func >> [ 173.988108] 00000000 00000000 ee747db8 c1711f4a ee747df8 ee747de8 c103edaf c18d1e10 >> [ 173.988112] ee747e14 00000171 c18a8b29 00000153 c1490556 c1490556 eaf45f00 eafdc660 >> [ 173.988115] f14b8fa0 ee747e00 c103ee4e 00000009 ee747df8 c18d1e10 ee747e14 ee747e50 >> [ 173.988119] Call Trace: >> [ 173.988129] [] dump_stack+0x41/0x52 >> [ 173.988136] [] warn_slowpath_common+0x7f/0xa0 >> [ 173.988139] [] ? usb_submit_urb+0x4e6/0x500 >> [ 173.988141] [] ? usb_submit_urb+0x4e6/0x500 >> [ 173.988147] [] ? brcmf_usb_ioctl_resp_wake+0x40/0x40 [brcmfmac] >> [ 173.988150] [] warn_slowpath_fmt+0x2e/0x30 >> [ 173.988152] [] usb_submit_urb+0x4e6/0x500 >> [ 173.988156] [] ? __kmalloc+0x21/0x140 >> [ 173.988161] [] ? brcmf_usb_dl_cmd+0x33/0x120 [brcmfmac] >> [ 173.988166] [] brcmf_usb_dl_cmd+0xb3/0x120 [brcmfmac] >> [ 173.988170] [] brcmf_usb_probe_phase2+0x4e4/0x640 [brcmfmac] >> [ 173.988176] [] brcmf_fw_request_code_done+0xd0/0xf0 [brcmfmac] >> [ 173.988178] [] request_firmware_work_func+0x26/0x50 >> [ 173.988182] [] process_one_work+0x11e/0x360 >> [ 173.988184] [] worker_thread+0xf0/0x3c0 >> [ 173.988205] [] ? __wake_up_locked+0x1a/0x20 >> [ 173.988208] [] ? process_scheduled_works+0x30/0x30 >> [ 173.988211] [] kthread+0x96/0xb0 >> [ 173.988214] [] ret_from_kernel_thread+0x21/0x30 >> [ 173.988217] [] ? kthread_worker_fn+0x110/0x110 >> [ 173.988219] ---[ end trace 0c88bf46801de083 ]--- >> [ 173.988221] brcmf_usb_dl_cmd: usb_submit_urb failed -16 >> [ 173.988396] brcmfmac: brcmf_usb_probe_phase2 failed: dev=1-1, err=-19 >> [ 173.989503] brcmfmac: brcmf_usb_disconnect Enter >> >> This patch fixes the brcmf_usb_dl_cmd function to prevent an URB from being >> submitted twice. Tested using a LG TWFM-B003D, which now works properly. >> >> >> drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c >> index 5265aa7..1bc7858 100644 >> --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c >> +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c >> @@ -738,10 +738,12 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd, >> goto finalize; >> } >> >> - if (!brcmf_usb_ioctl_resp_wait(devinfo)) >> + if (!brcmf_usb_ioctl_resp_wait(devinfo)) { >> + usb_unlink_urb(devinfo->ctl_urb); >> ret = -ETIMEDOUT; >> - else >> + } else { >> memcpy(buffer, tmpbuf, buflen); >> + } >> >> finalize: >> kfree(tmpbuf); >> > -- 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/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 5265aa7..15b1aa7 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -709,8 +709,13 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd, char *tmpbuf; u16 size; - if ((!devinfo) || (devinfo->ctl_urb == NULL)) + if (!devinfo || !devinfo->ctl_urb || !devinfo->ctl_completed) { + WARN_ONCE(1, "EINVAL devinfo=%p ctl_rub=%p completed=%d\n", + devinfo, + devinfo ? devinfo->ctl_urb : NULL, + devinfo ? devinfo->ctl_completed : -1); return -EINVAL; + } tmpbuf = kmalloc(buflen, GFP_ATOMIC); if (!tmpbuf)