patch 'net/mlx5: fix probing with secondary bonding member' has been queued to stable release 21.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/15/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/99ba358268c8bd8d1bb387ea842a88ca45ffdbe1

Thanks.

Kevin

---
From 99ba358268c8bd8d1bb387ea842a88ca45ffdbe1 Mon Sep 17 00:00:00 2001
From: Rongwei Liu <rongweil@nvidia.com>
Date: Wed, 6 Apr 2022 10:12:24 +0300
Subject: [PATCH] net/mlx5: fix probing with secondary bonding member

[ upstream commit f956d3d4c33cdfac5e352f457050029bd5c9b8a8 ]

Users can probe primary or secondary PCIe id when bonding is
configured.
1. -a 0a:00.0,representor=pf[0-1]vf[0-1], PMD probes 5 ports
totally: bonding device plus 4 representor ports.
2. -a 0a:00.1,representor=pf[0-1]vf[0-1], PMD only probes 2
representor ports.

Under the 2nd condition, bonding IB device doesn't have the same
PCIe id and PMD needs to check bonding relationship otherwise
probe failure.

Fixes: 6856efa54eea ("net/mlx5: fix PF leak on PCI probing failure")

Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/common/mlx5/linux/mlx5_common_os.c | 26 ++++++++++++++++------
 drivers/net/mlx5/linux/mlx5_os.c           | 24 ++++++++++----------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c
index 25e09bb55b..eeb583a553 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -457,19 +457,31 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr)
 	struct ibv_device **ibv_list = mlx5_glue->get_device_list(&n);
 	struct ibv_device *ibv_match = NULL;
+	uint8_t guid1[32] = {0};
+	uint8_t guid2[32] = {0};
+	int ret1, ret2 = -1;
+	struct rte_pci_addr paddr;
 
-	if (ibv_list == NULL) {
+	if (ibv_list == NULL || !n) {
 		rte_errno = ENOSYS;
+		if (ibv_list)
+			mlx5_glue->free_device_list(ibv_list);
 		return NULL;
 	}
+	ret1 = mlx5_get_device_guid(addr, guid1, sizeof(guid1));
 	while (n-- > 0) {
-		struct rte_pci_addr paddr;
-
 		DRV_LOG(DEBUG, "Checking device \"%s\"..", ibv_list[n]->name);
 		if (mlx5_get_pci_addr(ibv_list[n]->ibdev_path, &paddr) != 0)
 			continue;
-		if (rte_pci_addr_cmp(addr, &paddr) != 0)
-			continue;
-		ibv_match = ibv_list[n];
-		break;
+		if (ret1 > 0)
+			ret2 = mlx5_get_device_guid(&paddr, guid2, sizeof(guid2));
+		/* Bond device can bond secondary PCIe */
+		if ((strstr(ibv_list[n]->name, "bond") &&
+		    ((ret1 > 0 && ret2 > 0 && !memcmp(guid1, guid2, sizeof(guid1))) ||
+		    (addr->domain == paddr.domain && addr->bus == paddr.bus &&
+		     addr->devid == paddr.devid))) ||
+		     !rte_pci_addr_cmp(addr, &paddr)) {
+			ibv_match = ibv_list[n];
+			break;
+		}
 	}
 	if (ibv_match == NULL) {
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 6c76a30e8c..792dd2cb22 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2190,7 +2190,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
 		/* No device matches, just complain and bail out. */
 		DRV_LOG(WARNING,
-			"No Verbs device matches PCI device " PCI_PRI_FMT ","
+			"PF %u doesn't have Verbs device matches PCI device " PCI_PRI_FMT ","
 			" are kernel drivers loaded?",
-			owner_pci.domain, owner_pci.bus,
+			owner_id, owner_pci.domain, owner_pci.bus,
 			owner_pci.devid, owner_pci.function);
 		rte_errno = ENOENT;
@@ -2613,14 +2613,14 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev)
 			ret = mlx5_os_pci_probe_pf(cdev, &eth_da,
 						   eth_da.ports[p]);
-			if (ret)
-				break;
-		}
-		if (ret) {
-			DRV_LOG(ERR, "Probe of PCI device " PCI_PRI_FMT " "
-				"aborted due to prodding failure of PF %u",
-				pci_dev->addr.domain, pci_dev->addr.bus,
-				pci_dev->addr.devid, pci_dev->addr.function,
-				eth_da.ports[p]);
-			mlx5_net_remove(cdev);
+			if (ret) {
+				DRV_LOG(INFO, "Probe of PCI device " PCI_PRI_FMT " "
+					"aborted due to proding failure of PF %u",
+					pci_dev->addr.domain, pci_dev->addr.bus,
+					pci_dev->addr.devid, pci_dev->addr.function,
+					eth_da.ports[p]);
+				mlx5_net_remove(cdev);
+				if (p != 0)
+					break;
+			}
 		}
 	} else {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-10 13:24:21.965977325 +0100
+++ 0013-net-mlx5-fix-probing-with-secondary-bonding-member.patch	2022-05-10 13:24:21.579646328 +0100
@@ -1 +1 @@
-From f956d3d4c33cdfac5e352f457050029bd5c9b8a8 Mon Sep 17 00:00:00 2001
+From 99ba358268c8bd8d1bb387ea842a88ca45ffdbe1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f956d3d4c33cdfac5e352f457050029bd5c9b8a8 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index 030ceb561f..d40cfd5cd1 100644
+index 25e09bb55b..eeb583a553 100644
@@ -31 +32 @@
-@@ -560,19 +560,31 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr)
+@@ -457,19 +457,31 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr)
@@ -71 +72 @@
-index ff65efb2a2..a821153b35 100644
+index 6c76a30e8c..792dd2cb22 100644
@@ -74 +75 @@
-@@ -1980,7 +1980,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
+@@ -2190,7 +2190,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
@@ -84 +85 @@
-@@ -2388,14 +2388,14 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev,
+@@ -2613,14 +2613,14 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev)
@@ -86 +87 @@
- 						   eth_da.ports[p], mkvlist);
+ 						   eth_da.ports[p]);