Commit cc2b6962 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

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



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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I311fe1c8015c8b8ac9659c38661244706c04b3e3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4287


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 3befb518

lib/nvme/nvme_ctrlr.c

+28 −0
Original line number Diff line number Diff line
@@ -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);

lib/nvme/nvme_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -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;

};



/**