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 CB552A09E4 for ; Thu, 4 Feb 2021 12:31:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C60C2240735; Thu, 4 Feb 2021 12:31:07 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 85FFB240722 for ; Thu, 4 Feb 2021 12:31:06 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cqo-00057h-Ai; Thu, 04 Feb 2021 11:31:06 +0000 From: Christian Ehrhardt To: Ajit Khaparde Cc: Lance Richardson , dpdk stable Date: Thu, 4 Feb 2021 12:27:57 +0100 Message-Id: <20210204112954.2488123-22-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix cleanup on mutex init failure' has been queued to stable release 19.11.7 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 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/69eb5f9ff4ce2ce11720368ecb4ce5da78389af8 Thanks. Christian Ehrhardt --- >From 69eb5f9ff4ce2ce11720368ecb4ce5da78389af8 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Tue, 1 Dec 2020 12:52:53 -0800 Subject: [PATCH] net/bnxt: fix cleanup on mutex init failure [ upstream commit 5bbf650b7105f867145664bfe1feeba06386a0d8 ] In case mutex init fails during initialization, start cleanup and fail the initialization process. Fixes: a73b8e939f10 ("net/bnxt: fix race between start and interrupt handler") Signed-off-by: Ajit Khaparde Acked-by: Lance Richardson --- drivers/net/bnxt/bnxt_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 8b50474e18..0279eeba8f 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4765,8 +4765,10 @@ bnxt_init_locks(struct bnxt *bp) } err = pthread_mutex_init(&bp->def_cp_lock, NULL); - if (err) + if (err) { PMD_DRV_LOG(ERR, "Unable to initialize def_cp_lock\n"); + return err; + } err = pthread_mutex_init(&bp->health_check_lock, NULL); if (err) -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:29.096333436 +0100 +++ 0022-net-bnxt-fix-cleanup-on-mutex-init-failure.patch 2021-02-04 12:04:27.882789586 +0100 @@ -1 +1 @@ -From 5bbf650b7105f867145664bfe1feeba06386a0d8 Mon Sep 17 00:00:00 2001 +From 69eb5f9ff4ce2ce11720368ecb4ce5da78389af8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5bbf650b7105f867145664bfe1feeba06386a0d8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 33358779bb..0b14ca2342 100644 +index 8b50474e18..0279eeba8f 100644 @@ -22 +23 @@ -@@ -4739,8 +4739,10 @@ bnxt_init_locks(struct bnxt *bp) +@@ -4765,8 +4765,10 @@ bnxt_init_locks(struct bnxt *bp)