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/resolve_btfids/Makefile

edd75c80 - tools/resolve_btfids: Fix setting HOSTCFLAGS

Tue, 30 May 2023 12:33:52 +0000

tools/resolve_btfids: Fix setting HOSTCFLAGSBuilding BPF selftests with custom HOSTCFLAGS yields an error: # make HOSTCFLAGS="-O2" [...] HOSTCC ./tools/testing/selftests/bpf/tools/build/resolve_btfids/main.o main.c:73:10: fatal error: linux/rbtree.h: No such file or directory 73 | #include | ^~~~~~~~~~~~~~~~The reason is that tools/bpf/resolve_btfids/Makefile passes headerinclude paths by extending HOSTCFLAGS which is overridden by settingHOSTCFLAGS in the make command (because of Makefile rules [1]).This patch fixes the above problem by passing the include paths via`HOSTCFLAGS_resolve_btfids` which is used by tools/build/Build.includeand can be combined with overridding HOSTCFLAGS.[1] https://www.gnu.org/software/make/manual/html_node/Overriding.htmlFixes: 56a2df7615fa ("tools/resolve_btfids: Compile resolve_btfids as host program")Signed-off-by: Viktor Malik Signed-off-by: Andrii Nakryiko Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20230530123352.1308488-1-vmalik@redhat.com List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

2531ba0e - tools/resolve_btfids: Pass HOSTCFLAGS as EXTRA_CFLAGS to prepare targets

Thu, 09 Feb 2023 14:37:35 +0000

tools/resolve_btfids: Pass HOSTCFLAGS as EXTRA_CFLAGS to prepare targetsThorsten reported build issue with command line that defined extraHOSTCFLAGS that were not passed into 'prepare' targets, but wereused to build resolve_btfids objects.This results in build fail when these objects are linked together: /usr/bin/ld: /build.../tools/bpf/resolve_btfids//libbpf/libbpf.a(libbpf-in.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a PIE \ object; recompile with -fPIEFixing this by passing HOSTCFLAGS in EXTRA_CFLAGS as part ofHOST_OVERRIDES variable for prepare targets.[1] https://lore.kernel.org/bpf/f7922132-6645-6316-5675-0ece4197bfff@leemhuis.info/Fixes: 56a2df7615fa ("tools/resolve_btfids: Compile resolve_btfids as host program")Reported-by: Thorsten Leemhuis Signed-off-by: Jiri Olsa Signed-off-by: Andrii Nakryiko Tested-by: Thorsten Leemhuis Acked-by: Ian Rogers Link: https://lore.kernel.org/bpf/20230209143735.4112845-1-jolsa@kernel.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

e0975ab9 - tools/resolve_btfids: Tidy HOST_OVERRIDES

Thu, 02 Feb 2023 22:42:53 +0000

tools/resolve_btfids: Tidy HOST_OVERRIDESDon't set EXTRA_CFLAGS to HOSTCFLAGS, ensure CROSS_COMPILE isn'tpassed through.Signed-off-by: Ian Rogers Signed-off-by: Daniel Borkmann Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20230202224253.40283-1-irogers@google.com List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

56a2df76 - tools/resolve_btfids: Compile resolve_btfids as host program

Thu, 02 Feb 2023 11:28:39 +0000

tools/resolve_btfids: Compile resolve_btfids as host programMaking resolve_btfids to be compiled as host program sowe can avoid cross compile issues as reported by Nathan.Also we no longer need HOST_OVERRIDES for BINARY target,just for 'prepare' targets.Fixes: 13e07691a16f ("tools/resolve_btfids: Alter how HOSTCC is forced")Reported-by: Nathan Chancellor Signed-off-by: Jiri Olsa Signed-off-by: Daniel Borkmann Tested-by: Nathan Chancellor Acked-by: Ian Rogers Link: https://lore.kernel.org/bpf/20230202112839.1131892-1-jolsa@kernel.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

13e07691 - tools/resolve_btfids: Alter how HOSTCC is forced

Tue, 24 Jan 2023 06:43:24 +0000

