From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by dpdk.org (Postfix) with ESMTP id BAFA82C37 for ; Mon, 9 Jan 2017 03:59:53 +0100 (CET) X-QQ-mid: bizesmtp3t1483930787t2hca3i2d Received: from local.opencloud.tech.localdomai (unknown [106.120.127.11]) by esmtp4.qq.com (ESMTP) with id ; Mon, 09 Jan 2017 10:59:45 +0800 (CST) X-QQ-SSF: 01100000002000F0F870000A0000000 X-QQ-FEAT: jfJxHuYZxODOJ/TkqoYsVHqi7aCJA7HC79RQ7QdLXVSRHJuKXyk7qURyIG4pO DBTtncSNndods2549bJ94jMd7rF2pmYpcU5GJ5jsdu/omzb5Ie6MxZKwEQkHpMlMTTB0cWq pii7dvCQvkHFr0CXVZUOFM+6ypn6cIFE7mZERAoy10E4IgLLYxFPqWLfAvHFk/EBsJrHlzW lLQGK/dQqnuxr5zZVy8Reqr6MyastkIj9KuxcNxTlnJShS3LCnyJkLF5ake9XzuBfDExut9 C1HoLQSPFFGINrb38DMVCKPig= X-QQ-GoodBg: 0 From: Nick Zhang To: yongwang@vmware.com Cc: ferruh.yigit@intel.com, dev@dpdk.org, Nick Zhang Date: Sun, 8 Jan 2017 18:59:39 -0800 Message-Id: <1483930780-7064-3-git-send-email-nic@opencloud.tech> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1483930780-7064-1-git-send-email-nic@opencloud.tech> References: <1483930780-7064-1-git-send-email-nic@opencloud.tech> X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [dpdk-dev] [PATCH v3 3/4] vmxnet3: Avoid memory leak in vmxnet3_dev_tx_queue_setup. X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 02:59:55 -0000 This patch will check the "nb_desc" parameter for tx queue. Tx vmxnet rings length should be between 512-4096. The patch will release the txq and re-allocation it soon for different "nb_desc". Signed-off-by: Nick Zhang --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index d5d7c33..f00b3b9 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -828,6 +828,23 @@ return -EINVAL; } + /* Tx vmxnet ring length should be between 512-4096 */ + if (nb_desc < VMXNET3_DEF_TX_RING_SIZE) { + PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Min: %u", + VMXNET3_DEF_TX_RING_SIZE); + return -EINVAL; + } else if (nb_desc > VMXNET3_TX_RING_MAX_SIZE) { + PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Max: %u", + VMXNET3_TX_RING_MAX_SIZE); + return -EINVAL; + } + + /* Free memory prior to re-allocation if needed... */ + if (dev->data->tx_queues[queue_idx] != NULL) { + vmxnet3_dev_tx_queue_release(dev->data->tx_queues[queue_idx]); + dev->data->tx_queues[queue_idx] = NULL; + } + txq = rte_zmalloc("ethdev_tx_queue", sizeof(struct vmxnet3_tx_queue), RTE_CACHE_LINE_SIZE); if (txq == NULL) { @@ -846,19 +863,8 @@ comp_ring = &txq->comp_ring; data_ring = &txq->data_ring; - /* Tx vmxnet ring length should be between 512-4096 */ - if (nb_desc < VMXNET3_DEF_TX_RING_SIZE) { - PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Min: %u", - VMXNET3_DEF_TX_RING_SIZE); - return -EINVAL; - } else if (nb_desc > VMXNET3_TX_RING_MAX_SIZE) { - PMD_INIT_LOG(ERR, "VMXNET3 Tx Ring Size Max: %u", - VMXNET3_TX_RING_MAX_SIZE); - return -EINVAL; - } else { - ring->size = nb_desc; - ring->size &= ~VMXNET3_RING_SIZE_MASK; - } + ring->size = nb_desc; + ring->size &= ~VMXNET3_RING_SIZE_MASK; comp_ring->size = data_ring->size = ring->size; /* Tx vmxnet rings structure initialization*/ -- 1.8.3.1