[v2] tests/avocado: update sbsa-ref firmware to latest

[PATCH v2 3/4] tests/avocado: use OpenBSD 7.4 for sbsa-ref

Posted by Marcin Juszkiewicz 1 year, 11 months ago

7.4 was released in October 2023, time to update before 7.3 gets dropped.

Disabled tests for 'max' cpu as OpenBSD fails there.

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

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index 259225f15f..0e52dc5854 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -159,14 +159,14 @@ def test_sbsaref_alpine_linux_max(self):
     # This tests the whole boot chain from EFI to Userspace
     # We only boot a whole OS for the current top level CPU and GIC
     # Other test profiles should use more minimal boots
-    def boot_openbsd73(self, cpu):
+    def boot_openbsd(self, cpu):
         self.fetch_firmware()
 
         img_url = (
-            "https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img"
+            "https://cdn.openbsd.org/pub/OpenBSD/7.4/arm64/miniroot74.img"
         )
 
-        img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5"
+        img_hash = "7b08b2ce081cff6408d183f7152ddcfd2779912104866e4fdf6ae2d864b51142"
         img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash)
 
         self.vm.set_console()
@@ -180,23 +180,44 @@ def boot_openbsd73(self, cpu):
         self.vm.launch()
         wait_for_console_pattern(self,
                                  "Welcome to the OpenBSD/arm64"
-                                 " 7.3 installation program.")
+                                 " 7.4 installation program.")
 
-    def test_sbsaref_openbsd73_cortex_a57(self):
+    def test_sbsaref_openbsd_cortex_a57(self):
         """
         :avocado: tags=cpu:cortex-a57
+        :avocado: tags=os:openbsd
         """
-        self.boot_openbsd73("cortex-a57")
+        self.boot_openbsd("cortex-a57")
 
-    def test_sbsaref_openbsd73_neoverse_n1(self):
+    def test_sbsaref_openbsd_neoverse_n1(self):
         """
         :avocado: tags=cpu:neoverse-n1
+        :avocado: tags=os:openbsd
         """
-        self.boot_openbsd73("neoverse-n1")
+        self.boot_openbsd("neoverse-n1")
 
-    def test_sbsaref_openbsd73_max(self):
-        """
-        :avocado: tags=cpu:max
-        """
-        self.boot_openbsd73("max")
+# OpenBSD 7.4 does not boot on current max cpu.
+#
+#   def test_sbsaref_openbsd_max_pauth_off(self):
+#       """
+#       :avocado: tags=cpu:max
+#       :avocado: tags=os:openbsd
+#       """
+#       self.boot_openbsd("max,pauth=off")
+
+#   @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
+#   def test_sbsaref_openbsd_max_pauth_impdef(self):
+#       """
+#       :avocado: tags=cpu:max
+#       :avocado: tags=os:openbsd
+#       """
+#       self.boot_openbsd("max,pauth-impdef=on")
+
+#   @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
+#   def test_sbsaref_openbsd_max(self):
+#       """
+#       :avocado: tags=cpu:max
+#       :avocado: tags=os:openbsd
+#       """
+#       self.boot_openbsd("max")
 

-- 
2.44.0

Re: [PATCH v2 3/4] tests/avocado: use OpenBSD 7.4 for sbsa-ref

Posted by Alex Bennée 1 year, 11 months ago

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

