[dpdk-stable] patch 'net/mlx5: fix meter suffix flow' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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 b2ea9821e4f81333fab8b75e82bc818e3316fc95 Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at mellanox.com>
Date: Wed, 8 Jan 2020 12:41:09 +0200
Subject: [PATCH] net/mlx5: fix meter suffix flow

[ upstream commit 64927f72a72fad39898b084e0cf66cc97b40959f ]

The meter suffix flow item pointer restore is not correct to decrease
a fixed value. The incorrect operation will cause incorrect match to
the meter suffix flow, the flow create will fail once the magic number
in the wrong offset memory start with RTE_FLOW_ITEM_TYPE_END.
The pointer should decrease the real offset it increases.

Set the decrease value to the real offset the pointer increases to fix
the issue.

Fixes: 9ea9b049a960 ("net/mlx5: split meter flow")

Reported-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 008716367c..e4c661d7ca 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4025,7 +4025,7 @@ flow_create_split_meter(struct rte_eth_dev *dev,
 			sfx_items++;
 		}
 		sfx_items->type = RTE_FLOW_ITEM_TYPE_END;
-		sfx_items -= METER_SUFFIX_ITEM;
+		sfx_items -= sfx_port_id_item ? 2 : 1;
 		/* Setting the sfx group atrr. */
 		sfx_attr.group = sfx_attr.transfer ?
 				(MLX5_FLOW_TABLE_LEVEL_SUFFIX - 1) :
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:42.963048673 +0000
+++ 0121-net-mlx5-fix-meter-suffix-flow.patch	2020-02-11 11:17:38.604005161 +0000
@@ -1,8 +1,10 @@
-From 64927f72a72fad39898b084e0cf66cc97b40959f Mon Sep 17 00:00:00 2001
+From b2ea9821e4f81333fab8b75e82bc818e3316fc95 Mon Sep 17 00:00:00 2001
 From: Suanming Mou <suanmingm at mellanox.com>
 Date: Wed, 8 Jan 2020 12:41:09 +0200
 Subject: [PATCH] net/mlx5: fix meter suffix flow
 
+[ upstream commit 64927f72a72fad39898b084e0cf66cc97b40959f ]
+
 The meter suffix flow item pointer restore is not correct to decrease
 a fixed value. The incorrect operation will cause incorrect match to
 the meter suffix flow, the flow create will fail once the magic number
@@ -13,7 +15,6 @@
 the issue.
 
 Fixes: 9ea9b049a960 ("net/mlx5: split meter flow")
-Cc: stable at dpdk.org
 
 Reported-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
 Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
@@ -23,10 +24,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index bb1f1f16a1..970123bf11 100644
+index 008716367c..e4c661d7ca 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -4042,7 +4042,7 @@ flow_create_split_meter(struct rte_eth_dev *dev,
+@@ -4025,7 +4025,7 @@ flow_create_split_meter(struct rte_eth_dev *dev,
  			sfx_items++;
  		}
  		sfx_items->type = RTE_FLOW_ITEM_TYPE_END;