diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-01-25 11:08:40 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-06-06 21:27:18 -0400 |
| commit | 599532238d11d63aaa6b74b548b1cd59f4a9bf0a (patch) | |
| tree | c5b5b0800536d1f420c0c55442a6ff4cc2976650 /fs | |
| parent | b25c834c79050637bde964bf42c10f9ec4e24cd4 (diff) | |
| download | linux-rt-599532238d11d63aaa6b74b548b1cd59f4a9bf0a.tar.gz | |
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>
Cc: stable-rt@vger.kernel.org
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/timerfd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c index dffeb3795af1..57f0e4e86f0a 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -313,7 +313,7 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, if (hrtimer_try_to_cancel(&ctx->tmr) >= 0) break; spin_unlock_irq(&ctx->wqh.lock); - cpu_relax(); + hrtimer_wait_for_timer(&ctx->tmr); } /* |