> 7.4 was released in October 2023, time to update before 7.3 gets dropped.
>
> Disabled tests for 'max' cpu as OpenBSD fails there.
>
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>  tests/avocado/machine_aarch64_sbsaref.py | 47 +++++++++++++++++++++++---------
>  1 file changed, 34 insertions(+), 13 deletions(-)
>
> diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
> index 259225f15f..0e52dc5854 100644
> --- a/tests/avocado/machine_aarch64_sbsaref.py
> +++ b/tests/avocado/machine_aarch64_sbsaref.py
> @@ -159,14 +159,14 @@ def test_sbsaref_alpine_linux_max(self):
>      # This tests the whole boot chain from EFI to Userspace
>      # We only boot a whole OS for the current top level CPU and GIC
>      # Other test profiles should use more minimal boots
> -    def boot_openbsd73(self, cpu):
> +    def boot_openbsd(self, cpu):
>          self.fetch_firmware()
>  
>          img_url = (
> -            "https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img"
> +            "https://cdn.openbsd.org/pub/OpenBSD/7.4/arm64/miniroot74.img"
>          )
>  
> -        img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5"
> +        img_hash = "7b08b2ce081cff6408d183f7152ddcfd2779912104866e4fdf6ae2d864b51142"
>          img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash)
>  
>          self.vm.set_console()
> @@ -180,23 +180,44 @@ def boot_openbsd73(self, cpu):
>          self.vm.launch()
>          wait_for_console_pattern(self,
>                                   "Welcome to the OpenBSD/arm64"
> -                                 " 7.3 installation program.")
> +                                 " 7.4 installation program.")
>  
> -    def test_sbsaref_openbsd73_cortex_a57(self):
> +    def test_sbsaref_openbsd_cortex_a57(self):
>          """
>          :avocado: tags=cpu:cortex-a57
> +        :avocado: tags=os:openbsd
>          """
> -        self.boot_openbsd73("cortex-a57")
> +        self.boot_openbsd("cortex-a57")
>  
> -    def test_sbsaref_openbsd73_neoverse_n1(self):
> +    def test_sbsaref_openbsd_neoverse_n1(self):
>          """
>          :avocado: tags=cpu:neoverse-n1
> +        :avocado: tags=os:openbsd
>          """
> -        self.boot_openbsd73("neoverse-n1")
> +        self.boot_openbsd("neoverse-n1")
>  
> -    def test_sbsaref_openbsd73_max(self):
> -        """
> -        :avocado: tags=cpu:max
> -        """
> -        self.boot_openbsd73("max")
> +# OpenBSD 7.4 does not boot on current max cpu.
> +#
> +#   def test_sbsaref_openbsd_max_pauth_off(self):
> +#       """
> +#       :avocado: tags=cpu:max
> +#       :avocado: tags=os:openbsd
> +#       """
> +#       self.boot_openbsd("max,pauth=off")

If we are not going to delete the entries then at least use a @skip
instead of commenting. Maybe:

  @skip("Potential un-diagnosed upstream bug?")

but it would be nice to figure out exactly where is breaks.

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

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH v2 3/4] tests/avocado: use OpenBSD 7.4 for sbsa-ref

Posted by Philippe Mathieu-Daudé 1 year, 11 months ago

