From patchwork Thu May 24 21:48:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Logan Gunthorpe X-Patchwork-Id: 10425609 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 CB3AC6019D for ; Thu, 24 May 2018 21:49:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBDCC295D6 for ; Thu, 24 May 2018 21:49:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0808295DA; Thu, 24 May 2018 21:49:27 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 F277B295D6 for ; Thu, 24 May 2018 21:49:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969576AbeEXVs6 (ORCPT ); Thu, 24 May 2018 17:48:58 -0400 Received: from ale.deltatee.com ([207.54.116.67]:39926 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966099AbeEXVss (ORCPT ); Thu, 24 May 2018 17:48:48 -0400 Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fLy6F-0005xd-Np; Thu, 24 May 2018 15:48:47 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.89) (envelope-from ) id 1fLy6C-0003mS-1I; Thu, 24 May 2018 15:48:40 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-doc@vger.kernel.org Cc: Stephen Bates , Christoph Hellwig , Bjorn Helgaas , Jonathan Corbet , Ingo Molnar , Thomas Gleixner , Christoffer Dall , "Paul E. McKenney" , Marc Zyngier , Kai-Heng Feng , Frederic Weisbecker , Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Benjamin Herrenschmidt , Alex Williamson , =?UTF-8?q?Christian=20K=C3=B6nig?= , Logan Gunthorpe Date: Thu, 24 May 2018 15:48:15 -0600 Message-Id: <20180524214816.14485-3-logang@deltatee.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180524214816.14485-1-logang@deltatee.com> References: <20180524214816.14485-1-logang@deltatee.com> X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, sbates@raithlin.com, hch@lst.de, bhelgaas@google.com, corbet@lwn.net, tglx@linutronix.de, cdall@linaro.org, paulmck@linux.vnet.ibm.com, marc.zyngier@arm.com, kai.heng.feng@canonical.com, mingo@kernel.org, frederic@kernel.org, dan.j.williams@intel.com, benh@kernel.crashing.org, jglisse@redhat.com, alex.williamson@redhat.com, christian.koenig@amd.com, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH 2/3] PCI: Allow specifying devices using a base bus and path of devfns X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) 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 When specifying PCI devices on the kernel command line using a BDF, the bus numbers can change when adding or replacing a device, changing motherboard firmware, or applying kernel parameters like pci=assign-buses. When this happens, it is usually undesirable to apply whatever command line tweak to the wrong device. Therefore, it is useful to be able to specify devices with a base bus number and the path of devfns needed to get to it. (Similar to the "device scope" structure in the Intel VT-d spec, Section 8.3.1.) Thus, we add an option to specify devices in the following format: path:[:]:./.[/ ...] The path can be any segment within the PCI hierarchy of any length and determined through the use of 'lspci -t'. When specified this way, it is less likely that a renumbered bus will result in a valid device specification and the tweak won't be applied to the wrong device. Signed-off-by: Logan Gunthorpe Reviewed-by: Stephen Bates --- Documentation/admin-guide/kernel-parameters.txt | 12 ++- drivers/pci/pci.c | 106 +++++++++++++++++++++++- 2 files changed, 112 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 894aa516ceab..519ab95bb418 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2986,9 +2986,10 @@ Some options herein operate on a specific device or a set of devices (). These are - specified in one of two formats: + specified in one of three formats: [:]:. + path:[:]:./.[/ ...] pci::[::] Note: the first format specifies a PCI @@ -2996,9 +2997,12 @@ if new hardware is inserted, if motherboard firmware changes, or due to changes caused by other kernel parameters. The second format - selects devices using IDs from the - configuration space which may match multiple - devices in the system. + specifies a path from a device through + a path of multiple slot/function addresses + (this is more robust against renumbering + issues). The third format selects devices using + IDs from the configuration space which may match + multiple devices in the system. earlydump [X86] dump PCI config space before the kernel changes anything diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 85fec5e2640b..53ea0d7b02ce 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -184,22 +184,116 @@ EXPORT_SYMBOL_GPL(pci_ioremap_wc_bar); #endif /** + * pci_dev_str_match_path - test if a path string matches a device + * @dev: the PCI device to test + * @p: string to match the device against + * @endptr: pointer to the string after the match + * + * Test if a string (typically from a kernel parameter) formated as a + * path of slot/function addresses matches a PCI device. The string must + * be of the form: + * + * [:]:./.[/ ...] + * + * A path for a device can be obtained using 'lspci -t'. Using a path + * is more robust against renumbering of devices than using only + * a single bus, slot and function address. + * + * Returns 1 if the string matches the device, 0 if it does not and + * a negative error code if it fails to parse the string. + */ +static int pci_dev_str_match_path(struct pci_dev *dev, const char *p, + const char **endptr) +{ + int ret; + int seg, bus, slot, func, count; + u8 *devfn_path; + int num_devfn = 0; + struct pci_dev *tmp; + + ret = sscanf(p, "%x:%x:%x.%x%n", &seg, &bus, &slot, + &func, &count); + if (ret != 4) { + seg = 0; + ret = sscanf(p, "%x:%x.%x%n", &bus, &slot, + &func, &count); + if (ret != 3) + return -EINVAL; + } + + p += count; + + devfn_path = kmalloc(PAGE_SIZE, GFP_KERNEL); + devfn_path[num_devfn++] = PCI_DEVFN(slot, func); + + while (*p && *p != ',' && *p != ';') { + ret = sscanf(p, "/%x.%x%n", &slot, &func, &count); + if (ret != 2) { + ret = -EINVAL; + goto free_and_exit; + } + + p += count; + devfn_path[num_devfn++] = PCI_DEVFN(slot, func); + if (num_devfn >= PAGE_SIZE) { + ret = -EINVAL; + goto free_and_exit; + } + } + + *endptr = p; + ret = 0; + + if (seg != pci_domain_nr(dev->bus)) + goto free_and_exit; + + pci_dev_get(dev); + while (num_devfn > 0 && dev) { + num_devfn--; + + if (devfn_path[num_devfn] != dev->devfn) + goto put_and_exit; + + if (num_devfn == 0 && bus == dev->bus->number) { + ret = 1; + goto put_and_exit; + } + + tmp = pci_dev_get(pci_upstream_bridge(dev)); + pci_dev_put(dev); + dev = tmp; + } + +put_and_exit: + pci_dev_put(dev); +free_and_exit: + kfree(devfn_path); + return ret; +} + +/** * pci_dev_str_match - test if a string matches a device * @dev: the PCI device to test * @p: string to match the device against * @endptr: pointer to the string after the match * * Test if a string (typically from a kernel parameter) matches a - * specified. The string may be of one of two forms formats: + * specified. The string may be of one of three formats: * * [:]:. + * path:[:]:./.[/ ...] * pci::[::] * * The first format specifies a PCI bus/slot/function address which * may change if new hardware is inserted, if motherboard firmware changes, * or due to changes caused in kernel parameters. * - * The second format matches devices using IDs in the configuration + * The second format specifies a PCI bus/slot/function root address and + * a path of slot/function addresses to the specific device from the root. + * The path for a device can be determined through the use of 'lspci -t'. + * This format is more robust against renumbering issues than the first format. + + * The third format matches devices using IDs in the configuration * space which may match multiple devices in the system. A value of 0 * for any field will match all devices. * @@ -236,7 +330,15 @@ static int pci_dev_str_match(struct pci_dev *dev, const char *p, (!subsystem_device || subsystem_device == dev->subsystem_device)) goto found; + } else if (strncmp(p, "path:", 5) == 0) { + /* PCI Root Bus and a path of Slot,Function IDs */ + p += 5; + ret = pci_dev_str_match_path(dev, p, &p); + if (ret < 0) + return ret; + else if (ret) + goto found; } else { /* PCI Bus,Slot,Function ids are specified */ ret = sscanf(p, "%x:%x:%x.%x%n", &seg, &bus, &slot,