[dpdk-stable] [PATCH 19.11] vhost: utilize dynamic memory allocator

[Christian Ehrhardt]

On Mon, Aug 30, 2021 at 5:22 AM Chenbo Xia <chenbo.xia at intel.com> wrote:
>
> [ upstream commit 20fd2f91cf2fb45ffc66abd4ca8ab26906cd0d1f ]

Thanks, applied!

> Replace dynamic memory allocator with dpdk memory allocator.
>
> Bugzilla ID: 794
> Fixes: 57589cdfd784 ("vhost: fix missing guest pages table NUMA realloc")
> Cc: stable at dpdk.org
>
> Signed-off-by: Marvin Liu <yong.liu at intel.com>
> Signed-off-by: Chenbo Xia <chenbo.xia at intel.com>
> Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
> ---
>  lib/librte_vhost/vhost_user.c | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index b1c0bef7b6..f35b6423d7 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -198,7 +198,7 @@ vhost_backend_cleanup(struct virtio_net *dev)
>                 dev->mem = NULL;
>         }
>
> -       free(dev->guest_pages);
> +       rte_free(dev->guest_pages);
>         dev->guest_pages = NULL;
>
>         if (dev->log_addr) {
> @@ -939,11 +939,12 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
>         if (dev->nr_guest_pages == dev->max_guest_pages) {
>                 dev->max_guest_pages *= 2;
>                 old_pages = dev->guest_pages;
> -               dev->guest_pages = realloc(dev->guest_pages,
> -                                       dev->max_guest_pages * sizeof(*page));
> -               if (!dev->guest_pages) {
> +               dev->guest_pages = rte_realloc(dev->guest_pages,
> +                                       dev->max_guest_pages * sizeof(*page),
> +                                       RTE_CACHE_LINE_SIZE);
> +               if (dev->guest_pages == NULL) {
>                         RTE_LOG(ERR, VHOST_CONFIG, "cannot realloc guest_pages\n");
> -                       free(old_pages);
> +                       rte_free(old_pages);
>                         return -1;
>                 }
>         }
> @@ -1097,10 +1098,12 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
>                         vhost_user_iotlb_flush_all(dev->virtqueue[i]);
>
>         dev->nr_guest_pages = 0;
> -       if (!dev->guest_pages) {
> +       if (dev->guest_pages == NULL) {
>                 dev->max_guest_pages = 8;
> -               dev->guest_pages = malloc(dev->max_guest_pages *
> -                                               sizeof(struct guest_page));
> +               dev->guest_pages = rte_zmalloc(NULL,
> +                                       dev->max_guest_pages *
> +                                       sizeof(struct guest_page),
> +                                       RTE_CACHE_LINE_SIZE);
>                 if (dev->guest_pages == NULL) {
>                         RTE_LOG(ERR, VHOST_CONFIG,
>                                 "(%d) failed to allocate memory "
> --
> 2.17.1
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd