Commit e21de9a9 authored Sep 01, 2020 by Shuhei Matsumoto Committed by Tomasz Zawadzki Sep 04, 2020

lib/nvmf: Add trid to struct spdk_nvmf_qpair



Add trid to struct spdk_nvmf_qpair and initialize it at initialization.

admin_qpair->trid will be used to get the corresponding
subsystem_listener via nvmf_subsystem_find_listener() and add it to
struct spdk_nvmf_ctrlr in the next patch.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I0d1a41aede60de88747eff16c7e04f63d0702596
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4009


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>

parent 58da6223

include/spdk/nvmf_transport.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ struct spdk_nvmf_qpair {
		struct spdk_nvmf_transport *transport;
		struct spdk_nvmf_ctrlr *ctrlr;
		struct spdk_nvmf_poll_group *group;
		const struct spdk_nvme_transport_id *trid;

		uint16_t qid;
		uint16_t sq_head;

lib/nvmf/rdma.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1262,6 +1262,7 @@ nvmf_rdma_connect(struct spdk_nvmf_transport transport, struct rdma_cm_event e
		rqpair->cm_id = event->id;
		rqpair->listen_id = event->listen_id;
		rqpair->qpair.transport = transport;
		rqpair->qpair.trid = port->trid;
		STAILQ_INIT(&rqpair->ibv_events);
		/* use qid from the private data to determine the qpair type
		qid will be set to the appropriate value when the controller is created */

lib/nvmf/tcp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -895,6 +895,7 @@ nvmf_tcp_handle_connect(struct spdk_nvmf_transport *transport,
		tqpair->state_cntr[TCP_REQUEST_STATE_FREE] = 0;
		tqpair->port = port;
		tqpair->qpair.transport = transport;
		tqpair->qpair.trid = port->trid;

		rc = spdk_sock_getaddr(tqpair->sock, tqpair->target_addr,
		sizeof(tqpair->target_addr), &tqpair->target_port,