Skip to contentSkip to conversation

FAILED: patch "[PATCH] timekeeping: Mark NMI safe time accessors as notrace" failed to apply to 4.19-stable tree

PATCH [email protected] 1 participant 1 message May 9, 2022

Subsystems (2)
Stable branch Timekeeping, clocksource core, NTP, alarmtimer
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 2c33d775ef4c25c0e1e1cc0fd5496d02f76bfa20 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach <[email protected]>
Date: Thu, 28 Apr 2022 08:24:32 +0200
Subject: [PATCH] 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 <[email protected]>
Signed-off-by Kurt Kanzenbach <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Cc [email protected]
Link https://lore.kernel.org/r/[email protected]/ open here
Link https://lore.kernel.org/r/[email protected] open here
kernel/time/timekeeping.c +2 -2
index dcdcb85121e4..3b1398fbddaf 100644
@@ -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);
 }