Possible clocksource wrapping issues w/ new vdso clock_gettime() code?
Hey Andi,
I've not been able to review the new vdso code very carefully yet, but
I noticed one thing right off: the offset calculation is not masked, so its possible w/ counters less then 64bits wide to have wrapping issues.
It seems something like the following would be needed.
arch/x86_64/vdso/vclock_gettime.c +2 -2
@@ -36,8 +36,8 @@ static inline long vgetns(void) {cycles_t (*vread)(void); vread = gtod->clock.vread; -return ((vread () - gtod->clock.cycle_last) * gtod->clock.mult) >> - gtod->clock.shift; +return (((vread () - gtod->clock.cycle_last) & gtod->clock.mask) * + gtod->clock.mult) >> gtod->clock.shift; } static noinline int do_realtime(struct timespec *ts)
Or am I just missing something?
thanks
-john
Quoted 4 lines · john stultz
Hey Andi,
I've not been able to review the new vdso code very carefully yet, but
I noticed one thing right off: the offset calculation is not masked, so its possible w/ counters less then 64bits wide to have wrapping issues.
Here's another minor cleanup. Looks like wall_time_nsec is being set twice.
arch/x86_64/kernel/vsyscall.c +0 -1
@@ -80,7 +80,6 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock) vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec; vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; vsyscall_gtod_data.sys_tz = sys_tz; - vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic;write_sequnlock_irqrestore (&vsyscall_gtod_data.lock, flags); }
Also, is there a reason why with the new __vdso_gettimeofday implementation, the old do_vgettimeofday has not been removed?
thanks
-john