nanosleep() fix for current bk
PATCH 1/1 nanosleep() fix for current bk
This should fix up the various mysterious application failures which people have been seeing (xmms, mplayer, DB2 at least).
A couple of things:
- if (rq_time <= get_jiffies_64())
- return 0;
That was unsafe against wrapping.
- if ((rq_time - get_jiffies_64()) > MAX_JIFFY_OFFSET){
- new_timer.expires = MAX_JIFFY_OFFSET;
This is the big one. get_jiffies_64() returns unsigned, so the whole expression is promoted to unsigned. So if rq_time happens to be _before_ jiffies_64 we end up sleeping for 0x7ffffffe jiffies.
Also I think this calculation:
- if (abs || !rq_time){
- adjust_abs_time(&posix_clocks[which_clock], &t, abs);
- tstojiffie(&t, posix_clocks[which_clock].res, &rq_time);
- }
should be outside the loop, yes?
The thing I have not explained is why the failure could only be triggered after 5 minutes uptime, when jiffies has become positive and when jiffies_64 is using the upper 32 bits. Can you see it??
kernel/posix-timers.c | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-)
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +22 -27
@@ -182,8 +182,7 @@ init_posix_timers(void)__initcall (init_posix_timers); -static inline int -tstojiffie (struct timespec *tp,int res,u64 *jiff) +static void tstojiffie (struct timespec *tp,int res,u64 *jiff) {unsigned long sec = tp->tv_sec;long nsec = tp->tv_nsec + res -1 ;
@@ -212,17 +211,14 @@ tstojiffie(struct timespec *tp, int res,* Split to jiffie and sub jiffie */ *jiff += nsec / (NSEC_PER_SEC /HZ ); -/* -* We trust that the optimizer will use the remainder from the -* above div in the following operation as long as they are close. -*/ -return 0 ; } +static void tstotimer (struct itimerspec *time,struct k_itimer *timer) {u64 result;int res = posix_clocks[timer->it_clock].res; +tstojiffie (&time->it_value, res, &result); timer->it_timer.expires = (unsigned long )result;tstojiffie (&time->it_interval, res, &result);
@@ -1195,6 +1191,7 @@ sys_clock_nanosleep(clockid_t which_clocreturn ret; } +long do_clock_nanosleep (clockid_t which_clock,int flags,struct timespec *tsave) {
@@ -1225,30 +1222,30 @@ do_clock_nanosleep(clockid_t which_clock rq_time = (rq_time <<32 ) + restart_block->arg2;if (!rq_time)return -EINTR ; -if (rq_time <=get_jiffies_64 ()) -return 0 ; + left = rq_time -get_jiffies_64 (); +if (left <=0LL ) +return 0 ;/* Already passed */ }if (abs && (posix_clocks[which_clock].clock_get != posix_clocks[CLOCK_MONOTONIC ].clock_get)) {add_wait_queue (&nanosleep_abs_wqueue, &abs_wqueue); } - do { - t = *tsave; - if (abs || !rq_time){ - adjust_abs_time(&posix_clocks[which_clock], &t, abs); - tstojiffie(&t, posix_clocks[which_clock].res, &rq_time); - } -#if (BITS_PER_LONG < 64) - if ((rq_time - get_jiffies_64()) > MAX_JIFFY_OFFSET){ - new_timer.expires = MAX_JIFFY_OFFSET; - }else -#endif - { - new_timer.expires = (long)rq_time; - } - current->state = TASK_INTERRUPTIBLE; + t = *tsave; +if (abs || !rq_time) { +adjust_abs_time (&posix_clocks[which_clock], &t, abs); +tstojiffie (&t, posix_clocks[which_clock].res, &rq_time); + } + + left = rq_time -get_jiffies_64 (); + +while (left >0 && !test_thread_flag (TIF_SIGPENDING )) { +if (left >=MAX_JIFFY_OFFSET ) + left =MAX_JIFFY_OFFSET ; + + new_timer.expires = jiffies + left; +__set_current_state (TASK_INTERRUPTIBLE );add_timer (&new_timer);schedule ();
@@ -1256,10 +1253,8 @@ do_clock_nanosleep(clockid_t which_clockdel_timer_sync (&new_timer); left = rq_time -get_jiffies_64 (); } -while ( (left >0 ) && - !test_thread_flag (TIF_SIGPENDING )); -if ( abs_wqueue.task_list.next) +if (abs_wqueue.task_list.next)finish_wait (&nanosleep_abs_wqueue, &abs_wqueue);if (left >0 ) {
_
Quoted 9 lines · Andrew Morton
This should fix up the various mysterious application failures which people have been seeing (xmms, mplayer, DB2 at least).
A couple of things:
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +0
-2-if (rq_time <=get_jiffies_64 ()) -return 0 ;That was unsafe against wrapping.
Uh, I don't think so. They are both 64 bits. It that wraps we will both be long gone ...
Quoted 8 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +0
-2-if ((rq_time -get_jiffies_64 ()) >MAX_JIFFY_OFFSET ){ - new_timer.expires =MAX_JIFFY_OFFSET ;This is the big one.
get_jiffies_64()returns unsigned, so the whole expression is promoted to unsigned. So ifrq_timehappens to be _before_jiffies_64we end up sleeping for0x7ffffffejiffies.
Yes, this needs to be signed...
Quoted 10 lines
Also I think this calculation:
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +0
-4-if (abs || !rq_time){ -adjust_abs_time (&posix_clocks[which_clock], &t, abs); -tstojiffie (&t, posix_clocks[which_clock].res, &rq_time); - }should be outside the loop, yes?
No. If abs is set we need to redue the conversion just in case the clock was set (and setting the clock will wake us up early). If abs is not set, we just do the conversion once, after which rq_time will be non-zero and we will use the old expire time.
Quoted 51 lines
The thing I have not explained is why the failure could only be triggered after 5 minutes uptime, when jiffies has become positive and when
jiffies_64is using the upper 32 bits. Can you see it??kernel/posix-timers.c | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-)diff -puN
kernel/posix-timers.c~posix-timers-fixeskernel/posix-timers.ckernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +4
-7@@ -182,8 +182,7 @@ init_posix_timers(void)__initcall (init_posix_timers); -static inline int -tstojiffie (struct timespec *tp,int res,u64 *jiff) +static void tstojiffie (struct timespec *tp,int res,u64 *jiff) {unsigned long sec = tp->tv_sec;long nsec = tp->tv_nsec + res -1 ;@@ -212,17 +211,14 @@ tstojiffie(struct timespec *tp, int res,* Split to jiffie and sub jiffie */ *jiff += nsec / (NSEC_PER_SEC /HZ ); -/* -* We trust that the optimizer will use the remainder from the -* above div in the following operation as long as they are close. -*/ -return 0 ; } +static void tstotimer (struct itimerspec *time,struct k_itimer *timer) {u64 result;int res = posix_clocks[timer->it_clock].res; +tstojiffie (&time->it_value, res, &result); timer->it_timer.expires = (unsigned long )result;tstojiffie (&time->it_interval, res, &result);@@ -1195,6 +1191,7 @@ sys_clock_nanosleep(clockid_t which_clocreturn ret; } +long do_clock_nanosleep (clockid_t which_clock,int flags,struct timespec *tsave) {
kernel/posix-timers.c do_clock_nanosleep(clockid_t which_clock · line 1227
Quoted 8 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +3
-2@@ -1225,30 +1222,30 @@ do_clock_nanosleep(clockid_t which_clock rq_time = (rq_time <<32 ) + restart_block->arg2;if (!rq_time)return -EINTR ; -if (rq_time <=get_jiffies_64 ()) -return 0 ; + left = rq_time -get_jiffies_64 (); +if (left <=0LL ) +return 0 ;/* Already passed */
I really don't think this will fail.
Quoted 27 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +5
-15}if (abs && (posix_clocks[which_clock].clock_get != posix_clocks[CLOCK_MONOTONIC ].clock_get)) {add_wait_queue (&nanosleep_abs_wqueue, &abs_wqueue); } - do { - t = *tsave; - if (abs || !rq_time){ - adjust_abs_time(&posix_clocks[which_clock], &t, abs); - tstojiffie(&t, posix_clocks[which_clock].res, &rq_time); - } -#if (BITS_PER_LONG < 64) - if ((rq_time - get_jiffies_64()) > MAX_JIFFY_OFFSET){ - new_timer.expires = MAX_JIFFY_OFFSET; - }else -#endif - { - new_timer.expires = (long)rq_time; - } - current->state = TASK_INTERRUPTIBLE; + t = *tsave; +if (abs || !rq_time) { +adjust_abs_time (&posix_clocks[which_clock], &t, abs); +tstojiffie (&t, posix_clocks[which_clock].res, &rq_time); + }
kernel/posix-timers.c do_clock_nanosleep(clockid_t which_clock · line 1249
Quoted 10 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +9
-0+ + left = rq_time -get_jiffies_64 (); + +while (left >0 && !test_thread_flag (TIF_SIGPENDING )) { +if (left >=MAX_JIFFY_OFFSET ) + left =MAX_JIFFY_OFFSET ; + + new_timer.expires = jiffies + left; +__set_current_state (TASK_INTERRUPTIBLE );add_timer (&new_timer);
This will fail the clock setting test. The standard says that the abs sleep should stop "on time" even if the clock is set. I think the only "real" issue is the unsigned compare.
Quoted 18 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +1
-3schedule ();@@ -1256,10 +1253,8 @@ do_clock_nanosleep(clockid_t which_clockdel_timer_sync (&new_timer); left = rq_time -get_jiffies_64 (); } -while ( (left >0 ) && - !test_thread_flag (TIF_SIGPENDING )); -if ( abs_wqueue.task_list.next) +if (abs_wqueue.task_list.next)finish_wait (&nanosleep_abs_wqueue, &abs_wqueue);if (left >0 ) {_
Signature · 3 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
Quoted 7 lines · george anzinger
Quoted 5 lines · Andrew Morton
This should fix up the various mysterious application failures which people have been seeing (xmms, mplayer, DB2 at least).
A couple of things:
Quoted 7 lines
Quoted 4 lines
(quoted diff) +0
-2- if (rq_time <= get_jiffies_64()) - return 0;That was unsafe against wrapping.
Uh, I don't think so. They are both 64 bits. It that wraps we will both be long gone ...
Well, someome may decide to set INTIAL_JIFFIES to -300HZ. It is more correct.
Quoted 8 lines
Quoted 8 lines
Also I think this calculation:
(quoted diff) +0
-4- if (abs || !rq_time){ - adjust_abs_time(&posix_clocks[which_clock], &t, abs); - tstojiffie(&t, posix_clocks[which_clock].res, &rq_time); - }
Quoted 6 lines
Quoted 1 line
should be outside the loop, yes?
No. If abs is set we need to redue the conversion just in case the clock was set (and setting the clock will wake us up early). If abs is not set, we just do the conversion once, after which
rq_timewill be non-zero and we will use the old expire time.
OK. Here's an updated patch.
kernel/posix-timers.c | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-)
kernel/posix-timers.c renamed from kernel/posix-timers.c~posix-timers-fixes +20 -24
@@ -182,8 +182,7 @@ init_posix_timers(void)__initcall (init_posix_timers); -static inline int -tstojiffie (struct timespec *tp,int res,u64 *jiff) +static void tstojiffie (struct timespec *tp,int res,u64 *jiff) {unsigned long sec = tp->tv_sec;long nsec = tp->tv_nsec + res -1 ;
@@ -212,17 +211,14 @@ tstojiffie(struct timespec *tp, int res,* Split to jiffie and sub jiffie */ *jiff += nsec / (NSEC_PER_SEC /HZ ); -/* -* We trust that the optimizer will use the remainder from the -* above div in the following operation as long as they are close. -*/ -return 0 ; } +static void tstotimer (struct itimerspec *time,struct k_itimer *timer) {u64 result;int res = posix_clocks[timer->it_clock].res; +tstojiffie (&time->it_value, res, &result); timer->it_timer.expires = (unsigned long )result;tstojiffie (&time->it_interval, res, &result);
@@ -1195,6 +1191,7 @@ sys_clock_nanosleep(clockid_t which_clocreturn ret; } +long do_clock_nanosleep (clockid_t which_clock,int flags,struct timespec *tsave) {
@@ -1225,41 +1222,40 @@ do_clock_nanosleep(clockid_t which_clock rq_time = (rq_time <<32 ) + restart_block->arg2;if (!rq_time)return -EINTR ; -if (rq_time <=get_jiffies_64 ()) -return 0 ; + left = rq_time -get_jiffies_64 (); +if (left <=0LL ) +return 0 ;/* Already passed */ }if (abs && (posix_clocks[which_clock].clock_get != posix_clocks[CLOCK_MONOTONIC ].clock_get)) {add_wait_queue (&nanosleep_abs_wqueue, &abs_wqueue); } +do { t = *tsave; -if (abs || !rq_time){ +if (abs || !rq_time) {adjust_abs_time (&posix_clocks[which_clock], &t, abs); -tstojiffie (&t, posix_clocks[which_clock].res, &rq_time); } -#if (BITS_PER_LONG <64 ) -if ((rq_time -get_jiffies_64 ()) >MAX_JIFFY_OFFSET ){ - new_timer.expires =MAX_JIFFY_OFFSET ; - }else -#endif - { - new_timer.expires = (long )rq_time; - } - current->state =TASK_INTERRUPTIBLE ; + + left = rq_time -get_jiffies_64 (); +if (left >=MAX_JIFFY_OFFSET ) + left =MAX_JIFFY_OFFSET ; +if (left <0 ) +break ; + + new_timer.expires = jiffies + left; +__set_current_state (TASK_INTERRUPTIBLE );add_timer (&new_timer);schedule ();del_timer_sync (&new_timer); left = rq_time -get_jiffies_64 (); - } -while ( (left >0 ) && - !test_thread_flag (TIF_SIGPENDING )); + }while (left >0 && !test_thread_flag (TIF_SIGPENDING )); -if ( abs_wqueue.task_list.next) +if (abs_wqueue.task_list.next)finish_wait (&nanosleep_abs_wqueue, &abs_wqueue);if (left >0 ) {
_