Description: while running a periodic timer's callback, if another
timer is manipulated, the updated flag is raised
preventing the periodic timer to reload.
Fix: move
updated flag from priv_timer to rte_timer stucture (one
per core)
Signed-off-by: Vadim Suraev <vadim.suraev at gmail.com>
---
lib/librte_timer/rte_timer.c | 17 ++++++++---------
lib/librte_timer/rte_timer.h | 7 ++++++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index f98e904..0cc5fa9 100755
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -58,11 +58,6 @@ LIST_HEAD(rte_timer_list, rte_timer);
struct priv_timer {
struct rte_timer pending_head; /**< dummy timer instance to head up
list */
rte_spinlock_t list_lock; /**< lock to protect list access */
-
- /** per-core variable that true if a timer was updated on this
- * core since last reset of the variable */
- int updated;
-
/** track the current depth of the skiplist */
unsigned curr_skiplist_depth;
@@ -107,10 +102,14 @@ void
rte_timer_init(struct rte_timer *tim)
{
union rte_timer_status status;
+ unsigned lcore_id;
status.state = RTE_TIMER_STOP;
status.owner = RTE_TIMER_NO_OWNER;
tim->status.u32 = status.u32;
+ for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id ++) {
+ tim->updated[lcore_id] = 0;
+ }
}
/*
@@ -378,7 +377,7 @@ __rte_timer_reset(struct rte_timer *tim, uint64_t expire,
return -1;
__TIMER_STAT_ADD(reset, 1);
- priv_timer[lcore_id].updated = 1;
+ tim->updated[lcore_id] = 1;
/* remove it from list */
if (prev_status.state == RTE_TIMER_PENDING) {
@@ -453,7 +452,7 @@ rte_timer_stop(struct rte_timer *tim)
return -1;
__TIMER_STAT_ADD(stop, 1);
- priv_timer[lcore_id].updated = 1;
+ tim->updated[lcore_id] = 1;
/* remove it from list */
if (prev_status.state == RTE_TIMER_PENDING) {
@@ -541,7 +540,7 @@ void rte_timer_manage(void)
rte_spinlock_unlock(&priv_timer[lcore_id].list_lock);
- priv_timer[lcore_id].updated = 0;
+ tim->updated[lcore_id] = 0;
/* execute callback function with list unlocked */
tim->f(tim, tim->arg);
@@ -550,7 +549,7 @@ void rte_timer_manage(void)
/* the timer was stopped or reloaded by the callback
* function, we have nothing to do here */
- if (priv_timer[lcore_id].updated == 1)
+ if (tim->updated[lcore_id] == 1)
continue;
if (tim->period == 0) {
diff --git a/lib/librte_timer/rte_timer.h b/lib/librte_timer/rte_timer.h
index c5f936b..235dfd6 100755
--- a/lib/librte_timer/rte_timer.h
+++ b/lib/librte_timer/rte_timer.h
@@ -129,6 +129,10 @@ struct rte_timer
uint64_t period; /**< Period of timer (0 if not periodic). */
rte_timer_cb_t *f; /**< Callback function. */
void *arg; /**< Argument to callback function. */
+ /** per-core variable that true if a timer was updated on this
+ * core since last reset of the variable */
+ int updated[RTE_MAX_LCORE];
+
};
@@ -142,7 +146,8 @@ struct rte_timer
{{RTE_TIMER_STOP, RTE_TIMER_NO_OWNER}}, \
0, \
NULL, \
- NULL, \
+ NULL, \
+ {0}, \
}
#else
/**
--
1.7.9.5
