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

test/nvme/e2edp: switch to spdk_*malloc().

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

Change-Id: I749a557ab95162aa9bb91bf0ec9b53146c50fb0f
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459556
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-06-27 07:16:14 +02:00 committed by Changpeng Liu
parent 3708070daf
commit 294ac20b0f
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
test/nvme/e2edp/nvme_dp.c
View File

@ -143,7 +143,8 @@ static uint32_t dp_guard_check_extended_lba_test(struct spdk_nvme_ns *ns, struct
sector_size = spdk_nvme_ns_get_sector_size(ns); sector_size = spdk_nvme_ns_get_sector_size(ns);
md_size = spdk_nvme_ns_get_md_size(ns); md_size = spdk_nvme_ns_get_md_size(ns);
req->contig = spdk_dma_zmalloc((sector_size + md_size) * req->lba_count, 0x1000, NULL); req->contig = spdk_zmalloc((sector_size + md_size) * req->lba_count, 0x1000, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!req->contig) { if (!req->contig) {
return 0; return 0;
} }
@ -180,7 +181,8 @@ static uint32_t dp_with_pract_test(struct spdk_nvme_ns *ns, struct io_request *r
sector_size = spdk_nvme_ns_get_sector_size(ns); sector_size = spdk_nvme_ns_get_sector_size(ns);
/* No additional metadata buffer provided */ /* No additional metadata buffer provided */
req->contig = spdk_dma_zmalloc(sector_size * req->lba_count, 0x1000, NULL); req->contig = spdk_zmalloc(sector_size * req->lba_count, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY,
SPDK_MALLOC_DMA);
if (!req->contig) { if (!req->contig) {
return 0; return 0;
} }
@ -229,7 +231,8 @@ static uint32_t dp_without_pract_extended_lba_test(struct spdk_nvme_ns *ns, stru
sector_size = spdk_nvme_ns_get_sector_size(ns); sector_size = spdk_nvme_ns_get_sector_size(ns);
md_size = spdk_nvme_ns_get_md_size(ns); md_size = spdk_nvme_ns_get_md_size(ns);
req->contig = spdk_dma_zmalloc((sector_size + md_size) * req->lba_count, 0x1000, NULL); req->contig = spdk_zmalloc((sector_size + md_size) * req->lba_count, 0x1000, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!req->contig) { if (!req->contig) {
return 0; return 0;
} }
@ -265,7 +268,8 @@ static uint32_t dp_without_flags_extended_lba_test(struct spdk_nvme_ns *ns, stru
sector_size = spdk_nvme_ns_get_sector_size(ns); sector_size = spdk_nvme_ns_get_sector_size(ns);
md_size = spdk_nvme_ns_get_md_size(ns); md_size = spdk_nvme_ns_get_md_size(ns);
req->contig = spdk_dma_zmalloc((sector_size + md_size) * req->lba_count, 0x1000, NULL); req->contig = spdk_zmalloc((sector_size + md_size) * req->lba_count, 0x1000, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!req->contig) { if (!req->contig) {
return 0; return 0;
} }
@ -301,14 +305,16 @@ static uint32_t dp_without_pract_separate_meta_test(struct spdk_nvme_ns *ns, str
sector_size = spdk_nvme_ns_get_sector_size(ns); sector_size = spdk_nvme_ns_get_sector_size(ns);
md_size = spdk_nvme_ns_get_md_size(ns); md_size = spdk_nvme_ns_get_md_size(ns);
req->contig = spdk_dma_zmalloc(sector_size * req->lba_count, 0x1000, NULL); req->contig = spdk_zmalloc(sector_size * req->lba_count, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY,
SPDK_MALLOC_DMA);
if (!req->contig) { if (!req->contig) {
return 0; return 0;
} }
req->metadata = spdk_dma_zmalloc(md_size * req->lba_count, 0x1000, NULL); req->metadata = spdk_zmalloc(md_size * req->lba_count, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY,
SPDK_MALLOC_DMA);
if (!req->metadata) { if (!req->metadata) {
spdk_dma_free(req->contig); spdk_free(req->contig);
return 0; return 0;
} }
@ -346,14 +352,16 @@ static uint32_t dp_without_pract_separate_meta_apptag_test(struct spdk_nvme_ns *
sector_size = spdk_nvme_ns_get_sector_size(ns); sector_size = spdk_nvme_ns_get_sector_size(ns);
md_size = spdk_nvme_ns_get_md_size(ns); md_size = spdk_nvme_ns_get_md_size(ns);
req->contig = spdk_dma_zmalloc(sector_size * req->lba_count, 0x1000, NULL); req->contig = spdk_zmalloc(sector_size * req->lba_count, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY,
SPDK_MALLOC_DMA);
if (!req->contig) { if (!req->contig) {
return 0; return 0;
} }
req->metadata = spdk_dma_zmalloc(md_size * req->lba_count, 0x1000, NULL); req->metadata = spdk_zmalloc(md_size * req->lba_count, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY,
SPDK_MALLOC_DMA);
if (!req->metadata) { if (!req->metadata) {
spdk_dma_free(req->contig); spdk_free(req->contig);
return 0; return 0;
} }
@ -389,14 +397,16 @@ static uint32_t dp_without_flags_separate_meta_test(struct spdk_nvme_ns *ns, str
sector_size = spdk_nvme_ns_get_sector_size(ns); sector_size = spdk_nvme_ns_get_sector_size(ns);
md_size = spdk_nvme_ns_get_md_size(ns); md_size = spdk_nvme_ns_get_md_size(ns);
req->contig = spdk_dma_zmalloc(sector_size * req->lba_count, 0x1000, NULL); req->contig = spdk_zmalloc(sector_size * req->lba_count, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY,
SPDK_MALLOC_DMA);
if (!req->contig) { if (!req->contig) {
return 0; return 0;
} }
req->metadata = spdk_dma_zmalloc(md_size * req->lba_count, 0x1000, NULL); req->metadata = spdk_zmalloc(md_size * req->lba_count, 0x1000, NULL, SPDK_ENV_LCORE_ID_ANY,
SPDK_MALLOC_DMA);
if (!req->metadata) { if (!req->metadata) {
spdk_dma_free(req->contig); spdk_free(req->contig);
return 0; return 0;
} }
@ -418,14 +428,14 @@ free_req(struct io_request *req)
} }
if (req->contig) { if (req->contig) {
spdk_dma_free(req->contig); spdk_free(req->contig);
} }
if (req->metadata) { if (req->metadata) {
spdk_dma_free(req->metadata); spdk_free(req->metadata);
} }
spdk_dma_free(req); spdk_free(req);
} }
static int static int
@ -484,7 +494,7 @@ write_read_e2e_dp_tests(struct dev *dev, nvme_build_io_req_fn_t build_io_fn, con
return 0; return 0;
} }
req = spdk_dma_zmalloc(sizeof(*req), 0, NULL); req = spdk_zmalloc(sizeof(*req), 0, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!req) { if (!req) {
fprintf(stderr, "Allocate request failed\n"); fprintf(stderr, "Allocate request failed\n");
return 0; return 0;