From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Eric Dumazet <edumazet@google.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Chris Mason <clm@fb.com>, Arjan van de Ven <arjan@infradead.org>,
rt@linutronix.de, Anna-Maria Gleixner <anna-maria@linutronix.de>
Subject: [patch 19/20] timer: Split out index calculation
Date: Mon, 13 Jun 2016 08:41:05 -0000 [thread overview]
Message-ID: <20160613075929.773295596@linutronix.de> (raw)
In-Reply-To: 20160613070440.950649741@linutronix.de
[-- Attachment #1: timers--Split-out-index-calculation.patch --]
[-- Type: text/plain, Size: 2768 bytes --]
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
For further optimizations we need to seperate index calculation and
queueing. No functional change.
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/time/timer.c | 41 +++++++++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 8 deletions(-)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -456,12 +456,9 @@ static inline unsigned calc_index(unsign
return base + (((expires + gran) >> sft) & LVL_MASK);
}
-static void
-__internal_add_timer(struct timer_base *base, struct timer_list *timer)
+static int calc_wheel_index(unsigned long expires, unsigned long clk)
{
- unsigned long expires = timer->expires;
- unsigned long delta = expires - base->clk;
- struct hlist_head *vec;
+ unsigned long delta = expires - clk;
unsigned int idx;
if (delta < LVL1_TSTART) {
@@ -475,7 +472,7 @@ static void
} else if (delta < LVL5_TSTART) {
idx = calc_index(expires, LVL4_GRAN, LVL4_SHIFT, LVL4_OFFS);
} else if ((long) delta < 0) {
- idx = base->clk & LVL_MASK;
+ idx = clk & LVL_MASK;
} else {
/*
* The long timeouts go into the last array level. They
@@ -485,6 +482,18 @@ static void
idx = calc_index(expires, LVL5_GRAN, LVL5_SHIFT, LVL5_OFFS);
}
+ return idx;
+}
+
+/*
+ * Enqueue the timer into the hash bucket, mark it pending in
+ * the bitmap and store the index in the timer flags.
+ */
+static void enqueue_timer(struct timer_base *base, struct timer_list *timer,
+ unsigned int idx)
+{
+ struct hlist_head *vec;
+
/*
* Enqueue the timer into the array bucket, mark it pending in
* the bitmap and store the index in the timer flags.
@@ -495,10 +504,19 @@ static void
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 long expires = timer->expires;
+ unsigned int idx;
+
+ idx = calc_wheel_index(expires, base->clk);
+ enqueue_timer(base, timer, idx);
+}
+static void
+trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer)
+{
/*
* We might have to IPI the remote CPU if the base is idle and the
* timer is not deferrable. If the other cpu is on the way to idle
@@ -523,6 +541,13 @@ static void internal_add_timer(struct ti
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
void __timer_stats_timer_set_start_info(struct timer_list *timer, void *addr)
{
next prev parent reply other threads:[~2016-06-13 8:43 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 8:40 [patch 00/20] timer: Refactor the timer wheel Thomas Gleixner
2016-06-13 8:40 ` [patch 01/20] timer: Make pinned a timer property Thomas Gleixner
2016-06-13 8:40 ` [patch 02/20] x86/apic/uv: Initialize timer as pinned Thomas Gleixner
2016-06-13 8:40 ` [patch 03/20] x86/mce: " Thomas Gleixner
2016-06-13 8:40 ` [patch 04/20] cpufreq/powernv: " Thomas Gleixner
2016-06-13 13:18 ` Arjan van de Ven
2016-06-13 8:40 ` [patch 05/20] driver/net/ethernet/tile: " Thomas Gleixner
2016-06-13 8:40 ` [patch 06/20] drivers/tty/metag_da: " Thomas Gleixner
2016-06-13 13:13 ` Arjan van de Ven
2016-06-13 8:40 ` [patch 07/20] drivers/tty/mips_ejtag: " Thomas Gleixner
2016-06-13 8:40 ` [patch 08/20] net/ipv4/inet: Initialize timers " Thomas Gleixner
2016-06-13 8:40 ` [patch 09/20] timer: Remove mod_timer_pinned Thomas Gleixner
2016-06-13 8:40 ` [patch 10/20] timer: Add a cascading tracepoint Thomas Gleixner
2016-06-13 8:40 ` [patch 11/20] hlist: Add hlist_is_last_node() helper Thomas Gleixner
2016-06-13 10:27 ` Paolo Bonzini
2016-06-13 8:40 ` [patch 12/20] timer: Give a few structs and members proper names Thomas Gleixner
2016-06-13 8:41 ` [patch 13/20] timer: Switch to a non cascading wheel Thomas Gleixner
2016-06-13 11:40 ` Peter Zijlstra
2016-06-13 12:30 ` Thomas Gleixner
2016-06-13 12:46 ` Eric Dumazet
2016-06-13 14:30 ` Thomas Gleixner
2016-06-14 10:11 ` Ingo Molnar
2016-06-14 16:28 ` Thomas Gleixner
2016-06-14 17:14 ` Arjan van de Ven
2016-06-14 18:05 ` Thomas Gleixner
2016-06-14 20:34 ` Peter Zijlstra
2016-06-14 20:42 ` Peter Zijlstra
2016-06-14 21:17 ` Eric Dumazet
2016-06-15 14:53 ` Thomas Gleixner
2016-06-15 14:55 ` Arjan van de Ven
2016-06-15 16:43 ` Thomas Gleixner
2016-06-16 15:43 ` Thomas Gleixner
2016-06-16 16:02 ` Paul E. McKenney
2016-06-16 18:14 ` Peter Zijlstra
2016-06-17 0:40 ` Paul E. McKenney
2016-06-17 4:04 ` Paul E. McKenney
2016-06-16 16:04 ` Arjan van de Ven
2016-06-16 16:09 ` Thomas Gleixner
2016-06-15 15:05 ` Eric Dumazet
2016-06-13 14:36 ` Richard Cochran
2016-06-13 14:39 ` Thomas Gleixner
2016-06-13 8:41 ` [patch 15/20] timer: Move __run_timers() function Thomas Gleixner
2016-06-13 8:41 ` [patch 14/20] timer: Remove slack leftovers Thomas Gleixner
2016-06-13 8:41 ` [patch 16/20] timer: Optimize collect timers for NOHZ Thomas Gleixner
2016-06-13 8:41 ` [patch 17/20] tick/sched: Remove pointless empty function Thomas Gleixner
2016-06-13 8:41 ` [patch 18/20] timer: Forward wheel clock whenever possible Thomas Gleixner
2016-06-13 15:14 ` Richard Cochran
2016-06-13 15:18 ` Thomas Gleixner
2016-06-13 8:41 ` Thomas Gleixner [this message]
2016-06-13 8:41 ` [patch 20/20] timer: Optimization for same expiry time in mod_timer() Thomas Gleixner
2016-06-13 14:10 ` [patch 00/20] timer: Refactor the timer wheel Eric Dumazet
2016-06-13 16:15 ` Paul E. McKenney
2016-06-15 15:15 ` Paul E. McKenney
2016-06-15 17:02 ` Thomas Gleixner
2016-06-15 20:26 ` Paul E. McKenney
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=20160613075929.773295596@linutronix.de \
--to=tglx@linutronix.de \
--cc=anna-maria@linutronix.de \
--cc=arjan@infradead.org \
--cc=clm@fb.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rt@linutronix.de \
/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).