From: Hiroyuki Mikita <h.mikita89@gmail.com>
To: rsanford@akamai.com
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] timer: fix break list when timer_cb reset running timer
Date: Mon, 18 Jul 2016 03:08:00 +0900 [thread overview]
Message-ID: <1468778880-25515-1-git-send-email-h.mikita89@gmail.com> (raw)
When timer_cb resets another running timer on the same lcore,
the list of expired timers is chained to the pending-list.
This commit prevents a running timer from being reset
by not its own timer_cb.
Signed-off-by: Hiroyuki Mikita <h.mikita89@gmail.com>
---
lib/librte_timer/rte_timer.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index 3dcdab5..00e80c9 100644
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -69,6 +69,9 @@ struct priv_timer {
unsigned prev_lcore; /**< used for lcore round robin */
+ /** running timer on this lcore now */
+ struct rte_timer *running_tim;
+
#ifdef RTE_LIBRTE_TIMER_DEBUG
/** per-lcore statistics */
struct rte_timer_debug_stats stats;
@@ -135,9 +138,12 @@ timer_set_config_state(struct rte_timer *tim,
while (success == 0) {
prev_status.u32 = tim->status.u32;
- /* timer is running on another core, exit */
+ /* timer is running on another core
+ * or ready to run on local core, exit
+ */
if (prev_status.state == RTE_TIMER_RUNNING &&
- prev_status.owner != (uint16_t)lcore_id)
+ (prev_status.owner != (uint16_t)lcore_id ||
+ tim != priv_timer[lcore_id].running_tim))
return -1;
/* timer is being configured on another core */
@@ -580,6 +586,7 @@ void rte_timer_manage(void)
for (tim = run_first_tim; tim != NULL; tim = next_tim) {
next_tim = tim->sl_next[0];
priv_timer[lcore_id].updated = 0;
+ priv_timer[lcore_id].running_tim = tim;
/* execute callback function with list unlocked */
tim->f(tim, tim->arg);
@@ -610,6 +617,7 @@ void rte_timer_manage(void)
rte_spinlock_unlock(&priv_timer[lcore_id].list_lock);
}
}
+ priv_timer[lcore_id].running_tim = NULL;
}
/* dump statistics about timers */
--
2.7.4
next reply other threads:[~2016-07-17 18:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-17 18:08 Hiroyuki Mikita [this message]
2016-07-20 20:17 ` Sanford, Robert
2016-07-21 10:34 ` Hiroyuki Mikita
2016-07-22 22:14 ` Sanford, Robert
2016-07-23 8:49 ` Thomas Monjalon
2016-07-25 12:29 ` Sanford, Robert
2016-07-25 14:21 ` Hiroyuki Mikita
2016-07-25 14:43 ` Thomas Monjalon
2016-07-25 15:14 ` Hiroyuki Mikita
2016-07-25 15:21 ` Thomas Monjalon
2016-07-25 15:53 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468778880-25515-1-git-send-email-h.mikita89@gmail.com \
--to=h.mikita89@gmail.com \
--cc=dev@dpdk.org \
--cc=rsanford@akamai.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).