Commit ffdf0477 authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Ingo Molnar

timers: Split out index calculation

For further optimizations we need to seperate index calculation
from queueing. No functional change.
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Chris Mason <clm@fb.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: George Spelvin <linux@sciencehorizons.net>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160704094342.691159619@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 4e85876a
...@@ -471,12 +471,9 @@ static inline unsigned calc_index(unsigned expires, unsigned lvl) ...@@ -471,12 +471,9 @@ static inline unsigned calc_index(unsigned expires, unsigned lvl)
return LVL_OFFS(lvl) + (expires & LVL_MASK); return LVL_OFFS(lvl) + (expires & LVL_MASK);
} }
static void static int calc_wheel_index(unsigned long expires, unsigned long clk)
__internal_add_timer(struct timer_base *base, struct timer_list *timer)
{ {
unsigned long expires = timer->expires; unsigned long delta = expires - clk;
unsigned long delta = expires - base->clk;
struct hlist_head *vec;
unsigned int idx; unsigned int idx;
if (delta < LVL_START(1)) { if (delta < LVL_START(1)) {
...@@ -496,7 +493,7 @@ __internal_add_timer(struct timer_base *base, struct timer_list *timer) ...@@ -496,7 +493,7 @@ __internal_add_timer(struct timer_base *base, struct timer_list *timer)
} else if (LVL_DEPTH > 8 && delta < LVL_START(8)) { } else if (LVL_DEPTH > 8 && delta < LVL_START(8)) {
idx = calc_index(expires, 7); idx = calc_index(expires, 7);
} else if ((long) delta < 0) { } else if ((long) delta < 0) {
idx = base->clk & LVL_MASK; idx = clk & LVL_MASK;
} else { } else {
/* /*
* Force expire obscene large timeouts to expire at the * Force expire obscene large timeouts to expire at the
...@@ -507,20 +504,33 @@ __internal_add_timer(struct timer_base *base, struct timer_list *timer) ...@@ -507,20 +504,33 @@ __internal_add_timer(struct timer_base *base, struct timer_list *timer)
idx = calc_index(expires, LVL_DEPTH - 1); idx = calc_index(expires, LVL_DEPTH - 1);
} }
/* return idx;
* Enqueue the timer into the array bucket, mark it pending in }
/*
* Enqueue the timer into the hash bucket, mark it pending in
* the bitmap and store the index in the timer flags. * the bitmap and store the index in the timer flags.
*/ */
vec = base->vectors + idx; static void enqueue_timer(struct timer_base *base, struct timer_list *timer,
hlist_add_head(&timer->entry, vec); unsigned int idx)
{
hlist_add_head(&timer->entry, base->vectors + idx);
__set_bit(idx, base->pending_map); __set_bit(idx, base->pending_map);
timer_set_idx(timer, idx); timer_set_idx(timer, idx);
} }
static void internal_add_timer(struct timer_base *base, struct timer_list *timer) static void
__internal_add_timer(struct timer_base *base, struct timer_list *timer)
{ {
__internal_add_timer(base, timer); unsigned int idx;
idx = calc_wheel_index(timer->expires, base->clk);
enqueue_timer(base, timer, idx);
}
static void
trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer)
{
if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active) if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active)
return; return;
...@@ -554,6 +564,13 @@ static void internal_add_timer(struct timer_base *base, struct timer_list *timer ...@@ -554,6 +564,13 @@ static void internal_add_timer(struct timer_base *base, struct timer_list *timer
wake_up_nohz_cpu(base->cpu); wake_up_nohz_cpu(base->cpu);
} }
static void
internal_add_timer(struct timer_base *base, struct timer_list *timer)
{
__internal_add_timer(base, timer);
trigger_dyntick_cpu(base, timer);
}
#ifdef CONFIG_TIMER_STATS #ifdef CONFIG_TIMER_STATS
void __timer_stats_timer_set_start_info(struct timer_list *timer, void *addr) void __timer_stats_timer_set_start_info(struct timer_list *timer, void *addr)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment