From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: "Toke Høiland-Jørgensen" <toke@redhat.com>
Cc: Andrii Nakryiko <andriin@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next] libbpf: Fix include of bpf_helpers.h when libbpf is installed on system
Date: Tue, 14 Jan 2020 11:07:15 -0800 [thread overview]
Message-ID: <CAEf4Bzb9sTF4BWA1wyWM-3jsMUnbwYi1XtkDj8ZXdyHk7C4_mQ@mail.gmail.com> (raw)
In-Reply-To: <20200114164250.922192-1-toke@redhat.com>
On Tue, Jan 14, 2020 at 8:43 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
>
> The change to use angled includes for bpf_helper_defs.h breaks compilation
> against libbpf when it is installed in the include path, since the file is
> installed in the bpf/ subdirectory of $INCLUDE_PATH. Fix this by adding the
> bpf/ prefix to the #include directive.
>
> Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir")
> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
> ---
> Not actually sure this fix works for all the cases you originally tried to
This does break selftests/bpf. Have you tried building selftests, does
it work for you? We need to fix selftests simultaneously with this
change.
> fix with the referred commit; please check. Also, could we please stop breaking
> libbpf builds? :)
Which libbpf build is failing right now? Both github and in-kernel
libbpf builds are fine. You must be referring to something else. What
exactly?
>
> tools/lib/bpf/bpf_helpers.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h
> index 050bb7bf5be6..fa43d649e7a2 100644
> --- a/tools/lib/bpf/bpf_helpers.h
> +++ b/tools/lib/bpf/bpf_helpers.h
> @@ -2,7 +2,7 @@
> #ifndef __BPF_HELPERS__
> #define __BPF_HELPERS__
>
> -#include <bpf_helper_defs.h>
> +#include <bpf/bpf_helper_defs.h>
>
> #define __uint(name, val) int (*name)[val]
> #define __type(name, val) typeof(val) *name
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-01-14 19:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 16:42 [PATCH bpf-next] libbpf: Fix include of bpf_helpers.h when libbpf is installed on system Toke Høiland-Jørgensen
2020-01-14 19:07 ` Andrii Nakryiko [this message]
2020-01-14 19:41 ` Andrii Nakryiko
2020-01-14 21:26 ` Toke Høiland-Jørgensen
2020-01-14 22:58 ` Alexei Starovoitov
2020-01-15 8:39 ` Toke Høiland-Jørgensen
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=CAEf4Bzb9sTF4BWA1wyWM-3jsMUnbwYi1XtkDj8ZXdyHk7C4_mQ@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
--cc=toke@redhat.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).