[PATCH bpf-next 1/2] libbpf: Add missing per-arch include path

[Björn Töpel]

Andrii,

On Fri, 27 Sept 2024 at 22:51, Andrii Nakryiko
<andrii.nakryiko at gmail.com> wrote:
>
> On Fri, Sep 27, 2024 at 6:14 AM Björn Töpel <bjorn at kernel.org> wrote:
> >
> > From: Björn Töpel <bjorn at rivosinc.com>
> >
> > libbpf does not include the per-arch tools include path, e.g.
> > tools/arch/riscv/include. Some architectures depend those files to
> > build properly.
> >
> > Include tools/arch/$(SUBARCH)/include in the libbpf build.
> >
> > Fixes: 6d74d178fe6e ("tools: Add riscv barrier implementation")
> > Signed-off-by: Björn Töpel <bjorn at rivosinc.com>
> > ---
> >  tools/lib/bpf/Makefile | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> > index 1b22f0f37288..857a5f7b413d 100644
> > --- a/tools/lib/bpf/Makefile
> > +++ b/tools/lib/bpf/Makefile
> > @@ -61,7 +61,8 @@ ifndef VERBOSE
> >  endif
> >
> >  INCLUDES = -I$(or $(OUTPUT),.) \
> > -          -I$(srctree)/tools/include -I$(srctree)/tools/include/uapi
> > +          -I$(srctree)/tools/include -I$(srctree)/tools/include/uapi \
> > +          -I$(srctree)/tools/arch/$(SRCARCH)/include
> >
> >  export prefix libdir src obj
> >
>
> Do you know what exactly is used from tools/arch/$(SRCARCH)/include
> for (I assume) RISC-V? I'm asking because we'd need to make sure that
> Github version of libbpf Makefile and include directory has all the
> necessary pieces as well (so I'd appreciate if you could take a look
> at that as well, if you haven't already).

Ah, apologies for not stating that explicitly. It's
tools/arch/riscv/include/asm/{barrier.h,fence.h}

Cheers,
Björn