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

nvmf/tcp: switch to spdk_*malloc()

Browse Source 
spdk_dma_*malloc() is about to be deprecated.

Change-Id: Ic42db528bbae4b3ca2e91cb9ac46def99ecb5f28
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459431
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-06-26 11:20:32 +02:00 committed by Changpeng Liu
parent e3e524306b
commit 36ccca2c08
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/nvmf/tcp.c
View File

@ -498,8 +498,8 @@ spdk_nvmf_tcp_qpair_destroy(struct spdk_nvmf_tcp_qpair *tqpair)
free(tqpair->pdu_pool); free(tqpair->pdu_pool);
free(tqpair->req); free(tqpair->req);
free(tqpair->reqs); free(tqpair->reqs);
spdk_dma_free(tqpair->buf); spdk_free(tqpair->buf);
spdk_dma_free(tqpair->bufs); spdk_free(tqpair->bufs);
free(tqpair); free(tqpair);
SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "Leave\n"); 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) { 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) { if (!tqpair->buf) {
SPDK_ERRLOG("Unable to allocate buf on tqpair=%p.\n", tqpair); SPDK_ERRLOG("Unable to allocate buf on tqpair=%p.\n", tqpair);
return -1; 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) { 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) { if (!tqpair->bufs) {
SPDK_ERRLOG("Unable to allocate bufs on tqpair=%p.\n", tqpair); SPDK_ERRLOG("Unable to allocate bufs on tqpair=%p.\n", tqpair);
return -1; return -1;