From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751894AbdIKQUB (ORCPT ); Mon, 11 Sep 2017 12:20:01 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:34206 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750969AbdIKQT7 (ORCPT ); Mon, 11 Sep 2017 12:19:59 -0400 X-Google-Smtp-Source: ADKCNb5DLlWMxafz0CrteOOqf821rfYbMD5EL7ugwyo6Mq4cfYz6tfU40OaZVIRCdjUwejDuQpRB6A== From: Mark Salyzyn To: linux-kernel@vger.kernel.org Cc: kevin.brodsky@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, mingo@kernel.org, borntraeger@de.ibm.com, james.morse@arm.com, peterz@infradead.org, Dave.Martin@arm.com, credmonster@gmail.com, zijun_hu@htc.com, mark.rutland@arm.com, jszhang@marvell.com, labbott@redhat.com, john.stultz@linaro.org, keescook@chromium.org, linux-arm-kernel@lists.infradead.org, takahiro.akashi@linaro.org, mmarek@suse.com, ard.biesheuvel@linaro.org, Mark Salyzyn , Russell King , Mark Salyzyn , Andy Lutomirski , Marc Zyngier , Dmitry Safonov , Scott Wood Subject: [PATCH 3/3] arm+arm64: vdso: Add support for CLOCK_BOOTTIME Date: Mon, 11 Sep 2017 09:19:36 -0700 Message-Id: <20170911161947.112946-1-salyzyn@android.com> X-Mailer: git-send-email 2.14.1.581.gf28d330327-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Mark Salyzyn --- arch/arm/include/asm/vdso_datapage.h | 1 + arch/arm/kernel/vdso.c | 1 + arch/arm/vdso/vgettimeofday.c | 56 ++++++++++++++++++++++++++++++++++ arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/vdso.c | 1 + 5 files changed, 60 insertions(+) diff --git a/arch/arm/include/asm/vdso_datapage.h b/arch/arm/include/asm/vdso_datapage.h index d57c296f7f52..d2c8e0807f06 100644 --- a/arch/arm/include/asm/vdso_datapage.h +++ b/arch/arm/include/asm/vdso_datapage.h @@ -47,6 +47,7 @@ struct vdso_data { u32 tz_minuteswest; /* timezone info for gettimeofday(2) */ u32 tz_dsttime; + u64 btm_nsec; /* monotonic to boot time */ u32 cs_raw_mult; /* Raw clocksource multipler */ u32 raw_time_sec; /* Raw time */ u32 raw_time_nsec; diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index 74bede343ffc..d55b2b217700 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -347,6 +347,7 @@ void update_vsyscall(struct timekeeper *tk) /* tkr_mono.shift == tkr_raw.shift */ vdso_data->cs_shift = tk->tkr_mono.shift; vdso_data->cs_mask = tk->tkr_mono.mask; + vdso_data->btm_nsec = ktime_to_ns(tk->offs_boot); } vdso_write_end(vdso_data); diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index 786ff319aead..be65da32e838 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -209,6 +209,51 @@ static __always_inline notrace int do_monotonic_raw(const struct vdso_data *vd, return 0; } +static __always_inline notrace int do_boottime(const struct vdso_data *vd, + struct timespec *ts) +{ + u32 seq, mult, shift; + u64 nsec, cycle_last, wtm_nsec; +#ifdef ARCH_CLOCK_FIXED_MASK + static const u64 mask = ARCH_CLOCK_FIXED_MASK; +#else + u64 mask; +#endif + + typeof(ts->tv_sec) sec; + + do { + seq = vdso_read_begin(vd); + + if (vd->use_syscall) + return -1; + + cycle_last = vd->cs_cycle_last; + + mult = vd->cs_mono_mult; + shift = vd->cs_shift; +#ifndef ARCH_CLOCK_FIXED_MASK + mask = vd->cs_mask; +#endif + + sec = vd->xtime_clock_sec; + nsec = vd->xtime_clock_snsec; + + sec += vd->wtm_clock_sec; + wtm_nsec = vd->wtm_clock_nsec + vd->btm_nsec; + + } while (unlikely(vdso_read_retry(vd, seq))); + + nsec += get_clock_shifted_nsec(cycle_last, mult, mask); + nsec >>= shift; + nsec += wtm_nsec; + + ts->tv_sec = sec + __iter_div_u64_rem(nsec, NSEC_PER_SEC, &nsec); + ts->tv_nsec = nsec; + + return 0; +} + #else /* CONFIG_ARM_ARCH_TIMER */ static notrace int do_realtime(const struct vdso_data *vd, @@ -229,6 +274,12 @@ static notrace int do_monotonic_raw(const struct vdso_data *vd, return -1; } +static notrace int do_boottime(const struct vdso_data *vd, + struct timespec *ts) +{ + return -1; +} + #endif /* CONFIG_ARM_ARCH_TIMER */ static notrace void do_realtime_coarse(const struct vdso_data *vd, @@ -301,6 +352,10 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) case CLOCK_MONOTONIC_COARSE: do_monotonic_coarse(vd, ts); break; + case CLOCK_BOOTTIME: + if (do_boottime(vd, ts)) + goto fallback; + break; default: goto fallback; } @@ -337,6 +392,7 @@ int __vdso_clock_getres(clockid_t clock_id, struct timespec *res) typeof(res->tv_nsec) nsec; if (clock_id == CLOCK_REALTIME || + clock_id == CLOCK_BOOTTIME || clock_id == CLOCK_MONOTONIC || clock_id == CLOCK_MONOTONIC_RAW) nsec = MONOTONIC_RES_NSEC; diff --git a/arch/arm64/include/asm/vdso_datapage.h b/arch/arm64/include/asm/vdso_datapage.h index c9e30226cdbc..1e115b0f373d 100644 --- a/arch/arm64/include/asm/vdso_datapage.h +++ b/arch/arm64/include/asm/vdso_datapage.h @@ -30,6 +30,7 @@ struct vdso_data { __u64 xtime_coarse_nsec; __u64 wtm_clock_sec; /* Wall to monotonic time */ __u64 wtm_clock_nsec; + __u64 btm_nsec; /* monotonic to boot time */ __u32 tb_seq_count; /* Timebase sequence counter */ /* cs_* members must be adjacent and in this order (ldp accesses) */ __u32 cs_mono_mult; /* NTP-adjusted clocksource multiplier */ diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 59f150c25889..0710edd8bedc 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -243,6 +243,7 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->cs_raw_mult = tk->tkr_raw.mult; /* tkr_mono.shift == tkr_raw.shift */ vdso_data->cs_shift = tk->tkr_mono.shift; + vdso_data->btm_nsec = ktime_to_ns(tk->offs_boot); } smp_wmb(); -- 2.14.1.581.gf28d330327-goog