[dpdk-stable] patch 'regex/mlx5: fix redundancy in device removal' has been queued to stable release 20.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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 07/28/21. 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.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/da1a6d5e462d783ca6aaf53ac9b58945d00ea485

Thanks.

Luca Boccassi

---
>From da1a6d5e462d783ca6aaf53ac9b58945d00ea485 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Mon, 12 Jul 2021 10:06:44 +0300
Subject: [PATCH] regex/mlx5: fix redundancy in device removal

[ upstream commit 34c84ebbbcc8fc71901e17899f1bf1b1ba815084 ]

In the removal function, PMD releases all driver resources and
cancels the regexdev registry.

However, regexdev registration is accidentally canceled twice.
Remove one of them.

Fixes: b34d816363b5 ("regex/mlx5: support rules import")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
---
 drivers/regex/mlx5/mlx5_regex.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index 34827fa133..9ec9346a62 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -248,8 +248,6 @@ mlx5_regex_pci_remove(struct rte_pci_device *pci_dev)
 			rte_regexdev_unregister(priv->regexdev);
 		if (priv->ctx)
 			mlx5_glue->close_device(priv->ctx);
-		if (priv->regexdev)
-			rte_regexdev_unregister(priv->regexdev);
 		rte_free(priv);
 	}
 	return 0;
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-26 13:53:17.337867426 +0100
+++ 0029-regex-mlx5-fix-redundancy-in-device-removal.patch	2021-07-26 13:53:15.857292791 +0100
@@ -1 +1 @@
-From 34c84ebbbcc8fc71901e17899f1bf1b1ba815084 Mon Sep 17 00:00:00 2001
+From da1a6d5e462d783ca6aaf53ac9b58945d00ea485 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 34c84ebbbcc8fc71901e17899f1bf1b1ba815084 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 279b89acc9..f17b6df47f 100644
+index 34827fa133..9ec9346a62 100644
@@ -25 +26 @@
-@@ -282,8 +282,6 @@ mlx5_regex_dev_remove(struct rte_device *rte_dev)
+@@ -248,8 +248,6 @@ mlx5_regex_pci_remove(struct rte_pci_device *pci_dev)