DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd
@ 2021-03-02  6:13 Robin Zhang
  2021-03-30  8:16 ` [dpdk-dev] [PATCH v2] " Robin Zhang
                   ` (5 more replies)
  0 siblings, 6 replies; 15+ messages in thread
From: Robin Zhang @ 2021-03-02  6:13 UTC (permalink / raw)
  To: dev; +Cc: mdr, nhorman, beilei.xing, jia.guo, jingjing.wu, Robin Zhang

Avf PMD was introduced from DPDK 18.02 to promote Intel Adaptive Virtual
Function with device ID is 0x1889 aligned with AVF public spec. At the
meanwhile, i40evf PMD was co-existed to support other existing device IDs
of i40e devices. So on i40e devices, iavf PMD can only run in the VM whose
hypervisor has emulated the VF’s device to 0x1889. At that time, linux
i40evf kernel driver covers device ID of i40e VF and 0x1889. Start from
ice, all the VFs will be AVF, that is to say their device ID is 0x1889.

Currently in i40e VF driver, when one new feature is added, DPDK SW need
to maintain two drivers even for one device. Validation team also need to
keep the behavior of those two drivers are the same.
Meanwhile, container deploy becomes more popular, and device ID cannot be
changed as there is no device emulate. So the user in container can only
use i40evf PMD on i40e devices, when upgrade to ice devices, driver should
be switched to iavf. That will break iavf continuity on i40e devices.
Also, one driver would force the developing the interface to be consistent
for customers using both i40e, ice and later products.

So, i40evf PMD is no need to maintain, as iavf will be used instead of
i40evf.

Impact:
If the customers are using i40evf PMD on Intel 700 series NICs, when they
upgrade to latest DPDK SW, they do not need to modify device ID anymore.

Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
---
 doc/guides/rel_notes/deprecation.rst | 6 ++++++
 drivers/common/iavf/iavf_devids.h    | 3 +++
 drivers/net/i40e/i40e_ethdev_vf.c    | 4 ----
 drivers/net/iavf/iavf_ethdev.c       | 6 ++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 82c1a90a3..069ab04e9 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -125,3 +125,9 @@ Deprecation Notices
 * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
   content. On Linux and FreeBSD, supported prior to DPDK 20.11,
   original structure will be kept until DPDK 21.11.
+
+* i40e: As there are both i40evf and iavf pmd, the functions of them are
+  duplicated. And now more and more advanced features are developed on iavf.
+  To keep consistent with kernel driver's name
+  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain,
+  will use iavf to instead of i40evf in DPDK 21.11.
diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
index 722c2e4f4..5047525fc 100644
--- a/drivers/common/iavf/iavf_devids.h
+++ b/drivers/common/iavf/iavf_devids.h
@@ -13,5 +13,8 @@
 #define IAVF_DEV_ID_VF_HV		0x1571
 #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
 #define IAVF_DEV_ID_X722_VF		0x37CD
+#ifdef X722_A0_SUPPORT
+#define I40E_DEV_ID_X722_A0_VF          0x374D
+#endif
 
 #endif /* _IAVF_DEVIDS_H_ */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 2909b4d89..fe8a86466 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1164,10 +1164,6 @@ i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid)
 }
 
 static const struct rte_pci_id pci_id_i40evf_map[] = {
-	{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF) },
-	{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF_HV) },
-	{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
-	{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_VF) },
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 4d3772202..3f656140e 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -127,6 +127,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
 
 static const struct rte_pci_id pci_id_iavf_map[] = {
 	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
+#ifdef X722_A0_SUPPORT
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
+#endif
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v2] net/iavf: deprecate i40evf pmd
  2021-03-02  6:13 [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd Robin Zhang
@ 2021-03-30  8:16 ` Robin Zhang
  2021-04-02 10:42 ` [dpdk-dev] [PATCH v3] " Robin Zhang
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 15+ messages in thread
From: Robin Zhang @ 2021-03-30  8:16 UTC (permalink / raw)
  To: dev
  Cc: mdr, nhorman, jingjing.wu, beilei.xing, jia.guo, qiming.yang,
	stevex.yang, Robin Zhang

Avf PMD was introduced from DPDK 18.02 to promote Intel Adaptive Virtual
Function with device ID is 0x1889 aligned with AVF public spec. At the
meanwhile, i40evf PMD was co-existed to support other existing device IDs
of i40e devices. So on i40e devices, iavf PMD can only run in the VM whose
hypervisor has emulated the VF’s device to 0x1889. At that time, linux
i40evf kernel driver covers device ID of i40e VF and 0x1889. Start from
ice, all the VFs will be AVF, that is to say their device ID is 0x1889.

Currently in i40e VF driver, when one new feature is added, DPDK SW need
to maintain two drivers even for one device. Validation team also need to
keep the behavior of those two drivers are the same.
Meanwhile, container deploy becomes more popular, and device ID cannot be
changed as there is no device emulate. So the user in container can only
use i40evf PMD on i40e devices, when upgrade to ice devices, driver should
be switched to iavf. That will break iavf continuity on i40e devices.
Also, one driver would force the developing the interface to be consistent
for customers using both i40e, ice and later products.

So, i40evf PMD is no need to maintain, as iavf will be used instead of
i40evf. Starting from DPDK 21.05, the default VF driver will be iavf.

Impact:
If the customers are using i40evf PMD on Intel 700 series NICs, when they
upgrade to latest DPDK SW, they do not need to modify device ID anymore.
Meanwhile, before i40evf is deleted officially, i40evf can still be used
if users specify the devarg "driver=i40evf".

Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
---
v2:
-change default VF driver to iavf, add devarg "driver=i40evf" so that
 i40evf can still be used.
---
 doc/guides/rel_notes/deprecation.rst |  8 +++++
 drivers/common/iavf/iavf_devids.h    |  4 +++
 drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++++++++++++
 drivers/net/iavf/iavf_ethdev.c       |  6 ++++
 4 files changed, 63 insertions(+)

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 64629e0641..63b59bd2fd 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -130,3 +130,11 @@ Deprecation Notices
 * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
   content. On Linux and FreeBSD, supported prior to DPDK 20.11,
   original structure will be kept until DPDK 21.11.
+
+* i40e: As there are both i40evf and iavf pmd, the functions of them are
+  duplicated. And now more and more advanced features are developed on iavf.
+  To keep consistent with kernel driver's name
+  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain.
+  Starting from 21.05, the default VF driver of i40e will be iavf, but i40evf
+  can still be used if users specify the devarg "driver=i40evf". I40evf will
+  be deleted in DPDK 21.11.
diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
index 722c2e4f49..74d84a82e8 100644
--- a/drivers/common/iavf/iavf_devids.h
+++ b/drivers/common/iavf/iavf_devids.h
@@ -13,5 +13,9 @@
 #define IAVF_DEV_ID_VF_HV		0x1571
 #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
 #define IAVF_DEV_ID_X722_VF		0x37CD
+#ifdef X722_A0_SUPPORT
+#define I40E_DEV_ID_X722_A0_VF          0x374D
+#endif
+
 
 #endif /* _IAVF_DEVIDS_H_ */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 0c9bd8d2c6..509c8f4e37 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+static int
+i40evf_check_driver_handler(__rte_unused const char *key,
+			    const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+i40evf_driver_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       i40evf_check_driver_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	struct rte_pci_device *pci_dev)
 {
+	if (!i40evf_driver_selected(pci_dev->device.devargs))
+		return 1;
+
 	return rte_eth_dev_pci_generic_probe(pci_dev,
 		sizeof(struct i40e_adapter), i40evf_dev_init);
 }
@@ -1681,6 +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd = {
 RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 869c4a1988..e20e07807f 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -125,6 +125,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
 
 static const struct rte_pci_id pci_id_iavf_map[] = {
 	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
+#ifdef X722_A0_SUPPORT
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
+#endif
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v3] net/iavf: deprecate i40evf pmd
  2021-03-02  6:13 [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd Robin Zhang
  2021-03-30  8:16 ` [dpdk-dev] [PATCH v2] " Robin Zhang
@ 2021-04-02 10:42 ` Robin Zhang
  2021-04-15  2:05 ` [dpdk-dev] [PATCH v4] " Robin Zhang
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 15+ messages in thread
From: Robin Zhang @ 2021-04-02 10:42 UTC (permalink / raw)
  To: dev
  Cc: mdr, nhorman, jingjing.wu, beilei.xing, jia.guo, qiming.yang,
	stevex.yang, Robin Zhang

The i40evf PMD will be deprecated, iavf will be the only VF driver for
Intel 700 serial (i40e) NIC family. To reach this, there will be 2 steps:

Step 1: iavf will be the default VF driver, while i40evf still can be
selected by devarg: "driver=i40evf".
This is covered by this patch, which include:
1) add all 700 serial NIC VF device ID into iavf PMD
2) skip probe if devargs contain "driver=i40evf" in iavf
3) continue probe if devargs contain "driver=i40evf" in i40evf

Step 2: i40evf and related devarg are removed, this will happen at DPDK
21.11

Between step 1 and step 2, no new feature will be added into i40evf except
bug fix.

Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
---
v3:
- skip probe if devargs contain "driver=i40evf" in iavf.
- update intel_vf.rst for the new devargs.

v2:
- change default VF driver to iavf, add devarg "driver=i40evf" so that
  i40evf can still be used.
---
 doc/guides/nics/intel_vf.rst         |  6 +++
 doc/guides/rel_notes/deprecation.rst |  8 ++++
 drivers/common/iavf/iavf_devids.h    |  4 ++
 drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++
 drivers/net/iavf/iavf_ethdev.c       | 69 +++++++++++++++++++++++++++-
 5 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index 529ff4a955..fcea8151bf 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following documents:
     assignment in hypervisor. Take qemu for example, the device assignment should carry the IAVF device id (0x1889) like
     ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
 
+    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series Ethernet Controller will be IAVF. No new feature
+    will be added into i40evf except bug fix until it's removed in DPDK 21.11. Between DPDK 21.05 and 21.11, by using the
+    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on Intel® 700 Series Ethernet Controller, for example::
+
+    -a 81:02.0,driver=i40evf
+
     When IAVF is backed by an Intel® E810 device, the "Protocol Extraction" feature which is supported by ice PMD is also
     available for IAVF PMD. The same devargs with the same parameters can be applied to IAVF PMD, for detail please reference
     the section ``Protocol extraction for per queue`` of ice.rst.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 64629e0641..63b59bd2fd 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -130,3 +130,11 @@ Deprecation Notices
 * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
   content. On Linux and FreeBSD, supported prior to DPDK 20.11,
   original structure will be kept until DPDK 21.11.
+
+* i40e: As there are both i40evf and iavf pmd, the functions of them are
+  duplicated. And now more and more advanced features are developed on iavf.
+  To keep consistent with kernel driver's name
+  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain.
+  Starting from 21.05, the default VF driver of i40e will be iavf, but i40evf
+  can still be used if users specify the devarg "driver=i40evf". I40evf will
+  be deleted in DPDK 21.11.
diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
index 722c2e4f49..74d84a82e8 100644
--- a/drivers/common/iavf/iavf_devids.h
+++ b/drivers/common/iavf/iavf_devids.h
@@ -13,5 +13,9 @@
 #define IAVF_DEV_ID_VF_HV		0x1571
 #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
 #define IAVF_DEV_ID_X722_VF		0x37CD
+#ifdef X722_A0_SUPPORT
+#define I40E_DEV_ID_X722_A0_VF          0x374D
+#endif
+
 
 #endif /* _IAVF_DEVIDS_H_ */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 0c9bd8d2c6..509c8f4e37 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+static int
+i40evf_check_driver_handler(__rte_unused const char *key,
+			    const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+i40evf_driver_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       i40evf_check_driver_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	struct rte_pci_device *pci_dev)
 {
+	if (!i40evf_driver_selected(pci_dev->device.devargs))
+		return 1;
+
 	return rte_eth_dev_pci_generic_probe(pci_dev,
 		sizeof(struct i40e_adapter), i40evf_dev_init);
 }
@@ -1681,6 +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd = {
 RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 869c4a1988..6d667ad519 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -125,6 +125,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
 
 static const struct rte_pci_id pci_id_iavf_map[] = {
 	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
+#ifdef X722_A0_SUPPORT
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
+#endif
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
@@ -2323,10 +2329,69 @@ iavf_dcf_cap_selected(struct rte_devargs *devargs)
 	return ret;
 }
 
+static int
+iavf_is_i40evf_device_id(uint16_t id)
+{
+	if (id == IAVF_DEV_ID_VF ||
+	    id == IAVF_DEV_ID_VF_HV ||
+	    id == IAVF_DEV_ID_X722_VF)
+		return 1;
+
+#ifdef X722_A0_SUPPORT
+	if (id == I40E_DEV_ID_X722_A0_VF)
+		return 1;
+#endif
+
+	return 0;
+}
+
+static int
+iavf_drv_i40evf_check_handler(__rte_unused const char *key,
+			      const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+iavf_drv_i40evf_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       iavf_drv_i40evf_check_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_iavf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 			     struct rte_pci_device *pci_dev)
 {
-	if (iavf_dcf_cap_selected(pci_dev->device.devargs))
+	if (iavf_dcf_cap_selected(pci_dev->device.devargs) ||
+	    (iavf_is_i40evf_device_id(pci_dev->id.device_id) &&
+	     iavf_drv_i40evf_selected(pci_dev->device.devargs)))
 		return 1;
 
 	return rte_eth_dev_pci_generic_probe(pci_dev,
@@ -2349,7 +2414,7 @@ static struct rte_pci_driver rte_iavf_pmd = {
 RTE_PMD_REGISTER_PCI(net_iavf, rte_iavf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_iavf, pci_id_iavf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
+RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf driver=i40evf");
 RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
 RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);
 #ifdef RTE_LIBRTE_IAVF_DEBUG_RX
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v4] net/iavf: deprecate i40evf pmd
  2021-03-02  6:13 [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd Robin Zhang
  2021-03-30  8:16 ` [dpdk-dev] [PATCH v2] " Robin Zhang
  2021-04-02 10:42 ` [dpdk-dev] [PATCH v3] " Robin Zhang
@ 2021-04-15  2:05 ` Robin Zhang
  2021-04-15  7:46   ` Wang, Haiyue
  2021-04-15  9:40   ` Zhang, Qi Z
  2021-04-15 10:34 ` [dpdk-dev] [PATCH v5] " Robin Zhang
                   ` (2 subsequent siblings)
  5 siblings, 2 replies; 15+ messages in thread
From: Robin Zhang @ 2021-04-15  2:05 UTC (permalink / raw)
  To: dev
  Cc: beilei.xing, jia.guo, haiyue.wang, mdr, nhorman, jingjing.wu,
	qiming.yang, stevex.yang, Robin Zhang

The i40evf PMD will be deprecated, iavf will be the only VF driver for
Intel 700 serial (i40e) NIC family. To reach this, there will be 2 steps:

Step 1: iavf will be the default VF driver, while i40evf still can be
selected by devarg: "driver=i40evf".
This is covered by this patch, which include:
1) add all 700 serial NIC VF device ID into iavf PMD
2) skip probe if devargs contain "driver=i40evf" in iavf
3) continue probe if devargs contain "driver=i40evf" in i40evf

