dpdk: patch to support bonded interface for MLX NIC
At present, creating bonding devices using --vdev is broken for PMD like
mlx5 as it is neither UIO nor VFIO based and hence PMD driver is unknown
to find_port_id_by_pci_addr().
This DPDK patch fixes parsing PCI ID from bonding device params by verifying
it in RTE PCI bus, rather than checking dev->kdrv.
Change-Id: If575f63ef31733102566610d769ddd212d74736a
Signed-off-by: Steve Shin <jonshin@cisco.com>
diff --git a/dpdk/Makefile b/dpdk/Makefile
index 0734750..01e2e44 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -25,7 +25,7 @@
B := $(DPDK_BUILD_DIR)
I := $(DPDK_INSTALL_DIR)
DPDK_VERSION ?= 17.08
-PKG_SUFFIX ?= vpp1
+PKG_SUFFIX ?= vpp2
DPDK_BASE_URL ?= http://fast.dpdk.org/rel
DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
diff --git a/dpdk/dpdk-17.08_patches/0001-net-bonding-support-for-mlx.patch b/dpdk/dpdk-17.08_patches/0001-net-bonding-support-for-mlx.patch
new file mode 100644
index 0000000..13a2ba6
--- /dev/null
+++ b/dpdk/dpdk-17.08_patches/0001-net-bonding-support-for-mlx.patch
@@ -0,0 +1,63 @@
+diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
+index bb634c6..7c65dda 100644
+--- a/drivers/net/bonding/rte_eth_bond_args.c
++++ b/drivers/net/bonding/rte_eth_bond_args.c
+@@ -61,16 +61,6 @@
+ unsigned i;
+
+ for (i = 0; i < rte_eth_dev_count(); i++) {
+-
+- /* Currently populated by rte_eth_copy_pci_info().
+- *
+- * TODO: Once the PCI bus has arrived we should have a better
+- * way to test for being a PCI device or not.
+- */
+- if (rte_eth_devices[i].data->kdrv == RTE_KDRV_UNKNOWN ||
+- rte_eth_devices[i].data->kdrv == RTE_KDRV_NONE)
+- continue;
+-
+ pci_dev = RTE_ETH_DEV_TO_PCI(&rte_eth_devices[i]);
+ eth_pci_addr = &pci_dev->addr;
+
+@@ -98,6 +88,16 @@
+ return -1;
+ }
+
++static inline int
++pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr)
++{
++ struct rte_pci_device *pdev;
++ const struct rte_pci_addr *paddr = _pci_addr;
++
++ pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev);
++ return rte_eal_compare_pci_addr(&pdev->addr, paddr);
++}
++
+ /**
+ * Parses a port identifier string to a port id by pci address, then by name,
+ * and finally port id.
+@@ -106,10 +106,23 @@
+ parse_port_id(const char *port_str)
+ {
+ struct rte_pci_addr dev_addr;
++ struct rte_bus *pci_bus;
++ struct rte_device *dev;
+ int port_id;
+
++ pci_bus = rte_bus_find_by_name("pci");
++ if (pci_bus == NULL) {
++ RTE_LOG(ERR, PMD, "unable to find PCI bus\n");
++ return -1;
++ }
++
+ /* try parsing as pci address, physical devices */
+- if (eal_parse_pci_DomBDF(port_str, &dev_addr) == 0) {
++ if (pci_bus->parse(port_str, &dev_addr) == 0) {
++ dev = pci_bus->find_device(NULL, pci_addr_cmp, &dev_addr);
++ if (dev == NULL) {
++ RTE_LOG(ERR, PMD, "unable to find PCI device\n");
++ return -1;
++ }
+ port_id = find_port_id_by_pci_addr(&dev_addr);
+ if (port_id < 0)
+ return -1;