patch 'net/mlx5: fix bonding check' has been queued to stable release 25.11.1
Kevin Traynor
ktraynor at redhat.com
Thu Mar 19 11:02:31 CET 2026
Hi,
FYI, your patch has been queued to stable release 25.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/23/26. 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/538b08dda4b51b61128dd323b06a3ea2b83eac49
Thanks.
Kevin
---
>From 538b08dda4b51b61128dd323b06a3ea2b83eac49 Mon Sep 17 00:00:00 2001
From: Dariusz Sosnowski <dsosnowski at nvidia.com>
Date: Wed, 4 Mar 2026 11:57:17 +0100
Subject: [PATCH] net/mlx5: fix bonding check
[ upstream commit f6e478d5557a8d8c1407b35620fd7a32b8211a91 ]
mlx5 networking PMD supports probing ethdev ports based
on LAG configured on Linux kernel level.
In such cases, a single IB device is created in the kernel
and mlx5 PMD configured the device through this IB device.
In order to recognize whether PMD will run over LAG device or not,
mlx5 PMD relied on IB device name.
This patch fixes mlx5 networking PMD logic to rely on
mlx5_os_is_device_bond() introduced in previous commit,
instead of relying solely on IB device name.
Fixes: 2e569a370395 ("net/mlx5: add VF LAG mode bonding device recognition")
Signed-off-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
Acked-by: Bing Zhao <bingz at nvidia.com>
---
drivers/net/mlx5/linux/mlx5_os.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 7b21bc4ec2..71fadc23fc 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1914,6 +1914,6 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
* Match PCI information for possible slaves of bonding device.
*
- * @param[in] ibdev_name
- * Name of Infiniband device.
+ * @param[in] ibdev
+ * Pointer to IB device.
* @param[in] pci_dev
* Pointer to primary PCI address structure to match.
@@ -1932,5 +1932,5 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
*/
static int
-mlx5_device_bond_pci_match(const char *ibdev_name,
+mlx5_device_bond_pci_match(const struct ibv_device *ibdev,
const struct rte_pci_addr *pci_dev,
int nl_rdma, uint16_t owner,
@@ -1954,7 +1954,7 @@ mlx5_device_bond_pci_match(const char *ibdev_name,
if (nl_rdma < 0)
return -1;
- if (!strstr(ibdev_name, "bond"))
+ if (!mlx5_os_is_device_bond(ibdev))
return -1;
- np = mlx5_nl_portnum(nl_rdma, ibdev_name, dev_info);
+ np = mlx5_nl_portnum(nl_rdma, ibdev->name, dev_info);
if (!np)
return -1;
@@ -1968,5 +1968,5 @@ mlx5_device_bond_pci_match(const char *ibdev_name,
for (i = 1; i <= np; ++i) {
/* Check whether Infiniband port is populated. */
- ifindex = mlx5_nl_ifindex(nl_rdma, ibdev_name, i, dev_info);
+ ifindex = mlx5_nl_ifindex(nl_rdma, ibdev->name, i, dev_info);
if (!ifindex)
continue;
@@ -2382,5 +2382,5 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
}
DRV_LOG(DEBUG, "Checking device \"%s\"", ibv_list[ret]->name);
- bd = mlx5_device_bond_pci_match(ibv_list[ret]->name, &owner_pci,
+ bd = mlx5_device_bond_pci_match(ibv_list[ret], &owner_pci,
nl_rdma, owner_id,
info,
--
2.53.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-03-19 10:01:08.097029592 +0000
+++ 0033-net-mlx5-fix-bonding-check.patch 2026-03-19 10:01:07.098331261 +0000
@@ -1 +1 @@
-From f6e478d5557a8d8c1407b35620fd7a32b8211a91 Mon Sep 17 00:00:00 2001
+From 538b08dda4b51b61128dd323b06a3ea2b83eac49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f6e478d5557a8d8c1407b35620fd7a32b8211a91 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 76edd19c70..405aa9799c 100644
+index 7b21bc4ec2..71fadc23fc 100644
@@ -30 +31 @@
-@@ -1929,6 +1929,6 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
+@@ -1914,6 +1914,6 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
@@ -39 +40 @@
-@@ -1947,5 +1947,5 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
+@@ -1932,5 +1932,5 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
@@ -46 +47 @@
-@@ -1969,7 +1969,7 @@ mlx5_device_bond_pci_match(const char *ibdev_name,
+@@ -1954,7 +1954,7 @@ mlx5_device_bond_pci_match(const char *ibdev_name,
@@ -56 +57 @@
-@@ -1983,5 +1983,5 @@ mlx5_device_bond_pci_match(const char *ibdev_name,
+@@ -1968,5 +1968,5 @@ mlx5_device_bond_pci_match(const char *ibdev_name,
@@ -63 +64 @@
-@@ -2397,5 +2397,5 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
+@@ -2382,5 +2382,5 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
More information about the stable
mailing list