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

bdev/nvme: rename functions and add more logs

Browse Source 
Change 'bdev_nvme_compare_trids' to name 'bdev_nvme_check_secondary_trid'
and 'bdev_nvme_compare_namespaces' to 'bdev_nvme_check_secondary_namespace'
which better explain the aim of these function.

RPC bdev_nvme_attach_controller only response "invalid parameter"
if the path is not sucessfully added due to not meeting the conditions
in bdev_nvme_compare_trids. Add more log.

Change-Id: If9ba6ec1d397d49689aa2ed6ab74fbfa96e16afa
Signed-off-by: Richael Zhuang <richael.zhuang@arm.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14251
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Richael Zhuang 2022-08-23 16:58:37 +08:00 committed by Tomasz Zawadzki
parent 3d7851e011
commit dbd7999f5e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4431,9 +4431,9 @@ nvme_ctrlr_populate_namespaces_done(struct nvme_ctrlr *nvme_ctrlr,
} }
static int static int
bdev_nvme_compare_trids(struct nvme_ctrlr *nvme_ctrlr, bdev_nvme_check_secondary_trid(struct nvme_ctrlr *nvme_ctrlr,
struct spdk_nvme_ctrlr *new_ctrlr, struct spdk_nvme_ctrlr *new_ctrlr,
struct spdk_nvme_transport_id *trid) struct spdk_nvme_transport_id *trid)
{ {
struct nvme_path_id *tmp_trid; struct nvme_path_id *tmp_trid;
@ -4444,17 +4444,25 @@ bdev_nvme_compare_trids(struct nvme_ctrlr *nvme_ctrlr,
/* Currently we only support failover to the same transport type. */ /* Currently we only support failover to the same transport type. */
if (nvme_ctrlr->active_path_id->trid.trtype != trid->trtype) { if (nvme_ctrlr->active_path_id->trid.trtype != trid->trtype) {
SPDK_WARNLOG("Failover from trtype: %s to a different trtype: %s is not supported currently\n",
spdk_nvme_transport_id_trtype_str(nvme_ctrlr->active_path_id->trid.trtype),
spdk_nvme_transport_id_trtype_str(trid->trtype));
return -EINVAL; return -EINVAL;
} }
/* Currently we only support failover to the same NQN. */ /* Currently we only support failover to the same NQN. */
if (strncmp(trid->subnqn, nvme_ctrlr->active_path_id->trid.subnqn, SPDK_NVMF_NQN_MAX_LEN)) { if (strncmp(trid->subnqn, nvme_ctrlr->active_path_id->trid.subnqn, SPDK_NVMF_NQN_MAX_LEN)) {
SPDK_WARNLOG("Failover from subnqn: %s to a different subnqn: %s is not supported currently\n",
nvme_ctrlr->active_path_id->trid.subnqn, trid->subnqn);
return -EINVAL; return -EINVAL;
} }
/* Skip all the other checks if we've already registered this path. */ /* Skip all the other checks if we've already registered this path. */
TAILQ_FOREACH(tmp_trid, &nvme_ctrlr->trids, link) { TAILQ_FOREACH(tmp_trid, &nvme_ctrlr->trids, link) {
if (!spdk_nvme_transport_id_compare(&tmp_trid->trid, trid)) { if (!spdk_nvme_transport_id_compare(&tmp_trid->trid, trid)) {
SPDK_WARNLOG("This path (traddr: %s subnqn: %s) is already registered\n", trid->traddr,
trid->subnqn);
return -EEXIST; return -EEXIST;
} }
} }
@ -4463,8 +4471,8 @@ bdev_nvme_compare_trids(struct nvme_ctrlr *nvme_ctrlr,
} }
static int static int
bdev_nvme_compare_namespaces(struct nvme_ctrlr *nvme_ctrlr, bdev_nvme_check_secondary_namespace(struct nvme_ctrlr *nvme_ctrlr,
struct spdk_nvme_ctrlr *new_ctrlr) struct spdk_nvme_ctrlr *new_ctrlr)
{ {
struct nvme_ns *nvme_ns; struct nvme_ns *nvme_ns;
struct spdk_nvme_ns *new_ns; struct spdk_nvme_ns *new_ns;
@ -4523,12 +4531,12 @@ bdev_nvme_add_secondary_trid(struct nvme_ctrlr *nvme_ctrlr,
pthread_mutex_lock(&nvme_ctrlr->mutex); pthread_mutex_lock(&nvme_ctrlr->mutex);
rc = bdev_nvme_compare_trids(nvme_ctrlr, new_ctrlr, trid); rc = bdev_nvme_check_secondary_trid(nvme_ctrlr, new_ctrlr, trid);
if (rc != 0) { if (rc != 0) {
goto exit; goto exit;
} }
rc = bdev_nvme_compare_namespaces(nvme_ctrlr, new_ctrlr); rc = bdev_nvme_check_secondary_namespace(nvme_ctrlr, new_ctrlr);
if (rc != 0) { if (rc != 0) {
goto exit; goto exit;
} }