Thread (4 messages) flat view 4 messages, 2 authors, 2025-10-08
STALE353d

[PATCH 1/2] tracing/wakeup: Balance prolog on fgraph failure

From: Sasha Levin <sashal@kernel.org>
Date: 2025-10-06 17:58:56
Also in: lkml
Subsystem: the rest, tracing, tracing os noise / latency tracers · Maintainers: Linus Torvalds, Steven Rostedt, Masami Hiramatsu

Commit a485ea9e3ef3 ("tracing: Fix irqsoff and wakeup latency tracers when
using function graph") added fgraph_reserve_data()/fgraph_retrieve_data() to
the wakeup tracer's function-graph hooks.

When func_prolog_preempt_disable() succeeded but those calls failed, the code
returned without undoing the prolog (no local_dec(&data->disabled), no
preempt_enable_notrace()). That leaked a preempt disable into later code and
could trigger "BUG: scheduling while atomic".

Balance the prolog on these failure paths in both entry and return hooks.

Fixes: a485ea9e3ef3 ("tracing: Fix irqsoff and wakeup latency tracers when using function graph")
Assisted-by: gpt-5-codex
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 kernel/trace/trace_sched_wakeup.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index bf1cb80742aed..fa48bbdf0851c 100644
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -138,8 +138,11 @@ static int wakeup_graph_entry(struct ftrace_graph_ent *trace,
 		return 0;
 
 	calltime = fgraph_reserve_data(gops->idx, sizeof(*calltime));
-	if (!calltime)
+	if (!calltime) {
+		local_dec(&data->disabled);
+		preempt_enable_notrace();
 		return 0;
+	}
 
 	*calltime = trace_clock_local();
 
@@ -169,8 +172,11 @@ static void wakeup_graph_return(struct ftrace_graph_ret *trace,
 	rettime = trace_clock_local();
 
 	calltime = fgraph_retrieve_data(gops->idx, &size);
-	if (!calltime)
+	if (!calltime) {
+		local_dec(&data->disabled);
+		preempt_enable_notrace();
 		return;
+	}
 
 	__trace_graph_return(tr, trace, trace_ctx, *calltime, rettime);
 	local_dec(&data->disabled);
-- 
2.51.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help