Skip to contentSkip to conversation

tests/acceptance: test hot(un)plug of ccw devices

PATCH Applied Cornelia Huck 5 participants 8 messages Dec 8, 2020 – Dec 17, 2020

lore
Share & tools
lore
#0 lore raw

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

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

---
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(+)
tests/acceptance/machine_s390_ccw_virtio.py +24 -0
index 81d14088818c..864ef4ee6e9b 100644
@@ -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')
Signature · 1 line
2.26.2
Reviewed-by on v3 1/1
#1 lore raw
Quoted 7 lines · Cornelia Huck

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

---
v2->v3:
- do the dmesg cleanout and waiting for messages properly [Thomas]

Quoted 6 lines

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(+)
#2 lore raw
In reply to Cornelia Huck

Hi Paolo, Fam,

Quoted 7 lines · Cornelia Huck

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

---
v2->v3:
- do the dmesg cleanout and waiting for messages properly [Thomas]

Quoted 6 lines

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 '[email protected]'
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/[email protected]/

#3 lore raw
Quoted 32 lines · On Wed, 9 Dec 2020 19:09:25 +0100 Philippe Mathieu-Daudé <[email protected]>…

Hi Paolo, Fam,

Quoted 7 lines · Cornelia Huck

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

---
v2->v3:
- do the dmesg cleanout and waiting for messages properly [Thomas]

Quoted 6 lines

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 '[email protected]'
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

Quoted 2 lines

https://patchew.org/QEMU/[email protected]/

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

#4 lore raw
Quoted 35 lines · Cornelia Huck
Quoted 32 lines · On Wed, 9 Dec 2020 19:09:25 +0100 Philippe Mathieu-Daudé <[email protected]>…

Hi Paolo, Fam,

Quoted 7 lines · Cornelia Huck

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

---
v2->v3:
- do the dmesg cleanout and waiting for messages properly [Thomas]

Quoted 6 lines

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 '[email protected]'
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

Quoted 5 lines
Quoted 2 lines

https://patchew.org/QEMU/[email protected]/

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.

Tested-by Reviewed-by on v3 1/1
#5 lore raw
In reply to Cornelia Huck
Quoted 37 lines · Cornelia Huck

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

---
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(+)
tests/acceptance/machine_s390_ccw_virtio.py +14 -0
index 81d14088818c..864ef4ee6e9b 100644
@@ -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',

tests/acceptance/machine_s390_ccw_virtio.py class S390CCWVirtioMachine(Test): · line 125

Quoted 10 lines
tests/acceptance/machine_s390_ccw_virtio.py +10 -0
+                                    '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

Reviewed-by on v3 1/1
#6 lore raw
In reply to Cornelia Huck

Hi,

Quoted 9 lines · Cornelia Huck

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

---
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.

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

lgtm.

Quoted 33 lines
tests/acceptance/machine_s390_ccw_virtio.py +24 -0
index 81d14088818c..864ef4ee6e9b 100644
@@ -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')
author Applied
#7 lore raw
In reply to Cornelia Huck
Quoted 7 lines · On Tue, 8 Dec 2020 13:28:43 +0100 Cornelia Huck <[email protected]> wrote:

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

---
v2->v3:
- do the dmesg cleanout and waiting for messages properly [Thomas]

Quoted 6 lines

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.