dwarves.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries
@ 2020-10-24 18:36 Andrii Nakryiko
  2020-10-26 19:49 ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 6+ messages in thread
From: Andrii Nakryiko @ 2020-10-24 18:36 UTC (permalink / raw)
  To: dwarves, acme; +Cc: andrii

Now that libbpf is used to implement deduplicated strings container, all of
the binaries will need linux/btf.h header to compile properly. libbpf is
distributed with its own copies of Linux UAPI headers, so use them during
compilation.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e9fe4710a0c..84693514e0c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,9 @@ project(pahole C)
 cmake_minimum_required(VERSION 2.8.8)
 cmake_policy(SET CMP0005 NEW)
 
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
+		    ${CMAKE_CURRENT_SOURCE_DIR}
+		    ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi)
 
 # Try to parse this later, Helio just showed me a KDE4 example to support
 # x86-64 builds.
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries
  2020-10-24 18:36 [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries Andrii Nakryiko
@ 2020-10-26 19:49 ` Arnaldo Carvalho de Melo
  2020-10-26 23:26   ` Andrii Nakryiko
  0 siblings, 1 reply; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-10-26 19:49 UTC (permalink / raw)
  To: Andrii Nakryiko; +Cc: dwarves

Em Sat, Oct 24, 2020 at 11:36:53AM -0700, Andrii Nakryiko escreveu:
> Now that libbpf is used to implement deduplicated strings container, all of
> the binaries will need linux/btf.h header to compile properly. libbpf is
> distributed with its own copies of Linux UAPI headers, so use them during
> compilation.

Thanks, applied.

- Arnaldo
 
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
> ---
>  CMakeLists.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 8e9fe4710a0c..84693514e0c8 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -2,7 +2,9 @@ project(pahole C)
>  cmake_minimum_required(VERSION 2.8.8)
>  cmake_policy(SET CMP0005 NEW)
>  
> -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
> +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
> +		    ${CMAKE_CURRENT_SOURCE_DIR}
> +		    ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi)
>  
>  # Try to parse this later, Helio just showed me a KDE4 example to support
>  # x86-64 builds.
> -- 
> 2.24.1
> 

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries
  2020-10-26 19:49 ` Arnaldo Carvalho de Melo
@ 2020-10-26 23:26   ` Andrii Nakryiko
  2020-10-27 11:20     ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 6+ messages in thread
From: Andrii Nakryiko @ 2020-10-26 23:26 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo; +Cc: Andrii Nakryiko, dwarves, Alexei Starovoitov

On Mon, Oct 26, 2020 at 12:49 PM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> Em Sat, Oct 24, 2020 at 11:36:53AM -0700, Andrii Nakryiko escreveu:
> > Now that libbpf is used to implement deduplicated strings container, all of
> > the binaries will need linux/btf.h header to compile properly. libbpf is
> > distributed with its own copies of Linux UAPI headers, so use them during
> > compilation.
>
> Thanks, applied.
>

Still don't see it at
https://git.kernel.org/pub/scm/devel/pahole/pahole.git/, did you
forget to push? This is breaking libbpf and kernel CIs at the moment
:(

> - Arnaldo
>
> > Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
> > ---
> >  CMakeLists.txt | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/CMakeLists.txt b/CMakeLists.txt
> > index 8e9fe4710a0c..84693514e0c8 100644
> > --- a/CMakeLists.txt
> > +++ b/CMakeLists.txt
> > @@ -2,7 +2,9 @@ project(pahole C)
> >  cmake_minimum_required(VERSION 2.8.8)
> >  cmake_policy(SET CMP0005 NEW)
> >
> > -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
> > +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
> > +                 ${CMAKE_CURRENT_SOURCE_DIR}
> > +                 ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi)
> >
> >  # Try to parse this later, Helio just showed me a KDE4 example to support
> >  # x86-64 builds.
> > --
> > 2.24.1
> >
>
> --
>
> - Arnaldo

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries
  2020-10-26 23:26   ` Andrii Nakryiko
@ 2020-10-27 11:20     ` Arnaldo Carvalho de Melo
  2020-10-27 12:22       ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-10-27 11:20 UTC (permalink / raw)
  To: Andrii Nakryiko; +Cc: Andrii Nakryiko, dwarves, Alexei Starovoitov

