Re: [PATCH bpf-next 02/11] bpf: always emit struct bpf_perf_link BTF

From: Song Liu
Date: Fri Apr 15 2022 - 19:25:12 EST


On Thu, Apr 14, 2022 at 3:45 PM Alexander Lobakin <alobakin@xxxxx> wrote:
>
> When building bpftool with !CONFIG_PERF_EVENTS:
>
> skeleton/pid_iter.bpf.c:47:14: error: incomplete definition of type 'struct bpf_perf_link'
> perf_link = container_of(link, struct bpf_perf_link, link);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helpers.h:74:22: note: expanded from macro 'container_of'
> ((type *)(__mptr - offsetof(type, member))); \
> ^~~~~~~~~~~~~~~~~~~~~~
> tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helpers.h:68:60: note: expanded from macro 'offsetof'
> #define offsetof(TYPE, MEMBER) ((unsigned long)&((TYPE *)0)->MEMBER)
> ~~~~~~~~~~~^
> skeleton/pid_iter.bpf.c:44:9: note: forward declaration of 'struct bpf_perf_link'
> struct bpf_perf_link *perf_link;
> ^
>
> &bpf_perf_link is being defined and used only under the ifdef.
> Move it out of the block and explicitly emit a BTF to fix
> compilation.
>
> Fixes: cbdaf71f7e65 ("bpftool: Add bpf_cookie to link output")
> Signed-off-by: Alexander Lobakin <alobakin@xxxxx>

Similar to v1, this fix is weird to me. I hope we have can fix it in user
space.