Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1850820/?format=api
{ "id": 1850820, "url": "http://patchwork.ozlabs.org/api/patches/1850820/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-16-thuth@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20231018130716.286638-16-thuth@redhat.com>", "list_archive_url": null, "date": "2023-10-18T13:07:06", "name": "[PULL,15/25] tests/avocado: s390x cpu topology core", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "37c1137b184eb9dec1db5adcd33a741dbbbdafbc", "submitter": { "id": 66152, "url": "http://patchwork.ozlabs.org/api/people/66152/?format=api", "name": "Thomas Huth", "email": "thuth@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-16-thuth@redhat.com/mbox/", "series": [ { "id": 378180, "url": "http://patchwork.ozlabs.org/api/series/378180/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=378180", "date": "2023-10-18T13:06:52", "name": "[PULL,01/25] qapi: machine.json: change docs regarding CPU topology", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/378180/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1850820/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1850820/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=BW2eDZmU;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4S9WXg3S3dz20cx\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 19 Oct 2023 00:14:43 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1qt6IC-0006K5-Mg; Wed, 18 Oct 2023 09:08:56 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1qt6HP-0004Ye-3L\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:08:12 -0400", "from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1qt6HK-00081O-8M\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:08:06 -0400", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-693-Lp98PKMMOzabspBVwuDQ7A-1; Wed, 18 Oct 2023 09:07:44 -0400", "from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8878088B7AB;\n Wed, 18 Oct 2023 13:07:44 +0000 (UTC)", "from thuth-p1g4.redhat.com (unknown [10.39.192.109])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 5423B20268C8;\n Wed, 18 Oct 2023 13:07:43 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1697634481;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=PqOCqxXlBbK1bizrXYP68QVYEW/W4PHiJ4zRDkLjD+0=;\n b=BW2eDZmUnuoaddu/yITzwjPkRNJr7qm0bom/1uX5JQwbMK+6XXJPtq3Y5Vne9lfGvGc5sR\n g+PoBhJuYRSsbbCeaNEc0vaKPBYZqplk5CZcIL19jAaBcNAjno3o00LpmXFpHCO/RIosjW\n EfUwNxkPYTsgCx86LMJ0+XxgsM0jtEg=", "X-MC-Unique": "Lp98PKMMOzabspBVwuDQ7A-1", "From": "Thomas Huth <thuth@redhat.com>", "To": "qemu-devel@nongnu.org", "Cc": "Stefan Hajnoczi <stefanha@redhat.com>, qemu-s390x@nongnu.org,\n Nina Schoetterl-Glausch <nsg@linux.ibm.com>", "Subject": "[PULL 15/25] tests/avocado: s390x cpu topology core", "Date": "Wed, 18 Oct 2023 15:07:06 +0200", "Message-ID": "<20231018130716.286638-16-thuth@redhat.com>", "In-Reply-To": "<20231018130716.286638-1-thuth@redhat.com>", "References": "<20231018130716.286638-1-thuth@redhat.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.4", "Received-SPF": "pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com;\n helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "From: Pierre Morel <pmorel@linux.ibm.com>\n\nIntroduction of the s390x cpu topology core functions and\nbasic tests.\n\nWe test the correlation between the command line and\nthe QMP results in query-cpus-fast for various CPU topology.\n\nSigned-off-by: Pierre Morel <pmorel@linux.ibm.com>\nReviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\nCo-developed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\nTested-by: Thomas Huth <thuth@redhat.com>\nSigned-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\nMessage-ID: <20231016183925.2384704-16-nsg@linux.ibm.com>\nSigned-off-by: Thomas Huth <thuth@redhat.com>\n---\n MAINTAINERS | 1 +\n tests/avocado/s390_topology.py | 200 +++++++++++++++++++++++++++++++++\n 2 files changed, 201 insertions(+)\n create mode 100644 tests/avocado/s390_topology.py", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex de8d9f5104..9ad32e20f4 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -1718,6 +1718,7 @@ F: hw/s390x/cpu-topology.c\n F: target/s390x/kvm/stsi-topology.c\n F: docs/devel/s390-cpu-topology.rst\n F: docs/system/s390x/cpu-topology.rst\n+F: tests/avocado/s390_topology.py\n \n X86 Machines\n ------------\ndiff --git a/tests/avocado/s390_topology.py b/tests/avocado/s390_topology.py\nnew file mode 100644\nindex 0000000000..9078b45281\n--- /dev/null\n+++ b/tests/avocado/s390_topology.py\n@@ -0,0 +1,200 @@\n+# Functional test that boots a Linux kernel and checks the console\n+#\n+# Copyright IBM Corp. 2023\n+#\n+# Author:\n+# Pierre Morel <pmorel@linux.ibm.com>\n+#\n+# This work is licensed under the terms of the GNU GPL, version 2 or\n+# later. See the COPYING file in the top-level directory.\n+\n+import os\n+import shutil\n+import time\n+\n+from avocado_qemu import QemuSystemTest\n+from avocado_qemu import exec_command\n+from avocado_qemu import exec_command_and_wait_for_pattern\n+from avocado_qemu import interrupt_interactive_console_until_pattern\n+from avocado_qemu import wait_for_console_pattern\n+from avocado.utils import process\n+from avocado.utils import archive\n+\n+\n+class S390CPUTopology(QemuSystemTest):\n+ \"\"\"\n+ S390x CPU topology consists of 4 topology layers, from bottom to top,\n+ the cores, sockets, books and drawers and 2 modifiers attributes,\n+ the entitlement and the dedication.\n+ See: docs/system/s390x/cpu-topology.rst.\n+\n+ S390x CPU topology is setup in different ways:\n+ - implicitly from the '-smp' argument by completing each topology\n+ level one after the other beginning with drawer 0, book 0 and\n+ socket 0.\n+ - explicitly from the '-device' argument on the QEMU command line\n+ - explicitly by hotplug of a new CPU using QMP or HMP\n+ - it is modified by using QMP 'set-cpu-topology'\n+\n+ The S390x modifier attribute entitlement depends on the machine\n+ polarization, which can be horizontal or vertical.\n+ The polarization is changed on a request from the guest.\n+ \"\"\"\n+ timeout = 90\n+\n+ KERNEL_COMMON_COMMAND_LINE = ('printk.time=0 '\n+ 'root=/dev/ram '\n+ 'selinux=0 '\n+ 'rdinit=/bin/sh')\n+\n+ def wait_until_booted(self):\n+ wait_for_console_pattern(self, 'no job control',\n+ failure_message='Kernel panic - not syncing',\n+ vm=None)\n+\n+ def check_topology(self, c, s, b, d, e, t):\n+ res = self.vm.qmp('query-cpus-fast')\n+ cpus = res['return']\n+ for cpu in cpus:\n+ core = cpu['props']['core-id']\n+ socket = cpu['props']['socket-id']\n+ book = cpu['props']['book-id']\n+ drawer = cpu['props']['drawer-id']\n+ entitlement = cpu.get('entitlement')\n+ dedicated = cpu.get('dedicated')\n+ if core == c:\n+ self.assertEqual(drawer, d)\n+ self.assertEqual(book, b)\n+ self.assertEqual(socket, s)\n+ self.assertEqual(entitlement, e)\n+ self.assertEqual(dedicated, t)\n+\n+ def kernel_init(self):\n+ \"\"\"\n+ We need a VM that supports CPU topology,\n+ currently this only the case when using KVM, not TCG.\n+ We need a kernel supporting the CPU topology.\n+ We need a minimal root filesystem with a shell.\n+ \"\"\"\n+ self.require_accelerator(\"kvm\")\n+ kernel_url = ('https://archives.fedoraproject.org/pub/archive'\n+ '/fedora-secondary/releases/35/Server/s390x/os'\n+ '/images/kernel.img')\n+ kernel_hash = '0d1aaaf303f07cf0160c8c48e56fe638'\n+ kernel_path = self.fetch_asset(kernel_url, algorithm='md5',\n+ asset_hash=kernel_hash)\n+\n+ initrd_url = ('https://archives.fedoraproject.org/pub/archive'\n+ '/fedora-secondary/releases/35/Server/s390x/os'\n+ '/images/initrd.img')\n+ initrd_hash = 'a122057d95725ac030e2ec51df46e172'\n+ initrd_path_xz = self.fetch_asset(initrd_url, algorithm='md5',\n+ asset_hash=initrd_hash)\n+ initrd_path = os.path.join(self.workdir, 'initrd-raw.img')\n+ archive.lzma_uncompress(initrd_path_xz, initrd_path)\n+\n+ self.vm.set_console()\n+ kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE\n+ self.vm.add_args('-nographic',\n+ '-enable-kvm',\n+ '-cpu', 'max,ctop=on',\n+ '-m', '512',\n+ '-kernel', kernel_path,\n+ '-initrd', initrd_path,\n+ '-append', kernel_command_line)\n+\n+ def test_single(self):\n+ \"\"\"\n+ This test checks the simplest topology with a single CPU.\n+\n+ :avocado: tags=arch:s390x\n+ :avocado: tags=machine:s390-ccw-virtio\n+ \"\"\"\n+ self.kernel_init()\n+ self.vm.launch()\n+ self.wait_until_booted()\n+ self.check_topology(0, 0, 0, 0, 'medium', False)\n+\n+ def test_default(self):\n+ \"\"\"\n+ This test checks the implicit topology.\n+\n+ :avocado: tags=arch:s390x\n+ :avocado: tags=machine:s390-ccw-virtio\n+ \"\"\"\n+ self.kernel_init()\n+ self.vm.add_args('-smp',\n+ '13,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')\n+ self.vm.launch()\n+ self.wait_until_booted()\n+ self.check_topology(0, 0, 0, 0, 'medium', False)\n+ self.check_topology(1, 0, 0, 0, 'medium', False)\n+ self.check_topology(2, 1, 0, 0, 'medium', False)\n+ self.check_topology(3, 1, 0, 0, 'medium', False)\n+ self.check_topology(4, 2, 0, 0, 'medium', False)\n+ self.check_topology(5, 2, 0, 0, 'medium', False)\n+ self.check_topology(6, 0, 1, 0, 'medium', False)\n+ self.check_topology(7, 0, 1, 0, 'medium', False)\n+ self.check_topology(8, 1, 1, 0, 'medium', False)\n+ self.check_topology(9, 1, 1, 0, 'medium', False)\n+ self.check_topology(10, 2, 1, 0, 'medium', False)\n+ self.check_topology(11, 2, 1, 0, 'medium', False)\n+ self.check_topology(12, 0, 0, 1, 'medium', False)\n+\n+ def test_move(self):\n+ \"\"\"\n+ This test checks the topology modification by moving a CPU\n+ to another socket: CPU 0 is moved from socket 0 to socket 2.\n+\n+ :avocado: tags=arch:s390x\n+ :avocado: tags=machine:s390-ccw-virtio\n+ \"\"\"\n+ self.kernel_init()\n+ self.vm.add_args('-smp',\n+ '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')\n+ self.vm.launch()\n+ self.wait_until_booted()\n+\n+ self.check_topology(0, 0, 0, 0, 'medium', False)\n+ res = self.vm.qmp('set-cpu-topology',\n+ {'core-id': 0, 'socket-id': 2, 'entitlement': 'low'})\n+ self.assertEqual(res['return'], {})\n+ self.check_topology(0, 2, 0, 0, 'low', False)\n+\n+ def test_dash_device(self):\n+ \"\"\"\n+ This test verifies that a CPU defined with the '-device'\n+ command line option finds its right place inside the topology.\n+\n+ :avocado: tags=arch:s390x\n+ :avocado: tags=machine:s390-ccw-virtio\n+ \"\"\"\n+ self.kernel_init()\n+ self.vm.add_args('-smp',\n+ '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')\n+ self.vm.add_args('-device', 'max-s390x-cpu,core-id=10')\n+ self.vm.add_args('-device',\n+ 'max-s390x-cpu,'\n+ 'core-id=1,socket-id=0,book-id=1,drawer-id=1,entitlement=low')\n+ self.vm.add_args('-device',\n+ 'max-s390x-cpu,'\n+ 'core-id=2,socket-id=0,book-id=1,drawer-id=1,entitlement=medium')\n+ self.vm.add_args('-device',\n+ 'max-s390x-cpu,'\n+ 'core-id=3,socket-id=1,book-id=1,drawer-id=1,entitlement=high')\n+ self.vm.add_args('-device',\n+ 'max-s390x-cpu,'\n+ 'core-id=4,socket-id=1,book-id=1,drawer-id=1')\n+ self.vm.add_args('-device',\n+ 'max-s390x-cpu,'\n+ 'core-id=5,socket-id=2,book-id=1,drawer-id=1,dedicated=true')\n+\n+ self.vm.launch()\n+ self.wait_until_booted()\n+\n+ self.check_topology(10, 2, 1, 0, 'medium', False)\n+ self.check_topology(1, 0, 1, 1, 'low', False)\n+ self.check_topology(2, 0, 1, 1, 'medium', False)\n+ self.check_topology(3, 1, 1, 1, 'high', False)\n+ self.check_topology(4, 1, 1, 1, 'medium', False)\n+ self.check_topology(5, 2, 1, 1, 'high', True)\n", "prefixes": [ "PULL", "15/25" ] }