On 14/3/24 13:14, Alex Bennée wrote:
> Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> writes:
> 
>> 7.4 was released in October 2023, time to update before 7.3 gets dropped.
>>
>> Disabled tests for 'max' cpu as OpenBSD fails there.
>>
>> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
>> ---
>>   tests/avocado/machine_aarch64_sbsaref.py | 47 +++++++++++++++++++++++---------
>>   1 file changed, 34 insertions(+), 13 deletions(-)
>>
>> diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
>> index 259225f15f..0e52dc5854 100644
>> --- a/tests/avocado/machine_aarch64_sbsaref.py
>> +++ b/tests/avocado/machine_aarch64_sbsaref.py
>> @@ -159,14 +159,14 @@ def test_sbsaref_alpine_linux_max(self):
>>       # This tests the whole boot chain from EFI to Userspace
>>       # We only boot a whole OS for the current top level CPU and GIC
>>       # Other test profiles should use more minimal boots
>> -    def boot_openbsd73(self, cpu):
>> +    def boot_openbsd(self, cpu):
>>           self.fetch_firmware()
>>   
>>           img_url = (
>> -            "https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img"
>> +            "https://cdn.openbsd.org/pub/OpenBSD/7.4/arm64/miniroot74.img"
>>           )
>>   
>> -        img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5"
>> +        img_hash = "7b08b2ce081cff6408d183f7152ddcfd2779912104866e4fdf6ae2d864b51142"
>>           img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash)
>>   
>>           self.vm.set_console()
>> @@ -180,23 +180,44 @@ def boot_openbsd73(self, cpu):
>>           self.vm.launch()
>>           wait_for_console_pattern(self,
>>                                    "Welcome to the OpenBSD/arm64"
>> -                                 " 7.3 installation program.")
>> +                                 " 7.4 installation program.")
>>   
>> -    def test_sbsaref_openbsd73_cortex_a57(self):
>> +    def test_sbsaref_openbsd_cortex_a57(self):
>>           """
>>           :avocado: tags=cpu:cortex-a57
>> +        :avocado: tags=os:openbsd
>>           """
>> -        self.boot_openbsd73("cortex-a57")
>> +        self.boot_openbsd("cortex-a57")
>>   
>> -    def test_sbsaref_openbsd73_neoverse_n1(self):
>> +    def test_sbsaref_openbsd_neoverse_n1(self):
>>           """
>>           :avocado: tags=cpu:neoverse-n1
>> +        :avocado: tags=os:openbsd
>>           """
>> -        self.boot_openbsd73("neoverse-n1")
>> +        self.boot_openbsd("neoverse-n1")
>>   
>> -    def test_sbsaref_openbsd73_max(self):
>> -        """
>> -        :avocado: tags=cpu:max
>> -        """
>> -        self.boot_openbsd73("max")
>> +# OpenBSD 7.4 does not boot on current max cpu.
>> +#
>> +#   def test_sbsaref_openbsd_max_pauth_off(self):
>> +#       """
>> +#       :avocado: tags=cpu:max
>> +#       :avocado: tags=os:openbsd
>> +#       """
>> +#       self.boot_openbsd("max,pauth=off")
> 
> If we are not going to delete the entries then at least use a @skip
> instead of commenting. Maybe:
> 
>    @skip("Potential un-diagnosed upstream bug?")

Daniel or Peter suggested to open a GitLab issue and use

     @skip("https://gitlab.com/qemu-project/qemu/-/issues/xyz")

to track progress.

> but it would be nice to figure out exactly where is breaks.

Re: [PATCH v2 3/4] tests/avocado: use OpenBSD 7.4 for sbsa-ref

Posted by Alex Bennée 1 year, 11 months ago

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

