Skip to content

Commit df786c9

Browse files
fomichevborkmann
authored andcommitted
bpf: Force .BTF section start to zero when dumping from vmlinux
While trying to figure out why fentry_fexit selftest doesn't pass for me (old pahole, broken BTF), I found out that my latest patch can break vmlinux .BTF generation. objcopy preserves section start when doing --only-section, so there is a chance (depending on where pahole inserts .BTF section) to have leading empty zeroes. Let's explicitly force section offset to zero. Before: $ objcopy --set-section-flags .BTF=alloc -O binary \ --only-section=.BTF vmlinux .btf.vmlinux.bin $ xxd .btf.vmlinux.bin | head -n1 00000000: 0000 0000 0000 0000 0000 0000 0000 0000 ................ After: $ objcopy --change-section-address .BTF=0 \ --set-section-flags .BTF=alloc -O binary \ --only-section=.BTF vmlinux .btf.vmlinux.bin $ xxd .btf.vmlinux.bin | head -n1 00000000: 9feb 0100 1800 0000 0000 0000 80e1 1c00 ................ ^BTF magic As part of this change, I'm also dropping '2>/dev/null' from objcopy invocation to be able to catch possible other issues (objcopy doesn't produce any warnings for me anymore, it did before with --dump-section). Fixes: da5fb18 ("bpf: Support pre-2.25-binutils objcopy for vmlinux BTF") Signed-off-by: Stanislav Fomichev <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Acked-by: John Fastabend <[email protected]> Cc: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent ce27709 commit df786c9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

scripts/link-vmlinux.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ gen_btf()
127127
cut -d, -f1 | cut -d' ' -f2)
128128
bin_format=$(LANG=C ${OBJDUMP} -f ${1} | grep 'file format' | \
129129
awk '{print $4}')
130-
${OBJCOPY} --set-section-flags .BTF=alloc -O binary \
131-
--only-section=.BTF ${1} .btf.vmlinux.bin 2>/dev/null
130+
${OBJCOPY} --change-section-address .BTF=0 \
131+
--set-section-flags .BTF=alloc -O binary \
132+
--only-section=.BTF ${1} .btf.vmlinux.bin
132133
${OBJCOPY} -I binary -O ${bin_format} -B ${bin_arch} \
133134
--rename-section .data=.BTF .btf.vmlinux.bin ${2}
134135
}

0 commit comments

Comments
 (0)