From nobody Mon Feb 9 19:53:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.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=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1711031275; cv=none; d=zohomail.com; s=zohoarc; b=mzrsEb9QdeqXENtoB40VZ9o3/HvYRXSeLR5N9g7vsfFgaEPKFFX/jh7Ew2psBS9BQVaRL8AqEqOgMxmeXVGOIhUmN+HKoPeeaWpqJM57tUu8LwXM5LVO6hxPnDXPNFEpqJR7FDOYY1KqISbH63mTJX730i39PkbGL/fLNYVNmVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711031275; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hf4Wuzt5VOyOhioEP5wsHK7JZ93qaeqXdeBJaeXWs3s=; b=LmdrmjCAIQTlOKNwbMa/kyld1Zhs+5uZZyISOBaNcHo69eo2VQot0QDFD8y7ynUEdVgwQJpCMh4qLtwfJp0VZ+RMdRlYLQZ/GQgXte+TU3Wg67zJLwA/FTyfs/M3FPPPlprTsRxImFsYG68NrzI18pHHWEpve8OuIiqcZyt3JVQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711031275726332.46367511687276; Thu, 21 Mar 2024 07:27:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnJOB-0007xJ-7c; Thu, 21 Mar 2024 10:27:27 -0400 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 1rnJO9-0007xA-SM for qemu-devel@nongnu.org; Thu, 21 Mar 2024 10:27:26 -0400 Received: from mgamail.intel.com ([198.175.65.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnJO8-0002mA-1I for qemu-devel@nongnu.org; Thu, 21 Mar 2024 10:27:25 -0400 Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2024 07:27:22 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa009.jf.intel.com with ESMTP; 21 Mar 2024 07:27:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711031245; x=1742567245; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lzFCM7hzDzVOEt2eiczVXmyNZngO0ts9zmWVhXGU1nY=; b=cBJNHaKOvszfQKG4VUM1Xg3+s3S7bc0UkJKkmJKYs51cBlij3qxRFwYr lM9RuRV7QWIeRpFUOG3cBXNTcp5PV6Gh62xaMiutIPopxtT3Y8AvEFC1j /+IBpsh3CnzJ/Sd6d6/d3Pi9rZoyVAHWcMcszbraIzfjBbmkJvwHx7Sx4 PsBhfYE3TgBRJMFo0dn8KJZuCmny54WQV03BvJFZ4css2CnRJ5FQZUDUu ayeR9n81zjj2mBoUZBQ0gnWU2Mkq1ADDthBYlD/CuPJ6p83c+Bvsvkq8S HWW0VxkvpEqv39cvZ8m8CahbwTY9BJkQoaEUcxAabZiEo2s3nk45yel+H g==; X-IronPort-AV: E=McAfee;i="6600,9927,11020"; a="9806371" X-IronPort-AV: E=Sophos;i="6.07,143,1708416000"; d="scan'208";a="9806371" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,143,1708416000"; d="scan'208";a="14527816" From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , "Michael S . Tsirkin" , Richard Henderson , Paolo Bonzini , Eric Blake , Markus Armbruster , Marcelo Tosatti , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Xiaoyao Li Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Zhenyu Wang , Zhuocheng Ding , Babu Moger , Yongwei Ma , Zhao Liu Subject: [PATCH v10 02/21] hw/core/machine: Support modules in -smp Date: Thu, 21 Mar 2024 22:40:29 +0800 Message-Id: <20240321144048.3699388-3-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240321144048.3699388-1-zhao1.liu@linux.intel.com> References: <20240321144048.3699388-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: none client-ip=198.175.65.15; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.372, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1711031277831100006 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Add "modules" parameter parsing support in -smp. Suggested-by: Xiaoyao Li Tested-by: Yongwei Ma Signed-off-by: Zhao Liu Tested-by: Babu Moger Acked-by: Markus Armbruster --- Changes since v9: * Rebased on the SMP changes about unsupported "parameter=3D1" configurations. (Philippe) * Fixed typo about topology field. (Dapeng) Changes since v8: * Added module description in qemu_smp_opts. Changes since v7: * New commit to introduce module level in -smp. --- hw/core/machine-smp.c | 39 +++++++++++++++++++++++++++++++++------ hw/core/machine.c | 1 + qapi/machine.json | 3 +++ system/vl.c | 3 +++ 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index 2e68fcfdfd79..2b93fa99c943 100644 --- a/hw/core/machine-smp.c +++ b/hw/core/machine-smp.c @@ -51,6 +51,10 @@ static char *cpu_hierarchy_to_string(MachineState *ms) g_string_append_printf(s, " * clusters (%u)", ms->smp.clusters); } =20 + if (mc->smp_props.modules_supported) { + g_string_append_printf(s, " * modules (%u)", ms->smp.modules); + } + g_string_append_printf(s, " * cores (%u)", ms->smp.cores); g_string_append_printf(s, " * threads (%u)", ms->smp.threads); =20 @@ -88,6 +92,7 @@ void machine_parse_smp_config(MachineState *ms, unsigned sockets =3D config->has_sockets ? config->sockets : 0; unsigned dies =3D config->has_dies ? config->dies : 0; unsigned clusters =3D config->has_clusters ? config->clusters : 0; + unsigned modules =3D config->has_modules ? config->modules : 0; unsigned cores =3D config->has_cores ? config->cores : 0; unsigned threads =3D config->has_threads ? config->threads : 0; unsigned maxcpus =3D config->has_maxcpus ? config->maxcpus : 0; @@ -103,6 +108,7 @@ void machine_parse_smp_config(MachineState *ms, (config->has_sockets && config->sockets =3D=3D 0) || (config->has_dies && config->dies =3D=3D 0) || (config->has_clusters && config->clusters =3D=3D 0) || + (config->has_modules && config->modules =3D=3D 0) || (config->has_cores && config->cores =3D=3D 0) || (config->has_threads && config->threads =3D=3D 0) || (config->has_maxcpus && config->maxcpus =3D=3D 0)) { @@ -115,6 +121,20 @@ void machine_parse_smp_config(MachineState *ms, * If not supported by the machine, a topology parameter must be * omitted. */ + if (!mc->smp_props.modules_supported && config->has_modules) { + if (config->modules > 1) { + error_setg(errp, "modules not supported by this " + "machine's CPU topology"); + return; + } else { + /* Here modules only equals 1 since we've checked zero case. */ + warn_report("Deprecated CPU topology (considered invalid): " + "Unsupported modules parameter mustn't be " + "specified as 1"); + } + } + modules =3D modules > 0 ? modules : 1; + if (!mc->smp_props.clusters_supported && config->has_clusters) { if (config->clusters > 1) { error_setg(errp, "clusters not supported by this " @@ -185,11 +205,13 @@ void machine_parse_smp_config(MachineState *ms, cores =3D cores > 0 ? cores : 1; threads =3D threads > 0 ? threads : 1; sockets =3D maxcpus / - (drawers * books * dies * clusters * cores * thr= eads); + (drawers * books * dies * clusters * + modules * cores * threads); } else if (cores =3D=3D 0) { threads =3D threads > 0 ? threads : 1; cores =3D maxcpus / - (drawers * books * sockets * dies * clusters * thr= eads); + (drawers * books * sockets * dies * + clusters * modules * threads); } } else { /* prefer cores over sockets since 6.2 */ @@ -197,22 +219,26 @@ void machine_parse_smp_config(MachineState *ms, sockets =3D sockets > 0 ? sockets : 1; threads =3D threads > 0 ? threads : 1; cores =3D maxcpus / - (drawers * books * sockets * dies * clusters * thr= eads); + (drawers * books * sockets * dies * + clusters * modules * threads); } else if (sockets =3D=3D 0) { threads =3D threads > 0 ? threads : 1; sockets =3D maxcpus / - (drawers * books * dies * clusters * cores * thr= eads); + (drawers * books * dies * clusters * + modules * cores * threads); } } =20 /* try to calculate omitted threads at last */ if (threads =3D=3D 0) { threads =3D maxcpus / - (drawers * books * sockets * dies * clusters * cores= ); + (drawers * books * sockets * dies * + clusters * modules * cores); } } =20 - total_cpus =3D drawers * books * sockets * dies * clusters * cores * t= hreads; + total_cpus =3D drawers * books * sockets * dies * + clusters * modules * cores * threads; maxcpus =3D maxcpus > 0 ? maxcpus : total_cpus; cpus =3D cpus > 0 ? cpus : maxcpus; =20 @@ -222,6 +248,7 @@ void machine_parse_smp_config(MachineState *ms, ms->smp.sockets =3D sockets; ms->smp.dies =3D dies; ms->smp.clusters =3D clusters; + ms->smp.modules =3D modules; ms->smp.cores =3D cores; ms->smp.threads =3D threads; ms->smp.max_cpus =3D maxcpus; diff --git a/hw/core/machine.c b/hw/core/machine.c index fe0579b7a7e9..9ff5170f8e31 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -878,6 +878,7 @@ static void machine_get_smp(Object *obj, Visitor *v, co= nst char *name, .has_sockets =3D true, .sockets =3D ms->smp.sockets, .has_dies =3D true, .dies =3D ms->smp.dies, .has_clusters =3D true, .clusters =3D ms->smp.clusters, + .has_modules =3D true, .modules =3D ms->smp.modules, .has_cores =3D true, .cores =3D ms->smp.cores, .has_threads =3D true, .threads =3D ms->smp.threads, .has_maxcpus =3D true, .maxcpus =3D ms->smp.max_cpus, diff --git a/qapi/machine.json b/qapi/machine.json index 0840c91e70ec..3f6a5af10ba8 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1635,6 +1635,8 @@ # # @clusters: number of clusters per parent container (since 7.0) # +# @modules: number of modules per parent container (since 9.1) +# # @cores: number of cores per parent container # # @threads: number of threads per core @@ -1648,6 +1650,7 @@ '*sockets': 'int', '*dies': 'int', '*clusters': 'int', + '*modules': 'int', '*cores': 'int', '*threads': 'int', '*maxcpus': 'int' } } diff --git a/system/vl.c b/system/vl.c index c64422298245..7756eac81e48 100644 --- a/system/vl.c +++ b/system/vl.c @@ -741,6 +741,9 @@ static QemuOptsList qemu_smp_opts =3D { }, { .name =3D "clusters", .type =3D QEMU_OPT_NUMBER, + }, { + .name =3D "modules", + .type =3D QEMU_OPT_NUMBER, }, { .name =3D "cores", .type =3D QEMU_OPT_NUMBER, --=20 2.34.1