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

reduce: switch to spdk_*malloc()

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

Change-Id: I140e10b2fd07efb48e664cfa00e1d60f604abd21
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449797
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Darek Stojaczyk 2019-06-26 11:13:44 +02:00
parent 67066ade3c
commit 4617707d07
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/reduce/reduce.c
View File

@ -336,14 +336,15 @@ _allocate_vol_requests(struct spdk_reduce_vol *vol)
/* Allocate 2x since we need buffers for both read/write and compress/decompress /* Allocate 2x since we need buffers for both read/write and compress/decompress
* intermediate buffers. * intermediate buffers.
*/ */
vol->buf_mem = spdk_dma_malloc(2 * REDUCE_NUM_VOL_REQUESTS * vol->params.chunk_size, 64, NULL); vol->buf_mem = spdk_malloc(2 * REDUCE_NUM_VOL_REQUESTS * vol->params.chunk_size,
64, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (vol->buf_mem == NULL) { if (vol->buf_mem == NULL) {
return -ENOMEM; return -ENOMEM;
} }
vol->request_mem = calloc(REDUCE_NUM_VOL_REQUESTS, sizeof(*req)); vol->request_mem = calloc(REDUCE_NUM_VOL_REQUESTS, sizeof(*req));
if (vol->request_mem == NULL) { if (vol->request_mem == NULL) {
spdk_dma_free(vol->buf_mem); spdk_free(vol->buf_mem);
vol->buf_mem = NULL; vol->buf_mem = NULL;
return -ENOMEM; return -ENOMEM;
} }
@ -355,7 +356,7 @@ _allocate_vol_requests(struct spdk_reduce_vol *vol)
2 * sizeof(struct iovec) * vol->backing_io_units_per_chunk); 2 * sizeof(struct iovec) * vol->backing_io_units_per_chunk);
if (vol->buf_iov_mem == NULL) { if (vol->buf_iov_mem == NULL) {
free(vol->request_mem); free(vol->request_mem);
spdk_dma_free(vol->buf_mem); spdk_free(vol->buf_mem);
vol->request_mem = NULL; vol->request_mem = NULL;
vol->buf_mem = NULL; vol->buf_mem = NULL;
return -ENOMEM; return -ENOMEM;
@ -377,7 +378,7 @@ static void
_init_load_cleanup(struct spdk_reduce_vol *vol, struct reduce_init_load_ctx *ctx) _init_load_cleanup(struct spdk_reduce_vol *vol, struct reduce_init_load_ctx *ctx)
{ {
if (ctx != NULL) { if (ctx != NULL) {
spdk_dma_free(ctx->path); spdk_free(ctx->path);
free(ctx); free(ctx);
} }
@ -386,12 +387,12 @@ _init_load_cleanup(struct spdk_reduce_vol *vol, struct reduce_init_load_ctx *ctx
pmem_unmap(vol->pm_file.pm_buf, vol->pm_file.size); pmem_unmap(vol->pm_file.pm_buf, vol->pm_file.size);
} }
spdk_dma_free(vol->backing_super); spdk_free(vol->backing_super);
spdk_bit_array_free(&vol->allocated_chunk_maps); spdk_bit_array_free(&vol->allocated_chunk_maps);
spdk_bit_array_free(&vol->allocated_backing_io_units); spdk_bit_array_free(&vol->allocated_backing_io_units);
free(vol->request_mem); free(vol->request_mem);
free(vol->buf_iov_mem); free(vol->buf_iov_mem);
spdk_dma_free(vol->buf_mem); spdk_free(vol->buf_mem);
free(vol); free(vol);
} }
} }
@ -517,7 +518,8 @@ spdk_reduce_vol_init(struct spdk_reduce_vol_params *params,
TAILQ_INIT(&vol->executing_requests); TAILQ_INIT(&vol->executing_requests);
TAILQ_INIT(&vol->queued_requests); TAILQ_INIT(&vol->queued_requests);
vol->backing_super = spdk_dma_zmalloc(sizeof(*vol->backing_super), 0, NULL); vol->backing_super = spdk_zmalloc(sizeof(*vol->backing_super), 0, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (vol->backing_super == NULL) { if (vol->backing_super == NULL) {
cb_fn(cb_arg, NULL, -ENOMEM); cb_fn(cb_arg, NULL, -ENOMEM);
_init_load_cleanup(vol, NULL); _init_load_cleanup(vol, NULL);
@ -531,7 +533,8 @@ spdk_reduce_vol_init(struct spdk_reduce_vol_params *params,
return; return;
} }
init_ctx->path = spdk_dma_zmalloc(REDUCE_PATH_MAX, 0, NULL); init_ctx->path = spdk_zmalloc(REDUCE_PATH_MAX, 0, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (init_ctx->path == NULL) { if (init_ctx->path == NULL) {
cb_fn(cb_arg, NULL, -ENOMEM); cb_fn(cb_arg, NULL, -ENOMEM);
_init_load_cleanup(vol, init_ctx); _init_load_cleanup(vol, init_ctx);
@ -726,7 +729,8 @@ spdk_reduce_vol_load(struct spdk_reduce_backing_dev *backing_dev,
TAILQ_INIT(&vol->executing_requests); TAILQ_INIT(&vol->executing_requests);
TAILQ_INIT(&vol->queued_requests); TAILQ_INIT(&vol->queued_requests);
vol->backing_super = spdk_dma_zmalloc(sizeof(*vol->backing_super), 64, NULL); vol->backing_super = spdk_zmalloc(sizeof(*vol->backing_super), 64, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (vol->backing_super == NULL) { if (vol->backing_super == NULL) {
_init_load_cleanup(vol, NULL); _init_load_cleanup(vol, NULL);
cb_fn(cb_arg, NULL, -ENOMEM); cb_fn(cb_arg, NULL, -ENOMEM);
@ -742,7 +746,8 @@ spdk_reduce_vol_load(struct spdk_reduce_backing_dev *backing_dev,
return; return;
} }
load_ctx->path = spdk_dma_zmalloc(REDUCE_PATH_MAX, 64, NULL); load_ctx->path = spdk_zmalloc(REDUCE_PATH_MAX, 64, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (load_ctx->path == NULL) { if (load_ctx->path == NULL) {
_init_load_cleanup(vol, load_ctx); _init_load_cleanup(vol, load_ctx);
cb_fn(cb_arg, NULL, -ENOMEM); cb_fn(cb_arg, NULL, -ENOMEM);
@ -808,7 +813,7 @@ destroy_unload_cpl(void *cb_arg, int reduce_errno)
* actually destroyed. * actually destroyed.
*/ */
destroy_ctx->cb_fn(destroy_ctx->cb_arg, destroy_ctx->reduce_errno); destroy_ctx->cb_fn(destroy_ctx->cb_arg, destroy_ctx->reduce_errno);
spdk_dma_free(destroy_ctx->super); spdk_free(destroy_ctx->super);
free(destroy_ctx); free(destroy_ctx);
} }
@ -829,7 +834,7 @@ destroy_load_cb(void *cb_arg, struct spdk_reduce_vol *vol, int reduce_errno)
if (reduce_errno != 0) { if (reduce_errno != 0) {
destroy_ctx->cb_fn(destroy_ctx->cb_arg, reduce_errno); destroy_ctx->cb_fn(destroy_ctx->cb_arg, reduce_errno);
spdk_dma_free(destroy_ctx->super); spdk_free(destroy_ctx->super);
free(destroy_ctx); free(destroy_ctx);
return; return;
} }
@ -857,7 +862,8 @@ spdk_reduce_vol_destroy(struct spdk_reduce_backing_dev *backing_dev,
return; return;
} }
destroy_ctx->super = spdk_dma_zmalloc(sizeof(*destroy_ctx->super), 64, NULL); destroy_ctx->super = spdk_zmalloc(sizeof(*destroy_ctx->super), 64, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (destroy_ctx->super == NULL) { if (destroy_ctx->super == NULL) {
free(destroy_ctx); free(destroy_ctx);
cb_fn(cb_arg, -ENOMEM); cb_fn(cb_arg, -ENOMEM);

1
test/unit/lib/reduce/reduce.c/reduce_ut.c
View File

@ -1002,7 +1002,6 @@ destroy(void)
CU_ASSERT(g_reduce_errno == 0); CU_ASSERT(g_reduce_errno == 0);
g_reduce_errno = -1; g_reduce_errno = -1;
MOCK_CLEAR(spdk_dma_zmalloc);
MOCK_CLEAR(spdk_malloc); MOCK_CLEAR(spdk_malloc);
MOCK_CLEAR(spdk_zmalloc); MOCK_CLEAR(spdk_zmalloc);
spdk_reduce_vol_destroy(&backing_dev, destroy_cb, NULL); spdk_reduce_vol_destroy(&backing_dev, destroy_cb, NULL);