Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1425084
| From | Thomas Gleixner <tglx@linutronix.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [patch V2 01/20] timer: Make pinned a timer property |
| Date | 2016-06-17 15:40 +0200 |
| Message-ID | <rL2a5-77b-7@gated-at.bofh.it> (permalink) |
| References | <rL20p-73O-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
We want to move the timer migration from a push to a pull model. This requires
to store the pinned attribute of a timer in the timer itself. This must happen
at initialization time.
Add the helper macros for this.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Chris Mason <clm@fb.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: rt@linutronix.de
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Arjan van de Ven <arjan@infradead.org>
---
include/linux/timer.h | 25 ++++++++++++++++++++++---
kernel/time/timer.c | 10 +++++-----
2 files changed, 27 insertions(+), 8 deletions(-)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -62,7 +62,8 @@ struct timer_list {
#define TIMER_MIGRATING 0x00080000
#define TIMER_BASEMASK (TIMER_CPUMASK | TIMER_MIGRATING)
#define TIMER_DEFERRABLE 0x00100000
-#define TIMER_IRQSAFE 0x00200000
+#define TIMER_PINNED 0x00200000
+#define TIMER_IRQSAFE 0x00400000
#define __TIMER_INITIALIZER(_function, _expires, _data, _flags) { \
.entry = { .next = TIMER_ENTRY_STATIC }, \
@@ -78,9 +79,15 @@ struct timer_list {
#define TIMER_INITIALIZER(_function, _expires, _data) \
__TIMER_INITIALIZER((_function), (_expires), (_data), 0)
+#define TIMER_PINNED_INITIALIZER(_function, _expires, _data) \
+ __TIMER_INITIALIZER((_function), (_expires), (_data), TIMER_PINNED)
+
#define TIMER_DEFERRED_INITIALIZER(_function, _expires, _data) \
__TIMER_INITIALIZER((_function), (_expires), (_data), TIMER_DEFERRABLE)
+#define TIMER_PINNED_DEFERRED_INITIALIZER(_function, _expires, _data) \
+ __TIMER_INITIALIZER((_function), (_expires), (_data), TIMER_DEFERRABLE | TIMER_PINNED)
+
#define DEFINE_TIMER(_name, _function, _expires, _data) \
struct timer_list _name = \
TIMER_INITIALIZER(_function, _expires, _data)
@@ -124,8 +131,12 @@ static inline void init_timer_on_stack_k
#define init_timer(timer) \
__init_timer((timer), 0)
+#define init_timer_pinned(timer) \
+ __init_timer((timer), TIMER_PINNED)
#define init_timer_deferrable(timer) \
__init_timer((timer), TIMER_DEFERRABLE)
+#define init_timer_pinned_deferrable(timer) \
+ __init_timer((timer), TIMER_DEFERRABLE | TIMER_PINNED)
#define init_timer_on_stack(timer) \
__init_timer_on_stack((timer), 0)
@@ -145,12 +156,20 @@ static inline void init_timer_on_stack_k
#define setup_timer(timer, fn, data) \
__setup_timer((timer), (fn), (data), 0)
+#define setup_pinned_timer(timer, fn, data) \
+ __setup_timer((timer), (fn), (data), TIMER_PINNED)
#define setup_deferrable_timer(timer, fn, data) \
__setup_timer((timer), (fn), (data), TIMER_DEFERRABLE)
+#define setup_pinned_deferrable_timer(timer, fn, data) \
+ __setup_timer((timer), (fn), (data), TIMER_DEFERRABLE | TIMER_PINNED)
#define setup_timer_on_stack(timer, fn, data) \
__setup_timer_on_stack((timer), (fn), (data), 0)
+#define setup_pinned_timer_on_stack(timer, fn, data) \
+ __setup_timer_on_stack((timer), (fn), (data), TIMER_PINNED)
#define setup_deferrable_timer_on_stack(timer, fn, data) \
__setup_timer_on_stack((timer), (fn), (data), TIMER_DEFERRABLE)
+#define setup_pinned_deferrable_timer_on_stack(timer, fn, data) \
+ __setup_timer_on_stack((timer), (fn), (data), TIMER_DEFERRABLE | TIMER_PINNED)
/**
* timer_pending - is a timer pending?
@@ -175,8 +194,8 @@ extern int mod_timer_pinned(struct timer
extern void set_timer_slack(struct timer_list *time, int slack_hz);
-#define TIMER_NOT_PINNED 0
-#define TIMER_PINNED 1
+#define MOD_TIMER_NOT_PINNED 0
+#define MOD_TIMER_PINNED 1
/*
* The jiffies value which is added to now, when there is no timer
* in the timer wheel:
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -782,7 +782,7 @@ static inline int
debug_activate(timer, expires);
- new_base = get_target_base(base, pinned);
+ new_base = get_target_base(base, pinned || timer->flags & TIMER_PINNED);
if (base != new_base) {
/*
@@ -825,7 +825,7 @@ static inline int
*/
int mod_timer_pending(struct timer_list *timer, unsigned long expires)
{
- return __mod_timer(timer, expires, true, TIMER_NOT_PINNED);
+ return __mod_timer(timer, expires, true, MOD_TIMER_NOT_PINNED);
}
EXPORT_SYMBOL(mod_timer_pending);
@@ -900,7 +900,7 @@ int mod_timer(struct timer_list *timer,
if (timer_pending(timer) && timer->expires == expires)
return 1;
- return __mod_timer(timer, expires, false, TIMER_NOT_PINNED);
+ return __mod_timer(timer, expires, false, MOD_TIMER_NOT_PINNED);
}
EXPORT_SYMBOL(mod_timer);
@@ -928,7 +928,7 @@ int mod_timer_pinned(struct timer_list *
if (timer->expires == expires && timer_pending(timer))
return 1;
- return __mod_timer(timer, expires, false, TIMER_PINNED);
+ return __mod_timer(timer, expires, false, MOD_TIMER_PINNED);
}
EXPORT_SYMBOL(mod_timer_pinned);
@@ -1512,7 +1512,7 @@ signed long __sched schedule_timeout(sig
expire = timeout + jiffies;
setup_timer_on_stack(&timer, process_timeout, (unsigned long)current);
- __mod_timer(&timer, expire, false, TIMER_NOT_PINNED);
+ __mod_timer(&timer, expire, false, MOD_TIMER_NOT_PINNED);
schedule();
del_singleshot_timer_sync(&timer);
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:30 +0200
[patch V2 20/20] timer: Optimization for same expiry time in mod_timer() Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:30 +0200
[patch V2 11/20] timer: Give a few structs and members proper names Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:30 +0200
[patch V2 15/20] timer: Optimize collect timers for NOHZ Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:30 +0200
[patch V2 19/20] timer: Split out index calculation Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:30 +0200
[patch V2 06/20] drivers/tty/metag_da: Initialize timer as pinned Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 01/20] timer: Make pinned a timer property Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 10/20] hlist: Add hlist_is_singular_node() helper Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 04/20] cpufreq/powernv: Initialize timer as pinned Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 08/20] net/ipv4/inet: Initialize timers as pinned Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 03/20] x86/mce: Initialize timer as pinned Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 17/20] timer: Forward wheel clock whenever possible Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 02/20] x86/apic/uv: Initialize timer as pinned Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 14/20] timer: Move __run_timers() function Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 12/20] timer: Switch to a non cascading wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
Re: [patch V2 12/20] timer: Switch to a non cascading wheel "George Spelvin" <linux@sciencehorizons.net> - 2016-06-18 12:00 +0200
[patch V2 09/20] timer: Remove mod_timer_pinned Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 13/20] timer: Remove slack leftovers Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
[patch V2 05/20] driver/net/ethernet/tile: Initialize timer as pinned Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
Re: [patch V2 05/20] driver/net/ethernet/tile: Initialize timer as pinned Peter Zijlstra <peterz@infradead.org> - 2016-06-21 20:50 +0200
[patch V2 18/20] timer: Only wake softirq if necessary Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 15:40 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Eric Dumazet <edumazet@google.com> - 2016-06-17 15:50 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-17 16:00 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Eric Dumazet <edumazet@google.com> - 2016-06-17 16:30 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-20 16:00 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-20 16:50 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Arjan van de Ven <arjanvandeven@gmail.com> - 2016-06-20 18:10 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Arjan van de Ven <arjanvandeven@gmail.com> - 2016-06-20 16:50 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Rik van Riel <riel@redhat.com> - 2016-06-20 21:10 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Eric Dumazet <edumazet@google.com> - 2016-06-21 04:50 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Arjan van de Ven <arjanvandeven@gmail.com> - 2016-06-17 16:30 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-20 17:20 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-20 17:50 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-06-20 17:40 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Mike Galbraith <umgwanakikbuti@gmail.com> - 2016-06-22 09:40 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-22 10:50 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Mike Galbraith <umgwanakikbuti@gmail.com> - 2016-06-22 11:10 +0200
Re: [patch V2 00/20] timer: Refactor the timer wheel Mike Galbraith <umgwanakikbuti@gmail.com> - 2016-06-22 15:40 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel Cyril Hrubis <chrubis@suse.cz> - 2016-06-22 12:40 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-23 10:30 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel Cyril Hrubis <chrubis@suse.cz> - 2016-06-23 14:00 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel "George Spelvin" <linux@sciencehorizons.net> - 2016-06-23 16:00 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-23 16:20 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel Cyril Hrubis <chrubis@suse.cz> - 2016-06-23 17:20 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel Thomas Gleixner <tglx@linutronix.de> - 2016-06-23 17:30 +0200
Re: [LTP] [patch V2 00/20] timer: Refactor the timer wheel Cyril Hrubis <chrubis@suse.cz> - 2016-06-23 18:40 +0200
csiph-web