Commit ab81e203 authored Oct 20, 2019 by Jakub Sitnicki Committed by Alexei Starovoitov Oct 20, 2019

scripts/bpf: Print an error when known types list needs updating



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, clean up the partially
generated header and stop.

v1->v2:
- Switched from temporary file to .DELETE_ON_ERROR.

Fixes: 456a513b ("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>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191020112344.19395-1-jakub@cloudflare.com

parent 54b8625c

scripts/bpf_helpers_doc.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)
		sys.exit(1)

		seen_helpers = set()

tools/lib/bpf/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -286,3 +286,6 @@ tags:
		# Declare the contents of the .PHONY variable as phony. We keep that
		# information in a variable so we can use it in if_changed and friends.
		.PHONY: $(PHONY)

		# Delete partially updated (corrupted) files on error
		.DELETE_ON_ERROR:

Admin message