From 294ac20b0f0d9dc8119dbb301a2de9bbea3c1382 Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Thu, 27 Jun 2019 07:16:14 +0200 Subject: [PATCH] test/nvme/e2edp: switch to spdk_*malloc(). spdk_dma_*malloc() is about to be deprecated. Change-Id: I749a557ab95162aa9bb91bf0ec9b53146c50fb0f Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459556 Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu --- test/nvme/e2edp/nvme_dp.c | 44 ++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/test/nvme/e2edp/nvme_dp.c b/test/nvme/e2edp/nvme_dp.c index 9afe19000..4bffee93a 100644 --- a/test/nvme/e2edp/nvme_dp.c +++ b/test/nvme/e2edp/nvme_dp.c @@ -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); 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) { 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); /* 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) { 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); 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) { 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); 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) { 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); 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) { 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) { - spdk_dma_free(req->contig); + spdk_free(req->contig); 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); 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) { 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) { - spdk_dma_free(req->contig); + spdk_free(req->contig); 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); 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) { 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) { - spdk_dma_free(req->contig); + spdk_free(req->contig); return 0; } @@ -418,14 +428,14 @@ free_req(struct io_request *req) } if (req->contig) { - spdk_dma_free(req->contig); + spdk_free(req->contig); } if (req->metadata) { - spdk_dma_free(req->metadata); + spdk_free(req->metadata); } - spdk_dma_free(req); + spdk_free(req); } 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; } - 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) { fprintf(stderr, "Allocate request failed\n"); return 0;