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

nvme: use nvme_malloc for calloc to share ctrlr->ioq among processes

Browse Source 
Change-Id: I480fe43b8ac59c285999eedc2e4c2323c0401a8b
Signed-off-by: GangCao <gang.cao@intel.com>
This commit is contained in:
GangCao 2016-09-22 16:49:07 -04:00 committed by Jim Harris
parent 0babf8ce81
commit b9eedbf403
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nvme/nvme_ctrlr.c
View File

@ -349,6 +349,7 @@ nvme_ctrlr_construct_io_qpairs(struct spdk_nvme_ctrlr *ctrlr)
union spdk_nvme_cap_register cap; union spdk_nvme_cap_register cap;
uint32_t i, num_entries, num_trackers; uint32_t i, num_entries, num_trackers;
int rc; int rc;
uint64_t phys_addr = 0;
if (ctrlr->ioq != NULL) { if (ctrlr->ioq != NULL) {
/* /*
@ -375,7 +376,9 @@ nvme_ctrlr_construct_io_qpairs(struct spdk_nvme_ctrlr *ctrlr)
*/ */
num_trackers = nvme_min(NVME_IO_TRACKERS, (num_entries - 1)); num_trackers = nvme_min(NVME_IO_TRACKERS, (num_entries - 1));
ctrlr->ioq = calloc(ctrlr->opts.num_io_queues, sizeof(struct spdk_nvme_qpair)); ctrlr->ioq = nvme_malloc("nvme_ioq",
ctrlr->opts.num_io_queues * sizeof(struct spdk_nvme_qpair),
64, &phys_addr);
if (ctrlr->ioq == NULL) if (ctrlr->ioq == NULL)
return -1; return -1;
@ -1159,7 +1162,7 @@ nvme_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr)
} }
} }
free(ctrlr->ioq); nvme_free(ctrlr->ioq);
nvme_qpair_destroy(&ctrlr->adminq); nvme_qpair_destroy(&ctrlr->adminq);