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: 841480 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="SoM+LCvE"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="E0Z12jNf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylc9h1xxhz9sPr for ; Mon, 27 Nov 2017 17:20:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751135AbdK0GUj (ORCPT ); Mon, 27 Nov 2017 01:20:39 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:48534 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751096AbdK0GUh (ORCPT ); Mon, 27 Nov 2017 01:20:37 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3C14E69B23; 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= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) 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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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); }