From 3e967963910030b8381ca3b7c2b87fd9d5aff7c8 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 11 Dec 2020 00:19:52 +0000 Subject: [PATCH] nvmf: assert that subsystem cb_fn/cb_arg don't get set twice nvmf_subsystem_state_change() protects against going starting the pause/change/resume chain again if we haven't completed the previous chain. But add some asserts to make sure the cb_fn and cb_args never get set twice. This also requires setting them back to NULL after they've been used. Signed-off-by: Jim Harris Change-Id: I56c6c89bfb108223f731d5ac28100abbb746ab2f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5531 Community-CI: Broadcom CI Reviewed-by: Aleksey Marchuk Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- lib/nvmf/ctrlr.c | 2 ++ lib/nvmf/nvmf.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index 0761fa421..1dfcb4a4c 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -3409,6 +3409,8 @@ _nvmf_request_complete(void *ctx) sgroup->io_outstanding == 0) { sgroup->state = SPDK_NVMF_SUBSYSTEM_PAUSED; sgroup->cb_fn(sgroup->cb_arg, 0); + sgroup->cb_fn = NULL; + sgroup->cb_arg = NULL; } } diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 5ea319caf..0f473eed9 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -1424,7 +1424,9 @@ nvmf_poll_group_pause_subsystem(struct spdk_nvmf_poll_group *group, sgroup->state = SPDK_NVMF_SUBSYSTEM_PAUSING; if (sgroup->io_outstanding > 0) { + assert(sgroup->cb_fn == NULL); sgroup->cb_fn = cb_fn; + assert(sgroup->cb_arg == NULL); sgroup->cb_arg = cb_arg; return; }