[dpdk-stable] patch 'net/sfc: free MAE lock once switch domain is assigned' 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/af0aaab086f605cee539c67ff80cea9785d2f850

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From af0aaab086f605cee539c67ff80cea9785d2f850 Mon Sep 17 00:00:00 2001
From: Viacheslav Galaktionov <viacheslav.galaktionov at oktetlabs.ru>
Date: Mon, 11 Oct 2021 17:48:46 +0300
Subject: [PATCH] net/sfc: free MAE lock once switch domain is assigned
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit c7e64eea525241a383dc66c467358a9c91c5ed4a ]

If for some reason the hardware switch ID initialization function fails,
MAE lock is still held after the function finishes. This patch fixes that.

Fixes: 1e7fbdf0ba19 ("net/sfc: support concept of switch domains/ports")

Signed-off-by: Viacheslav Galaktionov <viacheslav.galaktionov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Reviewed-by: Andy Moreton <amoreton at xilinx.com>
---
 drivers/net/sfc/sfc_switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/sfc/sfc_switch.c b/drivers/net/sfc/sfc_switch.c
index bdea2a2446..4aa9ab3060 100644
--- a/drivers/net/sfc/sfc_switch.c
+++ b/drivers/net/sfc/sfc_switch.c
@@ -214,9 +214,9 @@ fail_domain_alloc:
 
 fail_mem_alloc:
 	sfc_hw_switch_id_fini(sa, hw_switch_id);
-	rte_spinlock_unlock(&sfc_mae_switch.lock);
 
 fail_hw_switch_id_init:
+	rte_spinlock_unlock(&sfc_mae_switch.lock);
 	return rc;
 }
 
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:08.070479983 +0800
+++ 0138-net-sfc-free-MAE-lock-once-switch-domain-is-assigned.patch	2021-11-10 14:17:01.900745845 +0800
@@ -1 +1 @@
-From c7e64eea525241a383dc66c467358a9c91c5ed4a Mon Sep 17 00:00:00 2001
+From af0aaab086f605cee539c67ff80cea9785d2f850 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c7e64eea525241a383dc66c467358a9c91c5ed4a ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index c37cdf4a61..80c884a599 100644
+index bdea2a2446..4aa9ab3060 100644