Commit 3ec7a3ee authored Dec 21, 2017 by Anna-Maria Gleixner Committed by Ingo Molnar Jan 16, 2018

hrtimer: Remove the 'base' parameter from hrtimer_reprogram()



hrtimer_reprogram() must have access to the hrtimer_clock_base of the new
first expiring timer to access hrtimer_clock_base.offset for adjusting the
expiry time to CLOCK_MONOTONIC. This is required to evaluate whether the
new left most timer in the hrtimer_clock_base is the first expiring timer
of all clock bases in a hrtimer_cpu_base.

The only user of hrtimer_reprogram() is hrtimer_start_range_ns(), which has
a pointer to hrtimer_clock_base() already and hands it in as a parameter. But
hrtimer_start_range_ns() will be split for the upcoming support for softirq
based hrtimers to avoid code duplication and will lose the direct access to
the clock base pointer.

Instead of handing in timer and timer->base as a parameter remove the base
parameter from hrtimer_reprogram() instead and retrieve the clock base internally.

Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: keescook@chromium.org
Link: http://lkml.kernel.org/r/20171221104205.7269-23-anna-maria@linutronix.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 2ac2dccc

kernel/time/hrtimer.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -648,10 +648,10 @@ static inline void retrigger_next_event(void *arg) { }
		*
		* Called with interrupts disabled and base->cpu_base.lock held
		*/
		static void hrtimer_reprogram(struct hrtimer *timer,
		struct hrtimer_clock_base *base)
		static void hrtimer_reprogram(struct hrtimer *timer)
		{
		struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
		struct hrtimer_clock_base *base = timer->base;
		ktime_t expires = ktime_sub(hrtimer_get_expires(timer), base->offset);

		WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);
		@@ -939,7 +939,7 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
		if (!leftmost)
		goto unlock;

		hrtimer_reprogram(timer, new_base);
		hrtimer_reprogram(timer);
		unlock:
		unlock_hrtimer_base(timer, &flags);
		}

Admin message