Skip to content

Commit edede7a

Browse files
Ye Weihuarostedt
authored andcommitted
trace/fgraph: Fix the warning caused by missing unregister notifier
This warning was triggered during testing on v6.16: notifier callback ftrace_suspend_notifier_call already registered WARNING: CPU: 2 PID: 86 at kernel/notifier.c:23 notifier_chain_register+0x44/0xb0 ... Call Trace: <TASK> blocking_notifier_chain_register+0x34/0x60 register_ftrace_graph+0x330/0x410 ftrace_profile_write+0x1e9/0x340 vfs_write+0xf8/0x420 ? filp_flush+0x8a/0xa0 ? filp_close+0x1f/0x30 ? do_dup2+0xaf/0x160 ksys_write+0x65/0xe0 do_syscall_64+0xa4/0x260 entry_SYSCALL_64_after_hwframe+0x77/0x7f When writing to the function_profile_enabled interface, the notifier was not unregistered after start_graph_tracing failed, causing a warning the next time function_profile_enabled was written. Fixed by adding unregister_pm_notifier in the exception path. Link: https://lore.kernel.org/[email protected] Fixes: 4a2b8dd ("tracing/function-graph-tracer: fix a regression while suspend to disk") Acked-by: Masami Hiramatsu (Google) <[email protected]> Signed-off-by: Ye Weihua <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent cd6e4fa commit edede7a

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

kernel/trace/fgraph.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,7 @@ int register_ftrace_graph(struct fgraph_ops *gops)
13971397
ftrace_graph_active--;
13981398
gops->saved_func = NULL;
13991399
fgraph_lru_release_index(i);
1400+
unregister_pm_notifier(&ftrace_suspend_notifier);
14001401
}
14011402
return ret;
14021403
}

0 commit comments

Comments
 (0)