ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: disconnect qpairs before freeing i/o channel

Browse Source 
Previously, qpair deletion was synchronous and handled by the
io_channel_destroy_cb for the target. However, with the new asynchronous
qpair deletion api, these qpairs need to be completely removed before we
free the i/o channel and the poll group.

Change-Id: I42c62391df62825d53e158306c4372523403ad27
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/420208
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Seth Howell 2018-07-23 15:40:02 -07:00 committed by Ben Walker
parent e4c1e5f866
commit e5a6540777
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/nvmf/nvmf.c
View File

@ -148,17 +148,13 @@ spdk_nvmf_tgt_create_poll_group(void *io_device, void *ctx_buf)
} }
static void static void
_spdk_nvmf_tgt_destroy_poll_group_cb(void *ctx, int status) spdk_nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf)
{ {
struct spdk_nvmf_poll_group *group = ctx; struct spdk_nvmf_poll_group *group = ctx_buf;
struct spdk_nvmf_transport_poll_group *tgroup, *tmp; struct spdk_nvmf_transport_poll_group *tgroup, *tmp;
struct spdk_nvmf_subsystem_poll_group *sgroup; struct spdk_nvmf_subsystem_poll_group *sgroup;
uint32_t sid, nsid; uint32_t sid, nsid;
if (status != 0) {
return;
}
TAILQ_FOREACH_SAFE(tgroup, &group->tgroups, link, tmp) { TAILQ_FOREACH_SAFE(tgroup, &group->tgroups, link, tmp) {
TAILQ_REMOVE(&group->tgroups, tgroup, link); TAILQ_REMOVE(&group->tgroups, tgroup, link);
spdk_nvmf_transport_poll_group_destroy(tgroup); spdk_nvmf_transport_poll_group_destroy(tgroup);
@ -186,6 +182,7 @@ _nvmf_tgt_disconnect_next_qpair(void *ctx)
struct spdk_nvmf_qpair *qpair; struct spdk_nvmf_qpair *qpair;
struct nvmf_qpair_disconnect_many_ctx *qpair_ctx = ctx; struct nvmf_qpair_disconnect_many_ctx *qpair_ctx = ctx;
struct spdk_nvmf_poll_group *group = qpair_ctx->group; struct spdk_nvmf_poll_group *group = qpair_ctx->group;
struct spdk_io_channel *ch;
int rc = 0; int rc = 0;
qpair = TAILQ_FIRST(&group->qpairs); qpair = TAILQ_FIRST(&group->qpairs);
@ -195,19 +192,17 @@ _nvmf_tgt_disconnect_next_qpair(void *ctx)
} }
if (!qpair || rc != 0) { if (!qpair || rc != 0) {
_spdk_nvmf_tgt_destroy_poll_group_cb(qpair_ctx->group, rc); /* When the refcount from the channels reaches 0, spdk_nvmf_tgt_destroy_poll_group will be called. */
ch = spdk_io_channel_from_ctx(group);
spdk_put_io_channel(ch);
free(qpair_ctx); free(qpair_ctx);
return;
} }
} }
static void static void
spdk_nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf) spdk_nvmf_tgt_destroy_poll_group_qpairs(struct spdk_nvmf_poll_group *group)
{ {
struct spdk_nvmf_poll_group *group = ctx_buf;
struct spdk_nvmf_qpair *qpair;
struct nvmf_qpair_disconnect_many_ctx *ctx; struct nvmf_qpair_disconnect_many_ctx *ctx;
int rc = 0;
ctx = calloc(1, sizeof(struct nvmf_qpair_disconnect_many_ctx)); ctx = calloc(1, sizeof(struct nvmf_qpair_disconnect_many_ctx));
@ -219,17 +214,7 @@ spdk_nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf)
spdk_poller_unregister(&group->poller); spdk_poller_unregister(&group->poller);
ctx->group = group; ctx->group = group;
_nvmf_tgt_disconnect_next_qpair(ctx);
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 * struct spdk_nvmf_tgt *
@ -616,10 +601,8 @@ spdk_nvmf_poll_group_create(struct spdk_nvmf_tgt *tgt)
void void
spdk_nvmf_poll_group_destroy(struct spdk_nvmf_poll_group *group) spdk_nvmf_poll_group_destroy(struct spdk_nvmf_poll_group *group)
{ {
struct spdk_io_channel *ch; /* This function will put the io_channel associated with this poll group */
spdk_nvmf_tgt_destroy_poll_group_qpairs(group);
ch = spdk_io_channel_from_ctx(group);
spdk_put_io_channel(ch);
} }
int int