[RFC PATCH V4] pci: virtio_pci: Add SR-IOV support for virtio_pci devices
Hardware-realized virtio_pci devices can implement SR-IOV, so this
patch enables its use. The device in question is an upcoming Intel
NIC that implements both a virtio_net PF and virtio_net VFs. These
are hardware realizations of what has been up to now been a software
interface.
The device in question has the following 4-part PCI IDs:
PF: vendor: 1af4 device: 1041 subvendor: 8086 subdevice: 15fe
VF: vendor: 1af4 device: 1041 subvendor: 8086 subdevice: 05fe
The patch needs no check for device ID, because the callback will
never be made for devices that do not assert the capability or
when run on a platform incapable of SR-IOV.
One reason for this patch is because the hardware requires the
vendor ID of a VF to be the same as the vendor ID of the PF that
created it. So it seemed logical to simply have a fully-functioning
virtio_net PF create the VFs. This patch makes that possible.
Signed-off-by: Mark Rustad <mark.d.rus...@intel.com>
Reviewed-by: Alexander Duyck <alexander.h.du...@intel.com>
---
Changes in V4:
- V3 was a mis-send, this has what was intended
- Move most code to new helpers in pci/iov.c, pci_sriov_configure_generic
and pci_sriov_disable_generic
- Correct mislabeling of vendor and device IDs
- Other minor changelog fixes
- Rebased to pci/master, since most changes are in that area now
- No new ifdefs with this approach (yay)
Changes in V3:
- Missent patch, please disregard
Changes in V2:
- Simplified logic from previous version, removed added driver variable
- Disable SR-IOV on driver removal except when VFs are assigned
- Sent as RFC to virtio-dev, linux-pci, netdev, lkml and others
---
drivers/pci/iov.c | 50
drivers/virtio/virtio_pci_common.c |2 +
include/linux/pci.h| 10 +++
3 files changed, 62 insertions(+)
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 677924ae0350..4b110e169b7c 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -367,6 +367,56 @@ static void sriov_disable(struct pci_dev *dev)
pci_iov_set_numvfs(dev, 0);
}
+/**
+ * pci_sriov_disable_generic - standard helper to disable SR-IOV
+ * @dev:the PCI PF device whose VFs are to be disabled
+ */
+int pci_sriov_disable_generic(struct pci_dev *dev)
+{
+ /*
+* If vfs are assigned we cannot shut down SR-IOV without causing
+* issues, so just leave the hardware available.
+*/
+ if (pci_vfs_assigned(dev)) {
+ pci_warn(dev,
+"Cannot disable SR-IOV while VFs are assigned - VFs
will not be deallocated\n");
+ return -EPERM;
+ }
+ pci_disable_sriov(dev);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(pci_sriov_disable_generic);
+
+static int pci_sriov_enable(struct pci_dev *dev, int num_vfs)
+{
+ int rc;
+
+ if (pci_num_vf(dev))
+ return -EINVAL;
+
+ rc = pci_enable_sriov(dev, num_vfs);
+ if (rc) {
+ pci_warn(dev, "Failed to enable PCI sriov: %d\n", rc);
+ return rc;
+ }
+ pci_info(dev, "SR-IOV enabled with %d VFs\n", num_vfs);
+ return num_vfs;
+}
+
+/**
+ * pci_sriov_configure_generic - standard helper to configure SR-IOV
+ * @dev: the PCI PF device that is configuring SR-IOV
+ */
+int pci_sriov_configure_generic(struct pci_dev *dev, int num_vfs)
+{
+ if (num_vfs)
+ return pci_sriov_enable(dev, num_vfs);
+ if (!pci_num_vf(dev))
+ return -EINVAL;
+ return pci_sriov_disable_generic(dev);
+}
+EXPORT_SYMBOL_GPL(pci_sriov_configure_generic);
+
static int sriov_init(struct pci_dev *dev, int pos)
{
int i, bar64;
diff --git a/drivers/virtio/virtio_pci_common.c
b/drivers/virtio/virtio_pci_common.c
index 48d4d1cf1cb6..d7679377131f 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -584,6 +584,7 @@ static void virtio_pci_remove(struct pci_dev *pci_dev)
else
virtio_pci_modern_remove(vp_dev);
+ pci_sriov_disable_generic(pci_dev);
pci_disable_device(pci_dev);
put_device(dev);
}
@@ -596,6 +597,7 @@ static struct pci_driver virtio_pci_driver = {
#ifdef CONFIG_PM_SLEEP
.driver.pm = _pci_pm_ops,
#endif
+ .sriov_configure = pci_sriov_configure_generic,
};
module_pci_driver(virtio_pci_driver);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 024a1beda008..937124d4e098 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1947,6 +1947,8 @@ int pci_iov_virtfn_devfn(struct pci_dev *dev, int id);
int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
void pci_disable_sriov(struct pci_dev *dev);
+int pci_sriov_disable_generic(struct pci_dev *dev);
+int pci_sriov_configure_generic(struct pci_dev *dev, int num_vfs);
int pci_iov_add_virtfn(struct pci_dev *dev, int id);
void pci_iov_remove_virtfn(struct pci_dev *dev, int id);
int p
[RFC PATCH V3] virtio_pci: Add SR-IOV support
Hardware-realized virtio-pci devices can implement SR-IOV, so this
patch enables its use. The device in question is an upcoming Intel
NIC that implements both a virtio-net PF and virtio-net VFs. These
are hardware realizations of what has been up to now been a software
interface.
The device in question has the following 4-part PCI IDs:
PF: device: 1af4 vendor: 1041 subvendor: 8086 subdevice: 15fe
VF: device: 1af4 vendor: 1041 subvendor: 8086 subdevice: 05fe
The patch needs no check for device ID, because the callback will
never be made for devices that do not assert the capability or
when run on a platform incapable of SR-IOV.
One reason for this patch is because the hardware requires the
vendor ID of a VF to be the same as the vendor ID of the PF that
created it. So it seemed logical to simply have a fully-functioning
virtio-net PF create the VFs. This patch makes that possible.
Signed-off-by: Mark Rustad <mark.d.rus...@intel.com>
Reviewed-by: Alexander Duyck <alexander.h.du...@intel.com>
---
Changes in V3:
- Move most code to a new helper in pci/iov.c, pci_sriov_configure
Changes in V2:
- Simplified logic from previous version, removed added driver variable
- Disable SR-IOV on driver removal excapt when VFs are assigned
- Sent as RFC to virtio-dev, linux-pci, netdev, lkml and others
---
drivers/pci/iov.c | 48
drivers/virtio/virtio_pci_common.c |2 ++
include/linux/pci.h| 10
3 files changed, 60 insertions(+)
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 677924ae0350..ddd44a9d93ec 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -367,6 +367,54 @@ static void sriov_disable(struct pci_dev *dev)
pci_iov_set_numvfs(dev, 0);
}
+/**
+ * pci_sriov_disable - standard helper to disable SR-IOV
+ * @dev:the PCI PF device whose VFs are to be disabled
+ */
+int pci_sriov_disable(struct pci_dev *dev)
+{
+ /*
+* If vfs are assigned we cannot shut down SR-IOV without causing
+* issues, so just leave the hardware available.
+*/
+ if (pci_vfs_assigned(dev)) {
+ pci_warn(>dev,
+"Cannot disable SR-IOV while VFs are assigned - VFs
will not be deallocated\n");
+ return -EPERM;
+ }
+ pci_disable_sriov(dev);
+ return 0;
+}
+
+static int pci_sriov_enable(struct pci_dev *dev, int num_vfs)
+{
+ int rc;
+
+ if (pci_num_vf(dev))
+ return -EINVAL;
+
+ rc = pci_enable_sriov(dev, num_vfs);
+ if (rc) {
+ pci_warn(dev, "Failed to enable PCI sriov: %d\n", rc);
+ return rc;
+ }
+ dev_info(dev, "SR-IOV enabled with %d VFs\n", num_vfs);
+ return num_vfs;
+}
+
+/**
+ * pci_sriov_configure - standard helper to configure SR-IOV
+ * @dev: the PCI PF device that is configuring SR-IOV
+ */
+int pci_sriov_configure(struct pci_dev *dev, int num_vfs)
+{
+ if (num_vfs)
+ return pci_sriov_enable(dev, num_vfs);
+ if (!pci_num_vf(dev))
+ return -EINVAL;
+ return pci_sriov_disable(dev);
+}
+
static int sriov_init(struct pci_dev *dev, int pos)
{
int i, bar64;
diff --git a/drivers/virtio/virtio_pci_common.c
b/drivers/virtio/virtio_pci_common.c
index 48d4d1cf1cb6..37e353c4f8b4 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -584,6 +584,7 @@ static void virtio_pci_remove(struct pci_dev *pci_dev)
else
virtio_pci_modern_remove(vp_dev);
+ pci_sriov_disable(pci_dev);
pci_disable_device(pci_dev);
put_device(dev);
}
@@ -596,6 +597,7 @@ static struct pci_driver virtio_pci_driver = {
#ifdef CONFIG_PM_SLEEP
.driver.pm = _pci_pm_ops,
#endif
+ .sriov_configure = pci_sriov_configure,
};
module_pci_driver(virtio_pci_driver);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 024a1beda008..ef6b359afefd 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1947,6 +1947,8 @@ int pci_iov_virtfn_devfn(struct pci_dev *dev, int id);
int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
void pci_disable_sriov(struct pci_dev *dev);
+int pci_sriov_disable(struct pci_dev *dev);
+int pci_sriov_configure(struct pci_dev *dev, int num_vfs);
int pci_iov_add_virtfn(struct pci_dev *dev, int id);
void pci_iov_remove_virtfn(struct pci_dev *dev, int id);
int pci_num_vf(struct pci_dev *dev);
@@ -1973,6 +1975,14 @@ static inline int pci_iov_add_virtfn(struct pci_dev
*dev, int id)
static inline void pci_iov_remove_virtfn(struct pci_dev *dev,
int id) { }
static inline void pci_disable_sriov(struct pci_dev *dev) { }
+static inline int pci_sriov_disable(struct pci_dev *dev)
+{
+ return -ENODEV;
+}
+static inline int pci_sriov_configure(struct pci_dev *dev, int num_vfs)
+{
+ return -EN
[RFC PATCH V2] virtio_pci: Add SR-IOV support
Hardware-realized virtio-pci devices can implement SR-IOV, so this
patch enables its use. The device in question is an upcoming Intel
NIC that implements both a virtio-net PF and virtio-net VFs. These
are hardware realizations of what has been up to now been a software
interface.
The device in question has the following 4-part PCI IDs:
PF: device: 1af4 vendor: 1041 subvendor: 8086 subdevice: 15fe
VF: device: 1af4 vendor: 1041 subvendor: 8086 subdevice: 05fe
The patch needs no check for device ID, because the callback will
never be made for devices that do not assert the capability or
when run on a platform incapable of SR-IOV.
One reason for this patch is because the hardware requires the
vendor ID of a VF to be the same as the vendor ID of the PF that
created it. So it seemed logical to simply have a fully-functioning
virtio-net PF create the VFs. This patch makes that possible.
Signed-off-by: Mark Rustad <mark.d.rus...@intel.com>
Reviewed-by: Alexander Duyck <alexander.h.du...@intel.com>
---
Changes in V2:
- Simplified logic from previous version, removed added driver variable
- Disable SR-IOV on driver removal excapt when VFs are assigned
- Sent as RFC to virtio-dev, linux-pci, netdev, lkml and others
---
drivers/virtio/virtio_pci_common.c | 47
1 file changed, 47 insertions(+)
diff --git a/drivers/virtio/virtio_pci_common.c
b/drivers/virtio/virtio_pci_common.c
index 48d4d1cf1cb6..78b53ffc4cee 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -572,6 +572,47 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,
return rc;
}
+#ifdef CONFIG_PCI_IOV
+static int virtio_pci_sriov_disable(struct pci_dev *pci_dev)
+{
+ /* If vfs are assigned we cannot shut down SR-IOV without causing
+* issues, so just leave the hardware available.
+*/
+ if (pci_vfs_assigned(pci_dev)) {
+ dev_warn(_dev->dev,
+"Unloading driver while VFs are assigned - VFs will
not be deallocated\n");
+ return -EPERM;
+ }
+ pci_disable_sriov(pci_dev);
+ return 0;
+}
+
+static int virtio_pci_sriov_enable(struct pci_dev *pci_dev, int num_vfs)
+{
+ int rc = 0;
+
+ if (pci_num_vf(pci_dev))
+ return -EINVAL;
+
+ rc = pci_enable_sriov(pci_dev, num_vfs);
+ if (rc) {
+ dev_warn(_dev->dev, "Failed to enable PCI sriov: %d\n", rc);
+ return rc;
+ }
+ dev_info(_dev->dev, "SR-IOV enabled with %d VFs\n", num_vfs);
+ return num_vfs;
+}
+
+static int virtio_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
+{
+ if (num_vfs)
+ return virtio_pci_sriov_enable(dev, num_vfs);
+ if (!pci_num_vf(dev))
+ return -EINVAL;
+ return virtio_pci_sriov_disable(dev);
+}
+#endif /* CONFIG_PCI_IOV */
+
static void virtio_pci_remove(struct pci_dev *pci_dev)
{
struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
@@ -584,6 +625,9 @@ static void virtio_pci_remove(struct pci_dev *pci_dev)
else
virtio_pci_modern_remove(vp_dev);
+#ifdef CONFIG_PCI_IOV
+ virtio_pci_sriov_disable(pci_dev);
+#endif
pci_disable_device(pci_dev);
put_device(dev);
}
@@ -596,6 +640,9 @@ static void virtio_pci_remove(struct pci_dev *pci_dev)
#ifdef CONFIG_PM_SLEEP
.driver.pm = _pci_pm_ops,
#endif
+#ifdef CONFIG_PCI_IOV
+ .sriov_configure = virtio_pci_sriov_configure,
+#endif
};
module_pci_driver(virtio_pci_driver);
Re: [Intel-wired-lan] [PATCH] igb: add more checks for disconnected adapter
On 9/21/15 9:14 PM, Jarod Wilson wrote: > Just switching to adapter->io_addr everywhere seems to not work as > noted above. :\ Note that I'm also chasing this from the other end > with the author of the pci patches that seem to have triggered this, > so the real bug might be over in pci-land, but hardening against > explosions in igb still seems like a worthwhile effort here. My understanding is that there can be problems if too many writes to a removed device happen. That is why ixgbe avoids doing that by testing for removal in some places. The io_addr does get used in the transmit path simply to avoid adding a test to that hot path. That approach seems to be working well for ixgbe. signature.asc Description: OpenPGP digital signature
