]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
scripts/gen-btf.sh: Reduce log verbosity
authorIhor Solodrai <ihor.solodrai@linux.dev>
Wed, 31 Dec 2025 18:39:29 +0000 (10:39 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 31 Dec 2025 21:38:13 +0000 (13:38 -0800)
Remove info messages from gen-btf.sh, as they are unnecessarily
detailed and sometimes inaccurate [1].  Verbose log can be produced by
passing V=1 to make, which will set -x for the shell.

[1] https://lore.kernel.org/bpf/CAADnVQ+biTSDaNtoL=ct9XtBJiXYMUqGYLqu604C3D8N+8YH9A@mail.gmail.com/

Suggested-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Link: https://lore.kernel.org/r/20251231183929.65668-1-ihor.solodrai@linux.dev
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
scripts/gen-btf.sh
scripts/link-vmlinux.sh

index 0aec86615416223e239f8ed993607e9048101d20..d6457661b9b67fda059dbd1a49c15493035636bc 100755 (executable)
@@ -60,28 +60,20 @@ is_enabled() {
        grep -q "^$1=y" ${objtree}/include/config/auto.conf
 }
 
-info()
-{
-       printf "  %-7s %s\n" "${1}" "${2}"
-}
-
 case "${KBUILD_VERBOSE}" in
 *1*)
        set -x
        ;;
 esac
 
-
 gen_btf_data()
 {
-       info BTF "${ELF_FILE}"
        btf1="${ELF_FILE}.BTF.1"
        ${PAHOLE} -J ${PAHOLE_FLAGS}                    \
                ${BTF_BASE:+--btf_base ${BTF_BASE}}     \
                --btf_encode_detached=${btf1}           \
                "${ELF_FILE}"
 
-       info BTFIDS "${ELF_FILE}"
        ${RESOLVE_BTFIDS} ${RESOLVE_BTFIDS_FLAGS}       \
                ${BTF_BASE:+--btf_base ${BTF_BASE}}     \
                --btf ${btf1} "${ELF_FILE}"
@@ -95,7 +87,6 @@ gen_btf_o()
        # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
        # deletes all symbols including __start_BTF and __stop_BTF, which will
        # be redefined in the linker script.
-       info OBJCOPY "${btf_data}"
        echo "" | ${CC} ${CLANG_FLAGS} ${KBUILD_CFLAGS} -c -x c -o ${btf_data} -
        ${OBJCOPY} --add-section .BTF=${ELF_FILE}.BTF \
                --set-section-flags .BTF=alloc,readonly ${btf_data}
@@ -113,7 +104,6 @@ gen_btf_o()
 
 embed_btf_data()
 {
-       info OBJCOPY "${ELF_FILE}.BTF"
        ${OBJCOPY} --add-section .BTF=${ELF_FILE}.BTF ${ELF_FILE}
 
        # a module might not have a .BTF_ids or .BTF.base section
index 1915adf3249b962d8eea66b69a3f76fe47f527d6..08cd8e25c65ce73c963e7c5ff882e03efccc9d9e 100755 (executable)
@@ -205,6 +205,7 @@ if is_enabled CONFIG_KALLSYMS || is_enabled CONFIG_DEBUG_INFO_BTF; then
 fi
 
 if is_enabled CONFIG_DEBUG_INFO_BTF; then
+       info BTF .tmp_vmlinux1
        if ! ${srctree}/scripts/gen-btf.sh .tmp_vmlinux1; then
                echo >&2 "Failed to generate BTF for vmlinux"
                echo >&2 "Try to disable CONFIG_DEBUG_INFO_BTF"
@@ -265,7 +266,7 @@ fi
 vmlinux_link "${VMLINUX}"
 
 if is_enabled CONFIG_DEBUG_INFO_BTF; then
-       info OBJCOPY ${btfids_vmlinux}
+       info BTFIDS ${VMLINUX}
        ${RESOLVE_BTFIDS} --patch_btfids ${btfids_vmlinux} ${VMLINUX}
 fi