[PATCH v3 0/4] tests/avocado: update sbsa-ref firmware to latest

[PATCH v3 0/4] tests/avocado: update sbsa-ref firmware to latest

[Marcin Juszkiewicz]

Updating sbsa-ref firmware for QEMU CI was manual task. Now it is
replaced by CI job run on CodeLinaro Gitlab instance.

This patchset updates to current state:

- Trusted Firmware v2.10.2 (latest LTS)
- Tianocore EDK2 stable202402 (latest release)

And Tianocore EDK2-platforms commit 085c2fb (edk2-platforms does not
have releases).

Firmware images were built using Debian 'bookworm' cross gcc 12.2.0
compiler.

And while I am in that file I dropped use of 'virtio-rng-pci' device as
sbsa-ref is supposed to emulate physical hardware.

Added 'max' tests with 'pauth=off' and 'pauth-impdef=on' variants.

(01/11) test_sbsaref_edk2_firmware: PASS (2.51 s)
(02/11) test_sbsaref_alpine_linux_cortex_a57: PASS (23.72 s)
(03/11) test_sbsaref_alpine_linux_neoverse_n1: PASS (23.70 s)
(04/11) test_sbsaref_alpine_linux_max_pauth_off: PASS (23.00 s)
(05/11) test_sbsaref_alpine_linux_max_pauth_impdef: PASS (29.03 s)
(06/11) test_sbsaref_alpine_linux_max: PASS (80.69 s)
(07/11) test_sbsaref_openbsd73_cortex_a57: PASS (16.05 s)
(08/11) test_sbsaref_openbsd73_neoverse_n1: PASS (15.97 s)
(09/11) test_sbsaref_openbsd73_max_pauth_off: PASS (16.22 s)
(10/11) test_sbsaref_openbsd73_max_pauth_impdef: PASS (16.11 s)
(11/11) test_sbsaref_openbsd73_max: PASS (16.08 s)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
Changes in v3:
- left OpenBSD at 7.3 (7.4+ is known to not boot)
  https://gitlab.com/qemu-project/qemu/-/issues/2224
  https://marc.info/?l=openbsd-arm&m=171050428327850&w=2
- added pauth variants of 'max' to OpenBSD tests
- Link to v2: https://lore.kernel.org/r/20240314-sbsa-ref-firmware-update-v2-0-b557c56559cd@linaro.org

Changes in v2:
- disabled 'max' tests on OpenBSD
- moved tags to 'one tag per line'
- added 'os:linux' tags to Alpine ones
- Link to v1: https://lore.kernel.org/r/20240313-sbsa-ref-firmware-update-v1-0-e166703c5424@linaro.org

---
Marcin Juszkiewicz (4):
      tests/avocado: update sbsa-ref firmware
      tests/avocado: drop virtio-rng from sbsa-ref tests
      tests/avocado: sbsa-ref: add Alpine tests for misc 'max' setup
      tests/avocado: sbsa-ref: add OpenBSD tests for misc 'max' setup

 tests/avocado/machine_aarch64_sbsaref.py | 86 +++++++++++++++++++++-----------
 1 file changed, 58 insertions(+), 28 deletions(-)
---
base-commit: ba49d760eb04630e7b15f423ebecf6c871b8f77b
change-id: 20240313-sbsa-ref-firmware-update-7579d9f6d59b

Best regards,
-- 
Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

[PATCH v3 1/4] tests/avocado: update sbsa-ref firmware

[Marcin Juszkiewicz]

We now have CI job to build those and publish in space with
readable urls.

Firmware is built using Debian 'bookworm' cross toolchain (gcc 12.2.0).

Used versions:

- Trusted Firmware v2.10.2
- Tianocore EDK2 stable202402
- Tianocore EDK2 Platforms code commit 085c2fb

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 40 +++++++++++++++++---------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index 528c7d2934..cbab793455 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -1,6 +1,6 @@
 # Functional test that boots a Linux kernel and checks the console
 #
-# SPDX-FileCopyrightText: 2023 Linaro Ltd.
+# SPDX-FileCopyrightText: 2023-2024 Linaro Ltd.
 # SPDX-FileContributor: Philippe Mathieu-Daudé <philmd@linaro.org>
 # SPDX-FileContributor: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
 #
@@ -32,34 +32,36 @@ def fetch_firmware(self):
         """
         Flash volumes generated using:
 
-        - Fedora GNU Toolchain version 13.2.1 20230728 (Red Hat 13.2.1-1)
+        Toolchain from Debian:
+        aarch64-linux-gnu-gcc (Debian 12.2.0-14) 12.2.0
 
-        - Trusted Firmware-A
-          https://github.com/ARM-software/arm-trusted-firmware/tree/7c3ff62d
+        Used components:
+
+        - Trusted Firmware 2.10.2
+        - Tianocore EDK2 stable202402
+        - Tianocore EDK2-platforms commit 085c2fb
 
-        - Tianocore EDK II
-          https://github.com/tianocore/edk2/tree/0f9283429dd4
-          https://github.com/tianocore/edk2/tree/ad1c0394b177
-          https://github.com/tianocore/edk2-platforms/tree/d03a60523a60
         """
 
         # Secure BootRom (TF-A code)
         fs0_xz_url = (
-            "https://fileserver.linaro.org/s/rE43RJyTfxPtBkc/"
-            "download/SBSA_FLASH0.fd.xz"
+            "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
+            "20240313-116475/edk2/SBSA_FLASH0.fd.xz"
         )
-        fs0_xz_hash = "cdb8e4ffdaaa79292b7b465693f9e5fae6b7062d"
-        tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash)
+        fs0_xz_hash = "637593749cc307dea7dc13265c32e5d020267552f22b18a31850b8429fc5e159"
+        tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash,
+                                      algorithm='sha256')
         archive.extract(tar_xz_path, self.workdir)
         fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
 
         # Non-secure rom (UEFI and EFI variables)
         fs1_xz_url = (
-            "https://fileserver.linaro.org/s/AGWPDXbcqJTKS4R/"
-            "download/SBSA_FLASH1.fd.xz"
+            "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
+            "20240313-116475/edk2/SBSA_FLASH1.fd.xz"
         )
-        fs1_xz_hash = "411155ae6984334714dff08d5d628178e790c875"
-        tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash)
+        fs1_xz_hash = "cb0a5e8cf5e303c5d3dc106cfd5943ffe9714b86afddee7164c69ee1dd41991c"
+        tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash,
+                                      algorithm='sha256')
         archive.extract(tar_xz_path, self.workdir)
         fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd")
 
@@ -96,15 +98,15 @@ def test_sbsaref_edk2_firmware(self):
 
         # AP Trusted ROM
         wait_for_console_pattern(self, "Booting Trusted Firmware")
-        wait_for_console_pattern(self, "BL1: v2.9(release):v2.9")
+        wait_for_console_pattern(self, "BL1: v2.10.2(release):")
         wait_for_console_pattern(self, "BL1: Booting BL2")
 
         # Trusted Boot Firmware
-        wait_for_console_pattern(self, "BL2: v2.9(release)")
+        wait_for_console_pattern(self, "BL2: v2.10.2(release)")
         wait_for_console_pattern(self, "Booting BL31")
 
         # EL3 Runtime Software
-        wait_for_console_pattern(self, "BL31: v2.9(release)")
+        wait_for_console_pattern(self, "BL31: v2.10.2(release)")
 
         # Non-trusted Firmware
         wait_for_console_pattern(self, "UEFI firmware (version 1.0")

-- 
2.44.0

[PATCH v3 2/4] tests/avocado: drop virtio-rng from sbsa-ref tests

[Marcin Juszkiewicz]

sbsa-ref is supposed to emulate real hardware so virtio-rng-pci
does not fit here

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index cbab793455..259225f15f 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -132,10 +132,6 @@ def boot_alpine_linux(self, cpu):
             cpu,
             "-drive",
             f"file={iso_path},format=raw",
-            "-device",
-            "virtio-rng-pci,rng=rng0",
-            "-object",
-            "rng-random,id=rng0,filename=/dev/urandom",
         )
 
         self.vm.launch()
@@ -179,10 +175,6 @@ def boot_openbsd73(self, cpu):
             cpu,
             "-drive",
             f"file={img_path},format=raw",
-            "-device",
-            "virtio-rng-pci,rng=rng0",
-            "-object",
-            "rng-random,id=rng0,filename=/dev/urandom",
         )
 
         self.vm.launch()

-- 
2.44.0

[PATCH v3 3/4] tests/avocado: sbsa-ref: add Alpine tests for misc 'max' setup

[Marcin Juszkiewicz]

