{"id":1850798,"url":"http://patchwork.ozlabs.org/api/patches/1850798/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-10-thuth@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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-10-thuth@redhat.com>","list_archive_url":null,"date":"2023-10-18T13:07:00","name":"[PULL,09/25] qapi/s390x/cpu topology: set-cpu-topology qmp command","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d98436c6ff81180aeac83a5903a13e6208b1b236","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/?format=json","name":"Thomas Huth","email":"thuth@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-10-thuth@redhat.com/mbox/","series":[{"id":378180,"url":"http://patchwork.ozlabs.org/api/series/378180/?format=json","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/1850798/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1850798/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=SloOeSwJ;\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 4S9WPm6RxQz20Zj\n\tfor ; Thu, 19 Oct 2023 00:08:44 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1qt6H9-0004Sw-Cy; Wed, 18 Oct 2023 09:07:54 -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 ) id 1qt6H5-0004Lm-VX\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:48 -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 ) id 1qt6H4-0007yt-2H\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:47 -0400","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-103-BrfbAu2qNoOCX6d3mYgEgw-1; Wed, 18 Oct 2023 09:07:34 -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 249791DD35D5;\n Wed, 18 Oct 2023 13:07:34 +0000 (UTC)","from thuth-p1g4.redhat.com (unknown [10.39.192.109])\n by smtp.corp.redhat.com (Postfix) with ESMTP id E921E20268C8;\n Wed, 18 Oct 2023 13:07:32 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1697634465;\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=TppKG0m+yq0DBZlEnNTstB5ilmksDEBfnyvEfeJZYWE=;\n b=SloOeSwJVxYIDc6Z73P9u6+6C77VdKgGmGYFBVv9hRWRRNUHEc+3MHYT/5NMn61Fn68R2N\n 9j3sFEzH8C6LCkMJ17gFzC2h+77JbS8dFuLDFpDOQMIpJmHR50bKXYYdWiOteY4/tg8hjd\n KdQXUfYaPC/mWa0xtyjCjdhx4eEuoTU=","X-MC-Unique":"BrfbAu2qNoOCX6d3mYgEgw-1","From":"Thomas Huth ","To":"qemu-devel@nongnu.org","Cc":"Stefan Hajnoczi , qemu-s390x@nongnu.org,\n Nina Schoetterl-Glausch ","Subject":"[PULL 09/25] qapi/s390x/cpu topology: set-cpu-topology qmp command","Date":"Wed, 18 Oct 2023 15:07:00 +0200","Message-ID":"<20231018130716.286638-10-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=unavailable 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","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 \n\nThe modification of the CPU attributes are done through a monitor\ncommand.\n\nIt allows to move the core inside the topology tree to optimize\nthe cache usage in the case the host's hypervisor previously\nmoved the CPU.\n\nThe same command allows to modify the CPU attributes modifiers\nlike polarization entitlement and the dedicated attribute to notify\nthe guest if the host admin modified scheduling or dedication of a vCPU.\n\nWith this knowledge the guest has the possibility to optimize the\nusage of the vCPUs.\n\nThe command has a feature unstable for the moment.\n\nSigned-off-by: Pierre Morel \nReviewed-by: Nina Schoetterl-Glausch \nCo-developed-by: Nina Schoetterl-Glausch \nReviewed-by: Thomas Huth \nSigned-off-by: Nina Schoetterl-Glausch \nAcked-by: Markus Armbruster \nMessage-ID: <20231016183925.2384704-10-nsg@linux.ibm.com>\nSigned-off-by: Thomas Huth \n---\n qapi/machine-target.json | 42 +++++++++++++\n hw/s390x/cpu-topology.c | 132 +++++++++++++++++++++++++++++++++++++++\n 2 files changed, 174 insertions(+)","diff":"diff --git a/qapi/machine-target.json b/qapi/machine-target.json\nindex 93cbf1c128..7688f32ffa 100644\n--- a/qapi/machine-target.json\n+++ b/qapi/machine-target.json\n@@ -4,6 +4,8 @@\n # This work is licensed under the terms of the GNU GPL, version 2 or later.\n # See the COPYING file in the top-level directory.\n \n+{ 'include': 'machine-common.json' }\n+\n ##\n # @CpuModelInfo:\n #\n@@ -375,3 +377,43 @@\n 'data': [ 'horizontal', 'vertical' ],\n 'if': 'TARGET_S390X'\n }\n+\n+##\n+# @set-cpu-topology:\n+#\n+# Modify the topology by moving the CPU inside the topology tree,\n+# or by changing a modifier attribute of a CPU.\n+# Absent values will not be modified.\n+#\n+# @core-id: the vCPU ID to be moved\n+#\n+# @socket-id: destination socket to move the vCPU to\n+#\n+# @book-id: destination book to move the vCPU to\n+#\n+# @drawer-id: destination drawer to move the vCPU to\n+#\n+# @entitlement: entitlement to set\n+#\n+# @dedicated: whether the provisioning of real to virtual CPU is dedicated\n+#\n+# Features:\n+#\n+# @unstable: This command is experimental.\n+#\n+# Returns: Nothing on success.\n+#\n+# Since: 8.2\n+##\n+{ 'command': 'set-cpu-topology',\n+ 'data': {\n+ 'core-id': 'uint16',\n+ '*socket-id': 'uint16',\n+ '*book-id': 'uint16',\n+ '*drawer-id': 'uint16',\n+ '*entitlement': 'CpuS390Entitlement',\n+ '*dedicated': 'bool'\n+ },\n+ 'features': [ 'unstable' ],\n+ 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] }\n+}\ndiff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c\nindex 4e4c35f6da..f3771f5045 100644\n--- a/hw/s390x/cpu-topology.c\n+++ b/hw/s390x/cpu-topology.c\n@@ -23,6 +23,7 @@\n #include \"target/s390x/cpu.h\"\n #include \"hw/s390x/s390-virtio-ccw.h\"\n #include \"hw/s390x/cpu-topology.h\"\n+#include \"qapi/qapi-commands-machine-target.h\"\n \n /*\n * s390_topology is used to keep the topology information.\n@@ -257,6 +258,29 @@ static bool s390_topology_check(uint16_t socket_id, uint16_t book_id,\n return true;\n }\n \n+/**\n+ * s390_topology_need_report\n+ * @cpu: Current cpu\n+ * @drawer_id: future drawer ID\n+ * @book_id: future book ID\n+ * @socket_id: future socket ID\n+ * @entitlement: future entitlement\n+ * @dedicated: future dedicated\n+ *\n+ * A modified topology change report is needed if the topology\n+ * tree or the topology attributes change.\n+ */\n+static bool s390_topology_need_report(S390CPU *cpu, int drawer_id,\n+ int book_id, int socket_id,\n+ uint16_t entitlement, bool dedicated)\n+{\n+ return cpu->env.drawer_id != drawer_id ||\n+ cpu->env.book_id != book_id ||\n+ cpu->env.socket_id != socket_id ||\n+ cpu->env.entitlement != entitlement ||\n+ cpu->env.dedicated != dedicated;\n+}\n+\n /**\n * s390_update_cpu_props:\n * @ms: the machine state\n@@ -325,3 +349,111 @@ void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp)\n /* topology tree is reflected in props */\n s390_update_cpu_props(ms, cpu);\n }\n+\n+static void s390_change_topology(uint16_t core_id,\n+ bool has_socket_id, uint16_t socket_id,\n+ bool has_book_id, uint16_t book_id,\n+ bool has_drawer_id, uint16_t drawer_id,\n+ bool has_entitlement,\n+ CpuS390Entitlement entitlement,\n+ bool has_dedicated, bool dedicated,\n+ Error **errp)\n+{\n+ MachineState *ms = current_machine;\n+ int old_socket_entry;\n+ int new_socket_entry;\n+ bool report_needed;\n+ S390CPU *cpu;\n+\n+ cpu = s390_cpu_addr2state(core_id);\n+ if (!cpu) {\n+ error_setg(errp, \"Core-id %d does not exist!\", core_id);\n+ return;\n+ }\n+\n+ /* Get attributes not provided from cpu and verify the new topology */\n+ if (!has_socket_id) {\n+ socket_id = cpu->env.socket_id;\n+ }\n+ if (!has_book_id) {\n+ book_id = cpu->env.book_id;\n+ }\n+ if (!has_drawer_id) {\n+ drawer_id = cpu->env.drawer_id;\n+ }\n+ if (!has_dedicated) {\n+ dedicated = cpu->env.dedicated;\n+ }\n+\n+ /*\n+ * When the user specifies the entitlement as 'auto' on the command line,\n+ * QEMU will set the entitlement as:\n+ * Medium when the CPU is not dedicated.\n+ * High when dedicated is true.\n+ */\n+ if (!has_entitlement || entitlement == S390_CPU_ENTITLEMENT_AUTO) {\n+ if (dedicated) {\n+ entitlement = S390_CPU_ENTITLEMENT_HIGH;\n+ } else {\n+ entitlement = S390_CPU_ENTITLEMENT_MEDIUM;\n+ }\n+ }\n+\n+ if (!s390_topology_check(socket_id, book_id, drawer_id,\n+ entitlement, dedicated, errp)) {\n+ return;\n+ }\n+\n+ /* Check for space on new socket */\n+ old_socket_entry = s390_socket_nb(cpu);\n+ new_socket_entry = s390_socket_nb_from_ids(drawer_id, book_id, socket_id);\n+\n+ if (new_socket_entry != old_socket_entry) {\n+ if (s390_topology.cores_per_socket[new_socket_entry] >=\n+ ms->smp.cores) {\n+ error_setg(errp, \"No more space on this socket\");\n+ return;\n+ }\n+ /* Update the count of cores in sockets */\n+ s390_topology.cores_per_socket[new_socket_entry] += 1;\n+ s390_topology.cores_per_socket[old_socket_entry] -= 1;\n+ }\n+\n+ /* Check if we will need to report the modified topology */\n+ report_needed = s390_topology_need_report(cpu, drawer_id, book_id,\n+ socket_id, entitlement,\n+ dedicated);\n+\n+ /* All checks done, report new topology into the vCPU */\n+ cpu->env.drawer_id = drawer_id;\n+ cpu->env.book_id = book_id;\n+ cpu->env.socket_id = socket_id;\n+ cpu->env.dedicated = dedicated;\n+ cpu->env.entitlement = entitlement;\n+\n+ /* topology tree is reflected in props */\n+ s390_update_cpu_props(ms, cpu);\n+\n+ /* Advertise the topology change */\n+ if (report_needed) {\n+ s390_cpu_topology_set_changed(true);\n+ }\n+}\n+\n+void qmp_set_cpu_topology(uint16_t core,\n+ bool has_socket, uint16_t socket,\n+ bool has_book, uint16_t book,\n+ bool has_drawer, uint16_t drawer,\n+ bool has_entitlement, CpuS390Entitlement entitlement,\n+ bool has_dedicated, bool dedicated,\n+ Error **errp)\n+{\n+ if (!s390_has_topology()) {\n+ error_setg(errp, \"This machine doesn't support topology\");\n+ return;\n+ }\n+\n+ s390_change_topology(core, has_socket, socket, has_book, book,\n+ has_drawer, drawer, has_entitlement, entitlement,\n+ has_dedicated, dedicated, errp);\n+}\n","prefixes":["PULL","09/25"]}