From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id C1E715F35; Fri, 8 Jun 2018 13:56:16 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94B25BB43F; Fri, 8 Jun 2018 11:56:15 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-51.ams2.redhat.com [10.36.117.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id E98EE2026990; Fri, 8 Jun 2018 11:56:13 +0000 (UTC) To: Rasesh Mody , dev@dpdk.org Cc: ferruh.yigit@intel.com, Dept-EngDPDKDev@cavium.com, stable@dpdk.org References: <1528389020-4803-1-git-send-email-rasesh.mody@cavium.com> From: Kevin Traynor Organization: Red Hat Message-ID: <0c97c7b1-45d8-6eba-76f7-660c26fcbc7f@redhat.com> Date: Fri, 8 Jun 2018 12:56:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 MIME-Version: 1.0 In-Reply-To: <1528389020-4803-1-git-send-email-rasesh.mody@cavium.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 08 Jun 2018 11:56:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 08 Jun 2018 11:56:15 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ktraynor@redhat.com' RCPT:'' Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/qede: fix memory alloc for multiple port reconfig 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: , X-List-Received-Date: Fri, 08 Jun 2018 11:56:17 -0000 On 06/07/2018 05:30 PM, Rasesh Mody wrote: > Multiple port reconfigurations can lead to memory allocation failures > due to hitting RTE memzone limit or no more room in config while > reserving memzone. > > When freeing memzones, update the memzone mapping and the memzone count. > Release Rx and Tx queue rings allocated during queue setup. > > Fixes: a39001d90dbd ("net/qede: fix DMA memory leak") > Cc: stable@dpdk.org > > Signed-off-by: Rasesh Mody Reviewed-by: Kevin Traynor > --- > drivers/net/qede/base/bcm_osal.c | 5 +++++ > drivers/net/qede/qede_rxtx.c | 21 +++++++++++---------- > 2 files changed, 16 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c > index ca1c2b1..72627df 100644 > --- a/drivers/net/qede/base/bcm_osal.c > +++ b/drivers/net/qede/base/bcm_osal.c > @@ -201,6 +201,11 @@ void osal_dma_free_mem(struct ecore_dev *p_dev, dma_addr_t phys) > DP_VERBOSE(p_dev, ECORE_MSG_SP, > "Free memzone %s\n", ecore_mz_mapping[j]->name); > rte_memzone_free(ecore_mz_mapping[j]); > + while (j < ecore_mz_count - 1) { > + ecore_mz_mapping[j] = ecore_mz_mapping[j + 1]; > + j++; > + } > + ecore_mz_count--; > return; > } > } > diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c > index bdb5d6f..4fa1c61 100644 > --- a/drivers/net/qede/qede_rxtx.c > +++ b/drivers/net/qede/qede_rxtx.c > @@ -192,9 +192,15 @@ static void qede_rx_queue_release_mbufs(struct qede_rx_queue *rxq) > void qede_rx_queue_release(void *rx_queue) > { > struct qede_rx_queue *rxq = rx_queue; > + struct qede_dev *qdev = rxq->qdev; > + struct ecore_dev *edev = QEDE_INIT_EDEV(qdev); > + > + PMD_INIT_FUNC_TRACE(edev); > > if (rxq) { > qede_rx_queue_release_mbufs(rxq); > + qdev->ops->common->chain_free(edev, &rxq->rx_bd_ring); > + qdev->ops->common->chain_free(edev, &rxq->rx_comp_ring); > rte_free(rxq->sw_rx_ring); > rte_free(rxq); > } > @@ -350,9 +356,14 @@ static void qede_tx_queue_release_mbufs(struct qede_tx_queue *txq) > void qede_tx_queue_release(void *tx_queue) > { > struct qede_tx_queue *txq = tx_queue; > + struct qede_dev *qdev = txq->qdev; > + struct ecore_dev *edev = QEDE_INIT_EDEV(qdev); > + > + PMD_INIT_FUNC_TRACE(edev); > > if (txq) { > qede_tx_queue_release_mbufs(txq); > + qdev->ops->common->chain_free(edev, &txq->tx_pbl); > rte_free(txq->sw_tx_ring); > rte_free(txq); > } > @@ -441,8 +452,6 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev) > struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev); > struct ecore_dev *edev = QEDE_INIT_EDEV(qdev); > struct qede_fastpath *fp; > - struct qede_rx_queue *rxq; > - struct qede_tx_queue *txq; > uint16_t sb_idx; > uint8_t i; > > @@ -467,21 +476,13 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev) > for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { > if (eth_dev->data->rx_queues[i]) { > qede_rx_queue_release(eth_dev->data->rx_queues[i]); > - rxq = eth_dev->data->rx_queues[i]; > - qdev->ops->common->chain_free(edev, > - &rxq->rx_bd_ring); > - qdev->ops->common->chain_free(edev, > - &rxq->rx_comp_ring); > eth_dev->data->rx_queues[i] = NULL; > } > } > > for (i = 0; i < eth_dev->data->nb_tx_queues; i++) { > if (eth_dev->data->tx_queues[i]) { > - txq = eth_dev->data->tx_queues[i]; > qede_tx_queue_release(eth_dev->data->tx_queues[i]); > - qdev->ops->common->chain_free(edev, > - &txq->tx_pbl); > eth_dev->data->tx_queues[i] = NULL; > } > } >