Calling rte_eal_cleanup() should cause DPDK to cleanup all
outstanding resources including file descriptors.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
lib/librte_eal/common/eal_private.h | 7 +++++++
lib/librte_eal/linux/eal/eal.c | 1 +
lib/librte_eal/linux/eal/eal_alarm.c | 11 +++++++++++
3 files changed, 19 insertions(+)
diff --git a/lib/librte_eal/common/eal_private.h
b/lib/librte_eal/common/eal_private.h
index fdd942d71a36..38682e79827c 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -202,6 +202,13 @@ int rte_eal_intr_init(void);
*/
int rte_eal_alarm_init(void);
+/**
+ * Cleanup alarm resources.
+ *
+ * This function is private to EAL.
+ */
+void rte_eal_alarm_cleanup(void);
+
/**
* Function is to check if the kernel module(like, vfio, vfio_iommu_type1,
* etc.) loaded.
diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index a3381fd01a23..a1b928820b11 100644
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -1325,6 +1325,7 @@ rte_eal_cleanup(void)
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
rte_memseg_walk(mark_freeable, NULL);
rte_service_finalize();
+ rte_eal_alarm_cleanup();
rte_mp_channel_cleanup();
eal_cleanup_config(&internal_config);
rte_eal_log_cleanup();
diff --git a/lib/librte_eal/linux/eal/eal_alarm.c
b/lib/librte_eal/linux/eal/eal_alarm.c
index 0924c9205c84..e6aeee933ece 100644
--- a/lib/librte_eal/linux/eal/eal_alarm.c
+++ b/lib/librte_eal/linux/eal/eal_alarm.c
@@ -6,6 +6,7 @@
#include <signal.h>
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#include <sys/queue.h>
#include <sys/time.h>
#include <sys/timerfd.h>
@@ -72,6 +73,16 @@ rte_eal_alarm_init(void)
return -1;
}
+void
+rte_eal_alarm_cleanup(void)
+{
+ if (intr_handle.fd == -1)
+ return;
+
+ close(intr_handle.fd);
+ intr_handle.fd = -1;
+}
+
static void
eal_alarm_callback(void *arg __rte_unused)
{
--
2.20.1
