From patchwork Thu Jan 5 10:43:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nickcooper-zhangtonghao X-Patchwork-Id: 18903 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 5884FD586; Thu, 5 Jan 2017 11:43:25 +0100 (CET) Received: from smtpbg202.qq.com (smtpbg202.qq.com [184.105.206.29]) by dpdk.org (Postfix) with ESMTP id D07E0D586 for ; Thu, 5 Jan 2017 11:43:16 +0100 (CET) X-QQ-mid: bizesmtp2t1483612990tyryfrl5v Received: from local.opencloud.tech.localdomai (unknown [106.120.127.11]) by esmtp4.qq.com (ESMTP) with id ; Thu, 05 Jan 2017 18:43:10 +0800 (CST) X-QQ-SSF: 0110000000200070F650B00A0000000 X-QQ-FEAT: q17Yoz/cMVrHk7aKpfW6iym6IgXDl5XMcdniUvWjfJnlbkRaSKDtXO5omF7UG opwIcl+ZUeqtoyuwu3DIonvxMgh6MDSFlkowPEb2CoNFwGN0QvMeX0aqn0WCnRy2k71cx98 UehWH1AVZpwgh7hkx9MJvSAGFX+wKHj4RLme93Xz2Y9QgzbgLb2tFsBMNdFv5CgJ4zyFEnH tgQxvnHNoV85SBk3svaxMS8Lo1uVlm14R2ujzGgQRvYGa/0V2iTrjPtmht6bqJv2RrFROn0 oMa/qT0aMUse2X X-QQ-GoodBg: 0 From: nickcooper-zhangtonghao To: dev@dpdk.org Cc: nickcooper-zhangtonghao Date: Thu, 5 Jan 2017 02:43:00 -0800 Message-Id: <1483612983-3545-2-git-send-email-nic@opencloud.tech> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1483612983-3545-1-git-send-email-nic@opencloud.tech> References: <1483612983-3545-1-git-send-email-nic@opencloud.tech> X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [dpdk-dev] [PATCH 2/5] vmxnet3: Avoid memory leak in vmxnet3_dev_rx_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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch will check the "nb_desc" parameter for rx queue, release the rxq and re-allocation it soon. Signed-off-by: nickcooper-zhangtonghao --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index b109168..e83ac05 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -926,6 +926,21 @@ PMD_INIT_FUNC_TRACE(); + /* Rx vmxnet rings length should be between 128-4096 */ + if (nb_desc < VMXNET3_DEF_RX_RING_SIZE) { + PMD_INIT_LOG(ERR, "VMXNET3 Rx Ring Size Min: 128"); + return -EINVAL; + } else if (nb_desc > VMXNET3_RX_RING_MAX_SIZE) { + PMD_INIT_LOG(ERR, "VMXNET3 Rx Ring Size Max: 4096"); + return -EINVAL; + } + + /* Free memory prior to re-allocation if needed. */ + if (dev->data->rx_queues[queue_idx] != NULL) { + vmxnet3_dev_rx_queue_release(dev->data->rx_queues[queue_idx]); + dev->data->rx_queues[queue_idx] = NULL; + } + rxq = rte_zmalloc("ethdev_rx_queue", sizeof(struct vmxnet3_rx_queue), RTE_CACHE_LINE_SIZE); if (rxq == NULL) { @@ -946,18 +961,9 @@ ring1 = &rxq->cmd_ring[1]; comp_ring = &rxq->comp_ring; - /* Rx vmxnet rings length should be between 256-4096 */ - if (nb_desc < VMXNET3_DEF_RX_RING_SIZE) { - PMD_INIT_LOG(ERR, "VMXNET3 Rx Ring Size Min: 256"); - return -EINVAL; - } else if (nb_desc > VMXNET3_RX_RING_MAX_SIZE) { - PMD_INIT_LOG(ERR, "VMXNET3 Rx Ring Size Max: 4096"); - return -EINVAL; - } else { - ring0->size = nb_desc; - ring0->size &= ~VMXNET3_RING_SIZE_MASK; - ring1->size = ring0->size; - } + ring0->size = nb_desc; + ring0->size &= ~VMXNET3_RING_SIZE_MASK; + ring1->size = ring0->size; comp_ring->size = ring0->size + ring1->size;