From 569df985ce5ec431e9549860da7dbdefbe308c5b Mon Sep 17 00:00:00 2001 From: wjunLu Date: Tue, 30 Jul 2024 15:43:46 +0800 Subject: [PATCH 1/6] Add grafana tempo docker image --- tempo/2.5.0/24.03-lts/Dockerfile | 14 +++++++ tempo/README.md | 66 +++++++++++++++++++++++++++++++ tempo/doc/image-info.yml | 62 +++++++++++++++++++++++++++++ tempo/doc/picture/logo.png | Bin 0 -> 10648 bytes tempo/meta.yml | 2 + 5 files changed, 144 insertions(+) create mode 100644 tempo/2.5.0/24.03-lts/Dockerfile create mode 100644 tempo/README.md create mode 100644 tempo/doc/image-info.yml create mode 100644 tempo/doc/picture/logo.png create mode 100644 tempo/meta.yml diff --git a/tempo/2.5.0/24.03-lts/Dockerfile b/tempo/2.5.0/24.03-lts/Dockerfile new file mode 100644 index 00000000..7a8a49a9 --- /dev/null +++ b/tempo/2.5.0/24.03-lts/Dockerfile @@ -0,0 +1,14 @@ +ARG BASE=openeuler/openeuler:24.03-lts +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=2.5.0 + +RUN yum -y install wget && \ + wget -O /tmp/tempo.rpm https://github.com/grafana/tempo/releases/download/v${VERSION}/tempo_${VERSION}_linux_${TARGETARCH}.rpm && \ + yum -y install /tmp/tempo.rpm && \ + rm -f /tmp/tempo.rpm && \ + yum remove -y wget && \ + yum clean all + +ENTRYPOINT ["tempo", "-config.file", "/etc/tempo/config.yml"] diff --git a/tempo/README.md b/tempo/README.md new file mode 100644 index 00000000..d3929e55 --- /dev/null +++ b/tempo/README.md @@ -0,0 +1,66 @@ +# Quick reference + +- The official Tempo docker image. + +- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative). + +- Where to get help: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative), [openEuler](https://gitee.com/openeuler/community). + +# Tempo | openEuler +Current Tempo docker images are built on the [openEuler](https://repo.openeuler.org/). This repository is free to use and exempted from per-user rate limits. + +Grafana Tempo is an open source, easy-to-use and high-scale distributed tracing backend. Tempo is cost-efficient, requiring only object storage to operate, and is deeply integrated with Grafana, Prometheus, and Loki. + +Learn more on [Tempo website](https://grafana.com/oss/tempo/). + +# Supported tags and respective Dockerfile links +The tag of each `tempo` docker image is consist of the version of `tempo` and the version of basic image. The details are as follows +| Tag | Currently | Architectures | +|----------|-------------|------------------| +|[2.5.0-oe2403lts](https://gitee.com/openeuler/openeuler-docker-images/blob/master/tempo/2.5.0/24.03-lts/Dockerfile)| Grafana Tempo 2.5.0 on openEuler 24.03-LTS | amd64, arm64 | + +# Usage +In this usage, users can select the corresponding `{Tag}` and `container startup options` based on their requirements. + +- Pull the `openeuler/tempo` image from docker + + ```bash + docker pull openeuler/tempo:{Tag} + ``` + +- Start a tempo instance + + ```bash + docker run -d \ + --name my-tempo \ + -p 3200:3200 -p 14268:14268 -p 9095:9095 -p 4317:4317 -p 4318:4318 -p 9411:9411 \ + openeuler/tempo:{Tag} + ``` + When the instance `my-tempo` is started, access the Tempo API through `http://localhost:3200`. + +- Container startup options + + | Option | Description | + |--------|-------------| + | -p 3200:3200 | Tempo HTTP API port | + | -p 9095:9095 | Tempo GRPC API port | + | -p 14268:14268 | Jaeger thrift format ingestion port | + | -p 4317:4317 | OpenTelemetry GRPC ingestion port | + | -p 4318:4318 | OpenTelemetry HTTP ingestion port | + | -p 9411:9411 | Zipkin format ingestion port | + | -v /path/to/tempo/config.yml:/etc/tempo/config.yml | start tempo with customed configuration file | + +- Check logs + + ```bash + docker logs -f my-tempo + ``` + +- To get an interactive shell + + ```bash + docker exec -it my-tempo /bin/bash + ``` + +# Question and answering +If you have any questions or want to use some special features, please submit an issue or a pull request on [openeuler-docker-images](https://gitee.com/openeuler/openeuler-docker-images). \ No newline at end of file diff --git a/tempo/doc/image-info.yml b/tempo/doc/image-info.yml new file mode 100644 index 00000000..fbdf9957 --- /dev/null +++ b/tempo/doc/image-info.yml @@ -0,0 +1,62 @@ + +name: tempo +category: cloud +description: Grafana Tempo 是一个开源、易于使用的大规模分布式跟踪后端。 Tempo 具有成本效益，仅需要对象存储即可运行，并且与 Grafana、Prometheus 和 Loki 深度集成。 +environment: | + 本应用在Docker环境中运行，安装Docker执行如下命令 + ``` + yum install -y docker + ``` +tags: | + Tempo镜像的Tag由其版本信息和基础镜像版本信息组成，详细内容如下 + + | Tag | Currently | Architectures | + |----------|-------------|------------------| + |[2.5.0-oe2403lts](https://gitee.com/openeuler/openeuler-docker-images/blob/master/tempo/2.5.0/24.03-lts/Dockerfile)| Grafana Tempo 2.5.0 on openEuler 24.03-LTS | amd64, arm64 | + +download: | + 拉取镜像到本地 + ``` + docker pull openeuler/tempo:{Tag} + ``` + +usage: | + - 启动容器 + ``` + docker run -d \ + --name my-tempo \ + -p 3200:3200 -p 14268:14268 -p 9095:9095 -p 4317:4317 -p 4318:4318 -p 9411:9411 \ + openeuler/tempo:{Tag} + ``` + 用户可根据自身需求选择对应版本的{Tag}、容器启动的选项。 + `my-tempo`启动之后，通过`localhost:3200`访问tempo API。 + + - 启动参数 + + | Parameter | Description | + |----------------|---------------| + | -p 3200:3200 | Tempo HTTP API访问端口 | + | -p 9095:9095 | Tempo GRPC API访问端口 | + | -p 14268:14268 | Jaeger thrift格式的数据接收端口 | + | -p 4317:4317 | OpenTelemetry GRPC数据接收端口 | + | -p 4318:4318 | OpenTelemetry HTTP数据接收端口 | + | -p 9411:9411 | Zipkin格式的数据接收端口 | + | -v /path/to/tempo/config.yml:/etc/tempo/config.yml | 使用本地自定义配置文件 | + + - 容器测试 + + 查看运行日志 + ``` + docker logs -f my-tempo + ``` + + 使用shell交互 + ``` + docker exec -it my-tempo /bin/bash + ``` + +license: AGPL-3.0 license +similar_packages: + - N/A +dependency: + - N/A \ No newline at end of file diff --git a/tempo/doc/picture/logo.png b/tempo/doc/picture/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..92536a9b7265b1c513e4846dab2a4403f1c9242c GIT binary patch literal 10648 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 atQXAMaN0L6dsQF)N-M~yNLNal2LBJYT_}|R literal 0 HcmV?d00001 diff --git a/tempo/meta.yml b/tempo/meta.yml new file mode 100644 index 00000000..9ee6dab5 --- /dev/null +++ b/tempo/meta.yml @@ -0,0 +1,2 @@ +2.5.0-oe24.03lts: + path: tempo/2.5.0/24.03-lts/Dockerfile \ No newline at end of file -- Gitee From 17d7e23539db709fd8b74bd8710cf884091419d0 Mon Sep 17 00:00:00 2001 From: wjunLu Date: Fri, 2 Aug 2024 17:02:28 +0800 Subject: [PATCH 2/6] Add kselftests-virtme docker image. --- .../1.25/22.03-lts-sp4/Dockerfile | 95 + .../1.25/22.03-lts-sp4/entrypoint.sh | 1701 +++++++++++++++++ .../1.25/22.03-lts-sp4/tap2json.py | 143 ++ kselftests-virtme/README.md | 274 +++ kselftests-virtme/doc/image-info.yml | 56 + kselftests-virtme/doc/picture/logo.png | Bin 0 -> 6913 bytes kselftests-virtme/meta.yml | 2 + 7 files changed, 2271 insertions(+) create mode 100644 kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile create mode 100755 kselftests-virtme/1.25/22.03-lts-sp4/entrypoint.sh create mode 100755 kselftests-virtme/1.25/22.03-lts-sp4/tap2json.py create mode 100644 kselftests-virtme/README.md create mode 100644 kselftests-virtme/doc/image-info.yml create mode 100644 kselftests-virtme/doc/picture/logo.png create mode 100644 kselftests-virtme/meta.yml diff --git a/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile b/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile new file mode 100644 index 00000000..ccc04489 --- /dev/null +++ b/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile @@ -0,0 +1,95 @@ +# SPDX-License-Identifier: GPL-2.0 +ARG BASE=openeuler/openeuler:22.03-lts-sp4 +FROM ${BASE} + +LABEL name=openeuler-kselftests-virtme-docker + +# dependencies for the script +RUN yum update -y && \ + yum install -y \ + make gcc ncurses-devel openssl-devel bc bison byacc automake \ + elfutils-libelf-devel flex git curl tar qemu-kvm sudo expect \ + python3 python3-pip python3-setuptools file \ + busybox coreutils python3-requests libvirt-client udev \ + iputils ethtool kbd rsync ccache nc \ + ca-certificates gnupg2 net-tools kmod \ + dbus-devel libnl3-devel libibverbs-devel \ + tcpdump pkgconfig libmnl-devel \ + clang clang-tools-extra lld llvm llvm-devel libcap-devel \ + gdb gdb-gdbserver crash strace trace-cmd \ + iptables ebtables nftables vim psmisc bash-completion less jq \ + gettext libevent-devel newt perl-devel perl-ExtUtils-MakeMaker perl-Digest-SHA perl-Encode \ + perl-IPC-Cmd perl-Text-ParseWords perl-Time-HiRes perl-JSON zstd wget xz lftp cpio cscope bpftrace libunwind-devel libdwarf-devel \ + libzstd-devel numactl-devel libxml2-devel sqlite-devel gtk3-devel gtk2-devel && \ + yum clean all + +# byobu (not to have a dep to iproute2) +ARG BYOBU_URL="https://github.com/dustinkirkland/byobu/archive/refs/tags/6.12.tar.gz" +ARG BYOBU_SUM="abb000331858609dfda9214115705506249f69237625633c80487abe2093dd45 byobu.tar.gz" +RUN cd /opt && \ + curl -L "${BYOBU_URL}" -o byobu.tar.gz && \ + echo "${BYOBU_SUM}" | sha256sum -c && \ + tar xzf byobu.tar.gz && \ + cd byobu-*/ && \ + ./autogen.sh && \ + ./configure --prefix=/usr && \ + make -j"$(nproc)" -l"$(nproc)" && \ + make install + +# packetdrill +ARG PACKETDRILL_GIT_URL="https://github.com/multipath-tcp/packetdrill.git" +ARG PACKETDRILL_GIT_BRANCH="mptcp-net-next" +ENV PACKETDRILL_GIT_BRANCH="${PACKETDRILL_GIT_BRANCH}" +RUN cd /opt && \ + git clone "${PACKETDRILL_GIT_URL}" && \ + cd packetdrill && \ + git checkout "${PACKETDRILL_GIT_BRANCH}" && \ + cd gtests/net/packetdrill/ && \ + ./configure && \ + make -j"$(nproc)" -l"$(nproc)" && \ + ln -s /opt/packetdrill/gtests/net/packetdrill/packetdrill \ + /opt/packetdrill/gtests/net/packetdrill/run_all.py \ + /usr/sbin/ + +# Sparse +ARG SPARSE_GIT_URL="git://git.kernel.org/pub/scm/devel/sparse/sparse.git" +ARG SPARSE_GIT_SHA="09411a7a5127516a0741eb1bd8762642fa9197ce" # include a fix for 'unreplaced' issues and llvm 16 +RUN cd /opt && \ + git clone "${SPARSE_GIT_URL}" sparse && \ + cd "sparse" && \ + git checkout "${SPARSE_GIT_SHA}" && \ + make -j"$(nproc)" -l"$(nproc)" && \ + make PREFIX=/usr install && \ + cd .. && \ + rm -rf "sparse" + +# iproute +ARG IPROUTE2_GIT_URL="git://git.kernel.org/pub/scm/network/iproute2/iproute2.git" +ARG IPROUTE2_GIT_SHA="v6.10.0" +RUN cd /opt && \ + git clone "${IPROUTE2_GIT_URL}" iproute2 && \ + cd iproute2 && \ + git checkout "${IPROUTE2_GIT_SHA}" && \ + ./configure && \ + make -j"$(nproc)" -l"$(nproc)" && \ + make install + +# Virtme NG +ARG VERSION=1.25 +RUN pip3 install virtme-ng=="${VERSION}" + +# to quickly shutdown the VM and more +RUN for i in /usr/lib/klibc/bin/*; do \ + type "$(basename "${i}")" >/dev/null 2>&1 || ln -sv "${i}" /usr/sbin/; \ + done + +# CCache for quicker builds with default colours +# Note: use 'ccache -M xG' to increase max size, default is 5GB +ENV PATH /usr/lib/ccache:${PATH} +ENV CCACHE_COMPRESS true +ENV KBUILD_BUILD_TIMESTAMP "0" +ENV GCC_COLORS error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01 + +COPY entrypoint.sh tap2json.py / + +ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/kselftests-virtme/1.25/22.03-lts-sp4/entrypoint.sh b/kselftests-virtme/1.25/22.03-lts-sp4/entrypoint.sh new file mode 100755 index 00000000..868e5421 --- /dev/null +++ b/kselftests-virtme/1.25/22.03-lts-sp4/entrypoint.sh @@ -0,0 +1,1701 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# The goal is to launch (MPTCP) kernel selftests and more. +# But also to provide a dev env for kernel developers or testers. +# +# Arguments: +# - "manual": to have a console in the VM. Additional args are for the kconfig +# - args we pass to kernel's "scripts/config" script. + +# We should manage all errors in this script +set -e + +is_ci() { + [ "${CI}" = "true" ] +} + +is_github_action() { + [ "${GITHUB_ACTIONS}" = "true" ] +} + +trace_needed() { + [ "${INPUT_TRACE}" = "1" ] +} + +set_trace_on() { + if trace_needed; then + set -x + fi +} + +set_trace_off() { + if trace_needed; then + set +x + fi +} + +with_clang() { + [ "${INPUT_CLANG}" = "1" ] +} + +set_trace_on + +# The behaviour can be changed with 'input' env var +: "${INPUT_CCACHE_MAXSIZE:=5G}" +: "${INPUT_NO_BLOCK:=0}" +: "${INPUT_PACKETDRILL_NO_SYNC:=0}" +: "${INPUT_PACKETDRILL_NO_MORE_TOLERANCE:=0}" +: "${INPUT_PACKETDRILL_STABLE:=0}" +: "${INPUT_RUN_LOOP_CONTINUE:=0}" +: "${INPUT_RUN_TESTS_ONLY:=""}" +: "${INPUT_RUN_TESTS_EXCEPT:=""}" +: "${INPUT_SELFTESTS_DIR:=""}" +: "${INPUT_SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES:=1}" +: "${INPUT_SELFTESTS_MPTCP_LIB_OVERRIDE_FLAKY:=0}" +: "${INPUT_SELFTESTS_MPTCP_LIB_COLOR_FORCE:=1}" +: "${INPUT_CPUS:=""}" +: "${INPUT_CI_RESULTS_DIR:=""}" +: "${INPUT_CI_PRINT_EXIT_CODE:=1}" +: "${INPUT_CI_TIMEOUT_SEC:=7200}" +: "${INPUT_EXPECT_TIMEOUT:="-1"}" +: "${INPUT_BUILD_SKIP_PERF:=1}" + +if [ -z "${INPUT_MODE}" ]; then + INPUT_MODE="${1}" + shift || true # none set +fi + +# to be able to set an extra env var +if [[ "${INPUT_EXTRA_ENV}" =~ ^"INPUT_"[A-Z0-9_]+"="[a-zA-Z0-9_]+$ ]]; then + eval "${INPUT_EXTRA_ENV}" +fi + +: "${PACKETDRILL_GIT_BRANCH:=mptcp-net-next}" +: "${VIRTME_ARCH:="$(uname -m)"}" + +TIMESTAMPS_SEC_START=$(date +%s) +# CI only: estimated time before (clone + boot) and after (artifacts) running this script +VIRTME_CI_ESTIMATED_EXTRA_TIME="540" + +# max time to boot: it should take less than one minute with a debug kernel, *5 to be safe +VIRTME_EXPECT_BOOT_TIMEOUT="300" + +KERNEL_SRC="${PWD}" + +# used to pass environment variables to the VM +BASH_PROFILE="/root/.bash_profile" + +VIRTME_WORKDIR="${KERNEL_SRC}/.virtme" +VIRTME_BUILD_DIR="${VIRTME_WORKDIR}/build" +with_clang && VIRTME_BUILD_DIR+="-clang" +VIRTME_SCRIPTS_DIR="${VIRTME_WORKDIR}/scripts" +VIRTME_HEADERS_DIR="${VIRTME_WORKDIR}/headers" +VIRTME_PERF_DIR="${VIRTME_BUILD_DIR}/tools/perf" +VIRTME_TOOLS_SBIN_DIR="${VIRTME_BUILD_DIR}/tools/sbin" +VIRTME_CACHE_DIR="${VIRTME_BUILD_DIR}/.cache" + +VIRTME_KCONFIG="${VIRTME_BUILD_DIR}/.config" + +VIRTME_SCRIPT="${VIRTME_SCRIPTS_DIR}/tests.sh" +VIRTME_SCRIPT_END="__VIRTME_END__" +VIRTME_SCRIPT_UNEXPECTED_STOP="Unexpected stop of the VM" +VIRTME_RUN_SCRIPT="${VIRTME_SCRIPTS_DIR}/virtme.sh" +VIRTME_RUN_EXPECT="${VIRTME_SCRIPTS_DIR}/virtme.expect" + +SELFTESTS_DIR="${INPUT_SELFTESTS_DIR:-tools/testing/selftests/net/mptcp}" +SELFTESTS_CONFIG="${SELFTESTS_DIR}/config" +BPFTESTS_DIR="${INPUT_BPFTESTS_DIR:-tools/testing/selftests/bpf}" +BPFTESTS_CONFIG="${BPFTESTS_DIR}/config" + +export CCACHE_MAXSIZE="${INPUT_CCACHE_MAXSIZE}" +export CCACHE_DIR="${VIRTME_WORKDIR}/ccache" +with_clang && CCACHE_DIR+="-clang" + +export KBUILD_OUTPUT="${VIRTME_BUILD_DIR}" +export KCONFIG_CONFIG="${VIRTME_KCONFIG}" + +mkdir -p \ + "${VIRTME_BUILD_DIR}" \ + "${VIRTME_SCRIPTS_DIR}" \ + "${VIRTME_HEADERS_DIR}" \ + "${VIRTME_PERF_DIR}" \ + "${VIRTME_CACHE_DIR}" \ + "${CCACHE_DIR}" +chmod 777 "${VIRTME_CACHE_DIR}" # to let users writting files there, e.g. clangd + +VIRTME_CONFIGKERNEL="virtme-configkernel" +VIRTME_RUN="virtme-run" +VIRTME_RUN_OPTS_DEFAULT=( + --arch "${VIRTME_ARCH}" + --name "mptcpdev" # hostname + --memory 2048M + --kdir "${VIRTME_BUILD_DIR}" + --mods=auto + --rw # Don't use "rwdir", it will use 9p ; in a container, we can use rw + --pwd + --show-command + --verbose --show-boot-console + --kopt mitigations=off +) + +# results dir +RESULTS_DIR_BASE="${VIRTME_WORKDIR}/results" +RESULTS_DIR= + +# log files +OUTPUT_VIRTME= +TESTS_SUMMARY= +CONCLUSION= +KMEMLEAK= + +EXIT_STATUS=0 +EXIT_REASONS=() +EXIT_TITLE="KVM Validation" +EXPECT=0 +VIRTME_EXEC_RUN="${KERNEL_SRC}/.virtme-exec-run" +VIRTME_EXEC_PRE="${KERNEL_SRC}/.virtme-exec-pre" +VIRTME_EXEC_POST="${KERNEL_SRC}/.virtme-exec-post" +VIRTME_PREPARE_POST="${KERNEL_SRC}/.virtme-prepare-post" + +COLOR_RED="\E[1;31m" +COLOR_GREEN="\E[1;32m" +COLOR_YELLOW="\E[1;33m" +COLOR_BLUE="\E[1;34m" +COLOR_RESET="\E[0m" + +# $1: color, $2: text +print_color() { + echo -e "${START_PRINT:-}${*}${COLOR_RESET}" +} + +print() { + print_color "${COLOR_GREEN}${*}" +} + +printinfo() { + print_color "${COLOR_BLUE}${*}" +} + +printerr() { + print_color "${COLOR_RED}${*}" >&2 +} + +if is_github_action; then + # $1: description + log_section_start() { + echo -e "\n::group::${COLOR_YELLOW}${*}${COLOR_RESET}" + } + + log_section_end() { + echo -e "::endgroup::\n" + } +else + # $1: description + log_section_start() { + printinfo "${@}" + } + + log_section_end() { + true + } +fi + +setup_env() { local mode net=() + mode="${1}" + + log_section_start "Setup environment" + + # Avoid 'unsafe repository' error: we need to get the rev/tag later from + # this docker image + git config --global --replace-all safe.directory "${KERNEL_SRC}" || true + + # Set a name, just in case for automations + git config --global user.name "MPTCP Virtme Docker" + git config --global user.email "DO-NOT@SEND.THIS" + + if is_ci; then + # Root dir: not to have to go down dirs to get artifacts + RESULTS_DIR="${KERNEL_SRC}${INPUT_CI_RESULTS_DIR:+/${INPUT_CI_RESULTS_DIR}}" + mkdir -p "${RESULTS_DIR}" + + : "${INPUT_CPUS:=$(nproc)}" # use all available resources + + EXIT_TITLE="${EXIT_TITLE}: ${mode}" # only one mode + + if [ -n "${INPUT_RUN_TESTS_ONLY}" ]; then + EXIT_TITLE="${EXIT_TITLE} (only ${INPUT_RUN_TESTS_ONLY})" + fi + + if [ -n "${INPUT_RUN_TESTS_EXCEPT}" ]; then + EXIT_TITLE="${EXIT_TITLE} (except ${INPUT_RUN_TESTS_EXCEPT})" + fi + + # The CI doesn't need to access to the outside world, so no '--net' + else + # avoid override + RESULTS_DIR="${RESULTS_DIR_BASE}/$(git rev-parse --short HEAD || echo "UNKNOWN")/${mode}" + rm -rf "${RESULTS_DIR}" + mkdir -p "${RESULTS_DIR}" + + : "${INPUT_CPUS:=2}" # limit to 2 cores for now + + # add net support, can be useful, but delay the start of the tests (~1 sec?) + net=("--net") + fi + + VIRTME_RUN_OPTS=( + "${VIRTME_RUN_OPTS_DEFAULT[@]}" + --cpus "${INPUT_CPUS}" + "${net[@]}" + ) + + OUTPUT_VIRTME="${RESULTS_DIR}/output.log" + TESTS_SUMMARY="${RESULTS_DIR}/summary.txt" + CONCLUSION="${RESULTS_DIR}/conclusion.txt" + KMEMLEAK="${RESULTS_DIR}/kmemleak.txt" + + KVERSION=$(make -C "${KERNEL_SRC}" -s kernelversion) ## 5.17.0 or 5.17.0-rc8 + KVER_MAJ=${KVERSION%%.*} ## 5 + KVER_MIN=${KVERSION#*.} ## 17.0* + KVER_MIC=${KVER_MIN#*.} ## 0 + KVER_MIN=${KVER_MIN%%.*} ## 17 + + # without rc, it means we probably already merged with net-next + if [[ ! "${KVERSION}" =~ rc ]] && [ "${KVER_MIC}" = 0 ]; then + KVER_MIN=$((KVER_MIN + 1)) + + # max .19 because Linus has 20 fingers + if [ ${KVER_MIN} -gt 19 ]; then + KVER_MAJ=$((KVER_MAJ + 1)) + KVER_MIN=0 + fi + fi + + if [ "${KVER_MAJ}" -lt 5 ] || + { [ "${KVER_MAJ}" -eq 5 ] && [ "${KVER_MIN}" -le 10 ]; }; then + # virtiofs doesn't seem to be supported on old kernels + VIRTME_RUN_OPTS+=(--force-9p) + fi + + log_section_end +} + +_get_last_iproute_version() { + curl https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/refs/tags 2>/dev/null | \ + grep "/tag/?h=v[0-9]" | \ + cut -d\' -f2 | cut -d= -f2 | \ + sort -Vu | \ + tail -n1 +} + +check_last_iproute() { local last curr + # only check on CI + if ! is_ci; then + return 0 + fi + + # skip the check for stable, fine not to have the latest version + if [ "${INPUT_PACKETDRILL_STABLE}" = "1" ]; then + return 0 + fi + + log_section_start "Check IPRoute2 version" + + last="$(_get_last_iproute_version)" + curr="v$(ip -V | sed 's/.*iproute2-\([0-9.]\+\).*/\1/')" + if [ "${curr}" = "${last}" ]; then + printinfo "IPRoute2: using the last version: ${last}" + else + printerr "WARN: IPRoute2: not the last version: ${curr} < ${last}" + fi + + log_section_end +} + +_check_source_exec_one() { + local src="${1}" + local reason="${2}" + + if [ -f "${src}" ]; then + printinfo "This script file exists and will be used ${reason}: $(basename "${src}")" + cat -n "${src}" + + if is_ci || [ "${INPUT_NO_BLOCK}" = "1" ]; then + printinfo "Check source exec: not blocking" + else + print "Press Enter to continue (use 'INPUT_NO_BLOCK=1' to avoid this)" + read -r + fi + fi +} + +check_source_exec_all() { + log_section_start "Check extented exec files" + + _check_source_exec_one "${VIRTME_EXEC_PRE}" "before the tests suite" + _check_source_exec_one "${VIRTME_EXEC_RUN}" "to replace the execution of the whole tests suite" + _check_source_exec_one "${VIRTME_EXEC_POST}" "after the tests suite" + + log_section_end +} + +read -ra MAKE_ARGS <<< "${INPUT_MAKE_ARGS}" +with_clang && MAKE_ARGS+=(LLVM=1 LLVM_IAS=1 CC=clang ARCH="${VIRTME_ARCH}") +MAKE_ARGS_O=("${MAKE_ARGS[@]}" O="${VIRTME_BUILD_DIR}") + +_make_j() { + make -j"$(nproc)" -l"$(nproc)" "${@}" +} + +_make() { + _make_j "${MAKE_ARGS[@]}" "${@}" +} + +_make_o() { + _make_j "${MAKE_ARGS_O[@]}" "${@}" +} + +# $1: source ; $2: target +_add_symlink() { + local src="${1}" + local dst="${2}" + + if [ -e "${dst}" ] && [ ! -L "${dst}" ]; then + printerr "${dst} already exists and is not a symlink, please remove it" + return 1 + fi + + ln -sf "${src}" "${dst}" +} + +# $1: mode ; [rest: extra kconfig] +gen_kconfig() { local mode kconfig=() vck rc=0 + mode="${1}" + shift + + log_section_start "Generate kernel config" + + vck=(--arch "${VIRTME_ARCH}" --defconfig --custom "${SELFTESTS_CONFIG}") + + if [ "${mode}" = "debug" ]; then + kconfig+=( + -e NET_NS_REFCNT_TRACKER # useful for 'net' tests + -d SLUB_DEBUG_ON # perf impact is too important + -e BOOTPARAM_SOFTLOCKUP_PANIC # instead of blocking + -e BOOTPARAM_HUNG_TASK_PANIC # instead of blocking + ) + + vck+=(--custom kernel/configs/debug.config) + else + # low-overhead sampling-based memory safety error detector. + # Only in non-debug: KASAN is more precise + kconfig+=(-e KFENCE) + fi + + # stop at the first oops, no need to continue in a bad state + kconfig+=(-e PANIC_ON_OOPS) + + # Debug info for developers + kconfig+=(-e DEBUG_INFO -e DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT -e GDB_SCRIPTS) + if with_clang; then + kconfig+=(-e DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT) + else + # decode_stacktrace.sh script reports '??:?' with GCC and DWARF5 + kconfig+=(-e DEBUG_INFO_DWARF4) + fi + + # Compressed (old/new option) + kconfig+=(-e DEBUG_INFO_COMPRESSED -e DEBUG_INFO_COMPRESSED_ZLIB) + + # We need more debug info but it is slow to generate + if [ "${mode}" = "btf" ]; then + vck+=(--custom "${BPFTESTS_CONFIG}") + kconfig+=(-e DEBUG_INFO_BTF_MODULES -e MODULE_ALLOW_BTF_MISMATCH) + # Fix ./include/linux/if.h:28:10: fatal error: + # sys/socket.h: no such file or directory + kconfig+=(-d IA32_EMULATION) + elif is_ci || [ "${mode}" != "debsym" ]; then + kconfig+=(-e DEBUG_INFO_REDUCED -e DEBUG_INFO_SPLIT) + fi + + # Debug tools for developers + kconfig+=( + -e DYNAMIC_DEBUG --set-val CONSOLE_LOGLEVEL_DEFAULT 8 + -e FTRACE -e FUNCTION_TRACER -e DYNAMIC_FTRACE + -e FTRACE_SYSCALLS -e HIST_TRIGGERS + ) + + # Extra sanity checks in networking: for the moment, small checks + kconfig+=(-e DEBUG_NET) + + # Extra options needed for MPTCP KUnit tests + kconfig+=(-m KUNIT -e KUNIT_DEBUGFS -d KUNIT_ALL_TESTS -m MPTCP_KUNIT_TEST) + + # Options for BPF + kconfig+=(-e BPF_JIT -e BPF_SYSCALL) + + # Extra options needed for packetdrill + # note: we still need SHA1 for fallback tests with v0 + kconfig+=(-e TUN -e CRYPTO_USER_API_HASH -e CRYPTO_SHA1) + + # Useful to reproduce issue + kconfig+=(-e NET_SCH_TBF) + + # Disable retpoline to accelerate tests + kconfig+=(-d RETPOLINE) + + # Disable components we don't need + kconfig+=( + -d PCCARD -d MACINTOSH_DRIVERS -d SOUND -d USB_SUPPORT + -d NEW_LEDS -d SURFACE_PLATFORMS -d DRM -d FB + ) + + # extra config + kconfig+=("${@}") + + # KBUILD_OUTPUT is used by virtme + "${VIRTME_CONFIGKERNEL}" "${vck[@]}" "${MAKE_ARGS_O[@]}" || rc=${?} + + ./scripts/config --file "${VIRTME_KCONFIG}" "${kconfig[@]}" || rc=${?} + + _make_o olddefconfig || rc=${?} + + if is_ci; then + # Useful to help reproducing issues later + zstd -19 -T0 "${VIRTME_KCONFIG}" -o "${RESULTS_DIR}/config.zstd" || rc=${?} + fi + + log_section_end + + return ${rc} +} + +build_kernel() { local rc=0 + log_section_start "Build kernel" + + _make_o || rc=${?} + + # virtme will mount a tmpfs there + symlink to .virtme_mods + mkdir -p /lib/modules + + log_section_end + + return ${rc} +} + +build_compile_commands() { local rc=0 + log_section_start "Build compile_commands.json" + + _make_o compile_commands.json || rc=${?} + + log_section_end + + return ${rc} +} + +install_kernel_headers() { local rc=0 + log_section_start "Install kernel headers" + + # for BPFTrace and cie + cp -r include/ "${VIRTME_BUILD_DIR}" + + _make_o headers_install INSTALL_HDR_PATH="${VIRTME_HEADERS_DIR}" || rc=${?} + + log_section_end + + return ${rc} + +} + +build_perf() { local rc=0 + if [ "${INPUT_BUILD_SKIP_PERF}" = 1 ]; then + printinfo "Skip Perf build" + return 0 + fi + + log_section_start "Build Perf" + + cd tools/perf + + _make O="${VIRTME_PERF_DIR}" DESTDIR=/usr install || rc=${?} + + cd "${KERNEL_SRC}" + + log_section_end + + return ${rc} +} + +build() { + if [ "${INPUT_BUILD_SKIP}" = 1 ]; then + printinfo "Skip kernel build" + return 0 + fi + + build_kernel + if [ "${EXPECT}" = 0 ] && with_clang; then + build_compile_commands || true # nice to have + fi + install_kernel_headers + build_perf +} + +build_selftests() { local rc=0 + if [ "${INPUT_BUILD_SKIP_SELFTESTS}" = 1 ]; then + printinfo "Skip selftests build" + return 0 + fi + + log_section_start "Build the selftests $(basename "${SELFTESTS_DIR}")" + + _make_o KHDR_INCLUDES="-I${VIRTME_HEADERS_DIR}/include" -C "${SELFTESTS_DIR}" || rc=${?} + + log_section_end + + return ${rc} +} + +build_bpftests() { local rc=0 + if [ "${INPUT_BUILD_SKIP_BPFTESTS}" = 1 ]; then + printinfo "Skip bpftests build" + return 0 + fi + + log_section_start "Build BPFTests" + + _make_o KHDR_INCLUDES="-I${VIRTME_HEADERS_DIR}/include" -C "${BPFTESTS_DIR}" || rc=${?} + + log_section_end + + return ${rc} +} + +build_packetdrill() { local old_pwd kversion branch rc=0 + if [ "${INPUT_BUILD_SKIP_PACKETDRILL}" = 1 ]; then + printinfo "Skip Packetdrill build" + return 0 + fi + + log_section_start "Build Packetdrill" + + old_pwd="${PWD}" + + # make sure we have the last stable tests + cd /opt/packetdrill/ + if [ "${INPUT_PACKETDRILL_NO_SYNC}" = "1" ]; then + printinfo "Packetdrill: no sync" + else + git fetch origin + + branch="${PACKETDRILL_GIT_BRANCH}" + if [ "${INPUT_PACKETDRILL_STABLE}" = "1" ]; then + kversion="mptcp-${KVER_MAJ}.${KVER_MIN}" + # set the new branch only if it exists. If not, take the dev one + if git show-ref --quiet "refs/remotes/origin/${kversion}"; then + branch="${kversion}" + fi + fi + git checkout -f "origin/${branch}" + fi + cd gtests/net/packetdrill/ + ./configure + _make || rc=${?} + + if [ "${INPUT_PACKETDRILL_NO_MORE_TOLERANCE}" = "1" ]; then + printinfo "Packetdrill: not modifying the tolerance" + else + cd ../mptcp + # reduce debug logs: too much + set_trace_off + + local pf val new_val + for pf in $(git grep -l "^--tolerance_usecs="); do + # shellcheck disable=SC2013 # to filter duplicated ones + for val in $(grep "^--tolerance_usecs=" "${pf}" | cut -d= -f2 | sort -u); do + if [ "${mode}" = "debug" ]; then + # Increase tolerance in debug mode: + # the environment can be very slow + new_val=$((val * 8)) + else + # Triple the time in normal mode: + # public CI can be quite loaded... + new_val=$((val * 3)) + fi + + sed -i "s/^--tolerance_usecs=${val}$/--tolerance_usecs=${new_val}/g" "${pf}" + done + done + + set_trace_on + fi + cd "${old_pwd}" + + log_section_end + + return ${rc} +} + +prepare() { local mode no_tap=1 + mode="${1}" + + printinfo "Prepare the environment" + + build_selftests + if [ "${mode}" = "btf" ]; then + build_bpftests + fi + build_packetdrill + + if is_ci; then + no_tap=0 # we want subtests + fi + + cat < "${BASH_PROFILE}" +export KERNEL_BUILD_DIR="${VIRTME_BUILD_DIR}" +export KERNEL_SRC_DIR="${KERNEL_SRC}" +export PATH="\${PATH}:${VIRTME_TOOLS_SBIN_DIR}" +EOF + + cat < "${VIRTME_SCRIPT}" +#! /bin/bash + +if [ "${INPUT_TRACE}" = "1" ]; then + set -x +fi + +# useful for virtme-exec-run +TAP_PREFIX="${KERNEL_SRC}/tools/testing/selftests/kselftest/prefix.pl" +RESULTS_DIR="${RESULTS_DIR}" +OUTPUT_VIRTME="${OUTPUT_VIRTME}" +KUNIT_CORE_LOADED=0 +MAX_THREADS=${INPUT_MAX_THREADS:-$((INPUT_CPUS * 2))} +export SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES="${INPUT_SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES}" +export SELFTESTS_MPTCP_LIB_OVERRIDE_FLAKY="${INPUT_SELFTESTS_MPTCP_LIB_OVERRIDE_FLAKY}" +export SELFTESTS_MPTCP_LIB_COLOR_FORCE="${INPUT_SELFTESTS_MPTCP_LIB_COLOR_FORCE}" +export SELFTESTS_MPTCP_LIB_NO_TAP="${no_tap}" + +set_max_threads() { + # if QEmu without KVM support + if [ "${mode}" == "debug" ] || + { [ "\$(cat /sys/devices/virtual/dmi/id/sys_vendor)" = "QEMU" ] && + [ "\$(cat /sys/devices/system/clocksource/clocksource0/current_clocksource)" != "kvm-clock" ]; }; then + MAX_THREADS=$((MAX_THREADS / 2)) # avoid too many concurrent work + fi +} + +if [ "${GITHUB_ACTIONS}" = "true" ]; then + # \$1: description + log_section_start() { + echo -e "\n::group::${COLOR_YELLOW}\${*}${COLOR_RESET}" + } + + log_section_end() { + echo -e "::endgroup::\n" + } +else + # \$1: description + log_section_start() { + echo -e "${COLOR_BLUE}\${*}${COLOR_RESET}" + } + + log_section_end() { + true + } +fi + +# \$1: name of the test +_can_run() { local tname + tname="\${1}" + + # only some tests? + if [ -n "${INPUT_RUN_TESTS_ONLY}" ]; then + if ! echo "${INPUT_RUN_TESTS_ONLY}" | grep -wq "\${tname}"; then + return 1 + fi + fi + + # not some tests? + if [ -n "${INPUT_RUN_TESTS_EXCEPT}" ]; then + if echo "${INPUT_RUN_TESTS_EXCEPT}" | grep -wq "\${tname}"; then + return 1 + fi + fi + + return 0 +} + +can_run() { + # Use the function name of the caller without the prefix + _can_run "\${FUNCNAME[1]#*_}" +} + +# \$1: file ; \$2+: commands +_tap() { local out out_subtests tmp fname rc ok nok msg cmt ts_s_start ts_s_stop + out="\${1}.tap" + out_subtests="\${1}_subtests.tap" + fname="\$(basename \${1})" + shift + + rm -f "\${out}" "\${out_subtests}" + # With TAP, we have first the summary, then the diagnostic + tmp="\${out}.tmp" + ok="ok 1 test: \${fname}" + nok="not \${ok}" + ts_s_start=\$(date +%s) + + # init + { + echo "TAP version 13" + echo "1..1" + } | tee "\${out}" + + # Exec the command and pipe in tap prefix + store for later + "\${@}" 2>&1 | "\${TAP_PREFIX}" | tee "\${tmp}" + # output to stdout now to see the progression + rc=\${PIPESTATUS[0]} + ts_s_stop=\$(date +%s) + + # summary + case \${rc} in + 0) + msg="\${ok}" + ;; + 1) + msg="\${nok}" + cmt=FAIL + ;; + 2) + msg="\${nok}" + cmt=XFAIL + ;; + 3) + msg="\${nok}" + cmt=XPASS + ;; + 4) + cmt=SKIP + if [ "\${SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES}" = "1" ]; then + msg="\${nok}" + else + msg="\${ok}" + fi + ;; + *) + msg="\${nok}" + cmt="FAIL # exit=\${rc}" + ;; + esac + # note: '#' is a directive, not a comment: we imitate kselftest/runner.sh + echo "\${msg}\${cmt+ # }\${cmt}" | tee -a "\${out}" + + # diagnostic at the end with TAP + # Strip colours: https://stackoverflow.com/a/18000433 + # Also extract subtests displayed at the end, if any, in a different file without "#" + sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]//g" "\${tmp}" | \ + awk "BEGIN { subtests=0 } { + if (subtests == 0 && \\\$0 ~ /^# TAP version /) { subtests=1 }; + if (subtests == 0) { print >> \"\${out}\" } + else { for (i=2; i <= NF; i++) printf(\"%s\", ((i>2) ? OFS : \"\") \\\$i) >> \"\${out_subtests}\" ; printf(\"\n\") >> \"\${out_subtests}\" } + }" + rm -f "\${tmp}" + + echo "# time=\$((ts_s_stop - ts_s_start))" | tee -a "\${out}" + + return \${rc} +} + +# \$1: kunit path ; \$2: kunit test +_kunit_result() { + if ! grep -q "^KTAP" "\${1}" 2>/dev/null; then + echo "TAP version 14" + echo "1..1" + fi + + if ! cat "\${1}"; then + echo "not ok 1 test: \${2} # no kunit result" + return 1 + fi +} + +run_kunit_core() { + [ "\${KUNIT_CORE_LOADED}" = 1 ] && return 0 + KUNIT_CORE_LOADED=1 + + _tap "${RESULTS_DIR}/kunit" insmod ${VIRTME_BUILD_DIR}/lib/kunit/kunit.ko +} + +# \$1: .ko path +run_kunit_one() { local ko kunit kunit_path rc=0 + ko="\${1}" + + kunit="\${ko#${VIRTME_BUILD_DIR}/}" # remove abs dir + kunit="\${kunit:10:-8}" # remove net/mptcp (10) + _test.ko (8) + kunit="\${kunit//_/-}" # dash + kunit_path="/sys/kernel/debug/kunit/\${kunit}/results" + + log_section_start "KUnit Test: \${kunit}" + + run_kunit_core || return \${?} + + insmod "\${ko}" || true # errors will also be visible below: no results + _kunit_result "\${kunit_path}" "\${kunit}" | tee "${RESULTS_DIR}/kunit_\${kunit}.tap" || rc=\${?} + + log_section_end + + return \${rc} +} + +run_kunit_all() { local ko rc=0 + can_run || return 0 + + cd "${KERNEL_SRC}" + + for ko in ${VIRTME_BUILD_DIR}/net/mptcp/*_test.ko; do + run_kunit_one "\${ko}" || rc=\${?} + done + + return \${rc} +} + +# \$1: output tap file; rest: command to launch +_run_selftest_one_tap() { + cd "${KERNEL_SRC}/${SELFTESTS_DIR}" + _tap "\${@}" +} + +# \$1: script file; rest: command to launch +run_selftest_one() { local sf tap rc=0 + sf=\$(basename \${1}) + tap=selftest_\${sf:0:-3} + shift + + _can_run "\${tap}" || return 0 + + log_section_start "Selftest Test: ./\${sf}\${1:+ \${*}}" + _run_selftest_one_tap "${RESULTS_DIR}/\${tap}" "./\${sf}" "\${@}" || rc=\${?} + log_section_end + + return \${rc} +} + +run_selftest_all() { local sf rc=0 + # The following command re-do a slow headers install + compilation in a different dir + #make O="${VIRTME_BUILD_DIR}" --silent -C tools/testing/selftests TARGETS=net/mptcp run_tests + + for sf in "${KERNEL_SRC}/${SELFTESTS_DIR}/"*.sh; do + if [ -x "\${sf}" ]; then + run_selftest_one "\${sf}" || rc=\${?} + fi + done + + return \${rc} +} + +_run_mptcp_connect_opt() { local t="mptcp_connect_\${1}" rc=0 + shift + + log_section_start "Selftest Test: ./mptcp_connect.sh \${*}" + MPTCP_LIB_KSFT_TEST=\${t} _run_selftest_one_tap "${RESULTS_DIR}/\${t}" ./mptcp_connect.sh "\${@}" || rc=\${?} + log_section_end + + return \${rc} +} + +run_mptcp_connect_mmap() { + can_run || return 0 + + _run_mptcp_connect_opt mmap -m mmap +} + +# \$1: packetdrill TAP file, \$2: TAP prefix +_packetdrill_result() { + if grep -q "^TAP version 13" "\${1}" 2>/dev/null; then + sed -i "s#\${PWD}/#packetdrill: #g" "\${1}" # remove long path + prefix + return 0 + fi + + { + echo "TAP version 13" + echo "1..1" + echo "not ok 1 test: \${2} # no result" + } > "\${1}" + + return 1 +} + +# \$1: pktd_dir (e.g. mptcp/dss) +run_packetdrill_one() { local pktd_dir pktd tap rc=0 + pktd_dir="\${1}" + pktd="\$(basename "\${pktd_dir}" ".pkt")" # remove ext just in case + tap="packetdrill_\${pktd}" + + if [ "\${pktd}" = "common" ]; then + return 0 + fi + + _can_run "\${tap}" || return 0 + + log_section_start "Packetdrill Test: \${pktd}" + cd /opt/packetdrill/gtests/net/ + PYTHONUNBUFFERED=1 ./packetdrill/run_all.py -t "${RESULTS_DIR}" \ + -l -v -P \${MAX_THREADS} \${pktd_dir} || rc=\${?} + _packetdrill_result "${RESULTS_DIR}/\${tap}.tap" "\${tap}" || rc=\${?} + log_section_end + + return \${rc} +} + +run_packetdrill_all() { local pktd_dir rc=0 + cd /opt/packetdrill/gtests/net/ + + # dry run just to "heat" up the environment: the first tests are always + # slower, especially with a debug kernel + ./packetdrill/run_all.py mptcp/add_addr/add_addr4_server.pkt &>/dev/null || true + + for pktd_dir in mptcp/*; do + run_packetdrill_one "\${pktd_dir}" || rc=\${?} + done + + return \${rc} +} + +# \$1: output tap file; rest: command to launch +_run_bpftest_one_tap() { + cd "${VIRTME_BUILD_DIR}" + _tap "\${@}" +} + +# \$1: script file; rest: command to launch +run_bpftest_one() { local bf bt tap rc=0 + bf=\$(basename \${1}) + bt=\${2} + tap=bpftest_\${bf}_\${bt} + + log_section_start "BPF Test: \${bf} -t \${bt}" + _run_bpftest_one_tap "${RESULTS_DIR}/\${tap}" "./\${bf}" -t "\${bt}" || rc=\${?} + log_section_end + + return \${rc} +} + +run_bpftest_all() { + can_run || return 0 + + if [ "${mode}" = "btf" ]; then + local sf rc=0 + + for sf in "${VIRTME_BUILD_DIR}/"test_progs*; do + if [ -x "\${sf}" ]; then + run_bpftest_one "\${sf}" mptcp || rc=\${?} + fi + done + + return \${rc} + else + echo "Skip BPF tests: only supported in the 'btf' mode" + fi +} + +run_all() { + run_kunit_all + run_selftest_all + run_mptcp_connect_mmap + run_packetdrill_all + run_bpftest_all +} + +has_call_trace() { + grep -q "[C]all Trace:" "${OUTPUT_VIRTME}" +} + +kmemleak_scan() { + if [ "${mode}" = "debug" ]; then + echo scan > /sys/kernel/debug/kmemleak + cat /sys/kernel/debug/kmemleak > "${KMEMLEAK}" + fi +} + +# \$1: max iterations (<1 means no limit) ; args: what needs to be executed +run_loop_n() { local i tdir rc=0 + n=\${1} + shift + + tdir="${KERNEL_SRC}/${SELFTESTS_DIR}" + if ls "\${tdir}/"*.pcap &>/dev/null; then + mkdir -p "\${tdir}/pcaps" + mv "\${tdir}/"*.pcap "\${tdir}/pcaps" + fi + + i=1 + while true; do + echo -e "\n\n\t=== ${COLOR_BLUE}Attempt: \${i} (\$(date -R))${COLOR_RESET} ===\n\n" + + if ! "\${@}" || has_call_trace; then + rc=1 + + echo -e "\n\n\t=== ${COLOR_RED}ERROR after \${i} attempts (\$(date -R))${COLOR_RESET} ===\n\n" + + if [ "${INPUT_RUN_LOOP_CONTINUE}" = "1" ]; then + echo "Attempt: \${i}" >> "${CONCLUSION}.failed" + else + break + fi + fi + + rm -f "\${tdir}/"*.pcap 2>/dev/null + + if [ "\${i}" = "\${n}" ]; then + break + fi + + i=\$((i+1)) + done + + echo -e "\n\n\t${COLOR_BLUE}Stopped after \${i} attempts${COLOR_RESET}\n\n" + + return "\${rc}" +} + +# args: what needs to be executed +run_loop() { + run_loop_n 0 "\${@}" +} + +set_max_threads + +# To run commands before executing the tests +if [ -f "${VIRTME_EXEC_PRE}" ]; then + source "${VIRTME_EXEC_PRE}" + # e.g.: + # echo "file net/mptcp/* +fmp" > /sys/kernel/debug/dynamic_debug/control + # echo __mptcp_subflow_connect > /sys/kernel/tracing/set_graph_function + # echo printk > /sys/kernel/tracing/set_graph_notrace + # echo function_graph > /sys/kernel/tracing/current_tracer +fi + +# To exec different tests than the full suite +if [ -f "${VIRTME_EXEC_RUN}" ]; then + echo -e "\n\n\t${COLOR_YELLOW}Not running all tests but:${COLOR_RESET}\n\n-------- 8< --------\n\$(sed "s/#.*//g;/^\s*$/d" "${VIRTME_EXEC_RUN}")\n-------- 8< --------\n\n" + source "${VIRTME_EXEC_RUN}" + # e.g.: + # run_selftest_one ./mptcp_join.sh -f + # run_loop run_selftest_one ./simult_flows.sh + # run_packetdrill_one mptcp/dss +else + run_all +fi + +cd "${KERNEL_SRC}" + +kmemleak_scan + +# To run commands before executing the tests +if [ -f "${VIRTME_EXEC_POST}" ]; then + source "${VIRTME_EXEC_POST}" + # e.g.: cat /sys/kernel/tracing/trace +fi + +# end +echo "${VIRTME_SCRIPT_END}" +EOF + chmod +x "${VIRTME_SCRIPT}" + + if [ -f "${VIRTME_PREPARE_POST}" ]; then + # shellcheck source=/dev/null + source "${VIRTME_PREPARE_POST}" + fi +} + +run() { + printinfo "Run the virtme script: manual" + + "${VIRTME_RUN}" "${VIRTME_RUN_OPTS[@]}" +} + +run_expect() { + local timestamps_sec_stop + + if is_ci; then + timestamps_sec_stop=$(date +%s) + + # max - compilation time - before/after script + VIRTME_EXPECT_TEST_TIMEOUT=$((INPUT_CI_TIMEOUT_SEC - (timestamps_sec_stop - TIMESTAMPS_SEC_START) - VIRTME_CI_ESTIMATED_EXTRA_TIME)) + else + # disable timeout + VIRTME_EXPECT_TEST_TIMEOUT="${INPUT_EXPECT_TIMEOUT}" + fi + + # force a stop in case of panic, but avoid a reboot in "expect" mode + VIRTME_RUN_OPTS+=(--kopt panic=-1 --qemu-opts -no-reboot) + + printinfo "Run the virtme script: expect (timeout: ${VIRTME_EXPECT_TEST_TIMEOUT})" + + cat < "${VIRTME_RUN_SCRIPT}" +#! /bin/bash +echo -e "$(log_section_start "Boot VM")" +set -x +"${VIRTME_RUN}" ${VIRTME_RUN_OPTS[@]} 2>&1 | tr -d '\r' +EOF + chmod +x "${VIRTME_RUN_SCRIPT}" + + cat < "${VIRTME_RUN_EXPECT}" +#!/usr/bin/expect -f + +set timeout "${VIRTME_EXPECT_BOOT_TIMEOUT}" +spawn "${VIRTME_RUN_SCRIPT}" +expect { + "virtme-ng-init: initialization done\r" { + send_user "Waiting for the console to be ready\n" + send "\r" + } timeout { + send_user "\n$(log_section_end)" + send_user "Timeout virtme-ng-init: stopping\n" + exit 1 + } eof { + send_user "\n$(log_section_end)" + send_user "${VIRTME_SCRIPT_UNEXPECTED_STOP} (ttyS0)\n" + exit 1 + } +} + +set timeout "1" + +for {set i 0} {\$i < 60} {incr i 1} { + expect { + "root@" { + send_user "\n$(log_section_end)" + send_user "Starting the validation script (after \$i sec)\n" + break + } timeout { + sleep 1 + send "\r" + } eof { + send_user "\n$(log_section_end)" + send_user "${VIRTME_SCRIPT_UNEXPECTED_STOP} (console)\n" + exit 1 + } + } +} + +if {\$i >= 60} { + send_user "\n$(log_section_end)" + send_user "Timeout console: stopping (\$i)\n" + exit 1 +} + +set timeout "${VIRTME_EXPECT_TEST_TIMEOUT}" +send -- "stdbuf -oL ${VIRTME_SCRIPT}\r" + +expect { + "${VIRTME_SCRIPT_END}\r" { + send_user "validation script ended with success\n" + } timeout { + send_user "\n$(log_section_end)" + send_user "Timeout: sending Ctrl+C\n" + send "\x03\r" + sleep 2 + send "\x03\r" + } eof { + send_user "${VIRTME_SCRIPT_UNEXPECTED_STOP}\n" + exit 1 + } +} +send -- "/usr/lib/klibc/bin/poweroff\r" + +expect eof +EOF + chmod +x "${VIRTME_RUN_EXPECT}" + + # We could use "--script-sh", but we use expect to catch timeout, etc. + "${VIRTME_RUN_EXPECT}" | tee "${OUTPUT_VIRTME}" +} + +ccache_stat() { + if is_ci; then + log_section_start "CCache Stats" + ccache -s + log_section_end + fi +} + +# $1: category ; $2: mode ; $3: reason +_register_issue() { local msg + # only one mode in CI mode + if is_ci; then + msg="${1}: ${3}" + else + msg="${1} ('${2}' mode): ${3}" + fi + + if [ "${#EXIT_REASONS[@]}" -eq 0 ]; then + EXIT_REASONS=("${msg}") + else + EXIT_REASONS+=("-" "${msg}") + fi +} + +_had_issues() { + [ ${#EXIT_REASONS[@]} -gt 0 ] +} + +_had_critical_issues() { + echo "${EXIT_REASONS[*]}" | grep -q "Critical" +} + +# $1: end critical ; $2: end unstable +_print_issues() { + echo -n "${EXIT_REASONS[*]} " + if _had_critical_issues; then + echo "${1}" + else + echo "${2}" + fi +} + +_has_call_trace() { + grep -q "Call Trace:" "${OUTPUT_VIRTME}" +} + +_print_line() { + echo "==========================================" +} + +decode_stacktrace() { + ./scripts/decode_stacktrace.sh "${VIRTME_BUILD_DIR}/vmlinux" "${KERNEL_SRC}" "${VIRTME_BUILD_DIR}/.virtme_mods" +} + +_print_call_trace_info() { + echo + _print_line + echo "Call Trace:" + _print_line + grep --text -C 80 "Call Trace:" "${OUTPUT_VIRTME}" | decode_stacktrace + _print_line + echo "Call Trace found" +} + +_get_call_trace_status() { + echo "$(grep -c "Call Trace:" "${OUTPUT_VIRTME}") Call Trace(s)" +} + +_has_unexpected_stop() { + grep -q "${VIRTME_SCRIPT_UNEXPECTED_STOP}" "${OUTPUT_VIRTME}" +} + +_print_unexpected_stop() { + echo + _print_line + echo "${VIRTME_SCRIPT_UNEXPECTED_STOP}: see above" +} + +_has_timed_out() { + ! grep -q "${VIRTME_SCRIPT_END}" "${OUTPUT_VIRTME}" +} + +_print_timed_out() { + echo + _print_line + echo "Timeout:" + _print_line + tail -n 20 "${OUTPUT_VIRTME}" + _print_line + echo "Global Timeout" +} + +_has_kmemleak() { + [ -s "${KMEMLEAK}" ] +} + +_print_kmemleak() { + echo + _print_line + echo "KMemLeak:" + _print_line + decode_stacktrace < "${KMEMLEAK}" + _print_line + echo "KMemLeak detected" +} + +# $1: mode, rest: args for kconfig +_print_summary_header() { + local mode="${1}" + shift + + echo "== Summary ==" + echo + echo "Ref: ${GITHUB_REF_NAME:-${CIRRUS_TAG:-$(git describe --tags 2>/dev/null || git rev-parse --short HEAD 2>/dev/null || echo "Unknown")}}${GITHUB_SHA:+ (${GITHUB_SHA})}" + echo "Mode: ${mode}" + echo "Extra kconfig: ${*:-/}" + echo +} + +# [ $1: .tap file, summary file by default] +_has_failed_tests() { + grep -q "^not ok " "${1:-${TESTS_SUMMARY}}" +} + +# $1: prefix +_print_tests_results_subtests() { local tap ok + for tap in "${RESULTS_DIR}/${1}"*.tap; do + [[ "${tap}" = *"_*.tap" ]] && continue + grep -q "^not ok " "${tap}" && ok="not ok" || ok="ok" + echo "${ok} 1 test: $(basename "${tap}" ".tap")" + done +} + +_print_tests_result() { local flaky + echo "All tests:" + # only from the main tests + grep --text --no-filename -E "^(not )?ok 1 test: " "${RESULTS_DIR}"/*.tap || true + _print_tests_results_subtests "kunit_" + _print_tests_results_subtests "packetdrill_" + + if is_ci; then + flaky="$(grep --text --no-filename -F " # IGNORE Flaky" "${RESULTS_DIR}"/*_subtests.tap || true)" + else + flaky="$(grep --text --no-filename -F "[IGNO] (flaky)" "${RESULTS_DIR}"/*.tap || true)" + fi + if [ -n "${flaky}" ]; then + echo + echo "Flaky tests:" + echo "${flaky}" + fi +} + +_print_failed_tests() { local t + echo + _print_line + echo "Failed tests:" + for t in "${RESULTS_DIR}"/*.tap; do + if _has_failed_tests "${t}"; then + _print_line + echo "- $(basename "${t}"):" + echo + grep -av "^ok [0-9]\+ " "${t}" + fi + done + _print_line +} + +_get_failed_tests() { + # not ok 1 test: selftest_mptcp_join.tap # exit=1 + # we just want the main results, not the detailed ones for the moment + grep --text "^not ok 1 test: " "${TESTS_SUMMARY}" | \ + awk '{ print $5 }' | \ + sort -u | \ + sed "s/\.tap$//g" +} + +_get_failed_tests_status() { local t fails=() + for t in $(_get_failed_tests); do + fails+=("${t}") + done + + echo "${#fails[@]} failed test(s): ${fails[*]}" +} + +_gen_results_files() { + LANG=C tap2junit "${RESULTS_DIR}"/*.tap + + # remove prefix id (unique test) and comments (status, time) + sed -i 's/\(/">/g' "${RESULTS_DIR}"/*.tap.xml + + LANG=C /tap2json.py \ + --output "${RESULTS_DIR}/results.json" \ + --info "run_id:${GITHUB_RUN_ID:-"none"}" \ + --only-fails \ + "${RESULTS_DIR}"/*.tap +} + +# $1: mode, rest: args for kconfig +analyze() { + # reduce log that could be wrongly interpreted + set_trace_off + + local mode="${1}" + shift + + printinfo "Analyze results" + + if is_ci; then + _gen_results_files || true + fi + + echo -ne "\n${COLOR_GREEN}" + _print_summary_header "${mode}" "${@}" | tee "${TESTS_SUMMARY}" + _print_tests_result | tee -a "${TESTS_SUMMARY}" + + echo -ne "${COLOR_RESET}\n${COLOR_RED}" + + if _has_failed_tests; then + # no tee, it can be long and less important than critical err + _print_failed_tests >> "${TESTS_SUMMARY}" + _register_issue "Unstable" "${mode}" "$(_get_failed_tests_status)" + EXIT_STATUS=42 + fi + + # look for crashes/warnings + if _has_call_trace; then + _print_call_trace_info | tee -a "${TESTS_SUMMARY}" + _register_issue "Critical" "${mode}" "$(_get_call_trace_status)" + EXIT_STATUS=1 + + if is_ci; then + zstd -19 -T0 "${VIRTME_BUILD_DIR}/vmlinux" \ + -o "${RESULTS_DIR}/vmlinux.zstd" + fi + fi + + if _has_unexpected_stop; then + _print_unexpected_stop | tee -a "${TESTS_SUMMARY}" + _register_issue "Critical" "${mode}" "${VIRTME_SCRIPT_UNEXPECTED_STOP}" + EXIT_STATUS=1 + elif _has_timed_out; then + _print_timed_out | tee -a "${TESTS_SUMMARY}" + _register_issue "Critical" "${mode}" "Global Timeout" + EXIT_STATUS=1 + fi + + if _has_kmemleak; then + _print_kmemleak | tee -a "${TESTS_SUMMARY}" + _register_issue "Critical" "${mode}" "KMemLeak" + EXIT_STATUS=1 + fi + + echo -ne "${COLOR_RESET}" + + if [ "${EXIT_STATUS}" = "1" ]; then + echo + printerr "Critical issue(s) detected, exiting" + exit 1 + fi + + set_trace_on +} + +# $@: args for kconfig +prepare_all() { local t mode + t=${1}; shift + mode="${1}" + + printinfo "Start: ${t} (${mode})" + + setup_env "${mode}" + gen_kconfig "${@}" + build + prepare "${mode}" +} + +# $1: mode ; [ $2+: kconfig ] +go_manual() { + prepare_all manual "${@}" + run +} + +# $1: mode ; [ $2+: kconfig ] +go_expect() { + EXPECT=1 + + ccache_stat + check_last_iproute + check_source_exec_all + + prepare_all auto "${@}" + ccache_stat + + run_expect + analyze "${@}" +} + +static_analysis() { local src obj ftmp + ftmp=$(mktemp) + + for src in net/mptcp/*.c; do + obj="${src/%.c/.o}" + if [[ "${src}" = *"_test.mod.c" ]]; then + continue + fi + + printinfo "Checking: ${src}" + + touch "${src}" + if ! KCFLAGS="-Werror" _make_o W=1 "${obj}"; then + printerr "Found make W=1 issues for ${src}" + fi + + touch "${src}" + _make_o C=1 "${obj}" >/dev/null 2>"${ftmp}" || true + + if test -s "${ftmp}"; then + cat "${ftmp}" + printerr "Found make C=1 issues for ${src}" + fi + done + + rm -f "${ftmp}" +} + +print_conclusion() { local rc=${1} + echo -n "${EXIT_TITLE}: " + + if _had_issues; then + _print_issues "❌" "🔴" + elif [ "${rc}" != "0" ]; then + echo "Script error! ❓" + else + echo "Success! ✅" + fi +} + +exit_trap() { local rc=${?} + set +x + + echo -ne "\n${COLOR_BLUE}" + if [ "${EXPECT}" = 1 ]; then + print_conclusion ${rc} | tee "${CONCLUSION:-"conclusion.txt"}" + fi + echo -e "${COLOR_RESET}" + + return ${rc} +} + +usage() { + echo "Usage: ${0} [KConfig]" + echo + echo " - manual: access to an interactive shell" + echo " - auto: the tests suite is ran automatically" + echo + echo " - normal: without the debug kconfig" + echo " - debug: with debug kconfig" + echo " - btf: without the debug kconfig, but with BTF support" + echo " - all: both 'normal' and 'debug' modes" + echo + echo " - KConfig: optional kernel config: arguments for './scripts/config'" + echo + echo "Usage: ${0} | defconfig | selftests | bpftests | cmd | src | static | vm-manual | vm-auto >" + echo + echo " - make: run the make command with optional parameters" + echo " - make.cross: run Intel's make.cross command with optional parameters" + echo " - build: build everything, but don't start the VM ('normal' mode by default)" + echo " - defconfig: only generate the .config file ('normal' mode by default)" + echo " - selftests: only build the KSelftests" + echo " - bpftests: only build the BPF tests" + echo " - cmd: run the given command" + echo " - src: source a given script file" + echo " - static: run static analysis, with make W=1 C=1" + echo " - vm-manual: start the VM with what has already been built ('normal' mode by default)" + echo " - vm-auto: same, then run the tests as well ('normal' mode by default)" + echo + echo "This script needs to be ran from the root of kernel source code." + echo + echo "Some files can be added in the kernel sources to modify the tests suite." + echo "See the README file for more details." +} + + +if [ -z "${INPUT_MODE}" ]; then + set +x + usage + exit 0 +fi + +if [ ! -s "${SELFTESTS_CONFIG}" ]; then + printerr "Please be at the root of kernel source code with MPTCP (Upstream) support" + exit 1 +fi + + +trap 'exit_trap' EXIT + +case "${INPUT_MODE}" in + "manual" | "normal" | "manual-normal") + go_manual "normal" "${@}" + ;; + "debug" | "manual-debug") + go_manual "debug" "${@}" + ;; + "btf" | "manual-btf") + go_manual "btf" "${@}" + ;; + "expect-normal" | "auto-normal") + go_expect "normal" "${@}" + ;; + "expect-debug" | "auto-debug") + go_expect "debug" "${@}" + ;; + "expect-btf" | "auto-btf") + go_expect "btf" "${@}" + ;; + "expect" | "all" | "expect-all" | "auto-all") + # first with the minimum because configs like KASAN slow down the + # tests execution, it might hide bugs + _make_o -C "${SELFTESTS_DIR}" clean + go_expect "normal" "${@}" + _make_o clean + go_expect "debug" "${@}" + ;; + "make") + _make_o "${@}" + ;; + "make.cross") + MAKE_CROSS="/usr/sbin/make.cross" + wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O "${MAKE_CROSS}" + chmod +x "${MAKE_CROSS}" + COMPILER_INSTALL_PATH="${VIRTME_WORKDIR}/0day" \ + COMPILER="${COMPILER}" \ + "${MAKE_CROSS}" "${@}" + ;; + "build") + prepare_all manual "${@:-normal}" + ;; + "defconfig") + gen_kconfig "${@:-normal}" + ;; + "selftests") + build_selftests + ;; + "bpftests") + build_bpftests + ;; + "cmd" | "command") + "${@}" + ;; + "src" | "source" | "script") + if [ ! -f "${1}" ]; then + printerr "No such file: ${1}" + exit 1 + fi + + # shellcheck disable=SC1090 + source "${1}" + ;; + "static" | "static-analysis") + static_analysis + ;; + "vm" | "vm-manual") + setup_env "${@:-normal}" + [ "${INPUT_PACKETDRILL_STABLE}" = "1" ] && build_packetdrill + run + ;; + "vm-expect" | "vm-auto") + setup_env "${@:-normal}" + [ "${INPUT_PACKETDRILL_STABLE}" = "1" ] && build_packetdrill + run_expect + analyze "${@:-normal}" + ;; + *) + set +x + printerr "Unknown mode: ${INPUT_MODE}" + echo -e "${COLOR_RED}" + usage + echo -e "${COLOR_RESET}" + exit 1 +esac + +if is_ci && [ "${INPUT_CI_PRINT_EXIT_CODE}" = 1 ]; then + set_trace_off + echo "==EXIT_STATUS=${EXIT_STATUS}==" +else + exit "${EXIT_STATUS}" +fi \ No newline at end of file diff --git a/kselftests-virtme/1.25/22.03-lts-sp4/tap2json.py b/kselftests-virtme/1.25/22.03-lts-sp4/tap2json.py new file mode 100755 index 00000000..f5d37b29 --- /dev/null +++ b/kselftests-virtme/1.25/22.03-lts-sp4/tap2json.py @@ -0,0 +1,143 @@ +#! /usr/bin/python3 +# SPDX-License-Identifier: GPL-2.0 +# +# Very simple TAP to JSON parser +# +# JQ can be used to filter tests later, e.g.abs +# $ jq '.results.[] | select(.[].result == "fail")' results.json + +import argparse +import json +import os +import re +import sys + + +def get_args_parser(): + parser = argparse.ArgumentParser( + description="(Simple) TAP to JSON converter" + ) + + parser.add_argument( + "--output", + "-o", + action="store", + help="Output JSON file" + ) + + parser.add_argument( + "--info", + "-I", + action="append", + metavar="key:value", + help="Add extra info in the JSON, can be used multiple times" + ) + + parser.add_argument( + "--only-fails", + "-f", + action="store_true", + help="Only keep failed tests" + ) + + parser.add_argument( + "tapfiles", + metavar="tapfiles", + type=str, + nargs="*", + help="Input TAP file(s)" + ) + + return parser + +# Same as in NIPA +TAP_RE = re.compile(r"(not )?ok (\d+)( -)? ([^#]*[^ ])( # )?([^ ].*)?$") + +def parse_tap(tap, name, only_fails): + results = {} + has_results = False + + for line in tap: + try: + r = TAP_RE.match(line.rstrip()).groups() + except AttributeError: + continue + + has_results = True + + success = r[0] is None + + result = { + 'result': "pass" if success else "fail", + 'name': r[3] + } + + if r[5]: + result['comment'] = r[5] + if success: + if r[5].lower().startswith('skip'): + result['result'] = "skip" + elif r[5].lower().startswith('ignore flaky'): + result['result'] = "flaky" + + if only_fails and result['result'] == "pass": + continue + + results[r[1]] = result + + # just in case, to catch errors + if not has_results: + results[0] = {'result': "fail", 'name': name} + + return results + + +def parse_all_tap(tap_files, only_fails): + results = {} + + for tap in tap_files: + name = os.path.splitext(os.path.basename(tap))[0] + with open(tap, "r", encoding="utf-8") as fd: + result = parse_tap(fd.readlines(), name, only_fails) + if result: + results[name] = result + + return results + +def add_info(results, infos): + results = { + "results": results + } + + for info in infos: + info = info.split(':', 1) + if len(info) != 2: + print("Skip info: " + info[0], file=sys.stderr) + continue + + results[info[0]] = info[1] + + return results + +def write_json(out_file, results): + out = json.dumps(results) + if out_file: + with open(out_file, "w") as fd: + fd.write(out) + else: + print(out) + +if __name__ == "__main__": + arg_parser = get_args_parser() + args = arg_parser.parse_args() + + if not args.tapfiles: + arg_parser.print_usage() + sys.exit(1) + + results = parse_all_tap(args.tapfiles, args.only_fails) + + if args.info: + results = add_info(results, args.info) + + write_json(args.output, results) \ No newline at end of file diff --git a/kselftests-virtme/README.md b/kselftests-virtme/README.md new file mode 100644 index 00000000..6508bd5f --- /dev/null +++ b/kselftests-virtme/README.md @@ -0,0 +1,274 @@ +# Quick reference + +- The official Kselftests-virtme docker image. + +- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative). + +- Where to get help: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative), [openEuler](https://gitee.com/openeuler/community). + +# Kselftests-virtme | openEuler +Current Kselftests-virtme (Kernel self-tests by Virtme) docker images are built on the [openEuler](https://repo.openeuler.org/). This repository is free to use and exempted from per-user rate limits. + +This image provides a virtual environment with Virtme to validate [mptcp_net-next](https://github.com/multipath-tcp/mptcp_net-next) repo and can be used by devs and CI, to replace [mptcp-upstream-virtme-docker](https://github.com/multipath-tcp/mptcp-upstream-virtme-docker) which is based on Ubuntu. + +# Supported tags and respective Dockerfile links +The tag of each `kselftests-virtme` docker image is consist of the version of `virtme-ng` and the version of basic image. The details are as follows +| Tag | Currently | Architectures | +|----------|-------------|------------------| +|[1.25-oe2203sp4](https://gitee.com/openeuler/openeuler-docker-images/blob/master/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile)| Virtme-ng 1.25 on openEuler 22.03-LTS-sp4 | amd64, arm64 | + + +# Usage + +## Entrypoint options + +When launching the docker image, you have to specify the mode you want to use: + +- `manual-*`: Build the kernel and dependences, start a VM, then leave you with + a shell prompt inside the VM: + - `manual-normal`: With a non-debug kernel config. + - `manual-debug`: With a debug kernel config. + - `manual-btf`: With BTF support (needed for BPF features). +- `auto-*`: Build the kernel and dependences, start a VM, then run all the + automatic tests from the VM: + - `auto-normal`: With a non-debug kernel config. + - `auto-debug`: With a debug kernel config. + - `auto-all`: First with a non-debug, then a debug kernel config. + - `auto-btf`: With BTF support (needed for BPF features). +- `make`: Run the `make` command with optional parameters. +- `make.cross`: Run Intel's `make.cross` command with optional parameters. +- `build`: Build everything, but don't start the VM (`normal` mode by default). +- `defconfig`: Only generate the `.config` file (`normal` mode by default). +- `selftests`: Only build the KSelftests. +- `bpftests`: Only build the BPF tests. +- `cmd`: Run the given command in the docker image (not in the VM), e.g. + `cmd bash` to have a prompt. +- `static`: Run static analysis, with `make W=1 C=1`. +- `vm-manual`: Start the VM with what has already been built (`normal` mode by + default). +- `vm-auto`: Start the VM with what has already been built, then run the tests + (`normal` mode by default). +- `src`: `source` a given script file. +- `help`: display all possible commands. + +All the `manual-*` and `auto-*` options accept optional arguments for +`scripts/config` script from the kernel source code, e.g. `-e DEBUG_LOCKDEP` + + +You can quickly get a ready to use environment: + +```bash +cd +docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" -v "${PWD}/.home:/root:rw" --rm \ + -it --privileged --pull always openeuler/kselftests-virtme:latest \ + +``` +This docker image needs to be executed with `--privileged` option to be able to +execute QEmu with KVM acceleration. + +## Extension + +### Files + +3 files can be created in the root dir of the kernel source code: + +- `.virtme-exec-pre` +- `.virtme-exec-run` +- `.virtme-exec-post` + +`pre` and `post` are run before and after the tests' suite. `run` is run instead +of the tests' suite. + +These scripts are sourced and can use functions from the virtme script. + +### Env vars + +Env vars can be set to change the behaviour of the script. When using the Docker +command, you need to specify the `-e` parameter, e.g. to set +`INPUT_BUILD_SKIP=1`: + +```bash +docker run -e INPUT_BUILD_SKIP=1 (...) openeuler/kselftests-virtme:latest (...) +``` + +#### Skip kernel build + +If you didn't change the kernel code, it can be useful to skip the compilation +part. You can then set `INPUT_BUILD_SKIP=1` to save a few seconds to start the +VM. + +#### Use CLang instead of GCC + +Simply set `INPUT_CLANG=1` env var with all the commands you use. + +#### Not blocking with questions + +You can set `INPUT_NO_BLOCK=1` env var not to block if these files are present. +This is useful if you need to do a `git bisect`. + +### Not stop after an error is detected with `run_loop` + +You can set `INPUT_RUN_LOOP_CONTINUE=1` env var to continue even if an error is +detected. Failed iterations are logged in `${CONCLUSION}.failed`. + +#### Packetdrill + +You can set `INPUT_PACKETDRILL_STABLE=1` env var to use the branch for the +current kernel version instead of the dev version following MPTCP net-next. + +You can set `INPUT_PACKETDRILL_NO_SYNC=1` env var not to sync Packetdrill with +upstream. This is useful if you mount a local packetdrill repo in the image. + +You can also set `INPUT_PACKETDRILL_NO_MORE_TOLERANCE=1` not to increase +Packetdrill's tolerances. + +Run the Docker commands directly, you can use: + +```bash +docker run \ + -e INPUT_PACKETDRILL_NO_SYNC=1 \ + -e INPUT_PACKETDRILL_NO_MORE_TOLERANCE=1 \ + -v /PATH/TO/packetdrill:/opt/packetdrill:rw \ + -v "${PWD}:${PWD}:rw" -w "${PWD}" -v "${PWD}/.home:/root:rw" \ + --privileged --rm -it \ + openeuler/kselftests-virtme:latest \ + manual + +cd /opt/packetdrill/gtests/net/ +./packetdrill/run_all.py -lvv -P 2 mptcp/dss ## or any other subdirs +``` + +If packetdrill itself is modified and to continue to use the same build +environment, the recompilation can also be done from the running docker image: + +```bash +docker exec -w /opt/packetdrill/gtests/net/packetdrill -it \ + $(docker ps --filter ancestor=openeuler/kselftests-virtme --format='{{.ID}}') \ + make +``` + +## Using for other subsystems than MPTCP + +This image is used to validate modifications done in MPTCP +Upstream project. But it can also be used to validate other subsystems. Here are +a few tips to use it elsewhere: + +- If you only need to run extra steps at the "preparation" phase but keeping the + same docker image, write them in a `.virtme-prepare-post` file, e.g. to + compile iproute2 differently. + +- Similar to the previous point, you might prefer to extend the docker image not + to have to install new packages from `.virtme-prepare-post` each time you run + the docker image. You can use our docker image as a base and then install + other dependences: + ```dockerfile + FROM openeuler/kselftests-virtme:latest + + RUN yum update -y && yum install -y python3-pip && pip3 install scapy-python3 + ``` + + +- Skip the build steps you don't need, e.g. + ```bash + docker run (...) \ + -e INPUT_BUILD_SKIP_PERF=1 \ + -e INPUT_BUILD_SKIP_SELFTESTS=1 \ + -e INPUT_BUILD_SKIP_PACKETDRILL=1 \ + (...) \ + openeuler/kselftests-virtme:latest \ + auto-normal + ``` + +- Specify the path to another selftests dir to test by using + `INPUT_SELFTESTS_DIR` env var, e.g. + ```bash + docker run (...) \ + -e INPUT_SELFTESTS_DIR=tools/testing/selftests/tc-testing + (...) + ``` + +- Use `.virtme-exec-run` file (and similar) to execute different tests, + see above. + +An example: + +```bash +# Better to extend the docker image (but quick solution here), see above: +cat <<'EOF' > ".virtme-prepare-post" +yum update -y && yum install -y python3-pip && pip3 install scapy-python3 +EOF + +# Only run the selftests +cat <<'EOF' > ".virtme-exec-run" +run_selftest_all +EOF + +# skip Packetdrill build (not needed), run TC selftests and add CONFIG_DUMMY +docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" -v "${PWD}/.home:/root:rw" --rm \ + -it --privileged \ + -e INPUT_BUILD_SKIP_PACKETDRILL=1 \ + -e INPUT_SELFTESTS_DIR=tools/testing/selftests/tc-testing \ + --pull always openeuler/kselftests-virtme:latest \ + auto-normal -e DUMMY +``` + +Feel free to contact us and/or open Pull Requests to support more cases. + +## Compilation issues with Perf or Objtools + +If you see such messages: + +``` +Makefile.config:458: *** No gnu/libc-version.h found, please install glibc-dev[el]. Stop. +``` + +This can happen when switching between major versions of the compiler. In this +case, it will be required to clean the build dir in `.virtme/build`, e.g. + +```bash +docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --rm -it \ + openeuler/kselftests-virtme:latest \ + cmd rm -r .virtme/build*/tools +``` + +## Working with VSCode + +If you use [VSCode for Linux kernel development](https://github.com/FlorentRevest/linux-kernel-vscode) +add-on, you can configure it to use this docker image: simply copy all files +from the [`vscode`](/vscode) directory in your `.vscode` dir from the kernel +source (or use symbolic links). `.clangd` needs to be placed at the root of the +kernel source directory. + +Notes: +- The VSCode add-on needs some modifications, see + [PR #5](https://github.com/FlorentRevest/linux-kernel-vscode/pull/5) and + [PR #6](https://github.com/FlorentRevest/linux-kernel-vscode/pull/6). If these + PRs are not merged, you can use + [this fork](https://github.com/matttbe/linux-kernel-vscode/) (`virtme-support` + branch) for the moment. +- CLang will be used by VSCode instead of GCC. It is then required to launch all + docker commands with `-e INPUT_CLANG=1`, see above. +- CLangD will be used on the host machine, not in the Docker. + +## CLang Analyzer + +In the kernel, it is possible to run `make clang-analyzer`, but it will scan all +compiled files, that's too long, and maybe not needed here. Here is a workaround +to scan only MPTCP files: + +```bash +cd +docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" -v "${PWD}/.home:/root:rw" --rm \ + -e INPUT_CLANG=1 \ + -it --privileged --pull always openeuler/kselftests-virtme:latest \ + build +jq 'map(select(.file | contains ("/mptcp/")))' \ + .virtme/build-clang/compile_commands.json > compile_commands-mptcp.json +docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" -v "${PWD}/.home:/root:rw" --rm \ + -e INPUT_CLANG=1 \ + -it --privileged --pull always openeuler/kselftests-virtme:latest \ + cmd ./scripts/clang-tools/run-clang-tools.py clang-analyzer compile_commands-mptcp.json +``` + +# Question and answering +If you have any questions or want to use some special features, please submit an issue or a pull request on [openeuler-docker-images](https://gitee.com/openeuler/openeuler-docker-images). \ No newline at end of file diff --git a/kselftests-virtme/doc/image-info.yml b/kselftests-virtme/doc/image-info.yml new file mode 100644 index 00000000..9fcab777 --- /dev/null +++ b/kselftests-virtme/doc/image-info.yml @@ -0,0 +1,56 @@ +name: kselftests-virtme +category: other +description: kselftests-virtme (Kernel self-tests by Virtme) 是一个用来验证 mptcp_net-next (https://github.com/multipath-tcp/mptcp_net-next) 源码的虚拟环境，可用于开发或CI环节。 +environment: | + 本应用在Docker环境中运行，安装Docker执行如下命令 + ``` + yum install -y docker + ``` +tags: | + kselftests-virtme镜像的Tag由其版本信息和基础镜像版本信息组成，详细内容如下 + + | Tag | Currently | Architectures | + |----------|-------------|------------------| + |[1.25-oe2203sp4](https://gitee.com/openeuler/openeuler-docker-images/blob/master/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile)| Virtme-ng 1.25 on openEuler 22.03-LTS-sp4 | amd64, arm64 | + +download: | + 由于kselftests-virtme镜像体积较大，建议单独pull到本地后再启动容器： + ``` + docker pull openeuler/kselftests-virtme:{Tag} + ``` + +usage: | + - 下载[mptcp_net-next](https://github.com/multipath-tcp/mptcp_net-next)源码 + ``` + git clone https://github.com/multipath-tcp/mptcp_net-next.git + ``` + + - 编译并测试`mptcp_net-next`源码 + ``` + # 进入源码目录 + cd mptcp_net-next + # 启动容器编译、测试源码 + docker run \ + -e INPUT_NO_BLOCK=1 \ + -e INPUT_PACKETDRILL_NO_SYNC=1 \ + -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \ + openeuler/kselftests-virtme:{Tag} \ + auto-normal + ``` + + 容器启动后会提示以下编译信息: + ``` + Check extented exec files + Start: auto (normal) + Setup environment + Generate kernel config + make[1]: Entering directory '/home/mptcp_net-next/.virtme/build' + <...> + ``` + +license: GPL-2.0 license +similar_packages: + - N/A +dependency: + - qemu + - kvm diff --git a/kselftests-virtme/doc/picture/logo.png b/kselftests-virtme/doc/picture/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d117602f2522510fdebdadcc5592530af10e3521 GIT binary patch literal 6913 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 literal 0 HcmV?d00001 diff --git a/kselftests-virtme/meta.yml b/kselftests-virtme/meta.yml new file mode 100644 index 00000000..a2454b6b --- /dev/null +++ b/kselftests-virtme/meta.yml @@ -0,0 +1,2 @@ +1.25-oe2203sp4: + path: kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile \ No newline at end of file -- Gitee From d3c511419e8fe40c576292e5b931edfbd2668e51 Mon Sep 17 00:00:00 2001 From: wjunLu Date: Mon, 5 Aug 2024 17:10:53 +0800 Subject: [PATCH 3/6] update --- .../{1.25 => 1.27}/22.03-lts-sp4/Dockerfile | 44 +++++++++++-------- .../22.03-lts-sp4/entrypoint.sh | 0 .../{1.25 => 1.27}/22.03-lts-sp4/tap2json.py | 0 kselftests-virtme/README.md | 2 +- kselftests-virtme/meta.yml | 4 +- 5 files changed, 28 insertions(+), 22 deletions(-) rename kselftests-virtme/{1.25 => 1.27}/22.03-lts-sp4/Dockerfile (67%) rename kselftests-virtme/{1.25 => 1.27}/22.03-lts-sp4/entrypoint.sh (100%) rename kselftests-virtme/{1.25 => 1.27}/22.03-lts-sp4/tap2json.py (100%) diff --git a/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile b/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile similarity index 67% rename from kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile rename to kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile index ccc04489..98c6126c 100644 --- a/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile +++ b/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile @@ -1,27 +1,33 @@ # SPDX-License-Identifier: GPL-2.0 -ARG BASE=openeuler/openeuler:22.03-lts-sp4 +ARG BASE=openeuler/openeuler:24.03-lts FROM ${BASE} LABEL name=openeuler-kselftests-virtme-docker # dependencies for the script RUN yum update -y && \ - yum install -y \ - make gcc ncurses-devel openssl-devel bc bison byacc automake \ - elfutils-libelf-devel flex git curl tar qemu-kvm sudo expect \ - python3 python3-pip python3-setuptools file \ - busybox coreutils python3-requests libvirt-client udev \ - iputils ethtool kbd rsync ccache nc \ - ca-certificates gnupg2 net-tools kmod \ - dbus-devel libnl3-devel libibverbs-devel \ - tcpdump pkgconfig libmnl-devel \ - clang clang-tools-extra lld llvm llvm-devel libcap-devel \ - gdb gdb-gdbserver crash strace trace-cmd \ - iptables ebtables nftables vim psmisc bash-completion less jq \ - gettext libevent-devel newt perl-devel perl-ExtUtils-MakeMaker perl-Digest-SHA perl-Encode \ - perl-IPC-Cmd perl-Text-ParseWords perl-Time-HiRes perl-JSON zstd wget xz lftp cpio cscope bpftrace libunwind-devel libdwarf-devel \ - libzstd-devel numactl-devel libxml2-devel sqlite-devel gtk3-devel gtk2-devel && \ - yum clean all + yum upgrade -y && \ + yum install -y \ + make ncurses-devel gcc gcc-c++ openssl-devel bc bison byacc automake \ + elfutils-libelf-devel flex git curl tar perl-Digest-SHA qemu-kvm sudo expect \ + python3 python3-pip python3-setuptools file libvirt-daemon-config-network \ + busybox coreutils python3-requests libvirt-client udev \ + iputils ethtool kbd rsync ccache nc \ + ca-certificates gnupg2 net-tools kmod \ + dbus-devel libnl3-devel libibverbs-devel \ + tcpdump \ + pkgconfig libmnl-devel \ + clang clang-tools-extra lld llvm llvm-devel libcap-devel \ + gdb gdb-gdbserver crash dwarves strace trace-cmd \ + iptables ebtables nftables vim psmisc bash-completion less jq \ + gettext libevent-devel libtraceevent-devel newt-devel slang-devel libutempter-devel python3-newt tmux \ + libdwarf-devel binutils-devel numactl-devel libzstd-devel libunwind-devel elfutils-devel python3-devel binutils-devel libbabeltrace-devel systemtap-sdt-devel perl-devel python3-docutils \ + libxml2-devel sqlite-devel gtk3-devel gtk2-devel perl-JSON \ + zstd \ + wget xz lftp cpio uboot-tools \ + cscope \ + bpftrace && \ + yum clean all # byobu (not to have a dep to iproute2) ARG BYOBU_URL="https://github.com/dustinkirkland/byobu/archive/refs/tags/6.12.tar.gz" @@ -75,8 +81,8 @@ RUN cd /opt && \ make install # Virtme NG -ARG VERSION=1.25 -RUN pip3 install virtme-ng=="${VERSION}" +ARG VERSION=1.27 +RUN pip3 install --break-system-packages virtme-ng=="${VERSION}" # to quickly shutdown the VM and more RUN for i in /usr/lib/klibc/bin/*; do \ diff --git a/kselftests-virtme/1.25/22.03-lts-sp4/entrypoint.sh b/kselftests-virtme/1.27/22.03-lts-sp4/entrypoint.sh similarity index 100% rename from kselftests-virtme/1.25/22.03-lts-sp4/entrypoint.sh rename to kselftests-virtme/1.27/22.03-lts-sp4/entrypoint.sh diff --git a/kselftests-virtme/1.25/22.03-lts-sp4/tap2json.py b/kselftests-virtme/1.27/22.03-lts-sp4/tap2json.py similarity index 100% rename from kselftests-virtme/1.25/22.03-lts-sp4/tap2json.py rename to kselftests-virtme/1.27/22.03-lts-sp4/tap2json.py diff --git a/kselftests-virtme/README.md b/kselftests-virtme/README.md index 6508bd5f..fbd11b61 100644 --- a/kselftests-virtme/README.md +++ b/kselftests-virtme/README.md @@ -15,7 +15,7 @@ This image provides a virtual environment with Virtme to validate [mptcp_net-nex The tag of each `kselftests-virtme` docker image is consist of the version of `virtme-ng` and the version of basic image. The details are as follows | Tag | Currently | Architectures | |----------|-------------|------------------| -|[1.25-oe2203sp4](https://gitee.com/openeuler/openeuler-docker-images/blob/master/kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile)| Virtme-ng 1.25 on openEuler 22.03-LTS-sp4 | amd64, arm64 | +|[1.27-oe2203sp4](https://gitee.com/openeuler/openeuler-docker-images/blob/master/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile)| Virtme-ng 1.27 on openEuler 22.03-LTS-sp4 | amd64, arm64 | # Usage diff --git a/kselftests-virtme/meta.yml b/kselftests-virtme/meta.yml index a2454b6b..a5295dc7 100644 --- a/kselftests-virtme/meta.yml +++ b/kselftests-virtme/meta.yml @@ -1,2 +1,2 @@ -1.25-oe2203sp4: - path: kselftests-virtme/1.25/22.03-lts-sp4/Dockerfile \ No newline at end of file +1.27-oe2203sp4: + path: kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile \ No newline at end of file -- Gitee From b45966eb9d3f45eada73fce5fa5786c25e97ec6d Mon Sep 17 00:00:00 2001 From: wjunLu Date: Mon, 5 Aug 2024 17:30:41 +0800 Subject: [PATCH 4/6] update README --- README.en.md | 2 ++ README.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.en.md b/README.en.md index 026a8bd9..0b7577ef 100644 --- a/README.en.md +++ b/README.en.md @@ -1,3 +1,5 @@ +[中文](README.md) | English + # openEuler official container images ## Introduction diff --git a/README.md b/README.md index dc6357f5..6934d636 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +中文 | [English](README.en.md) + # openEuler官方容器镜像仓 ## 介绍 -- Gitee From 61395ec74a5042a9f41ca27c08e74c8fc4317889 Mon Sep 17 00:00:00 2001 From: wjunLu Date: Thu, 8 Aug 2024 10:31:18 +0800 Subject: [PATCH 5/6] update Dockerfile --- kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile b/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile index 98c6126c..bc02e625 100644 --- a/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile +++ b/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ARG BASE=openeuler/openeuler:24.03-lts +ARG BASE=openeuler/openeuler:22.03-lts-sp4 FROM ${BASE} LABEL name=openeuler-kselftests-virtme-docker @@ -8,7 +8,7 @@ LABEL name=openeuler-kselftests-virtme-docker RUN yum update -y && \ yum upgrade -y && \ yum install -y \ - make ncurses-devel gcc gcc-c++ openssl-devel bc bison byacc automake \ + make ncurses-devel gcc openssl-devel bc bison byacc automake \ elfutils-libelf-devel flex git curl tar perl-Digest-SHA qemu-kvm sudo expect \ python3 python3-pip python3-setuptools file libvirt-daemon-config-network \ busybox coreutils python3-requests libvirt-client udev \ -- Gitee From c8cafb2b47a502c4940d5620a79008b8eff1cfb3 Mon Sep 17 00:00:00 2001 From: wjunLu Date: Thu, 8 Aug 2024 15:40:57 +0800 Subject: [PATCH 6/6] bugfix --- kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile b/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile index bc02e625..e631e334 100644 --- a/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile +++ b/kselftests-virtme/1.27/22.03-lts-sp4/Dockerfile @@ -82,7 +82,7 @@ RUN cd /opt && \ # Virtme NG ARG VERSION=1.27 -RUN pip3 install --break-system-packages virtme-ng=="${VERSION}" +RUN pip3 install virtme-ng=="${VERSION}" # to quickly shutdown the VM and more RUN for i in /usr/lib/klibc/bin/*; do \ -- Gitee