diff mbox series

[v7,7/7] vhost: convert inflight data to DPDK allocation API

Message ID 20210629161133.79472-8-maxime.coquelin@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers show
Series vhost: Fix and improve NUMA reallocation | expand

Checks

Context Check Description
ci/iol-abi-testing success Testing PASS
ci/iol-intel-Performance fail Performance Testing issues
ci/iol-mellanox-Functional fail Functional Testing issues
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/github-robot success github build: passed
ci/checkpatch success coding style OK

Commit Message

Maxime Coquelin June 29, 2021, 4:11 p.m. UTC
Inflight metadata are allocated using glibc's calloc.
This patch converts them to rte_zmalloc_socket to take
care of the NUMA affinity.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/vhost/vhost.c      |  4 +--
 lib/vhost/vhost_user.c | 71 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 60 insertions(+), 15 deletions(-)

Comments

Chenbo Xia June 30, 2021, 5:20 a.m. UTC | #1
> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Wednesday, June 30, 2021 12:12 AM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>;
> david.marchand@redhat.com
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH v7 7/7] vhost: convert inflight data to DPDK allocation API
> 
> Inflight metadata are allocated using glibc's calloc.
> This patch converts them to rte_zmalloc_socket to take
> care of the NUMA affinity.
> 
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
>  lib/vhost/vhost.c      |  4 +--
>  lib/vhost/vhost_user.c | 71 ++++++++++++++++++++++++++++++++++--------
>  2 files changed, 60 insertions(+), 15 deletions(-)
> 
> diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
> index 0000cd3297..53a470f547 100644
> --- a/lib/vhost/vhost.c
> +++ b/lib/vhost/vhost.c
> @@ -312,10 +312,10 @@ cleanup_vq_inflight(struct virtio_net *dev, struct
> vhost_virtqueue *vq)
> 
>  	if (vq->resubmit_inflight) {
>  		if (vq->resubmit_inflight->resubmit_list) {
> -			free(vq->resubmit_inflight->resubmit_list);
> +			rte_free(vq->resubmit_inflight->resubmit_list);
>  			vq->resubmit_inflight->resubmit_list = NULL;
>  		}
> -		free(vq->resubmit_inflight);
> +		rte_free(vq->resubmit_inflight);
>  		vq->resubmit_inflight = NULL;
>  	}
>  }
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index d8ec087dfc..67935c4ccc 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -188,7 +188,7 @@ vhost_backend_cleanup(struct virtio_net *dev)
>  			dev->inflight_info->fd = -1;
>  		}
> 
> -		free(dev->inflight_info);
> +		rte_free(dev->inflight_info);
>  		dev->inflight_info = NULL;
>  	}
> 
> @@ -562,6 +562,31 @@ numa_realloc(struct virtio_net *dev, int index)
>  		vq->log_cache = lc;
>  	}
> 
> +	if (vq->resubmit_inflight) {
> +		struct rte_vhost_resubmit_info *ri;
> +
> +		ri = rte_realloc_socket(vq->resubmit_inflight, sizeof(*ri), 0,
> node);
> +		if (!ri) {
> +			VHOST_LOG_CONFIG(ERR, "Failed to realloc resubmit inflight
> on node %d\n",
> +					node);
> +			return dev;
> +		}
> +		vq->resubmit_inflight = ri;
> +
> +		if (ri->resubmit_list) {
> +			struct rte_vhost_resubmit_desc *rd;
> +
> +			rd = rte_realloc_socket(ri->resubmit_list, sizeof(*rd) * ri-
> >resubmit_num,
> +					0, node);
> +			if (!rd) {
> +				VHOST_LOG_CONFIG(ERR, "Failed to realloc resubmit list
> on node %d\n",
> +						node);
> +				return dev;
> +			}
> +			ri->resubmit_list = rd;
> +		}
> +	}
> +
>  	vq->numa_node = node;
> 
>  out_dev_realloc:
> @@ -1491,6 +1516,7 @@ vhost_user_get_inflight_fd(struct virtio_net **pdev,
>  	uint16_t num_queues, queue_size;
>  	struct virtio_net *dev = *pdev;
>  	int fd, i, j;
> +	int numa_node = SOCKET_ID_ANY;
>  	void *addr;
> 
>  	if (msg->size != sizeof(msg->payload.inflight)) {
> @@ -1500,9 +1526,16 @@ vhost_user_get_inflight_fd(struct virtio_net **pdev,
>  		return RTE_VHOST_MSG_RESULT_ERR;
>  	}
> 
> +	/*
> +	 * If VQ 0 has already been allocated, try to allocate on the same
> +	 * NUMA node. It can be reallocated later in numa_realloc().
> +	 */
> +	if (dev->nr_vring > 0)
> +		numa_node = dev->virtqueue[0]->numa_node;
> +
>  	if (dev->inflight_info == NULL) {
> -		dev->inflight_info = calloc(1,
> -					    sizeof(struct inflight_mem_info));
> +		dev->inflight_info = rte_zmalloc_socket("inflight_info",
> +				sizeof(struct inflight_mem_info), 0, numa_node);
>  		if (!dev->inflight_info) {
>  			VHOST_LOG_CONFIG(ERR,
>  				"failed to alloc dev inflight area\n");
> @@ -1585,6 +1618,7 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev,
> VhostUserMsg *msg,
>  	struct vhost_virtqueue *vq;
>  	void *addr;
>  	int fd, i;
> +	int numa_node = SOCKET_ID_ANY;
> 
>  	fd = msg->fds[0];
>  	if (msg->size != sizeof(msg->payload.inflight) || fd < 0) {
> @@ -1618,9 +1652,16 @@ vhost_user_set_inflight_fd(struct virtio_net **pdev,
> VhostUserMsg *msg,
>  		"set_inflight_fd pervq_inflight_size: %d\n",
>  		pervq_inflight_size);
> 
> +	/*
> +	 * If VQ 0 has already been allocated, try to allocate on the same
> +	 * NUMA node. It can be reallocated later in numa_realloc().
> +	 */
> +	if (dev->nr_vring > 0)
> +		numa_node = dev->virtqueue[0]->numa_node;
> +
>  	if (!dev->inflight_info) {
> -		dev->inflight_info = calloc(1,
> -					    sizeof(struct inflight_mem_info));
> +		dev->inflight_info = rte_zmalloc_socket("inflight_info",
> +				sizeof(struct inflight_mem_info), 0, numa_node);
>  		if (dev->inflight_info == NULL) {
>  			VHOST_LOG_CONFIG(ERR,
>  				"failed to alloc dev inflight area\n");
> @@ -1779,19 +1820,21 @@ vhost_check_queue_inflights_split(struct virtio_net
> *dev,
>  	vq->last_avail_idx += resubmit_num;
> 
>  	if (resubmit_num) {
> -		resubmit  = calloc(1, sizeof(struct rte_vhost_resubmit_info));
> +		resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct
> rte_vhost_resubmit_info),
> +				0, vq->numa_node);
>  		if (!resubmit) {
>  			VHOST_LOG_CONFIG(ERR,
>  				"failed to allocate memory for resubmit info.\n");
>  			return RTE_VHOST_MSG_RESULT_ERR;
>  		}
> 
> -		resubmit->resubmit_list = calloc(resubmit_num,
> -			sizeof(struct rte_vhost_resubmit_desc));
> +		resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
> +				resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
> +				0, vq->numa_node);
>  		if (!resubmit->resubmit_list) {
>  			VHOST_LOG_CONFIG(ERR,
>  				"failed to allocate memory for inflight desc.\n");
> -			free(resubmit);
> +			rte_free(resubmit);
>  			return RTE_VHOST_MSG_RESULT_ERR;
>  		}
> 
> @@ -1873,19 +1916,21 @@ vhost_check_queue_inflights_packed(struct virtio_net
> *dev,
>  	}
> 
>  	if (resubmit_num) {
> -		resubmit = calloc(1, sizeof(struct rte_vhost_resubmit_info));
> +		resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct
> rte_vhost_resubmit_info),
> +				0, vq->numa_node);
>  		if (resubmit == NULL) {
>  			VHOST_LOG_CONFIG(ERR,
>  				"failed to allocate memory for resubmit info.\n");
>  			return RTE_VHOST_MSG_RESULT_ERR;
>  		}
> 
> -		resubmit->resubmit_list = calloc(resubmit_num,
> -			sizeof(struct rte_vhost_resubmit_desc));
> +		resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
> +				resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
> +				0, vq->numa_node);
>  		if (resubmit->resubmit_list == NULL) {
>  			VHOST_LOG_CONFIG(ERR,
>  				"failed to allocate memory for resubmit desc.\n");
> -			free(resubmit);
> +			rte_free(resubmit);
>  			return RTE_VHOST_MSG_RESULT_ERR;
>  		}
> 
> --
> 2.31.1

Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
David Marchand June 30, 2021, 7:55 a.m. UTC | #2
On Tue, Jun 29, 2021 at 6:11 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
>
> Inflight metadata are allocated using glibc's calloc.
> This patch converts them to rte_zmalloc_socket to take
> care of the NUMA affinity.

About the title, maybe:
vhost: use DPDK allocations for inflight data

>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>

[snip]

> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index d8ec087dfc..67935c4ccc 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c

[snip]

> @@ -1779,19 +1820,21 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,
>         vq->last_avail_idx += resubmit_num;
>
>         if (resubmit_num) {
> -               resubmit  = calloc(1, sizeof(struct rte_vhost_resubmit_info));
> +               resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),

Nit: double space.


> +                               0, vq->numa_node);
>                 if (!resubmit) {
>                         VHOST_LOG_CONFIG(ERR,
>                                 "failed to allocate memory for resubmit info.\n");
>                         return RTE_VHOST_MSG_RESULT_ERR;
>                 }
>
> -               resubmit->resubmit_list = calloc(resubmit_num,
> -                       sizeof(struct rte_vhost_resubmit_desc));
> +               resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
> +                               resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
> +                               0, vq->numa_node);
>                 if (!resubmit->resubmit_list) {
>                         VHOST_LOG_CONFIG(ERR,
>                                 "failed to allocate memory for inflight desc.\n");
> -                       free(resubmit);
> +                       rte_free(resubmit);
>                         return RTE_VHOST_MSG_RESULT_ERR;
>                 }
>
> @@ -1873,19 +1916,21 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev,
>         }
>
>         if (resubmit_num) {
> -               resubmit = calloc(1, sizeof(struct rte_vhost_resubmit_info));
> +               resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),

Copy/paste detected :-)
Double space.

