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

ut/bdev_nvme: spdk_nvme_detach() stub calls ut_detach_ctrlr() if ctrlr is attached by ut_attach_ctrlr()

Browse Source 
bdev_nvme_delete() calls spdk_nvme_detach() in the end. However,
previously spdk_nvme_detach() stub did nothing and ut_detach_ctrlr()
was called separately if ctrlr wass attached by ut_detach_ctrlr().

This was to differentiate the two cases, ctrlr is statically assigned
or dynamically attached by ut_detach_ctrlr().

This might be a little confusing. Hence by adding a flag, attached,
to ctrlr, merge ut_detach_ctrlr() into spdk_nvme_detach(), and remove
ut_detach_ctrlr() calls.

Besides, change one SPDK_CU_ASSERT_FATAL to return NULL because the
other cases do that and the callers for ut_attach_ctrlr() already have
SPDK_CU_ASSERT_FATAL.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I2a73f57c6031819d3ae441a6874127ff5d53fc04
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7311
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Shuhei Matsumoto 2021-04-11 02:34:03 +09:00 committed by Tomasz Zawadzki
parent d9e3ffea48
commit 67a03bc73a
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
View File

@ -51,8 +51,6 @@ DEFINE_STUB(spdk_nvme_probe_async, struct spdk_nvme_probe_ctx *,
spdk_nvme_probe_cb probe_cb, spdk_nvme_attach_cb attach_cb, spdk_nvme_probe_cb probe_cb, spdk_nvme_attach_cb attach_cb,
spdk_nvme_remove_cb remove_cb), NULL); spdk_nvme_remove_cb remove_cb), NULL);
DEFINE_STUB(spdk_nvme_detach, int, (struct spdk_nvme_ctrlr *ctrlr), 0);
DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid, DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid,
enum spdk_nvme_transport_type trtype)); enum spdk_nvme_transport_type trtype));
@ -251,6 +249,7 @@ struct spdk_nvme_ctrlr {
struct spdk_nvme_ns_data *nsdata; struct spdk_nvme_ns_data *nsdata;
struct spdk_nvme_qpair adminq; struct spdk_nvme_qpair adminq;
struct spdk_nvme_ctrlr_data cdata; struct spdk_nvme_ctrlr_data cdata;
bool attached;
bool is_failed; bool is_failed;
bool fail_reset; bool fail_reset;
struct spdk_nvme_transport_id trid; struct spdk_nvme_transport_id trid;
@ -313,8 +312,11 @@ ut_attach_ctrlr(const struct spdk_nvme_transport_id *trid, uint32_t num_ns)
uint32_t i; uint32_t i;
ctrlr = calloc(1, sizeof(*ctrlr)); ctrlr = calloc(1, sizeof(*ctrlr));
SPDK_CU_ASSERT_FATAL(ctrlr != NULL); if (ctrlr == NULL) {
return NULL;
}
ctrlr->attached = true;
ctrlr->adminq.ctrlr = ctrlr; ctrlr->adminq.ctrlr = ctrlr;
TAILQ_INIT(&ctrlr->adminq.outstanding_reqs); TAILQ_INIT(&ctrlr->adminq.outstanding_reqs);
@ -488,6 +490,16 @@ spdk_nvme_connect_async(const struct spdk_nvme_transport_id *trid,
return probe_ctx; return probe_ctx;
} }
int
spdk_nvme_detach(struct spdk_nvme_ctrlr *ctrlr)
{
if (ctrlr->attached) {
ut_detach_ctrlr(ctrlr);
}
return 0;
}
const struct spdk_nvme_ctrlr_data * const struct spdk_nvme_ctrlr_data *
spdk_nvme_ctrlr_get_data(struct spdk_nvme_ctrlr *ctrlr) spdk_nvme_ctrlr_get_data(struct spdk_nvme_ctrlr *ctrlr)
{ {
@ -1472,7 +1484,6 @@ test_attach_ctrlr(void)
poll_threads(); poll_threads();
CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL); CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);
ut_detach_ctrlr(ctrlr);
/* If ctrlr has one namespace, one nvme_bdev_ctrlr with one namespace and /* If ctrlr has one namespace, one nvme_bdev_ctrlr with one namespace and
* one nvme_bdev is created. * one nvme_bdev is created.
@ -1509,8 +1520,6 @@ test_attach_ctrlr(void)
CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL); CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);
ut_detach_ctrlr(ctrlr);
/* Ctrlr has one namespace but one nvme_bdev_ctrlr with no namespace is /* Ctrlr has one namespace but one nvme_bdev_ctrlr with no namespace is
* created because creating one nvme_bdev failed. * created because creating one nvme_bdev failed.
*/ */
@ -1542,8 +1551,6 @@ test_attach_ctrlr(void)
CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL); CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);
ut_detach_ctrlr(ctrlr);
g_ut_register_bdev_status = 0; g_ut_register_bdev_status = 0;
} }
@ -1680,8 +1687,6 @@ test_aer_cb(void)
poll_threads(); poll_threads();
CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL); CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);
ut_detach_ctrlr(ctrlr);
} }
static void static void
@ -1869,8 +1874,6 @@ test_submit_nvme_cmd(void)
poll_threads(); poll_threads();
CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL); CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);
ut_detach_ctrlr(ctrlr);
} }
static void static void
@ -2119,8 +2122,6 @@ test_abort(void)
poll_threads(); poll_threads();
CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL); CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);
ut_detach_ctrlr(ctrlr);
} }
static void static void
@ -2225,8 +2226,6 @@ test_bdev_unregister(void)
poll_threads(); poll_threads();
CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL); CU_ASSERT(nvme_bdev_ctrlr_get_by_name("nvme0") == NULL);
ut_detach_ctrlr(ctrlr);
} }
static void static void