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

mempool: remove v20 ABI compatibility

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

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
This commit is contained in:
Olivier Matz 2020-10-06 09:07:49 +02:00 committed by David Marchand
parent ba156cdf70
commit 9b427d5229
3 changed files with 5 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/librte_mempool/meson.build
View File

@ -9,8 +9,6 @@ foreach flag: extra_flags
endif endif
endforeach endforeach
use_function_versioning = true
sources = files('rte_mempool.c', 'rte_mempool_ops.c', sources = files('rte_mempool.c', 'rte_mempool_ops.c',
'rte_mempool_ops_default.c', 'mempool_trace_points.c') 'rte_mempool_ops_default.c', 'mempool_trace_points.c')
headers = files('rte_mempool.h', 'rte_mempool_trace.h', headers = files('rte_mempool.h', 'rte_mempool_trace.h',

80
lib/librte_mempool/rte_mempool.c
View File

@ -30,10 +30,8 @@
#include <rte_string_fns.h> #include <rte_string_fns.h>
#include <rte_spinlock.h> #include <rte_spinlock.h>
#include <rte_tailq.h> #include <rte_tailq.h>
#include <rte_function_versioning.h>
#include <rte_eal_paging.h> #include <rte_eal_paging.h>
#include "rte_mempool.h" #include "rte_mempool.h"
#include "rte_mempool_trace.h" #include "rte_mempool_trace.h"
@ -305,17 +303,12 @@ mempool_ops_alloc_once(struct rte_mempool *mp)
return 0; 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 /* Add objects in the pool, using a physically contiguous memory
* zone. Return the number of objects added, or a negative value * zone. Return the number of objects added, or a negative value
* on error. * on error.
*/ */
__vsym int int
rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr, 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, rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
void *opaque) void *opaque)
{ {
@ -375,35 +368,6 @@ rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
return ret; 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 static rte_iova_t
get_iova(void *addr) get_iova(void *addr)
{ {
@ -417,16 +381,11 @@ get_iova(void *addr)
return ms->iova + RTE_PTR_DIFF(addr, ms->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 /* Populate the mempool with a virtual area. Return the number of
* objects added, or a negative value on error. * objects added, or a negative value on error.
*/ */
__vsym int int
rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr, 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, size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
void *opaque) void *opaque)
{ {
@ -459,7 +418,7 @@ rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
break; 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); phys_len, free_cb, opaque);
if (ret == 0) if (ret == 0)
continue; continue;
@ -477,35 +436,6 @@ rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
rte_mempool_free_memchunks(mp); rte_mempool_free_memchunks(mp);
return ret; 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. */ /* Get the minimal page size used in a mempool before populating it. */
int int

7
lib/librte_mempool/rte_mempool_version.map
View File

@ -31,13 +31,6 @@ DPDK_21 {
local: *; local: *;
}; };
DPDK_20.0 {
global:
rte_mempool_populate_iova;
rte_mempool_populate_virt;
};
EXPERIMENTAL { EXPERIMENTAL {
global: global: