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

bdev/nvme: remove dangling pointer from g_nvme_bdevs list on bdev_nvme destruction

Browse Source 
It was causing segfaults and infinite looping.

Change-Id: I4c19b5d3af1ba1360250cd5f6aa573a27003409f
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-03-17 12:39:51 +01:00 committed by Daniel Verkamp
parent 118c08154e
commit 0e2ea8797f
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/bdev/nvme/blockdev_nvme.c
View File

@ -197,20 +197,16 @@ bdev_nvme_poll_adminq(void *arg)
static int static int
bdev_nvme_destruct(struct spdk_bdev *bdev) bdev_nvme_destruct(struct spdk_bdev *bdev)
{ {
bool removable = true;
struct nvme_bdev *nvme_disk = (struct nvme_bdev *)bdev; struct nvme_bdev *nvme_disk = (struct nvme_bdev *)bdev;
struct nvme_ctrlr *nvme_ctrlr = nvme_disk->nvme_ctrlr; struct nvme_ctrlr *nvme_ctrlr = nvme_disk->nvme_ctrlr;
pthread_mutex_lock(&g_bdev_nvme_mutex); pthread_mutex_lock(&g_bdev_nvme_mutex);
nvme_ctrlr->ref--; nvme_ctrlr->ref--;
if (nvme_ctrlr->ref != 0) { TAILQ_REMOVE(&g_nvme_bdevs, nvme_disk, link);
removable = false;
}
free(nvme_disk); free(nvme_disk);
if (removable == true) { if (nvme_ctrlr->ref == 0) {
TAILQ_REMOVE(&g_nvme_ctrlrs, nvme_ctrlr, tailq); TAILQ_REMOVE(&g_nvme_ctrlrs, nvme_ctrlr, tailq);
pthread_mutex_unlock(&g_bdev_nvme_mutex); pthread_mutex_unlock(&g_bdev_nvme_mutex);
spdk_io_device_unregister(nvme_ctrlr->ctrlr); spdk_io_device_unregister(nvme_ctrlr->ctrlr);
@ -808,7 +804,6 @@ bdev_nvme_library_fini(void)
struct nvme_bdev *nvme_bdev, *btmp; struct nvme_bdev *nvme_bdev, *btmp;
TAILQ_FOREACH_SAFE(nvme_bdev, &g_nvme_bdevs, link, btmp) { TAILQ_FOREACH_SAFE(nvme_bdev, &g_nvme_bdevs, link, btmp) {
TAILQ_REMOVE(&g_nvme_bdevs, nvme_bdev, link);
bdev_nvme_destruct(&nvme_bdev->disk); bdev_nvme_destruct(&nvme_bdev->disk);
} }
} }