From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6D0FC3ABC0 for ; Wed, 7 May 2025 15:14:43 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4ZszM33jg4z2yrt; Thu, 8 May 2025 01:14:23 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1746630863; cv=none; b=Dt4KmjTwtH+c0LaE7Ao3Xv4tLYKSvntH5YFAMkzaTkFozYnho8WoxTMkFJmC9e4VZowfOKisa5VMu3hqXF1XHQV/dAss+YLXnPBCOMfgEwGZt8u9y96GCFqVsclonJQo1GPOqrmHNBT/qHHKHRuFXcqlo0l9NMcTDZZmWxnp95fhsOzLTQ+U8M/AhX+6MQ1Jhx+fDM4w3ym53639pglsJNVxKbRON/6sdup6cflM0vHtKRAZ/AjkXQFet2Q6bIn78bw4mqXuIVMXK0ArRFMJJwZJDf58EqVnsMR2MBIkbYEhCbr2IGOlm12k7iTg2Ixny7G2fd0za8VaCyASd0wm2Q== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1746630863; c=relaxed/relaxed; bh=8sj3lqlp3c72tUgnREROhDuVMcJemo9gQdamc3hr3nE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xualgk4aiEkRpx+8pxqmQUekkBsXWp83Miyb1/TjNhTpHsSZXWI3qAgVFm/eZgu0eaXrpLD3tGEWC2OhJdgOWJSq5rVEVo8XorLaOObBIctG39GqYWjlxuPCLJ2ls2sXsalQE6kKmbLKfuMXwHweXox8SDjiRE3FCLpsNX/QZebUd+nt1L9nXzIR11cIzSvg2PPe2zGNfkEc9HA1UPBCjsyxhy9X4N4rWxPEFZkPZ9CaflStUOQE+UHJpeqsHSgs1dQKmjfCBpCi172JGoCcfh2g1uQX0gUnSrQsQab1pQ6gXf/xdrzIxsn9lBXLZHyBAgsYDJ/79f6xLAbkavoI5w== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass (client-ip=217.140.110.172; helo=foss.arm.com; envelope-from=alexandru.elisei@arm.com; receiver=lists.ozlabs.org) smtp.mailfrom=arm.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=arm.com (client-ip=217.140.110.172; helo=foss.arm.com; envelope-from=alexandru.elisei@arm.com; receiver=lists.ozlabs.org) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lists.ozlabs.org (Postfix) with ESMTP id 4ZszM10v2sz3057 for ; Thu, 8 May 2025 01:14:20 +1000 (AEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E826422BE; Wed, 7 May 2025 08:13:31 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C912D3F58B; Wed, 7 May 2025 08:13:38 -0700 (PDT) From: Alexandru Elisei To: andrew.jones@linux.dev, eric.auger@redhat.com, lvivier@redhat.com, thuth@redhat.com, frankja@linux.ibm.com, imbrenda@linux.ibm.com, nrb@linux.ibm.com, david@redhat.com, pbonzini@redhat.com Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-s390@vger.kernel.org, will@kernel.org, julien.thierry.kdev@gmail.com, maz@kernel.org, oliver.upton@linux.dev, suzuki.poulose@arm.com, yuzenghui@huawei.com, joey.gouly@arm.com, andre.przywara@arm.com Subject: [kvm-unit-tests PATCH v3 08/16] scripts: Add 'kvmtool_params' to test definition Date: Wed, 7 May 2025 16:12:48 +0100 Message-ID: <20250507151256.167769-9-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507151256.167769-1-alexandru.elisei@arm.com> References: <20250507151256.167769-1-alexandru.elisei@arm.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit arm/arm64 supports running tests under kvmtool, but kvmtool's syntax for running and configuring a virtual machine is different to qemu. To run tests using the automated test infrastructure, add a new test parameter, 'kvmtool_params'. The parameter serves the exact purpose as 'qemu_params', but using kvmtool's syntax. Signed-off-by: Alexandru Elisei --- arm/unittests.cfg | 24 +++++++++++++++++++++++ docs/unittests.txt | 8 ++++++++ scripts/common.bash | 47 +++++++++++++++++++++++++++++---------------- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/arm/unittests.cfg b/arm/unittests.cfg index a4192ed7e20b..f3c773e56933 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -17,6 +17,7 @@ file = selftest.flat smp = 2 test_args = 'setup smp=2 mem=256' qemu_params = -m 256 +kvmtool_params = --mem 256 groups = selftest # Test vector setup and exception handling (kernel mode). @@ -48,66 +49,77 @@ groups = pci file = pmu.flat groups = pmu test_args = "cycle-counter 0" +kvmtool_params = --pmu [pmu-event-introspection] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-event-introspection +kvmtool_params = --pmu [pmu-event-counter-config] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-event-counter-config +kvmtool_params = --pmu [pmu-basic-event-count] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-basic-event-count +kvmtool_params = --pmu [pmu-mem-access] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-mem-access +kvmtool_params = --pmu [pmu-mem-access-reliability] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-mem-access-reliability +kvmtool_params = --pmu [pmu-sw-incr] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-sw-incr +kvmtool_params = --pmu [pmu-chained-counters] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-chained-counters +kvmtool_params = --pmu [pmu-chained-sw-incr] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-chained-sw-incr +kvmtool_params = --pmu [pmu-chain-promotion] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-chain-promotion +kvmtool_params = --pmu [pmu-overflow-interrupt] file = pmu.flat groups = pmu arch = arm64 test_args = pmu-overflow-interrupt +kvmtool_params = --pmu # Test PMU support (TCG) with -icount IPC=1 #[pmu-tcg-icount-1] @@ -131,6 +143,7 @@ file = gic.flat smp = $((($MAX_SMP < 8)?$MAX_SMP:8)) test_args = ipi qemu_params = -machine gic-version=2 +kvmtool_params = --irqchip=gicv2 groups = gic [gicv2-mmio] @@ -138,6 +151,7 @@ file = gic.flat smp = $((($MAX_SMP < 8)?$MAX_SMP:8)) test_args = mmio qemu_params = -machine gic-version=2 +kvmtool_params = --irqchip=gicv2 groups = gic [gicv2-mmio-up] @@ -145,6 +159,7 @@ file = gic.flat smp = 1 test_args = mmio qemu_params = -machine gic-version=2 +kvmtool_params = --irqchip=gicv2 groups = gic [gicv2-mmio-3p] @@ -152,6 +167,7 @@ file = gic.flat smp = $((($MAX_SMP < 3)?$MAX_SMP:3)) test_args = mmio qemu_params = -machine gic-version=2 +kvmtool_params = --irqchip=gicv2 groups = gic [gicv3-ipi] @@ -159,6 +175,7 @@ file = gic.flat smp = $MAX_SMP test_args = ipi qemu_params = -machine gic-version=3 +kvmtool_params = --irqchip=gicv3 groups = gic [gicv2-active] @@ -166,6 +183,7 @@ file = gic.flat smp = $((($MAX_SMP < 8)?$MAX_SMP:8)) test_args = active qemu_params = -machine gic-version=2 +kvmtool_params = --irqchip=gicv2 groups = gic [gicv3-active] @@ -173,6 +191,7 @@ file = gic.flat smp = $MAX_SMP test_args = active qemu_params = -machine gic-version=3 +kvmtool_params = --irqchip=gicv3 groups = gic [its-introspection] @@ -180,6 +199,7 @@ file = gic.flat smp = $MAX_SMP test_args = its-introspection qemu_params = -machine gic-version=3 +kvmtool_params = --irqchip=gicv3-its groups = its arch = arm64 @@ -188,6 +208,7 @@ file = gic.flat smp = $MAX_SMP test_args = its-trigger qemu_params = -machine gic-version=3 +kvmtool_params = --irqchip=gicv3-its groups = its arch = arm64 @@ -196,6 +217,7 @@ file = gic.flat smp = $MAX_SMP test_args = its-migration qemu_params = -machine gic-version=3 +kvmtool_params = --irqchip=gicv3 groups = its migration arch = arm64 @@ -204,6 +226,7 @@ file = gic.flat smp = $MAX_SMP test_args = its-pending-migration qemu_params = -machine gic-version=3 +kvmtool_params = --irqchip=gicv3 groups = its migration arch = arm64 @@ -212,6 +235,7 @@ file = gic.flat smp = $MAX_SMP test_args = its-migrate-unmapped-collection qemu_params = -machine gic-version=3 +kvmtool_params = --irqchip=gicv3 groups = its migration arch = arm64 diff --git a/docs/unittests.txt b/docs/unittests.txt index ea0da959f008..a9164bccc24c 100644 --- a/docs/unittests.txt +++ b/docs/unittests.txt @@ -78,6 +78,14 @@ extra_params Alias for 'qemu_params', supported for compatibility purposes. Use 'qemu_params' for new tests. +kvmtool_params +-------------- +Extra parameters supplied to the kvmtool process. Works similarly to +'qemu_params', but uses kvmtool's syntax for command line arguments. The +example for 'qemu_params', applied to kvmtool, would be: + +kvmtool_params = --mem 256 + groups ------ groups = ... diff --git a/scripts/common.bash b/scripts/common.bash index 649f1c737617..0645235d8baa 100644 --- a/scripts/common.bash +++ b/scripts/common.bash @@ -1,6 +1,29 @@ source config.mak source scripts/vmm.bash +function parse_opts() +{ + local opts="$1" + local fd="$2" + + while read -r -u $fd; do + #escape backslash newline, but not double backslash + if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then + if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then + opts=${opts%\\$'\n'} + fi + fi + if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then + opts+=${BASH_REMATCH[1]} + break + else + opts+=$REPLY$'\n' + fi + done + + echo "$opts" +} + function for_each_unittest() { local unittests="$1" @@ -46,24 +69,14 @@ function for_each_unittest() smp="${vmm_opts[$TARGET:nr_cpus]} ${BASH_REMATCH[1]}" elif [[ $line =~ ^test_args\ *=\ *(.*)$ ]]; then test_args="${vmm_opts[$TARGET:args]} ${BASH_REMATCH[1]}" - elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *'"""'(.*)$ ]]; then - opts=${BASH_REMATCH[2]}$'\n' - while read -r -u $fd; do - #escape backslash newline, but not double backslash - if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then - if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then - opts=${opts%\\$'\n'} - fi - fi - if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then - opts+=${BASH_REMATCH[1]} - break - else - opts+=$REPLY$'\n' - fi - done - elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *(.*)$ ]]; then + elif [[ $TARGET = "qemu" ]] && [[ $line =~ ^(extra_params|qemu_params)\ *=\ *'"""'(.*)$ ]]; then + opts=$(parse_opts ${BASH_REMATCH[2]}$'\n' $fd) + elif [[ $TARGET = "qemu" ]] && [[ $line =~ ^(extra_params|qemu_params)\ *=\ *(.*)$ ]]; then opts=${BASH_REMATCH[2]} + elif [[ $TARGET = "kvmtool" ]] && [[ $line =~ ^kvmtool_params\ *=\ *'"""'(.*)$ ]]; then + opts=$(parse_opts ${BASH_REMATCH[1]}$'\n' $fd) + elif [[ $TARGET = "kvmtool" ]] && [[ $line =~ ^kvmtool_params\ *=\ *(.*)$ ]]; then + opts=${BASH_REMATCH[1]} elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then groups=${BASH_REMATCH[1]} elif [[ $line =~ ^arch\ *=\ *(.*)$ ]]; then -- 2.49.0