From nobody Mon Feb 9 22:04:24 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1621161589; cv=none; d=zohomail.com; s=zohoarc; b=ktp3D3vTd5PjIErCQxgmIYhjRQA3THw9U2nO2X9L2pw8EJ7X8tH1FBGaP3BYjaRj1ysfBqLFcQ2TDuk5GL6JFy5Z2Y2cNh9y5+hTJ8W0aNb7t7/BMOn0mXFeQg8I6wwhEHVYPFg4txIeA5erh7mj6+kyHw8lwWeJmupd6cWGaME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621161589; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hWpKCe5vYm2JIAsM8sYXfIqeIIH2gDVKLyWZSBTFNRs=; b=KY6anPu05Xm67jfiVP1qda3umHGX2Pnxlybs/fCXp4IH5/ZY5FOkr/iVqAVmHSHNcJCfG12pSovLg2s7iGHjzArOErKF0NIgkwW7G9vk4I6kiQseg8mONnK5HpcCduc6t3eORKVqa6w54JWAU3sxd5i3dhu0m0/zVh8Y56WS7UE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162116158981978.33342145929339; Sun, 16 May 2021 03:39:49 -0700 (PDT) Received: from localhost ([::1]:54492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liEBY-0006zC-OI for importer@patchew.org; Sun, 16 May 2021 06:39:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liE4i-0008Vv-4V; Sun, 16 May 2021 06:32:44 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liE4c-0000nH-K0; Sun, 16 May 2021 06:32:43 -0400 Received: from dggems702-chm.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Fjdmw4fdfzmVkX; Sun, 16 May 2021 18:29:52 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggems702-chm.china.huawei.com (10.3.19.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Sun, 16 May 2021 18:32:35 +0800 Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Sun, 16 May 2021 18:32:35 +0800 From: Yanan Wang To: Peter Maydell , Paolo Bonzini , Andrew Jones , "Michael S . Tsirkin" , Igor Mammedov , Shannon Zhao , , Subject: [RFC PATCH v3 4/4] hw/arm/virt: Parse -smp cluster parameter in virt_smp_parse Date: Sun, 16 May 2021 18:32:28 +0800 Message-ID: <20210516103228.37792-5-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20210516103228.37792-1-wangyanan55@huawei.com> References: <20210516103228.37792-1-wangyanan55@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=wangyanan55@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , prime.zeng@hisilicon.com, wanghaibin.wang@huawei.com, yuzenghui@huawei.com, yangyicong@huawei.com, zhukeqian1@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D 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 ch= ar *type_str) static void virt_smp_parse(MachineState *ms, QemuOpts *opts) { VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(ms); + VirtMachineState *vms =3D VIRT_MACHINE(ms); =20 if (opts) { unsigned cpus =3D qemu_opt_get_number(opts, "cpus", 0); unsigned maxcpus =3D qemu_opt_get_number(opts, "maxcpus", 0); unsigned sockets =3D qemu_opt_get_number(opts, "sockets", 0); + unsigned clusters =3D qemu_opt_get_number(opts, "clusters", 0); unsigned cores =3D qemu_opt_get_number(opts, "cores", 0); unsigned threads =3D qemu_opt_get_number(opts, "threads", 0); =20 - /* Default threads to 1 if not provided */ + /* Default clusters and threads to 1 if not provided */ + clusters =3D clusters > 0 ? clusters : 1; threads =3D threads > 0 ? threads : 1; =20 if (cpus =3D=3D 0 && maxcpus =3D=3D 0) { @@ -2676,13 +2679,13 @@ static void virt_smp_parse(MachineState *ms, QemuOp= ts *opts) cores =3D 1; if (cpus =3D=3D 0) { sockets =3D 1; - cpus =3D sockets * cores * threads; + cpus =3D sockets * clusters * cores * threads; } else { maxcpus =3D maxcpus > 0 ? maxcpus : cpus; - sockets =3D maxcpus / (cores * threads); + sockets =3D maxcpus / (clusters * cores * threads); } } else if (sockets > 0 && cores > 0) { - cpus =3D cpus > 0 ? cpus : sockets * cores * threads; + cpus =3D cpus > 0 ? cpus : sockets * clusters * cores * thread= s; maxcpus =3D 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, QemuOp= ts *opts) exit(1); } =20 - 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); } =20 - if (sockets * cores * threads !=3D maxcpus) { + if (sockets * clusters * cores * threads !=3D maxcpus) { error_report("cpu topology: " - "sockets (%u) * cores (%u) * threads (%u) " - "!=3D maxcpus (%u)", - sockets, cores, threads, maxcpus); + "sockets (%u) * clusters (%u) * cores (%u) * " + "threads (%u) !=3D maxcpus (%u)", + sockets, clusters, cores, threads, maxcpus); exit(1); } =20 ms->smp.cpus =3D cpus; ms->smp.max_cpus =3D maxcpus; ms->smp.sockets =3D sockets; + vms->smp_clusters =3D clusters; ms->smp.cores =3D cores; ms->smp.threads =3D threads; } --=20 2.19.1