MIME-Version: 1.0
References: <YddEVgNKBJiqcV6Y@kernel.org> <YddGjjmlMZzxUZbN@kernel.org>
 <YddHmYhvtVvgqZb/@kernel.org> <CAP-5=fU2QAr9BMHqm9i6uDKPaUFsY2EAqt+oO1AO8ovBXCh5xQ@mail.gmail.com>
 <CAEf4BzbbOHQZUAe6iWaehKCPQAf3VC=hq657buqe2_yRKxaK-A@mail.gmail.com> <CAP-5=fUN+XqrSmwqab9DyGtvpZ7iZkfnUNwBfK1CDA_iX+aF0Q@mail.gmail.com>
In-Reply-To: <CAP-5=fUN+XqrSmwqab9DyGtvpZ7iZkfnUNwBfK1CDA_iX+aF0Q@mail.gmail.com>
From:   Ian Rogers <irogers@google.com>
Date:   Thu, 6 Jan 2022 19:30:34 -0800
Message-ID: <CAP-5=fVE5eo9TSX3rrGb-=DETeYvXtG0AqhpGwjnP6nr8pKrqg@mail.gmail.com>
Subject: Re: perf build broken seemingly due to libbpf changes, checking...
To:     Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Song Liu <songliubraving@fb.com>, Jiri Olsa <jolsa@kernel.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        Jiri Slaby <jirislaby@kernel.org>,
        Namhyung Kim <namhyung@kernel.org>, bpf <bpf@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Quentin Monnet <quentin@isovalent.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Jan 6, 2022 at 2:04 PM Ian Rogers <irogers@google.com> wrote:
