Merge tag 'timers-urgent-2024-04-07' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (3520c35e) · Commits · git / linux-net

arch/powerpc/include/asm/vdso/gettimeofday.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@

		#ifndef __ASSEMBLY__

		#include <asm/page.h>
		#include <asm/vdso/timebase.h>
		#include <asm/barrier.h>
		#include <asm/unistd.h>
		@@ -95,7 +94,7 @@ const struct vdso_data *__arch_get_vdso_data(void);
		static __always_inline
		const struct vdso_data __arch_get_timens_vdso_data(const struct vdso_data vd)
		{
		return (void *)vd + PAGE_SIZE;
		return (void *)vd + (1U << CONFIG_PAGE_SHIFT);
		}
		#endif

include/linux/timecounter.h

+9 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		*
		* @read: returns the current cycle value
		* @mask: bitmask for two's complement
		* subtraction of non 64 bit counters,
		* subtraction of non-64-bit counters,
		* see CYCLECOUNTER_MASK() helper macro
		* @mult: cycle to nanosecond multiplier
		* @shift: cycle to nanosecond divisor (power of two)
		@@ -35,7 +35,7 @@ struct cyclecounter {
		};

		/**
		* struct timecounter - layer above a %struct cyclecounter which counts nanoseconds
		* struct timecounter - layer above a &struct cyclecounter which counts nanoseconds
		* Contains the state needed by timecounter_read() to detect
		* cycle counter wrap around. Initialize with
		* timecounter_init(). Also used to convert cycle counts into the
		@@ -66,6 +66,8 @@ struct timecounter {
		* @cycles: Cycles
		* @mask: bit mask for maintaining the 'frac' field
		* @frac: pointer to storage for the fractional nanoseconds.
		*
		* Returns: cycle counter cycles converted to nanoseconds
		*/
		static inline u64 cyclecounter_cyc2ns(const struct cyclecounter *cc,
		u64 cycles, u64 mask, u64 *frac)
		@@ -79,6 +81,7 @@ static inline u64 cyclecounter_cyc2ns(const struct cyclecounter *cc,

		/**
		* timecounter_adjtime - Shifts the time of the clock.
		* @tc: The &struct timecounter to adjust
		* @delta: Desired change in nanoseconds.
		*/
		static inline void timecounter_adjtime(struct timecounter *tc, s64 delta)
		@@ -107,6 +110,8 @@ extern void timecounter_init(struct timecounter *tc,
		*
		* In other words, keeps track of time since the same epoch as
		* the function which generated the initial time stamp.
		*
		* Returns: nanoseconds since the initial time stamp
		*/
		extern u64 timecounter_read(struct timecounter *tc);

		@@ -123,6 +128,8 @@ extern u64 timecounter_read(struct timecounter *tc);
		*
		* This allows conversion of cycle counter values which were generated
		* in the past.
		*
		* Returns: cycle counter converted to nanoseconds since the initial time stamp
		*/
		extern u64 timecounter_cyc2time(const struct timecounter *tc,
		u64 cycle_tstamp);

include/linux/timekeeping.h

+42 −7

Original line number	Diff line number	Diff line
		@@ -22,14 +22,14 @@ extern int do_sys_settimeofday64(const struct timespec64 *tv,
		const struct timezone *tz);

		/*
		* ktime_get() family: read the current time in a multitude of ways,
		* ktime_get() family - read the current time in a multitude of ways.
		*
		* The default time reference is CLOCK_MONOTONIC, starting at
		* boot time but not counting the time spent in suspend.
		* For other references, use the functions with "real", "clocktai",
		* "boottime" and "raw" suffixes.
		*
		* To get the time in a different format, use the ones wit
		* To get the time in a different format, use the ones with
		* "ns", "ts64" and "seconds" suffix.
		*
		* See Documentation/core-api/timekeeping.rst for more details.
		@@ -74,6 +74,8 @@ extern u32 ktime_get_resolution_ns(void);

		/**
		* ktime_get_real - get the real (wall-) time in ktime_t format
		*
		* Returns: real (wall) time in ktime_t format
		*/
		static inline ktime_t ktime_get_real(void)
		{
		@@ -86,10 +88,12 @@ static inline ktime_t ktime_get_coarse_real(void)
		}

		/**
		* ktime_get_boottime - Returns monotonic time since boot in ktime_t format
		* ktime_get_boottime - Get monotonic time since boot in ktime_t format
		*
		* This is similar to CLOCK_MONTONIC/ktime_get, but also includes the
		* time spent in suspend.
		*
		* Returns: monotonic time since boot in ktime_t format
		*/
		static inline ktime_t ktime_get_boottime(void)
		{
		@@ -102,7 +106,9 @@ static inline ktime_t ktime_get_coarse_boottime(void)
		}

		/**
		* ktime_get_clocktai - Returns the TAI time of day in ktime_t format
		* ktime_get_clocktai - Get the TAI time of day in ktime_t format
		*
		* Returns: the TAI time of day in ktime_t format
		*/
		static inline ktime_t ktime_get_clocktai(void)
		{
		@@ -144,32 +150,60 @@ static inline u64 ktime_get_coarse_clocktai_ns(void)

		/**
		* ktime_mono_to_real - Convert monotonic time to clock realtime
		* @mono: monotonic time to convert
		*
		* Returns: time converted to realtime clock
		*/
		static inline ktime_t ktime_mono_to_real(ktime_t mono)
		{
		return ktime_mono_to_any(mono, TK_OFFS_REAL);
		}

		/**
		* ktime_get_ns - Get the current time in nanoseconds
		*
		* Returns: current time converted to nanoseconds
		*/
		static inline u64 ktime_get_ns(void)
		{
		return ktime_to_ns(ktime_get());
		}

		/**
		* ktime_get_real_ns - Get the current real/wall time in nanoseconds
		*
		* Returns: current real time converted to nanoseconds
		*/
		static inline u64 ktime_get_real_ns(void)
		{
		return ktime_to_ns(ktime_get_real());
		}

		/**
		* ktime_get_boottime_ns - Get the monotonic time since boot in nanoseconds
		*
		* Returns: current boottime converted to nanoseconds
		*/
		static inline u64 ktime_get_boottime_ns(void)
		{
		return ktime_to_ns(ktime_get_boottime());
		}

		/**
		* ktime_get_clocktai_ns - Get the current TAI time of day in nanoseconds
		*
		* Returns: current TAI time converted to nanoseconds
		*/
		static inline u64 ktime_get_clocktai_ns(void)
		{
		return ktime_to_ns(ktime_get_clocktai());
		}

		/**
		* ktime_get_raw_ns - Get the raw monotonic time in nanoseconds
		*
		* Returns: current raw monotonic time converted to nanoseconds
		*/
		static inline u64 ktime_get_raw_ns(void)
		{
		return ktime_to_ns(ktime_get_raw());
		@@ -224,8 +258,8 @@ extern bool timekeeping_rtc_skipresume(void);

		extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta);

		/*
		* struct ktime_timestanps - Simultaneous mono/boot/real timestamps
		/**
		* struct ktime_timestamps - Simultaneous mono/boot/real timestamps
		* @mono: Monotonic timestamp
		* @boot: Boottime timestamp
		* @real: Realtime timestamp
		@@ -242,7 +276,8 @@ struct ktime_timestamps {
		* @cycles: Clocksource counter value to produce the system times
		* @real: Realtime system time
		* @raw: Monotonic raw system time
		* @clock_was_set_seq: The sequence number of clock was set events
		* @cs_id: Clocksource ID
		* @clock_was_set_seq: The sequence number of clock-was-set events
		* @cs_was_changed_seq: The sequence number of clocksource change events
		*/
		struct system_time_snapshot {

include/linux/timer.h

+10 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#define __TIMER_LOCKDEP_MAP_INITIALIZER(_kn)
		#endif

		/**
		/*
		* @TIMER_DEFERRABLE: A deferrable timer will work normally when the
		* system is busy, but will not cause a CPU to come out of idle just
		* to service it; instead, the timer will be serviced when the CPU
		@@ -140,7 +140,7 @@ static inline void destroy_timer_on_stack(struct timer_list *timer) { }
		* or not. Callers must ensure serialization wrt. other operations done
		* to this timer, eg. interrupt contexts, or other CPUs on SMP.
		*
		* return value: 1 if the timer is pending, 0 if not.
		* Returns: 1 if the timer is pending, 0 if not.
		*/
		static inline int timer_pending(const struct timer_list * timer)
		{
		@@ -175,6 +175,10 @@ extern int timer_shutdown(struct timer_list *timer);
		* See timer_delete_sync() for detailed explanation.
		*
		* Do not use in new code. Use timer_delete_sync() instead.
		*
		* Returns:
		* * %0 - The timer was not pending
		* * %1 - The timer was pending and deactivated
		*/
		static inline int del_timer_sync(struct timer_list *timer)
		{
		@@ -188,6 +192,10 @@ static inline int del_timer_sync(struct timer_list *timer)
		* See timer_delete() for detailed explanation.
		*
		* Do not use in new code. Use timer_delete() instead.
		*
		* Returns:
		* * %0 - The timer was not pending
		* * %1 - The timer was pending and deactivated
		*/
		static inline int del_timer(struct timer_list *timer)
		{

include/vdso/datapage.h

+1 −7

Original line number	Diff line number	Diff line
		@@ -19,12 +19,6 @@
		#include <vdso/time32.h>
		#include <vdso/time64.h>

		#ifdef CONFIG_ARM64
		#include <asm/page-def.h>
		#else
		#include <asm/page.h>
		#endif

		#ifdef CONFIG_ARCH_HAS_VDSO_DATA
		#include <asm/vdso/data.h>
		#else
		@@ -132,7 +126,7 @@ extern struct vdso_data _timens_data[CS_BASES] __attribute__((visibility("hidden
		*/
		union vdso_data_store {
		struct vdso_data data[CS_BASES];
		u8 page[PAGE_SIZE];
		u8 page[1U << CONFIG_PAGE_SHIFT];
		};

		/*