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: deller@gmx.de, peterz@infradead.org,
	linux-kernel@vger.kernel.org, john.stultz@linaro.org,
	mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com
Subject: [tip:timers/urgent] posix-timers: Handle relative timers with CONFIG_TIME_LOW_RES proper
Date: Sun, 17 Jan 2016 02:43:26 -0800	[thread overview]
Message-ID: <tip-572c39172684c3711e4a03c9a7380067e2b0661c@git.kernel.org> (raw)
In-Reply-To: <20160114164159.450510905@linutronix.de>

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

posix-timers: Handle relative timers with CONFIG_TIME_LOW_RES proper

As Helge reported for timerfd we have the same issue in posix timers. We
return remaining time larger than the programmed relative time to user space
in case of CONFIG_TIME_LOW_RES=y. Use the proper function to adjust the extra
time added in hrtimer_start_range_ns().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Helge Deller <deller@gmx.de>
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.450510905@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/time/posix-timers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 31d11ac..f2826c3 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -760,7 +760,7 @@ common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting)
 	    (timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE))
 		timr->it_overrun += (unsigned int) hrtimer_forward(timer, now, iv);
 
-	remaining = ktime_sub(hrtimer_get_expires(timer), now);
+	remaining = __hrtimer_expires_remaining_adjusted(timer, now);
 	/* Return 0 only, when the timer is expired and not pending */
 	if (remaining.tv64 <= 0) {
 		/*

  reply	other threads:[~2016-01-17 10:44 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:timers/urgent] " tip-bot for Thomas Gleixner
2016-01-14 16:54 ` [patch 2/4] " 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-bot for Thomas Gleixner [this message]
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-572c39172684c3711e4a03c9a7380067e2b0661c@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] posix-timers: 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.