| Message ID | 20210526215228.3729875-1-javierm@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ff2e6efda0d5c51b33e2bcc0b0b981ac0a0ef214 |
| Delegated to: | BPF |
| Headers | show |
| Series | [v2] kbuild: quote OBJCOPY var to avoid a pahole call break the build | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, May 26, 2021 at 2:52 PM Javier Martinez Canillas <javierm@redhat.com> wrote: > > 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: 5f9ae91f7c0 ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it") I replaced 5f9ae91f7c0 with 5f9ae91f7c0d to have a recommended 12 characters hash. Applied to bpf tree, thanks. > Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> > Acked-by: Andrii Nakryiko <andrii@kernel.org> > Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> > --- > > Changes in v2: > - Add collected Acked-by tags. > - Also quote on a similar assignment in scripts/link-vmlinux.sh (masahiroy) > > scripts/Makefile.modfinal | 2 +- > scripts/link-vmlinux.sh | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal > index dd87cea9fba..a7883e45529 100644 > --- a/scripts/Makefile.modfinal > +++ b/scripts/Makefile.modfinal > @@ -59,7 +59,7 @@ quiet_cmd_ld_ko_o = LD [M] $@ > quiet_cmd_btf_ko = BTF [M] $@ > cmd_btf_ko = \ > if [ -f vmlinux ]; then \ > - LLVM_OBJCOPY=$(OBJCOPY) $(PAHOLE) -J --btf_base vmlinux $@; \ > + LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J --btf_base vmlinux $@; \ > else \ > printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \ > fi; > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > index f4de4c97015..0e0f6466b18 100755 > --- a/scripts/link-vmlinux.sh > +++ b/scripts/link-vmlinux.sh > @@ -240,7 +240,7 @@ gen_btf() > fi > > 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 > -- > 2.31.1 >
Hello: This patch was applied to bpf/bpf.git (refs/heads/master): On Wed, 26 May 2021 23:52:28 +0200 you wrote: > 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/ > > [...] Here is the summary with links: - [v2] kbuild: quote OBJCOPY var to avoid a pahole call break the build https://git.kernel.org/bpf/bpf/c/ff2e6efda0d5 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index dd87cea9fba..a7883e45529 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -59,7 +59,7 @@ quiet_cmd_ld_ko_o = LD [M] $@ quiet_cmd_btf_ko = BTF [M] $@ cmd_btf_ko = \ if [ -f vmlinux ]; then \ - LLVM_OBJCOPY=$(OBJCOPY) $(PAHOLE) -J --btf_base vmlinux $@; \ + LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J --btf_base vmlinux $@; \ else \ printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \ fi; diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index f4de4c97015..0e0f6466b18 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -240,7 +240,7 @@ gen_btf() fi 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
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: 5f9ae91f7c0 ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it") Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- Changes in v2: - Add collected Acked-by tags. - Also quote on a similar assignment in scripts/link-vmlinux.sh (masahiroy) scripts/Makefile.modfinal | 2 +- scripts/link-vmlinux.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)