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/
Unified · Split
| @@ -714,14 +714,30 @@ static int count_symbols(void *data, unsigned long unused) · 713 unmodified lines | ||
| 714 | 714 | return 0; |
| 715 | 715 | } |
| 716 | 716 | |
| 717 | +struct sym_count_ctx { | |
| 718 | + unsigned int count; | |
| 719 | + const char *name; | |
| 720 | +}; | |
| 721 | + | |
| 722 | +static 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 | + | |
| 717 | 732 | static 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; | |
| 722 | − kallsyms_on_each_match_symbol(count_symbols, func_name, &count); | |
| 738 | + module_kallsyms_on_each_symbol(NULL, count_mod_symbols, &ctx); | |
| 723 | 739 | |
| 724 | − return count; | |
| 740 | + return ctx.count; | |
| 725 | 741 | } |
| 726 | 742 | |
| 727 | 743 | static int __trace_kprobe_create(int argc, const char *argv[]) |