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

nvme: Add API to get SPDK memory domain per nvme controller 



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


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 avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
parent d06b6097

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ the memory domains and request hardware perform DMA transfers between them. 
Added API `spdk_log_to_syslog_level` to return syslog level based on SPDK's

log level.



### nvme



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



## v21.07:



### accel_fw

include/spdk/nvme.h

+11 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 *   Copyright (c) Intel Corporation. All rights reserved.

 *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.

 *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions
@@ -3641,6 +3642,14 @@ 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.

 *

 * \param ctrlr Opaque handle to the NVMe controller.

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

 */

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



/**

 * Opaque handle for a transport poll group. Used by the transport function table.

 */
@@ -3745,6 +3754,8 @@ 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);

};



/**

lib/nvme/nvme_ctrlr.c

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 *   Copyright (c) Intel Corporation. All rights reserved.

 *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.

 *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions
@@ -4587,3 +4588,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)

{

	return nvme_transport_ctrlr_get_memory_domain(ctrlr);

}

lib/nvme/nvme_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 *   Copyright (c) Intel Corporation. All rights reserved.

 *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.

 *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions
@@ -1360,6 +1361,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);

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

+10 −0
Original line number Diff line number Diff line
@@ -2784,6 +2784,14 @@ 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)

{

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



	return rqpair->memory_domain->domain;

}



void

spdk_nvme_rdma_init_hooks(struct spdk_nvme_rdma_hooks *hooks)

{
@@ -2811,6 +2819,8 @@ 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,



	.qpair_abort_reqs = nvme_rdma_qpair_abort_reqs,

	.qpair_reset = nvme_rdma_qpair_reset,

	.qpair_submit_request = nvme_rdma_qpair_submit_request,