Commit ea0aaf5e authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

nvme: Transports now set qpair state to NVME_QPAIR_CONNECTED inside 


.ctrlr_connect_qpair

Previously this was assumed to be a synchronous process so the generic
layer transport code updated the state after .ctrlr_connect_qpair
returned. In preparation for making this support asynchronous mode,
shift that responsibility down into the individual transports.

While none of the transports actually do this asynchronously, insert a
busy wait in nvme_transport_ctrlr_connect_qpair to wait for the qpair to
exit from the CONNECTING state. None of the upper layer code can
actually correct handle a transport doing this asynchronously, so the
busy wait will cover that.

Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: I3c1a5c115264ffcb87e549765d891d796e0c81fe
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8909


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMonica Kenguva <monica.kenguva@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 50472c44

lib/nvme/nvme_pcie_common.c

+10 −4
Original line number Diff line number Diff line
@@ -542,11 +542,17 @@ _nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme 
int

nvme_pcie_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

	if (nvme_qpair_is_admin_queue(qpair)) {

		return 0;

	} else {

		return _nvme_pcie_ctrlr_create_io_qpair(ctrlr, qpair, qpair->id);

	int rc = 0;



	if (!nvme_qpair_is_admin_queue(qpair)) {

		rc = _nvme_pcie_ctrlr_create_io_qpair(ctrlr, qpair, qpair->id);

	}



	if (rc == 0) {

		nvme_qpair_set_state(qpair, NVME_QPAIR_CONNECTED);

	}



	return rc;

}



void

lib/nvme/nvme_rdma.c

+4 −0
Original line number Diff line number Diff line
@@ -1245,6 +1245,10 @@ nvme_rdma_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qp 
		} while (rc == -EAGAIN && retry_count < NVME_RDMA_STALE_CONN_RETRY_MAX);

	}



	if (rc == 0) {

		nvme_qpair_set_state(qpair, NVME_QPAIR_CONNECTED);

	}



	return rc;

}

lib/nvme/nvme_tcp.c

+2 −0
Original line number Diff line number Diff line
@@ -1941,6 +1941,8 @@ nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpa 
		return rc;

	}



	nvme_qpair_set_state(qpair, NVME_QPAIR_CONNECTED);



	return 0;

}

lib/nvme/nvme_transport.c

+3 −1
Original line number Diff line number Diff line
@@ -369,7 +369,9 @@ nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nv 
		goto err;

	}



	nvme_qpair_set_state(qpair, NVME_QPAIR_CONNECTED);

	/* Busy wait until the qpair exits the connecting state */

	while (nvme_qpair_get_state(qpair) == NVME_QPAIR_CONNECTING) { }



	if (qpair->poll_group) {

		rc = nvme_poll_group_connect_qpair(qpair);

		if (rc) {