mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 20:53:53 +08:00
1638b8f096
A recent commit removed the NULL pointer check from the clock_getres()
implementation causing a test case to fault.
POSIX requires an explicit NULL pointer check for clock_getres() aside of
the validity check of the clock_id argument for obscure reasons.
Add it back for both 32bit and 64bit.
Note, this is only a partial revert of the offending commit which does not
bring back the broken fallback invocation in the the 32bit compat
implementations of clock_getres() and clock_gettime().
Fixes: a9446a906f
("lib/vdso/32: Remove inconsistent NULL pointer checks")
Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1910211202260.1904@nanos.tec.linutronix.de
256 lines
5.9 KiB
C
256 lines
5.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Generic userspace implementations of gettimeofday() and similar.
|
|
*/
|
|
#include <linux/compiler.h>
|
|
#include <linux/math64.h>
|
|
#include <linux/time.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/hrtimer_defs.h>
|
|
#include <vdso/datapage.h>
|
|
#include <vdso/helpers.h>
|
|
|
|
/*
|
|
* The generic vDSO implementation requires that gettimeofday.h
|
|
* provides:
|
|
* - __arch_get_vdso_data(): to get the vdso datapage.
|
|
* - __arch_get_hw_counter(): to get the hw counter based on the
|
|
* clock_mode.
|
|
* - gettimeofday_fallback(): fallback for gettimeofday.
|
|
* - clock_gettime_fallback(): fallback for clock_gettime.
|
|
* - clock_getres_fallback(): fallback for clock_getres.
|
|
*/
|
|
#ifdef ENABLE_COMPAT_VDSO
|
|
#include <asm/vdso/compat_gettimeofday.h>
|
|
#else
|
|
#include <asm/vdso/gettimeofday.h>
|
|
#endif /* ENABLE_COMPAT_VDSO */
|
|
|
|
#ifndef vdso_calc_delta
|
|
/*
|
|
* Default implementation which works for all sane clocksources. That
|
|
* obviously excludes x86/TSC.
|
|
*/
|
|
static __always_inline
|
|
u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult)
|
|
{
|
|
return ((cycles - last) & mask) * mult;
|
|
}
|
|
#endif
|
|
|
|
static int do_hres(const struct vdso_data *vd, clockid_t clk,
|
|
struct __kernel_timespec *ts)
|
|
{
|
|
const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
|
|
u64 cycles, last, sec, ns;
|
|
u32 seq;
|
|
|
|
do {
|
|
seq = vdso_read_begin(vd);
|
|
cycles = __arch_get_hw_counter(vd->clock_mode);
|
|
ns = vdso_ts->nsec;
|
|
last = vd->cycle_last;
|
|
if (unlikely((s64)cycles < 0))
|
|
return -1;
|
|
|
|
ns += vdso_calc_delta(cycles, last, vd->mask, vd->mult);
|
|
ns >>= vd->shift;
|
|
sec = vdso_ts->sec;
|
|
} while (unlikely(vdso_read_retry(vd, seq)));
|
|
|
|
/*
|
|
* Do this outside the loop: a race inside the loop could result
|
|
* in __iter_div_u64_rem() being extremely slow.
|
|
*/
|
|
ts->tv_sec = sec + __iter_div_u64_rem(ns, NSEC_PER_SEC, &ns);
|
|
ts->tv_nsec = ns;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void do_coarse(const struct vdso_data *vd, clockid_t clk,
|
|
struct __kernel_timespec *ts)
|
|
{
|
|
const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
|
|
u32 seq;
|
|
|
|
do {
|
|
seq = vdso_read_begin(vd);
|
|
ts->tv_sec = vdso_ts->sec;
|
|
ts->tv_nsec = vdso_ts->nsec;
|
|
} while (unlikely(vdso_read_retry(vd, seq)));
|
|
}
|
|
|
|
static __maybe_unused int
|
|
__cvdso_clock_gettime_common(clockid_t clock, struct __kernel_timespec *ts)
|
|
{
|
|
const struct vdso_data *vd = __arch_get_vdso_data();
|
|
u32 msk;
|
|
|
|
/* Check for negative values or invalid clocks */
|
|
if (unlikely((u32) clock >= MAX_CLOCKS))
|
|
return -1;
|
|
|
|
/*
|
|
* Convert the clockid to a bitmask and use it to check which
|
|
* clocks are handled in the VDSO directly.
|
|
*/
|
|
msk = 1U << clock;
|
|
if (likely(msk & VDSO_HRES)) {
|
|
return do_hres(&vd[CS_HRES_COARSE], clock, ts);
|
|
} else if (msk & VDSO_COARSE) {
|
|
do_coarse(&vd[CS_HRES_COARSE], clock, ts);
|
|
return 0;
|
|
} else if (msk & VDSO_RAW) {
|
|
return do_hres(&vd[CS_RAW], clock, ts);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
static __maybe_unused int
|
|
__cvdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts)
|
|
{
|
|
int ret = __cvdso_clock_gettime_common(clock, ts);
|
|
|
|
if (unlikely(ret))
|
|
return clock_gettime_fallback(clock, ts);
|
|
return 0;
|
|
}
|
|
|
|
static __maybe_unused int
|
|
__cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
|
|
{
|
|
struct __kernel_timespec ts;
|
|
int ret;
|
|
|
|
ret = __cvdso_clock_gettime_common(clock, &ts);
|
|
|
|
#ifdef VDSO_HAS_32BIT_FALLBACK
|
|
if (unlikely(ret))
|
|
return clock_gettime32_fallback(clock, res);
|
|
#else
|
|
if (unlikely(ret))
|
|
ret = clock_gettime_fallback(clock, &ts);
|
|
#endif
|
|
|
|
if (likely(!ret)) {
|
|
res->tv_sec = ts.tv_sec;
|
|
res->tv_nsec = ts.tv_nsec;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static __maybe_unused int
|
|
__cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
|
|
{
|
|
const struct vdso_data *vd = __arch_get_vdso_data();
|
|
|
|
if (likely(tv != NULL)) {
|
|
struct __kernel_timespec ts;
|
|
|
|
if (do_hres(&vd[CS_HRES_COARSE], CLOCK_REALTIME, &ts))
|
|
return gettimeofday_fallback(tv, tz);
|
|
|
|
tv->tv_sec = ts.tv_sec;
|
|
tv->tv_usec = (u32)ts.tv_nsec / NSEC_PER_USEC;
|
|
}
|
|
|
|
if (unlikely(tz != NULL)) {
|
|
tz->tz_minuteswest = vd[CS_HRES_COARSE].tz_minuteswest;
|
|
tz->tz_dsttime = vd[CS_HRES_COARSE].tz_dsttime;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef VDSO_HAS_TIME
|
|
static __maybe_unused time_t __cvdso_time(time_t *time)
|
|
{
|
|
const struct vdso_data *vd = __arch_get_vdso_data();
|
|
time_t t = READ_ONCE(vd[CS_HRES_COARSE].basetime[CLOCK_REALTIME].sec);
|
|
|
|
if (time)
|
|
*time = t;
|
|
|
|
return t;
|
|
}
|
|
#endif /* VDSO_HAS_TIME */
|
|
|
|
#ifdef VDSO_HAS_CLOCK_GETRES
|
|
static __maybe_unused
|
|
int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
|
|
{
|
|
const struct vdso_data *vd = __arch_get_vdso_data();
|
|
u64 hrtimer_res;
|
|
u32 msk;
|
|
u64 ns;
|
|
|
|
/* Check for negative values or invalid clocks */
|
|
if (unlikely((u32) clock >= MAX_CLOCKS))
|
|
return -1;
|
|
|
|
hrtimer_res = READ_ONCE(vd[CS_HRES_COARSE].hrtimer_res);
|
|
/*
|
|
* Convert the clockid to a bitmask and use it to check which
|
|
* clocks are handled in the VDSO directly.
|
|
*/
|
|
msk = 1U << clock;
|
|
if (msk & VDSO_HRES) {
|
|
/*
|
|
* Preserves the behaviour of posix_get_hrtimer_res().
|
|
*/
|
|
ns = hrtimer_res;
|
|
} else if (msk & VDSO_COARSE) {
|
|
/*
|
|
* Preserves the behaviour of posix_get_coarse_res().
|
|
*/
|
|
ns = LOW_RES_NSEC;
|
|
} else if (msk & VDSO_RAW) {
|
|
/*
|
|
* Preserves the behaviour of posix_get_hrtimer_res().
|
|
*/
|
|
ns = hrtimer_res;
|
|
} else {
|
|
return -1;
|
|
}
|
|
|
|
if (likely(res)) {
|
|
res->tv_sec = 0;
|
|
res->tv_nsec = ns;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res)
|
|
{
|
|
int ret = __cvdso_clock_getres_common(clock, res);
|
|
|
|
if (unlikely(ret))
|
|
return clock_getres_fallback(clock, res);
|
|
return 0;
|
|
}
|
|
|
|
static __maybe_unused int
|
|
__cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
|
|
{
|
|
struct __kernel_timespec ts;
|
|
int ret;
|
|
|
|
ret = __cvdso_clock_getres_common(clock, &ts);
|
|
|
|
#ifdef VDSO_HAS_32BIT_FALLBACK
|
|
if (unlikely(ret))
|
|
return clock_getres32_fallback(clock, res);
|
|
#else
|
|
if (unlikely(ret))
|
|
ret = clock_getres_fallback(clock, &ts);
|
|
#endif
|
|
|
|
if (likely(!ret && res)) {
|
|
res->tv_sec = ts.tv_sec;
|
|
res->tv_nsec = ts.tv_nsec;
|
|
}
|
|
return ret;
|
|
}
|
|
#endif /* VDSO_HAS_CLOCK_GETRES */
|