[dpdk-stable] patch 'net/bnxt: release HWRM lock in error' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/9481fba8fd2ab438d8e2a7a5d1f1240b3b7bc77e

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 9481fba8fd2ab438d8e2a7a5d1f1240b3b7bc77e Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Tue, 17 Nov 2020 12:40:24 +0530
Subject: [PATCH] net/bnxt: release HWRM lock in error

[ upstream commit ec0a96819d35070276f350c2488203e7ab72aed4 ]

In __bnxt_hwrm_func_qcaps, when memory allocations fails
driver is not releasing the hwrm lock. This patch fixes it
by calling hwrm_unlock in that error case.

Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index d87605f7d7..b2665089a6 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -634,6 +634,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
 			    sizeof(bp->pf.vf_info[0]) * new_max_vfs, 0);
 			if (bp->pf.vf_info == NULL) {
 				PMD_DRV_LOG(ERR, "Alloc vf info fail\n");
+				HWRM_UNLOCK();
 				return -ENOMEM;
 			}
 			bp->pf.max_vfs = new_max_vfs;
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:29.023300039 +0100
+++ 0020-net-bnxt-release-HWRM-lock-in-error.patch	2021-02-04 12:04:27.874789577 +0100
@@ -1 +1 @@
-From ec0a96819d35070276f350c2488203e7ab72aed4 Mon Sep 17 00:00:00 2001
+From 9481fba8fd2ab438d8e2a7a5d1f1240b3b7bc77e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ec0a96819d35070276f350c2488203e7ab72aed4 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index ebbf504c0c..784e9778a3 100644
+index d87605f7d7..b2665089a6 100644
@@ -24,3 +25,3 @@
-@@ -718,6 +718,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
- 			    sizeof(bp->pf->vf_info[0]) * new_max_vfs, 0);
- 			if (bp->pf->vf_info == NULL) {
+@@ -634,6 +634,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
+ 			    sizeof(bp->pf.vf_info[0]) * new_max_vfs, 0);
+ 			if (bp->pf.vf_info == NULL) {
@@ -31 +32 @@
- 			bp->pf->max_vfs = new_max_vfs;
+ 			bp->pf.max_vfs = new_max_vfs;