History

tracing/kprobes: Fix symbol counting logic by looking at modules as well

Recent changes to count number of matching symbols when creating a kprobe event failed to take into account kernel modules. As such, it breaks kprobes on kernel module symbols, by assuming there is no match. Fix this my calling module_kallsyms_on_each_symbol() in addition to kallsyms_on_each_match_symbol() to perform a proper counting. Link: https://lore.kernel.org/all/20231027233126.2073148-1-andrii@kernel.org/

Andrii Nakryiko committed 3 years ago

Commit 926fe781 parent e0f83181 file · +20 −4Browse files

Unified · Split

kernel/trace/trace_kprobe.c+20−4
@@ -714,14 +714,30 @@ static int count_symbols(void *data, unsigned long unused) · 713 unmodified lines
714 return 0;714 return 0;
715}715}
716 716
717struct sym_count_ctx {
718 unsigned int count;
719 const char *name;
720};
721
722static int count_mod_symbols(void *data, const char *name, unsigned long unused)
723{
724 struct sym_count_ctx *ctx = data;
725
726 if (strcmp(name, ctx->name) == 0)
727 ctx->count++;
728
729 return 0;
730}
731
717static unsigned int number_of_same_symbols(char *func_name)732static unsigned int number_of_same_symbols(char *func_name)
718{733{
719 unsigned int count;734 struct sym_count_ctx ctx = { .count = 0, .name = func_name };
735
736 kallsyms_on_each_match_symbol(count_symbols, func_name, &ctx.count);
720 737
721 count = 0;738 module_kallsyms_on_each_symbol(NULL, count_mod_symbols, &ctx);
722 kallsyms_on_each_match_symbol(count_symbols, func_name, &count);
723 739
724 return count;740 return ctx.count;
725}741}
726 742
727static int __trace_kprobe_create(int argc, const char *argv[])743static int __trace_kprobe_create(int argc, const char *argv[])

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t