Skip to content

Commit 2c33d77

Browse files
shifty91KAGA-KOKO
authored andcommitted
timekeeping: Mark NMI safe time accessors as notrace
Mark the CLOCK_MONOTONIC fast time accessors as notrace. These functions are used in tracing to retrieve timestamps, so they should not recurse. Fixes: 4498e74 ("time: Parametrize all tk_fast_mono users") Fixes: f09cb9a ("time: Introduce tk_fast_raw") Reported-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220426175338.3807ca4f@gandalf.local.home/ Link: https://lore.kernel.org/r/20220428062432.61063-1-kurt@linutronix.de
1 parent 214cab6 commit 2c33d77

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

kernel/time/timekeeping.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ static __always_inline u64 __ktime_get_fast_ns(struct tk_fast *tkf)
482482
* of the following timestamps. Callers need to be aware of that and
483483
* deal with it.
484484
*/
485-
u64 ktime_get_mono_fast_ns(void)
485+
u64 notrace ktime_get_mono_fast_ns(void)
486486
{
487487
return __ktime_get_fast_ns(&tk_fast_mono);
488488
}
@@ -494,7 +494,7 @@ EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);
494494
* Contrary to ktime_get_mono_fast_ns() this is always correct because the
495495
* conversion factor is not affected by NTP/PTP correction.
496496
*/
497-
u64 ktime_get_raw_fast_ns(void)
497+
u64 notrace ktime_get_raw_fast_ns(void)
498498
{
499499
return __ktime_get_fast_ns(&tk_fast_raw);
500500
}

0 commit comments

Comments
 (0)