Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
On Wed, 6 Nov 2024 at 23:04, Andrii Nakryiko wrote: > I'm sorry, but unfortunately it's too late now to move those patches > as it's now been more than a month since they landed. For the future, > please let us know ASAP if you think patches were misrouted. I think > we are stuck with the need to do a stable backport for these, sorry. Yeah, realize that it's really late. Thanks for getting back, and noted for the future. Cheers, Björn
Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
On Mon, Nov 4, 2024 at 2:26 AM Björn Töpel wrote: > > [email protected] writes: > > > Hello: > > > > This series was applied to bpf/bpf-next.git (master) > > by Andrii Nakryiko : > > > > On Fri, 27 Sep 2024 15:13:52 +0200 you wrote: > >> From: Björn Töpel > >> > >> 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. > >> > >> [...] > > > > Here is the summary with links: > > - [bpf-next,1/2] libbpf: Add missing per-arch include path > > https://git.kernel.org/bpf/bpf-next/c/710fbca820c7 > > - [bpf-next,2/2] selftests: bpf: Add missing per-arch include path > > https://git.kernel.org/bpf/bpf-next/c/19090f0306f1 > > Andrii, I just noted that this landed into bpf-next, and not bpf > (fixes). Hi Bjorn, Yes, libbpf and selftests fixes are generally applied through bpf-next, unless the issue is pretty bad and immediate. I'm sorry, but unfortunately it's too late now to move those patches as it's now been more than a month since they landed. For the future, please let us know ASAP if you think patches were misrouted. I think we are stuck with the need to do a stable backport for these, sorry. > > RISC-V libbpf/perf needs this fix in 6.12 to properly build. Would it be > possible to have it in the bpf tree, and have it land in 6.12-rc7? > > Andreas that has a similar fix [1]. > > > Björn > > [1] https://lore.kernel.org/linux-riscv/[email protected]/
Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
On 9/27/2024 9:13 PM, Björn Töpel wrote:
From: Björn Töpel
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
---
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
base-commit: db5ca265e3334b48c4e3fa07eef79e8bc578c430
This fixes building of bpf tools, thanks! You can add the following tags...
Reported-by: Andreas Schwab
Closes: https://lore.kernel.org/all/[email protected]/
Tested-by: Kexy Biscuit
--
Best Regards,
Kexy Biscuit
Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
[email protected] writes: > Hello: > > This series was applied to bpf/bpf-next.git (master) > by Andrii Nakryiko : > > On Fri, 27 Sep 2024 15:13:52 +0200 you wrote: >> From: Björn Töpel >> >> 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. >> >> [...] > > Here is the summary with links: > - [bpf-next,1/2] libbpf: Add missing per-arch include path > https://git.kernel.org/bpf/bpf-next/c/710fbca820c7 > - [bpf-next,2/2] selftests: bpf: Add missing per-arch include path > https://git.kernel.org/bpf/bpf-next/c/19090f0306f1 Andrii, I just noted that this landed into bpf-next, and not bpf (fixes). RISC-V libbpf/perf needs this fix in 6.12 to properly build. Would it be possible to have it in the bpf tree, and have it land in 6.12-rc7? Andreas that has a similar fix [1]. Björn [1] https://lore.kernel.org/linux-riscv/[email protected]/
Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
Hi Bjorn,
On 27/09/2024 15:13, Björn Töpel wrote:
From: Björn Töpel
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
---
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
base-commit: db5ca265e3334b48c4e3fa07eef79e8bc578c430
You can add:
Tested-by: Alexandre Ghiti
Thanks,
Alex
Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
Hello: This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko : On Fri, 27 Sep 2024 15:13:52 +0200 you wrote: > From: Björn Töpel > > 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. > > [...] Here is the summary with links: - [bpf-next,1/2] libbpf: Add missing per-arch include path https://git.kernel.org/bpf/bpf-next/c/710fbca820c7 - [bpf-next,2/2] selftests: bpf: Add missing per-arch include path https://git.kernel.org/bpf/bpf-next/c/19090f0306f1 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
Andrii,
On Fri, 27 Sept 2024 at 22:51, Andrii Nakryiko
wrote:
>
> On Fri, Sep 27, 2024 at 6:14 AM Björn Töpel wrote:
> >
> > From: Björn Töpel
> >
> > 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
> > ---
> > 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
Re: [PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
On Fri, Sep 27, 2024 at 6:14 AM Björn Töpel wrote:
>
> From: Björn Töpel
>
> 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
> ---
> 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).
>
> base-commit: db5ca265e3334b48c4e3fa07eef79e8bc578c430
> --
> 2.43.0
>
[PATCH bpf-next 1/2] libbpf: Add missing per-arch include path
From: Björn Töpel
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
---
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
base-commit: db5ca265e3334b48c4e3fa07eef79e8bc578c430
--
2.43.0
