Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Tue, 12 Apr 2022 22:28:09 +0200
From:   Jiri Olsa <olsajiri@gmail.com>
To:     Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc:     Jiri Olsa <jolsa@kernel.org>, Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Networking <netdev@vger.kernel.org>, bpf <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
Message-ID: <YlXg2SD4871l/uiW@krava>
References: <20220407125224.310255-1-jolsa@kernel.org>
 <20220407125224.310255-2-jolsa@kernel.org>
 <CAEf4BzYffXGFigxywjP391s4G=6VpykxaqD5OYuOR5mBRa1Tmw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAEf4BzYffXGFigxywjP391s4G=6VpykxaqD5OYuOR5mBRa1Tmw@mail.gmail.com>
Precedence: bulk

On Mon, Apr 11, 2022 at 03:15:23PM -0700, Andrii Nakryiko wrote:

SNIP

> >  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)
> 
> isn't this literally strcmp? Or compiler will actually complain about
> const void * vs const char *?

yes..

kernel/kallsyms.c: In function ‘kallsyms_callback’:
kernel/kallsyms.c:597:73: error: passing argument 5 of ‘bsearch’ from incompatible pointer type [-Werror=incompatible-pointer-types]
  597 |         if (!bsearch(&name, args->syms, args->cnt, sizeof(*args->syms), strcmp))
      |                                                                         ^~~~~~
      |                                                                         |
      |                                                                         int (*)(const char *, const char *)


> 
> > +{
> > +       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);
> > +
> > +       args.addrs = addrs;
> > +       args.syms = syms;
> > +       args.cnt = cnt;
> > +       args.found = 0;
> > +       kallsyms_on_each_symbol(kallsyms_callback, &args);
> > +
> > +       return args.found == args.cnt ? 0 : -EINVAL;
> 
> ESRCH or ENOENT makes a bit more sense as an error?

ok

jirka

> 
> 
> > +}
> > +
> >  /* To avoid using get_symbol_offset for every symbol, we carry prefix along. */
> >  struct kallsym_iter {
> >         loff_t pos;
> > --
> > 2.35.1
> >