[dpdk-stable] patch 'net/mlx5: fix crash when releasing meter table' 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 da5c4ff51b3bd72c44096d4d1f24db301a966237 Mon Sep 17 00:00:00 2001
From: Tonghao Zhang <xiangxia.m.yue at gmail.com>
Date: Wed, 15 Apr 2020 16:52:29 +0800
Subject: [PATCH] net/mlx5: fix crash when releasing meter table

[ upstream commit 0d7d180a0dda4b97021fc1f580d6bfe3b42a332d ]

The meters of ports share the same meter table on
the port. When releasing meters, don't check value returned
using assert. Because other meters may reference to it.

Fixes: 46a5e6bc6a85 ("net/mlx5: prepare meter flow tables")
Fixes: 9dbaf7eef6e1 ("net/mlx5: fix meter suffix table leak")

Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 3574b94f4a..acc0fd3271 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -8144,11 +8144,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
 		claim_zero(mlx5_glue->dv_destroy_flow_matcher
 			  (mtd->egress.any_matcher));
 	if (mtd->egress.tbl)
-		claim_zero(flow_dv_tbl_resource_release(dev,
-							mtd->egress.tbl));
+		flow_dv_tbl_resource_release(dev, mtd->egress.tbl);
 	if (mtd->egress.sfx_tbl)
-		claim_zero(flow_dv_tbl_resource_release(dev,
-							mtd->egress.sfx_tbl));
+		flow_dv_tbl_resource_release(dev, mtd->egress.sfx_tbl);
 	if (mtd->ingress.color_matcher)
 		claim_zero(mlx5_glue->dv_destroy_flow_matcher
 			  (mtd->ingress.color_matcher));
@@ -8156,11 +8154,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
 		claim_zero(mlx5_glue->dv_destroy_flow_matcher
 			  (mtd->ingress.any_matcher));
 	if (mtd->ingress.tbl)
-		claim_zero(flow_dv_tbl_resource_release(dev,
-							mtd->ingress.tbl));
+		flow_dv_tbl_resource_release(dev, mtd->ingress.tbl);
 	if (mtd->ingress.sfx_tbl)
-		claim_zero(flow_dv_tbl_resource_release(dev,
-							mtd->ingress.sfx_tbl));
+		flow_dv_tbl_resource_release(dev, mtd->ingress.sfx_tbl);
 	if (mtd->transfer.color_matcher)
 		claim_zero(mlx5_glue->dv_destroy_flow_matcher
 			  (mtd->transfer.color_matcher));
@@ -8168,11 +8164,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
 		claim_zero(mlx5_glue->dv_destroy_flow_matcher
 			  (mtd->transfer.any_matcher));
 	if (mtd->transfer.tbl)
-		claim_zero(flow_dv_tbl_resource_release(dev,
-							mtd->transfer.tbl));
+		flow_dv_tbl_resource_release(dev, mtd->transfer.tbl);
 	if (mtd->transfer.sfx_tbl)
-		claim_zero(flow_dv_tbl_resource_release(dev,
-							mtd->transfer.sfx_tbl));
+		flow_dv_tbl_resource_release(dev, mtd->transfer.sfx_tbl);
 	if (mtd->drop_actn)
 		claim_zero(mlx5_glue->destroy_flow_action(mtd->drop_actn));
 	rte_free(mtd);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:48.727023141 +0100
+++ 0105-net-mlx5-fix-crash-when-releasing-meter-table.patch	2020-05-19 14:04:44.328650403 +0100
@@ -1,15 +1,16 @@
-From 0d7d180a0dda4b97021fc1f580d6bfe3b42a332d Mon Sep 17 00:00:00 2001
+From da5c4ff51b3bd72c44096d4d1f24db301a966237 Mon Sep 17 00:00:00 2001
 From: Tonghao Zhang <xiangxia.m.yue at gmail.com>
 Date: Wed, 15 Apr 2020 16:52:29 +0800
 Subject: [PATCH] net/mlx5: fix crash when releasing meter table
 
+[ upstream commit 0d7d180a0dda4b97021fc1f580d6bfe3b42a332d ]
+
 The meters of ports share the same meter table on
 the port. When releasing meters, don't check value returned
 using assert. Because other meters may reference to it.
 
 Fixes: 46a5e6bc6a85 ("net/mlx5: prepare meter flow tables")
 Fixes: 9dbaf7eef6e1 ("net/mlx5: fix meter suffix table leak")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -18,10 +19,10 @@
  1 file changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index e156c79e01..c6d132c6b7 100644
+index 3574b94f4a..acc0fd3271 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -8699,11 +8699,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
+@@ -8144,11 +8144,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
  		claim_zero(mlx5_glue->dv_destroy_flow_matcher
  			  (mtd->egress.any_matcher));
  	if (mtd->egress.tbl)
@@ -35,7 +36,7 @@
  	if (mtd->ingress.color_matcher)
  		claim_zero(mlx5_glue->dv_destroy_flow_matcher
  			  (mtd->ingress.color_matcher));
-@@ -8711,11 +8709,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
+@@ -8156,11 +8154,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
  		claim_zero(mlx5_glue->dv_destroy_flow_matcher
  			  (mtd->ingress.any_matcher));
  	if (mtd->ingress.tbl)
@@ -49,7 +50,7 @@
  	if (mtd->transfer.color_matcher)
  		claim_zero(mlx5_glue->dv_destroy_flow_matcher
  			  (mtd->transfer.color_matcher));
-@@ -8723,11 +8719,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
+@@ -8168,11 +8164,9 @@ flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
  		claim_zero(mlx5_glue->dv_destroy_flow_matcher
  			  (mtd->transfer.any_matcher));
  	if (mtd->transfer.tbl)