2011-06-13 17:15:51

by Max Asbock

Subject: [PATCH] timerfd: fix wakeup of processes when timer is cancelled on clock change

I have sent this before, perhaps it got lost in the noise.

Currently processes waiting on cancelable timerfd timers are
not woken up when the timers are canceled.
When the system time is set the clock_was_set() function calls
timerfd_clock_was_set() to cancel and wake up processes waiting on
potential cancelable timerfd timers. However the wake up currently has
no effect because in the case of timerfd_read it is dependent on
ctx->ticks not being 0. timerfd_poll also requires ctx->ticks being non
zero. As a consequence processes waiting on cancelable timers only get
woken up when the timers expire. This patch fixes this by incrementing
ctx->ticks before calling wake_up.

Signed-off-by: Max Asbock <[email protected]>
---

--- linux-3.0-rc1/fs/timerfd.c
+++ linux-3.0-rc1.timerfd/fs/timerfd.c
@@ -61,7 +61,9 @@ static enum hrtimer_restart timerfd_tmrp

/*
* Called when the clock was set to cancel the timers in the cancel
- * list.
+ * list. This will wake up processes waiting on these timers. The
+ * wake-up requires ctx->ticks to be non zero, therefore we increment
+ * it before calling wake_up_locked().
*/
void timerfd_clock_was_set(void)
{
@@ -76,6 +78,7 @@ void timerfd_clock_was_set(void)
spin_lock_irqsave(&ctx->wqh.lock, flags);
if (ctx->moffs.tv64 != moffs.tv64) {
ctx->moffs.tv64 = KTIME_MAX;
+ ctx->ticks++;
wake_up_locked(&ctx->wqh);
}
spin_unlock_irqrestore(&ctx->wqh.lock, flags);


--
Max

2011-06-14 09:49:27

by Max Asbock

Subject: [tip:timers/urgent] timerfd: Fix wakeup of processes when timer is cancelled on clock change

Commit-ID: 1123d93963cbd2546449d4d9f0c568e323cb0ac6
Gitweb: http://git.kernel.org/tip/1123d93963cbd2546449d4d9f0c568e323cb0ac6
Author: Max Asbock <[email protected]>
AuthorDate: Mon, 13 Jun 2011 10:18:32 -0700
Committer: Thomas Gleixner <[email protected]>
CommitDate: Tue, 14 Jun 2011 11:46:14 +0200

timerfd: Fix wakeup of processes when timer is cancelled on clock change

Currently processes waiting with poll on cancelable timerfd timers are
not woken up when the timers are canceled. When the system time is set
the clock_was_set() function calls timerfd_clock_was_set() to cancel
and wake up processes waiting on potential cancelable timerfd
timers. However the wake up currently has no effect because in the
case of timerfd_read it is dependent on ctx->ticks not being
0. timerfd_poll also requires ctx->ticks being non zero. As a
consequence processes waiting on cancelable timers only get woken up
when the timers expire. This patch fixes this by incrementing
ctx->ticks before calling wake_up.

Signed-off-by: Max Asbock <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: johnstul <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
fs/timerfd.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fs/timerfd.c b/fs/timerfd.c
index f67acbd..dffeb37 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -61,7 +61,9 @@ static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr)

/*
* Called when the clock was set to cancel the timers in the cancel
- * list.
+ * list. This will wake up processes waiting on these timers. The
+ * wake-up requires ctx->ticks to be non zero, therefore we increment
+ * it before calling wake_up_locked().
*/
void timerfd_clock_was_set(void)
{
@@ -76,6 +78,7 @@ void timerfd_clock_was_set(void)
spin_lock_irqsave(&ctx->wqh.lock, flags);
if (ctx->moffs.tv64 != moffs.tv64) {
ctx->moffs.tv64 = KTIME_MAX;
+ ctx->ticks++;
wake_up_locked(&ctx->wqh);
}
spin_unlock_irqrestore(&ctx->wqh.lock, flags);