Having a single allocator between split and packed implems would avoid
this, but it might not be that easy and this is out of the scope for
this patch.



> +                               0, vq->numa_node);
>                 if (resubmit == NULL) {
>                         VHOST_LOG_CONFIG(ERR,
>                                 "failed to allocate memory for resubmit info.\n");
>                         return RTE_VHOST_MSG_RESULT_ERR;
>                 }
>
> -               resubmit->resubmit_list = calloc(resubmit_num,
> -                       sizeof(struct rte_vhost_resubmit_desc));
> +               resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
> +                               resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
> +                               0, vq->numa_node);
>                 if (resubmit->resubmit_list == NULL) {
>                         VHOST_LOG_CONFIG(ERR,
>                                 "failed to allocate memory for resubmit desc.\n");
> -                       free(resubmit);
> +                       rte_free(resubmit);
>                         return RTE_VHOST_MSG_RESULT_ERR;
>                 }
>
> --
> 2.31.1
>
Maxime Coquelin June 30, 2021, 11:16 a.m. UTC | #3
On 6/30/21 9:55 AM, David Marchand wrote:
> On Tue, Jun 29, 2021 at 6:11 PM Maxime Coquelin
> <maxime.coquelin@redhat.com> wrote:
>>
>> Inflight metadata are allocated using glibc's calloc.
>> This patch converts them to rte_zmalloc_socket to take
>> care of the NUMA affinity.
> 
> About the title, maybe:
> vhost: use DPDK allocations for inflight data

