timer: fix resource leak in finalize

[dpdk.git] / lib / librte_timer / rte_timer.c

diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index dd79539..71dffd2 100644 (file)
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -13,6 +13,7 @@
 #include <rte_atomic.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
+#include <rte_eal_memconfig.h>
 #include <rte_per_lcore.h>
 #include <rte_memory.h>
 #include <rte_launch.h>
@@ -61,6 +62,8 @@ struct rte_timer_data {
 };
 
 #define RTE_MAX_DATA_ELS 64
+static const struct rte_memzone *rte_timer_data_mz;
+static int *volatile rte_timer_mz_refcnt;
 static struct rte_timer_data *rte_timer_data_arr;
 static const uint32_t default_data_id;
 static uint32_t rte_timer_subsystem_initialized;
@@ -92,7 +95,7 @@ timer_data_valid(uint32_t id)
        timer_data = &rte_timer_data_arr[id];                           \
 } while (0)
 
-int __rte_experimental
+int
 rte_timer_data_alloc(uint32_t *id_ptr)
 {
        int i;
@@ -116,7 +119,7 @@ rte_timer_data_alloc(uint32_t *id_ptr)
        return -ENOSPC;
 }
 
-int __rte_experimental
+int
 rte_timer_data_dealloc(uint32_t id)
 {
        struct rte_timer_data *timer_data;
@@ -157,28 +160,30 @@ rte_timer_subsystem_init_v1905(void)
        int i, lcore_id;
        static const char *mz_name = "rte_timer_mz";
        const size_t data_arr_size =
-                               RTE_MAX_DATA_ELS * sizeof(*rte_timer_data_arr);
+                       RTE_MAX_DATA_ELS * sizeof(*rte_timer_data_arr);
+       const size_t mem_size = data_arr_size + sizeof(*rte_timer_mz_refcnt);
        bool do_full_init = true;
 
        if (rte_timer_subsystem_initialized)
                return -EALREADY;
 
-reserve:
-       rte_errno = 0;
-       mz = rte_memzone_reserve_aligned(mz_name, data_arr_size, SOCKET_ID_ANY,
-                                        0, RTE_CACHE_LINE_SIZE);
-       if (mz == NULL) {
-               if (rte_errno == EEXIST) {
-                       mz = rte_memzone_lookup(mz_name);
-                       if (mz == NULL)
-                               goto reserve;
+       rte_mcfg_timer_lock();
 
-                       do_full_init = false;
-               } else
+       mz = rte_memzone_lookup(mz_name);
+       if (mz == NULL) {
+               mz = rte_memzone_reserve_aligned(mz_name, mem_size,
+                               SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+               if (mz == NULL) {
+                       rte_mcfg_timer_unlock();
                        return -ENOMEM;
-       }
+               }
+               do_full_init = true;
+       } else
+               do_full_init = false;
 
+       rte_timer_data_mz = mz;
        rte_timer_data_arr = mz->addr;
+       rte_timer_mz_refcnt = (void *)((char *)mz->addr + data_arr_size);
 
        if (do_full_init) {
                for (i = 0; i < RTE_MAX_DATA_ELS; i++) {
@@ -195,6 +200,9 @@ reserve:
        }
 
        rte_timer_data_arr[default_data_id].internal_flags |= FL_ALLOCATED;
+       (*rte_timer_mz_refcnt)++;
+
+       rte_mcfg_timer_unlock();
 
        rte_timer_subsystem_initialized = 1;
 
@@ -204,12 +212,19 @@ MAP_STATIC_SYMBOL(int rte_timer_subsystem_init(void),
                  rte_timer_subsystem_init_v1905);
 BIND_DEFAULT_SYMBOL(rte_timer_subsystem_init, _v1905, 19.05);
 
-void __rte_experimental
+void
 rte_timer_subsystem_finalize(void)
 {
        if (!rte_timer_subsystem_initialized)
                return;
 
+       rte_mcfg_timer_lock();
+
+       if (--(*rte_timer_mz_refcnt) == 0)
+               rte_memzone_free(rte_timer_data_mz);
+
+       rte_mcfg_timer_unlock();
+
        rte_timer_subsystem_initialized = 0;
 }
 
@@ -573,7 +588,7 @@ MAP_STATIC_SYMBOL(int rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
                  rte_timer_reset_v1905);
 BIND_DEFAULT_SYMBOL(rte_timer_reset, _v1905, 19.05);
 
-int __rte_experimental
+int
 rte_timer_alt_reset(uint32_t timer_data_id, struct rte_timer *tim,
                    uint64_t ticks, enum rte_timer_type type,
                    unsigned int tim_lcore, rte_timer_cb_t fct, void *arg)
@@ -657,7 +672,7 @@ MAP_STATIC_SYMBOL(int rte_timer_stop(struct rte_timer *tim),
                  rte_timer_stop_v1905);
 BIND_DEFAULT_SYMBOL(rte_timer_stop, _v1905, 19.05);
 
-int __rte_experimental
+int
 rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim)
 {
        struct rte_timer_data *timer_data;
@@ -822,7 +837,7 @@ rte_timer_manage_v1905(void)
 MAP_STATIC_SYMBOL(int rte_timer_manage(void), rte_timer_manage_v1905);
 BIND_DEFAULT_SYMBOL(rte_timer_manage, _v1905, 19.05);
 
-int __rte_experimental
+int
 rte_timer_alt_manage(uint32_t timer_data_id,
                     unsigned int *poll_lcores,
                     int nb_poll_lcores,
@@ -995,7 +1010,7 @@ rte_timer_alt_manage(uint32_t timer_data_id,
 }
 
 /* Walk pending lists, stopping timers and calling user-specified function */
-int __rte_experimental
+int
 rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores,
                   int nb_walk_lcores,
                   rte_timer_stop_all_cb_t f, void *f_arg)
@@ -1074,7 +1089,7 @@ MAP_STATIC_SYMBOL(int rte_timer_dump_stats(FILE *f),
                  rte_timer_dump_stats_v1905);
 BIND_DEFAULT_SYMBOL(rte_timer_dump_stats, _v1905, 19.05);
 
-int __rte_experimental
+int
 rte_timer_alt_dump_stats(uint32_t timer_data_id __rte_unused, FILE *f)
 {
        struct rte_timer_data *timer_data;