tools/resolve_btfids: Alter how HOSTCC is forcedHOSTCC is always wanted when building. Setting CC to HOSTCC happensafter tools/scripts/Makefile.include is included, meaning flags areset assuming say CC is gcc, but then it can be later set to HOSTCCwhich may be clang. tools/scripts/Makefile.include is needed for hostset up and common macros in objtool's Makefile. Rather than overrideCC to HOSTCC, just pass CC as HOSTCC to Makefile.build, the libsubcmdbuilds and the linkage step. This means the Makefiles don't see thingslike CC changing and tool flag determination, and similar, workproperly.Also, clear the passed subdir as otherwise an outer build may break byinadvertently passing an inappropriate value.Signed-off-by: Ian Rogers Signed-off-by: Daniel Borkmann Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20230124064324.672022-2-irogers@google.com List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

af03299d - tools/resolve_btfids: Install subcmd headers

Tue, 24 Jan 2023 06:43:23 +0000

tools/resolve_btfids: Install subcmd headersPreviously tools/lib/subcmd was added to the include path, switch toinstalling the headers and then including from that directory. Thisavoids dependencies on headers internal to tools/lib/subcmd. Add themissing subcmd directory to the affected #include.Signed-off-by: Ian Rogers Signed-off-by: Daniel Borkmann Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20230124064324.672022-1-irogers@google.com List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

0e43662e - tools/resolve_btfids: Use pkg-config to locate libelf

Thu, 15 Dec 2022 04:47:03 +0000

tools/resolve_btfids: Use pkg-config to locate libelfWhen libelf was not installed in the standard location, it cannot belocated by the current building config.Use pkg-config to help locate libelf in such cases.Signed-off-by: Shen Jiamin Signed-off-by: Daniel Borkmann Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20221215044703.400139-1-shen_jiamin@comp.nus.edu.sg List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

7f3bdbc3 - tools/resolve_btfids: Do not print any commands when building silently

Tue, 01 Feb 2022 21:25:04 +0000

tools/resolve_btfids: Do not print any commands when building silentlyWhen building with 'make -s', there is some output from resolve_btfids:$ make -sj"$(nproc)" oldconfig prepare MKDIR .../tools/bpf/resolve_btfids/libbpf/ MKDIR .../tools/bpf/resolve_btfids//libsubcmd LINK resolve_btfidsSilent mode means that no information should be emitted about what iscurrently being done. Use the $(silent) variable from Makefile.includeto avoid defining the msg macro so that there is no information printed.Fixes: fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")Signed-off-by: Nathan Chancellor Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20220201212503.731732-1-nathan@kernel.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

0e3a1c90 - tools/resolve_btfids: Build with host flags

Wed, 12 Jan 2022 00:25:03 +0000

tools/resolve_btfids: Build with host flagsresolve_btfids is built using $(HOSTCC) and $(HOSTLD) but does notpick up the corresponding flags. As a result, host-specific settings(such as a sysroot specified via HOSTCFLAGS=--sysroot=..., or a linkerspecified via HOSTLDFLAGS=-fuse-ld=...) will not be respected.Fix this by setting CFLAGS to KBUILD_HOSTCFLAGS and LDFLAGS toKBUILD_HOSTLDFLAGS.Also pass the cflags through to libbpf via EXTRA_CFLAGS to ensure thatthe host libbpf is built with flags consistent with resolve_btfids.Signed-off-by: Connor O'Brien Signed-off-by: Andrii Nakryiko Acked-by: Song Liu Link: https://lore.kernel.org/bpf/20220112002503.115968-1-connoro@google.com List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

bf1be903 - tools/resolve_btfids: Support cross-building the kernel with clang

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

tools/resolve_btfids: Support cross-building the kernel with clangThe CROSS_COMPILE variable may be present during resolve_btfids build ifthe kernel is being cross-built. Since resolve_btfids is always executedon the host, we set CC to HOSTCC in order to use the host toolchain whencross-building with GCC. But instead of a toolchain prefix, cross-buildwith clang uses a "-target" parameter, which Makefile.include deducesfrom the CROSS_COMPILE variable. In order to avoid cross-buildinglibbpf, clear CROSS_COMPILE before building resolve_btfids.Signed-off-by: Jean-Philippe Brucker Signed-off-by: Andrii Nakryiko Acked-by: Quentin Monnet Link: https://lore.kernel.org/bpf/20211216163842.829836-3-jean-philippe@linaro.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

