From nobody Tue Nov 26 08:53:34 2024 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=1709029361; cv=none; d=zohomail.com; s=zohoarc; b=FJB1+7bGSqeYycQgXTGWWC68xnU4/i2hu47B0K6UQRT6MdGhSq97lubsIsAY74cOi5BY4+EwQ1dXm9FaDMXR0ZEiEFbGoL2pxQgjUzpL16vnKRz/vYebvMrz5dbH1GwVtWbBxyJJZz22yta+7cpMvtD6CzeyXFrV1Xy1sX5BlsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709029361; 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=YGAe26Mo7fL1nTd0DWA9Ei4eC+jzScWiVhFRVkISOOQ=; b=kwq9Lz9vUWqdwI96ZqAlB9ZtQ0uGaKYeg/DLsZ1jv8HnbMu6LXDqoay9z4aRELgrdlNE2ugDQ6YB26UXPhW6eydevRSOeIcITzHjxCkRulyHM9F6u3/cSXMcHtDR/+D0JERap3kNXTm86riMzMhYzzBXdQgZDO26+oDY76pVj2Y= 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 1709029361074107.20790215802708; Tue, 27 Feb 2024 02:22:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1reuYN-00048e-6a; Tue, 27 Feb 2024 05:19:15 -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 1reuYK-000483-C6 for qemu-devel@nongnu.org; Tue, 27 Feb 2024 05:19:12 -0500 Received: from mgamail.intel.com ([192.198.163.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reuYH-00035V-Ai for qemu-devel@nongnu.org; Tue, 27 Feb 2024 05:19:10 -0500 Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2024 02:19:05 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmviesa010.fm.intel.com with ESMTP; 27 Feb 2024 02:19:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709029149; x=1740565149; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Xku42uCayJRLnOt7qcUXXyKok9VmJXSFyxjGiCeSzZY=; b=FhMIzJQoXeDxe/wsHIaB59mmeKBtCrp03vhdqZvWyJR7Baih6H94TZw7 Jzau0D67fTCUqsrFdXmBqzqNkrf3+oAcGZfthgWyEJnWNY3AHr3V8yHjG 7gETavjunE5jC2ge+kn0zXfIQO1VvzVcTEB4s7iHFGRCPPaK9g6YKbV29 DtH8J0P29PbAHjVU/4PtfJ+kuS/ckKvZcbOYHe/3GDPzcdIzeuAxon/eL 9giiYMHhParQ0G9HdkwLbgIKEvZklRf1tlOZ9GN/TUPBJIHRoDJpV6om7 y6Lw+yO0XL+k/agEpFo+uRjNHtmjlekB3GbD0U+XNGEkCytHIalmMcJdS w==; X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="6310213" X-IronPort-AV: E=Sophos;i="6.06,187,1705392000"; d="scan'208";a="6310213" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,187,1705392000"; d="scan'208";a="6954751" 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 v9 02/21] hw/core/machine: Support modules in -smp Date: Tue, 27 Feb 2024 18:32:12 +0800 Message-Id: <20240227103231.1556302-3-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240227103231.1556302-1-zhao1.liu@linux.intel.com> References: <20240227103231.1556302-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=192.198.163.13; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.014, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1709029363155100005 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 Acked-by: Markus Armbruster --- Changes since v8: * Add 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, 36 insertions(+), 10 deletions(-) diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index a0a30da59aa4..8a8296b0d05b 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.clusters); + } + 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; @@ -102,6 +107,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)) { @@ -117,12 +123,12 @@ void machine_parse_smp_config(MachineState *ms, error_setg(errp, "dies not supported by this machine's CPU topolog= y"); return; } + dies =3D dies > 0 ? dies : 1; + if (!mc->smp_props.clusters_supported && clusters > 1) { error_setg(errp, "clusters not supported by this machine's CPU top= ology"); return; } - - dies =3D dies > 0 ? dies : 1; clusters =3D clusters > 0 ? clusters : 1; =20 if (!mc->smp_props.books_supported && books > 1) { @@ -138,6 +144,13 @@ void machine_parse_smp_config(MachineState *ms, } drawers =3D drawers > 0 ? drawers : 1; =20 + if (!mc->smp_props.modules_supported && modules > 1) { + error_setg(errp, "modules not supported by this " + "machine's CPU topology"); + return; + } + modules =3D modules > 0 ? modules : 1; + /* compute missing values based on the provided ones */ if (cpus =3D=3D 0 && maxcpus =3D=3D 0) { sockets =3D sockets > 0 ? sockets : 1; @@ -152,11 +165,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 */ @@ -164,23 +179,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 maxcpus =3D maxcpus > 0 ? maxcpus : drawers * books * sockets * dies * - clusters * cores * threads; + clusters * modules * cores * threads; cpus =3D cpus > 0 ? cpus : maxcpus; =20 ms->smp.cpus =3D cpus; @@ -189,6 +207,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; @@ -196,8 +215,8 @@ void machine_parse_smp_config(MachineState *ms, mc->smp_props.has_clusters =3D config->has_clusters; =20 /* sanity-check of the computed topology */ - if (drawers * books * sockets * dies * clusters * cores * threads !=3D - maxcpus) { + if (drawers * books * sockets * dies * clusters * modules * cores * + threads !=3D maxcpus) { g_autofree char *topo_msg =3D cpu_hierarchy_to_string(ms); error_setg(errp, "Invalid CPU topology: " "product of the hierarchy must match maxcpus: " diff --git a/hw/core/machine.c b/hw/core/machine.c index 36fe3a4806f2..030b7e250ac5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -872,6 +872,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 93b46772869e..5233a8947556 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1640,6 +1640,8 @@ # # @clusters: number of clusters per parent container (since 7.0) # +# @modules: number of modules per parent container (since 9.0) +# # @cores: number of cores per parent container # # @threads: number of threads per core @@ -1653,6 +1655,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 b8469d9965da..15ff95b89b57 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