From 96ec8bff78be48caf1db5d69b31b7d97c4181177 Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Wed, 26 Jun 2019 11:23:23 +0200 Subject: [PATCH] nvmf/rdma: switch to spdk_*malloc() spdk_dma_*malloc() is about to be deprecated. Change-Id: I5bcac50baca785255eb068086e67c07d120b042f Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459432 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- lib/nvmf/rdma.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 4f759e117..1cbce29d9 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -702,9 +702,9 @@ nvmf_rdma_resources_destroy(struct spdk_nvmf_rdma_resources *resources) ibv_dereg_mr(resources->bufs_mr); } - spdk_dma_free(resources->cmds); - spdk_dma_free(resources->cpls); - spdk_dma_free(resources->bufs); + spdk_free(resources->cmds); + spdk_free(resources->cpls); + spdk_free(resources->bufs); free(resources->reqs); free(resources->recvs); free(resources); @@ -730,15 +730,15 @@ nvmf_rdma_resources_create(struct spdk_nvmf_rdma_resource_opts *opts) resources->reqs = calloc(opts->max_queue_depth, sizeof(*resources->reqs)); resources->recvs = calloc(opts->max_queue_depth, sizeof(*resources->recvs)); - resources->cmds = spdk_dma_zmalloc(opts->max_queue_depth * sizeof(*resources->cmds), - 0x1000, NULL); - resources->cpls = spdk_dma_zmalloc(opts->max_queue_depth * sizeof(*resources->cpls), - 0x1000, NULL); + resources->cmds = spdk_zmalloc(opts->max_queue_depth * sizeof(*resources->cmds), + 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA); + resources->cpls = spdk_zmalloc(opts->max_queue_depth * sizeof(*resources->cpls), + 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA); if (opts->in_capsule_data_size > 0) { - resources->bufs = spdk_dma_zmalloc(opts->max_queue_depth * - opts->in_capsule_data_size, - 0x1000, NULL); + resources->bufs = spdk_zmalloc(opts->max_queue_depth * opts->in_capsule_data_size, + 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY, + SPDK_MALLOC_DMA); } if (!resources->reqs || !resources->recvs || !resources->cmds ||