Step 2: i40evf and related devarg are removed, this will happen at DPDK
21.11

Between step 1 and step 2, no new feature will be added into i40evf except
bug fix.

Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
---
v4:
- rebase code.

v3:
- skip probe if devargs contain "driver=i40evf" in iavf.
- update intel_vf.rst for the new devargs.

v2:
- change default VF driver to iavf, add devarg "driver=i40evf" so that
  i40evf can still be used.
---
 doc/guides/nics/intel_vf.rst         |  6 +++
 doc/guides/rel_notes/deprecation.rst |  8 ++++
 drivers/common/iavf/iavf_devids.h    |  4 ++
 drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++
 drivers/net/iavf/iavf_ethdev.c       | 69 +++++++++++++++++++++++++++-
 5 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index 529ff4a955..fcea8151bf 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following documents:
     assignment in hypervisor. Take qemu for example, the device assignment should carry the IAVF device id (0x1889) like
     ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
 
+    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series Ethernet Controller will be IAVF. No new feature
+    will be added into i40evf except bug fix until it's removed in DPDK 21.11. Between DPDK 21.05 and 21.11, by using the
+    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on Intel® 700 Series Ethernet Controller, for example::
+
+    -a 81:02.0,driver=i40evf
+
     When IAVF is backed by an Intel® E810 device, the "Protocol Extraction" feature which is supported by ice PMD is also
     available for IAVF PMD. The same devargs with the same parameters can be applied to IAVF PMD, for detail please reference
     the section ``Protocol extraction for per queue`` of ice.rst.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 2afc84c396..05ef276b21 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -139,3 +139,11 @@ Deprecation Notices
 * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
   content. On Linux and FreeBSD, supported prior to DPDK 20.11,
   original structure will be kept until DPDK 21.11.
+
+* i40e: As there are both i40evf and iavf pmd, the functions of them are
+  duplicated. And now more and more advanced features are developed on iavf.
+  To keep consistent with kernel driver's name
+  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain.
+  Starting from 21.05, the default VF driver of i40e will be iavf, but i40evf
+  can still be used if users specify the devarg "driver=i40evf". I40evf will
+  be deleted in DPDK 21.11.
diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
index 722c2e4f49..74d84a82e8 100644
--- a/drivers/common/iavf/iavf_devids.h
+++ b/drivers/common/iavf/iavf_devids.h
@@ -13,5 +13,9 @@
 #define IAVF_DEV_ID_VF_HV		0x1571
 #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
 #define IAVF_DEV_ID_X722_VF		0x37CD
+#ifdef X722_A0_SUPPORT
+#define I40E_DEV_ID_X722_A0_VF          0x374D
+#endif
+
 
 #endif /* _IAVF_DEVIDS_H_ */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 0c9bd8d2c6..509c8f4e37 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+static int
+i40evf_check_driver_handler(__rte_unused const char *key,
+			    const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+i40evf_driver_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       i40evf_check_driver_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	struct rte_pci_device *pci_dev)
 {
+	if (!i40evf_driver_selected(pci_dev->device.devargs))
+		return 1;
+
 	return rte_eth_dev_pci_generic_probe(pci_dev,
 		sizeof(struct i40e_adapter), i40evf_dev_init);
 }
