From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Jiri Benc <jbenc@redhat.com>
Cc: bpf <bpf@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Andrii Nakryiko <andriin@fb.com>,
Networking <netdev@vger.kernel.org>
Subject: Re: [PATCH bpf] selftests: bpf: fix makefile dependencies on libbpf
Date: Mon, 27 Sep 2021 21:53:57 -0700 [thread overview]
Message-ID: <CAEf4Bza82pfB-DniE+Snb7nZLHXmPBmkgE7yj9qwkdYyOq_qXQ@mail.gmail.com> (raw)
In-Reply-To: <ee84ab66436fba05a197f952af23c98d90eb6243.1632758415.git.jbenc@redhat.com>
On Mon, Sep 27, 2021 at 9:02 AM Jiri Benc <jbenc@redhat.com> wrote:
>
> When building bpf selftest with make -j, I'm randomly getting build failures
> such as this one:
>
> > In file included from progs/bpf_flow.c:19:
> > [...]/tools/testing/selftests/bpf/tools/include/bpf/bpf_helpers.h:11:10: fatal error: 'bpf_helper_defs.h' file not found
> > #include "bpf_helper_defs.h"
> > ^~~~~~~~~~~~~~~~~~~
>
> The file that fails the build varies between runs but it's always in the
> progs/ subdir.
>
> The reason is a missing make dependency on libbpf for the .o files in
> progs/. There was a dependency before commit 3ac2e20fba07e but that commit
> removed it to prevent unneeded rebuilds. However, that only works if libbpf
> has been built already; the 'wildcard' prerequisite does not trigger when
> there's no bpf_helper_defs.h generated yet.
>
> Keep the libbpf as an order-only prerequisite to satisfy both goals. It is
> always built before the progs/ objects but it does not trigger unnecessary
> rebuilds by itself.
>
> Fixes: 3ac2e20fba07e ("selftests/bpf: BPF object files should depend only on libbpf headers")
> Signed-off-by: Jiri Benc <jbenc@redhat.com>
> ---
> tools/testing/selftests/bpf/Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 866531c08e4f..e7c42695dbbf 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -375,7 +375,8 @@ $(TRUNNER_BPF_OBJS): $(TRUNNER_OUTPUT)/%.o: \
> $(TRUNNER_BPF_PROGS_DIR)/%.c \
> $(TRUNNER_BPF_PROGS_DIR)/*.h \
> $$(INCLUDE_DIR)/vmlinux.h \
> - $(wildcard $(BPFDIR)/bpf_*.h) | $(TRUNNER_OUTPUT)
> + $(wildcard $(BPFDIR)/bpf_*.h) | $(TRUNNER_OUTPUT) \
> + $$(BPFOBJ)
I've moved `| $(TRUNNER_OUTPUT)` into this new line so it's more
obvious that both are order-only prerequisites. Applied to bpf,
thanks.
> $$(call $(TRUNNER_BPF_BUILD_RULE),$$<,$$@, \
> $(TRUNNER_BPF_CFLAGS))
>
> --
> 2.18.1
>
prev parent reply other threads:[~2021-09-28 4:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 16:01 [PATCH bpf] selftests: bpf: fix makefile dependencies on libbpf Jiri Benc
2021-09-28 4:53 ` Andrii Nakryiko [this message]
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=CAEf4Bza82pfB-DniE+Snb7nZLHXmPBmkgE7yj9qwkdYyOq_qXQ@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jbenc@redhat.com \
--cc=netdev@vger.kernel.org \
/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).