From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AEBCEA0093 for ; Thu, 28 May 2020 18:24:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 983A31D996; Thu, 28 May 2020 18:24:38 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id F3EB81D996 for ; Thu, 28 May 2020 18:24:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FEH2xMPX8XWok7QcM+Y27o1vwQDO0BQ7cGDf/Gnm42s=; b=dl8UIlPM4a2FnZrU/lN76DsxKFKTSV30oqjQTg5rG8Li1vwF28+99CmhFmZTL6xCT2DE6P 31HfjjiPBkVCgVhJLHNlYpBgBb4LPR4yY9xl5bD8A+maS9CtBLMedCU7ub3rXoNpWOFeCb chTYLxHMwC4jBAblRufW+nwJzpJdA1s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-Uj99Y2qkNFyb6WXKoFLVOA-1; Thu, 28 May 2020 12:24:31 -0400 X-MC-Unique: Uj99Y2qkNFyb6WXKoFLVOA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8587D10506E1; Thu, 28 May 2020 16:24:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0CF560C05; Thu, 28 May 2020 16:24:29 +0000 (UTC) From: Kevin Traynor To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Thu, 28 May 2020 17:21:59 +0100 Message-Id: <20200528162322.7863-12-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix initialization error path' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/3dc55d5fd25b239cf88a4396d58c430d627a7b4e Thanks. Kevin. --- >From 3dc55d5fd25b239cf88a4396d58c430d627a7b4e Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Thu, 5 Mar 2020 10:38:36 +0000 Subject: [PATCH] net/sfc: fix initialization error path [ upstream commit ba77f3e171733b49d7c991f03b97f0df6c85c4d1 ] NIC deinitialization should not happen after a failed NIC initialization. Fixes: 91831d4068c8 ("net/sfc: estimate available resources") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index d056d12164..48d95845d6 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -241,6 +241,6 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa) fail_get_vi_pool: -fail_nic_init: efx_nic_fini(sa->nic); +fail_nic_init: return rc; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:12:59.801447468 +0100 +++ 0012-net-sfc-fix-initialization-error-path.patch 2020-05-28 17:12:59.050557554 +0100 @@ -1 +1 @@ -From ba77f3e171733b49d7c991f03b97f0df6c85c4d1 Mon Sep 17 00:00:00 2001 +From 3dc55d5fd25b239cf88a4396d58c430d627a7b4e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ba77f3e171733b49d7c991f03b97f0df6c85c4d1 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index c6b514ac2f..3f5cd7758b 100644 +index d056d12164..48d95845d6 100644 @@ -22 +23 @@ -@@ -242,6 +242,6 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa) +@@ -241,6 +241,6 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)