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

bdev/ocssd: check namespace population

Browse Source 
Added population checks before any media event processings is performed,
as a namespace can get depopulated at any time.  This will guarantee
that depopulated namespaces are never touched.

Change-Id: I071404158e099b5f3195c1e3e50563b22cdf5c59
Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/921
Reviewed-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Konrad Sztyber 2020-02-17 10:31:19 +01:00 committed by Tomasz Zawadzki
parent 339fb7cd15
commit b70c23feb0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/bdev/nvme/bdev_ocssd.c
View File

@ -817,6 +817,11 @@ bdev_ocssd_chunk_notification_cb(void *ctx, const struct spdk_nvme_cpl *cpl)
return; return;
} }
/* The namespace could have been depopulated in the meantime */
if (!nvme_ns->populated) {
return;
}
for (chunk_id = 0; chunk_id < CHUNK_NOTIFICATION_ENTRY_COUNT; ++chunk_id) { for (chunk_id = 0; chunk_id < CHUNK_NOTIFICATION_ENTRY_COUNT; ++chunk_id) {
chunk_entry = &ocssd_ns->chunk[chunk_id]; chunk_entry = &ocssd_ns->chunk[chunk_id];
if (chunk_entry->nc <= ocssd_ns->chunk_notify_count) { if (chunk_entry->nc <= ocssd_ns->chunk_notify_count) {
@ -884,13 +889,18 @@ static int
bdev_ocssd_poll_mm(void *ctx) bdev_ocssd_poll_mm(void *ctx)
{ {
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = ctx; struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = ctx;
struct nvme_bdev_ns *nvme_ns;
struct bdev_ocssd_ns *ocssd_ns; struct bdev_ocssd_ns *ocssd_ns;
uint32_t nsid; uint32_t nsid;
int rc; int rc;
for (nsid = 0; nsid < nvme_bdev_ctrlr->num_ns; ++nsid) { for (nsid = 0; nsid < nvme_bdev_ctrlr->num_ns; ++nsid) {
ocssd_ns = bdev_ocssd_get_ns_from_nvme(nvme_bdev_ctrlr->namespaces[nsid]); nvme_ns = nvme_bdev_ctrlr->namespaces[nsid];
if (nvme_ns == NULL || !nvme_ns->populated) {
continue;
}
ocssd_ns = bdev_ocssd_get_ns_from_nvme(nvme_ns);
if (ocssd_ns->chunk_notify_pending) { if (ocssd_ns->chunk_notify_pending) {
ocssd_ns->chunk_notify_pending = false; ocssd_ns->chunk_notify_pending = false;
@ -900,7 +910,7 @@ bdev_ocssd_poll_mm(void *ctx)
sizeof(ocssd_ns->chunk[0]) * sizeof(ocssd_ns->chunk[0]) *
CHUNK_NOTIFICATION_ENTRY_COUNT, CHUNK_NOTIFICATION_ENTRY_COUNT,
0, bdev_ocssd_chunk_notification_cb, 0, bdev_ocssd_chunk_notification_cb,
nvme_bdev_ctrlr->namespaces[nsid]); nvme_ns);
if (spdk_unlikely(rc != 0)) { if (spdk_unlikely(rc != 0)) {
SPDK_ERRLOG("Failed to get chunk notification log page: %s\n", SPDK_ERRLOG("Failed to get chunk notification log page: %s\n",
spdk_strerror(-rc)); spdk_strerror(-rc));