Changes in Makefile

42367eca - tools: Remove redundant quiet setup

Thu, 13 Feb 2025 21:06:22 +0000

tools: Remove redundant quiet setupQ is exported from Makefile.include so it is not necessary to manuallyset it.Reviewed-by: Jiri Olsa Signed-off-by: Charlie Jenkins Acked-by: Andrii Nakryiko Acked-by: Quentin Monnet Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Alexei Starovoitov Cc: Benjamin Tissoires Cc: Daniel Borkmann Cc: Daniel Lezcano Cc: Eduard Zingerman Cc: Hao Luo Cc: Ian Rogers Cc: Ingo Molnar Cc: Jiri Kosina Cc: John Fastabend Cc: Josh Poimboeuf Cc: KP Singh Cc: Lukasz Luba Cc: Mark Rutland Cc: Martin KaFai Lau Cc: Mykola Lysenko Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Shuah Khan Cc: Song Liu Cc: Stanislav Fomichev Cc: Steven Rostedt (VMware) Cc: Yonghong Song Cc: Zhang Rui Link: https://lore.kernel.org/r/20250213-quiet_tools-v3-2-07de4482a581@rivosinc.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/bpf/Makefile

bab211f6 - tools bpf_jit_disasm: Don't display disassembler-four-args feature test

Mon, 01 Aug 2022 01:38:32 +0000

tools bpf_jit_disasm: Don't display disassembler-four-args feature testThe feature check does not seem important enough to display.Suggested-by: Jiri Olsa Signed-off-by: Andres Freund Acked-by: Quentin Monnet Cc: Alexei Starovoitov Cc: Ben Hutchings Cc: Daniel Borkmann Cc: Quentin Monnet Cc: Sedat Dilek Cc: bpf@vger.kernel.orgLink: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.deLink: https://lore.kernel.org/r/20220801013834.156015-7-andres@anarazel.deSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/bpf/Makefile

96ed0660 - tools bpf_jit_disasm: Fix compilation error with new binutils

Mon, 01 Aug 2022 01:38:31 +0000

tools bpf_jit_disasm: Fix compilation error with new binutilsbinutils changed the signature of init_disassemble_info(), which now causescompilation to fail for tools/bpf/bpf_jit_disasm.c, e.g. on debianunstable.Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07Wire up the feature test and switch to init_disassemble_info_compat(),which were introduced in prior commits, fixing the compilation failure.I verified that bpf_jit_disasm can still disassemble bpf programs, bothwith the old and new dis-asm.h API. With old binutils there's no change inoutput before/after this patch. When comparing the output from oldbinutils (2.35) to new bintuils with the patch (upstream snapshot) thereare a few output differences, but they are unrelated to this patch. Anexample hunk is: f4: mov %r14,%rsi f7: mov %r15,%rdx fa: mov $0x2a,%ecx - ff: callq 0xffffffffea8c4988 + ff: call 0xffffffffea8c4988 104: test %rax,%rax 107: jge 0x0000000000000110 109: xor %eax,%eax - 10b: jmpq 0x0000000000000073 + 10b: jmp 0x0000000000000073 110: cmp $0x16,%raxHowever, I had to use an older kernel to generate the bpf_jit_enabled =2 output, as that has been broken since 5.18 / 1022a5498f6f745c ("bpf,x86_64: Use bpf_jit_binary_pack_alloc"). https://lore.kernel.org/20220703030210.pmjft7qc2eajzi6c@alap3.anarazel.deSigned-off-by: Andres Freund Acked-by: Quentin Monnet Cc: Alexei Starovoitov Cc: Ben Hutchings Cc: Daniel Borkmann Cc: Jiri Olsa Cc: Quentin Monnet Cc: Sedat Dilek Cc: bpf@vger.kernel.orgLink: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.deLink: https://lore.kernel.org/r/20220801013834.156015-6-andres@anarazel.deSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/bpf/Makefile

1d719254 - tools: bpf: Fix error in 'make -C tools/ bpf_install'

