From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
lkml <linux-kernel@vger.kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>
Subject: [RFC bpf-next 2/4] fprobe: Resolve symbols with kallsyms_lookup_names
Date: Thu, 7 Apr 2022 14:52:22 +0200 [thread overview]
Message-ID: <20220407125224.310255-3-jolsa@kernel.org> (raw)
In-Reply-To: <20220407125224.310255-1-jolsa@kernel.org>
Using kallsyms_lookup_names to speed up symbols lookup
in register_fprobe_syms API.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/kallsyms.c | 2 +-
kernel/trace/fprobe.c | 23 ++---------------------
2 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index a3738ddf9e87..7d89da375c23 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -230,7 +230,7 @@ unsigned long kallsyms_lookup_name(const char *name)
return module_kallsyms_lookup_name(name);
}
-#ifdef CONFIG_LIVEPATCH
+#if defined(CONFIG_LIVEPATCH) || defined(CONFIG_FPROBE)
/*
* Iterate over all symbols in vmlinux. For symbols from modules use
* module_kallsyms_on_each_symbol instead.
diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c
index 89d9f994ebb0..d466803dc2b2 100644
--- a/kernel/trace/fprobe.c
+++ b/kernel/trace/fprobe.c
@@ -88,36 +88,17 @@ NOKPROBE_SYMBOL(fprobe_exit_handler);
/* Convert ftrace location address from symbols */
static unsigned long *get_ftrace_locations(const char **syms, int num)
{
- unsigned long addr, size;
unsigned long *addrs;
- int i;
/* Convert symbols to symbol address */
addrs = kcalloc(num, sizeof(*addrs), GFP_KERNEL);
if (!addrs)
return ERR_PTR(-ENOMEM);
- for (i = 0; i < num; i++) {
- addr = kallsyms_lookup_name(syms[i]);
- if (!addr) /* Maybe wrong symbol */
- goto error;
+ if (!kallsyms_lookup_names(syms, num, addrs))
+ return addrs;
- /* Convert symbol address to ftrace location. */
- if (!kallsyms_lookup_size_offset(addr, &size, NULL) || !size)
- goto error;
-
- addr = ftrace_location_range(addr, addr + size - 1);
- if (!addr) /* No dynamic ftrace there. */
- goto error;
-
- addrs[i] = addr;
- }
-
- return addrs;
-
-error:
kfree(addrs);
-
return ERR_PTR(-ENOENT);
}
--
2.35.1
next prev parent reply other threads:[~2022-04-07 12:53 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 12:52 [RFC bpf-next 0/4] bpf: Speed up symbol resolving in kprobe multi link Jiri Olsa
2022-04-07 12:52 ` [RFC bpf-next 1/4] kallsyms: Add kallsyms_lookup_names function Jiri Olsa
2022-04-08 0:57 ` Masami Hiramatsu
2022-04-13 7:27 ` Jiri Olsa
2022-04-08 23:19 ` Alexei Starovoitov
2022-04-09 20:24 ` Jiri Olsa
2022-04-12 20:46 ` Jiri Olsa
2022-04-15 0:47 ` Masami Hiramatsu
2022-04-15 22:39 ` Jiri Olsa
2022-04-11 22:15 ` Andrii Nakryiko
2022-04-12 20:28 ` Jiri Olsa
2022-04-07 12:52 ` Jiri Olsa [this message]
2022-04-08 0:58 ` [RFC bpf-next 2/4] fprobe: Resolve symbols with kallsyms_lookup_names Masami Hiramatsu
2022-04-07 12:52 ` [RFC bpf-next 3/4] bpf: Resolve symbols with kallsyms_lookup_names for kprobe multi link Jiri Olsa
2022-04-08 23:26 ` Alexei Starovoitov
2022-04-09 20:24 ` Jiri Olsa
2022-04-11 22:15 ` Andrii Nakryiko
2022-04-11 22:15 ` Andrii Nakryiko
2022-04-12 18:42 ` Jiri Olsa
2022-04-07 12:52 ` [RFC bpf-next 4/4] selftests/bpf: Add attach bench test Jiri Olsa
2022-04-11 22:15 ` Andrii Nakryiko
2022-04-12 0:49 ` Masami Hiramatsu
2022-04-12 22:51 ` Andrii Nakryiko
2022-04-16 14:21 ` Masami Hiramatsu
2022-04-18 17:33 ` Steven Rostedt
2022-04-28 13:58 ` Steven Rostedt
2022-04-28 13:59 ` Steven Rostedt
2022-04-28 18:59 ` Alexei Starovoitov
2022-04-28 20:05 ` Steven Rostedt
2022-04-28 23:32 ` Andrii Nakryiko
2022-04-28 23:53 ` Steven Rostedt
2022-04-29 0:09 ` Steven Rostedt
2022-04-29 0:31 ` Steven Rostedt
2022-04-13 16:44 ` Steven Rostedt
2022-04-13 16:45 ` Andrii Nakryiko
2022-04-13 16:59 ` Steven Rostedt
2022-04-13 19:02 ` Andrii Nakryiko
2022-04-12 15:44 ` Jiri Olsa
2022-04-12 22:59 ` Andrii Nakryiko
2022-04-08 23:29 ` [RFC bpf-next 0/4] bpf: Speed up symbol resolving in kprobe multi link Alexei Starovoitov
2022-04-09 20:24 ` Jiri Olsa
2022-04-11 22:15 ` Andrii Nakryiko
2022-04-11 22:18 ` Alexei Starovoitov
2022-04-11 22:21 ` Andrii Nakryiko
2022-04-12 15:46 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220407125224.310255-3-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).