From: Alex Bennée <alex.bennee@linaro.org>

This is a simple test case that runs an image with kvmtool and
kvm-unit-tests which can validate virtualisation works. This is useful
for exercising TCG but can also be applied to any nested virt setup
which is why it doesn't specify an accelerator.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250721153326.783646-1-alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
v2: Addressed Manos review comments
---
 tests/functional/meson.build         |  1 +
 tests/functional/test_aarch64_kvm.py | 80 ++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100755 tests/functional/test_aarch64_kvm.py

diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 7699af9e2d2..2f7bc4ed65c 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -89,6 +89,7 @@ tests_aarch64_system_thorough = [
   'aarch64_device_passthrough',
   'aarch64_hotplug_pci',
   'aarch64_imx8mp_evk',
+  'aarch64_kvm',
   'aarch64_raspi3',
   'aarch64_raspi4',
   'aarch64_replay',
diff --git a/tests/functional/test_aarch64_kvm.py b/tests/functional/test_aarch64_kvm.py
new file mode 100755
index 00000000000..add89c58c5e
--- /dev/null
+++ b/tests/functional/test_aarch64_kvm.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+#
+# Functional test that runs subsets of kvm-unit-tests on Aarch64.
+# These can run on TCG and any accelerator supporting nested
+# virtualisation.
+#
+# Copyright (c) 2025 Linaro
+#
+# Author:
+#  Alex Bennée <alex.bennee@linaro.org>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu.machine.machine import VMLaunchFailure
+
+from qemu_test import Asset
+from qemu_test import exec_command_and_wait_for_pattern as ec_and_wait
+from qemu_test.linuxkernel import LinuxKernelTest
+
+
+class Aarch64VirtKVMTests(LinuxKernelTest):
+
+    ASSET_KVM_TEST_KERNEL = Asset(
+        'https://fileserver.linaro.org/s/HmjaxXXYHYSqbes/'
+        'download?path=%2F&files='
+        'image-with-kvm-tool-and-unit-tests.gz',
+        '34de4aaea90db5da42729e7d28b77f392c37a2f4da859f889a5234aaf0970696')
+
+    # make it easier to detect successful return to shell
+    PS1 = 'RES=[$?] # '
+    OK_CMD = 'RES=[0] # '
+
+    # base of tests
+    KUT_BASE = '/usr/share/kvm-unit-tests/'
+
+    def _launch_guest(self, kvm_mode):
+
+        self.set_machine('virt')
+        kernel_path = self.ASSET_KVM_TEST_KERNEL.fetch()
+
+        self.vm.set_console()
+        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                               f'console=ttyAMA0 kvm-arm.mode={kvm_mode}')
+
+        self.vm.add_args('-accel', 'tcg')
+        self.vm.add_args('-cpu', 'cortex-a72')
+        self.vm.add_args('-machine', 'virt,gic-version=3,virtualization=on',
+                         '-kernel', kernel_path,
+                         '-append', kernel_command_line)
+        self.vm.add_args('-smp', '2', '-m', '320')
+
+        try:
+            self.vm.launch()
+        except VMLaunchFailure as excp:
+            self.log.info('unhandled launch failure: %s', excp.output)
+            raise excp
+
+        self.wait_for_console_pattern('buildroot login:')
+        ec_and_wait(self, 'root', '#')
+        ec_and_wait(self, f'export PS1="{self.PS1}"', self.OK_CMD)
+
+    def _run_kut(self, kvm_mode):
+        ec_and_wait(self, f'{self.KUT_BASE}/selftest-setup', self.OK_CMD)
+        ec_and_wait(self, f'{self.KUT_BASE}/selftest-vectors-kernel', self.OK_CMD)
+        ec_and_wait(self, f'{self.KUT_BASE}/selftest-vectors-user', self.OK_CMD)
+        ec_and_wait(self, f'{self.KUT_BASE}/selftest-smp', self.OK_CMD)
+
+    def do_test(self, kvm_mode='nvhe', accel='tcg'):
+        self.require_accelerator(accel)
+        self._launch_guest(kvm_mode)
+        self._run_kut(kvm_mode)
+
+    def test_aarch64_vhe_selftest_tcg(self):
+        self.do_test('vhe')
+
+    def test_aarch64_nvhe_selftest_tcg(self):
+        self.do_test('nvhe')
+
+if __name__ == '__main__':
+    LinuxKernelTest.main()
-- 
2.49.0

Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> From: Alex Bennée <alex.bennee@linaro.org>
>
> This is a simple test case that runs an image with kvmtool and
> kvm-unit-tests which can validate virtualisation works. This is useful
> for exercising TCG but can also be applied to any nested virt setup
> which is why it doesn't specify an accelerator.

