From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@osdl.org>
Cc: LKML <linux-kernel@vger.kernel.org>, Ingo Molnar <mingo@elte.hu>,
George Anzinger <george@wildturkeyranch.net>,
Steven Rostedt <rostedt@goodmis.org>,
Andrew Morton <akpm@osdl.org>
Subject: [PATCH 3/7] [hrtimers] Fix oldvalue return in setitimer
Date: Fri, 20 Jan 2006 02:55:47 -0000 [thread overview]
Message-ID: <20060120021342.498532000@tglx.tec.linutronix.de> (raw)
In-Reply-To: 20060120021336.134802000@tglx.tec.linutronix.de
[-- Attachment #1: 0003-hrtimers-Fix-oldvalue-return-in-setitimer.txt --]
[-- Type: text/plain, Size: 1202 bytes --]
This resolves bugzilla bug#5617. The oldvalue of the
timer was read after the timer was cancelled, so the
remaining time was always zero.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/itimer.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
3f59dd20898d805781b3eac7ed0807e7a0b30f2f
diff --git a/kernel/itimer.c b/kernel/itimer.c
index 6433d06..379be2f 100644
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -155,16 +155,16 @@ int do_setitimer(int which, struct itime
again:
spin_lock_irq(&tsk->sighand->siglock);
timer = &tsk->signal->real_timer;
- /* We are sharing ->siglock with it_real_fn() */
- if (hrtimer_try_to_cancel(timer) < 0) {
- spin_unlock_irq(&tsk->sighand->siglock);
- goto again;
- }
if (ovalue) {
ovalue->it_value = itimer_get_remtime(timer);
ovalue->it_interval
= ktime_to_timeval(tsk->signal->it_real_incr);
}
+ /* We are sharing ->siglock with it_real_fn() */
+ if (hrtimer_try_to_cancel(timer) < 0) {
+ spin_unlock_irq(&tsk->sighand->siglock);
+ goto again;
+ }
tsk->signal->it_real_incr =
timeval_to_ktime(value->it_interval);
expires = timeval_to_ktime(value->it_value);
--
1.0.8
--
next prev parent reply other threads:[~2006-01-20 2:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-20 2:55 [PATCH 0/7] hrtimers updates Thomas Gleixner
2006-01-20 2:55 ` [PATCH 1/7] [hrtimers] Fixup itimer conversion Thomas Gleixner
2006-01-20 2:55 ` [PATCH 2/7] [hrtimers] Fix possible use of NULL pointer in posix-timers Thomas Gleixner
2006-01-20 2:55 ` Thomas Gleixner [this message]
2006-01-24 21:56 ` [PATCH 3/7] [hrtimers] Fix oldvalue return in setitimer Orion Poplawski
2006-01-25 6:56 ` Thomas Gleixner
2006-01-20 2:55 ` [PATCH 4/7] [hrtimers] Fix posix-timer requeue race Thomas Gleixner
2006-01-20 11:36 ` Roman Zippel
2006-01-20 2:55 ` [PATCH 5/7] [hrtimers] Cleanups and simplifications Thomas Gleixner
2006-01-20 2:55 ` [PATCH 6/7] [hrtimers] Add back lost credit lines Thomas Gleixner
2006-01-20 2:55 ` [PATCH 7/7] [hrtimers] Set correct initial expiry time for relative SIGEV_NONE timers Thomas Gleixner
2006-01-20 5:11 ` Andrew Morton
2006-01-20 9:49 ` Thomas Gleixner
2006-01-20 16:33 ` George Anzinger
2006-01-20 16:58 ` Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060120021342.498532000@tglx.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=akpm@osdl.org \
--cc=george@wildturkeyranch.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).