mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 08:28:13 +00:00
87ee33bfdd
The script test_bpftool_build.sh attempts to build bpftool in the various supported ways, to make sure nothing breaks. One of those ways is to run "make tools/bpf" from the root of the kernel repository. This command builds bpftool, along with the other tools under tools/bpf, and runqslower in particular. After running the command and upon a successful bpftool build, the script attempts to cleanup the generated objects. However, after building with this target and in the case of runqslower, the files are not cleaned up as expected. This is because the "tools/bpf" target sets $(OUTPUT) to .../tools/bpf/runqslower/ when building the tool, causing the object files to be placed directly under the runqslower directory. But when running "cd tools/bpf; make clean", the value for $(OUTPUT) is set to ".output" (relative to the runqslower directory) by runqslower's Makefile, and this is where the Makefile looks for files to clean up. We cannot easily fix in the root Makefile (where "tools/bpf" is defined) or in tools/scripts/Makefile.include (setting $(OUTPUT)), where changing the way the output variables are passed would likely have consequences elsewhere. We could change runqslower's Makefile to build in the repository instead of in a dedicated ".output/", but doing so just to accommodate a test script doesn't sound great. Instead, let's just make sure that we clean up runqslower properly by adding the correct command to the script. This will attempt to clean runqslower twice: the first try with command "cd tools/bpf; make clean" will search for tools/bpf/runqslower/.output and fail to clean it (but will still clean the other tools, in particular bpftool), the second one (added in this commit) sets the $(OUTPUT) variable like for building with the "tool/bpf" target and should succeed. Signed-off-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20211007194438.34443-12-quentin@isovalent.com
151 lines
3.9 KiB
Bash
Executable file
151 lines
3.9 KiB
Bash
Executable file
#!/bin/bash
|
|
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
|
|
|
case $1 in
|
|
-h|--help)
|
|
echo -e "$0 [-j <n>]"
|
|
echo -e "\tTest the different ways of building bpftool."
|
|
echo -e ""
|
|
echo -e "\tOptions:"
|
|
echo -e "\t\t-j <n>:\tPass -j flag to 'make'."
|
|
exit 0
|
|
;;
|
|
esac
|
|
|
|
J=$*
|
|
|
|
# Assume script is located under tools/testing/selftests/bpf/. We want to start
|
|
# build attempts from the top of kernel repository.
|
|
SCRIPT_REL_PATH=$(realpath --relative-to=$PWD $0)
|
|
SCRIPT_REL_DIR=$(dirname $SCRIPT_REL_PATH)
|
|
KDIR_ROOT_DIR=$(realpath $PWD/$SCRIPT_REL_DIR/../../../../)
|
|
cd $KDIR_ROOT_DIR
|
|
if [ ! -e tools/bpf/bpftool/Makefile ]; then
|
|
echo -e "skip: bpftool files not found!\n"
|
|
exit 4 # KSFT_SKIP=4
|
|
fi
|
|
|
|
ERROR=0
|
|
TMPDIR=
|
|
|
|
# If one build fails, continue but return non-0 on exit.
|
|
return_value() {
|
|
if [ -d "$TMPDIR" ] ; then
|
|
rm -rf -- $TMPDIR
|
|
fi
|
|
exit $ERROR
|
|
}
|
|
trap return_value EXIT
|
|
|
|
check() {
|
|
local dir=$(realpath $1)
|
|
|
|
echo -n "binary: "
|
|
# Returns non-null if file is found (and "false" is run)
|
|
find $dir -type f -executable -name bpftool -print -exec false {} + && \
|
|
ERROR=1 && printf "FAILURE: Did not find bpftool\n"
|
|
}
|
|
|
|
make_and_clean() {
|
|
echo -e "\$PWD: $PWD"
|
|
echo -e "command: make -s $* >/dev/null"
|
|
make $J -s $* >/dev/null
|
|
if [ $? -ne 0 ] ; then
|
|
ERROR=1
|
|
fi
|
|
if [ $# -ge 1 ] ; then
|
|
check ${@: -1}
|
|
else
|
|
check .
|
|
fi
|
|
(
|
|
if [ $# -ge 1 ] ; then
|
|
cd ${@: -1}
|
|
fi
|
|
make -s clean
|
|
)
|
|
echo
|
|
}
|
|
|
|
make_with_tmpdir() {
|
|
local ARGS
|
|
|
|
TMPDIR=$(mktemp -d)
|
|
if [ $# -ge 2 ] ; then
|
|
ARGS=${@:1:(($# - 1))}
|
|
fi
|
|
echo -e "\$PWD: $PWD"
|
|
echo -e "command: make -s $ARGS ${@: -1}=$TMPDIR/ >/dev/null"
|
|
make $J -s $ARGS ${@: -1}=$TMPDIR/ >/dev/null
|
|
if [ $? -ne 0 ] ; then
|
|
ERROR=1
|
|
fi
|
|
check $TMPDIR
|
|
rm -rf -- $TMPDIR
|
|
echo
|
|
}
|
|
|
|
echo "Trying to build bpftool"
|
|
echo -e "... through kbuild\n"
|
|
|
|
if [ -f ".config" ] ; then
|
|
make_and_clean tools/bpf
|
|
## "make tools/bpf" sets $(OUTPUT) to ...tools/bpf/runqslower for
|
|
## runqslower, but the default (used for the "clean" target) is .output.
|
|
## Let's make sure we clean runqslower's directory properly.
|
|
make -C tools/bpf/runqslower OUTPUT=${KDIR_ROOT_DIR}/tools/bpf/runqslower/ clean
|
|
|
|
## $OUTPUT is overwritten in kbuild Makefile, and thus cannot be passed
|
|
## down from toplevel Makefile to bpftool's Makefile.
|
|
|
|
# make_with_tmpdir tools/bpf OUTPUT
|
|
echo -e "skip: make tools/bpf OUTPUT=<dir> (not supported)\n"
|
|
|
|
make_with_tmpdir tools/bpf O
|
|
else
|
|
echo -e "skip: make tools/bpf (no .config found)\n"
|
|
echo -e "skip: make tools/bpf OUTPUT=<dir> (not supported)\n"
|
|
echo -e "skip: make tools/bpf O=<dir> (no .config found)\n"
|
|
fi
|
|
|
|
echo -e "... from kernel source tree\n"
|
|
|
|
make_and_clean -C tools/bpf/bpftool
|
|
|
|
make_with_tmpdir -C tools/bpf/bpftool OUTPUT
|
|
|
|
make_with_tmpdir -C tools/bpf/bpftool O
|
|
|
|
echo -e "... from tools/\n"
|
|
cd tools/
|
|
|
|
make_and_clean bpf
|
|
|
|
## In tools/bpf/Makefile, function "descend" is called and passes $(O) and
|
|
## $(OUTPUT). We would like $(OUTPUT) to have "bpf/bpftool/" appended before
|
|
## calling bpftool's Makefile, but this is not the case as the "descend"
|
|
## function focuses on $(O)/$(subdir). However, in the present case, updating
|
|
## $(O) to have $(OUTPUT) recomputed from it in bpftool's Makefile does not
|
|
## work, because $(O) is not defined from command line and $(OUTPUT) is not
|
|
## updated in tools/scripts/Makefile.include.
|
|
##
|
|
## Workarounds would require to a) edit "descend" or use an alternative way to
|
|
## call bpftool's Makefile, b) modify the conditions to update $(OUTPUT) and
|
|
## other variables in tools/scripts/Makefile.include (at the risk of breaking
|
|
## the build of other tools), or c) append manually the "bpf/bpftool" suffix to
|
|
## $(OUTPUT) in bpf's Makefile, which may break if targets for other directories
|
|
## use "descend" in the future.
|
|
|
|
# make_with_tmpdir bpf OUTPUT
|
|
echo -e "skip: make bpf OUTPUT=<dir> (not supported)\n"
|
|
|
|
make_with_tmpdir bpf O
|
|
|
|
echo -e "... from bpftool's dir\n"
|
|
cd bpf/bpftool
|
|
|
|
make_and_clean
|
|
|
|
make_with_tmpdir OUTPUT
|
|
|
|
make_with_tmpdir O
|