linux-stable.git/include/linux/hrtimer.h, branch linux-2.6.24.y

hrtimer: fix *rmtp handling in hrtimer_nanosleep()

2008-02-26T00:18:56+00:00

commit 080344b98805553f9b01de0f59a41b1533036d8d

Spotted by Pavel Emelyanov and Alexey Dobriyan.

hrtimer_nanosleep() sets restart_block->arg1 = rmtp, but this rmtp points to
the local variable which lives in the caller's stack frame. This means that
if sys_restart_syscall() actually happens and it is interrupted as well, we
don't update the user-space variable, but write into the already dead stack
frame.

Introduced by commit 04c227140fed77587432667a574b14736a06dd7f
hrtimer: Rework hrtimer_nanosleep to make sys_compat_nanosleep easier

Change the callers to pass "__user *rmtp" to hrtimer_nanosleep(), and change
hrtimer_nanosleep() to use copy_to_user() to actually update *rmtp.

Small problem remains. man 2 nanosleep states that *rtmp should be written if
nanosleep() was interrupted (it says nothing whether it is OK to update *rmtp
if nanosleep returns 0), but (with or without this patch) we can dirty *rem
even if nanosleep() returns 0.

NOTE: this patch doesn't change compat_sys_nanosleep(), because it has other
bugs. Fixed by the next patch.

Signed-off-by: Oleg Nesterov 
Cc: Alexey Dobriyan 
Cc: Michael Kerrisk 
Cc: Pavel Emelyanov 
Cc: Peter Zijlstra 
Cc: Toyo Abe 
Cc: Andrew Morton 
Signed-off-by: Thomas Gleixner 
Signed-off-by: Greg Kroah-Hartman

hrtimer: Rework hrtimer_nanosleep to make sys_compat_nanosleep easier

2007-10-18T20:54:18+00:00

Pull the copy_to_user out of hrtimer_nanosleep and into the callers
(common_nsleep, sys_nanosleep) in preparation for converting
compat_sys_nanosleep to use hrtimers.

Signed-off-by: Anton Blanchard 
Acked-by: Arnd Bergmann 
Signed-off-by: Thomas Gleixner

Add a flag to indicate deferrable timers in /proc/timer_stats

2007-07-16T16:05:45+00:00

Add a flag in /proc/timer_stats to indicate deferrable timers.  This will
let developers/users to differentiate between types of tiemrs in
/proc/timer_stats.

Deferrable timer and normal timer will appear in /proc/timer_stats as below.
  10D,     1 swapper          queue_delayed_work_on (delayed_work_timer_fn)
   10,     1 swapper          queue_delayed_work_on (delayed_work_timer_fn)

Also version of timer_stats changes from v0.1 to v0.2

Signed-off-by: Venkatesh Pallipadi 
Acked-by: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: john stultz 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] high-res timers: resume fix

2007-04-07T17:03:43+00:00

Soeren Sonnenburg reported that upon resume he is getting
this backtrace:

 [] smp_apic_timer_interrupt+0x57/0x90
 [] retrigger_next_event+0x0/0xb0
 [] apic_timer_interrupt+0x28/0x30
 [] retrigger_next_event+0x0/0xb0
 [] __kfifo_put+0x8/0x90
 [] on_each_cpu+0x35/0x60
 [] clock_was_set+0x18/0x20
 [] timekeeping_resume+0x7c/0xa0
 [] __sysdev_resume+0x11/0x80
 [] sysdev_resume+0x47/0x80
 [] device_power_up+0x5/0x10

it turns out that on resume we mistakenly re-enable interrupts too
early.  Do the timer retrigger only on the current CPU.

Signed-off-by: Ingo Molnar 
Acked-by: Thomas Gleixner 
Acked-by: Soeren Sonnenburg 
Signed-off-by: Linus Torvalds

[PATCH] hrtimers: hrtimer_clock_base description typo

2007-03-06T17:30:24+00:00

The description for the hrtimer_clock_base struct describes "hrtimer_base".
 That should be hrtimer_clock_base.

Signed-off-by: Andres Salomon 
Acked-by: Thomas Gleixner 
Acked-by: Ingo Molnar 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] hrtimers: fix HRTIMER_CB_IRQSAFE_NO_SOFTIRQ description

2007-03-06T17:30:24+00:00

The description for HRTIMER_CB_IRQSAFE_NO_SOFTIRQ is backwards; "NO
SOFTIRQ" sounds a whole lot like it means it must not be run in a softirq.

Signed-off-by: Andres Salomon 
Acked-by: Thomas Gleixner 
Acked-by: Ingo Molnar 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] kernel-doc fixes for 2.6.20-git15 (non-drivers)

2007-03-01T22:53:37+00:00

Fix kernel-doc warnings in 2.6.20-git15 (lib/, mm/, kernel/, include/).

Signed-off-by: Randy Dunlap 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] Add SysRq-Q to print timer_list debug info

2007-02-16T16:13:59+00:00

Add SysRq-Q to print pending timers and other timer info.

Signed-off-by: Ingo Molnar 
Signed-off-by: Thomas Gleixner 
Cc: john stultz 
Cc: Roman Zippel 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] Add debugging feature /proc/timer_stat

2007-02-16T16:13:59+00:00

Add /proc/timer_stats support: debugging feature to profile timer expiration.
Both the starting site, process/PID and the expiration function is captured.
This allows the quick identification of timer event sources in a system.

Sample output:

# echo 1 > /proc/timer_stats
# cat /proc/timer_stats
Timer Stats Version: v0.1
Sample period: 4.010 s
  24,     0 swapper          hrtimer_stop_sched_tick (hrtimer_sched_tick)
  11,     0 swapper          sk_reset_timer (tcp_delack_timer)
   6,     0 swapper          hrtimer_stop_sched_tick (hrtimer_sched_tick)
   2,     1 swapper          queue_delayed_work_on (delayed_work_timer_fn)
  17,     0 swapper          hrtimer_restart_sched_tick (hrtimer_sched_tick)
   2,     1 swapper          queue_delayed_work_on (delayed_work_timer_fn)
   4,  2050 pcscd            do_nanosleep (hrtimer_wakeup)
   5,  4179 sshd             sk_reset_timer (tcp_write_timer)
   4,  2248 yum-updatesd     schedule_timeout (process_timeout)
  18,     0 swapper          hrtimer_restart_sched_tick (hrtimer_sched_tick)
   3,     0 swapper          sk_reset_timer (tcp_delack_timer)
   1,     1 swapper          neigh_table_init_no_netlink (neigh_periodic_timer)
   2,     1 swapper          e1000_up (e1000_watchdog)
   1,     1 init             schedule_timeout (process_timeout)
100 total events, 25.24 events/sec

[ cleanups and hrtimers support from Thomas Gleixner  ]
[bunk@stusta.de: nr_entries can become static]
Signed-off-by: Ingo Molnar 
Signed-off-by: Thomas Gleixner 
Cc: john stultz 
Cc: Roman Zippel 
Cc: Andi Kleen 
Signed-off-by: Adrian Bunk 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] hrtimers: add high resolution timer support

2007-02-16T16:13:59+00:00

Implement high resolution timers on top of the hrtimers infrastructure and the
clockevents / tick-management framework.  This provides accurate timers for
all hrtimer subsystem users.

Signed-off-by: Thomas Gleixner 
Signed-off-by: Ingo Molnar 
Cc: john stultz 
Cc: Roman Zippel 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds