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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12D45ECAAA1 for ; Thu, 27 Oct 2022 11:27:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234721AbiJ0L1Q (ORCPT ); Thu, 27 Oct 2022 07:27:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234043AbiJ0L1P (ORCPT ); Thu, 27 Oct 2022 07:27:15 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43277D73D2 for ; Thu, 27 Oct 2022 04:27:14 -0700 (PDT) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29RAj0ds000302; Thu, 27 Oct 2022 11:27:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=tH/Y3ccWV58Ne4I7NI1QWcbYOo2VJJlqfPRJxEExBrc=; b=dGV3x92wyMXCvTnYR35Zt3oBUYMxFggRQgqc9ekp6oyvsUcZ1kQ5WdNZ83lWiSwElCeh DEbjmMuwEGDqGJmEiJK7Tb4pNL1LXelncLv2lBjoWwV4y4DywvWyaNimv1qC8dY5IQrg pXY4dCj61jXStVHTxbIQG+XZH+kcyaOiNr3fCdoaZS94AVJQTwrqsAsnrFIV5e33i/ng wfsluQB20KuZEg5gT1RnEDymZ5D3fI/Zyb66YMinOoh+eBgjf9kk9+/Jz2o5vqZ8oIhy GGGscB4O5TTatZHDEAhGOdSJQCezKStB9GLPZSEM3c175I/0jOcKOidZtuAIgXa72MGs 3A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kfrgsh81n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Oct 2022 11:27:01 +0000 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 29RAjWLJ002179; Thu, 27 Oct 2022 11:27:01 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kfrgsh80v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Oct 2022 11:27:00 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 29RBL3j6000615; Thu, 27 Oct 2022 11:26:58 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma03ams.nl.ibm.com with ESMTP id 3kfahqhw06-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Oct 2022 11:26:58 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 29RBQtoe63373598 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Oct 2022 11:26:55 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6A7E8A405B; Thu, 27 Oct 2022 11:26:55 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7B2C5A4054; Thu, 27 Oct 2022 11:26:54 +0000 (GMT) Received: from [9.179.10.218] (unknown [9.179.10.218]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 27 Oct 2022 11:26:54 +0000 (GMT) Message-ID: <443be3c8-0da8-8b6c-0067-59ff19b0bc4e@linux.ibm.com> Date: Thu, 27 Oct 2022 13:26:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: [PATCH v10 3/9] s390x/cpu_topology: resetting the Topology-Change-Report Content-Language: en-US To: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Thomas Huth , qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, borntraeger@de.ibm.com, pasic@linux.ibm.com, richard.henderson@linaro.org, david@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 References: <20221012162107.91734-1-pmorel@linux.ibm.com> <20221012162107.91734-4-pmorel@linux.ibm.com> <450544bf-4ff0-9d72-f57c-4274692916a5@redhat.com> <77d52b82-aa44-ed79-2345-1b3c3a15fb7d@linux.ibm.com> From: Pierre Morel In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: GgsuIxG674P1NmpHQqEW9OF6Qdty-yHs X-Proofpoint-GUID: fpnwRWn2NNrzDvtou7l-VaBz35q5M15_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-27_05,2022-10-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 clxscore=1015 mlxscore=0 bulkscore=0 lowpriorityscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2210270061 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 10/27/22 11:58, Cédric Le Goater wrote: > On 10/27/22 11:11, Pierre Morel wrote: >> >> >> On 10/27/22 10:14, Thomas Huth wrote: >>> On 12/10/2022 18.21, Pierre Morel wrote: >>>> During a subsystem reset the Topology-Change-Report is cleared >>>> by the machine. >>>> Let's ask KVM to clear the Modified Topology Change Report (MTCR) >>>>   bit of the SCA in the case of a subsystem reset. >>>> >>>> Signed-off-by: Pierre Morel >>>> Reviewed-by: Nico Boehr >>>> Reviewed-by: Janis Schoetterl-Glausch >>>> --- >>>>   target/s390x/cpu.h           |  1 + >>>>   target/s390x/kvm/kvm_s390x.h |  1 + >>>>   hw/s390x/cpu-topology.c      | 12 ++++++++++++ >>>>   hw/s390x/s390-virtio-ccw.c   |  1 + >>>>   target/s390x/cpu-sysemu.c    |  7 +++++++ >>>>   target/s390x/kvm/kvm.c       | 23 +++++++++++++++++++++++ >>>>   6 files changed, 45 insertions(+) >>>> >>>> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h >>>> index d604aa9c78..9b35795ac8 100644 >>>> --- a/target/s390x/cpu.h >>>> +++ b/target/s390x/cpu.h >>>> @@ -825,6 +825,7 @@ void s390_enable_css_support(S390CPU *cpu); >>>>   void s390_do_cpu_set_diag318(CPUState *cs, run_on_cpu_data arg); >>>>   int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t >>>> sch_id, >>>>                                   int vq, bool assign); >>>> +void s390_cpu_topology_reset(void); >>>>   #ifndef CONFIG_USER_ONLY >>>>   unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu); >>>>   #else >>>> diff --git a/target/s390x/kvm/kvm_s390x.h >>>> b/target/s390x/kvm/kvm_s390x.h >>>> index aaae8570de..a13c8fb9a3 100644 >>>> --- a/target/s390x/kvm/kvm_s390x.h >>>> +++ b/target/s390x/kvm/kvm_s390x.h >>>> @@ -46,5 +46,6 @@ void kvm_s390_crypto_reset(void); >>>>   void kvm_s390_restart_interrupt(S390CPU *cpu); >>>>   void kvm_s390_stop_interrupt(S390CPU *cpu); >>>>   void kvm_s390_set_diag318(CPUState *cs, uint64_t diag318_info); >>>> +int kvm_s390_topology_set_mtcr(uint64_t attr); >>>>   #endif /* KVM_S390X_H */ >>>> diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c >>>> index c73cebfe6f..9f202621d0 100644 >>>> --- a/hw/s390x/cpu-topology.c >>>> +++ b/hw/s390x/cpu-topology.c >>>> @@ -107,6 +107,17 @@ static void s390_topology_realize(DeviceState >>>> *dev, Error **errp) >>>>       qemu_mutex_init(&topo->topo_mutex); >>>>   } >>>> +/** >>>> + * s390_topology_reset: >>>> + * @dev: the device >>>> + * >>>> + * Calls the sysemu topology reset >>>> + */ >>>> +static void s390_topology_reset(DeviceState *dev) >>>> +{ >>>> +    s390_cpu_topology_reset(); >>>> +} >>>> + >>>>   /** >>>>    * topology_class_init: >>>>    * @oc: Object class >>>> @@ -120,6 +131,7 @@ static void topology_class_init(ObjectClass *oc, >>>> void *data) >>>>       dc->realize = s390_topology_realize; >>>>       set_bit(DEVICE_CATEGORY_MISC, dc->categories); >>>> +    dc->reset = s390_topology_reset; >>>>   } >>>>   static const TypeInfo cpu_topology_info = { >>>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >>>> index aa99a62e42..362378454a 100644 >>>> --- a/hw/s390x/s390-virtio-ccw.c >>>> +++ b/hw/s390x/s390-virtio-ccw.c >>>> @@ -113,6 +113,7 @@ static const char *const reset_dev_types[] = { >>>>       "s390-flic", >>>>       "diag288", >>>>       TYPE_S390_PCI_HOST_BRIDGE, >>>> +    TYPE_S390_CPU_TOPOLOGY, >>>>   }; >>>>   static void subsystem_reset(void) >>>> diff --git a/target/s390x/cpu-sysemu.c b/target/s390x/cpu-sysemu.c >>>> index 948e4bd3e0..707c0b658c 100644 >>>> --- a/target/s390x/cpu-sysemu.c >>>> +++ b/target/s390x/cpu-sysemu.c >>>> @@ -306,3 +306,10 @@ void s390_do_cpu_set_diag318(CPUState *cs, >>>> run_on_cpu_data arg) >>>>           kvm_s390_set_diag318(cs, arg.host_ulong); >>>>       } >>>>   } >>>> + >>>> +void s390_cpu_topology_reset(void) >>>> +{ >>>> +    if (kvm_enabled()) { >>>> +        kvm_s390_topology_set_mtcr(0); >>>> +    } >>>> +} >>>> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c >>>> index f96630440b..9c994d27d5 100644 >>>> --- a/target/s390x/kvm/kvm.c >>>> +++ b/target/s390x/kvm/kvm.c >>>> @@ -2585,3 +2585,26 @@ int kvm_s390_get_zpci_op(void) >>>>   { >>>>       return cap_zpci_op; >>>>   } >>>> + >>>> +int kvm_s390_topology_set_mtcr(uint64_t attr) >>>> +{ >>>> +    struct kvm_device_attr attribute = { >>>> +        .group = KVM_S390_VM_CPU_TOPOLOGY, >>>> +        .attr  = attr, >>>> +    }; >>>> +    int ret; >>>> + >>>> +    if (!s390_has_feat(S390_FEAT_CONFIGURATION_TOPOLOGY)) { >>>> +        return -EFAULT; >>> >>> EFAULT is something that indicates a bad address (e.g. a segmentation >>> fault) ... so this definitely sounds like a bad choice for an error >>> code here. >> >> Hum, yes, ENODEV seems besser no? > > -ENOTSUP would be 'meilleur' may be ?  :) yes better :) thanks, Pierre -- Pierre Morel IBM Lab Boeblingen