timer updated for 2.6.32
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
Tracepoints for timers and itimer improvements which include some fixups in various archs due to the core code changes.
Thanks,
tglx
------------------>
Stanislaw Gruszka (4):
itimers: Merge ITIMER_VIRT and ITIMER_PROF
itimers: Fix periodic tics precision
itimers: Simplify arm_timer() code a bit
cputime: Optimize jiffies_to_cputime(1)
Xiao Guangrong (3):
timers: Add tracepoints for timer_list timers
hrtimer: Add tracepoint for hrtimers
itimers: Add tracepoints for itimer
arch/ia64/include/asm/cputime.h | 1 + arch/powerpc/include/asm/cputime.h | 13 ++ arch/powerpc/kernel/time.c | 4 + arch/s390/include/asm/cputime.h | 1 + include/asm-generic/cputime.h | 1 + include/linux/sched.h | 16 ++- include/trace/events/timer.h | 342 ++++++++++++++++++++++++++++++++++++ kernel/fork.c | 9 +- kernel/hrtimer.c | 40 ++++- kernel/itimer.c | 169 ++++++++++-------- kernel/posix-cpu-timers.c | 155 +++++++++-------- kernel/sched.c | 9 +- kernel/timer.c | 32 +++- 13 files changed, 620 insertions(+), 172 deletions(-) create mode 100644 include/trace/events/timer.h
arch/ia64/include/asm/cputime.h +1 -0
@@ -30,6 +30,7 @@ typedef u64 cputime_t;typedef u64 cputime64_t ;#define cputime_zero ((cputime_t)0) +#define cputime_one_jiffy jiffies_to_cputime(1)#define cputime_max ((~((cputime_t)0) >> 1) - 1)#define cputime_add (__a, __b) ((__a) + (__b))#define cputime_sub (__a, __b) ((__a) - (__b))
arch/powerpc/include/asm/cputime.h +13 -0
@@ -18,6 +18,9 @@#ifndef CONFIG_VIRT_CPU_ACCOUNTING #include <asm-generic/cputime.h> +#ifdef __KERNEL__ +static inline void setup_cputime_one_jiffy (void ) { } +#endif #else #include <linux/types.h>
@@ -49,6 +52,11 @@ typedef u64 cputime64_t;#ifdef __KERNEL__/* +* One jiffy in timebase units computed during initialization +*/ +extern cputime_t cputime_one_jiffy; + +/* * Convert cputime <-> jiffies */ extern u64 __cputime_jiffies_factor;
@@ -89,6 +97,11 @@ static inline cputime_t jiffies_to_cputime(const unsigned long jif)return ct; } +static inline void setup_cputime_one_jiffy (void ) +{ + cputime_one_jiffy =jiffies_to_cputime (1 ); +} +static inline cputime64_t jiffies64_to_cputime64 (const u64 jif) {cputime_t ct;
arch/powerpc/kernel/time.c +4 -0
@@ -193,6 +193,8 @@ EXPORT_SYMBOL(__cputime_clockt_factor); DEFINE_PER_CPU(unsigned long, cputime_last_delta); DEFINE_PER_CPU(unsigned long, cputime_scaled_last_delta); +cputime_t cputime_one_jiffy; +static void calc_cputime_factors (void ) {struct div_result res;
@@ -500,6 +502,7 @@ static int __init iSeries_tb_recal(void) tb_to_xs = divres.result_low; vdso_data->tb_ticks_per_sec = tb_ticks_per_sec; vdso_data->tb_to_xs = tb_to_xs; +setup_cputime_one_jiffy (); }else { printk( "Titan recalibrate: FAILED (difference > 4 percent)\n"
@@ -950,6 +953,7 @@ void __init time_init(void) tb_ticks_per_usec = ppc_tb_freq /1000000 ; tb_to_us =mulhwu_scale_factor (ppc_tb_freq,1000000 );calc_cputime_factors (); +setup_cputime_one_jiffy ();/* * Calculate the length of each tick in ns. It will not be
arch/s390/include/asm/cputime.h +1 -0
@@ -42,6 +42,7 @@ __div(unsigned long long n, unsigned int base)#endif /* __s390x__ */ #define cputime_zero (0ULL) +#define cputime_one_jiffy jiffies_to_cputime(1)#define cputime_max ((~0UL >> 1) - 1)#define cputime_add (__a, __b) ((__a) + (__b))#define cputime_sub (__a, __b) ((__a) - (__b))
include/asm-generic/cputime.h +1 -0
@@ -7,6 +7,7 @@typedef unsigned long cputime_t ;#define cputime_zero (0UL) +#define cputime_one_jiffy jiffies_to_cputime(1)#define cputime_max ((~0UL >> 1) - 1)#define cputime_add (__a, __b) ((__a) + (__b))#define cputime_sub (__a, __b) ((__a) - (__b))
include/linux/sched.h +13 -3
@@ -470,6 +470,13 @@ struct pacct_struct {unsigned long ac_minflt, ac_majflt; }; +struct cpu_itimer { +cputime_t expires; +cputime_t incr; +u32 error; +u32 incr_error; +}; +/** * struct task_cputime - collected CPU time counts * @utime: time spent in user mode, in &cputime_t units
@@ -564,9 +571,12 @@ struct signal_struct {struct pid *leader_pid;ktime_t it_real_incr; -/* ITIMER_PROF and ITIMER_VIRTUAL timers for the process */ -cputime_t it_prof_expires, it_virt_expires; -cputime_t it_prof_incr, it_virt_incr; +/* +* ITIMER_PROF and ITIMER_VIRTUAL timers for the process, we use +* CPUCLOCK_PROF and CPUCLOCK_VIRT for indexing array as these +* values are defined to 0 and 1 respectively +*/ +struct cpu_itimer it[2 ];/* * Thread group totals for process CPU timers.
include/trace/events/timer.h new file +342 -0
342 lines not on this page · raw message
kernel/fork.c +5 -4
@@ -62,6 +62,7 @@#include <linux/fs_struct.h> #include <linux/magic.h> #include <linux/perf_counter.h> +#include <linux/posix-timers.h> #include <asm/pgtable.h> #include <asm/pgalloc.h>
@@ -790,10 +791,10 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)thread_group_cputime_init (sig);/* Expiration times and increments. */ - sig->it_virt_expires = cputime_zero; - sig->it_virt_incr = cputime_zero; - sig->it_prof_expires = cputime_zero; - sig->it_prof_incr = cputime_zero; + sig->it[CPUCLOCK_PROF ].expires = cputime_zero; + sig->it[CPUCLOCK_PROF ].incr = cputime_zero; + sig->it[CPUCLOCK_VIRT ].expires = cputime_zero; + sig->it[CPUCLOCK_VIRT ].incr = cputime_zero;/* Cached expiration times. */ sig->cputime_expires.prof_exp = cputime_zero;
kernel/hrtimer.c +32 -8
@@ -48,6 +48,8 @@#include <asm/uaccess.h> +#include <trace/events/timer.h> +/* * The timer bases: *
@@ -441,6 +443,26 @@ static inline void debug_hrtimer_activate(struct hrtimer *timer) { }static inline void debug_hrtimer_deactivate (struct hrtimer *timer) { }#endif +static inline void +debug_init (struct hrtimer *timer,clockid_t clockid, +enum hrtimer_mode mode) +{ +debug_hrtimer_init (timer); +trace_hrtimer_init (timer, clockid, mode); +} + +static inline void debug_activate (struct hrtimer *timer) +{ +debug_hrtimer_activate (timer); +trace_hrtimer_start (timer); +} + +static inline void debug_deactivate (struct hrtimer *timer) +{ +debug_hrtimer_deactivate (timer); +trace_hrtimer_cancel (timer); +} +/* High resolution timer related functions */ #ifdef CONFIG_HIGH_RES_TIMERS
@@ -797,7 +819,7 @@ static int enqueue_hrtimer(struct hrtimer *timer,struct hrtimer *entry;int leftmost =1 ; -debug_hrtimer_activate (timer); +debug_activate (timer);/* * Find the right place in the rbtree:
@@ -883,7 +905,7 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base)* reprogramming happens in the interrupt handler. This is a * rare case and less expensive than a smp call. */ -debug_hrtimer_deactivate (timer); +debug_deactivate (timer);timer_stats_hrtimer_clear_start_info (timer); reprogram = base->cpu_base == &__get_cpu_var (hrtimer_bases); __remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE,
@@ -1116,7 +1138,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,void hrtimer_init (struct hrtimer *timer,clockid_t clock_id,enum hrtimer_mode mode) { -debug_hrtimer_init (timer); +debug_init (timer, clock_id, mode);__hrtimer_init (timer, clock_id, mode); }EXPORT_SYMBOL_GPL (hrtimer_init);
@@ -1140,7 +1162,7 @@ int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp) }EXPORT_SYMBOL_GPL (hrtimer_get_res); -static void __run_hrtimer (struct hrtimer *timer) +static void __run_hrtimer (struct hrtimer *timer,ktime_t *now) {struct hrtimer_clock_base *base = timer->base;struct hrtimer_cpu_base *cpu_base = base->cpu_base;
@@ -1149,7 +1171,7 @@ static void __run_hrtimer(struct hrtimer *timer)WARN_ON (!irqs_disabled ()); -debug_hrtimer_deactivate (timer); +debug_deactivate (timer);__remove_hrtimer (timer, base,HRTIMER_STATE_CALLBACK ,0 );timer_stats_account_hrtimer (timer); fn = timer->function;
@@ -1160,7 +1182,9 @@ static void __run_hrtimer(struct hrtimer *timer)* the timer base. */ spin_unlock (&cpu_base->lock); +trace_hrtimer_expire_entry (timer, now); restart =fn (timer); +trace_hrtimer_expire_exit (timer);spin_lock (&cpu_base->lock);/*
@@ -1271,7 +1295,7 @@ void hrtimer_interrupt(struct clock_event_device *dev)break ; } -__run_hrtimer (timer); +__run_hrtimer (timer, &basenow); } base++; }
@@ -1393,7 +1417,7 @@ void hrtimer_run_queues(void) hrtimer_get_expires_tv64(timer))break ; -__run_hrtimer (timer); +__run_hrtimer (timer, &base->softirq_time); }spin_unlock (&cpu_base->lock); }
@@ -1569,7 +1593,7 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,while ((node =rb_first (&old_base->active))) { timer = rb_entry(node, struct hrtimer, node);BUG_ON (hrtimer_callback_running (timer)); -debug_hrtimer_deactivate (timer); +debug_deactivate (timer);/* * Mark it as STATE_MIGRATE not INACTIVE otherwise the
kernel/itimer.c +91 -78
220 lines not on this page · raw message
kernel/posix-cpu-timers.c +85 -70
243 lines not on this page · raw message
kernel/sched.c +4 -5
@@ -5031,17 +5031,16 @@ void account_idle_time(cputime_t cputime)*/ void account_process_tick (struct task_struct *p,int user_tick) { -cputime_t one_jiffy =jiffies_to_cputime (1 ); -cputime_t one_jiffy_scaled =cputime_to_scaled (one_jiffy); +cputime_t one_jiffy_scaled =cputime_to_scaled (cputime_one_jiffy);struct rq *rq =this_rq ();if (user_tick) -account_user_time (p, one_jiffy, one_jiffy_scaled); +account_user_time (p, cputime_one_jiffy, one_jiffy_scaled);else if ((p != rq->idle) || (irq_count () !=HARDIRQ_OFFSET )) -account_system_time (p,HARDIRQ_OFFSET , one_jiffy, +account_system_time (p,HARDIRQ_OFFSET , cputime_one_jiffy, one_jiffy_scaled);else -account_idle_time (one_jiffy); +account_idle_time (cputime_one_jiffy); }/*
kernel/timer.c +28 -4
@@ -46,6 +46,9 @@#include <asm/timex.h> #include <asm/io.h> +#define CREATE_TRACE_POINTS +#include <trace/events/timer.h> + u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;EXPORT_SYMBOL (jiffies_64);
@@ -521,6 +524,25 @@ static inline void debug_timer_activate(struct timer_list *timer) { }static inline void debug_timer_deactivate (struct timer_list *timer) { }#endif +static inline void debug_init (struct timer_list *timer) +{ +debug_timer_init (timer); +trace_timer_init (timer); +} + +static inline void +debug_activate (struct timer_list *timer,unsigned long expires) +{ +debug_timer_activate (timer); +trace_timer_start (timer, expires); +} + +static inline void debug_deactivate (struct timer_list *timer) +{ +debug_timer_deactivate (timer); +trace_timer_cancel (timer); +} +static void __init_timer (struct timer_list *timer,const char *name,struct lock_class_key *key)
@@ -549,7 +571,7 @@ void init_timer_key(struct timer_list *timer,const char *name, struct lock_class_key *key) { -debug_timer_init (timer ); +debug_init (timer );__init_timer (timer, name, key); }EXPORT_SYMBOL (init_timer_key);
@@ -568,7 +590,7 @@ static inline void detach_timer(struct timer_list *timer, {struct list_head *entry = &timer->entry; -debug_timer_deactivate (timer); +debug_deactivate (timer);__list_del (entry->prev, entry->next);if (clear_pending)
@@ -632,7 +654,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, goto out_unlock; } -debug_timer_activate (timer); +debug_activate (timer, expires); new_base =__get_cpu_var (tvec_bases);
@@ -787,7 +809,7 @@ void add_timer_on(struct timer_list *timer, int cpu)BUG_ON (timer_pending (timer) || !timer->function);spin_lock_irqsave (&base->lock, flags);timer_set_base (timer, base); -debug_timer_activate (timer); +debug_activate (timer, timer->expires);if (time_before (timer->expires, base->next_timer) && !tbase_get_deferrable (timer->base)) base->next_timer = timer->expires;
@@ -1000,7 +1022,9 @@ static inline void __run_timers(struct tvec_base *base)*/ lock_map_acquire (&lockdep_map); +trace_timer_expire_entry (timer);fn (data); +trace_timer_expire_exit (timer);lock_map_release (&lockdep_map);