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

lib/ftl: IO channel handling for nv cache

Browse Source 
Moved scrubbing of nv cache to core thread. Added IO channel which is
used in user context, during shutdown of nv cache.

Signed-off-by: Mateusz Kozlowski <mateusz.kozlowski@intel.com>
Change-Id: I88e680324e361bf7e0c0a9a9d29323f179c56e3b
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465932
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Mateusz Kozlowski 2019-08-21 15:19:07 +02:00 committed by Jim Harris
parent 863512e916
commit a3b7ae8ab6
3 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ftl/ftl_core.c
View File

@ -407,7 +407,6 @@ ftl_get_io_channel(const struct spdk_ftl_dev *dev)
return NULL; return NULL;
} }
int int
ftl_io_erase(struct ftl_io *io) ftl_io_erase(struct ftl_io *io)
{ {

2
lib/ftl/ftl_core.h
View File

@ -157,6 +157,8 @@ struct spdk_ftl_dev {
/* Indicates the device is about to be stopped */ /* Indicates the device is about to be stopped */
int halt; int halt;
/* Status to return for halt completion callback */
int halt_complete_status;
/* Initializaton context */ /* Initializaton context */
struct ftl_init_context init_ctx; struct ftl_init_context init_ctx;
/* Destruction context */ /* Destruction context */

75
lib/ftl/ftl_init.c
View File

@ -909,12 +909,26 @@ ftl_clear_nv_cache_cb(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)
} }
} }
static void
_ftl_nv_cache_scrub(void *ctx)
{
struct spdk_ftl_dev *dev = ctx;
int rc;
rc = ftl_nv_cache_scrub(&dev->nv_cache, ftl_clear_nv_cache_cb, dev);
if (spdk_unlikely(rc != 0)) {
SPDK_ERRLOG("Unable to clear the non-volatile cache bdev: %s\n",
spdk_strerror(-rc));
ftl_init_fail(dev);
}
}
static int static int
ftl_setup_initial_state(struct spdk_ftl_dev *dev) ftl_setup_initial_state(struct spdk_ftl_dev *dev)
{ {
struct spdk_ftl_conf *conf = &dev->conf; struct spdk_ftl_conf *conf = &dev->conf;
size_t i; size_t i;
int rc;
spdk_uuid_generate(&dev->uuid); spdk_uuid_generate(&dev->uuid);
@ -938,12 +952,7 @@ ftl_setup_initial_state(struct spdk_ftl_dev *dev)
if (!ftl_dev_has_nv_cache(dev)) { if (!ftl_dev_has_nv_cache(dev)) {
ftl_init_complete(dev); ftl_init_complete(dev);
} else { } else {
rc = ftl_nv_cache_scrub(&dev->nv_cache, ftl_clear_nv_cache_cb, dev); spdk_thread_send_msg(ftl_get_core_thread(dev), _ftl_nv_cache_scrub, dev);
if (spdk_unlikely(rc != 0)) {
SPDK_ERRLOG("Unable to clear the non-volatile cache bdev: %s\n",
spdk_strerror(-rc));
return -1;
}
} }
return 0; return 0;
@ -1229,6 +1238,13 @@ ftl_dev_free_sync(struct spdk_ftl_dev *dev)
spdk_io_device_unregister(dev, NULL); spdk_io_device_unregister(dev, NULL);
if (dev->core_thread.thread) {
ftl_dev_free_thread(dev, &dev->core_thread);
}
if (dev->read_thread.thread) {
ftl_dev_free_thread(dev, &dev->read_thread);
}
if (dev->bands) { if (dev->bands) {
for (i = 0; i < ftl_dev_num_bands(dev); ++i) { for (i = 0; i < ftl_dev_num_bands(dev); ++i) {
free(dev->bands[i].chunk_buf); free(dev->bands[i].chunk_buf);
@ -1267,37 +1283,28 @@ ftl_call_fini_complete(struct spdk_ftl_dev *dev, int status)
} }
} }
static void
ftl_halt_complete_cb(void *ctx)
{
struct spdk_ftl_dev *dev = ctx;
ftl_call_fini_complete(dev, dev->halt_complete_status);
}
static void static void
ftl_nv_cache_header_fini_cb(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) ftl_nv_cache_header_fini_cb(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)
{ {
int status = 0; struct spdk_ftl_dev *dev = cb_arg;
int rc = 0;
spdk_bdev_free_io(bdev_io); spdk_bdev_free_io(bdev_io);
if (spdk_unlikely(!success)) { if (spdk_unlikely(!success)) {
SPDK_ERRLOG("Failed to write non-volatile cache metadata header\n"); SPDK_ERRLOG("Failed to write non-volatile cache metadata header\n");
status = -EIO; rc = -EIO;
} }
ftl_call_fini_complete((struct spdk_ftl_dev *)cb_arg, status); dev->halt_complete_status = rc;
} spdk_thread_send_msg(dev->fini_ctx.thread, ftl_halt_complete_cb, dev);
static void
ftl_halt_complete_cb(void *ctx)
{
struct spdk_ftl_dev *dev = ctx;
struct ftl_nv_cache *nv_cache = &dev->nv_cache;
int rc = 0;
if (!ftl_dev_has_nv_cache(dev)) {
ftl_call_fini_complete(dev, 0);
} else {
rc = ftl_nv_cache_write_header(nv_cache, true, ftl_nv_cache_header_fini_cb, dev);
if (spdk_unlikely(rc != 0)) {
SPDK_ERRLOG("Failed to write non-volatile cache metadata header: %s\n",
spdk_strerror(-rc));
ftl_call_fini_complete(dev, rc);
}
}
} }
static int static int
@ -1308,12 +1315,14 @@ ftl_halt_poller(void *ctx)
if (!dev->core_thread.poller && !dev->read_thread.poller) { if (!dev->core_thread.poller && !dev->read_thread.poller) {
spdk_poller_unregister(&dev->fini_ctx.poller); spdk_poller_unregister(&dev->fini_ctx.poller);
ftl_dev_free_thread(dev, &dev->read_thread);
ftl_dev_free_thread(dev, &dev->core_thread);
ftl_anm_unregister_device(dev); ftl_anm_unregister_device(dev);
spdk_thread_send_msg(dev->fini_ctx.thread, ftl_halt_complete_cb, dev); if (ftl_dev_has_nv_cache(dev)) {
ftl_nv_cache_write_header(&dev->nv_cache, true, ftl_nv_cache_header_fini_cb, dev);
} else {
dev->halt_complete_status = 0;
spdk_thread_send_msg(dev->fini_ctx.thread, ftl_halt_complete_cb, dev);
}
} }
return 0; return 0;