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

ut/nvme: switch to spdk_*malloc().

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

Change-Id: I305914637ce6ad5d95cce9eb2cf4049e67969a1c
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459561
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-27 07:28:47 +02:00
parent 1dfa34eb68
commit 67066ade3c
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/unit/lib/nvme/nvme.c/nvme_ut.c
View File

@ -531,7 +531,7 @@ test_nvme_user_copy_cmd_complete(void)
SPDK_CU_ASSERT_FATAL(req.user_buffer != NULL); SPDK_CU_ASSERT_FATAL(req.user_buffer != NULL);
memset(req.user_buffer, 0, buff_size); memset(req.user_buffer, 0, buff_size);
req.payload_size = buff_size; req.payload_size = buff_size;
buff = spdk_dma_zmalloc(buff_size, 0x100, NULL); buff = spdk_zmalloc(buff_size, 0x100, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
SPDK_CU_ASSERT_FATAL(buff != NULL); SPDK_CU_ASSERT_FATAL(buff != NULL);
req.payload = NVME_PAYLOAD_CONTIG(buff, NULL); req.payload = NVME_PAYLOAD_CONTIG(buff, NULL);
memcpy(buff, &test_data, buff_size); memcpy(buff, &test_data, buff_size);
@ -551,7 +551,7 @@ test_nvme_user_copy_cmd_complete(void)
*/ */
memset(&ut_spdk_nvme_cpl, 0, sizeof(ut_spdk_nvme_cpl)); memset(&ut_spdk_nvme_cpl, 0, sizeof(ut_spdk_nvme_cpl));
memset(req.user_buffer, 0, buff_size); memset(req.user_buffer, 0, buff_size);
buff = spdk_dma_zmalloc(buff_size, 0x100, NULL); buff = spdk_zmalloc(buff_size, 0x100, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
SPDK_CU_ASSERT_FATAL(buff != NULL); SPDK_CU_ASSERT_FATAL(buff != NULL);
req.payload = NVME_PAYLOAD_CONTIG(buff, NULL); req.payload = NVME_PAYLOAD_CONTIG(buff, NULL);
memcpy(buff, &test_data, buff_size); memcpy(buff, &test_data, buff_size);
@ -690,7 +690,7 @@ test_nvme_allocate_request_user_copy(void)
CU_ASSERT(req->user_buffer == buffer); CU_ASSERT(req->user_buffer == buffer);
CU_ASSERT(req->cb_arg == req); CU_ASSERT(req->cb_arg == req);
CU_ASSERT(memcmp(req->payload.contig_or_cb_arg, buffer, payload_size) == 0); CU_ASSERT(memcmp(req->payload.contig_or_cb_arg, buffer, payload_size) == 0);
spdk_dma_free(req->payload.contig_or_cb_arg); spdk_free(req->payload.contig_or_cb_arg);
/* same thing but additional path coverage, no copy */ /* same thing but additional path coverage, no copy */
host_to_controller = false; host_to_controller = false;
@ -704,16 +704,16 @@ test_nvme_allocate_request_user_copy(void)
CU_ASSERT(req->user_buffer == buffer); CU_ASSERT(req->user_buffer == buffer);
CU_ASSERT(req->cb_arg == req); CU_ASSERT(req->cb_arg == req);
CU_ASSERT(memcmp(req->payload.contig_or_cb_arg, buffer, payload_size) != 0); CU_ASSERT(memcmp(req->payload.contig_or_cb_arg, buffer, payload_size) != 0);
spdk_dma_free(req->payload.contig_or_cb_arg); spdk_free(req->payload.contig_or_cb_arg);
/* good buffer and valid payload size but make spdk_dma_zmalloc fail */ /* good buffer and valid payload size but make spdk_zmalloc fail */
/* set the mock pointer to NULL for spdk_dma_zmalloc */ /* set the mock pointer to NULL for spdk_zmalloc */
MOCK_SET(spdk_dma_zmalloc, NULL); MOCK_SET(spdk_zmalloc, NULL);
req = nvme_allocate_request_user_copy(&qpair, buffer, payload_size, cb_fn, req = nvme_allocate_request_user_copy(&qpair, buffer, payload_size, cb_fn,
cb_arg, host_to_controller); cb_arg, host_to_controller);
CU_ASSERT(req == NULL); CU_ASSERT(req == NULL);
free(buffer); free(buffer);
MOCK_CLEAR(spdk_dma_zmalloc); MOCK_CLEAR(spdk_zmalloc);
} }
static void static void

2
test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
View File

