From patchwork Mon Nov 27 06:20:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10075819 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 524EB602BD for ; Mon, 27 Nov 2017 06:21:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4250028D43 for ; Mon, 27 Nov 2017 06:21:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 369AC28D4C; Mon, 27 Nov 2017 06:21:26 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DE43228D43 for ; Mon, 27 Nov 2017 06:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=kk6/PJrmIDJx+82yVReuxnnm9mTIM6a3sih80gr/UwY=; b=YAiVHS2qxDMeLVcQnQRl/iCBTd fbkbx4k765vcxW5PYz51OOOb/TfImWF+an6/PmnZeCuq3YG4IgVwffnOaQ9ilYqwsiFFTKuhpfeKj rKFFT5bvRTk6/WbHD2SjEiPJyRo51HlScy5mt38Yxe8S1mWX3n6uq/Bp0Ic2EuEiSkhDBB7P2Rq+V JwYdc5ett6OzbxNvfWrVNb7N4oNB8vGhBQVqkf8w6cosSpBBg4PjtlJ/NQU0iKa23cekoVCdQ+Xau CrfAqV8EcWrs9tXha6GhFO6B9ll56RXa3puHWZdzBQCBoskl5SVgFm/b8awybixTrpP91sl1pAnr/ VfsxGTww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eJCmr-00044a-Ku; Mon, 27 Nov 2017 06:21:01 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eJCmo-000417-Jh for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2017 06:21:00 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 08F3B69B21; Mon, 27 Nov 2017 06:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763637; bh=gGIzE9+CPXxkgzv0zni+8aWouptmQrhysAh7wTTcmHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SoM+LCvEdIN8b3JyfuiVAJXxNWnQTaz6XEKRtljSLlMzch4YmeTF9O5RWn05m1HVw f1rBHhy/xiLTGxKnrtQqRqFDRxu7Hc8jz79xt8UGYdc0wt7sK23GHMddPEd/SJFgsv GRVeTX7y4SMTRzjVWQCAkWYGUToEKKOZwSVEtWLQ= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D965469B1D; Mon, 27 Nov 2017 06:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511763636; bh=gGIzE9+CPXxkgzv0zni+8aWouptmQrhysAh7wTTcmHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E0Z12jNfHb4mYLbev7fSkY0AtYA/oQ2pJJh7ueRmyZ4Pnsjl4Xpsb2JT2mmiP6uOq Wb8E8vx/UqPc7roeOQBilJvd+H5wDCKdB6ztx1eoGDND8CqD/wxrUqo3uHkLL2ynAm GJbpJzmQiifBDgz22w8fv/JGjkbfFGFVSXejAv74= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D965469B1D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Subject: [PATCH V2 1/7] PCI: protect restore with device lock to be consistent Date: Mon, 27 Nov 2017 01:20:22 -0500 Message-Id: <1511763628-11856-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> References: <1511763628-11856-1-git-send-email-okaya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171126_222058_715084_FACA651C X-CRM114-Status: UNSURE ( 9.39 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sinan Kaya , linux-arm-msm@vger.kernel.org, Bjorn Helgaas , open list , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit b014e96d1abb ("PCI: Protect pci_error_handlers->reset_notify() usage with device_lock()") added protection around pci_dev_restore() function so that device specific remove callback does not cause a race condition against hotplug. pci_dev_lock() usage has been forgotten in two different places in the code. Adding locks for pci_slot_restore() and moving pci_dev_restore() inside the locks for pci_try_reset_function(). Signed-off-by: Sinan Kaya Reviewed-by: Christoph Hellwig --- drivers/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 6078dfc..23681f4 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4344,9 +4344,9 @@ int pci_try_reset_function(struct pci_dev *dev) pci_dev_save_and_disable(dev); rc = __pci_reset_function_locked(dev); + pci_dev_restore(dev); pci_dev_unlock(dev); - pci_dev_restore(dev); return rc; } EXPORT_SYMBOL_GPL(pci_try_reset_function); @@ -4546,7 +4546,9 @@ static void pci_slot_restore(struct pci_slot *slot) list_for_each_entry(dev, &slot->bus->devices, bus_list) { if (!dev->slot || dev->slot != slot) continue; + pci_dev_lock(dev); pci_dev_restore(dev); + pci_dev_unlock(dev); if (dev->subordinate) pci_bus_restore(dev->subordinate); }