tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ftrace: Properly merge notrace hashes

Browse Source 
commit 04a80a34c22f4db245f553d8696d1318d1c00ece upstream.

The global notrace hash should be jointly decided by the intersection of
each subops's notrace hash, but not the filter hash.

Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/20250408160258.48563-1-andybnac@gmail.com
Fixes: 5fccc7552c ("ftrace: Add subops logic to allow one ops to manage many")
Signed-off-by: Andy Chiu <andybnac@gmail.com>
[ fixed removing of freeing of filter_hash ]
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Chiu
2025-04-09 00:02:57 +08:00
committed by Greg Kroah-Hartman
parent 1fce9574b9
commit e66fb9b4e9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/trace/ftrace.c
+4 -4
View File
@@ -3523,16 +3523,16 @@ int ftrace_startup_subops(struct ftrace_ops *ops, struct ftrace_ops *subops, int
ftrace_hash_empty(subops->func_hash->notrace_hash)) { ftrace_hash_empty(subops->func_hash->notrace_hash)) {
notrace_hash = EMPTY_HASH; notrace_hash = EMPTY_HASH;
} else { } else {
size_bits = max(ops->func_hash->filter_hash->size_bits, size_bits = max(ops->func_hash->notrace_hash->size_bits,
subops->func_hash->filter_hash->size_bits); subops->func_hash->notrace_hash->size_bits);
notrace_hash = alloc_ftrace_hash(size_bits); notrace_hash = alloc_ftrace_hash(size_bits);
if (!notrace_hash) { if (!notrace_hash) {
free_ftrace_hash(filter_hash); free_ftrace_hash(filter_hash);
return -ENOMEM; return -ENOMEM;
} }
ret = intersect_hash(&notrace_hash, ops->func_hash->filter_hash, ret = intersect_hash(&notrace_hash, ops->func_hash->notrace_hash,
subops->func_hash->filter_hash); subops->func_hash->notrace_hash);
if (ret < 0) { if (ret < 0) {
free_ftrace_hash(filter_hash); free_ftrace_hash(filter_hash);
free_ftrace_hash(notrace_hash); free_ftrace_hash(notrace_hash);