time: compensate for rounding on odd-frequency clocksources
PATCH 1/1 time: compensate for rounding on odd-frequency clocksources
When the clocksource is not a multiple of HZ, the clock will be off. For acpi_pm, HZ=1000 the error is 127.111 ppm:
The rounding of cycle_interval ends up generating a false error term in ntp_error accumulation since xtime_interval is not exactly 1/HZ. So, we subtract out the error caused by the rounding.
This has been visible since 2.6.32-rc2
commit a092ff0f90cae22b2ac8028ecd2c6f6c1a9e4601 time: Implement logarithmic time accumulation
That commit raised NTP_INTERVAL_FREQ and exposed the rounding error.
testing tool: http://n1.taur.dk/permanent/testpmt.c
Also tested with ntpd and a frequency counter.
patch against 2.6.36-rc3-next.
--- kernel/time/timekeeping.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
kernel/time/timekeeping.c +7 -2
@@ -32,6 +32,8 @@ struct timekeeper {cycle_t cycle_interval;/* Number of clock shifted nano seconds in one NTP interval. */ u64 xtime_interval; +/* shifted nano seconds left over when rounding cycle_interval */ +s64 xtime_remainder;/* Raw nano seconds accumulated per NTP interval. */ u32 raw_interval;
@@ -62,7 +64,7 @@ struct timekeeper timekeeper;static void timekeeper_setup_internals (struct clocksource *clock) {cycle_t interval; -u64 tmp; +u64 tmp, ntpinterval; timekeeper.clock = clock; clock->cycle_last = clock->read (clock);
@@ -70,6 +72,7 @@ static void timekeeper_setup_internals(struct clocksource *clock)/* Do the ns -> cycle conversion first, using original mult */ tmp =NTP_INTERVAL_LENGTH ; tmp <<= clock->shift; + ntpinterval = tmp; tmp += clock->mult/2 ;do_div (tmp, clock->mult);if (tmp ==0 )
@@ -80,6 +83,7 @@ static void timekeeper_setup_internals(struct clocksource *clock)/* Go back from cycles -> shifted ns */ timekeeper.xtime_interval = (u64 ) interval * clock->mult; + timekeeper.xtime_remainder = ntpinterval - timekeeper.xtime_interval; timekeeper.raw_interval = ((u64 ) interval * clock->mult) >> clock->shift;
@@ -746,7 +750,8 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)/* Accumulate error between NTP and clock interval */ timekeeper.ntp_error += tick_length << shift; - timekeeper.ntp_error -= timekeeper.xtime_interval << + timekeeper.ntp_error -= + (timekeeper.xtime_interval + timekeeper.xtime_remainder) << (timekeeper.ntp_error_shift + shift);return offset;
Quoted 6 lines · Kasper Pedersen
When the clocksource is not a multiple of HZ, the clock will be off. For
acpi_pm, HZ=1000 the error is 127.111 ppm:The rounding of
cycle_intervalends up generating a false error term inntp_erroraccumulation sincextime_intervalis not exactly 1/HZ. So, we subtract out the error caused by the rounding.
Yes, this has been a long outstanding granularity error issue and I argued with Roman way back in the day about it until I just gave up on it (as long as the error is constant from boot to boot, and not terribly bad, NTPd can correct for it).
Quoted 4 lines
This has been visible since 2.6.32-rc2
commit a092ff0f90cae22b2ac8028ecd2c6f6c1a9e4601 time: Implement logarithmic time accumulationThat commit raised
NTP_INTERVAL_FREQand exposed the rounding error.
Well, only for CONFIG_NOHZ=y systems. Otherwise, the issue has been present since 2.6.18/2.6.21. Having the longer ntp interval did help minimize this error, but caused other issues with coarse accumulation.
Quoted 42 lines
testing tool: http://n1.taur.dk/permanent/testpmt.c
Also tested with ntpd and a frequency counter.patch against 2.6.36-rc3-next.
Signed-off-by Kasper Pedersen <[email protected]>--- kernel/time/timekeeping.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)kernel/time/timekeeping.c +4
-1@@ -32,6 +32,8 @@ struct timekeeper {cycle_t cycle_interval;/* Number of clock shifted nano seconds in one NTP interval. */ u64 xtime_interval; +/* shifted nano seconds left over when rounding cycle_interval */ +s64 xtime_remainder;/* Raw nano seconds accumulated per NTP interval. */ u32 raw_interval;@@ -62,7 +64,7 @@ struct timekeeper timekeeper;static void timekeeper_setup_internals (struct clocksource *clock) {cycle_t interval; -u64 tmp; +u64 tmp, ntpinterval; timekeeper.clock = clock; clock->cycle_last = clock->read (clock);@@ -70,6 +72,7 @@ static void timekeeper_setup_internals(struct clocksource *clock)/* Do the ns -> cycle conversion first, using original mult */ tmp =NTP_INTERVAL_LENGTH ; tmp <<= clock->shift; + ntpinterval = tmp; tmp += clock->mult/2 ;do_div (tmp, clock->mult);if (tmp ==0 )
kernel/time/timekeeping.c static void timekeeper_setup_internals(struct clocksource *clock) · line 88
Quoted 6 lines
kernel/time/timekeeping.c +1
-0@@ -80,6 +83,7 @@ static void timekeeper_setup_internals(struct clocksource *clock)/* Go back from cycles -> shifted ns */ timekeeper.xtime_interval = (u64 ) interval * clock->mult; + timekeeper.xtime_remainder = ntpinterval - timekeeper.xtime_interval; timekeeper.raw_interval = ((u64 ) interval * clock->mult) >> clock->shift;
So the above looks ok.
kernel/time/timekeeping.c static cycle_t logarithmic_accumulation(cycle_t offset, int shift) · line 755
Quoted 8 lines
kernel/time/timekeeping.c +2
-1@@ -746,7 +750,8 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)/* Accumulate error between NTP and clock interval */ timekeeper.ntp_error += tick_length << shift; - timekeeper.ntp_error -= timekeeper.xtime_interval << + timekeeper.ntp_error -= + (timekeeper.xtime_interval + timekeeper.xtime_remainder) << (timekeeper.ntp_error_shift + shift);
I like that you used the error value to handle the correction, its equivalent, but cleaner than my earlier attempt of altering the base ntp interval used to calculate tick_length so that it matched a multiple of the clocksource period.
However, one concern might be: by always adding the clocksource-constant xtime_remainder value, do you cause issues with the freq adjustments, as they are only made against the xtime_interval, and not both?
In other words: If the initial error is removed with this patch, if you make a 10ppm adjustment, does the system time accurately skew at 10ppm?
Intuitively it seems the xtime_remainder would be so small, that the error in the specified freq adjustment would be negligible. The freq error should be the result of the adjustment * corrected error.
So in the acpi_pm case of 127ppm granularity error, with a maximum adjustment of 500ppm, the freq error should be ~60ppb (that's *billion*).
Assuming the granularity of all clocks are under 500ppm (otherwise ntp couldn't fix it), that limited the maximum freq error to 250ppb.
I'd say that's small enough that we don't care. But let me know if you see an issue with my math.
thanks
-john