mirror of
https://github.com/torvalds/linux.git
synced 2024-12-31 23:31:29 +00:00
a3ed0e4393
Revert commits92af4dcb4e
("tracing: Unify the "boot" and "mono" tracing clocks")127bfa5f43
("hrtimer: Unify MONOTONIC and BOOTTIME clock behavior")7250a4047a
("posix-timers: Unify MONOTONIC and BOOTTIME clock behavior")d6c7270e91
("timekeeping: Remove boot time specific code")f2d6fdbfd2
("Input: Evdev - unify MONOTONIC and BOOTTIME clock behavior")d6ed449afd
("timekeeping: Make the MONOTONIC clock behave like the BOOTTIME clock")72199320d4
("timekeeping: Add the new CLOCK_MONOTONIC_ACTIVE clock") As stated in the pull request for the unification of CLOCK_MONOTONIC and CLOCK_BOOTTIME, it was clear that we might have to revert the change. As reported by several folks systemd and other applications rely on the documented behaviour of CLOCK_MONOTONIC on Linux and break with the above changes. After resume daemons time out and other timeout related issues are observed. Rafael compiled this list: * systemd kills daemons on resume, after >WatchdogSec seconds of suspending (Genki Sky). [Verified that that's because systemd uses CLOCK_MONOTONIC and expects it to not include the suspend time.] * systemd-journald misbehaves after resume: systemd-journald[7266]: File /var/log/journal/016627c3c4784cd4812d4b7e96a34226/system.journal corrupted or uncleanly shut down, renaming and replacing. (Mike Galbraith). * NetworkManager reports "networking disabled" and networking is broken after resume 50% of the time (Pavel). [May be because of systemd.] * MATE desktop dims the display and starts the screensaver right after system resume (Pavel). * Full system hang during resume (me). [May be due to systemd or NM or both.] That happens on debian and open suse systems. It's sad, that these problems were neither catched in -next nor by those folks who expressed interest in this change. Reported-by: Rafael J. Wysocki <rjw@rjwysocki.net> Reported-by: Genki Sky <sky@genki.is>, Reported-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Kevin Easton <kevin@guarana.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mark Salyzyn <salyzyn@android.com> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Petr Mladek <pmladek@suse.com> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org>
238 lines
5.3 KiB
C
238 lines
5.3 KiB
C
/*
|
|
* Dummy stubs used when CONFIG_POSIX_TIMERS=n
|
|
*
|
|
* Created by: Nicolas Pitre, July 2016
|
|
* Copyright: (C) 2016 Linaro Limited
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/linkage.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/syscalls.h>
|
|
#include <linux/ktime.h>
|
|
#include <linux/timekeeping.h>
|
|
#include <linux/posix-timers.h>
|
|
#include <linux/compat.h>
|
|
|
|
#ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
|
|
/* Architectures may override SYS_NI and COMPAT_SYS_NI */
|
|
#include <asm/syscall_wrapper.h>
|
|
#endif
|
|
|
|
asmlinkage long sys_ni_posix_timers(void)
|
|
{
|
|
pr_err_once("process %d (%s) attempted a POSIX timer syscall "
|
|
"while CONFIG_POSIX_TIMERS is not set\n",
|
|
current->pid, current->comm);
|
|
return -ENOSYS;
|
|
}
|
|
|
|
#ifndef SYS_NI
|
|
#define SYS_NI(name) SYSCALL_ALIAS(sys_##name, sys_ni_posix_timers)
|
|
#endif
|
|
|
|
#ifndef COMPAT_SYS_NI
|
|
#define COMPAT_SYS_NI(name) SYSCALL_ALIAS(compat_sys_##name, sys_ni_posix_timers)
|
|
#endif
|
|
|
|
SYS_NI(timer_create);
|
|
SYS_NI(timer_gettime);
|
|
SYS_NI(timer_getoverrun);
|
|
SYS_NI(timer_settime);
|
|
SYS_NI(timer_delete);
|
|
SYS_NI(clock_adjtime);
|
|
SYS_NI(getitimer);
|
|
SYS_NI(setitimer);
|
|
#ifdef __ARCH_WANT_SYS_ALARM
|
|
SYS_NI(alarm);
|
|
#endif
|
|
|
|
/*
|
|
* We preserve minimal support for CLOCK_REALTIME and CLOCK_MONOTONIC
|
|
* as it is easy to remain compatible with little code. CLOCK_BOOTTIME
|
|
* is also included for convenience as at least systemd uses it.
|
|
*/
|
|
|
|
SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
|
|
const struct timespec __user *, tp)
|
|
{
|
|
struct timespec64 new_tp;
|
|
|
|
if (which_clock != CLOCK_REALTIME)
|
|
return -EINVAL;
|
|
if (get_timespec64(&new_tp, tp))
|
|
return -EFAULT;
|
|
|
|
return do_sys_settimeofday64(&new_tp, NULL);
|
|
}
|
|
|
|
int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)
|
|
{
|
|
switch (which_clock) {
|
|
case CLOCK_REALTIME:
|
|
ktime_get_real_ts64(tp);
|
|
break;
|
|
case CLOCK_MONOTONIC:
|
|
ktime_get_ts64(tp);
|
|
break;
|
|
case CLOCK_BOOTTIME:
|
|
get_monotonic_boottime64(tp);
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
|
|
struct timespec __user *, tp)
|
|
{
|
|
int ret;
|
|
struct timespec64 kernel_tp;
|
|
|
|
ret = do_clock_gettime(which_clock, &kernel_tp);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (put_timespec64(&kernel_tp, tp))
|
|
return -EFAULT;
|
|
return 0;
|
|
}
|
|
|
|
SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct timespec __user *, tp)
|
|
{
|
|
struct timespec64 rtn_tp = {
|
|
.tv_sec = 0,
|
|
.tv_nsec = hrtimer_resolution,
|
|
};
|
|
|
|
switch (which_clock) {
|
|
case CLOCK_REALTIME:
|
|
case CLOCK_MONOTONIC:
|
|
case CLOCK_BOOTTIME:
|
|
if (put_timespec64(&rtn_tp, tp))
|
|
return -EFAULT;
|
|
return 0;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
|
|
const struct timespec __user *, rqtp,
|
|
struct timespec __user *, rmtp)
|
|
{
|
|
struct timespec64 t;
|
|
|
|
switch (which_clock) {
|
|
case CLOCK_REALTIME:
|
|
case CLOCK_MONOTONIC:
|
|
case CLOCK_BOOTTIME:
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (get_timespec64(&t, rqtp))
|
|
return -EFAULT;
|
|
if (!timespec64_valid(&t))
|
|
return -EINVAL;
|
|
if (flags & TIMER_ABSTIME)
|
|
rmtp = NULL;
|
|
current->restart_block.nanosleep.type = rmtp ? TT_NATIVE : TT_NONE;
|
|
current->restart_block.nanosleep.rmtp = rmtp;
|
|
return hrtimer_nanosleep(&t, flags & TIMER_ABSTIME ?
|
|
HRTIMER_MODE_ABS : HRTIMER_MODE_REL,
|
|
which_clock);
|
|
}
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
COMPAT_SYS_NI(timer_create);
|
|
COMPAT_SYS_NI(clock_adjtime);
|
|
COMPAT_SYS_NI(timer_settime);
|
|
COMPAT_SYS_NI(timer_gettime);
|
|
COMPAT_SYS_NI(getitimer);
|
|
COMPAT_SYS_NI(setitimer);
|
|
|
|
COMPAT_SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
|
|
struct compat_timespec __user *, tp)
|
|
{
|
|
struct timespec64 new_tp;
|
|
|
|
if (which_clock != CLOCK_REALTIME)
|
|
return -EINVAL;
|
|
if (compat_get_timespec64(&new_tp, tp))
|
|
return -EFAULT;
|
|
|
|
return do_sys_settimeofday64(&new_tp, NULL);
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
|
|
struct compat_timespec __user *, tp)
|
|
{
|
|
int ret;
|
|
struct timespec64 kernel_tp;
|
|
|
|
ret = do_clock_gettime(which_clock, &kernel_tp);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (compat_put_timespec64(&kernel_tp, tp))
|
|
return -EFAULT;
|
|
return 0;
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
|
|
struct compat_timespec __user *, tp)
|
|
{
|
|
struct timespec64 rtn_tp = {
|
|
.tv_sec = 0,
|
|
.tv_nsec = hrtimer_resolution,
|
|
};
|
|
|
|
switch (which_clock) {
|
|
case CLOCK_REALTIME:
|
|
case CLOCK_MONOTONIC:
|
|
case CLOCK_BOOTTIME:
|
|
if (compat_put_timespec64(&rtn_tp, tp))
|
|
return -EFAULT;
|
|
return 0;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
|
|
struct compat_timespec __user *, rqtp,
|
|
struct compat_timespec __user *, rmtp)
|
|
{
|
|
struct timespec64 t;
|
|
|
|
switch (which_clock) {
|
|
case CLOCK_REALTIME:
|
|
case CLOCK_MONOTONIC:
|
|
case CLOCK_BOOTTIME:
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (compat_get_timespec64(&t, rqtp))
|
|
return -EFAULT;
|
|
if (!timespec64_valid(&t))
|
|
return -EINVAL;
|
|
if (flags & TIMER_ABSTIME)
|
|
rmtp = NULL;
|
|
current->restart_block.nanosleep.type = rmtp ? TT_COMPAT : TT_NONE;
|
|
current->restart_block.nanosleep.compat_rmtp = rmtp;
|
|
return hrtimer_nanosleep(&t, flags & TIMER_ABSTIME ?
|
|
HRTIMER_MODE_ABS : HRTIMER_MODE_REL,
|
|
which_clock);
|
|
}
|
|
#endif
|