Return-path: Received: from mail-pf0-f193.google.com ([209.85.192.193]:36857 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751422AbeFAQeA (ORCPT ); Fri, 1 Jun 2018 12:34:00 -0400 Received: by mail-pf0-f193.google.com with SMTP id w129-v6so12766322pfd.3 for ; Fri, 01 Jun 2018 09:34:00 -0700 (PDT) Date: Fri, 1 Jun 2018 09:33:57 -0700 From: Brian Norris To: Ganapathi Bhat Cc: linux-wireless@vger.kernel.org, Cathy Luo , Xinming Hu , Zhiyuan Yang , James Cao , Mangesh Malusare Subject: Re: [PATCH 2/2] mwifiex: handle race during mwifiex_usb_disconnect Message-ID: <20180601163355.GA248677@rodete-desktop-imager.corp.google.com> (sfid-20180601_183410_506648_0B850716) References: <1527849680-31445-1-git-send-email-gbhat@marvell.com> <1527849680-31445-2-git-send-email-gbhat@marvell.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1527849680-31445-2-git-send-email-gbhat@marvell.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Hi Ganapathi, On Fri, Jun 01, 2018 at 04:11:20PM +0530, Ganapathi Bhat wrote: > Race condition is observed during rmmod of mwifiex_usb: > > 1. The rmmod thread will call mwifiex_usb_disconnect(), download > SHUTDOWN command and do wait_event_interruptible_timeout(), > waiting for response. > > 2. The main thread will handle the response and will do a > wake_up_interruptible(), unblocking rmmod thread. > > 3. On getting unblocked, rmmod thread will make rx_cmd.urb = NULL in > mwifiex_usb_free(). > > 4. The main thread will try to resubmit rx_cmd.urb in > mwifiex_usb_submit_rx_urb(), which is NULL. > > To fix this, move mwifiex_usb_free() from mwifiex_usb_disconnect > to mwifiex_unregister_dev(). Function mwifiex_unregister_dev() is > called after flushing the command and RX work queues. > > Signed-off-by: Brian Norris ^^ I'm not sure if that line is quite accurate. While I nearly spelled out what the patch would look like, you wrote it. Anyway, patch seems good to me, assuming it tests out OK for you: Reviewed-by: Brian Norris and if Kalle hasn't applied this yet, an alternative to Signed-off-by: Suggested-by: Brian Norris > Signed-off-by: Ganapathi Bhat > --- > drivers/net/wireless/marvell/mwifiex/usb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c > index bc475b8..88f4c89 100644 > --- a/drivers/net/wireless/marvell/mwifiex/usb.c > +++ b/drivers/net/wireless/marvell/mwifiex/usb.c > @@ -644,8 +644,6 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf) > MWIFIEX_FUNC_SHUTDOWN); > } > > - mwifiex_usb_free(card); > - > mwifiex_dbg(adapter, FATAL, > "%s: removing card\n", __func__); > mwifiex_remove_card(adapter); > @@ -1353,6 +1351,8 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter) > { > struct usb_card_rec *card = (struct usb_card_rec *)adapter->card; > > + mwifiex_usb_free(card); > + > mwifiex_usb_cleanup_tx_aggr(adapter); > > card->adapter = NULL; > -- > 1.9.1 >