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

lib/nvme: Add an internal API nvme_ctrlr_parse_ana_log_page() 



Add an internal API nvme_ctrlr_parse_ana_log_page() to parse an ANA
log page and execute the specified callback function for each
ANA group descriptor in the ANA log page.

We will be able to copy the ANA group descriptor to the caller instead.
To do that, we will need to inform the size of the descriptor first,
but the size will not be constant.

Passing parser to the API will be more convenient.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ifd8fda30a83965948017fb8ad992c0d889197cde
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4279


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 a0befabd

lib/nvme/nvme_ctrlr.c

+26 −0
Original line number Diff line number Diff line
@@ -725,6 +725,32 @@ nvme_ctrlr_init_ana_log_page(struct spdk_nvme_ctrlr *ctrlr) 
	return nvme_ctrlr_update_ana_log_page(ctrlr);

}



int

nvme_ctrlr_parse_ana_log_page(struct spdk_nvme_ctrlr *ctrlr,

			      spdk_nvme_parse_ana_log_page_cb cb_fn, void *cb_arg)

{

	struct spdk_nvme_ana_group_descriptor *desc;

	uint32_t i;

	int rc = 0;



	if (ctrlr->ana_log_page == NULL) {

		return -EINVAL;

	}



	desc = (void *)((uint8_t *)ctrlr->ana_log_page + sizeof(struct spdk_nvme_ana_page));



	for (i = 0; i < ctrlr->ana_log_page->num_ana_group_desc; i++) {

		rc = cb_fn(desc, cb_arg);

		if (rc != 0) {

			break;

		}

		desc = (void *)((uint8_t *)desc + sizeof(struct spdk_nvme_ana_group_descriptor) +

				desc->num_of_nsid * sizeof(uint32_t));

	}



	return rc;

}



static int

nvme_ctrlr_set_supported_log_pages(struct spdk_nvme_ctrlr *ctrlr)

{

lib/nvme/nvme_internal.h

+5 −0
Original line number Diff line number Diff line
@@ -972,6 +972,11 @@ int nvme_fabric_ctrlr_discover(struct spdk_nvme_ctrlr *ctrlr, 
				   struct spdk_nvme_probe_ctx *probe_ctx);

int	nvme_fabric_qpair_connect(struct spdk_nvme_qpair *qpair, uint32_t num_entries);



typedef int (*spdk_nvme_parse_ana_log_page_cb)(

	const struct spdk_nvme_ana_group_descriptor *desc, void *cb_arg);

int	nvme_ctrlr_parse_ana_log_page(struct spdk_nvme_ctrlr *ctrlr,

				      spdk_nvme_parse_ana_log_page_cb cb_fn, void *cb_arg);



static inline struct nvme_request *

nvme_allocate_request(struct spdk_nvme_qpair *qpair,

		      const struct nvme_payload *payload, uint32_t payload_size, uint32_t md_size,