From patchwork Tue Jan 2 17:00:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10141071 X-Patchwork-Delegate: bhelgaas@google.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 A032C6034B for ; Tue, 2 Jan 2018 17:03:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91CF326AE3 for ; Tue, 2 Jan 2018 17:03:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8694C28C74; Tue, 2 Jan 2018 17:03:11 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 2733126AE3 for ; Tue, 2 Jan 2018 17:03:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751269AbeABRAf (ORCPT ); Tue, 2 Jan 2018 12:00:35 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:52470 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751052AbeABRAc (ORCPT ); Tue, 2 Jan 2018 12:00:32 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4096A60B14; Tue, 2 Jan 2018 17:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1514912432; bh=whYO8FROj019FU23pMDJc+rBoQ/PdZZWIOTNUoRUMKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bznhlluo35mCgIyZVOTCpRfPDUC8zB0Ai9ugoYaz0sHQZJT0skeG7gKMouk6VZ+0U ha0JudqYjr8aiWTlLh+lmV+y+Pw4E4lSvz6dRjh194T5UOrlrSb8QuT4TiF+20uCoj ACCBujNjI+M/Tf6ymJLP2dJOj57kVcH0dhtNCqRU= 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 127296024C; Tue, 2 Jan 2018 17:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1514912431; bh=whYO8FROj019FU23pMDJc+rBoQ/PdZZWIOTNUoRUMKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUgL9UOwerWWcQoa0j2qAbL3V2SxqwM7+mntZ9tuuU/kxK8hb6mzasa8RXT1D2PaK wImrMviZH8IDkzsTZVfNcs0MqvR9bNLyse2wYROgbeZMlD4pHzLFpbRgPUkXbwKksW 8VMZbqaZJ69N1SVvnCbmf4zijCT+7igitpkQffwo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 127296024C 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 V3 1/6] PCI: Protect restore with device lock to be consistent Date: Tue, 2 Jan 2018 12:00:18 -0500 Message-Id: <1514912423-13341-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1514912423-13341-1-git-send-email-okaya@codeaurora.org> References: <1514912423-13341-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 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 764ca7b..463b32d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4448,9 +4448,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); @@ -4658,7 +4658,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); }