Agree with your proposal.

>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> 
> [snip]
> 
>> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
>> index d8ec087dfc..67935c4ccc 100644
>> --- a/lib/vhost/vhost_user.c
>> +++ b/lib/vhost/vhost_user.c
> 
> [snip]
> 
>> @@ -1779,19 +1820,21 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,
>>         vq->last_avail_idx += resubmit_num;
>>
>>         if (resubmit_num) {
>> -               resubmit  = calloc(1, sizeof(struct rte_vhost_resubmit_info));
>> +               resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),
> 
> Nit: double space.
> 

Can be fixed while applying.

>> +                               0, vq->numa_node);
>>                 if (!resubmit) {
>>                         VHOST_LOG_CONFIG(ERR,
>>                                 "failed to allocate memory for resubmit info.\n");
>>                         return RTE_VHOST_MSG_RESULT_ERR;
>>                 }
>>
>> -               resubmit->resubmit_list = calloc(resubmit_num,
>> -                       sizeof(struct rte_vhost_resubmit_desc));
>> +               resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
>> +                               resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
>> +                               0, vq->numa_node);
>>                 if (!resubmit->resubmit_list) {
>>                         VHOST_LOG_CONFIG(ERR,
>>                                 "failed to allocate memory for inflight desc.\n");
>> -                       free(resubmit);
>> +                       rte_free(resubmit);
>>                         return RTE_VHOST_MSG_RESULT_ERR;
>>                 }
>>
>> @@ -1873,19 +1916,21 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev,
>>         }
>>
>>         if (resubmit_num) {
>> -               resubmit = calloc(1, sizeof(struct rte_vhost_resubmit_info));
>> +               resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),
> 
> Copy/paste detected :-)
> Double space.