Mon, 28 Jun 2021 03:04:09 +0000

tools: bpf: Fix error in 'make -C tools/ bpf_install'make[2]: *** No rule to make target 'install'. Stop.make[1]: *** [Makefile:122: runqslower_install] Error 2make: *** [Makefile:116: bpf_install] Error 2There is no rule for target 'install' in tools/bpf/runqslower/Makefile,and there is no need to install it, so just remove 'runqslower_install'.Fixes: 9c01546d26d2 ("tools/bpf: Add runqslower tool to tools/bpf")Signed-off-by: Wei Li Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20210628030409.3459095-1-liwei391@huawei.com List of files: /linux-6.15/tools/bpf/Makefile

1eb832ac - tools/bpf: build: Make sure resolve_btfids cleans up after itself

Tue, 01 Sep 2020 14:43:43 +0000

tools/bpf: build: Make sure resolve_btfids cleans up after itselfThe new resolve_btfids tool did not clean up the feature detection folderon 'make clean', and also was not called properly from the clean rule intools/make/ folder on its 'make clean'. This lead to stale objects beingleft around, which could cause feature detection to fail on subsequentbuilds.Fixes: fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")Signed-off-by: Toke Høiland-Jørgensen Signed-off-by: Daniel Borkmann Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20200901144343.179552-1-toke@redhat.com List of files: /linux-6.15/tools/bpf/Makefile

f143c11b - tools: bpf: Use local copy of headers including uapi/linux/filter.h

Thu, 21 Nov 2019 12:41:40 +0000

tools: bpf: Use local copy of headers including uapi/linux/filter.hPulling header files directly out of the kernel sources for inclusion inuserspace programs is highly error prone, not least because it bypassesthe kbuild infrastructure entirely and so may end up referencing otherheader files that have not been generated.Subsequent patches will cause compiler.h to pull in the ungeneratedasm/rwonce.h file via filter.h, breaking the build for tools/bpf: | $ make -C tools/bpf | make: Entering directory '/linux/tools/bpf' | CC bpf_jit_disasm.o | LINK bpf_jit_disasm | CC bpf_dbg.o | In file included from /linux/include/uapi/linux/filter.h:9, | from /linux/tools/bpf/bpf_dbg.c:41: | /linux/include/linux/compiler.h:247:10: fatal error: asm/rwonce.h: No such file or directory | #include | ^~~~~~~~~~~~~~ | compilation terminated. | make: *** [Makefile:61: bpf_dbg.o] Error 1 | make: Leaving directory '/linux/tools/bpf'Take a copy of the installed version of linux/filter.h (i.e. the onecreated by the 'headers_install' target) into tools/include/uapi/linux/and adjust the BPF tool Makefile to reference the local includedirectories instead of those in the main source tree.Cc: Masahiro Yamada Acked-by: Peter Zijlstra (Intel) Acked-by: Alexei Starovoitov Suggested-by: Daniel Borkmann Reported-by: Xiao Yang Signed-off-by: Will Deacon List of files: /linux-6.15/tools/bpf/Makefile

33a57ce0 - bpf: Compile resolve_btfids tool at kernel compilation start

Sat, 11 Jul 2020 21:53:22 +0000

bpf: Compile resolve_btfids tool at kernel compilation startThe resolve_btfids tool will be used during the vmlinux linking,so it's necessary it's ready for it.Signed-off-by: Jiri Olsa Signed-off-by: Alexei Starovoitov Tested-by: Andrii Nakryiko Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20200711215329.41165-3-jolsa@kernel.org List of files: /linux-6.15/tools/bpf/Makefile

47f6bc4c - tools, bpf: Do not force gcc as CC

Tue, 09 Jun 2020 21:35:06 +0000

tools, bpf: Do not force gcc as CCThis allows transparent cross-compilation with CROSS_COMPILE byrelying on 7ed1c1901fe5 ("tools: fix cross-compile var clobbering").Same change was applied to tools/bpf/bpftool/Makefile in9e88b9312acb ("tools: bpftool: do not force gcc as CC").Signed-off-by: Brett Mastbergen Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20200609213506.3299-1-brett.mastbergen@gmail.com List of files: /linux-6.15/tools/bpf/Makefile

