Re: [PATCH] time: x86: Fix race switching from vsyscall to non-vsyscallclock

From: Thomas Gleixner
Date: Mon Mar 12 2012 - 12:08:27 EST


On Fri, 9 Mar 2012, John Stultz wrote:

> When switching from a vsyscall capable to a non-vsyscall capable
> clocksource, there was a small race, where the last vsyscall
> gettimeofday before the switch might return a invalid time value
> using the new non-vsyscall enabled clocksource values after the
> switch is complete.
>
> This is due to the vsyscall code checking the vclock_mode once
> outside of the seqcount protected section. After it reads the
> vclock mode, it doesn't re-check that the sampled clock data
> that is obtained in the seqcount critical section still matches.
>
> The fix is to sample vclock_mode inside the protected section,
> and as long as it isn't VCLOCK_NONE, return the calculated
> value. If it has changed and is now VCLOCK_NONE, fall back
> to the syscall gettime calculation.
>
> CC: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
> CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
> ---
> arch/x86/vdso/vclock_gettime.c | 25 ++++++++++++++++++++-----
> 1 files changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
> index 6bc0e72..e7cf1dd 100644
> --- a/arch/x86/vdso/vclock_gettime.c
> +++ b/arch/x86/vdso/vclock_gettime.c
> @@ -85,21 +85,28 @@ notrace static inline long vgetns(void)
> notrace static noinline int do_realtime(struct timespec *ts)
> {
> unsigned long seq, ns;
> + int mode;
> do {
> seq = read_seqbegin(&gtod->lock);
> + mode = gtod->clock.vclock_mode;
> ts->tv_sec = gtod->wall_time_sec;
> ts->tv_nsec = gtod->wall_time_nsec;
> ns = vgetns();
> } while (unlikely(read_seqretry(&gtod->lock, seq)));
> +
> timespec_add_ns(ts, ns);
> + if (mode == VCLOCK_NONE)
> + return -1;

Can't we just return mode and avoid repeated conditionals all over the
place ?

> {
res = VCLOCK_NONE;

> switch (clock) {
> case CLOCK_REALTIME:
> - if (likely(gtod->clock.vclock_mode != VCLOCK_NONE))
> - return do_realtime(ts);

res = do_realtime(ts);
break;


> case CLOCK_MONOTONIC_COARSE:
> return do_monotonic_coarse(ts);
> }

return res != VCLOCK_NONE ? 0 : vdso_fallback_gettime(clock, ts);

Thanks,

tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/