From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 8B7D2298F for ; Tue, 26 Apr 2016 14:32:13 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 26 Apr 2016 05:32:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,536,1455004800"; d="scan'208";a="953174659" Received: from dpdk06.sh.intel.com ([10.239.128.225]) by fmsmga001.fm.intel.com with ESMTP; 26 Apr 2016 05:32:11 -0700 From: Jianfeng Tan To: dev@dpdk.org Cc: huawei.xie@intel.com, yuanhan.liu@linux.intel.com, Jianfeng Tan Date: Tue, 26 Apr 2016 12:32:12 +0000 Message-Id: <1461673932-128879-1-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH] virtio: fix memory leak of virtqueue memzones X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 12:32:14 -0000 Issue: When virtio was proposed in DPDK, there is no API to free memzones. But this has changed since rte_memzone_free() has been implemented by commit ff909fe21f. This patch is to make sure memzones in struct virtqueue, like mz and virtio_net_hdr_mz, are freed when queue is released or setup fails. Signed-off-by: Jianfeng Tan --- drivers/net/virtio/virtio_ethdev.c | 69 ++++++++++++++++++++------------------ drivers/net/virtio/virtio_ethdev.h | 2 +- drivers/net/virtio/virtio_rxtx.c | 4 +-- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 63a368a..54eacf6 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -261,12 +261,18 @@ virtio_set_multiple_queues(struct rte_eth_dev *dev, uint16_t nb_queues) } void -virtio_dev_queue_release(struct virtqueue *vq) { +virtio_dev_queue_release(struct virtqueue *vq, int io_related) +{ struct virtio_hw *hw; if (vq) { hw = vq->hw; - hw->vtpci_ops->del_queue(hw, vq); + if (io_related) + hw->vtpci_ops->del_queue(hw, vq); + + rte_memzone_free(vq->mz); + if (vq->virtio_net_hdr_mz) + rte_memzone_free(vq->virtio_net_hdr_mz); rte_free(vq->sw_ring); rte_free(vq); @@ -286,6 +292,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, unsigned int vq_size, size; struct virtio_hw *hw = dev->data->dev_private; struct virtqueue *vq = NULL; + const char *queue_names[] = {"rvq", "txq", "cvq"}; PMD_INIT_LOG(DEBUG, "setting up queue: %u", vtpci_queue_idx); @@ -305,34 +312,34 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } - if (queue_type == VTNET_RQ) { - snprintf(vq_name, sizeof(vq_name), "port%d_rvq%d", - dev->data->port_id, queue_idx); - vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) + - vq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE); - vq->sw_ring = rte_zmalloc_socket("rxq->sw_ring", - (RTE_PMD_VIRTIO_RX_MAX_BURST + vq_size) * - sizeof(vq->sw_ring[0]), RTE_CACHE_LINE_SIZE, socket_id); - } else if (queue_type == VTNET_TQ) { - snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d", - dev->data->port_id, queue_idx); - vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) + - vq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE); - } else if (queue_type == VTNET_CQ) { - snprintf(vq_name, sizeof(vq_name), "port%d_cvq", - dev->data->port_id); - vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) + - vq_size * sizeof(struct vq_desc_extra), - RTE_CACHE_LINE_SIZE); + if (queue_type < VTNET_RQ || queue_type > VTNET_RQ) { + PMD_INIT_LOG(ERR, "invalid queue type: %d", queue_type); + return -EINVAL; } + + snprintf(vq_name, sizeof(vq_name), "port%d_%s%d", + dev->data->port_id, queue_names[queue_type], queue_idx); + vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) + + vq_size * sizeof(struct vq_desc_extra), + RTE_CACHE_LINE_SIZE); if (vq == NULL) { PMD_INIT_LOG(ERR, "Can not allocate virtqueue"); return -ENOMEM; } - if (queue_type == VTNET_RQ && vq->sw_ring == NULL) { - PMD_INIT_LOG(ERR, "Can not allocate RX soft ring"); - rte_free(vq); - return -ENOMEM; + + if (queue_type == VTNET_RQ) { + size_t sz_sw; + + sz_sw = (RTE_PMD_VIRTIO_RX_MAX_BURST + vq_size) * + sizeof(vq->sw_ring[0]); + vq->sw_ring = rte_zmalloc_socket("rxq->sw_ring", sz_sw, + RTE_CACHE_LINE_SIZE, + socket_id); + if (!vq->sw_ring) { + PMD_INIT_LOG(ERR, "Can not allocate RX soft ring"); + virtio_dev_queue_release(vq, 0); + return -ENOMEM; + } } vq->hw = hw; @@ -358,7 +365,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, if (rte_errno == EEXIST) mz = rte_memzone_lookup(vq_name); if (mz == NULL) { - rte_free(vq); + virtio_dev_queue_release(vq, 0); return -ENOMEM; } } @@ -370,7 +377,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, */ if ((mz->phys_addr + vq->vq_ring_size - 1) >> (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32)) { PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!"); - rte_free(vq); + virtio_dev_queue_release(vq, 0); return -ENOMEM; } @@ -380,8 +387,6 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, vq->vq_ring_virt_mem = mz->addr; PMD_INIT_LOG(DEBUG, "vq->vq_ring_mem: 0x%"PRIx64, (uint64_t)mz->phys_addr); PMD_INIT_LOG(DEBUG, "vq->vq_ring_virt_mem: 0x%"PRIx64, (uint64_t)(uintptr_t)mz->addr); - vq->virtio_net_hdr_mz = NULL; - vq->virtio_net_hdr_mem = 0; if (queue_type == VTNET_TQ) { const struct rte_memzone *hdr_mz; @@ -402,7 +407,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, if (rte_errno == EEXIST) hdr_mz = rte_memzone_lookup(vq_name); if (hdr_mz == NULL) { - rte_free(vq); + virtio_dev_queue_release(vq, 0); return -ENOMEM; } } @@ -436,7 +441,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, vq->virtio_net_hdr_mz = rte_memzone_lookup(vq_name); if (vq->virtio_net_hdr_mz == NULL) { - rte_free(vq); + virtio_dev_queue_release(vq, 0); return -ENOMEM; } } @@ -1184,7 +1189,7 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) eth_dev->tx_pkt_burst = NULL; eth_dev->rx_pkt_burst = NULL; - virtio_dev_queue_release(hw->cvq); + virtio_dev_queue_release(hw->cvq, 1); rte_free(eth_dev->data->mac_addrs); eth_dev->data->mac_addrs = NULL; diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h index 66423a0..070345a 100644 --- a/drivers/net/virtio/virtio_ethdev.h +++ b/drivers/net/virtio/virtio_ethdev.h @@ -83,7 +83,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, unsigned int socket_id, struct virtqueue **pvq); -void virtio_dev_queue_release(struct virtqueue *vq); +void virtio_dev_queue_release(struct virtqueue *vq, int io_related); int virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint16_t nb_rx_desc, unsigned int socket_id, diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index ef21d8e..f8cbb9c 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -464,7 +464,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, void virtio_dev_rx_queue_release(void *rxq) { - virtio_dev_queue_release(rxq); + virtio_dev_queue_release(rxq, 1); } /* @@ -539,7 +539,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, void virtio_dev_tx_queue_release(void *txq) { - virtio_dev_queue_release(txq); + virtio_dev_queue_release(txq, 1); } static void -- 2.1.4