[dpdk-stable] patch 'net/mlx5: fix assert in modify converting' 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 4fdea813e5d0447db8d6d8d6d0de081290355e78 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz at mellanox.com>
Date: Wed, 29 Apr 2020 21:06:14 +0800
Subject: [PATCH] net/mlx5: fix assert in modify converting

[ upstream commit c8fa92f6c16691664a3f8e080233aa3480907497 ]

The assertion was added incorrectly in converting the modify actions
into the format of low layer driver.
There is no mask specified in the rte_flow actions, and PMD driver
will give a mask of all 1s to the field to be modified. For each
field, the mask could not be zero. But for the whole header which
contains this field, the masks of other fields could be zero. The
assertion needs to be removed for debug mode.

Fixes: 72a944dba163 ("net/mlx5: fix header modify action validation")

Signed-off-by: Bing Zhao <bingz at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 8ed29adaaa..6cdaa00519 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -427,7 +427,6 @@ flow_dv_convert_modify_action(struct rte_flow_item *item,
 		/* Fetch variable byte size mask from the array. */
 		mask = flow_dv_fetch_field((const uint8_t *)item->mask +
 					   field->offset, field->size);
-		assert(mask);
 		if (!mask) {
 			++field;
 			continue;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.719611722 +0100
+++ 0154-net-mlx5-fix-assert-in-modify-converting.patch	2020-05-19 14:04:44.488653303 +0100
@@ -1,8 +1,10 @@
-From c8fa92f6c16691664a3f8e080233aa3480907497 Mon Sep 17 00:00:00 2001
+From 4fdea813e5d0447db8d6d8d6d0de081290355e78 Mon Sep 17 00:00:00 2001
 From: Bing Zhao <bingz at mellanox.com>
 Date: Wed, 29 Apr 2020 21:06:14 +0800
 Subject: [PATCH] net/mlx5: fix assert in modify converting
 
+[ upstream commit c8fa92f6c16691664a3f8e080233aa3480907497 ]
+
 The assertion was added incorrectly in converting the modify actions
 into the format of low layer driver.
 There is no mask specified in the rte_flow actions, and PMD driver
@@ -12,7 +14,6 @@
 assertion needs to be removed for debug mode.
 
 Fixes: 72a944dba163 ("net/mlx5: fix header modify action validation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bing Zhao <bingz at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -21,14 +22,14 @@
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index c8035b352e..794afcf18c 100644
+index 8ed29adaaa..6cdaa00519 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -435,7 +435,6 @@ flow_dv_convert_modify_action(struct rte_flow_item *item,
+@@ -427,7 +427,6 @@ flow_dv_convert_modify_action(struct rte_flow_item *item,
  		/* Fetch variable byte size mask from the array. */
  		mask = flow_dv_fetch_field((const uint8_t *)item->mask +
  					   field->offset, field->size);
--		MLX5_ASSERT(mask);
+-		assert(mask);
  		if (!mask) {
  			++field;
  			continue;