mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 22:37:45 -04:00
tracing/ftrace: use preempt_enable_no_resched_notrace in ring_buffer_time_stamp()
Impact: prevent a trace recursion After some tests with function graph tracer under x86-32, I saw some recursions caused by ring_buffer_time_stamp() that calls preempt_enable_no_notrace() which calls preempt_schedule() which is traced itself. This patch re-enables preemption without rescheduling. Signed-off-by: Frederic Weisbecker <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
1 parent
9dfc3bc7d2
commit
2c2d7329d8
1 file changed
+1
-1
@@ -107,7 +107,7 @@ u64 ring_buffer_time_stamp(int cpu)
|
||||
preempt_disable_notrace();
|
||||
/* shift to debug/test normalization and TIME_EXTENTS */
|
||||
time = sched_clock() << DEBUG_SHIFT;
|
||||
preempt_enable_notrace();
|
||||
preempt_enable_no_resched_notrace();
|
||||
|
||||
return time;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user