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 A89EDA0093 for ; Tue, 19 May 2020 14:59:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9F1BF1C1E4; Tue, 19 May 2020 14:59:17 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id B970E1C1E4 for ; Tue, 19 May 2020 14:59:14 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id j5so15853245wrq.2 for ; Tue, 19 May 2020 05:59:14 -0700 (PDT) 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=8nr3/+983mbHWarrbsAzb7koBZ78GYQQYBEzBeM4GyU=; b=Xbq/ONijuQ10v8OUs9+4bCNcn7pp8NQEsTxNpWID9UdwpqoSmti+s8/J4y4szUIMJN Jo3h9fX3WMIXMcOZxcYY73njE1uAku81tvQHb5+IqB2OrG5ntvvjAFmhhDSOK1iwohF0 aD0MiAN03yY05D7mOrETtgEzFu7pPKC1ue5zU+5nRqjcrtnnW5dMt01NmotX9yK7FINt 2pB/3e6Pkge2DzQxTgrchHHvEG5v4TqqZdm7wef6Wsdt3/jgpC0L+qRXjqjy0RmhQ1Fa GRF/Ol93bHlOTZIsmA21/PO3dRbELnRnSVOr2VWMv6SdtLanfDEERqvfLdtHPyNsq/ay E+kQ== 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=8nr3/+983mbHWarrbsAzb7koBZ78GYQQYBEzBeM4GyU=; b=WI1Nd94kRYlPkdsTjkbjtRehx5nDYHQ6DinJ8LRMxVJIjW9gKHmnEW4/0nZe95LKDN OkwIcZ9+WWe/Ob3iU0EhkqQnItCmTIICP+0kjgzwNRpZ0+7FQgUYiDCueBxCRds61MXy ZNo6nEGOwo7nX+HO9r9yporPhcPV9P04X36QvoqdqNTCbRW4awS9aI/UV86EXsVwObkn w+KfhFCX/8ABo1Ytwa+2mPSuZA2EoOoL8fM2c0iH6YFsWs7ij8D3XmBQx7by2a76PSvn Tk7IR50bVpUVy+rlJNH3Wd6VM4EPAo6N2+m+zZ/L30mZ2tVulFjYGyWfVlcHt4loTQuk KmpA== X-Gm-Message-State: AOAM530URvBKcHUMsVc8uaMHExzZrpfbk+ATI1pHNCnjkLTGxfgwvG6+ 1uIitYzIeHQJkfqKFSslOC4= X-Google-Smtp-Source: ABdhPJy1sjAOrnVNzq1ackbky8v38qWb3VBSdZ6N9wDs6WbPICMfnDedHjQ4033rduopimFQjmE3fQ== X-Received: by 2002:adf:8169:: with SMTP id 96mr25505347wrm.283.1589893154518; Tue, 19 May 2020 05:59:14 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i6sm20672956wrw.97.2020.05.19.05.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Tue, 19 May 2020 13:53:38 +0100 Message-Id: <20200519125804.104349-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix initialization error path' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From 251cb7e7223defd17d3c2b715f6ead96cdcc967d 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 c6b514ac2f..3f5cd7758b 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -241,8 +241,8 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa) return 0; fail_get_vi_pool: -fail_nic_init: efx_nic_fini(sa->nic); +fail_nic_init: return rc; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.956704230 +0100 +++ 0028-net-sfc-fix-initialization-error-path.patch 2020-05-19 13:56:18.215501747 +0100 @@ -1,13 +1,14 @@ -From ba77f3e171733b49d7c991f03b97f0df6c85c4d1 Mon Sep 17 00:00:00 2001 +From 251cb7e7223defd17d3c2b715f6ead96cdcc967d 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") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko