Skip to contentSkip to conversation

btf: do not use CONFIG_OUTPUT_FORMAT

PATCH In review Ilya Leoshkevich 2 participants 2 messages Aug 20, 2019 – Aug 21, 2019

Subsystems (2)
Kbuild BPF
lore
Share & tools
lore

Ilya Leoshkevich

author
#0 lore raw

PATCH 1/1 btf: do not use CONFIG_OUTPUT_FORMAT

Building s390 kernel with CONFIG_DEBUG_INFO_BTF fails, because CONFIG_OUTPUT_FORMAT is not defined. As a matter of fact, this variable appears to be x86-only, so other arches might be affected as well.

Fix by obtaining this value from objdump output, just like it's already done for bin_arch. The exact objdump invocation is "inspired" by arch/powerpc/boot/wrapper.

Also, use LANG=C for the existing bin_arch objdump invocation to avoid potential build issues on systems with non-English locale.

Fixes 341dfcf8d78e ("btf: expose BTF info through sysfs")
Signed-off-by Ilya Leoshkevich <[email protected]>
---
 scripts/link-vmlinux.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/link-vmlinux.sh +4 -2
index c31193340108..0d8f41db8cd6 100755
@@ -115,10 +115,12 @@ gen_btf()
 	LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
 
 	# dump .BTF section into raw binary file to link with final vmlinux
-	bin_arch=$(${OBJDUMP} -f ${1} | grep architecture | \
+	bin_arch=$(LANG=C ${OBJDUMP} -f ${1} | grep architecture | \
 		cut -d, -f1 | cut -d' ' -f2)
+	bin_format=$(LANG=C ${OBJDUMP} -f ${1} | grep 'file format' | \
+		awk '{print $4}')
 	${OBJCOPY} --dump-section .BTF=.btf.vmlinux.bin ${1} 2>/dev/null
-	${OBJCOPY} -I binary -O ${CONFIG_OUTPUT_FORMAT} -B ${bin_arch} \
+	${OBJCOPY} -I binary -O ${bin_format} -B ${bin_arch} \
 		--rename-section .data=.BTF .btf.vmlinux.bin ${2}
 }
Signature · 1 line
2.21.0
maintainer
#1 lore raw
Quoted 8 lines · Ilya Leoshkevich

Building s390 kernel with CONFIG_DEBUG_INFO_BTF fails, because CONFIG_OUTPUT_FORMAT is not defined. As a matter of fact, this variable appears to be x86-only, so other arches might be affected as well.

Fix by obtaining this value from objdump output, just like it's already done for bin_arch. The exact objdump invocation is "inspired" by arch/powerpc/boot/wrapper.

Quoted 5 lines

Also, use LANG=C for the existing bin_arch objdump invocation to avoid potential build issues on systems with non-English locale.

Fixes 341dfcf8d78e ("btf: expose BTF info through sysfs")
Signed-off-by Ilya Leoshkevich <[email protected]>

LGTM, applied, thanks!