Commit 6e01f86f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-core-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer and timekeeping updates from Thomas Gleixner:

 - Expose CLOCK_TAI to instrumentation to aid with TSN debugging.

 - Ensure that the clockevent is stopped when there is no timer armed to
   avoid pointless wakeups.

 - Make the sched clock frequency handling and rounding consistent.

 - Provide a better debugobject hint for delayed works. The timer
   callback is always the same, which makes it difficult to identify the
   underlying work. Use the work function as a hint instead.

 - Move the timer specific sysctl code into the timer subsystem.

 - The usual set of improvements and cleanups

* tag 'timers-core-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers: Provide a better debugobjects hint for delayed works
  time/sched_clock: Fix formatting of frequency reporting code
  time/sched_clock: Use Hz as the unit for clock rate reporting below 4kHz
  time/sched_clock: Round the frequency reported to nearest rather than down
  timekeeping: Consolidate fast timekeeper
  timekeeping: Annotate ktime_get_boot_fast_ns() with data_race()
  timers/nohz: Switch to ONESHOT_STOPPED in the low-res handler when the tick is stopped
  timekeeping: Introduce fast accessor to clock tai
  tracing/timer: Add missing argument documentation of trace points
  clocksource: Replace cpumask_weight() with cpumask_empty()
  timers: Move timer sysctl into the timer code
  clockevents: Use dedicated list iterator variable
  timers: Simplify calc_index()
  timers: Initialize base::next_expiry_recalc in timers_prepare_cpu()
parents fcfde8a7 317f29c1

Documentation/core-api/timekeeping.rst

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ Some additional variants exist for more specialized cases: 
.. c:function:: u64 ktime_get_mono_fast_ns( void )

		u64 ktime_get_raw_fast_ns( void )

		u64 ktime_get_boot_fast_ns( void )

		u64 ktime_get_tai_fast_ns( void )

		u64 ktime_get_real_fast_ns( void )



	These variants are safe to call from any context, including from

include/linux/timekeeping.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static inline u64 ktime_get_raw_ns(void) 
extern u64 ktime_get_mono_fast_ns(void);

extern u64 ktime_get_raw_fast_ns(void);

extern u64 ktime_get_boot_fast_ns(void);

extern u64 ktime_get_tai_fast_ns(void);

extern u64 ktime_get_real_fast_ns(void);



/*

include/linux/timer.h

+0 −8
Original line number Diff line number Diff line
@@ -196,14 +196,6 @@ extern void init_timers(void); 
struct hrtimer;

extern enum hrtimer_restart it_real_fn(struct hrtimer *);



#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)

struct ctl_table;



extern unsigned int sysctl_timer_migration;

int timer_migration_handler(struct ctl_table *table, int write,

			    void *buffer, size_t *lenp, loff_t *ppos);

#endif



unsigned long __round_jiffies(unsigned long j, int cpu);

unsigned long __round_jiffies_relative(unsigned long j, int cpu);

unsigned long round_jiffies(unsigned long j);

include/trace/events/timer.h

+4 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ DEFINE_EVENT(timer_class, timer_init, 
 * timer_start - called when the timer is started

 * @timer:	pointer to struct timer_list

 * @expires:	the timers expiry time

 * @flags:	the timers flags

 */

TRACE_EVENT(timer_start,
@@ -84,6 +85,7 @@ TRACE_EVENT(timer_start, 
/**

 * timer_expire_entry - called immediately before the timer callback

 * @timer:	pointer to struct timer_list

 * @baseclk:	value of timer_base::clk when timer expires

 *

 * Allows to determine the timer latency.

 */
@@ -191,6 +193,7 @@ TRACE_EVENT(hrtimer_init, 
/**

 * hrtimer_start - called when the hrtimer is started

 * @hrtimer:	pointer to struct hrtimer

 * @mode:	the hrtimers mode

 */

TRACE_EVENT(hrtimer_start,

kernel/sysctl.c

+0 −11
Original line number Diff line number Diff line
@@ -2288,17 +2288,6 @@ static struct ctl_table kern_table[] = { 
		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)

	{

		.procname	= "timer_migration",

		.data		= &sysctl_timer_migration,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= timer_migration_handler,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#endif

#ifdef CONFIG_BPF_SYSCALL

	{

		.procname	= "unprivileged_bpf_disabled",