bpf: Add config for skipping BTF enum64s
Subsystems (2)
PATCH 1/1 bpf: Add config for skipping BTF enum64s
From: Martin Rodriguez Reboredo <[email protected]>
After the release of pahole 1.24 some people in the dwarves mailing list notified issues related to building the kernel with the BTF_DEBUG_INFO option toggled. They seem to be happenning due to the kernel and resolve_btfids interpreting btf types erroneously. In the dwarves list I've proposed a change to the scripts that I've written while testing the Rust kernel, it simply passes the --skip_encoding_btf_enum64 to pahole if it has version 1.24, but it might be desirable to have the option to pass said flag.
--- lib/Kconfig.debug | 14 ++++++++++++++ scripts/pahole-flags.sh | 7 +++++++ 2 files changed, 21 insertions(+)
lib/Kconfig.debug +14 -0
@@ -356,6 +356,20 @@ config PAHOLE_HAS_BTF_TAG btf_decl_tag) or not. Currently only clang compiler implements these attributes, so make the config depend on CC_IS_CLANG. +config PAHOLE_HAS_SKIP_ENCODING_BTF_ENUM64 + def_bool PAHOLE_VERSION >= 124 + help + Encoding BTF enum64s can be skipped with the + --skip_encoding_btf_enum64 pahole option. + +config DEBUG_INFO_BTF_SKIP_ENCODING_ENUM64 + def_bool n + depends on DEBUG_INFO_BTF && PAHOLE_HAS_SKIP_ENCODING_BTF_ENUM64 + help + Omit the encoding of 64 bits enum values with pahole. With certain + kernel configurations having ENUM64s enabled may result in malformed + output binaries. + config DEBUG_INFO_BTF_MODULES def_bool y depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
scripts/pahole-flags.sh +7 -0
@@ -9,6 +9,10 @@ fi pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE}) +is_enabled() { + grep -q "^$1=y" include/config/auto.conf +} + if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
@@ -19,5 +23,8 @@ fi if [ "${pahole_ver}" -ge "122" ]; then extra_paholeopt="${extra_paholeopt} -j" fi +if is_enabled DEBUG_INFO_BTF_SKIP_ENCODING_ENUM64; then + extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" +fi echo ${extra_paholeopt}
Signature · 1 line
2.37.2
Quoted 10 lines · Martin Reboredo
From: Martin Rodriguez Reboredo <[email protected]>
After the release of pahole 1.24 some people in the dwarves mailing list notified issues related to building the kernel with the
BTF_DEBUG_INFOoption toggled. They seem to be happenning due to the kernel andresolve_btfidsinterpreting btf types erroneously. In the dwarves list I've proposed a change to the scripts that I've written while testing the Rust kernel, it simply passes the --skip_encoding_btf_enum64 to pahole if it has version 1.24, but it might be desirable to have the option to pass said flag.
as I wrote in the original thread, I think we need to do this just for stable kernels that don't have enum64 support and use pahole 1.24
I think we should switch it off there by default without config option
jirka
Quoted 59 lines
Signed-off-by Martin Rodriguez Reboredo <[email protected]>--- lib/Kconfig.debug | 14 ++++++++++++++ scripts/pahole-flags.sh | 7 +++++++ 2 files changed, 21 insertions(+)lib/Kconfig.debug +14
-0@@ -356,6 +356,20 @@ config PAHOLE_HAS_BTF_TAG btf_decl_tag) or not. Currently only clang compiler implements these attributes, so make the config depend on CC_IS_CLANG. +config PAHOLE_HAS_SKIP_ENCODING_BTF_ENUM64 + def_bool PAHOLE_VERSION >= 124 + help + Encoding BTF enum64s can be skipped with the + --skip_encoding_btf_enum64 pahole option. + +config DEBUG_INFO_BTF_SKIP_ENCODING_ENUM64 + def_bool n + depends on DEBUG_INFO_BTF && PAHOLE_HAS_SKIP_ENCODING_BTF_ENUM64 + help + Omit the encoding of 64 bits enum values with pahole. With certain + kernel configurations having ENUM64s enabled may result in malformed + output binaries. + config DEBUG_INFO_BTF_MODULES def_bool y depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTFscripts/pahole-flags.sh +7
-0@@ -9,6 +9,10 @@ fi pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE}) +is_enabled() { + grep -q "^$1=y" include/config/auto.conf +} + if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"@@ -19,5 +23,8 @@ fi if [ "${pahole_ver}" -ge "122" ]; then extra_paholeopt="${extra_paholeopt} -j" fi +if is_enabled DEBUG_INFO_BTF_SKIP_ENCODING_ENUM64; then + extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" +fi echo ${extra_paholeopt}Signature · 1 line
2.37.2
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Martin,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Martin-Reboredo/bpf-Add-config-for-skipping-BTF-enum64s/20220829-005156 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master config: csky-randconfig-r005-20220828 (https://download.01.org/0day-ci/archive/20220829/[email protected]/config) compiler: csky-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/f3a761ad9050394b31ca80192708bea109c5e536
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Martin-Reboredo/bpf-Add-config-for-skipping-BTF-enum64s/20220829-005156 git checkout f3a761ad9050394b31ca80192708bea109c5e536
# save the config file
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 ARCH=csky
If you fix the issue, kindly add following tag where applicable
All errors (new ones prefixed by >>):
>> grep: include/config/auto.conf: No such file or directory >> grep: include/config/auto.conf: No such file or directory >> grep: include/config/auto.conf: No such file or directory
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp