[dpdk-stable] patch 'net/mlx5: fix zero metadata action' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/21/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 75457cff3fc1dd00e29f44c37ef3d24a8fc149b3 Mon Sep 17 00:00:00 2001
From: Wisam Jaddo <wisamm at mellanox.com>
Date: Thu, 12 Mar 2020 11:24:40 +0200
Subject: [PATCH] net/mlx5: fix zero metadata action

[ upstream commit 85e26044cb8da437428dcf3a0755ceb1cdd38426 ]

There is no reason to prevent the user from using zero metadata,
it indeed means no metadata, but sometimes the user may need to
report to datapath that there is no metadata anymore, which is
valid case.

Fixes: fcc8d2f716fd ("net/mlx5: extend flow metadata support")

Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 69b17f104e..868d01438d 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1978,10 +1978,6 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev,
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION, action,
 					  "meta data must be within reg C0");
-	if (!(conf->data & conf->mask))
-		return rte_flow_error_set(error, EINVAL,
-					  RTE_FLOW_ERROR_TYPE_ACTION, action,
-					  "zero value has no effect");
 	return 0;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:20.631901907 +0100
+++ 0044-net-mlx5-fix-zero-metadata-action.patch	2020-05-19 13:56:18.259502539 +0100
@@ -1,15 +1,16 @@
-From 85e26044cb8da437428dcf3a0755ceb1cdd38426 Mon Sep 17 00:00:00 2001
+From 75457cff3fc1dd00e29f44c37ef3d24a8fc149b3 Mon Sep 17 00:00:00 2001
 From: Wisam Jaddo <wisamm at mellanox.com>
 Date: Thu, 12 Mar 2020 11:24:40 +0200
 Subject: [PATCH] net/mlx5: fix zero metadata action
 
+[ upstream commit 85e26044cb8da437428dcf3a0755ceb1cdd38426 ]
+
 There is no reason to prevent the user from using zero metadata,
 it indeed means no metadata, but sometimes the user may need to
 report to datapath that there is no metadata anymore, which is
 valid case.
 
 Fixes: fcc8d2f716fd ("net/mlx5: extend flow metadata support")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -18,10 +19,10 @@
  1 file changed, 4 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index e7278f0b3f..e2d6690fa8 100644
+index 69b17f104e..868d01438d 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -2109,10 +2109,6 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev,
+@@ -1978,10 +1978,6 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev,
  		return rte_flow_error_set(error, EINVAL,
  					  RTE_FLOW_ERROR_TYPE_ACTION, action,
  					  "meta data must be within reg C0");