From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751652AbcAQKnr (ORCPT ); Sun, 17 Jan 2016 05:43:47 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35636 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897AbcAQKnn (ORCPT ); Sun, 17 Jan 2016 05:43:43 -0500 Date: Sun, 17 Jan 2016 02:43:04 -0800 From: tip-bot for Thomas Gleixner Message-ID: 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 Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, john.stultz@linaro.org, hpa@zytor.com, deller@gmx.de, mingo@kernel.org In-Reply-To: <20160114164159.354500742@linutronix.de> References: <20160114164159.354500742@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper Git-Commit-ID: b62526ed11a1fe3861ab98d40b7fdab8981d788a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b62526ed11a1fe3861ab98d40b7fdab8981d788a Gitweb: http://git.kernel.org/tip/b62526ed11a1fe3861ab98d40b7fdab8981d788a Author: Thomas Gleixner AuthorDate: Thu, 14 Jan 2016 16:54:46 +0000 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: John Stultz 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 --- 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; }