From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8DA75EB64D9 for ; Tue, 27 Jun 2023 11:59:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qE7LL-0002N7-9x; Tue, 27 Jun 2023 07:58:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE7LJ-0002Dk-1p; Tue, 27 Jun 2023 07:58:45 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE7LG-0006GA-Oj; Tue, 27 Jun 2023 07:58:44 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35RBlRsW008403; Tue, 27 Jun 2023 11:58:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pp1; bh=4QwGkY8FzTMesCI8wQuAWBTq65CQMvog3gIMjbOJlVQ=; b=df6OIvBjLBYKyp6y0aGYMZ62PJLX1+NnMcmg7J8pFQdjHCdCcZ+1Rfy2NTjKgwdFqKpw STS1Kmu7XFI3R/KEdocDSKMOJlb89Irbljxh489SjSBCFYCH9Hvs7P8obsgh2WQ5cTI+ ZNkCDl5zoc/u5yA1zWtD4JHhInkaoG6rxyoLMnO8xTcFznJA6mjk6DocrbdkNSnIShaJ NKVx39YEhfZuhM50fVsqrU3lNiOUybRdkQGWUaU4xipBaZs3bbu4PfGputHgCmP5aov3 tTIlEBytkXdBA94bpWJdopA2KWkPat7NVCDf7pLwQwn5zFeXesCB37xrDObrpeKAji3m 0g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rfy6wg7d3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 27 Jun 2023 11:58:32 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 35RBwVjU011881; Tue, 27 Jun 2023 11:58:31 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rfy6wg7cp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 27 Jun 2023 11:58:31 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 35R1FPdb004968; Tue, 27 Jun 2023 11:58:30 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma04fra.de.ibm.com (PPS) with ESMTPS id 3rdr451d89-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 27 Jun 2023 11:58:29 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 35RBwMYA44433802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 27 Jun 2023 11:58:23 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CE82A2004D; Tue, 27 Jun 2023 11:58:22 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6D93F20040; Tue, 27 Jun 2023 11:58:22 +0000 (GMT) Received: from [9.152.222.242] (unknown [9.152.222.242]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTPS; Tue, 27 Jun 2023 11:58:22 +0000 (GMT) Message-ID: <31a877c0-490e-cbe1-bd8f-c577c911a059@linux.ibm.com> Date: Tue, 27 Jun 2023 13:58:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v20 14/21] tests/avocado: s390x cpu topology core Content-Language: en-US To: Nina Schoetterl-Glausch , qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, borntraeger@de.ibm.com, pasic@linux.ibm.com, richard.henderson@linaro.org, david@redhat.com, thuth@redhat.com, cohuck@redhat.com, mst@redhat.com, pbonzini@redhat.com, kvm@vger.kernel.org, ehabkost@redhat.com, marcel.apfelbaum@gmail.com, eblake@redhat.com, armbru@redhat.com, seiden@linux.ibm.com, nrb@linux.ibm.com, frankja@linux.ibm.com, berrange@redhat.com, clg@kaod.org References: <20230425161456.21031-1-pmorel@linux.ibm.com> <20230425161456.21031-15-pmorel@linux.ibm.com> <6f0f0bb9f9f7aa48cbb6c60629a0a83ef722970a.camel@linux.ibm.com> From: Pierre Morel In-Reply-To: <6f0f0bb9f9f7aa48cbb6c60629a0a83ef722970a.camel@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed X-TM-AS-GCONF: 00 X-Proofpoint-GUID: QOqFbDHW87mE1MH5sV7vgPWziulgq6UI X-Proofpoint-ORIG-GUID: 8tivmg07Kw50on7pIybeE-4Ny_LMGRuA Content-Transfer-Encoding: 7bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-27_07,2023-06-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 mlxscore=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 spamscore=0 adultscore=0 phishscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306270106 Received-SPF: pass client-ip=148.163.158.5; envelope-from=pmorel@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.103, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 5/22/23 21:38, Nina Schoetterl-Glausch wrote: > On Tue, 2023-04-25 at 18:14 +0200, Pierre Morel wrote: >> Introduction of the s390x cpu topology core functions and >> basic tests. >> >> We test the corelation between the command line and >> the QMP results in query-cpus-fast for various CPU topology. >> >> Signed-off-by: Pierre Morel >> --- >> MAINTAINERS | 1 + >> tests/avocado/s390_topology.py | 208 +++++++++++++++++++++++++++++++++ >> 2 files changed, 209 insertions(+) >> create mode 100644 tests/avocado/s390_topology.py >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index fe5638e31d..41419840b0 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1662,6 +1662,7 @@ F: hw/s390x/cpu-topology.c >> F: target/s390x/kvm/cpu_topology.c >> F: docs/devel/s390-cpu-topology.rst >> F: docs/system/s390x/cpu-topology.rst >> +F: tests/avocado/s390_topology.py >> >> X86 Machines >> ------------ >> diff --git a/tests/avocado/s390_topology.py b/tests/avocado/s390_topology.py >> new file mode 100644 >> index 0000000000..ce119a095e >> --- /dev/null >> +++ b/tests/avocado/s390_topology.py >> @@ -0,0 +1,208 @@ >> +# Functional test that boots a Linux kernel and checks the console >> +# >> +# Copyright IBM Corp. 2023 >> +# >> +# Author: >> +# Pierre Morel >> +# >> +# 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 LinuxKernelTest(QemuSystemTest): > I'd get rid of this class, unless you plan to use it for more children. OK > >> + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' >> + >> + def wait_for_console_pattern(self, success_message, vm=None): > You always use the same args for this function, I'd refactor it into > def wait_until_booted(self): OK > >> + wait_for_console_pattern(self, success_message, >> + failure_message='Kernel panic - not syncing', >> + vm=vm) >> + >> + >> +class S390CPUTopology(LinuxKernelTest): >> + """ >> + S390x CPU topology consist 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: >> + - implicitely from the '-smp' argument by completing each topology >> + level one after the other begining with drawer 0, book 0 and socket 0. >> + - explicitely from the '-device' argument on the QEMU command line >> + - explicitely 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 >> + >> + >> + def check_topology(self, c, s, b, d, e, t): >> + res = self.vm.qmp('query-cpus-fast') >> + line = res['return'] >> + for x in line: > for cpu in cpus Yes indeed we are working with CPU so it is better > >> + core = x['props']['core-id'] >> + socket = x['props']['socket-id'] >> + book = x['props']['book-id'] >> + drawer = x['props']['drawer-id'] >> + entitlement = x['entitlement'] >> + dedicated = x['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 kernel supporting the CPU topology. >> + We need a minimal root filesystem with a shell. >> + """ >> + 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 + >> + 'root=/dev/ram ' >> + 'selinux=0 ' >> + 'rdinit=/bin/sh') >> + self.vm.add_args('-nographic', >> + '-enable-kvm', >> + '-cpu', 'z14,ctop=on', >> + '-m', '512', >> + '-name', 'Some Guest Name', >> + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa', > What is the meaning of those flags (name & uuid), do you need them? > Where does the value for the uuid come from? I do not need them > >> + '-kernel', kernel_path, >> + '-initrd', initrd_path, >> + '-append', kernel_command_line) >> + >> + def test_single(self): > Why no comment and avocado tags here? just forgot thanks for the catch > >> + self.kernel_init() >> + self.vm.launch() >> + self.wait_for_console_pattern('no job control') >> + self.check_topology(0, 0, 0, 0, 'medium', False) >> + >> + def test_default(self): >> + """ >> + This test checks the implicite topology. > s/implicite/implicit/ thx > >> + >> + :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_for_console_pattern('no job control') >> + 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_for_console_pattern('no job control') >> + >> + 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_hotplug(self): >> + """ >> + This test verifies that a CPU defined with '-device' command line >> + argument 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', 'z14-s390x-cpu,core-id=10') >> + self.vm.launch() >> + self.wait_for_console_pattern('no job control') >> + >> + self.check_topology(10, 2, 1, 0, 'medium', False) >> + >> + def test_hotplug_full(self): > I would unite this test with the previous one. > Both test -device with some values missing. OK > >> + """ >> + This test verifies that a hotplugged fully defined with '-device' >> + command line argument 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', >> + 'z14-s390x-cpu,' >> + 'core-id=1,socket-id=0,book-id=1,drawer-id=1,entitlement=low') >> + self.vm.add_args('-device', >> + 'z14-s390x-cpu,' >> + 'core-id=2,socket-id=0,book-id=1,drawer-id=1,entitlement=medium') >> + self.vm.add_args('-device', >> + 'z14-s390x-cpu,' >> + 'core-id=3,socket-id=1,book-id=1,drawer-id=1,entitlement=high') >> + self.vm.add_args('-device', >> + 'z14-s390x-cpu,' >> + 'core-id=4,socket-id=1,book-id=1,drawer-id=1') >> + self.vm.add_args('-device', >> + 'z14-s390x-cpu,' >> + 'core-id=5,socket-id=2,book-id=1,drawer-id=1,dedicated=true') >> + self.vm.launch() >> + self.wait_for_console_pattern('no job control') >> + 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) > Looks good all in all. Thanks for the comment, I update all. Regards, Pierre