timers fixes
Linus,
Please pull the latest timers-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus
Thanks,
Ingo
------------------>
Heiko Carstens (1):
hrtimer: move timer stats helper functions to hrtimer.c
Thomas Gleixner (2):
hrtimer: Tune hrtimer_interrupt hang logic
itimer: Fix the itimer trace print format
include/linux/hrtimer.h | 56 +++---------------- include/trace/events/timer.h | 8 ++-- kernel/hrtimer.c | 121 ++++++++++++++++++++++++++--------------- kernel/time/timer_list.c | 5 ++- 4 files changed, 94 insertions(+), 96 deletions(-)
include/linux/hrtimer.h +9 -47
@@ -162,10 +162,11 @@ struct hrtimer_clock_base {* @expires_next: absolute time of the next event which was scheduled * via clock_set_next_event() * @hres_active: State of high resolution mode -* @check_clocks: Indictator, when set evaluate time source and clock -* event devices whether high resolution mode can be -* activated. -* @nr_events: Total number of timer interrupt events +* @hang_detected: The last hrtimer interrupt detected a hang +* @nr_events: Total number of hrtimer interrupt events +* @nr_retries: Total number of hrtimer interrupt retries +* @nr_hangs: Total number of hrtimer interrupt hangs +* @max_hang_time: Maximum time spent in hrtimer_interrupt */ struct hrtimer_cpu_base {spinlock_t lock;
@@ -173,7 +174,11 @@ struct hrtimer_cpu_base {#ifdef CONFIG_HIGH_RES_TIMERS ktime_t expires_next;int hres_active; +int hang_detected;unsigned long nr_events; +unsigned long nr_retries; +unsigned long nr_hangs; +ktime_t max_hang_time;#endif };
@@ -435,47 +440,4 @@ extern u64 ktime_divns(const ktime_t kt, s64 div);/* Show pending timers: */ extern void sysrq_timer_list_show (void ); -/* -* Timer-statistics info: -*/ -#ifdef CONFIG_TIMER_STATS - -extern void timer_stats_update_stats (void *timer,pid_t pid,void *startf, -void *timerf,char *comm, -unsigned int timer_flag); - -static inline void timer_stats_account_hrtimer (struct hrtimer *timer) -{ -if (likely (!timer_stats_active)) -return ; -timer_stats_update_stats (timer, timer->start_pid, timer->start_site, - timer->function, timer->start_comm,0 ); -} - -extern void __timer_stats_hrtimer_set_start_info (struct hrtimer *timer, -void *addr); - -static inline void timer_stats_hrtimer_set_start_info (struct hrtimer *timer) -{ -__timer_stats_hrtimer_set_start_info (timer,__builtin_return_address (0 )); -} - -static inline void timer_stats_hrtimer_clear_start_info (struct hrtimer *timer) -{ - timer->start_site =NULL ; -} -#else -static inline void timer_stats_account_hrtimer (struct hrtimer *timer) -{ -} - -static inline void timer_stats_hrtimer_set_start_info (struct hrtimer *timer) -{ -} - -static inline void timer_stats_hrtimer_clear_start_info (struct hrtimer *timer) -{ -} -#endif -#endif
include/trace/events/timer.h +4 -4
@@ -301,8 +301,8 @@ TRACE_EVENT(itimer_state, __entry->interval_usec = value->it_interval.tv_usec; ), -TP_printk ("which=%d expires=%lu it_value=%lu.%lu it_interval=%lu.%lu" , - __entry->which, __entry->expires, +TP_printk ("which=%d expires=%llu it_value=%ld.%ld it_interval=%ld.%ld" , + __entry->which, (unsigned long long )__entry->expires, __entry->value_sec, __entry->value_usec, __entry->interval_sec, __entry->interval_usec) );
@@ -331,8 +331,8 @@ TRACE_EVENT(itimer_expire, __entry->pid =pid_nr (pid); ), -TP_printk ("which=%d pid=%d now=%lu" , __entry->which, - (int ) __entry->pid, __entry->now) +TP_printk ("which=%d pid=%d now=%llu" , __entry->which, + (int ) __entry->pid, (unsigned long long )__entry->now) );#endif /* _TRACE_TIMER_H */
kernel/hrtimer.c +77 -44
176 lines not on this page · raw message
kernel/time/timer_list.c +4 -1
@@ -150,6 +150,9 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)P_ns (expires_next);P (hres_active);P (nr_events); +P (nr_retries); +P (nr_hangs); +P_ns (max_hang_time);#endif #undef P#undef P_ns
@@ -254,7 +257,7 @@ static int timer_list_show(struct seq_file *m, void *v)u64 now =ktime_to_ns (ktime_get ());int cpu; -SEQ_printf (m,"Timer List Version: v0.4\n" ); +SEQ_printf (m,"Timer List Version: v0.5\n" );SEQ_printf (m,"HRTIMER_MAX_CLOCK_BASES: %d\n" ,HRTIMER_MAX_CLOCK_BASES );SEQ_printf (m,"now at %Ld nsecs\n" , (unsigned long long )now);