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

bdev: don't allow multiple unregister calls

Browse Source 
Unregister calls are not guarded. Fix this by chekcing status before
doing unregister.

Change-Id: I593e27efdae17f6d89362fd8e4edccf2af2b7281
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/445894
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Pawel Wodkowski 2019-02-22 14:28:43 +01:00 committed by Jim Harris
parent 5a051a6c1b
commit 0fe8cd1711
1 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
lib/bdev/bdev.c
View File

@ -3775,33 +3775,18 @@ _remove_notify(void *arg)
} }
} }
void /* Must be called while holding bdev->internal.mutex.
spdk_bdev_unregister(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void *cb_arg) * returns: 0 - bdev removed and ready to be destructed.
* -EBUSY - bdev can't be destructed yet. */
static int
spdk_bdev_unregister_unsafe(struct spdk_bdev *bdev)
{ {
struct spdk_bdev_desc *desc, *tmp; struct spdk_bdev_desc *desc, *tmp;
bool do_destruct = true; int rc = 0;
struct spdk_thread *thread;
SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Removing bdev %s from list\n", bdev->name);
thread = spdk_get_thread();
if (!thread) {
/* The user called this from a non-SPDK thread. */
if (cb_fn != NULL) {
cb_fn(cb_arg, -ENOTSUP);
}
return;
}
pthread_mutex_lock(&bdev->internal.mutex);
bdev->internal.status = SPDK_BDEV_STATUS_REMOVING;
bdev->internal.unregister_cb = cb_fn;
bdev->internal.unregister_ctx = cb_arg;
TAILQ_FOREACH_SAFE(desc, &bdev->internal.open_descs, link, tmp) { TAILQ_FOREACH_SAFE(desc, &bdev->internal.open_descs, link, tmp) {
if (desc->remove_cb) { if (desc->remove_cb) {
do_destruct = false; rc = -EBUSY;
/* /*
* Defer invocation of the remove_cb to a separate message that will * Defer invocation of the remove_cb to a separate message that will
* run later on its thread. This ensures this context unwinds and * run later on its thread. This ensures this context unwinds and
@ -3816,15 +3801,51 @@ spdk_bdev_unregister(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void
} }
} }
if (!do_destruct) { if (rc == 0) {
pthread_mutex_unlock(&bdev->internal.mutex); TAILQ_REMOVE(&g_bdev_mgr.bdevs, bdev, internal.link);
SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Removing bdev %s from list done\n", bdev->name);
}
return rc;
}
void
spdk_bdev_unregister(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void *cb_arg)
{
struct spdk_thread *thread;
int rc;
SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Removing bdev %s from list\n", bdev->name);
thread = spdk_get_thread();
if (!thread) {
/* The user called this from a non-SPDK thread. */
if (cb_fn != NULL) {
cb_fn(cb_arg, -ENOTSUP);
}
return; return;
} }
TAILQ_REMOVE(&g_bdev_mgr.bdevs, bdev, internal.link); pthread_mutex_lock(&bdev->internal.mutex);
if (bdev->internal.status == SPDK_BDEV_STATUS_REMOVING) {
pthread_mutex_unlock(&bdev->internal.mutex);
if (cb_fn) {
cb_fn(cb_arg, -EBUSY);
}
return;
}
bdev->internal.status = SPDK_BDEV_STATUS_REMOVING;
bdev->internal.unregister_cb = cb_fn;
bdev->internal.unregister_ctx = cb_arg;
/* Call under lock. */
rc = spdk_bdev_unregister_unsafe(bdev);
pthread_mutex_unlock(&bdev->internal.mutex); pthread_mutex_unlock(&bdev->internal.mutex);
spdk_bdev_fini(bdev); if (rc == 0) {
spdk_bdev_fini(bdev);
}
} }
int int
@ -3895,7 +3916,7 @@ void
spdk_bdev_close(struct spdk_bdev_desc *desc) spdk_bdev_close(struct spdk_bdev_desc *desc)
{ {
struct spdk_bdev *bdev = desc->bdev; struct spdk_bdev *bdev = desc->bdev;
bool do_unregister = false; int rc;
SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Closing descriptor %p for bdev %s on thread %p\n", desc, bdev->name, SPDK_DEBUGLOG(SPDK_LOG_BDEV, "Closing descriptor %p for bdev %s on thread %p\n", desc, bdev->name,
spdk_get_thread()); spdk_get_thread());
@ -3928,12 +3949,14 @@ spdk_bdev_close(struct spdk_bdev_desc *desc)
spdk_bdev_set_qd_sampling_period(bdev, 0); spdk_bdev_set_qd_sampling_period(bdev, 0);
if (bdev->internal.status == SPDK_BDEV_STATUS_REMOVING && TAILQ_EMPTY(&bdev->internal.open_descs)) { if (bdev->internal.status == SPDK_BDEV_STATUS_REMOVING && TAILQ_EMPTY(&bdev->internal.open_descs)) {
do_unregister = true; rc = spdk_bdev_unregister_unsafe(bdev);
} pthread_mutex_unlock(&bdev->internal.mutex);
pthread_mutex_unlock(&bdev->internal.mutex);
if (do_unregister == true) { if (rc == 0) {
spdk_bdev_unregister(bdev, bdev->internal.unregister_cb, bdev->internal.unregister_ctx); spdk_bdev_fini(bdev);
}
} else {
pthread_mutex_unlock(&bdev->internal.mutex);
} }
} }