Commit 3ada37fa authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvme: use poll_group_process_completions in connect_qpair 



If a qpair is part of a poll group and it's not configured in the async
mode, it should be using poll group's process_completions variant.

Additionally, connecting qpairs to the poll group was moved up, so that
qpairs are already on the connected qpairs queue when waiting for the
connection to complete.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I08f75bd61a566d1ab60029b6202d9337df75733f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9074


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 avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarMonica Kenguva <monica.kenguva@intel.com>
parent 98b483a3

lib/nvme/nvme_transport.c

+17 −10
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_ 
}



static void

nvme_transport_connect_qpair_fail(struct spdk_nvme_qpair *qpair)

nvme_transport_connect_qpair_fail(struct spdk_nvme_qpair *qpair, void *unused)

{

	struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr;
@@ -380,26 +380,33 @@ nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nv 
		goto err;

	}



	if (qpair->poll_group) {

		rc = nvme_poll_group_connect_qpair(qpair);

		if (rc) {

			goto err;

		}

	}



	if (!qpair->async) {

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

		while (nvme_qpair_get_state(qpair) == NVME_QPAIR_CONNECTING) {

			if (qpair->poll_group) {

				rc = spdk_nvme_poll_group_process_completions(

					     qpair->poll_group->group, 0,

					     nvme_transport_connect_qpair_fail);

			} else {

				rc = spdk_nvme_qpair_process_completions(qpair, 0);

			if (rc < 0) {

				goto err;

			}

		}

			}



	if (qpair->poll_group) {

		rc = nvme_poll_group_connect_qpair(qpair);

		if (rc) {

			if (rc < 0) {

				goto err;

			}

		}

	}



	return 0;

err:

	nvme_transport_connect_qpair_fail(qpair);

	nvme_transport_connect_qpair_fail(qpair, NULL);

	return rc;

}

test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ DEFINE_STUB(spdk_nvme_transport_id_trtype_str, const char *, 
	    (enum spdk_nvme_transport_type trtype), NULL);

DEFINE_STUB(spdk_nvme_qpair_process_completions, int32_t, (struct spdk_nvme_qpair *qpair,

		uint32_t max_completions), 0);

DEFINE_STUB(spdk_nvme_poll_group_process_completions, int64_t, (struct spdk_nvme_poll_group *group,

		uint32_t completions_per_qpair,

		spdk_nvme_disconnected_qpair_cb disconnected_qpair_cb), 0);



static void

ut_construct_transport(struct spdk_nvme_transport *transport, const char name[])