Re: perf build broken looking for bpf/{libbpf,bpf}.h after merge with upstream

[Arnaldo Carvalho de Melo]

Em Thu, Nov 04, 2021 at 06:15:57PM +0000, Quentin Monnet escreveu:
> 2021-11-04 15:09 UTC-0300 ~ Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > Em Thu, Nov 04, 2021 at 10:47:12AM -0700, Andrii Nakryiko escreveu:
> >> On Thu, Nov 4, 2021 at 10:38 AM Arnaldo Carvalho de Melo
> >> <arnaldo.melo@xxxxxxxxx> wrote:
> >>>
> >>>
> >>> Hi Song,
> >>>
> >>
> >> cc Quentin as well, might be related to recent Makefiles revamp for
> >> users of libbpf. But in bpf-next perf builds perfectly fine, so not
> >> sure.
> > 
> > This did the trick:
> > 
> > ⬢[acme@toolbox perf]$ git show
> > commit 504afe6757ec646539ca3b4aa0431820e8c92b45 (HEAD -> perf/core)
> > Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > Date:   Thu Nov 4 14:58:56 2021 -0300
> > 
> >     Revert "bpftool: Remove Makefile dep. on $(LIBBPF) for $(LIBBPF_INTERNAL_HDRS)"
> > 
> >     This reverts commit 8b6c46241c774c83998092a4eafe40f054568881.
> > 
> >     Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > 
> > diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> > index c0c30e56988f2cbe..c5ad996ee95d4e87 100644
> > --- a/tools/bpf/bpftool/Makefile
> > +++ b/tools/bpf/bpftool/Makefile
> > @@ -39,14 +39,14 @@ ifeq ($(BPFTOOL_VERSION),)
> >  BPFTOOL_VERSION := $(shell make -rR --no-print-directory -sC ../../.. kernelversion)
> >  endif
> > 
> > -$(LIBBPF_OUTPUT) $(BOOTSTRAP_OUTPUT) $(LIBBPF_BOOTSTRAP_OUTPUT) $(LIBBPF_HDRS_DIR):
> > +$(LIBBPF_OUTPUT) $(BOOTSTRAP_OUTPUT) $(LIBBPF_BOOTSTRAP_OUTPUT):
> >         $(QUIET_MKDIR)mkdir -p $@
> > 
> >  $(LIBBPF): $(wildcard $(BPF_DIR)/*.[ch] $(BPF_DIR)/Makefile) | $(LIBBPF_OUTPUT)
> >         $(Q)$(MAKE) -C $(BPF_DIR) OUTPUT=$(LIBBPF_OUTPUT) \
> >                 DESTDIR=$(LIBBPF_DESTDIR) prefix= $(LIBBPF) install_headers
> > 
> > -$(LIBBPF_INTERNAL_HDRS): $(LIBBPF_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_HDRS_DIR)
> > +$(LIBBPF_INTERNAL_HDRS): $(LIBBPF_HDRS_DIR)/%.h: $(BPF_DIR)/%.h $(LIBBPF)
> >         $(call QUIET_INSTALL, $@)
> >         $(Q)install -m 644 -t $(LIBBPF_HDRS_DIR) $<
> 
> 
> Interesting. I needed that patch because otherwise I'd get errors when
> compiling bpftool after the switch to libbpf's hashmap implementation.
> For the current breakage, it could be a matter of how we pass variables
> when descending into bpftool/ from perf's Makefile.perf. I'll try to
> look at this in details, and to experiment tonight, if I can. (Thanks
> Andrii for the CC!)

yeah, if we pass the location for those headers from the perf side, it
should work.

Extra info: if libbpf-devel is installed, it "builds", well, built
before the merge, as the one available for fedora 34 is:

libbpf-devel-2:0.4.0-1.fc34.x86_64

after installing it, on the merged tree, with the above revert, I get:

  CC      /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/disasm.o
btf.c: In function ‘dump_btf_type’:
btf.c:328:47: warning: implicit declaration of function ‘btf__type_cnt’ [-Wimplicit-function-declaration]
  328 |                                 if (v->type < btf__type_cnt(btf)) {
      |                                               ^~~~~~~~~~~~~
btf.c:328:45: warning: comparison of integer expressions of different signedness: ‘__u32’ {aka ‘unsigned int’} and ‘int’ [-Wsign-compare]
  328 |                                 if (v->type < btf__type_cnt(btf)) {
      |                                             ^
btf.c: In function ‘do_dump’:
btf.c:591:23: warning: implicit declaration of function ‘btf__load_from_kernel_by_id_split’ [-Wimplicit-function-declaration]
  591 |                 btf = btf__load_from_kernel_by_id_split(btf_id, base_btf);
      |                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
btf.c:591:21: warning: assignment to ‘struct btf *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
  591 |                 btf = btf__load_from_kernel_by_id_split(btf_id, base_btf);
      |                     ^
btf_dumper.c: In function ‘dump_prog_id_as_func_ptr’:
btf_dumper.c:69:20: warning: implicit declaration of function ‘btf__load_from_kernel_by_id’ [-Wimplicit-function-declaration]
   69 |         prog_btf = btf__load_from_kernel_by_id(info->btf_id);
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
btf_dumper.c:69:18: warning: assignment to ‘struct btf *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
   69 |         prog_btf = btf__load_from_kernel_by_id(info->btf_id);
      |                  ^
  LINK    /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/bpftool


If I revert the above revert I get a more catastrophic breakage:

  CC      /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/disasm.o
btf.c: In function ‘dump_btf_type’:
btf.c:328:47: warning: implicit declaration of function ‘btf__type_cnt’ [-Wimplicit-function-declaration]
  328 |                                 if (v->type < btf__type_cnt(btf)) {
      |                                               ^~~~~~~~~~~~~
btf.c:328:45: warning: comparison of integer expressions of different signedness: ‘__u32’ {aka ‘unsigned int’} and ‘int’ [-Wsign-compare]
  328 |                                 if (v->type < btf__type_cnt(btf)) {
      |                                             ^
btf.c: In function ‘do_dump’:
btf.c:591:23: warning: implicit declaration of function ‘btf__load_from_kernel_by_id_split’ [-Wimplicit-function-declaration]
  591 |                 btf = btf__load_from_kernel_by_id_split(btf_id, base_btf);
      |                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
btf.c:591:21: warning: assignment to ‘struct btf *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
  591 |                 btf = btf__load_from_kernel_by_id_split(btf_id, base_btf);
      |                     ^
btf_dumper.c: In function ‘dump_prog_id_as_func_ptr’:
btf_dumper.c:69:20: warning: implicit declaration of function ‘btf__load_from_kernel_by_id’ [-Wimplicit-function-declaration]
   69 |         prog_btf = btf__load_from_kernel_by_id(info->btf_id);
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
btf_dumper.c:69:18: warning: assignment to ‘struct btf *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
   69 |         prog_btf = btf__load_from_kernel_by_id(info->btf_id);
      |                  ^
gen.c: In function ‘codegen_datasecs’:
gen.c:214:17: warning: implicit declaration of function ‘btf__type_cnt’ [-Wimplicit-function-declaration]
  214 |         int n = btf__type_cnt(btf);
      |                 ^~~~~~~~~~~~~
In file included from /usr/include/bpf/bpf.h:31,
                 from gen.c:15:
gen.c: In function ‘gen_trace’:
gen.c:489:29: error: variable ‘opts’ has initializer but incomplete type
  489 |         DECLARE_LIBBPF_OPTS(gen_loader_opts, opts);
      |                             ^~~~~~~~~~~~~~~
gen.c:489:9: error: invalid application of ‘sizeof’ to incomplete type ‘struct gen_loader_opts’
  489 |         DECLARE_LIBBPF_OPTS(gen_loader_opts, opts);
      |         ^~~~~~~~~~~~~~~~~~~
gen.c:489:9: error: ‘struct gen_loader_opts’ has no member named ‘sz’
  489 |         DECLARE_LIBBPF_OPTS(gen_loader_opts, opts);
      |         ^~~~~~~~~~~~~~~~~~~
gen.c:489:9: error: invalid application of ‘sizeof’ to incomplete type ‘struct gen_loader_opts’
  489 |         DECLARE_LIBBPF_OPTS(gen_loader_opts, opts);
      |         ^~~~~~~~~~~~~~~~~~~
gen.c:489:9: warning: excess elements in struct initializer
  489 |         DECLARE_LIBBPF_OPTS(gen_loader_opts, opts);
      |         ^~~~~~~~~~~~~~~~~~~
gen.c:489:9: note: (near initialization for ‘(anonymous)’)
In file included from /usr/include/bpf/bpf.h:31,
                 from gen.c:15:
gen.c:489:9: error: invalid use of undefined type ‘struct gen_loader_opts’
  489 |         DECLARE_LIBBPF_OPTS(gen_loader_opts, opts);
      |         ^~~~~~~~~~~~~~~~~~~
gen.c:489:46: error: storage size of ‘opts’ isn’t known
  489 |         DECLARE_LIBBPF_OPTS(gen_loader_opts, opts);
      |                                              ^~~~
gen.c:494:15: warning: implicit declaration of function ‘bpf_object__gen_loader’; did you mean ‘bpf_object__unload’? [-Wimplicit-function-declaration]
  494 |         err = bpf_object__gen_loader(obj, &opts);
      |               ^~~~~~~~~~~~~~~~~~~~~~
      |               bpf_object__unload
gen.c:556:29: warning: implicit declaration of function ‘bpf_map__initial_value’; did you mean ‘bpf_map__set_initial_value’? [-Wimplicit-function-declaration]
  556 |                 mmap_data = bpf_map__initial_value(map, &mmap_size);
      |                             ^~~~~~~~~~~~~~~~~~~~~~
      |                             bpf_map__set_initial_value
gen.c:556:27: warning: assignment to ‘const void *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
  556 |                 mmap_data = bpf_map__initial_value(map, &mmap_size);
      |                           ^
make[3]: *** [Makefile:213: /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/gen.o] Error 1
make[2]: *** [Makefile.perf:1048: /tmp/build/perf/util/bpf_skel/.tmp/bootstrap/bpftool] Error 2
make[1]: *** [Makefile.perf:240: sub-make] Error 2
make: *** [Makefile:113: install-bin] Error 2
make: Leaving directory '/var/home/acme/git/perf/tools/perf'

 Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin':

          7,103.73 msec task-clock:u              #    1.476 CPUs utilized
          7,074.44 msec cpu-clock:u               #    1.469 CPUs utilized

       4.814384825 seconds time elapsed

       3.917534000 seconds user
       3.433976000 seconds sys


70: Event expansion for cgroups                                     : Ok
88: perf all metricgroups test                                      : FAILED!
⬢[acme@toolbox perf]$


Kinda expected, as its an old libbpf version, the one in fedora 34. I'll
remove it, and try to fix it on the perf side, i.e. telling where to
find bpf/bpf.h, bpf/libbpf.h.

- Arnaldo