36 lines
1016 B
Diff
36 lines
1016 B
Diff
|
From 4490965316764b4c9d5e50df99833072a6414ae1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Date: Wed, 25 Jan 2012 11:08:40 +0100
|
||
|
|
Subject: [PATCH 124/365] timer-fd: Prevent live lock
|
||
|
|
|
||
|
|
If hrtimer_try_to_cancel() requires a retry, then depending on the
|
||
|
|
priority setting te retry loop might prevent timer callback completion
|
||
|
|
on RT. Prevent that by waiting for completion on RT, no change for a
|
||
|
|
non RT kernel.
|
||
|
|
|
||
|
|
Reported-by: Sankara Muthukrishnan <sankara.m@gmail.com>
|
||
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
---
|
||
|
|
fs/timerfd.c | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/fs/timerfd.c b/fs/timerfd.c
|
||
|
|
index ab8dd1538381..5580853f57dd 100644
|
||
|
|
--- a/fs/timerfd.c
|
||
|
|
+++ b/fs/timerfd.c
|
||
|
|
@@ -471,7 +471,10 @@ static int do_timerfd_settime(int ufd, int flags,
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
spin_unlock_irq(&ctx->wqh.lock);
|
||
|
|
- cpu_relax();
|
||
|
|
+ if (isalarm(ctx))
|
||
|
|
+ hrtimer_wait_for_timer(&ctx->t.alarm.timer);
|
||
|
|
+ else
|
||
|
|
+ hrtimer_wait_for_timer(&ctx->t.tmr);
|
||
|
|
}
|
||
|
|
|
||
|
|
/*
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|