2007-05-08 15:27:59 +08:00
|
|
|
/*
|
|
|
|
* linux/kernel/time/timekeeping.c
|
|
|
|
*
|
|
|
|
* Kernel timekeeping code and accessor functions
|
|
|
|
*
|
|
|
|
* This code was moved from linux/kernel/timer.c.
|
|
|
|
* Please see that file for copyright and history logs.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2012-09-05 03:12:07 +08:00
|
|
|
#include <linux/timekeeper_internal.h>
|
2007-05-08 15:27:59 +08:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/percpu.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/mm.h>
|
2009-10-07 21:09:06 +08:00
|
|
|
#include <linux/sched.h>
|
2011-03-24 05:16:04 +08:00
|
|
|
#include <linux/syscore_ops.h>
|
2007-05-08 15:27:59 +08:00
|
|
|
#include <linux/clocksource.h>
|
|
|
|
#include <linux/jiffies.h>
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/tick.h>
|
2009-08-14 21:47:30 +08:00
|
|
|
#include <linux/stop_machine.h>
|
2012-11-28 09:28:59 +08:00
|
|
|
#include <linux/pvclock_gtod.h>
|
2014-04-08 06:39:20 +08:00
|
|
|
#include <linux/compiler.h>
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2013-02-22 06:51:36 +08:00
|
|
|
#include "tick-internal.h"
|
2013-03-23 02:31:29 +08:00
|
|
|
#include "ntp_internal.h"
|
2013-05-22 13:32:14 +08:00
|
|
|
#include "timekeeping_internal.h"
|
2009-08-14 21:47:26 +08:00
|
|
|
|
2013-06-27 18:35:45 +08:00
|
|
|
#define TK_CLEAR_NTP (1 << 0)
|
|
|
|
#define TK_MIRROR (1 << 1)
|
2013-06-27 18:35:46 +08:00
|
|
|
#define TK_CLOCK_WAS_SET (1 << 2)
|
2013-06-27 18:35:45 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
/*
|
|
|
|
* The most important data for readout fits into a single 64 byte
|
|
|
|
* cache line.
|
|
|
|
*/
|
|
|
|
static struct {
|
|
|
|
seqcount_t seq;
|
|
|
|
struct timekeeper timekeeper;
|
|
|
|
} tk_core ____cacheline_aligned;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
static DEFINE_RAW_SPINLOCK(timekeeper_lock);
|
2013-02-22 06:51:40 +08:00
|
|
|
static struct timekeeper shadow_timekeeper;
|
2009-08-14 21:47:26 +08:00
|
|
|
|
2014-07-17 05:05:23 +08:00
|
|
|
/**
|
|
|
|
* struct tk_fast - NMI safe timekeeper
|
|
|
|
* @seq: Sequence counter for protecting updates. The lowest bit
|
|
|
|
* is the index for the tk_read_base array
|
|
|
|
* @base: tk_read_base array. Access is indexed by the lowest bit of
|
|
|
|
* @seq.
|
|
|
|
*
|
|
|
|
* See @update_fast_timekeeper() below.
|
|
|
|
*/
|
|
|
|
struct tk_fast {
|
|
|
|
seqcount_t seq;
|
|
|
|
struct tk_read_base base[2];
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct tk_fast tk_fast_mono ____cacheline_aligned;
|
|
|
|
|
2011-11-15 03:46:39 +08:00
|
|
|
/* flag for if timekeeping is suspended */
|
|
|
|
int __read_mostly timekeeping_suspended;
|
|
|
|
|
2013-01-16 00:09:47 +08:00
|
|
|
/* Flag for if there is a persistent clock on this platform */
|
|
|
|
bool __read_mostly persistent_clock_exist = false;
|
|
|
|
|
2012-07-13 13:21:53 +08:00
|
|
|
static inline void tk_normalize_xtime(struct timekeeper *tk)
|
|
|
|
{
|
2014-07-17 05:05:16 +08:00
|
|
|
while (tk->tkr.xtime_nsec >= ((u64)NSEC_PER_SEC << tk->tkr.shift)) {
|
|
|
|
tk->tkr.xtime_nsec -= (u64)NSEC_PER_SEC << tk->tkr.shift;
|
2012-07-13 13:21:53 +08:00
|
|
|
tk->xtime_sec++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-17 05:04:05 +08:00
|
|
|
static inline struct timespec64 tk_xtime(struct timekeeper *tk)
|
|
|
|
{
|
|
|
|
struct timespec64 ts;
|
|
|
|
|
|
|
|
ts.tv_sec = tk->xtime_sec;
|
2014-07-17 05:05:16 +08:00
|
|
|
ts.tv_nsec = (long)(tk->tkr.xtime_nsec >> tk->tkr.shift);
|
2014-07-17 05:04:05 +08:00
|
|
|
return ts;
|
|
|
|
}
|
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
static void tk_set_xtime(struct timekeeper *tk, const struct timespec64 *ts)
|
2012-07-13 13:21:53 +08:00
|
|
|
{
|
|
|
|
tk->xtime_sec = ts->tv_sec;
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec = (u64)ts->tv_nsec << tk->tkr.shift;
|
2012-07-13 13:21:53 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
static void tk_xtime_add(struct timekeeper *tk, const struct timespec64 *ts)
|
2012-07-13 13:21:53 +08:00
|
|
|
{
|
|
|
|
tk->xtime_sec += ts->tv_sec;
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec += (u64)ts->tv_nsec << tk->tkr.shift;
|
2012-08-22 08:30:46 +08:00
|
|
|
tk_normalize_xtime(tk);
|
2012-07-13 13:21:53 +08:00
|
|
|
}
|
2011-11-15 03:46:39 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
static void tk_set_wall_to_mono(struct timekeeper *tk, struct timespec64 wtm)
|
2012-07-28 02:48:12 +08:00
|
|
|
{
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 tmp;
|
2012-07-28 02:48:12 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify consistency of: offset_real = -wall_to_monotonic
|
|
|
|
* before modifying anything
|
|
|
|
*/
|
2014-07-17 05:04:01 +08:00
|
|
|
set_normalized_timespec64(&tmp, -tk->wall_to_monotonic.tv_sec,
|
2012-07-28 02:48:12 +08:00
|
|
|
-tk->wall_to_monotonic.tv_nsec);
|
2014-07-17 05:04:01 +08:00
|
|
|
WARN_ON_ONCE(tk->offs_real.tv64 != timespec64_to_ktime(tmp).tv64);
|
2012-07-28 02:48:12 +08:00
|
|
|
tk->wall_to_monotonic = wtm;
|
2014-07-17 05:04:01 +08:00
|
|
|
set_normalized_timespec64(&tmp, -wtm.tv_sec, -wtm.tv_nsec);
|
|
|
|
tk->offs_real = timespec64_to_ktime(tmp);
|
2013-12-11 09:13:35 +08:00
|
|
|
tk->offs_tai = ktime_add(tk->offs_real, ktime_set(tk->tai_offset, 0));
|
2012-07-28 02:48:12 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 05:05:00 +08:00
|
|
|
static inline void tk_update_sleep_time(struct timekeeper *tk, ktime_t delta)
|
2012-07-28 02:48:12 +08:00
|
|
|
{
|
2014-07-17 05:05:00 +08:00
|
|
|
tk->offs_boot = ktime_add(tk->offs_boot, delta);
|
2012-07-28 02:48:12 +08:00
|
|
|
}
|
|
|
|
|
2009-08-14 21:47:26 +08:00
|
|
|
/**
|
2013-11-28 16:28:55 +08:00
|
|
|
* tk_setup_internals - Set up internals to use clocksource clock.
|
2009-08-14 21:47:26 +08:00
|
|
|
*
|
2013-11-28 16:28:55 +08:00
|
|
|
* @tk: The target timekeeper to setup.
|
2009-08-14 21:47:26 +08:00
|
|
|
* @clock: Pointer to clocksource.
|
|
|
|
*
|
|
|
|
* Calculates a fixed cycle/nsec interval for a given clocksource/adjustment
|
|
|
|
* pair and interval request.
|
|
|
|
*
|
|
|
|
* Unless you're the timekeeping code, you should not be using this!
|
|
|
|
*/
|
2012-07-13 13:21:57 +08:00
|
|
|
static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock)
|
2009-08-14 21:47:26 +08:00
|
|
|
{
|
|
|
|
cycle_t interval;
|
2010-10-21 06:55:15 +08:00
|
|
|
u64 tmp, ntpinterval;
|
2012-07-13 13:21:53 +08:00
|
|
|
struct clocksource *old_clock;
|
2009-08-14 21:47:26 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
old_clock = tk->tkr.clock;
|
|
|
|
tk->tkr.clock = clock;
|
|
|
|
tk->tkr.read = clock->read;
|
|
|
|
tk->tkr.mask = clock->mask;
|
|
|
|
tk->tkr.cycle_last = tk->tkr.read(clock);
|
2009-08-14 21:47:26 +08:00
|
|
|
|
|
|
|
/* Do the ns -> cycle conversion first, using original mult */
|
|
|
|
tmp = NTP_INTERVAL_LENGTH;
|
|
|
|
tmp <<= clock->shift;
|
2010-10-21 06:55:15 +08:00
|
|
|
ntpinterval = tmp;
|
2009-08-14 21:47:28 +08:00
|
|
|
tmp += clock->mult/2;
|
|
|
|
do_div(tmp, clock->mult);
|
2009-08-14 21:47:26 +08:00
|
|
|
if (tmp == 0)
|
|
|
|
tmp = 1;
|
|
|
|
|
|
|
|
interval = (cycle_t) tmp;
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->cycle_interval = interval;
|
2009-08-14 21:47:26 +08:00
|
|
|
|
|
|
|
/* Go back from cycles -> shifted ns */
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->xtime_interval = (u64) interval * clock->mult;
|
|
|
|
tk->xtime_remainder = ntpinterval - tk->xtime_interval;
|
|
|
|
tk->raw_interval =
|
2009-08-14 21:47:28 +08:00
|
|
|
((u64) interval * clock->mult) >> clock->shift;
|
2009-08-14 21:47:26 +08:00
|
|
|
|
2012-07-13 13:21:53 +08:00
|
|
|
/* if changing clocks, convert xtime_nsec shift units */
|
|
|
|
if (old_clock) {
|
|
|
|
int shift_change = clock->shift - old_clock->shift;
|
|
|
|
if (shift_change < 0)
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec >>= -shift_change;
|
2012-07-13 13:21:53 +08:00
|
|
|
else
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec <<= shift_change;
|
2012-07-13 13:21:53 +08:00
|
|
|
}
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.shift = clock->shift;
|
2009-08-14 21:47:26 +08:00
|
|
|
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->ntp_error = 0;
|
|
|
|
tk->ntp_error_shift = NTP_SCALE_SHIFT - clock->shift;
|
2014-04-24 11:53:29 +08:00
|
|
|
tk->ntp_tick = ntpinterval << tk->ntp_error_shift;
|
2009-08-14 21:47:28 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The timekeeper keeps its own mult values for the currently
|
|
|
|
* active clocksource. These value will be adjusted via NTP
|
|
|
|
* to counteract clock drifting.
|
|
|
|
*/
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.mult = clock->mult;
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
tk->ntp_err_mult = 0;
|
2009-08-14 21:47:26 +08:00
|
|
|
}
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2009-08-14 21:47:29 +08:00
|
|
|
/* Timekeeper helper functions. */
|
time: convert arch_gettimeoffset to a pointer
Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
arch core provides a single implementation of arch_gettimeoffset(). In
many cases, different sub-architectures, different machines, or
different timer providers exist, and so the arch ends up implementing
arch_gettimeoffset() as a call-through-pointer anyway. Examples are
ARM, Cris, M68K, and it's arguable that the remaining architectures,
M32R and Blackfin, should be doing this anyway.
Modify arch_gettimeoffset so that it itself is a function pointer, which
the arch initializes. This will allow later changes to move the
initialization of this function into individual machine support or timer
drivers. This is particularly useful for code in drivers/clocksource
which should rely on an arch-independant mechanism to register their
implementation of arch_gettimeoffset().
This patch also converts the Cris architecture to set arch_gettimeoffset
directly to the final implementation in time_init(), because Cris already
had separate time_init() functions per sub-architecture. M68K and ARM
are converted to set arch_gettimeoffset to the final implementation in
later patches, because they already have function pointers in place for
this purpose.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-11-08 08:58:54 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
2014-07-17 05:03:50 +08:00
|
|
|
static u32 default_arch_gettimeoffset(void) { return 0; }
|
|
|
|
u32 (*arch_gettimeoffset)(void) = default_arch_gettimeoffset;
|
time: convert arch_gettimeoffset to a pointer
Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
arch core provides a single implementation of arch_gettimeoffset(). In
many cases, different sub-architectures, different machines, or
different timer providers exist, and so the arch ends up implementing
arch_gettimeoffset() as a call-through-pointer anyway. Examples are
ARM, Cris, M68K, and it's arguable that the remaining architectures,
M32R and Blackfin, should be doing this anyway.
Modify arch_gettimeoffset so that it itself is a function pointer, which
the arch initializes. This will allow later changes to move the
initialization of this function into individual machine support or timer
drivers. This is particularly useful for code in drivers/clocksource
which should rely on an arch-independant mechanism to register their
implementation of arch_gettimeoffset().
This patch also converts the Cris architecture to set arch_gettimeoffset
directly to the final implementation in time_init(), because Cris already
had separate time_init() functions per sub-architecture. M68K and ARM
are converted to set arch_gettimeoffset to the final implementation in
later patches, because they already have function pointers in place for
this purpose.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-11-08 08:58:54 +08:00
|
|
|
#else
|
2014-07-17 05:03:50 +08:00
|
|
|
static inline u32 arch_gettimeoffset(void) { return 0; }
|
time: convert arch_gettimeoffset to a pointer
Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
arch core provides a single implementation of arch_gettimeoffset(). In
many cases, different sub-architectures, different machines, or
different timer providers exist, and so the arch ends up implementing
arch_gettimeoffset() as a call-through-pointer anyway. Examples are
ARM, Cris, M68K, and it's arguable that the remaining architectures,
M32R and Blackfin, should be doing this anyway.
Modify arch_gettimeoffset so that it itself is a function pointer, which
the arch initializes. This will allow later changes to move the
initialization of this function into individual machine support or timer
drivers. This is particularly useful for code in drivers/clocksource
which should rely on an arch-independant mechanism to register their
implementation of arch_gettimeoffset().
This patch also converts the Cris architecture to set arch_gettimeoffset
directly to the final implementation in time_init(), because Cris already
had separate time_init() functions per sub-architecture. M68K and ARM
are converted to set arch_gettimeoffset to the final implementation in
later patches, because they already have function pointers in place for
this purpose.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-11-08 08:58:54 +08:00
|
|
|
#endif
|
|
|
|
|
2014-07-17 05:05:18 +08:00
|
|
|
static inline s64 timekeeping_get_ns(struct tk_read_base *tkr)
|
2009-08-14 21:47:29 +08:00
|
|
|
{
|
2014-07-17 05:05:10 +08:00
|
|
|
cycle_t cycle_now, delta;
|
2012-07-13 13:21:53 +08:00
|
|
|
s64 nsec;
|
2009-08-14 21:47:29 +08:00
|
|
|
|
|
|
|
/* read clocksource: */
|
2014-07-17 05:05:18 +08:00
|
|
|
cycle_now = tkr->read(tkr->clock);
|
2009-08-14 21:47:29 +08:00
|
|
|
|
|
|
|
/* calculate the delta since the last update_wall_time: */
|
2014-07-17 05:05:18 +08:00
|
|
|
delta = clocksource_delta(cycle_now, tkr->cycle_last, tkr->mask);
|
2009-08-14 21:47:29 +08:00
|
|
|
|
2014-07-17 05:05:18 +08:00
|
|
|
nsec = delta * tkr->mult + tkr->xtime_nsec;
|
|
|
|
nsec >>= tkr->shift;
|
2012-07-13 13:21:55 +08:00
|
|
|
|
time: convert arch_gettimeoffset to a pointer
Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
arch core provides a single implementation of arch_gettimeoffset(). In
many cases, different sub-architectures, different machines, or
different timer providers exist, and so the arch ends up implementing
arch_gettimeoffset() as a call-through-pointer anyway. Examples are
ARM, Cris, M68K, and it's arguable that the remaining architectures,
M32R and Blackfin, should be doing this anyway.
Modify arch_gettimeoffset so that it itself is a function pointer, which
the arch initializes. This will allow later changes to move the
initialization of this function into individual machine support or timer
drivers. This is particularly useful for code in drivers/clocksource
which should rely on an arch-independant mechanism to register their
implementation of arch_gettimeoffset().
This patch also converts the Cris architecture to set arch_gettimeoffset
directly to the final implementation in time_init(), because Cris already
had separate time_init() functions per sub-architecture. M68K and ARM
are converted to set arch_gettimeoffset to the final implementation in
later patches, because they already have function pointers in place for
this purpose.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-11-08 08:58:54 +08:00
|
|
|
/* If arch requires, add in get_arch_timeoffset() */
|
2014-07-17 05:03:50 +08:00
|
|
|
return nsec + arch_gettimeoffset();
|
2009-08-14 21:47:29 +08:00
|
|
|
}
|
|
|
|
|
2012-07-13 13:21:57 +08:00
|
|
|
static inline s64 timekeeping_get_ns_raw(struct timekeeper *tk)
|
2009-08-14 21:47:29 +08:00
|
|
|
{
|
2014-07-17 05:05:16 +08:00
|
|
|
struct clocksource *clock = tk->tkr.clock;
|
2014-07-17 05:05:10 +08:00
|
|
|
cycle_t cycle_now, delta;
|
2012-07-13 13:21:55 +08:00
|
|
|
s64 nsec;
|
2009-08-14 21:47:29 +08:00
|
|
|
|
|
|
|
/* read clocksource: */
|
2014-07-17 05:05:16 +08:00
|
|
|
cycle_now = tk->tkr.read(clock);
|
2009-08-14 21:47:29 +08:00
|
|
|
|
|
|
|
/* calculate the delta since the last update_wall_time: */
|
2014-07-17 05:05:16 +08:00
|
|
|
delta = clocksource_delta(cycle_now, tk->tkr.cycle_last, tk->tkr.mask);
|
2009-08-14 21:47:29 +08:00
|
|
|
|
2012-07-13 13:21:55 +08:00
|
|
|
/* convert delta to nanoseconds. */
|
2014-07-17 05:05:10 +08:00
|
|
|
nsec = clocksource_cyc2ns(delta, clock->mult, clock->shift);
|
2012-07-13 13:21:55 +08:00
|
|
|
|
time: convert arch_gettimeoffset to a pointer
Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
arch core provides a single implementation of arch_gettimeoffset(). In
many cases, different sub-architectures, different machines, or
different timer providers exist, and so the arch ends up implementing
arch_gettimeoffset() as a call-through-pointer anyway. Examples are
ARM, Cris, M68K, and it's arguable that the remaining architectures,
M32R and Blackfin, should be doing this anyway.
Modify arch_gettimeoffset so that it itself is a function pointer, which
the arch initializes. This will allow later changes to move the
initialization of this function into individual machine support or timer
drivers. This is particularly useful for code in drivers/clocksource
which should rely on an arch-independant mechanism to register their
implementation of arch_gettimeoffset().
This patch also converts the Cris architecture to set arch_gettimeoffset
directly to the final implementation in time_init(), because Cris already
had separate time_init() functions per sub-architecture. M68K and ARM
are converted to set arch_gettimeoffset to the final implementation in
later patches, because they already have function pointers in place for
this purpose.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-11-08 08:58:54 +08:00
|
|
|
/* If arch requires, add in get_arch_timeoffset() */
|
2014-07-17 05:03:50 +08:00
|
|
|
return nsec + arch_gettimeoffset();
|
2009-08-14 21:47:29 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 05:05:23 +08:00
|
|
|
/**
|
|
|
|
* update_fast_timekeeper - Update the fast and NMI safe monotonic timekeeper.
|
|
|
|
* @tk: The timekeeper from which we take the update
|
|
|
|
* @tkf: The fast timekeeper to update
|
|
|
|
* @tbase: The time base for the fast timekeeper (mono/raw)
|
|
|
|
*
|
|
|
|
* We want to use this from any context including NMI and tracing /
|
|
|
|
* instrumenting the timekeeping code itself.
|
|
|
|
*
|
|
|
|
* So we handle this differently than the other timekeeping accessor
|
|
|
|
* functions which retry when the sequence count has changed. The
|
|
|
|
* update side does:
|
|
|
|
*
|
|
|
|
* smp_wmb(); <- Ensure that the last base[1] update is visible
|
|
|
|
* tkf->seq++;
|
|
|
|
* smp_wmb(); <- Ensure that the seqcount update is visible
|
|
|
|
* update(tkf->base[0], tk);
|
|
|
|
* smp_wmb(); <- Ensure that the base[0] update is visible
|
|
|
|
* tkf->seq++;
|
|
|
|
* smp_wmb(); <- Ensure that the seqcount update is visible
|
|
|
|
* update(tkf->base[1], tk);
|
|
|
|
*
|
|
|
|
* The reader side does:
|
|
|
|
*
|
|
|
|
* do {
|
|
|
|
* seq = tkf->seq;
|
|
|
|
* smp_rmb();
|
|
|
|
* idx = seq & 0x01;
|
|
|
|
* now = now(tkf->base[idx]);
|
|
|
|
* smp_rmb();
|
|
|
|
* } while (seq != tkf->seq)
|
|
|
|
*
|
|
|
|
* As long as we update base[0] readers are forced off to
|
|
|
|
* base[1]. Once base[0] is updated readers are redirected to base[0]
|
|
|
|
* and the base[1] update takes place.
|
|
|
|
*
|
|
|
|
* So if a NMI hits the update of base[0] then it will use base[1]
|
|
|
|
* which is still consistent. In the worst case this can result is a
|
|
|
|
* slightly wrong timestamp (a few nanoseconds). See
|
|
|
|
* @ktime_get_mono_fast_ns.
|
|
|
|
*/
|
|
|
|
static void update_fast_timekeeper(struct timekeeper *tk)
|
|
|
|
{
|
|
|
|
struct tk_read_base *base = tk_fast_mono.base;
|
|
|
|
|
|
|
|
/* Force readers off to base[1] */
|
|
|
|
raw_write_seqcount_latch(&tk_fast_mono.seq);
|
|
|
|
|
|
|
|
/* Update base[0] */
|
|
|
|
memcpy(base, &tk->tkr, sizeof(*base));
|
|
|
|
|
|
|
|
/* Force readers back to base[0] */
|
|
|
|
raw_write_seqcount_latch(&tk_fast_mono.seq);
|
|
|
|
|
|
|
|
/* Update base[1] */
|
|
|
|
memcpy(base + 1, base, sizeof(*base));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ktime_get_mono_fast_ns - Fast NMI safe access to clock monotonic
|
|
|
|
*
|
|
|
|
* This timestamp is not guaranteed to be monotonic across an update.
|
|
|
|
* The timestamp is calculated by:
|
|
|
|
*
|
|
|
|
* now = base_mono + clock_delta * slope
|
|
|
|
*
|
|
|
|
* So if the update lowers the slope, readers who are forced to the
|
|
|
|
* not yet updated second array are still using the old steeper slope.
|
|
|
|
*
|
|
|
|
* tmono
|
|
|
|
* ^
|
|
|
|
* | o n
|
|
|
|
* | o n
|
|
|
|
* | u
|
|
|
|
* | o
|
|
|
|
* |o
|
|
|
|
* |12345678---> reader order
|
|
|
|
*
|
|
|
|
* o = old slope
|
|
|
|
* u = update
|
|
|
|
* n = new slope
|
|
|
|
*
|
|
|
|
* So reader 6 will observe time going backwards versus reader 5.
|
|
|
|
*
|
|
|
|
* While other CPUs are likely to be able observe that, the only way
|
|
|
|
* for a CPU local observation is when an NMI hits in the middle of
|
|
|
|
* the update. Timestamps taken from that NMI context might be ahead
|
|
|
|
* of the following timestamps. Callers need to be aware of that and
|
|
|
|
* deal with it.
|
|
|
|
*/
|
|
|
|
u64 notrace ktime_get_mono_fast_ns(void)
|
|
|
|
{
|
|
|
|
struct tk_read_base *tkr;
|
|
|
|
unsigned int seq;
|
|
|
|
u64 now;
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = raw_read_seqcount(&tk_fast_mono.seq);
|
|
|
|
tkr = tk_fast_mono.base + (seq & 0x01);
|
|
|
|
now = ktime_to_ns(tkr->base_mono) + timekeeping_get_ns(tkr);
|
|
|
|
|
|
|
|
} while (read_seqcount_retry(&tk_fast_mono.seq, seq));
|
|
|
|
return now;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);
|
|
|
|
|
2014-07-17 05:04:05 +08:00
|
|
|
#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD
|
|
|
|
|
|
|
|
static inline void update_vsyscall(struct timekeeper *tk)
|
|
|
|
{
|
2014-08-14 03:47:14 +08:00
|
|
|
struct timespec xt, wm;
|
2014-07-17 05:04:05 +08:00
|
|
|
|
2014-07-24 05:35:39 +08:00
|
|
|
xt = timespec64_to_timespec(tk_xtime(tk));
|
2014-08-14 03:47:14 +08:00
|
|
|
wm = timespec64_to_timespec(tk->wall_to_monotonic);
|
|
|
|
update_vsyscall_old(&xt, &wm, tk->tkr.clock, tk->tkr.mult,
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.cycle_last);
|
2014-07-17 05:04:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void old_vsyscall_fixup(struct timekeeper *tk)
|
|
|
|
{
|
|
|
|
s64 remainder;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Store only full nanoseconds into xtime_nsec after rounding
|
|
|
|
* it up and add the remainder to the error difference.
|
|
|
|
* XXX - This is necessary to avoid small 1ns inconsistnecies caused
|
|
|
|
* by truncating the remainder in vsyscalls. However, it causes
|
|
|
|
* additional work to be done in timekeeping_adjust(). Once
|
|
|
|
* the vsyscall implementations are converted to use xtime_nsec
|
|
|
|
* (shifted nanoseconds), and CONFIG_GENERIC_TIME_VSYSCALL_OLD
|
|
|
|
* users are removed, this can be killed.
|
|
|
|
*/
|
2014-07-17 05:05:16 +08:00
|
|
|
remainder = tk->tkr.xtime_nsec & ((1ULL << tk->tkr.shift) - 1);
|
|
|
|
tk->tkr.xtime_nsec -= remainder;
|
|
|
|
tk->tkr.xtime_nsec += 1ULL << tk->tkr.shift;
|
2014-07-17 05:04:05 +08:00
|
|
|
tk->ntp_error += remainder << tk->ntp_error_shift;
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->ntp_error -= (1ULL << tk->tkr.shift) << tk->ntp_error_shift;
|
2014-07-17 05:04:05 +08:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define old_vsyscall_fixup(tk)
|
|
|
|
#endif
|
|
|
|
|
2012-11-28 09:28:59 +08:00
|
|
|
static RAW_NOTIFIER_HEAD(pvclock_gtod_chain);
|
|
|
|
|
2013-06-27 18:35:46 +08:00
|
|
|
static void update_pvclock_gtod(struct timekeeper *tk, bool was_set)
|
2012-11-28 09:28:59 +08:00
|
|
|
{
|
2013-06-27 18:35:46 +08:00
|
|
|
raw_notifier_call_chain(&pvclock_gtod_chain, was_set, tk);
|
2012-11-28 09:28:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pvclock_gtod_register_notifier - register a pvclock timedata update listener
|
|
|
|
*/
|
|
|
|
int pvclock_gtod_register_notifier(struct notifier_block *nb)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2012-11-28 09:28:59 +08:00
|
|
|
unsigned long flags;
|
|
|
|
int ret;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2012-11-28 09:28:59 +08:00
|
|
|
ret = raw_notifier_chain_register(&pvclock_gtod_chain, nb);
|
2013-06-27 18:35:46 +08:00
|
|
|
update_pvclock_gtod(tk, true);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2012-11-28 09:28:59 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(pvclock_gtod_register_notifier);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pvclock_gtod_unregister_notifier - unregister a pvclock
|
|
|
|
* timedata update listener
|
|
|
|
*/
|
|
|
|
int pvclock_gtod_unregister_notifier(struct notifier_block *nb)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
int ret;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2012-11-28 09:28:59 +08:00
|
|
|
ret = raw_notifier_chain_unregister(&pvclock_gtod_chain, nb);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2012-11-28 09:28:59 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(pvclock_gtod_unregister_notifier);
|
|
|
|
|
2014-07-17 05:04:10 +08:00
|
|
|
/*
|
|
|
|
* Update the ktime_t based scalar nsec members of the timekeeper
|
|
|
|
*/
|
|
|
|
static inline void tk_update_ktime_data(struct timekeeper *tk)
|
|
|
|
{
|
|
|
|
s64 nsec;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The xtime based monotonic readout is:
|
|
|
|
* nsec = (xtime_sec + wtm_sec) * 1e9 + wtm_nsec + now();
|
|
|
|
* The ktime based monotonic readout is:
|
|
|
|
* nsec = base_mono + now();
|
|
|
|
* ==> base_mono = (xtime_sec + wtm_sec) * 1e9 + wtm_nsec
|
|
|
|
*/
|
|
|
|
nsec = (s64)(tk->xtime_sec + tk->wall_to_monotonic.tv_sec);
|
|
|
|
nsec *= NSEC_PER_SEC;
|
|
|
|
nsec += tk->wall_to_monotonic.tv_nsec;
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.base_mono = ns_to_ktime(nsec);
|
2014-07-17 05:05:04 +08:00
|
|
|
|
|
|
|
/* Update the monotonic raw base */
|
|
|
|
tk->base_raw = timespec64_to_ktime(tk->raw_time);
|
2014-07-17 05:04:10 +08:00
|
|
|
}
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
/* must hold timekeeper_lock */
|
2013-06-27 18:35:45 +08:00
|
|
|
static void timekeeping_update(struct timekeeper *tk, unsigned int action)
|
2011-11-14 07:19:49 +08:00
|
|
|
{
|
2013-06-27 18:35:45 +08:00
|
|
|
if (action & TK_CLEAR_NTP) {
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->ntp_error = 0;
|
2011-11-14 07:19:49 +08:00
|
|
|
ntp_clear();
|
|
|
|
}
|
2013-02-22 06:51:40 +08:00
|
|
|
|
2014-07-17 05:04:10 +08:00
|
|
|
tk_update_ktime_data(tk);
|
|
|
|
|
2014-09-06 18:24:49 +08:00
|
|
|
update_vsyscall(tk);
|
|
|
|
update_pvclock_gtod(tk, action & TK_CLOCK_WAS_SET);
|
|
|
|
|
2013-06-27 18:35:45 +08:00
|
|
|
if (action & TK_MIRROR)
|
2014-07-17 05:04:07 +08:00
|
|
|
memcpy(&shadow_timekeeper, &tk_core.timekeeper,
|
|
|
|
sizeof(tk_core.timekeeper));
|
2014-07-17 05:05:23 +08:00
|
|
|
|
|
|
|
update_fast_timekeeper(tk);
|
2011-11-14 07:19:49 +08:00
|
|
|
}
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
2009-08-14 21:47:26 +08:00
|
|
|
* timekeeping_forward_now - update clock to the current time
|
2007-05-08 15:27:59 +08:00
|
|
|
*
|
2008-08-21 07:37:28 +08:00
|
|
|
* Forward the current clock to update its state since the last call to
|
|
|
|
* update_wall_time(). This is useful before significant clock changes,
|
|
|
|
* as it avoids having to deal with this time offset explicitly.
|
2007-05-08 15:27:59 +08:00
|
|
|
*/
|
2012-07-13 13:21:57 +08:00
|
|
|
static void timekeeping_forward_now(struct timekeeper *tk)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:05:16 +08:00
|
|
|
struct clocksource *clock = tk->tkr.clock;
|
2014-07-17 05:05:10 +08:00
|
|
|
cycle_t cycle_now, delta;
|
2008-08-21 07:37:28 +08:00
|
|
|
s64 nsec;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
cycle_now = tk->tkr.read(clock);
|
|
|
|
delta = clocksource_delta(cycle_now, tk->tkr.cycle_last, tk->tkr.mask);
|
|
|
|
tk->tkr.cycle_last = cycle_now;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec += delta * tk->tkr.mult;
|
2009-05-02 04:10:26 +08:00
|
|
|
|
time: convert arch_gettimeoffset to a pointer
Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
arch core provides a single implementation of arch_gettimeoffset(). In
many cases, different sub-architectures, different machines, or
different timer providers exist, and so the arch ends up implementing
arch_gettimeoffset() as a call-through-pointer anyway. Examples are
ARM, Cris, M68K, and it's arguable that the remaining architectures,
M32R and Blackfin, should be doing this anyway.
Modify arch_gettimeoffset so that it itself is a function pointer, which
the arch initializes. This will allow later changes to move the
initialization of this function into individual machine support or timer
drivers. This is particularly useful for code in drivers/clocksource
which should rely on an arch-independant mechanism to register their
implementation of arch_gettimeoffset().
This patch also converts the Cris architecture to set arch_gettimeoffset
directly to the final implementation in time_init(), because Cris already
had separate time_init() functions per sub-architecture. M68K and ARM
are converted to set arch_gettimeoffset to the final implementation in
later patches, because they already have function pointers in place for
this purpose.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-11-08 08:58:54 +08:00
|
|
|
/* If arch requires, add in get_arch_timeoffset() */
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec += (u64)arch_gettimeoffset() << tk->tkr.shift;
|
2009-05-02 04:10:26 +08:00
|
|
|
|
2012-07-13 13:21:57 +08:00
|
|
|
tk_normalize_xtime(tk);
|
2008-08-21 07:37:30 +08:00
|
|
|
|
2014-07-17 05:05:10 +08:00
|
|
|
nsec = clocksource_cyc2ns(delta, clock->mult, clock->shift);
|
2014-07-17 05:04:01 +08:00
|
|
|
timespec64_add_ns(&tk->raw_time, nsec);
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2014-07-17 05:04:04 +08:00
|
|
|
* __getnstimeofday64 - Returns the time of day in a timespec64.
|
2007-05-08 15:27:59 +08:00
|
|
|
* @ts: pointer to the timespec to be set
|
|
|
|
*
|
2012-11-20 02:26:16 +08:00
|
|
|
* Updates the time of day in the timespec.
|
|
|
|
* Returns 0 on success, or -ve when suspended (timespec will be undefined).
|
2007-05-08 15:27:59 +08:00
|
|
|
*/
|
2014-07-17 05:04:04 +08:00
|
|
|
int __getnstimeofday64(struct timespec64 *ts)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2007-05-08 15:27:59 +08:00
|
|
|
unsigned long seq;
|
2012-07-13 13:21:53 +08:00
|
|
|
s64 nsecs = 0;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
ts->tv_sec = tk->xtime_sec;
|
2014-07-17 05:05:18 +08:00
|
|
|
nsecs = timekeeping_get_ns(&tk->tkr);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2012-09-12 07:26:03 +08:00
|
|
|
ts->tv_nsec = 0;
|
2014-07-17 05:04:04 +08:00
|
|
|
timespec64_add_ns(ts, nsecs);
|
2012-11-20 02:26:16 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Do not bail out early, in case there were callers still using
|
|
|
|
* the value, even in the face of the WARN_ON.
|
|
|
|
*/
|
|
|
|
if (unlikely(timekeeping_suspended))
|
|
|
|
return -EAGAIN;
|
|
|
|
return 0;
|
|
|
|
}
|
2014-07-17 05:04:04 +08:00
|
|
|
EXPORT_SYMBOL(__getnstimeofday64);
|
2012-11-20 02:26:16 +08:00
|
|
|
|
|
|
|
/**
|
2014-07-17 05:04:04 +08:00
|
|
|
* getnstimeofday64 - Returns the time of day in a timespec64.
|
2012-11-20 02:26:16 +08:00
|
|
|
* @ts: pointer to the timespec to be set
|
|
|
|
*
|
|
|
|
* Returns the time of day in a timespec (WARN if suspended).
|
|
|
|
*/
|
2014-07-17 05:04:04 +08:00
|
|
|
void getnstimeofday64(struct timespec64 *ts)
|
2012-11-20 02:26:16 +08:00
|
|
|
{
|
2014-07-17 05:04:04 +08:00
|
|
|
WARN_ON(__getnstimeofday64(ts));
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
2014-07-17 05:04:04 +08:00
|
|
|
EXPORT_SYMBOL(getnstimeofday64);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2009-07-07 17:27:28 +08:00
|
|
|
ktime_t ktime_get(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2009-07-07 17:27:28 +08:00
|
|
|
unsigned int seq;
|
2014-07-17 05:04:12 +08:00
|
|
|
ktime_t base;
|
|
|
|
s64 nsecs;
|
2009-07-07 17:27:28 +08:00
|
|
|
|
|
|
|
WARN_ON(timekeeping_suspended);
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2014-07-17 05:05:16 +08:00
|
|
|
base = tk->tkr.base_mono;
|
2014-07-17 05:05:18 +08:00
|
|
|
nsecs = timekeeping_get_ns(&tk->tkr);
|
2009-07-07 17:27:28 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2014-07-17 05:03:53 +08:00
|
|
|
|
2014-07-17 05:04:12 +08:00
|
|
|
return ktime_add_ns(base, nsecs);
|
2009-07-07 17:27:28 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get);
|
|
|
|
|
2014-07-17 05:04:13 +08:00
|
|
|
static ktime_t *offsets[TK_OFFS_MAX] = {
|
|
|
|
[TK_OFFS_REAL] = &tk_core.timekeeper.offs_real,
|
|
|
|
[TK_OFFS_BOOT] = &tk_core.timekeeper.offs_boot,
|
|
|
|
[TK_OFFS_TAI] = &tk_core.timekeeper.offs_tai,
|
|
|
|
};
|
|
|
|
|
|
|
|
ktime_t ktime_get_with_offset(enum tk_offsets offs)
|
|
|
|
{
|
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
|
|
|
unsigned int seq;
|
|
|
|
ktime_t base, *offset = offsets[offs];
|
|
|
|
s64 nsecs;
|
|
|
|
|
|
|
|
WARN_ON(timekeeping_suspended);
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2014-07-17 05:05:16 +08:00
|
|
|
base = ktime_add(tk->tkr.base_mono, *offset);
|
2014-07-17 05:05:18 +08:00
|
|
|
nsecs = timekeeping_get_ns(&tk->tkr);
|
2014-07-17 05:04:13 +08:00
|
|
|
|
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
|
|
|
|
|
|
|
return ktime_add_ns(base, nsecs);
|
|
|
|
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get_with_offset);
|
|
|
|
|
2014-07-17 05:04:22 +08:00
|
|
|
/**
|
|
|
|
* ktime_mono_to_any() - convert mononotic time to any other time
|
|
|
|
* @tmono: time to convert.
|
|
|
|
* @offs: which offset to use
|
|
|
|
*/
|
|
|
|
ktime_t ktime_mono_to_any(ktime_t tmono, enum tk_offsets offs)
|
|
|
|
{
|
|
|
|
ktime_t *offset = offsets[offs];
|
|
|
|
unsigned long seq;
|
|
|
|
ktime_t tconv;
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
|
|
|
tconv = ktime_add(tmono, *offset);
|
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
|
|
|
|
|
|
|
return tconv;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_mono_to_any);
|
|
|
|
|
2014-07-17 05:05:04 +08:00
|
|
|
/**
|
|
|
|
* ktime_get_raw - Returns the raw monotonic time in ktime_t format
|
|
|
|
*/
|
|
|
|
ktime_t ktime_get_raw(void)
|
|
|
|
{
|
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
|
|
|
unsigned int seq;
|
|
|
|
ktime_t base;
|
|
|
|
s64 nsecs;
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
|
|
|
base = tk->base_raw;
|
|
|
|
nsecs = timekeeping_get_ns_raw(tk);
|
|
|
|
|
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
|
|
|
|
|
|
|
return ktime_add_ns(base, nsecs);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get_raw);
|
|
|
|
|
2009-07-07 17:27:28 +08:00
|
|
|
/**
|
2014-07-17 05:04:04 +08:00
|
|
|
* ktime_get_ts64 - get the monotonic clock in timespec64 format
|
2009-07-07 17:27:28 +08:00
|
|
|
* @ts: pointer to timespec variable
|
|
|
|
*
|
|
|
|
* The function calculates the monotonic clock from the realtime
|
|
|
|
* clock and the wall_to_monotonic offset and stores the result
|
|
|
|
* in normalized timespec format in the variable pointed to by @ts.
|
|
|
|
*/
|
2014-07-17 05:04:04 +08:00
|
|
|
void ktime_get_ts64(struct timespec64 *ts)
|
2009-07-07 17:27:28 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:04:04 +08:00
|
|
|
struct timespec64 tomono;
|
2012-09-12 07:26:03 +08:00
|
|
|
s64 nsec;
|
2009-07-07 17:27:28 +08:00
|
|
|
unsigned int seq;
|
|
|
|
|
|
|
|
WARN_ON(timekeeping_suspended);
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2014-07-17 05:04:04 +08:00
|
|
|
ts->tv_sec = tk->xtime_sec;
|
2014-07-17 05:05:18 +08:00
|
|
|
nsec = timekeeping_get_ns(&tk->tkr);
|
2012-07-28 02:48:13 +08:00
|
|
|
tomono = tk->wall_to_monotonic;
|
2009-07-07 17:27:28 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2009-07-07 17:27:28 +08:00
|
|
|
|
2014-07-17 05:04:04 +08:00
|
|
|
ts->tv_sec += tomono.tv_sec;
|
|
|
|
ts->tv_nsec = 0;
|
|
|
|
timespec64_add_ns(ts, nsec + tomono.tv_nsec);
|
2009-07-07 17:27:28 +08:00
|
|
|
}
|
2014-07-17 05:04:04 +08:00
|
|
|
EXPORT_SYMBOL_GPL(ktime_get_ts64);
|
2009-07-07 17:27:28 +08:00
|
|
|
|
2011-01-13 09:00:57 +08:00
|
|
|
#ifdef CONFIG_NTP_PPS
|
|
|
|
|
|
|
|
/**
|
|
|
|
* getnstime_raw_and_real - get day and raw monotonic time in timespec format
|
|
|
|
* @ts_raw: pointer to the timespec to be set to raw monotonic time
|
|
|
|
* @ts_real: pointer to the timespec to be set to the time of day
|
|
|
|
*
|
|
|
|
* This function reads both the time of day and raw monotonic time at the
|
|
|
|
* same time atomically and stores the resulting timestamps in timespec
|
|
|
|
* format.
|
|
|
|
*/
|
|
|
|
void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2011-01-13 09:00:57 +08:00
|
|
|
unsigned long seq;
|
|
|
|
s64 nsecs_raw, nsecs_real;
|
|
|
|
|
|
|
|
WARN_ON_ONCE(timekeeping_suspended);
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2011-01-13 09:00:57 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
*ts_raw = timespec64_to_timespec(tk->raw_time);
|
2012-07-28 02:48:13 +08:00
|
|
|
ts_real->tv_sec = tk->xtime_sec;
|
2012-07-13 13:21:53 +08:00
|
|
|
ts_real->tv_nsec = 0;
|
2011-01-13 09:00:57 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
nsecs_raw = timekeeping_get_ns_raw(tk);
|
2014-07-17 05:05:18 +08:00
|
|
|
nsecs_real = timekeeping_get_ns(&tk->tkr);
|
2011-01-13 09:00:57 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2011-01-13 09:00:57 +08:00
|
|
|
|
|
|
|
timespec_add_ns(ts_raw, nsecs_raw);
|
|
|
|
timespec_add_ns(ts_real, nsecs_real);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(getnstime_raw_and_real);
|
|
|
|
|
|
|
|
#endif /* CONFIG_NTP_PPS */
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
|
|
|
* do_gettimeofday - Returns the time of day in a timeval
|
|
|
|
* @tv: pointer to the timeval to be set
|
|
|
|
*
|
2008-01-30 20:30:01 +08:00
|
|
|
* NOTE: Users should be converted to using getnstimeofday()
|
2007-05-08 15:27:59 +08:00
|
|
|
*/
|
|
|
|
void do_gettimeofday(struct timeval *tv)
|
|
|
|
{
|
2014-07-17 05:04:04 +08:00
|
|
|
struct timespec64 now;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:04:04 +08:00
|
|
|
getnstimeofday64(&now);
|
2007-05-08 15:27:59 +08:00
|
|
|
tv->tv_sec = now.tv_sec;
|
|
|
|
tv->tv_usec = now.tv_nsec/1000;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(do_gettimeofday);
|
2012-04-27 16:12:42 +08:00
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
|
|
|
* do_settimeofday - Sets the time of day
|
|
|
|
* @tv: pointer to the timespec variable containing the new time
|
|
|
|
*
|
|
|
|
* Sets the time of day to the new time and update NTP and notify hrtimers
|
|
|
|
*/
|
2011-02-01 21:50:58 +08:00
|
|
|
int do_settimeofday(const struct timespec *tv)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 ts_delta, xt, tmp;
|
2011-11-15 06:05:44 +08:00
|
|
|
unsigned long flags;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2012-09-01 01:30:06 +08:00
|
|
|
if (!timespec_valid_strict(tv))
|
2007-05-08 15:27:59 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
timekeeping_forward_now(tk);
|
2008-08-21 07:37:28 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
xt = tk_xtime(tk);
|
2012-07-13 13:21:53 +08:00
|
|
|
ts_delta.tv_sec = tv->tv_sec - xt.tv_sec;
|
|
|
|
ts_delta.tv_nsec = tv->tv_nsec - xt.tv_nsec;
|
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, ts_delta));
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
tmp = timespec_to_timespec64(*tv);
|
|
|
|
tk_set_xtime(tk, &tmp);
|
2012-07-13 13:21:53 +08:00
|
|
|
|
2013-06-27 18:35:46 +08:00
|
|
|
timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
/* signal hrtimers about time change */
|
|
|
|
clock_was_set();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(do_settimeofday);
|
|
|
|
|
2011-02-01 21:52:17 +08:00
|
|
|
/**
|
|
|
|
* timekeeping_inject_offset - Adds or subtracts from the current time.
|
|
|
|
* @tv: pointer to the timespec variable containing the offset
|
|
|
|
*
|
|
|
|
* Adds or subtracts an offset value from the current time.
|
|
|
|
*/
|
|
|
|
int timekeeping_inject_offset(struct timespec *ts)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2011-11-15 06:05:44 +08:00
|
|
|
unsigned long flags;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 ts64, tmp;
|
2012-08-09 03:36:20 +08:00
|
|
|
int ret = 0;
|
2011-02-01 21:52:17 +08:00
|
|
|
|
|
|
|
if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
ts64 = timespec_to_timespec64(*ts);
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2011-02-01 21:52:17 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
timekeeping_forward_now(tk);
|
2011-02-01 21:52:17 +08:00
|
|
|
|
2012-08-09 03:36:20 +08:00
|
|
|
/* Make sure the proposed value is valid */
|
2014-07-17 05:04:01 +08:00
|
|
|
tmp = timespec64_add(tk_xtime(tk), ts64);
|
|
|
|
if (!timespec64_valid_strict(&tmp)) {
|
2012-08-09 03:36:20 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto error;
|
|
|
|
}
|
2012-07-13 13:21:53 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
tk_xtime_add(tk, &ts64);
|
|
|
|
tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, ts64));
|
2011-02-01 21:52:17 +08:00
|
|
|
|
2012-08-09 03:36:20 +08:00
|
|
|
error: /* even if we error out, we forwarded the time, so call update */
|
2013-06-27 18:35:46 +08:00
|
|
|
timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
|
2011-02-01 21:52:17 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2011-02-01 21:52:17 +08:00
|
|
|
|
|
|
|
/* signal hrtimers about time change */
|
|
|
|
clock_was_set();
|
|
|
|
|
2012-08-09 03:36:20 +08:00
|
|
|
return ret;
|
2011-02-01 21:52:17 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(timekeeping_inject_offset);
|
|
|
|
|
2012-05-04 03:30:07 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* timekeeping_get_tai_offset - Returns current TAI offset from UTC
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
s32 timekeeping_get_tai_offset(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2012-05-04 03:30:07 +08:00
|
|
|
unsigned int seq;
|
|
|
|
s32 ret;
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2012-05-04 03:30:07 +08:00
|
|
|
ret = tk->tai_offset;
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2012-05-04 03:30:07 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* __timekeeping_set_tai_offset - Lock free worker function
|
|
|
|
*
|
|
|
|
*/
|
2013-03-26 03:24:24 +08:00
|
|
|
static void __timekeeping_set_tai_offset(struct timekeeper *tk, s32 tai_offset)
|
2012-05-04 03:30:07 +08:00
|
|
|
{
|
|
|
|
tk->tai_offset = tai_offset;
|
2013-12-11 09:13:35 +08:00
|
|
|
tk->offs_tai = ktime_add(tk->offs_real, ktime_set(tai_offset, 0));
|
2012-05-04 03:30:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* timekeeping_set_tai_offset - Sets the current TAI offset from UTC
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void timekeeping_set_tai_offset(s32 tai_offset)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2012-05-04 03:30:07 +08:00
|
|
|
unsigned long flags;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2012-05-04 03:30:07 +08:00
|
|
|
__timekeeping_set_tai_offset(tk, tai_offset);
|
2013-12-12 10:50:25 +08:00
|
|
|
timekeeping_update(tk, TK_MIRROR | TK_CLOCK_WAS_SET);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2013-04-11 03:41:49 +08:00
|
|
|
clock_was_set();
|
2012-05-04 03:30:07 +08:00
|
|
|
}
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
|
|
|
* change_clocksource - Swaps clocksources if a new one is available
|
|
|
|
*
|
|
|
|
* Accumulates current time interval and initializes new clocksource
|
|
|
|
*/
|
2009-08-14 21:47:30 +08:00
|
|
|
static int change_clocksource(void *data)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2009-04-22 03:24:02 +08:00
|
|
|
struct clocksource *new, *old;
|
2012-03-15 07:38:15 +08:00
|
|
|
unsigned long flags;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2009-08-14 21:47:30 +08:00
|
|
|
new = (struct clocksource *) data;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2012-03-15 07:38:15 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
timekeeping_forward_now(tk);
|
2013-04-26 04:31:44 +08:00
|
|
|
/*
|
|
|
|
* If the cs is in module, get a module reference. Succeeds
|
|
|
|
* for built-in code (owner == NULL) as well.
|
|
|
|
*/
|
|
|
|
if (try_module_get(new->owner)) {
|
|
|
|
if (!new->enable || new->enable(new) == 0) {
|
2014-07-17 05:05:16 +08:00
|
|
|
old = tk->tkr.clock;
|
2013-04-26 04:31:44 +08:00
|
|
|
tk_setup_internals(tk, new);
|
|
|
|
if (old->disable)
|
|
|
|
old->disable(old);
|
|
|
|
module_put(old->owner);
|
|
|
|
} else {
|
|
|
|
module_put(new->owner);
|
|
|
|
}
|
2009-08-14 21:47:30 +08:00
|
|
|
}
|
2013-06-27 18:35:46 +08:00
|
|
|
timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
|
2012-03-15 07:38:15 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2012-03-15 07:38:15 +08:00
|
|
|
|
2009-08-14 21:47:30 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2009-08-14 21:47:30 +08:00
|
|
|
/**
|
|
|
|
* timekeeping_notify - Install a new clock source
|
|
|
|
* @clock: pointer to the clock source
|
|
|
|
*
|
|
|
|
* This function is called from clocksource.c after a new, better clock
|
|
|
|
* source has been registered. The caller holds the clocksource_mutex.
|
|
|
|
*/
|
2013-04-26 04:31:44 +08:00
|
|
|
int timekeeping_notify(struct clocksource *clock)
|
2009-08-14 21:47:30 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2012-07-28 02:48:13 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
if (tk->tkr.clock == clock)
|
2013-04-26 04:31:44 +08:00
|
|
|
return 0;
|
2009-08-14 21:47:30 +08:00
|
|
|
stop_machine(change_clocksource, clock, NULL);
|
2007-05-08 15:27:59 +08:00
|
|
|
tick_clock_notify();
|
2014-07-17 05:05:16 +08:00
|
|
|
return tk->tkr.clock == clock ? 0 : -1;
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
2009-08-14 21:47:30 +08:00
|
|
|
|
2008-08-21 07:37:30 +08:00
|
|
|
/**
|
|
|
|
* getrawmonotonic - Returns the raw monotonic time in a timespec
|
|
|
|
* @ts: pointer to the timespec to be set
|
|
|
|
*
|
|
|
|
* Returns the raw monotonic time (completely un-modified by ntp)
|
|
|
|
*/
|
|
|
|
void getrawmonotonic(struct timespec *ts)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 ts64;
|
2008-08-21 07:37:30 +08:00
|
|
|
unsigned long seq;
|
|
|
|
s64 nsecs;
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2012-07-28 02:48:13 +08:00
|
|
|
nsecs = timekeeping_get_ns_raw(tk);
|
2014-07-17 05:04:01 +08:00
|
|
|
ts64 = tk->raw_time;
|
2008-08-21 07:37:30 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2008-08-21 07:37:30 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
timespec64_add_ns(&ts64, nsecs);
|
|
|
|
*ts = timespec64_to_timespec(ts64);
|
2008-08-21 07:37:30 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(getrawmonotonic);
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
2008-02-08 20:19:24 +08:00
|
|
|
* timekeeping_valid_for_hres - Check if timekeeping is suitable for hres
|
2007-05-08 15:27:59 +08:00
|
|
|
*/
|
2008-02-08 20:19:24 +08:00
|
|
|
int timekeeping_valid_for_hres(void)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2007-05-08 15:27:59 +08:00
|
|
|
unsigned long seq;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
ret = tk->tkr.clock->flags & CLOCK_SOURCE_VALID_FOR_HRES;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-08-19 01:45:10 +08:00
|
|
|
/**
|
|
|
|
* timekeeping_max_deferment - Returns max time the clocksource can be deferred
|
|
|
|
*/
|
|
|
|
u64 timekeeping_max_deferment(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2011-11-15 04:48:10 +08:00
|
|
|
unsigned long seq;
|
|
|
|
u64 ret;
|
2012-07-13 13:21:51 +08:00
|
|
|
|
2011-11-15 04:48:10 +08:00
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2011-11-15 04:48:10 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
ret = tk->tkr.clock->max_idle_ns;
|
2011-11-15 04:48:10 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2011-11-15 04:48:10 +08:00
|
|
|
|
|
|
|
return ret;
|
2009-08-19 01:45:10 +08:00
|
|
|
}
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
2009-08-14 21:47:31 +08:00
|
|
|
* read_persistent_clock - Return time from the persistent clock.
|
2007-05-08 15:27:59 +08:00
|
|
|
*
|
|
|
|
* Weak dummy function for arches that do not yet support it.
|
2009-08-14 21:47:31 +08:00
|
|
|
* Reads the time from the battery backed persistent clock.
|
|
|
|
* Returns a timespec with tv_sec=0 and tv_nsec=0 if unsupported.
|
2007-05-08 15:27:59 +08:00
|
|
|
*
|
|
|
|
* XXX - Do be sure to remove it once all arches implement it.
|
|
|
|
*/
|
2014-04-08 06:39:20 +08:00
|
|
|
void __weak read_persistent_clock(struct timespec *ts)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2009-08-14 21:47:31 +08:00
|
|
|
ts->tv_sec = 0;
|
|
|
|
ts->tv_nsec = 0;
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
|
|
|
|
2009-08-14 21:47:32 +08:00
|
|
|
/**
|
|
|
|
* read_boot_clock - Return time of the system start.
|
|
|
|
*
|
|
|
|
* Weak dummy function for arches that do not yet support it.
|
|
|
|
* Function to read the exact time the system has been started.
|
|
|
|
* Returns a timespec with tv_sec=0 and tv_nsec=0 if unsupported.
|
|
|
|
*
|
|
|
|
* XXX - Do be sure to remove it once all arches implement it.
|
|
|
|
*/
|
2014-04-08 06:39:20 +08:00
|
|
|
void __weak read_boot_clock(struct timespec *ts)
|
2009-08-14 21:47:32 +08:00
|
|
|
{
|
|
|
|
ts->tv_sec = 0;
|
|
|
|
ts->tv_nsec = 0;
|
|
|
|
}
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/*
|
|
|
|
* timekeeping_init - Initializes the clocksource and common timekeeping values
|
|
|
|
*/
|
|
|
|
void __init timekeeping_init(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2009-08-14 21:47:26 +08:00
|
|
|
struct clocksource *clock;
|
2007-05-08 15:27:59 +08:00
|
|
|
unsigned long flags;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 now, boot, tmp;
|
|
|
|
struct timespec ts;
|
2013-01-16 00:09:47 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
read_persistent_clock(&ts);
|
|
|
|
now = timespec_to_timespec64(ts);
|
|
|
|
if (!timespec64_valid_strict(&now)) {
|
2012-08-09 03:36:20 +08:00
|
|
|
pr_warn("WARNING: Persistent clock returned invalid value!\n"
|
|
|
|
" Check your CMOS/BIOS settings.\n");
|
|
|
|
now.tv_sec = 0;
|
|
|
|
now.tv_nsec = 0;
|
2013-01-16 00:09:47 +08:00
|
|
|
} else if (now.tv_sec || now.tv_nsec)
|
|
|
|
persistent_clock_exist = true;
|
2012-08-09 03:36:20 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
read_boot_clock(&ts);
|
|
|
|
boot = timespec_to_timespec64(ts);
|
|
|
|
if (!timespec64_valid_strict(&boot)) {
|
2012-08-09 03:36:20 +08:00
|
|
|
pr_warn("WARNING: Boot clock returned invalid value!\n"
|
|
|
|
" Check your CMOS/BIOS settings.\n");
|
|
|
|
boot.tv_sec = 0;
|
|
|
|
boot.tv_nsec = 0;
|
|
|
|
}
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2013-03-23 02:37:28 +08:00
|
|
|
ntp_init();
|
|
|
|
|
2009-08-14 21:47:21 +08:00
|
|
|
clock = clocksource_default_clock();
|
2009-08-14 21:47:19 +08:00
|
|
|
if (clock->enable)
|
|
|
|
clock->enable(clock);
|
2012-07-28 02:48:13 +08:00
|
|
|
tk_setup_internals(tk, clock);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
tk_set_xtime(tk, &now);
|
|
|
|
tk->raw_time.tv_sec = 0;
|
|
|
|
tk->raw_time.tv_nsec = 0;
|
2014-07-17 05:05:04 +08:00
|
|
|
tk->base_raw.tv64 = 0;
|
2012-07-13 13:21:53 +08:00
|
|
|
if (boot.tv_sec == 0 && boot.tv_nsec == 0)
|
2012-07-28 02:48:13 +08:00
|
|
|
boot = tk_xtime(tk);
|
2012-07-13 13:21:53 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
set_normalized_timespec64(&tmp, -boot.tv_sec, -boot.tv_nsec);
|
2012-07-28 02:48:13 +08:00
|
|
|
tk_set_wall_to_mono(tk, tmp);
|
2012-07-28 02:48:12 +08:00
|
|
|
|
2014-07-17 05:04:09 +08:00
|
|
|
timekeeping_update(tk, TK_MIRROR);
|
2013-02-22 06:51:40 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* time in seconds when suspend began */
|
2014-07-17 05:04:01 +08:00
|
|
|
static struct timespec64 timekeeping_suspend_time;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2011-04-02 05:32:09 +08:00
|
|
|
/**
|
|
|
|
* __timekeeping_inject_sleeptime - Internal function to add sleep interval
|
|
|
|
* @delta: pointer to a timespec delta value
|
|
|
|
*
|
|
|
|
* Takes a timespec offset measuring a suspend interval and properly
|
|
|
|
* adds the sleep offset to the timekeeping variables.
|
|
|
|
*/
|
2012-07-13 13:21:57 +08:00
|
|
|
static void __timekeeping_inject_sleeptime(struct timekeeper *tk,
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 *delta)
|
2011-04-02 05:32:09 +08:00
|
|
|
{
|
2014-07-17 05:04:01 +08:00
|
|
|
if (!timespec64_valid_strict(delta)) {
|
2014-06-05 07:11:43 +08:00
|
|
|
printk_deferred(KERN_WARNING
|
|
|
|
"__timekeeping_inject_sleeptime: Invalid "
|
|
|
|
"sleep delta value!\n");
|
2011-06-02 09:18:09 +08:00
|
|
|
return;
|
|
|
|
}
|
2012-07-13 13:21:57 +08:00
|
|
|
tk_xtime_add(tk, delta);
|
2014-07-17 05:04:01 +08:00
|
|
|
tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, *delta));
|
2014-07-17 05:05:00 +08:00
|
|
|
tk_update_sleep_time(tk, timespec64_to_ktime(*delta));
|
2013-05-22 13:32:14 +08:00
|
|
|
tk_debug_account_sleep_time(delta);
|
2011-04-02 05:32:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* timekeeping_inject_sleeptime - Adds suspend interval to timeekeeping values
|
|
|
|
* @delta: pointer to a timespec delta value
|
|
|
|
*
|
|
|
|
* This hook is for architectures that cannot support read_persistent_clock
|
|
|
|
* because their RTC/persistent clock is only accessible when irqs are enabled.
|
|
|
|
*
|
|
|
|
* This function should only be called by rtc_resume(), and allows
|
|
|
|
* a suspend offset to be injected into the timekeeping values.
|
|
|
|
*/
|
|
|
|
void timekeeping_inject_sleeptime(struct timespec *delta)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 tmp;
|
2011-11-15 06:05:44 +08:00
|
|
|
unsigned long flags;
|
2011-04-02 05:32:09 +08:00
|
|
|
|
2013-01-16 00:09:47 +08:00
|
|
|
/*
|
|
|
|
* Make sure we don't set the clock twice, as timekeeping_resume()
|
|
|
|
* already did it
|
|
|
|
*/
|
|
|
|
if (has_persistent_clock())
|
2011-04-02 05:32:09 +08:00
|
|
|
return;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2011-11-15 04:48:10 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
timekeeping_forward_now(tk);
|
2011-04-02 05:32:09 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
tmp = timespec_to_timespec64(*delta);
|
|
|
|
__timekeeping_inject_sleeptime(tk, &tmp);
|
2011-04-02 05:32:09 +08:00
|
|
|
|
2013-06-27 18:35:46 +08:00
|
|
|
timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
|
2011-04-02 05:32:09 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2011-04-02 05:32:09 +08:00
|
|
|
|
|
|
|
/* signal hrtimers about time change */
|
|
|
|
clock_was_set();
|
|
|
|
}
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
|
|
|
* timekeeping_resume - Resumes the generic timekeeping subsystem.
|
|
|
|
*
|
|
|
|
* This is for the generic clocksource timekeeping.
|
|
|
|
* xtime/wall_to_monotonic/jiffies/etc are
|
|
|
|
* still managed by arch specific suspend/resume code.
|
|
|
|
*/
|
2011-03-24 05:16:04 +08:00
|
|
|
static void timekeeping_resume(void)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:05:16 +08:00
|
|
|
struct clocksource *clock = tk->tkr.clock;
|
2011-11-15 06:05:44 +08:00
|
|
|
unsigned long flags;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 ts_new, ts_delta;
|
|
|
|
struct timespec tmp;
|
2013-03-12 11:56:48 +08:00
|
|
|
cycle_t cycle_now, cycle_delta;
|
|
|
|
bool suspendtime_found = false;
|
2009-08-14 21:47:31 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
read_persistent_clock(&tmp);
|
|
|
|
ts_new = timespec_to_timespec64(tmp);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2012-08-06 07:40:41 +08:00
|
|
|
clockevents_resume();
|
2007-05-14 17:10:02 +08:00
|
|
|
clocksource_resume();
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2013-03-12 11:56:48 +08:00
|
|
|
/*
|
|
|
|
* After system resumes, we need to calculate the suspended time and
|
|
|
|
* compensate it for the OS time. There are 3 sources that could be
|
|
|
|
* used: Nonstop clocksource during suspend, persistent clock and rtc
|
|
|
|
* device.
|
|
|
|
*
|
|
|
|
* One specific platform may have 1 or 2 or all of them, and the
|
|
|
|
* preference will be:
|
|
|
|
* suspend-nonstop clocksource -> persistent clock -> rtc
|
|
|
|
* The less preferred source will only be tried if there is no better
|
|
|
|
* usable source. The rtc part is handled separately in rtc core code.
|
|
|
|
*/
|
2014-07-17 05:05:16 +08:00
|
|
|
cycle_now = tk->tkr.read(clock);
|
2013-03-12 11:56:48 +08:00
|
|
|
if ((clock->flags & CLOCK_SOURCE_SUSPEND_NONSTOP) &&
|
2014-07-17 05:05:16 +08:00
|
|
|
cycle_now > tk->tkr.cycle_last) {
|
2013-03-12 11:56:48 +08:00
|
|
|
u64 num, max = ULLONG_MAX;
|
|
|
|
u32 mult = clock->mult;
|
|
|
|
u32 shift = clock->shift;
|
|
|
|
s64 nsec = 0;
|
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
cycle_delta = clocksource_delta(cycle_now, tk->tkr.cycle_last,
|
|
|
|
tk->tkr.mask);
|
2013-03-12 11:56:48 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* "cycle_delta * mutl" may cause 64 bits overflow, if the
|
|
|
|
* suspended time is too long. In that case we need do the
|
|
|
|
* 64 bits math carefully
|
|
|
|
*/
|
|
|
|
do_div(max, mult);
|
|
|
|
if (cycle_delta > max) {
|
|
|
|
num = div64_u64(cycle_delta, max);
|
|
|
|
nsec = (((u64) max * mult) >> shift) * num;
|
|
|
|
cycle_delta -= num * max;
|
|
|
|
}
|
|
|
|
nsec += ((u64) cycle_delta * mult) >> shift;
|
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
ts_delta = ns_to_timespec64(nsec);
|
2013-03-12 11:56:48 +08:00
|
|
|
suspendtime_found = true;
|
2014-07-17 05:04:01 +08:00
|
|
|
} else if (timespec64_compare(&ts_new, &timekeeping_suspend_time) > 0) {
|
|
|
|
ts_delta = timespec64_sub(ts_new, timekeeping_suspend_time);
|
2013-03-12 11:56:48 +08:00
|
|
|
suspendtime_found = true;
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
2013-03-12 11:56:48 +08:00
|
|
|
|
|
|
|
if (suspendtime_found)
|
|
|
|
__timekeeping_inject_sleeptime(tk, &ts_delta);
|
|
|
|
|
|
|
|
/* Re-base the last cycle value */
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.cycle_last = cycle_now;
|
2012-07-28 02:48:13 +08:00
|
|
|
tk->ntp_error = 0;
|
2007-05-08 15:27:59 +08:00
|
|
|
timekeeping_suspended = 0;
|
2013-06-27 18:35:46 +08:00
|
|
|
timekeeping_update(tk, TK_MIRROR | TK_CLOCK_WAS_SET);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
touch_softlockup_watchdog();
|
|
|
|
|
|
|
|
clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL);
|
|
|
|
|
|
|
|
/* Resume hrtimers */
|
2011-05-02 22:48:57 +08:00
|
|
|
hrtimers_resume();
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
|
|
|
|
2011-03-24 05:16:04 +08:00
|
|
|
static int timekeeping_suspend(void)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2011-11-15 06:05:44 +08:00
|
|
|
unsigned long flags;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 delta, delta_delta;
|
|
|
|
static struct timespec64 old_delta;
|
|
|
|
struct timespec tmp;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
read_persistent_clock(&tmp);
|
|
|
|
timekeeping_suspend_time = timespec_to_timespec64(tmp);
|
2007-09-16 21:36:43 +08:00
|
|
|
|
2013-05-18 02:24:05 +08:00
|
|
|
/*
|
|
|
|
* On some systems the persistent_clock can not be detected at
|
|
|
|
* timekeeping_init by its return value, so if we see a valid
|
|
|
|
* value returned, update the persistent_clock_exists flag.
|
|
|
|
*/
|
|
|
|
if (timekeeping_suspend_time.tv_sec || timekeeping_suspend_time.tv_nsec)
|
|
|
|
persistent_clock_exist = true;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2012-07-28 02:48:13 +08:00
|
|
|
timekeeping_forward_now(tk);
|
2007-05-08 15:27:59 +08:00
|
|
|
timekeeping_suspended = 1;
|
time: Avoid accumulating time drift in suspend/resume
Because the read_persistent_clock interface is usually backed by
only a second granular interface, each time we read from the persistent
clock for suspend/resume, we introduce a half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the persistent
clock and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the persistent clock. However, without
this patch, since each read could cause almost a full second worth of
error, its possible to get almost 2 seconds of error just from the
suspend/resume cycle alone, so this about equal to any offset added by
the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-06-01 13:53:23 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* To avoid drift caused by repeated suspend/resumes,
|
|
|
|
* which each can add ~1 second drift error,
|
|
|
|
* try to compensate so the difference in system time
|
|
|
|
* and persistent_clock time stays close to constant.
|
|
|
|
*/
|
2014-07-17 05:04:01 +08:00
|
|
|
delta = timespec64_sub(tk_xtime(tk), timekeeping_suspend_time);
|
|
|
|
delta_delta = timespec64_sub(delta, old_delta);
|
time: Avoid accumulating time drift in suspend/resume
Because the read_persistent_clock interface is usually backed by
only a second granular interface, each time we read from the persistent
clock for suspend/resume, we introduce a half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the persistent
clock and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the persistent clock. However, without
this patch, since each read could cause almost a full second worth of
error, its possible to get almost 2 seconds of error just from the
suspend/resume cycle alone, so this about equal to any offset added by
the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-06-01 13:53:23 +08:00
|
|
|
if (abs(delta_delta.tv_sec) >= 2) {
|
|
|
|
/*
|
|
|
|
* if delta_delta is too large, assume time correction
|
|
|
|
* has occured and set old_delta to the current delta.
|
|
|
|
*/
|
|
|
|
old_delta = delta;
|
|
|
|
} else {
|
|
|
|
/* Otherwise try to adjust old_system to compensate */
|
|
|
|
timekeeping_suspend_time =
|
2014-07-17 05:04:01 +08:00
|
|
|
timespec64_add(timekeeping_suspend_time, delta_delta);
|
time: Avoid accumulating time drift in suspend/resume
Because the read_persistent_clock interface is usually backed by
only a second granular interface, each time we read from the persistent
clock for suspend/resume, we introduce a half second (on average) of error.
In order to avoid this error accumulating as the system is suspended
over and over, this patch measures the time delta between the persistent
clock and the system CLOCK_REALTIME.
If the delta is less then 2 seconds from the last suspend, we compensate
by using the previous time delta (keeping it close). If it is larger
then 2 seconds, we assume the clock was set or has been changed, so we
do no correction and update the delta.
Note: If NTP is running, ths could seem to "fight" with the NTP corrected
time, where as if the system time was off by 1 second, and NTP slewed the
value in, a suspend/resume cycle could undo this correction, by trying to
restore the previous offset from the persistent clock. However, without
this patch, since each read could cause almost a full second worth of
error, its possible to get almost 2 seconds of error just from the
suspend/resume cycle alone, so this about equal to any offset added by
the compensation.
Further on systems that suspend/resume frequently, this should keep time
closer then NTP could compensate for if the errors were allowed to
accumulate.
Credits to Arve Hjønnevåg for suggesting this solution.
CC: Arve Hjønnevåg <arve@android.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-06-01 13:53:23 +08:00
|
|
|
}
|
2013-12-12 11:10:36 +08:00
|
|
|
|
|
|
|
timekeeping_update(tk, TK_MIRROR);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL);
|
2010-02-03 06:41:41 +08:00
|
|
|
clocksource_suspend();
|
2012-08-06 07:40:41 +08:00
|
|
|
clockevents_suspend();
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sysfs resume/suspend bits for timekeeping */
|
2011-03-24 05:16:04 +08:00
|
|
|
static struct syscore_ops timekeeping_syscore_ops = {
|
2007-05-08 15:27:59 +08:00
|
|
|
.resume = timekeeping_resume,
|
|
|
|
.suspend = timekeeping_suspend,
|
|
|
|
};
|
|
|
|
|
2011-03-24 05:16:04 +08:00
|
|
|
static int __init timekeeping_init_ops(void)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2011-03-24 05:16:04 +08:00
|
|
|
register_syscore_ops(&timekeeping_syscore_ops);
|
|
|
|
return 0;
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
2011-03-24 05:16:04 +08:00
|
|
|
device_initcall(timekeeping_init_ops);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
/*
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
* Apply a multiplier adjustment to the timekeeper
|
2007-05-08 15:27:59 +08:00
|
|
|
*/
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
static __always_inline void timekeeping_apply_adjustment(struct timekeeper *tk,
|
|
|
|
s64 offset,
|
|
|
|
bool negative,
|
|
|
|
int adj_scale)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
s64 interval = tk->cycle_interval;
|
|
|
|
s32 mult_adj = 1;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
if (negative) {
|
|
|
|
mult_adj = -mult_adj;
|
|
|
|
interval = -interval;
|
|
|
|
offset = -offset;
|
2012-08-05 03:21:14 +08:00
|
|
|
}
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
mult_adj <<= adj_scale;
|
|
|
|
interval <<= adj_scale;
|
|
|
|
offset <<= adj_scale;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2011-10-28 09:12:42 +08:00
|
|
|
/*
|
|
|
|
* So the following can be confusing.
|
|
|
|
*
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
* To keep things simple, lets assume mult_adj == 1 for now.
|
2011-10-28 09:12:42 +08:00
|
|
|
*
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
* When mult_adj != 1, remember that the interval and offset values
|
2011-10-28 09:12:42 +08:00
|
|
|
* have been appropriately scaled so the math is the same.
|
|
|
|
*
|
|
|
|
* The basic idea here is that we're increasing the multiplier
|
|
|
|
* by one, this causes the xtime_interval to be incremented by
|
|
|
|
* one cycle_interval. This is because:
|
|
|
|
* xtime_interval = cycle_interval * mult
|
|
|
|
* So if mult is being incremented by one:
|
|
|
|
* xtime_interval = cycle_interval * (mult + 1)
|
|
|
|
* Its the same as:
|
|
|
|
* xtime_interval = (cycle_interval * mult) + cycle_interval
|
|
|
|
* Which can be shortened to:
|
|
|
|
* xtime_interval += cycle_interval
|
|
|
|
*
|
|
|
|
* So offset stores the non-accumulated cycles. Thus the current
|
|
|
|
* time (in shifted nanoseconds) is:
|
|
|
|
* now = (offset * adj) + xtime_nsec
|
|
|
|
* Now, even though we're adjusting the clock frequency, we have
|
|
|
|
* to keep time consistent. In other words, we can't jump back
|
|
|
|
* in time, and we also want to avoid jumping forward in time.
|
|
|
|
*
|
|
|
|
* So given the same offset value, we need the time to be the same
|
|
|
|
* both before and after the freq adjustment.
|
|
|
|
* now = (offset * adj_1) + xtime_nsec_1
|
|
|
|
* now = (offset * adj_2) + xtime_nsec_2
|
|
|
|
* So:
|
|
|
|
* (offset * adj_1) + xtime_nsec_1 =
|
|
|
|
* (offset * adj_2) + xtime_nsec_2
|
|
|
|
* And we know:
|
|
|
|
* adj_2 = adj_1 + 1
|
|
|
|
* So:
|
|
|
|
* (offset * adj_1) + xtime_nsec_1 =
|
|
|
|
* (offset * (adj_1+1)) + xtime_nsec_2
|
|
|
|
* (offset * adj_1) + xtime_nsec_1 =
|
|
|
|
* (offset * adj_1) + offset + xtime_nsec_2
|
|
|
|
* Canceling the sides:
|
|
|
|
* xtime_nsec_1 = offset + xtime_nsec_2
|
|
|
|
* Which gives us:
|
|
|
|
* xtime_nsec_2 = xtime_nsec_1 - offset
|
|
|
|
* Which simplfies to:
|
|
|
|
* xtime_nsec -= offset
|
|
|
|
*
|
|
|
|
* XXX - TODO: Doc ntp_error calculation.
|
|
|
|
*/
|
time: Avoid possible NTP adjustment mult overflow.
Ideally, __clocksource_updatefreq_scale, selects the largest shift
value possible for a clocksource. This results in the mult memember of
struct clocksource being particularly large, although not so large
that NTP would adjust the clock to cause it to overflow.
That said, nothing actually prohibits an overflow from occuring, its
just that it "shouldn't" occur.
So while very unlikely, and so far never observed, the value of
(cs->mult+cs->maxadj) may have a chance to reach very near 0xFFFFFFFF,
so there is a possibility it may overflow when doing NTP positive
adjustment
See the following detail: When NTP slewes the clock, kernel goes
through update_wall_time()->...->timekeeping_apply_adjustment():
tk->tkr.mult += mult_adj;
Since there is no guard against it, its possible tk->tkr.mult may
overflow during this operation.
This patch avoids any possible mult overflow by judging the overflow
case before adding mult_adj to mult, also adds the WARNING message
when capturing such case.
Signed-off-by: pang.xunlei <pang.xunlei@linaro.org>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
2014-10-08 15:03:34 +08:00
|
|
|
if (tk->tkr.mult + mult_adj < mult_adj) {
|
|
|
|
/* NTP adjustment caused clocksource mult overflow */
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
tk->tkr.mult += mult_adj;
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->xtime_interval += interval;
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec -= offset;
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->ntp_error -= (interval - offset) << tk->ntp_error_shift;
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Calculate the multiplier adjustment needed to match the frequency
|
|
|
|
* specified by NTP
|
|
|
|
*/
|
|
|
|
static __always_inline void timekeeping_freqadjust(struct timekeeper *tk,
|
|
|
|
s64 offset)
|
|
|
|
{
|
|
|
|
s64 interval = tk->cycle_interval;
|
|
|
|
s64 xinterval = tk->xtime_interval;
|
|
|
|
s64 tick_error;
|
|
|
|
bool negative;
|
|
|
|
u32 adj;
|
|
|
|
|
|
|
|
/* Remove any current error adj from freq calculation */
|
|
|
|
if (tk->ntp_err_mult)
|
|
|
|
xinterval -= tk->cycle_interval;
|
|
|
|
|
2014-04-24 11:53:29 +08:00
|
|
|
tk->ntp_tick = ntp_tick_length();
|
|
|
|
|
timekeeping: Rework frequency adjustments to work better w/ nohz
The existing timekeeping_adjust logic has always been complicated
to understand. Further, since it was developed prior to NOHZ becoming
common, its not surprising it performs poorly when NOHZ is enabled.
Since Miroslav pointed out the problematic nature of the existing code
in the NOHZ case, I've tried to refactor the code to perform better.
The problem with the previous approach was that it tried to adjust
for the total cumulative error using a scaled dampening factor. This
resulted in large errors to be corrected slowly, while small errors
were corrected quickly. With NOHZ the timekeeping code doesn't know
how far out the next tick will be, so this results in bad
over-correction to small errors, and insufficient correction to large
errors.
Inspired by Miroslav's patch, I've refactored the code to try to
address the correction in two steps.
1) Check the future freq error for the next tick, and if the frequency
error is large, try to make sure we correct it so it doesn't cause
much accumulated error.
2) Then make a small single unit adjustment to correct any cumulative
error that has collected over time.
This method performs fairly well in the simulator Miroslav created.
Major credit to Miroslav for pointing out the issue, providing the
original patch to resolve this, a simulator for testing, as well as
helping debug and resolve issues in my implementation so that it
performed closer to his original implementation.
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Reported-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-07 09:25:21 +08:00
|
|
|
/* Calculate current error per tick */
|
|
|
|
tick_error = ntp_tick_length() >> tk->ntp_error_shift;
|
|
|
|
tick_error -= (xinterval + tk->xtime_remainder);
|
|
|
|
|
|
|
|
/* Don't worry about correcting it if its small */
|
|
|
|
if (likely((tick_error >= 0) && (tick_error <= interval)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* preserve the direction of correction */
|
|
|
|
negative = (tick_error < 0);
|
|
|
|
|
|
|
|
/* Sort out the magnitude of the correction */
|
|
|
|
tick_error = abs(tick_error);
|
|
|
|
for (adj = 0; tick_error > interval; adj++)
|
|
|
|
tick_error >>= 1;
|
|
|
|
|
|
|
|
/* scale the corrections */
|
|
|
|
timekeeping_apply_adjustment(tk, offset, negative, adj);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Adjust the timekeeper's multiplier to the correct frequency
|
|
|
|
* and also to reduce the accumulated error value.
|
|
|
|
*/
|
|
|
|
static void timekeeping_adjust(struct timekeeper *tk, s64 offset)
|
|
|
|
{
|
|
|
|
/* Correct for the current frequency error */
|
|
|
|
timekeeping_freqadjust(tk, offset);
|
|
|
|
|
|
|
|
/* Next make a small adjustment to fix any cumulative error */
|
|
|
|
if (!tk->ntp_err_mult && (tk->ntp_error > 0)) {
|
|
|
|
tk->ntp_err_mult = 1;
|
|
|
|
timekeeping_apply_adjustment(tk, offset, 0, 0);
|
|
|
|
} else if (tk->ntp_err_mult && (tk->ntp_error <= 0)) {
|
|
|
|
/* Undo any existing error adjustment */
|
|
|
|
timekeeping_apply_adjustment(tk, offset, 1, 0);
|
|
|
|
tk->ntp_err_mult = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(tk->tkr.clock->maxadj &&
|
|
|
|
(tk->tkr.mult > tk->tkr.clock->mult + tk->tkr.clock->maxadj))) {
|
|
|
|
printk_once(KERN_WARNING
|
|
|
|
"Adjusting %s more than 11%% (%ld vs %ld)\n",
|
|
|
|
tk->tkr.clock->name, (long)tk->tkr.mult,
|
|
|
|
(long)tk->tkr.clock->mult + tk->tkr.clock->maxadj);
|
|
|
|
}
|
2012-07-13 13:21:56 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* It may be possible that when we entered this function, xtime_nsec
|
|
|
|
* was very small. Further, if we're slightly speeding the clocksource
|
|
|
|
* in the code above, its possible the required corrective factor to
|
|
|
|
* xtime_nsec could cause it to underflow.
|
|
|
|
*
|
|
|
|
* Now, since we already accumulated the second, cannot simply roll
|
|
|
|
* the accumulated second back, since the NTP subsystem has been
|
|
|
|
* notified via second_overflow. So instead we push xtime_nsec forward
|
|
|
|
* by the amount we underflowed, and add that amount into the error.
|
|
|
|
*
|
|
|
|
* We'll correct this error next time through this function, when
|
|
|
|
* xtime_nsec is not as small.
|
|
|
|
*/
|
2014-07-17 05:05:16 +08:00
|
|
|
if (unlikely((s64)tk->tkr.xtime_nsec < 0)) {
|
|
|
|
s64 neg = -(s64)tk->tkr.xtime_nsec;
|
|
|
|
tk->tkr.xtime_nsec = 0;
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->ntp_error += neg << tk->ntp_error_shift;
|
2012-07-13 13:21:56 +08:00
|
|
|
}
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
|
|
|
|
2012-07-13 13:21:54 +08:00
|
|
|
/**
|
|
|
|
* accumulate_nsecs_to_secs - Accumulates nsecs into secs
|
|
|
|
*
|
|
|
|
* Helper function that accumulates a the nsecs greater then a second
|
|
|
|
* from the xtime_nsec field to the xtime_secs field.
|
|
|
|
* It also calls into the NTP code to handle leapsecond processing.
|
|
|
|
*
|
|
|
|
*/
|
2013-06-27 18:35:46 +08:00
|
|
|
static inline unsigned int accumulate_nsecs_to_secs(struct timekeeper *tk)
|
2012-07-13 13:21:54 +08:00
|
|
|
{
|
2014-07-17 05:05:16 +08:00
|
|
|
u64 nsecps = (u64)NSEC_PER_SEC << tk->tkr.shift;
|
2013-12-12 12:07:49 +08:00
|
|
|
unsigned int clock_set = 0;
|
2012-07-13 13:21:54 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
while (tk->tkr.xtime_nsec >= nsecps) {
|
2012-07-13 13:21:54 +08:00
|
|
|
int leap;
|
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec -= nsecps;
|
2012-07-13 13:21:54 +08:00
|
|
|
tk->xtime_sec++;
|
|
|
|
|
|
|
|
/* Figure out if its a leap sec and apply if needed */
|
|
|
|
leap = second_overflow(tk->xtime_sec);
|
2012-07-28 02:48:12 +08:00
|
|
|
if (unlikely(leap)) {
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 ts;
|
2012-07-28 02:48:12 +08:00
|
|
|
|
|
|
|
tk->xtime_sec += leap;
|
2012-07-13 13:21:54 +08:00
|
|
|
|
2012-07-28 02:48:12 +08:00
|
|
|
ts.tv_sec = leap;
|
|
|
|
ts.tv_nsec = 0;
|
|
|
|
tk_set_wall_to_mono(tk,
|
2014-07-17 05:04:01 +08:00
|
|
|
timespec64_sub(tk->wall_to_monotonic, ts));
|
2012-07-28 02:48:12 +08:00
|
|
|
|
2012-05-04 03:30:07 +08:00
|
|
|
__timekeeping_set_tai_offset(tk, tk->tai_offset - leap);
|
|
|
|
|
2013-12-12 12:07:49 +08:00
|
|
|
clock_set = TK_CLOCK_WAS_SET;
|
2012-07-28 02:48:12 +08:00
|
|
|
}
|
2012-07-13 13:21:54 +08:00
|
|
|
}
|
2013-12-12 12:07:49 +08:00
|
|
|
return clock_set;
|
2012-07-13 13:21:54 +08:00
|
|
|
}
|
|
|
|
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
/**
|
|
|
|
* logarithmic_accumulation - shifted accumulation of cycles
|
|
|
|
*
|
|
|
|
* This functions accumulates a shifted interval of cycles into
|
|
|
|
* into a shifted interval nanoseconds. Allows for O(log) accumulation
|
|
|
|
* loop.
|
|
|
|
*
|
|
|
|
* Returns the unconsumed cycles.
|
|
|
|
*/
|
2012-07-13 13:21:57 +08:00
|
|
|
static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset,
|
2013-12-12 12:07:49 +08:00
|
|
|
u32 shift,
|
|
|
|
unsigned int *clock_set)
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
{
|
2013-02-22 06:51:36 +08:00
|
|
|
cycle_t interval = tk->cycle_interval << shift;
|
2010-08-10 05:20:09 +08:00
|
|
|
u64 raw_nsecs;
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
|
2012-07-13 13:21:57 +08:00
|
|
|
/* If the offset is smaller then a shifted interval, do nothing */
|
2013-02-22 06:51:36 +08:00
|
|
|
if (offset < interval)
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
return offset;
|
|
|
|
|
|
|
|
/* Accumulate one shifted interval */
|
2013-02-22 06:51:36 +08:00
|
|
|
offset -= interval;
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.cycle_last += interval;
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
tk->tkr.xtime_nsec += tk->xtime_interval << shift;
|
2013-12-12 12:07:49 +08:00
|
|
|
*clock_set |= accumulate_nsecs_to_secs(tk);
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
|
2010-08-10 05:20:09 +08:00
|
|
|
/* Accumulate raw time */
|
2012-10-09 15:18:23 +08:00
|
|
|
raw_nsecs = (u64)tk->raw_interval << shift;
|
2012-07-13 13:21:57 +08:00
|
|
|
raw_nsecs += tk->raw_time.tv_nsec;
|
2010-08-14 02:30:58 +08:00
|
|
|
if (raw_nsecs >= NSEC_PER_SEC) {
|
|
|
|
u64 raw_secs = raw_nsecs;
|
|
|
|
raw_nsecs = do_div(raw_secs, NSEC_PER_SEC);
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->raw_time.tv_sec += raw_secs;
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
}
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->raw_time.tv_nsec = raw_nsecs;
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
|
|
|
|
/* Accumulate error between NTP and clock interval */
|
2014-04-24 11:53:29 +08:00
|
|
|
tk->ntp_error += tk->ntp_tick << shift;
|
2012-07-13 13:21:57 +08:00
|
|
|
tk->ntp_error -= (tk->xtime_interval + tk->xtime_remainder) <<
|
|
|
|
(tk->ntp_error_shift + shift);
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2007-05-08 15:27:59 +08:00
|
|
|
/**
|
|
|
|
* update_wall_time - Uses the current clocksource to increment the wall time
|
|
|
|
*
|
|
|
|
*/
|
2013-12-13 05:10:55 +08:00
|
|
|
void update_wall_time(void)
|
2007-05-08 15:27:59 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *real_tk = &tk_core.timekeeper;
|
2013-02-22 06:51:40 +08:00
|
|
|
struct timekeeper *tk = &shadow_timekeeper;
|
2007-05-08 15:27:59 +08:00
|
|
|
cycle_t offset;
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
int shift = 0, maxshift;
|
2013-12-12 12:07:49 +08:00
|
|
|
unsigned int clock_set = 0;
|
2011-11-15 04:48:10 +08:00
|
|
|
unsigned long flags;
|
|
|
|
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
|
|
|
/* Make sure we're fully resumed: */
|
|
|
|
if (unlikely(timekeeping_suspended))
|
2011-11-15 04:48:10 +08:00
|
|
|
goto out;
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2010-07-14 08:56:20 +08:00
|
|
|
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
2013-02-22 06:51:40 +08:00
|
|
|
offset = real_tk->cycle_interval;
|
2010-07-14 08:56:20 +08:00
|
|
|
#else
|
2014-07-17 05:05:16 +08:00
|
|
|
offset = clocksource_delta(tk->tkr.read(tk->tkr.clock),
|
|
|
|
tk->tkr.cycle_last, tk->tkr.mask);
|
2007-05-08 15:27:59 +08:00
|
|
|
#endif
|
|
|
|
|
2012-08-22 08:30:49 +08:00
|
|
|
/* Check if there's really nothing to do */
|
2013-02-22 06:51:40 +08:00
|
|
|
if (offset < real_tk->cycle_interval)
|
2012-08-22 08:30:49 +08:00
|
|
|
goto out;
|
|
|
|
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
/*
|
|
|
|
* With NO_HZ we may have to accumulate many cycle_intervals
|
|
|
|
* (think "ticks") worth of time at once. To do this efficiently,
|
|
|
|
* we calculate the largest doubling multiple of cycle_intervals
|
2012-03-15 11:28:56 +08:00
|
|
|
* that is smaller than the offset. We then accumulate that
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
* chunk in one go, and then try to consume the next smaller
|
|
|
|
* doubled multiple.
|
2007-05-08 15:27:59 +08:00
|
|
|
*/
|
2012-07-28 02:48:13 +08:00
|
|
|
shift = ilog2(offset) - ilog2(tk->cycle_interval);
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
shift = max(0, shift);
|
2012-03-15 11:28:56 +08:00
|
|
|
/* Bound shift to one less than what overflows tick_length */
|
2011-11-15 05:18:07 +08:00
|
|
|
maxshift = (64 - (ilog2(ntp_tick_length())+1)) - 1;
|
time: Implement logarithmic time accumulation
Accumulating one tick at a time works well unless we're using NOHZ.
Then it can be an issue, since we may have to run through the loop
a few thousand times, which can increase timer interrupt caused
latency.
The current solution was to accumulate in half-second intervals
with NOHZ. This kept the number of loops down, however it did
slightly change how we make NTP adjustments. While not an issue
with NTPd users, as NTPd makes adjustments over a longer period of
time, other adjtimex() users have noticed the half-second
granularity with which we can apply frequency changes to the clock.
For instance, if a application tries to apply a 100ppm frequency
correction for 20ms to correct a 2us offset, with NOHZ they either
get no correction, or a 50us correction.
Now, there will always be some granularity error for applying
frequency corrections. However with users sensitive to this error
have seen a 50-500x increase with NOHZ compared to running without
NOHZ.
So I figured I'd try another approach then just simply increasing
the interval. My approach is to consume the time interval
logarithmically. This reduces the number of times through the loop
needed keeping latency down, while still preserving the original
granularity error for adjtimex() changes.
Further, this change allows us to remove the xtime_cache code
(patch to follow), as xtime is always within one tick of the
current time, instead of the half-second updates it saw before.
An earlier version of this patch has been shipping to x86 users in
the RedHat MRG releases for awhile without issue, but I've reworked
this version to be even more careful about avoiding possible
overflows if the shift value gets too large.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1254525473.7741.88.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-03 07:17:53 +08:00
|
|
|
shift = min(shift, maxshift);
|
2012-07-28 02:48:13 +08:00
|
|
|
while (offset >= tk->cycle_interval) {
|
2013-12-12 12:07:49 +08:00
|
|
|
offset = logarithmic_accumulation(tk, offset, shift,
|
|
|
|
&clock_set);
|
2012-07-28 02:48:13 +08:00
|
|
|
if (offset < tk->cycle_interval<<shift)
|
2010-03-19 05:47:30 +08:00
|
|
|
shift--;
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* correct the clock when NTP error is too big */
|
2012-07-28 02:48:13 +08:00
|
|
|
timekeeping_adjust(tk, offset);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2010-04-07 05:30:51 +08:00
|
|
|
/*
|
2012-09-05 03:38:12 +08:00
|
|
|
* XXX This can be killed once everyone converts
|
|
|
|
* to the new update_vsyscall.
|
|
|
|
*/
|
|
|
|
old_vsyscall_fixup(tk);
|
2007-05-08 15:27:59 +08:00
|
|
|
|
2010-04-07 05:30:51 +08:00
|
|
|
/*
|
|
|
|
* Finally, make sure that after the rounding
|
2012-07-13 13:21:53 +08:00
|
|
|
* xtime_nsec isn't larger than NSEC_PER_SEC
|
2010-04-07 05:30:51 +08:00
|
|
|
*/
|
2013-12-12 12:07:49 +08:00
|
|
|
clock_set |= accumulate_nsecs_to_secs(tk);
|
Revert "time: Remove xtime_cache"
This reverts commit 7bc7d637452383d56ba4368d4336b0dde1bb476d, as
requested by John Stultz. Quoting John:
"Petr Titěra reported an issue where he saw odd atime regressions with
2.6.33 where there were a full second worth of nanoseconds in the
nanoseconds field.
He also reviewed the time code and narrowed down the problem: unhandled
overflow of the nanosecond field caused by rounding up the
sub-nanosecond accumulated time.
Details:
* At the end of update_wall_time(), we currently round up the
sub-nanosecond portion of accumulated time when storing it into xtime.
This was added to avoid time inconsistencies caused when the
sub-nanosecond portion was truncated when storing into xtime.
Unfortunately we don't handle the possible second overflow caused by
that rounding.
* Previously the xtime_cache code hid this overflow by normalizing the
xtime value when storing into the xtime_cache.
* We could try to handle the second overflow after the rounding up, but
since this affects the timekeeping's internal state, this would further
complicate the next accumulation cycle, causing small errors in ntp
steering. As much as I'd like to get rid of it, the xtime_cache code is
known to work.
* The correct fix is really to include the sub-nanosecond portion in the
timekeeping accessor function, so we don't need to round up at during
accumulation. This would greatly simplify the accumulation code.
Unfortunately, we can't do this safely until the last three
non-GENERIC_TIME arches (sparc32, arm, cris) are converted (those
patches are in -mm) and we kill off the spots where arches set xtime
directly. This is all 2.6.34 material, so I think reverting the
xtime_cache change is the best approach for now.
Many thanks to Petr for both reporting and finding the issue!"
Reported-by: Petr Titěra <P.Titera@century.cz>
Requested-by: john stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-23 06:10:37 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2013-02-22 06:51:40 +08:00
|
|
|
/*
|
|
|
|
* Update the real timekeeper.
|
|
|
|
*
|
|
|
|
* We could avoid this memcpy by switching pointers, but that
|
|
|
|
* requires changes to all other timekeeper usage sites as
|
|
|
|
* well, i.e. move the timekeeper pointer getter into the
|
|
|
|
* spinlocked/seqcount protected sections. And we trade this
|
2014-07-17 05:04:07 +08:00
|
|
|
* memcpy under the tk_core.seq against one before we start
|
2013-02-22 06:51:40 +08:00
|
|
|
* updating.
|
|
|
|
*/
|
|
|
|
memcpy(real_tk, tk, sizeof(*tk));
|
2013-12-12 12:07:49 +08:00
|
|
|
timekeeping_update(real_tk, clock_set);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-02-22 06:51:40 +08:00
|
|
|
out:
|
2013-02-22 06:51:38 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2013-12-13 05:10:55 +08:00
|
|
|
if (clock_set)
|
2014-03-28 07:30:49 +08:00
|
|
|
/* Have to call _delayed version, since in irq context*/
|
|
|
|
clock_was_set_delayed();
|
2007-05-08 15:27:59 +08:00
|
|
|
}
|
2007-07-16 14:39:41 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* getboottime - Return the real time of system boot.
|
|
|
|
* @ts: pointer to the timespec to be set
|
|
|
|
*
|
2011-02-15 09:52:09 +08:00
|
|
|
* Returns the wall-time of boot in a timespec.
|
2007-07-16 14:39:41 +08:00
|
|
|
*
|
|
|
|
* This is based on the wall_to_monotonic offset and the total suspend
|
|
|
|
* time. Calls to settimeofday will affect the value returned (which
|
|
|
|
* basically means that however wrong your real time clock is at boot time,
|
|
|
|
* you get the right time here).
|
|
|
|
*/
|
|
|
|
void getboottime(struct timespec *ts)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:04:58 +08:00
|
|
|
ktime_t t = ktime_sub(tk->offs_real, tk->offs_boot);
|
|
|
|
|
|
|
|
*ts = ktime_to_timespec(t);
|
2007-07-16 14:39:41 +08:00
|
|
|
}
|
2010-01-27 19:13:40 +08:00
|
|
|
EXPORT_SYMBOL_GPL(getboottime);
|
2007-07-16 14:39:41 +08:00
|
|
|
|
2007-07-25 09:38:34 +08:00
|
|
|
unsigned long get_seconds(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2012-07-28 02:48:13 +08:00
|
|
|
|
|
|
|
return tk->xtime_sec;
|
2007-07-25 09:38:34 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(get_seconds);
|
|
|
|
|
2009-08-20 10:13:34 +08:00
|
|
|
struct timespec __current_kernel_time(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2012-07-28 02:48:13 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
return timespec64_to_timespec(tk_xtime(tk));
|
2009-08-20 10:13:34 +08:00
|
|
|
}
|
2007-07-25 09:38:34 +08:00
|
|
|
|
2007-07-25 08:47:43 +08:00
|
|
|
struct timespec current_kernel_time(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 now;
|
2007-07-25 08:47:43 +08:00
|
|
|
unsigned long seq;
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
Revert "time: Remove xtime_cache"
This reverts commit 7bc7d637452383d56ba4368d4336b0dde1bb476d, as
requested by John Stultz. Quoting John:
"Petr Titěra reported an issue where he saw odd atime regressions with
2.6.33 where there were a full second worth of nanoseconds in the
nanoseconds field.
He also reviewed the time code and narrowed down the problem: unhandled
overflow of the nanosecond field caused by rounding up the
sub-nanosecond accumulated time.
Details:
* At the end of update_wall_time(), we currently round up the
sub-nanosecond portion of accumulated time when storing it into xtime.
This was added to avoid time inconsistencies caused when the
sub-nanosecond portion was truncated when storing into xtime.
Unfortunately we don't handle the possible second overflow caused by
that rounding.
* Previously the xtime_cache code hid this overflow by normalizing the
xtime value when storing into the xtime_cache.
* We could try to handle the second overflow after the rounding up, but
since this affects the timekeeping's internal state, this would further
complicate the next accumulation cycle, causing small errors in ntp
steering. As much as I'd like to get rid of it, the xtime_cache code is
known to work.
* The correct fix is really to include the sub-nanosecond portion in the
timekeeping accessor function, so we don't need to round up at during
accumulation. This would greatly simplify the accumulation code.
Unfortunately, we can't do this safely until the last three
non-GENERIC_TIME arches (sparc32, arm, cris) are converted (those
patches are in -mm) and we kill off the spots where arches set xtime
directly. This is all 2.6.34 material, so I think reverting the
xtime_cache change is the best approach for now.
Many thanks to Petr for both reporting and finding the issue!"
Reported-by: Petr Titěra <P.Titera@century.cz>
Requested-by: john stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-23 06:10:37 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
now = tk_xtime(tk);
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2007-07-25 08:47:43 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
return timespec64_to_timespec(now);
|
2007-07-25 08:47:43 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(current_kernel_time);
|
2009-08-20 10:13:34 +08:00
|
|
|
|
|
|
|
struct timespec get_monotonic_coarse(void)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 now, mono;
|
2009-08-20 10:13:34 +08:00
|
|
|
unsigned long seq;
|
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
Revert "time: Remove xtime_cache"
This reverts commit 7bc7d637452383d56ba4368d4336b0dde1bb476d, as
requested by John Stultz. Quoting John:
"Petr Titěra reported an issue where he saw odd atime regressions with
2.6.33 where there were a full second worth of nanoseconds in the
nanoseconds field.
He also reviewed the time code and narrowed down the problem: unhandled
overflow of the nanosecond field caused by rounding up the
sub-nanosecond accumulated time.
Details:
* At the end of update_wall_time(), we currently round up the
sub-nanosecond portion of accumulated time when storing it into xtime.
This was added to avoid time inconsistencies caused when the
sub-nanosecond portion was truncated when storing into xtime.
Unfortunately we don't handle the possible second overflow caused by
that rounding.
* Previously the xtime_cache code hid this overflow by normalizing the
xtime value when storing into the xtime_cache.
* We could try to handle the second overflow after the rounding up, but
since this affects the timekeeping's internal state, this would further
complicate the next accumulation cycle, causing small errors in ntp
steering. As much as I'd like to get rid of it, the xtime_cache code is
known to work.
* The correct fix is really to include the sub-nanosecond portion in the
timekeeping accessor function, so we don't need to round up at during
accumulation. This would greatly simplify the accumulation code.
Unfortunately, we can't do this safely until the last three
non-GENERIC_TIME arches (sparc32, arm, cris) are converted (those
patches are in -mm) and we kill off the spots where arches set xtime
directly. This is all 2.6.34 material, so I think reverting the
xtime_cache change is the best approach for now.
Many thanks to Petr for both reporting and finding the issue!"
Reported-by: Petr Titěra <P.Titera@century.cz>
Requested-by: john stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-23 06:10:37 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
now = tk_xtime(tk);
|
|
|
|
mono = tk->wall_to_monotonic;
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2009-08-20 10:13:34 +08:00
|
|
|
|
2014-07-17 05:04:01 +08:00
|
|
|
set_normalized_timespec64(&now, now.tv_sec + mono.tv_sec,
|
2009-08-20 10:13:34 +08:00
|
|
|
now.tv_nsec + mono.tv_nsec);
|
2014-07-17 05:04:01 +08:00
|
|
|
|
|
|
|
return timespec64_to_timespec(now);
|
2009-08-20 10:13:34 +08:00
|
|
|
}
|
2011-01-27 22:58:55 +08:00
|
|
|
|
|
|
|
/*
|
2012-02-29 08:50:11 +08:00
|
|
|
* Must hold jiffies_lock
|
2011-01-27 22:58:55 +08:00
|
|
|
*/
|
|
|
|
void do_timer(unsigned long ticks)
|
|
|
|
{
|
|
|
|
jiffies_64 += ticks;
|
|
|
|
calc_global_load(ticks);
|
|
|
|
}
|
2011-01-27 22:59:05 +08:00
|
|
|
|
|
|
|
/**
|
2014-07-17 05:03:52 +08:00
|
|
|
* ktime_get_update_offsets_tick - hrtimer helper
|
|
|
|
* @offs_real: pointer to storage for monotonic -> realtime offset
|
|
|
|
* @offs_boot: pointer to storage for monotonic -> boottime offset
|
|
|
|
* @offs_tai: pointer to storage for monotonic -> clock tai offset
|
|
|
|
*
|
|
|
|
* Returns monotonic time at last tick and various offsets
|
2011-01-27 22:59:05 +08:00
|
|
|
*/
|
2014-07-17 05:03:52 +08:00
|
|
|
ktime_t ktime_get_update_offsets_tick(ktime_t *offs_real, ktime_t *offs_boot,
|
|
|
|
ktime_t *offs_tai)
|
2011-01-27 22:59:05 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2014-07-17 05:03:52 +08:00
|
|
|
unsigned int seq;
|
2014-07-17 05:04:20 +08:00
|
|
|
ktime_t base;
|
|
|
|
u64 nsecs;
|
2011-01-27 22:59:05 +08:00
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2014-07-17 05:03:52 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
base = tk->tkr.base_mono;
|
|
|
|
nsecs = tk->tkr.xtime_nsec >> tk->tkr.shift;
|
2014-07-17 05:04:20 +08:00
|
|
|
|
2014-07-17 05:03:52 +08:00
|
|
|
*offs_real = tk->offs_real;
|
|
|
|
*offs_boot = tk->offs_boot;
|
|
|
|
*offs_tai = tk->offs_tai;
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2014-07-17 05:03:52 +08:00
|
|
|
|
2014-07-17 05:04:20 +08:00
|
|
|
return ktime_add_ns(base, nsecs);
|
2011-01-27 22:59:05 +08:00
|
|
|
}
|
2011-01-27 22:59:10 +08:00
|
|
|
|
2012-07-11 06:43:24 +08:00
|
|
|
#ifdef CONFIG_HIGH_RES_TIMERS
|
|
|
|
/**
|
2014-07-17 05:03:52 +08:00
|
|
|
* ktime_get_update_offsets_now - hrtimer helper
|
2012-07-11 06:43:24 +08:00
|
|
|
* @offs_real: pointer to storage for monotonic -> realtime offset
|
|
|
|
* @offs_boot: pointer to storage for monotonic -> boottime offset
|
2013-10-18 09:13:30 +08:00
|
|
|
* @offs_tai: pointer to storage for monotonic -> clock tai offset
|
2012-07-11 06:43:24 +08:00
|
|
|
*
|
|
|
|
* Returns current monotonic time and updates the offsets
|
2013-10-18 09:13:30 +08:00
|
|
|
* Called from hrtimer_interrupt() or retrigger_next_event()
|
2012-07-11 06:43:24 +08:00
|
|
|
*/
|
2014-07-17 05:03:52 +08:00
|
|
|
ktime_t ktime_get_update_offsets_now(ktime_t *offs_real, ktime_t *offs_boot,
|
2013-01-22 09:00:11 +08:00
|
|
|
ktime_t *offs_tai)
|
2012-07-11 06:43:24 +08:00
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2012-07-11 06:43:24 +08:00
|
|
|
unsigned int seq;
|
2014-07-17 05:04:19 +08:00
|
|
|
ktime_t base;
|
|
|
|
u64 nsecs;
|
2012-07-11 06:43:24 +08:00
|
|
|
|
|
|
|
do {
|
2014-07-17 05:04:07 +08:00
|
|
|
seq = read_seqcount_begin(&tk_core.seq);
|
2012-07-11 06:43:24 +08:00
|
|
|
|
2014-07-17 05:05:16 +08:00
|
|
|
base = tk->tkr.base_mono;
|
2014-07-17 05:05:18 +08:00
|
|
|
nsecs = timekeeping_get_ns(&tk->tkr);
|
2012-07-11 06:43:24 +08:00
|
|
|
|
2012-07-28 02:48:13 +08:00
|
|
|
*offs_real = tk->offs_real;
|
|
|
|
*offs_boot = tk->offs_boot;
|
2013-01-22 09:00:11 +08:00
|
|
|
*offs_tai = tk->offs_tai;
|
2014-07-17 05:04:07 +08:00
|
|
|
} while (read_seqcount_retry(&tk_core.seq, seq));
|
2012-07-11 06:43:24 +08:00
|
|
|
|
2014-07-17 05:04:19 +08:00
|
|
|
return ktime_add_ns(base, nsecs);
|
2012-07-11 06:43:24 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-03-23 02:31:29 +08:00
|
|
|
/**
|
|
|
|
* do_adjtimex() - Accessor function to NTP __do_adjtimex function
|
|
|
|
*/
|
|
|
|
int do_adjtimex(struct timex *txc)
|
|
|
|
{
|
2014-07-17 05:04:07 +08:00
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
2013-03-23 02:37:28 +08:00
|
|
|
unsigned long flags;
|
2014-07-17 05:04:01 +08:00
|
|
|
struct timespec64 ts;
|
2013-04-11 03:41:49 +08:00
|
|
|
s32 orig_tai, tai;
|
2013-03-23 03:08:52 +08:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Validate the data before disabling interrupts */
|
|
|
|
ret = ntp_validate_timex(txc);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2013-03-23 06:04:13 +08:00
|
|
|
if (txc->modes & ADJ_SETOFFSET) {
|
|
|
|
struct timespec delta;
|
|
|
|
delta.tv_sec = txc->time.tv_sec;
|
|
|
|
delta.tv_nsec = txc->time.tv_usec;
|
|
|
|
if (!(txc->modes & ADJ_NANO))
|
|
|
|
delta.tv_nsec *= 1000;
|
|
|
|
ret = timekeeping_inject_offset(&delta);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-07-17 05:04:04 +08:00
|
|
|
getnstimeofday64(&ts);
|
2013-03-23 03:28:15 +08:00
|
|
|
|
2013-03-23 02:37:28 +08:00
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2013-03-23 02:37:28 +08:00
|
|
|
|
2013-04-11 03:41:49 +08:00
|
|
|
orig_tai = tai = tk->tai_offset;
|
2013-03-23 03:28:15 +08:00
|
|
|
ret = __do_adjtimex(txc, &ts, &tai);
|
2013-03-23 02:31:29 +08:00
|
|
|
|
2013-04-11 03:41:49 +08:00
|
|
|
if (tai != orig_tai) {
|
|
|
|
__timekeeping_set_tai_offset(tk, tai);
|
2013-12-12 10:50:25 +08:00
|
|
|
timekeeping_update(tk, TK_MIRROR | TK_CLOCK_WAS_SET);
|
2013-04-11 03:41:49 +08:00
|
|
|
}
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-03-23 02:37:28 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
|
|
|
|
timekeeping: Avoid possible deadlock from clock_was_set_delayed
As part of normal operaions, the hrtimer subsystem frequently calls
into the timekeeping code, creating a locking order of
hrtimer locks -> timekeeping locks
clock_was_set_delayed() was suppoed to allow us to avoid deadlocks
between the timekeeping the hrtimer subsystem, so that we could
notify the hrtimer subsytem the time had changed while holding
the timekeeping locks. This was done by scheduling delayed work
that would run later once we were out of the timekeeing code.
But unfortunately the lock chains are complex enoguh that in
scheduling delayed work, we end up eventually trying to grab
an hrtimer lock.
Sasha Levin noticed this in testing when the new seqlock lockdep
enablement triggered the following (somewhat abrieviated) message:
[ 251.100221] ======================================================
[ 251.100221] [ INFO: possible circular locking dependency detected ]
[ 251.100221] 3.13.0-rc2-next-20131206-sasha-00005-g8be2375-dirty #4053 Not tainted
[ 251.101967] -------------------------------------------------------
[ 251.101967] kworker/10:1/4506 is trying to acquire lock:
[ 251.101967] (timekeeper_seq){----..}, at: [<ffffffff81160e96>] retrigger_next_event+0x56/0x70
[ 251.101967]
[ 251.101967] but task is already holding lock:
[ 251.101967] (hrtimer_bases.lock#11){-.-...}, at: [<ffffffff81160e7c>] retrigger_next_event+0x3c/0x70
[ 251.101967]
[ 251.101967] which lock already depends on the new lock.
[ 251.101967]
[ 251.101967]
[ 251.101967] the existing dependency chain (in reverse order) is:
[ 251.101967]
-> #5 (hrtimer_bases.lock#11){-.-...}:
[snipped]
-> #4 (&rt_b->rt_runtime_lock){-.-...}:
[snipped]
-> #3 (&rq->lock){-.-.-.}:
[snipped]
-> #2 (&p->pi_lock){-.-.-.}:
[snipped]
-> #1 (&(&pool->lock)->rlock){-.-...}:
[ 251.101967] [<ffffffff81194803>] validate_chain+0x6c3/0x7b0
[ 251.101967] [<ffffffff81194d9d>] __lock_acquire+0x4ad/0x580
[ 251.101967] [<ffffffff81194ff2>] lock_acquire+0x182/0x1d0
[ 251.101967] [<ffffffff84398500>] _raw_spin_lock+0x40/0x80
[ 251.101967] [<ffffffff81153e69>] __queue_work+0x1a9/0x3f0
[ 251.101967] [<ffffffff81154168>] queue_work_on+0x98/0x120
[ 251.101967] [<ffffffff81161351>] clock_was_set_delayed+0x21/0x30
[ 251.101967] [<ffffffff811c4bd1>] do_adjtimex+0x111/0x160
[ 251.101967] [<ffffffff811e2711>] compat_sys_adjtimex+0x41/0x70
[ 251.101967] [<ffffffff843a4b49>] ia32_sysret+0x0/0x5
[ 251.101967]
-> #0 (timekeeper_seq){----..}:
[snipped]
[ 251.101967] other info that might help us debug this:
[ 251.101967]
[ 251.101967] Chain exists of:
timekeeper_seq --> &rt_b->rt_runtime_lock --> hrtimer_bases.lock#11
[ 251.101967] Possible unsafe locking scenario:
[ 251.101967]
[ 251.101967] CPU0 CPU1
[ 251.101967] ---- ----
[ 251.101967] lock(hrtimer_bases.lock#11);
[ 251.101967] lock(&rt_b->rt_runtime_lock);
[ 251.101967] lock(hrtimer_bases.lock#11);
[ 251.101967] lock(timekeeper_seq);
[ 251.101967]
[ 251.101967] *** DEADLOCK ***
[ 251.101967]
[ 251.101967] 3 locks held by kworker/10:1/4506:
[ 251.101967] #0: (events){.+.+.+}, at: [<ffffffff81154960>] process_one_work+0x200/0x530
[ 251.101967] #1: (hrtimer_work){+.+...}, at: [<ffffffff81154960>] process_one_work+0x200/0x530
[ 251.101967] #2: (hrtimer_bases.lock#11){-.-...}, at: [<ffffffff81160e7c>] retrigger_next_event+0x3c/0x70
[ 251.101967]
[ 251.101967] stack backtrace:
[ 251.101967] CPU: 10 PID: 4506 Comm: kworker/10:1 Not tainted 3.13.0-rc2-next-20131206-sasha-00005-g8be2375-dirty #4053
[ 251.101967] Workqueue: events clock_was_set_work
So the best solution is to avoid calling clock_was_set_delayed() while
holding the timekeeping lock, and instead using a flag variable to
decide if we should call clock_was_set() once we've released the locks.
This works for the case here, where the do_adjtimex() was the deadlock
trigger point. Unfortuantely, in update_wall_time() we still hold
the jiffies lock, which would deadlock with the ipi triggered by
clock_was_set(), preventing us from calling it even after we drop the
timekeeping lock. So instead call clock_was_set_delayed() at that point.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: stable <stable@vger.kernel.org> #3.10+
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-11 09:18:18 +08:00
|
|
|
if (tai != orig_tai)
|
|
|
|
clock_was_set();
|
|
|
|
|
2013-09-12 07:50:56 +08:00
|
|
|
ntp_notify_cmos_timer();
|
|
|
|
|
2013-03-23 03:28:15 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2013-03-23 02:31:29 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_NTP_PPS
|
|
|
|
/**
|
|
|
|
* hardpps() - Accessor function to NTP __hardpps function
|
|
|
|
*/
|
|
|
|
void hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
|
|
|
|
{
|
2013-03-23 02:37:28 +08:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_begin(&tk_core.seq);
|
2013-03-23 02:37:28 +08:00
|
|
|
|
2013-03-23 02:31:29 +08:00
|
|
|
__hardpps(phase_ts, raw_ts);
|
2013-03-23 02:37:28 +08:00
|
|
|
|
2014-07-17 05:04:07 +08:00
|
|
|
write_seqcount_end(&tk_core.seq);
|
2013-03-23 02:37:28 +08:00
|
|
|
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
|
2013-03-23 02:31:29 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(hardpps);
|
|
|
|
#endif
|
|
|
|
|
2011-01-27 22:59:10 +08:00
|
|
|
/**
|
|
|
|
* xtime_update() - advances the timekeeping infrastructure
|
|
|
|
* @ticks: number of ticks, that have elapsed since the last call.
|
|
|
|
*
|
|
|
|
* Must be called with interrupts disabled.
|
|
|
|
*/
|
|
|
|
void xtime_update(unsigned long ticks)
|
|
|
|
{
|
2012-02-29 08:50:11 +08:00
|
|
|
write_seqlock(&jiffies_lock);
|
2011-01-27 22:59:10 +08:00
|
|
|
do_timer(ticks);
|
2012-02-29 08:50:11 +08:00
|
|
|
write_sequnlock(&jiffies_lock);
|
2013-12-13 05:10:55 +08:00
|
|
|
update_wall_time();
|
2011-01-27 22:59:10 +08:00
|
|
|
}
|