Skip to contentSkip to conversation

kbuild: Fix compilation for latest pahole release

PATCH In review Jiri Olsa 6 participants 15 messages Oct 19, 2022 – Oct 26, 2022

Subsystems (2)
lore
Share & tools
lore
author reviewer
#6 lore raw

PATCH 4/5 kbuild: Unify options for BTF generation for vmlinux and modules

In reply to Jiri Olsa

From: Jiri Olsa <[email protected]>

commit 9741e07ece7c247dd65e1aa01e16b683f01c05a8 upstream.

[skipped --btf_gen_floats option in pahole-flags.sh, skipped Makefile.modfinal change, because there's no BTF kmod support, squashing in 'exit 0' change from merge commit fc02cb2b37fe]

Using new PAHOLE_FLAGS variable to pass extra arguments to pahole for both vmlinux and modules BTF data generation.

Adding new scripts/pahole-flags.sh script that detect and prints pahole options.

[ fixed issues found by kernel test robot ]

---
 Makefile                |  3 +++
 scripts/link-vmlinux.sh |  8 +-------
 scripts/pahole-flags.sh | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100755 scripts/pahole-flags.sh
Makefile +3 -0
index b824bdb0457c..fc8f1a1c0d98 100644
@@ -465,6 +465,8 @@ LZ4		= lz4c
 XZ		= xz
 ZSTD		= zstd
 
+PAHOLE_FLAGS	= $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh)
+
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
 		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
 NOSTDINC_FLAGS :=
@@ -518,6 +520,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
 export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
 export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
 export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
+export PAHOLE_FLAGS
 
 # Files to ignore in find ... statements
 
scripts/link-vmlinux.sh +1 -7
index bbb22be4c8f1..acd07a70a2f4 100755
@@ -146,7 +146,6 @@ vmlinux_link()
 gen_btf()
 {
 	local pahole_ver
-	local extra_paholeopt=
 
 	if ! [ -x "$(command -v ${PAHOLE})" ]; then
 		echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
@@ -161,13 +160,8 @@ gen_btf()
 
 	vmlinux_link ${1}
 
-	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"
-	fi
-
 	info "BTF" ${2}
-	LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1}
+	LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
 
 	# Create ${2} which contains just .BTF section but no symbols. Add
 	# SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
scripts/pahole-flags.sh new file +17 -0
new file mode 100755
index 000000000000..27445cb72974
@@ -0,0 +1,17 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+extra_paholeopt=
+
+if ! [ -x "$(command -v ${PAHOLE})" ]; then
+	exit 0
+fi
+
+pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
+
+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"
+fi
+
+echo ${extra_paholeopt}
Signature · 1 line
2.37.3
author reviewer
#5 lore raw

PATCH 3/5 kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21

In reply to Jiri Olsa

From: Andrii Nakryiko <[email protected]>

commit a0b8200d06ad6450c179407baa5f0f52f8cfcc97 upstream.

[small context changes due to missing floats support in 5.10]

Commit "mm/page_alloc: convert per-cpu list protection to local_lock" will introduce a zero-sized per-CPU variable, which causes pahole to generate invalid BTF. Only pahole versions 1.18 through 1.21 are impacted, as before 1.18 pahole doesn't know anything about per-CPU variables, and 1.22 contains the proper fix for the issue.

Luckily, pahole 1.18 got --skip_encoding_btf_vars option disabling BTF generation for per-CPU variables in anticipation of some unanticipated problems. So use this escape hatch to disable per-CPU var BTF info on those problematic pahole versions. Users relying on availability of per-CPU var BTFs would need to upgrade to pahole 1.22+, but everyone won't notice any regressions.

---
 scripts/link-vmlinux.sh | 5 +++++
 1 file changed, 5 insertions(+)
scripts/link-vmlinux.sh +5 -0
index 72bf14df6903..bbb22be4c8f1 100755
@@ -161,6 +161,11 @@ gen_btf()
 
 	vmlinux_link ${1}
 
+	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"
+	fi
+
 	info "BTF" ${2}
 	LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1}
 