PAuth makes run timeout on CI so add tests using 'max' without it
and with impdef one.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index 259225f15f..cf8954d02e 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -140,18 +140,36 @@ def boot_alpine_linux(self, cpu):
     def test_sbsaref_alpine_linux_cortex_a57(self):
         """
         :avocado: tags=cpu:cortex-a57
+        :avocado: tags=os:linux
         """
         self.boot_alpine_linux("cortex-a57")
 
     def test_sbsaref_alpine_linux_neoverse_n1(self):
         """
         :avocado: tags=cpu:neoverse-n1
+        :avocado: tags=os:linux
         """
         self.boot_alpine_linux("neoverse-n1")
 
+    def test_sbsaref_alpine_linux_max_pauth_off(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:linux
+        """
+        self.boot_alpine_linux("max,pauth=off")
+
+    def test_sbsaref_alpine_linux_max_pauth_impdef(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:linux
+        """
+        self.boot_alpine_linux("max,pauth-impdef=on")
+
+    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
     def test_sbsaref_alpine_linux_max(self):
         """
         :avocado: tags=cpu:max
+        :avocado: tags=os:linux
         """
         self.boot_alpine_linux("max")
 

-- 
2.44.0

[PATCH v3 4/4] tests/avocado: sbsa-ref: add OpenBSD tests for misc 'max' setup

[Marcin Juszkiewicz]

PAuth makes run timeout on CI so add tests using 'max' without
it and with impdef one.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index cf8954d02e..98c76c1ff7 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -203,18 +203,36 @@ def boot_openbsd73(self, cpu):
     def test_sbsaref_openbsd73_cortex_a57(self):
         """
         :avocado: tags=cpu:cortex-a57
+        :avocado: tags=os:openbsd
         """
         self.boot_openbsd73("cortex-a57")
 
     def test_sbsaref_openbsd73_neoverse_n1(self):
         """
         :avocado: tags=cpu:neoverse-n1
+        :avocado: tags=os:openbsd
         """
         self.boot_openbsd73("neoverse-n1")
 
+    def test_sbsaref_openbsd73_max_pauth_off(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:openbsd
+        """
+        self.boot_openbsd73("max,pauth=off")
+
+    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
+    def test_sbsaref_openbsd73_max_pauth_impdef(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:openbsd
+        """
+        self.boot_openbsd73("max,pauth-impdef=on")
+
+    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
     def test_sbsaref_openbsd73_max(self):
         """
         :avocado: tags=cpu:max
+        :avocado: tags=os:openbsd
         """
         self.boot_openbsd73("max")
-

-- 
2.44.0

Re: [PATCH v3 0/4] tests/avocado: update sbsa-ref firmware to latest

[Philippe Mathieu-Daudé]

Hi Marcin,

On 18/3/24 15:08, Marcin Juszkiewicz wrote:
> Updating sbsa-ref firmware for QEMU CI was manual task. Now it is
> replaced by CI job run on CodeLinaro Gitlab instance.
> 
> This patchset updates to current state:
> 
> - Trusted Firmware v2.10.2 (latest LTS)
> - Tianocore EDK2 stable202402 (latest release)
> 
> And Tianocore EDK2-platforms commit 085c2fb (edk2-platforms does not
> have releases).
> 
> Firmware images were built using Debian 'bookworm' cross gcc 12.2.0
> compiler.
> 
> And while I am in that file I dropped use of 'virtio-rng-pci' device as
> sbsa-ref is supposed to emulate physical hardware.
> 
> Added 'max' tests with 'pauth=off' and 'pauth-impdef=on' variants.
> 
> (01/11) test_sbsaref_edk2_firmware: PASS (2.51 s)
> (02/11) test_sbsaref_alpine_linux_cortex_a57: PASS (23.72 s)
> (03/11) test_sbsaref_alpine_linux_neoverse_n1: PASS (23.70 s)
> (04/11) test_sbsaref_alpine_linux_max_pauth_off: PASS (23.00 s)
> (05/11) test_sbsaref_alpine_linux_max_pauth_impdef: PASS (29.03 s)
> (06/11) test_sbsaref_alpine_linux_max: PASS (80.69 s)

This one is timeouting for me, should we skip it with
AVOCADO_TIMEOUT_EXPECTED? (See below)

> (07/11) test_sbsaref_openbsd73_cortex_a57: PASS (16.05 s)
> (08/11) test_sbsaref_openbsd73_neoverse_n1: PASS (15.97 s)
> (09/11) test_sbsaref_openbsd73_max_pauth_off: PASS (16.22 s)
> (10/11) test_sbsaref_openbsd73_max_pauth_impdef: PASS (16.11 s)
> (11/11) test_sbsaref_openbsd73_max: PASS (16.08 s)
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
> Changes in v3:
> - left OpenBSD at 7.3 (7.4+ is known to not boot)
>    https://gitlab.com/qemu-project/qemu/-/issues/2224
>    https://marc.info/?l=openbsd-arm&m=171050428327850&w=2
> - added pauth variants of 'max' to OpenBSD tests
> - Link to v2: https://lore.kernel.org/r/20240314-sbsa-ref-firmware-update-v2-0-b557c56559cd@linaro.org
> 
> Changes in v2:
> - disabled 'max' tests on OpenBSD
> - moved tags to 'one tag per line'
> - added 'os:linux' tags to Alpine ones
> - Link to v1: https://lore.kernel.org/r/20240313-sbsa-ref-firmware-update-v1-0-e166703c5424@linaro.org
> 
> ---
> Marcin Juszkiewicz (4):
>        tests/avocado: update sbsa-ref firmware
>        tests/avocado: drop virtio-rng from sbsa-ref tests
>        tests/avocado: sbsa-ref: add Alpine tests for misc 'max' setup
>        tests/avocado: sbsa-ref: add OpenBSD tests for misc 'max' setup

$ make check-avocado AVOCADO_TAGS='machine:sbsa-ref'
ninja: no work to do.
JOB ID     : 76d5dc90c6f70f0801c5269ff1c1db6c0d2cb27b
JOB LOG    : 
build/system_arm/tests/results/job-2024-03-18T15.54-76d5dc9/job.log
  (1/7) 
tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_edk2_firmware: 
PASS (4.96 s)
  (2/7) 
tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_cortex_a57: 
PASS (52.67 s)
  (3/7) 
tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_neoverse_n1: 
PASS (51.01 s)
  (4/7) 
tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_max: 
INTERRUPTED: Test interrupted by SIGTERM\nRunner error occurred: Timeout 
reached\nOriginal status: ERROR\n{'name': 
'4-tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_max', 
'logdir': 'build/system_... (180.50 s)
  (5/7) 
tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd73_cortex_a57: 
PASS (21.15 s)
  (6/7) 
tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd73_neoverse_n1: 
PASS (20.88 s)
  (7/7) 
tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd73_max: 
PASS (20.70 s)
RESULTS    : PASS 6 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 1 | 
CANCEL 0
JOB TIME   : 355.21 s
make: *** [tests/Makefile.include:139: check-avocado] Error 8

Looking at debug.log:

15:56:17 DEBUG| Opening console file
15:56:17 DEBUG| Opening console socket
15:56:17 DEBUG| NOTICE:  Booting Trusted Firmware
15:56:17 DEBUG| NOTICE:  BL1: v2.9(release):v2.9.0-764-g7c3ff62d2
15:56:17 DEBUG| NOTICE:  BL1: Built : 12:32:06, Sep 27 2023
15:56:17 DEBUG| NOTICE:  BL1: Booting BL2
15:56:17 DEBUG| NOTICE:  BL2: v2.9(release):v2.9.0-764-g7c3ff62d2
15:56:17 DEBUG| NOTICE:  BL2: Built : 12:32:06, Sep 27 2023
15:56:17 DEBUG| NOTICE:  BL1: Booting BL31
15:56:17 DEBUG| NOTICE:  BL31: v2.9(release):v2.9.0-764-g7c3ff62d2
15:56:17 DEBUG| NOTICE:  BL31: Built : 12:32:06, Sep 27 2023
15:56:17 DEBUG| UEFI firmware (version 1.0 built at 15:45:23 on Sep 20 2023)
...
15:57:48 DEBUG| * Mounting security filesystem ... [ ok ]
15:57:49 DEBUG| * Mounting debug filesystem ... [ ok ]
15:57:49 DEBUG| * Mounting persistent storage (pstore) filesystem ... [ ok ]
15:57:50 DEBUG| * Mounting efivarfs filesystem ... [ ok ]
15:57:51 DEBUG| * Starting busybox mdev ... [ ok ]
15:58:05 DEBUG| * Scanning hardware for mdev ... [ ok ]
15:59:05 DEBUG| * Loading hardware drivers ... [ ok ]
15:59:05 DEBUG| * WARNING: clock skew detected!
15:59:07 DEBUG| * Setting the local clock based on last shutdown time 
... [ ok ]
15:59:11 DEBUG| * Loading modules ... [ ok ]
15:59:13 ERROR|
15:59:13 ERROR| RuntimeError: Test interrupted by SIGTERM

Re: [PATCH v3 1/4] tests/avocado: update sbsa-ref firmware

[Philippe Mathieu-Daudé]

On 18/3/24 15:08, Marcin Juszkiewicz wrote:
> We now have CI job to build those and publish in space with
> readable urls.
> 
> Firmware is built using Debian 'bookworm' cross toolchain (gcc 12.2.0).
> 
> Used versions:
> 
> - Trusted Firmware v2.10.2
> - Tianocore EDK2 stable202402
> - Tianocore EDK2 Platforms code commit 085c2fb
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   tests/avocado/machine_aarch64_sbsaref.py | 40 +++++++++++++++++---------------
>   1 file changed, 21 insertions(+), 19 deletions(-)

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

Re: [PATCH v3 4/4] tests/avocado: sbsa-ref: add OpenBSD tests for misc 'max' setup

[Philippe Mathieu-Daudé]

On 18/3/24 15:08, Marcin Juszkiewicz wrote:
> PAuth makes run timeout on CI so add tests using 'max' without
> it and with impdef one.
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   tests/avocado/machine_aarch64_sbsaref.py | 20 +++++++++++++++++++-
>   1 file changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
> index cf8954d02e..98c76c1ff7 100644
> --- a/tests/avocado/machine_aarch64_sbsaref.py
> +++ b/tests/avocado/machine_aarch64_sbsaref.py
> @@ -203,18 +203,36 @@ def boot_openbsd73(self, cpu):
>       def test_sbsaref_openbsd73_cortex_a57(self):
>           """
>           :avocado: tags=cpu:cortex-a57
> +        :avocado: tags=os:openbsd
>           """
>           self.boot_openbsd73("cortex-a57")
>   
>       def test_sbsaref_openbsd73_neoverse_n1(self):
>           """
>           :avocado: tags=cpu:neoverse-n1
> +        :avocado: tags=os:openbsd
>           """
>           self.boot_openbsd73("neoverse-n1")
>   
> +    def test_sbsaref_openbsd73_max_pauth_off(self):
> +        """
> +        :avocado: tags=cpu:max
> +        :avocado: tags=os:openbsd
> +        """
> +        self.boot_openbsd73("max,pauth=off")
> +
> +    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')

This one worked well,

> +    def test_sbsaref_openbsd73_max_pauth_impdef(self):
> +        """
> +        :avocado: tags=cpu:max
> +        :avocado: tags=os:openbsd
> +        """
> +        self.boot_openbsd73("max,pauth-impdef=on")
> +
> +    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')

and also this one. Do we still expect timeout?

>       def test_sbsaref_openbsd73_max(self):
>           """
>           :avocado: tags=cpu:max
> +        :avocado: tags=os:openbsd
>           """
>           self.boot_openbsd73("max")
> -
> 

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH v3 3/4] tests/avocado: sbsa-ref: add Alpine tests for misc 'max' setup

[Philippe Mathieu-Daudé]

On 18/3/24 15:08, Marcin Juszkiewicz wrote:
> PAuth makes run timeout on CI so add tests using 'max' without it
> and with impdef one.
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   tests/avocado/machine_aarch64_sbsaref.py | 18 ++++++++++++++++++
>   1 file changed, 18 insertions(+)
> 
> diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
> index 259225f15f..cf8954d02e 100644
> --- a/tests/avocado/machine_aarch64_sbsaref.py
> +++ b/tests/avocado/machine_aarch64_sbsaref.py
> @@ -140,18 +140,36 @@ def boot_alpine_linux(self, cpu):
>       def test_sbsaref_alpine_linux_cortex_a57(self):
>           """
>           :avocado: tags=cpu:cortex-a57
> +        :avocado: tags=os:linux
>           """
>           self.boot_alpine_linux("cortex-a57")
>   
>       def test_sbsaref_alpine_linux_neoverse_n1(self):
>           """
>           :avocado: tags=cpu:neoverse-n1
> +        :avocado: tags=os:linux
>           """
>           self.boot_alpine_linux("neoverse-n1")
>   
> +    def test_sbsaref_alpine_linux_max_pauth_off(self):
> +        """
> +        :avocado: tags=cpu:max
> +        :avocado: tags=os:linux
> +        """
> +        self.boot_alpine_linux("max,pauth=off")
> +
> +    def test_sbsaref_alpine_linux_max_pauth_impdef(self):
> +        """
> +        :avocado: tags=cpu:max
> +        :avocado: tags=os:linux
> +        """
> +        self.boot_alpine_linux("max,pauth-impdef=on")
> +
> +    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')

Odd, this tag doesn't seem processed in my test. Anyhow,

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

>       def test_sbsaref_alpine_linux_max(self):
>           """
>           :avocado: tags=cpu:max
> +        :avocado: tags=os:linux
>           """
>           self.boot_alpine_linux("max")
>   
> 

Re: [PATCH v3 0/4] tests/avocado: update sbsa-ref firmware to latest

[Philippe Mathieu-Daudé]

On 18/3/24 17:30, Philippe Mathieu-Daudé wrote:
> Hi Marcin,
> 
> On 18/3/24 15:08, Marcin Juszkiewicz wrote:
>> Updating sbsa-ref firmware for QEMU CI was manual task. Now it is
>> replaced by CI job run on CodeLinaro Gitlab instance.
>>
>> This patchset updates to current state:
>>
>> - Trusted Firmware v2.10.2 (latest LTS)
>> - Tianocore EDK2 stable202402 (latest release)
>>
>> And Tianocore EDK2-platforms commit 085c2fb (edk2-platforms does not
>> have releases).
>>
>> Firmware images were built using Debian 'bookworm' cross gcc 12.2.0
>> compiler.
>>
>> And while I am in that file I dropped use of 'virtio-rng-pci' device as
>> sbsa-ref is supposed to emulate physical hardware.
>>
>> Added 'max' tests with 'pauth=off' and 'pauth-impdef=on' variants.
>>
>> (01/11) test_sbsaref_edk2_firmware: PASS (2.51 s)
>> (02/11) test_sbsaref_alpine_linux_cortex_a57: PASS (23.72 s)
>> (03/11) test_sbsaref_alpine_linux_neoverse_n1: PASS (23.70 s)
>> (04/11) test_sbsaref_alpine_linux_max_pauth_off: PASS (23.00 s)
>> (05/11) test_sbsaref_alpine_linux_max_pauth_impdef: PASS (29.03 s)
>> (06/11) test_sbsaref_alpine_linux_max: PASS (80.69 s)
> 
> This one is timeouting for me, should we skip it with
> AVOCADO_TIMEOUT_EXPECTED? (See below)

Well AVOCADO_TIMEOUT_EXPECTED is present but apparently ignored :/

>> (07/11) test_sbsaref_openbsd73_cortex_a57: PASS (16.05 s)
>> (08/11) test_sbsaref_openbsd73_neoverse_n1: PASS (15.97 s)
>> (09/11) test_sbsaref_openbsd73_max_pauth_off: PASS (16.22 s)
>> (10/11) test_sbsaref_openbsd73_max_pauth_impdef: PASS (16.11 s)
>> (11/11) test_sbsaref_openbsd73_max: PASS (16.08 s)
>>
>> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
>> ---
>> Changes in v3:
>> - left OpenBSD at 7.3 (7.4+ is known to not boot)
>>    https://gitlab.com/qemu-project/qemu/-/issues/2224
>>    https://marc.info/?l=openbsd-arm&m=171050428327850&w=2
>> - added pauth variants of 'max' to OpenBSD tests
>> - Link to v2: 
>> https://lore.kernel.org/r/20240314-sbsa-ref-firmware-update-v2-0-b557c56559cd@linaro.org
>>
>> Changes in v2:
>> - disabled 'max' tests on OpenBSD
>> - moved tags to 'one tag per line'
>> - added 'os:linux' tags to Alpine ones
>> - Link to v1: 
>> https://lore.kernel.org/r/20240313-sbsa-ref-firmware-update-v1-0-e166703c5424@linaro.org
>>
>> ---
>> Marcin Juszkiewicz (4):
>>        tests/avocado: update sbsa-ref firmware
>>        tests/avocado: drop virtio-rng from sbsa-ref tests
>>        tests/avocado: sbsa-ref: add Alpine tests for misc 'max' setup
>>        tests/avocado: sbsa-ref: add OpenBSD tests for misc 'max' setup
> 
> $ make check-avocado AVOCADO_TAGS='machine:sbsa-ref'
> ninja: no work to do.
> JOB ID     : 76d5dc90c6f70f0801c5269ff1c1db6c0d2cb27b
> JOB LOG    : 
> build/system_arm/tests/results/job-2024-03-18T15.54-76d5dc9/job.log
>   (1/7) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_edk2_firmware: PASS (4.96 s)
>   (2/7) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_cortex_a57: PASS (52.67 s)
>   (3/7) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_neoverse_n1: PASS (51.01 s)
>   (4/7) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_max: INTERRUPTED: Test interrupted by SIGTERM\nRunner error occurred: Timeout reached\nOriginal status: ERROR\n{'name': '4-tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_alpine_linux_max', 'logdir': 'build/system_... (180.50 s)
>   (5/7) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd73_cortex_a57: PASS (21.15 s)
>   (6/7) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd73_neoverse_n1: PASS (20.88 s)
>   (7/7) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd73_max: PASS (20.70 s)
> RESULTS    : PASS 6 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 1 | 
> CANCEL 0
> JOB TIME   : 355.21 s
> make: *** [tests/Makefile.include:139: check-avocado] Error 8
> 
> Looking at debug.log:
> 
> 15:56:17 DEBUG| Opening console file
> 15:56:17 DEBUG| Opening console socket
> 15:56:17 DEBUG| NOTICE:  Booting Trusted Firmware
> 15:56:17 DEBUG| NOTICE:  BL1: v2.9(release):v2.9.0-764-g7c3ff62d2
> 15:56:17 DEBUG| NOTICE:  BL1: Built : 12:32:06, Sep 27 2023
> 15:56:17 DEBUG| NOTICE:  BL1: Booting BL2
> 15:56:17 DEBUG| NOTICE:  BL2: v2.9(release):v2.9.0-764-g7c3ff62d2
> 15:56:17 DEBUG| NOTICE:  BL2: Built : 12:32:06, Sep 27 2023
> 15:56:17 DEBUG| NOTICE:  BL1: Booting BL31
> 15:56:17 DEBUG| NOTICE:  BL31: v2.9(release):v2.9.0-764-g7c3ff62d2
> 15:56:17 DEBUG| NOTICE:  BL31: Built : 12:32:06, Sep 27 2023
> 15:56:17 DEBUG| UEFI firmware (version 1.0 built at 15:45:23 on Sep 20 
> 2023)
> ...
> 15:57:48 DEBUG| * Mounting security filesystem ... [ ok ]
> 15:57:49 DEBUG| * Mounting debug filesystem ... [ ok ]
> 15:57:49 DEBUG| * Mounting persistent storage (pstore) filesystem ... [ 
> ok ]
> 15:57:50 DEBUG| * Mounting efivarfs filesystem ... [ ok ]
> 15:57:51 DEBUG| * Starting busybox mdev ... [ ok ]
> 15:58:05 DEBUG| * Scanning hardware for mdev ... [ ok ]
> 15:59:05 DEBUG| * Loading hardware drivers ... [ ok ]
> 15:59:05 DEBUG| * WARNING: clock skew detected!
> 15:59:07 DEBUG| * Setting the local clock based on last shutdown time 
> ... [ ok ]
> 15:59:11 DEBUG| * Loading modules ... [ ok ]
> 15:59:13 ERROR|
> 15:59:13 ERROR| RuntimeError: Test interrupted by SIGTERM
> 

Re: [PATCH v3 0/4] tests/avocado: update sbsa-ref firmware to latest

[Alex Bennée]

Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> writes:

> Updating sbsa-ref firmware for QEMU CI was manual task. Now it is
> replaced by CI job run on CodeLinaro Gitlab instance.
>
> This patchset updates to current state:
>
> - Trusted Firmware v2.10.2 (latest LTS)
> - Tianocore EDK2 stable202402 (latest release)
>
> And Tianocore EDK2-platforms commit 085c2fb (edk2-platforms does not
> have releases).
>
> Firmware images were built using Debian 'bookworm' cross gcc 12.2.0
> compiler.
>
> And while I am in that file I dropped use of 'virtio-rng-pci' device as
> sbsa-ref is supposed to emulate physical hardware.
>
> Added 'max' tests with 'pauth=off' and 'pauth-impdef=on' variants.

Queued to for-9.0/misc-fixes, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro