From 908cab3f1cea5a59cbacfaf60fcf3cd52c240613 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 6 Jul 2017 17:20:53 -0700 Subject: [PATCH] bdev: populate module_name Add a name parameter to the MODULE_REGISTER macros, and then modify each bdev module to pass a string for its name. Signed-off-by: Jim Harris Change-Id: If878617ce3c3eacfcf5df44ed6f194f11c66f78f Reviewed-on: https://review.gerrithub.io/368596 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Ben Walker --- include/spdk_internal/bdev.h | 22 ++++++++++++---------- lib/bdev/aio/blockdev_aio.c | 2 +- lib/bdev/bdev.c | 4 ++-- lib/bdev/error/vbdev_error.c | 2 +- lib/bdev/gpt/vbdev_gpt.c | 2 +- lib/bdev/malloc/blockdev_malloc.c | 2 +- lib/bdev/null/blockdev_null.c | 2 +- lib/bdev/nvme/blockdev_nvme.c | 2 +- lib/bdev/rbd/blockdev_rbd.c | 2 +- lib/bdev/split/vbdev_split.c | 3 ++- 10 files changed, 23 insertions(+), 20 deletions(-) diff --git a/include/spdk_internal/bdev.h b/include/spdk_internal/bdev.h index d5401e511..af7e1d3cf 100644 --- a/include/spdk_internal/bdev.h +++ b/include/spdk_internal/bdev.h @@ -104,7 +104,7 @@ struct spdk_bdev_module_if { void (*config_text)(FILE *fp); /** Name for the modules being defined. */ - const char *module_name; + const char *name; /** * Returns the allocation size required for the backend for uses such as local @@ -423,29 +423,31 @@ spdk_bdev_io_from_ctx(void *ctx) ((uintptr_t)ctx - offsetof(struct spdk_bdev_io, driver_ctx)); } -#define SPDK_BDEV_MODULE_REGISTER(init_fn, fini_fn, config_fn, ctx_size_fn) \ - static struct spdk_bdev_module_if init_fn ## _if = { \ +#define SPDK_BDEV_MODULE_REGISTER(_name, init_fn, fini_fn, config_fn, ctx_size_fn) \ + static struct spdk_bdev_module_if _name ## _if = { \ + .name = #_name, \ .module_init = init_fn, \ .module_fini = fini_fn, \ .config_text = config_fn, \ .get_ctx_size = ctx_size_fn, \ }; \ - __attribute__((constructor)) static void init_fn ## _init(void) \ + __attribute__((constructor)) static void _name ## _init(void) \ { \ - spdk_bdev_module_list_add(&init_fn ## _if); \ + spdk_bdev_module_list_add(&_name ## _if); \ } -#define SPDK_VBDEV_MODULE_REGISTER(init_fn, fini_fn, config_fn, ctx_size_fn, bdev_registered_fn)\ - static struct spdk_bdev_module_if init_fn ## _if = { \ +#define SPDK_VBDEV_MODULE_REGISTER(_name, init_fn, fini_fn, config_fn, ctx_size_fn, registered_fn)\ + static struct spdk_bdev_module_if _name ## _if = { \ + .name = #_name, \ .module_init = init_fn, \ .module_fini = fini_fn, \ .config_text = config_fn, \ .get_ctx_size = ctx_size_fn, \ - .bdev_registered = bdev_registered_fn, \ + .bdev_registered = registered_fn, \ }; \ - __attribute__((constructor)) static void init_fn ## _init(void) \ + __attribute__((constructor)) static void _name ## _init(void) \ { \ - spdk_vbdev_module_list_add(&init_fn ## _if); \ + spdk_vbdev_module_list_add(&_name ## _if); \ } #endif /* SPDK_INTERNAL_BDEV_H */ diff --git a/lib/bdev/aio/blockdev_aio.c b/lib/bdev/aio/blockdev_aio.c index 10f5cb449..31f19cdcd 100644 --- a/lib/bdev/aio/blockdev_aio.c +++ b/lib/bdev/aio/blockdev_aio.c @@ -52,7 +52,7 @@ blockdev_aio_get_ctx_size(void) return sizeof(struct blockdev_aio_task); } -SPDK_BDEV_MODULE_REGISTER(blockdev_aio_initialize, NULL, NULL, blockdev_aio_get_ctx_size) +SPDK_BDEV_MODULE_REGISTER(aio, blockdev_aio_initialize, NULL, NULL, blockdev_aio_get_ctx_size) static int blockdev_aio_open(struct file_disk *disk) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 9c2ab5073..c06eaf292 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -373,7 +373,7 @@ spdk_bdev_module_init_next(int rc) { if (rc) { assert(g_next_bdev_module != NULL); - SPDK_ERRLOG("Failed to init bdev module: %s\n", g_next_bdev_module->module_name); + SPDK_ERRLOG("Failed to init bdev module: %s\n", g_next_bdev_module->name); spdk_bdev_init_complete(rc); return; } @@ -396,7 +396,7 @@ spdk_vbdev_module_init_next(int rc) { if (rc) { assert(g_next_vbdev_module != NULL); - SPDK_ERRLOG("Failed to init vbdev module: %s\n", g_next_vbdev_module->module_name); + SPDK_ERRLOG("Failed to init vbdev module: %s\n", g_next_vbdev_module->name); spdk_bdev_init_complete(rc); return; } diff --git a/lib/bdev/error/vbdev_error.c b/lib/bdev/error/vbdev_error.c index c38404896..14a0c8a01 100644 --- a/lib/bdev/error/vbdev_error.c +++ b/lib/bdev/error/vbdev_error.c @@ -330,4 +330,4 @@ vbdev_error_fini(void) } } -SPDK_VBDEV_MODULE_REGISTER(vbdev_error_init, vbdev_error_fini, NULL, NULL, NULL) +SPDK_VBDEV_MODULE_REGISTER(error, vbdev_error_init, vbdev_error_fini, NULL, NULL, NULL) diff --git a/lib/bdev/gpt/vbdev_gpt.c b/lib/bdev/gpt/vbdev_gpt.c index c6959fa43..9c2223bbb 100644 --- a/lib/bdev/gpt/vbdev_gpt.c +++ b/lib/bdev/gpt/vbdev_gpt.c @@ -545,6 +545,6 @@ vbdev_gpt_get_ctx_size(void) return sizeof(struct spdk_io_channel *); } -SPDK_VBDEV_MODULE_REGISTER(vbdev_gpt_init, vbdev_gpt_fini, NULL, +SPDK_VBDEV_MODULE_REGISTER(gpt, vbdev_gpt_init, vbdev_gpt_fini, NULL, vbdev_gpt_get_ctx_size, vbdev_gpt_register) SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_gpt", SPDK_TRACE_VBDEV_GPT) diff --git a/lib/bdev/malloc/blockdev_malloc.c b/lib/bdev/malloc/blockdev_malloc.c index 7355894ff..cbe3a5b4f 100644 --- a/lib/bdev/malloc/blockdev_malloc.c +++ b/lib/bdev/malloc/blockdev_malloc.c @@ -99,7 +99,7 @@ blockdev_malloc_get_ctx_size(void) return sizeof(struct malloc_task) + spdk_copy_task_size(); } -SPDK_BDEV_MODULE_REGISTER(blockdev_malloc_initialize, blockdev_malloc_finish, +SPDK_BDEV_MODULE_REGISTER(malloc, blockdev_malloc_initialize, blockdev_malloc_finish, blockdev_malloc_get_spdk_running_config, blockdev_malloc_get_ctx_size) static void diff --git a/lib/bdev/null/blockdev_null.c b/lib/bdev/null/blockdev_null.c index 4dc55ddf4..fd8dc322f 100644 --- a/lib/bdev/null/blockdev_null.c +++ b/lib/bdev/null/blockdev_null.c @@ -284,7 +284,7 @@ blockdev_null_get_spdk_running_config(FILE *fp) } } -SPDK_BDEV_MODULE_REGISTER(blockdev_null_initialize, blockdev_null_finish, +SPDK_BDEV_MODULE_REGISTER(null, blockdev_null_initialize, blockdev_null_finish, blockdev_null_get_spdk_running_config, blockdev_null_get_ctx_size) SPDK_LOG_REGISTER_TRACE_FLAG("bdev_null", SPDK_TRACE_BDEV_NULL) diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c index 4390aa8ff..a0533b214 100644 --- a/lib/bdev/nvme/blockdev_nvme.c +++ b/lib/bdev/nvme/blockdev_nvme.c @@ -150,7 +150,7 @@ bdev_nvme_get_ctx_size(void) return sizeof(struct nvme_bdev_io); } -SPDK_BDEV_MODULE_REGISTER(bdev_nvme_library_init, bdev_nvme_library_fini, +SPDK_BDEV_MODULE_REGISTER(nvme, bdev_nvme_library_init, bdev_nvme_library_fini, bdev_nvme_get_spdk_running_config, bdev_nvme_get_ctx_size) diff --git a/lib/bdev/rbd/blockdev_rbd.c b/lib/bdev/rbd/blockdev_rbd.c index 24e71e419..4569317d6 100644 --- a/lib/bdev/rbd/blockdev_rbd.c +++ b/lib/bdev/rbd/blockdev_rbd.c @@ -210,7 +210,7 @@ blockdev_rbd_get_ctx_size(void) return sizeof(struct blockdev_rbd_io); } -SPDK_BDEV_MODULE_REGISTER(blockdev_rbd_library_init, blockdev_rbd_library_fini, NULL, +SPDK_BDEV_MODULE_REGISTER(rbd, blockdev_rbd_library_init, blockdev_rbd_library_fini, NULL, blockdev_rbd_get_ctx_size) static int64_t diff --git a/lib/bdev/split/vbdev_split.c b/lib/bdev/split/vbdev_split.c index 46852bf4f..f3b9a3af7 100644 --- a/lib/bdev/split/vbdev_split.c +++ b/lib/bdev/split/vbdev_split.c @@ -422,5 +422,6 @@ vbdev_split_get_ctx_size(void) return sizeof(struct spdk_io_channel *); } -SPDK_VBDEV_MODULE_REGISTER(vbdev_split_init, vbdev_split_fini, NULL, vbdev_split_get_ctx_size, NULL) +SPDK_VBDEV_MODULE_REGISTER(split, vbdev_split_init, vbdev_split_fini, NULL, + vbdev_split_get_ctx_size, NULL) SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_split", SPDK_TRACE_VBDEV_SPLIT)