Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp152603imm; Thu, 31 May 2018 21:03:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLsU/R9K1XMwCAPrRCYH9mj1/9KATb4y2J1yT31mEgJWp57de1g0IeOIbVy2SLyKAkRyFjP X-Received: by 2002:a63:aa07:: with SMTP id e7-v6mr7558601pgf.331.1527825805236; Thu, 31 May 2018 21:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527825805; cv=none; d=google.com; s=arc-20160816; b=gZqgRLG8ygRJlga48IYTRD1UzJBreP9e6kEBIgR3iFqpeHtnOi68vKqxIqRyUNIN1t TaEbVr63rq7MRZ5o9LGAtdilJfVLDQLJ6aoH3xTGf7j7Zvmeb5NNoMKKntMxSfXqSuo4 62gHfrT0EvhmTCCnqakhBvkGnN3Oq1bv+3E6LRMtdCt4NRgLSheS1OOviD+OGIgXVXBt ixgLLJcyCldN1g+PaCP+WSxr623rYMWctKKKludTWJHP9ai6XaZRgxccRuGxByLZ1CYO ItvsTv/j8QLqO5stA4mjJiZMr1E6ONkZWX8XdcJnnTihJrQzn2BjSYlAwq8TOa7xhMTQ 3ZeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=8cm+TanGCKlWlLaEYRVIuuM8PAioQa6WezrKHuCJbgo=; b=s/bPTSG47CBfKYpSugBuL4/YcRX7voKUe9vnEPYIrEcPf+qh+tc5FEHtaOzVuf1zAi 0wEr/zenpLLoNylyd0yvf9CpEYUw2xaUIm8cGiYrnSxzBQMRs8q1KXXeoF41p4MFk6EM 0HYBNLAaY6/WO+qAt66Rd55D+B6X17o67wU3c3mWmmp3OHyoIi8XE2SHmu/v4aPG/8ik RFJNbNhO5RZwEoW9o+ykFj279sarDwJRSQXog0sdQNfFHXyIaF+54Qajh62Q953Pu5Gz B6ZvQ8HPdHXXLOoFEz8aRBia3vGhMEanO8g+dlC/GziL3oXCMGwjWqQYqm9EZ/gCN9ry oS4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k63-v6si29774181pgc.401.2018.05.31.21.03.10; Thu, 31 May 2018 21:03:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750961AbeFAECl (ORCPT + 99 others); Fri, 1 Jun 2018 00:02:41 -0400 Received: from mga01.intel.com ([192.55.52.88]:20594 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750758AbeFAECk (ORCPT ); Fri, 1 Jun 2018 00:02:40 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 May 2018 21:02:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,464,1520924400"; d="scan'208";a="55649408" Received: from debian.sh.intel.com ([10.67.104.203]) by orsmga003.jf.intel.com with ESMTP; 31 May 2018 21:02:37 -0700 From: Tiwei Bie To: mst@redhat.com, bhelgaas@google.com, stefanha@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, virtio-dev@lists.oasis-open.org, linux-pci@vger.kernel.org Cc: dan.daly@intel.com, mark.d.rustad@intel.com, alexander.h.duyck@intel.com, cunming.liang@intel.com, zhihong.wang@intel.com Subject: [PATCH v3] virtio_pci: support enabling VFs Date: Fri, 1 Jun 2018 12:02:39 +0800 Message-Id: <20180601040239.1151-1-tiwei.bie@intel.com> X-Mailer: git-send-email 2.17.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a new feature bit allocated in virtio spec to support SR-IOV (Single Root I/O Virtualization): https://github.com/oasis-tcs/virtio-spec/issues/11 This patch enables the support for this feature bit in virtio driver. Signed-off-by: Tiwei Bie --- v3: - Drop the acks; v2: - Disable VFs when unbinding the driver (Alex, MST); - Don't use pci_sriov_configure_simple (Alex); drivers/virtio/virtio_pci_common.c | 30 ++++++++++++++++++++++++++++++ drivers/virtio/virtio_pci_modern.c | 14 ++++++++++++++ include/uapi/linux/virtio_config.h | 7 ++++++- 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index 48d4d1cf1cb6..1d4467b2dc31 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -577,6 +577,8 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev); struct device *dev = get_device(&vp_dev->vdev.dev); + pci_disable_sriov(pci_dev); + unregister_virtio_device(&vp_dev->vdev); if (vp_dev->ioaddr) @@ -588,6 +590,33 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) put_device(dev); } +static int virtio_pci_sriov_configure(struct pci_dev *pci_dev, int num_vfs) +{ + struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev); + struct virtio_device *vdev = &vp_dev->vdev; + int ret; + + if (!(vdev->config->get_status(vdev) & VIRTIO_CONFIG_S_DRIVER_OK)) + return -EBUSY; + + if (!__virtio_test_bit(vdev, VIRTIO_F_SR_IOV)) + return -EINVAL; + + if (pci_vfs_assigned(pci_dev)) + return -EPERM; + + if (num_vfs == 0) { + pci_disable_sriov(pci_dev); + return 0; + } + + ret = pci_enable_sriov(pci_dev, num_vfs); + if (ret < 0) + return ret; + + return num_vfs; +} + static struct pci_driver virtio_pci_driver = { .name = "virtio-pci", .id_table = virtio_pci_id_table, @@ -596,6 +625,7 @@ static struct pci_driver virtio_pci_driver = { #ifdef CONFIG_PM_SLEEP .driver.pm = &virtio_pci_pm_ops, #endif + .sriov_configure = virtio_pci_sriov_configure, }; module_pci_driver(virtio_pci_driver); diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 2555d80f6eec..07571daccfec 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -153,14 +153,28 @@ static u64 vp_get_features(struct virtio_device *vdev) return features; } +static void vp_transport_features(struct virtio_device *vdev, u64 features) +{ + struct virtio_pci_device *vp_dev = to_vp_device(vdev); + struct pci_dev *pci_dev = vp_dev->pci_dev; + + if ((features & BIT_ULL(VIRTIO_F_SR_IOV)) && + pci_find_ext_capability(pci_dev, PCI_EXT_CAP_ID_SRIOV)) + __virtio_set_bit(vdev, VIRTIO_F_SR_IOV); +} + /* virtio config->finalize_features() implementation */ static int vp_finalize_features(struct virtio_device *vdev) { struct virtio_pci_device *vp_dev = to_vp_device(vdev); + u64 features = vdev->features; /* Give virtio_ring a chance to accept features. */ vring_transport_features(vdev); + /* Give virtio_pci a chance to accept features. */ + vp_transport_features(vdev, features); + if (!__virtio_test_bit(vdev, VIRTIO_F_VERSION_1)) { dev_err(&vdev->dev, "virtio: device uses modern interface " "but does not have VIRTIO_F_VERSION_1\n"); diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 308e2096291f..b7c1f4e7d59e 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -49,7 +49,7 @@ * transport being used (eg. virtio_ring), the rest are per-device feature * bits. */ #define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 34 +#define VIRTIO_TRANSPORT_F_END 38 #ifndef VIRTIO_CONFIG_NO_LEGACY /* Do we get callbacks when the ring is completely used, even if we've @@ -71,4 +71,9 @@ * this is for compatibility with legacy systems. */ #define VIRTIO_F_IOMMU_PLATFORM 33 + +/* + * Does the device support Single Root I/O Virtualization? + */ +#define VIRTIO_F_SR_IOV 37 #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ -- 2.17.0