@ -1713,8 +1713,6 @@ test_spdk_nvme_ctrlr_doorbell_buffer_config(void)
ctrlr.page_size = 0x1000; ctrlr.page_size = 0x1000;
MOCK_CLEAR(spdk_malloc); MOCK_CLEAR(spdk_malloc);
MOCK_CLEAR(spdk_zmalloc); MOCK_CLEAR(spdk_zmalloc);
MOCK_CLEAR(spdk_dma_malloc);
MOCK_CLEAR(spdk_dma_zmalloc);
ret = nvme_ctrlr_set_doorbell_buffer_config(&ctrlr); ret = nvme_ctrlr_set_doorbell_buffer_config(&ctrlr);
CU_ASSERT(ret == 0); CU_ASSERT(ret == 0);
nvme_ctrlr_free_doorbell_buffer(&ctrlr); nvme_ctrlr_free_doorbell_buffer(&ctrlr);

12
test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
View File

@ -593,7 +593,7 @@ test_nvme_ns_cmd_dataset_management(void)
CU_ASSERT(g_request->cmd.nsid == ns.id); CU_ASSERT(g_request->cmd.nsid == ns.id);
CU_ASSERT(g_request->cmd.cdw10 == 0); CU_ASSERT(g_request->cmd.cdw10 == 0);
CU_ASSERT(g_request->cmd.cdw11 == SPDK_NVME_DSM_ATTR_DEALLOCATE); CU_ASSERT(g_request->cmd.cdw11 == SPDK_NVME_DSM_ATTR_DEALLOCATE);
spdk_dma_free(g_request->payload.contig_or_cb_arg); spdk_free(g_request->payload.contig_or_cb_arg);
nvme_free_request(g_request); nvme_free_request(g_request);
/* TRIM 256 LBAs */ /* TRIM 256 LBAs */
@ -605,7 +605,7 @@ test_nvme_ns_cmd_dataset_management(void)
CU_ASSERT(g_request->cmd.nsid == ns.id); CU_ASSERT(g_request->cmd.nsid == ns.id);
CU_ASSERT(g_request->cmd.cdw10 == 255u); CU_ASSERT(g_request->cmd.cdw10 == 255u);
CU_ASSERT(g_request->cmd.cdw11 == SPDK_NVME_DSM_ATTR_DEALLOCATE); CU_ASSERT(g_request->cmd.cdw11 == SPDK_NVME_DSM_ATTR_DEALLOCATE);
spdk_dma_free(g_request->payload.contig_or_cb_arg); spdk_free(g_request->payload.contig_or_cb_arg);
nvme_free_request(g_request); nvme_free_request(g_request);
rc = spdk_nvme_ns_cmd_dataset_management(&ns, &qpair, SPDK_NVME_DSM_ATTR_DEALLOCATE, rc = spdk_nvme_ns_cmd_dataset_management(&ns, &qpair, SPDK_NVME_DSM_ATTR_DEALLOCATE,
@ -787,7 +787,7 @@ test_nvme_ns_cmd_reservation_register(void)
CU_ASSERT(g_request->cmd.cdw10 == tmp_cdw10); CU_ASSERT(g_request->cmd.cdw10 == tmp_cdw10);
spdk_dma_free(g_request->payload.contig_or_cb_arg); spdk_free(g_request->payload.contig_or_cb_arg);
nvme_free_request(g_request); nvme_free_request(g_request);
free(payload); free(payload);
cleanup_after_test(&qpair); cleanup_after_test(&qpair);
@ -825,7 +825,7 @@ test_nvme_ns_cmd_reservation_release(void)
CU_ASSERT(g_request->cmd.cdw10 == tmp_cdw10); CU_ASSERT(g_request->cmd.cdw10 == tmp_cdw10);
spdk_dma_free(g_request->payload.contig_or_cb_arg); spdk_free(g_request->payload.contig_or_cb_arg);
nvme_free_request(g_request); nvme_free_request(g_request);
free(payload); free(payload);
cleanup_after_test(&qpair); cleanup_after_test(&qpair);
@ -863,7 +863,7 @@ test_nvme_ns_cmd_reservation_acquire(void)
CU_ASSERT(g_request->cmd.cdw10 == tmp_cdw10); CU_ASSERT(g_request->cmd.cdw10 == tmp_cdw10);
spdk_dma_free(g_request->payload.contig_or_cb_arg); spdk_free(g_request->payload.contig_or_cb_arg);
nvme_free_request(g_request); nvme_free_request(g_request);
free(payload); free(payload);
cleanup_after_test(&qpair); cleanup_after_test(&qpair);
@ -895,7 +895,7 @@ test_nvme_ns_cmd_reservation_report(void)
CU_ASSERT(g_request->cmd.cdw10 == (size / 4)); CU_ASSERT(g_request->cmd.cdw10 == (size / 4));
spdk_dma_free(g_request->payload.contig_or_cb_arg); spdk_free(g_request->payload.contig_or_cb_arg);
nvme_free_request(g_request); nvme_free_request(g_request);
free(payload); free(payload);
cleanup_after_test(&qpair); cleanup_after_test(&qpair);