All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: john.stultz@linaro.org, peterz@infradead.org, tglx@linutronix.de,
	linux-kernel@vger.kernel.org, mingo@kernel.org, deller@gmx.de,
	hpa@zytor.com
Subject: [tip:timers/urgent] timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper
Date: Sun, 17 Jan 2016 02:43:04 -0800	[thread overview]
Message-ID: <tip-b62526ed11a1fe3861ab98d40b7fdab8981d788a@git.kernel.org> (raw)
In-Reply-To: <20160114164159.354500742@linutronix.de>

Commit-ID:  b62526ed11a1fe3861ab98d40b7fdab8981d788a
Gitweb:     http://git.kernel.org/tip/b62526ed11a1fe3861ab98d40b7fdab8981d788a
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Thu, 14 Jan 2016 16:54:46 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sun, 17 Jan 2016 11:13:55 +0100

timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper

Helge reported that a relative timer can return a remaining time larger than
the programmed relative time on parisc and other architectures which have
CONFIG_TIME_LOW_RES set. This happens because we add a jiffie to the resulting
expiry time to prevent short timeouts.

Use the new function hrtimer_expires_remaining_adjusted() to calculate the
remaining time. It takes that extra added time into account for relative
timers.

Reported-and-tested-by: Helge Deller <deller@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: dhowells@redhat.com
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/20160114164159.354500742@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 fs/timerfd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/timerfd.c b/fs/timerfd.c
index b94fa6c..053818d 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -153,7 +153,7 @@ static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx)
 	if (isalarm(ctx))
 		remaining = alarm_expires_remaining(&ctx->t.alarm);
 	else
-		remaining = hrtimer_expires_remaining(&ctx->t.tmr);
+		remaining = hrtimer_expires_remaining_adjusted(&ctx->t.tmr);
 
 	return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
 }

  reply	other threads:[~2016-01-17 10:43 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-14 16:54 [patch 0/4] hrtimers: Handle remaining time correctly for CONFIG_TIME_LOW_RES=y Thomas Gleixner
2016-01-14 16:54 ` Thomas Gleixner
2016-01-14 16:54 ` [patch 1/4] hrtimer: Handle remaining time proper for TIME_LOW_RES Thomas Gleixner
2016-01-14 16:54   ` Thomas Gleixner
2016-01-16 18:36   ` Helge Deller
2016-01-16 18:36     ` Helge Deller
2016-01-16 18:36   ` Helge Deller
2016-01-17 10:42   ` [tip:timers/urgent] " tip-bot for Thomas Gleixner
2016-01-14 16:54 ` [patch 2/4] timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper Thomas Gleixner
2016-01-17 10:43   ` tip-bot for Thomas Gleixner [this message]
2016-01-14 16:54 ` Thomas Gleixner
2016-01-14 16:54 ` [patch 3/4] posix-timers: " Thomas Gleixner
2016-01-14 16:54   ` Thomas Gleixner
2016-01-17 10:43   ` [tip:timers/urgent] " tip-bot for Thomas Gleixner
2016-01-14 16:54 ` [patch 4/4] itimers: " Thomas Gleixner
2016-01-14 16:54 ` Thomas Gleixner
2016-01-17 10:43   ` [tip:timers/urgent] " tip-bot for 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=tip-b62526ed11a1fe3861ab98d40b7fdab8981d788a@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=deller@gmx.de \
    --cc=hpa@zytor.com \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --subject='Re: [tip:timers/urgent] timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.