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

nvme: Factor out getting ZNS Identify Namespace Data 



As a preparation to get NVM specific identify data,
add one abstraction to share the code both for synchronous and
asynchronous cases.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I4abd5a7ae7d513fd0e55d25d6a7a14e532e9fb37
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23619


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 0ce1f5c7

lib/nvme/nvme_ctrlr.c

+19 −13
Original line number Diff line number Diff line
@@ -2640,23 +2640,11 @@ nvme_ctrlr_identify_ns_zns_specific_async_done(void *arg, const struct spdk_nvme 
}



static int

nvme_ctrlr_identify_ns_iocs_specific_async(struct spdk_nvme_ns *ns)

nvme_ctrlr_identify_ns_zns_specific_async(struct spdk_nvme_ns *ns)

{

	struct spdk_nvme_ctrlr *ctrlr = ns->ctrlr;

	int rc;



	switch (ns->csi) {

	case SPDK_NVME_CSI_ZNS:

		break;

	default:

		/*

		 * This switch must handle all cases for which

		 * nvme_ns_has_supported_iocs_specific_data() returns true,

		 * other cases should never happen.

		 */

		assert(0);

	}



	assert(!ns->nsdata_zns);

	ns->nsdata_zns = spdk_zmalloc(sizeof(*ns->nsdata_zns), 64, NULL, SPDK_ENV_SOCKET_ID_ANY,

				      SPDK_MALLOC_SHARE);
@@ -2676,6 +2664,24 @@ nvme_ctrlr_identify_ns_iocs_specific_async(struct spdk_nvme_ns *ns) 
	return rc;

}



static int

nvme_ctrlr_identify_ns_iocs_specific_async(struct spdk_nvme_ns *ns)

{

	switch (ns->csi) {

	case SPDK_NVME_CSI_ZNS:

		return nvme_ctrlr_identify_ns_zns_specific_async(ns);

	default:

		/*

		 * This switch must handle all cases for which

		 * nvme_ns_has_supported_iocs_specific_data() returns true,

		 * other cases should never happen.

		 */

		assert(0);

	}



	return -EINVAL;

}



static int

nvme_ctrlr_identify_namespaces_iocs_specific(struct spdk_nvme_ctrlr *ctrlr)

{

lib/nvme/nvme_ns.c

+19 −13
Original line number Diff line number Diff line
@@ -128,25 +128,13 @@ nvme_ctrlr_identify_ns(struct spdk_nvme_ns *ns) 
}



static int

nvme_ctrlr_identify_ns_iocs_specific(struct spdk_nvme_ns *ns)

nvme_ctrlr_identify_ns_zns_specific(struct spdk_nvme_ns *ns)

{

	struct nvme_completion_poll_status *status;

	struct spdk_nvme_ctrlr *ctrlr = ns->ctrlr;

	struct spdk_nvme_zns_ns_data *nsdata_zns;

	int rc;



	switch (ns->csi) {

	case SPDK_NVME_CSI_ZNS:

		break;

	default:

		/*

		 * This switch must handle all cases for which

		 * nvme_ns_has_supported_iocs_specific_data() returns true,

		 * other cases should never happen.

		 */

		assert(0);

	}



	nvme_ns_free_zns_specific_data(ns);



	nsdata_zns = spdk_zmalloc(sizeof(*nsdata_zns), 64, NULL, SPDK_ENV_SOCKET_ID_ANY,
@@ -185,6 +173,24 @@ nvme_ctrlr_identify_ns_iocs_specific(struct spdk_nvme_ns *ns) 
	return 0;

}



static int

nvme_ctrlr_identify_ns_iocs_specific(struct spdk_nvme_ns *ns)

{

	switch (ns->csi) {

	case SPDK_NVME_CSI_ZNS:

		return nvme_ctrlr_identify_ns_zns_specific(ns);

	default:

		/*

		 * This switch must handle all cases for which

		 * nvme_ns_has_supported_iocs_specific_data() returns true,

		 * other cases should never happen.

		 */

		assert(0);

	}



	return -EINVAL;

}



static int

nvme_ctrlr_identify_id_desc(struct spdk_nvme_ns *ns)

{