From nobody Sun Feb 8 04:23:29 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B25CD39F311 for ; Thu, 22 Jan 2026 21:44:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769118281; cv=none; b=QbwoOKezyW/LLPTRsj5orUsRuGRl4jwqZlZv9l+XsEKpr7bUQrQOFT8qOhtKlaAkZF7sM1cElTJKiedH+76bLcEleDTcJhe6TEj1yPvrAPR9l9b+Afq0COuUVIstdt/8fq21fdyiZKRAp3Trfp7jW7K79TbdN+01SVftTuvWbnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769118281; c=relaxed/simple; bh=aadm7jOZAi1kOC8JS9AGpDTaYFuNRw6u/dHgv9v63cw=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=LHtPesUr1+eXy630+TpBmtd88oErwhsMUetcNBMJBnW0Bm0xp2J3qICQ6LtWR2bW0gafApG0fyUX0p682B9vYRN4uXBcZLvvblclS80auHMp0iq9Az3sWoFiun4rdrOmB6tLqpvMtO+50LwYIiVPqDjQ62GdK3t4qwcVho90P+M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jordanrichards.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=JJdiBxTM; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jordanrichards.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JJdiBxTM" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2b72c11c64dso2470698eec.1 for ; Thu, 22 Jan 2026 13:44:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769118268; x=1769723068; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=bKtdJ1Um+ioXTalulgc0FZS9uRQNlR4c3Y/lciWq6zo=; b=JJdiBxTMDmZfNWjEhdQiN366CvJ/f98VYfbPmztPcBU2Y+6UUp3iPWuuYWrivndN9z T3gSBL9aLFe87vyrzOLVGQSAwbUEEHDepysnQ8Pu/52AY5j9/u3KchhxZB1uDhwQVqLp 3Eudv1vUOTY/B46Y/3eOH81juFsd2RrrNj2ZsyUZL6FBsgl6XfWKOqKcXYuOZjs5ZQsl kfTKm83dahVeqptC4hUAGQU1J+3jhHCEO/GACvNcpR79u4Ed+bFH6Sm3zvbvQ/doUoHw QWdRKfc4xRgGnNM558EdPLMr8VaClkN79XnZtmmzKD8tHioX4lOoUz4y5kUHVJGCR+is oZyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769118268; x=1769723068; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bKtdJ1Um+ioXTalulgc0FZS9uRQNlR4c3Y/lciWq6zo=; b=usfctmFXBZxnl04RBpGvEsJJkM3sjkbDjWujs0FdOSjKcMOhkL1svQghsFQ2VQrhM0 FBaOJpVdT2JO5eS6fWIJTyPx4A/CYuTrsusUXRuul03rhyIt7PYekRPQPgj+DNoK12AI PasnLAefZu372KxXoHuEW9tLhQGoAPR7dn65KqMR7NUC+T/HAGUmhrcSQJw0+UDgPzkP hdjY9E2YAtPPZ2iLjen3tabWliixQerG55nn0aSk85ybHygTVsXaw9GvYGut8A46b/Fp XOm3ERHITcD+wZdyljR6okMIdDQMwKJn/0NDy0Vp5UND8sBhNGSLWntAVTSw3qGTZbhQ scTw== X-Forwarded-Encrypted: i=1; AJvYcCUzUZJyGSKaMQ5HdkXCBkfHja9ECIOaikglbkZ/erh/DGQ3+ekwdTSIIFpeC1JPtV7J8cwsPgjb5GCX6tg=@vger.kernel.org X-Gm-Message-State: AOJu0YxB48h0d5rMSNzJNcCYesOTn0ROsU5r2K3XJplICenmOdfwHB52 u39SJWCIXgsGGXAIDXDOVI4YX/ZspNLCXushTIz9j3Ypt7N3FR/WFXdvtatnjE71l1z0AYQ3VYK eop/K8w9AeLHsXrDSR0PpSy6JjYoWk3s4y3UuKQ== X-Received: from dlb34.prod.google.com ([2002:a05:7022:622:b0:123:35cc:b60f]) (user=jordanrichards job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:1f12:b0:2b1:7486:3a6e with SMTP id 5a478bee46e88-2b739998ca8mr411363eec.12.1769118268376; Thu, 22 Jan 2026 13:44:28 -0800 (PST) Date: Thu, 22 Jan 2026 21:44:27 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260122214427.3568647-1-jordanrichards@google.com> Subject: [PATCH] selftests/liveupdate: add end to end test infrastructure and scripts From: Jordan Richards To: Pasha Tatashin , Mike Rapoport , Pratyush Yadav , Shuah Khan Cc: Jason Miu , David Matlack , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Jordan Richards Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pasha Tatashin Add the end to end testing infrastructure required to verify the liveupdate feature. This includes a custom init process, a test orchestration script, and a batch runner. The framework consists of: init.c: A lightweight init process that manages the kexec lifecycle. It mounts necessary filesystems, determines the current execution stage (1 or 2) via the kernel command line, and handles the kexec_file_load() sequence to transition between kernels. luo_test.sh: The primary KTAP-compliant test driver. It handles: - Kernel configuration merging and building. - Cross-compilation detection for x86_64 and arm64. - Generation of the initrd containing the test binary and init. - QEMU execution with automatic accelerator detection (KVM, HVF, or TCG). run.sh: A wrapper script to discover and execute all `luo_*.c` tests across supported architectures, providing a summary of pass/fail/skip results. Signed-off-by: Pasha Tatashin Co-developed-by: Jordan Richards Signed-off-by: Jordan Richards --- Changelog since luo v7 [1]: - Build test binaries with `-nostdlib -nostdinc` - Use minimal per-arch config instead of defconfig - Unhandled test errors now cause the test to fail instead of skip [1] https://lore.kernel.org/all/20251122222351.1059049-20-pasha.tatashin@so= leen.com/ tools/testing/selftests/liveupdate/.gitignore | 2 + tools/testing/selftests/liveupdate/config | 1 + .../selftests/liveupdate/config.aarch64 | 2 + .../selftests/liveupdate/config.x86_64 | 2 + tools/testing/selftests/liveupdate/init.c | 179 +++++++++++ .../testing/selftests/liveupdate/luo_test.sh | 303 ++++++++++++++++++ .../selftests/liveupdate/luo_test_utils.c | 35 +- tools/testing/selftests/liveupdate/run.sh | 68 ++++ 8 files changed, 579 insertions(+), 13 deletions(-) create mode 100644 tools/testing/selftests/liveupdate/config.aarch64 create mode 100644 tools/testing/selftests/liveupdate/config.x86_64 create mode 100644 tools/testing/selftests/liveupdate/init.c create mode 100755 tools/testing/selftests/liveupdate/luo_test.sh create mode 100755 tools/testing/selftests/liveupdate/run.sh diff --git a/tools/testing/selftests/liveupdate/.gitignore b/tools/testing/= selftests/liveupdate/.gitignore index 661827083ab6..7dc1e8aec44c 100644 --- a/tools/testing/selftests/liveupdate/.gitignore +++ b/tools/testing/selftests/liveupdate/.gitignore @@ -6,4 +6,6 @@ !*.sh !.gitignore !config +!config.aarch64 +!config.x86_64 !Makefile diff --git a/tools/testing/selftests/liveupdate/config b/tools/testing/self= tests/liveupdate/config index 91d03f9a6a39..016d009dba13 100644 --- a/tools/testing/selftests/liveupdate/config +++ b/tools/testing/selftests/liveupdate/config @@ -1,4 +1,5 @@ CONFIG_BLK_DEV_INITRD=3Dy +CONFIG_DEVTMPFS=3Dy CONFIG_KEXEC_FILE=3Dy CONFIG_KEXEC_HANDOVER=3Dy CONFIG_KEXEC_HANDOVER_ENABLE_DEFAULT=3Dy diff --git a/tools/testing/selftests/liveupdate/config.aarch64 b/tools/test= ing/selftests/liveupdate/config.aarch64 new file mode 100644 index 000000000000..445716403925 --- /dev/null +++ b/tools/testing/selftests/liveupdate/config.aarch64 @@ -0,0 +1,2 @@ +CONFIG_SERIAL_AMBA_PL011=3Dy +CONFIG_SERIAL_AMBA_PL011_CONSOLE=3Dy diff --git a/tools/testing/selftests/liveupdate/config.x86_64 b/tools/testi= ng/selftests/liveupdate/config.x86_64 new file mode 100644 index 000000000000..810d9c9d213e --- /dev/null +++ b/tools/testing/selftests/liveupdate/config.x86_64 @@ -0,0 +1,2 @@ +CONFIG_SERIAL_8250=3Dy +CONFIG_SERIAL_8250_CONSOLE=3Dy diff --git a/tools/testing/selftests/liveupdate/init.c b/tools/testing/self= tests/liveupdate/init.c new file mode 100644 index 000000000000..52a96d45f164 --- /dev/null +++ b/tools/testing/selftests/liveupdate/init.c @@ -0,0 +1,179 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Copyright (c) 2025, Google LLC. + * Pasha Tatashin + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define COMMAND_LINE_SIZE 2048 +#define KERNEL_IMAGE "/kernel" +#define INITRD_IMAGE "/initrd.img" +#define TEST_BINARY "/test_binary" + +static int mount_filesystems(void) +{ + if (mount("devtmpfs", "/dev", "devtmpfs", 0, NULL) < 0) { + fprintf(stderr, "INIT: Warning: Failed to mount devtmpfs\n"); + return -1; + } + + if (mount("debugfs", "/debugfs", "debugfs", 0, NULL) < 0) { + fprintf(stderr, "INIT: Failed to mount debugfs\n"); + return -1; + } + + if (mount("proc", "/proc", "proc", 0, NULL) < 0) { + fprintf(stderr, "INIT: Failed to mount proc\n"); + return -1; + } + + return 0; +} + +static long kexec_file_load(int kernel_fd, int initrd_fd, + unsigned long cmdline_len, const char *cmdline, + unsigned long flags) +{ + return syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, cmdline_len, + cmdline, flags); +} + +static int kexec_load(void) +{ + char cmdline[COMMAND_LINE_SIZE]; + int kernel_fd, initrd_fd, err; + ssize_t len; + int fd; + + fd =3D open("/proc/cmdline", O_RDONLY); + if (fd < 0) { + fprintf(stderr, "INIT: Failed to read /proc/cmdline\n"); + + return -1; + } + + len =3D read(fd, cmdline, sizeof(cmdline) - 1); + close(fd); + if (len < 0) + return -1; + + cmdline[len] =3D 0; + if (len > 0 && cmdline[len - 1] =3D=3D '\n') + cmdline[len - 1] =3D 0; + + strncat(cmdline, " luo_stage=3D2", sizeof(cmdline) - strlen(cmdline) - 1); + + kernel_fd =3D open(KERNEL_IMAGE, O_RDONLY); + if (kernel_fd < 0) { + fprintf(stderr, "INIT: Failed to open kernel image\n"); + return -1; + } + + initrd_fd =3D open(INITRD_IMAGE, O_RDONLY); + if (initrd_fd < 0) { + fprintf(stderr, "INIT: Failed to open initrd image\n"); + close(kernel_fd); + return -1; + } + + err =3D kexec_file_load(kernel_fd, initrd_fd, strlen(cmdline) + 1, + cmdline, 0); + + close(initrd_fd); + close(kernel_fd); + + return err ? : 0; +} + +static int run_test(int stage) +{ + char stage_arg[32]; + int status; + pid_t pid; + + snprintf(stage_arg, sizeof(stage_arg), "%d", stage); + + pid =3D fork(); + if (pid < 0) + return -1; + + if (!pid) { + char *const argv[] =3D {TEST_BINARY, "-s", stage_arg, NULL}; + + execve(TEST_BINARY, argv, NULL); + fprintf(stderr, "INIT: execve failed\n"); + _exit(1); + } + + waitpid(pid, &status, 0); + + return (WIFEXITED(status) && WEXITSTATUS(status) =3D=3D 0) ? 0 : -1; +} + +static int get_current_stage(void) +{ + char cmdline[COMMAND_LINE_SIZE]; + ssize_t len; + int fd; + + fd =3D open("/proc/cmdline", O_RDONLY); + if (fd < 0) + return -1; + + len =3D read(fd, cmdline, sizeof(cmdline) - 1); + close(fd); + + if (len < 0) + return -1; + + cmdline[len] =3D 0; + + return strstr(cmdline, "luo_stage=3D2") ? 2 : 1; +} + +int main(int argc, char *argv[]) +{ + int current_stage; + int err; + + if (mount_filesystems()) + goto err_reboot; + + current_stage =3D get_current_stage(); + if (current_stage < 0) { + fprintf(stderr, "INIT: Failed to read cmdline"); + goto err_reboot; + } + + printf("INIT: Starting Stage %d\n", current_stage); + + if (current_stage =3D=3D 1 && kexec_load()) { + fprintf(stderr, "INIT: Failed to load kexec kernel\n"); + goto err_reboot; + } + + if (run_test(current_stage)) { + fprintf(stderr, "INIT: Test binary returned failure\n"); + goto err_reboot; + } + + printf("INIT: Stage %d completed successfully.\n", current_stage); + reboot(current_stage =3D=3D 1 ? RB_KEXEC : RB_AUTOBOOT); + + return 0; + +err_reboot: + reboot(RB_AUTOBOOT); + + return -1; +} diff --git a/tools/testing/selftests/liveupdate/luo_test.sh b/tools/testing= /selftests/liveupdate/luo_test.sh new file mode 100755 index 000000000000..90ecb16e87bb --- /dev/null +++ b/tools/testing/selftests/liveupdate/luo_test.sh @@ -0,0 +1,303 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +set -ue + +CROSS_COMPILE=3D"${CROSS_COMPILE:-""}" + +test_dir=3D$(realpath "$(dirname "$0")") +kernel_dir=3D$(realpath "$test_dir/../../../..") + +workspace_dir=3D"" +headers_dir=3D"" +initrd=3D"" +KEEP_WORKSPACE=3D0 + +source "$test_dir/../kselftest/ktap_helpers.sh" + +function get_arch_conf() { + local arch=3D$1 + if [[ "$arch" =3D=3D "arm64" ]]; then + QEMU_CMD=3D"qemu-system-aarch64 -M virt -cpu max" + KERNEL_IMAGE=3D"Image" + KERNEL_CMDLINE=3D"console=3DttyAMA0" + elif [[ "$arch" =3D=3D "x86" ]]; then + QEMU_CMD=3D"qemu-system-x86_64" + KERNEL_IMAGE=3D"bzImage" + KERNEL_CMDLINE=3D"console=3DttyS0" + else + echo "Unsupported architecture: $arch" + exit 1 + fi +} + +function usage() { + cat <) + -j) number of jobs for compilation + -t) run test for target_arch (aarch64, x86_64) + -T) test name to run (default: luo_kexec_simple) + -w) custom workspace directory (default: creates temp dir) + -k) keep workspace directory after successful test + -h) display this help +EOF +} + +function cleanup() { + local exit_code=3D$? + + if [ -z "$workspace_dir" ]; then + ktap_finished + return + fi + + if [ $exit_code -ne 0 ]; then + echo "# Test failed (exit code $exit_code)." + echo "# Workspace preserved at: $workspace_dir" + elif [ "$KEEP_WORKSPACE" -eq 1 ]; then + echo "# Workspace preserved (user request) at: $workspace_dir" + else + rm -fr "$workspace_dir" + fi + ktap_print_totals + + exit $exit_code +} +trap cleanup EXIT + +function skip() { + local msg=3D${1:-""} + ktap_test_skip "$msg" + exit "$KSFT_SKIP" +} + +function fail() { + local msg=3D${1:-""} + ktap_test_fail "$msg" + exit "$KSFT_FAIL" +} + +function detect_cross_compile() { + local target=3D$1 + local host=3D$(uname -m) + + if [ -n "$CROSS_COMPILE" ]; then + return + fi + + [[ "$host" =3D=3D "arm64" ]] && host=3D"aarch64" + [[ "$target" =3D=3D "arm64" ]] && target=3D"aarch64" + + if [[ "$host" =3D=3D "$target" ]]; then + CROSS_COMPILE=3D"" + return + fi + + local candidate=3D"" + case "$target" in + aarch64) candidate=3D"aarch64-linux-gnu-" ;; + x86_64) candidate=3D"x86_64-linux-gnu-" ;; + *) skip "Auto-detection for target '$target' not supported. Please= set CROSS_COMPILE manually." ;; + esac + + if command -v "${candidate}gcc" &> /dev/null; then + CROSS_COMPILE=3D"$candidate" + else + skip "Compiler '${candidate}gcc' not found. Please install it (e.g., 'ap= t install gcc-aarch64-linux-gnu') or set CROSS_COMPILE." + fi +} + +function build_kernel() { + local build_dir=3D$1 + local make_cmd=3D$2 + local kimage=3D$3 + local target_arch=3D$4 + + local kconfig=3D"$build_dir/.config" + local common_conf=3D"$test_dir/config" + local arch_conf=3D"$test_dir/config.$target_arch" + + echo "# Building kernel in: $build_dir" + + local fragments=3D() + + if [[ -f "$common_conf" ]]; then + fragments+=3D("$common_conf") + fi + + if [[ -f "$arch_conf" ]]; then + fragments+=3D("$arch_conf") + fi + + if [[ ${#fragments[@]} > 1 ]]; then + echo $fragments + "$kernel_dir/scripts/kconfig/merge_config.sh" \ + -Q -m -O "$build_dir" "${fragments[@]}" >> /dev/null + else + cp ${fragments[0]} $kconfig + fi + cat $kconfig + + $make_cmd olddefconfig + $make_cmd "$kimage" + $make_cmd headers_install INSTALL_HDR_PATH=3D"$headers_dir" +} + +function mkinitrd() { + local build_dir=3D$1 + local kernel_path=3D$2 + local test_name=3D$3 + + # Compile the test binary and the init process + "$CROSS_COMPILE"gcc -static -O2 -nostdinc -nostdlib \ + -I "$headers_dir/include" \ + -I "$kernel_dir/tools/include/nolibc" \ + -I "$test_dir" \ + -o "$workspace_dir/test_binary" \ + "$test_dir/$test_name.c" "$test_dir/luo_test_utils.c" + + "$CROSS_COMPILE"gcc -s -static -Os -nostdinc -nostdlib \ + -fno-asynchronous-unwind-tables -fno-ident \ + -fno-stack-protector \ + -I "$headers_dir/include" \ + -I "$kernel_dir/tools/include/nolibc" \ + -o "$workspace_dir/init" "$test_dir/init.c" + + cat > "$workspace_dir/cpio_list_inner" < "$works= pace_dir/inner_initrd.cpio" + + cat > "$workspace_dir/cpio_list" < "$initrd" + local size=3D$(du -h "$initrd" | cut -f1) +} + +function run_qemu() { + local qemu_cmd=3D$1 + local cmdline=3D$2 + local kernel_path=3D$3 + local serial=3D"$workspace_dir/qemu.serial" + + local accel=3D"-accel tcg" + local host_machine=3D$(uname -m) + + [[ "$host_machine" =3D=3D "arm64" ]] && host_machine=3D"aarch64" + [[ "$host_machine" =3D=3D "x86_64" ]] && host_machine=3D"x86_64" + + if [[ "$qemu_cmd" =3D=3D *"$host_machine"* ]]; then + if [ -w /dev/kvm ]; then + accel=3D"-accel kvm" + fi + fi + + cmdline=3D"$cmdline liveupdate=3Don panic=3D-1" + + echo "# Serial Log: $serial" + timeout 30s $qemu_cmd -m 1G -smp 2 -no-reboot -nographic -nodefaults \ + $accel \ + -serial file:"$serial" \ + -append "$cmdline" \ + -kernel "$kernel_path" \ + -initrd "$initrd" + + local ret=3D$? + + if [ $ret -eq 124 ]; then + fail "QEMU timed out" + fi + + grep "TEST PASSED" "$serial" &> /dev/null || fail "Liveupdate failed. Che= ck $serial for details." +} + +function target_to_arch() { + local target=3D$1 + case $target in + aarch64) echo "arm64" ;; + x86_64) echo "x86" ;; + *) skip "architecture $target is not supported" + esac +} + +function main() { + local build_dir=3D"" + local jobs=3D$(nproc) + local target=3D"$(uname -m)" + local test_name=3D"luo_kexec_simple" + local workspace_arg=3D"" + + set -o errtrace + trap fail ERR + + while getopts 'hd:j:t:T:w:k' opt; do + case $opt in + d) build_dir=3D"$OPTARG" ;; + j) jobs=3D"$OPTARG" ;; + t) target=3D"$OPTARG" ;; + T) test_name=3D"$OPTARG" ;; + w) workspace_arg=3D"$OPTARG" ;; + k) KEEP_WORKSPACE=3D1 ;; + h) usage; exit 0 ;; + *) echo "Unknown argument $opt"; usage; exit 1 ;; + esac + done + + ktap_print_header + ktap_set_plan 1 + + if [ -n "$workspace_arg" ]; then + workspace_dir=3D"$(realpath -m "$workspace_arg")" + mkdir -p "$workspace_dir" + else + workspace_dir=3D$(mktemp -d /tmp/luo-test.XXXXXXXX) + fi + + echo "# Workspace created at: $workspace_dir" + headers_dir=3D"$workspace_dir/usr" + initrd=3D"$workspace_dir/initrd.cpio" + + detect_cross_compile "$target" + + local arch=3D$(target_to_arch "$target") + + if [ -z "$build_dir" ]; then + build_dir=3D"$kernel_dir/.luo_test_build.$arch" + fi + + mkdir -p "$build_dir" + build_dir=3D$(realpath "$build_dir") + get_arch_conf "$arch" + + local make_cmd=3D"make -s ARCH=3D$arch CROSS_COMPILE=3D$CROSS_COMPILE -j$= jobs" + local make_cmd_build=3D"$make_cmd -C $kernel_dir O=3D$build_dir" + + build_kernel "$build_dir" "$make_cmd_build" "$KERNEL_IMAGE" "$target" + + local final_kernel=3D"$build_dir/arch/$arch/boot/$KERNEL_IMAGE" + mkinitrd "$build_dir" "$final_kernel" "$test_name" + + run_qemu "$QEMU_CMD" "$KERNEL_CMDLINE" "$final_kernel" + ktap_test_pass "$test_name succeeded" +} + +main "$@" diff --git a/tools/testing/selftests/liveupdate/luo_test_utils.c b/tools/te= sting/selftests/liveupdate/luo_test_utils.c index 3c8721c505df..7ee80b6ed4cb 100644 --- a/tools/testing/selftests/liveupdate/luo_test_utils.c +++ b/tools/testing/selftests/liveupdate/luo_test_utils.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,8 +22,20 @@ #include #include +#include + #include "luo_test_utils.h" +int sys_ftruncate(int fd, off_t length) +{ + return my_syscall2(__NR_ftruncate, fd, length); +} + +int ftruncate(int fd, off_t length) +{ + return __sysret(sys_ftruncate(fd, length)); +} + int luo_open_device(void) { return open(LUO_DEVICE, O_RDWR); @@ -32,8 +45,8 @@ int luo_create_session(int luo_fd, const char *name) { struct liveupdate_ioctl_create_session arg =3D { .size =3D sizeof(arg) }; - snprintf((char *)arg.name, LIVEUPDATE_SESSION_NAME_LENGTH, "%.*s", - LIVEUPDATE_SESSION_NAME_LENGTH - 1, name); + strncpy((char *)arg.name, name, LIVEUPDATE_SESSION_NAME_LENGTH); + arg.name[LIVEUPDATE_SESSION_NAME_LENGTH - 1] =3D '\0'; if (ioctl(luo_fd, LIVEUPDATE_IOCTL_CREATE_SESSION, &arg) < 0) return -errno; @@ -45,8 +58,8 @@ int luo_retrieve_session(int luo_fd, const char *name) { struct liveupdate_ioctl_retrieve_session arg =3D { .size =3D sizeof(arg) = }; - snprintf((char *)arg.name, LIVEUPDATE_SESSION_NAME_LENGTH, "%.*s", - LIVEUPDATE_SESSION_NAME_LENGTH - 1, name); + strncpy((char *)arg.name, name, LIVEUPDATE_SESSION_NAME_LENGTH); + arg.name[LIVEUPDATE_SESSION_NAME_LENGTH - 1] =3D '\0'; if (ioctl(luo_fd, LIVEUPDATE_IOCTL_RETRIEVE_SESSION, &arg) < 0) return -errno; @@ -57,7 +70,7 @@ int luo_retrieve_session(int luo_fd, const char *name) int create_and_preserve_memfd(int session_fd, int token, const char *data) { struct liveupdate_session_preserve_fd arg =3D { .size =3D sizeof(arg) }; - long page_size =3D sysconf(_SC_PAGE_SIZE); + long page_size =3D getpagesize(); void *map =3D MAP_FAILED; int mfd =3D -1, ret =3D -1; @@ -93,7 +106,7 @@ int restore_and_verify_memfd(int session_fd, int token, const char *expected_data) { struct liveupdate_session_retrieve_fd arg =3D { .size =3D sizeof(arg) }; - long page_size =3D sysconf(_SC_PAGE_SIZE); + long page_size =3D getpagesize(); void *map =3D MAP_FAILED; int mfd =3D -1, ret =3D -1; @@ -204,16 +217,11 @@ void daemonize_and_wait(void) static int parse_stage_args(int argc, char *argv[]) { - static struct option long_options[] =3D { - {"stage", required_argument, 0, 's'}, - {0, 0, 0, 0} - }; - int option_index =3D 0; int stage =3D 1; int opt; optind =3D 1; - while ((opt =3D getopt_long(argc, argv, "s:", long_options, &option_index= )) !=3D -1) { + while ((opt =3D getopt(argc, argv, "s:")) !=3D -1) { switch (opt) { case 's': stage =3D atoi(optarg); @@ -224,6 +232,7 @@ static int parse_stage_args(int argc, char *argv[]) fail_exit("Unknown argument"); } } + return stage; } @@ -251,7 +260,7 @@ int luo_test(int argc, char *argv[], fail_exit("Failed to check for state session"); if (target_stage !=3D detected_stage) { - ksft_exit_fail_msg("Stage mismatch Requested --stage %d, but system is i= n stage %d.\n" + ksft_exit_fail_msg("Stage mismatch Requested stage %d, but system is in = stage %d.\n" "(State session %s: %s)\n", target_stage, detected_stage, state_session_name, (detected_stage =3D=3D 2) ? "EXISTS" : "MISSING"); diff --git a/tools/testing/selftests/liveupdate/run.sh b/tools/testing/self= tests/liveupdate/run.sh new file mode 100755 index 000000000000..3f6b29a26648 --- /dev/null +++ b/tools/testing/selftests/liveupdate/run.sh @@ -0,0 +1,68 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +OUTPUT_DIR=3D"results_$(date +%Y%m%d_%H%M%S)" +SCRIPT_DIR=3D$(dirname "$(realpath "$0")") +TEST_RUNNER=3D"$SCRIPT_DIR/luo_test.sh" + +TARGETS=3D("x86_64" "aarch64") + +GREEN=3D'\033[0;32m' +RED=3D'\033[0;31m' +YELLOW=3D'\033[1;33m' +NC=3D'\033[0m' + +PASSED=3D() +FAILED=3D() +SKIPPED=3D() + +mkdir -p "$OUTPUT_DIR" + +TEST_NAMES=3D() +while IFS=3D read -r file; do + TEST_NAMES+=3D("$(basename "$file" .c)") +done < <(find "$SCRIPT_DIR" -maxdepth 1 -name "luo_*.c" ! -name "luo_test_= utils.c") + +if [ ${#TEST_NAMES[@]} -eq 0 ]; then + echo "No tests found in $SCRIPT_DIR" + exit 1 +fi + +for arch in "${TARGETS[@]}"; do + for test_name in "${TEST_NAMES[@]}"; do + log_file=3D"$OUTPUT_DIR/${arch}_${test_name}.log" + echo -n " -> $arch $test_name ... " + + if "$TEST_RUNNER" -t "$arch" -T "$test_name" > "$log_file" 2>&1; t= hen + echo -e "${GREEN}PASS${NC}" + PASSED+=3D("${arch}:${test_name}") + else + exit_code=3D$? + if [ $exit_code -eq 4 ]; then + echo -e "${YELLOW}SKIP${NC}" + SKIPPED+=3D("${arch}:${test_name}") + else + echo -e "${RED}FAIL${NC}" + FAILED+=3D("${arch}:${test_name}") + fi + fi + done + echo "" +done + +echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D" +echo " TEST SUMMARY " +echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D" +echo -e "PASSED: ${GREEN}${#PASSED[@]}${NC}" +echo -e "FAILED: ${RED}${#FAILED[@]}${NC}" +for fail in "${FAILED[@]}"; do + echo -e " - $fail" +done +echo -e "SKIPPED: ${YELLOW}${#SKIPPED[@]}${NC}" +echo "Logs: $OUTPUT_DIR" + +if [ ${#FAILED[@]} -eq 0 ]; then + exit 0 +else + exit 1 +fi base-commit: 0f61b1860cc3f52aef9036d7235ed1f017632193 -- 2.52.0.457.g6b5491de43-goog