1478994a - tools/resolve_btfids: Install libbpf headers when building

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

tools/resolve_btfids: Install libbpf headers when buildingAPI headers from libbpf should not be accessed directly from thelibrary's source directory. Instead, they should be exported with "makeinstall_headers". Let's make sure that resolve_btfids installs theheaders properly when building.When descending from a parent Makefile, the specific output directoriesfor building the library and exporting the headers are configurable withLIBBPF_OUT and LIBBPF_DESTDIR, respectively. This is in addition toOUTPUT, on top of which those variables are constructed by default.Also adjust the Makefile for the BPF selftests in order to point to the(target) libbpf shared with other tools, instead of building a versionspecific to resolve_btfids. Remove libbpf's order-only dependencies onthe include directories (they are created by libbpf and don't need toexist beforehand).Signed-off-by: Quentin Monnet Signed-off-by: Andrii Nakryiko Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20211007194438.34443-5-quentin@isovalent.com List of files: /linux-6.15/tools/bpf/resolve_btfids/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/bpf/resolve_btfids/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/bpf/resolve_btfids/Makefile

7962cb9b - tools/resolve_btfids: Set srctree variable unconditionally

Fri, 05 Feb 2021 12:40:19 +0000

tools/resolve_btfids: Set srctree variable unconditionallyWe want this clean to be called from tree's root Makefile,which defines same srctree variable and that will screwthe make setup.We actually do not use srctree being passed from outside,so we can solve this by setting current srctree valuedirectly.Also changing the way how srctree is initialized as suggestedby Andrri.Also root Makefile does not define the implicit RM variable,so adding RM initialization.Signed-off-by: Jiri Olsa Signed-off-by: Andrii Nakryiko Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20210205124020.683286-4-jolsa@kernel.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

f2313097 - tools/resolve_btfids: Check objects before removing

Fri, 05 Feb 2021 12:40:18 +0000

tools/resolve_btfids: Check objects before removingWe want this clean to be called from tree's root cleanand that one is silent if there's nothing to clean.Adding check for all object to clean and display CLEANmessages only if there are objects to remove.Signed-off-by: Jiri Olsa Signed-off-by: Andrii Nakryiko Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20210205124020.683286-3-jolsa@kernel.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

fc6b48f6 - tools/resolve_btfids: Build libbpf and libsubcmd in separate directories

Fri, 05 Feb 2021 12:40:17 +0000

tools/resolve_btfids: Build libbpf and libsubcmd in separate directoriesSetting up separate build directories for libbpf and libpsubcmd,so it's separated from other objects and we don't get them mixedin the future.It also simplifies cleaning, which is now simple rm -rf.Also there's no need for FEATURE-DUMP.libbpf and bpf_helper_defs.hfiles in .gitignore anymore.Signed-off-by: Jiri Olsa Signed-off-by: Andrii Nakryiko Acked-by: Song Liu Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20210205124020.683286-2-jolsa@kernel.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

c8a950d0 - tools: Factor HOSTCC, HOSTLD, HOSTAR definitions

Tue, 10 Nov 2020 16:43:05 +0000

tools: Factor HOSTCC, HOSTLD, HOSTAR definitionsSeveral Makefiles in tools/ need to define the host toolchain variables.Move their definition to tools/scripts/Makefile.includeSigned-off-by: Jean-Philippe Brucker Signed-off-by: Andrii Nakryiko Acked-by: Jiri Olsa Acked-by: Rafael J. Wysocki Link: https://lore.kernel.org/bpf/20201110164310.2600671-2-jean-philippe@linaro.org List of files: /linux-6.15/tools/bpf/resolve_btfids/Makefile

dc3652d3 - tools resolve_btfids: Always force HOSTARCH

Wed, 23 Sep 2020 18:57:35 +0000

tools resolve_btfids: Always force HOSTARCHSeth reported problem with cross builds, that failon resolve_btfids build, because we are trying tobuild it on cross build arch.Fixing this by always forcing the host arch.Reported-by: Seth Forshee Signed-off-by: Jiri Olsa Signed-off-by: Alexei Starovoitov Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20200923185735.3048198-2-jolsa@kernel.org List of files: /linux-6.15/tools/bpf/resolve_btfids/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/resolve_btfids/Makefile