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/lib/bpf/Makefile

710fbca8 - libbpf: Add missing per-arch include path

Fri, 27 Sep 2024 13:13:52 +0000

libbpf: Add missing per-arch include pathlibbpf does not include the per-arch tools include path, e.g.tools/arch/riscv/include. Some architectures depend those files tobuild properly.Include tools/arch/$(SUBARCH)/include in the libbpf build.Fixes: 6d74d178fe6e ("tools: Add riscv barrier implementation")Signed-off-by: Björn Töpel Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20240927131355.350918-1-bjorn@kernel.org List of files: /linux-6.15/tools/lib/bpf/Makefile

dbb2a7a9 - tools build: Correct bpf fixdep dependencies

Mon, 15 Jul 2024 20:32:44 +0000

tools build: Correct bpf fixdep dependenciesThe dependencies in tools/lib/bpf/Makefile are incorrect. Before werecurse to build $(BPF_IN_STATIC), we need to build its 'fixdep'executable.I can't use the usual shortcut from Makefile.include: : fixdepbecause its 'fixdep' target relies on $(OUTPUT), and $(OUTPUT) differsin the parent 'make' versus the child 'make' -- so I imitate it viaopen-coding.I tweak a few $(MAKE) invocations while I'm at it, because1. I'm adding a new recursive make; and2. these recursive 'make's print spurious lines about files that are "up to date" (which isn't normally a feature in Kbuild subtargets) or "jobserver not available" (see [1])I also need to tweak the assignment of the OUTPUT variable, so thatrelative path builds work. For example, for 'make tools/lib/bpf', OUTPUTis unset, and is usually treated as "cwd" -- but recursive make willchange cwd and so OUTPUT has a new meaning. For consistency, I ensureOUTPUT is always an absolute path.And $(Q) gets a backup definition in tools/build/Makefile.include,because Makefile.include is sometimes included withouttools/build/Makefile, so the "quiet command" stuff doesn't actually workconsistently without it.After this change, top-level builds result in an empty grep result from: $ grep 'cannot find fixdep' $(find tools/ -name '*.cmd')[1] https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.htmlIf we're not using $(MAKE) directly, then we need to use more '+'.Signed-off-by: Brian Norris Acked-by: Andrii Nakryiko Acked-by: Jiri Olsa Cc: Ian Rogers Cc: Josh Poimboeuf Cc: Masahiro Yamada Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Richter Link: https://lore.kernel.org/r/20240715203325.3832977-4-briannorris@chromium.orgSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/bpf/Makefile

e2bad142 - kbuild: unexport abs_srctree and abs_objtree

Wed, 06 Mar 2024 10:42:22 +0000

kbuild: unexport abs_srctree and abs_objtreeCommit 25b146c5b8ce ("kbuild: allow Kbuild to start from any directory")exported abs_srctree and abs_objtree to avoid recomputation after thesub-make. However, this approach turned out to be fragile.Commit 5fa94ceb793e ("kbuild: set correct abs_srctree and abs_objtreefor package builds") moved them above "ifneq ($(sub_make_done),1)",eliminating the need for exporting them.These are only needed in the top Makefile. If an absolute path isrequired in sub-directories, you can use $(abspath ) or $(realpath )as needed.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/tools/lib/bpf/Makefile

94e38c95 - libbpf: fix typos in Makefile

Sat, 22 Jul 2023 06:52:36 +0000

libbpf: fix typos in MakefileCapitalize ABI (acronym) and fix spelling of "destination".Fixes: 706819495921 ("libbpf: Improve usability of libbpf Makefile")Signed-off-by: Randy Dunlap Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Andrii Nakryiko Cc: bpf@vger.kernel.orgCc: Xin Liu Link: https://lore.kernel.org/r/20230722065236.17010-1-rdunlap@infradead.orgSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/tools/lib/bpf/Makefile

70681949 - libbpf: Improve usability of libbpf Makefile

Fri, 02 Dec 2022 08:17:38 +0000

