d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtio: fix memory leak of virtqueue memzones

Browse Source 
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 ff909fe21f0a ("mem: introduce memzone freeing").

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.

Fixes: c1f86306a026 ("virtio: add new driver")

Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
This commit is contained in:
Jianfeng Tan 2016-04-29 00:48:46 +00:00 committed by Yuanhan Liu
parent 4166bbf631
commit 2963d99a8b
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/virtio/virtio_ethdev.c
View File

@ -260,12 +260,18 @@ virtio_set_multiple_queues(struct rte_eth_dev *dev, uint16_t nb_queues)
} }
void void
virtio_dev_queue_release(struct virtqueue *vq) { virtio_dev_queue_release(struct virtqueue *vq)
{
struct virtio_hw *hw; struct virtio_hw *hw;
if (vq) { if (vq) {
hw = vq->hw; hw = vq->hw;
hw->vtpci_ops->del_queue(hw, vq); if (vq->configured)
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->sw_ring);
rte_free(vq); rte_free(vq);
@ -325,7 +331,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
socket_id); socket_id);
if (!vq->sw_ring) { if (!vq->sw_ring) {
PMD_INIT_LOG(ERR, "Can not allocate RX soft ring"); PMD_INIT_LOG(ERR, "Can not allocate RX soft ring");
rte_free(vq); virtio_dev_queue_release(vq);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -353,7 +359,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
if (rte_errno == EEXIST) if (rte_errno == EEXIST)
mz = rte_memzone_lookup(vq_name); mz = rte_memzone_lookup(vq_name);
if (mz == NULL) { if (mz == NULL) {
rte_free(vq); virtio_dev_queue_release(vq);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -365,7 +371,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)) { 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!"); PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!");
rte_free(vq); virtio_dev_queue_release(vq);
return -ENOMEM; return -ENOMEM;
} }
@ -397,7 +403,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
if (rte_errno == EEXIST) if (rte_errno == EEXIST)
hdr_mz = rte_memzone_lookup(vq_name); hdr_mz = rte_memzone_lookup(vq_name);
if (hdr_mz == NULL) { if (hdr_mz == NULL) {
rte_free(vq); virtio_dev_queue_release(vq);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -431,7 +437,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
vq->virtio_net_hdr_mz = vq->virtio_net_hdr_mz =
rte_memzone_lookup(vq_name); rte_memzone_lookup(vq_name);
if (vq->virtio_net_hdr_mz == NULL) { if (vq->virtio_net_hdr_mz == NULL) {
rte_free(vq); virtio_dev_queue_release(vq);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -442,6 +448,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
hw->vtpci_ops->setup_queue(hw, vq); hw->vtpci_ops->setup_queue(hw, vq);
vq->configured = 1;
*pvq = vq; *pvq = vq;
return 0; return 0;
} }

2
drivers/net/virtio/virtqueue.h
View File

@ -201,6 +201,8 @@ struct virtqueue {
uint16_t *notify_addr; uint16_t *notify_addr;
int configured;
struct vq_desc_extra { struct vq_desc_extra {
void *cookie; void *cookie;
uint16_t ndescs; uint16_t ndescs;