Em Mon, Oct 26, 2020 at 04:26:22PM -0700, Andrii Nakryiko escreveu:
> On Mon, Oct 26, 2020 at 12:49 PM Arnaldo Carvalho de Melo
> <acme@kernel.org> wrote:
> >
> > Em Sat, Oct 24, 2020 at 11:36:53AM -0700, Andrii Nakryiko escreveu:
> > > Now that libbpf is used to implement deduplicated strings container, all of
> > > the binaries will need linux/btf.h header to compile properly. libbpf is
> > > distributed with its own copies of Linux UAPI headers, so use them during
> > > compilation.
> >
> > Thanks, applied.
> >
> 
> Still don't see it at
> https://git.kernel.org/pub/scm/devel/pahole/pahole.git/, did you
> forget to push? This is breaking libbpf and kernel CIs at the moment
> :(

That got delayed due to that 'void variable found' bug that Hao fixed, I
just tested built a kernel with it, rebooting with it, some more testing
and it'll go to the public repo,

- Arnaldo
 
> > - Arnaldo
> >
> > > Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
> > > ---
> > >  CMakeLists.txt | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/CMakeLists.txt b/CMakeLists.txt
> > > index 8e9fe4710a0c..84693514e0c8 100644
> > > --- a/CMakeLists.txt
> > > +++ b/CMakeLists.txt
> > > @@ -2,7 +2,9 @@ project(pahole C)
> > >  cmake_minimum_required(VERSION 2.8.8)
> > >  cmake_policy(SET CMP0005 NEW)
> > >
> > > -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
> > > +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
> > > +                 ${CMAKE_CURRENT_SOURCE_DIR}
> > > +                 ${CMAKE_CURRENT_SOURCE_DIR}/lib/bpf/include/uapi)
> > >
> > >  # Try to parse this later, Helio just showed me a KDE4 example to support
> > >  # x86-64 builds.
> > > --
> > > 2.24.1
> > >
> >
> > --
> >
> > - Arnaldo

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries
  2020-10-27 11:20     ` Arnaldo Carvalho de Melo
@ 2020-10-27 12:22       ` Arnaldo Carvalho de Melo
  2020-10-27 18:02         ` Andrii Nakryiko
  0 siblings, 1 reply; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-10-27 12:22 UTC (permalink / raw)
  To: Andrii Nakryiko; +Cc: Andrii Nakryiko, dwarves, Alexei Starovoitov

Em Tue, Oct 27, 2020 at 08:20:50AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Mon, Oct 26, 2020 at 04:26:22PM -0700, Andrii Nakryiko escreveu:
> > On Mon, Oct 26, 2020 at 12:49 PM Arnaldo Carvalho de Melo
> > <acme@kernel.org> wrote:
> > >
> > > Em Sat, Oct 24, 2020 at 11:36:53AM -0700, Andrii Nakryiko escreveu:
> > > > Now that libbpf is used to implement deduplicated strings container, all of
> > > > the binaries will need linux/btf.h header to compile properly. libbpf is
> > > > distributed with its own copies of Linux UAPI headers, so use them during
> > > > compilation.
> > >
> > > Thanks, applied.
> > >
> > 
> > Still don't see it at
> > https://git.kernel.org/pub/scm/devel/pahole/pahole.git/, did you
> > forget to push? This is breaking libbpf and kernel CIs at the moment
> > :(
> 
> That got delayed due to that 'void variable found' bug that Hao fixed, I
> just tested built a kernel with it, rebooting with it, some more testing
> and it'll go to the public repo,

Rebooted, tested usage of /sys/kernel/btf/vmlinux, pushed to the main
git.kernel.org and to the mirror at github.

Thanks, please let me know if now everything is ok with the kernel CIs.

- Arnaldo

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries
  2020-10-27 12:22       ` Arnaldo Carvalho de Melo
@ 2020-10-27 18:02         ` Andrii Nakryiko
  0 siblings, 0 replies; 6+ messages in thread
From: Andrii Nakryiko @ 2020-10-27 18:02 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo; +Cc: Andrii Nakryiko, dwarves, Alexei Starovoitov

On Tue, Oct 27, 2020 at 5:22 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> Em Tue, Oct 27, 2020 at 08:20:50AM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Mon, Oct 26, 2020 at 04:26:22PM -0700, Andrii Nakryiko escreveu:
> > > On Mon, Oct 26, 2020 at 12:49 PM Arnaldo Carvalho de Melo
> > > <acme@kernel.org> wrote:
> > > >
> > > > Em Sat, Oct 24, 2020 at 11:36:53AM -0700, Andrii Nakryiko escreveu:
> > > > > Now that libbpf is used to implement deduplicated strings container, all of
> > > > > the binaries will need linux/btf.h header to compile properly. libbpf is
> > > > > distributed with its own copies of Linux UAPI headers, so use them during
> > > > > compilation.
> > > >
> > > > Thanks, applied.
> > > >
> > >
> > > Still don't see it at
> > > https://git.kernel.org/pub/scm/devel/pahole/pahole.git/, did you
> > > forget to push? This is breaking libbpf and kernel CIs at the moment
> > > :(
> >
> > That got delayed due to that 'void variable found' bug that Hao fixed, I
> > just tested built a kernel with it, rebooting with it, some more testing
> > and it'll go to the public repo,
>
> Rebooted, tested usage of /sys/kernel/btf/vmlinux, pushed to the main
> git.kernel.org and to the mirror at github.
>
> Thanks, please let me know if now everything is ok with the kernel CIs.

Thanks, Arnaldo! All good now.

>
> - Arnaldo

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-10-27 18:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-24 18:36 [PATCH dwarves] cmake: make libbpf's Linux UAPI headers available to all binaries Andrii Nakryiko
2020-10-26 19:49 ` Arnaldo Carvalho de Melo
2020-10-26 23:26   ` Andrii Nakryiko
2020-10-27 11:20     ` Arnaldo Carvalho de Melo
2020-10-27 12:22       ` Arnaldo Carvalho de Melo
2020-10-27 18:02         ` Andrii Nakryiko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).