From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3AF59A0524 for ; Fri, 5 Feb 2021 12:21:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 32FFF4067B; Fri, 5 Feb 2021 12:21:45 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 400604067B for ; Fri, 5 Feb 2021 12:21:43 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id m13so7231731wro.12 for ; Fri, 05 Feb 2021 03:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k9jW/SWqjst/tSpqgDknWg/OoVLoHA3IVInD+zFqxuY=; b=q5cHbD0CHz7Rw4zJLL5gs5HlSmvgb8KLJ1SFCWxRQGcQVdyHVngHGbKo7Pq3FAyeey EkWicEzpmUdHUFzpyROO+p7fKnXfbKTAESQddfZIY9misaBZ9l2/Co6gqEK02us/ojdQ AiKqc1cgX7MKgL3DulZgsF1Md9w04TOvnmh6lslvNVEkR0PzwJe7ROb0kXMQVG2K16kx taODvCnSJg3dhmfRsQFJ1ioHE8taRtg6e1HcyWt4EpIPOjAewosuyoqgAyZuYefIKwEg ndPTcak8pEnBmjVWkmM7HZ7nBFvl52aEWmdb7LWXfjzAQ3/t0cqzbioet1I0X5iE4Qax acuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k9jW/SWqjst/tSpqgDknWg/OoVLoHA3IVInD+zFqxuY=; b=WMWxv1KEQ4KPx2jwWsvtw5btocep47fc1I5wbXn7FbiWYzW/jM/zFheftwNKpja9aH +61p7WvTHB6ixuRiyM8ii8VuJBYfZJLi+3Ni2+a9N8PMHkDXVqrZVyKGTulmplbCpFOp u7hl1mVT800dLEzgGFVwYbrZd5rmYGz+Q31pYHWfW07iRyXQ1gysv8CKUVTUUXQKEhI7 LcOIAxJrhk7vxThyWySXNQoCf5Pi8ylVDsnVFbka2jQQ4IZhQbe07KLWfNZkmS7C9bMB MKpgInkR/XMwaWPv8gTyvV4GuUJ/fPGDs8YyBVGQ+kFT4wJpzKSGl9NzHU8ttjHI2ZIQ 12gQ== X-Gm-Message-State: AOAM530oBbF1EFuU6pcNTjGu83+JY9x8fL2fvzObabIZ2Nl2xAHb5cUe GhPnk7iXYscdwTJGJ92OqMpEkokrFeBWdpRZ X-Google-Smtp-Source: ABdhPJwgI0+80bCdjNwNzDP8DTUtDXvl7YE1liXgetraYDsdIyTaJbopLWWZfdfTpePSq/rwFGvefg== X-Received: by 2002:a5d:40c5:: with SMTP id b5mr4542698wrq.121.1612524103006; Fri, 05 Feb 2021 03:21:43 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 143sm7400691wmb.47.2021.02.05.03.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:42 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Fri, 5 Feb 2021 11:15:27 +0000 Message-Id: <20210205111920.1272063-41-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: release HWRM lock in error' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 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/07/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/6b544c78a3819fa53ac52e97637567bd37ebf085 Thanks. Luca Boccassi --- >From 6b544c78a3819fa53ac52e97637567bd37ebf085 Mon Sep 17 00:00:00 2001 From: Kalesh AP 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 Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- 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 ebbf504c0c..784e9778a3 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -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) { PMD_DRV_LOG(ERR, "Alloc vf info fail\n"); + HWRM_UNLOCK(); return -ENOMEM; } bp->pf->max_vfs = new_max_vfs; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.131728512 +0000 +++ 0041-net-bnxt-release-HWRM-lock-in-error.patch 2021-02-05 11:18:28.706689208 +0000 @@ -1 +1 @@ -From ec0a96819d35070276f350c2488203e7ab72aed4 Mon Sep 17 00:00:00 2001 +From 6b544c78a3819fa53ac52e97637567bd37ebf085 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ec0a96819d35070276f350c2488203e7ab72aed4 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org