Skip to contentSkip to conversation

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

PATCH Applied Jakub Sitnicki 4 participants 4 messages Oct 20, 2019 – Oct 21, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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 456a513bb5d4 ("scripts/bpf: Emit an #error directive known types list needs updating")
---
 scripts/bpf_helpers_doc.py | 4 ++--
 tools/lib/bpf/Makefile     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
scripts/bpf_helpers_doc.py +2 -2
index 08300bc024da..7548569e8076 100755
@@ -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
index 75b538577c17..54ff80faa8df 100644
@@ -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:
Signature · 1 line
2.20.1
Acked-by on v2 1/1
#1 lore raw
Quoted 11 lines · Jakub Sitnicki

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 456a513bb5d4 ("scripts/bpf: Emit an #error directive known types list needs updating")
Quoted 32 lines
---
  scripts/bpf_helpers_doc.py | 4 ++--
  tools/lib/bpf/Makefile     | 3 +++
  2 files changed, 5 insertions(+), 2 deletions(-)
scripts/bpf_helpers_doc.py +2 -2
index 08300bc024da..7548569e8076 100755
@@ -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
index 75b538577c17..54ff80faa8df 100644
@@ -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:
Acked-by on v2 1/1
#2 lore raw
In reply to Jakub Sitnicki
Quoted 6 lines · Jakub Sitnicki

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.

Quoted 7 lines

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

Fixes 456a513bb5d4 ("scripts/bpf: Emit an #error directive known types list needs updating")

---

LGTM, thanks!

Quoted 4 lines
 scripts/bpf_helpers_doc.py | 4 ++--
 tools/lib/bpf/Makefile     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

[...]

#3 lore raw
Quoted 8 lines · Andrii Nakryiko
Quoted 6 lines · Jakub Sitnicki

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.

Quoted 6 lines
Quoted 6 lines

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

Fixes 456a513bb5d4 ("scripts/bpf: Emit an #error directive known types list needs updating")

Applied.Thanks