Skip to content

Commit 560877a

Browse files
pengdonglingregkh
pengdonglin
authored andcommitted
ftrace: Fix preemption accounting for stacktrace filter command
commit 11aff32 upstream. The preemption count of the stacktrace filter command to trace ksys_read is consistently incorrect: $ echo ksys_read:stacktrace > set_ftrace_filter <...>-453 [004] ...1. 38.308956: <stack trace> => ksys_read => do_syscall_64 => entry_SYSCALL_64_after_hwframe The root cause is that the trace framework disables preemption when invoking the filter command callback in function_trace_probe_call: preempt_disable_notrace(); probe_ops->func(ip, parent_ip, probe_opsbe->tr, probe_ops, probe->data); preempt_enable_notrace(); Use tracing_gen_ctx_dec() to account for the preempt_disable_notrace(), which will output the correct preemption count: $ echo ksys_read:stacktrace > set_ftrace_filter <...>-410 [006] ..... 31.420396: <stack trace> => ksys_read => do_syscall_64 => entry_SYSCALL_64_after_hwframe Cc: [email protected] Fixes: 36590c5 ("tracing: Merge irqflags + preempt counter.") Link: https://lore.kernel.org/[email protected] Signed-off-by: pengdonglin <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent deea40f commit 560877a

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

kernel/trace/trace_functions.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -568,11 +568,7 @@ ftrace_traceoff(unsigned long ip, unsigned long parent_ip,
568568

569569
static __always_inline void trace_stack(struct trace_array *tr)
570570
{
571-
unsigned int trace_ctx;
572-
573-
trace_ctx = tracing_gen_ctx();
574-
575-
__trace_stack(tr, trace_ctx, FTRACE_STACK_SKIP);
571+
__trace_stack(tr, tracing_gen_ctx_dec(), FTRACE_STACK_SKIP);
576572
}
577573

578574
static void

0 commit comments

Comments
 (0)