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

bdev/nvme: bdev_nvme_delete() uses mutexes for race conditions

Browse Source 
Inline the internal of bdev_nvme_delete_ctrlr() and bdev_nvme_failover()
into _bdev_nvme_delete().

Change the _nvme_ctrlr_destruct() call from direct to message passing
to reduce lock hold time and avoid potential deadlock.

Then, protect nbdev_ctrlr via g_bdev_mutex_unlock and each nvme_ctrlr
via nvme_ctrlr->mutex.

Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I5cc2cf781d2846c51bce631c12fceaeade860a0b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16822
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Michael Haeuptle <michaelhaeuptle@gmail.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2023-02-24 13:29:14 +09:00 committed by Konrad Sztyber
parent c161969df9
commit b05ec00f1a
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5294,8 +5294,11 @@ static int
_bdev_nvme_delete(struct nvme_ctrlr *nvme_ctrlr, const struct nvme_path_id *path_id)
{
struct nvme_path_id *p, *t;
spdk_msg_fn msg_fn;
int rc = -ENXIO;
pthread_mutex_lock(&nvme_ctrlr->mutex);
TAILQ_FOREACH_REVERSE_SAFE(p, &nvme_ctrlr->trids, nvme_paths, link, t) {
if (p == TAILQ_FIRST(&nvme_ctrlr->trids)) {
break;
@ -5312,6 +5315,7 @@ _bdev_nvme_delete(struct nvme_ctrlr *nvme_ctrlr, const struct nvme_path_id *path
}
if (p == NULL || !nvme_path_should_delete(p, path_id)) {
pthread_mutex_unlock(&nvme_ctrlr->mutex);
return rc;
}
@ -5322,10 +5326,20 @@ _bdev_nvme_delete(struct nvme_ctrlr *nvme_ctrlr, const struct nvme_path_id *path
if (!TAILQ_NEXT(p, link)) {
/* The current path is the only path. */
rc = bdev_nvme_delete_ctrlr(nvme_ctrlr, false);
msg_fn = _nvme_ctrlr_destruct;
rc = bdev_nvme_delete_ctrlr_unsafe(nvme_ctrlr, false);
} else {
/* There is an alternative path. */
rc = bdev_nvme_failover(nvme_ctrlr, true);
msg_fn = _bdev_nvme_reset;
rc = bdev_nvme_failover_unsafe(nvme_ctrlr, true);
}
pthread_mutex_unlock(&nvme_ctrlr->mutex);
if (rc == 0) {
spdk_thread_send_msg(nvme_ctrlr->thread, msg_fn, nvme_ctrlr);
} else if (rc == -EALREADY) {
rc = 0;
}
return rc;
@ -5342,8 +5356,12 @@ bdev_nvme_delete(const char *name, const struct nvme_path_id *path_id)
return -EINVAL;
}
pthread_mutex_lock(&g_bdev_nvme_mutex);
nbdev_ctrlr = nvme_bdev_ctrlr_get_by_name(name);
if (nbdev_ctrlr == NULL) {
pthread_mutex_unlock(&g_bdev_nvme_mutex);
SPDK_ERRLOG("Failed to find NVMe bdev controller\n");
return -ENODEV;
}
@ -5351,6 +5369,8 @@ bdev_nvme_delete(const char *name, const struct nvme_path_id *path_id)
TAILQ_FOREACH_SAFE(nvme_ctrlr, &nbdev_ctrlr->ctrlrs, tailq, tmp_nvme_ctrlr) {
_rc = _bdev_nvme_delete(nvme_ctrlr, path_id);
if (_rc < 0 && _rc != -ENXIO) {
pthread_mutex_unlock(&g_bdev_nvme_mutex);
return _rc;
} else if (_rc == 0) {
/* We traverse all remaining nvme_ctrlrs even if one nvme_ctrlr
@ -5361,6 +5381,8 @@ bdev_nvme_delete(const char *name, const struct nvme_path_id *path_id)
}
}
pthread_mutex_unlock(&g_bdev_nvme_mutex);
/* All nvme_ctrlrs were deleted or no nvme_ctrlr which had the trid was found. */
return rc;
}