[dpdk-stable] patch 'net/mlx5: fix probing device in legacy bonding mode' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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/19/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/f2828c3411b9383b7b3451c502295c1ec04026c4

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From f2828c3411b9383b7b3451c502295c1ec04026c4 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Date: Wed, 21 Apr 2021 08:10:13 +0000
Subject: [PATCH] net/mlx5: fix probing device in legacy bonding mode

[ upstream commit ecaee305b811036d297eda04ad7c91d8349de77e ]

If the device was configured as legacy bond one (without
involving E-Switch), the mlx5 PMD erroneously tried to deduce
the vport index raising the fatal error and preventing
device from being used.

The patch checks whether there is E-Switch present and we
should use vport index indeed.

Fixes: 2eb4d0107acc ("net/mlx5: refactor PCI probing on Linux")
Fixes: d5c06b1b10ae ("net/mlx5: query vport index match mode and parameters")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index f8de9e329e..8c5e270428 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -2439,7 +2439,8 @@ err_secondary:
 	}
 	if (devx_port.comp_mask & MLX5DV_DEVX_PORT_VPORT) {
 		priv->vport_id = devx_port.vport_num;
-	} else if (spawn->pf_bond >= 0) {
+	} else if (spawn->pf_bond >= 0 &&
+			(switch_info->representor || switch_info->master)) {
 		DRV_LOG(ERR, "can't deduce vport index for port %d"
 			     " on bonding device %s",
 			     spawn->ibv_port, spawn->ibv_dev->name);
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:36.277655488 +0200
+++ 0176-net-mlx5-fix-probing-device-in-legacy-bonding-mode.patch	2021-05-17 17:40:29.507812121 +0200
@@ -1 +1 @@
-From ecaee305b811036d297eda04ad7c91d8349de77e Mon Sep 17 00:00:00 2001
+From f2828c3411b9383b7b3451c502295c1ec04026c4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ecaee305b811036d297eda04ad7c91d8349de77e ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
- drivers/net/mlx5/linux/mlx5_os.c | 3 ++-
+ drivers/net/mlx5/mlx5.c | 3 ++-
@@ -23,5 +24,5 @@
-diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
-index 17d0533c1b..479ee7d8d1 100644
---- a/drivers/net/mlx5/linux/mlx5_os.c
-+++ b/drivers/net/mlx5/linux/mlx5_os.c
-@@ -1097,7 +1097,8 @@ err_secondary:
+diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
+index f8de9e329e..8c5e270428 100644
+--- a/drivers/net/mlx5/mlx5.c
++++ b/drivers/net/mlx5/mlx5.c
+@@ -2439,7 +2439,8 @@ err_secondary:
@@ -33 +34 @@
-+		   (switch_info->representor || switch_info->master)) {
++			(switch_info->representor || switch_info->master)) {
@@ -36 +37 @@
- 			     spawn->phys_port,
+ 			     spawn->ibv_port, spawn->ibv_dev->name);