Commit fbf920f2 authored by Nam Cao's avatar Nam Cao Committed by Thomas Gleixner
Browse files

hrtimers: Add missing hrtimer_init() trace points 



hrtimer_init*_on_stack() is not covered by tracing when
CONFIG_DEBUG_OBJECTS_TIMERS=y.

Rework the functions similar to hrtimer_init() and hrtimer_init_sleeper()
so that the hrtimer_init() tracepoint is unconditionally available.

The rework makes hrtimer_init_sleeper() unused. Delete it.

Signed-off-by: default avatarNam Cao <namcao@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/74528e8abf2bb96e8bee85ffacbf14e15cf89f0d.1730386209.git.namcao@linutronix.de
parent 2634303f

include/linux/hrtimer.h

+1 −18
Original line number Diff line number Diff line
@@ -228,32 +228,15 @@ static inline void hrtimer_cancel_wait_running(struct hrtimer *timer) 
/* 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);



#ifdef CONFIG_DEBUG_OBJECTS_TIMERS

extern void destroy_hrtimer_on_stack(struct hrtimer *timer);

#else

static inline void hrtimer_init_on_stack(struct hrtimer *timer,

					 clockid_t which_clock,

					 enum hrtimer_mode mode)

{

	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

kernel/time/hrtimer.c

+36 −29
Original line number Diff line number Diff line
@@ -417,6 +417,11 @@ static inline void debug_hrtimer_init(struct hrtimer *timer) 
	debug_object_init(timer, &hrtimer_debug_descr);

}



static inline void debug_hrtimer_init_on_stack(struct hrtimer *timer)

{

	debug_object_init_on_stack(timer, &hrtimer_debug_descr);

}



static inline void debug_hrtimer_activate(struct hrtimer *timer,

					  enum hrtimer_mode mode)

{
@@ -428,28 +433,6 @@ static inline void debug_hrtimer_deactivate(struct hrtimer *timer) 
	debug_object_deactivate(timer, &hrtimer_debug_descr);

}



static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,

			   enum hrtimer_mode mode);



void hrtimer_init_on_stack(struct hrtimer *timer, clockid_t clock_id,

			   enum hrtimer_mode mode)

{

	debug_object_init_on_stack(timer, &hrtimer_debug_descr);

	__hrtimer_init(timer, clock_id, mode);

}

EXPORT_SYMBOL_GPL(hrtimer_init_on_stack);



static void __hrtimer_init_sleeper(struct hrtimer_sleeper *sl,

				   clockid_t clock_id, enum hrtimer_mode mode);



void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,

				   clockid_t clock_id, enum hrtimer_mode mode)

{

	debug_object_init_on_stack(&sl->timer, &hrtimer_debug_descr);

	__hrtimer_init_sleeper(sl, clock_id, mode);

}

EXPORT_SYMBOL_GPL(hrtimer_init_sleeper_on_stack);



void destroy_hrtimer_on_stack(struct hrtimer *timer)

{

	debug_object_free(timer, &hrtimer_debug_descr);
@@ -459,6 +442,7 @@ EXPORT_SYMBOL_GPL(destroy_hrtimer_on_stack); 
#else



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

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

static inline void debug_hrtimer_activate(struct hrtimer *timer,

					  enum hrtimer_mode mode) { }

static inline void debug_hrtimer_deactivate(struct hrtimer *timer) { }
@@ -472,6 +456,13 @@ debug_init(struct hrtimer *timer, clockid_t clockid, 
	trace_hrtimer_init(timer, clockid, mode);

}



static inline void debug_init_on_stack(struct hrtimer *timer, clockid_t clockid,

				       enum hrtimer_mode mode)

{

	debug_hrtimer_init_on_stack(timer);

	trace_hrtimer_init(timer, clockid, mode);

}



static inline void debug_activate(struct hrtimer *timer,

				  enum hrtimer_mode mode)

{
@@ -1600,6 +1591,23 @@ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id, 
}

EXPORT_SYMBOL_GPL(hrtimer_init);



/**

 * hrtimer_init_on_stack - initialize a timer in stack memory

 * @timer:	The timer to be initialized

 * @clock_id:	The clock to be used

 * @mode:       The timer mode

 *

 * Similar to hrtimer_init(), except that this one must be used if struct hrtimer is in stack

 * memory.

 */

void hrtimer_init_on_stack(struct hrtimer *timer, clockid_t clock_id,

			   enum hrtimer_mode mode)

{

	debug_init_on_stack(timer, clock_id, mode);

	__hrtimer_init(timer, clock_id, mode);

}

EXPORT_SYMBOL_GPL(hrtimer_init_on_stack);



/*

 * A timer is active, when it is enqueued into the rbtree or the

 * callback function is running or it's in the state of being migrated
@@ -1944,7 +1952,7 @@ void hrtimer_sleeper_start_expires(struct hrtimer_sleeper *sl, 
	 * Make the enqueue delivery mode check work on RT. If the sleeper

	 * was initialized for hard interrupt delivery, force the mode bit.

	 * This is a special case for hrtimer_sleepers because

	 * hrtimer_init_sleeper() determines the delivery mode on RT so the

	 * __hrtimer_init_sleeper() determines the delivery mode on RT so the

	 * fiddling with this decision is avoided at the call sites.

	 */

	if (IS_ENABLED(CONFIG_PREEMPT_RT) && sl->timer.is_hard)
@@ -1987,19 +1995,18 @@ static void __hrtimer_init_sleeper(struct hrtimer_sleeper *sl, 
}



/**

 * hrtimer_init_sleeper - initialize sleeper to the given clock

 * hrtimer_init_sleeper_on_stack - initialize a sleeper in stack memory

 * @sl:		sleeper to be initialized

 * @clock_id:	the clock to be used

 * @mode:	timer mode abs/rel

 */

void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, clockid_t clock_id,

			  enum hrtimer_mode mode)

void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,

				   clockid_t clock_id, enum hrtimer_mode mode)

{

	debug_init(&sl->timer, clock_id, mode);

	debug_init_on_stack(&sl->timer, clock_id, mode);

	__hrtimer_init_sleeper(sl, clock_id, mode);



}

EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);

EXPORT_SYMBOL_GPL(hrtimer_init_sleeper_on_stack);



int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts)

{