Skip to content

Commit f710bd6

Browse files
pengdonglinopsiff
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: stable@vger.kernel.org Fixes: 36590c5 ("tracing: Merge irqflags + preempt counter.") Link: https://lore.kernel.org/20250512094246.1167956-2-dolinux.peng@gmail.com Signed-off-by: pengdonglin <dolinux.peng@gmail.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 9d1216bf49103fe8bd83fcd3ddc767f0ca425ddb)
1 parent 8852325 commit f710bd6

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

kernel/trace/trace_functions.c

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

562562
static __always_inline void trace_stack(struct trace_array *tr)
563563
{
564-
unsigned int trace_ctx;
565-
566-
trace_ctx = tracing_gen_ctx();
567-
568-
__trace_stack(tr, trace_ctx, FTRACE_STACK_SKIP);
564+
__trace_stack(tr, tracing_gen_ctx_dec(), FTRACE_STACK_SKIP);
569565
}
570566

571567
static void

0 commit comments

Comments
 (0)