From patchwork Fri Dec 8 21:47:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 10103355 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 9017F602A0 for ; Fri, 8 Dec 2017 21:48:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84A9828F94 for ; Fri, 8 Dec 2017 21:48:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7992128F9E; Fri, 8 Dec 2017 21:48:15 +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.9 required=2.0 tests=BAYES_00,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 2266028F94 for ; Fri, 8 Dec 2017 21:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752610AbdLHVsJ (ORCPT ); Fri, 8 Dec 2017 16:48:09 -0500 Received: from mga03.intel.com ([134.134.136.65]:23538 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752350AbdLHVsI (ORCPT ); Fri, 8 Dec 2017 16:48:08 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Dec 2017 13:48:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,379,1508828400"; d="scan'208";a="182609509" Received: from jtkirshe-nuc.jf.intel.com ([134.134.177.151]) by orsmga005.jf.intel.com with ESMTP; 08 Dec 2017 13:48:07 -0800 From: Jeff Kirsher To: alex.williamson@redhat.com Cc: Liang-Min Wang , kvm@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, bhelgaas@google.com, alexander.h.duyck@intel.com Subject: [PATCH v2] Enable SR-IOV instantiation through /sys file Date: Fri, 8 Dec 2017 13:47:58 -0800 Message-Id: <20171208214758.6959-1-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 2.14.3 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Liang-Min Wang When a SR-IOV capable device is bound with vfio-pci, the device loses capability of creating SR-IOV instances through /sy/bus/ pci/devices/.../sriov_numvfs. This patch re-activates this capability for a PCIe device that is SR-IOV capable and is bound with vfio-pci.ko. This patch also disables drivers_autoprobe attribute of SR-IOV devices created from vfio-pci bound device by default, so user-space PF device can coordinate the bring-up of SR-IOV devices Signed-off-by: Liang-Min Wang --- drivers/pci/pci-driver.c | 12 ++++++++++++ drivers/vfio/pci/vfio_pci.c | 22 ++++++++++++++++++++++ include/linux/pci.h | 1 + 3 files changed, 35 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 7f47bb7..19522fe 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1467,6 +1467,18 @@ void pci_dev_put(struct pci_dev *dev) } EXPORT_SYMBOL(pci_dev_put); +/** + * pci_dev_sriov_autoprobe_set - set device sriov driver autoprobe + * @dev: device with which sriov autoprobe will be set + * + */ +void pci_dev_sriov_autoprobe_set(struct pci_dev *dev, bool autoprobe) +{ + if (dev && dev->sriov) + dev->sriov->drivers_autoprobe = autoprobe; +} +EXPORT_SYMBOL(pci_dev_sriov_autoprobe_set); + static int pci_uevent(struct device *dev, struct kobj_uevent_env *env) { struct pci_dev *pdev; diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index f041b1a..004836c 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -1213,6 +1213,8 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) return -ENOMEM; } + /* disable sriov automatic driver attachment */ + pci_dev_sriov_autoprobe_set(pdev, false); vdev->pdev = pdev; vdev->irq_type = VFIO_PCI_NUM_IRQS; mutex_init(&vdev->igate); @@ -1256,6 +1258,7 @@ static void vfio_pci_remove(struct pci_dev *pdev) if (!vdev) return; + pci_disable_sriov(pdev); vfio_iommu_group_put(pdev->dev.iommu_group, &pdev->dev); kfree(vdev->region); kfree(vdev); @@ -1303,12 +1306,31 @@ static pci_ers_result_t vfio_pci_aer_err_detected(struct pci_dev *pdev, .error_detected = vfio_pci_aer_err_detected, }; +static int vfio_sriov_configure(struct pci_dev *pdev, int num_vfs) +{ + int status; + + if (!num_vfs) { + pci_disable_sriov(pdev); + return 0; + } + + status = pci_enable_sriov(pdev, num_vfs); + if (!status) { + pr_crit("Created %d SR-IOV from a user-space driver based upon vfio-pci\n", num_vfs); + add_taint(TAINT_USER, LOCKDEP_STILL_OK); + } + + return status; +} + static struct pci_driver vfio_pci_driver = { .name = "vfio-pci", .id_table = NULL, /* only dynamic ids */ .probe = vfio_pci_probe, .remove = vfio_pci_remove, .err_handler = &vfio_err_handlers, + .sriov_configure = vfio_sriov_configure, }; struct vfio_devices { diff --git a/include/linux/pci.h b/include/linux/pci.h index 0403894..e04b69d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -921,6 +921,7 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, struct pci_dev *pci_dev_get(struct pci_dev *dev); void pci_dev_put(struct pci_dev *dev); void pci_remove_bus(struct pci_bus *b); +void pci_dev_sriov_autoprobe_set(struct pci_dev *dev, bool autoprobe); void pci_stop_and_remove_bus_device(struct pci_dev *dev); void pci_stop_and_remove_bus_device_locked(struct pci_dev *dev); void pci_stop_root_bus(struct pci_bus *bus);