summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorKurt Kanzenbach <kurt@linutronix.de>2022-04-28 08:24:32 +0200
committerThomas Gleixner <tglx@linutronix.de>2022-04-29 00:07:53 +0200
commit2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20 (patch)
tree0f7cf5c4b813f09b3c0ce5ec96301f828c0709e6 /kernel
parent214cab6f8020a9ad4a5e9862a4e68088d5a79f08 (diff)
downloadlinux-stable-2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20.tar.gz
linux-stable-2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20.tar.bz2
linux-stable-2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20.zip
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: 4498e7467e9e ("time: Parametrize all tk_fast_mono users") Fixes: f09cb9a1808e ("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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timekeeping.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index dcdcb85121e4..3b1398fbddaf 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -482,7 +482,7 @@ static __always_inline u64 __ktime_get_fast_ns(struct tk_fast *tkf)
* of the following timestamps. Callers need to be aware of that and
* deal with it.
*/
-u64 ktime_get_mono_fast_ns(void)
+u64 notrace ktime_get_mono_fast_ns(void)
{
return __ktime_get_fast_ns(&tk_fast_mono);
}
@@ -494,7 +494,7 @@ EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);
* Contrary to ktime_get_mono_fast_ns() this is always correct because the
* conversion factor is not affected by NTP/PTP correction.
*/
-u64 ktime_get_raw_fast_ns(void)
+u64 notrace ktime_get_raw_fast_ns(void)
{
return __ktime_get_fast_ns(&tk_fast_raw);
}