From nobody Thu Apr 2 18:53:52 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6F703D9DA6 for ; Fri, 27 Mar 2026 08:53:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774601624; cv=none; b=IUL27GmunE0G9ZNyMPqFFA4all9/D4Vuuxgms7Td5nZmSwMo6sBj/m1il1ri6YwGyl74LQKPYaOIR61Ru5onKaN0tDWfzIstMxrVN94123b9Ja5DA1EYG8UWfbHnW9YeWvNJUtfMR2fMVdATXnYEb8t+lxdvX2+lVUDGdoIMzEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774601624; c=relaxed/simple; bh=BsSYA5cy/2SkZyy3G7dv+N3UbWW5P8XBB9WMNK85tiA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jy2s/wCVtuEWukfMEInUgKiMHQlV0Z8/jYr4EXPtwb9e7N0RfCLaYItizPQsZlUqRjwEQzS6+Fm/XcY/gDKJBaK2M7FErPVstcsvyVpBoc8JumOMBZRk6eZO5P1tsS4nRW62dwwCvBT1Fn53MasUXwE2F2zlD8ZI44stx9HOn60= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=f540NeRm; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="f540NeRm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774601621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TaBKeSfaC+frAgr5WgnFAfgrBSTjbXwnCuf3mrMVN4k=; b=f540NeRmVsHy2QVq8qxspglOFDHjxw1THEQsl4UHd/7pWvci4Njh9Rc/x2S/eKwisLJAzY TgDORsOcjmFZI4AjSd+BJ6owifCJF1CYctQ3GxkCQKqXVBTOgYqwcu5I9G/teU4cK5AGhh wCXGDHfy3fybK+A/zKsRIweBvm4wosI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-RuIq779hPRe3FKgNdmJ7uQ-1; Fri, 27 Mar 2026 04:53:38 -0400 X-MC-Unique: RuIq779hPRe3FKgNdmJ7uQ-1 X-Mimecast-MFC-AGG-ID: RuIq779hPRe3FKgNdmJ7uQ_1774601617 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2445218002E7; Fri, 27 Mar 2026 08:53:37 +0000 (UTC) Received: from [192.168.1.153] (unknown [10.44.32.245]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 429B71800671; Fri, 27 Mar 2026 08:53:32 +0000 (UTC) From: Albert Esteve Date: Fri, 27 Mar 2026 09:53:05 +0100 Subject: [PATCH 3/3] selftests: cgroup: Add vmtest-dmem runner based on hid vmtest Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260327-kunit_cgroups-v1-3-971b3c739a00@redhat.com> References: <20260327-kunit_cgroups-v1-0-971b3c739a00@redhat.com> In-Reply-To: <20260327-kunit_cgroups-v1-0-971b3c739a00@redhat.com> To: Tejun Heo , Johannes Weiner , =?utf-8?q?Michal_Koutn=C3=BD?= , Shuah Khan Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org, Albert Esteve , mripard@redhat.com, echanude@redhat.com X-Developer-Signature: v=1; a=ed25519-sha256; t=1774601599; l=6486; i=aesteve@redhat.com; s=20260303; h=from:subject:message-id; bh=BsSYA5cy/2SkZyy3G7dv+N3UbWW5P8XBB9WMNK85tiA=; b=KGs37dNZ77rJ/YEqYjctlqQ7wa/lhKxxsSI7hPuaGFtsS6+xnPmCOF9/y2aJOr7U+UMFnLMjC LuZPZlwTCklBVzFKD/oPWMIBnhgVM5/nyV85GCngh898RN4BOlkc37F X-Developer-Key: i=aesteve@redhat.com; a=ed25519; pk=YSFz6sOHd2L45+Fr8DIvHTi6lSIjhLZ5T+rkxspJt1s= X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Currently, test_dmem relies on the dmem_selftest helper module and a VM setup that may not have the helper preinstalled. This makes automated coverage of dmem charge paths harder in virtme-based runs. Add tools/testing/selftests/cgroup/vmtest-dmem.sh, modeled after the existing selftests vmtest runners (notably tools/testing/selftests/hid/vmtest.sh), to provide a repeatable VM workflow for dmem tests. The script boots a virtme-ng guest, validates dmem controller availability, ensures the dmem helper path is present, and runs tools/testing/selftests/cgroup/test_dmem. If the helper is not available as a loaded module, it attempts module build/load for the running guest kernel before executing the test binary. The runner also supports interactive shell mode and reuses the same verbosity and exit-code conventions used by other vmtest scripts, so it integrates with existing kselftest workflows. Signed-off-by: Albert Esteve --- tools/testing/selftests/cgroup/vmtest-dmem.sh | 189 ++++++++++++++++++++++= ++++ 1 file changed, 189 insertions(+) diff --git a/tools/testing/selftests/cgroup/vmtest-dmem.sh b/tools/testing/= selftests/cgroup/vmtest-dmem.sh new file mode 100755 index 0000000000000..e481d3b2cdf8f --- /dev/null +++ b/tools/testing/selftests/cgroup/vmtest-dmem.sh @@ -0,0 +1,189 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2026 Red Hat, Inc. +# +# Run cgroup test_dmem inside a virtme-ng VM. +# Dependencies: +# * virtme-ng +# * busybox-static (used by virtme-ng) +# * qemu (used by virtme-ng) + +set -euo pipefail + +readonly SCRIPT_DIR=3D"$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && p= wd -P)" +readonly KERNEL_CHECKOUT=3D"$(realpath "${SCRIPT_DIR}"/../../../../)" + +source "${SCRIPT_DIR}"/../kselftest/ktap_helpers.sh + +readonly SSH_GUEST_PORT=3D"${SSH_GUEST_PORT:-22}" +readonly WAIT_PERIOD=3D3 +readonly WAIT_PERIOD_MAX=3D80 +readonly WAIT_TOTAL=3D$((WAIT_PERIOD * WAIT_PERIOD_MAX)) +readonly QEMU_PIDFILE=3D"$(mktemp /tmp/qemu_dmem_vmtest_XXXX.pid)" +readonly QEMU_OPTS=3D" --pidfile ${QEMU_PIDFILE} " + +QEMU=3D"qemu-system-$(uname -m)" +VERBOSE=3D0 +SHELL_MODE=3D0 +GUEST_TREE=3D"${GUEST_TREE:-$KERNEL_CHECKOUT}" + +usage() { + echo + echo "$0 [OPTIONS]" + echo " -q QEMU binary/path (default: ${QEMU})" + echo " -s Start interactive shell in VM" + echo " -v Verbose output (use -vv for vng boot logs)" + echo +} + +die() { + echo "$*" >&2 + exit "${KSFT_FAIL}" +} + +cleanup() { + if [[ -s "${QEMU_PIDFILE}" ]]; then + pkill -SIGTERM -F "${QEMU_PIDFILE}" >/dev/null 2>&1 || true + fi + rm -f "${QEMU_PIDFILE}" +} + +vm_ssh() { + stdbuf -oL ssh -q \ + -F "${HOME}/.cache/virtme-ng/.ssh/virtme-ng-ssh.conf" \ + -l root "virtme-ng%${SSH_GUEST_PORT}" \ + "$@" +} + +check_deps() { + for dep in vng "${QEMU}" busybox pkill ssh; do + if ! command -v "${dep}" >/dev/null 2>&1; then + echo "skip: dependency ${dep} not found" + exit "${KSFT_SKIP}" + fi + done +} + +vm_start() { + local logfile=3D/dev/null + local verbose_opt=3D"" + + if [[ "${VERBOSE}" -eq 2 ]]; then + verbose_opt=3D"--verbose" + logfile=3D/dev/stdout + fi + + vng \ + --run \ + ${verbose_opt} \ + --qemu-opts=3D"${QEMU_OPTS}" \ + --qemu=3D"$(command -v "${QEMU}")" \ + --user root \ + --ssh "${SSH_GUEST_PORT}" \ + --rw &>"${logfile}" & + + local vng_pid=3D$! + local elapsed=3D0 + + while [[ ! -s "${QEMU_PIDFILE}" ]]; do + kill -0 "${vng_pid}" 2>/dev/null || die "vng exited early; failed to boo= t VM" + [[ "${elapsed}" -ge "${WAIT_TOTAL}" ]] && die "timed out waiting for VM = boot" + sleep 1 + elapsed=3D$((elapsed + 1)) + done +} + +vm_wait_for_ssh() { + local i=3D0 + while true; do + vm_ssh -- true && break + i=3D$((i + 1)) + [[ "${i}" -gt "${WAIT_PERIOD_MAX}" ]] && die "timed out waiting for gues= t ssh" + sleep "${WAIT_PERIOD}" + done +} + +check_guest_requirements() { + local cfg_ok + cfg_ok=3D"$(vm_ssh -- "cfg=3D/boot/config-\$(uname -r); \ + if [[ -r \"\$cfg\" ]]; then grep -Eq '^CONFIG_CGROUP_DMEM=3D(y|m)$' \"\$= cfg\"; \ + elif [[ -r /proc/config.gz ]]; then \ + zgrep -Eq '^CONFIG_CGROUP_DMEM=3D(y|m)$' /proc/config.gz; \ + else false; fi; echo \$?")" + [[ "${cfg_ok}" =3D=3D "0" ]] || die "guest kernel missing CONFIG_CGROUP_D= MEM" +} + +setup_guest_dmem_helper() { + local kdir + + vm_ssh -- "mountpoint -q /sys/kernel/debug || \ + mount -t debugfs none /sys/kernel/debug" || true + + # Already available (built-in or loaded). + if vm_ssh -- "[[ -e /sys/kernel/debug/dmem_selftest/charge ]]"; then + echo "dmem_selftest ready" + return 0 + fi + + # Fast path: try installed module. + vm_ssh -- "modprobe -q dmem_selftest 2>/dev/null || true" + if vm_ssh -- "[[ -e /sys/kernel/debug/dmem_selftest/charge ]]"; then + echo "dmem_selftest ready" + return 0 + fi + + # Fallback: build only this module against running guest kernel, + # then insert it. + kdir=3D"$(vm_ssh -- "echo /lib/modules/\$(uname -r)/build")" + if vm_ssh -- "[[ -d '${kdir}' ]]"; then + echo "Building dmem_selftest.ko against running guest kernel..." + vm_ssh -- "make -C '${kdir}' \ + M=3D'${GUEST_TREE}/kernel/cgroup' \ + CONFIG_DMEM_SELFTEST=3Dm modules" + vm_ssh -- "insmod '${GUEST_TREE}/kernel/cgroup/dmem_selftest.ko' \ + 2>/dev/null || modprobe -q dmem_selftest 2>/dev/null || true" + fi + + if vm_ssh -- "[[ -e /sys/kernel/debug/dmem_selftest/charge ]]"; then + echo "dmem_selftest ready" + return 0 + fi + + die "dmem_selftest unavailable (modprobe/build+insmod failed)" +} + +run_test() { + vm_ssh -- "cd '${GUEST_TREE}' && make -C tools/testing/selftests TARGETS= =3Dcgroup" + vm_ssh -- "cd '${GUEST_TREE}' && ./tools/testing/selftests/cgroup/test_dm= em" +} + +while getopts ":hvq:s" o; do + case "${o}" in + v) VERBOSE=3D$((VERBOSE + 1)) ;; + q) QEMU=3D"${OPTARG}" ;; + s) SHELL_MODE=3D1 ;; + h|*) usage ;; + esac +done + +trap cleanup EXIT + +check_deps +echo "Booting virtme-ng VM..." +vm_start +vm_wait_for_ssh +echo "VM is reachable via SSH." +check_guest_requirements +setup_guest_dmem_helper + +if [[ "${SHELL_MODE}" -eq 1 ]]; then + echo "Starting interactive shell in VM. Exit to stop VM." + vm_ssh -t -- "cd '${GUEST_TREE}' && exec bash --noprofile --norc" + exit "${KSFT_PASS}" +fi + +echo "Running cgroup/test_dmem in VM..." +run_test +echo "PASS: test_dmem completed" +exit "${KSFT_PASS}" --=20 2.52.0