mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
b5b4453e79
Jakub Drnec reported:
Setting the realtime clock can sometimes make the monotonic clock go
back by over a hundred years. Decreasing the realtime clock across
the y2k38 threshold is one reliable way to reproduce. Allegedly this
can also happen just by running ntpd, I have not managed to
reproduce that other than booting with rtc at >2038 and then running
ntp. When this happens, anything with timers (e.g. openjdk) breaks
rather badly.
And included a test case (slightly edited for brevity):
#define _POSIX_C_SOURCE 199309L
#include <stdio.h>
#include <time.h>
#include <stdlib.h>
#include <unistd.h>
long get_time(void) {
struct timespec tp;
clock_gettime(CLOCK_MONOTONIC, &tp);
return tp.tv_sec + tp.tv_nsec / 1000000000;
}
int main(void) {
long last = get_time();
while(1) {
long now = get_time();
if (now < last) {
printf("clock went backwards by %ld seconds!\n", last - now);
}
last = now;
sleep(1);
}
return 0;
}
Which when run concurrently with:
# date -s 2040-1-1
# date -s 2037-1-1
Will detect the clock going backward.
The root cause is that wtom_clock_sec in struct vdso_data is only a
32-bit signed value, even though we set its value to be equal to
tk->wall_to_monotonic.tv_sec which is 64-bits.
Because the monotonic clock starts at zero when the system boots the
wall_to_montonic.tv_sec offset is negative for current and future
dates. Currently on a freshly booted system the offset will be in the
vicinity of negative 1.5 billion seconds.
However if the wall clock is set past the Y2038 boundary, the offset
from wall to monotonic becomes less than negative 2^31, and no longer
fits in 32-bits. When that value is assigned to wtom_clock_sec it is
truncated and becomes positive, causing the VDSO assembly code to
calculate CLOCK_MONOTONIC incorrectly.
That causes CLOCK_MONOTONIC to jump ahead by ~4 billion seconds which
it is not meant to do. Worse, if the time is then set back before the
Y2038 boundary CLOCK_MONOTONIC will jump backward.
We can fix it simply by storing the full 64-bit offset in the
vdso_data, and using that in the VDSO assembly code. We also shuffle
some of the fields in vdso_data to avoid creating a hole.
The original commit that added the CLOCK_MONOTONIC support to the VDSO
did actually use a 64-bit value for wtom_clock_sec, see commit
a7f290dad3 ("[PATCH] powerpc: Merge vdso's and add vdso support to
32 bits kernel") (Nov 2005). However just 3 days later it was
converted to 32-bits in commit 0c37ec2aa8 ("[PATCH] powerpc: vdso
fixes (take #2)"), and the bug has existed since then AFAICS.
Fixes: 0c37ec2aa8 ("[PATCH] powerpc: vdso fixes (take #2)")
Cc: stable@vger.kernel.org # v2.6.15+
Link: http://lkml.kernel.org/r/HaC.ZfES.62bwlnvAvMP.1STMMj@seznam.cz
Reported-by: Jakub Drnec <jaydee@email.cz>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
124 lines
4.3 KiB
C
124 lines
4.3 KiB
C
#ifndef _VDSO_DATAPAGE_H
|
|
#define _VDSO_DATAPAGE_H
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
* Copyright (C) 2002 Peter Bergner <bergner@vnet.ibm.com>, IBM
|
|
* Copyright (C) 2005 Benjamin Herrenschmidy <benh@kernel.crashing.org>,
|
|
* IBM Corp.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
|
|
/*
|
|
* Note about this structure:
|
|
*
|
|
* This structure was historically called systemcfg and exposed to
|
|
* userland via /proc/ppc64/systemcfg. Unfortunately, this became an
|
|
* ABI issue as some proprietary software started relying on being able
|
|
* to mmap() it, thus we have to keep the base layout at least for a
|
|
* few kernel versions.
|
|
*
|
|
* However, since ppc32 doesn't suffer from this backward handicap,
|
|
* a simpler version of the data structure is used there with only the
|
|
* fields actually used by the vDSO.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* If the major version changes we are incompatible.
|
|
* Minor version changes are a hint.
|
|
*/
|
|
#define SYSTEMCFG_MAJOR 1
|
|
#define SYSTEMCFG_MINOR 1
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <linux/unistd.h>
|
|
#include <linux/time.h>
|
|
|
|
#define SYSCALL_MAP_SIZE ((NR_syscalls + 31) / 32)
|
|
|
|
/*
|
|
* So here is the ppc64 backward compatible version
|
|
*/
|
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
struct vdso_data {
|
|
__u8 eye_catcher[16]; /* Eyecatcher: SYSTEMCFG:PPC64 0x00 */
|
|
struct { /* Systemcfg version numbers */
|
|
__u32 major; /* Major number 0x10 */
|
|
__u32 minor; /* Minor number 0x14 */
|
|
} version;
|
|
|
|
/* Note about the platform flags: it now only contains the lpar
|
|
* bit. The actual platform number is dead and buried
|
|
*/
|
|
__u32 platform; /* Platform flags 0x18 */
|
|
__u32 processor; /* Processor type 0x1C */
|
|
__u64 processorCount; /* # of physical processors 0x20 */
|
|
__u64 physicalMemorySize; /* Size of real memory(B) 0x28 */
|
|
__u64 tb_orig_stamp; /* Timebase at boot 0x30 */
|
|
__u64 tb_ticks_per_sec; /* Timebase tics / sec 0x38 */
|
|
__u64 tb_to_xs; /* Inverse of TB to 2^20 0x40 */
|
|
__u64 stamp_xsec; /* 0x48 */
|
|
__u64 tb_update_count; /* Timebase atomicity ctr 0x50 */
|
|
__u32 tz_minuteswest; /* Minutes west of Greenwich 0x58 */
|
|
__u32 tz_dsttime; /* Type of dst correction 0x5C */
|
|
__u32 dcache_size; /* L1 d-cache size 0x60 */
|
|
__u32 dcache_line_size; /* L1 d-cache line size 0x64 */
|
|
__u32 icache_size; /* L1 i-cache size 0x68 */
|
|
__u32 icache_line_size; /* L1 i-cache line size 0x6C */
|
|
|
|
/* those additional ones don't have to be located anywhere
|
|
* special as they were not part of the original systemcfg
|
|
*/
|
|
__u32 dcache_block_size; /* L1 d-cache block size */
|
|
__u32 icache_block_size; /* L1 i-cache block size */
|
|
__u32 dcache_log_block_size; /* L1 d-cache log block size */
|
|
__u32 icache_log_block_size; /* L1 i-cache log block size */
|
|
__u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */
|
|
__s32 wtom_clock_nsec; /* Wall to monotonic clock nsec */
|
|
__s64 wtom_clock_sec; /* Wall to monotonic clock sec */
|
|
struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */
|
|
__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
|
__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
|
};
|
|
|
|
#else /* CONFIG_PPC64 */
|
|
|
|
/*
|
|
* And here is the simpler 32 bits version
|
|
*/
|
|
struct vdso_data {
|
|
__u64 tb_orig_stamp; /* Timebase at boot 0x30 */
|
|
__u64 tb_ticks_per_sec; /* Timebase tics / sec 0x38 */
|
|
__u64 tb_to_xs; /* Inverse of TB to 2^20 0x40 */
|
|
__u64 stamp_xsec; /* 0x48 */
|
|
__u32 tb_update_count; /* Timebase atomicity ctr 0x50 */
|
|
__u32 tz_minuteswest; /* Minutes west of Greenwich 0x58 */
|
|
__u32 tz_dsttime; /* Type of dst correction 0x5C */
|
|
__s32 wtom_clock_sec; /* Wall to monotonic clock */
|
|
__s32 wtom_clock_nsec;
|
|
struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */
|
|
__u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */
|
|
__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
|
__u32 dcache_block_size; /* L1 d-cache block size */
|
|
__u32 icache_block_size; /* L1 i-cache block size */
|
|
__u32 dcache_log_block_size; /* L1 d-cache log block size */
|
|
__u32 icache_log_block_size; /* L1 i-cache log block size */
|
|
};
|
|
|
|
#endif /* CONFIG_PPC64 */
|
|
|
|
extern struct vdso_data *vdso_data;
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _SYSTEMCFG_H */
|