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

nvme: return NSID from spdk_nvme_ctrlr_create_ns()

Browse Source 
Previously, there was no way to determine what namespace ID was assigned
when a namespace was created via the NVMe library interface.

Also drop the incorrect comment about calling
spdk_nvme_ctrlr_process_admin_completions(), since
spdk_nvme_ctrlr_create_ns() checks the admin queue internally.

Change-Id: If90a6e9fc773aefa220ebbf6effc2d033c9f20cc
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-05-18 17:05:38 -07:00
parent 8f876a612f
commit 4957d2642a
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/nvme/nvme_manage/nvme_manage.c
View File

@ -439,7 +439,7 @@ static void
ns_manage_add(struct dev *device, uint64_t ns_size, uint64_t ns_capacity, int ns_lbasize, ns_manage_add(struct dev *device, uint64_t ns_size, uint64_t ns_capacity, int ns_lbasize,
uint8_t ns_dps_type, uint8_t ns_dps_location, uint8_t ns_nmic) uint8_t ns_dps_type, uint8_t ns_dps_location, uint8_t ns_nmic)
{ {
int ret = 0; uint32_t nsid;
struct spdk_nvme_ns_data *ndata; struct spdk_nvme_ns_data *ndata;
ndata = rte_zmalloc("nvme namespace data", sizeof(struct spdk_nvme_ns_data), 4096); ndata = rte_zmalloc("nvme namespace data", sizeof(struct spdk_nvme_ns_data), 4096);
@ -456,9 +456,11 @@ ns_manage_add(struct dev *device, uint64_t ns_size, uint64_t ns_capacity, int ns
ndata->dps.md_start = ns_dps_location; ndata->dps.md_start = ns_dps_location;
} }
ndata->nmic.can_share = ns_nmic; ndata->nmic.can_share = ns_nmic;
ret = spdk_nvme_ctrlr_create_ns(device->ctrlr, ndata); nsid = spdk_nvme_ctrlr_create_ns(device->ctrlr, ndata);
if (ret) { if (nsid == 0) {
fprintf(stdout, "ns manage: Failed\n"); fprintf(stdout, "ns manage: Failed\n");
} else {
printf("Created namespace ID %u\n", nsid);
} }
rte_free(ndata); rte_free(ndata);

8
include/spdk/nvme.h
View File

@ -442,14 +442,12 @@ int spdk_nvme_ctrlr_detach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
* \param ctrlr NVMe controller to create namespace on. * \param ctrlr NVMe controller to create namespace on.
* \param payload The pointer to the NVMe namespace data. * \param payload The pointer to the NVMe namespace data.
* *
* \return 0 if successfully submitted, ENOMEM if resources could not be allocated for this request * \return Namespace ID (>= 1) if successfully created, or 0 if the request failed.
* *
* This function is thread safe and can be called at any point after spdk_nvme_attach(). * This function is thread safe and can be called at any point after spdk_nvme_attach().
*
* Call \ref spdk_nvme_ctrlr_process_admin_completions() to poll for completion
* of commands submitted through this function.
*/ */
int spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_data *payload); uint32_t spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr,
struct spdk_nvme_ns_data *payload);
/** /**
* \brief Delete a namespace. * \brief Delete a namespace.

14
lib/nvme/nvme_ctrlr.c
View File

@ -1231,7 +1231,7 @@ spdk_nvme_ctrlr_detach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
return spdk_nvme_ctrlr_reset(ctrlr); return spdk_nvme_ctrlr_reset(ctrlr);
} }
int uint32_t
spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_data *payload) spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_data *payload)
{ {
struct nvme_completion_poll_status status; struct nvme_completion_poll_status status;
@ -1240,7 +1240,7 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat
status.done = false; status.done = false;
res = nvme_ctrlr_cmd_create_ns(ctrlr, payload, nvme_completion_poll_cb, &status); res = nvme_ctrlr_cmd_create_ns(ctrlr, payload, nvme_completion_poll_cb, &status);
if (res) if (res)
return res; return 0;
while (status.done == false) { while (status.done == false) {
nvme_mutex_lock(&ctrlr->ctrlr_lock); nvme_mutex_lock(&ctrlr->ctrlr_lock);
spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0); spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);
@ -1248,10 +1248,16 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat
} }
if (spdk_nvme_cpl_is_error(&status.cpl)) { if (spdk_nvme_cpl_is_error(&status.cpl)) {
nvme_printf(ctrlr, "spdk_nvme_ctrlr_create_ns failed!\n"); nvme_printf(ctrlr, "spdk_nvme_ctrlr_create_ns failed!\n");
return ENXIO; return 0;
} }
return spdk_nvme_ctrlr_reset(ctrlr); res = spdk_nvme_ctrlr_reset(ctrlr);
if (res) {
return 0;
}
/* Return the namespace ID that was created */
return status.cpl.cdw0;
} }
int int