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 X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6A93C433ED for ; Tue, 18 May 2021 08:22:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5B9C86109E for ; Tue, 18 May 2021 08:22:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B9C86109E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liuzT-0005FR-7P for qemu-devel@archiver.kernel.org; Tue, 18 May 2021 04:22:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liuxO-0003vz-QD for qemu-devel@nongnu.org; Tue, 18 May 2021 04:20:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liuxL-0000Lt-Ou for qemu-devel@nongnu.org; Tue, 18 May 2021 04:20:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621325998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3JRVJcvPn+Ioya9we+Wwf0CUOqiqWvoOEgqsBdEscYc=; b=CF6Vciv1+teGpS++nt5LQlTom3LCbR2aoH4XX6kz9wULa9cv53ivvya0mR6n2sg0woM+BD 42LvtEo0c1A2IV8smlZW04Bn7nhwESYrAJGvUCKsU5stDn2OjYxir+HS8J5WjQE4AKRrGb wcnZenNhbtzeoC6CFVa5M5zWEOzzQk4= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-jyyYPhv3NfGT20Nao57kNw-1; Tue, 18 May 2021 04:19:56 -0400 X-MC-Unique: jyyYPhv3NfGT20Nao57kNw-1 Received: by mail-ej1-f72.google.com with SMTP id sd18-20020a170906ce32b02903cedf584542so2071531ejb.9 for ; Tue, 18 May 2021 01:19:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=3JRVJcvPn+Ioya9we+Wwf0CUOqiqWvoOEgqsBdEscYc=; b=O3brZ2eHqxWw4apr326aHLSn0ZA/QH3IkGFFLZ3mCPczlIdRl1m1TUcFf4zotckRZI Jfttl0MaAqskN8VyZbjGM6LOAElXrrISHNbtt8hQrfMlV1H7St1ZR8SRolwkGtgAVy8e z14fZOAS6oY1a34S5dH4mkMUDxCs8ZBffyMzrTQv7B4cNSCtoCLjbvcjStTQ3BKK3PVI /8zxdLbhfhMQEyhXpK+19JKd791cXKw5l41mtXN6adUAC318m+2dq8djEG2JET8dFezz AkwJuDL2krU8Mfir08d3JYjCWQYTvnl7Rwejjq7yFnaJLdCuumUlPYNbgnrujm0xWzRG E31Q== X-Gm-Message-State: AOAM5327GMLsUNOt3em9gGsJe32MOhQ7yi0lpX5NtMc2CdJpHCHwSRDy b6q8Eucds3gAvFV0YC3Ly/nEfyyFYgyNN/4eUrlcSCJ39FBMoS9YREWzUdDXURQ3i88yrgobWx6 7BZqPDoVKRa04mvk= X-Received: by 2002:a17:906:dcb:: with SMTP id p11mr4859154eji.117.1621325995779; Tue, 18 May 2021 01:19:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj8TG0oWjKQQ5fgTmS2sUbDZs52ip8mLQWz3gb4/NqQ/fvrG+3QLITNWKUUQP5QEEMhxd69Q== X-Received: by 2002:a17:906:dcb:: with SMTP id p11mr4859117eji.117.1621325995407; Tue, 18 May 2021 01:19:55 -0700 (PDT) Received: from gator.home (cst2-174-132.cust.vodafone.cz. [31.30.174.132]) by smtp.gmail.com with ESMTPSA id ck4sm12488275edb.56.2021.05.18.01.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 01:19:55 -0700 (PDT) Date: Tue, 18 May 2021 10:19:53 +0200 From: Andrew Jones To: "wangyanan (Y)" Subject: Re: [RFC PATCH v3 4/4] hw/arm/virt: Parse -smp cluster parameter in virt_smp_parse Message-ID: <20210518081953.5dn4rhs3o45yasj3@gator.home> References: <20210516103228.37792-1-wangyanan55@huawei.com> <20210516103228.37792-5-wangyanan55@huawei.com> <01351414c3424710bf3dc5eb949f0d75@huawei.com> <3f6756a9-409e-f273-a6be-8cff57a7cfff@huawei.com> MIME-Version: 1.0 In-Reply-To: <3f6756a9-409e-f273-a6be-8cff57a7cfff@huawei.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=drjones@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Barry Song , Peter Maydell , Salil Mehta , "Michael S . Tsirkin" , wanghaibin.wang@huawei.com, zhukeqian1@huawei.com, qemu-devel@nongnu.org, yangyicong@huawei.com, Shannon Zhao , qemu-arm@nongnu.org, prime.zeng@hisilicon.com, Paolo Bonzini , yuzenghui@huawei.com, Igor Mammedov , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, May 18, 2021 at 11:48:34AM +0800, wangyanan (Y) wrote: > Hi Salil, > > On 2021/5/17 23:17, Salil Mehta wrote: > > > From: Qemu-devel > > > [mailto:qemu-devel-bounces+salil.mehta=huawei.com@nongnu.org] On Behalf Of > > > Yanan Wang > > > Sent: Sunday, May 16, 2021 11:32 AM > > > To: Peter Maydell ; Paolo Bonzini > > > ; Andrew Jones ; Michael S . Tsirkin > > > ; Igor Mammedov ; Shannon Zhao > > > ; qemu-devel@nongnu.org; qemu-arm@nongnu.org > > > Cc: Song Bao Hua (Barry Song) ; Philippe > > > Mathieu-Daudé ; wangyanan (Y) ; > > > Zengtao (B) ; Wanghaibin (D) > > > ; yuzenghui ; yangyicong > > > ; zhukeqian > > > Subject: [RFC PATCH v3 4/4] hw/arm/virt: Parse -smp cluster parameter in > > > virt_smp_parse > > > > > > There is a separate function virt_smp_parse() in hw/virt/arm.c used > > > to parse cpu topology for the ARM machines. So add parsing of -smp > > > cluster parameter in it, then total number of logical cpus will be > > > calculated like: max_cpus = sockets * clusters * cores * threads. > > > > > > Note, we will assume multi-cluster in one socket is not supported > > > and default the value of clusters to 1, if it's not explicitly > > > specified in -smp cmdline. > > > > > > Signed-off-by: Yanan Wang > > > --- > > > hw/arm/virt.c | 32 ++++++++++++++++++-------------- > > > 1 file changed, 18 insertions(+), 14 deletions(-) > > > > > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > > index 7de822e491..678d5ef36c 100644 > > > --- a/hw/arm/virt.c > > > +++ b/hw/arm/virt.c > > > @@ -2642,8 +2642,8 @@ static int virt_kvm_type(MachineState *ms, const char > > > *type_str) > > > * with the -smp cmdlines when parsing them. > > > * > > > * We require that at least one of cpus or maxcpus must be provided. > > > - * Threads will default to 1 if not provided. Sockets and cores must > > > - * be either both provided or both not. > > > + * Clusters and threads will default to 1 if they are not provided. > > > + * Sockets and cores must be either both provided or both not. > > > * > > > * Note, if neither sockets nor cores are specified, we will calculate > > > * all the missing values just like smp_parse() does, but will disable > > > @@ -2652,15 +2652,18 @@ static int virt_kvm_type(MachineState *ms, const char > > > *type_str) > > > static void virt_smp_parse(MachineState *ms, QemuOpts *opts) > > > { > > > VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(ms); > > > + VirtMachineState *vms = VIRT_MACHINE(ms); > > > > > > if (opts) { > > > unsigned cpus = qemu_opt_get_number(opts, "cpus", 0); > > > unsigned maxcpus = qemu_opt_get_number(opts, "maxcpus", 0); > > > unsigned sockets = qemu_opt_get_number(opts, "sockets", 0); > > > + unsigned clusters = qemu_opt_get_number(opts, "clusters", 0); > > > unsigned cores = qemu_opt_get_number(opts, "cores", 0); > > > unsigned threads = qemu_opt_get_number(opts, "threads", 0); > > > > > > - /* Default threads to 1 if not provided */ > > > + /* Default clusters and threads to 1 if not provided */ > > > + clusters = clusters > 0 ? clusters : 1; > > > threads = threads > 0 ? threads : 1; > > > > > > if (cpus == 0 && maxcpus == 0) { > > > @@ -2676,13 +2679,13 @@ static void virt_smp_parse(MachineState *ms, QemuOpts > > > *opts) > > > cores = 1; > > > if (cpus == 0) { > > > sockets = 1; > > > - cpus = sockets * cores * threads; > > > + cpus = sockets * clusters * cores * threads; > > > } else { > > > maxcpus = maxcpus > 0 ? maxcpus : cpus; > > > - sockets = maxcpus / (cores * threads); > > > + sockets = maxcpus / (clusters * cores * threads); > > > } > > > } else if (sockets > 0 && cores > 0) { > > > - cpus = cpus > 0 ? cpus : sockets * cores * threads; > > > + cpus = cpus > 0 ? cpus : sockets * clusters * cores * threads; > > > maxcpus = maxcpus > 0 ? maxcpus : cpus; > > > } else { > > > error_report("sockets and cores must be both provided " > > > @@ -2695,25 +2698,26 @@ static void virt_smp_parse(MachineState *ms, QemuOpts > > > *opts) > > > exit(1); > > > } > > > > > > - if (sockets * cores * threads < cpus) { > > > + if (sockets * clusters * cores * threads < cpus) { > > > error_report("cpu topology: " > > > - "sockets (%u) * cores (%u) * threads (%u) < " > > > - "smp_cpus (%u)", > > > - sockets, cores, threads, cpus); > > > + "sockets (%u) * clusters (%u) * cores (%u) * " > > > + "threads (%u) < smp_cpus (%u)", > > > + sockets, clusters, cores, threads, cpus); > > > exit(1); > > > } > > > > > > - if (sockets * cores * threads != maxcpus) { > > > + if (sockets * clusters * cores * threads != maxcpus) { > > > error_report("cpu topology: " > > > - "sockets (%u) * cores (%u) * threads (%u) " > > > - "!= maxcpus (%u)", > > > - sockets, cores, threads, maxcpus); > > > + "sockets (%u) * clusters (%u) * cores (%u) * " > > > + "threads (%u) != maxcpus (%u)", > > > + sockets, clusters, cores, threads, maxcpus); > > > exit(1); > > > } > > > > > > ms->smp.cpus = cpus; > > > ms->smp.max_cpus = maxcpus; > > > ms->smp.sockets = sockets; > > > + vms->smp_clusters = clusters; > > > > This variable naming *smp_clusters* looks out-of-sorts. I thought a similar > > variable *smp_cpus* was destined to be removed for the reason given in below > > link - a patch by Andrew Jones? > > > > Link: https://lists.gnu.org/archive/html/qemu-arm/2020-12/msg00418.html > > > > Am I missing anything here? > The smp_clusters is added in VirtMachineState and nowhere else because > it's currently only used for ARM. But I think maybe I should also move it to > CpuTopology structure like [1] is doing to move dies to CpuTopology. Yes, please do that. Thanks, drew > > Move clusters to CpuTopology won't affect other architectures that don't > support it yet, and will also make it easy if they want to in the future. > > [1] From Paolo: > https://patchwork.kernel.org/project/qemu-devel/patch/20210513162901.1310239-10-pbonzini@redhat.com/ > > Thanks, > Yanan > > Salil. > > > > > ms->smp.cores = cores; > > > ms->smp.threads = threads; > > > } > > . >