2007-05-08 01:27:59 -06: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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/percpu.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/sysdev.h>
|
|
|
|
#include <linux/clocksource.h>
|
|
|
|
#include <linux/jiffies.h>
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/tick.h>
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
/* Structure holding internal timekeeping values. */
|
|
|
|
struct timekeeper {
|
|
|
|
/* Current clocksource used for timekeeping. */
|
|
|
|
struct clocksource *clock;
|
2009-08-14 07:47:27 -06:00
|
|
|
/* The shift value of the current clocksource. */
|
|
|
|
int shift;
|
2009-08-14 07:47:26 -06:00
|
|
|
|
|
|
|
/* Number of clock cycles in one NTP interval. */
|
|
|
|
cycle_t cycle_interval;
|
|
|
|
/* Number of clock shifted nano seconds in one NTP interval. */
|
|
|
|
u64 xtime_interval;
|
|
|
|
/* Raw nano seconds accumulated per NTP interval. */
|
|
|
|
u32 raw_interval;
|
|
|
|
|
|
|
|
/* Clock shifted nano seconds remainder not stored in xtime.tv_nsec. */
|
|
|
|
u64 xtime_nsec;
|
|
|
|
/* Difference between accumulated time and NTP time in ntp
|
|
|
|
* shifted nano seconds. */
|
|
|
|
s64 ntp_error;
|
2009-08-14 07:47:27 -06:00
|
|
|
/* Shift conversion between clock shifted nano seconds and
|
|
|
|
* ntp shifted nano seconds. */
|
|
|
|
int ntp_error_shift;
|
2009-08-14 07:47:26 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct timekeeper timekeeper;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* timekeeper_setup_internals - Set up internals to use clocksource clock.
|
|
|
|
*
|
|
|
|
* @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!
|
|
|
|
*/
|
|
|
|
static void timekeeper_setup_internals(struct clocksource *clock)
|
|
|
|
{
|
|
|
|
cycle_t interval;
|
|
|
|
u64 tmp;
|
|
|
|
|
|
|
|
timekeeper.clock = clock;
|
|
|
|
clock->cycle_last = clock->read(clock);
|
|
|
|
|
|
|
|
/* Do the ns -> cycle conversion first, using original mult */
|
|
|
|
tmp = NTP_INTERVAL_LENGTH;
|
|
|
|
tmp <<= clock->shift;
|
|
|
|
tmp += clock->mult_orig/2;
|
|
|
|
do_div(tmp, clock->mult_orig);
|
|
|
|
if (tmp == 0)
|
|
|
|
tmp = 1;
|
|
|
|
|
|
|
|
interval = (cycle_t) tmp;
|
|
|
|
timekeeper.cycle_interval = interval;
|
|
|
|
|
|
|
|
/* Go back from cycles -> shifted ns */
|
|
|
|
timekeeper.xtime_interval = (u64) interval * clock->mult;
|
|
|
|
timekeeper.raw_interval =
|
|
|
|
((u64) interval * clock->mult_orig) >> clock->shift;
|
|
|
|
|
|
|
|
timekeeper.xtime_nsec = 0;
|
2009-08-14 07:47:27 -06:00
|
|
|
timekeeper.shift = clock->shift;
|
2009-08-14 07:47:26 -06:00
|
|
|
|
|
|
|
timekeeper.ntp_error = 0;
|
2009-08-14 07:47:27 -06:00
|
|
|
timekeeper.ntp_error_shift = NTP_SCALE_SHIFT - clock->shift;
|
2009-08-14 07:47:26 -06:00
|
|
|
}
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This read-write spinlock protects us from races in SMP while
|
2009-04-11 02:43:41 -06:00
|
|
|
* playing with xtime.
|
2007-05-08 01:27:59 -06:00
|
|
|
*/
|
2007-10-17 00:27:16 -06:00
|
|
|
__cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The current time
|
|
|
|
* wall_to_monotonic is what we need to add to xtime (or xtime corrected
|
|
|
|
* for sub jiffie times) to get to monotonic time. Monotonic is pegged
|
|
|
|
* at zero at system boot time, so wall_to_monotonic will be negative,
|
|
|
|
* however, we will ALWAYS keep the tv_nsec part positive so we can use
|
|
|
|
* the usual normalization.
|
2007-07-16 00:39:41 -06:00
|
|
|
*
|
|
|
|
* wall_to_monotonic is moved after resume from suspend for the monotonic
|
|
|
|
* time not to jump. We need to add total_sleep_time to wall_to_monotonic
|
|
|
|
* to get the real boot based time offset.
|
|
|
|
*
|
|
|
|
* - wall_to_monotonic is no longer the boot time, getboottime must be
|
|
|
|
* used instead.
|
2007-05-08 01:27:59 -06:00
|
|
|
*/
|
|
|
|
struct timespec xtime __attribute__ ((aligned (16)));
|
|
|
|
struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
|
2007-07-16 00:39:41 -06:00
|
|
|
static unsigned long total_sleep_time; /* seconds */
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
/*
|
|
|
|
* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock.
|
|
|
|
*/
|
|
|
|
struct timespec raw_time;
|
|
|
|
|
2008-12-22 15:05:28 -07:00
|
|
|
/* flag for if timekeeping is suspended */
|
|
|
|
int __read_mostly timekeeping_suspended;
|
|
|
|
|
2007-07-24 19:38:34 -06:00
|
|
|
static struct timespec xtime_cache __attribute__ ((aligned (16)));
|
2008-02-01 09:45:13 -07:00
|
|
|
void update_xtime_cache(u64 nsec)
|
2007-07-24 19:38:34 -06:00
|
|
|
{
|
|
|
|
xtime_cache = xtime;
|
|
|
|
timespec_add_ns(&xtime_cache, nsec);
|
|
|
|
}
|
|
|
|
|
2009-08-14 07:47:18 -06:00
|
|
|
/* must hold xtime_lock */
|
|
|
|
void timekeeping_leap_insert(int leapsecond)
|
|
|
|
{
|
|
|
|
xtime.tv_sec += leapsecond;
|
|
|
|
wall_to_monotonic.tv_sec -= leapsecond;
|
2009-08-14 07:47:26 -06:00
|
|
|
update_vsyscall(&xtime, timekeeper.clock);
|
2009-08-14 07:47:18 -06:00
|
|
|
}
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
#ifdef CONFIG_GENERIC_TIME
|
|
|
|
/**
|
2009-08-14 07:47:26 -06:00
|
|
|
* timekeeping_forward_now - update clock to the current time
|
2007-05-08 01:27:59 -06:00
|
|
|
*
|
2008-08-20 17:37:28 -06: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 01:27:59 -06:00
|
|
|
*/
|
2009-08-14 07:47:26 -06:00
|
|
|
static void timekeeping_forward_now(void)
|
2007-05-08 01:27:59 -06:00
|
|
|
{
|
|
|
|
cycle_t cycle_now, cycle_delta;
|
2009-08-14 07:47:26 -06:00
|
|
|
struct clocksource *clock;
|
2008-08-20 17:37:28 -06:00
|
|
|
s64 nsec;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
clock = timekeeper.clock;
|
2009-08-14 07:47:19 -06:00
|
|
|
cycle_now = clock->read(clock);
|
2007-05-08 01:27:59 -06:00
|
|
|
cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
|
2008-08-20 17:37:28 -06:00
|
|
|
clock->cycle_last = cycle_now;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
nsec = clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift);
|
2009-05-01 14:10:26 -06:00
|
|
|
|
|
|
|
/* If arch requires, add in gettimeoffset() */
|
|
|
|
nsec += arch_gettimeoffset();
|
|
|
|
|
2008-08-20 17:37:28 -06:00
|
|
|
timespec_add_ns(&xtime, nsec);
|
2008-08-20 17:37:30 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
nsec = clocksource_cyc2ns(cycle_delta, clock->mult_orig, clock->shift);
|
|
|
|
timespec_add_ns(&raw_time, nsec);
|
2007-05-08 01:27:59 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-01-30 05:30:01 -07:00
|
|
|
* getnstimeofday - Returns the time of day in a timespec
|
2007-05-08 01:27:59 -06:00
|
|
|
* @ts: pointer to the timespec to be set
|
|
|
|
*
|
2008-01-30 05:30:01 -07:00
|
|
|
* Returns the time of day in a timespec.
|
2007-05-08 01:27:59 -06:00
|
|
|
*/
|
2008-01-30 05:30:01 -07:00
|
|
|
void getnstimeofday(struct timespec *ts)
|
2007-05-08 01:27:59 -06:00
|
|
|
{
|
2008-08-20 17:37:28 -06:00
|
|
|
cycle_t cycle_now, cycle_delta;
|
2009-08-14 07:47:26 -06:00
|
|
|
struct clocksource *clock;
|
2007-05-08 01:27:59 -06:00
|
|
|
unsigned long seq;
|
|
|
|
s64 nsecs;
|
|
|
|
|
2008-12-22 15:05:28 -07:00
|
|
|
WARN_ON(timekeeping_suspended);
|
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&xtime_lock);
|
|
|
|
|
|
|
|
*ts = xtime;
|
2008-08-20 17:37:28 -06:00
|
|
|
|
|
|
|
/* read clocksource: */
|
2009-08-14 07:47:26 -06:00
|
|
|
clock = timekeeper.clock;
|
2009-08-14 07:47:19 -06:00
|
|
|
cycle_now = clock->read(clock);
|
2008-08-20 17:37:28 -06:00
|
|
|
|
|
|
|
/* calculate the delta since the last update_wall_time: */
|
|
|
|
cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
|
|
|
|
|
|
|
|
/* convert to nanoseconds: */
|
2009-08-14 07:47:26 -06:00
|
|
|
nsecs = clocksource_cyc2ns(cycle_delta, clock->mult,
|
|
|
|
clock->shift);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-05-01 14:10:26 -06:00
|
|
|
/* If arch requires, add in gettimeoffset() */
|
|
|
|
nsecs += arch_gettimeoffset();
|
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
} while (read_seqretry(&xtime_lock, seq));
|
|
|
|
|
|
|
|
timespec_add_ns(ts, nsecs);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(getnstimeofday);
|
|
|
|
|
2009-07-07 03:27:28 -06:00
|
|
|
ktime_t ktime_get(void)
|
|
|
|
{
|
|
|
|
cycle_t cycle_now, cycle_delta;
|
2009-08-14 07:47:26 -06:00
|
|
|
struct clocksource *clock;
|
2009-07-07 03:27:28 -06:00
|
|
|
unsigned int seq;
|
|
|
|
s64 secs, nsecs;
|
|
|
|
|
|
|
|
WARN_ON(timekeeping_suspended);
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&xtime_lock);
|
|
|
|
secs = xtime.tv_sec + wall_to_monotonic.tv_sec;
|
|
|
|
nsecs = xtime.tv_nsec + wall_to_monotonic.tv_nsec;
|
|
|
|
|
|
|
|
/* read clocksource: */
|
2009-08-14 07:47:26 -06:00
|
|
|
clock = timekeeper.clock;
|
2009-08-14 07:47:19 -06:00
|
|
|
cycle_now = clock->read(clock);
|
2009-07-07 03:27:28 -06:00
|
|
|
|
|
|
|
/* calculate the delta since the last update_wall_time: */
|
|
|
|
cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
|
|
|
|
|
|
|
|
/* convert to nanoseconds: */
|
2009-08-14 07:47:26 -06:00
|
|
|
nsecs += clocksource_cyc2ns(cycle_delta, clock->mult,
|
|
|
|
clock->shift);
|
2009-07-07 03:27:28 -06:00
|
|
|
|
|
|
|
} while (read_seqretry(&xtime_lock, seq));
|
|
|
|
/*
|
|
|
|
* Use ktime_set/ktime_add_ns to create a proper ktime on
|
|
|
|
* 32-bit architectures without CONFIG_KTIME_SCALAR.
|
|
|
|
*/
|
|
|
|
return ktime_add_ns(ktime_set(secs, 0), nsecs);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ktime_get_ts - get the monotonic clock in timespec format
|
|
|
|
* @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.
|
|
|
|
*/
|
|
|
|
void ktime_get_ts(struct timespec *ts)
|
|
|
|
{
|
|
|
|
cycle_t cycle_now, cycle_delta;
|
2009-08-14 07:47:26 -06:00
|
|
|
struct clocksource *clock;
|
2009-07-07 03:27:28 -06:00
|
|
|
struct timespec tomono;
|
|
|
|
unsigned int seq;
|
|
|
|
s64 nsecs;
|
|
|
|
|
|
|
|
WARN_ON(timekeeping_suspended);
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&xtime_lock);
|
|
|
|
*ts = xtime;
|
|
|
|
tomono = wall_to_monotonic;
|
|
|
|
|
|
|
|
/* read clocksource: */
|
2009-08-14 07:47:26 -06:00
|
|
|
clock = timekeeper.clock;
|
2009-08-14 07:47:19 -06:00
|
|
|
cycle_now = clock->read(clock);
|
2009-07-07 03:27:28 -06:00
|
|
|
|
|
|
|
/* calculate the delta since the last update_wall_time: */
|
|
|
|
cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
|
|
|
|
|
|
|
|
/* convert to nanoseconds: */
|
2009-08-14 07:47:26 -06:00
|
|
|
nsecs = clocksource_cyc2ns(cycle_delta, clock->mult,
|
|
|
|
clock->shift);
|
2009-07-07 03:27:28 -06:00
|
|
|
|
|
|
|
} while (read_seqretry(&xtime_lock, seq));
|
|
|
|
|
|
|
|
set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec,
|
|
|
|
ts->tv_nsec + tomono.tv_nsec + nsecs);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get_ts);
|
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
/**
|
|
|
|
* do_gettimeofday - Returns the time of day in a timeval
|
|
|
|
* @tv: pointer to the timeval to be set
|
|
|
|
*
|
2008-01-30 05:30:01 -07:00
|
|
|
* NOTE: Users should be converted to using getnstimeofday()
|
2007-05-08 01:27:59 -06:00
|
|
|
*/
|
|
|
|
void do_gettimeofday(struct timeval *tv)
|
|
|
|
{
|
|
|
|
struct timespec now;
|
|
|
|
|
2008-01-30 05:30:01 -07:00
|
|
|
getnstimeofday(&now);
|
2007-05-08 01:27:59 -06:00
|
|
|
tv->tv_sec = now.tv_sec;
|
|
|
|
tv->tv_usec = now.tv_nsec/1000;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(do_gettimeofday);
|
|
|
|
/**
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
int do_settimeofday(struct timespec *tv)
|
|
|
|
{
|
2008-08-20 17:37:28 -06:00
|
|
|
struct timespec ts_delta;
|
2007-05-08 01:27:59 -06:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
write_seqlock_irqsave(&xtime_lock, flags);
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeping_forward_now();
|
2008-08-20 17:37:28 -06:00
|
|
|
|
|
|
|
ts_delta.tv_sec = tv->tv_sec - xtime.tv_sec;
|
|
|
|
ts_delta.tv_nsec = tv->tv_nsec - xtime.tv_nsec;
|
|
|
|
wall_to_monotonic = timespec_sub(wall_to_monotonic, ts_delta);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2008-08-20 17:37:28 -06:00
|
|
|
xtime = *tv;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2008-02-01 09:45:13 -07:00
|
|
|
update_xtime_cache(0);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeper.ntp_error = 0;
|
2007-05-08 01:27:59 -06:00
|
|
|
ntp_clear();
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
update_vsyscall(&xtime, timekeeper.clock);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
write_sequnlock_irqrestore(&xtime_lock, flags);
|
|
|
|
|
|
|
|
/* signal hrtimers about time change */
|
|
|
|
clock_was_set();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(do_settimeofday);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* change_clocksource - Swaps clocksources if a new one is available
|
|
|
|
*
|
|
|
|
* Accumulates current time interval and initializes new clocksource
|
|
|
|
*/
|
|
|
|
static void change_clocksource(void)
|
|
|
|
{
|
2009-04-21 13:24:02 -06:00
|
|
|
struct clocksource *new, *old;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
new = clocksource_get_next();
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
if (!new || timekeeper.clock == new)
|
2007-05-08 01:27:59 -06:00
|
|
|
return;
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeping_forward_now();
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:19 -06:00
|
|
|
if (new->enable && !new->enable(new))
|
2009-04-21 13:24:02 -06:00
|
|
|
return;
|
2009-08-14 07:47:19 -06:00
|
|
|
/*
|
|
|
|
* The frequency may have changed while the clocksource
|
|
|
|
* was disabled. If so the code in ->enable() must update
|
|
|
|
* the mult value to reflect the new frequency. Make sure
|
|
|
|
* mult_orig follows this change.
|
|
|
|
*/
|
|
|
|
new->mult_orig = new->mult;
|
2008-08-20 17:37:30 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
old = timekeeper.clock;
|
|
|
|
timekeeper_setup_internals(new);
|
|
|
|
|
2009-08-14 07:47:19 -06:00
|
|
|
/*
|
|
|
|
* Save mult_orig in mult so that the value can be restored
|
|
|
|
* regardless if ->enable() updates the value of mult or not.
|
|
|
|
*/
|
|
|
|
old->mult = old->mult_orig;
|
|
|
|
if (old->disable)
|
|
|
|
old->disable(old);
|
2009-04-21 13:24:02 -06:00
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
tick_clock_notify();
|
|
|
|
}
|
2009-07-07 05:00:31 -06:00
|
|
|
#else /* GENERIC_TIME */
|
2009-08-14 07:47:26 -06:00
|
|
|
static inline void timekeeping_forward_now(void) { }
|
2007-05-08 01:27:59 -06:00
|
|
|
static inline void change_clocksource(void) { }
|
2009-07-07 05:00:31 -06:00
|
|
|
|
|
|
|
/**
|
|
|
|
* ktime_get - get the monotonic time in ktime_t format
|
|
|
|
*
|
|
|
|
* returns the time in ktime_t format
|
|
|
|
*/
|
|
|
|
ktime_t ktime_get(void)
|
|
|
|
{
|
|
|
|
struct timespec now;
|
|
|
|
|
|
|
|
ktime_get_ts(&now);
|
|
|
|
|
|
|
|
return timespec_to_ktime(now);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ktime_get_ts - get the monotonic clock in timespec format
|
|
|
|
* @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.
|
|
|
|
*/
|
|
|
|
void ktime_get_ts(struct timespec *ts)
|
|
|
|
{
|
|
|
|
struct timespec tomono;
|
|
|
|
unsigned long seq;
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&xtime_lock);
|
|
|
|
getnstimeofday(ts);
|
|
|
|
tomono = wall_to_monotonic;
|
|
|
|
|
|
|
|
} while (read_seqretry(&xtime_lock, seq));
|
|
|
|
|
|
|
|
set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec,
|
|
|
|
ts->tv_nsec + tomono.tv_nsec);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get_ts);
|
|
|
|
#endif /* !GENERIC_TIME */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ktime_get_real - get the real (wall-) time in ktime_t format
|
|
|
|
*
|
|
|
|
* returns the time in ktime_t format
|
|
|
|
*/
|
|
|
|
ktime_t ktime_get_real(void)
|
|
|
|
{
|
|
|
|
struct timespec now;
|
|
|
|
|
|
|
|
getnstimeofday(&now);
|
|
|
|
|
|
|
|
return timespec_to_ktime(now);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ktime_get_real);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2008-08-20 17:37:30 -06: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)
|
|
|
|
{
|
|
|
|
unsigned long seq;
|
|
|
|
s64 nsecs;
|
|
|
|
cycle_t cycle_now, cycle_delta;
|
2009-08-14 07:47:26 -06:00
|
|
|
struct clocksource *clock;
|
2008-08-20 17:37:30 -06:00
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&xtime_lock);
|
|
|
|
|
|
|
|
/* read clocksource: */
|
2009-08-14 07:47:26 -06:00
|
|
|
clock = timekeeper.clock;
|
2009-08-14 07:47:19 -06:00
|
|
|
cycle_now = clock->read(clock);
|
2008-08-20 17:37:30 -06:00
|
|
|
|
|
|
|
/* calculate the delta since the last update_wall_time: */
|
|
|
|
cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
|
|
|
|
|
|
|
|
/* convert to nanoseconds: */
|
2009-08-14 07:47:26 -06:00
|
|
|
nsecs = clocksource_cyc2ns(cycle_delta, clock->mult_orig,
|
|
|
|
clock->shift);
|
2008-08-20 17:37:30 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
*ts = raw_time;
|
2008-08-20 17:37:30 -06:00
|
|
|
|
|
|
|
} while (read_seqretry(&xtime_lock, seq));
|
|
|
|
|
|
|
|
timespec_add_ns(ts, nsecs);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(getrawmonotonic);
|
|
|
|
|
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
/**
|
2008-02-08 05:19:24 -07:00
|
|
|
* timekeeping_valid_for_hres - Check if timekeeping is suitable for hres
|
2007-05-08 01:27:59 -06:00
|
|
|
*/
|
2008-02-08 05:19:24 -07:00
|
|
|
int timekeeping_valid_for_hres(void)
|
2007-05-08 01:27:59 -06:00
|
|
|
{
|
|
|
|
unsigned long seq;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&xtime_lock);
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
ret = timekeeper.clock->flags & CLOCK_SOURCE_VALID_FOR_HRES;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
} while (read_seqretry(&xtime_lock, seq));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* read_persistent_clock - Return time in seconds from the persistent clock.
|
|
|
|
*
|
|
|
|
* Weak dummy function for arches that do not yet support it.
|
|
|
|
* Returns seconds from epoch using the battery backed persistent clock.
|
|
|
|
* Returns zero if unsupported.
|
|
|
|
*
|
|
|
|
* XXX - Do be sure to remove it once all arches implement it.
|
|
|
|
*/
|
|
|
|
unsigned long __attribute__((weak)) read_persistent_clock(void)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* timekeeping_init - Initializes the clocksource and common timekeeping values
|
|
|
|
*/
|
|
|
|
void __init timekeeping_init(void)
|
|
|
|
{
|
2009-08-14 07:47:26 -06:00
|
|
|
struct clocksource *clock;
|
2007-05-08 01:27:59 -06:00
|
|
|
unsigned long flags;
|
|
|
|
unsigned long sec = read_persistent_clock();
|
|
|
|
|
|
|
|
write_seqlock_irqsave(&xtime_lock, flags);
|
|
|
|
|
2008-05-01 05:34:41 -06:00
|
|
|
ntp_init();
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:21 -06:00
|
|
|
clock = clocksource_default_clock();
|
2009-08-14 07:47:19 -06:00
|
|
|
if (clock->enable)
|
|
|
|
clock->enable(clock);
|
|
|
|
/* set mult_orig on enable */
|
|
|
|
clock->mult_orig = clock->mult;
|
2009-08-14 07:47:26 -06:00
|
|
|
|
|
|
|
timekeeper_setup_internals(clock);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
xtime.tv_sec = sec;
|
|
|
|
xtime.tv_nsec = 0;
|
2009-08-14 07:47:26 -06:00
|
|
|
raw_time.tv_sec = 0;
|
|
|
|
raw_time.tv_nsec = 0;
|
2007-05-08 01:27:59 -06:00
|
|
|
set_normalized_timespec(&wall_to_monotonic,
|
|
|
|
-xtime.tv_sec, -xtime.tv_nsec);
|
2008-02-01 09:45:13 -07:00
|
|
|
update_xtime_cache(0);
|
2007-07-16 00:39:41 -06:00
|
|
|
total_sleep_time = 0;
|
2007-05-08 01:27:59 -06:00
|
|
|
write_sequnlock_irqrestore(&xtime_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* time in seconds when suspend began */
|
|
|
|
static unsigned long timekeeping_suspend_time;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* timekeeping_resume - Resumes the generic timekeeping subsystem.
|
|
|
|
* @dev: unused
|
|
|
|
*
|
|
|
|
* This is for the generic clocksource timekeeping.
|
|
|
|
* xtime/wall_to_monotonic/jiffies/etc are
|
|
|
|
* still managed by arch specific suspend/resume code.
|
|
|
|
*/
|
|
|
|
static int timekeeping_resume(struct sys_device *dev)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
unsigned long now = read_persistent_clock();
|
|
|
|
|
2007-05-14 03:10:02 -06:00
|
|
|
clocksource_resume();
|
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
write_seqlock_irqsave(&xtime_lock, flags);
|
|
|
|
|
|
|
|
if (now && (now > timekeeping_suspend_time)) {
|
|
|
|
unsigned long sleep_length = now - timekeeping_suspend_time;
|
|
|
|
|
|
|
|
xtime.tv_sec += sleep_length;
|
|
|
|
wall_to_monotonic.tv_sec -= sleep_length;
|
2007-07-16 00:39:41 -06:00
|
|
|
total_sleep_time += sleep_length;
|
2007-05-08 01:27:59 -06:00
|
|
|
}
|
2008-02-01 09:45:13 -07:00
|
|
|
update_xtime_cache(0);
|
2007-05-08 01:27:59 -06:00
|
|
|
/* re-base the last cycle value */
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock);
|
|
|
|
timekeeper.ntp_error = 0;
|
2007-05-08 01:27:59 -06:00
|
|
|
timekeeping_suspended = 0;
|
|
|
|
write_sequnlock_irqrestore(&xtime_lock, flags);
|
|
|
|
|
|
|
|
touch_softlockup_watchdog();
|
|
|
|
|
|
|
|
clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL);
|
|
|
|
|
|
|
|
/* Resume hrtimers */
|
|
|
|
hres_timers_resume();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int timekeeping_suspend(struct sys_device *dev, pm_message_t state)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
2007-09-16 07:36:43 -06:00
|
|
|
timekeeping_suspend_time = read_persistent_clock();
|
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
write_seqlock_irqsave(&xtime_lock, flags);
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeping_forward_now();
|
2007-05-08 01:27:59 -06:00
|
|
|
timekeeping_suspended = 1;
|
|
|
|
write_sequnlock_irqrestore(&xtime_lock, flags);
|
|
|
|
|
|
|
|
clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sysfs resume/suspend bits for timekeeping */
|
|
|
|
static struct sysdev_class timekeeping_sysclass = {
|
2007-12-19 18:09:39 -07:00
|
|
|
.name = "timekeeping",
|
2007-05-08 01:27:59 -06:00
|
|
|
.resume = timekeeping_resume,
|
|
|
|
.suspend = timekeeping_suspend,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sys_device device_timer = {
|
|
|
|
.id = 0,
|
|
|
|
.cls = &timekeeping_sysclass,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init timekeeping_init_device(void)
|
|
|
|
{
|
|
|
|
int error = sysdev_class_register(&timekeeping_sysclass);
|
|
|
|
if (!error)
|
|
|
|
error = sysdev_register(&device_timer);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
device_initcall(timekeeping_init_device);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the error is already larger, we look ahead even further
|
|
|
|
* to compensate for late or lost adjustments.
|
|
|
|
*/
|
2009-08-14 07:47:26 -06:00
|
|
|
static __always_inline int timekeeping_bigadjust(s64 error, s64 *interval,
|
2007-05-08 01:27:59 -06:00
|
|
|
s64 *offset)
|
|
|
|
{
|
|
|
|
s64 tick_error, i;
|
|
|
|
u32 look_ahead, adj;
|
|
|
|
s32 error2, mult;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Use the current error value to determine how much to look ahead.
|
|
|
|
* The larger the error the slower we adjust for it to avoid problems
|
|
|
|
* with losing too many ticks, otherwise we would overadjust and
|
|
|
|
* produce an even larger error. The smaller the adjustment the
|
|
|
|
* faster we try to adjust for it, as lost ticks can do less harm
|
2008-02-08 05:19:25 -07:00
|
|
|
* here. This is tuned so that an error of about 1 msec is adjusted
|
2007-05-08 01:27:59 -06:00
|
|
|
* within about 1 sec (or 2^20 nsec in 2^SHIFT_HZ ticks).
|
|
|
|
*/
|
2009-08-14 07:47:26 -06:00
|
|
|
error2 = timekeeper.ntp_error >> (NTP_SCALE_SHIFT + 22 - 2 * SHIFT_HZ);
|
2007-05-08 01:27:59 -06:00
|
|
|
error2 = abs(error2);
|
|
|
|
for (look_ahead = 0; error2 > 0; look_ahead++)
|
|
|
|
error2 >>= 2;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now calculate the error in (1 << look_ahead) ticks, but first
|
|
|
|
* remove the single look ahead already included in the error.
|
|
|
|
*/
|
2009-08-14 07:47:27 -06:00
|
|
|
tick_error = tick_length >> (timekeeper.ntp_error_shift + 1);
|
2009-08-14 07:47:26 -06:00
|
|
|
tick_error -= timekeeper.xtime_interval >> 1;
|
2007-05-08 01:27:59 -06:00
|
|
|
error = ((error - tick_error) >> look_ahead) + tick_error;
|
|
|
|
|
|
|
|
/* Finally calculate the adjustment shift value. */
|
|
|
|
i = *interval;
|
|
|
|
mult = 1;
|
|
|
|
if (error < 0) {
|
|
|
|
error = -error;
|
|
|
|
*interval = -*interval;
|
|
|
|
*offset = -*offset;
|
|
|
|
mult = -1;
|
|
|
|
}
|
|
|
|
for (adj = 0; error > i; adj++)
|
|
|
|
error >>= 1;
|
|
|
|
|
|
|
|
*interval <<= adj;
|
|
|
|
*offset <<= adj;
|
|
|
|
return mult << adj;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Adjust the multiplier to reduce the error value,
|
|
|
|
* this is optimized for the most common adjustments of -1,0,1,
|
|
|
|
* for other values we can do a bit more work.
|
|
|
|
*/
|
2009-08-14 07:47:26 -06:00
|
|
|
static void timekeeping_adjust(s64 offset)
|
2007-05-08 01:27:59 -06:00
|
|
|
{
|
2009-08-14 07:47:26 -06:00
|
|
|
s64 error, interval = timekeeper.cycle_interval;
|
2007-05-08 01:27:59 -06:00
|
|
|
int adj;
|
|
|
|
|
2009-08-14 07:47:27 -06:00
|
|
|
error = timekeeper.ntp_error >> (timekeeper.ntp_error_shift - 1);
|
2007-05-08 01:27:59 -06:00
|
|
|
if (error > interval) {
|
|
|
|
error >>= 2;
|
|
|
|
if (likely(error <= interval))
|
|
|
|
adj = 1;
|
|
|
|
else
|
2009-08-14 07:47:26 -06:00
|
|
|
adj = timekeeping_bigadjust(error, &interval, &offset);
|
2007-05-08 01:27:59 -06:00
|
|
|
} else if (error < -interval) {
|
|
|
|
error >>= 2;
|
|
|
|
if (likely(error >= -interval)) {
|
|
|
|
adj = -1;
|
|
|
|
interval = -interval;
|
|
|
|
offset = -offset;
|
|
|
|
} else
|
2009-08-14 07:47:26 -06:00
|
|
|
adj = timekeeping_bigadjust(error, &interval, &offset);
|
2007-05-08 01:27:59 -06:00
|
|
|
} else
|
|
|
|
return;
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeper.clock->mult += adj;
|
|
|
|
timekeeper.xtime_interval += interval;
|
|
|
|
timekeeper.xtime_nsec -= offset;
|
|
|
|
timekeeper.ntp_error -= (interval - offset) <<
|
2009-08-14 07:47:27 -06:00
|
|
|
timekeeper.ntp_error_shift;
|
2007-05-08 01:27:59 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* update_wall_time - Uses the current clocksource to increment the wall time
|
|
|
|
*
|
|
|
|
* Called from the timer interrupt, must hold a write on xtime_lock.
|
|
|
|
*/
|
|
|
|
void update_wall_time(void)
|
|
|
|
{
|
2009-08-14 07:47:26 -06:00
|
|
|
struct clocksource *clock;
|
2007-05-08 01:27:59 -06:00
|
|
|
cycle_t offset;
|
2009-08-14 07:47:27 -06:00
|
|
|
u64 nsecs;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
/* Make sure we're fully resumed: */
|
|
|
|
if (unlikely(timekeeping_suspended))
|
|
|
|
return;
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
clock = timekeeper.clock;
|
2007-05-08 01:27:59 -06:00
|
|
|
#ifdef CONFIG_GENERIC_TIME
|
2009-08-14 07:47:19 -06:00
|
|
|
offset = (clock->read(clock) - clock->cycle_last) & clock->mask;
|
2007-05-08 01:27:59 -06:00
|
|
|
#else
|
2009-08-14 07:47:26 -06:00
|
|
|
offset = timekeeper.cycle_interval;
|
2007-05-08 01:27:59 -06:00
|
|
|
#endif
|
2009-08-14 07:47:27 -06:00
|
|
|
timekeeper.xtime_nsec = (s64)xtime.tv_nsec << timekeeper.shift;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
|
|
|
/* normally this loop will run just once, however in the
|
|
|
|
* case of lost or late ticks, it will accumulate correctly.
|
|
|
|
*/
|
2009-08-14 07:47:26 -06:00
|
|
|
while (offset >= timekeeper.cycle_interval) {
|
2009-08-14 07:47:27 -06:00
|
|
|
u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift;
|
2009-08-14 07:47:26 -06:00
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
/* accumulate one interval */
|
2009-08-14 07:47:26 -06:00
|
|
|
offset -= timekeeper.cycle_interval;
|
|
|
|
clock->cycle_last += timekeeper.cycle_interval;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeper.xtime_nsec += timekeeper.xtime_interval;
|
|
|
|
if (timekeeper.xtime_nsec >= nsecps) {
|
|
|
|
timekeeper.xtime_nsec -= nsecps;
|
2007-05-08 01:27:59 -06:00
|
|
|
xtime.tv_sec++;
|
|
|
|
second_overflow();
|
|
|
|
}
|
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
raw_time.tv_nsec += timekeeper.raw_interval;
|
|
|
|
if (raw_time.tv_nsec >= NSEC_PER_SEC) {
|
|
|
|
raw_time.tv_nsec -= NSEC_PER_SEC;
|
|
|
|
raw_time.tv_sec++;
|
2008-08-20 17:37:30 -06:00
|
|
|
}
|
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
/* accumulate error between NTP and clock interval */
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeper.ntp_error += tick_length;
|
|
|
|
timekeeper.ntp_error -= timekeeper.xtime_interval <<
|
2009-08-14 07:47:27 -06:00
|
|
|
timekeeper.ntp_error_shift;
|
2007-05-08 01:27:59 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* correct the clock when NTP error is too big */
|
2009-08-14 07:47:26 -06:00
|
|
|
timekeeping_adjust(offset);
|
2007-05-08 01:27:59 -06:00
|
|
|
|
time: catch xtime_nsec underflows and fix them
Impact: fix time warp bug
Alex Shi, along with Yanmin Zhang have been noticing occasional time
inconsistencies recently. Through their great diagnosis, they found that
the xtime_nsec value used in update_wall_time was occasionally going
negative. After looking through the code for awhile, I realized we have
the possibility for an underflow when three conditions are met in
update_wall_time():
1) We have accumulated a second's worth of nanoseconds, so we
incremented xtime.tv_sec and appropriately decrement xtime_nsec.
(This doesn't cause xtime_nsec to go negative, but it can cause it
to be small).
2) The remaining offset value is large, but just slightly less then
cycle_interval.
3) clocksource_adjust() is speeding up the clock, causing a
corrective amount (compensating for the increase in the multiplier
being multiplied against the unaccumulated offset value) to be
subtracted from xtime_nsec.
This can cause xtime_nsec to underflow.
Unfortunately, since we notify the NTP subsystem via second_overflow()
whenever we accumulate a full second, and this effects the error
accumulation that has already occured, we cannot simply revert the
accumulated second from xtime nor move the second accumulation to after
the clocksource_adjust call without a change in behavior.
This leaves us with (at least) two options:
1) Simply return from clocksource_adjust() without making a change if we
notice the adjustment would cause xtime_nsec to go negative.
This would work, but I'm concerned that if a large adjustment was needed
(due to the error being large), it may be possible to get stuck with an
ever increasing error that becomes too large to correct (since it may
always force xtime_nsec negative). This may just be paranoia on my part.
2) Catch xtime_nsec if it is negative, then add back the amount its
negative to both xtime_nsec and the error.
This second method is consistent with how we've handled earlier rounding
issues, and also has the benefit that the error being added is always in
the oposite direction also always equal or smaller then the correction
being applied. So the risk of a corner case where things get out of
control is lessened.
This patch fixes bug 11970, as tested by Yanmin Zhang
http://bugzilla.kernel.org/show_bug.cgi?id=11970
Reported-by: alex.shi@intel.com
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Tested-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-12-01 19:34:41 -07:00
|
|
|
/*
|
|
|
|
* Since in the loop above, we accumulate any amount of time
|
|
|
|
* in xtime_nsec over a second into xtime.tv_sec, its possible for
|
|
|
|
* xtime_nsec to be fairly small after the loop. Further, if we're
|
2009-08-14 07:47:26 -06:00
|
|
|
* slightly speeding the clocksource up in timekeeping_adjust(),
|
time: catch xtime_nsec underflows and fix them
Impact: fix time warp bug
Alex Shi, along with Yanmin Zhang have been noticing occasional time
inconsistencies recently. Through their great diagnosis, they found that
the xtime_nsec value used in update_wall_time was occasionally going
negative. After looking through the code for awhile, I realized we have
the possibility for an underflow when three conditions are met in
update_wall_time():
1) We have accumulated a second's worth of nanoseconds, so we
incremented xtime.tv_sec and appropriately decrement xtime_nsec.
(This doesn't cause xtime_nsec to go negative, but it can cause it
to be small).
2) The remaining offset value is large, but just slightly less then
cycle_interval.
3) clocksource_adjust() is speeding up the clock, causing a
corrective amount (compensating for the increase in the multiplier
being multiplied against the unaccumulated offset value) to be
subtracted from xtime_nsec.
This can cause xtime_nsec to underflow.
Unfortunately, since we notify the NTP subsystem via second_overflow()
whenever we accumulate a full second, and this effects the error
accumulation that has already occured, we cannot simply revert the
accumulated second from xtime nor move the second accumulation to after
the clocksource_adjust call without a change in behavior.
This leaves us with (at least) two options:
1) Simply return from clocksource_adjust() without making a change if we
notice the adjustment would cause xtime_nsec to go negative.
This would work, but I'm concerned that if a large adjustment was needed
(due to the error being large), it may be possible to get stuck with an
ever increasing error that becomes too large to correct (since it may
always force xtime_nsec negative). This may just be paranoia on my part.
2) Catch xtime_nsec if it is negative, then add back the amount its
negative to both xtime_nsec and the error.
This second method is consistent with how we've handled earlier rounding
issues, and also has the benefit that the error being added is always in
the oposite direction also always equal or smaller then the correction
being applied. So the risk of a corner case where things get out of
control is lessened.
This patch fixes bug 11970, as tested by Yanmin Zhang
http://bugzilla.kernel.org/show_bug.cgi?id=11970
Reported-by: alex.shi@intel.com
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Tested-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-12-01 19:34:41 -07:00
|
|
|
* its possible the required corrective factor to xtime_nsec could
|
|
|
|
* cause it to underflow.
|
|
|
|
*
|
|
|
|
* Now, we 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.
|
|
|
|
*/
|
2009-08-14 07:47:26 -06:00
|
|
|
if (unlikely((s64)timekeeper.xtime_nsec < 0)) {
|
|
|
|
s64 neg = -(s64)timekeeper.xtime_nsec;
|
|
|
|
timekeeper.xtime_nsec = 0;
|
2009-08-14 07:47:27 -06:00
|
|
|
timekeeper.ntp_error += neg << timekeeper.ntp_error_shift;
|
time: catch xtime_nsec underflows and fix them
Impact: fix time warp bug
Alex Shi, along with Yanmin Zhang have been noticing occasional time
inconsistencies recently. Through their great diagnosis, they found that
the xtime_nsec value used in update_wall_time was occasionally going
negative. After looking through the code for awhile, I realized we have
the possibility for an underflow when three conditions are met in
update_wall_time():
1) We have accumulated a second's worth of nanoseconds, so we
incremented xtime.tv_sec and appropriately decrement xtime_nsec.
(This doesn't cause xtime_nsec to go negative, but it can cause it
to be small).
2) The remaining offset value is large, but just slightly less then
cycle_interval.
3) clocksource_adjust() is speeding up the clock, causing a
corrective amount (compensating for the increase in the multiplier
being multiplied against the unaccumulated offset value) to be
subtracted from xtime_nsec.
This can cause xtime_nsec to underflow.
Unfortunately, since we notify the NTP subsystem via second_overflow()
whenever we accumulate a full second, and this effects the error
accumulation that has already occured, we cannot simply revert the
accumulated second from xtime nor move the second accumulation to after
the clocksource_adjust call without a change in behavior.
This leaves us with (at least) two options:
1) Simply return from clocksource_adjust() without making a change if we
notice the adjustment would cause xtime_nsec to go negative.
This would work, but I'm concerned that if a large adjustment was needed
(due to the error being large), it may be possible to get stuck with an
ever increasing error that becomes too large to correct (since it may
always force xtime_nsec negative). This may just be paranoia on my part.
2) Catch xtime_nsec if it is negative, then add back the amount its
negative to both xtime_nsec and the error.
This second method is consistent with how we've handled earlier rounding
issues, and also has the benefit that the error being added is always in
the oposite direction also always equal or smaller then the correction
being applied. So the risk of a corner case where things get out of
control is lessened.
This patch fixes bug 11970, as tested by Yanmin Zhang
http://bugzilla.kernel.org/show_bug.cgi?id=11970
Reported-by: alex.shi@intel.com
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Tested-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-12-01 19:34:41 -07:00
|
|
|
}
|
|
|
|
|
2008-09-22 15:42:43 -06:00
|
|
|
/* store full nanoseconds into xtime after rounding it up and
|
|
|
|
* add the remainder to the error difference.
|
|
|
|
*/
|
2009-08-14 07:47:27 -06:00
|
|
|
xtime.tv_nsec = ((s64) timekeeper.xtime_nsec >> timekeeper.shift) + 1;
|
|
|
|
timekeeper.xtime_nsec -= (s64) xtime.tv_nsec << timekeeper.shift;
|
|
|
|
timekeeper.ntp_error += timekeeper.xtime_nsec <<
|
|
|
|
timekeeper.ntp_error_shift;
|
2007-05-08 01:27:59 -06:00
|
|
|
|
2009-08-14 07:47:26 -06:00
|
|
|
nsecs = clocksource_cyc2ns(offset, clock->mult, clock->shift);
|
|
|
|
update_xtime_cache(nsecs);
|
2007-07-24 19:38:34 -06:00
|
|
|
|
2007-05-08 01:27:59 -06:00
|
|
|
/* check to see if there is a new clocksource to use */
|
|
|
|
change_clocksource();
|
2009-08-14 07:47:26 -06:00
|
|
|
update_vsyscall(&xtime, timekeeper.clock);
|
2007-05-08 01:27:59 -06:00
|
|
|
}
|
2007-07-16 00:39:41 -06:00
|
|
|
|
|
|
|
/**
|
|
|
|
* getboottime - Return the real time of system boot.
|
|
|
|
* @ts: pointer to the timespec to be set
|
|
|
|
*
|
|
|
|
* Returns the time of day in a timespec.
|
|
|
|
*
|
|
|
|
* 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)
|
|
|
|
{
|
|
|
|
set_normalized_timespec(ts,
|
|
|
|
- (wall_to_monotonic.tv_sec + total_sleep_time),
|
|
|
|
- wall_to_monotonic.tv_nsec);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* monotonic_to_bootbased - Convert the monotonic time to boot based.
|
|
|
|
* @ts: pointer to the timespec to be converted
|
|
|
|
*/
|
|
|
|
void monotonic_to_bootbased(struct timespec *ts)
|
|
|
|
{
|
|
|
|
ts->tv_sec += total_sleep_time;
|
|
|
|
}
|
2007-07-24 18:47:43 -06:00
|
|
|
|
2007-07-24 19:38:34 -06:00
|
|
|
unsigned long get_seconds(void)
|
|
|
|
{
|
|
|
|
return xtime_cache.tv_sec;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(get_seconds);
|
|
|
|
|
|
|
|
|
2007-07-24 18:47:43 -06:00
|
|
|
struct timespec current_kernel_time(void)
|
|
|
|
{
|
|
|
|
struct timespec now;
|
|
|
|
unsigned long seq;
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&xtime_lock);
|
|
|
|
|
2007-07-24 19:38:34 -06:00
|
|
|
now = xtime_cache;
|
2007-07-24 18:47:43 -06:00
|
|
|
} while (read_seqretry(&xtime_lock, seq));
|
|
|
|
|
|
|
|
return now;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(current_kernel_time);
|