From: tip-bot for Anna-Maria Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: lenb@kernel.org, anna-maria@linutronix.de,
linux-kernel@vger.kernel.org, riel@redhat.com,
linux@sciencehorizons.net, edumazet@google.com,
arjan@infradead.org, torvalds@linux-foundation.org,
tglx@linutronix.de, paulmck@linux.vnet.ibm.com, mingo@kernel.org,
peterz@infradead.org, hpa@zytor.com, fweisbec@gmail.com,
clm@fb.com, josh@joshtriplett.org
Subject: [tip:timers/core] timers: Move __run_timers() function
Date: Thu, 7 Jul 2016 01:46:43 -0700 [thread overview]
Message-ID: <tip-73420fea80c6c376d91a69defe64013baa0d7e95@git.kernel.org> (raw)
In-Reply-To: <20160704094342.271872665@linutronix.de>
Commit-ID: 73420fea80c6c376d91a69defe64013baa0d7e95
Gitweb: http://git.kernel.org/tip/73420fea80c6c376d91a69defe64013baa0d7e95
Author: Anna-Maria Gleixner <anna-maria@linutronix.de>
AuthorDate: Mon, 4 Jul 2016 09:50:33 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 7 Jul 2016 10:35:09 +0200
timers: Move __run_timers() function
Move __run_timers() below __next_timer_interrupt() and next_pending_bucket()
in preparation for __run_timers() NOHZ optimization.
No functional change.
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: Thomas 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.271872665@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/time/timer.c | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index a83e23d..c16c48d 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1277,32 +1277,6 @@ static int collect_expired_timers(struct timer_base *base,
return levels;
}
-/**
- * __run_timers - run all expired timers (if any) on this CPU.
- * @base: the timer vector to be processed.
- */
-static inline void __run_timers(struct timer_base *base)
-{
- struct hlist_head heads[LVL_DEPTH];
- int levels;
-
- if (!time_after_eq(jiffies, base->clk))
- return;
-
- spin_lock_irq(&base->lock);
-
- while (time_after_eq(jiffies, base->clk)) {
-
- levels = collect_expired_timers(base, heads);
- base->clk++;
-
- while (levels--)
- expire_timers(base, heads + levels);
- }
- base->running_timer = NULL;
- spin_unlock_irq(&base->lock);
-}
-
#ifdef CONFIG_NO_HZ_COMMON
/*
* Find the next pending bucket of a level. Search from @offset + @clk upwards
@@ -1472,6 +1446,32 @@ void update_process_times(int user_tick)
run_posix_cpu_timers(p);
}
+/**
+ * __run_timers - run all expired timers (if any) on this CPU.
+ * @base: the timer vector to be processed.
+ */
+static inline void __run_timers(struct timer_base *base)
+{
+ struct hlist_head heads[LVL_DEPTH];
+ int levels;
+
+ if (!time_after_eq(jiffies, base->clk))
+ return;
+
+ spin_lock_irq(&base->lock);
+
+ while (time_after_eq(jiffies, base->clk)) {
+
+ levels = collect_expired_timers(base, heads);
+ base->clk++;
+
+ while (levels--)
+ expire_timers(base, heads + levels);
+ }
+ base->running_timer = NULL;
+ spin_unlock_irq(&base->lock);
+}
+
/*
* This function runs timers and the timer-tq in bottom half context.
*/
next prev parent reply other threads:[~2016-07-07 8:47 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 9:50 [patch 4 00/22] timer: Refactor the timer wheel Thomas Gleixner
2016-07-04 9:50 ` [patch 4 01/22] timer: Make pinned a timer property Thomas Gleixner
2016-07-07 8:39 ` [tip:timers/core] timers: Make 'pinned' " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 02/22] x86/apic/uv: Initialize timer as pinned Thomas Gleixner
2016-07-07 8:40 ` [tip:timers/core] timers, x86/apic/uv: Initialize the UV heartbeat " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 03/22] x86/mce: Initialize " Thomas Gleixner
2016-07-07 8:40 ` [tip:timers/core] timers, x86/mce: Initialize MCE restart " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 04/22] cpufreq/powernv: Initialize " Thomas Gleixner
2016-07-07 8:41 ` [tip:timers/core] timers, cpufreq/powernv: Initialize the gpstate " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 05/22] driver/net/ethernet/tile: Initialize " Thomas Gleixner
2016-07-07 8:41 ` [tip:timers/core] timers, driver/net/ethernet/tile: Initialize the egress " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 06/22] drivers/tty/metag_da: Initialize " Thomas Gleixner
2016-07-07 8:42 ` [tip:timers/core] timers, drivers/tty/metag_da: Initialize the poll " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 07/22] drivers/tty/mips_ejtag: Initialize " Thomas Gleixner
2016-07-07 8:42 ` [tip:timers/core] timers, drivers/tty/mips_ejtag: Initialize the poll " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 08/22] net/ipv4/inet: Initialize timers " Thomas Gleixner
2016-07-07 8:43 ` [tip:timers/core] timers, net/ipv4/inet: Initialize connection request " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 09/22] timer: Remove mod_timer_pinned Thomas Gleixner
2016-07-07 8:43 ` [tip:timers/core] timers: Remove the deprecated mod_timer_pinned() API tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 10/22] signal: Use hrtimer for sigtimedwait Thomas Gleixner
2016-07-07 8:43 ` [tip:timers/core] signals: Use hrtimer for sigtimedwait() tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 11/22] hlist: Add hlist_is_singular_node() helper Thomas Gleixner
2016-07-07 8:44 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 12/22] timer: Give a few structs and members proper names Thomas Gleixner
2016-07-07 8:44 ` [tip:timers/core] timers: " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 13/22] timer: Reduce the CPU index space to 256k Thomas Gleixner
2016-07-07 8:45 ` [tip:timers/core] timers: " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 14/22] timer: Switch to a non cascading wheel Thomas Gleixner
2016-07-07 8:45 ` [tip:timers/core] timers: Switch to a non-cascading wheel tip-bot for Thomas Gleixner
2016-08-11 15:21 ` [patch 4 14/22] timer: Switch to a non cascading wheel Jouni Malinen
2016-08-11 20:25 ` [PREEMPT-RT] " rcochran
2016-08-13 9:12 ` Jouni Malinen
2016-08-16 9:46 ` Richard Cochran
2016-08-16 14:35 ` Eric Dumazet
2016-08-17 9:05 ` Jouni Malinen
2016-08-17 9:23 ` rcochran
2016-08-12 17:50 ` Rik van Riel
2016-08-12 19:14 ` Paul E. McKenney
2016-08-16 8:55 ` Richard Cochran
2016-08-16 7:57 ` Richard Cochran
2016-07-04 9:50 ` [patch 4 15/22] timer: Remove slack leftovers Thomas Gleixner
2016-07-07 8:46 ` [tip:timers/core] timers: Remove set_timer_slack() leftovers tip-bot for Thomas Gleixner
2016-07-22 11:31 ` [patch 4 15/22] timer: Remove slack leftovers Jason A. Donenfeld
2016-07-22 13:04 ` Thomas Gleixner
2016-07-22 15:18 ` Jason A. Donenfeld
2016-07-22 22:54 ` Jason A. Donenfeld
2016-07-04 9:50 ` [patch 4 16/22] timer: Move __run_timers() function Thomas Gleixner
2016-07-07 8:46 ` tip-bot for Anna-Maria Gleixner [this message]
2016-07-04 9:50 ` [patch 4 17/22] timer: Optimize collect timers for NOHZ Thomas Gleixner
2016-07-07 8:47 ` [tip:timers/core] timers: Optimize collect_expired_timers() " tip-bot for Anna-Maria Gleixner
2016-07-04 9:50 ` [patch 4 18/22] tick/sched: Remove pointless empty function Thomas Gleixner
2016-07-07 8:47 ` [tip:timers/core] timers/nohz: Remove pointless tick_nohz_kick_tick() function tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 19/22] timer: Forward wheel clock whenever possible Thomas Gleixner
2016-07-07 8:48 ` [tip:timers/core] timers: Forward the " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 20/22] timer: Only wake softirq if necessary Thomas Gleixner
2016-07-07 8:48 ` [tip:timers/core] timers: " tip-bot for Thomas Gleixner
2016-07-04 9:50 ` [patch 4 21/22] timer: Split out index calculation Thomas Gleixner
2016-07-07 8:48 ` [tip:timers/core] timers: " tip-bot for Anna-Maria Gleixner
2016-07-04 9:50 ` [patch 4 22/22] timer: Optimization for same expiry time in mod_timer() Thomas Gleixner
2016-07-07 8:49 ` [tip:timers/core] timers: Implement optimization " tip-bot for Anna-Maria Gleixner
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=tip-73420fea80c6c376d91a69defe64013baa0d7e95@git.kernel.org \
--to=tipbot@zytor.com \
--cc=anna-maria@linutronix.de \
--cc=arjan@infradead.org \
--cc=clm@fb.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=josh@joshtriplett.org \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@sciencehorizons.net \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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).