From: Tobias Klauser <tklauser@distanz.ch>
To: Quentin Monnet <quentin@isovalent.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
bpf@vger.kernel.org,
Alexei Starovoitov <alexei.starovoitov@gmail.com>
Subject: Re: [PATCH] bpftool: use linux/types.h from source tree for profiler build
Date: Thu, 12 Mar 2020 13:54:01 +0100 [thread overview]
Message-ID: <20200312125401.aumdto3gkq73trgf@distanz.ch> (raw)
In-Reply-To: <e1193ce0-97c7-bc2a-984e-363afb2888e0@isovalent.com>
On 2020-03-12 at 13:48:21 +0100, Quentin Monnet <quentin@isovalent.com> wrote:
> 2020-03-12 11:53 UTC+0100 ~ Tobias Klauser <tklauser@distanz.ch>
> > When compiling bpftool on a system where the /usr/include/asm symlink
> > doesn't exist (e.g. on an Ubuntu system without gcc-multilib installed),
> > the build fails with:
> >
> > CLANG skeleton/profiler.bpf.o
> > In file included from skeleton/profiler.bpf.c:4:
> > In file included from /usr/include/linux/bpf.h:11:
> > /usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found
> > #include <asm/types.h>
> > ^~~~~~~~~~~~~
> > 1 error generated.
> > make: *** [Makefile:123: skeleton/profiler.bpf.o] Error 1
> >
> > This indicates that the build is using linux/types.h from system headers
> > instead of source tree headers.
> >
> > To fix this, adjust the clang search path to include the necessary
> > headers from tools/testing/selftests/bpf/include/uapi and
> > tools/include/uapi. Also undef __bitwise in skeleton/profiler.h avoid
> > clashing with the empty definition in
> > tools/testing/selftests/bpf/include/uapi/linux/types.h.
> >
> > Cc: Daniel Borkmann <daniel@iogearbox.net>
> > Cc: Song Liu <songliubraving@fb.com>
> > Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
>
> > diff --git a/tools/bpf/bpftool/skeleton/profiler.h b/tools/bpf/bpftool/skeleton/profiler.h
> > index e03b53eae767..95358c0df5ef 100644
> > --- a/tools/bpf/bpftool/skeleton/profiler.h
> > +++ b/tools/bpf/bpftool/skeleton/profiler.h
> > @@ -27,6 +27,7 @@ enum {
> > true = 1,
> > };
> >
> > +#undef __bitwise
> > #ifdef __CHECKER__
> > #define __bitwise__ __attribute__((bitwise))
> > #else
> >
>
> Even with the #undef above, I get warnings on __bitwise being redefined
> in tools/testing/selftests/bpf/include/uapi/linux/types.h. Can we maybe
> just find another name (or number of underscores) for the macro in
> skeleton/profiler.h?
Good point. It seems I actually didn't test this properly. Will change
the typedefs to use the existing __bitwise__.
> Makefile change works well otherwise, thanks (tested on Ubuntu with and
> without gcc-multilib).
Thanks for testing.
- Tobias
next prev parent reply other threads:[~2020-03-12 12:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 10:53 [PATCH] bpftool: use linux/types.h from source tree for profiler build Tobias Klauser
2020-03-12 12:48 ` Quentin Monnet
2020-03-12 12:54 ` Tobias Klauser [this message]
2020-03-12 13:03 ` [PATCH bpf-next v2] " Tobias Klauser
2020-03-12 14:15 ` Quentin Monnet
2020-03-12 15:38 ` Daniel Borkmann
2020-03-12 17:59 ` Andrii Nakryiko
2020-03-12 18:38 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200312125401.aumdto3gkq73trgf@distanz.ch \
--to=tklauser@distanz.ch \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=quentin@isovalent.com \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).