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

lib/nvme: set in_completion_context in poll group. 



This needs to be done for all qpairs in the poll group.

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


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 94345a0a

lib/nvme/nvme_ctrlr.c

+7 −0
Original line number Diff line number Diff line
@@ -528,6 +528,13 @@ spdk_nvme_ctrlr_free_io_qpair(struct spdk_nvme_qpair *qpair) 
		return 0;

	}



	if (qpair->poll_group && qpair->poll_group->in_completion_context) {

		/* Same as above, but in a poll group. */

		qpair->poll_group->num_qpairs_to_delete++;

		qpair->delete_after_completion_context = 1;

		return 0;

	}



	if (qpair->poll_group) {

		spdk_nvme_poll_group_remove(qpair->poll_group->group, qpair);

	}

lib/nvme/nvme_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -433,6 +433,8 @@ struct spdk_nvme_transport_poll_group { 
	STAILQ_HEAD(, spdk_nvme_qpair)			connected_qpairs;

	STAILQ_HEAD(, spdk_nvme_qpair)			disconnected_qpairs;

	STAILQ_ENTRY(spdk_nvme_transport_poll_group)	link;

	bool						in_completion_context;

	uint64_t					num_qpairs_to_delete;

};



struct spdk_nvme_ns {

lib/nvme/nvme_transport.c

+32 −1
Original line number Diff line number Diff line
@@ -453,8 +453,39 @@ int64_t 
nvme_transport_poll_group_process_completions(struct spdk_nvme_transport_poll_group *tgroup,

		uint32_t completions_per_qpair, spdk_nvme_disconnected_qpair_cb disconnected_qpair_cb)

{

	return tgroup->transport->ops.poll_group_process_completions(tgroup, completions_per_qpair,

	struct spdk_nvme_qpair *qpair;

	int64_t rc;



	tgroup->in_completion_context = true;

	rc = tgroup->transport->ops.poll_group_process_completions(tgroup, completions_per_qpair,

			disconnected_qpair_cb);

	tgroup->in_completion_context = false;



	if (spdk_unlikely(tgroup->num_qpairs_to_delete > 0)) {

		/* deleted qpairs are more likely to be in the disconnected qpairs list. */

		STAILQ_FOREACH(qpair, &tgroup->disconnected_qpairs, poll_group_stailq) {

			if (spdk_unlikely(qpair->delete_after_completion_context)) {

				spdk_nvme_ctrlr_free_io_qpair(qpair);

				if (--tgroup->num_qpairs_to_delete == 0) {

					return rc;

				}

			}

		}



		STAILQ_FOREACH(qpair, &tgroup->connected_qpairs, poll_group_stailq) {

			if (spdk_unlikely(qpair->delete_after_completion_context)) {

				spdk_nvme_ctrlr_free_io_qpair(qpair);

				if (--tgroup->num_qpairs_to_delete == 0) {

					return rc;

				}

			}

		}

		/* Just in case. */

		SPDK_DEBUGLOG(SPDK_LOG_NVME, "Mismatch between qpairs to delete and poll group number.\n");

		tgroup->num_qpairs_to_delete = 0;

	}



	return rc;

}



int