Commit 06fbf4b3 authored by Ed Rodriguez's avatar Ed Rodriguez Committed by Jim Harris
Browse files

nvme: Use active namespace list for enumerating namespaces 



 - Add support for multi page CNS 0x2
 - Use CNS value 0x02 (SPDK_NVME_IDENTIFY_ACTIVE_NS_LIST)
   to query active namespaces
 - Add an API to iterate the active list

Change-Id: Iea524881fa6e3610a7d85ab02a2005a92fd633df
Signed-off-by: default avatarJohn Meneghini <johnm@netapp.com>
Reviewed-on: https://review.gerrithub.io/401957


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 397521bd

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ experimental pending a functional allocator to free and reallocate CMB buffers. 


spdk_nvme_ns_get_uuid() has been added to allow retrieval of per-namespace UUIDs when available.



Added spdk_nvme_ctrlr_get_first_active_ns()/spdk_nvme_ctrlr_get_next_active_ns() to iterate

active namespaces and spdk_nvme_ctrlr_is_active_ns() to check if a ns id is active.



### NVMe-oF Target



Namespaces may now be assigned unique identifiers via new optional "eui64" and "nguid" parameters

examples/nvme/identify/identify.c

+4 −2
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ print_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_transport 
	struct spdk_pci_addr			pci_addr;

	struct spdk_pci_device			*pci_dev;

	struct spdk_pci_id			pci_id;

	uint32_t				nsid;



	cap = spdk_nvme_ctrlr_get_regs_cap(ctrlr);

	vs = spdk_nvme_ctrlr_get_regs_vs(ctrlr);
@@ -1173,8 +1174,9 @@ print_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_transport 
		printf("\n");

	}



	for (i = 1; i <= spdk_nvme_ctrlr_get_num_ns(ctrlr); i++) {

		print_namespace(spdk_nvme_ctrlr_get_ns(ctrlr, i));

	for (nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr);

	     nsid != 0; nsid = spdk_nvme_ctrlr_get_next_active_ns(ctrlr, nsid)) {

		print_namespace(spdk_nvme_ctrlr_get_ns(ctrlr, nsid));

	}



	if (g_discovery_page) {

examples/nvme/perf/perf.c

+3 −3
Original line number Diff line number Diff line
@@ -321,10 +321,10 @@ set_latency_tracking_feature(struct spdk_nvme_ctrlr *ctrlr, bool enable) 
static void

register_ctrlr(struct spdk_nvme_ctrlr *ctrlr)

{

	int nsid, num_ns;

	struct spdk_nvme_ns *ns;

	struct ctrlr_entry *entry = malloc(sizeof(struct ctrlr_entry));

	const struct spdk_nvme_ctrlr_data *cdata = spdk_nvme_ctrlr_get_data(ctrlr);

	uint32_t nsid;



	if (entry == NULL) {

		perror("ctrlr_entry malloc");
@@ -349,8 +349,8 @@ register_ctrlr(struct spdk_nvme_ctrlr *ctrlr) 
		set_latency_tracking_feature(ctrlr, true);

	}



	num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);

	for (nsid = 1; nsid <= num_ns; nsid++) {

	for (nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr);

	     nsid != 0; nsid = spdk_nvme_ctrlr_get_next_active_ns(ctrlr, nsid)) {

		ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

		if (ns == NULL) {

			continue;

include/spdk/nvme.h

+27 −0
Original line number Diff line number Diff line
@@ -468,6 +468,33 @@ uint32_t spdk_nvme_ctrlr_get_num_ns(struct spdk_nvme_ctrlr *ctrlr); 
 */

struct spdk_pci_device *spdk_nvme_ctrlr_get_pci_device(struct spdk_nvme_ctrlr *ctrlr);



/**

 * \brief Return true if nsid is an active ns for the given NVMe controller.

 *

 * This function is thread safe and can be called at any point while the controller is attached to

 *  the SPDK NVMe driver.

 *

 */

bool spdk_nvme_ctrlr_is_active_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid);



/**

 * \brief Return the nsid of the first active namespace, 0 if there are no active namespaces.

 *

 * This function is thread safe and can be called at any point while the controller is attached to

 *  the SPDK NVMe driver.

 *

 */

uint32_t spdk_nvme_ctrlr_get_first_active_ns(struct spdk_nvme_ctrlr *ctrlr);



/**

 * \brief Return a next active namespace given the previous ns id, 0 when there are no more active namespaces.

 *

 * This function is thread safe and can be called at any point while the controller is attached to

 *  the SPDK NVMe driver.

 *

 */

uint32_t spdk_nvme_ctrlr_get_next_active_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t prev_nsid);



/**

 * \brief Determine if a particular log page is supported by the given NVMe controller.

 *

lib/bdev/nvme/bdev_nvme.c

+7 −6
Original line number Diff line number Diff line
@@ -1105,21 +1105,22 @@ nvme_ctrlr_create_bdevs(struct nvme_ctrlr *nvme_ctrlr) 
	struct spdk_nvme_ns	*ns;

	const struct spdk_nvme_ctrlr_data *cdata;

	const struct spdk_uuid	*uuid;

	int			ns_id, num_ns, rc;

	int			rc;

	int			bdev_created = 0;

	uint32_t		nsid;



	num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);

	cdata = spdk_nvme_ctrlr_get_data(ctrlr);



	for (ns_id = 1; ns_id <= num_ns; ns_id++) {

		ns = spdk_nvme_ctrlr_get_ns(ctrlr, ns_id);

	for (nsid = spdk_nvme_ctrlr_get_first_active_ns(ctrlr);

	     nsid != 0; nsid = spdk_nvme_ctrlr_get_next_active_ns(ctrlr, nsid)) {

		ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

		if (!ns) {

			SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "Skipping invalid NS %d\n", ns_id);

			SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "Skipping invalid NS %d\n", nsid);

			continue;

		}



		if (!spdk_nvme_ns_is_active(ns)) {

			SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "Skipping inactive NS %d\n", ns_id);

			SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "Skipping inactive NS %d\n", nsid);

			continue;

		}