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 AB26DA0524 for ; Fri, 5 Feb 2021 12:21:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A1E71606C6; Fri, 5 Feb 2021 12:21:46 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id D60621606C6 for ; Fri, 5 Feb 2021 12:21:45 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id m1so5622053wml.2 for ; Fri, 05 Feb 2021 03:21:45 -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=xlYU1iQ3CckHeU8lhYFss++V9mM9jU5QbOirhm0t7DY=; b=Z0TFMx1Rxv+7rwD0kJVi676Sc74cPzUF/zURVCIHl3lJnNqeKyWEC1BSNEx99fYFhI mK+LJPjSMuglk0E7DGqptCbf7ZTne18qdXiYbStC3/f3yhY1mQBORKoqLxCcoOXikN+A uSa3DaHe4vrVhKRlbNSyN7pxoeKXiffHpCS5nA1ihR7cns+DgqSD1jYskZRla9sl4Ed0 HuZXh1IJt8yGUdhyVnjySiE1ePbbQUeT50Jrx0+v0cFKsHTsxt56z2SbouUwtyas/JCb RI0aPT773eAAwHPJVBZtfFHnKGHVtIrQ9WAw38eAO7B+qfh2Q0lSNiTdZLL7k5adR9VS qlmw== 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=xlYU1iQ3CckHeU8lhYFss++V9mM9jU5QbOirhm0t7DY=; b=elSldzfijEew2C2Z0Lu4ig6u5QaonOmxTaYJ/uMy7fx1lla/pCcSrjpNApzhxcGJ4s nF9BtytPiWnRzknL/Z6QrMOpF+1/vnFYVto4wD5D8BMG1kAwAR+o7elVavLLNWjIkmsL R79cwRvZfc+ItSBz2Uxth61uKXZr7Jo/6IaqZOnJ7IQ0m7uhwE36kN3/IkDzYW1gvYBK 68XKis7OBYciR3bfyH2pKK2jBItRExhqDoSsw8DmquSTxhOGDxbwq8e4IhsNd+5j4Chj NqgCBvSLyeMKZkDrgMauf1Tt5Pm5XZWtMTLSeqaLDug4vU6PiVhXIOOQH/DC0QhW625x iOxw== X-Gm-Message-State: AOAM530+j55CgOprqiTRyboMIV1S4ldXVIm86/W0NDZ79yHjBypGIkiU Vs+fMTNn7tR5YxBYVmknlMCZb2Gu/l0iZ2me X-Google-Smtp-Source: ABdhPJxEBOUQG0/XfksIccLzPTbkfUXhbN6+ilV7MhIshz8PjUK8mFksR15fTh7ZwQfBmuPNpZ6z1g== X-Received: by 2002:a05:600c:2351:: with SMTP id 17mr3214631wmq.2.1612524105674; Fri, 05 Feb 2021 03:21:45 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d9sm12310442wrq.74.2021.02.05.03.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:45 -0800 (PST) From: luca.boccassi@gmail.com To: Ajit Khaparde Cc: Lance Richardson , dpdk stable Date: Fri, 5 Feb 2021 11:15:29 +0000 Message-Id: <20210205111920.1272063-43-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: fix cleanup on mutex init failure' 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/919498cea112f93b47bbd3e4a022b23b60fd0a7d Thanks. Luca Boccassi --- >From 919498cea112f93b47bbd3e4a022b23b60fd0a7d 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 c62320a4b1..1719995871 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4738,8 +4738,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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.219107902 +0000 +++ 0043-net-bnxt-fix-cleanup-on-mutex-init-failure.patch 2021-02-05 11:18:28.718689436 +0000 @@ -1 +1 @@ -From 5bbf650b7105f867145664bfe1feeba06386a0d8 Mon Sep 17 00:00:00 2001 +From 919498cea112f93b47bbd3e4a022b23b60fd0a7d 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 c62320a4b1..1719995871 100644 @@ -22 +23 @@ -@@ -4739,8 +4739,10 @@ bnxt_init_locks(struct bnxt *bp) +@@ -4738,8 +4738,10 @@ bnxt_init_locks(struct bnxt *bp)