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

accel: Rename spdk_accel_engine_module_finish to

Browse Source 
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 <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13917
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
This commit is contained in:
Ben Walker 2022-08-08 13:36:34 -07:00 committed by Tomasz Zawadzki
parent 0b9ba6a330
commit dd7140e627
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/spdk/accel.h
View File

@ -61,11 +61,6 @@ int spdk_accel_engine_initialize(void);
*/ */
void spdk_accel_engine_finish(spdk_accel_fini_cb cb_fn, void *cb_arg); 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. * Get the I/O channel registered on the acceleration engine.
* *

5
include/spdk_internal/accel_engine.h
View File

@ -89,4 +89,9 @@ static void __attribute__((constructor)) _spdk_accel_module_register_##name(void
spdk_accel_module_list_add(module); \ 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 #endif

6
lib/accel/accel_engine.c
View File

@ -637,7 +637,7 @@ spdk_accel_write_config_json(struct spdk_json_write_ctx *w)
} }
void void
spdk_accel_engine_module_finish(void) spdk_accel_module_finish(void)
{ {
if (!g_accel_engine_module) { if (!g_accel_engine_module) {
g_accel_engine_module = TAILQ_FIRST(&spdk_accel_module_list); 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) { if (g_accel_engine_module->module_fini) {
spdk_thread_send_msg(spdk_get_thread(), g_accel_engine_module->module_fini, NULL); spdk_thread_send_msg(spdk_get_thread(), g_accel_engine_module->module_fini, NULL);
} else { } 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_io_device_unregister(&spdk_accel_module_list, NULL);
spdk_accel_engine_module_finish(); spdk_accel_module_finish();
} }
SPDK_LOG_REGISTER_COMPONENT(accel) SPDK_LOG_REGISTER_COMPONENT(accel)

2
lib/accel/accel_sw.c
View File

@ -385,7 +385,7 @@ static void
sw_accel_engine_fini(void *ctxt) sw_accel_engine_fini(void *ctxt)
{ {
spdk_io_device_unregister(&g_sw_module, NULL); 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) SPDK_ACCEL_MODULE_REGISTER(sw, &g_sw_module)

2
lib/accel/spdk_accel.map
View File

@ -4,7 +4,6 @@
# public functions # public functions
spdk_accel_engine_initialize; spdk_accel_engine_initialize;
spdk_accel_engine_finish; spdk_accel_engine_finish;
spdk_accel_engine_module_finish;
spdk_accel_engine_get_io_channel; spdk_accel_engine_get_io_channel;
spdk_accel_submit_copy; spdk_accel_submit_copy;
spdk_accel_submit_dualcast; spdk_accel_submit_dualcast;
@ -22,6 +21,7 @@
# functions needed by modules # functions needed by modules
spdk_accel_module_list_add; spdk_accel_module_list_add;
spdk_accel_module_finish;
spdk_accel_task_complete; spdk_accel_task_complete;
local: *; local: *;

2
module/accel/dsa/accel_engine_dsa.c
View File

@ -452,7 +452,7 @@ accel_engine_dsa_exit(void *ctx)
free(dev); free(dev);
} }
spdk_accel_engine_module_finish(); spdk_accel_module_finish();
} }
static void static void

2
module/accel/iaa/accel_engine_iaa.c
View File

@ -392,7 +392,7 @@ accel_engine_iaa_exit(void *ctx)
free(dev); free(dev);
} }
spdk_accel_engine_module_finish(); spdk_accel_module_finish();
} }
static void static void

4
module/accel/ioat/accel_engine_ioat.c
View File

@ -300,7 +300,7 @@ _device_unregister_cb(void *io_device)
g_ioat_initialized = false; g_ioat_initialized = false;
spdk_accel_engine_module_finish(); spdk_accel_module_finish();
} }
static void static void
@ -309,7 +309,7 @@ accel_engine_ioat_exit(void *ctx)
if (g_ioat_initialized) { if (g_ioat_initialized) {
spdk_io_device_unregister(&g_ioat_module, _device_unregister_cb); spdk_io_device_unregister(&g_ioat_module, _device_unregister_cb);
} else { } else {
spdk_accel_engine_module_finish(); spdk_accel_module_finish();
} }
} }