da38d5c28e
- kvm-tests-avocado-update-aarch64_virt-test-to-exercise-c.patch [bz#2060839] - kvm-RHEL-only-tests-avocado-Switch-aarch64-tests-from-a5.patch [bz#2060839] - kvm-RHEL-only-AArch64-Drop-unsupported-CPU-types.patch [bz#2060839] - kvm-target-i386-deprecate-CPUs-older-than-x86_64-v2-ABI.patch [bz#2060839] - kvm-target-s390x-deprecate-CPUs-older-than-z14.patch [bz#2060839] - kvm-target-arm-deprecate-named-CPU-models.patch [bz#2060839] - kvm-meson.build-Fix-docker-test-build-alpine-when-includ.patch [bz#1968509] - kvm-QIOChannel-Add-flags-on-io_writev-and-introduce-io_f.patch [bz#1968509] - kvm-QIOChannelSocket-Implement-io_writev-zero-copy-flag-.patch [bz#1968509] - kvm-migration-Add-zero-copy-send-parameter-for-QMP-HMP-f.patch [bz#1968509] - kvm-migration-Add-migrate_use_tls-helper.patch [bz#1968509] - kvm-multifd-multifd_send_sync_main-now-returns-negative-.patch [bz#1968509] - kvm-multifd-Send-header-packet-without-flags-if-zero-cop.patch [bz#1968509] - kvm-multifd-Implement-zero-copy-write-in-multifd-migrati.patch [bz#1968509] - kvm-QIOChannelSocket-Introduce-assert-and-reduce-ifdefs-.patch [bz#1968509] - kvm-QIOChannelSocket-Fix-zero-copy-send-so-socket-flush-.patch [bz#1968509] - kvm-migration-Change-zero_copy_send-from-migration-param.patch [bz#1968509] - kvm-migration-Allow-migrate-recover-to-run-multiple-time.patch [bz#2096143] - Resolves: bz#2060839 (Consider deprecating CPU models like "kvm64" / "qemu64" on RHEL 9) - Resolves: bz#1968509 (Use MSG_ZEROCOPY on QEMU Live Migration) - Resolves: bz#2096143 (The migration port is not released if use it again for recovering postcopy migration)
158 lines
6.0 KiB
Diff
158 lines
6.0 KiB
Diff
From f52aa60217634c96fef59ce76b803a94610bf5c8 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Jones <drjones@redhat.com>
|
|
Date: Wed, 15 Jun 2022 15:28:27 +0200
|
|
Subject: [PATCH 01/18] tests/avocado: update aarch64_virt test to exercise
|
|
-cpu max
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Daniel P. Berrangé <berrange@redhat.com>
|
|
RH-MergeRequest: 94: i386, aarch64, s390x: deprecate many named CPU models
|
|
RH-Commit: [1/6] df6839e567180a4c32afd98852f68b2279e00f7c (berrange/centos-src-qemu)
|
|
RH-Bugzilla: 2060839
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2066824
|
|
|
|
commit 11593544df6f8febb3ce87015c22b429bf43c4c7
|
|
Author: Alex Bennée <alex.bennee@linaro.org>
|
|
Date: Tue Apr 19 10:09:56 2022 +0100
|
|
|
|
tests/avocado: update aarch64_virt test to exercise -cpu max
|
|
|
|
The Fedora 29 kernel is quite old and importantly fails when running
|
|
in LPA2 scenarios. As it's not really exercising much of the CPU space
|
|
replace it with a custom 5.16.12 kernel with all the architecture
|
|
options turned on. There is a minimal buildroot initramfs included in
|
|
the kernel which has a few tools for stress testing the memory
|
|
subsystem. The userspace also targets the Neoverse N1 processor so
|
|
would fail with a v8.0 cpu like cortex-a53.
|
|
|
|
While we are at it move the test into its own file so it can have an
|
|
assigned maintainer.
|
|
|
|
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
|
|
Acked-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Tested-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Message-Id: <20220419091020.3008144-2-alex.bennee@linaro.org>
|
|
|
|
Signed-off-by: Andrew Jones <drjones@redhat.com>
|
|
---
|
|
MAINTAINERS | 1 +
|
|
tests/avocado/boot_linux_console.py | 25 -------------
|
|
tests/avocado/machine_aarch64_virt.py | 51 +++++++++++++++++++++++++++
|
|
3 files changed, 52 insertions(+), 25 deletions(-)
|
|
create mode 100644 tests/avocado/machine_aarch64_virt.py
|
|
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
index 2fe20a49ab..bfe8806f60 100644
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -942,6 +942,7 @@ S: Maintained
|
|
F: hw/arm/virt*
|
|
F: include/hw/arm/virt.h
|
|
F: docs/system/arm/virt.rst
|
|
+F: tests/avocado/machine_aarch64_virt.py
|
|
|
|
Xilinx Zynq
|
|
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
|
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
|
|
index b40a3abc81..45a2ceda22 100644
|
|
--- a/tests/avocado/boot_linux_console.py
|
|
+++ b/tests/avocado/boot_linux_console.py
|
|
@@ -325,31 +325,6 @@ def test_mips_malta32el_nanomips_64k_dbg(self):
|
|
kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180'
|
|
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
|
|
|
|
- def test_aarch64_virt(self):
|
|
- """
|
|
- :avocado: tags=arch:aarch64
|
|
- :avocado: tags=machine:virt
|
|
- :avocado: tags=accel:tcg
|
|
- :avocado: tags=cpu:cortex-a53
|
|
- """
|
|
- kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
|
|
- '/linux/releases/29/Everything/aarch64/os/images/pxeboot'
|
|
- '/vmlinuz')
|
|
- kernel_hash = '8c73e469fc6ea06a58dc83a628fc695b693b8493'
|
|
- kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
|
-
|
|
- self.vm.set_console()
|
|
- kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
|
|
- 'console=ttyAMA0')
|
|
- self.require_accelerator("tcg")
|
|
- self.vm.add_args('-cpu', 'cortex-a53',
|
|
- '-accel', 'tcg',
|
|
- '-kernel', kernel_path,
|
|
- '-append', kernel_command_line)
|
|
- self.vm.launch()
|
|
- console_pattern = 'Kernel command line: %s' % kernel_command_line
|
|
- self.wait_for_console_pattern(console_pattern)
|
|
-
|
|
def test_aarch64_xlnx_versal_virt(self):
|
|
"""
|
|
:avocado: tags=arch:aarch64
|
|
diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py
|
|
new file mode 100644
|
|
index 0000000000..21848cba70
|
|
--- /dev/null
|
|
+++ b/tests/avocado/machine_aarch64_virt.py
|
|
@@ -0,0 +1,51 @@
|
|
+# Functional test that boots a Linux kernel and checks the console
|
|
+#
|
|
+# Copyright (c) 2022 Linaro Ltd.
|
|
+#
|
|
+# Author:
|
|
+# Alex Bennée <alex.bennee@linaro.org>
|
|
+#
|
|
+# SPDX-License-Identifier: GPL-2.0-or-later
|
|
+
|
|
+import time
|
|
+
|
|
+from avocado_qemu import QemuSystemTest
|
|
+from avocado_qemu import wait_for_console_pattern
|
|
+from avocado_qemu import exec_command
|
|
+
|
|
+class Aarch64VirtMachine(QemuSystemTest):
|
|
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
|
+
|
|
+ def wait_for_console_pattern(self, success_message, vm=None):
|
|
+ wait_for_console_pattern(self, success_message,
|
|
+ failure_message='Kernel panic - not syncing',
|
|
+ vm=vm)
|
|
+
|
|
+ def test_aarch64_virt(self):
|
|
+ """
|
|
+ :avocado: tags=arch:aarch64
|
|
+ :avocado: tags=machine:virt
|
|
+ :avocado: tags=accel:tcg
|
|
+ :avocado: tags=cpu:max
|
|
+ """
|
|
+ kernel_url = ('https://fileserver.linaro.org/s/'
|
|
+ 'z6B2ARM7DQT3HWN/download')
|
|
+
|
|
+ kernel_hash = 'ed11daab50c151dde0e1e9c9cb8b2d9bd3215347'
|
|
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
|
+
|
|
+ self.vm.set_console()
|
|
+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
|
|
+ 'console=ttyAMA0')
|
|
+ self.require_accelerator("tcg")
|
|
+ self.vm.add_args('-cpu', 'max,pauth-impdef=on',
|
|
+ '-accel', 'tcg',
|
|
+ '-kernel', kernel_path,
|
|
+ '-append', kernel_command_line)
|
|
+ self.vm.launch()
|
|
+ self.wait_for_console_pattern('Welcome to Buildroot')
|
|
+ time.sleep(0.1)
|
|
+ exec_command(self, 'root')
|
|
+ time.sleep(0.1)
|
|
+ exec_command(self, 'cat /proc/self/maps')
|
|
+ time.sleep(0.1)
|
|
--
|
|
2.35.3
|
|
|