From 096c81b99cce642cc835d28bb6730a3dd03d8795 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 29 Nov 2021 12:05:23 +0100 Subject: [PATCH] env: rename deprecated DPDK MEMPOOL_F_* flags 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 Change-Id: I7c1c8818b47c5fc6e547c9b798fdc161e39f1cc5 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10454 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/env_dpdk/env.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/env_dpdk/env.c b/lib/env_dpdk/env.c index b51020c7e..8374360ff 100644 --- a/lib/env_dpdk/env.c +++ b/lib/env_dpdk/env.c @@ -223,6 +223,13 @@ spdk_mempool_create_ctor(const char *name, size_t count, { struct rte_mempool *mp; 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) { 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, 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; }