[dpdk-stable] patch 'net/mlx5: fix flow META item validation' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. 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.

Thanks.

Luca Boccassi

---
>From 77e0f36bfed0efeec0bfcfc997b82af973d4ea8e Mon Sep 17 00:00:00 2001
From: Shy Shyman <shys at mellanox.com>
Date: Sun, 28 Jun 2020 12:36:31 +0300
Subject: [PATCH] net/mlx5: fix flow META item validation

[ upstream commit 5f3541724e0812e23532fa7e9e89254b3e0c87c6 ]

When flow is inserted with meta match item it requires a certain
register support.
As part of the flow validation of such flows, the validation
function is missing a check that the mlx5 driver is not in
legacy mode in terms of extended meta data support
(MLX5_XMETA_MODE_LEGACY flag).
If the driver is in legacy mode it will cause downstream
function that allocates needed register for meta data.

The fix checks explicitly the conditions for support of
meta data in FDB mode. If the conditions are not met
an error message will be issued.

Fixes: 9bf26e1318e3 ("ethdev: move egress metadata to dynamic field")

Signed-off-by: Shy Shyman <shys at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index d83e49f95..930e16026 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1395,6 +1395,13 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
 					  "isn't supported");
 		if (reg != REG_A)
 			nic_mask.data = priv->sh->dv_meta_mask;
+	} else if (attr->transfer) {
+		return rte_flow_error_set(error, ENOTSUP,
+					RTE_FLOW_ERROR_TYPE_ITEM, item,
+					"extended metadata feature "
+					"should be enabled when "
+					"meta item is requested "
+					"with e-switch mode ");
 	}
 	if (!mask)
 		mask = &rte_flow_item_meta_mask;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.046477102 +0100
+++ 0117-net-mlx5-fix-flow-META-item-validation.patch	2020-07-24 12:53:48.391008397 +0100
@@ -1,8 +1,10 @@
-From 5f3541724e0812e23532fa7e9e89254b3e0c87c6 Mon Sep 17 00:00:00 2001
+From 77e0f36bfed0efeec0bfcfc997b82af973d4ea8e Mon Sep 17 00:00:00 2001
 From: Shy Shyman <shys at mellanox.com>
 Date: Sun, 28 Jun 2020 12:36:31 +0300
 Subject: [PATCH] net/mlx5: fix flow META item validation
 
+[ upstream commit 5f3541724e0812e23532fa7e9e89254b3e0c87c6 ]
+
 When flow is inserted with meta match item it requires a certain
 register support.
 As part of the flow validation of such flows, the validation
@@ -17,7 +19,6 @@
 an error message will be issued.
 
 Fixes: 9bf26e1318e3 ("ethdev: move egress metadata to dynamic field")
-Cc: stable at dpdk.org
 
 Signed-off-by: Shy Shyman <shys at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -26,10 +27,10 @@
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index 0bd1c99e6..8b5b6838f 100644
+index d83e49f95..930e16026 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -1483,6 +1483,13 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
+@@ -1395,6 +1395,13 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
  					  "isn't supported");
  		if (reg != REG_A)
  			nic_mask.data = priv->sh->dv_meta_mask;