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

lib/nvme: Keep ANA state per namespace up-to-date

Browse Source 
Add ana_state and ana_group_id to struct spdk_nvme_ns and keep
them up-to-date by updating when spdk_nvme_ctrlr is created or
ANA change notice is received asynchronously. For both cases,
struct spdk_nvme_ctrlr holds the latest ANA state.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I311fe1c8015c8b8ac9659c38661244706c04b3e3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4287
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Shuhei Matsumoto 2020-09-23 02:55:57 +09:00 committed by Tomasz Zawadzki
parent 3befb518b0
commit cc2b6962f9
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/nvme/nvme_ctrlr.c
View File

@ -725,6 +725,29 @@ nvme_ctrlr_init_ana_log_page(struct spdk_nvme_ctrlr *ctrlr)
return nvme_ctrlr_update_ana_log_page(ctrlr);
}
static int
nvme_ctrlr_update_ns_ana_states(const struct spdk_nvme_ana_group_descriptor *desc,
void *cb_arg)
{
struct spdk_nvme_ctrlr *ctrlr = cb_arg;
struct spdk_nvme_ns *ns;
uint32_t i, nsid;
for (i = 0; i < desc->num_of_nsid; i++) {
nsid = desc->nsid[i];
if (nsid == 0 || nsid > ctrlr->cdata.nn) {
continue;
}
ns = &ctrlr->ns[nsid - 1];
ns->ana_group_id = desc->ana_group_id;
ns->ana_state = desc->ana_state;
}
return 0;
}
int
nvme_ctrlr_parse_ana_log_page(struct spdk_nvme_ctrlr *ctrlr,
spdk_nvme_parse_ana_log_page_cb cb_fn, void *cb_arg)
@ -772,6 +795,10 @@ nvme_ctrlr_set_supported_log_pages(struct spdk_nvme_ctrlr *ctrlr)
}
if (ctrlr->cdata.cmic.ana_reporting) {
rc = nvme_ctrlr_init_ana_log_page(ctrlr);
if (rc == 0) {
nvme_ctrlr_parse_ana_log_page(ctrlr, nvme_ctrlr_update_ns_ana_states,
ctrlr);
}
}
out:
@ -2226,6 +2253,7 @@ nvme_ctrlr_async_event_cb(void *arg, const struct spdk_nvme_cpl *cpl)
if (rc) {
return;
}
nvme_ctrlr_parse_ana_log_page(ctrlr, nvme_ctrlr_update_ns_ana_states, ctrlr);
}
active_proc = nvme_ctrlr_get_current_process(ctrlr);

3
lib/nvme/nvme_internal.h
View File

@ -481,6 +481,9 @@ struct spdk_nvme_ns {
/* Namespace Identification Descriptor List (CNS = 03h) */
uint8_t id_desc_list[4096];
uint32_t ana_group_id;
enum spdk_nvme_ana_state ana_state;
};
/**