@@ -1681,6 +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd = {
 RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 51cad48069..00179a736c 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -125,6 +125,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
 
 static const struct rte_pci_id pci_id_iavf_map[] = {
 	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
+#ifdef X722_A0_SUPPORT
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
+#endif
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
@@ -2323,10 +2329,69 @@ iavf_dcf_cap_selected(struct rte_devargs *devargs)
 	return ret;
 }
 
+static int
+iavf_is_i40evf_device_id(uint16_t id)
+{
+	if (id == IAVF_DEV_ID_VF ||
+	    id == IAVF_DEV_ID_VF_HV ||
+	    id == IAVF_DEV_ID_X722_VF)
+		return 1;
+
+#ifdef X722_A0_SUPPORT
+	if (id == I40E_DEV_ID_X722_A0_VF)
+		return 1;
+#endif
+
+	return 0;
+}
+
+static int
+iavf_drv_i40evf_check_handler(__rte_unused const char *key,
+			      const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+iavf_drv_i40evf_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       iavf_drv_i40evf_check_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_iavf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 			     struct rte_pci_device *pci_dev)
 {
-	if (iavf_dcf_cap_selected(pci_dev->device.devargs))
+	if (iavf_dcf_cap_selected(pci_dev->device.devargs) ||
+	    (iavf_is_i40evf_device_id(pci_dev->id.device_id) &&
+	     iavf_drv_i40evf_selected(pci_dev->device.devargs)))
 		return 1;
 
 	return rte_eth_dev_pci_generic_probe(pci_dev,
@@ -2349,7 +2414,7 @@ static struct rte_pci_driver rte_iavf_pmd = {
 RTE_PMD_REGISTER_PCI(net_iavf, rte_iavf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_iavf, pci_id_iavf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
+RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf driver=i40evf");
 RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
 RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);
 #ifdef RTE_ETHDEV_DEBUG_RX
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v4] net/iavf: deprecate i40evf pmd
  2021-04-15  2:05 ` [dpdk-dev] [PATCH v4] " Robin Zhang
@ 2021-04-15  7:46   ` Wang, Haiyue
  2021-04-15  9:40   ` Zhang, Qi Z
  1 sibling, 0 replies; 15+ messages in thread
From: Wang, Haiyue @ 2021-04-15  7:46 UTC (permalink / raw)
  To: Zhang, RobinX, dev
  Cc: Xing, Beilei, Guo, Jia, mdr, nhorman, Wu, Jingjing, Yang, Qiming,
	Yang, SteveX

> -----Original Message-----
> From: Zhang, RobinX <robinx.zhang@intel.com>
> Sent: Thursday, April 15, 2021 10:05
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang, Haiyue
> <haiyue.wang@intel.com>; mdr@ashroe.eu; nhorman@tuxdriver.com; Wu, Jingjing <jingjing.wu@intel.com>;
> Yang, Qiming <qiming.yang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang, RobinX
> <robinx.zhang@intel.com>
> Subject: [PATCH v4] net/iavf: deprecate i40evf pmd
> 
> The i40evf PMD will be deprecated, iavf will be the only VF driver for
> Intel 700 serial (i40e) NIC family. To reach this, there will be 2 steps:
> 
> Step 1: iavf will be the default VF driver, while i40evf still can be
> selected by devarg: "driver=i40evf".
> This is covered by this patch, which include:
> 1) add all 700 serial NIC VF device ID into iavf PMD
> 2) skip probe if devargs contain "driver=i40evf" in iavf
> 3) continue probe if devargs contain "driver=i40evf" in i40evf
> 
> Step 2: i40evf and related devarg are removed, this will happen at DPDK
> 21.11
> 
> Between step 1 and step 2, no new feature will be added into i40evf except
> bug fix.
> 
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> ---
> v4:
> - rebase code.
> 
> v3:
> - skip probe if devargs contain "driver=i40evf" in iavf.
> - update intel_vf.rst for the new devargs.
> 
> v2:
> - change default VF driver to iavf, add devarg "driver=i40evf" so that
>   i40evf can still be used.
> ---
>  doc/guides/nics/intel_vf.rst         |  6 +++
>  doc/guides/rel_notes/deprecation.rst |  8 ++++
>  drivers/common/iavf/iavf_devids.h    |  4 ++
>  drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++
>  drivers/net/iavf/iavf_ethdev.c       | 69 +++++++++++++++++++++++++++-
>  5 files changed, 130 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
> index 529ff4a955..fcea8151bf 100644
> --- a/doc/guides/nics/intel_vf.rst
> +++ b/doc/guides/nics/intel_vf.rst
> @@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following documents:
>      assignment in hypervisor. Take qemu for example, the device assignment should carry the IAVF
> device id (0x1889) like
>      ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
> 
> +    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series Ethernet Controller will be
> IAVF. No new feature
> +    will be added into i40evf except bug fix until it's removed in DPDK 21.11. Between DPDK 21.05 and
> 21.11, by using the
> +    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on Intel® 700 Series Ethernet
> Controller, for example::
> +
> +    -a 81:02.0,driver=i40evf
> +
>      When IAVF is backed by an Intel® E810 device, the "Protocol Extraction" feature which is
> supported by ice PMD is also
>      available for IAVF PMD. The same devargs with the same parameters can be applied to IAVF PMD, for
> detail please reference
>      the section ``Protocol extraction for per queue`` of ice.rst.
> diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
> index 2afc84c396..05ef276b21 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -139,3 +139,11 @@ Deprecation Notices
>  * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
>    content. On Linux and FreeBSD, supported prior to DPDK 20.11,
>    original structure will be kept until DPDK 21.11.
> +
> +* i40e: As there are both i40evf and iavf pmd, the functions of them are
> +  duplicated. And now more and more advanced features are developed on iavf.
> +  To keep consistent with kernel driver's name
> +  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain.
> +  Starting from 21.05, the default VF driver of i40e will be iavf, but i40evf
> +  can still be used if users specify the devarg "driver=i40evf". I40evf will
> +  be deleted in DPDK 21.11.
> diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
> index 722c2e4f49..74d84a82e8 100644
> --- a/drivers/common/iavf/iavf_devids.h
> +++ b/drivers/common/iavf/iavf_devids.h
> @@ -13,5 +13,9 @@
>  #define IAVF_DEV_ID_VF_HV		0x1571
>  #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
>  #define IAVF_DEV_ID_X722_VF		0x37CD
> +#ifdef X722_A0_SUPPORT
> +#define I40E_DEV_ID_X722_A0_VF          0x374D
> +#endif
> +
> 
>  #endif /* _IAVF_DEVIDS_H_ */
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
> index 0c9bd8d2c6..509c8f4e37 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
> 
> +static int
> +i40evf_check_driver_handler(__rte_unused const char *key,
> +			    const char *value, __rte_unused void *opaque)
> +{
> +	if (strcmp(value, "i40evf"))
> +		return -1;
> +
> +	return 0;
> +}
> +
> +static int
> +i40evf_driver_selected(struct rte_devargs *devargs)
> +{
> +	struct rte_kvargs *kvlist;
> +	const char *key = "driver";
> +	int ret = 0;
> +
> +	if (devargs == NULL)
> +		return 0;
> +
> +	kvlist = rte_kvargs_parse(devargs->args, NULL);
> +	if (kvlist == NULL)
> +		return 0;
> +
> +	if (!rte_kvargs_count(kvlist, key))
> +		goto exit;
> +
> +	/* i40evf driver selected when there's a key-value pair:
> +	 * driver=i40evf
> +	 */
> +	if (rte_kvargs_process(kvlist, key,
> +			       i40evf_check_driver_handler, NULL) < 0)
> +		goto exit;
> +
> +	ret = 1;
> +
> +exit:
> +	rte_kvargs_free(kvlist);
> +	return ret;
> +}
> +
>  static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
>  	struct rte_pci_device *pci_dev)
>  {
> +	if (!i40evf_driver_selected(pci_dev->device.devargs))
> +		return 1;
> +
>  	return rte_eth_dev_pci_generic_probe(pci_dev,
>  		sizeof(struct i40e_adapter), i40evf_dev_init);
>  }
> @@ -1681,6 +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd = {
>  RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
>  RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
>  RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
> +RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
> 
>  static int
>  i40evf_dev_configure(struct rte_eth_dev *dev)
> diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
> index 51cad48069..00179a736c 100644
> --- a/drivers/net/iavf/iavf_ethdev.c
> +++ b/drivers/net/iavf/iavf_ethdev.c
> @@ -125,6 +125,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
> 
>  static const struct rte_pci_id pci_id_iavf_map[] = {
>  	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
> +#ifdef X722_A0_SUPPORT
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
> +#endif
>  	{ .vendor_id = 0, /* sentinel */ },
>  };
> 
> @@ -2323,10 +2329,69 @@ iavf_dcf_cap_selected(struct rte_devargs *devargs)
>  	return ret;
>  }
> 
> +static int
> +iavf_is_i40evf_device_id(uint16_t id)
> +{
> +	if (id == IAVF_DEV_ID_VF ||
> +	    id == IAVF_DEV_ID_VF_HV ||
> +	    id == IAVF_DEV_ID_X722_VF)
> +		return 1;
> +
> +#ifdef X722_A0_SUPPORT
> +	if (id == I40E_DEV_ID_X722_A0_VF)
> +		return 1;
> +#endif
> +
> +	return 0;
> +}
> +
> +static int
> +iavf_drv_i40evf_check_handler(__rte_unused const char *key,
> +			      const char *value, __rte_unused void *opaque)
> +{
> +	if (strcmp(value, "i40evf"))
> +		return -1;
> +
> +	return 0;
> +}
> +
> +static int
> +iavf_drv_i40evf_selected(struct rte_devargs *devargs)
> +{
> +	struct rte_kvargs *kvlist;
> +	const char *key = "driver";
> +	int ret = 0;
> +

Put the i40evf PCI device check here, then code will be simple,
and the design will be clear, I think. ;-)

	if (id != IAVF_DEV_ID_VF &&
	    id != IAVF_DEV_ID_VF_HV &&
#ifdef X722_A0_SUPPORT
	    id != I40E_DEV_ID_X722_A0_VF &&
#endif
	    id != IAVF_DEV_ID_X722_VF)
			return 0;


> +	if (devargs == NULL)
> +		return 0;
> +
> +	kvlist = rte_kvargs_parse(devargs->args, NULL);
> +	if (kvlist == NULL)
> +		return 0;
> +
> +	if (!rte_kvargs_count(kvlist, key))
> +		goto exit;
> +
> +	/* i40evf driver selected when there's a key-value pair:
> +	 * driver=i40evf
> +	 */
> +	if (rte_kvargs_process(kvlist, key,
> +			       iavf_drv_i40evf_check_handler, NULL) < 0)
> +		goto exit;
> +
> +	ret = 1;
> +
> +exit:
> +	rte_kvargs_free(kvlist);
> +	return ret;
> +}
> +
>  static int eth_iavf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
>  			     struct rte_pci_device *pci_dev)
>  {
> -	if (iavf_dcf_cap_selected(pci_dev->device.devargs))
> +	if (iavf_dcf_cap_selected(pci_dev->device.devargs) ||
> +	    (iavf_is_i40evf_device_id(pci_dev->id.device_id) &&
> +	     iavf_drv_i40evf_selected(pci_dev->device.devargs)))

We can merge 'iavf_is_i40evf_device_id' into 'iavf_drv_i40evf_selected', then
the check code will be simple.

>  		return 1;
> 
>  	return rte_eth_dev_pci_generic_probe(pci_dev,
> @@ -2349,7 +2414,7 @@ static struct rte_pci_driver rte_iavf_pmd = {
>  RTE_PMD_REGISTER_PCI(net_iavf, rte_iavf_pmd);
>  RTE_PMD_REGISTER_PCI_TABLE(net_iavf, pci_id_iavf_map);
>  RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
> -RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
> +RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf driver=i40evf");
>  RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
>  RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);
>  #ifdef RTE_ETHDEV_DEBUG_RX
> --
> 2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v4] net/iavf: deprecate i40evf pmd
  2021-04-15  2:05 ` [dpdk-dev] [PATCH v4] " Robin Zhang
  2021-04-15  7:46   ` Wang, Haiyue
@ 2021-04-15  9:40   ` Zhang, Qi Z
  1 sibling, 0 replies; 15+ messages in thread
From: Zhang, Qi Z @ 2021-04-15  9:40 UTC (permalink / raw)
  To: Zhang, RobinX, dev
  Cc: Xing, Beilei, Guo, Jia, Wang, Haiyue, mdr, nhorman, Wu, Jingjing,
	Yang, Qiming, Yang, SteveX, Zhang, RobinX



> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Robin Zhang
> Sent: Thursday, April 15, 2021 10:05 AM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang,
> Haiyue <haiyue.wang@intel.com>; mdr@ashroe.eu; nhorman@tuxdriver.com;
> Wu, Jingjing <jingjing.wu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
> RobinX <robinx.zhang@intel.com>
> Subject: [dpdk-dev] [PATCH v4] net/iavf: deprecate i40evf pmd
> 
> The i40evf PMD will be deprecated, iavf will be the only VF driver for Intel 700
> serial (i40e) NIC family. To reach this, there will be 2 steps:
> 
> Step 1: iavf will be the default VF driver, while i40evf still can be selected by
> devarg: "driver=i40evf".
> This is covered by this patch, which include:
> 1) add all 700 serial NIC VF device ID into iavf PMD
> 2) skip probe if devargs contain "driver=i40evf" in iavf
> 3) continue probe if devargs contain "driver=i40evf" in i40evf
> 
> Step 2: i40evf and related devarg are removed, this will happen at DPDK
> 21.11
> 
> Between step 1 and step 2, no new feature will be added into i40evf except
> bug fix.
> 
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> ---
> v4:
> - rebase code.
> 
> v3:
> - skip probe if devargs contain "driver=i40evf" in iavf.
> - update intel_vf.rst for the new devargs.
> 
> v2:
> - change default VF driver to iavf, add devarg "driver=i40evf" so that
>   i40evf can still be used.
> ---
>  doc/guides/nics/intel_vf.rst         |  6 +++
>  doc/guides/rel_notes/deprecation.rst |  8 ++++
>  drivers/common/iavf/iavf_devids.h    |  4 ++
>  drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++
>  drivers/net/iavf/iavf_ethdev.c       | 69 +++++++++++++++++++++++++++-
>  5 files changed, 130 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index
> 529ff4a955..fcea8151bf 100644
> --- a/doc/guides/nics/intel_vf.rst
> +++ b/doc/guides/nics/intel_vf.rst
> @@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following
> documents:
>      assignment in hypervisor. Take qemu for example, the device assignment
> should carry the IAVF device id (0x1889) like
>      ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
> 
> +    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series
> Ethernet Controller will be IAVF. No new feature
> +    will be added into i40evf except bug fix until it's removed in DPDK 21.11.
> Between DPDK 21.05 and 21.11, by using the
> +    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on
> Intel® 700 Series Ethernet Controller, for example::
> +
> +    -a 81:02.0,driver=i40evf
> +
>      When IAVF is backed by an Intel® E810 device, the "Protocol Extraction"
> feature which is supported by ice PMD is also
>      available for IAVF PMD. The same devargs with the same parameters can
> be applied to IAVF PMD, for detail please reference
>      the section ``Protocol extraction for per queue`` of ice.rst.
> diff --git a/doc/guides/rel_notes/deprecation.rst
> b/doc/guides/rel_notes/deprecation.rst
> index 2afc84c396..05ef276b21 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -139,3 +139,11 @@ Deprecation Notices
>  * cmdline: ``cmdline`` structure will be made opaque to hide
> platform-specific
>    content. On Linux and FreeBSD, supported prior to DPDK 20.11,
>    original structure will be kept until DPDK 21.11.
> +
> +* i40e: As there are both i40evf and iavf pmd, the functions of them
> +are
> +  duplicated. And now more and more advanced features are developed on
> iavf.
> +  To keep consistent with kernel driver's name
> +  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to
> maintain.
> +  Starting from 21.05, the default VF driver of i40e will be iavf, but
> +i40evf
> +  can still be used if users specify the devarg "driver=i40evf". I40evf
> +will
> +  be deleted in DPDK 21.11.
> diff --git a/drivers/common/iavf/iavf_devids.h
> b/drivers/common/iavf/iavf_devids.h
> index 722c2e4f49..74d84a82e8 100644
> --- a/drivers/common/iavf/iavf_devids.h
> +++ b/drivers/common/iavf/iavf_devids.h
> @@ -13,5 +13,9 @@
>  #define IAVF_DEV_ID_VF_HV		0x1571
>  #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
>  #define IAVF_DEV_ID_X722_VF		0x37CD
> +#ifdef X722_A0_SUPPORT
> +#define I40E_DEV_ID_X722_A0_VF          0x374D
> +#endif

