| Message ID | 20230425161456.21031-17-pmorel@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: CPU Topology | expand |
On Tue, 2023-04-25 at 18:14 +0200, Pierre Morel wrote: > This test takes care to check the changes on different entitlements > when the guest requests a polarization change. > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > --- > tests/avocado/s390_topology.py | 56 ++++++++++++++++++++++++++++++++++ > 1 file changed, 56 insertions(+) > > diff --git a/tests/avocado/s390_topology.py b/tests/avocado/s390_topology.py > index 30d3c0d0cb..64e1cc9209 100644 > --- a/tests/avocado/s390_topology.py > +++ b/tests/avocado/s390_topology.py > @@ -244,3 +244,59 @@ def test_polarisation(self): > '/bin/cat /sys/devices/system/cpu/dispatching', '0') > > self.check_topology(0, 0, 0, 0, 'medium', False) > + > + def test_entitlement(self): > + """ > + This test verifies that QEMU modifies the polarization > + after a guest request. > + > + :avocado: tags=arch:s390x > + :avocado: tags=machine:s390-ccw-virtio > + """ > + self.kernel_init() > + self.vm.add_args('-smp', > + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') > + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1') > + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2') > + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=3') Why the -device statements? Won't they result in the same as specifying -smp 4,...? Same for patch 17. > + self.vm.launch() > + self.wait_for_console_pattern('no job control') > + > + self.system_init() > + > + res = self.vm.qmp('set-cpu-topology', > + {'core-id': 0, 'entitlement': 'low'}) > + self.assertEqual(res['return'], {}) > + res = self.vm.qmp('set-cpu-topology', > + {'core-id': 1, 'entitlement': 'medium'}) > + self.assertEqual(res['return'], {}) > + res = self.vm.qmp('set-cpu-topology', > + {'core-id': 2, 'entitlement': 'high'}) > + self.assertEqual(res['return'], {}) > + res = self.vm.qmp('set-cpu-topology', > + {'core-id': 3, 'entitlement': 'high'}) > + self.assertEqual(res['return'], {}) > + self.check_topology(0, 0, 0, 0, 'low', False) > + self.check_topology(1, 0, 0, 0, 'medium', False) > + self.check_topology(2, 1, 0, 0, 'high', False) > + self.check_topology(3, 1, 0, 0, 'high', False) > + > + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') > + time.sleep(0.2) > + exec_command_and_wait_for_pattern(self, > + '/bin/cat /sys/devices/system/cpu/dispatching', '1') > + > + self.check_topology(0, 0, 0, 0, 'low', False) > + self.check_topology(1, 0, 0, 0, 'medium', False) > + self.check_topology(2, 1, 0, 0, 'high', False) > + self.check_topology(3, 1, 0, 0, 'high', False) > + > + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') > + time.sleep(0.2) > + exec_command_and_wait_for_pattern(self, > + '/bin/cat /sys/devices/system/cpu/dispatching', '0') > + > + self.check_topology(0, 0, 0, 0, 'low', False) > + self.check_topology(1, 0, 0, 0, 'medium', False) > + self.check_topology(2, 1, 0, 0, 'high', False) > + self.check_topology(3, 1, 0, 0, 'high', False)
On 5/22/23 21:47, Nina Schoetterl-Glausch wrote: > On Tue, 2023-04-25 at 18:14 +0200, Pierre Morel wrote: >> This test takes care to check the changes on different entitlements >> when the guest requests a polarization change. >> >> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> >> --- >> tests/avocado/s390_topology.py | 56 ++++++++++++++++++++++++++++++++++ >> 1 file changed, 56 insertions(+) >> >> diff --git a/tests/avocado/s390_topology.py b/tests/avocado/s390_topology.py >> index 30d3c0d0cb..64e1cc9209 100644 >> --- a/tests/avocado/s390_topology.py >> +++ b/tests/avocado/s390_topology.py >> @@ -244,3 +244,59 @@ def test_polarisation(self): >> '/bin/cat /sys/devices/system/cpu/dispatching', '0') >> >> self.check_topology(0, 0, 0, 0, 'medium', False) >> + >> + def test_entitlement(self): >> + """ >> + This test verifies that QEMU modifies the polarization >> + after a guest request. >> + >> + :avocado: tags=arch:s390x >> + :avocado: tags=machine:s390-ccw-virtio >> + """ >> + self.kernel_init() >> + self.vm.add_args('-smp', >> + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') >> + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1') >> + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2') >> + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=3') > Why the -device statements? Won't they result in the same as specifying -smp 4,...? > Same for patch 17. A left over. You are right it is the same. thanks, Pierre
diff --git a/tests/avocado/s390_topology.py b/tests/avocado/s390_topology.py index 30d3c0d0cb..64e1cc9209 100644 --- a/tests/avocado/s390_topology.py +++ b/tests/avocado/s390_topology.py @@ -244,3 +244,59 @@ def test_polarisation(self): '/bin/cat /sys/devices/system/cpu/dispatching', '0') self.check_topology(0, 0, 0, 0, 'medium', False) + + def test_entitlement(self): + """ + This test verifies that QEMU modifies the polarization + after a guest request. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=3') + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'low'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 1, 'entitlement': 'medium'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 2, 'entitlement': 'high'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 3, 'entitlement': 'high'}) + self.assertEqual(res['return'], {}) + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1') + + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False) + + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False)
This test takes care to check the changes on different entitlements when the guest requests a polarization change. Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> --- tests/avocado/s390_topology.py | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)