From nobody Tue Feb 10 00:59:12 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=1617185010; cv=none; d=zohomail.com; s=zohoarc; b=ETgtOd5gpaHAXisVzy2TtI4NCEwKWw/ThVtYWnOIyJ00+nPC7wVG0O1s4bSLQygyOdnSf7nmBgi8aMgAknaQXiq7cMNO+KYIzzfnRpwyZDWD8/OmgrWIyXbHODa2506iJm3PYmQ2PUeCwvxCWwHNTBXdbm2AJBIKHis86WE40KE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617185010; 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=O/MSzVeH1SLIXgsXkt5u0JGoKE6TLWEiGwub5jtCqOc=; b=SnLDXvWQXKuc4AzeGc46+693R4Ri+gF7fZ+TnRRVGzF+EWQDTN0uAtVAh1uwqFTgt8gTM5GJteR15qQUktcTpLvbYO4lCln303DnX4OslvrcsZqUs7NUWP+6GyN74SOgfCeVGfraAMdMsnDvCkjbz55O0vna0Zm2oWPH2Uw225o= 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 1617185010651938.7328976044869; Wed, 31 Mar 2021 03:03:30 -0700 (PDT) Received: from localhost ([::1]:53400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRXhB-00037X-Ds for importer@patchew.org; Wed, 31 Mar 2021 06:03:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRXYL-0002kv-Jy; Wed, 31 Mar 2021 05:54:21 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4838) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRXY9-0002Xt-9P; Wed, 31 Mar 2021 05:54:21 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4F9M6F6wfLz1BFy5; Wed, 31 Mar 2021 17:51:49 +0800 (CST) Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.498.0; Wed, 31 Mar 2021 17:53:48 +0800 From: Yanan Wang To: , Subject: [RFC PATCH 2/6] hw/core/machine: Parse cluster cpu topology in smp_parse() Date: Wed, 31 Mar 2021 17:53:39 +0800 Message-ID: <20210331095343.12172-3-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20210331095343.12172-1-wangyanan55@huawei.com> References: <20210331095343.12172-1-wangyanan55@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.128] 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.190; envelope-from=wangyanan55@huawei.com; helo=szxga04-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 , Peter Maydell , Andrew Jones , Eduardo Habkost , "Michael S . Tsirkin" , wanghaibin.wang@huawei.com, Richard Henderson , Yanan Wang , Shannon Zhao , Paolo Bonzini , yuzenghui@huawei.com, Igor Mammedov , zhukeqian1@huawei.com, Jiajie Li 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" Function smp_parse() in hw/core/machine.c is a generic/default function used for parsing the -smp command line. Since the new cluster parameter has been added in struct CpuTopology, we should parse this new parameter in the default function. In smp_parse(), the computing logic of missing values prefers sockets over cores over threads. And the value of clusters will be set as default 1 if not explictly specified, so that it will not impact the parsing results of machines that won't specify "clusters=3D" in -smp command line because they just don't support it. Signed-off-by: Yanan Wang --- hw/core/machine.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 970046f438..dd77ad183d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -720,33 +720,38 @@ static void smp_parse(MachineState *ms, QemuOpts *opt= s) if (opts) { unsigned cpus =3D qemu_opt_get_number(opts, "cpus", 0); unsigned sockets =3D qemu_opt_get_number(opts, "sockets", 0); + unsigned clusters =3D qemu_opt_get_number(opts, "clusters", 1); unsigned cores =3D qemu_opt_get_number(opts, "cores", 0); unsigned threads =3D qemu_opt_get_number(opts, "threads", 0); =20 - /* compute missing values, prefer sockets over cores over threads = */ + /* + * Compute missing values, prefer sockets over cores + * over threads. And the value of clusters has been + * set as default 1 if not explicitly specified. + */ if (cpus =3D=3D 0 || sockets =3D=3D 0) { cores =3D cores > 0 ? cores : 1; threads =3D threads > 0 ? threads : 1; if (cpus =3D=3D 0) { sockets =3D sockets > 0 ? sockets : 1; - cpus =3D cores * threads * sockets; + cpus =3D sockets * clusters * cores * threads; } else { ms->smp.max_cpus =3D qemu_opt_get_number(opts, "maxcpus", cpus); - sockets =3D ms->smp.max_cpus / (cores * threads); + sockets =3D ms->smp.max_cpus / (clusters * cores * threads= ); } } else if (cores =3D=3D 0) { threads =3D threads > 0 ? threads : 1; - cores =3D cpus / (sockets * threads); + cores =3D cpus / (sockets * clusters * threads); cores =3D cores > 0 ? cores : 1; } else if (threads =3D=3D 0) { - threads =3D cpus / (cores * sockets); + threads =3D cpus / (sockets * clusters * cores); threads =3D threads > 0 ? threads : 1; - } else if (sockets * cores * threads < cpus) { + } else 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 @@ -758,16 +763,17 @@ static void smp_parse(MachineState *ms, QemuOpts *opt= s) exit(1); } =20 - if (sockets * cores * threads !=3D ms->smp.max_cpus) { + if (sockets * clusters * cores * threads !=3D ms->smp.max_cpus) { error_report("Invalid CPU topology: " - "sockets (%u) * cores (%u) * threads (%u) " - "!=3D maxcpus (%u)", - sockets, cores, threads, + "sockets (%u) * clusters (%u) * cores (%u) * " + "threads (%u) !=3D maxcpus (%u)", + sockets, clusters, cores, threads, ms->smp.max_cpus); exit(1); } =20 ms->smp.cpus =3D cpus; + ms->smp.clusters =3D clusters; ms->smp.cores =3D cores; ms->smp.threads =3D threads; ms->smp.sockets =3D sockets; --=20 2.19.1