Do we really need this #ifdef?

Can we remove all of them in AVF driver?



^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v5] net/iavf: deprecate i40evf pmd
  2021-03-02  6:13 [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd Robin Zhang
                   ` (2 preceding siblings ...)
  2021-04-15  2:05 ` [dpdk-dev] [PATCH v4] " Robin Zhang
@ 2021-04-15 10:34 ` Robin Zhang
  2021-04-15 12:14   ` Zhang, Qi Z
  2021-04-16  1:57 ` [dpdk-dev] [PATCH v6] " Robin Zhang
  2021-04-19  3:05 ` [dpdk-dev] [PATCH v7] " Robin Zhang
  5 siblings, 1 reply; 15+ messages in thread
From: Robin Zhang @ 2021-04-15 10:34 UTC (permalink / raw)
  To: dev
  Cc: beilei.xing, jia.guo, haiyue.wang, mdr, nhorman, jingjing.wu,
	qiming.yang, stevex.yang, Robin Zhang

The i40evf PMD will be deprecated, iavf will be the only VF driver for
Intel 700 serial (i40e) NIC family. To reach this, there will be 2 steps:

Step 1: iavf will be the default VF driver, while i40evf still can be
selected by devarg: "driver=i40evf".
This is covered by this patch, which include:
1) add all 700 serial NIC VF device ID into iavf PMD
2) skip probe if devargs contain "driver=i40evf" in iavf
3) continue probe if devargs contain "driver=i40evf" in i40evf

Step 2: i40evf and related devarg are removed, this will happen at DPDK
21.11

Between step 1 and step 2, no new feature will be added into i40evf except
bug fix.

Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
---
v5:
- refine code of check device id

v4:
- rebase code.

v3:
- skip probe if devargs contain "driver=i40evf" in iavf.
- update intel_vf.rst for the new devargs.

v2:
- change default VF driver to iavf, add devarg "driver=i40evf" so that
  i40evf can still be used.
---
 doc/guides/nics/intel_vf.rst         |  6 +++
 doc/guides/rel_notes/deprecation.rst |  8 ++++
 drivers/common/iavf/iavf_devids.h    |  4 ++
 drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++++
 drivers/net/iavf/iavf_ethdev.c       | 61 +++++++++++++++++++++++++++-
 5 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index 529ff4a955..fcea8151bf 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following documents:
     assignment in hypervisor. Take qemu for example, the device assignment should carry the IAVF device id (0x1889) like
     ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
 
+    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series Ethernet Controller will be IAVF. No new feature
+    will be added into i40evf except bug fix until it's removed in DPDK 21.11. Between DPDK 21.05 and 21.11, by using the
+    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on Intel® 700 Series Ethernet Controller, for example::
+
+    -a 81:02.0,driver=i40evf
+
     When IAVF is backed by an Intel® E810 device, the "Protocol Extraction" feature which is supported by ice PMD is also
     available for IAVF PMD. The same devargs with the same parameters can be applied to IAVF PMD, for detail please reference
     the section ``Protocol extraction for per queue`` of ice.rst.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 2afc84c396..05ef276b21 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -139,3 +139,11 @@ Deprecation Notices
 * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
   content. On Linux and FreeBSD, supported prior to DPDK 20.11,
   original structure will be kept until DPDK 21.11.
+
+* i40e: As there are both i40evf and iavf pmd, the functions of them are
+  duplicated. And now more and more advanced features are developed on iavf.
+  To keep consistent with kernel driver's name
+  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain.
+  Starting from 21.05, the default VF driver of i40e will be iavf, but i40evf
+  can still be used if users specify the devarg "driver=i40evf". I40evf will
+  be deleted in DPDK 21.11.
diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
index 722c2e4f49..74d84a82e8 100644
--- a/drivers/common/iavf/iavf_devids.h
+++ b/drivers/common/iavf/iavf_devids.h
@@ -13,5 +13,9 @@
 #define IAVF_DEV_ID_VF_HV		0x1571
 #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
 #define IAVF_DEV_ID_X722_VF		0x37CD
+#ifdef X722_A0_SUPPORT
+#define I40E_DEV_ID_X722_A0_VF          0x374D
+#endif
+
 
 #endif /* _IAVF_DEVIDS_H_ */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 0c9bd8d2c6..509c8f4e37 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+static int
+i40evf_check_driver_handler(__rte_unused const char *key,
+			    const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+i40evf_driver_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       i40evf_check_driver_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	struct rte_pci_device *pci_dev)
 {
+	if (!i40evf_driver_selected(pci_dev->device.devargs))
+		return 1;
+
 	return rte_eth_dev_pci_generic_probe(pci_dev,
 		sizeof(struct i40e_adapter), i40evf_dev_init);
 }
