timer core for 2.6.35
Subsystems (3)
Linus,
Please pull the latest timers-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-for-linus
Thanks,
tglx
------------------>
Arjan van de Ven (1):
timers: Introduce the concept of timer slack for legacy timers
Carsten Emde (2):
hrtimers: Provide schedule_hrtimeout for CLOCK_REALTIME
mqueue: Convert message queue timeout to use hrtimers
John Stultz (6):
time: Clean up warp_clock()
time: Add xtime, wall_to_monotonic to feature-removal-schedule
ntp: Make time_adjust static
ntp: Remove tickadj
time: Remove xtime_cache
clocksource: Add clocksource_register_hz/khz interface
Stanislaw Gruszka (6):
cpu-timers: Simplify RLIMIT_CPU handling
cpu-timers: Cleanup arm_timer()
cpu-timers: Return correct previous timer reload value
cpu-timers: Change SIGEV_NONE timer implementation
cpu-timers: Avoid iterating over all threads in fastpath_timer_check()
posix-cpu-timers: Optimize run_posix_cpu_timers()
Thomas Gleixner (2):
timer: Split out timer function call
timer: Try to survive timer callback preempt_count leak
Uwe Kleine-König (1):
timer: Print function name for timer callbacks modifying preemption count
Documentation/feature-removal-schedule.txt | 10 + include/linux/clocksource.h | 19 ++- include/linux/hrtimer.h | 2 + include/linux/time.h | 1 - include/linux/timer.h | 10 +- include/linux/timex.h | 5 - ipc/mqueue.c | 74 +++----- kernel/hrtimer.c | 67 ++++--- kernel/posix-cpu-timers.c | 298 ++++++++++------------------ kernel/time.c | 11 +- kernel/time/clocksource.c | 48 +++++ kernel/time/ntp.c | 2 +- kernel/time/timekeeping.c | 35 ++-- kernel/timer.c | 137 +++++++++---- 14 files changed, 376 insertions(+), 343 deletions(-)
Documentation/feature-removal-schedule.txt +10 -0
@@ -564,6 +564,16 @@ Who: Avi Kivity <[email protected]> ---------------------------- +What: xtime, wall_to_monotonic +When: 2.6.36+ +Files: kernel/time/timekeeping.c include/linux/time.h +Why: Cleaning up timekeeping internal values. Please use + existing timekeeping accessor functions to access + the equivalent functionality. +Who: John Stultz <[email protected]> + +---------------------------- + What: KVM kernel-allocated memory slots When: July 2010 Why: Since 2.6.25, kvm supports user-allocated memory slots, which are
include/linux/clocksource.h +18 -1
@@ -273,7 +273,6 @@ static inline s64 clocksource_cyc2ns(cycle_t cycles, u32 mult, u32 shift) } -/* used to install a new clocksource */ extern int clocksource_register (struct clocksource *);extern void clocksource_unregister (struct clocksource *);extern void clocksource_touch_watchdog (void );
@@ -287,6 +286,24 @@ extern void clocksource_mark_unstable(struct clocksource *cs);extern void clocks_calc_mult_shift (u32 *mult,u32 *shift,u32 from,u32 to,u32 minsec); +/* +* Don't call __clocksource_register_scale directly, use +* clocksource_register_hz/khz +*/ +extern int +__clocksource_register_scale (struct clocksource *cs,u32 scale,u32 freq); + +static inline int clocksource_register_hz (struct clocksource *cs,u32 hz) +{ +return __clocksource_register_scale (cs,1 , hz); +} + +static inline int clocksource_register_khz (struct clocksource *cs,u32 khz) +{ +return __clocksource_register_scale (cs,1000 , khz); +} + +static inline void clocksource_calc_mult_shift (struct clocksource *cs,u32 freq,u32 minsec) {
include/linux/hrtimer.h +2 -0
@@ -422,6 +422,8 @@ extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,extern int schedule_hrtimeout_range (ktime_t *expires,unsigned long delta,const enum hrtimer_mode mode); +extern int schedule_hrtimeout_range_clock (ktime_t *expires, +unsigned long delta,const enum hrtimer_mode mode,int clock);extern int schedule_hrtimeout (ktime_t *expires,const enum hrtimer_mode mode);/* Soft interrupt function to run the hrtimer queues: */
include/linux/time.h +0 -1
@@ -150,7 +150,6 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran);extern int timekeeping_valid_for_hres (void );extern u64 timekeeping_max_deferment (void );extern void update_wall_time (void ); -extern void update_xtime_cache (u64 nsec);extern void timekeeping_leap_insert (int leapsecond);struct tms ;
include/linux/timer.h +9 -1
@@ -10,13 +10,19 @@struct tvec_base ;struct timer_list { +/* +* All fields that change during normal runtime grouped to the +* same cacheline +*/ struct list_head entry;unsigned long expires; +struct tvec_base *base;void (*function)(unsigned long );unsigned long data; -struct tvec_base *base; +int slack; +#ifdef CONFIG_TIMER_STATS void *start_site;char start_comm[16 ];
@@ -165,6 +171,8 @@ extern int mod_timer(struct timer_list *timer, unsigned long expires);extern int mod_timer_pending (struct timer_list *timer,unsigned long expires);extern int mod_timer_pinned (struct timer_list *timer,unsigned long expires); +extern void set_timer_slack (struct timer_list *time,int slack_hz); +#define TIMER_NOT_PINNED 0#define TIMER_PINNED 1/*
include/linux/timex.h +0 -5
@@ -232,13 +232,11 @@ struct timex {*/ extern unsigned long tick_usec;/* USER_HZ period (usec) */ extern unsigned long tick_nsec;/* ACTHZ period (nsec) */ -extern int tickadj;/* amount of adjustment per tick */ /* * phase-lock loop variables */ extern int time_status;/* clock synchronization status bits */ -extern long time_adjust;/* The amount of adjtime left */ extern void ntp_init (void );extern void ntp_clear (void );
@@ -271,9 +269,6 @@ extern void second_overflow(void);extern void update_ntp_one_tick (void );extern int do_adjtimex (struct timex *); -/* Don't use! Compatibility define for existing users. */ -#define tickadj (500/HZ ? : 1) -int read_current_timer (unsigned long *timer_val);/* The clock frequency of the i8253/i8254 PIT */
ipc/mqueue.c +25 -49
136 lines not on this page · raw message
kernel/hrtimer.c +41 -26
89 lines not on this page · raw message
kernel/posix-cpu-timers.c +103 -195
492 lines not on this page · raw message
kernel/time.c +5 -6
@@ -132,12 +132,11 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,*/ static inline void warp_clock (void ) { -write_seqlock_irq (&xtime_lock); - wall_to_monotonic.tv_sec -= sys_tz.tz_minuteswest *60 ; - xtime.tv_sec += sys_tz.tz_minuteswest *60 ; -update_xtime_cache (0 ); -write_sequnlock_irq (&xtime_lock); -clock_was_set (); +struct timespec delta, adjust; + delta.tv_sec = sys_tz.tz_minuteswest *60 ; + delta.tv_nsec =0 ; + adjust =timespec_add_safe (current_kernel_time (), delta); +do_settimeofday (&adjust); }/*
kernel/time/clocksource.c +48 -0
54 lines not on this page · raw message
kernel/time/ntp.c +1 -1
@@ -69,7 +69,7 @@ static s64 time_freq;/* time at last adjustment (secs): */ static long time_reftime; -long time_adjust; +static long time_adjust;/* constant (boot-param configurable) NTP tick adjustment (upscaled) */ static s64 ntp_tick_adj;
kernel/time/timekeeping.c +16 -19
@@ -165,13 +165,6 @@ struct timespec raw_time;/* flag for if timekeeping is suspended */ int __read_mostly timekeeping_suspended; -static struct timespec xtime_cache __attribute__ ((aligned (16))); -void update_xtime_cache (u64 nsec) -{ - xtime_cache = xtime; -timespec_add_ns (&xtime_cache, nsec); -} -/* must hold xtime_lock */ void timekeeping_leap_insert (int leapsecond) {
@@ -332,8 +325,6 @@ int do_settimeofday(struct timespec *tv) xtime = *tv; -update_xtime_cache (0 ); - timekeeper.ntp_error =0 ;ntp_clear ();
@@ -559,7 +550,6 @@ void __init timekeeping_init(void) }set_normalized_timespec (&wall_to_monotonic, -boot.tv_sec, -boot.tv_nsec); -update_xtime_cache (0 ); total_sleep_time.tv_sec =0 ; total_sleep_time.tv_nsec =0 ;write_sequnlock_irqrestore (&xtime_lock, flags);
@@ -593,7 +583,6 @@ static int timekeeping_resume(struct sys_device *dev) wall_to_monotonic =timespec_sub (wall_to_monotonic, ts); total_sleep_time =timespec_add_safe (total_sleep_time, ts); } -update_xtime_cache (0 );/* re-base the last cycle value */ timekeeper.clock->cycle_last = timekeeper.clock->read (timekeeper.clock); timekeeper.ntp_error =0 ;
@@ -788,7 +777,6 @@ void update_wall_time(void) {struct clocksource *clock;cycle_t offset; -u64 nsecs;int shift =0 , maxshift;/* Make sure we're fully resumed: */
@@ -847,7 +835,9 @@ void update_wall_time(void) timekeeper.ntp_error += neg << timekeeper.ntp_error_shift; } -/* store full nanoseconds into xtime after rounding it up and + +/* +* Store full nanoseconds into xtime after rounding it up and * add the remainder to the error difference. */ xtime.tv_nsec = ((s64 ) timekeeper.xtime_nsec >> timekeeper.shift) +1 ;
@@ -855,8 +845,15 @@ void update_wall_time(void) timekeeper.ntp_error += timekeeper.xtime_nsec << timekeeper.ntp_error_shift; - nsecs =clocksource_cyc2ns (offset, timekeeper.mult, timekeeper.shift); -update_xtime_cache (nsecs); +/* +* Finally, make sure that after the rounding +* xtime.tv_nsec isn't larger then NSEC_PER_SEC +*/ +if (unlikely (xtime.tv_nsec >=NSEC_PER_SEC )) { + xtime.tv_nsec -=NSEC_PER_SEC ; + xtime.tv_sec++; +second_overflow (); + }/* check to see if there is a new clocksource to use */ update_vsyscall (&xtime, timekeeper.clock, timekeeper.mult);
@@ -896,13 +893,13 @@ EXPORT_SYMBOL_GPL(monotonic_to_bootbased);unsigned long get_seconds (void ) { -return xtime_cache.tv_sec; +return xtime.tv_sec; }EXPORT_SYMBOL (get_seconds);struct timespec __current_kernel_time (void ) { -return xtime_cache; +return xtime; }struct timespec current_kernel_time (void )
@@ -913,7 +910,7 @@ struct timespec current_kernel_time(void)do { seq =read_seqbegin (&xtime_lock); - now = xtime_cache; + now = xtime; }while (read_seqretry (&xtime_lock, seq));return now;
@@ -928,7 +925,7 @@ struct timespec get_monotonic_coarse(void)do { seq =read_seqbegin (&xtime_lock); - now = xtime_cache; + now = xtime; mono = wall_to_monotonic; }while (read_seqretry (&xtime_lock, seq));
kernel/timer.c +98 -39
173 lines not on this page · raw message