Indeed!

> Having a single allocator between split and packed implems would avoid
> this, but it might not be that easy and this is out of the scope for
> this patch.
> 

Agree, I think the inflight code may be simpler.
We can think of a refactoring for v21.11.

Thanks,
Maxime

> 
>> +                               0, vq->numa_node);
>>                 if (resubmit == NULL) {
>>                         VHOST_LOG_CONFIG(ERR,
>>                                 "failed to allocate memory for resubmit info.\n");
>>                         return RTE_VHOST_MSG_RESULT_ERR;
>>                 }
>>
>> -               resubmit->resubmit_list = calloc(resubmit_num,
>> -                       sizeof(struct rte_vhost_resubmit_desc));
>> +               resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
>> +                               resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
>> +                               0, vq->numa_node);
>>                 if (resubmit->resubmit_list == NULL) {
>>                         VHOST_LOG_CONFIG(ERR,
>>                                 "failed to allocate memory for resubmit desc.\n");
>> -                       free(resubmit);
>> +                       rte_free(resubmit);
>>                         return RTE_VHOST_MSG_RESULT_ERR;
>>                 }
>>
>> --
>> 2.31.1
>>
> 
>
diff mbox series

Patch

diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index 0000cd3297..53a470f547 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -312,10 +312,10 @@  cleanup_vq_inflight(struct virtio_net *dev, struct vhost_virtqueue *vq)
 
 	if (vq->resubmit_inflight) {
 		if (vq->resubmit_inflight->resubmit_list) {
-			free(vq->resubmit_inflight->resubmit_list);
+			rte_free(vq->resubmit_inflight->resubmit_list);
 			vq->resubmit_inflight->resubmit_list = NULL;
 		}
-		free(vq->resubmit_inflight);
+		rte_free(vq->resubmit_inflight);
 		vq->resubmit_inflight = NULL;
 	}
 }
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index d8ec087dfc..67935c4ccc 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -188,7 +188,7 @@  vhost_backend_cleanup(struct virtio_net *dev)
 			dev->inflight_info->fd = -1;
 		}
 
-		free(dev->inflight_info);
+		rte_free(dev->inflight_info);
 		dev->inflight_info = NULL;
 	}
 
@@ -562,6 +562,31 @@  numa_realloc(struct virtio_net *dev, int index)
 		vq->log_cache = lc;
 	}
 
+	if (vq->resubmit_inflight) {
+		struct rte_vhost_resubmit_info *ri;
+
+		ri = rte_realloc_socket(vq->resubmit_inflight, sizeof(*ri), 0, node);
+		if (!ri) {
+			VHOST_LOG_CONFIG(ERR, "Failed to realloc resubmit inflight on node %d\n",
+					node);
+			return dev;
+		}
+		vq->resubmit_inflight = ri;
+
+		if (ri->resubmit_list) {
+			struct rte_vhost_resubmit_desc *rd;
+
+			rd = rte_realloc_socket(ri->resubmit_list, sizeof(*rd) * ri->resubmit_num,
+					0, node);
+			if (!rd) {
+				VHOST_LOG_CONFIG(ERR, "Failed to realloc resubmit list on node %d\n",
+						node);
+				return dev;
+			}
+			ri->resubmit_list = rd;
+		}
+	}
+
 	vq->numa_node = node;
 
 out_dev_realloc:
