From 36ccca2c08b8db65bdc9e73945a639d7f95a4eb3 Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Wed, 26 Jun 2019 11:20:32 +0200 Subject: [PATCH] nvmf/tcp: switch to spdk_*malloc() spdk_dma_*malloc() is about to be deprecated. Change-Id: Ic42db528bbae4b3ca2e91cb9ac46def99ecb5f28 Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459431 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu --- lib/nvmf/tcp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 60d694747..8d7ed0a3b 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -498,8 +498,8 @@ spdk_nvmf_tcp_qpair_destroy(struct spdk_nvmf_tcp_qpair *tqpair) free(tqpair->pdu_pool); free(tqpair->req); free(tqpair->reqs); - spdk_dma_free(tqpair->buf); - spdk_dma_free(tqpair->bufs); + spdk_free(tqpair->buf); + spdk_free(tqpair->bufs); free(tqpair); SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "Leave\n"); } @@ -941,7 +941,9 @@ spdk_nvmf_tcp_qpair_init_mem_resource(struct spdk_nvmf_tcp_qpair *tqpair, uint16 } if (in_capsule_data_size) { - tqpair->buf = spdk_dma_zmalloc(in_capsule_data_size, 0x1000, NULL); + tqpair->buf = spdk_zmalloc(in_capsule_data_size, 0x1000, + NULL, SPDK_ENV_LCORE_ID_ANY, + SPDK_MALLOC_DMA); if (!tqpair->buf) { SPDK_ERRLOG("Unable to allocate buf on tqpair=%p.\n", tqpair); return -1; @@ -983,7 +985,9 @@ spdk_nvmf_tcp_qpair_init_mem_resource(struct spdk_nvmf_tcp_qpair *tqpair, uint16 } if (in_capsule_data_size) { - tqpair->bufs = spdk_dma_zmalloc(size * in_capsule_data_size, 0x1000, NULL); + tqpair->bufs = spdk_zmalloc(size * in_capsule_data_size, 0x1000, + NULL, SPDK_ENV_LCORE_ID_ANY, + SPDK_MALLOC_DMA); if (!tqpair->bufs) { SPDK_ERRLOG("Unable to allocate bufs on tqpair=%p.\n", tqpair); return -1;