[dpdk-stable] patch 'net/ice: fix memzone leak after device init failure' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/34a2e17afc46a0ac011f42293f61514430b247be

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 34a2e17afc46a0ac011f42293f61514430b247be Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang at intel.com>
Date: Fri, 13 Aug 2021 14:21:54 +0800
Subject: [PATCH] net/ice: fix memzone leak after device init failure
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 96b25c496aadae16c548ea25c0267a73154dbd64 ]

When flow engine initialization or FXP resource reset failed, it needs
to free the memory zone and unregister the interrupt callback.

Bugzilla ID: 752
Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling")
Fixes: 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")

Reported-by: David Marchand <david.marchand at redhat.com>
Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_ethdev.c      | 10 ++++++++--
 drivers/net/ice/ice_fdir_filter.c |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index c153c7ca78..02644deeed 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2258,20 +2258,26 @@ ice_dev_init(struct rte_eth_dev *dev)
 		ret = ice_flow_init(ad);
 		if (ret) {
 			PMD_INIT_LOG(ERR, "Failed to initialize flow");
-			return ret;
+			goto err_flow_init;
 		}
 	}
 
 	ret = ice_reset_fxp_resource(hw);
 	if (ret) {
 		PMD_INIT_LOG(ERR, "Failed to reset fxp resource");
-		return ret;
+		goto err_flow_init;
 	}
 
 	pf->supported_rxdid = ice_get_supported_rxdid(hw);
 
 	return 0;
 
+err_flow_init:
+	ice_flow_uninit(ad);
+	rte_intr_disable(intr_handle);
+	ice_pf_disable_irq0(hw);
+	rte_intr_callback_unregister(intr_handle,
+				     ice_interrupt_handler, dev);
 err_pf_setup:
 	ice_res_pool_destroy(&pf->msix_pool);
 err_msix_pool_init:
diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index 4a071254ce..bb720d1036 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -659,8 +659,10 @@ ice_fdir_teardown(struct ice_pf *pf)
 
 	ice_tx_queue_release(pf->fdir.txq);
 	pf->fdir.txq = NULL;
+	rte_eth_dma_zone_free(eth_dev, "fdir_tx_ring", ICE_FDIR_QUEUE_ID);
 	ice_rx_queue_release(pf->fdir.rxq);
 	pf->fdir.rxq = NULL;
+	rte_eth_dma_zone_free(eth_dev, "fdir_rx_ring", ICE_FDIR_QUEUE_ID);
 	ice_fdir_prof_rm_all(pf);
 	ice_fdir_prof_free(hw);
 	ice_release_vsi(vsi);
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:03.056563545 +0800
+++ 0021-net-ice-fix-memzone-leak-after-device-init-failure.patch	2021-11-10 14:17:01.760746991 +0800
@@ -1 +1 @@
-From 96b25c496aadae16c548ea25c0267a73154dbd64 Mon Sep 17 00:00:00 2001
+From 34a2e17afc46a0ac011f42293f61514430b247be Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 96b25c496aadae16c548ea25c0267a73154dbd64 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index a4cd39c954..0683296584 100644
+index c153c7ca78..02644deeed 100644
@@ -27 +29 @@
-@@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev)
+@@ -2258,20 +2258,26 @@ ice_dev_init(struct rte_eth_dev *dev)
@@ -57 +59 @@
-index 82adb1fc8b..7ba65b9b04 100644
+index 4a071254ce..bb720d1036 100644
@@ -60 +62 @@
-@@ -651,8 +651,10 @@ ice_fdir_teardown(struct ice_pf *pf)
+@@ -659,8 +659,10 @@ ice_fdir_teardown(struct ice_pf *pf)