From patchwork Thu Mar 15 18:41:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10285539 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 E0C73602C2 for ; Thu, 15 Mar 2018 18:42:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D284328AC3 for ; Thu, 15 Mar 2018 18:42:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6D7F28BFE; Thu, 15 Mar 2018 18:42:06 +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 77F7E28AC3 for ; Thu, 15 Mar 2018 18:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932456AbeCOSle (ORCPT ); Thu, 15 Mar 2018 14:41:34 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:41841 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932257AbeCOSl2 (ORCPT ); Thu, 15 Mar 2018 14:41:28 -0400 Received: by mail-pg0-f68.google.com with SMTP id w17so3098222pgq.8; Thu, 15 Mar 2018 11:41:28 -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=yoqJ8Uz6aGSYcAtZmGiZLgdpgu6wFcwtyK9Zm8HobKM=; b=eKTZPaklht+ftrda7BG+LpLJetlifvCRQsfg2sBgcGvEfUb7NXwzwDpKs7J4spRIb+ WIYG/HJRuQbQS6LeR3GRV1unLACZbnRrWzCO0flZw4ekBgRFXqy4Nx+YvIN5R4Bcuu61 2+g4gBEThE/f5ka7BtW/vC7V4XDnSxRhpyOILEKa7ejRQm5rHCIwAiaIXKPLIxOjMQ+f O5KHTuFAHEYczsIe3VyXOTXdb5W+S0RkoJYrMCH4KXJ5iZJ3Pl8hBfWweghlbiHQkVVW pmMterdL1R/0tCeSixpPFpVk7oe1w/eSuJAT9oBkGgX9ikbT7uQne7YaEXbNOeE9hNEl Ybdw== 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=yoqJ8Uz6aGSYcAtZmGiZLgdpgu6wFcwtyK9Zm8HobKM=; b=Q2Aj8At6vUbjLlPWnnjWWkubUkg1nQBOY/x/PxtlZHfaZ/noD/h+2nVpkgNt97mA0i E7xVRvaqCbhWLsHsnEwltX6C6bd+V0rCroDC2IQHYF0A1+kkukKeQQWho7E/HuARz8Bl KsITCDGQuGiTTAscsomHRjRDA8KtfqlnuswW3xJJptuBG4BSRiBzqQOUNpQyf4rvDOq1 T8J3Kzdt3pBDc7+bJRNnBB4sikNivz0uucG/NfKWJL8CfsBpY9WUVjvsmijHk1qIXaJu KNbvdHCR1JTJMUNBD5HeK9oubBqQogC11G62OFeBUSJEFrzHsYKP2oHG376KI0f3Yhti MAnw== X-Gm-Message-State: AElRT7Gu15TVm9oRt3E2lZZ1AtYfOv87qH9f0ibqzmUU7Ic3YB0/5zfu PcwdF0ScFlJXJGUOaFCsLDk= X-Google-Smtp-Source: AG47ELtBYjd/q01ZW4jFOrlfSlLg+JK2SsGGtpvKIyytwnnRLezbrKUo1OF/FYFZMW1+3uolgJXzHA== X-Received: by 10.98.139.145 with SMTP id e17mr8488761pfl.53.1521139287750; Thu, 15 Mar 2018 11:41:27 -0700 (PDT) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id n27sm12075516pgc.40.2018.03.15.11.41.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 11:41:26 -0700 (PDT) Subject: [pci PATCH v7 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: Thu, 15 Mar 2018 11:41:25 -0700 Message-ID: <20180315184055.3102.2435.stgit@localhost.localdomain> In-Reply-To: <20180315183449.3102.64791.stgit@localhost.localdomain> References: <20180315183449.3102.64791.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 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 Tested-by: Mark Rustad --- 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 v7: Updated pci_sriov_configure_simple to drop need for err value Fixed comment explaining why pci_sriov_configure_simple is NULL drivers/pci/iov.c | 31 +++++++++++++++++++++++++++++++ include/linux/pci.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 677924ae0350..3e0a7fdff3e9 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -807,3 +807,34 @@ 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. Return value + * is negative on error, or number of VFs allocated on success. + */ +int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn) +{ + 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"); + return -EPERM; + } + + if (!nr_virtfn) { + sriov_disable(dev); + return 0; + } + + return sriov_enable(dev, nr_virtfn) ? : nr_virtfn; +} +EXPORT_SYMBOL_GPL(pci_sriov_configure_simple); diff --git a/include/linux/pci.h b/include/linux/pci.h index 024a1beda008..992202449829 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; } +/* this is 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) { }