[tip: timers/urgent] timekeeping: Mark NMI safe time accessors as notrace

From: tip-bot2 for Kurt Kanzenbach
Date: Thu Apr 28 2022 - 18:16:58 EST

The following commit has been merged into the timers/urgent branch of tip:

Commit-ID: 2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20
Gitweb: https://git.kernel.org/tip/2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20
Author: Kurt Kanzenbach <kurt@xxxxxxxxxxxxx>
AuthorDate: Thu, 28 Apr 2022 08:24:32 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Fri, 29 Apr 2022 00:07:53 +02:00

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@xxxxxxxxxxx>
Signed-off-by: Kurt Kanzenbach <kurt@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20220426175338.3807ca4f@xxxxxxxxxxxxxxxxxx/
Link: https://lore.kernel.org/r/20220428062432.61063-1-kurt@xxxxxxxxxxxxx
kernel/time/timekeeping.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index dcdcb85..3b1398f 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);