[1/2] mempool: remove v20 ABI

  Remove the deprecated v20 ABI of rte_mempool_populate_iova() and
rte_mempool_populate_virt().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_mempool/meson.build             |  2 -
 lib/librte_mempool/rte_mempool.c           | 79 ++--------------------
 lib/librte_mempool/rte_mempool_version.map |  7 --
 3 files changed, 5 insertions(+), 83 deletions(-)
  

On Tue, Oct 06, 2020 at 09:07:49AM +0200, Olivier Matz wrote:
> Remove the deprecated v20 ABI of rte_mempool_populate_iova() and
> rte_mempool_populate_virt().
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
>  lib/librte_mempool/meson.build             |  2 -
>  lib/librte_mempool/rte_mempool.c           | 79 ++--------------------
>  lib/librte_mempool/rte_mempool_version.map |  7 --
>  3 files changed, 5 insertions(+), 83 deletions(-)
> 
Thanks for the cleanup.

Series-acked-by: Bruce Richardson <bruce.richardson@intel.com>
  

On Tue, Oct 6, 2020 at 9:08 AM Olivier Matz <olivier.matz@6wind.com> wrote:
>
> Remove the deprecated v20 ABI of rte_mempool_populate_iova() and
> rte_mempool_populate_virt().
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
>  lib/librte_mempool/meson.build             |  2 -
>  lib/librte_mempool/rte_mempool.c           | 79 ++--------------------
>  lib/librte_mempool/rte_mempool_version.map |  7 --
>  3 files changed, 5 insertions(+), 83 deletions(-)
>
> diff --git a/lib/librte_mempool/meson.build b/lib/librte_mempool/meson.build
> index 7dbe6b9bea..a6e861cbfc 100644
> --- a/lib/librte_mempool/meson.build
> +++ b/lib/librte_mempool/meson.build
> @@ -9,8 +9,6 @@ foreach flag: extra_flags
>         endif
>  endforeach
>
> -use_function_versioning = true
> -
>  sources = files('rte_mempool.c', 'rte_mempool_ops.c',
>                 'rte_mempool_ops_default.c', 'mempool_trace_points.c')
>  headers = files('rte_mempool.h', 'rte_mempool_trace.h',
> diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
> index 7774f0c8da..0e3a2a7635 100644
> --- a/lib/librte_mempool/rte_mempool.c
> +++ b/lib/librte_mempool/rte_mempool.c
> @@ -30,7 +30,6 @@
>  #include <rte_string_fns.h>
>  #include <rte_spinlock.h>
>  #include <rte_tailq.h>
> -#include <rte_function_versioning.h>
>  #include <rte_eal_paging.h>
>
>
> @@ -305,17 +304,12 @@ mempool_ops_alloc_once(struct rte_mempool *mp)
>         return 0;
>  }
>
> -__vsym int
> -rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
> -       rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
> -       void *opaque);
> -
>  /* Add objects in the pool, using a physically contiguous memory
>   * zone. Return the number of objects added, or a negative value
>   * on error.
>   */
> -__vsym int
> -rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
> +int
> +rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
>         rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
>         void *opaque)
>  {
> @@ -375,35 +369,6 @@ rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
>         return ret;
>  }
>
> -BIND_DEFAULT_SYMBOL(rte_mempool_populate_iova, _v21, 21);
> -MAP_STATIC_SYMBOL(
> -       int rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
> -                               rte_iova_t iova, size_t len,
> -                               rte_mempool_memchunk_free_cb_t *free_cb,
> -                               void *opaque),
> -       rte_mempool_populate_iova_v21);
> -
> -__vsym int
> -rte_mempool_populate_iova_v20(struct rte_mempool *mp, char *vaddr,
> -       rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
> -       void *opaque);
> -
> -__vsym int
> -rte_mempool_populate_iova_v20(struct rte_mempool *mp, char *vaddr,
> -       rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
> -       void *opaque)
> -{
> -       int ret;
> -
> -       ret = rte_mempool_populate_iova_v21(mp, vaddr, iova, len, free_cb,
> -                                       opaque);
> -       if (ret == 0)
> -               ret = -EINVAL;
> -
> -       return ret;
> -}
> -VERSION_SYMBOL(rte_mempool_populate_iova, _v20, 20.0);
> -
>  static rte_iova_t
>  get_iova(void *addr)
>  {
> @@ -417,16 +382,11 @@ get_iova(void *addr)
>         return ms->iova + RTE_PTR_DIFF(addr, ms->addr);
>  }
>
> -__vsym int
> -rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
> -       size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
> -       void *opaque);
> -
>  /* Populate the mempool with a virtual area. Return the number of
>   * objects added, or a negative value on error.
>   */
> -__vsym int
> -rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
> +int
> +rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
>         size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
>         void *opaque)
>  {
> @@ -459,7 +419,7 @@ rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
>                                 break;
>                 }
>
> -               ret = rte_mempool_populate_iova_v21(mp, addr + off, iova,
> +               ret = rte_mempool_populate_iova(mp, addr + off, iova,
>                         phys_len, free_cb, opaque);
>                 if (ret == 0)
>                         continue;
> @@ -477,35 +437,6 @@ rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
>         rte_mempool_free_memchunks(mp);
>         return ret;
>  }
> -BIND_DEFAULT_SYMBOL(rte_mempool_populate_virt, _v21, 21);
> -MAP_STATIC_SYMBOL(
> -       int rte_mempool_populate_virt(struct rte_mempool *mp,
> -                               char *addr, size_t len, size_t pg_sz,
> -                               rte_mempool_memchunk_free_cb_t *free_cb,
> -                               void *opaque),
> -       rte_mempool_populate_virt_v21);
> -
> -__vsym int
> -rte_mempool_populate_virt_v20(struct rte_mempool *mp, char *addr,
> -       size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
> -       void *opaque);
> -
> -__vsym int
> -rte_mempool_populate_virt_v20(struct rte_mempool *mp, char *addr,
> -       size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
> -       void *opaque)
> -{
> -       int ret;
> -
> -       ret = rte_mempool_populate_virt_v21(mp, addr, len, pg_sz,
> -                                               free_cb, opaque);
> -
> -       if (ret == 0)
> -               ret = -EINVAL;
> -
> -       return ret;
> -}
> -VERSION_SYMBOL(rte_mempool_populate_virt, _v20, 20.0);
>
>  /* Get the minimal page size used in a mempool before populating it. */
>  int
> diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
> index 50e22ee020..83760ecfc9 100644
> --- a/lib/librte_mempool/rte_mempool_version.map
> +++ b/lib/librte_mempool/rte_mempool_version.map
> @@ -31,13 +31,6 @@ DPDK_21 {
>         local: *;
>  };
>
> -DPDK_20.0 {
> -       global:
> -
> -       rte_mempool_populate_iova;
> -       rte_mempool_populate_virt;
> -};
> -
>  EXPERIMENTAL {
>         global:
>
> --
> 2.25.1
>

For the series,
Reviewed-by: David Marchand <david.marchand@redhat.com>
  

On Tue, Oct 6, 2020 at 9:08 AM Olivier Matz <olivier.matz@6wind.com> wrote:
>
> Remove the deprecated v20 ABI of rte_mempool_populate_iova() and
> rte_mempool_populate_virt().
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>

Series applied, thanks Olivier.