> On 14/3/24 13:14, Alex Bennée wrote:
>> Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> writes:
>> 
>>> 7.4 was released in October 2023, time to update before 7.3 gets dropped.
>>>
>>> Disabled tests for 'max' cpu as OpenBSD fails there.
>>>
>>> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
>>> ---
>>>   tests/avocado/machine_aarch64_sbsaref.py | 47 +++++++++++++++++++++++---------
>>>   1 file changed, 34 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
>>> index 259225f15f..0e52dc5854 100644
>>> --- a/tests/avocado/machine_aarch64_sbsaref.py
>>> +++ b/tests/avocado/machine_aarch64_sbsaref.py
>>> @@ -159,14 +159,14 @@ def test_sbsaref_alpine_linux_max(self):
>>>       # This tests the whole boot chain from EFI to Userspace
>>>       # We only boot a whole OS for the current top level CPU and GIC
>>>       # Other test profiles should use more minimal boots
>>> -    def boot_openbsd73(self, cpu):
>>> +    def boot_openbsd(self, cpu):
>>>           self.fetch_firmware()
>>>             img_url = (
>>> -            "https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img"
>>> +            "https://cdn.openbsd.org/pub/OpenBSD/7.4/arm64/miniroot74.img"
>>>           )
>>>   -        img_hash =
>>> "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5"
>>> +        img_hash = "7b08b2ce081cff6408d183f7152ddcfd2779912104866e4fdf6ae2d864b51142"
>>>           img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash)
>>>             self.vm.set_console()
>>> @@ -180,23 +180,44 @@ def boot_openbsd73(self, cpu):
>>>           self.vm.launch()
>>>           wait_for_console_pattern(self,
>>>                                    "Welcome to the OpenBSD/arm64"
>>> -                                 " 7.3 installation program.")
>>> +                                 " 7.4 installation program.")
>>>   -    def test_sbsaref_openbsd73_cortex_a57(self):
>>> +    def test_sbsaref_openbsd_cortex_a57(self):
>>>           """
>>>           :avocado: tags=cpu:cortex-a57
>>> +        :avocado: tags=os:openbsd
>>>           """
>>> -        self.boot_openbsd73("cortex-a57")
>>> +        self.boot_openbsd("cortex-a57")
>>>   -    def test_sbsaref_openbsd73_neoverse_n1(self):
>>> +    def test_sbsaref_openbsd_neoverse_n1(self):
>>>           """
>>>           :avocado: tags=cpu:neoverse-n1
>>> +        :avocado: tags=os:openbsd
>>>           """
>>> -        self.boot_openbsd73("neoverse-n1")
>>> +        self.boot_openbsd("neoverse-n1")
>>>   -    def test_sbsaref_openbsd73_max(self):
>>> -        """
>>> -        :avocado: tags=cpu:max
>>> -        """
>>> -        self.boot_openbsd73("max")
>>> +# OpenBSD 7.4 does not boot on current max cpu.
>>> +#
>>> +#   def test_sbsaref_openbsd_max_pauth_off(self):
>>> +#       """
>>> +#       :avocado: tags=cpu:max
>>> +#       :avocado: tags=os:openbsd
>>> +#       """
>>> +#       self.boot_openbsd("max,pauth=off")
>> If we are not going to delete the entries then at least use a @skip
>> instead of commenting. Maybe:
>>    @skip("Potential un-diagnosed upstream bug?")
>
> Daniel or Peter suggested to open a GitLab issue and use
>
>     @skip("https://gitlab.com/qemu-project/qemu/-/issues/xyz")
>
> to track progress.

That's a good idea. Are you going to respin?

>
>> but it would be nice to figure out exactly where is breaks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH v2 3/4] tests/avocado: use OpenBSD 7.4 for sbsa-ref

Posted by Marcin Juszkiewicz 1 year, 11 months ago

W dniu 14.03.2024 o 15:56, Alex Bennée pisze:
>>> If we are not going to delete the entries then at least use a @skip
>>> instead of commenting. Maybe:
>>>     @skip("Potential un-diagnosed upstream bug?")
>> Daniel or Peter suggested to open a GitLab issue and use
>>
>>      @skip("https://gitlab.com/qemu-project/qemu/-/issues/xyz")
>>
>> to track progress.
> That's a good idea. Are you going to respin?

Opened https://gitlab.com/qemu-project/qemu/-/issues/2224 to track 
problem. Subscribed to arm@openbsd mailing list.

Will walk the dog and then mail them with problem.

And respin patch series tomorrow.

Re: [PATCH v2 3/4] tests/avocado: use OpenBSD 7.4 for sbsa-ref

Posted by Marcin Juszkiewicz 1 year, 11 months ago

W dniu 14.03.2024 o 13:14, Alex Bennée pisze:
>> +# OpenBSD 7.4 does not boot on current max cpu.
>> +#
>> +#   def test_sbsaref_openbsd_max_pauth_off(self):
>> +#       """
>> +#       :avocado: tags=cpu:max
>> +#       :avocado: tags=os:openbsd
>> +#       """
>> +#       self.boot_openbsd("max,pauth=off")
> If we are not going to delete the entries then at least use a @skip
> instead of commenting. Maybe:
> 
>    @skip("Potential un-diagnosed upstream bug?")
> 
> but it would be nice to figure out exactly where is breaks.

I am going to subscribe to openbsd mailing list and ask there.

OpenBSD 7.3 works, 7.4/7.5-current does not.
And it is on Neoverse-V1/N2 and max cpu types.