--disable-tcg qtest/avocado fixes for ppc64

[PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()

Posted by Daniel Henrique Barboza 3 years, 11 months ago

The icount framework relies on TCG availability. If QEMU is built with
--disable-tcg we won't have icount either, and then this test will fail
with the following message in an IBM POWER9 host:

tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
ERROR: ConnectError: Failed to establish session:
(...)
/11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin:
cannot configure icount, TCG support not available

Although this was revealed in a specific ppc64 scenario, the TCG check
is being done in the common code inside run_vm() because all archs need
TCG to have access to icount.

Cc: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 tests/avocado/replay_kernel.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py
index c68a953730..0b2b0dc692 100644
--- a/tests/avocado/replay_kernel.py
+++ b/tests/avocado/replay_kernel.py
@@ -36,6 +36,9 @@ class ReplayKernelBase(LinuxKernelTest):
 
     def run_vm(self, kernel_path, kernel_command_line, console_pattern,
                record, shift, args, replay_path):
+        # icount requires TCG to be available
+        self.require_accelerator('tcg')
+
         logger = logging.getLogger('replay')
         start_time = time.time()
         vm = self.get_vm()
@@ -243,6 +246,7 @@ def test_ppc64_pseries(self):
         """
         :avocado: tags=arch:ppc64
         :avocado: tags=machine:pseries
+        :avocado: tags=accel:tcg
         """
         kernel_url = ('https://archives.fedoraproject.org/pub/archive'
                       '/fedora-secondary/releases/29/Everything/ppc64le/os'
-- 
2.35.1

Re: [PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()

Posted by Cédric Le Goater 3 years, 11 months ago

On 3/3/22 16:35, Daniel Henrique Barboza wrote:
> The icount framework relies on TCG availability. If QEMU is built with
> --disable-tcg we won't have icount either, and then this test will fail
> with the following message in an IBM POWER9 host:
> 
> tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
> ERROR: ConnectError: Failed to establish session:
> (...)
> /11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin:
> cannot configure icount, TCG support not available
> 
> Although this was revealed in a specific ppc64 scenario, the TCG check
> is being done in the common code inside run_vm() because all archs need
> TCG to have access to icount.
> 
> Cc: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>


Reviewed-by: Cédric Le Goater <clg@kaod.org>

Pavel,

Should I take this patch through the ppc tree ?

Thanks,

C.


> ---
>   tests/avocado/replay_kernel.py | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py
> index c68a953730..0b2b0dc692 100644
> --- a/tests/avocado/replay_kernel.py
> +++ b/tests/avocado/replay_kernel.py
> @@ -36,6 +36,9 @@ class ReplayKernelBase(LinuxKernelTest):
>   
>       def run_vm(self, kernel_path, kernel_command_line, console_pattern,
>                  record, shift, args, replay_path):
> +        # icount requires TCG to be available
> +        self.require_accelerator('tcg')
> +
>           logger = logging.getLogger('replay')
>           start_time = time.time()
>           vm = self.get_vm()
> @@ -243,6 +246,7 @@ def test_ppc64_pseries(self):
>           """
>           :avocado: tags=arch:ppc64
>           :avocado: tags=machine:pseries
> +        :avocado: tags=accel:tcg
>           """
>           kernel_url = ('https://archives.fedoraproject.org/pub/archive'
>                         '/fedora-secondary/releases/29/Everything/ppc64le/os'

Re: [PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()

Posted by Pavel Dovgalyuk 3 years, 11 months ago

On 07.03.2022 11:47, Cédric Le Goater wrote:
> On 3/3/22 16:35, Daniel Henrique Barboza wrote:
>> The icount framework relies on TCG availability. If QEMU is built with
>> --disable-tcg we won't have icount either, and then this test will fail
>> with the following message in an IBM POWER9 host:
>>
>> tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
>> ERROR: ConnectError: Failed to establish session:
>> (...)
>> /11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin: 
>>
>> cannot configure icount, TCG support not available
>>
>> Although this was revealed in a specific ppc64 scenario, the TCG check
>> is being done in the common code inside run_vm() because all archs need
>> TCG to have access to icount.
>>
>> Cc: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
>> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> 
> 
> Reviewed-by: Cédric Le Goater <clg@kaod.org>
> 
> Pavel,
> 
> Should I take this patch through the ppc tree ?

Nobody has queued it yet, so I think it is ok.

> 
> Thanks,
> 
> C.
> 
> 
>> ---
>>   tests/avocado/replay_kernel.py | 4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/tests/avocado/replay_kernel.py 
>> b/tests/avocado/replay_kernel.py
>> index c68a953730..0b2b0dc692 100644
>> --- a/tests/avocado/replay_kernel.py
>> +++ b/tests/avocado/replay_kernel.py
>> @@ -36,6 +36,9 @@ class ReplayKernelBase(LinuxKernelTest):
>>       def run_vm(self, kernel_path, kernel_command_line, console_pattern,
>>                  record, shift, args, replay_path):
>> +        # icount requires TCG to be available
>> +        self.require_accelerator('tcg')
>> +
>>           logger = logging.getLogger('replay')
>>           start_time = time.time()
>>           vm = self.get_vm()
>> @@ -243,6 +246,7 @@ def test_ppc64_pseries(self):
>>           """
>>           :avocado: tags=arch:ppc64
>>           :avocado: tags=machine:pseries
>> +        :avocado: tags=accel:tcg
>>           """
>>           kernel_url = ('https://archives.fedoraproject.org/pub/archive'
>>                         
>> '/fedora-secondary/releases/29/Everything/ppc64le/os'
>

Re: [PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()

Posted by Cédric Le Goater 3 years, 11 months ago

On 3/9/22 05:59, Pavel Dovgalyuk wrote:
> On 07.03.2022 11:47, Cédric Le Goater wrote:
>> On 3/3/22 16:35, Daniel Henrique Barboza wrote:
>>> The icount framework relies on TCG availability. If QEMU is built with
>>> --disable-tcg we won't have icount either, and then this test will fail
>>> with the following message in an IBM POWER9 host:
>>>
>>> tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
>>> ERROR: ConnectError: Failed to establish session:
>>> (...)
>>> /11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin:
>>> cannot configure icount, TCG support not available
>>>
>>> Although this was revealed in a specific ppc64 scenario, the TCG check
>>> is being done in the common code inside run_vm() because all archs need
>>> TCG to have access to icount.
>>>
>>> Cc: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
>>> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
>>
>>
>> Reviewed-by: Cédric Le Goater <clg@kaod.org>
>>
>> Pavel,
>>
>> Should I take this patch through the ppc tree ?
> 
> Nobody has queued it yet, so I think it is ok.

Since these are fixes, I will at end of the week.

Thanks,

C.

[PATCH 1/5] qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc
[PATCH 2/5] qtest/meson.build: check CONFIG_TCG for boot-serial-test in qtests_ppc
[PATCH 3/5] avocado/boot_linux_console.py: check for tcg in test_ppc_powernv8/9
[PATCH 4/5] avocado/boot_linux_console.py: check tcg accel in test_ppc64_e500
[PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()