This extends the VBSA test to run the linux tests. The sysarch-acs test suite does provide some pre-built images which is good because the tests require a patched kernel. However due to the structure of the image we need to jump one or two hoops to get something useful:
- download and double decompress (zip then xz) the image - navigate grub to launch the Linux Execution Environment - shutdown the system once tests are done - extract the logs from the MSDOS file system and parse them It does make the code a bit ugly but it works for me at least. So far the subset of tests run is limited but that might be solved by adding some more devices to the PCIe bus to exercise the SMMU behaviour. Reviewed-by: Pierrick Bouvier <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- v2 - dropped unused imports - use archive_extract for the zip step - drop virtuilization=on and smmu=max lines from config - use utf8 encodings for file access - don't use f"" strings when not needed - hack grub.cfg rather than using key presses --- tests/functional/aarch64/test_virt_vbsa.py | 122 +++++++++++++++++++-- 1 file changed, 111 insertions(+), 11 deletions(-) diff --git a/tests/functional/aarch64/test_virt_vbsa.py b/tests/functional/aarch64/test_virt_vbsa.py index 1dd4cecde1e..57bfe5d7af2 100755 --- a/tests/functional/aarch64/test_virt_vbsa.py +++ b/tests/functional/aarch64/test_virt_vbsa.py @@ -10,7 +10,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later import shutil -from subprocess import check_call, DEVNULL +import re +from subprocess import check_call, check_output, DEVNULL from qemu_test import QemuSystemTest, Asset from qemu_test import get_qemu_img, skipIfMissingCommands @@ -28,6 +29,20 @@ def wait_for_console_pattern(self, success_message, vm=None): failure_message='FAILED', vm=vm) + def append_firmware_blobs(self): + """ + Setup QEMU firmware blobs for boot. + """ + code_path = self.build_file('pc-bios', 'edk2-aarch64-code.fd') + vars_source = self.build_file('pc-bios', 'edk2-arm-vars.fd') + vars_path = self.scratch_file('vars.fd') + shutil.copy(vars_source, vars_path) + + self.vm.add_args('-drive', + f'if=pflash,format=raw,readonly=on,file={code_path}') + self.vm.add_args('-drive', f'if=pflash,format=raw,file={vars_path}') + + ASSET_VBSA_EFI = Asset( 'https://github.com/ARM-software/sysarch-acs/raw/refs/heads/main' '/prebuilt_images/VBSA/v25.12_VBSA_0.7.0/Vbsa.efi', @@ -45,20 +60,12 @@ def test_aarch64_vbsa_uefi_tests(self): self.vm.set_console() - # virt machine wi + # virt machine self.set_machine('virt') self.vm.add_args('-M', 'virt,gic-version=max,virtualization=on') self.vm.add_args('-cpu', 'max', '-m', '1024') - # We will use the QEMU firmware blobs to boot - code_path = self.build_file('pc-bios', 'edk2-aarch64-code.fd') - vars_source = self.build_file('pc-bios', 'edk2-arm-vars.fd') - vars_path = self.scratch_file('vars.fd') - shutil.copy(vars_source, vars_path) - - self.vm.add_args('-drive', - f'if=pflash,format=raw,readonly=on,file={code_path}') - self.vm.add_args('-drive', f'if=pflash,format=raw,file={vars_path}') + self.append_firmware_blobs() # Build an EFI FAT32 file-system for the UEFI tests vbsa_efi = self.ASSET_VBSA_EFI.fetch() @@ -102,5 +109,98 @@ def test_aarch64_vbsa_uefi_tests(self): self.wait_for_console_pattern('VBSA tests complete. Reset the system.') + ASSET_SYSREADY_IMAGE = Asset( + 'https://github.com/ARM-software/arm-systemready/' + 'releases/download/v25.10_SR_3.1.0/systemready_acs_live_image.img.xz.zip', + 'df2c359de15784b1da6a8e6f3c98a053ee38ac0b3f241ccea62e17db092eb03a') + + ROOT_PROMPT = '/ # ' + + @skipIfMissingCommands("sfdisk", "jq", "sed") + def test_aarch64_vbsa_linux_tests(self): + """ + Launch the Linux based VBSA test from the ACS prebuilt images. + + We can use the pre-built images and then trigger the Linux + build and run the tests. We then need to slurp the results + from the partition. + """ + + self.vm.set_console() + + # Plain virt machine + self.set_machine('virt') + self.vm.add_args('-M', 'virt,gic-version=max') + self.vm.add_args('-cpu', 'max', '-m', '1024', '-smp', '4') + + self.append_firmware_blobs() + + # First fetch, decompress (twice) and prepare the disk image + # on an NVME device (the kernel only has drivers for that). + self.archive_extract(self.ASSET_SYSREADY_IMAGE, format="zip") + disk_image_xz = self.scratch_file("systemready_acs_live_image.img.xz") + disk_image = self.uncompress(disk_image_xz) + + self.vm.add_args('-device', + 'nvme,drive=hd,serial=QEMU_ROOT_SSD') + self.vm.add_args('-blockdev', + f'driver=raw,node-name=hd,file.driver=file,file.filename={disk_image}') + + # Tweak grub.cfg default to avoid manually navigating grub + grub_cfg = self.scratch_file("grub.cfg") + offset = int(check_output(f"sfdisk --json {disk_image} |" + "jq '.partitiontable.partitions[0].start * 512'", + shell=True)) + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::/EFI/BOOT/grub.cfg", grub_cfg]) + + with open(grub_cfg, 'a', encoding="utf8") as f: + f.write("set default='Linux Execution Enviroment'") + + check_call(["mcopy", "-D", "o", "-i", f"{disk_image}@@{offset}", + grub_cfg, "::/EFI/BOOT/grub.cfg"]) + + # Launch QEMU and wait for grub and select the "Linux + # Execution Environment" so we can launch the test. + + self.vm.launch() + self.wait_for_console_pattern(self.ROOT_PROMPT) + ec_and_wait(self, "/usr/bin/bsa.sh --skip " + "B_REP_1,B_IEP_1,B_PCIe_11,B_MEM_06", + self.ROOT_PROMPT) + + # Now we can shutdown + ec_and_wait(self, "halt -f", "reboot: System halted") + self.vm.shutdown() + + # and extract the test logs + bsa_app_res = self.scratch_file("BsaResultsApp.log") + bsa_kern_res = self.scratch_file("BsaResultsKernel.log") + + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::acs_results/Linux/BsaResultsApp.log", bsa_app_res]) + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::acs_results/Linux/BsaResultsKernel.log", bsa_kern_res]) + + # for now just check the kernel log for the result summary + test_result_re = re.compile(r"\[.*\]\s+(.+): Result:\s+(\w+)") + summary_re = re.compile(r"Total Tests Run =\s*(\d+), Tests Passed =\s*(\d+), Tests Failed =\s*(\d+)") + + with open(bsa_kern_res, 'r', encoding="utf8") as f: + for line in f: + test_match = test_result_re.search(line) + if test_match: + desc = test_match.group(1) + status = test_match.group(2) + self.log.info(f"Test: {desc} status: {status}") + + match = summary_re.search(line) + if match: + total, passed, failed = match.groups() + + if int(failed) > 0: + self.fail(f"{failed} tests failed ({total})") + + if __name__ == '__main__': QemuSystemTest.main() -- 2.47.3
