From fa9f668a8b130c59dc29147076497f1355b9f91b Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 18 Oct 2019 09:22:13 -0700 Subject: [PATCH] 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: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471753 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Alexey Marchuk Reviewed-by: Jim Harris --- lib/nvme/nvme_pcie.c | 2 +- lib/nvme/nvme_rdma.c | 2 +- lib/nvme/nvme_tcp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index d830e4af5..e98d5297b 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -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"); diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index db03be549..5df2d9441 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -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; diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index 0b80aedcd..deebc5c5a 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -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;