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

bdev/nvme: bdev_nvme_detach_controller is now much more flexible

Browse Source 
It can match by any provided parameter to remove paths.

Change-Id: I5e7a87342bbb90943dc97fb52f142814fcf0acfa
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9453
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Ben Walker 2021-09-08 11:39:23 -07:00 committed by Tomasz Zawadzki
parent 301b3635fd
commit 14739d6e13
4 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/bdev/nvme/bdev_nvme.c
View File

@ -3101,7 +3101,7 @@ bdev_nvme_delete(const char *name, const struct spdk_nvme_transport_id *trid)
struct nvme_ctrlr_trid *ctrlr_trid, *tmp_trid;
int rc = -ENXIO;
if (name == NULL) {
if (name == NULL || trid == NULL) {
return -EINVAL;
}
@ -3116,16 +3116,6 @@ bdev_nvme_delete(const char *name, const struct spdk_nvme_transport_id *trid)
*/
TAILQ_FOREACH_SAFE(nvme_ctrlr, &nbdev_ctrlr->ctrlrs, tailq, tmp_nvme_ctrlr) {
if (trid == NULL) {
/* Remove all nvme_ctrlrs of the nvme_bdev_ctrlr. */
rc = _bdev_nvme_delete(nvme_ctrlr, false);
if (rc != 0) {
return rc;
}
continue;
}
TAILQ_FOREACH_REVERSE_SAFE(ctrlr_trid, &nvme_ctrlr->trids, nvme_paths, link, tmp_trid) {
if (trid->trtype != 0) {
if (trid->trtype == SPDK_NVME_TRANSPORT_CUSTOM) {

38
module/bdev/nvme/bdev_nvme_rpc.c
View File

@ -553,7 +553,6 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
struct spdk_nvme_transport_id trid = {};
size_t len, maxlen;
int rc = 0;
bool all_trid_entries, one_trid_entry;
if (spdk_json_decode_object(params, rpc_bdev_nvme_detach_controller_decoders,
SPDK_COUNTOF(rpc_bdev_nvme_detach_controller_decoders),
@ -563,18 +562,8 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
goto cleanup;
}
all_trid_entries = req.trtype && req.traddr && req.adrfam && req.trsvcid && req.subnqn;
one_trid_entry = req.trtype || req.traddr || req.adrfam || req.trsvcid || req.subnqn;
if (all_trid_entries ^ one_trid_entry) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"trtype, traddr, adrfam, trsvcid, subnqn must all be provided together or not at all.");
goto cleanup;
}
if (all_trid_entries) {
/* Parse trtype */
rc = spdk_nvme_transport_id_parse_trtype(&trid.trtype, req.trtype);
if (req.trtype != NULL) {
rc = spdk_nvme_transport_id_populate_trstring(&trid, req.trtype);
if (rc < 0) {
SPDK_ERRLOG("Failed to parse trtype: %s\n", req.trtype);
spdk_jsonrpc_send_error_response_fmt(request, -EINVAL, "Failed to parse trtype: %s",
@ -582,7 +571,16 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
goto cleanup;
}
/* Parse traddr */
rc = spdk_nvme_transport_id_parse_trtype(&trid.trtype, req.trtype);
if (rc < 0) {
SPDK_ERRLOG("Failed to parse trtype: %s\n", req.trtype);
spdk_jsonrpc_send_error_response_fmt(request, -EINVAL, "Failed to parse trtype: %s",
req.trtype);
goto cleanup;
}
}
if (req.traddr != NULL) {
maxlen = sizeof(trid.traddr);
len = strnlen(req.traddr, maxlen);
if (len == maxlen) {
@ -591,7 +589,9 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
goto cleanup;
}
memcpy(trid.traddr, req.traddr, len + 1);
}
if (req.adrfam != NULL) {
rc = spdk_nvme_transport_id_parse_adrfam(&trid.adrfam, req.adrfam);
if (rc < 0) {
SPDK_ERRLOG("Failed to parse adrfam: %s\n", req.adrfam);
@ -599,7 +599,9 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
req.adrfam);
goto cleanup;
}
}
if (req.trsvcid != NULL) {
maxlen = sizeof(trid.trsvcid);
len = strnlen(req.trsvcid, maxlen);
if (len == maxlen) {
@ -608,7 +610,10 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
goto cleanup;
}
memcpy(trid.trsvcid, req.trsvcid, len + 1);
}
/* Parse subnqn */
if (req.subnqn != NULL) {
maxlen = sizeof(trid.subnqn);
len = strnlen(req.subnqn, maxlen);
if (len == maxlen) {
@ -617,11 +622,10 @@ rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
goto cleanup;
}
memcpy(trid.subnqn, req.subnqn, len + 1);
rc = bdev_nvme_delete(req.name, &trid);
} else {
rc = bdev_nvme_delete(req.name, NULL);
}
rc = bdev_nvme_delete(req.name, &trid);
if (rc != 0) {
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
goto cleanup;

3
test/nvmf/host/multipath.sh
View File

@ -94,6 +94,9 @@ rpc_pid=$!
wait $rpc_pid
cat $testdir/try.txt
$rpc_py -s $bdevperf_rpc_sock bdev_nvme_get_controllers | grep -q NVMe0
# No need to wait here since we are deleting a TRID we aren't connected to.
$rpc_py -s $bdevperf_rpc_sock bdev_nvme_detach_controller NVMe0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_THIRD_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1
$rpc_py -s $bdevperf_rpc_sock bdev_nvme_get_controllers | grep -q NVMe0

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

@ -301,6 +301,7 @@ static int g_ut_attach_ctrlr_status;
static size_t g_ut_attach_bdev_count;
static int g_ut_register_bdev_status;
static uint16_t g_ut_cntlid;
static struct spdk_nvme_transport_id g_any_trid = {};
static void
ut_init_trid(struct spdk_nvme_transport_id *trid)
@ -1180,7 +1181,7 @@ test_create_ctrlr(void)
CU_ASSERT(nvme_ctrlr_get_by_name("nvme0") != NULL);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
CU_ASSERT(nvme_ctrlr_get_by_name("nvme0") != NULL);
@ -1290,7 +1291,7 @@ test_reset_ctrlr(void)
poll_threads();
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -1336,7 +1337,7 @@ test_race_between_reset_and_destruct_ctrlr(void)
/* Try destructing ctrlr while ctrlr is being reset, but it will be deferred. */
set_thread(0);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
CU_ASSERT(nvme_ctrlr_get_by_name("nvme0") == nvme_ctrlr);
CU_ASSERT(nvme_ctrlr->destruct == true);
@ -1504,7 +1505,7 @@ test_failover_ctrlr(void)
poll_threads();
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -1633,7 +1634,7 @@ test_pending_reset(void)
set_thread(0);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -1697,7 +1698,7 @@ test_attach_ctrlr(void)
CU_ASSERT(nvme_ctrlr->ctrlr == ctrlr);
CU_ASSERT(nvme_ctrlr->num_ns == 0);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -1731,7 +1732,7 @@ test_attach_ctrlr(void)
SPDK_CU_ASSERT_FATAL(nbdev != NULL);
CU_ASSERT(bdev_nvme_get_ctrlr(&nbdev->disk) == ctrlr);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -1761,7 +1762,7 @@ test_attach_ctrlr(void)
CU_ASSERT(attached_names[0] == NULL);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -1860,7 +1861,7 @@ test_aer_cb(void)
CU_ASSERT(nvme_ctrlr_get_ns(nvme_ctrlr, 2)->ana_state == SPDK_NVME_ANA_INACCESSIBLE_STATE);
CU_ASSERT(nvme_ctrlr_get_ns(nvme_ctrlr, 4)->ana_state == SPDK_NVME_ANA_CHANGE_STATE);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -2054,7 +2055,7 @@ test_submit_nvme_cmd(void)
set_thread(1);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -2207,7 +2208,7 @@ test_add_remove_trid(void)
CU_ASSERT(ctrid != NULL);
/* If trid is not specified, nvme_ctrlr itself is removed. */
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
CU_ASSERT(nvme_ctrlr_get_by_name("nvme0") == nvme_ctrlr);
@ -2384,7 +2385,7 @@ test_abort(void)
set_thread(1);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -2424,7 +2425,7 @@ test_get_io_qpair(void)
spdk_put_io_channel(ch);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -2602,7 +2603,7 @@ test_init_ana_log_page(void)
CU_ASSERT(nvme_ctrlr_get_ns(nvme_ctrlr, 4)->bdev != NULL);
CU_ASSERT(nvme_ctrlr_get_ns(nvme_ctrlr, 5)->bdev != NULL);
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -2763,7 +2764,7 @@ test_reconnect_qpair(void)
poll_threads();
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
poll_threads();
@ -2843,7 +2844,7 @@ test_create_bdev_ctrlr(void)
CU_ASSERT(nvme_bdev_ctrlr_get_ctrlr(nbdev_ctrlr, &trid2) != NULL);
/* Delete two ctrlrs at once. */
rc = bdev_nvme_delete("nvme0", NULL);
rc = bdev_nvme_delete("nvme0", &g_any_trid);
CU_ASSERT(rc == 0);
CU_ASSERT(nvme_bdev_ctrlr_get("nvme0") == nbdev_ctrlr);