From dd7140e627f6e62b62f70826b09783d675c8574d Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 8 Aug 2022 13:36:34 -0700 Subject: [PATCH] accel: Rename spdk_accel_engine_module_finish to spdk_accel_module_finish Also move it into the internal header that defines the interface used by modules. Change-Id: I3aeb41e643f27a69556099cb8d166f64c9e5d67f Signed-off-by: Ben Walker Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13917 Tested-by: SPDK CI Jenkins Reviewed-by: Krzysztof Karas Reviewed-by: Shuhei Matsumoto Reviewed-by: Aleksey Marchuk Reviewed-by: Paul Luse Community-CI: Broadcom CI --- include/spdk/accel.h | 5 ----- include/spdk_internal/accel_engine.h | 5 +++++ lib/accel/accel_engine.c | 6 +++--- lib/accel/accel_sw.c | 2 +- lib/accel/spdk_accel.map | 2 +- module/accel/dsa/accel_engine_dsa.c | 2 +- module/accel/iaa/accel_engine_iaa.c | 2 +- module/accel/ioat/accel_engine_ioat.c | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/spdk/accel.h b/include/spdk/accel.h index a19d75869..c57706a11 100644 --- a/include/spdk/accel.h +++ b/include/spdk/accel.h @@ -61,11 +61,6 @@ int spdk_accel_engine_initialize(void); */ void spdk_accel_engine_finish(spdk_accel_fini_cb cb_fn, void *cb_arg); -/** - * Close the acceleration engine module and perform any necessary cleanup. - */ -void spdk_accel_engine_module_finish(void); - /** * Get the I/O channel registered on the acceleration engine. * diff --git a/include/spdk_internal/accel_engine.h b/include/spdk_internal/accel_engine.h index 59c84463a..c96866799 100644 --- a/include/spdk_internal/accel_engine.h +++ b/include/spdk_internal/accel_engine.h @@ -89,4 +89,9 @@ static void __attribute__((constructor)) _spdk_accel_module_register_##name(void spdk_accel_module_list_add(module); \ } +/** + * Called by an accel module when cleanup initiated during .module_fini has completed + */ +void spdk_accel_module_finish(void); + #endif diff --git a/lib/accel/accel_engine.c b/lib/accel/accel_engine.c index cfb1a803c..0d4fe759e 100644 --- a/lib/accel/accel_engine.c +++ b/lib/accel/accel_engine.c @@ -637,7 +637,7 @@ spdk_accel_write_config_json(struct spdk_json_write_ctx *w) } void -spdk_accel_engine_module_finish(void) +spdk_accel_module_finish(void) { if (!g_accel_engine_module) { g_accel_engine_module = TAILQ_FIRST(&spdk_accel_module_list); @@ -653,7 +653,7 @@ spdk_accel_engine_module_finish(void) if (g_accel_engine_module->module_fini) { spdk_thread_send_msg(spdk_get_thread(), g_accel_engine_module->module_fini, NULL); } else { - spdk_accel_engine_module_finish(); + spdk_accel_module_finish(); } } @@ -676,7 +676,7 @@ spdk_accel_engine_finish(spdk_accel_fini_cb cb_fn, void *cb_arg) } spdk_io_device_unregister(&spdk_accel_module_list, NULL); - spdk_accel_engine_module_finish(); + spdk_accel_module_finish(); } SPDK_LOG_REGISTER_COMPONENT(accel) diff --git a/lib/accel/accel_sw.c b/lib/accel/accel_sw.c index d547c583d..19dd586a7 100644 --- a/lib/accel/accel_sw.c +++ b/lib/accel/accel_sw.c @@ -385,7 +385,7 @@ static void sw_accel_engine_fini(void *ctxt) { spdk_io_device_unregister(&g_sw_module, NULL); - spdk_accel_engine_module_finish(); + spdk_accel_module_finish(); } SPDK_ACCEL_MODULE_REGISTER(sw, &g_sw_module) diff --git a/lib/accel/spdk_accel.map b/lib/accel/spdk_accel.map index d64b53122..b55b1e97e 100644 --- a/lib/accel/spdk_accel.map +++ b/lib/accel/spdk_accel.map @@ -4,7 +4,6 @@ # public functions spdk_accel_engine_initialize; spdk_accel_engine_finish; - spdk_accel_engine_module_finish; spdk_accel_engine_get_io_channel; spdk_accel_submit_copy; spdk_accel_submit_dualcast; @@ -22,6 +21,7 @@ # functions needed by modules spdk_accel_module_list_add; + spdk_accel_module_finish; spdk_accel_task_complete; local: *; diff --git a/module/accel/dsa/accel_engine_dsa.c b/module/accel/dsa/accel_engine_dsa.c index 61500e1b5..3bae57bf7 100644 --- a/module/accel/dsa/accel_engine_dsa.c +++ b/module/accel/dsa/accel_engine_dsa.c @@ -452,7 +452,7 @@ accel_engine_dsa_exit(void *ctx) free(dev); } - spdk_accel_engine_module_finish(); + spdk_accel_module_finish(); } static void diff --git a/module/accel/iaa/accel_engine_iaa.c b/module/accel/iaa/accel_engine_iaa.c index 35d39888c..045e6473b 100644 --- a/module/accel/iaa/accel_engine_iaa.c +++ b/module/accel/iaa/accel_engine_iaa.c @@ -392,7 +392,7 @@ accel_engine_iaa_exit(void *ctx) free(dev); } - spdk_accel_engine_module_finish(); + spdk_accel_module_finish(); } static void diff --git a/module/accel/ioat/accel_engine_ioat.c b/module/accel/ioat/accel_engine_ioat.c index 23c9af64a..54bfdf8d6 100644 --- a/module/accel/ioat/accel_engine_ioat.c +++ b/module/accel/ioat/accel_engine_ioat.c @@ -300,7 +300,7 @@ _device_unregister_cb(void *io_device) g_ioat_initialized = false; - spdk_accel_engine_module_finish(); + spdk_accel_module_finish(); } static void @@ -309,7 +309,7 @@ accel_engine_ioat_exit(void *ctx) if (g_ioat_initialized) { spdk_io_device_unregister(&g_ioat_module, _device_unregister_cb); } else { - spdk_accel_engine_module_finish(); + spdk_accel_module_finish(); } }