]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
time/jiffies: Mark jiffies_64_to_clock_t() notrace
authorSteven Rostedt <rostedt@goodmis.org>
Sat, 7 Mar 2026 02:24:03 +0000 (21:24 -0500)
committerThomas Gleixner <tglx@kernel.org>
Wed, 11 Mar 2026 09:33:12 +0000 (10:33 +0100)
The trace_clock_jiffies() function that handles the "uptime" clock for
tracing calls jiffies_64_to_clock_t(). This causes the function tracer to
constantly recurse when the tracing clock is set to "uptime". Mark it
notrace to prevent unnecessary recursion when using the "uptime" clock.

Fixes: 58d4e21e50ff3 ("tracing: Fix wraparound problems in "uptime" trace clock")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260306212403.72270bb2@robin
kernel/time/time.c

index 36fd2313ae7eef5686722687008750981646a9e0..0d832317d5766ab504026a71776335e160191264 100644 (file)
@@ -697,7 +697,7 @@ EXPORT_SYMBOL(clock_t_to_jiffies);
  *
  * Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC)
  */
-u64 jiffies_64_to_clock_t(u64 x)
+notrace u64 jiffies_64_to_clock_t(u64 x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
 # if HZ < USER_HZ