d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvmf: disconnect other connections if admin qpair disconnects.

Browse Source 
Also this patch make each io qpair recycled by its own thread.

Change-Id: I386e411f5d4cee4629054e4cce8d1f4401ec49c8
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/407743
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ziye Yang 2018-04-18 14:16:39 +08:00 committed by Daniel Verkamp
parent 2f94b4d4e3
commit adfa9f6dc7
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/nvmf/ctrlr.c
View File

@ -275,23 +275,13 @@ end:
}
static void
ctrlr_delete_qpair(void *ctx)
_ctrlr_destruct_check(void *ctx)
{
struct spdk_nvmf_qpair *qpair = ctx;
struct spdk_nvmf_ctrlr *ctrlr = qpair->ctrlr;
struct spdk_nvmf_ctrlr *ctrlr = ctx;
assert(ctrlr != NULL);
assert(ctrlr->num_qpairs > 0);
/* Defer the admin qpair deletion since there are still io qpairs */
if ((ctrlr->num_qpairs > 1) && (qpair == ctrlr->admin_qpair)) {
spdk_thread_send_msg(qpair->group->thread, ctrlr_delete_qpair, qpair);
return;
}
ctrlr->num_qpairs--;
TAILQ_REMOVE(&ctrlr->qpairs, qpair, link);
spdk_nvmf_transport_qpair_fini(qpair);
if (ctrlr->num_qpairs == 0) {
assert(ctrlr->subsys != NULL);
assert(ctrlr->subsys->thread != NULL);
@ -299,6 +289,41 @@ ctrlr_delete_qpair(void *ctx)
}
}
static void
nvmf_qpair_fini(void *ctx)
{
struct spdk_nvmf_qpair *qpair = ctx;
struct spdk_nvmf_ctrlr *ctrlr = qpair->ctrlr;
struct spdk_thread *admin_thread = ctrlr->admin_qpair->group->thread;
spdk_nvmf_transport_qpair_fini(qpair);
spdk_thread_send_msg(admin_thread, _ctrlr_destruct_check, ctrlr);
}
static void
ctrlr_delete_qpair(void *ctx)
{
struct spdk_nvmf_qpair *qpair = ctx, *_qpair, *tmp;
struct spdk_nvmf_ctrlr *ctrlr = qpair->ctrlr;
assert(ctrlr != NULL);
/* Delete all io qpairs if receving the admin qpair disconnect event early */
if ((ctrlr->num_qpairs > 1) && (qpair == ctrlr->admin_qpair)) {
TAILQ_FOREACH_SAFE(_qpair, &ctrlr->qpairs, link, tmp) {
if (_qpair != qpair) {
ctrlr_delete_qpair(_qpair);
}
}
spdk_thread_send_msg(qpair->group->thread, ctrlr_delete_qpair, qpair);
return;
}
TAILQ_REMOVE(&ctrlr->qpairs, qpair, link);
spdk_thread_send_msg(qpair->group->thread, nvmf_qpair_fini, qpair);
}
static void
_spdk_nvmf_ctrlr_add_io_qpair(void *ctx)
{