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 B52CCC05027 for ; Fri, 3 Feb 2023 14:41:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNxFE-0003zD-Ow; Fri, 03 Feb 2023 09:40:52 -0500 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 1pNxFD-0003xI-7i; Fri, 03 Feb 2023 09:40:51 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNxFB-0000nQ-3p; Fri, 03 Feb 2023 09:40:50 -0500 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 313Dg1IA031324; Fri, 3 Feb 2023 14:40:38 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=rR5EitcEJ67N1aIWfIHundVXybReQBBNv8h3jMMJ+xc=; b=FAhUrBZ65Lik3h7HfSfB4d+FuWkNI9vL549t/VACN/RirGFwbsnwi1nHlvFPXVSdt/jF +oZPbRVBxEfwtVbi1YtkoBWLNrYaM+Sw6nkdB08hhM3nAbo5dwxu3gUC2qg0H3GLmwkS OPfBsH/9N/0SZOiKDtH45Dhvx5M1oCRwS90MZuq0oVWMgCrtFCZuWYnCrrmeKhg+PCSO JtmB0b077/vn8Iw2kh865YYfbDHW7/y+GE+3C7Jrmr97/dYbULdFqvYCVGySOTK2sGgS 0nfWvPMYm3VVlvUoLZKOqXC02RPgcTAq9KAMbSKKV8gLu+iq0B4/RZc/dnEpxJ0bvOcr yQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nh3cm1np4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Feb 2023 14:40:38 +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 313EABq7001348; Fri, 3 Feb 2023 14:40:37 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nh3cm1nmw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Feb 2023 14:40:37 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3137p9id014675; Fri, 3 Feb 2023 14:40:35 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3ncvttyh63-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Feb 2023 14:40:34 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 313EeVAg47972738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Feb 2023 14:40:31 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 650AE20043; Fri, 3 Feb 2023 14:40:31 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EADB120040; Fri, 3 Feb 2023 14:40:29 +0000 (GMT) Received: from [9.171.57.15] (unknown [9.171.57.15]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 3 Feb 2023 14:40:29 +0000 (GMT) Message-ID: <5ad1cc6a-5d2d-57fc-f082-ec6f843c877e@linux.ibm.com> Date: Fri, 3 Feb 2023 15:40:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH v15 02/11] s390x/cpu topology: add topology entries on CPU hotplug 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: <20230201132051.126868-1-pmorel@linux.ibm.com> <20230201132051.126868-3-pmorel@linux.ibm.com> <6345131acfb04e353ca2eba620bf27609bfeb535.camel@linux.ibm.com> <45bb29fcb3629a857577e50378adab1f5598644e.camel@linux.ibm.com> From: Pierre Morel In-Reply-To: <45bb29fcb3629a857577e50378adab1f5598644e.camel@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: huOAq1nggo9el_54z4_vk1_UfzsjKLTZ X-Proofpoint-GUID: sYSBRxqBGkhzGE9EuRKm2XbvViLrcReb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-03_13,2023-02-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 mlxlogscore=999 priorityscore=1501 bulkscore=0 malwarescore=0 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302030134 Received-SPF: pass client-ip=148.163.156.1; envelope-from=pmorel@linux.ibm.com; helo=mx0a-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.09, 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: , 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 2/3/23 14:22, Nina Schoetterl-Glausch wrote: > On Fri, 2023-02-03 at 10:21 +0100, Pierre Morel wrote: >> >> On 2/2/23 17:42, Nina Schoetterl-Glausch wrote: >>> On Wed, 2023-02-01 at 14:20 +0100, Pierre Morel wrote: >>>> The topology information are attributes of the CPU and are >>>> specified during the CPU device creation. >>>> >>>> On hot plug we: >>>> - calculate the default values for the topology for drawers, >>>> books and sockets in the case they are not specified. >>>> - verify the CPU attributes >>>> - check that we have still room on the desired socket >>>> >>>> The possibility to insert a CPU in a mask is dependent on the >>>> number of cores allowed in a socket, a book or a drawer, the >>>> checking is done during the hot plug of the CPU to have an >>>> immediate answer. >>>> >>>> If the complete topology is not specified, the core is added >>>> in the physical topology based on its core ID and it gets >>>> defaults values for the modifier attributes. >>>> >>>> This way, starting QEMU without specifying the topology can >>>> still get some advantage of the CPU topology. >>>> >>>> Signed-off-by: Pierre Morel >>>> --- >>>> include/hw/s390x/cpu-topology.h | 24 +++ >>>> hw/s390x/cpu-topology.c | 256 ++++++++++++++++++++++++++++++++ >>>> hw/s390x/s390-virtio-ccw.c | 23 ++- >>>> hw/s390x/meson.build | 1 + >>>> 4 files changed, 302 insertions(+), 2 deletions(-) >>>> create mode 100644 hw/s390x/cpu-topology.c >>>> > [...] >>> >>>> +/** >>>> + * s390_set_core_in_socket: >>>> + * @cpu: the new S390CPU to insert in the topology structure >>>> + * @drawer_id: new drawer_id >>>> + * @book_id: new book_id >>>> + * @socket_id: new socket_id >>>> + * @creation: if is true the CPU is a new CPU and there is no old socket >>>> + * to handle. >>>> + * if is false, this is a moving the CPU and old socket count >>>> + * must be decremented. >>>> + * @errp: the error pointer >>>> + * >>>> + */ >>>> +static void s390_set_core_in_socket(S390CPU *cpu, int drawer_id, int book_id, >>> >>> Maybe name it s390_(topology_)?add_core_to_socket instead. >> >> OK, it is better >> >>> >>>> + int socket_id, bool creation, Error **errp) >>>> +{ >>>> + int old_socket = s390_socket_nb(cpu); >>>> + int new_socket; >>>> + >>>> + if (creation) { >>>> + new_socket = old_socket; >>>> + } else { >>> >>> You need parentheses here. >>> >>>> + new_socket = drawer_id * s390_topology.smp->books + >>> ( >>>> + book_id * s390_topology.smp->sockets + >>> ) >>>> + socket_id; >> >> If you prefer I can us parentheses. > > It's necessary, otherwise the multiplication of book_id and smp->sockets takes precedence. >> >> Right, I did not understand where you want the parenthesis. I think you mean: new_socket = (drawer_id * s390_topology.smp->books + book_id) * s390_topology.smp->sockets + socket_id; thanks, Regards, Pierre -- Pierre Morel IBM Lab Boeblingen