[v21] s390x: CPU Topology

[PATCH v21 18/20] tests/avocado: s390x cpu topology test socket full

Posted by Pierre Morel 2 years, 7 months ago

This test verifies that QMP set-cpu-topology does not accept
to overload a socket.

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
---
 tests/avocado/s390_topology.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/avocado/s390_topology.py b/tests/avocado/s390_topology.py
index cba44bec91..0003b30702 100644
--- a/tests/avocado/s390_topology.py
+++ b/tests/avocado/s390_topology.py
@@ -315,3 +315,28 @@ def test_dedicated(self):
         self.guest_set_dispatching('0');
 
         self.check_topology(0, 0, 0, 0, 'high', True)
+
+    def test_socket_full(self):
+        """
+        This test verifies that QEMU does not accept to overload a socket.
+        The socket-id 0 on book-id 0 already contains CPUs 0 and 1 and can
+        not accept any new CPU while socket-id 0 on book-id 1 is free.
+
+        :avocado: tags=arch:s390x
+        :avocado: tags=machine:s390-ccw-virtio
+        """
+        self.kernel_init()
+        self.vm.add_args('-smp',
+                         '3,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
+        self.vm.launch()
+        self.wait_until_booted()
+
+        self.system_init()
+
+        res = self.vm.qmp('set-cpu-topology',
+                          {'core-id': 2, 'socket-id': 0, 'book-id': 0})
+        self.assertEqual(res['error']['class'], 'GenericError')
+
+        res = self.vm.qmp('set-cpu-topology',
+                          {'core-id': 2, 'socket-id': 0, 'book-id': 1})
+        self.assertEqual(res['return'], {})
-- 
2.31.1

Re: [PATCH v21 18/20] tests/avocado: s390x cpu topology test socket full

Posted by Thomas Huth 2 years, 7 months ago

On 30/06/2023 11.17, Pierre Morel wrote:
> This test verifies that QMP set-cpu-topology does not accept
> to overload a socket.
> 
> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
> ---
>   tests/avocado/s390_topology.py | 25 +++++++++++++++++++++++++
>   1 file changed, 25 insertions(+)
> 
> diff --git a/tests/avocado/s390_topology.py b/tests/avocado/s390_topology.py
> index cba44bec91..0003b30702 100644
> --- a/tests/avocado/s390_topology.py
> +++ b/tests/avocado/s390_topology.py
> @@ -315,3 +315,28 @@ def test_dedicated(self):
>           self.guest_set_dispatching('0');
>   
>           self.check_topology(0, 0, 0, 0, 'high', True)
> +
> +    def test_socket_full(self):
> +        """
> +        This test verifies that QEMU does not accept to overload a socket.
> +        The socket-id 0 on book-id 0 already contains CPUs 0 and 1 and can
> +        not accept any new CPU while socket-id 0 on book-id 1 is free.
> +
> +        :avocado: tags=arch:s390x
> +        :avocado: tags=machine:s390-ccw-virtio
> +        """
> +        self.kernel_init()
> +        self.vm.add_args('-smp',
> +                         '3,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
> +        self.vm.launch()
> +        self.wait_until_booted()
> +
> +        self.system_init()
> +
> +        res = self.vm.qmp('set-cpu-topology',
> +                          {'core-id': 2, 'socket-id': 0, 'book-id': 0})
> +        self.assertEqual(res['error']['class'], 'GenericError')
> +
> +        res = self.vm.qmp('set-cpu-topology',
> +                          {'core-id': 2, 'socket-id': 0, 'book-id': 1})
> +        self.assertEqual(res['return'], {})

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

Re: [PATCH v21 18/20] tests/avocado: s390x cpu topology test socket full

Posted by Pierre Morel 2 years, 6 months ago

On 7/5/23 12:26, Thomas Huth wrote:
> On 30/06/2023 11.17, Pierre Morel wrote:
>> This test verifies that QMP set-cpu-topology does not accept
>> to overload a socket.
>>
>> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
>> ---
>>   tests/avocado/s390_topology.py | 25 +++++++++++++++++++++++++
>>   1 file changed, 25 insertions(+)
>>
>> diff --git a/tests/avocado/s390_topology.py 
>> b/tests/avocado/s390_topology.py
>> index cba44bec91..0003b30702 100644
>> --- a/tests/avocado/s390_topology.py
>> +++ b/tests/avocado/s390_topology.py
>> @@ -315,3 +315,28 @@ def test_dedicated(self):
>>           self.guest_set_dispatching('0');
>>             self.check_topology(0, 0, 0, 0, 'high', True)
>> +
>> +    def test_socket_full(self):
>> +        """
>> +        This test verifies that QEMU does not accept to overload a 
>> socket.
>> +        The socket-id 0 on book-id 0 already contains CPUs 0 and 1 
>> and can
>> +        not accept any new CPU while socket-id 0 on book-id 1 is free.
>> +
>> +        :avocado: tags=arch:s390x
>> +        :avocado: tags=machine:s390-ccw-virtio
>> +        """
>> +        self.kernel_init()
>> +        self.vm.add_args('-smp',
>> + '3,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
>> +        self.vm.launch()
>> +        self.wait_until_booted()
>> +
>> +        self.system_init()
>> +
>> +        res = self.vm.qmp('set-cpu-topology',
>> +                          {'core-id': 2, 'socket-id': 0, 'book-id': 0})
>> +        self.assertEqual(res['error']['class'], 'GenericError')
>> +
>> +        res = self.vm.qmp('set-cpu-topology',
>> +                          {'core-id': 2, 'socket-id': 0, 'book-id': 1})
>> +        self.assertEqual(res['return'], {})
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
Thanks,

Pierre