@@ -1681,6 +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd = {
 RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 51cad48069..77788a2a51 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -125,6 +125,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
 
 static const struct rte_pci_id pci_id_iavf_map[] = {
 	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
+#ifdef X722_A0_SUPPORT
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
+#endif
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
@@ -2323,10 +2329,61 @@ iavf_dcf_cap_selected(struct rte_devargs *devargs)
 	return ret;
 }
 
+static int
+iavf_drv_i40evf_check_handler(__rte_unused const char *key,
+			      const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+iavf_drv_i40evf_selected(struct rte_devargs *devargs, uint16_t device_id)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (device_id != IAVF_DEV_ID_VF &&
+	    device_id != IAVF_DEV_ID_VF_HV &&
+#ifdef X722_A0_SUPPORT
+	    device_id != I40E_DEV_ID_X722_A0_VF &&
+#endif
+	    device_id != IAVF_DEV_ID_X722_VF)
+		return 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       iavf_drv_i40evf_check_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_iavf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 			     struct rte_pci_device *pci_dev)
 {
-	if (iavf_dcf_cap_selected(pci_dev->device.devargs))
+	if (iavf_dcf_cap_selected(pci_dev->device.devargs) ||
+	    iavf_drv_i40evf_selected(pci_dev->device.devargs,
+				     pci_dev->id.device_id))
 		return 1;
 
 	return rte_eth_dev_pci_generic_probe(pci_dev,
@@ -2349,7 +2406,7 @@ static struct rte_pci_driver rte_iavf_pmd = {
 RTE_PMD_REGISTER_PCI(net_iavf, rte_iavf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_iavf, pci_id_iavf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
+RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf driver=i40evf");
 RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
 RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);
 #ifdef RTE_ETHDEV_DEBUG_RX
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v5] net/iavf: deprecate i40evf pmd
  2021-04-15 10:34 ` [dpdk-dev] [PATCH v5] " Robin Zhang
@ 2021-04-15 12:14   ` Zhang, Qi Z
  0 siblings, 0 replies; 15+ messages in thread
From: Zhang, Qi Z @ 2021-04-15 12:14 UTC (permalink / raw)
  To: Zhang, RobinX, dev
  Cc: Xing, Beilei, Guo, Jia, Wang, Haiyue, mdr, nhorman, Wu, Jingjing,
	Yang, Qiming, Yang, SteveX, Zhang, RobinX



> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Robin Zhang
> Sent: Thursday, April 15, 2021 6:35 PM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang,
> Haiyue <haiyue.wang@intel.com>; mdr@ashroe.eu; nhorman@tuxdriver.com;
> Wu, Jingjing <jingjing.wu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
> RobinX <robinx.zhang@intel.com>
> Subject: [dpdk-dev] [PATCH v5] net/iavf: deprecate i40evf pmd
> 
> The i40evf PMD will be deprecated, iavf will be the only VF driver for Intel 700
> serial (i40e) NIC family. To reach this, there will be 2 steps:
> 
> Step 1: iavf will be the default VF driver, while i40evf still can be selected by
> devarg: "driver=i40evf".
> This is covered by this patch, which include:
> 1) add all 700 serial NIC VF device ID into iavf PMD
> 2) skip probe if devargs contain "driver=i40evf" in iavf
> 3) continue probe if devargs contain "driver=i40evf" in i40evf
> 
> Step 2: i40evf and related devarg are removed, this will happen at DPDK
> 21.11
> 
> Between step 1 and step 2, no new feature will be added into i40evf except
> bug fix.
> 
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> ---
> v5:
> - refine code of check device id
> 
> v4:
> - rebase code.
> 
> v3:
> - skip probe if devargs contain "driver=i40evf" in iavf.
> - update intel_vf.rst for the new devargs.
> 
> v2:
> - change default VF driver to iavf, add devarg "driver=i40evf" so that
>   i40evf can still be used.
> ---
>  doc/guides/nics/intel_vf.rst         |  6 +++
>  doc/guides/rel_notes/deprecation.rst |  8 ++++
>  drivers/common/iavf/iavf_devids.h    |  4 ++
>  drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++++
>  drivers/net/iavf/iavf_ethdev.c       | 61 +++++++++++++++++++++++++++-
>  5 files changed, 122 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index
> 529ff4a955..fcea8151bf 100644
> --- a/doc/guides/nics/intel_vf.rst
> +++ b/doc/guides/nics/intel_vf.rst
> @@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following
> documents:
>      assignment in hypervisor. Take qemu for example, the device assignment
> should carry the IAVF device id (0x1889) like
>      ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
> 
> +    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series
> Ethernet Controller will be IAVF. No new feature
> +    will be added into i40evf except bug fix until it's removed in DPDK 21.11.
> Between DPDK 21.05 and 21.11, by using the
> +    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on
> Intel® 700 Series Ethernet Controller, for example::
> +
> +    -a 81:02.0,driver=i40evf
> +
>      When IAVF is backed by an Intel® E810 device, the "Protocol Extraction"
> feature which is supported by ice PMD is also
>      available for IAVF PMD. The same devargs with the same parameters can
> be applied to IAVF PMD, for detail please reference
>      the section ``Protocol extraction for per queue`` of ice.rst.
> diff --git a/doc/guides/rel_notes/deprecation.rst
> b/doc/guides/rel_notes/deprecation.rst
> index 2afc84c396..05ef276b21 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -139,3 +139,11 @@ Deprecation Notices
>  * cmdline: ``cmdline`` structure will be made opaque to hide
> platform-specific
>    content. On Linux and FreeBSD, supported prior to DPDK 20.11,
>    original structure will be kept until DPDK 21.11.
> +
> +* i40e: As there are both i40evf and iavf pmd, the functions of them
> +are
> +  duplicated. And now more and more advanced features are developed on
> iavf.
> +  To keep consistent with kernel driver's name
> +  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to
> maintain.
> +  Starting from 21.05, the default VF driver of i40e will be iavf, but
> +i40evf
> +  can still be used if users specify the devarg "driver=i40evf". I40evf
> +will
> +  be deleted in DPDK 21.11.
> diff --git a/drivers/common/iavf/iavf_devids.h
> b/drivers/common/iavf/iavf_devids.h
> index 722c2e4f49..74d84a82e8 100644
> --- a/drivers/common/iavf/iavf_devids.h
> +++ b/drivers/common/iavf/iavf_devids.h
> @@ -13,5 +13,9 @@
>  #define IAVF_DEV_ID_VF_HV		0x1571
>  #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
>  #define IAVF_DEV_ID_X722_VF		0x37CD
> +#ifdef X722_A0_SUPPORT
> +#define I40E_DEV_ID_X722_A0_VF          0x374D
> +#endif
> +

Can we remove #ifdef  

> 
>  #endif /* _IAVF_DEVIDS_H_ */
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> b/drivers/net/i40e/i40e_ethdev_vf.c
> index 0c9bd8d2c6..509c8f4e37 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
> 
> +static int
> +i40evf_check_driver_handler(__rte_unused const char *key,
> +			    const char *value, __rte_unused void *opaque) {
> +	if (strcmp(value, "i40evf"))
> +		return -1;
> +
> +	return 0;
> +}
> +
> +static int
> +i40evf_driver_selected(struct rte_devargs *devargs) {
> +	struct rte_kvargs *kvlist;
> +	const char *key = "driver";
> +	int ret = 0;
> +
> +	if (devargs == NULL)
> +		return 0;
> +
> +	kvlist = rte_kvargs_parse(devargs->args, NULL);
> +	if (kvlist == NULL)
> +		return 0;
> +
> +	if (!rte_kvargs_count(kvlist, key))
> +		goto exit;
> +
> +	/* i40evf driver selected when there's a key-value pair:
> +	 * driver=i40evf
> +	 */
> +	if (rte_kvargs_process(kvlist, key,
> +			       i40evf_check_driver_handler, NULL) < 0)
> +		goto exit;
> +
> +	ret = 1;
> +
> +exit:
> +	rte_kvargs_free(kvlist);
> +	return ret;
> +}
> +
>  static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
>  	struct rte_pci_device *pci_dev)
>  {
> +	if (!i40evf_driver_selected(pci_dev->device.devargs))
> +		return 1;
> +
>  	return rte_eth_dev_pci_generic_probe(pci_dev,
>  		sizeof(struct i40e_adapter), i40evf_dev_init);  } @@ -1681,6
> +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd =
> {  RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
> RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
> RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
> +RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
> 
>  static int
>  i40evf_dev_configure(struct rte_eth_dev *dev) diff --git
> a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index
> 51cad48069..77788a2a51 100644
> --- a/drivers/net/iavf/iavf_ethdev.c
> +++ b/drivers/net/iavf/iavf_ethdev.c
> @@ -125,6 +125,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev
> *dev,
> 
>  static const struct rte_pci_id pci_id_iavf_map[] = {
>  	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID,
> IAVF_DEV_ID_ADAPTIVE_VF) },
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
> #ifdef
> +X722_A0_SUPPORT
> +	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
> +#endif

Can we remove #ifdef ?

