2019-11-15 11:04:51 -08:00
|
|
|
#!/bin/bash
|
|
|
|
|
|
|
|
|
|
set -uo pipefail
|
|
|
|
|
trap 'exit 2' ERR
|
|
|
|
|
|
2020-08-21 19:06:43 -07:00
|
|
|
source $(cd $(dirname $0) && pwd)/helpers.sh
|
|
|
|
|
|
2019-11-15 11:04:51 -08:00
|
|
|
usage () {
|
|
|
|
|
USAGE_STRING="usage: $0 [-k KERNELRELEASE|-b DIR] [[-r ROOTFSVERSION] [-fo]|-I] [-Si] [-d DIR] IMG
|
|
|
|
|
$0 [-k KERNELRELEASE] -l
|
|
|
|
|
$0 -h
|
|
|
|
|
|
|
|
|
|
Run "${PROJECT_NAME}" tests in a virtual machine.
|
|
|
|
|
|
|
|
|
|
This exits with status 0 on success, 1 if the virtual machine ran successfully
|
|
|
|
|
but tests failed, and 2 if we encountered a fatal error.
|
|
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
This script uses sudo to work around a libguestfs bug.
|
2019-11-15 11:04:51 -08:00
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
|
IMG path of virtual machine disk image to create
|
|
|
|
|
|
|
|
|
|
Versions:
|
|
|
|
|
-k, --kernel=KERNELRELEASE
|
|
|
|
|
kernel release to test. This is a glob pattern; the
|
|
|
|
|
newest (sorted by version number) release that matches
|
|
|
|
|
the pattern is used (default: newest available release)
|
|
|
|
|
|
|
|
|
|
-b, --build DIR use the kernel built in the given directory. This option
|
|
|
|
|
cannot be combined with -k
|
|
|
|
|
|
|
|
|
|
-r, --rootfs=ROOTFSVERSION
|
|
|
|
|
version of root filesystem to use (default: newest
|
|
|
|
|
available version)
|
|
|
|
|
|
|
|
|
|
Setup:
|
|
|
|
|
-f, --force overwrite IMG if it already exists
|
|
|
|
|
|
|
|
|
|
-o, --one-shot one-shot mode. By default, this script saves a clean copy
|
|
|
|
|
of the downloaded root filesystem image and vmlinux and
|
|
|
|
|
makes a copy (reflinked, when possible) for executing the
|
|
|
|
|
virtual machine. This allows subsequent runs to skip
|
|
|
|
|
downloading these files. If this option is given, the
|
|
|
|
|
root filesystem image and vmlinux are always
|
|
|
|
|
re-downloaded and are not saved. This option implies -f
|
|
|
|
|
|
|
|
|
|
-s, --setup-cmd setup commands run on VM boot. Whitespace characters
|
|
|
|
|
should be escaped with preceding '\'.
|
|
|
|
|
|
|
|
|
|
-I, --skip-image skip creating the disk image; use the existing one at
|
|
|
|
|
IMG. This option cannot be combined with -r, -f, or -o
|
|
|
|
|
|
|
|
|
|
-S, --skip-source skip copying the source files and init scripts
|
|
|
|
|
|
|
|
|
|
Miscellaneous:
|
|
|
|
|
-i, --interactive interactive mode. Boot the virtual machine into an
|
|
|
|
|
interactive shell instead of automatically running tests
|
|
|
|
|
|
|
|
|
|
-d, --dir=DIR working directory to use for downloading and caching
|
|
|
|
|
files (default: current working directory)
|
|
|
|
|
|
|
|
|
|
-l, --list list available kernel releases instead of running tests.
|
|
|
|
|
The list may be filtered with -k
|
|
|
|
|
|
|
|
|
|
-h, --help display this help message and exit"
|
|
|
|
|
|
|
|
|
|
case "$1" in
|
|
|
|
|
out)
|
|
|
|
|
echo "$USAGE_STRING"
|
|
|
|
|
exit 0
|
|
|
|
|
;;
|
|
|
|
|
err)
|
|
|
|
|
echo "$USAGE_STRING" >&2
|
|
|
|
|
exit 2
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEMP=$(getopt -o 'k:b:r:fos:ISid:lh' --long 'kernel:,build:,rootfs:,force,one-shot,setup-cmd,skip-image,skip-source:,interactive,dir:,list,help' -n "$0" -- "$@")
|
|
|
|
|
eval set -- "$TEMP"
|
|
|
|
|
unset TEMP
|
|
|
|
|
|
|
|
|
|
unset KERNELRELEASE
|
|
|
|
|
unset BUILDDIR
|
|
|
|
|
unset ROOTFSVERSION
|
|
|
|
|
unset IMG
|
|
|
|
|
unset SETUPCMD
|
|
|
|
|
FORCE=0
|
|
|
|
|
ONESHOT=0
|
|
|
|
|
SKIPIMG=0
|
|
|
|
|
SKIPSOURCE=0
|
|
|
|
|
APPEND=""
|
|
|
|
|
DIR="$PWD"
|
|
|
|
|
LIST=0
|
2021-08-10 19:20:58 -07:00
|
|
|
|
|
|
|
|
# by default will copy all files that aren't listed in git exclusions
|
|
|
|
|
# but it doesn't work for entire kernel tree very well
|
|
|
|
|
# so for full kernel tree you may need to SOURCE_FULLCOPY=0
|
|
|
|
|
SOURCE_FULLCOPY=${SOURCE_FULLCOPY:-1}
|
|
|
|
|
|
2019-11-15 11:04:51 -08:00
|
|
|
while true; do
|
|
|
|
|
case "$1" in
|
|
|
|
|
-k|--kernel)
|
|
|
|
|
KERNELRELEASE="$2"
|
|
|
|
|
shift 2
|
|
|
|
|
;;
|
|
|
|
|
-b|--build)
|
|
|
|
|
BUILDDIR="$2"
|
|
|
|
|
shift 2
|
|
|
|
|
;;
|
|
|
|
|
-r|--rootfs)
|
|
|
|
|
ROOTFSVERSION="$2"
|
|
|
|
|
shift 2
|
|
|
|
|
;;
|
|
|
|
|
-f|--force)
|
|
|
|
|
FORCE=1
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
-o|--one-shot)
|
|
|
|
|
ONESHOT=1
|
|
|
|
|
FORCE=1
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
-s|--setup-cmd)
|
|
|
|
|
SETUPCMD="$2"
|
|
|
|
|
shift 2
|
|
|
|
|
;;
|
|
|
|
|
-I|--skip-image)
|
|
|
|
|
SKIPIMG=1
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
-S|--skip-source)
|
|
|
|
|
SKIPSOURCE=1
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
-i|--interactive)
|
|
|
|
|
APPEND=" single"
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
-d|--dir)
|
|
|
|
|
DIR="$2"
|
|
|
|
|
shift 2
|
|
|
|
|
;;
|
|
|
|
|
-l|--list)
|
|
|
|
|
LIST=1
|
|
|
|
|
;;
|
|
|
|
|
-h|--help)
|
|
|
|
|
usage out
|
|
|
|
|
;;
|
|
|
|
|
--)
|
|
|
|
|
shift
|
|
|
|
|
break
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
usage err
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
if [[ -v BUILDDIR ]]; then
|
|
|
|
|
if [[ -v KERNELRELEASE ]]; then
|
|
|
|
|
usage err
|
|
|
|
|
fi
|
|
|
|
|
elif [[ ! -v KERNELRELEASE ]]; then
|
|
|
|
|
KERNELRELEASE='*'
|
|
|
|
|
fi
|
|
|
|
|
if [[ $SKIPIMG -ne 0 && ( -v ROOTFSVERSION || $FORCE -ne 0 ) ]]; then
|
|
|
|
|
usage err
|
|
|
|
|
fi
|
|
|
|
|
if (( LIST )); then
|
|
|
|
|
if [[ $# -ne 0 || -v BUILDDIR || -v ROOTFSVERSION || $FORCE -ne 0 ||
|
|
|
|
|
$SKIPIMG -ne 0 || $SKIPSOURCE -ne 0 || -n $APPEND ]]; then
|
|
|
|
|
usage err
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
if [[ $# -ne 1 ]]; then
|
|
|
|
|
usage err
|
|
|
|
|
fi
|
|
|
|
|
IMG="${!OPTIND}"
|
|
|
|
|
fi
|
2021-03-30 00:36:50 +02:00
|
|
|
if [[ "${SOURCE_FULLCOPY}" == "1" ]]; then
|
|
|
|
|
img_size=2G
|
|
|
|
|
else
|
|
|
|
|
img_size=8G
|
|
|
|
|
fi
|
2019-11-15 11:04:51 -08:00
|
|
|
|
|
|
|
|
unset URLS
|
|
|
|
|
cache_urls() {
|
|
|
|
|
if ! declare -p URLS &> /dev/null; then
|
|
|
|
|
# This URL contains a mapping from file names to URLs where
|
|
|
|
|
# those files can be downloaded.
|
|
|
|
|
declare -gA URLS
|
|
|
|
|
while IFS=$'\t' read -r name url; do
|
|
|
|
|
URLS["$name"]="$url"
|
2020-02-12 12:20:53 -08:00
|
|
|
done < <(cat "${VMTEST_ROOT}/configs/INDEX")
|
2019-11-15 11:04:51 -08:00
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
matching_kernel_releases() {
|
|
|
|
|
local pattern="$1"
|
|
|
|
|
{
|
|
|
|
|
for file in "${!URLS[@]}"; do
|
2020-09-14 13:43:11 +02:00
|
|
|
if [[ $file =~ ^${ARCH}/vmlinux-(.*).zst$ ]]; then
|
2019-11-15 11:04:51 -08:00
|
|
|
release="${BASH_REMATCH[1]}"
|
|
|
|
|
case "$release" in
|
|
|
|
|
$pattern)
|
|
|
|
|
# sort -V handles rc versions properly
|
|
|
|
|
# if we use "~" instead of "-".
|
|
|
|
|
echo "${release//-rc/~rc}"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
} | sort -rV | sed 's/~rc/-rc/g'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
newest_rootfs_version() {
|
|
|
|
|
{
|
|
|
|
|
for file in "${!URLS[@]}"; do
|
2020-09-14 13:43:11 +02:00
|
|
|
if [[ $file =~ ^${ARCH}/${PROJECT_NAME}-vmtest-rootfs-(.*)\.tar\.zst$ ]]; then
|
2019-11-15 11:04:51 -08:00
|
|
|
echo "${BASH_REMATCH[1]}"
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
} | sort -rV | head -1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
download() {
|
|
|
|
|
local file="$1"
|
|
|
|
|
cache_urls
|
|
|
|
|
if [[ ! -v URLS[$file] ]]; then
|
|
|
|
|
echo "$file not found" >&2
|
|
|
|
|
return 1
|
|
|
|
|
fi
|
|
|
|
|
echo "Downloading $file..." >&2
|
|
|
|
|
curl -Lf "${URLS[$file]}" "${@:2}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
set_nocow() {
|
|
|
|
|
touch "$@"
|
|
|
|
|
chattr +C "$@" >/dev/null 2>&1 || true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cp_img() {
|
|
|
|
|
set_nocow "$2"
|
|
|
|
|
cp --reflink=auto "$1" "$2"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
create_rootfs_img() {
|
|
|
|
|
local path="$1"
|
|
|
|
|
set_nocow "$path"
|
2021-03-30 00:36:50 +02:00
|
|
|
truncate -s "$img_size" "$path"
|
2019-11-15 11:04:51 -08:00
|
|
|
mkfs.ext4 -q "$path"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
download_rootfs() {
|
|
|
|
|
local rootfsversion="$1"
|
2020-09-14 13:43:11 +02:00
|
|
|
download "${ARCH}/${PROJECT_NAME}-vmtest-rootfs-$rootfsversion.tar.zst" |
|
2021-03-30 00:36:50 +02:00
|
|
|
zstd -d
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tar_in() {
|
|
|
|
|
local dst_path="$1"
|
|
|
|
|
# guestfish --remote does not forward file descriptors, which prevents
|
|
|
|
|
# us from using `tar-in -` or bash process substitution. We don't want
|
|
|
|
|
# to copy all the data into a temporary file, so use a FIFO.
|
|
|
|
|
tmp=$(mktemp -d)
|
|
|
|
|
mkfifo "$tmp/fifo"
|
|
|
|
|
cat >"$tmp/fifo" &
|
|
|
|
|
local cat_pid=$!
|
|
|
|
|
guestfish --remote tar-in "$tmp/fifo" "$dst_path"
|
|
|
|
|
wait "$cat_pid"
|
|
|
|
|
rm -r "$tmp"
|
|
|
|
|
tmp=
|
2019-11-15 11:04:51 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (( LIST )); then
|
|
|
|
|
cache_urls
|
|
|
|
|
matching_kernel_releases "$KERNELRELEASE"
|
|
|
|
|
exit 0
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [[ $FORCE -eq 0 && $SKIPIMG -eq 0 && -e $IMG ]]; then
|
|
|
|
|
echo "$IMG already exists; use -f to overwrite it or -I to reuse it" >&2
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Only go to the network if it's actually a glob pattern.
|
|
|
|
|
if [[ -v BUILDDIR ]]; then
|
|
|
|
|
KERNELRELEASE="$(make -C "$BUILDDIR" -s kernelrelease)"
|
|
|
|
|
elif [[ ! $KERNELRELEASE =~ ^([^\\*?[]|\\[*?[])*\\?$ ]]; then
|
|
|
|
|
# We need to cache the list of URLs outside of the command
|
|
|
|
|
# substitution, which happens in a subshell.
|
|
|
|
|
cache_urls
|
|
|
|
|
KERNELRELEASE="$(matching_kernel_releases "$KERNELRELEASE" | head -1)"
|
|
|
|
|
if [[ -z $KERNELRELEASE ]]; then
|
|
|
|
|
echo "No matching kernel release found" >&2
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
if [[ $SKIPIMG -eq 0 && ! -v ROOTFSVERSION ]]; then
|
|
|
|
|
cache_urls
|
|
|
|
|
ROOTFSVERSION="$(newest_rootfs_version)"
|
|
|
|
|
fi
|
|
|
|
|
|
2021-11-30 00:16:31 +00:00
|
|
|
travis_fold start vmlinux_setup "Preparing Linux image"
|
|
|
|
|
|
2019-11-15 11:04:51 -08:00
|
|
|
echo "Kernel release: $KERNELRELEASE" >&2
|
2020-08-21 19:06:43 -07:00
|
|
|
echo
|
|
|
|
|
|
2019-11-15 11:04:51 -08:00
|
|
|
if (( SKIPIMG )); then
|
|
|
|
|
echo "Not extracting root filesystem" >&2
|
|
|
|
|
else
|
|
|
|
|
echo "Root filesystem version: $ROOTFSVERSION" >&2
|
|
|
|
|
fi
|
|
|
|
|
echo "Disk image: $IMG" >&2
|
|
|
|
|
|
|
|
|
|
tmp=
|
2020-09-14 14:12:52 +02:00
|
|
|
ARCH_DIR="$DIR/$ARCH"
|
2019-11-15 11:04:51 -08:00
|
|
|
mkdir -p "$ARCH_DIR"
|
|
|
|
|
|
|
|
|
|
cleanup() {
|
|
|
|
|
if [[ -n $tmp ]]; then
|
2021-03-30 00:36:50 +02:00
|
|
|
rm -rf "$tmp" || true
|
2019-11-15 11:04:51 -08:00
|
|
|
fi
|
2021-03-30 00:36:50 +02:00
|
|
|
guestfish --remote exit 2>/dev/null || true
|
2019-11-15 11:04:51 -08:00
|
|
|
}
|
|
|
|
|
trap cleanup EXIT
|
|
|
|
|
|
|
|
|
|
if [[ -v BUILDDIR ]]; then
|
|
|
|
|
vmlinuz="$BUILDDIR/$(make -C "$BUILDDIR" -s image_name)"
|
|
|
|
|
else
|
|
|
|
|
vmlinuz="${ARCH_DIR}/vmlinuz-${KERNELRELEASE}"
|
|
|
|
|
if [[ ! -e $vmlinuz ]]; then
|
|
|
|
|
tmp="$(mktemp "$vmlinuz.XXX.part")"
|
2020-09-14 13:43:11 +02:00
|
|
|
download "${ARCH}/vmlinuz-${KERNELRELEASE}" -o "$tmp"
|
2019-11-15 11:04:51 -08:00
|
|
|
mv "$tmp" "$vmlinuz"
|
|
|
|
|
tmp=
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
# Mount and set up the rootfs image. Use a persistent guestfish session in
|
|
|
|
|
# order to avoid the startup overhead.
|
|
|
|
|
# Work around https://bugs.launchpad.net/fuel/+bug/1467579.
|
|
|
|
|
sudo chmod +r /boot/vmlinuz*
|
|
|
|
|
eval "$(guestfish --listen)"
|
2019-11-15 11:04:51 -08:00
|
|
|
if (( ONESHOT )); then
|
|
|
|
|
rm -f "$IMG"
|
|
|
|
|
create_rootfs_img "$IMG"
|
2021-03-30 00:36:50 +02:00
|
|
|
guestfish --remote \
|
|
|
|
|
add "$IMG" label:img : \
|
|
|
|
|
launch : \
|
|
|
|
|
mount /dev/disk/guestfs/img /
|
|
|
|
|
download_rootfs "$ROOTFSVERSION" | tar_in /
|
2019-11-15 11:04:51 -08:00
|
|
|
else
|
|
|
|
|
if (( ! SKIPIMG )); then
|
|
|
|
|
rootfs_img="${ARCH_DIR}/${PROJECT_NAME}-vmtest-rootfs-${ROOTFSVERSION}.img"
|
|
|
|
|
|
|
|
|
|
if [[ ! -e $rootfs_img ]]; then
|
|
|
|
|
tmp="$(mktemp "$rootfs_img.XXX.part")"
|
|
|
|
|
set_nocow "$tmp"
|
2021-03-30 00:36:50 +02:00
|
|
|
truncate -s "$img_size" "$tmp"
|
2019-11-15 11:04:51 -08:00
|
|
|
mkfs.ext4 -q "$tmp"
|
|
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
# libguestfs supports hotplugging only with a libvirt
|
|
|
|
|
# backend, which we are not using here, so handle the
|
|
|
|
|
# temporary image in a separate session.
|
|
|
|
|
download_rootfs "$ROOTFSVERSION" |
|
|
|
|
|
guestfish -a "$tmp" tar-in - /
|
2019-11-15 11:04:51 -08:00
|
|
|
|
|
|
|
|
mv "$tmp" "$rootfs_img"
|
|
|
|
|
tmp=
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
rm -f "$IMG"
|
|
|
|
|
cp_img "$rootfs_img" "$IMG"
|
|
|
|
|
fi
|
2021-03-30 00:36:50 +02:00
|
|
|
guestfish --remote \
|
|
|
|
|
add "$IMG" label:img : \
|
|
|
|
|
launch : \
|
|
|
|
|
mount /dev/disk/guestfs/img /
|
2019-11-15 11:04:51 -08:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Install vmlinux.
|
2021-03-30 00:36:50 +02:00
|
|
|
vmlinux="/boot/vmlinux-${KERNELRELEASE}"
|
2019-11-15 11:04:51 -08:00
|
|
|
if [[ -v BUILDDIR || $ONESHOT -eq 0 ]]; then
|
|
|
|
|
if [[ -v BUILDDIR ]]; then
|
|
|
|
|
source_vmlinux="${BUILDDIR}/vmlinux"
|
|
|
|
|
else
|
|
|
|
|
source_vmlinux="${ARCH_DIR}/vmlinux-${KERNELRELEASE}"
|
|
|
|
|
if [[ ! -e $source_vmlinux ]]; then
|
|
|
|
|
tmp="$(mktemp "$source_vmlinux.XXX.part")"
|
2020-09-14 13:43:11 +02:00
|
|
|
download "${ARCH}/vmlinux-${KERNELRELEASE}.zst" | zstd -dfo "$tmp"
|
2019-11-15 11:04:51 -08:00
|
|
|
mv "$tmp" "$source_vmlinux"
|
|
|
|
|
tmp=
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
else
|
2021-03-30 00:36:50 +02:00
|
|
|
source_vmlinux="${ARCH_DIR}/vmlinux-${KERNELRELEASE}"
|
|
|
|
|
download "${ARCH}/vmlinux-${KERNELRELEASE}.zst" | zstd -d >"$source_vmlinux"
|
2019-11-15 11:04:51 -08:00
|
|
|
fi
|
2021-03-30 00:36:50 +02:00
|
|
|
echo "Copying vmlinux..." >&2
|
|
|
|
|
guestfish --remote \
|
|
|
|
|
upload "$source_vmlinux" "$vmlinux" : \
|
|
|
|
|
chmod 644 "$vmlinux"
|
2019-11-15 11:04:51 -08:00
|
|
|
|
2020-08-21 19:06:43 -07:00
|
|
|
travis_fold end vmlinux_setup
|
|
|
|
|
|
2021-08-10 19:20:58 -07:00
|
|
|
REPO_PATH="${SELFTEST_REPO_PATH:-travis-ci/vmtest/bpf-next}"
|
2020-02-12 12:20:53 -08:00
|
|
|
LIBBPF_PATH="${REPO_ROOT}" \
|
|
|
|
|
VMTEST_ROOT="${VMTEST_ROOT}" \
|
2021-08-10 19:20:58 -07:00
|
|
|
REPO_PATH="${REPO_PATH}" \
|
2021-03-30 00:36:50 +02:00
|
|
|
VMLINUX_BTF=$(realpath ${source_vmlinux}) ${VMTEST_ROOT}/build_selftests.sh
|
2020-02-12 12:20:53 -08:00
|
|
|
|
ci: run script to test bpftool types/options sync
When new eBPF program, map, or attach types are added to the kernel,
bpftool needs to be updated in order to support the related features.
These updates should add the new types to the code itself, but also to
the help messages, documentation, and bash completion. Given that it is
easy to omit one of those, a script has been created to attempt to
validate that all parts have been consistently updated.
This new script for bpftool is hosted in the kernel repository, amongst
the BPF selftests. But it is not called from the Makefile, and not run
along with the other selftests. If it was, all patches updating the BPF
UAPI would require the relevant changes in bpftool at the same time, _in
the same patches_, which is not desirable.
To ensure that bpftool's parts remain in sync, let's run this script
from the CI. This patch adds a new section to the run.sh script, focused
on bpftool, and calling the new test_bpftool_synctypes.py.
2021-08-15 22:15:49 +01:00
|
|
|
travis_fold start bpftool_checks "Running bpftool checks..."
|
2021-11-29 23:56:48 +00:00
|
|
|
bpftool_exitstatus=
|
ci: run script to test bpftool types/options sync
When new eBPF program, map, or attach types are added to the kernel,
bpftool needs to be updated in order to support the related features.
These updates should add the new types to the code itself, but also to
the help messages, documentation, and bash completion. Given that it is
easy to omit one of those, a script has been created to attempt to
validate that all parts have been consistently updated.
This new script for bpftool is hosted in the kernel repository, amongst
the BPF selftests. But it is not called from the Makefile, and not run
along with the other selftests. If it was, all patches updating the BPF
UAPI would require the relevant changes in bpftool at the same time, _in
the same patches_, which is not desirable.
To ensure that bpftool's parts remain in sync, let's run this script
from the CI. This patch adds a new section to the run.sh script, focused
on bpftool, and calling the new test_bpftool_synctypes.py.
2021-08-15 22:15:49 +01:00
|
|
|
if [[ "${KERNEL}" = 'LATEST' ]]; then
|
ci: create summary for tests and account for bpftool checks result
The bpftool checks work as expected when the CI runs, except that they
do not set any error status code for the script on error, which means
that the failures are lost among the logs and not reported in a clear
way to the reviewers.
This commit aims at fixing the issue. We could simply exit with a
non-zero error status when the bpftool checks, but that would prevent
the other tests from running. Instead, we propose to store the result of
the bpftool checks in a bash array. This array can later be reused to
print a summary of the different groups of tests, at the end of the CI
run, to help the reviewers understand where the failure happened without
having to manually unfold all the sections on the GitHub interface.
Currently, there are only two groups: the bpftool checks and the "VM
tests". The latter may later be split into test_maps, test_progs,
test_progs-no_alu32, etc. by teaching each of them to append their exit
status code to the "exitstatus" file.
Fixes: 88649fe655b8 ("ci: run script to test bpftool types/options sync")
2021-11-16 10:34:58 +00:00
|
|
|
# "&& true" does not change the return code (it is not executed if the
|
|
|
|
|
# Python script fails), but it prevents the trap on ERR set at the top
|
|
|
|
|
# of this file to trigger on failure.
|
|
|
|
|
"${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf/test_bpftool_synctypes.py" && true
|
2021-11-29 23:56:48 +00:00
|
|
|
bpftool_exitstatus=$?
|
|
|
|
|
if [[ "$bpftool_exitstatus" -eq 0 ]]; then
|
2021-11-29 22:54:07 +00:00
|
|
|
print_notice bpftool_checks "bpftool checks passed successfully."
|
ci: create summary for tests and account for bpftool checks result
The bpftool checks work as expected when the CI runs, except that they
do not set any error status code for the script on error, which means
that the failures are lost among the logs and not reported in a clear
way to the reviewers.
This commit aims at fixing the issue. We could simply exit with a
non-zero error status when the bpftool checks, but that would prevent
the other tests from running. Instead, we propose to store the result of
the bpftool checks in a bash array. This array can later be reused to
print a summary of the different groups of tests, at the end of the CI
run, to help the reviewers understand where the failure happened without
having to manually unfold all the sections on the GitHub interface.
Currently, there are only two groups: the bpftool checks and the "VM
tests". The latter may later be split into test_maps, test_progs,
test_progs-no_alu32, etc. by teaching each of them to append their exit
status code to the "exitstatus" file.
Fixes: 88649fe655b8 ("ci: run script to test bpftool types/options sync")
2021-11-16 10:34:58 +00:00
|
|
|
else
|
2021-11-29 23:56:48 +00:00
|
|
|
print_error bpftool_checks "bpftool checks returned ${bpftool_exitstatus}."
|
ci: create summary for tests and account for bpftool checks result
The bpftool checks work as expected when the CI runs, except that they
do not set any error status code for the script on error, which means
that the failures are lost among the logs and not reported in a clear
way to the reviewers.
This commit aims at fixing the issue. We could simply exit with a
non-zero error status when the bpftool checks, but that would prevent
the other tests from running. Instead, we propose to store the result of
the bpftool checks in a bash array. This array can later be reused to
print a summary of the different groups of tests, at the end of the CI
run, to help the reviewers understand where the failure happened without
having to manually unfold all the sections on the GitHub interface.
Currently, there are only two groups: the bpftool checks and the "VM
tests". The latter may later be split into test_maps, test_progs,
test_progs-no_alu32, etc. by teaching each of them to append their exit
status code to the "exitstatus" file.
Fixes: 88649fe655b8 ("ci: run script to test bpftool types/options sync")
2021-11-16 10:34:58 +00:00
|
|
|
fi
|
2021-11-29 23:56:48 +00:00
|
|
|
bpftool_exitstatus="bpftool:${bpftool_exitstatus}"
|
ci: run script to test bpftool types/options sync
When new eBPF program, map, or attach types are added to the kernel,
bpftool needs to be updated in order to support the related features.
These updates should add the new types to the code itself, but also to
the help messages, documentation, and bash completion. Given that it is
easy to omit one of those, a script has been created to attempt to
validate that all parts have been consistently updated.
This new script for bpftool is hosted in the kernel repository, amongst
the BPF selftests. But it is not called from the Makefile, and not run
along with the other selftests. If it was, all patches updating the BPF
UAPI would require the relevant changes in bpftool at the same time, _in
the same patches_, which is not desirable.
To ensure that bpftool's parts remain in sync, let's run this script
from the CI. This patch adds a new section to the run.sh script, focused
on bpftool, and calling the new test_bpftool_synctypes.py.
2021-08-15 22:15:49 +01:00
|
|
|
else
|
2021-11-29 23:56:48 +00:00
|
|
|
echo "bpftool checks skipped."
|
ci: run script to test bpftool types/options sync
When new eBPF program, map, or attach types are added to the kernel,
bpftool needs to be updated in order to support the related features.
These updates should add the new types to the code itself, but also to
the help messages, documentation, and bash completion. Given that it is
easy to omit one of those, a script has been created to attempt to
validate that all parts have been consistently updated.
This new script for bpftool is hosted in the kernel repository, amongst
the BPF selftests. But it is not called from the Makefile, and not run
along with the other selftests. If it was, all patches updating the BPF
UAPI would require the relevant changes in bpftool at the same time, _in
the same patches_, which is not desirable.
To ensure that bpftool's parts remain in sync, let's run this script
from the CI. This patch adds a new section to the run.sh script, focused
on bpftool, and calling the new test_bpftool_synctypes.py.
2021-08-15 22:15:49 +01:00
|
|
|
fi
|
|
|
|
|
travis_fold end bpftool_checks
|
|
|
|
|
|
2020-08-21 19:06:43 -07:00
|
|
|
travis_fold start vm_init "Starting virtual machine..."
|
|
|
|
|
|
2019-11-15 11:04:51 -08:00
|
|
|
if (( SKIPSOURCE )); then
|
|
|
|
|
echo "Not copying source files..." >&2
|
|
|
|
|
else
|
|
|
|
|
echo "Copying source files..." >&2
|
|
|
|
|
# Copy the source files in.
|
2021-03-30 00:36:50 +02:00
|
|
|
guestfish --remote \
|
|
|
|
|
mkdir-p "/${PROJECT_NAME}" : \
|
|
|
|
|
chmod 0755 "/${PROJECT_NAME}"
|
2021-08-10 19:20:58 -07:00
|
|
|
if [[ "${SOURCE_FULLCOPY}" == "1" ]]; then
|
2021-03-30 00:36:50 +02:00
|
|
|
git ls-files -z | tar --null --files-from=- -c | tar_in "/${PROJECT_NAME}"
|
2019-11-15 11:04:51 -08:00
|
|
|
else
|
2021-03-30 00:36:50 +02:00
|
|
|
guestfish --remote \
|
|
|
|
|
mkdir-p "/${PROJECT_NAME}/selftests" : \
|
|
|
|
|
chmod 0755 "/${PROJECT_NAME}/selftests" : \
|
|
|
|
|
mkdir-p "/${PROJECT_NAME}/travis-ci" : \
|
|
|
|
|
chmod 0755 "/${PROJECT_NAME}/travis-ci"
|
2021-08-10 19:20:58 -07:00
|
|
|
tree --du -shaC "${REPO_ROOT}/selftests/bpf"
|
2021-03-30 00:36:50 +02:00
|
|
|
tar -C "${REPO_ROOT}/selftests" -c bpf | tar_in "/${PROJECT_NAME}/selftests"
|
|
|
|
|
tar -C "${REPO_ROOT}/travis-ci" -c vmtest | tar_in "/${PROJECT_NAME}/travis-ci"
|
|
|
|
|
fi
|
2019-11-15 11:04:51 -08:00
|
|
|
fi
|
|
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
tmp=$(mktemp)
|
|
|
|
|
cat <<HERE >"$tmp"
|
|
|
|
|
"#!/bin/sh
|
2019-11-15 11:04:51 -08:00
|
|
|
|
|
|
|
|
echo 'Skipping setup commands'
|
2021-11-29 23:56:48 +00:00
|
|
|
echo vm_start:0 > /exitstatus
|
2021-03-30 00:36:50 +02:00
|
|
|
chmod 644 /exitstatus
|
|
|
|
|
HERE
|
2019-11-15 11:04:51 -08:00
|
|
|
|
|
|
|
|
# Create the init scripts.
|
|
|
|
|
if [[ ! -z SETUPCMD ]]; then
|
|
|
|
|
# Unescape whitespace characters.
|
|
|
|
|
setup_cmd=$(sed 's/\(\\\)\([[:space:]]\)/\2/g' <<< "${SETUPCMD}")
|
2020-02-12 12:20:53 -08:00
|
|
|
kernel="${KERNELRELEASE}"
|
|
|
|
|
if [[ -v BUILDDIR ]]; then kernel='latest'; fi
|
|
|
|
|
setup_envvars="export KERNEL=${kernel}"
|
2021-03-30 00:36:50 +02:00
|
|
|
cat <<HERE >"$tmp"
|
|
|
|
|
#!/bin/sh
|
2020-04-04 23:56:00 -07:00
|
|
|
set -eux
|
2019-11-15 11:04:51 -08:00
|
|
|
|
|
|
|
|
echo 'Running setup commands'
|
2021-03-30 00:36:50 +02:00
|
|
|
${setup_envvars}
|
2021-11-30 00:16:31 +00:00
|
|
|
set +e
|
|
|
|
|
${setup_cmd}; exitstatus=\$?
|
|
|
|
|
echo -e '$(travis_fold start collect_status "Collect status")'
|
|
|
|
|
set -e
|
2021-11-29 23:56:48 +00:00
|
|
|
# If setup command did not write its exit status to /exitstatus, do it now
|
2021-12-01 20:59:48 +00:00
|
|
|
if [[ ! -s /exitstatus ]]; then
|
2021-11-29 23:56:48 +00:00
|
|
|
echo setup_cmd:\$exitstatus > /exitstatus
|
|
|
|
|
fi
|
2021-03-30 00:36:50 +02:00
|
|
|
chmod 644 /exitstatus
|
2021-11-30 00:16:31 +00:00
|
|
|
echo -e '$(travis_fold end collect_status)'
|
|
|
|
|
echo -e '$(travis_fold start shutdown Shutdown)'
|
2021-03-30 00:36:50 +02:00
|
|
|
HERE
|
2019-11-15 11:04:51 -08:00
|
|
|
fi
|
|
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
guestfish --remote \
|
|
|
|
|
upload "$tmp" /etc/rcS.d/S50-run-tests : \
|
|
|
|
|
chmod 755 /etc/rcS.d/S50-run-tests
|
2019-11-15 11:04:51 -08:00
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
cat <<HERE >"$tmp"
|
|
|
|
|
#!/bin/sh
|
2019-11-15 11:04:51 -08:00
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
poweroff
|
|
|
|
|
HERE
|
|
|
|
|
guestfish --remote \
|
|
|
|
|
upload "$tmp" /etc/rcS.d/S99-poweroff : \
|
|
|
|
|
chmod 755 /etc/rcS.d/S99-poweroff
|
|
|
|
|
rm "$tmp"
|
|
|
|
|
tmp=
|
2019-11-15 11:04:51 -08:00
|
|
|
|
2021-03-30 00:36:50 +02:00
|
|
|
guestfish --remote exit
|
2019-11-15 11:04:51 -08:00
|
|
|
|
2020-12-18 13:20:46 -08:00
|
|
|
echo "Starting VM with $(nproc) CPUs..."
|
|
|
|
|
|
2020-09-14 14:12:52 +02:00
|
|
|
case "$ARCH" in
|
|
|
|
|
s390x)
|
|
|
|
|
qemu="qemu-system-s390x"
|
|
|
|
|
console="ttyS1"
|
|
|
|
|
smp=2
|
2020-09-14 12:30:25 +02:00
|
|
|
kvm_accel="-enable-kvm"
|
|
|
|
|
tcg_accel="-machine accel=tcg"
|
2020-09-14 14:12:52 +02:00
|
|
|
;;
|
|
|
|
|
x86_64)
|
|
|
|
|
qemu="qemu-system-x86_64"
|
|
|
|
|
console="ttyS0,115200"
|
|
|
|
|
smp=$(nproc)
|
2020-09-14 12:30:25 +02:00
|
|
|
kvm_accel="-cpu kvm64 -enable-kvm"
|
|
|
|
|
tcg_accel="-cpu qemu64 -machine accel=tcg"
|
2020-09-14 14:12:52 +02:00
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo "Unsupported architecture"
|
|
|
|
|
exit 1
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2020-09-14 12:30:25 +02:00
|
|
|
if kvm-ok ; then
|
|
|
|
|
accel=$kvm_accel
|
|
|
|
|
else
|
|
|
|
|
accel=$tcg_accel
|
|
|
|
|
fi
|
2020-09-14 14:12:52 +02:00
|
|
|
"$qemu" -nodefaults -display none -serial mon:stdio \
|
|
|
|
|
${accel} -smp "$smp" -m 4G \
|
2021-06-14 11:16:46 -07:00
|
|
|
-drive file="$IMG",format=raw,index=1,media=disk,if=virtio,cache=none \
|
2020-09-14 14:12:52 +02:00
|
|
|
-kernel "$vmlinuz" -append "root=/dev/vda rw console=$console kernel.panic=-1 $APPEND"
|
|
|
|
|
|
2021-11-29 23:56:48 +00:00
|
|
|
# Set exit status to 1 if at least one group test returned non-0
|
|
|
|
|
exitfile="${bpftool_exitstatus}${bpftool_exitstatus:+\n}"
|
|
|
|
|
exitfile+="$(guestfish --ro -a "$IMG" -i cat /exitstatus 2>/dev/null)"
|
|
|
|
|
exitstatus="$(echo -e "$exitfile" | awk --field-separator ':' \
|
|
|
|
|
'BEGIN { s=0 } { if ($2) {s=1} } END { print s }')"
|
|
|
|
|
|
|
|
|
|
if [[ "$exitstatus" =~ ^[0-9]+$ ]]; then
|
2019-11-15 11:04:51 -08:00
|
|
|
printf '\nTests exit status: %s\n' "$exitstatus" >&2
|
|
|
|
|
else
|
2021-11-29 23:56:48 +00:00
|
|
|
printf '\nCould not read tests exit status ("%s")\n' "$exitstatus" >&2
|
2019-11-15 11:04:51 -08:00
|
|
|
exitstatus=1
|
|
|
|
|
fi
|
2020-08-21 19:06:43 -07:00
|
|
|
|
|
|
|
|
travis_fold end shutdown
|
|
|
|
|
|
ci: create summary for tests and account for bpftool checks result
The bpftool checks work as expected when the CI runs, except that they
do not set any error status code for the script on error, which means
that the failures are lost among the logs and not reported in a clear
way to the reviewers.
This commit aims at fixing the issue. We could simply exit with a
non-zero error status when the bpftool checks, but that would prevent
the other tests from running. Instead, we propose to store the result of
the bpftool checks in a bash array. This array can later be reused to
print a summary of the different groups of tests, at the end of the CI
run, to help the reviewers understand where the failure happened without
having to manually unfold all the sections on the GitHub interface.
Currently, there are only two groups: the bpftool checks and the "VM
tests". The latter may later be split into test_maps, test_progs,
test_progs-no_alu32, etc. by teaching each of them to append their exit
status code to the "exitstatus" file.
Fixes: 88649fe655b8 ("ci: run script to test bpftool types/options sync")
2021-11-16 10:34:58 +00:00
|
|
|
# Final summary - Don't use a fold, keep it visible
|
|
|
|
|
echo -e "\033[1;33mTest Results:\033[0m"
|
2021-11-29 23:56:48 +00:00
|
|
|
echo -e "$exitfile" | while read result; do
|
|
|
|
|
testgroup=${result%:*}
|
|
|
|
|
status=${result#*:}
|
ci: create summary for tests and account for bpftool checks result
The bpftool checks work as expected when the CI runs, except that they
do not set any error status code for the script on error, which means
that the failures are lost among the logs and not reported in a clear
way to the reviewers.
This commit aims at fixing the issue. We could simply exit with a
non-zero error status when the bpftool checks, but that would prevent
the other tests from running. Instead, we propose to store the result of
the bpftool checks in a bash array. This array can later be reused to
print a summary of the different groups of tests, at the end of the CI
run, to help the reviewers understand where the failure happened without
having to manually unfold all the sections on the GitHub interface.
Currently, there are only two groups: the bpftool checks and the "VM
tests". The latter may later be split into test_maps, test_progs,
test_progs-no_alu32, etc. by teaching each of them to append their exit
status code to the "exitstatus" file.
Fixes: 88649fe655b8 ("ci: run script to test bpftool types/options sync")
2021-11-16 10:34:58 +00:00
|
|
|
# Print final result for each group of tests
|
2021-11-29 23:56:48 +00:00
|
|
|
if [[ "$status" -eq 0 ]]; then
|
|
|
|
|
printf "%20s: \033[1;32mPASS\033[0m\n" "$testgroup"
|
ci: create summary for tests and account for bpftool checks result
The bpftool checks work as expected when the CI runs, except that they
do not set any error status code for the script on error, which means
that the failures are lost among the logs and not reported in a clear
way to the reviewers.
This commit aims at fixing the issue. We could simply exit with a
non-zero error status when the bpftool checks, but that would prevent
the other tests from running. Instead, we propose to store the result of
the bpftool checks in a bash array. This array can later be reused to
print a summary of the different groups of tests, at the end of the CI
run, to help the reviewers understand where the failure happened without
having to manually unfold all the sections on the GitHub interface.
Currently, there are only two groups: the bpftool checks and the "VM
tests". The latter may later be split into test_maps, test_progs,
test_progs-no_alu32, etc. by teaching each of them to append their exit
status code to the "exitstatus" file.
Fixes: 88649fe655b8 ("ci: run script to test bpftool types/options sync")
2021-11-16 10:34:58 +00:00
|
|
|
else
|
2021-11-29 23:56:48 +00:00
|
|
|
printf "%20s: \033[1;31mFAIL\033[0m (returned %s)\n" "$testgroup" "$status"
|
ci: create summary for tests and account for bpftool checks result
The bpftool checks work as expected when the CI runs, except that they
do not set any error status code for the script on error, which means
that the failures are lost among the logs and not reported in a clear
way to the reviewers.
This commit aims at fixing the issue. We could simply exit with a
non-zero error status when the bpftool checks, but that would prevent
the other tests from running. Instead, we propose to store the result of
the bpftool checks in a bash array. This array can later be reused to
print a summary of the different groups of tests, at the end of the CI
run, to help the reviewers understand where the failure happened without
having to manually unfold all the sections on the GitHub interface.
Currently, there are only two groups: the bpftool checks and the "VM
tests". The latter may later be split into test_maps, test_progs,
test_progs-no_alu32, etc. by teaching each of them to append their exit
status code to the "exitstatus" file.
Fixes: 88649fe655b8 ("ci: run script to test bpftool types/options sync")
2021-11-16 10:34:58 +00:00
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
|
2019-11-15 11:04:51 -08:00
|
|
|
exit "$exitstatus"
|