>
> On Thu, Jan 6, 2022 at 1:44 PM Andrii Nakryiko
> <andrii.nakryiko@gmail.com> wrote:
> >
> > On Thu, Jan 6, 2022 at 1:42 PM Ian Rogers <irogers@google.com> wrote:
> > >
> > > On Thu, Jan 6, 2022 at 11:48 AM Arnaldo Carvalho de Melo
> > > <acme@kernel.org> wrote:
> > > >
> > > > Em Thu, Jan 06, 2022 at 04:44:14PM -0300, Arnaldo Carvalho de Melo =
escreveu:
> > > > > Em Thu, Jan 06, 2022 at 04:34:46PM -0300, Arnaldo Carvalho de Mel=
o escreveu:
> > > > > > After merging torvalds/master to perf/urgent I'm getting this:
> > > > > >
> > > > > > util/bpf-event.c:25:21: error: no previous prototype for =E2=80=
=98btf__load_from_kernel_by_id=E2=80=99 [-Werror=3Dmissing-prototypes]
> > > > > >    25 | struct btf * __weak btf__load_from_kernel_by_id(__u32 i=
d)
> > > > > >       |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > > > > util/bpf-event.c:37:1: error: no previous prototype for =E2=80=
=98bpf_object__next_program=E2=80=99 [-Werror=3Dmissing-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 =E2=80=
=98bpf_object__next_map=E2=80=99 [-Werror=3Dmissing-prototypes]
> > > > > >    46 | bpf_object__next_map(const struct bpf_object *obj, cons=
t struct bpf_map *prev)
> > > > > >       | ^~~~~~~~~~~~~~~~~~~~
> > > > > > util/bpf-event.c:55:1: error: no previous prototype for =E2=80=
=98btf__raw_data=E2=80=99 [-Werror=3Dmissing-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.buil=
d:96: /tmp/build/perf/util/bpf-event.o] Error 1
> > > > > > make[4]: *** Waiting for unfinished jobs....
> > > > > > util/bpf_counter.c: In function =E2=80=98bpf_target_prog_name=
=E2=80=99:
> > > > > > util/bpf_counter.c:82:15: error: implicit declaration of functi=
on =E2=80=98btf__load_from_kernel_by_id=E2=80=99 [-Werror=3Dimplicit-functi=
on-declaration]
> > > > > >    82 |         btf =3D btf__load_from_kernel_by_id(info_linear=
->info.btf_id);
> > > > > >       |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > > > > util/bpf_counter.c:82:13: error: assignment to =E2=80=98struct =
btf *=E2=80=99 from =E2=80=98int=E2=80=99 makes pointer from integer withou=
t a cast [-Werror=3Dint-conversion]
> > > > > >    82 |         btf =3D 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.buil=
d: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=3D1 CORESIGHT=3D1 PYTHON=3Dpython3 O=3D/=
tmp/build/perf -C tools/perf install-bin && git status && perf test python
> > > > >
> > > > > Nevermind, this was due to a patch by Ian Rogers I was testing,
> > > > > bisecting get up to the last patch, since I had merged torvalds/m=
aster
> > > > > today it got me to a wrong correlation, sorry for the disturbance=
.
> > > > >
> > > > > For reference, this is the patch:
> > > > >
> > > > > http://lore.kernel.org/lkml/20220106072627.476524-1-irogers@googl=
e.com
> > > >
> > > > Ian, I have libbpf-devel installed:
> > > >
> > > > =E2=AC=A2[acme@toolbox perf]$ rpm -qa | grep libbpf
> > > > libbpf-0.4.0-1.fc34.x86_64
> > > > libbpf-devel-0.4.0-1.fc34.x86_64
> > > > =E2=AC=A2[acme@toolbox perf]$
> > > >
> > > > But I'm not using LIBBPF_DYNAMIC=3D1, so you can't just give preced=
ence to
> > > > system headers for all of the homies in tools/lib/.
> > > >
> > > > I bet that if I remove the libbpf-devel package it works, yeah, jus=
t
> > > > tested. So we need to make those overrides dependent on using
> > > > LIBBPF_DYNAMIC=3D1, LIBTRACEEVENT_DYNAMIC=3D1, etc and avoid the bi=
g hammer
> > > > that is -Itools/lib/, using a more finegrained approach, right?
> > >
> > > Ugh, this is messy. The -I for tools/lib is overloaded and being used
> > > in tools/perf/util/bpf-event.c so that bpf/bpf.h, bpf/btf.h and
> >
> > can you do `make install` for libbpf instead and have it install
> > headers into a dedicated target directory which can be added into -I
> > search path. Quentin did this for all the other libbpf users in kernel
> > tree (bpftool, resolve_btfids, etc) and it works great.
>
> This sounds good to me, and being able to borrow code from bpftool
> should make writing it is straightforward. I'll try to find time to do
> a patch, but I don't mind someone getting there before me :-)

So tools/lib also provides subcmd, symbol and api. These will need
Makefiles to allow an install and likely the header file structure
altering. This seems like too big a fix for the next 5.16rc, wdyt?

Thanks,
Ian

> > > bpf/libbpf.h can be found. Likewise, for tools/perf/util/debug.c it i=
s
> > > used to pick up traceevent/event-parse.h.
> > >
> > > Assuming  LIBBPF_DYNAMIC=3D1 and LIBTRACEEVENT_DYNAMIC=3D1 then we ge=
t
> > > different combinations of:
> > > libtraceevent >=3D 1.3 && libbpf >=3D 0.6 - -I is broken for debug.c,
> > > -idirafter okay
> > > libtraceevent >=3D 1.3 && libbpf < 0.6 - -I is broken for debug.c,
> > > -idirafter broken for bpf-event.c
> > > libtraceevent < 1.3 && libbpf >=3D 0.6 - -I should build okay but
> > > headers mismatched, -idirafter okay
> > > libtraceevent < 1.3 && libbpf < 0.6 - -I will fail to link
> > > bpf-event.c, -idirafter broken for bpf-event.c
> > >
> > > As the choice of -I and -idirafter are binary then there will always
> > > be a way to break the build. We could modify the build so that the
> > > -I/-idirafter only applies to the affected C files. This postpones th=
e
> > > problem to when libbpf and libtracevent are in the same file, which
> > > doesn't happen currently. I think if you want the dynamic behavior
> > > then you need to use idirafter.
> > >
> > > Thanks,
> > > Ian