diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-01-25 11:08:40 +0100 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-11 11:07:35 -0500 |
| commit | 6db5f9f9c342bc990ee9556236e13577c106b211 (patch) | |
| tree | c7630752734d3dd536a4f0b1c088bf78ace1b4e2 /fs | |
| parent | 56490d984c211d339696a92d9a32ae164d93a9c4 (diff) | |
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); } /* |