On Wed, Jan 19, 2022 at 3:20 PM Song Liu <songliubraving@xxxxxx> wrote:
>
>
>
> > On Jan 19, 2022, at 3:06 PM, Christy Lee <christylee@xxxxxx> wrote:
> >
> > bpf_load_program() API is deprecated, remove perf's usage of the
> > deprecated function. Add a __weak function declaration for libbpf
> > version compatibility.
> >
> > Signed-off-by: Christy Lee <christylee@xxxxxx>
> > Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
>
> Acked-by: Song Liu <songliubraving@xxxxxx>
>
> With one minor comment below.
>
> > ---
> > tools/perf/tests/bpf.c | 14 ++++----------
> > tools/perf/util/bpf-event.c | 16 ++++++++++++++++
> > 2 files changed, 20 insertions(+), 10 deletions(-)
> >
> > diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
> > index 573490530194..57b9591f7cbb 100644
> > --- a/tools/perf/tests/bpf.c
> > +++ b/tools/perf/tests/bpf.c
> > @@ -281,8 +281,8 @@ static int __test__bpf(int idx)
> >
> > static int check_env(void)
> > {
> > + LIBBPF_OPTS(bpf_prog_load_opts, opts);
>
> This changes seems unnecessary.
>
> > int err;
> > - unsigned int kver_int;
> > char license[] = "GPL";
> >
> > struct bpf_insn insns[] = {
> > @@ -290,19 +290,13 @@ static int check_env(void)
> > BPF_EXIT_INSN(),
> > };
> >
> > - err = fetch_kernel_version(&kver_int, NULL, 0);
> > + err = fetch_kernel_version(&opts.kern_version, NULL, 0);
Opts are used here. Libbpf is now performing the same kern_version
extraction logic, so we might not need fetch_kernel_version() now, but
I'd still keep it to avoid unnecessary regressions.
> > if (err) {
> > pr_debug("Unable to get kernel version\n");
> > return err;
> > }
> > -
> > -/* temporarily disable libbpf deprecation warnings */
> > -#pragma GCC diagnostic push
> > -#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
> > - err = bpf_load_program(BPF_PROG_TYPE_KPROBE, insns,
> > - ARRAY_SIZE(insns),
> > - license, kver_int, NULL, 0);
> > -#pragma GCC diagnostic pop
> > + err = bpf_prog_load(BPF_PROG_TYPE_KPROBE, NULL, license, insns,
> > + ARRAY_SIZE(insns), &opts);
> > if (err < 0) {
> > pr_err("Missing basic BPF support, skip this test: %s\n",
> > strerror(errno));
> > diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
> > index a517eaa51eb3..48872276c0b7 100644
> > --- a/tools/perf/util/bpf-event.c
> > +++ b/tools/perf/util/bpf-event.c
> > @@ -33,6 +33,22 @@ struct btf * __weak btf__load_from_kernel_by_id(__u32 id)
> > return err ? ERR_PTR(err) : btf;
> > }
> >
> > +#pragma GCC diagnostic push
> > +#pragma GCC diagnostic ignored "-Wunused-parameter"
> > +int __weak
> > +bpf_prog_load(enum bpf_prog_type prog_type,
> > + const char *prog_name, const char *license,
> > + const struct bpf_insn *insns, size_t insn_cnt,
> > + const struct bpf_prog_load_opts *opts)
> > +{
> > +#pragma GCC diagnostic push
> > +#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
> > + return bpf_load_program(prog_type, insns, insn_cnt, license,
> > + opts->kern_version, opts->log_buf, opts->log_size);
> > +#pragma GCC diagnostic pop
> > +}
> > +#pragma GCC diagnostic pop
> > +
> > struct bpf_program * __weak
> > bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev)
> > {
> > --
> > 2.30.2
> >
>
