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

nvmf: ensure that destroying qpairs have a state_cb

Browse Source 
It appears that we can get caught in a loop when shutting down a
subsystem if there is a qpair that has been moved to the deactivating
state due to the target shutting down early. These qpairs don't have a
state cb and won't ever be destroyed or removed from the global list.

Change-Id: I4f9ed774a94e0e2c7ff7bfa3af1776b38a787035
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/419269
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Seth Howell 2018-07-13 09:41:22 -07:00 committed by Changpeng Liu
parent 8a5a15b876
commit a28a5c8ff7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/nvmf/nvmf.c
View File

@ -669,6 +669,17 @@ _spdk_nvmf_qpair_deactivate(void *ctx)
struct nvmf_qpair_disconnect_ctx *qpair_ctx = ctx; struct nvmf_qpair_disconnect_ctx *qpair_ctx = ctx;
struct spdk_nvmf_qpair *qpair = qpair_ctx->qpair; struct spdk_nvmf_qpair *qpair = qpair_ctx->qpair;
/* Check for outstanding I/O */
if (!TAILQ_EMPTY(&qpair->outstanding)) {
if (qpair->state_cb != NULL) {
qpair->state_cb = _spdk_nvmf_qpair_destroy;
qpair->state_cb_arg = qpair_ctx;
} else {
free(qpair_ctx);
}
return;
}
if (qpair->state == SPDK_NVMF_QPAIR_DEACTIVATING || if (qpair->state == SPDK_NVMF_QPAIR_DEACTIVATING ||
qpair->state == SPDK_NVMF_QPAIR_INACTIVE) { qpair->state == SPDK_NVMF_QPAIR_INACTIVE) {
/* This can occur if the connection is killed by the target, /* This can occur if the connection is killed by the target,
@ -684,13 +695,6 @@ _spdk_nvmf_qpair_deactivate(void *ctx)
assert(qpair->state == SPDK_NVMF_QPAIR_ACTIVE); assert(qpair->state == SPDK_NVMF_QPAIR_ACTIVE);
qpair->state = SPDK_NVMF_QPAIR_DEACTIVATING; qpair->state = SPDK_NVMF_QPAIR_DEACTIVATING;
/* Check for outstanding I/O */
if (!TAILQ_EMPTY(&qpair->outstanding)) {
qpair->state_cb = _spdk_nvmf_qpair_destroy;
qpair->state_cb_arg = qpair_ctx;
return;
}
_spdk_nvmf_qpair_destroy(qpair_ctx, 0); _spdk_nvmf_qpair_destroy(qpair_ctx, 0);
} }