Commit 9381d8d3 authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

nvme: Update spdk_nvme_ctrlr_get_memory_domain 



Allow to return more than one memory domain.
This change aligns bdev and nvme API and provides
more flexibility for custom transports.

Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Change-Id: Ica9b12ad8463c361be6cb62ee2c0513eec0b486d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9546


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent ecfc5087

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ log level. 
Added new functions `spdk_nvme_zns_set_zone_desc_ext` and `spdk_nvme_zns_ext_report_zones`

to set zone descriptor extension and to get extended zone report respectively.



New API `spdk_nvme_ctrlr_get_memory_domain` has been added, it allows to get SPDK memory domain used by nvme controller.

New API `spdk_nvme_ctrlr_get_memory_domains` has been added, it allows to get SPDK memory domains used by nvme controller.



New API functions `spdk_nvme_ns_cmd_readv_ext` and `spdk_nvme_ns_cmd_writev_ext`

have been added. These functions accept `spdk_nvme_ns_cmd_ext_io_opts` structure with extended IO request

include/spdk/nvme.h

+17 −4
Original line number Diff line number Diff line
@@ -3779,12 +3779,23 @@ int spdk_nvme_cuse_register(struct spdk_nvme_ctrlr *ctrlr); 
int spdk_nvme_cuse_unregister(struct spdk_nvme_ctrlr *ctrlr);



/**

 * Get SPDK memory domain used by the given nvme controller.

 * Get SPDK memory domains used by the given nvme controller.

 *

 * The user can call this function with \b domains set to NULL and \b array_size set to 0 to get the

 * number of memory domains used by nvme controller

 *

 * \param ctrlr Opaque handle to the NVMe controller.

 * \return Pointer to memory domain used by this controller or NULL

 * \param domains Pointer to an array of memory domains to be filled by this function. The user should allocate big enough

 * array to keep all memory domains used by nvme controller

 * \param array_size size of \b domains array

 * \return the number of entries in \b domains array or negated errno. If returned value is bigger than \b array_size passed by the user

 * then the user should increase the size of \b domains array and call this function again. There is no guarantees that

 * the content of \b domains array is valid in that case.

 *         -EINVAL if input parameters were invalid



 */

struct spdk_memory_domain *spdk_nvme_ctrlr_get_memory_domain(const struct spdk_nvme_ctrlr *ctrlr);

int spdk_nvme_ctrlr_get_memory_domains(const struct spdk_nvme_ctrlr *ctrlr,

				       struct spdk_memory_domain **domains, int array_size);



/**

 * Opaque handle for a transport poll group. Used by the transport function table.
@@ -3912,7 +3923,9 @@ struct spdk_nvme_transport_ops { 
	void (*poll_group_free_stats)(struct spdk_nvme_transport_poll_group *tgroup,

				      struct spdk_nvme_transport_poll_group_stat *stats);



	struct spdk_memory_domain *(*ctrlr_get_memory_domain)(const struct spdk_nvme_ctrlr *ctrlr);

	int (*ctrlr_get_memory_domains)(const struct spdk_nvme_ctrlr *ctrlr,

					struct spdk_memory_domain **domains,

					int array_size);

};



/**

lib/nvme/nvme_ctrlr.c

+4 −3
Original line number Diff line number Diff line
@@ -5100,8 +5100,9 @@ spdk_nvme_ctrlr_free_qid(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid) 
	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

}



struct spdk_memory_domain *

spdk_nvme_ctrlr_get_memory_domain(const struct spdk_nvme_ctrlr *ctrlr)

int

spdk_nvme_ctrlr_get_memory_domains(const struct spdk_nvme_ctrlr *ctrlr,

				   struct spdk_memory_domain **domains, int array_size)

{

	return nvme_transport_ctrlr_get_memory_domain(ctrlr);

	return nvme_transport_ctrlr_get_memory_domains(ctrlr, domains, array_size);

}

lib/nvme/nvme_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -1483,8 +1483,8 @@ int nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, 
				       struct spdk_nvme_qpair *qpair);

void nvme_transport_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr,

		struct spdk_nvme_qpair *qpair);

struct spdk_memory_domain *nvme_transport_ctrlr_get_memory_domain(const struct spdk_nvme_ctrlr

		*ctrlr);

int nvme_transport_ctrlr_get_memory_domains(const struct spdk_nvme_ctrlr *ctrlr,

		struct spdk_memory_domain **domains, int array_size);

void nvme_transport_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);

int nvme_transport_qpair_reset(struct spdk_nvme_qpair *qpair);

int nvme_transport_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *req);

lib/nvme/nvme_rdma.c

+9 −4
Original line number Diff line number Diff line
@@ -2865,12 +2865,17 @@ nvme_rdma_poll_group_free_stats(struct spdk_nvme_transport_poll_group *tgroup, 
	free(stats);

}



static struct spdk_memory_domain *

nvme_rdma_ctrlr_get_memory_domain(const struct spdk_nvme_ctrlr *ctrlr)

static int

nvme_rdma_ctrlr_get_memory_domains(const struct spdk_nvme_ctrlr *ctrlr,

				   struct spdk_memory_domain **domains, int array_size)

{

	struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(ctrlr->adminq);



	return rqpair->memory_domain->domain;

	if (domains && array_size > 0) {

		domains[0] = rqpair->memory_domain->domain;

	}



	return 1;

}



void
@@ -2900,7 +2905,7 @@ const struct spdk_nvme_transport_ops rdma_ops = { 
	.ctrlr_connect_qpair = nvme_rdma_ctrlr_connect_qpair,

	.ctrlr_disconnect_qpair = nvme_rdma_ctrlr_disconnect_qpair,



	.ctrlr_get_memory_domain = nvme_rdma_ctrlr_get_memory_domain,

	.ctrlr_get_memory_domains = nvme_rdma_ctrlr_get_memory_domains,



	.qpair_abort_reqs = nvme_rdma_qpair_abort_reqs,

	.qpair_reset = nvme_rdma_qpair_reset,