tools/bpf: build: make sure resolve_btfids cleans up after itself
Subsystems (3)
PATCH 1/1 tools/bpf: build: make sure resolve_btfids cleans up after itself
The new resolve_btfids tool did not clean up the feature detection folder on 'make clean', and also was not called properly from the clean rule in tools/make/ folder on its 'make clean'. This lead to stale objects being left around, which could cause feature detection to fail on subsequent builds.
--- tools/bpf/Makefile | 4 ++-- tools/bpf/resolve_btfids/Makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
tools/bpf/Makefile +2 -2
@@ -38,7 +38,7 @@ FEATURE_TESTS = libbfd disassembler-four-args FEATURE_DISPLAY = libbfd disassembler-four-args check_feat := 1 -NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean +NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean ifdef MAKECMDGOALS ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),) check_feat := 0
@@ -89,7 +89,7 @@ $(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.c -clean: bpftool_clean runqslower_clean +clean: bpftool_clean runqslower_clean resolve_btfids_clean $(call QUIET_CLEAN, bpf-progs) $(Q)$(RM) -r -- $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \ $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*
tools/bpf/resolve_btfids/Makefile +1 -0
@@ -80,6 +80,7 @@ libbpf-clean: clean: libsubcmd-clean libbpf-clean fixdep-clean $(call msg,CLEAN,$(BINARY)) $(Q)$(RM) -f $(BINARY); \ + $(RM) -rf $(if $(OUTPUT),$(OUTPUT),.)/feature; \ find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM) tags:
Signature · 1 line
2.28.0
Quoted 40 lines · Toke Høiland-Jørgensen
The new
resolve_btfidstool did not clean up the feature detection folder on 'make clean', and also was not called properly from the clean rule intools/make/folder on its 'make clean'. This lead to stale objects being left around, which could cause feature detection to fail on subsequent builds.Fixes fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")Signed-off-by Toke Høiland-Jørgensen <[email protected]>--- tools/bpf/Makefile | 4 ++-- tools/bpf/resolve_btfids/Makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)tools/bpf/Makefile +2
-2@@ -38,7 +38,7 @@ FEATURE_TESTS = libbfd disassembler-four-args FEATURE_DISPLAY = libbfd disassembler-four-args check_feat := 1 -NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean +NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean ifdef MAKECMDGOALS ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),) check_feat := 0@@ -89,7 +89,7 @@ $(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.c -clean: bpftool_clean runqslower_clean +clean: bpftool_clean runqslower_clean resolve_btfids_clean $(call QUIET_CLEAN, bpf-progs) $(Q)$(RM) -r -- $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \ $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*tools/bpf/resolve_btfids/Makefile +0
-0
tools/bpf/resolve_btfids/Makefile libbpf-clean: · line 83
Quoted 4 lines
tools/bpf/resolve_btfids/Makefile +1
-0@@ -80,6 +80,7 @@ libbpf-clean: clean: libsubcmd-clean libbpf-clean fixdep-clean $(call msg,CLEAN,$(BINARY)) $(Q)$(RM) -f $(BINARY); \ + $(RM) -rf $(if $(OUTPUT),$(OUTPUT),.)/feature; \
I forgot this one.. thanks for fixing this
jirka
Quoted 31 lines · Jiri Olsa
Quoted 30 lines · Toke Høiland-Jørgensen
The new
resolve_btfidstool did not clean up the feature detection folder on 'make clean', and also was not called properly from the clean rule intools/make/folder on its 'make clean'. This lead to stale objects being left around, which could cause feature detection to fail on subsequent builds.Fixes fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")Signed-off-by Toke Høiland-Jørgensen <[email protected]>--- tools/bpf/Makefile | 4 ++-- tools/bpf/resolve_btfids/Makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)tools/bpf/Makefile +1
-1@@ -38,7 +38,7 @@ FEATURE_TESTS = libbfd disassembler-four-args FEATURE_DISPLAY = libbfd disassembler-four-args check_feat := 1 -NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean +NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean ifdef MAKECMDGOALS ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),) check_feat := 0@@ -89,7 +89,7 @@ $(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.c
Quoted 16 lines
Quoted 10 lines
tools/bpf/Makefile +1
-1-clean: bpftool_clean runqslower_clean +clean: bpftool_clean runqslower_clean resolve_btfids_clean $(call QUIET_CLEAN, bpf-progs) $(Q)$(RM) -r -- $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \ $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*tools/bpf/resolve_btfids/Makefile +0
-0tools/bpf/resolve_btfids/Makefile libbpf-clean: · line 83
Quoted 4 lines
tools/bpf/resolve_btfids/Makefile +1
-0@@ -80,6 +80,7 @@ libbpf-clean: clean: libsubcmd-clean libbpf-clean fixdep-clean $(call msg,CLEAN,$(BINARY)) $(Q)$(RM) -f $(BINARY); \ + $(RM) -rf $(if $(OUTPUT),$(OUTPUT),.)/feature; \I forgot this one.. thanks for fixing this
You're welcome - it was a bit frustrating to track down, but a simple fix once I figured out what was going on.
BTW, there's still an issue that a 'make clean' in the toplevel kernel dir will not clean up this feature dir, so if someone doesn't know to do 'cd tools/bpf && make clean' the main build may still break (I happened upon this because my main kernel build broke :/). Couldn't figure out how to convince make to fix that, so if you could take a look that would be great! :)
-Toke
Quoted 11 lines · Toke Høiland-Jørgensen
Quoted 9 lines · Jiri Olsa
Quoted 8 lines · Toke Høiland-Jørgensen
The new
resolve_btfidstool did not clean up the feature detection folder on 'make clean', and also was not called properly from the clean rule intools/make/folder on its 'make clean'. This lead to stale objects being left around, which could cause feature detection to fail on subsequent builds.Fixes fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")Signed-off-by Toke Høiland-Jørgensen <[email protected]>
Applied, thanks guys!
Quoted 53 lines · Toke Høiland-Jørgensen
Quoted 31 lines · Jiri Olsa
Quoted 30 lines · Toke Høiland-Jørgensen
The new
resolve_btfidstool did not clean up the feature detection folder on 'make clean', and also was not called properly from the clean rule intools/make/folder on its 'make clean'. This lead to stale objects being left around, which could cause feature detection to fail on subsequent builds.Fixes fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")Signed-off-by Toke Høiland-Jørgensen <[email protected]>--- tools/bpf/Makefile | 4 ++-- tools/bpf/resolve_btfids/Makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)tools/bpf/Makefile +1
-1@@ -38,7 +38,7 @@ FEATURE_TESTS = libbfd disassembler-four-args FEATURE_DISPLAY = libbfd disassembler-four-args check_feat := 1 -NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean +NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean ifdef MAKECMDGOALS ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),) check_feat := 0@@ -89,7 +89,7 @@ $(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c $(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.cQuoted 16 lines
Quoted 10 lines
tools/bpf/Makefile +1
-1-clean: bpftool_clean runqslower_clean +clean: bpftool_clean runqslower_clean resolve_btfids_clean $(call QUIET_CLEAN, bpf-progs) $(Q)$(RM) -r -- $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \ $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*tools/bpf/resolve_btfids/Makefile +0
-0tools/bpf/resolve_btfids/Makefile libbpf-clean: · line 83
Quoted 4 lines
tools/bpf/resolve_btfids/Makefile +1
-0@@ -80,6 +80,7 @@ libbpf-clean: clean: libsubcmd-clean libbpf-clean fixdep-clean $(call msg,CLEAN,$(BINARY)) $(Q)$(RM) -f $(BINARY); \ + $(RM) -rf $(if $(OUTPUT),$(OUTPUT),.)/feature; \I forgot this one.. thanks for fixing this
You're welcome - it was a bit frustrating to track down, but a simple fix once I figured out what was going on.
Quoted 6 lines
BTW, there's still an issue that a 'make clean' in the toplevel kernel dir will not clean up this feature dir, so if someone doesn't know to do 'cd
tools/bpf&& make clean' the main build may still break (I happened upon this because my main kernel build broke :/). Couldn't figure out how to convince make to fix that, so if you could take a look that would be great! :)
will check, thanks
jirka