hrtimers: Remove the "timer_stats_active" check when setting the start info
PATCH 1/1 hrtimers: Remove the "timer_stats_active" check when setting the start info
Hi tglx,
Please review this patch (generated against v2.6.31-rc8)
Thanks,
Feng
Quoted 1 line
From
8c6b53a0ead71590a0dd5556c9ad409f0c1ad2d1Mon Sep 17 00:00:00 2001
From: Feng Tang <[email protected]>
Date: Thu, 3 Sep 2009 15:51:10 +0800
Subject: [PATCH] hrtimers: Remove the "timer_stats_active" check when setting the start info
Recent hrtimer code will set the start info to a hrtimer only when that flag is set, then the start info of all hrtimers will always be uninitialised before a "echo 1 > /proc/timer_stats", thus the /proc/timer_lists will have something like:
active timers:
#0: <c27d46b0>, tick_sched_timer, S:01, <(null)>, /-1
# expires at 91062000000-91062000000 nsecs [in 156071 to 156071 nsecs] #1: <efb81b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91062300331-91062350331 nsecs [in 456402 to 506402 nsecs] #2: <efac9b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068699811-91068749811 nsecs [in 6855882 to 6905882 nsecs] #3: <efacdb6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068755511-91068805511 nsecs [in 6911582 to 6961582 nsecs] #4: <efa95b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068806066-91068856066 nsecs [in 6962137 to 7012137 nsecs] .....
This patch will fix it.
--- include/linux/hrtimer.h | 2 -- kernel/hrtimer.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-)
include/linux/hrtimer.h +0 -2
@@ -459,8 +459,6 @@ extern void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer,static inline void timer_stats_hrtimer_set_start_info (struct hrtimer *timer) { -if (likely (!timer_stats_active)) -return ;__timer_stats_hrtimer_set_start_info (timer,__builtin_return_address (0 )); }
kernel/hrtimer.c +1 -1
@@ -778,7 +778,7 @@ static inline void hrtimer_init_timer_hres(struct hrtimer *timer) { }#ifdef CONFIG_TIMER_STATS void __timer_stats_hrtimer_set_start_info (struct hrtimer *timer,void *addr) { -if (timer->start_site) +if (timer->start_site == addr && timer->start_pid == current->pid)return ; timer->start_site = addr;
Signature · 1 line
1.5.6.3
Quoted 28 lines · Feng Tang
Please review this patch (generated against v2.6.31-rc8)
Thanks,
FengQuoted 1 line
From
8c6b53a0ead71590a0dd5556c9ad409f0c1ad2d1Mon Sep 17 00:00:00 2001From: Feng Tang <[email protected]>
Date: Thu, 3 Sep 2009 15:51:10 +0800
Subject: [PATCH] hrtimers: Remove the "timer_stats_active" check when setting the start infoRecent hrtimer code will set the start info to a hrtimer only when that flag is set, then the start info of all hrtimers will always be uninitialised before a "echo 1 >
/proc/timer_stats", thus the/proc/timer_listswill have something like:active timers:
#0: <c27d46b0>,tick_sched_timer, S:01, <(null)>, /-1# expires at 91062000000-91062000000 nsecs [in 156071 to 156071 nsecs] #1: <efb81b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91062300331-91062350331 nsecs [in 456402 to 506402 nsecs] #2: <efac9b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068699811-91068749811 nsecs [in 6855882 to 6905882 nsecs] #3: <efacdb6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068755511-91068805511 nsecs [in 6911582 to 6961582 nsecs] #4: <efa95b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068806066-91068856066 nsecs [in 6962137 to 7012137 nsecs] .....
Quoted 1 line
This patch will fix it.
Well, at the same time it forces the memcpy when !timer_stats_active. We generally want to avoid such overhead when debug facilities are disabled.
Thanks,
tglx
Quoted 19 lines · On Tue, 15 Sep 2009 17:00:09 +0800 Thomas Gleixner <[email protected]> wrote:
Quoted 19 lines
Recent hrtimer code will set the start info to a hrtimer only when that flag is set, then the start info of all hrtimers will always be uninitialised before a "echo 1 >
/proc/timer_stats", thus the/proc/timer_listswill have something like:active timers:
#0: <c27d46b0>,tick_sched_timer, S:01, <(null)>, /-1# expires at 91062000000-91062000000 nsecs [in 156071 to 156071 nsecs] #1: <efb81b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91062300331-91062350331 nsecs [in 456402 to 506402 nsecs] #2: <efac9b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068699811-91068749811 nsecs [in 6855882 to 6905882 nsecs] #3: <efacdb6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068755511-91068805511 nsecs [in 6911582 to 6961582 nsecs] #4: <efa95b6c>, hrtimer_wakeup, S:01, <(null)>, /-1 # expires at 91068806066-91068856066 nsecs [in 6962137 to 7012137 nsecs] .....
Quoted 5 lines
Quoted 1 line
This patch will fix it.
Well, at the same time it forces the memcpy when !timer_stats_active. We generally want to avoid such overhead when debug facilities are disabled.
I understand the performance point, that's why I add a check line trying to avoid unnecessary copy (yes, the check itself will bring some overload):
void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer, void *addr) {
- if (timer->start_site)
+ if (timer->start_site == addr && timer->start_pid == current->pid)
return;
Also there is one corner case, that a hrtimer get initialized and queued in before setting timer_stats_active to 1, but get run after that. Then its start_site will be NULL which will prevent it from being accounted.
Thanks,
Feng