Commit f10a91ed authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

nvmf: Add function to get local addr for a qpair 



Change-Id: I19b9834c709bf97b1bbc1a9278b8c3b9350546e2
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/425185


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 311ce0e2

include/spdk/nvmf.h

+12 −0
Original line number Diff line number Diff line
@@ -218,6 +218,18 @@ int spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair, nvmf_qpair_disconn 
int spdk_nvmf_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,

				  struct spdk_nvme_transport_id *trid);



/**

 * Get the local transport ID for this queue pair.

 *

 * \param qpair The NVMe-oF qpair

 * \param trid Output parameter that will contain the transport id.

 *

 * \return 0 for success.

 * \return -EINVAL if the qpair is not connected.

 */

int spdk_nvmf_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,

				   struct spdk_nvme_transport_id *trid);



/**

 * Get the associated listener transport ID for this queue pair.

 *

lib/nvmf/nvmf.c

+7 −0
Original line number Diff line number Diff line
@@ -753,6 +753,13 @@ spdk_nvmf_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, 
	return spdk_nvmf_transport_qpair_get_peer_trid(qpair, trid);

}



int

spdk_nvmf_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,

			       struct spdk_nvme_transport_id *trid)

{

	return spdk_nvmf_transport_qpair_get_local_trid(qpair, trid);

}



int

spdk_nvmf_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,

				struct spdk_nvme_transport_id *trid)

lib/nvmf/rdma.c

+12 −0
Original line number Diff line number Diff line
@@ -2757,6 +2757,17 @@ spdk_nvmf_rdma_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, 
	return spdk_nvmf_rdma_trid_from_cm_id(rqpair->cm_id, trid, true);

}



static int

spdk_nvmf_rdma_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,

				    struct spdk_nvme_transport_id *trid)

{

	struct spdk_nvmf_rdma_qpair	*rqpair;



	rqpair = SPDK_CONTAINEROF(qpair, struct spdk_nvmf_rdma_qpair, qpair);



	return spdk_nvmf_rdma_trid_from_cm_id(rqpair->cm_id, trid, false);

}



static int

spdk_nvmf_rdma_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,

				     struct spdk_nvme_transport_id *trid)
@@ -2790,6 +2801,7 @@ const struct spdk_nvmf_transport_ops spdk_nvmf_transport_rdma = { 
	.qpair_fini = spdk_nvmf_rdma_close_qpair,

	.qpair_is_idle = spdk_nvmf_rdma_qpair_is_idle,

	.qpair_get_peer_trid = spdk_nvmf_rdma_qpair_get_peer_trid,

	.qpair_get_local_trid = spdk_nvmf_rdma_qpair_get_local_trid,

	.qpair_get_listen_trid = spdk_nvmf_rdma_qpair_get_listen_trid,



};

lib/nvmf/transport.c

+7 −0
Original line number Diff line number Diff line
@@ -217,6 +217,13 @@ spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, 
	return qpair->transport->ops->qpair_get_peer_trid(qpair, trid);

}



int

spdk_nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,

		struct spdk_nvme_transport_id *trid)

{

	return qpair->transport->ops->qpair_get_local_trid(qpair, trid);

}



int

spdk_nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,

		struct spdk_nvme_transport_id *trid)

lib/nvmf/transport.h

+9 −0
Original line number Diff line number Diff line
@@ -137,6 +137,12 @@ struct spdk_nvmf_transport_ops { 
	int (*qpair_get_peer_trid)(struct spdk_nvmf_qpair *qpair,

				   struct spdk_nvme_transport_id *trid);



	/*

	 * Get the local transport ID for the queue pair.

	 */

	int (*qpair_get_local_trid)(struct spdk_nvmf_qpair *qpair,

				    struct spdk_nvme_transport_id *trid);



	/*

	 * Get the listener transport ID that accepted this qpair originally.

	 */
@@ -183,6 +189,9 @@ bool spdk_nvmf_transport_qpair_is_idle(struct spdk_nvmf_qpair *qpair); 
int spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,

		struct spdk_nvme_transport_id *trid);



int spdk_nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,

		struct spdk_nvme_transport_id *trid);



int spdk_nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,

		struct spdk_nvme_transport_id *trid);