Signature · 1 line
2.37.3
author reviewer
#2 lore raw

PATCH 2/5 kbuild: Quote OBJCOPY var to avoid a pahole call break the build

In reply to Jiri Olsa

From: Javier Martinez Canillas <[email protected]>

commit ff2e6efda0d5c51b33e2bcc0b0b981ac0a0ef214 upstream.

[backported for dependency, skipped Makefile.modfinal change, because module BTF is not supported in 5.10]

The ccache tool can be used to speed up cross-compilation, by calling the compiler and binutils through ccache. For example, following should work:

    $ export ARCH=arm64 CROSS_COMPILE="ccache aarch64-linux-gnu-"
    $ make M=drivers/gpu/drm/rockchip/

but pahole fails to extract the BTF info from DWARF, breaking the build:

CC [M] drivers/gpu/drm/rockchip//rockchipdrm.mod.o LD [M] drivers/gpu/drm/rockchip//rockchipdrm.ko BTF [M] drivers/gpu/drm/rockchip//rockchipdrm.ko
aarch64-linux-gnu-objcopy: invalid option -- 'J'
Usage: aarch64-linux-gnu-objcopy [option(s)] in-file [out-file]
Copies a binary file, possibly transforming it in the process
...
make[1]: *** [scripts/Makefile.modpost:156: __modpost] Error 2
make: *** [Makefile:1866: modules] Error 2

this fails because OBJCOPY is set to "ccache aarch64-linux-gnu-copy" and later pahole is executed with the following command line:

    LLVM_OBJCOPY=$(OBJCOPY) $(PAHOLE) -J --btf_base vmlinux $@

which gets expanded to:

LLVM_OBJCOPY=ccache aarch64-linux-gnu-objcopy pahole -J ...

instead of:

LLVM_OBJCOPY="ccache aarch64-linux-gnu-objcopy" pahole -J ...

Fixes 5f9ae91f7c0d ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it")
---
 scripts/link-vmlinux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/link-vmlinux.sh +1 -1
index cdfccbfed452..72bf14df6903 100755
@@ -162,7 +162,7 @@ gen_btf()
 	vmlinux_link ${1}
 
 	info "BTF" ${2}
-	LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${extra_paholeopt} ${1}
+	LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1}
 
 	# Create ${2} which contains just .BTF section but no symbols. Add
 	# SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
Signature · 1 line
2.37.3
maintainer
#3 lore raw

Re: [PATCH stable 5.10 2/5] kbuild: Quote OBJCOPY var to avoid a pahole call break the build

Quoted 3 lines · Jiri Olsa

From: Javier Martinez Canillas <[email protected]>

commit ff2e6efda0d5c51b33e2bcc0b0b981ac0a0ef214 upstream.

I only see patches 2, 3, and 4 of this series, same with lore.kernel.org:

	https://lore.kernel.org/all/[email protected]/

Are the remaining ones somewhere else?

thanks,

greg k-h

#4 lore raw

Re: [PATCH stable 5.10 2/5] kbuild: Quote OBJCOPY var to avoid a pahole call break the build

Quoted 10 lines · Greg KH
Quoted 3 lines · Jiri Olsa

From: Javier Martinez Canillas <[email protected]>

commit ff2e6efda0d5c51b33e2bcc0b0b981ac0a0ef214 upstream.

I only see patches 2, 3, and 4 of this series, same with lore.kernel.org:

	https://lore.kernel.org/all/[email protected]/

Are the remaining ones somewhere else?

hum, the 'git send-email' log says it was sent to [email protected] (plus other emails) all with no problem.. maybe some mailing list hiccup? I'd give it some time

jirka

Quoted 4 lines

thanks,

greg k-h

author reviewer
#7 lore raw

PATCH 5/5 kbuild: Add skip_encoding_btf_enum64 option to pahole

In reply to Jiri Olsa

From: Martin Rodriguez Reboredo <[email protected]>

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.

---
 scripts/pahole-flags.sh | 4 ++++
 1 file changed, 4 insertions(+)
scripts/pahole-flags.sh +4 -0
index 27445cb72974..8c82173e42e5 100755
@@ -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}
Signature · 1 line
2.37.3

Jiri Olsa

author reviewer
#0 lore raw

cover kbuild: Fix compilation for latest pahole release

hi,
new version of pahole (1.24) is causing compilation fail for 5.10 stable kernel, discussed in here [1][2]. Sending fix for that plus dependency patches.

thanks,
jirka

[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://lore.kernel.org/bpf/YwQRKkmWqsf%[email protected]/
---
Andrii Nakryiko (1):
kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21

Ilya Leoshkevich (1):
bpf: Generate BTF_KIND_FLOAT when linking vmlinux

Javier Martinez Canillas (1):
kbuild: Quote OBJCOPY var to avoid a pahole call break the build

Jiri Olsa (1):
kbuild: Unify options for BTF generation for vmlinux and modules

Martin Rodriguez Reboredo (1):
kbuild: Add skip_encoding_btf_enum64 option to pahole

 Makefile                |  3 +++
 scripts/link-vmlinux.sh |  2 +-
 scripts/pahole-flags.sh | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100755 scripts/pahole-flags.sh
author reviewer
#1 lore raw

PATCH 1/5 bpf: Generate BTF_KIND_FLOAT when linking vmlinux

From: Ilya Leoshkevich <[email protected]>

commit db16c1fe92d7ba7d39061faef897842baee2c887 upstream.

[backported for dependency only extra_paholeopt variable setup and usage, we don't want floats generated in 5.10]

pahole v1.21 supports the --btf_gen_floats flag, which makes it generate the information about the floating-point types [1].

Adjust link-vmlinux.sh to pass this flag to pahole in case it's supported, which is determined using a simple version check.

[1] https://lore.kernel.org/dwarves/[email protected]/

---
 scripts/link-vmlinux.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/link-vmlinux.sh +2 -1
index d0b44bee9286..cdfccbfed452 100755
@@ -146,6 +146,7 @@ vmlinux_link()
 gen_btf()
 {
 	local pahole_ver
+	local extra_paholeopt=
 
 	if ! [ -x "$(command -v ${PAHOLE})" ]; then
 		echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
@@ -161,7 +162,7 @@ gen_btf()
 	vmlinux_link ${1}
 
 	info "BTF" ${2}
-	LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
+	LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${extra_paholeopt} ${1}
 
 	# Create ${2} which contains just .BTF section but no symbols. Add
 	# SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
Signature · 1 line
2.37.3
#12 lore raw
In reply to Jiri Olsa
Quoted 24 lines · Jiri Olsa

hi,
new version of pahole (1.24) is causing compilation fail for 5.10 stable kernel, discussed in here [1][2]. Sending fix for that plus dependency patches.

thanks,
jirka

[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://lore.kernel.org/bpf/YwQRKkmWqsf%[email protected]/
---
Andrii Nakryiko (1):
kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21

Ilya Leoshkevich (1):
bpf: Generate BTF_KIND_FLOAT when linking vmlinux

Javier Martinez Canillas (1):
kbuild: Quote OBJCOPY var to avoid a pahole call break the build

Jiri Olsa (1):
kbuild: Unify options for BTF generation for vmlinux and modules

Quoted 8 lines

Martin Rodriguez Reboredo (1):
kbuild: Add skip_encoding_btf_enum64 option to pahole

 Makefile                |  3 +++
 scripts/link-vmlinux.sh |  2 +-
 scripts/pahole-flags.sh | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100755 scripts/pahole-flags.sh

Ah, all showed up now. I'll look at these tomorrow, thanks!

greg k-h

#13 lore raw
Quoted 28 lines · Greg KH
Quoted 27 lines · Jiri Olsa

hi,
new version of pahole (1.24) is causing compilation fail for 5.10 stable kernel, discussed in here [1][2]. Sending fix for that plus dependency patches.

thanks,
jirka

[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://lore.kernel.org/bpf/YwQRKkmWqsf%[email protected]/
---
Andrii Nakryiko (1):
kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21

Ilya Leoshkevich (1):
bpf: Generate BTF_KIND_FLOAT when linking vmlinux

Javier Martinez Canillas (1):
kbuild: Quote OBJCOPY var to avoid a pahole call break the build

Jiri Olsa (1):
kbuild: Unify options for BTF generation for vmlinux and modules

Martin Rodriguez Reboredo (1):
kbuild: Add skip_encoding_btf_enum64 option to pahole

Quoted 7 lines
Quoted 5 lines
 Makefile                |  3 +++
 scripts/link-vmlinux.sh |  2 +-
 scripts/pahole-flags.sh | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100755 scripts/pahole-flags.sh

Ah, all showed up now. I'll look at these tomorrow, thanks!

great, thanks

jirka

#8 lore raw

Re: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

In reply to Jiri Olsa
FYI: kernel test robot notices the stable kernel rule is not satisfied.

Hi,

Thanks for your patch.

FYI: kernel test robot notices the stable kernel rule is not satisfied.

Rule: 'Cc: [email protected]' or 'commit <sha1> upstream.'
Subject: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
#9 lore raw

Re: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

Quoted 10 lines · kernel test robot

Hi,

Thanks for your patch.

FYI: kernel test robot notices the stable kernel rule is not satisfied.

Rule: 'Cc: stable(a)vger.kernel.org' or 'commit <sha1> upstream.'
Subject: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

Uh, this should be fine though, right? The stable list was the primary recipient and all show up for me in my stable folder.

-srw

#10 lore raw

Re: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

Quoted 6 lines · Slade Watkins
Quoted 5 lines · kernel test robot

Hi,

Thanks for your patch.

Quoted 8 lines
Quoted 5 lines

FYI: kernel test robot notices the stable kernel rule is not satisfied.

Rule: 'Cc: [email protected]' or 'commit <sha1> upstream.'
Subject: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

Uh, this should be fine though, right? The stable list was the primary recipient and all show up for me in my stable folder.

Yes, this is fine, this bot is not that smart at times.

#11 lore raw

Re: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

Quoted 8 lines · Greg KH
Quoted 7 lines · Slade Watkins
Quoted 6 lines · kernel test robot

Hi,

Thanks for your patch.

FYI: kernel test robot notices the stable kernel rule is not satisfied.

the patch 5/5 does not have equivalent commit in linus tree, so I wonder the warning is because of that

jirka

Quoted 9 lines
Quoted 7 lines
Quoted 4 lines

Rule: 'Cc: stable(a)vger.kernel.org' or 'commit <sha1> upstream.'
Subject: [PATCH stable 5.10 5/5] kbuild: Add skip_encoding_btf_enum64 option to pahole

Uh, this should be fine though, right? The stable list was the primary recipient and all show up for me in my stable folder.

Yes, this is fine, this bot is not that smart at times.

maintainer
#14 lore raw
In reply to Jiri Olsa
Quoted 24 lines · Jiri Olsa

hi,
new version of pahole (1.24) is causing compilation fail for 5.10 stable kernel, discussed in here [1][2]. Sending fix for that plus dependency patches.

thanks,
jirka

[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://lore.kernel.org/bpf/YwQRKkmWqsf%[email protected]/
---
Andrii Nakryiko (1):
kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21

Ilya Leoshkevich (1):
bpf: Generate BTF_KIND_FLOAT when linking vmlinux

Javier Martinez Canillas (1):
kbuild: Quote OBJCOPY var to avoid a pahole call break the build

Jiri Olsa (1):
kbuild: Unify options for BTF generation for vmlinux and modules

Quoted 8 lines

Martin Rodriguez Reboredo (1):
kbuild: Add skip_encoding_btf_enum64 option to pahole

 Makefile                |  3 +++
 scripts/link-vmlinux.sh |  2 +-
 scripts/pahole-flags.sh | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100755 scripts/pahole-flags.sh

Now queued up, thanks.

greg k-h