d70a6be1 - tools/bpf: Don't use $(COMPILE.c)

Tue, 02 Jun 2020 17:56:48 +0000

tools/bpf: Don't use $(COMPILE.c)When using make kselftest TARGETS=bpf, tools/bpf is built withMAKEFLAGS=rR, which causes $(COMPILE.c) to be undefined, which in turncauses the build to fail with CC kselftest/bpf/tools/build/bpftool/map_perf_ring.o/bin/sh: 1: -MMD: not foundFix by using $(CC) $(CFLAGS) -c instead of $(COMPILE.c).Signed-off-by: Ilya Leoshkevich Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20200602175649.2501580-2-iii@linux.ibm.com List of files: /linux-6.15/tools/bpf/Makefile

9c01546d - tools/bpf: Add runqslower tool to tools/bpf

Mon, 13 Jan 2020 07:31:42 +0000

tools/bpf: Add runqslower tool to tools/bpfConvert one of BCC tools (runqslower [0]) to BPF CO-RE + libbpf. It matchesits BCC-based counterpart 1-to-1, supporting all the same parameters andfunctionality.runqslower tool utilizes BPF skeleton, auto-generated from BPF object file,as well as memory-mapped interface to global (read-only, in this case) data.Its Makefile also ensures auto-generation of "relocatable" vmlinux.h, which isnecessary for BTF-typed raw tracepoints with direct memory access. [0] https://github.com/iovisor/bcc/blob/11bf5d02c895df9646c117c713082eb192825293/tools/runqslower.pySigned-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200113073143.1779940-6-andriin@fb.com List of files: /linux-6.15/tools/bpf/Makefile

a89b2cbf - tools, bpf: Fix build for 'make -s tools/bpf O='

Tue, 19 Nov 2019 10:56:26 +0000

tools, bpf: Fix build for 'make -s tools/bpf O='Building selftests with 'make TARGETS=bpf kselftest' was fixed in commit55d554f5d140 ("tools: bpf: Use !building_out_of_srctree to determinesrctree"). However, by updating $(srctree) in tools/bpf/Makefile forin-tree builds only, we leave out the case where we pass an outputdirectory to build BPF tools, but $(srctree) is not set. Thistypically happens for: $ make -s tools/bpf O=/tmp/foo Makefile:40: /tools/build/Makefile.feature: No such file or directoryFix it by updating $(srctree) in the Makefile not only for out-of-treebuilds, but also if $(srctree) is empty.Detected with test_bpftool_build.sh.Fixes: 55d554f5d140 ("tools: bpf: Use !building_out_of_srctree to determine srctree")Signed-off-by: Quentin Monnet Signed-off-by: Daniel Borkmann Acked-by: Jakub Kicinski Link: https://lore.kernel.org/bpf/20191119105626.21453-1-quentin.monnet@netronome.com List of files: /linux-6.15/tools/bpf/Makefile

55d554f5 - tools: bpf: Use !building_out_of_srctree to determine srctree

Fri, 27 Sep 2019 01:13:44 +0000

tools: bpf: Use !building_out_of_srctree to determine srctreemake TARGETS=bpf kselftest fails with:Makefile:127: tools/build/Makefile.include: No such file or directoryWhen the bpf tool make is invoked from tools Makefile, srctree iscleared and the current logic check for srctree equals to emptystring to determine srctree location from CURDIR.When the build in invoked from selftests/bpf Makefile, the srctreeis set to "." and the same logic used for srctree equals to empty isneeded to determine srctree.Check building_out_of_srctree undefined as the condition for bothcases to fix "make TARGETS=bpf kselftest" build failure.Signed-off-by: Shuah Khan Signed-off-by: Daniel Borkmann Acked-by: Song Liu Link: https://lore.kernel.org/bpf/20190927011344.4695-1-skhan@linuxfoundation.org List of files: /linux-6.15/tools/bpf/Makefile