libbpf: Improve usability of libbpf MakefileCurrent libbpf Makefile does not contain the help command, whichis inconvenient to use. Similar to the Makefile help command of theperf, a help command is provided to list the commands supported bylibbpf make and the functions of the commands.Signed-off-by: Xin Liu Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20221202081738.128513-1-liuxin350@huawei.com List of files: /linux-6.15/tools/lib/bpf/Makefile

daa45f3f - tools lib bpf: Avoid install_headers make warning

Thu, 17 Nov 2022 00:43:52 +0000

tools lib bpf: Avoid install_headers make warningThe perf build makes the install_headers target, however, as there isno action for this target a warning is always produced of:make[3]: Nothing to be done for 'install_headers'.Solve this by adding a display of 'INSTALL libbpf_headers'.Signed-off-by: Ian Rogers Acked-by: Andrii Nakryiko Cc: Alexander Shishkin Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Hao Luo Cc: Ingo Molnar Cc: Jiri Olsa Cc: John Fastabend Cc: KP Singh Cc: Mark Rutland Cc: Martin KaFai Lau Cc: Masahiro Yamada Cc: Namhyung Kim Cc: Nicolas Schier Cc: Peter Zijlstra Cc: Song Liu Cc: Stanislav Fomichev Cc: Stephane Eranian Cc: Yonghong Song Cc: bpf@vger.kernel.orgLink: https://lore.kernel.org/r/20221117004356.279422-3-irogers@google.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/bpf/Makefile

f3660063 - libbpf: move xsk.{c,h} into selftests/bpf

Mon, 27 Jun 2022 21:15:13 +0000

libbpf: move xsk.{c,h} into selftests/bpfRemove deprecated xsk APIs from libbpf. But given we have selftestsrelying on this, move those files (with minimal adjustments to make themcompilable) under selftests/bpf.We also remove all the removed APIs from libbpf.map, while overallkeeping version inheritance chain, as most APIs are backwardscompatible so there is no need to reassign them as LIBBPF_1.0.0 versions.Cc: Magnus Karlsson Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/r/20220627211527.2245459-2-andrii@kernel.orgSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/tools/lib/bpf/Makefile

056431ae - libbpf: fix up global symbol counting logic

Wed, 18 May 2022 18:59:13 +0000

libbpf: fix up global symbol counting logicAdd the same negative ABS filter that we use in VERSIONED_SYM_COUNT tofilter out ABS symbols like LIBBPF_0.8.0.Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/r/20220518185915.3529475-2-andrii@kernel.orgSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/tools/lib/bpf/Makefile

d72e2968 - libbpf: Add BPF-side of USDT support

Mon, 04 Apr 2022 23:41:56 +0000

