From 9b5dabff7fea1b93cc839fce6123d894c49411e3 Mon Sep 17 00:00:00 2001 From: Or Gerlitz Date: Thu, 12 May 2022 15:19:21 +0000 Subject: [PATCH] nvme/rdma: Always use spdk allocation scheme Use the conventional huge-pages based spdk allocation scheme for the initiator data-structures unconditionally. Change-Id: I5baee7614e3ac9b5497b3d771dfddfbaa7fdf65b Signed-off-by: Or Gerlitz Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12687 Community-CI: Broadcom CI Reviewed-by: Aleksey Marchuk Reviewed-by: Dong Yi Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- lib/nvme/nvme_rdma.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index 2c2936a8b..b564a8518 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -404,21 +404,13 @@ nvme_rdma_calloc(size_t nmemb, size_t size) return NULL; } - if (!g_nvme_hooks.get_rkey) { - return calloc(nmemb, size); - } else { - return spdk_zmalloc(nmemb * size, 0, NULL, SPDK_ENV_SOCKET_ID_ANY, SPDK_MALLOC_DMA); - } + return spdk_zmalloc(nmemb * size, 0, NULL, SPDK_ENV_SOCKET_ID_ANY, SPDK_MALLOC_DMA); } static inline void nvme_rdma_free(void *buf) { - if (!g_nvme_hooks.get_rkey) { - free(buf); - } else { - spdk_free(buf); - } + spdk_free(buf); } static int nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr,