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 BB45FA0613 for ; Wed, 28 Aug 2019 15:43:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AEB131C21E; Wed, 28 Aug 2019 15:43:43 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0A22A1C234 for ; Wed, 28 Aug 2019 15:43:42 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7AEEE18C890B; Wed, 28 Aug 2019 13:43:41 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D2CC194B2; Wed, 28 Aug 2019 13:43:40 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Somnath Kotur , dpdk stable Date: Wed, 28 Aug 2019 14:42:17 +0100 Message-Id: <20190828134234.20547-41-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Wed, 28 Aug 2019 13:43:41 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix device init error path' has been queued to LTS release 18.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 LTS release 18.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 09/04/19. 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/65bfa7430b52074ec8abea5e957ead68f48291cd Thanks. Kevin Traynor --- >From 65bfa7430b52074ec8abea5e957ead68f48291cd Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 18 Jul 2019 09:06:00 +0530 Subject: [PATCH] net/bnxt: fix device init error path [ upstream commit 7d2d64c76cb5b0ebacbb989cb8055d3ce2e4c3a1 ] 1. bnxt_dev_init() invokes bnxt_dev_uninit() on failure. So there is no need to do individual function cleanups in failure path. 2. rearrange the check for primary process to remove an unwanted goto. 3. fix to invoke bnxt_hwrm_func_buf_unrgtr() in bnxt_dev_uninit() when it is needed. Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 28 ++++++++++++++-------------- drivers/net/bnxt/bnxt_hwrm.c | 3 +++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 286f7cb8b..15f2bdcf4 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3282,6 +3282,14 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) bp->dev_stopped = 1; + eth_dev->dev_ops = &bnxt_dev_ops; + eth_dev->rx_pkt_burst = &bnxt_recv_pkts; + eth_dev->tx_pkt_burst = &bnxt_xmit_pkts; + + /* + * For secondary processes, we don't initialise any further + * as primary has already done this work. + */ if (rte_eal_process_type() != RTE_PROC_PRIMARY) - goto skip_init; + return 0; if (bnxt_vf_pciid(pci_dev->id.device_id)) @@ -3294,10 +3302,4 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) goto error; } -skip_init: - eth_dev->dev_ops = &bnxt_dev_ops; - eth_dev->rx_pkt_burst = &bnxt_recv_pkts; - eth_dev->tx_pkt_burst = &bnxt_xmit_pkts; - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; if (pci_dev->id.device_id != BROADCOM_DEV_ID_NS2) { @@ -3548,9 +3550,9 @@ skip_ext_stats: rc = bnxt_alloc_mem(bp); if (rc) - goto error_free_int; + goto error_free; rc = bnxt_request_int(bp); if (rc) - goto error_free_int; + goto error_free; bnxt_init_nic(bp); @@ -3558,9 +3560,4 @@ skip_ext_stats: return 0; -error_free_int: - bnxt_disable_int(bp); - bnxt_hwrm_func_buf_unrgtr(bp); - bnxt_free_int(bp); - bnxt_free_mem(bp); error_free: bnxt_dev_uninit(eth_dev); @@ -3582,4 +3579,7 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev) bnxt_free_int(bp); bnxt_free_mem(bp); + + bnxt_hwrm_func_buf_unrgtr(bp); + if (bp->grp_info != NULL) { rte_free(bp->grp_info); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 79803b4d0..0713e86f9 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -2969,4 +2969,7 @@ int bnxt_hwrm_func_buf_unrgtr(struct bnxt *bp) struct hwrm_func_buf_unrgtr_output *resp = bp->hwrm_cmd_resp_addr; + if (!(BNXT_PF(bp) && bp->pdev->max_vfs)) + return 0; + HWRM_PREP(req, FUNC_BUF_UNRGTR, BNXT_USE_CHIMP_MB); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:34.267944257 +0100 +++ 0042-net-bnxt-fix-device-init-error-path.patch 2019-08-28 14:32:31.698956089 +0100 @@ -1 +1 @@ -From 7d2d64c76cb5b0ebacbb989cb8055d3ce2e4c3a1 Mon Sep 17 00:00:00 2001 +From 65bfa7430b52074ec8abea5e957ead68f48291cd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7d2d64c76cb5b0ebacbb989cb8055d3ce2e4c3a1 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 70d24494a..4d1c9adb9 100644 +index 286f7cb8b..15f2bdcf4 100644 @@ -26 +27 @@ -@@ -3854,6 +3854,14 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) +@@ -3282,6 +3282,14 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) @@ -42 +43 @@ -@@ -3872,10 +3880,4 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) +@@ -3294,10 +3302,4 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev) @@ -52,2 +53,2 @@ - rc = bnxt_alloc_hwrm_resources(bp); -@@ -4022,9 +4024,9 @@ skip_init: + if (pci_dev->id.device_id != BROADCOM_DEV_ID_NS2) { +@@ -3548,9 +3550,9 @@ skip_ext_stats: @@ -65 +66 @@ -@@ -4032,9 +4034,4 @@ skip_init: +@@ -3558,9 +3560,4 @@ skip_ext_stats: @@ -75 +76 @@ -@@ -4056,4 +4053,7 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev) +@@ -3582,4 +3579,7 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev) @@ -84 +85 @@ -index 9c5e5ad77..27c4f2d88 100644 +index 79803b4d0..0713e86f9 100644 @@ -87 +88 @@ -@@ -3200,4 +3200,7 @@ int bnxt_hwrm_func_buf_unrgtr(struct bnxt *bp) +@@ -2969,4 +2969,7 @@ int bnxt_hwrm_func_buf_unrgtr(struct bnxt *bp)