fbdb620b - tools: bpf: account for generated feature/ and libbpf/ directories

Fri, 30 Aug 2019 11:00:39 +0000

tools: bpf: account for generated feature/ and libbpf/ directoriesWhen building "tools/bpf" from the top of the Linux repository, thebuild system passes a value for the $(OUTPUT) Makefile variable totools/bpf/Makefile and tools/bpf/bpftool/Makefile, which results ingenerating "libbpf/" (for bpftool) and "feature/" (bpf and bpftool)directories inside the tree.This commit adds such directories to the relevant .gitignore files, andedits the Makefiles to ensure they are removed on "make clean". The useof "rm" is also made consistent throughout those Makefiles (relies onthe $(RM) variable, use "--" to prevent interpreting$(OUTPUT)/$(DESTDIR) as options.v2:- New patch.Signed-off-by: Quentin Monnet Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile

9c299a32 - bpf: fix for lex/yacc build error with gcc-5

Wed, 25 Apr 2018 21:22:45 +0000

bpf: fix for lex/yacc build error with gcc-5Fix build error found with Ubuntu shipped gcc-5~/git/bpf/tools/bpf$ make allAuto-detecting system features:... libbfd: [ OFF ]... disassembler-four-args: [ OFF ] CC bpf_jit_disasm.o LINK bpf_jit_disasm CC bpf_dbg.o/home/john/git/bpf/tools/bpf/bpf_dbg.c: In function ‘cmd_load’:/home/john/git/bpf/tools/bpf/bpf_dbg.c:1077:13: warning: ‘cont’ may be used uninitialized in this function [-Wmaybe-uninitialized] } else if (matches(subcmd, "pcap") == 0) { ^ LINK bpf_dbg CC bpf_asm.omake: *** No rule to make target `bpf_exp.yacc.o', needed by `bpf_asm'. Stop.Fixes: 5a8997f20715 ("tools: bpf: respect output directory during build")Signed-off-by: John Fastabend Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile

cc5b3403 - tools: bpf: remove feature detection output

Fri, 16 Mar 2018 06:26:17 +0000

tools: bpf: remove feature detection outputbpf tools use feature detection for libbfd dependency, clean upthe output files on make clean.Signed-off-by: Jakub Kicinski Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile

8050ea46 - tools: bpf: cleanup PHONY target

Fri, 16 Mar 2018 06:26:16 +0000

tools: bpf: cleanup PHONY targetThere is no FORCE target in the Makefile and some of the PHONYtargets are missing, update the list.Signed-off-by: Jakub Kicinski Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile

ef8ba83b - tools: bpf: silence make by not deleting intermediate file

Thu, 08 Mar 2018 22:00:41 +0000

tools: bpf: silence make by not deleting intermediate fileEven in quiet mode, make finishes withrm tools/bpf/bpf_exp.lex.cThat's because it considers the file to be intermediate. Silence that bymentioning the lex.c file instead of the lex.o file; the dependency stillstays.Signed-off-by: Jiri Benc Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile

a50b7f8c - tools: bpf: respect quiet/verbose build

Thu, 08 Mar 2018 22:00:40 +0000

tools: bpf: respect quiet/verbose buildDefault to quiet build, with V=1 enabling verbose build as is usual.Signed-off-by: Jiri Benc Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile

58416c37 - tools: bpf: call descend in Makefile

Thu, 08 Mar 2018 22:00:39 +0000

tools: bpf: call descend in MakefileUse the descend macro to properly propagate $(subdir) to bpftool.Signed-off-by: Jiri Benc Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile

6c071008 - tools: bpf: make install should build first

Thu, 08 Mar 2018 22:00:38 +0000

tools: bpf: make install should build firstMake the 'install' target depend on the 'all' target to build the binariesfirst.Signed-off-by: Jiri Benc Signed-off-by: Daniel Borkmann List of files: /linux-6.15/tools/bpf/Makefile