1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
# Functional test that boots a Linux kernel and checks the console
#
# Copyright IBM Corp. 2023
#
# Author:
# Pierre Morel <pmorel@linux.ibm.com>
#
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
import os
import shutil
import time
from avocado_qemu import QemuSystemTest
from avocado_qemu import exec_command
from avocado_qemu import exec_command_and_wait_for_pattern
from avocado_qemu import interrupt_interactive_console_until_pattern
from avocado_qemu import wait_for_console_pattern
from avocado.utils import process
from avocado.utils import archive
class S390CPUTopology(QemuSystemTest):
"""
S390x CPU topology consists of 4 topology layers, from bottom to top,
the cores, sockets, books and drawers and 2 modifiers attributes,
the entitlement and the dedication.
See: docs/system/s390x/cpu-topology.rst.
S390x CPU topology is setup in different ways:
- implicitly from the '-smp' argument by completing each topology
level one after the other beginning with drawer 0, book 0 and
socket 0.
- explicitly from the '-device' argument on the QEMU command line
- explicitly by hotplug of a new CPU using QMP or HMP
- it is modified by using QMP 'set-cpu-topology'
The S390x modifier attribute entitlement depends on the machine
polarization, which can be horizontal or vertical.
The polarization is changed on a request from the guest.
"""
timeout = 90
event_timeout = 10
KERNEL_COMMON_COMMAND_LINE = ('printk.time=0 '
'root=/dev/ram '
'selinux=0 '
'rdinit=/bin/sh')
def wait_until_booted(self):
wait_for_console_pattern(self, 'no job control',
failure_message='Kernel panic - not syncing',
vm=None)
def check_topology(self, c, s, b, d, e, t):
res = self.vm.qmp('query-cpus-fast')
cpus = res['return']
for cpu in cpus:
core = cpu['props']['core-id']
socket = cpu['props']['socket-id']
book = cpu['props']['book-id']
drawer = cpu['props']['drawer-id']
entitlement = cpu.get('entitlement')
dedicated = cpu.get('dedicated')
if core == c:
self.assertEqual(drawer, d)
self.assertEqual(book, b)
self.assertEqual(socket, s)
self.assertEqual(entitlement, e)
self.assertEqual(dedicated, t)
def kernel_init(self):
"""
We need a VM that supports CPU topology,
currently this only the case when using KVM, not TCG.
We need a kernel supporting the CPU topology.
We need a minimal root filesystem with a shell.
"""
self.require_accelerator("kvm")
kernel_url = ('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/35/Server/s390x/os'
'/images/kernel.img')
kernel_hash = '0d1aaaf303f07cf0160c8c48e56fe638'
kernel_path = self.fetch_asset(kernel_url, algorithm='md5',
asset_hash=kernel_hash)
initrd_url = ('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/35/Server/s390x/os'
'/images/initrd.img')
initrd_hash = 'a122057d95725ac030e2ec51df46e172'
initrd_path_xz = self.fetch_asset(initrd_url, algorithm='md5',
asset_hash=initrd_hash)
initrd_path = os.path.join(self.workdir, 'initrd-raw.img')
archive.lzma_uncompress(initrd_path_xz, initrd_path)
self.vm.set_console()
kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
self.vm.add_args('-nographic',
'-enable-kvm',
'-cpu', 'max,ctop=on',
'-m', '512',
'-kernel', kernel_path,
'-initrd', initrd_path,
'-append', kernel_command_line)
def system_init(self):
self.log.info("System init")
exec_command_and_wait_for_pattern(self,
""" mount proc -t proc /proc;
mount sys -t sysfs /sys;
cat /sys/devices/system/cpu/dispatching """,
'0')
def test_single(self):
"""
This test checks the simplest topology with a single CPU.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
"""
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
self.check_topology(0, 0, 0, 0, 'medium', False)
def test_default(self):
"""
This test checks the implicit topology.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
"""
self.kernel_init()
self.vm.add_args('-smp',
'13,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
self.vm.launch()
self.wait_until_booted()
self.check_topology(0, 0, 0, 0, 'medium', False)
self.check_topology(1, 0, 0, 0, 'medium', False)
self.check_topology(2, 1, 0, 0, 'medium', False)
self.check_topology(3, 1, 0, 0, 'medium', False)
self.check_topology(4, 2, 0, 0, 'medium', False)
self.check_topology(5, 2, 0, 0, 'medium', False)
self.check_topology(6, 0, 1, 0, 'medium', False)
self.check_topology(7, 0, 1, 0, 'medium', False)
self.check_topology(8, 1, 1, 0, 'medium', False)
self.check_topology(9, 1, 1, 0, 'medium', False)
self.check_topology(10, 2, 1, 0, 'medium', False)
self.check_topology(11, 2, 1, 0, 'medium', False)
self.check_topology(12, 0, 0, 1, 'medium', False)
def test_move(self):
"""
This test checks the topology modification by moving a CPU
to another socket: CPU 0 is moved from socket 0 to socket 2.
: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.launch()
self.wait_until_booted()
self.check_topology(0, 0, 0, 0, 'medium', False)
res = self.vm.qmp('set-cpu-topology',
{'core-id': 0, 'socket-id': 2, 'entitlement': 'low'})
self.assertEqual(res['return'], {})
self.check_topology(0, 2, 0, 0, 'low', False)
def test_dash_device(self):
"""
This test verifies that a CPU defined with the '-device'
command line option finds its right place inside the topology.
: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', 'max-s390x-cpu,core-id=10')
self.vm.add_args('-device',
'max-s390x-cpu,'
'core-id=1,socket-id=0,book-id=1,drawer-id=1,entitlement=low')
self.vm.add_args('-device',
'max-s390x-cpu,'
'core-id=2,socket-id=0,book-id=1,drawer-id=1,entitlement=medium')
self.vm.add_args('-device',
'max-s390x-cpu,'
'core-id=3,socket-id=1,book-id=1,drawer-id=1,entitlement=high')
self.vm.add_args('-device',
'max-s390x-cpu,'
'core-id=4,socket-id=1,book-id=1,drawer-id=1')
self.vm.add_args('-device',
'max-s390x-cpu,'
'core-id=5,socket-id=2,book-id=1,drawer-id=1,dedicated=true')
self.vm.launch()
self.wait_until_booted()
self.check_topology(10, 2, 1, 0, 'medium', False)
self.check_topology(1, 0, 1, 1, 'low', False)
self.check_topology(2, 0, 1, 1, 'medium', False)
self.check_topology(3, 1, 1, 1, 'high', False)
self.check_topology(4, 1, 1, 1, 'medium', False)
self.check_topology(5, 2, 1, 1, 'high', True)
def guest_set_dispatching(self, dispatching):
exec_command(self,
f'echo {dispatching} > /sys/devices/system/cpu/dispatching')
self.vm.event_wait('CPU_POLARIZATION_CHANGE', self.event_timeout)
exec_command_and_wait_for_pattern(self,
'cat /sys/devices/system/cpu/dispatching', dispatching)
def test_polarization(self):
"""
This test verifies that QEMU modifies the entitlement change after
several guest polarization change requests.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
"""
self.kernel_init()
self.vm.launch()
self.wait_until_booted()
self.system_init()
res = self.vm.qmp('query-s390x-cpu-polarization')
self.assertEqual(res['return']['polarization'], 'horizontal')
self.check_topology(0, 0, 0, 0, 'medium', False)
self.guest_set_dispatching('1');
res = self.vm.qmp('query-s390x-cpu-polarization')
self.assertEqual(res['return']['polarization'], 'vertical')
self.check_topology(0, 0, 0, 0, 'medium', False)
self.guest_set_dispatching('0');
res = self.vm.qmp('query-s390x-cpu-polarization')
self.assertEqual(res['return']['polarization'], 'horizontal')
self.check_topology(0, 0, 0, 0, 'medium', False)
|
