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>
166 lines
6.9 KiB
C
166 lines
6.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* tick internal variable and functions used by low/high res code
|
|
*/
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/tick.h>
|
|
|
|
#include "timekeeping.h"
|
|
#include "tick-sched.h"
|
|
|
|
#ifdef CONFIG_GENERIC_CLOCKEVENTS
|
|
|
|
# define TICK_DO_TIMER_NONE -1
|
|
# define TICK_DO_TIMER_BOOT -2
|
|
|
|
DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
|
|
extern ktime_t tick_next_period;
|
|
extern ktime_t tick_period;
|
|
extern int tick_do_timer_cpu __read_mostly;
|
|
|
|
extern void tick_setup_periodic(struct clock_event_device *dev, int broadcast);
|
|
extern void tick_handle_periodic(struct clock_event_device *dev);
|
|
extern void tick_check_new_device(struct clock_event_device *dev);
|
|
extern void tick_shutdown(unsigned int cpu);
|
|
extern void tick_suspend(void);
|
|
extern void tick_resume(void);
|
|
extern bool tick_check_replacement(struct clock_event_device *curdev,
|
|
struct clock_event_device *newdev);
|
|
extern void tick_install_replacement(struct clock_event_device *dev);
|
|
extern int tick_is_oneshot_available(void);
|
|
extern struct tick_device *tick_get_device(int cpu);
|
|
|
|
extern int clockevents_tick_resume(struct clock_event_device *dev);
|
|
/* Check, if the device is functional or a dummy for broadcast */
|
|
static inline int tick_device_is_functional(struct clock_event_device *dev)
|
|
{
|
|
return !(dev->features & CLOCK_EVT_FEAT_DUMMY);
|
|
}
|
|
|
|
static inline enum clock_event_state clockevent_get_state(struct clock_event_device *dev)
|
|
{
|
|
return dev->state_use_accessors;
|
|
}
|
|
|
|
static inline void clockevent_set_state(struct clock_event_device *dev,
|
|
enum clock_event_state state)
|
|
{
|
|
dev->state_use_accessors = state;
|
|
}
|
|
|
|
extern void clockevents_shutdown(struct clock_event_device *dev);
|
|
extern void clockevents_exchange_device(struct clock_event_device *old,
|
|
struct clock_event_device *new);
|
|
extern void clockevents_switch_state(struct clock_event_device *dev,
|
|
enum clock_event_state state);
|
|
extern int clockevents_program_event(struct clock_event_device *dev,
|
|
ktime_t expires, bool force);
|
|
extern void clockevents_handle_noop(struct clock_event_device *dev);
|
|
extern int __clockevents_update_freq(struct clock_event_device *dev, u32 freq);
|
|
extern ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt);
|
|
|
|
/* Broadcasting support */
|
|
# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
|
|
extern int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu);
|
|
extern void tick_install_broadcast_device(struct clock_event_device *dev);
|
|
extern int tick_is_broadcast_device(struct clock_event_device *dev);
|
|
extern void tick_shutdown_broadcast(unsigned int cpu);
|
|
extern void tick_suspend_broadcast(void);
|
|
extern void tick_resume_broadcast(void);
|
|
extern bool tick_resume_check_broadcast(void);
|
|
extern void tick_broadcast_init(void);
|
|
extern void tick_set_periodic_handler(struct clock_event_device *dev, int broadcast);
|
|
extern int tick_broadcast_update_freq(struct clock_event_device *dev, u32 freq);
|
|
extern struct tick_device *tick_get_broadcast_device(void);
|
|
extern struct cpumask *tick_get_broadcast_mask(void);
|
|
# else /* !CONFIG_GENERIC_CLOCKEVENTS_BROADCAST: */
|
|
static inline void tick_install_broadcast_device(struct clock_event_device *dev) { }
|
|
static inline int tick_is_broadcast_device(struct clock_event_device *dev) { return 0; }
|
|
static inline int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu) { return 0; }
|
|
static inline void tick_do_periodic_broadcast(struct clock_event_device *d) { }
|
|
static inline void tick_shutdown_broadcast(unsigned int cpu) { }
|
|
static inline void tick_suspend_broadcast(void) { }
|
|
static inline void tick_resume_broadcast(void) { }
|
|
static inline bool tick_resume_check_broadcast(void) { return false; }
|
|
static inline void tick_broadcast_init(void) { }
|
|
static inline int tick_broadcast_update_freq(struct clock_event_device *dev, u32 freq) { return -ENODEV; }
|
|
|
|
/* Set the periodic handler in non broadcast mode */
|
|
static inline void tick_set_periodic_handler(struct clock_event_device *dev, int broadcast)
|
|
{
|
|
dev->event_handler = tick_handle_periodic;
|
|
}
|
|
# endif /* !CONFIG_GENERIC_CLOCKEVENTS_BROADCAST */
|
|
|
|
#else /* !GENERIC_CLOCKEVENTS: */
|
|
static inline void tick_suspend(void) { }
|
|
static inline void tick_resume(void) { }
|
|
#endif /* !GENERIC_CLOCKEVENTS */
|
|
|
|
/* Oneshot related functions */
|
|
#ifdef CONFIG_TICK_ONESHOT
|
|
extern void tick_setup_oneshot(struct clock_event_device *newdev,
|
|
void (*handler)(struct clock_event_device *),
|
|
ktime_t nextevt);
|
|
extern int tick_program_event(ktime_t expires, int force);
|
|
extern void tick_oneshot_notify(void);
|
|
extern int tick_switch_to_oneshot(void (*handler)(struct clock_event_device *));
|
|
extern void tick_resume_oneshot(void);
|
|
static inline bool tick_oneshot_possible(void) { return true; }
|
|
extern int tick_oneshot_mode_active(void);
|
|
extern void tick_clock_notify(void);
|
|
extern int tick_check_oneshot_change(int allow_nohz);
|
|
extern int tick_init_highres(void);
|
|
#else /* !CONFIG_TICK_ONESHOT: */
|
|
static inline
|
|
void tick_setup_oneshot(struct clock_event_device *newdev,
|
|
void (*handler)(struct clock_event_device *),
|
|
ktime_t nextevt) { BUG(); }
|
|
static inline void tick_resume_oneshot(void) { BUG(); }
|
|
static inline int tick_program_event(ktime_t expires, int force) { return 0; }
|
|
static inline void tick_oneshot_notify(void) { }
|
|
static inline bool tick_oneshot_possible(void) { return false; }
|
|
static inline int tick_oneshot_mode_active(void) { return 0; }
|
|
static inline void tick_clock_notify(void) { }
|
|
static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
|
|
#endif /* !CONFIG_TICK_ONESHOT */
|
|
|
|
/* Functions related to oneshot broadcasting */
|
|
#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
|
|
extern void tick_broadcast_switch_to_oneshot(void);
|
|
extern void tick_shutdown_broadcast_oneshot(unsigned int cpu);
|
|
extern int tick_broadcast_oneshot_active(void);
|
|
extern void tick_check_oneshot_broadcast_this_cpu(void);
|
|
bool tick_broadcast_oneshot_available(void);
|
|
extern struct cpumask *tick_get_broadcast_oneshot_mask(void);
|
|
#else /* !(BROADCAST && ONESHOT): */
|
|
static inline void tick_broadcast_switch_to_oneshot(void) { }
|
|
static inline void tick_shutdown_broadcast_oneshot(unsigned int cpu) { }
|
|
static inline int tick_broadcast_oneshot_active(void) { return 0; }
|
|
static inline void tick_check_oneshot_broadcast_this_cpu(void) { }
|
|
static inline bool tick_broadcast_oneshot_available(void) { return tick_oneshot_possible(); }
|
|
#endif /* !(BROADCAST && ONESHOT) */
|
|
|
|
/* NO_HZ_FULL internal */
|
|
#ifdef CONFIG_NO_HZ_FULL
|
|
extern void tick_nohz_init(void);
|
|
# else
|
|
static inline void tick_nohz_init(void) { }
|
|
#endif
|
|
|
|
#ifdef CONFIG_NO_HZ_COMMON
|
|
extern unsigned long tick_nohz_active;
|
|
extern void timers_update_nohz(void);
|
|
# ifdef CONFIG_SMP
|
|
extern struct static_key_false timers_migration_enabled;
|
|
# endif
|
|
#else /* CONFIG_NO_HZ_COMMON */
|
|
static inline void timers_update_nohz(void) { }
|
|
#define tick_nohz_active (0)
|
|
#endif
|
|
|
|
DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
|
|
|
|
extern u64 get_next_timer_interrupt(unsigned long basej, u64 basem);
|
|
void timer_clear_idle(void);
|