From patchwork Tue Jul 17 18:05:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10061 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4498623E2F for ; Tue, 17 Jul 2012 18:06:39 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id EBFC0A182AE for ; Tue, 17 Jul 2012 18:06:38 +0000 (UTC) Received: by ghbz12 with SMTP id z12so756676ghb.11 for ; Tue, 17 Jul 2012 11:06:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=Lb7fqHOcIrdNYeTUQjZ1KOZ8AGtb921PDhA8lvuWNkQ=; b=YbearAOlupzvQlYx71Qz7rLYrFDqFH3jXhJzPg5utCkga4dBvBzBWXaqUz9wTiexDe tXCU4JWPnHgCuEyZ6+OQJm0Bb8B46dmBzQsBSKrt3Nw64WahKWaZivSiBODV4j6zFGBp YPzWsu38TYvAfIofJJVNfs7E0kDBe7q9qBd51WTPWFhsXXVnSvQlKO3e1G6fkdTjGYHA I3D1lLi/UkEDb0fk7+1IgRWBmq0TzHpJBpCr8SbG5WMU4Wp86pB3GR3ydYYl+yJ4Rif9 ia53nnFj/nAWuqZZr9doiAZs5L2zkSCsxjGznINk0tLkK/wZQKwhjvAXndj+vgm0LPMl 7DEQ== Received: by 10.50.46.232 with SMTP id y8mr2180512igm.57.1342548397753; Tue, 17 Jul 2012 11:06:37 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.241.2 with SMTP id lc2csp22926ibb; Tue, 17 Jul 2012 11:06:36 -0700 (PDT) Received: by 10.60.13.228 with SMTP id k4mr4702992oec.28.1342548395833; Tue, 17 Jul 2012 11:06:35 -0700 (PDT) Received: from e32.co.us.ibm.com (e32.co.us.ibm.com. [32.97.110.150]) by mx.google.com with ESMTPS id im8si19079121obb.64.2012.07.17.11.06.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 11:06:35 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.150 as permitted sender) client-ip=32.97.110.150; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.150 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 12:06:35 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 12:06:32 -0600 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 37D10C40010 for ; Tue, 17 Jul 2012 18:06:29 +0000 (WET) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6HI6FH3041170 for ; Tue, 17 Jul 2012 12:06:21 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6HI6ABx019591 for ; Tue, 17 Jul 2012 12:06:10 -0600 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6HI60xl018372; Tue, 17 Jul 2012 12:06:07 -0600 From: John Stultz To: stable@vger.kernel.org Cc: Thomas Gleixner , John Stultz , Prarit Bhargava , Linux Kernel Subject: [PATCH 07/11] 2.6.35.x: timekeeping: Maintain ktime_t based offsets for hrtimers Date: Tue, 17 Jul 2012 14:05:38 -0400 Message-Id: <1342548342-19683-8-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342548342-19683-1-git-send-email-johnstul@us.ibm.com> References: <1342548342-19683-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071718-2356-0000-0000-0000006EFBF8 X-Gm-Message-State: ALoCoQnl4UQTU1tlV0FKHoVwAs2KejrdGT5yjo/PAQidYlubfgak/Wymv0/tm5yanFZOCcamUg5y From: Thomas Gleixner This is a backport of 5b9fe759a678e05be4937ddf03d50e950207c1c0 We need to update the hrtimer clock offsets from the hrtimer interrupt context. To avoid conversions from timespec to ktime_t maintain a ktime_t based representation of those offsets in the timekeeper. This puts the conversion overhead into the code which updates the underlying offsets and provides fast accessible values in the hrtimer interrupt. Signed-off-by: Thomas Gleixner Signed-off-by: John Stultz Reviewed-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Prarit Bhargava Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1341960205-56738-4-git-send-email-johnstul@us.ibm.com Signed-off-by: Thomas Gleixner Cc: Prarit Bhargava Cc: Thomas Gleixner Cc: Linux Kernel Signed-off-by: John Stultz --- kernel/time/timekeeping.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index eaf1e09..1f8140e 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -161,18 +161,34 @@ struct timespec xtime __attribute__ ((aligned (16))); struct timespec wall_to_monotonic __attribute__ ((aligned (16))); static struct timespec total_sleep_time; +/* Offset clock monotonic -> clock realtime */ +static ktime_t offs_real; + +/* Offset clock monotonic -> clock boottime */ +static ktime_t offs_boot; + /* * The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */ struct timespec raw_time; /* must hold write on xtime_lock */ +static void update_rt_offset(void) +{ + struct timespec tmp, *wtm = &wall_to_monotonic; + + set_normalized_timespec(&tmp, -wtm->tv_sec, -wtm->tv_nsec); + offs_real = timespec_to_ktime(tmp); +} + +/* must hold write on xtime_lock */ static void timekeeping_update(bool clearntp) { if (clearntp) { timekeeper.ntp_error = 0; ntp_clear(); } + update_rt_offset(); update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult); } @@ -556,6 +572,7 @@ void __init timekeeping_init(void) } set_normalized_timespec(&wall_to_monotonic, -boot.tv_sec, -boot.tv_nsec); + update_rt_offset(); total_sleep_time.tv_sec = 0; total_sleep_time.tv_nsec = 0; write_sequnlock_irqrestore(&xtime_lock, flags); @@ -564,6 +581,12 @@ void __init timekeeping_init(void) /* time in seconds when suspend began */ static struct timespec timekeeping_suspend_time; +static void update_sleep_time(struct timespec t) +{ + total_sleep_time = t; + offs_boot = timespec_to_ktime(t); +} + /** * timekeeping_resume - Resumes the generic timekeeping subsystem. * @dev: unused @@ -587,7 +610,7 @@ static int timekeeping_resume(struct sys_device *dev) ts = timespec_sub(ts, timekeeping_suspend_time); xtime = timespec_add_safe(xtime, ts); wall_to_monotonic = timespec_sub(wall_to_monotonic, ts); - total_sleep_time = timespec_add_safe(total_sleep_time, ts); + update_sleep_time(timespec_add_safe(total_sleep_time, ts)); } /* re-base the last cycle value */ timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock);