diff mbox series

vhost: fix zmbufs array leak after NUMA realloc

Message ID 20180815145439.2513-1-i.maximets@samsung.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers show
Series vhost: fix zmbufs array leak after NUMA realloc | expand

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Ilya Maximets Aug. 15, 2018, 2:54 p.m. UTC
'numa_realloc()' allocates 'zmbufs' even if zero copy mode
is not configured. This leads to memory leak, because array
is freed only for zero copy case.

Fixes: 2651726defb7 ("vhost: do deep copy while reallocating queue")
CC: stable@dpdk.org

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
---
 lib/librte_vhost/vhost_user.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

Tiwei Bie Aug. 16, 2018, 5:31 a.m. UTC | #1
On Wed, Aug 15, 2018 at 05:54:39PM +0300, Ilya Maximets wrote:
> 'numa_realloc()' allocates 'zmbufs' even if zero copy mode
> is not configured. This leads to memory leak, because array
> is freed only for zero copy case.
> 
> Fixes: 2651726defb7 ("vhost: do deep copy while reallocating queue")
> CC: stable@dpdk.org
> 
> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
> ---
>  lib/librte_vhost/vhost_user.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index a2d4c9ffc..9aa1ce118 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -357,11 +357,13 @@ numa_realloc(struct virtio_net *dev, int index)
>  		memcpy(vq, old_vq, sizeof(*vq));
>  		TAILQ_INIT(&vq->zmbuf_list);
>  
> -		new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
> -			sizeof(struct zcopy_mbuf), 0, newnode);
> -		if (new_zmbuf) {
> -			rte_free(vq->zmbufs);
> -			vq->zmbufs = new_zmbuf;
> +		if (dev->dequeue_zero_copy) {
> +			new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
> +					sizeof(struct zcopy_mbuf), 0, newnode);
> +			if (new_zmbuf) {
> +				rte_free(vq->zmbufs);
> +				vq->zmbufs = new_zmbuf;
> +			}
>  		}
>  
>  		if (vq_is_packed(dev)) {
> -- 
> 2.17.1
> 

Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>

Thanks!
Maxime Coquelin Sept. 10, 2018, 1:38 p.m. UTC | #2
On 08/15/2018 04:54 PM, Ilya Maximets wrote:
> 'numa_realloc()' allocates 'zmbufs' even if zero copy mode
> is not configured. This leads to memory leak, because array
> is freed only for zero copy case.
> 
> Fixes: 2651726defb7 ("vhost: do deep copy while reallocating queue")
> CC: stable@dpdk.org
> 
> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
> ---
>   lib/librte_vhost/vhost_user.c | 12 +++++++-----
>   1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index a2d4c9ffc..9aa1ce118 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -357,11 +357,13 @@ numa_realloc(struct virtio_net *dev, int index)
>   		memcpy(vq, old_vq, sizeof(*vq));
>   		TAILQ_INIT(&vq->zmbuf_list);
>   
> -		new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
> -			sizeof(struct zcopy_mbuf), 0, newnode);
> -		if (new_zmbuf) {
> -			rte_free(vq->zmbufs);
> -			vq->zmbufs = new_zmbuf;
> +		if (dev->dequeue_zero_copy) {
> +			new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
> +					sizeof(struct zcopy_mbuf), 0, newnode);
> +			if (new_zmbuf) {
> +				rte_free(vq->zmbufs);
> +				vq->zmbufs = new_zmbuf;
> +			}
>   		}
>   
>   		if (vq_is_packed(dev)) {
> 

Applied to dpdk-next-virtio/master.

Thanks!
Maxime
diff mbox series

Patch

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index a2d4c9ffc..9aa1ce118 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -357,11 +357,13 @@  numa_realloc(struct virtio_net *dev, int index)
 		memcpy(vq, old_vq, sizeof(*vq));
 		TAILQ_INIT(&vq->zmbuf_list);
 
-		new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
-			sizeof(struct zcopy_mbuf), 0, newnode);
-		if (new_zmbuf) {
-			rte_free(vq->zmbufs);
-			vq->zmbufs = new_zmbuf;
+		if (dev->dequeue_zero_copy) {
+			new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
+					sizeof(struct zcopy_mbuf), 0, newnode);
+			if (new_zmbuf) {
+				rte_free(vq->zmbufs);
+				vq->zmbufs = new_zmbuf;
+			}
 		}
 
 		if (vq_is_packed(dev)) {