timers core for 2.6.33
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
------------------>
H Hartley Sweeten (1):
clockevents: Add missing include to pacify sparse
John Stultz (2):
time: Implement logarithmic time accumulation
time: Remove xtime_cache
Jon Hunter (2):
nohz: Prevent clocksource wrapping during idle
nohz: Allow 32-bit machines to sleep for more than 2.15 seconds
Martin Schwidefsky (2):
nohz: Reuse ktime in sub-functions of tick_check_idle.
nohz: Introduce arch_needs_cpu
Mike Travis (1):
timers, init: Limit the number of per cpu calibration bootup messages
Stanislaw Gruszka (1):
posix-cpu-timers: optimize and document timer_create callback
Stephen Rothwell (1):
sparc: fix printk for change of variable type
Thomas Gleixner (8):
clockevents: Use u32 for mult and shift factors
clocksource: Provide a generic mult/shift factor calculation
mips: Use generic mult/shift factor calculation for clocks
nohz: Type cast printk argument
nohz: Track last do_timer() cpu clocksource/events: Fix fallout of generic code changes
x86: Fix printk format due to variable type change
x86: vmiclock: Fix printk format
arch/mips/include/asm/time.h | 14 +++- arch/mips/kernel/time.c | 33 --------- arch/powerpc/kernel/time.c | 2 +- arch/s390/include/asm/cputime.h | 8 ++ arch/s390/kernel/s390_ext.c | 2 + arch/s390/kernel/vtime.c | 2 + arch/sparc/kernel/time_64.c | 2 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/vmiclock_32.c | 2 +- drivers/s390/cio/cio.c | 1 + include/linux/clockchips.h | 19 ++++-- include/linux/clocksource.h | 12 +++ include/linux/tick.h | 5 ++ include/linux/time.h | 1 + include/linux/timex.h | 4 - init/calibrate.c | 24 ++++--- kernel/cpu.c | 5 +- kernel/hrtimer.c | 3 +- kernel/posix-cpu-timers.c | 5 +- kernel/time.c | 1 - kernel/time/clockevents.c | 13 ++-- kernel/time/clocksource.c | 97 +++++++++++++++++++++++++++ kernel/time/tick-oneshot.c | 4 +- kernel/time/tick-sched.c | 141 ++++++++++++++++++++++++--------------- kernel/time/timekeeping.c | 119 ++++++++++++++++++++------------- kernel/time/timer_list.c | 10 ++- 26 files changed, 353 insertions(+), 178 deletions(-)
arch/mips/include/asm/time.h +11 -3
@@ -84,8 +84,16 @@ static inline int init_mips_clocksource(void) #endif } -extern void clocksource_set_clock (struct clocksource *cs,unsigned int clock); -extern void clockevent_set_clock (struct clock_event_device *cd, -unsigned int clock); +static inline void clocksource_set_clock (struct clocksource *cs, +unsigned int clock) +{ +clocksource_calc_mult_shift (cs, clock,4 ); +} + +static inline void clockevent_set_clock (struct clock_event_device *cd, +unsigned int clock) +{ +clockevents_calc_mult_shift (cd, clock,4 ); +}#endif /* _ASM_TIME_H */
arch/mips/kernel/time.c +0 -33
@@ -71,39 +71,6 @@ EXPORT_SYMBOL(perf_irq);unsigned int mips_hpt_frequency; -void __init clocksource_set_clock (struct clocksource *cs,unsigned int clock) -{ -u64 temp; -u32 shift; - -/* Find a shift value */ -for (shift =32 ; shift >0 ; shift--) { - temp = (u64 )NSEC_PER_SEC << shift; -do_div (temp, clock); -if ((temp >>32 ) ==0 ) -break ; - } - cs->shift = shift; - cs->mult = (u32 ) temp; -} - -void __cpuinit clockevent_set_clock (struct clock_event_device *cd, -unsigned int clock) -{ -u64 temp; -u32 shift; - -/* Find a shift value */ -for (shift =32 ; shift >0 ; shift--) { - temp = (u64 ) clock << shift; -do_div (temp,NSEC_PER_SEC ); -if ((temp >>32 ) ==0 ) -break ; - } - cd->shift = shift; - cd->mult = (u32 ) temp; -} -/* * This function exists in order to cause an error due to a duplicate * definition if platform code should have its own implementation. The hook
arch/powerpc/kernel/time.c +1 -1
@@ -905,7 +905,7 @@ static void register_decrementer_clockevent(int cpu) *dec = decrementer_clockevent; dec->cpumask =cpumask_of (cpu); -printk (KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n" , +printk (KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n" , dec->name, dec->mult, dec->shift, cpu);clockevents_register_device (dec);
arch/s390/include/asm/cputime.h +8 -0
@@ -183,6 +183,7 @@ struct s390_idle_data {unsigned long long idle_count;unsigned long long idle_enter;unsigned long long idle_time; +int nohz_delay; }; DECLARE_PER_CPU(struct s390_idle_data, s390_idle);
@@ -198,4 +199,11 @@ static inline void s390_idle_check(void) vtime_start_cpu(); } +static inline int s390_nohz_delay (int cpu) +{ +return per_cpu (s390_idle, cpu).nohz_delay !=0 ; +} + +#define arch_needs_cpu (cpu) s390_nohz_delay(cpu) +#endif /* _S390_CPUTIME_H */
arch/s390/kernel/s390_ext.c +2 -0
@@ -126,6 +126,8 @@ void __irq_entry do_extint(struct pt_regs *regs, unsigned short code)/* Serve timer interrupts first. */ clock_comparator_work ();kstat_cpu (smp_processor_id ()).irqs[EXTERNAL_INTERRUPT ]++; +if (code !=0x1004 ) +__get_cpu_var (s390_idle).nohz_delay =1 ; index =ext_hash (code);for (p = ext_int_hash[index]; p; p = p->next) {if (likely (p->code == code))
arch/s390/kernel/vtime.c +2 -0
@@ -167,6 +167,8 @@ void vtime_stop_cpu(void)/* Wait for external, I/O or machine check interrupt. */ psw.mask = psw_kernel_bits |PSW_MASK_WAIT |PSW_MASK_IO |PSW_MASK_EXT ; + idle->nohz_delay =0 ; +/* Check if the CPU timer needs to be reprogrammed. */ if (vq->do_spt) {__u64 vmax =VTIMER_MAX_SLICE ;
arch/sparc/kernel/time_64.c +1 -1
@@ -847,7 +847,7 @@ void __init time_init(void) sparc64_clockevent.min_delta_ns =clockevent_delta2ns (0xF , &sparc64_clockevent); -printk ("clockevent: mult[%lx] shift[%d]\n" , +printk ("clockevent: mult[%ux] shift[%d]\n" , sparc64_clockevent.mult, sparc64_clockevent.shift);setup_sparc64_timer ();
arch/x86/kernel/apic/apic.c +1 -1
@@ -662,7 +662,7 @@ static int __init calibrate_APIC_clock(void) calibration_result = (delta *APIC_DIVISOR ) /LAPIC_CAL_LOOPS ;apic_printk (APIC_VERBOSE ,"..... delta %ld\n" , delta); -apic_printk (APIC_VERBOSE ,"..... mult: %ld\n" , lapic_clockevent.mult); +apic_printk (APIC_VERBOSE ,"..... mult: %u\n" , lapic_clockevent.mult);apic_printk (APIC_VERBOSE ,"..... calibration result: %u\n" , calibration_result);
arch/x86/kernel/vmiclock_32.c +1 -1
@@ -226,7 +226,7 @@ static void __devinit vmi_time_init_clockevent(void) evt->min_delta_ns =clockevent_delta2ns (1 , evt); evt->cpumask =cpumask_of (cpu); -printk (KERN_WARNING "vmi: registering clock event %s. mult=%lu shift=%u\n" , +printk (KERN_WARNING "vmi: registering clock event %s. mult=%u shift=%u\n" , evt->name, evt->mult, evt->shift);clockevents_register_device (evt); }
drivers/s390/cio/cio.c +1 -0
@@ -618,6 +618,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs) old_regs =set_irq_regs (regs);s390_idle_check ();irq_enter (); +__get_cpu_var (s390_idle).nohz_delay =1 ;if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)/* Serve timer interrupts first. */ clock_comparator_work ();
include/linux/clockchips.h +13 -6
@@ -77,10 +77,10 @@ enum clock_event_nofitiers {struct clock_event_device {const char *name;unsigned int features; -unsigned long max_delta_ns; -unsigned long min_delta_ns; -unsigned long mult; -int shift; +u64 max_delta_ns; +u64 min_delta_ns; +u32 mult; +u32 shift;int rating;int irq;const struct cpumask *cpumask;
@@ -116,8 +116,8 @@ static inline unsigned long div_sc(unsigned long ticks, unsigned long nsec, }/* Clock event layer functions */ -extern unsigned long clockevent_delta2ns (unsigned long latch, -struct clock_event_device *evt); +extern u64 clockevent_delta2ns (unsigned long latch, +struct clock_event_device *evt);extern void clockevents_register_device (struct clock_event_device *dev); extern void clockevents_exchange_device(struct clock_event_device *old,
@@ -130,6 +130,13 @@ extern int clockevents_program_event(struct clock_event_device *dev,extern void clockevents_handle_noop (struct clock_event_device *dev); +static inline void +clockevents_calc_mult_shift (struct clock_event_device *ce,u32 freq,u32 minsec) +{ +return clocks_calc_mult_shift (&ce->mult, &ce->shift,NSEC_PER_SEC , + freq, minsec); +} +#ifdef CONFIG_GENERIC_CLOCKEVENTS extern void clockevents_notify (unsigned long reason,void *arg);#else
include/linux/clocksource.h +12 -0
@@ -151,6 +151,7 @@ extern u64 timecounter_cyc2time(struct timecounter *tc,* subtraction of non 64 bit counters * @mult: cycle to nanosecond multiplier * @shift: cycle to nanosecond divisor (power of two) +* @max_idle_ns: max idle time permitted by the clocksource (nsecs) * @flags: flags describing special properties * @vread: vsyscall based read * @resume: resume function for the clocksource, if necessary
@@ -168,6 +169,7 @@ struct clocksource {cycle_t mask;u32 mult;u32 shift; +u64 max_idle_ns;unsigned long flags;cycle_t (*vread)(void);void (*resume)(void );
@@ -279,6 +281,16 @@ extern void clocksource_resume(void);extern struct clocksource *__init __weak clocksource_default_clock (void );extern void clocksource_mark_unstable (struct clocksource *cs); +extern void +clocks_calc_mult_shift (u32 *mult,u32 *shift,u32 from,u32 to,u32 minsec); + +static inline void +clocksource_calc_mult_shift (struct clocksource *cs,u32 freq,u32 minsec) +{ +return clocks_calc_mult_shift (&cs->mult, &cs->shift, freq, +NSEC_PER_SEC , minsec); +} +#ifdef CONFIG_GENERIC_TIME_VSYSCALL extern void update_vsyscall (struct timespec *ts,struct clocksource *c);extern void update_vsyscall_tz (void );
include/linux/tick.h +5 -0
@@ -43,6 +43,7 @@ enum tick_nohz_mode {* @idle_exittime: Time when the idle state was left * @idle_sleeptime: Sum of the time slept in idle with sched tick stopped * @sleep_length: Duration of the current idle sleep +* @do_timer_lst: CPU was the last one doing do_timer before going idle */ struct tick_sched {struct hrtimer sched_timer;
@@ -64,6 +65,7 @@ struct tick_sched {unsigned long last_jiffies;unsigned long next_jiffies;ktime_t idle_expires; +int do_timer_last; };extern void __init tick_init (void );
@@ -98,6 +100,9 @@ extern int tick_check_oneshot_change(int allow_nohz);extern struct tick_sched *tick_get_tick_sched (int cpu);extern void tick_check_idle (int cpu);extern int tick_oneshot_mode_active (void ); +# ifndef arch_needs_cpu +# define arch_needs_cpu (cpu) (0) +# endif # else static inline void tick_clock_notify (void ) { }static inline int tick_check_oneshot_change (int allow_nohz) {return 0 ; }
include/linux/time.h +1 -0
@@ -148,6 +148,7 @@ extern void monotonic_to_bootbased(struct timespec *ts);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);
include/linux/timex.h +0 -4
@@ -261,11 +261,7 @@ static inline int ntp_synced(void)#define NTP_SCALE_SHIFT 32 -#ifdef CONFIG_NO_HZ -#define NTP_INTERVAL_FREQ (2) -#else #define NTP_INTERVAL_FREQ (HZ) -#endif #define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)/* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */
init/calibrate.c +15 -9
@@ -123,23 +123,26 @@ void __cpuinit calibrate_delay(void) {unsigned long ticks, loopbit;int lps_precision =LPS_PREC ; +static bool printed;if (preset_lpj) { loops_per_jiffy = preset_lpj; -printk (KERN_INFO -"Calibrating delay loop (skipped) preset value.. " ); - }else if ((smp_processor_id () ==0 ) && lpj_fine) { +if (!printed) +pr_info ("Calibrating delay loop (skipped) " +"preset value.. " ); + }else if ((!printed) && lpj_fine) { loops_per_jiffy = lpj_fine; -printk (KERN_INFO -"Calibrating delay loop (skipped), " +pr_info ("Calibrating delay loop (skipped), " "value calculated using timer frequency.. " ); }else if ((loops_per_jiffy =calibrate_delay_direct ()) !=0 ) { -printk (KERN_INFO -"Calibrating delay using timer specific routine.. " ); +if (!printed) +pr_info ("Calibrating delay using timer " +"specific routine.. " ); }else { loops_per_jiffy = (1 <<12 ); -printk (KERN_INFO "Calibrating delay loop... " ); +if (!printed) +pr_info ("Calibrating delay loop... " );while ((loops_per_jiffy <<=1 ) !=0 ) {/* wait for "start of" clock tick */ ticks = jiffies;
@@ -170,7 +173,10 @@ void __cpuinit calibrate_delay(void) loops_per_jiffy &= ~loopbit; } } -printk (KERN_CONT "%lu.%02lu BogoMIPS (lpj=%lu)\n" , +if (!printed) +pr_cont ("%lu.%02lu BogoMIPS (lpj=%lu)\n" , loops_per_jiffy/(500000 /HZ ), (loops_per_jiffy/(5000 /HZ )) %100 , loops_per_jiffy); + + printed = true; }
kernel/cpu.c +2 -3
@@ -392,10 +392,9 @@ int disable_nonboot_cpus(void)if (cpu == first_cpu)continue ; error =_cpu_down (cpu,1 ); -if (!error) { +if (!error)cpumask_set_cpu (cpu, frozen_cpus); -printk ("CPU%d is down\n" , cpu); - }else { +else {printk (KERN_ERR "Error taking CPU%d down: %d\n" , cpu, error);break ;
kernel/hrtimer.c +2 -1
@@ -1240,7 +1240,8 @@ hrtimer_interrupt_hanging(struct clock_event_device *dev, force_clock_reprogram =1 ; dev->min_delta_ns = (unsigned long )try_time.tv64 *3 ;printk (KERN_WARNING "hrtimer: interrupt too slow, " -"forcing clock min delta to %lu ns\n" , dev->min_delta_ns); +"forcing clock min delta to %llu ns\n" , + (unsigned long long ) dev->min_delta_ns); }/* * High resolution timer interrupt
kernel/posix-cpu-timers.c +2 -3
@@ -384,7 +384,8 @@ int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp)/* * Validate the clockid_t for a new CPU-clock timer, and initialize the timer. -* This is called from sys_timer_create with the new timer already locked. +* This is called from sys_timer_create() and do_cpu_nanosleep() with the +* new timer already all-zeros initialized. */ int posix_cpu_timer_create (struct k_itimer *new_timer) {
@@ -396,8 +397,6 @@ int posix_cpu_timer_create(struct k_itimer *new_timer)return -EINVAL ;INIT_LIST_HEAD (&new_timer->it.cpu.entry); - new_timer->it.cpu.incr.sched =0 ; - new_timer->it.cpu.expires.sched =0 ;read_lock (&tasklist_lock);if (CPUCLOCK_PERTHREAD (new_timer->it_clock)) {
kernel/time.c +0 -1
@@ -136,7 +136,6 @@ 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 (); }
kernel/time/clockevents.c +7 -6
@@ -20,6 +20,8 @@#include <linux/sysdev.h> #include <linux/tick.h> +#include "tick-internal.h" +/* The registered clock event devices */ static LIST_HEAD (clockevent_devices);static LIST_HEAD (clockevents_released);
@@ -37,10 +39,9 @@ static DEFINE_SPINLOCK(clockevents_lock);* * Math helper, returns latch value converted to nanoseconds (bound checked) */ -unsigned long clockevent_delta2ns (unsigned long latch, -struct clock_event_device *evt) +u64 clockevent_delta2ns (unsigned long latch,struct clock_event_device *evt) { -u64 clc = ((u64 ) latch << evt->shift); +u64 clc = (u64 ) latch << evt->shift;if (unlikely (!evt->mult)) { evt->mult =1 ;
@@ -50,10 +51,10 @@ unsigned long clockevent_delta2ns(unsigned long latch,do_div (clc, evt->mult);if (clc <1000 ) clc =1000 ; -if (clc >LONG_MAX ) - clc =LONG_MAX ; +if (clc >KTIME_MAX ) + clc =KTIME_MAX ; -return (unsigned long ) clc; +return clc; }EXPORT_SYMBOL_GPL (clockevent_delta2ns);
kernel/time/clocksource.c +97 -0
115 lines not on this page · raw message
kernel/time/tick-oneshot.c +2 -2
@@ -50,9 +50,9 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires, dev->min_delta_ns += dev->min_delta_ns >>1 ;printk (KERN_WARNING -"CE: %s increasing min_delta_ns to %lu nsec\n" , +"CE: %s increasing min_delta_ns to %llu nsec\n" , dev->name ? dev->name :"?" , - dev->min_delta_ns <<1 ); + (unsigned long long ) dev->min_delta_ns <<1 ); i =0 ; }
kernel/time/tick-sched.c +88 -53
253 lines not on this page · raw message
kernel/time/timekeeping.c +73 -46
198 lines not on this page · raw message
kernel/time/timer_list.c +6 -4
@@ -204,10 +204,12 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)return ; }SEQ_printf (m,"%s\n" , dev->name); -SEQ_printf (m," max_delta_ns: %lu\n" , dev->max_delta_ns); -SEQ_printf (m," min_delta_ns: %lu\n" , dev->min_delta_ns); -SEQ_printf (m," mult: %lu\n" , dev->mult); -SEQ_printf (m," shift: %d\n" , dev->shift); +SEQ_printf (m," max_delta_ns: %llu\n" , + (unsigned long long ) dev->max_delta_ns); +SEQ_printf (m," min_delta_ns: %llu\n" , + (unsigned long long ) dev->min_delta_ns); +SEQ_printf (m," mult: %u\n" , dev->mult); +SEQ_printf (m," shift: %u\n" , dev->shift);SEQ_printf (m," mode: %d\n" , dev->mode);SEQ_printf (m," next_event: %Ld nsecs\n" , (unsigned long long )ktime_to_ns (dev->next_event));