>  	{ .vendor_id = 0, /* sentinel */ },
>  };
> 
> @@ -2323,10 +2329,61 @@ iavf_dcf_cap_selected(struct rte_devargs
> *devargs)
>  	return ret;
>  }
> 
> +static int
> +iavf_drv_i40evf_check_handler(__rte_unused const char *key,
> +			      const char *value, __rte_unused void *opaque) {
> +	if (strcmp(value, "i40evf"))
> +		return -1;
> +
> +	return 0;
> +}
> +
> +static int
> +iavf_drv_i40evf_selected(struct rte_devargs *devargs, uint16_t
> +device_id) {
> +	struct rte_kvargs *kvlist;
> +	const char *key = "driver";
> +	int ret = 0;
> +
> +	if (device_id != IAVF_DEV_ID_VF &&
> +	    device_id != IAVF_DEV_ID_VF_HV &&
> +#ifdef X722_A0_SUPPORT
> +	    device_id != I40E_DEV_ID_X722_A0_VF && #endif

Can we remove #ifdef ?

> +	    device_id != IAVF_DEV_ID_X722_VF)
> +		return 0;
> +
> +	if (devargs == NULL)
> +		return 0;
> +
> +	kvlist = rte_kvargs_parse(devargs->args, NULL);
> +	if (kvlist == NULL)
> +		return 0;
> +
> +	if (!rte_kvargs_count(kvlist, key))
> +		goto exit;
> +
> +	/* i40evf driver selected when there's a key-value pair:
> +	 * driver=i40evf
> +	 */
> +	if (rte_kvargs_process(kvlist, key,
> +			       iavf_drv_i40evf_check_handler, NULL) < 0)
> +		goto exit;
> +
> +	ret = 1;
> +
> +exit:
> +	rte_kvargs_free(kvlist);
> +	return ret;
> +}
> +
>  static int eth_iavf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
>  			     struct rte_pci_device *pci_dev)  {
> -	if (iavf_dcf_cap_selected(pci_dev->device.devargs))
> +	if (iavf_dcf_cap_selected(pci_dev->device.devargs) ||
> +	    iavf_drv_i40evf_selected(pci_dev->device.devargs,
> +				     pci_dev->id.device_id))
>  		return 1;
> 
>  	return rte_eth_dev_pci_generic_probe(pci_dev,
> @@ -2349,7 +2406,7 @@ static struct rte_pci_driver rte_iavf_pmd =
> {  RTE_PMD_REGISTER_PCI(net_iavf, rte_iavf_pmd);
> RTE_PMD_REGISTER_PCI_TABLE(net_iavf, pci_id_iavf_map);
> RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
> -RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
> +RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf driver=i40evf");
>  RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
> RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);  #ifdef
> RTE_ETHDEV_DEBUG_RX
> --
> 2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v6] net/iavf: deprecate i40evf pmd
  2021-03-02  6:13 [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd Robin Zhang
                   ` (3 preceding siblings ...)
  2021-04-15 10:34 ` [dpdk-dev] [PATCH v5] " Robin Zhang
@ 2021-04-16  1:57 ` Robin Zhang
  2021-04-16 10:15   ` Zhang, Qi Z
  2021-04-19  2:06   ` Xing, Beilei
  2021-04-19  3:05 ` [dpdk-dev] [PATCH v7] " Robin Zhang
  5 siblings, 2 replies; 15+ messages in thread
From: Robin Zhang @ 2021-04-16  1:57 UTC (permalink / raw)
  To: dev
  Cc: beilei.xing, jia.guo, haiyue.wang, mdr, nhorman, jingjing.wu,
	qiming.yang, stevex.yang, Robin Zhang

The i40evf PMD will be deprecated, iavf will be the only VF driver for
Intel 700 serial (i40e) NIC family. To reach this, there will be 2 steps:

Step 1: iavf will be the default VF driver, while i40evf still can be
selected by devarg: "driver=i40evf".
This is covered by this patch, which include:
1) add all 700 serial NIC VF device ID into iavf PMD
2) skip probe if devargs contain "driver=i40evf" in iavf
3) continue probe if devargs contain "driver=i40evf" in i40evf

Step 2: i40evf and related devarg are removed, this will happen at DPDK
21.11

Between step 1 and step 2, no new feature will be added into i40evf except
bug fix.

Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
---
v6:
- remove unnecessary ifdef in iavf.

v5:
- refine code of check device id.

v4:
- rebase code.

v3:
- skip probe if devargs contain "driver=i40evf" in iavf.
- update intel_vf.rst for the new devargs.

v2:
- change default VF driver to iavf, add devarg "driver=i40evf" so that
  i40evf can still be used.
---
 doc/guides/nics/intel_vf.rst         |  6 +++
 doc/guides/rel_notes/deprecation.rst |  8 ++++
 drivers/common/iavf/iavf_devids.h    |  2 +
 drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++++++
 drivers/net/iavf/iavf_ethdev.c       | 57 +++++++++++++++++++++++++++-
 5 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index 529ff4a955..fcea8151bf 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following documents:
     assignment in hypervisor. Take qemu for example, the device assignment should carry the IAVF device id (0x1889) like
     ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
 
+    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series Ethernet Controller will be IAVF. No new feature
+    will be added into i40evf except bug fix until it's removed in DPDK 21.11. Between DPDK 21.05 and 21.11, by using the
+    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on Intel® 700 Series Ethernet Controller, for example::
+
+    -a 81:02.0,driver=i40evf
+
     When IAVF is backed by an Intel® E810 device, the "Protocol Extraction" feature which is supported by ice PMD is also
     available for IAVF PMD. The same devargs with the same parameters can be applied to IAVF PMD, for detail please reference
     the section ``Protocol extraction for per queue`` of ice.rst.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 2afc84c396..05ef276b21 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -139,3 +139,11 @@ Deprecation Notices
 * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
   content. On Linux and FreeBSD, supported prior to DPDK 20.11,
   original structure will be kept until DPDK 21.11.
+
+* i40e: As there are both i40evf and iavf pmd, the functions of them are
+  duplicated. And now more and more advanced features are developed on iavf.
+  To keep consistent with kernel driver's name
+  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain.
+  Starting from 21.05, the default VF driver of i40e will be iavf, but i40evf
+  can still be used if users specify the devarg "driver=i40evf". I40evf will
+  be deleted in DPDK 21.11.
diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
index 722c2e4f49..b0d48b0582 100644
--- a/drivers/common/iavf/iavf_devids.h
+++ b/drivers/common/iavf/iavf_devids.h
@@ -13,5 +13,7 @@
 #define IAVF_DEV_ID_VF_HV		0x1571
 #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
 #define IAVF_DEV_ID_X722_VF		0x37CD
+#define I40E_DEV_ID_X722_A0_VF          0x374D
+
 
 #endif /* _IAVF_DEVIDS_H_ */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 0c9bd8d2c6..509c8f4e37 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+static int
+i40evf_check_driver_handler(__rte_unused const char *key,
+			    const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+i40evf_driver_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       i40evf_check_driver_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	struct rte_pci_device *pci_dev)
 {
+	if (!i40evf_driver_selected(pci_dev->device.devargs))
+		return 1;
+
 	return rte_eth_dev_pci_generic_probe(pci_dev,
 		sizeof(struct i40e_adapter), i40evf_dev_init);
 }
@@ -1681,6 +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd = {
 RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 51cad48069..cbfe3996fb 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -125,6 +125,10 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
 
 static const struct rte_pci_id pci_id_iavf_map[] = {
 	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
@@ -2323,10 +2327,59 @@ iavf_dcf_cap_selected(struct rte_devargs *devargs)
 	return ret;
 }
 
+static int
+iavf_drv_i40evf_check_handler(__rte_unused const char *key,
+			      const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+iavf_drv_i40evf_selected(struct rte_devargs *devargs, uint16_t device_id)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (device_id != IAVF_DEV_ID_VF &&
+	    device_id != IAVF_DEV_ID_VF_HV &&
+	    device_id != IAVF_DEV_ID_X722_VF &&
+	    device_id != I40E_DEV_ID_X722_A0_VF)
+		return 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       iavf_drv_i40evf_check_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_iavf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 			     struct rte_pci_device *pci_dev)
 {
-	if (iavf_dcf_cap_selected(pci_dev->device.devargs))
+	if (iavf_dcf_cap_selected(pci_dev->device.devargs) ||
+	    iavf_drv_i40evf_selected(pci_dev->device.devargs,
+				     pci_dev->id.device_id))
 		return 1;
 
 	return rte_eth_dev_pci_generic_probe(pci_dev,
@@ -2349,7 +2402,7 @@ static struct rte_pci_driver rte_iavf_pmd = {
 RTE_PMD_REGISTER_PCI(net_iavf, rte_iavf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_iavf, pci_id_iavf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
+RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf driver=i40evf");
 RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
 RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);
 #ifdef RTE_ETHDEV_DEBUG_RX
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v6] net/iavf: deprecate i40evf pmd
  2021-04-16  1:57 ` [dpdk-dev] [PATCH v6] " Robin Zhang
@ 2021-04-16 10:15   ` Zhang, Qi Z
  2021-04-16 13:36     ` Ferruh Yigit
  2021-04-19  2:06   ` Xing, Beilei
  1 sibling, 1 reply; 15+ messages in thread
From: Zhang, Qi Z @ 2021-04-16 10:15 UTC (permalink / raw)
  To: Zhang, RobinX, dev
  Cc: Xing, Beilei, Guo, Jia, Wang, Haiyue, mdr, nhorman, Wu, Jingjing,
	Yang, Qiming, Yang, SteveX, Zhang, RobinX



> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Robin Zhang
> Sent: Friday, April 16, 2021 9:58 AM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang,
> Haiyue <haiyue.wang@intel.com>; mdr@ashroe.eu; nhorman@tuxdriver.com;
> Wu, Jingjing <jingjing.wu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
> RobinX <robinx.zhang@intel.com>
> Subject: [dpdk-dev] [PATCH v6] net/iavf: deprecate i40evf pmd
> 
> The i40evf PMD will be deprecated, iavf will be the only VF driver for Intel 700
> serial (i40e) NIC family. To reach this, there will be 2 steps:
> 
> Step 1: iavf will be the default VF driver, while i40evf still can be selected by
> devarg: "driver=i40evf".
> This is covered by this patch, which include:
> 1) add all 700 serial NIC VF device ID into iavf PMD
> 2) skip probe if devargs contain "driver=i40evf" in iavf
> 3) continue probe if devargs contain "driver=i40evf" in i40evf
> 
> Step 2: i40evf and related devarg are removed, this will happen at DPDK
> 21.11
> 
> Between step 1 and step 2, no new feature will be added into i40evf except
> bug fix.
> 
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v6] net/iavf: deprecate i40evf pmd
  2021-04-16 10:15   ` Zhang, Qi Z
@ 2021-04-16 13:36     ` Ferruh Yigit
  0 siblings, 0 replies; 15+ messages in thread
From: Ferruh Yigit @ 2021-04-16 13:36 UTC (permalink / raw)
  To: Zhang, Qi Z, Zhang, RobinX
  Cc: Xing, Beilei, Guo, Jia, Wang, Haiyue, mdr, nhorman, Wu, Jingjing,
	Yang, Qiming, Yang, SteveX, dev, Bruce Richardson,
	Konstantin Ananyev

