From patchwork Thu Oct 20 13:26:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 9386843 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AFD25607D0 for ; Thu, 20 Oct 2016 13:27:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F89E2843C for ; Thu, 20 Oct 2016 13:27:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9436429343; Thu, 20 Oct 2016 13:27:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDAE52843C for ; Thu, 20 Oct 2016 13:27:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938886AbcJTN1B (ORCPT ); Thu, 20 Oct 2016 09:27:01 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:53916 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935962AbcJTN1A (ORCPT ); Thu, 20 Oct 2016 09:27:00 -0400 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9KDOjGq023487; Thu, 20 Oct 2016 06:26:59 -0700 Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 263htkv37y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 20 Oct 2016 06:26:59 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1104.5; Thu, 20 Oct 2016 06:26:58 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server id 15.0.1104.5 via Frontend Transport; Thu, 20 Oct 2016 06:26:58 -0700 Received: from pe-lt949 (unknown [10.31.130.253]) by maili.marvell.com (Postfix) with ESMTP id A0F423F703F; Thu, 20 Oct 2016 06:26:57 -0700 (PDT) Received: from pe-lt949 (piotr-probook.localdomain [127.0.0.1]) by pe-lt949 (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id u9KDQkfo028599; Thu, 20 Oct 2016 18:56:46 +0530 Received: (from root@localhost) by pe-lt949 (8.14.4/8.14.4/Submit) id u9KDQkcA028598; Thu, 20 Oct 2016 18:56:46 +0530 From: Amitkumar Karwar To: CC: Cathy Luo , Nishant Sarmukadam , , , Xinming Hu , Amitkumar Karwar Subject: [PATCH v5 4/4] mwifiex: fix race for card->adapter Date: Thu, 20 Oct 2016 18:56:19 +0530 Message-ID: <1476969979-28554-4-git-send-email-akarwar@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476969979-28554-1-git-send-email-akarwar@marvell.com> References: <1476969979-28554-1-git-send-email-akarwar@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-20_07:, , signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610200241 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xinming Hu card->adapter is set/reset in register/unregister calls. Firmware gets downloaded asynchronously in a separate thread during init. We have a unregister call when firmware initialization fails. It may have a race with suspend thread where "card->adapter" is being read. This patch adds spinlock to fix the problem. Signed-off-by: Cathy Luo Signed-off-by: Xinming Hu Signed-off-by: Amitkumar Karwar --- New patch introduced in v5 to address race between driver init and suspend threads. --- drivers/net/wireless/marvell/mwifiex/pcie.c | 38 +++++++++++++++++++++++------ drivers/net/wireless/marvell/mwifiex/pcie.h | 2 ++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 94f75be..9147e6a 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -102,23 +102,32 @@ static int mwifiex_pcie_suspend(struct device *dev) struct mwifiex_adapter *adapter; struct pcie_service_card *card; struct pci_dev *pdev = to_pci_dev(dev); + unsigned long flags; card = pci_get_drvdata(pdev); - if (!card || !card->adapter || - card->adapter->hw_status == MWIFIEX_HW_STATUS_RESET || - card->adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY) { - pr_err("Card or adapter structure is not valid or hw_status shows failure\n"); + if (!card) { + pr_err("Card is not valid\n"); return 0; } + spin_lock_irqsave(&card->adapter_lock, flags); adapter = card->adapter; + if (!adapter || + adapter->hw_status == MWIFIEX_HW_STATUS_RESET || + adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY) { + spin_unlock_irqrestore(&card->adapter_lock, flags); + pr_err("Adapter structure is not valid or hw_status shows failure\n"); + return 0; + } if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING || adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE || adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) { + spin_unlock_irqrestore(&card->adapter_lock, flags); pr_err("We are in the middle of initialzaion or closing\n"); return -EBUSY; } + spin_unlock_irqrestore(&card->adapter_lock, flags); /* Enable the Host Sleep */ if (!mwifiex_enable_hs(adapter)) { @@ -150,16 +159,22 @@ static int mwifiex_pcie_resume(struct device *dev) struct mwifiex_adapter *adapter; struct pcie_service_card *card; struct pci_dev *pdev = to_pci_dev(dev); + unsigned long flags; card = pci_get_drvdata(pdev); - - if (!card || !card->adapter || - card->adapter->hw_status != MWIFIEX_HW_STATUS_READY) { - pr_err("Card or adapter structure is not valid or hw_status is not ready\n"); + if (!card) { + pr_err("Card is not valid\n"); return 0; } + spin_lock_irqsave(&card->adapter_lock, flags); adapter = card->adapter; + if (!adapter || adapter->hw_status != MWIFIEX_HW_STATUS_READY) { + spin_unlock_irqrestore(&card->adapter_lock, flags); + pr_err("adapter structure is not valid or hw_status is not ready\n"); + return 0; + } + spin_unlock_irqrestore(&card->adapter_lock, flags); if (!adapter->is_suspended) { mwifiex_dbg(adapter, WARN, @@ -195,6 +210,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev, return -ENOMEM; card->dev = pdev; + spin_lock_init(&card->adapter_lock); if (ent->driver_data) { struct mwifiex_pcie_device *data = (void *)ent->driver_data; @@ -2973,9 +2989,12 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter) { struct pcie_service_card *card = adapter->card; struct pci_dev *pdev = card->dev; + unsigned long flags; + spin_lock_irqsave(&card->adapter_lock, flags); /* save adapter pointer in card */ card->adapter = adapter; + spin_unlock_irqrestore(&card->adapter_lock, flags); adapter->dev = &pdev->dev; if (mwifiex_pcie_request_irq(adapter)) @@ -3001,6 +3020,7 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter) struct pcie_service_card *card = adapter->card; struct pci_dev *pdev; int i; + unsigned long flags; if (card) { pdev = card->dev; @@ -3022,7 +3042,9 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter) if (card->msi_enable) pci_disable_msi(pdev); } + spin_lock_irqsave(&card->adapter_lock, flags); card->adapter = NULL; + spin_unlock_irqrestore(&card->adapter_lock, flags); } } diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h index 46f99ca..f6e20ea 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.h +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h @@ -344,6 +344,8 @@ struct mwifiex_msix_context { struct pcie_service_card { struct pci_dev *dev; struct mwifiex_adapter *adapter; + /* spin lock for card->adapter */ + spinlock_t adapter_lock; struct mwifiex_pcie_device pcie; u8 txbd_flush;