From patchwork Tue Mar 13 21:28:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10280865 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 5E04F6038F for ; Tue, 13 Mar 2018 21:29:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EB86283DA for ; Tue, 13 Mar 2018 21:29:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4191A28518; Tue, 13 Mar 2018 21:29:22 +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.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 C08AF283DA for ; Tue, 13 Mar 2018 21:29:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752793AbeCMV2x (ORCPT ); Tue, 13 Mar 2018 17:28:53 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35379 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752397AbeCMV2v (ORCPT ); Tue, 13 Mar 2018 17:28:51 -0400 Received: by mail-pg0-f67.google.com with SMTP id d1so448875pgv.2; Tue, 13 Mar 2018 14:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=Ed4ikwizjsLBPJgGhJdQ/26iFo2M6bcOsDmoVV53A+c=; b=qpb1pRPntT1B1toZdzQNRhKifHixO3MEok7sIOGOrw1w6Zpf8LJdU436A3RhzsJSpY CJaFLWCkegFspHOgNs2egwfROU+hyWzEarZ6FQoZclBHwn9o8gW9KhscuRsoKkNxy+8G j+RYDbx+gVa1FOtk7AHZXwxmLVmwHJlIIXqCBTOL775qjI770r8c3j3rVrT7eivHaPmB I0nONn8CK0pvO+u3dnNFGS9uL3chvvJ42XrJIPBiirSUC/Wm8CP2O0c6wLiYu5lTgMkt HVVfK4X6/YkiyMDz1zcO/zzWsJAXEKYl8PYi/+rcPGY7phd9af6jz9IR5BmK0OjIV/ZQ iiIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=Ed4ikwizjsLBPJgGhJdQ/26iFo2M6bcOsDmoVV53A+c=; b=U+PO8CZrq6HOiQ7sfx0SHoMpCmPGAM421IQpzHoEzOebl/An9oR7M1JXvTafyjaYe9 0wMM0Iza9MfyrI7S+hc3H2rYql3fZAHhOHOhQyV0Vi+Py3vCpuG2N4PsEklO7DvfQnd7 aJjyURNWOV1NuZzTipbXv6CybBdbr9pfGH8ecJ8nsAm0qM/RUpMFBDEilr0f0Oq1TufI tflXjtKU2iWdX6M/SikYBsSIY45L9oXa1psXXRNtrRfLKaelPagKDZWHbPubfvMGHglE EP4W+mekFIyGvtcODlFloJRD/jJppQeFAQjvb+dxbP5kpywKRSCahaUH3A2PF2FZ6kpu i1dQ== X-Gm-Message-State: AElRT7E6NBr/uimykGH9YfGHbg84nAOGTwT/jMRZbH1Z0PWz+z+VY04F aOIuSboOh5mlTAZW3QGAwxQ= X-Google-Smtp-Source: AG47ELutM8chTAexINwr5vFVnu+1RjMr7SsK+zA53R/sFV5IXCrlhuccDJMBytJYz7KgHQkeeNa4pQ== X-Received: by 10.99.111.78 with SMTP id k75mr1665840pgc.414.1520976530784; Tue, 13 Mar 2018 14:28:50 -0700 (PDT) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id r78sm1898535pfb.24.2018.03.13.14.28.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 14:28:50 -0700 (PDT) Subject: [pci PATCH v6 1/5] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources From: Alexander Duyck To: bhelgaas@google.com, alexander.h.duyck@intel.com, linux-pci@vger.kernel.org Cc: virtio-dev@lists.oasis-open.org, kvm@vger.kernel.org, netdev@vger.kernel.org, dan.daly@intel.com, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, keith.busch@intel.com, netanel@amazon.com, ddutile@redhat.com, mheyne@amazon.de, liang-min.wang@intel.com, mark.d.rustad@intel.com, dwmw2@infradead.org, hch@lst.de, dwmw@amazon.co.uk Date: Tue, 13 Mar 2018 14:28:49 -0700 Message-ID: <20180313212754.3553.72176.stgit@localhost.localdomain> In-Reply-To: <20180313212508.3553.65326.stgit@localhost.localdomain> References: <20180313212508.3553.65326.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Alexander Duyck This patch adds a common configuration function called pci_sriov_configure_simple that will allow for managing VFs on devices where the PF is not capable of managing VF resources. Signed-off-by: Alexander Duyck Reviewed-by: Christoph Hellwig --- v5: New patch replacing pci_sriov_configure_unmanaged with pci_sriov_configure_simple Dropped bits related to autoprobe changes v6: Defined pci_sriov_configure_simple as NULL if IOV is disabled drivers/pci/iov.c | 32 ++++++++++++++++++++++++++++++++ include/linux/pci.h | 3 +++ 2 files changed, 35 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 677924ae0350..bd7021491fdb 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -807,3 +807,35 @@ int pci_sriov_get_totalvfs(struct pci_dev *dev) return dev->sriov->total_VFs; } EXPORT_SYMBOL_GPL(pci_sriov_get_totalvfs); + +/** + * pci_sriov_configure_simple - helper to configure unmanaged SR-IOV + * @dev: the PCI device + * @nr_virtfn: number of virtual functions to enable, 0 to disable + * + * Used to provide generic enable/disable SR-IOV option for devices + * that do not manage the VFs generated by their driver + */ +int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn) +{ + int err = -EINVAL; + + might_sleep(); + + if (!dev->is_physfn) + return -ENODEV; + + if (pci_vfs_assigned(dev)) { + pci_warn(dev, + "Cannot modify SR-IOV while VFs are assigned\n"); + err = -EPERM; + } else if (!nr_virtfn) { + sriov_disable(dev); + err = 0; + } else if (!dev->sriov->num_VFs) { + err = sriov_enable(dev, nr_virtfn); + } + + return err ? err : nr_virtfn; +} +EXPORT_SYMBOL_GPL(pci_sriov_configure_simple); diff --git a/include/linux/pci.h b/include/linux/pci.h index 024a1beda008..f3099e940cda 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1953,6 +1953,7 @@ static inline void pci_mmcfg_late_init(void) { } int pci_vfs_assigned(struct pci_dev *dev); int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); int pci_sriov_get_totalvfs(struct pci_dev *dev); +int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn); resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno); void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe); #else @@ -1980,6 +1981,8 @@ static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs) { return 0; } static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) { return 0; } +/* since this expected to be used as a function pointer just define as NULL */ +#define pci_sriov_configure_simple NULL static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) { return 0; } static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }