[PATCH] fprobe: Simplify fprobe_remove_ips() by reusing existing helpers
From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Date: 2026-07-28 23:30:01
Also in:
lkml
Subsystem:
the rest, tracing · Maintainers:
Linus Torvalds, Steven Rostedt, Masami Hiramatsu
From: Masami Hiramatsu (Google) <mhiramat@kernel.org> fprobe_remove_ips() manually duplicates the unregister and filter-removal logic for both graph and ftrace ops. Simplify it by delegating to the existing fprobe_graph_remove_ips() and fprobe_ftrace_remove_ips() helpers. Assisted-by: Antigravity:gemini-3.6-flash Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> --- kernel/trace/fprobe.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c
index f681015413b8..54256586fde3 100644
--- a/kernel/trace/fprobe.c
+++ b/kernel/trace/fprobe.c@@ -464,15 +464,8 @@ static bool fprobe_exists_on_hash(unsigned long ip, bool ftrace) #ifdef CONFIG_MODULES static void fprobe_remove_ips(unsigned long *ips, unsigned int cnt) { - if (!nr_fgraph_fprobes) - __fprobe_graph_unregister(); - else if (cnt) - ftrace_set_filter_ips(&fprobe_graph_ops.ops, ips, cnt, 1, 0); - - if (!nr_ftrace_fprobes) - __fprobe_ftrace_unregister(); - else if (cnt) - ftrace_set_filter_ips(&fprobe_ftrace_ops, ips, cnt, 1, 0); + fprobe_graph_remove_ips(ips, cnt); + fprobe_ftrace_remove_ips(ips, cnt); } #endif #else