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

bdev/nvme: Hold mutex while adding failover trid

Browse Source 
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I4e4aa1a9ed8e18a279b8d7aa7b90361df8fddc26
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5697
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-12-22 21:26:39 +09:00 committed by Tomasz Zawadzki
parent 1f14fea3b4
commit ea2d4bb501
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1803,6 +1803,7 @@ bdev_nvme_add_trid(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct spdk_nvme_ctr
struct nvme_bdev_ns *nvme_ns; struct nvme_bdev_ns *nvme_ns;
struct spdk_nvme_ns *new_ns; struct spdk_nvme_ns *new_ns;
struct nvme_bdev_ctrlr_trid *new_trid; struct nvme_bdev_ctrlr_trid *new_trid;
int rc = 0;
assert(nvme_bdev_ctrlr != NULL); assert(nvme_bdev_ctrlr != NULL);
@ -1811,25 +1812,31 @@ bdev_nvme_add_trid(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct spdk_nvme_ctr
return -ENOTSUP; return -ENOTSUP;
} }
pthread_mutex_lock(&g_bdev_nvme_mutex);
/* Currently we only support failover to the same transport type. */ /* Currently we only support failover to the same transport type. */
if (nvme_bdev_ctrlr->connected_trid->trtype != trid->trtype) { if (nvme_bdev_ctrlr->connected_trid->trtype != trid->trtype) {
return -EINVAL; rc = -EINVAL;
goto exit;
} }
/* Currently we only support failover to the same NQN. */ /* Currently we only support failover to the same NQN. */
if (strncmp(trid->subnqn, nvme_bdev_ctrlr->connected_trid->subnqn, SPDK_NVMF_NQN_MAX_LEN)) { if (strncmp(trid->subnqn, nvme_bdev_ctrlr->connected_trid->subnqn, SPDK_NVMF_NQN_MAX_LEN)) {
return -EINVAL; rc = -EINVAL;
goto exit;
} }
/* 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(new_trid, &nvme_bdev_ctrlr->trids, link) { TAILQ_FOREACH(new_trid, &nvme_bdev_ctrlr->trids, link) {
if (!spdk_nvme_transport_id_compare(&new_trid->trid, trid)) { if (!spdk_nvme_transport_id_compare(&new_trid->trid, trid)) {
return -EEXIST; rc = -EEXIST;
goto exit;
} }
} }
if (spdk_nvme_ctrlr_get_num_ns(new_ctrlr) != nvme_bdev_ctrlr->num_ns) { if (spdk_nvme_ctrlr_get_num_ns(new_ctrlr) != nvme_bdev_ctrlr->num_ns) {
return -EINVAL; rc = -EINVAL;
goto exit;
} }
for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) { for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) {
@ -1844,18 +1851,22 @@ bdev_nvme_add_trid(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct spdk_nvme_ctr
assert(new_ns != NULL); assert(new_ns != NULL);
if (bdev_nvme_compare_ns(nvme_ns->ns, new_ns) != 0) { if (bdev_nvme_compare_ns(nvme_ns->ns, new_ns) != 0) {
return -EINVAL; rc = -EINVAL;
goto exit;
} }
} }
new_trid = calloc(1, sizeof(*new_trid)); new_trid = calloc(1, sizeof(*new_trid));
if (new_trid == NULL) { if (new_trid == NULL) {
return -ENOMEM; rc = -ENOMEM;
goto exit;
} }
new_trid->trid = *trid; new_trid->trid = *trid;
TAILQ_INSERT_TAIL(&nvme_bdev_ctrlr->trids, new_trid, link); TAILQ_INSERT_TAIL(&nvme_bdev_ctrlr->trids, new_trid, link);
return 0; exit:
pthread_mutex_unlock(&g_bdev_nvme_mutex);
return rc;
} }
static void static void