mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-10-26 10:57:38 +08:00
The vDSO basetime of a clock is stored in the scaled nanoseconds of
tkr_mono, so that the reader can floor the base and the cycle delta
together in vdso_calc_ns().
vdso_time_update_aux() instead shifts the base down to nanoseconds, adds
the offset, and shifts it back up, which zeroes the fractional nanoseconds
of xtime_nsec. The reader then floors the base and the delta separately:
ktime_get_aux(): base + ((delta * mult + xtime_nsec) >> shift)
vdso: base + (xtime_nsec >> shift)
+ ((delta * mult) >> shift)
Since floor(a) + floor(b) <= floor(a + b), the vDSO reports 0 or 1 ns
below the syscall for the same clock. It is not a monotonicity problem:
across an update the step is floor(a + d) - floor(a) - floor(d), which is
0 or 1, never negative.
Add the offset in scaled nanoseconds as the other high resolution clocks
do, and normalise with __iter_div64_u64_rem() so that the stored base
stays below one second and the userspace fast-path does not iterate more
in __iter_div_u64_rem().
Only the sub-second field changes. (a + (b << shift)) >> shift is exactly
(a >> shift) + b, so the seconds carried out of the normalisation are the
same as before; what the old form dropped was the low shift bits of the
remainder.
monotonic_to_aux.tv_nsec is a normalised timespec64 fraction, so it stays
below NSEC_PER_SEC even for a negative offset, and the sum stays below
2 * (NSEC_PER_SEC << shift). The largest shift clocks_calc_mult_shift()
can pick is 32, which makes that 8.6e18 against a u64 limit of 1.8e19.
Fixes: 380b84e168 ("vdso/vsyscall: Update auxiliary clock data in the datapage")
Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Reviewed-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Link: https://patch.msgid.link/20261002153104.1347978-4-zhanxusheng@xiaomi.com
223 lines
6.2 KiB
C
223 lines
6.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright 2019 ARM Ltd.
|
|
*
|
|
* Generic implementation of update_vsyscall and update_vsyscall_tz.
|
|
*
|
|
* Based on the x86 specific implementation.
|
|
*/
|
|
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/timekeeper_internal.h>
|
|
#include <linux/vdso_time.h>
|
|
#include <vdso/datapage.h>
|
|
#include <vdso/helpers.h>
|
|
#include <vdso/vsyscall.h>
|
|
|
|
#include "timekeeping_internal.h"
|
|
|
|
#ifndef __arch_update_vdso_clock
|
|
static __always_inline void __arch_update_vdso_clock(struct vdso_clock *vc)
|
|
{
|
|
}
|
|
#endif /* __arch_update_vdso_clock */
|
|
|
|
#ifndef __arch_sync_vdso_time_data
|
|
static __always_inline void __arch_sync_vdso_time_data(struct vdso_time_data *vdata)
|
|
{
|
|
}
|
|
#endif /* __arch_sync_vdso_time_data */
|
|
|
|
static inline void fill_clock_configuration(struct vdso_clock *vc, const struct tk_read_base *base)
|
|
{
|
|
vc->cycle_last = base->cycle_last;
|
|
#ifdef CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT
|
|
vc->max_cycles = base->clock->max_cycles;
|
|
#endif
|
|
vc->mask = base->mask;
|
|
vc->mult = base->mult;
|
|
vc->shift = base->shift;
|
|
}
|
|
|
|
static inline void update_vdso_time_data(struct vdso_time_data *vdata, struct timekeeper *tk)
|
|
{
|
|
struct vdso_clock *vc = vdata->clock_data;
|
|
struct vdso_timestamp *vdso_ts;
|
|
u64 nsec, sec;
|
|
|
|
fill_clock_configuration(&vc[CS_HRES_COARSE], &tk->tkr_mono);
|
|
fill_clock_configuration(&vc[CS_RAW], &tk->tkr_raw);
|
|
|
|
/* CLOCK_MONOTONIC */
|
|
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_MONOTONIC];
|
|
vdso_ts->sec = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
|
|
|
|
nsec = tk->tkr_mono.xtime_nsec;
|
|
nsec += ((u64)tk->wall_to_monotonic.tv_nsec << tk->tkr_mono.shift);
|
|
vdso_ts->sec += __iter_div64_u64_rem(nsec, (u64)NSEC_PER_SEC << tk->tkr_mono.shift,
|
|
&vdso_ts->nsec);
|
|
|
|
/* Copy MONOTONIC time for BOOTTIME */
|
|
sec = vdso_ts->sec;
|
|
nsec = vdso_ts->nsec;
|
|
/* Add the boot offset */
|
|
sec += tk->monotonic_to_boot.tv_sec;
|
|
nsec += (u64)tk->monotonic_to_boot.tv_nsec << tk->tkr_mono.shift;
|
|
|
|
/* CLOCK_BOOTTIME */
|
|
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_BOOTTIME];
|
|
vdso_ts->sec = sec;
|
|
vdso_ts->sec += __iter_div64_u64_rem(nsec, (u64)NSEC_PER_SEC << tk->tkr_mono.shift,
|
|
&vdso_ts->nsec);
|
|
|
|
/* CLOCK_MONOTONIC_RAW */
|
|
vdso_ts = &vc[CS_RAW].basetime[CLOCK_MONOTONIC_RAW];
|
|
vdso_ts->sec = tk->raw_sec;
|
|
vdso_ts->nsec = tk->tkr_raw.xtime_nsec;
|
|
|
|
/* CLOCK_TAI */
|
|
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_TAI];
|
|
vdso_ts->sec = tk->xtime_sec + (s64)tk->tai_offset;
|
|
vdso_ts->nsec = tk->tkr_mono.xtime_nsec;
|
|
}
|
|
|
|
void update_vsyscall(struct timekeeper *tk)
|
|
{
|
|
struct vdso_time_data *vdata = vdso_k_time_data;
|
|
struct vdso_clock *vc = vdata->clock_data;
|
|
struct vdso_timestamp *vdso_ts;
|
|
s32 clock_mode;
|
|
u64 nsec;
|
|
|
|
/* copy vsyscall data */
|
|
vdso_write_begin(vdata);
|
|
|
|
clock_mode = tk->tkr_mono.clock->vdso_clock_mode;
|
|
vc[CS_HRES_COARSE].clock_mode = clock_mode;
|
|
vc[CS_RAW].clock_mode = clock_mode;
|
|
|
|
/* CLOCK_REALTIME also required for time() */
|
|
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_REALTIME];
|
|
vdso_ts->sec = tk->xtime_sec;
|
|
vdso_ts->nsec = tk->tkr_mono.xtime_nsec;
|
|
|
|
/* CLOCK_REALTIME_COARSE */
|
|
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_REALTIME_COARSE];
|
|
vdso_ts->sec = tk->xtime_sec;
|
|
vdso_ts->nsec = tk->coarse_nsec;
|
|
|
|
/* CLOCK_MONOTONIC_COARSE */
|
|
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_MONOTONIC_COARSE];
|
|
vdso_ts->sec = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
|
|
nsec = tk->coarse_nsec;
|
|
nsec = nsec + tk->wall_to_monotonic.tv_nsec;
|
|
vdso_ts->sec += __iter_div_u64_rem(nsec, NSEC_PER_SEC, &vdso_ts->nsec);
|
|
|
|
/*
|
|
* Read without the seqlock held by clock_getres().
|
|
*/
|
|
WRITE_ONCE(vdata->hrtimer_res, hrtimer_resolution);
|
|
|
|
/*
|
|
* If the current clocksource is not VDSO capable, then spare the
|
|
* update of the high resolution parts.
|
|
*/
|
|
if (clock_mode != VDSO_CLOCKMODE_NONE)
|
|
update_vdso_time_data(vdata, tk);
|
|
|
|
__arch_update_vdso_clock(&vc[CS_HRES_COARSE]);
|
|
__arch_update_vdso_clock(&vc[CS_RAW]);
|
|
|
|
vdso_write_end(vdata);
|
|
|
|
__arch_sync_vdso_time_data(vdata);
|
|
}
|
|
|
|
void update_vsyscall_tz(void)
|
|
{
|
|
struct vdso_time_data *vdata = vdso_k_time_data;
|
|
|
|
vdata->tz_minuteswest = sys_tz.tz_minuteswest;
|
|
vdata->tz_dsttime = sys_tz.tz_dsttime;
|
|
|
|
__arch_sync_vdso_time_data(vdata);
|
|
}
|
|
|
|
#ifdef CONFIG_POSIX_AUX_CLOCKS
|
|
void vdso_time_update_aux(struct timekeeper *tk)
|
|
{
|
|
struct vdso_time_data *vdata = vdso_k_time_data;
|
|
struct vdso_timestamp *vdso_ts;
|
|
struct vdso_clock *vc;
|
|
s32 clock_mode;
|
|
u64 nsec;
|
|
|
|
vc = &vdata->aux_clock_data[tk->id - TIMEKEEPER_AUX_FIRST];
|
|
vdso_ts = &vc->basetime[VDSO_BASE_AUX];
|
|
clock_mode = tk->tkr_mono.clock->vdso_clock_mode;
|
|
if (!tk->clock_valid)
|
|
clock_mode = VDSO_CLOCKMODE_NONE;
|
|
|
|
/* copy vsyscall data */
|
|
vdso_write_begin_clock(vc);
|
|
|
|
vc->clock_mode = clock_mode;
|
|
|
|
if (clock_mode != VDSO_CLOCKMODE_NONE) {
|
|
fill_clock_configuration(vc, &tk->tkr_mono);
|
|
|
|
vdso_ts->sec = tk->xtime_sec + tk->monotonic_to_aux.tv_sec;
|
|
|
|
nsec = tk->tkr_mono.xtime_nsec;
|
|
nsec += (u64)tk->monotonic_to_aux.tv_nsec << tk->tkr_mono.shift;
|
|
vdso_ts->sec += __iter_div64_u64_rem(nsec,
|
|
(u64)NSEC_PER_SEC << tk->tkr_mono.shift,
|
|
&vdso_ts->nsec);
|
|
}
|
|
|
|
__arch_update_vdso_clock(vc);
|
|
|
|
vdso_write_end_clock(vc);
|
|
|
|
__arch_sync_vdso_time_data(vdata);
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* vdso_time_update_begin - Start of a VDSO update section
|
|
*
|
|
* Allows architecture code to safely update the architecture specific VDSO
|
|
* data. Disables interrupts, acquires timekeeper lock to serialize against
|
|
* concurrent updates from timekeeping and invalidates the VDSO data
|
|
* sequence counter to prevent concurrent readers from accessing
|
|
* inconsistent data.
|
|
*
|
|
* Returns: Saved interrupt flags which need to be handed in to
|
|
* vdso_time_update_end().
|
|
*/
|
|
unsigned long vdso_time_update_begin(void)
|
|
{
|
|
struct vdso_time_data *vdata = vdso_k_time_data;
|
|
unsigned long flags = timekeeper_lock_irqsave();
|
|
|
|
vdso_write_begin(vdata);
|
|
return flags;
|
|
}
|
|
|
|
/**
|
|
* vdso_time_update_end - End of a VDSO update section
|
|
* @flags: Interrupt flags as returned from vdso_time_update_begin()
|
|
*
|
|
* Pairs with vdso_time_update_begin(). Marks vdso data consistent, invokes data
|
|
* synchronization if the architecture requires it, drops timekeeper lock
|
|
* and restores interrupt flags.
|
|
*/
|
|
void vdso_time_update_end(unsigned long flags)
|
|
{
|
|
struct vdso_time_data *vdata = vdso_k_time_data;
|
|
|
|
vdso_write_end(vdata);
|
|
__arch_sync_vdso_time_data(vdata);
|
|
timekeeper_unlock_irqrestore(flags);
|
|
}
|