timers fixes
Ingo Molnar
maintainerLinus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
# HEAD: de95a991bb72e009f47e0c4bbc90fc5f594588d5 tick/sched: Annotate lockless access to last_jiffies_update
Three fixes: fix link failure on Alpha, fix a Sparse warning and annotate/robustify a lockless access in the NOHZ code.
Thanks,
Ingo
------------------>
Arnd Bergmann (1):
time/posix-stubs: Provide compat itimer supoprt for alpha
Eric Dumazet (1):
tick/sched: Annotate lockless access to last_jiffies_update
Vincenzo Frascino (1):
lib/vdso: Make __cvdso_clock_getres() static
kernel/time/posix-stubs.c | 3 +++ kernel/time/tick-sched.c | 14 +++++++++----- lib/vdso/gettimeofday.c | 1 + 3 files changed, 13 insertions(+), 5 deletions(-)
kernel/time/posix-stubs.c +3 -0
@@ -151,6 +151,9 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,#ifdef CONFIG_COMPAT COMPAT_SYS_NI (timer_create); +#endif + +#if defined(CONFIG_COMPAT ) || defined(CONFIG_ALPHA )COMPAT_SYS_NI (getitimer);COMPAT_SYS_NI (setitimer);#endif
kernel/time/tick-sched.c +9 -5
@@ -58,8 +58,9 @@ static void tick_do_update_jiffies64(ktime_t now)/* * Do a quick check without holding jiffies_lock: +* The READ_ONCE() pairs with two updates done later in this function. */ - delta =ktime_sub (now, last_jiffies_update); + delta =ktime_sub (now,READ_ONCE (last_jiffies_update));if (delta < tick_period)return ;
@@ -70,8 +71,9 @@ static void tick_do_update_jiffies64(ktime_t now)if (delta >= tick_period) { delta =ktime_sub (delta, tick_period); - last_jiffies_update =ktime_add (last_jiffies_update, - tick_period); +/* Pairs with the lockless read in this function. */ +WRITE_ONCE (last_jiffies_update, +ktime_add (last_jiffies_update, tick_period));/* Slow path for long timeouts */ if (unlikely (delta >= tick_period)) {
@@ -79,8 +81,10 @@ static void tick_do_update_jiffies64(ktime_t now) ticks =ktime_divns (delta, incr); - last_jiffies_update =ktime_add_ns (last_jiffies_update, - incr * ticks); +/* Pairs with the lockless read in this function. */ +WRITE_ONCE (last_jiffies_update, +ktime_add_ns (last_jiffies_update, + incr * ticks)); }do_timer (++ticks);
lib/vdso/gettimeofday.c +1 -0
@@ -221,6 +221,7 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)return 0 ; } +static __maybe_unused int __cvdso_clock_getres (clockid_t clock,struct __kernel_timespec *res) {int ret =__cvdso_clock_getres_common (clock, res);
The pull request you sent on Sat, 18 Jan 2020 19:47:46 +0100:
The pull request you sent on Sat, 18 Jan 2020 19:47:46 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gittimers-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7ff15cd0458c288afa954de843bb1903c723e5b3
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker