[PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Cornelia Huck]

Hotplug a virtio-net-ccw device, and then hotunplug it again.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
v2->v3:
- do the dmesg cleanout and waiting for messages properly [Thomas]

Wainer: I dropped your r-b, as there had been too many changes for
        me to be comfortable with retaining it

---
 tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
index 81d14088818c..864ef4ee6e9b 100644
--- a/tests/acceptance/machine_s390_ccw_virtio.py
+++ b/tests/acceptance/machine_s390_ccw_virtio.py
@@ -99,3 +99,27 @@ class S390CCWVirtioMachine(Test):
         exec_command_and_wait_for_pattern(self,
                         'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
                         '0x0000000c')
+        # add another device
+        exec_command_and_wait_for_pattern(self,
+                                    'dmesg -c > /dev/null; echo dm_clear\ 1',
+                                    'dm_clear 1')
+        self.vm.command('device_add', driver='virtio-net-ccw',
+                        devno='fe.0.4711', id='net_4711')
+        exec_command_and_wait_for_pattern(self,
+                        'while ! (dmesg -c | grep CRW) ; do sleep 1 ; done',
+                        'CRW reports')
+        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/',
+                                          '0.0.4711')
+        # and detach it again
+        exec_command_and_wait_for_pattern(self,
+                                    'dmesg -c > /dev/null; echo dm_clear\ 2',
+                                    'dm_clear 2')
+        self.vm.command('device_del', id='net_4711')
+        self.vm.event_wait(name='DEVICE_DELETED',
+                           match={'data': {'device': 'net_4711'}})
+        exec_command_and_wait_for_pattern(self,
+                        'while ! (dmesg -c | grep CRW) ; do sleep 1 ; done',
+                        'CRW reports')
+        exec_command_and_wait_for_pattern(self,
+                                          'ls /sys/bus/ccw/devices/0.0.4711',
+                                          'No such file or directory')
-- 
2.26.2

Re: [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Thomas Huth]

On 08/12/2020 13.28, Cornelia Huck wrote:
> Hotplug a virtio-net-ccw device, and then hotunplug it again.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> v2->v3:
> - do the dmesg cleanout and waiting for messages properly [Thomas]
> 
> Wainer: I dropped your r-b, as there had been too many changes for
>         me to be comfortable with retaining it
> 
> ---
>  tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
>  1 file changed, 24 insertions(+)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Philippe Mathieu-Daudé]

Hi Paolo, Fam,

On 12/8/20 1:28 PM, Cornelia Huck wrote:
> Hotplug a virtio-net-ccw device, and then hotunplug it again.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> v2->v3:
> - do the dmesg cleanout and waiting for messages properly [Thomas]
> 
> Wainer: I dropped your r-b, as there had been too many changes for
>         me to be comfortable with retaining it
> 
> ---
>  tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
>  1 file changed, 24 insertions(+)

Patchew failed applying this patch... Any idea what got wrong?

Switched to a new branch '20201208122843.147186-1-cohuck@redhat.com'
Applying: tests/acceptance: test hot(un)plug of ccw devices
error: sha1 information is lacking or useless
(tests/acceptance/machine_s390_ccw_virtio.py).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 tests/acceptance: test hot(un)plug of ccw devices
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Failed to apply patch:
[PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

https://patchew.org/QEMU/20201208122843.147186-1-cohuck@redhat.com/

Re: [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Cornelia Huck]

On Wed, 9 Dec 2020 19:09:25 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

> Hi Paolo, Fam,
> 
> On 12/8/20 1:28 PM, Cornelia Huck wrote:
> > Hotplug a virtio-net-ccw device, and then hotunplug it again.
> > 
> > Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> > ---
> > v2->v3:
> > - do the dmesg cleanout and waiting for messages properly [Thomas]
> > 
> > Wainer: I dropped your r-b, as there had been too many changes for
> >         me to be comfortable with retaining it
> > 
> > ---
> >  tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
> >  1 file changed, 24 insertions(+)  
> 
> Patchew failed applying this patch... Any idea what got wrong?
> 
> Switched to a new branch '20201208122843.147186-1-cohuck@redhat.com'
> Applying: tests/acceptance: test hot(un)plug of ccw devices
> error: sha1 information is lacking or useless
> (tests/acceptance/machine_s390_ccw_virtio.py).
> error: could not build fake ancestor
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Patch failed at 0001 tests/acceptance: test hot(un)plug of ccw devices
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> Failed to apply patch:
> [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices
> 
> https://patchew.org/QEMU/20201208122843.147186-1-cohuck@redhat.com/
> 

Hm, seems I forgot to include the base version, which should be my
current s390-next branch...

Re: [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Philippe Mathieu-Daudé]

On 12/9/20 7:22 PM, Cornelia Huck wrote:
> On Wed, 9 Dec 2020 19:09:25 +0100
> Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> 
>> Hi Paolo, Fam,
>>
>> On 12/8/20 1:28 PM, Cornelia Huck wrote:
>>> Hotplug a virtio-net-ccw device, and then hotunplug it again.
>>>
>>> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
>>> ---
>>> v2->v3:
>>> - do the dmesg cleanout and waiting for messages properly [Thomas]
>>>
>>> Wainer: I dropped your r-b, as there had been too many changes for
>>>         me to be comfortable with retaining it
>>>
>>> ---
>>>  tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
>>>  1 file changed, 24 insertions(+)  
>>
>> Patchew failed applying this patch... Any idea what got wrong?
>>
>> Switched to a new branch '20201208122843.147186-1-cohuck@redhat.com'
>> Applying: tests/acceptance: test hot(un)plug of ccw devices
>> error: sha1 information is lacking or useless
>> (tests/acceptance/machine_s390_ccw_virtio.py).
>> error: could not build fake ancestor
>> hint: Use 'git am --show-current-patch=diff' to see the failed patch
>> Patch failed at 0001 tests/acceptance: test hot(un)plug of ccw devices
>> When you have resolved this problem, run "git am --continue".
>> If you prefer to skip this patch, run "git am --skip" instead.
>> To restore the original branch and stop patching, run "git am --abort".
>> Failed to apply patch:
>> [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices
>>
>> https://patchew.org/QEMU/20201208122843.147186-1-cohuck@redhat.com/
>>
> 
> Hm, seems I forgot to include the base version, which should be my
> current s390-next branch...

Ah OK, we are good then, thanks!

Phil.

Re: [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Willian Rampazzo]

On 12/8/20 9:28 AM, Cornelia Huck wrote:
> Hotplug a virtio-net-ccw device, and then hotunplug it again.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> v2->v3:
> - do the dmesg cleanout and waiting for messages properly [Thomas]
> 
> Wainer: I dropped your r-b, as there had been too many changes for
>          me to be comfortable with retaining it
> 
> ---
>   tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
>   1 file changed, 24 insertions(+)
> 
> diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
> index 81d14088818c..864ef4ee6e9b 100644
> --- a/tests/acceptance/machine_s390_ccw_virtio.py
> +++ b/tests/acceptance/machine_s390_ccw_virtio.py
> @@ -99,3 +99,27 @@ class S390CCWVirtioMachine(Test):
>           exec_command_and_wait_for_pattern(self,
>                           'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
>                           '0x0000000c')
> +        # add another device
> +        exec_command_and_wait_for_pattern(self,
> +                                    'dmesg -c > /dev/null; echo dm_clear\ 1',
> +                                    'dm_clear 1')
> +        self.vm.command('device_add', driver='virtio-net-ccw',
> +                        devno='fe.0.4711', id='net_4711')
> +        exec_command_and_wait_for_pattern(self,
> +                        'while ! (dmesg -c | grep CRW) ; do sleep 1 ; done',
> +                        'CRW reports')
> +        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/',
> +                                          '0.0.4711')
> +        # and detach it again
> +        exec_command_and_wait_for_pattern(self,
> +                                    'dmesg -c > /dev/null; echo dm_clear\ 2',
> +                                    'dm_clear 2')
> +        self.vm.command('device_del', id='net_4711')
> +        self.vm.event_wait(name='DEVICE_DELETED',
> +                           match={'data': {'device': 'net_4711'}})
> +        exec_command_and_wait_for_pattern(self,
> +                        'while ! (dmesg -c | grep CRW) ; do sleep 1 ; done',
> +                        'CRW reports')
> +        exec_command_and_wait_for_pattern(self,
> +                                          'ls /sys/bus/ccw/devices/0.0.4711',
> +                                          'No such file or directory')
> 

I tested it on top of your s390-next branch. So far so good:

JOB ID     : 7708796aa28805766d088de296e1131b025f4ed1
JOB LOG    : 
/home/linux1/src/qemu.dev/build/tests/results/job-2020-12-09T15.40-7708796/job.log
  (1/1) 
tests/acceptance/machine_s390_ccw_virtio.py:S390CCWVirtioMachine.test_s390x_devices: 
PASS (7.07 s)
RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | 
CANCEL 0
JOB TIME   : 7.18 s

Tested-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Re: [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Wainer dos Santos Moschetta]

Hi,

On 12/8/20 9:28 AM, Cornelia Huck wrote:
> Hotplug a virtio-net-ccw device, and then hotunplug it again.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> v2->v3:
> - do the dmesg cleanout and waiting for messages properly [Thomas]
>
> Wainer: I dropped your r-b, as there had been too many changes for
>          me to be comfortable with retaining it
Ok.
>
> ---
>   tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
>   1 file changed, 24 insertions(+)

lgtm.

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

>
> diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py
> index 81d14088818c..864ef4ee6e9b 100644
> --- a/tests/acceptance/machine_s390_ccw_virtio.py
> +++ b/tests/acceptance/machine_s390_ccw_virtio.py
> @@ -99,3 +99,27 @@ class S390CCWVirtioMachine(Test):
>           exec_command_and_wait_for_pattern(self,
>                           'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
>                           '0x0000000c')
> +        # add another device
> +        exec_command_and_wait_for_pattern(self,
> +                                    'dmesg -c > /dev/null; echo dm_clear\ 1',
> +                                    'dm_clear 1')
> +        self.vm.command('device_add', driver='virtio-net-ccw',
> +                        devno='fe.0.4711', id='net_4711')
> +        exec_command_and_wait_for_pattern(self,
> +                        'while ! (dmesg -c | grep CRW) ; do sleep 1 ; done',
> +                        'CRW reports')
> +        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/',
> +                                          '0.0.4711')
> +        # and detach it again
> +        exec_command_and_wait_for_pattern(self,
> +                                    'dmesg -c > /dev/null; echo dm_clear\ 2',
> +                                    'dm_clear 2')
> +        self.vm.command('device_del', id='net_4711')
> +        self.vm.event_wait(name='DEVICE_DELETED',
> +                           match={'data': {'device': 'net_4711'}})
> +        exec_command_and_wait_for_pattern(self,
> +                        'while ! (dmesg -c | grep CRW) ; do sleep 1 ; done',
> +                        'CRW reports')
> +        exec_command_and_wait_for_pattern(self,
> +                                          'ls /sys/bus/ccw/devices/0.0.4711',
> +                                          'No such file or directory')

Re: [PATCH v3] tests/acceptance: test hot(un)plug of ccw devices

[Cornelia Huck]

On Tue,  8 Dec 2020 13:28:43 +0100
Cornelia Huck <cohuck@redhat.com> wrote:

> Hotplug a virtio-net-ccw device, and then hotunplug it again.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> v2->v3:
> - do the dmesg cleanout and waiting for messages properly [Thomas]
> 
> Wainer: I dropped your r-b, as there had been too many changes for
>         me to be comfortable with retaining it
> 
> ---
>  tests/acceptance/machine_s390_ccw_virtio.py | 24 +++++++++++++++++++++
>  1 file changed, 24 insertions(+)

Queued to s390-next.