Skip to content

Commit 397282c

Browse files
rostedtgregkh
authored andcommitted
ftrace: Do not add duplicate entries in subops manager ops
commit 8eb4b09 upstream. Check if a function is already in the manager ops of a subops. A manager ops contains multiple subops, and if two or more subops are tracing the same function, the manager ops only needs a single entry in its hash. Cc: stable@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Link: https://lore.kernel.org/20250220202055.226762894@goodmis.org Fixes: 4f554e9 ("ftrace: Add ftrace_set_filter_ips function") Tested-by: Heiko Carstens <hca@linux.ibm.com> Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1adab9a commit 397282c

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

kernel/trace/ftrace.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5770,6 +5770,9 @@ __ftrace_match_addr(struct ftrace_hash *hash, unsigned long ip, int remove)
57705770
return -ENOENT;
57715771
free_hash_entry(hash, entry);
57725772
return 0;
5773+
} else if (__ftrace_lookup_ip(hash, ip) != NULL) {
5774+
/* Already exists */
5775+
return 0;
57735776
}
57745777

57755778
entry = add_hash_entry(hash, ip);

0 commit comments

Comments
 (0)