Commit dbc1625f authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

hrtimer: Consolidate hrtimer_init() + hrtimer_init_sleeper() calls 



hrtimer_init_sleeper() calls require prior initialisation of the hrtimer
object which is embedded into the hrtimer_sleeper.

Combine the initialization and spare a function call. Fixup all call sites.

This is also a preparatory change for PREEMPT_RT to do hrtimer sleeper
specific initializations of the embedded hrtimer without modifying any of
the call sites.

No functional change.

[ anna-maria: Minor cleanups ]
[ tglx: Adopted to the removal of the task argument of
  	hrtimer_init_sleeper() and trivial polishing.
	Folded a fix from Stephen Rothwell for the vsoc code ]

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190726185752.887468908@linutronix.de
parent b7449487

block/blk-mq.c

+1 −2
Original line number Diff line number Diff line
@@ -3415,10 +3415,9 @@ static bool blk_mq_poll_hybrid_sleep(struct request_queue *q, 
	kt = nsecs;



	mode = HRTIMER_MODE_REL;

	hrtimer_init_on_stack(&hs.timer, CLOCK_MONOTONIC, mode);

	hrtimer_init_sleeper_on_stack(&hs, CLOCK_MONOTONIC, mode);

	hrtimer_set_expires(&hs.timer, kt);



	hrtimer_init_sleeper(&hs);

	do {

		if (blk_mq_rq_state(rq) == MQ_RQ_COMPLETE)

			break;

drivers/staging/android/vsoc.c

+2 −4
Original line number Diff line number Diff line
@@ -437,12 +437,10 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg) 
			return -EINVAL;

		wake_time = ktime_set(arg->wake_time_sec, arg->wake_time_nsec);



		hrtimer_init_on_stack(&to->timer, CLOCK_MONOTONIC,

		hrtimer_init_sleeper_on_stack(to, CLOCK_MONOTONIC,

					      HRTIMER_MODE_ABS);

		hrtimer_set_expires_range_ns(&to->timer, wake_time,

					     current->timer_slack_ns);



		hrtimer_init_sleeper(to);

	}



	while (1) {

include/linux/hrtimer.h

+14 −3
Original line number Diff line number Diff line
@@ -347,10 +347,15 @@ DECLARE_PER_CPU(struct tick_device, tick_cpu_device); 
/* Initialize timers: */

extern void hrtimer_init(struct hrtimer *timer, clockid_t which_clock,

			 enum hrtimer_mode mode);

extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, clockid_t clock_id,

				 enum hrtimer_mode mode);



#ifdef CONFIG_DEBUG_OBJECTS_TIMERS

extern void hrtimer_init_on_stack(struct hrtimer *timer, clockid_t which_clock,

				  enum hrtimer_mode mode);

extern void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,

					  clockid_t clock_id,

					  enum hrtimer_mode mode);



extern void destroy_hrtimer_on_stack(struct hrtimer *timer);

#else
@@ -360,6 +365,14 @@ static inline void hrtimer_init_on_stack(struct hrtimer *timer, 
{

	hrtimer_init(timer, which_clock, mode);

}



static inline void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,

						 clockid_t clock_id,

						 enum hrtimer_mode mode)

{

	hrtimer_init_sleeper(sl, clock_id, mode);

}



static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { }

#endif
@@ -463,8 +476,6 @@ extern long hrtimer_nanosleep(const struct timespec64 *rqtp, 
			      const enum hrtimer_mode mode,

			      const clockid_t clockid);



extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl);



extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,

				    const enum hrtimer_mode mode);

extern int schedule_hrtimeout_range_clock(ktime_t *expires,

include/linux/wait.h

+2 −2
Original line number Diff line number Diff line
@@ -488,8 +488,8 @@ do { \ 
	int __ret = 0;								\

	struct hrtimer_sleeper __t;						\

										\

	hrtimer_init_on_stack(&__t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);	\

	hrtimer_init_sleeper(&__t);						\

	hrtimer_init_sleeper_on_stack(&__t, CLOCK_MONOTONIC,			\

				      HRTIMER_MODE_REL);			\

	if ((timeout) != KTIME_MAX)						\

		hrtimer_start_range_ns(&__t.timer, timeout,			\

				       current->timer_slack_ns,			\

kernel/futex.c

+3 −5
Original line number Diff line number Diff line
@@ -487,11 +487,9 @@ futex_setup_timer(ktime_t *time, struct hrtimer_sleeper *timeout, 
	if (!time)

		return NULL;



	hrtimer_init_on_stack(&timeout->timer, (flags & FLAGS_CLOCKRT) ?

	hrtimer_init_sleeper_on_stack(timeout, (flags & FLAGS_CLOCKRT) ?

				      CLOCK_REALTIME : CLOCK_MONOTONIC,

				      HRTIMER_MODE_ABS);

	hrtimer_init_sleeper(timeout);



	/*

	 * If range_ns is 0, calling hrtimer_set_expires_range_ns() is

	 * effectively the same as calling hrtimer_set_expires().