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

nvme manage: Add interface for format progress indicator.

Browse Source 
This patch just implement the feature of format progress indicator.
the NVMe available does't support FPI currently.

Change-Id: Ie937591fb1720d8a062354322aabcc95ff14b2d3
Signed-off-by: Cunyin Chang <cunyin.chang@intel.com>
This commit is contained in:
Cunyin Chang 2016-03-08 14:00:07 +08:00
parent 17005b5756
commit 30089f8939
3 changed files with 62 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,10 @@ display_namespace(struct spdk_nvme_ns *ns)
printf("Utilization (in LBAs): %lld (%lldM)\n", printf("Utilization (in LBAs): %lld (%lldM)\n",
(long long)nsdata->nuse, (long long)nsdata->nuse,
(long long)nsdata->nuse / 1024 / 1024); (long long)nsdata->nuse / 1024 / 1024);
printf("Format Progress Indicator: %s\n",
nsdata->fpi.fpi_supported ? "Supported" : "Not Supported");
if (nsdata->fpi.fpi_supported && nsdata->fpi.percentage_remaining)
printf("Formatted Percentage: %d%%\n", 100 - nsdata->fpi.percentage_remaining);
printf("Number of LBA Formats: %d\n", nsdata->nlbaf + 1); printf("Number of LBA Formats: %d\n", nsdata->nlbaf + 1);
printf("Current LBA Format: LBA Format #%02d\n", printf("Current LBA Format: LBA Format #%02d\n",
nsdata->flbas.format); nsdata->flbas.format);

5
include/spdk/nvme_spec.h
View File

@ -910,7 +910,10 @@ struct spdk_nvme_ns_data {
uint8_t raw; uint8_t raw;
} nsrescap; } nsrescap;
/** format progress indicator */ /** format progress indicator */
uint8_t fpi; struct {
uint8_t percentage_remaining : 7;
uint8_t fpi_supported : 1;
} fpi;
uint8_t reserved33; uint8_t reserved33;

99
lib/nvme/nvme_ns.c
View File

@ -39,6 +39,56 @@ _nvme_ns_get_data(struct spdk_nvme_ns *ns)
return &ns->ctrlr->nsdata[ns->id - 1]; return &ns->ctrlr->nsdata[ns->id - 1];
} }
static
int nvme_ns_identify_update(struct spdk_nvme_ns *ns)
{
struct nvme_completion_poll_status status;
struct spdk_nvme_ns_data *nsdata;
int rc;
nsdata = _nvme_ns_get_data(ns);
status.done = false;
rc = nvme_ctrlr_cmd_identify_namespace(ns->ctrlr, ns->id, nsdata,
nvme_completion_poll_cb, &status);
if (rc != 0) {
return rc;
}
while (status.done == false) {
nvme_mutex_lock(&ns->ctrlr->ctrlr_lock);
spdk_nvme_qpair_process_completions(&ns->ctrlr->adminq, 0);
nvme_mutex_unlock(&ns->ctrlr->ctrlr_lock);
}
if (spdk_nvme_cpl_is_error(&status.cpl)) {
nvme_printf(ctrlr, "nvme_identify_namespace failed\n");
return ENXIO;
}
ns->sector_size = 1 << nsdata->lbaf[nsdata->flbas.format].lbads;
ns->sectors_per_max_io = spdk_nvme_ns_get_max_io_xfer_size(ns) / ns->sector_size;
ns->sectors_per_stripe = ns->stripe_size / ns->sector_size;
ns->flags = 0x0000;
if (ns->ctrlr->cdata.oncs.dsm) {
ns->flags |= SPDK_NVME_NS_DEALLOCATE_SUPPORTED;
}
if (ns->ctrlr->cdata.vwc.present) {
ns->flags |= SPDK_NVME_NS_FLUSH_SUPPORTED;
}
if (ns->ctrlr->cdata.oncs.write_zeroes) {
ns->flags |= SPDK_NVME_NS_WRITE_ZEROES_SUPPORTED;
}
if (nsdata->nsrescap.raw) {
ns->flags |= SPDK_NVME_NS_RESERVATION_SUPPORTED;
}
return rc;
}
uint32_t uint32_t
spdk_nvme_ns_get_id(struct spdk_nvme_ns *ns) spdk_nvme_ns_get_id(struct spdk_nvme_ns *ns)
{ {
@ -91,17 +141,14 @@ spdk_nvme_ns_get_flags(struct spdk_nvme_ns *ns)
const struct spdk_nvme_ns_data * const struct spdk_nvme_ns_data *
spdk_nvme_ns_get_data(struct spdk_nvme_ns *ns) spdk_nvme_ns_get_data(struct spdk_nvme_ns *ns)
{ {
nvme_ns_identify_update(ns);
return _nvme_ns_get_data(ns); return _nvme_ns_get_data(ns);
} }
int int nvme_ns_construct(struct spdk_nvme_ns *ns, uint16_t id,
nvme_ns_construct(struct spdk_nvme_ns *ns, uint16_t id, struct spdk_nvme_ctrlr *ctrlr)
struct spdk_nvme_ctrlr *ctrlr)
{ {
struct nvme_completion_poll_status status;
struct spdk_nvme_ns_data *nsdata;
uint32_t pci_devid; uint32_t pci_devid;
int rc;
nvme_assert(id > 0, ("invalid namespace id %d", id)); nvme_assert(id > 0, ("invalid namespace id %d", id));
@ -114,45 +161,7 @@ nvme_ns_construct(struct spdk_nvme_ns *ns, uint16_t id,
ns->stripe_size = (1 << ctrlr->cdata.vs[3]) * ctrlr->min_page_size; ns->stripe_size = (1 << ctrlr->cdata.vs[3]) * ctrlr->min_page_size;
} }
nsdata = _nvme_ns_get_data(ns); return nvme_ns_identify_update(ns);
status.done = false;
rc = nvme_ctrlr_cmd_identify_namespace(ctrlr, id, nsdata,
nvme_completion_poll_cb, &status);
if (rc != 0) {
return rc;
}
while (status.done == false) {
spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);
}
if (spdk_nvme_cpl_is_error(&status.cpl)) {
nvme_printf(ctrlr, "nvme_identify_namespace failed\n");
return ENXIO;
}
ns->sector_size = 1 << nsdata->lbaf[nsdata->flbas.format].lbads;
ns->sectors_per_max_io = spdk_nvme_ns_get_max_io_xfer_size(ns) / ns->sector_size;
ns->sectors_per_stripe = ns->stripe_size / ns->sector_size;
if (ctrlr->cdata.oncs.dsm) {
ns->flags |= SPDK_NVME_NS_DEALLOCATE_SUPPORTED;
}
if (ctrlr->cdata.vwc.present) {
ns->flags |= SPDK_NVME_NS_FLUSH_SUPPORTED;
}
if (ctrlr->cdata.oncs.write_zeroes) {
ns->flags |= SPDK_NVME_NS_WRITE_ZEROES_SUPPORTED;
}
if (nsdata->nsrescap.raw) {
ns->flags |= SPDK_NVME_NS_RESERVATION_SUPPORTED;
}
return 0;
} }
void nvme_ns_destruct(struct spdk_nvme_ns *ns) void nvme_ns_destruct(struct spdk_nvme_ns *ns)