From: Jiri Olsa <olsajiri@gmail.com>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Jiri Olsa <jolsa@kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
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: Re: [RFC bpf-next 1/4] kallsyms: Add kallsyms_lookup_names function
Date: Sat, 16 Apr 2022 00:39:08 +0200 [thread overview]
Message-ID: <Yln0DCVKAf9yZicG@krava> (raw)
In-Reply-To: <20220415094727.2880a321bb6674d94e104110@kernel.org>
On Fri, Apr 15, 2022 at 09:47:27AM +0900, Masami Hiramatsu wrote:
> Hi Jiri,
>
> Sorry for replying later.
>
> On Tue, 12 Apr 2022 22:46:15 +0200
> Jiri Olsa <olsajiri@gmail.com> wrote:
>
> > On Fri, Apr 08, 2022 at 04:19:25PM -0700, Alexei Starovoitov wrote:
> > > On Thu, Apr 07, 2022 at 02:52:21PM +0200, Jiri Olsa wrote:
> > > > Adding kallsyms_lookup_names function that resolves array of symbols
> > > > with single pass over kallsyms.
> > > >
> > > > The user provides array of string pointers with count and pointer to
> > > > allocated array for resolved values.
> > > >
> > > > int kallsyms_lookup_names(const char **syms, u32 cnt,
> > > > unsigned long *addrs)
> > > >
> > > > Before we iterate kallsyms we sort user provided symbols by name and
> > > > then use that in kalsyms iteration to find each kallsyms symbol in
> > > > user provided symbols.
> > > >
> > > > We also check each symbol to pass ftrace_location, because this API
> > > > will be used for fprobe symbols resolving. This can be optional in
> > > > future if there's a need.
> > > >
> > > > Suggested-by: Andrii Nakryiko <andrii@kernel.org>
> > > > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > > > ---
> > > > include/linux/kallsyms.h | 6 +++++
> > > > kernel/kallsyms.c | 48 ++++++++++++++++++++++++++++++++++++++++
> > > > 2 files changed, 54 insertions(+)
> > > >
> > > > diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
> > > > index ce1bd2fbf23e..5320a5e77f61 100644
> > > > --- a/include/linux/kallsyms.h
> > > > +++ b/include/linux/kallsyms.h
> > > > @@ -72,6 +72,7 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
> > > > #ifdef CONFIG_KALLSYMS
> > > > /* Lookup the address for a symbol. Returns 0 if not found. */
> > > > unsigned long kallsyms_lookup_name(const char *name);
> > > > +int kallsyms_lookup_names(const char **syms, u32 cnt, unsigned long *addrs);
> > > >
> > > > extern int kallsyms_lookup_size_offset(unsigned long addr,
> > > > unsigned long *symbolsize,
> > > > @@ -103,6 +104,11 @@ static inline unsigned long kallsyms_lookup_name(const char *name)
> > > > return 0;
> > > > }
> > > >
> > > > +int kallsyms_lookup_names(const char **syms, u32 cnt, unsigned long *addrs)
> > > > +{
> > > > + return -ERANGE;
> > > > +}
> > > > +
> > > > static inline int kallsyms_lookup_size_offset(unsigned long addr,
> > > > unsigned long *symbolsize,
> > > > unsigned long *offset)
> > > > diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
> > > > index 79f2eb617a62..a3738ddf9e87 100644
> > > > --- a/kernel/kallsyms.c
> > > > +++ b/kernel/kallsyms.c
> > > > @@ -29,6 +29,8 @@
> > > > #include <linux/compiler.h>
> > > > #include <linux/module.h>
> > > > #include <linux/kernel.h>
> > > > +#include <linux/bsearch.h>
> > > > +#include <linux/sort.h>
> > > >
> > > > /*
> > > > * These will be re-linked against their real values
> > > > @@ -572,6 +574,52 @@ int sprint_backtrace_build_id(char *buffer, unsigned long address)
> > > > return __sprint_symbol(buffer, address, -1, 1, 1);
> > > > }
> > > >
> > > > +static int symbols_cmp(const void *a, const void *b)
> > > > +{
> > > > + const char **str_a = (const char **) a;
> > > > + const char **str_b = (const char **) b;
> > > > +
> > > > + return strcmp(*str_a, *str_b);
> > > > +}
> > > > +
> > > > +struct kallsyms_data {
> > > > + unsigned long *addrs;
> > > > + const char **syms;
> > > > + u32 cnt;
> > > > + u32 found;
> > > > +};
> > > > +
> > > > +static int kallsyms_callback(void *data, const char *name,
> > > > + struct module *mod, unsigned long addr)
> > > > +{
> > > > + struct kallsyms_data *args = data;
> > > > +
> > > > + if (!bsearch(&name, args->syms, args->cnt, sizeof(*args->syms), symbols_cmp))
> > > > + return 0;
> > > > +
> > > > + addr = ftrace_location(addr);
> > > > + if (!addr)
> > > > + return 0;
> > > > +
> > > > + args->addrs[args->found++] = addr;
> > > > + return args->found == args->cnt ? 1 : 0;
> > > > +}
> > > > +
> > > > +int kallsyms_lookup_names(const char **syms, u32 cnt, unsigned long *addrs)
> > > > +{
> > > > + struct kallsyms_data args;
> > > > +
> > > > + sort(syms, cnt, sizeof(*syms), symbols_cmp, NULL);
> > >
> > > It's nice to share symbols_cmp for sort and bsearch,
> > > but messing technically input argument 'syms' like this will cause
> > > issues sooner or later.
> > > Lets make caller do the sort.
> > > Unordered input will cause issue with bsearch, of course,
> > > but it's a lesser evil. imo.
> > >
> >
> > Masami,
> > this logic bubbles up to the register_fprobe_syms, because user
> > provides symbols as its argument. Can we still force this assumption
> > to the 'syms' array, like with the comment change below?
> >
> > FYI the bpf side does not use register_fprobe_syms, it uses
> > register_fprobe_ips, because it always needs ips as search
> > base for cookie values
>
> Hmm, in that case fprobe can call sort() in the register function.
> That will be much easier and safer. The bpf case, the input array will
> be generated by the bpftool (not by manual), so it can ensure the
> syms is sorted. But we don't know how fprobe user passes syms array.
> Then register_fprobe_syms() will always requires sort(). I don't like
> such redundant requirements.
ok, I'll add it to register_fprobe_syms
thanks,
jirka
next prev parent reply other threads:[~2022-04-15 22:39 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 [this message]
2022-04-11 22:15 ` Andrii Nakryiko
2022-04-12 20:28 ` Jiri Olsa
2022-04-07 12:52 ` [RFC bpf-next 2/4] fprobe: Resolve symbols with kallsyms_lookup_names Jiri Olsa
2022-04-08 0:58 ` 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=Yln0DCVKAf9yZicG@krava \
--to=olsajiri@gmail.com \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--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).