Commit e4c1e5f8 authored by Seth Howell's avatar Seth Howell Committed by Ben Walker
Browse files

nvmf: destroy_poll_group uses disconnect_qpair asynch api 



Change-Id: I47eff0db1ab33be23881f694d104e903706f1c28
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/417371


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent f2b22d68

lib/nvmf/nvmf.c

+56 −7
Original line number Diff line number Diff line
@@ -148,18 +148,15 @@ spdk_nvmf_tgt_create_poll_group(void *io_device, void *ctx_buf) 
}



static void

spdk_nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf)

_spdk_nvmf_tgt_destroy_poll_group_cb(void *ctx, int status)

{

	struct spdk_nvmf_poll_group *group = ctx_buf;

	struct spdk_nvmf_qpair *qpair, *qptmp;

	struct spdk_nvmf_poll_group *group = ctx;

	struct spdk_nvmf_transport_poll_group *tgroup, *tmp;

	struct spdk_nvmf_subsystem_poll_group *sgroup;

	uint32_t sid, nsid;



	spdk_poller_unregister(&group->poller);



	TAILQ_FOREACH_SAFE(qpair, &group->qpairs, link, qptmp) {

		spdk_nvmf_qpair_disconnect(qpair, NULL, NULL);

	if (status != 0) {

		return;

	}



	TAILQ_FOREACH_SAFE(tgroup, &group->tgroups, link, tmp) {
@@ -183,6 +180,58 @@ spdk_nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf) 
	free(group->sgroups);

}



static void

_nvmf_tgt_disconnect_next_qpair(void *ctx)

{

	struct spdk_nvmf_qpair *qpair;

	struct nvmf_qpair_disconnect_many_ctx *qpair_ctx = ctx;

	struct spdk_nvmf_poll_group *group = qpair_ctx->group;

	int rc = 0;



	qpair = TAILQ_FIRST(&group->qpairs);



	if (qpair) {

		rc = spdk_nvmf_qpair_disconnect(qpair, _nvmf_tgt_disconnect_next_qpair, ctx);

	}



	if (!qpair || rc != 0) {

		_spdk_nvmf_tgt_destroy_poll_group_cb(qpair_ctx->group, rc);

		free(qpair_ctx);

		return;

	}

}



static void

spdk_nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf)

{

	struct spdk_nvmf_poll_group *group = ctx_buf;

	struct spdk_nvmf_qpair *qpair;

	struct nvmf_qpair_disconnect_many_ctx *ctx;

	int rc = 0;



	ctx = calloc(1, sizeof(struct nvmf_qpair_disconnect_many_ctx));



	if (!ctx) {

		SPDK_ERRLOG("Failed to allocate memory for destroy poll group ctx\n");

		return;

	}



	spdk_poller_unregister(&group->poller);



	ctx->group = group;



	qpair = TAILQ_FIRST(&group->qpairs);



	if (qpair) {

		rc = spdk_nvmf_qpair_disconnect(qpair, _nvmf_tgt_disconnect_next_qpair, ctx);

	}



	if (!qpair || rc != 0) {

		_spdk_nvmf_tgt_destroy_poll_group_cb(group, rc);

		free(ctx);

	}

}



struct spdk_nvmf_tgt *

spdk_nvmf_tgt_create(struct spdk_nvmf_tgt_opts *opts)

{