From patchwork Sat Oct 30 03:50:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalesh A P X-Patchwork-Id: 103263 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2EA0FA0C4E; Sat, 30 Oct 2021 05:30:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D2A5B40DF8; Sat, 30 Oct 2021 05:30:27 +0200 (CEST) Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.231]) by mails.dpdk.org (Postfix) with ESMTP id A7A8B40DDB for ; Sat, 30 Oct 2021 05:30:26 +0200 (CEST) Received: from dhcp-10-123-153-22.dhcp.broadcom.net (bgccx-dev-host-lnx2.bec.broadcom.net [10.123.153.22]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 945C5F0; Fri, 29 Oct 2021 20:30:24 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 945C5F0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1635564625; bh=SJSVPSEgrXQn2iQi/ng8bl/YkO6si6AsAWX6yx3faL8=; h=From:To:Cc:Subject:Date:From; b=iKlPhrkTNsPCJgf8BQcXjwEFE33lgBnhLDb3OVztjgPgnalaBZ18yEaSUS9xdZGgj 0/edOKILAa7DgyD9/K7r7EAlFCbsFsYJazXhILarewDKP9/670Evm2NrjXA5qkbk7+ vqOdtUHjFFwZmm/oysthr7zyZwiwDq9fkHbRVLXg= From: Kalesh A P To: dev@dpdk.org Cc: ferruh.yigit@intel.com, ajit.khaparde@broadcom.com Date: Sat, 30 Oct 2021 09:20:19 +0530 Message-Id: <20211030035020.31813-1-kalesh-anakkur.purayil@broadcom.com> X-Mailer: git-send-email 2.10.1 Subject: [dpdk-dev] [PATCH 1/2] net/bnxt: fix freeing aggregation rings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Kalesh AP During port stop, we clear "eth_dev->data->scattered_rx" at the beginning. As a result, in bnxt_free_hwrm_rx_ring() the check bnxt_need_agg_ring() returns false and we end up not freeing the Rx aggregation rings which results in resource leak in the FW. Fixes: 657c2a7f1dd4 ("net/bnxt: create aggregation rings when needed") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 668e3aa..91f114e 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1476,7 +1476,6 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev) int ret; eth_dev->data->dev_started = 0; - eth_dev->data->scattered_rx = 0; /* Prevent crashes when queues are still in use */ eth_dev->rx_pkt_burst = &bnxt_dummy_recv_pkts; @@ -1533,6 +1532,8 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev) if (BNXT_FLOW_XSTATS_EN(bp)) bp->flow_stat->flow_count = 0; + eth_dev->data->scattered_rx = 0; + return 0; } From patchwork Sat Oct 30 03:50:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalesh A P X-Patchwork-Id: 103264 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EFC1CA0C4E; Sat, 30 Oct 2021 05:30:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A9226410FA; Sat, 30 Oct 2021 05:30:30 +0200 (CEST) Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.231]) by mails.dpdk.org (Postfix) with ESMTP id AB33040DDB for ; Sat, 30 Oct 2021 05:30:27 +0200 (CEST) Received: from dhcp-10-123-153-22.dhcp.broadcom.net (bgccx-dev-host-lnx2.bec.broadcom.net [10.123.153.22]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 409E57A23; Fri, 29 Oct 2021 20:30:26 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 409E57A23 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1635564627; bh=OfbFHY5AtLayOXYA9/mAc98RVMPuhx5KdVykQAGZ7Bo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XDGeAdnePknaZevIhuChvX0x6qh7LCGKUgoOoblhwrJkyxjIy/E7cbyO73JE2q+BR zeB9H2Aot5ZDzGke8xSR+IaFzXWT0kSd/Mc8817eyqkb378YidoFTWFOCY7Mtk8lBU E0LSH6Cl1Xjwd+pb5sYiNAvE1rk5MOnMPBjPT4FI= From: Kalesh A P To: dev@dpdk.org Cc: ferruh.yigit@intel.com, ajit.khaparde@broadcom.com Date: Sat, 30 Oct 2021 09:20:20 +0530 Message-Id: <20211030035020.31813-2-kalesh-anakkur.purayil@broadcom.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20211030035020.31813-1-kalesh-anakkur.purayil@broadcom.com> References: <20211030035020.31813-1-kalesh-anakkur.purayil@broadcom.com> Subject: [dpdk-dev] [PATCH 2/2] net/bnxt: fix stat context allocation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Kalesh AP stat_ctx_alloc is called within the context of each rx/tx ring. i.e from bnxt_alloc_hwrm_rx_ring and bnxt_alloc_hwrm_tx_ring(). So, there is no need to invoke bnxt_alloc_all_hwrm_stat_ctxs() from bnxt_start_nic(). Fixes: 657c2a7f1dd4 ("net/bnxt: create aggregation rings when needed") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 6 ------ drivers/net/bnxt/bnxt_hwrm.c | 31 ------------------------------- drivers/net/bnxt/bnxt_hwrm.h | 1 - 3 files changed, 38 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 91f114e..c8dad8a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -747,12 +747,6 @@ static int bnxt_start_nic(struct bnxt *bp) if (BNXT_CHIP_P5(bp)) bp->max_ring_grps = BNXT_MAX_RSS_CTXTS_P5; - rc = bnxt_alloc_all_hwrm_stat_ctxs(bp); - if (rc) { - PMD_DRV_LOG(ERR, "HWRM stat ctx alloc failure rc: %x\n", rc); - goto err_out; - } - rc = bnxt_alloc_hwrm_rings(bp); if (rc) { PMD_DRV_LOG(ERR, "HWRM ring alloc failure rc: %x\n", rc); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 82e89b7..55dcb1d 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -2648,37 +2648,6 @@ bnxt_free_all_hwrm_stat_ctxs(struct bnxt *bp) return 0; } -int bnxt_alloc_all_hwrm_stat_ctxs(struct bnxt *bp) -{ - struct bnxt_cp_ring_info *cpr; - unsigned int i; - int rc = 0; - - for (i = 0; i < bp->rx_cp_nr_rings; i++) { - struct bnxt_rx_queue *rxq = bp->rx_queues[i]; - - cpr = rxq->cp_ring; - if (cpr->hw_stats_ctx_id == HWRM_NA_SIGNATURE) { - rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr); - if (rc) - return rc; - } - } - - for (i = 0; i < bp->tx_cp_nr_rings; i++) { - struct bnxt_tx_queue *txq = bp->tx_queues[i]; - - cpr = txq->cp_ring; - if (cpr->hw_stats_ctx_id == HWRM_NA_SIGNATURE) { - rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr); - if (rc) - return rc; - } - } - - return rc; -} - static int bnxt_free_all_hwrm_ring_grps(struct bnxt *bp) { diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h index 6dc23b9..72d4864 100644 --- a/drivers/net/bnxt/bnxt_hwrm.h +++ b/drivers/net/bnxt/bnxt_hwrm.h @@ -188,7 +188,6 @@ int bnxt_hwrm_vnic_plcmode_cfg(struct bnxt *bp, int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic, bool enable); -int bnxt_alloc_all_hwrm_stat_ctxs(struct bnxt *bp); int bnxt_clear_all_hwrm_stat_ctxs(struct bnxt *bp); int bnxt_alloc_all_hwrm_ring_grps(struct bnxt *bp); void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr);