From nobody Tue May 13 12:19:09 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1675331170; cv=none; d=zohomail.com; s=zohoarc; b=C0ZYjvgGhE5qkgsth4pFtVPPqWYtsuKR5QwpEzHwgo4TBUwx0kQxLz8tEnjab0Cu9otGxWRAxyZP5DGLqyFjflCqVHZuUIjTSOSFQVE7hBxsCi/xhZNutjSZuVHdDFXqTXWVqCNxOriQefPRKbTEf6Eh9b7ZSwmqjVsYUV13DOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675331170; h=Content-Transfer-Encoding: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=k4LsNaJkTxbUS8FlRxTzA+A6gju65LTMX5/7BcRsyIg=; b=RwLNQfDnl7UC2B7tlbog3V2uOTCZ4ZPQOCxT8I72jDmcjL7RpbmONRA97mF/votfcnPknoHmDQtH7TcYbwzSWwXBGvIXr+NmefZn2Ba7SgwTTpFT3IeJ4F6eH3EFZXtd0cZvj3QOrEuljl1gq93VhHMXknL/cWdormwBVo1KJzk= 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+importer2=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 1675331170268294.39986391098057; Thu, 2 Feb 2023 01:46:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNW7z-0006Wu-Pz; Thu, 02 Feb 2023 04:43:35 -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 1pNW7y-0006WD-14 for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:43:34 -0500 Received: from mga02.intel.com ([134.134.136.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNW7v-0006Of-W5 for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:43:33 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2023 01:42:25 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.112]) by fmsmga001.fm.intel.com with ESMTP; 02 Feb 2023 01:42:22 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675331012; x=1706867012; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G8q2/m/wa4oJLtonC6t0auIGMsEQYicks7r+eWN7KzE=; b=JDamSPZVAJIkgPUcfoyN4BseZjlC6yldRO5LwYl+zmR0xowD33zufSuG 91gdayNCuwghUWBUc22emb4SrVZjZzcm7fdLou+EyZkC6BSiLLnGzwzOb ZGSzpURZ6dRijsimm5xnmAYXFKwmPHfwi0KsKyXKYd9Rba3sUvFBBXrF4 pz6Qssufa4MDtalVjL1IPvdBkRiJO8quEQJYpRgc8ce70lDSrBEgQ6HNe nfumqetIZdBppjNxjnw+D5YbOs65sNpPRqWWg8CbA1hwpNXjrtnw3/Lyu kM7U5SZwfZPSOQDLCyecP7I6MIkYXuA8pDNz1KGv39hD4n9V4FOuHZzcf Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="316402044" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="316402044" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="807909458" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="807909458" 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 Cc: qemu-devel@nongnu.org, Zhenyu Wang , Zhao Liu , Zhuocheng Ding Subject: [PATCH 10/18] i386: Update APIC ID parsing rule to support module level Date: Thu, 2 Feb 2023 17:49:21 +0800 Message-Id: <20230202094929.343799-11-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202094929.343799-1-zhao1.liu@linux.intel.com> References: <20230202094929.343799-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=134.134.136.20; envelope-from=zhao1.liu@linux.intel.com; helo=mga02.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1675331171472100005 Content-Type: text/plain; charset="utf-8" From: Zhuocheng Ding Add the module level parsing support for APIC ID. With this support, now the conversion between X86CPUTopoIDs, X86CPUTopoInfo and APIC ID is completed. Signed-off-by: Zhuocheng Ding Co-developed-by: Zhao Liu Signed-off-by: Zhao Liu --- hw/i386/x86.c | 19 ++++++++----------- include/hw/i386/topology.h | 36 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index b66719230d57..68fce87d18ac 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -310,11 +310,11 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, =20 /* * If APIC ID is not set, - * set it based on socket/die/core/thread properties. + * set it based on socket/die/cluster/core/thread properties. */ if (cpu->apic_id =3D=3D UNASSIGNED_APIC_ID) { - int max_socket =3D (ms->smp.max_cpus - 1) / - smp_threads / smp_cores / ms->smp.dies; + int max_socket =3D (ms->smp.max_cpus - 1) / smp_threads / smp_core= s / + ms->smp.clusters / ms->smp.dies; =20 /* * die-id was optional in QEMU 4.0 and older, so keep it optional @@ -378,15 +378,12 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, =20 x86_topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids); =20 - /* - * TODO: Before APIC ID supports module level parsing, there's no = need - * to expose module_id info. - */ error_setg(errp, - "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with" - " APIC ID %" PRIu32 ", valid index range 0:%d", - topo_ids.pkg_id, topo_ids.die_id, topo_ids.core_id, topo_ids.s= mt_id, - cpu->apic_id, ms->possible_cpus->len - 1); + "Invalid CPU [socket: %u, die: %u, module: %u, core: %u, threa= d: %u]" + " with APIC ID %" PRIu32 ", valid index range 0:%d", + topo_ids.pkg_id, topo_ids.die_id, topo_ids.module_id, + topo_ids.core_id, topo_ids.smt_id, cpu->apic_id, + ms->possible_cpus->len - 1); return; } =20 diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h index 5de905dc00d3..3cec97b377f2 100644 --- a/include/hw/i386/topology.h +++ b/include/hw/i386/topology.h @@ -79,12 +79,13 @@ static inline unsigned apicid_smt_width(X86CPUTopoInfo = *topo_info) /* Bit width of the Core_ID field */ static inline unsigned apicid_core_width(X86CPUTopoInfo *topo_info) { - /* - * TODO: Will separate module info from core_width when update - * APIC ID with module level. - */ - return apicid_bitwidth_for_count(topo_info->cores_per_module * - topo_info->modules_per_die); + return apicid_bitwidth_for_count(topo_info->cores_per_module); +} + +/* Bit width of the Module_ID (cluster ID) field */ +static inline unsigned apicid_module_width(X86CPUTopoInfo *topo_info) +{ + return apicid_bitwidth_for_count(topo_info->modules_per_die); } =20 /* Bit width of the Die_ID field */ @@ -99,10 +100,16 @@ static inline unsigned apicid_core_offset(X86CPUTopoIn= fo *topo_info) return apicid_smt_width(topo_info); } =20 +/* Bit offset of the Module_ID (cluster ID) field */ +static inline unsigned apicid_module_offset(X86CPUTopoInfo *topo_info) +{ + return apicid_core_offset(topo_info) + apicid_core_width(topo_info); +} + /* Bit offset of the Die_ID field */ static inline unsigned apicid_die_offset(X86CPUTopoInfo *topo_info) { - return apicid_core_offset(topo_info) + apicid_core_width(topo_info); + return apicid_module_offset(topo_info) + apicid_module_width(topo_info= ); } =20 /* Bit offset of the Pkg_ID (socket ID) field */ @@ -121,6 +128,7 @@ static inline apic_id_t x86_apicid_from_topo_ids(X86CPU= TopoInfo *topo_info, { return (topo_ids->pkg_id << apicid_pkg_offset(topo_info)) | (topo_ids->die_id << apicid_die_offset(topo_info)) | + (topo_ids->module_id << apicid_module_offset(topo_info)) | (topo_ids->core_id << apicid_core_offset(topo_info)) | topo_ids->smt_id; } @@ -138,11 +146,6 @@ static inline void x86_topo_ids_from_idx(X86CPUTopoInf= o *topo_info, unsigned nr_cores =3D topo_info->cores_per_module; unsigned nr_threads =3D topo_info->threads_per_core; =20 - /* - * Currently smp for i386 doesn't support "clusters", modules_per_die = is - * only 1. Therefore, the module_id generated from the module topology= will - * not conflict with the module_id generated according to the apicid. - */ topo_ids->pkg_id =3D cpu_index / (nr_dies * nr_modules * nr_cores * nr_threads); topo_ids->die_id =3D cpu_index / (nr_modules * nr_cores * @@ -166,12 +169,9 @@ static inline void x86_topo_ids_from_apicid(apic_id_t = apicid, topo_ids->core_id =3D (apicid >> apicid_core_offset(topo_info)) & ~(0xFFFFFFFFUL << apicid_core_width(topo_info)); - /* - * TODO: This is the temporary initialization for topo_ids.module_id to - * avoid "maybe-uninitialized" compilation errors. Will remove when AP= IC - * ID supports module level parsing. - */ - topo_ids->module_id =3D 0; + topo_ids->module_id =3D + (apicid >> apicid_module_offset(topo_info)) & + ~(0xFFFFFFFFUL << apicid_module_width(topo_info)); topo_ids->die_id =3D (apicid >> apicid_die_offset(topo_info)) & ~(0xFFFFFFFFUL << apicid_die_width(topo_info)); --=20 2.34.1