You might want to update this text give now...

<snip>
> +
> +    def do_test(self, kvm_mode='nvhe', accel='tcg'):
> +        self.require_accelerator(accel)

You are now forcing tcg. Or are you planning on adding additional tests
bellow to exercise split and KVM (when we have nested support for
HVF/KVM)?

> +        self._launch_guest(kvm_mode)
> +        self._run_kut(kvm_mode)
> +
> +    def test_aarch64_vhe_selftest_tcg(self):
> +        self.do_test('vhe')
> +
> +    def test_aarch64_nvhe_selftest_tcg(self):
> +        self.do_test('nvhe')
> +
> +if __name__ == '__main__':
> +    LinuxKernelTest.main()

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

On 24/7/25 13:02, Alex Bennée wrote:
> Philippe Mathieu-Daudé <philmd@linaro.org> writes:
> 
>> From: Alex Bennée <alex.bennee@linaro.org>
>>
>> This is a simple test case that runs an image with kvmtool and
>> kvm-unit-tests which can validate virtualisation works. This is useful
>> for exercising TCG but can also be applied to any nested virt setup
>> which is why it doesn't specify an accelerator.
> 
> You might want to update this text give now...
> 
> <snip>
>> +
>> +    def do_test(self, kvm_mode='nvhe', accel='tcg'):
>> +        self.require_accelerator(accel)
> 
> You are now forcing tcg. Or are you planning on adding additional tests
> bellow to exercise split and KVM (when we have nested support for
> HVF/KVM)?

I don't know about KVM. For HVF/split I'm using:

-- >8 --
commit a4c49f63b31da7fb16d29656479d1942efebba2a
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date:   Wed Jul 23 17:41:36 2025 +0200

     tests/functional/test_aarch64_kvm: Test split accelerator

     Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/tests/functional/test_aarch64_kvm.py 
b/tests/functional/test_aarch64_kvm.py
index add89c58c5e..f1e0a4382bd 100755
--- a/tests/functional/test_aarch64_kvm.py
+++ b/tests/functional/test_aarch64_kvm.py
@@ -36 +36 @@ class Aarch64VirtKVMTests(LinuxKernelTest):
-    def _launch_guest(self, kvm_mode):
+    def _launch_guest(self, kvm_mode, accel='tcg'):
@@ -45,2 +45,2 @@ def _launch_guest(self, kvm_mode):
-        self.vm.add_args('-accel', 'tcg')
-        self.vm.add_args('-cpu', 'cortex-a72')
+        self.vm.add_args('-accel', accel)
+        self.vm.add_args('-cpu', 'cortex-a72' if accel == 'tcg' else 
'host')
@@ -66 +66,2 @@ def _run_kut(self, kvm_mode):
-        ec_and_wait(self, f'{self.KUT_BASE}/selftest-smp', self.OK_CMD)
+        if kvm_mode == 'nvhe':
+            ec_and_wait(self, f'{self.KUT_BASE}/selftest-smp', self.OK_CMD)
@@ -70 +71 @@ def do_test(self, kvm_mode='nvhe', accel='tcg'):
-        self._launch_guest(kvm_mode)
+        self._launch_guest(kvm_mode, accel)
@@ -74 +75 @@ def test_aarch64_vhe_selftest_tcg(self):
-        self.do_test('vhe')
+        self.do_test('vhe', 'tcg')
@@ -77 +78,7 @@ def test_aarch64_nvhe_selftest_tcg(self):
-        self.do_test('nvhe')
+        self.do_test('nvhe', 'tcg')
+
+    def test_aarch64_vhe_selftest_split(self):
+        self.do_test('vhe', 'split')
+
+    def test_aarch64_nvhe_selftest_split(self):
+        self.do_test('nvhe', 'split')
---