On 4/16/2021 11:15 AM, Zhang, Qi Z wrote:
> 
> 
>> -----Original Message-----
>> From: dev <dev-bounces@dpdk.org> On Behalf Of Robin Zhang
>> Sent: Friday, April 16, 2021 9:58 AM
>> To: dev@dpdk.org
>> Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang,
>> Haiyue <haiyue.wang@intel.com>; mdr@ashroe.eu; nhorman@tuxdriver.com;
>> Wu, Jingjing <jingjing.wu@intel.com>; Yang, Qiming
>> <qiming.yang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
>> RobinX <robinx.zhang@intel.com>
>> Subject: [dpdk-dev] [PATCH v6] net/iavf: deprecate i40evf pmd
>>
>> The i40evf PMD will be deprecated, iavf will be the only VF driver for Intel 700
>> serial (i40e) NIC family. To reach this, there will be 2 steps:
>>
>> Step 1: iavf will be the default VF driver, while i40evf still can be selected by
>> devarg: "driver=i40evf".
>> This is covered by this patch, which include:
>> 1) add all 700 serial NIC VF device ID into iavf PMD
>> 2) skip probe if devargs contain "driver=i40evf" in iavf
>> 3) continue probe if devargs contain "driver=i40evf" in i40evf
>>
>> Step 2: i40evf and related devarg are removed, this will happen at DPDK
>> 21.11
>>
>> Between step 1 and step 2, no new feature will be added into i40evf except
>> bug fix.
>>
>> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> 
> Acked-by: Qi Zhang <qi.z.zhang@intel.com>
> 

Hi Qi, Robin,

Lgtm, hence:
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

But we need 3 acks for a deprecation notice to merge it.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v6] net/iavf: deprecate i40evf pmd
  2021-04-16  1:57 ` [dpdk-dev] [PATCH v6] " Robin Zhang
  2021-04-16 10:15   ` Zhang, Qi Z
@ 2021-04-19  2:06   ` Xing, Beilei
  1 sibling, 0 replies; 15+ messages in thread
From: Xing, Beilei @ 2021-04-19  2:06 UTC (permalink / raw)
  To: Zhang, RobinX, dev
  Cc: Guo, Jia, Wang, Haiyue, mdr, nhorman, Wu, Jingjing, Yang, Qiming,
	Yang, SteveX



> -----Original Message-----
> From: Zhang, RobinX <robinx.zhang@intel.com>
> Sent: Friday, April 16, 2021 9:58 AM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang,
> Haiyue <haiyue.wang@intel.com>; mdr@ashroe.eu; nhorman@tuxdriver.com;
> Wu, Jingjing <jingjing.wu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
> RobinX <robinx.zhang@intel.com>
> Subject: [PATCH v6] net/iavf: deprecate i40evf pmd
> 
> The i40evf PMD will be deprecated, iavf will be the only VF driver for Intel 700
> serial (i40e) NIC family. To reach this, there will be 2 steps:
> 
> Step 1: iavf will be the default VF driver, while i40evf still can be selected by
> devarg: "driver=i40evf".
> This is covered by this patch, which include:
> 1) add all 700 serial NIC VF device ID into iavf PMD
> 2) skip probe if devargs contain "driver=i40evf" in iavf
> 3) continue probe if devargs contain "driver=i40evf" in i40evf
> 
> Step 2: i40evf and related devarg are removed, this will happen at DPDK
> 21.11
> 
> Between step 1 and step 2, no new feature will be added into i40evf except
> bug fix.
> 
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> ---
> v6:
> - remove unnecessary ifdef in iavf.
> 
> v5:
> - refine code of check device id.
> 
> v4:
> - rebase code.
> 
> v3:
> - skip probe if devargs contain "driver=i40evf" in iavf.
> - update intel_vf.rst for the new devargs.
> 
> v2:
> - change default VF driver to iavf, add devarg "driver=i40evf" so that
>   i40evf can still be used.
> ---
>  doc/guides/nics/intel_vf.rst         |  6 +++
>  doc/guides/rel_notes/deprecation.rst |  8 ++++
>  drivers/common/iavf/iavf_devids.h    |  2 +
>  drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++++++
>  drivers/net/iavf/iavf_ethdev.c       | 57 +++++++++++++++++++++++++++-
>  5 files changed, 116 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index
> 529ff4a955..fcea8151bf 100644
> --- a/doc/guides/nics/intel_vf.rst
> +++ b/doc/guides/nics/intel_vf.rst
> @@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following
> documents:
>      assignment in hypervisor. Take qemu for example, the device assignment
> should carry the IAVF device id (0x1889) like
>      ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
> 
> +    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series
> Ethernet Controller will be IAVF. No new feature
> +    will be added into i40evf except bug fix until it's removed in DPDK 21.11.
> Between DPDK 21.05 and 21.11, by using the
> +    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on Intel®
> 700 Series Ethernet Controller, for example::
> +
> +    -a 81:02.0,driver=i40evf
> +
>      When IAVF is backed by an Intel® E810 device, the "Protocol Extraction"
> feature which is supported by ice PMD is also
>      available for IAVF PMD. The same devargs with the same parameters can be
> applied to IAVF PMD, for detail please reference
>      the section ``Protocol extraction for per queue`` of ice.rst.
> diff --git a/doc/guides/rel_notes/deprecation.rst
> b/doc/guides/rel_notes/deprecation.rst
> index 2afc84c396..05ef276b21 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -139,3 +139,11 @@ Deprecation Notices
>  * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
>    content. On Linux and FreeBSD, supported prior to DPDK 20.11,
>    original structure will be kept until DPDK 21.11.
> +
> +* i40e: As there are both i40evf and iavf pmd, the functions of them
> +are
> +  duplicated. And now more and more advanced features are developed on
> iavf.
> +  To keep consistent with kernel driver's name
> +  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to
> maintain.
> +  Starting from 21.05, the default VF driver of i40e will be iavf, but
> +i40evf
> +  can still be used if users specify the devarg "driver=i40evf". I40evf
> +will
> +  be deleted in DPDK 21.11.
> diff --git a/drivers/common/iavf/iavf_devids.h
> b/drivers/common/iavf/iavf_devids.h
> index 722c2e4f49..b0d48b0582 100644
> --- a/drivers/common/iavf/iavf_devids.h
> +++ b/drivers/common/iavf/iavf_devids.h
> @@ -13,5 +13,7 @@
>  #define IAVF_DEV_ID_VF_HV		0x1571
>  #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
>  #define IAVF_DEV_ID_X722_VF		0x37CD
> +#define I40E_DEV_ID_X722_A0_VF          0x374D

Why not IAVF_DEV_ID_X722_A0_VF here?

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v7] net/iavf: deprecate i40evf pmd
  2021-03-02  6:13 [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd Robin Zhang
                   ` (4 preceding siblings ...)
  2021-04-16  1:57 ` [dpdk-dev] [PATCH v6] " Robin Zhang
@ 2021-04-19  3:05 ` Robin Zhang
  2021-04-19  8:31   ` Xing, Beilei
  5 siblings, 1 reply; 15+ messages in thread
From: Robin Zhang @ 2021-04-19  3:05 UTC (permalink / raw)
  To: dev
  Cc: beilei.xing, jia.guo, haiyue.wang, mdr, nhorman, jingjing.wu,
	qiming.yang, stevex.yang, Robin Zhang, Qi Zhang, Ferruh Yigit

The i40evf PMD will be deprecated, iavf will be the only VF driver for
Intel 700 serial (i40e) NIC family. To reach this, there will be 2 steps:

Step 1: iavf will be the default VF driver, while i40evf still can be
selected by devarg: "driver=i40evf".
This is covered by this patch, which include:
1) add all 700 serial NIC VF device ID into iavf PMD
2) skip probe if devargs contain "driver=i40evf" in iavf
3) continue probe if devargs contain "driver=i40evf" in i40evf

Step 2: i40evf and related devarg are removed, this will happen at DPDK
21.11

Between step 1 and step 2, no new feature will be added into i40evf except
bug fix.

Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
v7:
- correct the device id macro name of X722_A0_VF.

v6:
- remove unnecessary ifdef in iavf.

v5:
- refine code of check device id.

v4:
- rebase code.

v3:
- skip probe if devargs contain "driver=i40evf" in iavf.
- update intel_vf.rst for the new devargs.

v2:
- change default VF driver to iavf, add devarg "driver=i40evf" so that
  i40evf can still be used.
---
 doc/guides/nics/intel_vf.rst         |  6 +++
 doc/guides/rel_notes/deprecation.rst |  8 ++++
 drivers/common/iavf/iavf_devids.h    |  2 +
 drivers/net/i40e/i40e_ethdev_vf.c    | 45 ++++++++++++++++++++++
 drivers/net/iavf/iavf_ethdev.c       | 57 +++++++++++++++++++++++++++-
 5 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index 529ff4a955..fcea8151bf 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -88,6 +88,12 @@ For more detail on SR-IOV, please refer to the following documents:
     assignment in hypervisor. Take qemu for example, the device assignment should carry the IAVF device id (0x1889) like
     ``-device vfio-pci,x-pci-device-id=0x1889,host=03:0a.0``.
 
+    Starting from DPDK 21.05, the default VF driver for Intel® 700 Series Ethernet Controller will be IAVF. No new feature
+    will be added into i40evf except bug fix until it's removed in DPDK 21.11. Between DPDK 21.05 and 21.11, by using the
+    ``devargs`` option ``driver=i40evf``, i40evf PMD still can be used on Intel® 700 Series Ethernet Controller, for example::
+
+    -a 81:02.0,driver=i40evf
+
     When IAVF is backed by an Intel® E810 device, the "Protocol Extraction" feature which is supported by ice PMD is also
     available for IAVF PMD. The same devargs with the same parameters can be applied to IAVF PMD, for detail please reference
     the section ``Protocol extraction for per queue`` of ice.rst.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 2afc84c396..05ef276b21 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -139,3 +139,11 @@ Deprecation Notices
 * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific
   content. On Linux and FreeBSD, supported prior to DPDK 20.11,
   original structure will be kept until DPDK 21.11.
+
+* i40e: As there are both i40evf and iavf pmd, the functions of them are
+  duplicated. And now more and more advanced features are developed on iavf.
+  To keep consistent with kernel driver's name
+  (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain.
+  Starting from 21.05, the default VF driver of i40e will be iavf, but i40evf
+  can still be used if users specify the devarg "driver=i40evf". I40evf will
+  be deleted in DPDK 21.11.
diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h
index 722c2e4f49..0f98375a09 100644
--- a/drivers/common/iavf/iavf_devids.h
+++ b/drivers/common/iavf/iavf_devids.h
@@ -13,5 +13,7 @@
 #define IAVF_DEV_ID_VF_HV		0x1571
 #define IAVF_DEV_ID_ADAPTIVE_VF		0x1889
 #define IAVF_DEV_ID_X722_VF		0x37CD
+#define IAVF_DEV_ID_X722_A0_VF          0x374D
+
 
 #endif /* _IAVF_DEVIDS_H_ */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 0c9bd8d2c6..509c8f4e37 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1656,9 +1656,53 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+static int
+i40evf_check_driver_handler(__rte_unused const char *key,
+			    const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+i40evf_driver_selected(struct rte_devargs *devargs)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       i40evf_check_driver_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	struct rte_pci_device *pci_dev)
 {
+	if (!i40evf_driver_selected(pci_dev->device.devargs))
+		return 1;
+
 	return rte_eth_dev_pci_generic_probe(pci_dev,
 		sizeof(struct i40e_adapter), i40evf_dev_init);
 }
@@ -1681,6 +1725,7 @@ static struct rte_pci_driver rte_i40evf_pmd = {
 RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(net_i40e_vf, "driver=i40evf");
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 51cad48069..f3d51327a2 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -125,6 +125,10 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev,
 
 static const struct rte_pci_id pci_id_iavf_map[] = {
 	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },
+	{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_A0_VF) },
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
@@ -2323,10 +2327,59 @@ iavf_dcf_cap_selected(struct rte_devargs *devargs)
 	return ret;
 }
 
+static int
+iavf_drv_i40evf_check_handler(__rte_unused const char *key,
+			      const char *value, __rte_unused void *opaque)
+{
+	if (strcmp(value, "i40evf"))
+		return -1;
+
+	return 0;
+}
+
+static int
+iavf_drv_i40evf_selected(struct rte_devargs *devargs, uint16_t device_id)
+{
+	struct rte_kvargs *kvlist;
+	const char *key = "driver";
+	int ret = 0;
+
+	if (device_id != IAVF_DEV_ID_VF &&
+	    device_id != IAVF_DEV_ID_VF_HV &&
+	    device_id != IAVF_DEV_ID_X722_VF &&
+	    device_id != IAVF_DEV_ID_X722_A0_VF)
+		return 0;
+
+	if (devargs == NULL)
+		return 0;
+
+	kvlist = rte_kvargs_parse(devargs->args, NULL);
+	if (kvlist == NULL)
+		return 0;
+
+	if (!rte_kvargs_count(kvlist, key))
+		goto exit;
+
+	/* i40evf driver selected when there's a key-value pair:
+	 * driver=i40evf
+	 */
+	if (rte_kvargs_process(kvlist, key,
+			       iavf_drv_i40evf_check_handler, NULL) < 0)
+		goto exit;
+
+	ret = 1;
+
+exit:
+	rte_kvargs_free(kvlist);
+	return ret;
+}
+
 static int eth_iavf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 			     struct rte_pci_device *pci_dev)
 {
-	if (iavf_dcf_cap_selected(pci_dev->device.devargs))
+	if (iavf_dcf_cap_selected(pci_dev->device.devargs) ||
+	    iavf_drv_i40evf_selected(pci_dev->device.devargs,
+				     pci_dev->id.device_id))
 		return 1;
 
 	return rte_eth_dev_pci_generic_probe(pci_dev,
@@ -2349,7 +2402,7 @@ static struct rte_pci_driver rte_iavf_pmd = {
 RTE_PMD_REGISTER_PCI(net_iavf, rte_iavf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_iavf, pci_id_iavf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
+RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf driver=i40evf");
 RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
 RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);
 #ifdef RTE_ETHDEV_DEBUG_RX
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v7] net/iavf: deprecate i40evf pmd
  2021-04-19  3:05 ` [dpdk-dev] [PATCH v7] " Robin Zhang