libbpf: Add BPF-side of USDT supportAdd BPF-side implementation of libbpf-provided USDT support. Thisconsists of single header library, usdt.bpf.h, which is meant to be usedfrom user's BPF-side source code. This header is added to the list ofinstalled libbpf header, along bpf_helpers.h and others.BPF-side implementation consists of two BPF maps: - spec map, which contains "a USDT spec" which encodes information necessary to be able to fetch USDT arguments and other information (argument count, user-provided cookie value, etc) at runtime; - IP-to-spec-ID map, which is only used on kernels that don't support BPF cookie feature. It allows to lookup spec ID based on the place in user application that triggers USDT program.These maps have default sizes, 256 and 1024, which are chosenconservatively to not waste a lot of space, but handling a lot of commoncases. But there could be cases when user application needs to eithertrace a lot of different USDTs, or USDTs are heavily inlined and theirarguments are located in a lot of differing locations. For such cases itmight be necessary to size those maps up, which libbpf allows to do byoverriding BPF_USDT_MAX_SPEC_CNT and BPF_USDT_MAX_IP_CNT macros.It is an important aspect to keep in mind. Single USDT (user-spaceequivalent of kernel tracepoint) can have multiple USDT "call sites".That is, single logical USDT is triggered from multiple places in userapplication. This can happen due to function inlining. Each such inlinedinstance of USDT invocation can have its own unique USDT argumentspecification (instructions about the location of the value of each ofUSDT arguments). So while USDT looks very similar to usual uprobe orkernel tracepoint, under the hood it's actually a collection of uprobes,each potentially needing different spec to know how to fetch arguments.User-visible API consists of three helper functions: - bpf_usdt_arg_cnt(), which returns number of arguments of current USDT; - bpf_usdt_arg(), which reads value of specified USDT argument (by it's zero-indexed position) and returns it as 64-bit value; - bpf_usdt_cookie(), which functions like BPF cookie for USDT programs; this is necessary as libbpf doesn't allow specifying actual BPF cookie and utilizes it internally for USDT support implementation.Each bpf_usdt_xxx() APIs expect struct pt_regs * context, passed intoBPF program. On kernels that don't support BPF cookie it is used tofetch absolute IP address of the underlying uprobe.usdt.bpf.h also provides BPF_USDT() macro, which functions likeBPF_PROG() and BPF_KPROBE() and allows much more user-friendly way toget access to USDT arguments, if USDT definition is static and known tothe user. It is expected that majority of use cases won't have to usebpf_usdt_arg_cnt() and bpf_usdt_arg() directly and BPF_USDT() will coverall their needs.Last, usdt.bpf.h is utilizing BPF CO-RE for one single purpose: todetect kernel support for BPF cookie. If BPF CO-RE dependency isundesirable, user application can redefine BPF_USDT_HAS_BPF_COOKIE toeither a boolean constant (or equivalently zero and non-zero), or evenpoint it to its own .rodata variable that can be specified from user'sapplication user-space code. It is important thatBPF_USDT_HAS_BPF_COOKIE is known to BPF verifier as static value (thus.rodata and not just .data), as otherwise BPF code will still containbpf_get_attach_cookie() BPF helper call and will fail validation atruntime, if not dead-code eliminated.Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Reviewed-by: Alan Maguire Link: https://lore.kernel.org/bpf/20220404234202.331384-2-andrii@kernel.org List of files: /linux-6.15/tools/lib/bpf/Makefile

5c816641 - kbuild: replace $(if A,A,B) with $(or A,B)

Fri, 11 Feb 2022 05:14:11 +0000

kbuild: replace $(if A,A,B) with $(or A,B)$(or ...) is available since GNU Make 3.81, and useful to shorten thecode in some places.Covert as follows: $(if A,A,B) --> $(or A,B)This patch also converts: $(if A, A, B) --> $(or A, B)Strictly speaking, the latter is not an equivalent conversion becauseGNU Make keeps spaces after commas; if A is not empty, $(if A, A, B)expands to " A", while $(or A, B) expands to "A".Anyway, preceding spaces are not significant in the code hunks I touched.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/tools/lib/bpf/Makefile

0908a66a - libbpf: Fix build issue with llvm-readelf

Fri, 04 Feb 2022 21:43:55 +0000

libbpf: Fix build issue with llvm-readelfThere are cases where clang compiler is packaged in a wayreadelf is a symbolic link to llvm-readelf. In such cases,llvm-readelf will be used instead of default binutils readelf,and the following error will appear during libbpf build: Warning: Num of global symbols in /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) does NOT match with num of versioned symbols in /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). Please make sure all LIBBPF_API symbols are versioned in libbpf.map. --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... @@ -324,6 +324,22 @@ btf__str_by_offset btf__type_by_id btf__type_cnt +LIBBPF_0.0.1 +LIBBPF_0.0.2 +LIBBPF_0.0.3 +LIBBPF_0.0.4 +LIBBPF_0.0.5 +LIBBPF_0.0.6 +LIBBPF_0.0.7 +LIBBPF_0.0.8 +LIBBPF_0.0.9 +LIBBPF_0.1.0 +LIBBPF_0.2.0 +LIBBPF_0.3.0 +LIBBPF_0.4.0 +LIBBPF_0.5.0 +LIBBPF_0.6.0 +LIBBPF_0.7.0 libbpf_attach_type_by_name libbpf_find_kernel_btf libbpf_find_vmlinux_btf_id make[2]: *** [Makefile:184: check_abi] Error 1 make[1]: *** [Makefile:140: all] Error 2The above failure is due to different printouts for some ABSversioned symbols. For example, with the same libbpf.so, $ /bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS 134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0 202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0 ... $ /opt/llvm/bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS 134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0@@LIBBPF_0.5.0 202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0@@LIBBPF_0.6.0 ...The binutils readelf doesn't print out the symbol LIBBPF_* version and llvm-readelf does.Such a difference caused libbpf build failure with llvm-readelf.The proposed fix filters out all ABS symbols as they are not part of the comparison.This works for both binutils readelf and llvm-readelf.Reported-by: Delyan Kratunov Signed-off-by: Yonghong Song Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220204214355.502108-1-yhs@fb.com List of files: /linux-6.15/tools/lib/bpf/Makefile