@@ -1491,6 +1516,7 @@  vhost_user_get_inflight_fd(struct virtio_net **pdev,
 	uint16_t num_queues, queue_size;
 	struct virtio_net *dev = *pdev;
 	int fd, i, j;
+	int numa_node = SOCKET_ID_ANY;
 	void *addr;
 
 	if (msg->size != sizeof(msg->payload.inflight)) {
@@ -1500,9 +1526,16 @@  vhost_user_get_inflight_fd(struct virtio_net **pdev,
 		return RTE_VHOST_MSG_RESULT_ERR;
 	}
 
+	/*
+	 * If VQ 0 has already been allocated, try to allocate on the same
+	 * NUMA node. It can be reallocated later in numa_realloc().
+	 */
+	if (dev->nr_vring > 0)
+		numa_node = dev->virtqueue[0]->numa_node;
+
 	if (dev->inflight_info == NULL) {
-		dev->inflight_info = calloc(1,
-					    sizeof(struct inflight_mem_info));
+		dev->inflight_info = rte_zmalloc_socket("inflight_info",
+				sizeof(struct inflight_mem_info), 0, numa_node);
 		if (!dev->inflight_info) {
 			VHOST_LOG_CONFIG(ERR,
 				"failed to alloc dev inflight area\n");
@@ -1585,6 +1618,7 @@  vhost_user_set_inflight_fd(struct virtio_net **pdev, VhostUserMsg *msg,
 	struct vhost_virtqueue *vq;
 	void *addr;
 	int fd, i;
+	int numa_node = SOCKET_ID_ANY;
 
 	fd = msg->fds[0];
 	if (msg->size != sizeof(msg->payload.inflight) || fd < 0) {
@@ -1618,9 +1652,16 @@  vhost_user_set_inflight_fd(struct virtio_net **pdev, VhostUserMsg *msg,
 		"set_inflight_fd pervq_inflight_size: %d\n",
 		pervq_inflight_size);
 
+	/*
+	 * If VQ 0 has already been allocated, try to allocate on the same
+	 * NUMA node. It can be reallocated later in numa_realloc().
+	 */
+	if (dev->nr_vring > 0)
+		numa_node = dev->virtqueue[0]->numa_node;
+
 	if (!dev->inflight_info) {
-		dev->inflight_info = calloc(1,
-					    sizeof(struct inflight_mem_info));
+		dev->inflight_info = rte_zmalloc_socket("inflight_info",
+				sizeof(struct inflight_mem_info), 0, numa_node);
 		if (dev->inflight_info == NULL) {
 			VHOST_LOG_CONFIG(ERR,
 				"failed to alloc dev inflight area\n");
@@ -1779,19 +1820,21 @@  vhost_check_queue_inflights_split(struct virtio_net *dev,
 	vq->last_avail_idx += resubmit_num;
 
 	if (resubmit_num) {
-		resubmit  = calloc(1, sizeof(struct rte_vhost_resubmit_info));
+		resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),
+				0, vq->numa_node);
 		if (!resubmit) {
 			VHOST_LOG_CONFIG(ERR,
 				"failed to allocate memory for resubmit info.\n");
 			return RTE_VHOST_MSG_RESULT_ERR;
 		}
 
-		resubmit->resubmit_list = calloc(resubmit_num,
-			sizeof(struct rte_vhost_resubmit_desc));
+		resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
+				resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
+				0, vq->numa_node);
 		if (!resubmit->resubmit_list) {
 			VHOST_LOG_CONFIG(ERR,
 				"failed to allocate memory for inflight desc.\n");
-			free(resubmit);
+			rte_free(resubmit);
 			return RTE_VHOST_MSG_RESULT_ERR;
 		}
 
@@ -1873,19 +1916,21 @@  vhost_check_queue_inflights_packed(struct virtio_net *dev,
 	}
 
 	if (resubmit_num) {
-		resubmit = calloc(1, sizeof(struct rte_vhost_resubmit_info));
+		resubmit  = rte_zmalloc_socket("resubmit", sizeof(struct rte_vhost_resubmit_info),
+				0, vq->numa_node);
 		if (resubmit == NULL) {
 			VHOST_LOG_CONFIG(ERR,
 				"failed to allocate memory for resubmit info.\n");
 			return RTE_VHOST_MSG_RESULT_ERR;
 		}
 
-		resubmit->resubmit_list = calloc(resubmit_num,
-			sizeof(struct rte_vhost_resubmit_desc));
+		resubmit->resubmit_list = rte_zmalloc_socket("resubmit_list",
+				resubmit_num * sizeof(struct rte_vhost_resubmit_desc),
+				0, vq->numa_node);
 		if (resubmit->resubmit_list == NULL) {
 			VHOST_LOG_CONFIG(ERR,
 				"failed to allocate memory for resubmit desc.\n");
-			free(resubmit);
+			rte_free(resubmit);
 			return RTE_VHOST_MSG_RESULT_ERR;
 		}