Commit d7de1c44 authored by Martin Rodriguez Reboredo's avatar Martin Rodriguez Reboredo Committed by Lipeng Sang
Browse files

kbuild: Add skip_encoding_btf_enum64 option to pahole 

stable inclusion
from stable-v5.10.151
commit ecad3312111798d84dac1ce6a853e0ac9de8d505
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64L0X

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ecad3312111798d84dac1ce6a853e0ac9de8d505



--------------------------------

New pahole (version 1.24) generates by default new BTF_KIND_ENUM64 BTF tag,
which is not supported by stable kernel.

As a result the kernel with CONFIG_DEBUG_INFO_BTF option will fail to
compile with following error:

  BTFIDS  vmlinux
FAILED: load BTF from vmlinux: Invalid argument

New pahole provides --skip_encoding_btf_enum64 option to skip BTF_KIND_ENUM64
generation and produce BTF supported by stable kernel.

Adding this option to scripts/pahole-flags.sh.

This change does not have equivalent commit in linus tree, because linus tree
has support for BTF_KIND_ENUM64 tag, so it does not need to be disabled.

Signed-off-by: default avatarMartin Rodriguez Reboredo <yakoyoku@gmail.com>
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLipeng Sang <sanglipeng1@jd.com>
parent 9119ff95

scripts/pahole-flags.sh

+4 −0
Original line number Diff line number Diff line
@@ -14,4 +14,8 @@ if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then 
	extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"

fi



if [ "${pahole_ver}" -ge "124" ]; then

	extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"

fi



echo ${extra_paholeopt}