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 D4B54A09DF for ; Thu, 3 Dec 2020 05:41:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F19D8C996; Thu, 3 Dec 2020 05:41:35 +0100 (CET) Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.221.30]) by dpdk.org (Postfix) with ESMTP id 3F73FC954 for ; Thu, 3 Dec 2020 05:41:33 +0100 (CET) Received: from dhcp-10-123-153-55.dhcp.broadcom.net (bgccx-dev-host-lnx35.bec.broadcom.net [10.123.153.55]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by relay.smtp-ext.broadcom.com (Postfix) with ESMTPS id CE60080D7; Wed, 2 Dec 2020 20:41:30 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com CE60080D7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1606970491; bh=QKz4C08WfWI+8DvFUL+Wd8yP1DLxZkBkCq14hG1UTAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M5QyXH8pzWdconpWbnxCwbtgPsbvP0Sfv2+7ibYSMha6+8TbjUAqgLgeb8AGs0RM6 SGKSbJWffG3AZinBzEcuBjiFuYRRlSj8GRzxcHQ74VfM4w79MkOUHeeL2rDXBjRPkV tGFKWoOUcT04Kf/eTLsY7ZhELrRPYB9KxOJZxIZE= From: Somnath Kotur To: stable@dpdk.org Cc: Somnath Kotur , Ajit Khaparde Date: Thu, 3 Dec 2020 10:02:59 +0530 Message-Id: <20201203043259.3423-2-somnath.kotur@broadcom.com> X-Mailer: git-send-email 2.28.0.450.g3a238e5 In-Reply-To: <20201203043259.3423-1-somnath.kotur@broadcom.com> References: <20201203043259.3423-1-somnath.kotur@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 18.11 2/2] net/bnxt: fix queue release 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" [upstream commit 97c3271781bf1094b0ab0235f472fb5a468b02d3] Some of the ring related memory was not being freed in both the release ops. Fix to free them now. Add some more NULL ptr checks in the corresponding queue_release_mbufs() and queue_release_op() respectively. Also call queue_release_op() in the error path of the corresponding queue_setup_op() Fixes: 6133f207970c ("net/bnxt: add Rx queue create/destroy") Fixes: 51c87ebafc7d ("net/bnxt: add Tx queue create/destroy") Cc: stable@dpdk.org Signed-off-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxq.c | 45 +++++++++++++++++++++++-------------- drivers/net/bnxt/bnxt_txq.c | 32 +++++++++++++++----------- 2 files changed, 47 insertions(+), 30 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index d1664dbc09..34dbb1dbdb 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -205,7 +205,7 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq) struct bnxt_tpa_info *tpa_info; uint16_t i; - if (!rxq) + if (!rxq || !rxq->rx_ring) return; rte_spinlock_lock(&rxq->lock); @@ -265,12 +265,21 @@ void bnxt_rx_queue_release_op(void *rx_queue) bnxt_rx_queue_release_mbufs(rxq); /* Free RX ring hardware descriptors */ - bnxt_free_ring(rxq->rx_ring->rx_ring_struct); - /* Free RX Agg ring hardware descriptors */ - bnxt_free_ring(rxq->rx_ring->ag_ring_struct); - + if (rxq->rx_ring) { + bnxt_free_ring(rxq->rx_ring->rx_ring_struct); + rte_free(rxq->rx_ring->rx_ring_struct); + /* Free RX Agg ring hardware descriptors */ + bnxt_free_ring(rxq->rx_ring->ag_ring_struct); + rte_free(rxq->rx_ring->ag_ring_struct); + + rte_free(rxq->rx_ring); + } /* Free RX completion ring hardware descriptors */ - bnxt_free_ring(rxq->cp_ring->cp_ring_struct); + if (rxq->cp_ring) { + bnxt_free_ring(rxq->cp_ring->cp_ring_struct); + rte_free(rxq->cp_ring->cp_ring_struct); + rte_free(rxq->cp_ring); + } bnxt_free_rxq_stats(rxq); rte_memzone_free(rxq->mz); @@ -302,8 +311,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, if (!nb_desc || nb_desc > MAX_RX_DESC_CNT) { PMD_DRV_LOG(ERR, "nb_desc %d is invalid\n", nb_desc); - rc = -EINVAL; - goto out; + return -EINVAL; } if (eth_dev->data->rx_queues) { @@ -315,8 +323,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, RTE_CACHE_LINE_SIZE, socket_id); if (!rxq) { PMD_DRV_LOG(ERR, "bnxt_rx_queue allocation failed!\n"); - rc = -ENOMEM; - goto out; + return -ENOMEM; } rxq->bp = bp; rxq->mb_pool = mp; @@ -326,8 +333,11 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, PMD_DRV_LOG(DEBUG, "RX Buf MTU %d\n", eth_dev->data->mtu); rc = bnxt_init_rx_ring_struct(rxq, socket_id); - if (rc) - goto out; + if (rc) { + PMD_DRV_LOG(ERR, + "init_rx_ring_struct failed!\n"); + goto err; + } PMD_DRV_LOG(DEBUG, "RX Buf size is %d\n", rxq->rx_buf_size); rxq->queue_id = queue_idx; @@ -342,10 +352,8 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, if (bnxt_alloc_rings(bp, queue_idx, NULL, rxq, rxq->cp_ring, "rxr")) { PMD_DRV_LOG(ERR, - "ring_dma_zone_reserve for rx_ring failed!\n"); - bnxt_rx_queue_release_op(rxq); - rc = -ENOMEM; - goto out; + "ring_dma_zone_reserve for rx_ring failed!\n"); + goto err; } rte_atomic64_init(&rxq->rx_mbuf_alloc_fail); @@ -369,7 +377,10 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, /* Configure mtu if it is different from what was configured before */ if (!queue_idx) bnxt_mtu_set_op(eth_dev, eth_dev->data->mtu); -out: + + return 0; +err: + bnxt_rx_queue_release_op(rxq); return rc; } diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c index cf6ddfb69b..707712729d 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c @@ -28,7 +28,7 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq) struct bnxt_sw_tx_bd *sw_ring; uint16_t i; - if (!txq) + if (!txq || !txq->tx_ring) return; sw_ring = txq->tx_ring->tx_buf_ring; @@ -60,10 +60,18 @@ void bnxt_tx_queue_release_op(void *tx_queue) if (txq) { /* Free TX ring hardware descriptors */ bnxt_tx_queue_release_mbufs(txq); - bnxt_free_ring(txq->tx_ring->tx_ring_struct); + if (txq->tx_ring) { + bnxt_free_ring(txq->tx_ring->tx_ring_struct); + rte_free(txq->tx_ring->tx_ring_struct); + rte_free(txq->tx_ring); + } /* Free TX completion ring hardware descriptors */ - bnxt_free_ring(txq->cp_ring->cp_ring_struct); + if (txq->cp_ring) { + bnxt_free_ring(txq->cp_ring->cp_ring_struct); + rte_free(txq->cp_ring->cp_ring_struct); + rte_free(txq->cp_ring); + } bnxt_free_txq_stats(txq); rte_memzone_free(txq->mz); @@ -92,8 +100,7 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, if (!nb_desc || nb_desc > MAX_TX_DESC_CNT) { PMD_DRV_LOG(ERR, "nb_desc %d is invalid", nb_desc); - rc = -EINVAL; - goto out; + return -EINVAL; } if (eth_dev->data->tx_queues) { @@ -107,8 +114,7 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, RTE_CACHE_LINE_SIZE, socket_id); if (!txq) { PMD_DRV_LOG(ERR, "bnxt_tx_queue allocation failed!"); - rc = -ENOMEM; - goto out; + return -ENOMEM; } txq->bp = bp; txq->nb_tx_desc = nb_desc; @@ -117,7 +123,7 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, rc = bnxt_init_tx_ring_struct(txq, socket_id); if (rc) - goto out; + goto err; txq->queue_id = queue_idx; txq->port_id = eth_dev->data->port_id; @@ -126,16 +132,14 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, if (bnxt_alloc_rings(bp, queue_idx, txq, NULL, txq->cp_ring, "txr")) { PMD_DRV_LOG(ERR, "ring_dma_zone_reserve for tx_ring failed!"); - bnxt_tx_queue_release_op(txq); rc = -ENOMEM; - goto out; + goto err; } if (bnxt_init_one_tx_ring(txq)) { PMD_DRV_LOG(ERR, "bnxt_init_one_tx_ring failed!"); - bnxt_tx_queue_release_op(txq); rc = -ENOMEM; - goto out; + goto err; } eth_dev->data->tx_queues[queue_idx] = txq; @@ -145,6 +149,8 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, else txq->tx_started = true; -out: + return 0; +err: + bnxt_tx_queue_release_op(txq); return rc; } -- 2.28.0.497.g54e85e7