Commit fa9f668a authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

nvme: call the generic qpair_connect fn from all transports. 



This wasn't being done in the previous case which meant that I/O qpairs
were not being moved to the connecting state when connecting for the
first time. However, to prepare the way for a coherent state machine for
nvme qpairs, we need to ensure that all qpairs go through the same
states.

Change-Id: I3cfe799a003acd926b24c107ab1461a96239c1bb
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471753


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c2df8f6d

lib/nvme/nvme_pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -1635,7 +1635,7 @@ nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, 
		return NULL;

	}



	rc = _nvme_pcie_ctrlr_create_io_qpair(ctrlr, qpair, qid);

	rc = nvme_transport_ctrlr_connect_qpair(ctrlr, qpair);



	if (rc != 0) {

		SPDK_ERRLOG("I/O queue creation failed\n");

lib/nvme/nvme_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1439,7 +1439,7 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, 
	}

	SPDK_DEBUGLOG(SPDK_LOG_NVME, "RDMA responses allocated\n");



	rc = nvme_rdma_qpair_connect(rqpair);

	rc = nvme_transport_ctrlr_connect_qpair(ctrlr, qpair);

	if (rc < 0) {

		nvme_rdma_qpair_destroy(qpair);

		return NULL;

lib/nvme/nvme_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ nvme_tcp_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, 
		return NULL;

	}



	rc = nvme_tcp_qpair_connect(tqpair);

	rc = nvme_transport_ctrlr_connect_qpair(ctrlr, qpair);

	if (rc < 0) {

		nvme_tcp_qpair_destroy(qpair);

		return NULL;