From 90126e3a40843de369a496db160ab22bdd6f4c48 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 15 Mar 2018 23:26:14 -0700 Subject: tools: bpftool: fix dependency file path Auto-generated dependency files are in the OUTPUT directory, we need to include them from there. This fixes object files not being rebuilt after header changes. Signed-off-by: Jakub Kicinski Signed-off-by: Daniel Borkmann --- tools/bpf/bpftool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 4c2867481f5c..50a715ac9e8b 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -70,7 +70,7 @@ ifeq ($(feature-disassembler-four-args), 1) CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE endif -include $(wildcard *.d) +include $(wildcard $(OUTPUT)*.d) all: $(OUTPUT)bpftool -- cgit v1.2.3 From d5fc73dceb060688f01c2ee225a2b42cf47352ba Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 15 Mar 2018 23:26:15 -0700 Subject: tools: bpftool: fix potential format truncation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 7 complains: xlated_dumper.c: In function ‘print_call’: xlated_dumper.c:179:10: warning: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size between 249 and 253 [-Wformat-truncation=] "%+d#%s", insn->off, sym->name); Add a bit more space to the buffer so it can handle the entire string and integer without truncation. Signed-off-by: Jakub Kicinski Signed-off-by: Daniel Borkmann --- tools/bpf/bpftool/xlated_dumper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/xlated_dumper.h b/tools/bpf/bpftool/xlated_dumper.h index 51c935d38ae2..b34affa7ef2d 100644 --- a/tools/bpf/bpftool/xlated_dumper.h +++ b/tools/bpf/bpftool/xlated_dumper.h @@ -49,7 +49,7 @@ struct dump_data { unsigned long address_call_base; struct kernel_sym *sym_mapping; __u32 sym_count; - char scratch_buff[SYM_MAX_NAME]; + char scratch_buff[SYM_MAX_NAME + 8]; }; void kernel_syms_load(struct dump_data *dd); -- cgit v1.2.3 From 8050ea4653c21e14681d9e00390c6886556a2640 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 15 Mar 2018 23:26:16 -0700 Subject: tools: bpf: cleanup PHONY target There is no FORCE target in the Makefile and some of the PHONY targets are missing, update the list. Signed-off-by: Jakub Kicinski Signed-off-by: Daniel Borkmann --- tools/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile index c07b4e718eeb..acfaf4c8cc32 100644 --- a/tools/bpf/Makefile +++ b/tools/bpf/Makefile @@ -100,4 +100,4 @@ bpftool_install: bpftool_clean: $(call descend,bpftool,clean) -.PHONY: bpftool FORCE +.PHONY: all install clean bpftool bpftool_install bpftool_clean -- cgit v1.2.3 From cc5b3403f0248ca5f40539d33f0e127ccca25dd2 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 15 Mar 2018 23:26:17 -0700 Subject: tools: bpf: remove feature detection output bpf tools use feature detection for libbfd dependency, clean up the output files on make clean. Signed-off-by: Jakub Kicinski Signed-off-by: Daniel Borkmann --- tools/bpf/Makefile | 2 ++ tools/bpf/bpftool/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile index acfaf4c8cc32..1ea545965ee3 100644 --- a/tools/bpf/Makefile +++ b/tools/bpf/Makefile @@ -81,6 +81,8 @@ clean: bpftool_clean $(call QUIET_CLEAN, bpf-progs) $(Q)rm -rf $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \ $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.* + $(call QUIET_CLEAN, core-gen) + $(Q)rm -f $(OUTPUT)FEATURE-DUMP.bpf install: $(PROGS) bpftool_install $(call QUIET_INSTALL, bpf_jit_disasm) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 50a715ac9e8b..4e69782c4a79 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -89,6 +89,8 @@ $(OUTPUT)%.o: %.c clean: $(LIBBPF)-clean $(call QUIET_CLEAN, bpftool) $(Q)$(RM) $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d + $(call QUIET_CLEAN, core-gen) + $(Q)$(RM) $(OUTPUT)FEATURE-DUMP.bpftool install: $(OUTPUT)bpftool $(call QUIET_INSTALL, bpftool) -- cgit v1.2.3