Commit c5448d46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-core-2025-09-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer core updates from Thomas Gleixner:

 - Address the inconsistent shutdown sequence of per CPU clockevents on
   CPU hotplug, which only removed it from the core but failed to invoke
   the actual device driver shutdown callback. This kept the timer
   active, which prevented power savings and caused pointless noise in
   virtualization.

 - Encapsulate the open coded access to the hrtimer clock base, which is
   a private implementation detail, so that the implementation can be
   changed without breaking a lot of usage sites.

 - Enhance the debug output of the clocksource watchdog to provide
   better information for analysis.

 - The usual set of cleanups and enhancements all over the place

* tag 'timers-core-2025-09-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Fix spelling mistakes in comments
  clocksource: Print durations for sync check unconditionally
  LoongArch: Remove clockevents shutdown call on offlining
  tick: Do not set device to detached state in tick_shutdown()
  hrtimer: Reorder branches in hrtimer_clockid_to_base()
  hrtimer: Remove hrtimer_clock_base:: Get_time
  hrtimer: Use hrtimer_cb_get_time() helper
  media: pwm-ir-tx: Avoid direct access to hrtimer clockbase
  ALSA: hrtimer: Avoid direct access to hrtimer clockbase
  lib: test_objpool: Avoid direct access to hrtimer clockbase
  sched/core: Avoid direct access to hrtimer clockbase
  timers/itimer: Avoid direct access to hrtimer clockbase
  posix-timers: Avoid direct access to hrtimer clockbase
  jiffies: Remove obsolete SHIFTED_HZ comment
parents c574fb2e 391253b2

arch/loongarch/kernel/time.c

+0 −2
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ static int arch_timer_starting(unsigned int cpu) 


static int arch_timer_dying(unsigned int cpu)

{

	constant_set_state_shutdown(this_cpu_ptr(&constant_clockevent_device));



	/* Clear Timer Interrupt */

	write_csr_tintclear(CSR_TINTCLR_TI);

drivers/media/rc/pwm-ir-tx.c

+1 −4
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ static int pwm_ir_tx_atomic(struct rc_dev *dev, unsigned int *txbuf, 
static enum hrtimer_restart pwm_ir_timer(struct hrtimer *timer)

{

	struct pwm_ir *pwm_ir = container_of(timer, struct pwm_ir, timer);

	ktime_t now;



	/*

	 * If we happen to hit an odd latency spike, loop through the
@@ -139,9 +138,7 @@ static enum hrtimer_restart pwm_ir_timer(struct hrtimer *timer) 
		hrtimer_add_expires_ns(timer, ns);



		pwm_ir->txbuf_index++;



		now = timer->base->get_time();

	} while (hrtimer_get_expires_tv64(timer) < now);

	} while (hrtimer_expires_remaining(timer) > 0);



	return HRTIMER_RESTART;

}

include/linux/hrtimer.h

+5 −9
Original line number Diff line number Diff line
@@ -154,14 +154,11 @@ static inline s64 hrtimer_get_expires_ns(const struct hrtimer *timer) 
	return ktime_to_ns(timer->node.expires);

}



static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer)

{

	return ktime_sub(timer->node.expires, timer->base->get_time());

}

ktime_t hrtimer_cb_get_time(const struct hrtimer *timer);



static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer)

static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer)

{

	return timer->base->get_time();

	return ktime_sub(timer->node.expires, hrtimer_cb_get_time(timer));

}



static inline int hrtimer_is_hres_active(struct hrtimer *timer)
@@ -200,8 +197,7 @@ __hrtimer_expires_remaining_adjusted(const struct hrtimer *timer, ktime_t now) 
static inline ktime_t

hrtimer_expires_remaining_adjusted(const struct hrtimer *timer)

{

	return __hrtimer_expires_remaining_adjusted(timer,

						    timer->base->get_time());

	return __hrtimer_expires_remaining_adjusted(timer, hrtimer_cb_get_time(timer));

}



#ifdef CONFIG_TIMERFD
@@ -363,7 +359,7 @@ hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval); 
static inline u64 hrtimer_forward_now(struct hrtimer *timer,

				      ktime_t interval)

{

	return hrtimer_forward(timer, timer->base->get_time(), interval);

	return hrtimer_forward(timer, hrtimer_cb_get_time(timer), interval);

}



/* Precise sleep: */

include/linux/hrtimer_defs.h

+0 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
 * @seq:		seqcount around __run_hrtimer

 * @running:		pointer to the currently running hrtimer

 * @active:		red black tree root node for the active timers

 * @get_time:		function to retrieve the current time of the clock

 * @offset:		offset of this clock to the monotonic base

 */

struct hrtimer_clock_base {
@@ -51,7 +50,6 @@ struct hrtimer_clock_base { 
	seqcount_raw_spinlock_t	seq;

	struct hrtimer		*running;

	struct timerqueue_head	active;

	ktime_t			(*get_time)(void);

	ktime_t			offset;

} __hrtimer_clock_base_align;

include/linux/jiffies.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 


extern void register_refined_jiffies(long clock_tick_rate);



/* TICK_USEC is the time between ticks in usec assuming SHIFTED_HZ */

/* TICK_USEC is the time between ticks in usec */

#define TICK_USEC ((USEC_PER_SEC + HZ/2) / HZ)



/* USER_TICK_USEC is the time between ticks in usec assuming fake USER_HZ */