posix-timers: Handle relative posix-timers correctly

The recent rework of the posix timer internals broke the magic posix
mechanism, which requires that relative timers are not affected by
modifications of the underlying clock. That means relative CLOCK_REALTIME
timers cannot use CLOCK_REALTIME, because that can be set and adjusted. The
underlying hrtimer switches the clock for these timers to CLOCK_MONOTONIC.

That still works, but reading the remaining time of such a timer has been
broken in the rework. The old code used the hrtimer internals directly and
avoided the posix clock callbacks. Now common_timer_get() uses the
underlying kclock->timer_get() callback, which is still CLOCK_REALTIME
based. So the remaining time of such a timer is calculated against the
wrong time base.

Handle it by switching the k_itimer->kclock pointer according to the
resulting hrtimer mode. k_itimer->it_clock still contains CLOCK_REALTIME
because the timer might be set with ABSTIME later and then it needs to
switch back to the realtime posix clock implementation.

Fixes: eae1c4ae275f ("posix-timers: Make use of cancel/arm callbacks")
Reported-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Link: http://lkml.kernel.org/r/20170609201156.GB21491@outlook.office365.com

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 88517dcfe0ca249575411935a97e48e730723061..58c0f60b132fb3f805b46602ad3f4e16ef3f3e08 100644 (file)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -72,6 +72,7 @@ static DEFINE_SPINLOCK(hash_lock);
 
 static const struct k_clock * const posix_clocks[];
 static const struct k_clock *clockid_to_kclock(const clockid_t id);
 
 static const struct k_clock * const posix_clocks[];
 static const struct k_clock *clockid_to_kclock(const clockid_t id);

+static const struct k_clock clock_realtime, clock_monotonic;

 
 /*
  * we assume that the new SIGEV_THREAD_ID shares no bits with the other
 
 /*
  * we assume that the new SIGEV_THREAD_ID shares no bits with the other


@@ -750,6 +751,18 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,
        enum hrtimer_mode mode;
 
        mode = absolute ? HRTIMER_MODE_ABS : HRTIMER_MODE_REL;
        enum hrtimer_mode mode;
 
        mode = absolute ? HRTIMER_MODE_ABS : HRTIMER_MODE_REL;

+       /*
+        * Posix magic: Relative CLOCK_REALTIME timers are not affected by
+        * clock modifications, so they become CLOCK_MONOTONIC based under the
+        * hood. See hrtimer_init(). Update timr->kclock, so the generic
+        * functions which use timr->kclock->clock_get() work.
+        *
+        * Note: it_clock stays unmodified, because the next timer_set() might
+        * use ABSTIME, so it needs to switch back.
+        */
+       if (timr->it_clock == CLOCK_REALTIME)
+               timr->kclock = absolute ? &clock_realtime : &clock_monotonic;
+

        hrtimer_init(&timr->it.real.timer, timr->it_clock, mode);
        timr->it.real.timer.function = posix_timer_fn;
 
        hrtimer_init(&timr->it.real.timer, timr->it_clock, mode);
        timr->it.real.timer.function = posix_timer_fn;