4980beb4 - tools/libbpf: Enable cross-building with clang

Thu, 16 Dec 2021 16:38:40 +0000

tools/libbpf: Enable cross-building with clangCross-building using clang requires passing the "-target" flag ratherthan using the CROSS_COMPILE prefix. Makefile.include transformsCROSS_COMPILE into CLANG_CROSS_FLAGS. Add them to the CFLAGS.Signed-off-by: Jean-Philippe Brucker Signed-off-by: Andrii Nakryiko Acked-by: Quentin Monnet Link: https://lore.kernel.org/bpf/20211216163842.829836-4-jean-philippe@linaro.org List of files: /linux-6.15/tools/lib/bpf/Makefile

3a74ac2d - libbpf: Compile using -std=gnu89

Fri, 05 Nov 2021 23:42:40 +0000

libbpf: Compile using -std=gnu89The minimum supported C standard version is C89, with use of GNUextensions, hence make sure to catch any instances that would breakthe build for this mode by passing -std=gnu89.Signed-off-by: Kumar Kartikeya Dwivedi Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20211105234243.390179-4-memxor@gmail.com List of files: /linux-6.15/tools/lib/bpf/Makefile

d51b6b22 - libbpf: Remove Makefile warnings on out-of-sync netlink.h/if_link.h

Sun, 10 Oct 2021 00:25:28 +0000

libbpf: Remove Makefile warnings on out-of-sync netlink.h/if_link.hAlthough relying on some definitions from the netlink.h and if_link.hheaders copied into tools/include/uapi/linux/, libbpf does not needthose headers to stay entirely up-to-date with their original versions,and the warnings emitted by the Makefile when it detects a differenceare usually just noise. Let's remove those warnings.Suggested-by: Andrii Nakryiko Signed-off-by: Quentin Monnet Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20211010002528.9772-1-quentin@isovalent.com List of files: /linux-6.15/tools/lib/bpf/Makefile

b79c2ce3 - libbpf: Skip re-installing headers file if source is older than target

Thu, 07 Oct 2021 19:44:27 +0000

libbpf: Skip re-installing headers file if source is older than targetThe "install_headers" target in libbpf's Makefile would unconditionallyexport all API headers to the target directory. When those headers areinstalled to compile another application, this means that make alwaysfinds newer dependencies for the source files relying on those headers,and deduces that the targets should be rebuilt.Avoid that by making "install_headers" depend on the source headerfiles, and (re-)install them only when necessary.Signed-off-by: Quentin Monnet Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20211007194438.34443-2-quentin@isovalent.com List of files: /linux-6.15/tools/lib/bpf/Makefile

929bef46 - bpf: Use $(pound) instead of \# in Makefiles

Wed, 06 Oct 2021 11:10:49 +0000

