157a1a27d5
Commit "timekeeping: Fix clock_gettime vsyscall time warp" (0696b711e) introduced the new parameter "mult" to update_vsyscall(). This parameter contains the internal NTP adjusted clock multiplier. The s390x vdso did not use this adjusted multiplier. Instead, it used the constant clock multiplier for gettimeofday() and clock_gettime() variants. This may result in observable time warps as explained in commit0696b711e. Make the NTP adjusted clock multiplier available to the s390x vdso implementation and use it for time calculations. Cc: <stable@kernel.org> Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
52 lines
1.3 KiB
C
52 lines
1.3 KiB
C
#ifndef __S390_VDSO_H__
|
|
#define __S390_VDSO_H__
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/* Default link addresses for the vDSOs */
|
|
#define VDSO32_LBASE 0
|
|
#define VDSO64_LBASE 0
|
|
|
|
#define VDSO_VERSION_STRING LINUX_2.6.29
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/*
|
|
* Note about the vdso_data and vdso_per_cpu_data structures:
|
|
*
|
|
* NEVER USE THEM IN USERSPACE CODE DIRECTLY. The layout of the
|
|
* structure is supposed to be known only to the function in the vdso
|
|
* itself and may change without notice.
|
|
*/
|
|
|
|
struct vdso_data {
|
|
__u64 tb_update_count; /* Timebase atomicity ctr 0x00 */
|
|
__u64 xtime_tod_stamp; /* TOD clock for xtime 0x08 */
|
|
__u64 xtime_clock_sec; /* Kernel time 0x10 */
|
|
__u64 xtime_clock_nsec; /* 0x18 */
|
|
__u64 wtom_clock_sec; /* Wall to monotonic clock 0x20 */
|
|
__u64 wtom_clock_nsec; /* 0x28 */
|
|
__u32 tz_minuteswest; /* Minutes west of Greenwich 0x30 */
|
|
__u32 tz_dsttime; /* Type of dst correction 0x34 */
|
|
__u32 ectg_available;
|
|
__u32 ntp_mult; /* NTP adjusted multiplier 0x3C */
|
|
};
|
|
|
|
struct vdso_per_cpu_data {
|
|
__u64 ectg_timer_base;
|
|
__u64 ectg_user_time;
|
|
};
|
|
|
|
extern struct vdso_data *vdso_data;
|
|
|
|
#ifdef CONFIG_64BIT
|
|
int vdso_alloc_per_cpu(int cpu, struct _lowcore *lowcore);
|
|
void vdso_free_per_cpu(int cpu, struct _lowcore *lowcore);
|
|
#endif
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* __S390_VDSO_H__ */
|