{"id":1850819,"url":"http://patchwork.ozlabs.org/api/patches/1850819/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-7-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-7-thuth@redhat.com>","list_archive_url":null,"date":"2023-10-18T13:06:57","name":"[PULL,06/25] s390x/cpu topology: resetting the Topology-Change-Report","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f3c631c42c2451be23420d60af14995b7a1c535e","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-7-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/1850819/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1850819/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=HnqGho13;\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 4S9WXC592sz20cx\n\tfor ; Thu, 19 Oct 2023 00:14:19 +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 1qt6Gs-00040Q-K0; Wed, 18 Oct 2023 09:07:34 -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 1qt6Gr-0003zI-Dr\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:33 -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 1qt6Gp-0007v0-OH\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:33 -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-637-N4hnUGrxNTeynE5ajvGnzA-1; Wed, 18 Oct 2023 09:07:29 -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 D8F7B88B773;\n Wed, 18 Oct 2023 13:07:28 +0000 (UTC)","from thuth-p1g4.redhat.com (unknown [10.39.192.109])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 8BB4C20268C8;\n Wed, 18 Oct 2023 13:07:27 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1697634451;\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=yXnLRhYT9uvJpjTT4NJn3SuRdytLVgdnTSs6R2ICfQM=;\n b=HnqGho13pH74dNzC7uEwR4VuCRtLg1MZ+Ijfi0Oc/gNX2WjWS93rwjd9UlKBt7sWFh52RA\n 49slz+lP5niRw79UsFDQZAKYzNmO8ra5EFG5RTe8a8SAnmGQb3HE7pjiABTzqwEYbuJ72a\n l08WEwmTmc92gi+cNmIVZj9pp90W+rw=","X-MC-Unique":"N4hnUGrxNTeynE5ajvGnzA-1","From":"Thomas Huth ","To":"qemu-devel@nongnu.org","Cc":"Stefan Hajnoczi , qemu-s390x@nongnu.org,\n Nina Schoetterl-Glausch ","Subject":"[PULL 06/25] s390x/cpu topology: resetting the Topology-Change-Report","Date":"Wed, 18 Oct 2023 15:06:57 +0200","Message-ID":"<20231018130716.286638-7-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":"","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\nDuring a subsystem reset the Topology-Change-Report is cleared\nby the machine.\nLet's ask KVM to clear the Modified Topology Change Report (MTCR)\nbit of the SCA in the case of a subsystem reset.\n\nSigned-off-by: Pierre Morel \nReviewed-by: Thomas Huth \nReviewed-by: Nina Schoetterl-Glausch \nCo-developed-by: Nina Schoetterl-Glausch \nSigned-off-by: Nina Schoetterl-Glausch \nMessage-ID: <20231016183925.2384704-7-nsg@linux.ibm.com>\nSigned-off-by: Thomas Huth \n---\n include/hw/s390x/cpu-topology.h | 1 +\n target/s390x/cpu.h | 1 +\n target/s390x/kvm/kvm_s390x.h | 1 +\n hw/s390x/cpu-topology.c | 11 +++++++++++\n hw/s390x/s390-virtio-ccw.c | 3 +++\n target/s390x/cpu-sysemu.c | 13 +++++++++++++\n target/s390x/kvm/kvm.c | 17 +++++++++++++++++\n 7 files changed, 47 insertions(+)","diff":"diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h\nindex f95d26d37c..e33e7c66df 100644\n--- a/include/hw/s390x/cpu-topology.h\n+++ b/include/hw/s390x/cpu-topology.h\n@@ -56,6 +56,7 @@ static inline void s390_topology_setup_cpu(MachineState *ms,\n #endif\n \n extern S390Topology s390_topology;\n+void s390_topology_reset(void);\n \n static inline int s390_std_socket(int n, CpuTopology *smp)\n {\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 09bff39fe4..40c5cedd0e 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -654,6 +654,7 @@ typedef struct SysIBCPUListEntry {\n QEMU_BUILD_BUG_ON(sizeof(SysIBCPUListEntry) != 16);\n \n void insert_stsi_15_1_x(S390CPU *cpu, int sel2, uint64_t addr, uint8_t ar, uintptr_t ra);\n+void s390_cpu_topology_set_changed(bool changed);\n \n /* MMU defines */\n #define ASCE_ORIGIN (~0xfffULL) /* segment table origin */\ndiff --git a/target/s390x/kvm/kvm_s390x.h b/target/s390x/kvm/kvm_s390x.h\nindex f9785564d0..649dae5948 100644\n--- a/target/s390x/kvm/kvm_s390x.h\n+++ b/target/s390x/kvm/kvm_s390x.h\n@@ -47,5 +47,6 @@ void kvm_s390_crypto_reset(void);\n void kvm_s390_restart_interrupt(S390CPU *cpu);\n void kvm_s390_stop_interrupt(S390CPU *cpu);\n void kvm_s390_set_diag318(CPUState *cs, uint64_t diag318_info);\n+int kvm_s390_topology_set_mtcr(uint64_t attr);\n \n #endif /* KVM_S390X_H */\ndiff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c\nindex 13168341b6..7ec9319272 100644\n--- a/hw/s390x/cpu-topology.c\n+++ b/hw/s390x/cpu-topology.c\n@@ -90,6 +90,17 @@ static void s390_topology_init(MachineState *ms)\n smp->books * smp->drawers);\n }\n \n+/**\n+ * s390_topology_reset:\n+ *\n+ * Generic reset for CPU topology, calls s390_topology_reset()\n+ * to reset the kernel Modified Topology Change Record.\n+ */\n+void s390_topology_reset(void)\n+{\n+ s390_cpu_topology_set_changed(false);\n+}\n+\n /**\n * s390_topology_cpu_default:\n * @cpu: pointer to a S390CPU\ndiff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 7fe2bce20c..6012165d41 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -124,6 +124,9 @@ static void subsystem_reset(void)\n device_cold_reset(dev);\n }\n }\n+ if (s390_has_topology()) {\n+ s390_topology_reset();\n+ }\n }\n \n static int virtio_ccw_hcall_notify(const uint64_t *args)\ndiff --git a/target/s390x/cpu-sysemu.c b/target/s390x/cpu-sysemu.c\nindex 8112561e5e..1cd30c1d84 100644\n--- a/target/s390x/cpu-sysemu.c\n+++ b/target/s390x/cpu-sysemu.c\n@@ -307,3 +307,16 @@ void s390_do_cpu_set_diag318(CPUState *cs, run_on_cpu_data arg)\n kvm_s390_set_diag318(cs, arg.host_ulong);\n }\n }\n+\n+void s390_cpu_topology_set_changed(bool changed)\n+{\n+ int ret;\n+\n+ if (kvm_enabled()) {\n+ ret = kvm_s390_topology_set_mtcr(changed);\n+ if (ret) {\n+ error_report(\"Failed to set Modified Topology Change Report: %s\",\n+ strerror(-ret));\n+ }\n+ }\n+}\ndiff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c\nindex 53d6300809..d6bda3a2a8 100644\n--- a/target/s390x/kvm/kvm.c\n+++ b/target/s390x/kvm/kvm.c\n@@ -2664,6 +2664,23 @@ int kvm_s390_get_zpci_op(void)\n return cap_zpci_op;\n }\n \n+int kvm_s390_topology_set_mtcr(uint64_t attr)\n+{\n+ struct kvm_device_attr attribute = {\n+ .group = KVM_S390_VM_CPU_TOPOLOGY,\n+ .attr = attr,\n+ };\n+\n+ if (!s390_has_feat(S390_FEAT_CONFIGURATION_TOPOLOGY)) {\n+ return 0;\n+ }\n+ if (!kvm_vm_check_attr(kvm_state, KVM_S390_VM_CPU_TOPOLOGY, attr)) {\n+ return -ENOTSUP;\n+ }\n+\n+ return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attribute);\n+}\n+\n void kvm_arch_accel_class_init(ObjectClass *oc)\n {\n }\n","prefixes":["PULL","06/25"]}