ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: call the generic qpair_connect fn from all transports.

Browse Source 
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: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471753
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Alexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2019-10-18 09:22:13 -07:00 committed by Jim Harris
parent c2df8f6d84
commit fa9f668a8b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nvme/nvme_pcie.c
View File

@ -1635,7 +1635,7 @@ nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid,
return NULL; return NULL;
} }
rc = _nvme_pcie_ctrlr_create_io_qpair(ctrlr, qpair, qid); rc = nvme_transport_ctrlr_connect_qpair(ctrlr, qpair);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("I/O queue creation failed\n"); SPDK_ERRLOG("I/O queue creation failed\n");

2
lib/nvme/nvme_rdma.c
View File

@ -1439,7 +1439,7 @@ nvme_rdma_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr,
} }
SPDK_DEBUGLOG(SPDK_LOG_NVME, "RDMA responses allocated\n"); 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) { if (rc < 0) {
nvme_rdma_qpair_destroy(qpair); nvme_rdma_qpair_destroy(qpair);
return NULL; return NULL;

2
lib/nvme/nvme_tcp.c
View File

@ -1723,7 +1723,7 @@ nvme_tcp_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr,
return NULL; return NULL;
} }
rc = nvme_tcp_qpair_connect(tqpair); rc = nvme_transport_ctrlr_connect_qpair(ctrlr, qpair);
if (rc < 0) { if (rc < 0) {
nvme_tcp_qpair_destroy(qpair); nvme_tcp_qpair_destroy(qpair);
return NULL; return NULL;