Currently, the multiprocess cleanup for VFIO is called via an internal-only API, and this is the only thing `eal_vfio.h` is used for in EAL. In order to make `eal_vfio.h` truly VFIO-internal, export a cleanup function from `rte_vfio` API instead, and call that. This allows us to remove all EAL references to `eal_vfio.h` in non-VFIO related files.
Signed-off-by: Anatoly Burakov <[email protected]> --- lib/eal/freebsd/eal.c | 6 ++++++ lib/eal/include/rte_vfio.h | 9 +++++++++ lib/eal/linux/eal.c | 3 +-- lib/eal/linux/eal_vfio.c | 7 +++++++ lib/eal/windows/eal.c | 6 ++++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 0fe54a9dd7..991ca45064 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -845,6 +845,12 @@ int rte_vfio_enable(__rte_unused const char *modname) return -1; } +RTE_EXPORT_INTERNAL_SYMBOL(rte_vfio_cleanup) +void +rte_vfio_cleanup(void) +{ +} + RTE_EXPORT_INTERNAL_SYMBOL(rte_vfio_is_enabled) int rte_vfio_is_enabled(__rte_unused const char *modname) { diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h index 0ddeb08f94..e76181c83c 100644 --- a/lib/eal/include/rte_vfio.h +++ b/lib/eal/include/rte_vfio.h @@ -109,6 +109,15 @@ int rte_vfio_release_device(const char *sysfs_base, const char *dev_addr, int fd __rte_internal int rte_vfio_enable(const char *modname); +/** + * @internal + * Cleanup VFIO resources. + * + * This function is only relevant to Linux. + */ +__rte_internal +void rte_vfio_cleanup(void); + /** * @internal * Check whether a VFIO-related kmod is enabled. diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index fc2e9b8c0e..5577bab24a 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -54,7 +54,6 @@ #include "eal_memcfg.h" #include "eal_trace.h" #include "eal_options.h" -#include "eal_vfio.h" #include "hotplug_mp.h" #include "log_internal.h" @@ -986,7 +985,7 @@ rte_eal_cleanup(void) rte_service_finalize(); eal_bus_cleanup(); - vfio_mp_sync_cleanup(); + rte_vfio_cleanup(); rte_mp_channel_cleanup(); rte_eal_alarm_cleanup(); rte_trace_save(); diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c index 33fa04feaf..6c77076bc3 100644 --- a/lib/eal/linux/eal_vfio.c +++ b/lib/eal/linux/eal_vfio.c @@ -2217,3 +2217,10 @@ rte_vfio_container_dma_unmap(int container_fd, uint64_t vaddr, uint64_t iova, return container_dma_unmap(vfio_cfg, vaddr, iova, len); } + +RTE_EXPORT_INTERNAL_SYMBOL(rte_vfio_cleanup) +void +rte_vfio_cleanup(void) +{ + vfio_mp_sync_cleanup(); +} diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c index de7a89a829..b8771d4d85 100644 --- a/lib/eal/windows/eal.c +++ b/lib/eal/windows/eal.c @@ -152,6 +152,12 @@ rte_eal_cleanup(void) return 0; } +RTE_EXPORT_INTERNAL_SYMBOL(rte_vfio_cleanup) +void +rte_vfio_cleanup(void) +{ +} + /* Launch threads, called at application init(). */ RTE_EXPORT_SYMBOL(rte_eal_init) int -- 2.52.0
