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

bdev/nvme: Delete alternate paths and an active path separately

Browse Source 
If alternate paths and an active path are treated separately in
_bdev_nvme_delete(), it will be much easier to protect a path list
from delete operation by mutex.

Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Ie3bed095fd92b80c0487ef7b136953ad03a174eb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16820
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2023-02-14 14:22:56 +09:00 committed by Tomasz Zawadzki
parent 422f5f3d11
commit f38d2f6a8e
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5365,30 +5365,35 @@ _bdev_nvme_delete(struct nvme_ctrlr *nvme_ctrlr, const struct nvme_path_id *path
int rc = -ENXIO; int rc = -ENXIO;
TAILQ_FOREACH_REVERSE_SAFE(p, &nvme_ctrlr->trids, nvme_paths, link, t) { TAILQ_FOREACH_REVERSE_SAFE(p, &nvme_ctrlr->trids, nvme_paths, link, t) {
if (p == TAILQ_FIRST(&nvme_ctrlr->trids)) {
break;
}
if (!nvme_path_should_delete(p, path_id)) { if (!nvme_path_should_delete(p, path_id)) {
continue; continue;
} }
/* If we made it here, then this path is a match! Now we need to remove it. */ /* We are not using the specified path. */
if (p == nvme_ctrlr->active_path_id) { TAILQ_REMOVE(&nvme_ctrlr->trids, p, link);
/* This is the active path in use right now. The active path is always the first in the list. */ free(p);
if (!TAILQ_NEXT(p, link)) { rc = 0;
/* The current path is the only path. */ }
rc = bdev_nvme_delete_ctrlr(nvme_ctrlr, false);
} else {
/* There is an alternative path. */
rc = bdev_nvme_failover(nvme_ctrlr, true);
}
} else {
/* We are not using the specified path. */
TAILQ_REMOVE(&nvme_ctrlr->trids, p, link);
free(p);
rc = 0;
}
if (rc < 0 && rc != -ENXIO) { if (p == NULL || !nvme_path_should_delete(p, path_id)) {
return rc; return rc;
} }
/* If we made it here, then this path is a match! Now we need to remove it. */
/* This is the active path in use right now. The active path is always the first in the list. */
assert(p == nvme_ctrlr->active_path_id);
if (!TAILQ_NEXT(p, link)) {
/* The current path is the only path. */
rc = bdev_nvme_delete_ctrlr(nvme_ctrlr, false);
} else {
/* There is an alternative path. */
rc = bdev_nvme_failover(nvme_ctrlr, true);
} }
return rc; return rc;