Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fprobe: Resolve symbols with ftrace_lookup_symbols

Using ftrace_lookup_symbols to speed up symbols lookup
in register_fprobe_syms API.

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20220510122616.2652285-4-jolsa@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Jiri Olsa and committed by
Alexei Starovoitov
8be92533 bed0d9a5

+12 -20
+12 -20
kernel/trace/fprobe.c
··· 85 85 } 86 86 NOKPROBE_SYMBOL(fprobe_exit_handler); 87 87 88 + static int symbols_cmp(const void *a, const void *b) 89 + { 90 + const char **str_a = (const char **) a; 91 + const char **str_b = (const char **) b; 92 + 93 + return strcmp(*str_a, *str_b); 94 + } 95 + 88 96 /* Convert ftrace location address from symbols */ 89 97 static unsigned long *get_ftrace_locations(const char **syms, int num) 90 98 { 91 - unsigned long addr, size; 92 99 unsigned long *addrs; 93 - int i; 94 100 95 101 /* Convert symbols to symbol address */ 96 102 addrs = kcalloc(num, sizeof(*addrs), GFP_KERNEL); 97 103 if (!addrs) 98 104 return ERR_PTR(-ENOMEM); 99 105 100 - for (i = 0; i < num; i++) { 101 - addr = kallsyms_lookup_name(syms[i]); 102 - if (!addr) /* Maybe wrong symbol */ 103 - goto error; 106 + /* ftrace_lookup_symbols expects sorted symbols */ 107 + sort(syms, num, sizeof(*syms), symbols_cmp, NULL); 104 108 105 - /* Convert symbol address to ftrace location. */ 106 - if (!kallsyms_lookup_size_offset(addr, &size, NULL) || !size) 107 - goto error; 109 + if (!ftrace_lookup_symbols(syms, num, addrs)) 110 + return addrs; 108 111 109 - addr = ftrace_location_range(addr, addr + size - 1); 110 - if (!addr) /* No dynamic ftrace there. */ 111 - goto error; 112 - 113 - addrs[i] = addr; 114 - } 115 - 116 - return addrs; 117 - 118 - error: 119 112 kfree(addrs); 120 - 121 113 return ERR_PTR(-ENOENT); 122 114 } 123 115