ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env: rename deprecated DPDK MEMPOOL_F_* flags

Browse Source 
Starting with DPDK 21.11 MEMPOOL_F_* flags were renamed
to RTE_MEMPOOL_F_*. See DPDK patch below:
(c47d7b90)mempool: add namespace to flags

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I7c1c8818b47c5fc6e547c9b798fdc161e39f1cc5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10454
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Tomasz Zawadzki 2021-11-29 12:05:23 +01:00 committed by Keith Lucas
parent fecf8a1106
commit 096c81b99c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/env_dpdk/env.c
View File

@ -223,6 +223,13 @@ spdk_mempool_create_ctor(const char *name, size_t count,
{ {
struct rte_mempool *mp; struct rte_mempool *mp;
size_t tmp; size_t tmp;
unsigned dpdk_flags = 0;
#if RTE_VERSION >= RTE_VERSION_NUM(21, 11, 0, 0)
dpdk_flags |= RTE_MEMPOOL_F_NO_IOVA_CONTIG;
#else
dpdk_flags |= MEMPOOL_F_NO_IOVA_CONTIG;
#endif
if (socket_id == SPDK_ENV_SOCKET_ID_ANY) { if (socket_id == SPDK_ENV_SOCKET_ID_ANY) {
socket_id = SOCKET_ID_ANY; socket_id = SOCKET_ID_ANY;
@ -240,7 +247,7 @@ spdk_mempool_create_ctor(const char *name, size_t count,
mp = rte_mempool_create(name, count, ele_size, cache_size, mp = rte_mempool_create(name, count, ele_size, cache_size,
0, NULL, NULL, (rte_mempool_obj_cb_t *)obj_init, obj_init_arg, 0, NULL, NULL, (rte_mempool_obj_cb_t *)obj_init, obj_init_arg,
socket_id, MEMPOOL_F_NO_IOVA_CONTIG); socket_id, dpdk_flags);
return (struct spdk_mempool *)mp; return (struct spdk_mempool *)mp;
} }