[dpdk-stable] patch 'net/ice: fix deadlock on flow redirect' 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/b68aeb48104a830f2d0d9e3bd14e16f56b3d2de1

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From b68aeb48104a830f2d0d9e3bd14e16f56b3d2de1 Mon Sep 17 00:00:00 2001
From: Dapeng Yu <dapengx.yu at intel.com>
Date: Mon, 11 Oct 2021 15:38:49 +0800
Subject: [PATCH] net/ice: fix deadlock on flow redirect
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit cc2f82b96a64789cc72beeb775a3a3543b5f2064 ]

If flow redirect failed, the spinlock will not be unlocked.
This patch fixes it.

Fixes: bc9201388d56 ("net/ice: support flow redirect")

Signed-off-by: Dapeng Yu <dapengx.yu at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_generic_flow.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 15667c7252..ca401c7703 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -2380,7 +2380,7 @@ ice_flow_redirect(struct ice_adapter *ad,
 	struct ice_pf *pf = &ad->pf;
 	struct rte_flow *p_flow;
 	void *temp;
-	int ret;
+	int ret = 0;
 
 	rte_spinlock_lock(&pf->flow_ops_lock);
 
@@ -2390,11 +2390,11 @@ ice_flow_redirect(struct ice_adapter *ad,
 		ret = p_flow->engine->redirect(ad, p_flow, rd);
 		if (ret) {
 			PMD_DRV_LOG(ERR, "Failed to redirect flows");
-			return ret;
+			break;
 		}
 	}
 
 	rte_spinlock_unlock(&pf->flow_ops_lock);
 
-	return 0;
+	return ret;
 }
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:08.889477538 +0800
+++ 0156-net-ice-fix-deadlock-on-flow-redirect.patch	2021-11-10 14:17:01.964078660 +0800
@@ -1 +1 @@
-From cc2f82b96a64789cc72beeb775a3a3543b5f2064 Mon Sep 17 00:00:00 2001
+From b68aeb48104a830f2d0d9e3bd14e16f56b3d2de1 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit cc2f82b96a64789cc72beeb775a3a3543b5f2064 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 3e6ed7005b..02f854666a 100644
+index 15667c7252..ca401c7703 100644
@@ -22 +24 @@
-@@ -2542,7 +2542,7 @@ ice_flow_redirect(struct ice_adapter *ad,
+@@ -2380,7 +2380,7 @@ ice_flow_redirect(struct ice_adapter *ad,
@@ -31 +33 @@
-@@ -2552,11 +2552,11 @@ ice_flow_redirect(struct ice_adapter *ad,
+@@ -2390,11 +2390,11 @@ ice_flow_redirect(struct ice_adapter *ad,