{"id":819326,"url":"http://patchwork.ozlabs.org/api/patches/819326/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/patch/20170927214220.41216-3-gvaradar@cisco.com/","project":{"id":28,"url":"http://patchwork.ozlabs.org/api/projects/28/?format=json","name":"Linux PCI development","link_name":"linux-pci","list_id":"linux-pci.vger.kernel.org","list_email":"linux-pci@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170927214220.41216-3-gvaradar@cisco.com>","list_archive_url":null,"date":"2017-09-27T21:42:18","name":"[2/4] pci: code refactor pci_bus_lock/unlock/trylock","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d3e58336aa28630cd2572586bea8872485cb61c8","submitter":{"id":46073,"url":"http://patchwork.ozlabs.org/api/people/46073/?format=json","name":"Govindarajulu Varadarajan","email":"gvaradar@cisco.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-pci/patch/20170927214220.41216-3-gvaradar@cisco.com/mbox/","series":[{"id":5455,"url":"http://patchwork.ozlabs.org/api/series/5455/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/list/?series=5455","date":"2017-09-27T21:42:16","name":"pci aer: fix deadlock in do_recovery","version":1,"mbox":"http://patchwork.ozlabs.org/series/5455/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819326/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819326/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-pci-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=cisco.com header.i=@cisco.com\n\theader.b=\"dsCBIQke\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y2WlX1Ynnz9t67\n\tfor ;\n\tThu, 28 Sep 2017 07:52:56 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752288AbdI0Vwk (ORCPT );\n\tWed, 27 Sep 2017 17:52:40 -0400","from rcdn-iport-7.cisco.com ([173.37.86.78]:17100 \"EHLO\n\trcdn-iport-7.cisco.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752237AbdI0Vwg (ORCPT\n\t); Wed, 27 Sep 2017 17:52:36 -0400","from alln-core-6.cisco.com ([173.36.13.139])\n\tby rcdn-iport-7.cisco.com with ESMTP/TLS/DHE-RSA-AES256-SHA;\n\t27 Sep 2017 21:43:04 +0000","from a6.cisco.com (arch-kvm-vm.cisco.com [10.193.184.6])\n\t(authenticated bits=0)\n\tby alln-core-6.cisco.com (8.14.5/8.14.5) with ESMTP id v8RLgpwg021066\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tWed, 27 Sep 2017 21:43:04 GMT"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n\td=cisco.com; i=@cisco.com; l=3483; q=dns/txt; s=iport;\n\tt=1506549156; x=1507758756;\n\th=from:to:cc:subject:date:message-id:in-reply-to: references;\n\tbh=2rkORbroAtNLjR8qm1paiwlUP3seXQssZWVlLG9BTsA=;\n\tb=dsCBIQkezkH6tvwNqZ8B/hqYX9sd2oUgLBPg21Jd3aUpxPhPVu9+7SLu\n\tI/8o8hLy9W8Gx8rGpDAechICJiNco94ptUVxDeecQh6JlNzHUAgzQMbWD\n\t7wHtqVIvZLqfUVSxN45rEOrqRXjXJOVm6tMXFLDasMDLd15lJ5mQ/TAnl E=;","X-IronPort-AV":"E=Sophos;i=\"5.42,446,1500940800\"; d=\"scan'208\";a=\"298943854\"","From":"Govindarajulu Varadarajan ","To":"benve@cisco.com, bhelgaas@google.com, linux-pci@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org, jlbec@evilplan.org, hch@lst.de,\n\tmingo@redhat.com, peterz@infradead.org","Cc":"Govindarajulu Varadarajan ","Subject":"[PATCH 2/4] pci: code refactor pci_bus_lock/unlock/trylock","Date":"Wed, 27 Sep 2017 14:42:18 -0700","Message-Id":"<20170927214220.41216-3-gvaradar@cisco.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170927214220.41216-1-gvaradar@cisco.com>","References":"<20170927214220.41216-1-gvaradar@cisco.com>","X-Authenticated-User":"gvaradar@cisco.com","Sender":"linux-pci-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-pci@vger.kernel.org"},"content":"Introduce __pci_bus_trylock and __pci_bus_unlock with lock and unlock cb\nfunctions as arguments. User can pass on what they want to lock in pci_dev.\n\nSigned-off-by: Govindarajulu Varadarajan \n---\n drivers/pci/pci.c | 38 +++++++++++++++++++++++++++-----------\n include/linux/pci.h | 16 ++++++++++++++++\n 2 files changed, 43 insertions(+), 11 deletions(-)","diff":"diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c\nindex 6078dfc11b11..3c6a9210f27c 100644\n--- a/drivers/pci/pci.c\n+++ b/drivers/pci/pci.c\n@@ -4377,29 +4377,38 @@ static void pci_bus_lock(struct pci_bus *bus)\n \t}\n }\n \n-/* Unlock devices from the bottom of the tree up */\n-static void pci_bus_unlock(struct pci_bus *bus)\n+void __pci_bus_unlock(struct pci_bus *bus,\n+\t\t void (*unlock)(struct pci_dev *dev))\n {\n \tstruct pci_dev *dev;\n \n \tlist_for_each_entry(dev, &bus->devices, bus_list) {\n \t\tif (dev->subordinate)\n-\t\t\tpci_bus_unlock(dev->subordinate);\n-\t\tpci_dev_unlock(dev);\n+\t\t\t__pci_bus_unlock(dev->subordinate, unlock);\n+\t\tunlock(dev);\n \t}\n }\n+EXPORT_SYMBOL_GPL(__pci_bus_unlock);\n \n-/* Return 1 on successful lock, 0 on contention */\n-static int pci_bus_trylock(struct pci_bus *bus)\n+/* Unlock devices from the bottom of the tree up */\n+static void pci_bus_unlock(struct pci_bus *bus)\n+{\n+\t__pci_bus_unlock(bus, pci_dev_unlock);\n+}\n+\n+int __pci_bus_trylock(struct pci_bus *bus,\n+\t\t int (*lock)(struct pci_dev *dev),\n+\t\t void (*unlock)(struct pci_dev *dev))\n {\n \tstruct pci_dev *dev;\n \n \tlist_for_each_entry(dev, &bus->devices, bus_list) {\n-\t\tif (!pci_dev_trylock(dev))\n+\t\tif (!lock(dev))\n \t\t\tgoto unlock;\n \t\tif (dev->subordinate) {\n-\t\t\tif (!pci_bus_trylock(dev->subordinate)) {\n-\t\t\t\tpci_dev_unlock(dev);\n+\t\t\tif (!__pci_bus_trylock(dev->subordinate, lock,\n+\t\t\t\t\t unlock)) {\n+\t\t\t\tunlock(dev);\n \t\t\t\tgoto unlock;\n \t\t\t}\n \t\t}\n@@ -4409,11 +4418,18 @@ static int pci_bus_trylock(struct pci_bus *bus)\n unlock:\n \tlist_for_each_entry_continue_reverse(dev, &bus->devices, bus_list) {\n \t\tif (dev->subordinate)\n-\t\t\tpci_bus_unlock(dev->subordinate);\n-\t\tpci_dev_unlock(dev);\n+\t\t\t__pci_bus_unlock(dev->subordinate, unlock);\n+\t\tunlock(dev);\n \t}\n \treturn 0;\n }\n+EXPORT_SYMBOL_GPL(__pci_bus_trylock);\n+\n+/* Return 1 on successful lock, 0 on contention */\n+static int pci_bus_trylock(struct pci_bus *bus)\n+{\n+\treturn __pci_bus_trylock(bus, pci_dev_trylock, pci_dev_unlock);\n+}\n \n /* Do any devices on or below this slot prevent a bus reset? */\n static bool pci_slot_resetable(struct pci_slot *slot)\ndiff --git a/include/linux/pci.h b/include/linux/pci.h\nindex b4b1a8a164c0..33359c64cd2e 100644\n--- a/include/linux/pci.h\n+++ b/include/linux/pci.h\n@@ -1515,6 +1515,22 @@ void pci_cfg_access_lock(struct pci_dev *dev);\n bool pci_cfg_access_trylock(struct pci_dev *dev);\n void pci_cfg_access_unlock(struct pci_dev *dev);\n \n+void __pci_bus_unlock(struct pci_bus *bus,\n+\t\t void (*unlock)(struct pci_dev *dev));\n+int __pci_bus_trylock(struct pci_bus *bus,\n+\t\t int (*lock)(struct pci_dev *dev),\n+\t\t void (*unlock)(struct pci_dev *dev));\n+static inline int pci_device_trylock(struct pci_dev *dev)\n+{\n+\treturn device_trylock(&dev->dev);\n+}\n+\n+static inline void pci_device_unlock(struct pci_dev *dev)\n+{\n+\tdevice_unlock(&dev->dev);\n+}\n+\n+\n /*\n * PCI domain support. Sometimes called PCI segment (eg by ACPI),\n * a PCI domain is defined to be a set of PCI buses which share\n","prefixes":["2/4"]}