patch 'net/mlx5: fix ineffective metadata argument adjustment' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

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/02/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/8d5484e7a11050d616ab5c7dee541d03a1d0fbfa

Thanks.

Luca Boccassi

---
>From 8d5484e7a11050d616ab5c7dee541d03a1d0fbfa Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Mon, 14 Feb 2022 11:34:53 +0200
Subject: [PATCH] net/mlx5: fix ineffective metadata argument adjustment

[ upstream commit ad9d0c6395abf9793f328f571338fbe6a61f5ebe ]

In "dv_xmeta_en" devarg there is an option of dv_xmeta_en=3 which
engages tunnel offload mode. In E-Switch configuration, that mode
implicitly activates dv_xmeta_en=1.

The update according to E-switch support is done immediately after the
first parsing of the devargs, but there is another adjustment later.

This patch moves the adjustment after the second parsing.

Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/linux/mlx5_os.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 602dc671ef..9d5cef9e09 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -868,10 +868,6 @@ err_secondary:
 			strerror(rte_errno));
 		goto error;
 	}
-	if (config->dv_miss_info) {
-		if (switch_info->master || switch_info->representor)
-			config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
-	}
 	mlx5_malloc_mem_select(config->sys_mem_en);
 	sh = mlx5_alloc_shared_dev_ctx(spawn, config);
 	if (!sh)
@@ -1111,6 +1107,10 @@ err_secondary:
 	}
 	/* Override some values set by hardware configuration. */
 	mlx5_args(config, dpdk_dev->devargs);
+	if (config->dv_miss_info) {
+		if (switch_info->master || switch_info->representor)
+			config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
+	}
 	err = mlx5_dev_check_sibling_config(priv, config);
 	if (err)
 		goto error;
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-28 21:17:56.460262306 +0000
+++ 0031-net-mlx5-fix-ineffective-metadata-argument-adjustmen.patch	2022-02-28 21:17:53.952931686 +0000
@@ -1 +1 @@
-From ad9d0c6395abf9793f328f571338fbe6a61f5ebe Mon Sep 17 00:00:00 2001
+From 8d5484e7a11050d616ab5c7dee541d03a1d0fbfa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ad9d0c6395abf9793f328f571338fbe6a61f5ebe ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index e157795b63..69d3e1e3ad 100644
+index 602dc671ef..9d5cef9e09 100644
@@ -28 +29 @@
-@@ -977,10 +977,6 @@ err_secondary:
+@@ -868,10 +868,6 @@ err_secondary:
@@ -35,0 +37 @@
+ 	mlx5_malloc_mem_select(config->sys_mem_en);
@@ -38,2 +40,2 @@
- 		return NULL;
-@@ -1242,6 +1238,10 @@ err_secondary:
+@@ -1111,6 +1107,10 @@ err_secondary:
+ 	}
@@ -42 +43,0 @@
- 	/* Update final values for devargs before check sibling config. */
@@ -47,3 +48,3 @@
- #if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
- 	if (config->dv_flow_en) {
- 		DRV_LOG(WARNING, "DV flow is not supported.");
+ 	err = mlx5_dev_check_sibling_config(priv, config);
+ 	if (err)
+ 		goto error;