Commit 9119ff95 authored by Jiri Olsa's avatar Jiri Olsa Committed by Lipeng Sang
Browse files

kbuild: Unify options for BTF generation for vmlinux and modules 

stable inclusion
from stable-v5.10.151
commit c5006abb80e276896ff7237300a6d447708c7924
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=c5006abb80e276896ff7237300a6d447708c7924



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

commit 9741e07e 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 fc02cb2b]

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 ]

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211029125729.70002-1-jolsa@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLipeng Sang <sanglipeng1@jd.com>
parent 40a0d0a9

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -467,6 +467,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 :=
@@ -520,6 +522,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
Original line number Diff line number Diff line
@@ -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

0 → 100755
+17 −0
Original line number Diff line number Diff line 
#!/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}