perf build broken seemingly due to libbpf changes, checking...

[Arnaldo Carvalho de Melo <acme@kernel.org>]

After merging torvalds/master to perf/urgent I'm getting this:

util/bpf-event.c:25:21: error: no previous prototype for ‘btf__load_from_kernel_by_id’ [-Werror=missing-prototypes]
   25 | struct btf * __weak btf__load_from_kernel_by_id(__u32 id)
      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
util/bpf-event.c:37:1: error: no previous prototype for ‘bpf_object__next_program’ [-Werror=missing-prototypes]
   37 | bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev)
      | ^~~~~~~~~~~~~~~~~~~~~~~~
util/bpf-event.c:46:1: error: no previous prototype for ‘bpf_object__next_map’ [-Werror=missing-prototypes]
   46 | bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev)
      | ^~~~~~~~~~~~~~~~~~~~
util/bpf-event.c:55:1: error: no previous prototype for ‘btf__raw_data’ [-Werror=missing-prototypes]
   55 | btf__raw_data(const struct btf *btf_ro, __u32 *size)
      | ^~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:96: /tmp/build/perf/util/bpf-event.o] Error 1
make[4]: *** Waiting for unfinished jobs....
util/bpf_counter.c: In function ‘bpf_target_prog_name’:
util/bpf_counter.c:82:15: error: implicit declaration of function ‘btf__load_from_kernel_by_id’ [-Werror=implicit-function-declaration]
   82 |         btf = btf__load_from_kernel_by_id(info_linear->info.btf_id);
      |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~
util/bpf_counter.c:82:13: error: assignment to ‘struct btf *’ from ‘int’ makes pointer from integer without a cast [-Werror=int-conversion]
   82 |         btf = btf__load_from_kernel_by_id(info_linear->info.btf_id);
      |             ^
cc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf/tools/build/Makefile.build:96: /tmp/build/perf/util/bpf_counter.o] Error 1

I'm checking now...

BTW I test perf builds with:

make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin && git status && perf test python


-- 

- Arnaldo