From: Andrii Nakryiko <andriin@fb.com>
To: Jakub Sitnicki <jakub@cloudflare.com>,
"bpf@vger.kernel.org" <bpf@vger.kernel.org>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"kernel-team@cloudflare.com" <kernel-team@cloudflare.com>
Subject: Re: [PATCH bpf-next] scripts/bpf: Print an error when known types list needs updating
Date: Thu, 17 Oct 2019 17:11:55 +0000 [thread overview]
Message-ID: <1651dcc4-51a8-dfb2-a4ba-87c61fc0e2b4@fb.com> (raw)
In-Reply-To: <20191017094416.7688-1-jakub@cloudflare.com>
On 10/17/19 2:44 AM, Jakub Sitnicki wrote:
> Don't generate a broken bpf_helper_defs.h header if the helper script needs
> updating because it doesn't recognize a newly added type. Instead print an
> error that explains why the build is failing and stop.
>
> Fixes: 456a513bb5d4 ("scripts/bpf: Emit an #error directive known types list needs updating")
> Suggested-by: Andrii Nakryiko <andriin@fb.com>
> Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
> ---
> scripts/bpf_helpers_doc.py | 4 ++--
> tools/lib/bpf/Makefile | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/bpf_helpers_doc.py b/scripts/bpf_helpers_doc.py
> index 08300bc024da..7548569e8076 100755
> --- a/scripts/bpf_helpers_doc.py
> +++ b/scripts/bpf_helpers_doc.py
> @@ -488,8 +488,8 @@ class PrinterHelpers(Printer):
> return t
> if t in self.mapped_types:
> return self.mapped_types[t]
> - print("")
> - print("#error \"Unrecognized type '%s', please add it to known types!\"" % t)
> + print("Unrecognized type '%s', please add it to known types!" % t,
> + file=sys.stderr)
This looks good, thanks!
> sys.exit(1)
>
> seen_helpers = set()
> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> index 75b538577c17..26c202261c5f 100644
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@ -169,7 +169,8 @@ $(BPF_IN): force elfdep bpfdep bpf_helper_defs.h
>
> bpf_helper_defs.h: $(srctree)/include/uapi/linux/bpf.h
> $(Q)$(srctree)/scripts/bpf_helpers_doc.py --header \
> - --file $(srctree)/include/uapi/linux/bpf.h > bpf_helper_defs.h
> + --file $(srctree)/include/uapi/linux/bpf.h > $@.tmp
> + @mv $@.tmp $@
This is unnecessary. Let's add ".DELETE_ON_ERROR:" at the end Makefile
instead to trigger this auto-deletion of failed targets automatically.
>
> $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)
>
>
next prev parent reply other threads:[~2019-10-17 17:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 9:44 [PATCH bpf-next] scripts/bpf: Print an error when known types list needs updating Jakub Sitnicki
2019-10-17 17:11 ` Andrii Nakryiko [this message]
2019-10-18 9:07 ` Jakub Sitnicki
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=1651dcc4-51a8-dfb2-a4ba-87c61fc0e2b4@fb.com \
--to=andriin@fb.com \
--cc=bpf@vger.kernel.org \
--cc=jakub@cloudflare.com \
--cc=kernel-team@cloudflare.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).