patch 'net/mlx5: add limitation for E-Switch Manager match' has been queued to stable release 21.11.2

[Kevin Traynor]

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 06/27/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/aa8fb4afda77b0e0161f296a3f511cc0c8b5835e

Thanks.

Kevin

---
>From aa8fb4afda77b0e0161f296a3f511cc0c8b5835e Mon Sep 17 00:00:00 2001
From: Shun Hao <shunh at nvidia.com>
Date: Sun, 19 Jun 2022 06:21:27 +0300
Subject: [PATCH] net/mlx5: add limitation for E-Switch Manager match

[ upstream commit 68e9925c30a1a311a945ea72f23a08ce3deebdce ]

For BF with old FW which doesn't expose the E-Switch Manager vport ID,
E-Switch Manager port matching works correctly only when BF is in
embedded CPU mode.

This patch adds the limitation description.

Fixes: a564038699f9 ("net/mlx5: support E-Switch manager egress traffic match")

Signed-off-by: Shun Hao <shunh at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 doc/guides/nics/mlx5.rst        |  6 ++++++
 drivers/net/mlx5/mlx5_flow.h    |  4 ++++
 drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index b3f1673b55..7a616784eb 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -361,4 +361,10 @@ Limitations
   - must specify PF port action (packet redirection from VF to PF).
 
+- E-Switch Manager matching:
+
+  - For Bluefield with old FW
+    which doesn't expose the E-Switch Manager vport ID in the capability,
+    matching E-Switch Manager should be used only in Bluefield embedded CPU mode.
+
 - Raw encapsulation:
 
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 64335b8670..3e34b1c08a 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1767,3 +1767,7 @@ mlx5_get_tof(const struct rte_flow_item *items,
 	     const struct rte_flow_action *actions,
 	     enum mlx5_tof_rule_type *rule_type);
+
+#define MLX5_PF_VPORT_ID 0
+#define MLX5_ECPF_VPORT_ID 0xFFFE
+
 #endif /* RTE_PMD_MLX5_FLOW_H_ */
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index b6f552bc62..1ceb6a0cd7 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -100,4 +100,5 @@ flow_dv_get_esw_manager_vport_id(struct rte_eth_dev *dev)
 	struct mlx5_common_device *cdev = priv->sh->cdev;
 
+	/* New FW exposes E-Switch Manager vport ID, can use it directly. */
 	if (cdev->config.hca_attr.esw_mgr_vport_id_valid)
 		return (int16_t)cdev->config.hca_attr.esw_mgr_vport_id;
@@ -109,7 +110,12 @@ flow_dv_get_esw_manager_vport_id(struct rte_eth_dev *dev)
 	case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF:
 	case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF:
-		return (int16_t)0xfffe;
+	/*
+	 * In old FW which doesn't expose the E-Switch Manager vport ID in the capability,
+	 * only the BF embedded CPUs control the E-Switch Manager port. Hence,
+	 * ECPF vport ID is selected and not the host port (0) in any BF case.
+	 */
+		return (int16_t)MLX5_ECPF_VPORT_ID;
 	default:
-		return 0;
+		return MLX5_PF_VPORT_ID;
 	}
 }
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-24 16:54:05.871645776 +0100
+++ 0011-net-mlx5-add-limitation-for-E-Switch-Manager-match.patch	2022-06-24 16:54:05.571165130 +0100
@@ -1 +1 @@
-From 68e9925c30a1a311a945ea72f23a08ce3deebdce Mon Sep 17 00:00:00 2001
+From aa8fb4afda77b0e0161f296a3f511cc0c8b5835e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 68e9925c30a1a311a945ea72f23a08ce3deebdce ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 4cd693ab4a..915467d58a 100644
+index b3f1673b55..7a616784eb 100644
@@ -27 +28 @@
-@@ -359,4 +359,10 @@ Limitations
+@@ -361,4 +361,10 @@ Limitations
@@ -39 +40 @@
-index f00c033fc5..7300390070 100644
+index 64335b8670..3e34b1c08a 100644
@@ -42,3 +43,3 @@
-@@ -2077,3 +2077,7 @@ size_t flow_dv_get_item_hdr_len(const enum rte_flow_item_type item_type);
- int flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
- 			   size_t *size, struct rte_flow_error *error);
+@@ -1767,3 +1767,7 @@ mlx5_get_tof(const struct rte_flow_item *items,
+ 	     const struct rte_flow_action *actions,
+ 	     enum mlx5_tof_rule_type *rule_type);
@@ -51 +52 @@
-index 65b02b20ce..09f662bdcf 100644
+index b6f552bc62..1ceb6a0cd7 100644