bpf: Use $(pound) instead of \# in MakefilesRecent-ish versions of make do no longer consider number signs ("#") ascomment symbols when they are inserted inside of a macro reference or ina function invocation. In such cases, the symbols should not be escaped.There are a few occurrences of "\#" in libbpf's and samples' Makefiles.In the former, the backslash is harmless, because grep associates noparticular meaning to the escaped symbol and reads it as a regular "#".In samples' Makefile, recent versions of make will pass the backslashdown to the compiler, making the probe fail all the time and resultingin the display of a warning about "make headers_install" being required,even after headers have been installed.A similar issue has been addressed at some other locations by commit9564a8cf422d ("Kbuild: fix # escaping in .cmd files for future Make").Let's address it for libbpf's and samples' Makefiles in the samefashion, by using a "$(pound)" variable (pulled fromtools/scripts/Makefile.include for libbpf, or re-defined for thesamples).Reference for the change in make:https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b57Fixes: 2f3830412786 ("libbpf: Make libbpf_version.h non-auto-generated")Fixes: 07c3bbdb1a9b ("samples: bpf: print a warning about headers_install")Signed-off-by: Quentin Monnet Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20211006111049.20708-1-quentin@isovalent.com List of files: /linux-6.15/tools/lib/bpf/Makefile

2f383041 - libbpf: Make libbpf_version.h non-auto-generated

Mon, 13 Sep 2021 22:23:09 +0000

libbpf: Make libbpf_version.h non-auto-generatedTurn previously auto-generated libbpf_version.h header into a normalheader file. This prevents various tricky Makefile integration issues,simplifies the overall build process, but also allows to further extendit with some more versioning-related APIs in the future.To prevent accidental out-of-sync versions as defined by libbpf.map andlibbpf_version.h, Makefile checks their consistency at build time.Simultaneously with this change bump libbpf.map to v0.6.Also undo adding libbpf's output directory into include path forkernel/bpf/preload, bpftool, and resolve_btfids, which is not necessarybecause libbpf_version.h is just a normal header like any other.Fixes: 0b46b7550560 ("libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecations")Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20210913222309.3220849-1-andrii@kernel.org List of files: /linux-6.15/tools/lib/bpf/Makefile

0b46b755 - libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecations

Wed, 08 Sep 2021 21:32:26 +0000

libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecationsIntroduce a macro LIBBPF_DEPRECATED_SINCE(major, minor, message) to preparethe deprecation of two API functions. This macro marks functions as deprecatedwhen libbpf's version reaches the values passed as an argument.As part of this change libbpf_version.h header is added with recorded major(LIBBPF_MAJOR_VERSION) and minor (LIBBPF_MINOR_VERSION) libbpf version macros.They are now part of libbpf public API and can be relied upon by user code.libbpf_version.h is installed system-wide along other libbpf public headers.Due to this new build-time auto-generated header, in-kernel applicationsrelying on libbpf (resolve_btfids, bpftool, bpf_preload) are updated toinclude libbpf's output directory as part of a list of include search paths.Better fix would be to use libbpf's make_install target to install public APIheaders, but that clean up is left out as a future improvement. The buildchanges were tested by building kernel (with KBUILD_OUTPUT and O= specifiedexplicitly), bpftool, libbpf, selftests/bpf, and resolve_btfids builds. Noproblems were detected.Note that because of the constraints of the C preprocessor we have to writea few lines of macro magic for each version used to prepare deprecation (0.6for now).Also, use LIBBPF_DEPRECATED_SINCE() to schedule deprecation ofbtf__get_from_id() and btf__load(), which are replaced bybtf__load_from_kernel_by_id() and btf__load_into_kernel(), respectively,starting from future libbpf v0.6. This is part of libbpf 1.0 effort ([0]). [0] Closes: https://github.com/libbpf/libbpf/issues/278Co-developed-by: Quentin Monnet Co-developed-by: Andrii Nakryiko Signed-off-by: Quentin Monnet Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20210908213226.1871016-1-andrii@kernel.org List of files: /linux-6.15/tools/lib/bpf/Makefile

61c7aa50 - libbpf: Re-build libbpf.so when libbpf.map changes

Sun, 15 Aug 2021 07:06:00 +0000

libbpf: Re-build libbpf.so when libbpf.map changesEnsure libbpf.so is re-built whenever libbpf.map is modified. Without this,changes to libbpf.map are not detected and versioned symbols mismatch errorwill be reported until `make clean && make` is used, which is a suboptimaldeveloper experience.Fixes: 306b267cb3c4 ("libbpf: Verify versioned symbols")Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20210815070609.987780-8-andrii@kernel.org List of files: /linux-6.15/tools/lib/bpf/Makefile