@ 2021-04-19  8:31   ` Xing, Beilei
  2021-04-19  8:33     ` Zhang, Qi Z
  0 siblings, 1 reply; 15+ messages in thread
From: Xing, Beilei @ 2021-04-19  8:31 UTC (permalink / raw)
  To: Zhang, RobinX, dev
  Cc: Guo, Jia, Wang, Haiyue, mdr, nhorman, Wu, Jingjing, Yang, Qiming,
	Yang, SteveX, Zhang, Qi Z, Yigit, Ferruh



> -----Original Message-----
> From: Zhang, RobinX <robinx.zhang@intel.com>
> Sent: Monday, April 19, 2021 11:06 AM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia <jia.guo@intel.com>; Wang,
> Haiyue <haiyue.wang@intel.com>; mdr@ashroe.eu; nhorman@tuxdriver.com;
> Wu, Jingjing <jingjing.wu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
> RobinX <robinx.zhang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Yigit,
> Ferruh <ferruh.yigit@intel.com>
> Subject: [PATCH v7] net/iavf: deprecate i40evf pmd
> 
> The i40evf PMD will be deprecated, iavf will be the only VF driver for Intel 700
> serial (i40e) NIC family. To reach this, there will be 2 steps:
> 
> Step 1: iavf will be the default VF driver, while i40evf still can be selected by
> devarg: "driver=i40evf".
> This is covered by this patch, which include:
> 1) add all 700 serial NIC VF device ID into iavf PMD
> 2) skip probe if devargs contain "driver=i40evf" in iavf
> 3) continue probe if devargs contain "driver=i40evf" in i40evf
> 
> Step 2: i40evf and related devarg are removed, this will happen at DPDK
> 21.11
> 
> Between step 1 and step 2, no new feature will be added into i40evf except
> bug fix.
> 
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> Acked-by: Qi Zhang <qi.z.zhang@intel.com>
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

Acked-by: Beilei Xing <beilei.xing@intel.com>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v7] net/iavf: deprecate i40evf pmd
  2021-04-19  8:31   ` Xing, Beilei
@ 2021-04-19  8:33     ` Zhang, Qi Z
  0 siblings, 0 replies; 15+ messages in thread
From: Zhang, Qi Z @ 2021-04-19  8:33 UTC (permalink / raw)
  To: Xing, Beilei, Zhang, RobinX, dev
  Cc: Guo, Jia, Wang, Haiyue, mdr, nhorman, Wu, Jingjing, Yang, Qiming,
	Yang, SteveX, Yigit, Ferruh



> -----Original Message-----
> From: Xing, Beilei <beilei.xing@intel.com>
> Sent: Monday, April 19, 2021 4:32 PM
> To: Zhang, RobinX <robinx.zhang@intel.com>; dev@dpdk.org
> Cc: Guo, Jia <jia.guo@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>;
> mdr@ashroe.eu; nhorman@tuxdriver.com; Wu, Jingjing
> <jingjing.wu@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Yang,
> SteveX <stevex.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Yigit,
> Ferruh <ferruh.yigit@intel.com>
> Subject: RE: [PATCH v7] net/iavf: deprecate i40evf pmd
> 
> 
> 
> > -----Original Message-----
> > From: Zhang, RobinX <robinx.zhang@intel.com>
> > Sent: Monday, April 19, 2021 11:06 AM
> > To: dev@dpdk.org
> > Cc: Xing, Beilei <beilei.xing@intel.com>; Guo, Jia
> > <jia.guo@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>;
> > mdr@ashroe.eu; nhorman@tuxdriver.com; Wu, Jingjing
> > <jingjing.wu@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Yang,
> > SteveX <stevex.yang@intel.com>; Zhang, RobinX
> > <robinx.zhang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Yigit,
> > Ferruh <ferruh.yigit@intel.com>
> > Subject: [PATCH v7] net/iavf: deprecate i40evf pmd
> >
> > The i40evf PMD will be deprecated, iavf will be the only VF driver for
> > Intel 700 serial (i40e) NIC family. To reach this, there will be 2 steps:
> >
> > Step 1: iavf will be the default VF driver, while i40evf still can be
> > selected by
> > devarg: "driver=i40evf".
> > This is covered by this patch, which include:
> > 1) add all 700 serial NIC VF device ID into iavf PMD
> > 2) skip probe if devargs contain "driver=i40evf" in iavf
> > 3) continue probe if devargs contain "driver=i40evf" in i40evf
> >
> > Step 2: i40evf and related devarg are removed, this will happen at
> > DPDK
> > 21.11
> >
> > Between step 1 and step 2, no new feature will be added into i40evf
> > except bug fix.
> >
> > Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> > Acked-by: Qi Zhang <qi.z.zhang@intel.com>
> > Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Acked-by: Beilei Xing <beilei.xing@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi


^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2021-04-19  8:33 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02  6:13 [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd Robin Zhang
2021-03-30  8:16 ` [dpdk-dev] [PATCH v2] " Robin Zhang
2021-04-02 10:42 ` [dpdk-dev] [PATCH v3] " Robin Zhang
2021-04-15  2:05 ` [dpdk-dev] [PATCH v4] " Robin Zhang
2021-04-15  7:46   ` Wang, Haiyue
2021-04-15  9:40   ` Zhang, Qi Z
2021-04-15 10:34 ` [dpdk-dev] [PATCH v5] " Robin Zhang
2021-04-15 12:14   ` Zhang, Qi Z
2021-04-16  1:57 ` [dpdk-dev] [PATCH v6] " Robin Zhang
2021-04-16 10:15   ` Zhang, Qi Z
2021-04-16 13:36     ` Ferruh Yigit
2021-04-19  2:06   ` Xing, Beilei
2021-04-19  3:05 ` [dpdk-dev] [PATCH v7] " Robin Zhang
2021-04-19  8:31   ` Xing, Beilei
2021-04-19  8:33     ` Zhang, Qi Z

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git