From patchwork Thu Feb 2 09:49:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13125637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67EA8C6379F for ; Thu, 2 Feb 2023 09:44:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNW7v-0006VC-NC; Thu, 02 Feb 2023 04:43:31 -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 1pNW7t-0006Uf-Fp for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:43:29 -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 1pNW7r-0006ND-NK for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:43:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675331007; x=1706867007; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DCitsdkqVqn+K7XTRwzMXR+GwDLS8VcH7odqeMqM8ig=; b=ggyx+NF5x/qepMc3Xf+SWTeaK4SE0C5R4IfFmLbSG5ff8+IBPZATZLkL aJaVXGJ6wHm/NMB9/Kj8rJjpBK7EmcHwU50lV9uncOSyKedw8XSPDm6gh lfTFmPohVujjDCKFN6grH+aNAmpo0n5TgkKB+uJ3MXub0mj3BASp1ki4H mevvc/uJYiRhTo+tfnC/SmJZDtSoQD3W6Nq/9z9EJ9oSsQikiw5kqn6HP KVJ6NKutoMPIi6mOw3mMBn9gSmiKoL2ECulzf2f8ypZCzNT1n0sreqL9i ZOW1voI4LwzTTLHwHRVMk1eosWN/t6mTudnFbGgkdrzq4mYSSdvwU7W96 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="316401981" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="316401981" 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:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="807909422" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="807909422" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.112]) by fmsmga001.fm.intel.com with ESMTP; 02 Feb 2023 01:42:11 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang , "Michael S . Tsirkin" , Richard Henderson , Paolo Bonzini Cc: qemu-devel@nongnu.org, Zhenyu Wang , Zhao Liu , Zhuocheng Ding Subject: [PATCH 06/18] i386: Introduce module-level cpu topology to CPUX86State Date: Thu, 2 Feb 2023 17:49:17 +0800 Message-Id: <20230202094929.343799-7-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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhuocheng Ding smp command has the "clusters" parameter but x86 hasn't supported that level. Though "clusters" was introduced to help define L2 cache topology [1], using cluster to define x86's L2 cache topology will cause the compatibility problem: Currently, x86 defaults that the L2 cache is shared in one core, which actually implies a default setting "cores per L2 cache is 1" and therefore implicitly defaults to having as many L2 caches as cores. For example (i386 PC machine): -smp 16,sockets=2,dies=2,cores=2,threads=2,maxcpus=16 (*) Considering the topology of the L2 cache, this (*) implicitly means "1 core per L2 cache" and "2 L2 caches per die". If we use cluster to configure L2 cache topology with the new default setting "clusters per L2 cache is 1", the above semantics will change to "2 cores per cluster" and "1 cluster per L2 cache", that is, "2 cores per L2 cache". So the same command (*) will cause changes in the L2 cache topology, further affecting the performance of the virtual machine. Therefore, x86 should only treat cluster as a cpu topology level and avoid using it to change L2 cache by default for compatibility. "cluster" in smp is the CPU topology level which is between "core" and die. For x86, the "cluster" in smp is corresponding to the module level [2], which is above the core level. So use the "module" other than "cluster" in i386 code. And please note that x86 already has a cpu topology level also named "cluster" [2], this level is at the upper level of the package. Here, the cluster in x86 cpu topology is completely different from the "clusters" as the smp parameter. After the module level is introduced, the cluster as the smp parameter will actually refer to the module level of x86. [1]: 0d87178 (hw/core/machine: Introduce CPU cluster topology support) [2]: SDM, vol.3, ch.9, 9.9.1 Hierarchical Mapping of Shared Resources. Signed-off-by: Zhuocheng Ding Co-developed-by: Zhao Liu Signed-off-by: Zhao Liu --- hw/i386/x86.c | 1 + target/i386/cpu.c | 1 + target/i386/cpu.h | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 78cc131926c8..66902d1c0923 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -305,6 +305,7 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, init_topo_info(&topo_info, x86ms); env->nr_dies = ms->smp.dies; + env->nr_modules = ms->smp.clusters; /* * If APIC ID is not set, diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 4cda84eb96f1..61ec9a7499b8 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6781,6 +6781,7 @@ static void x86_cpu_initfn(Object *obj) CPUX86State *env = &cpu->env; env->nr_dies = 1; + env->nr_modules = 1; cpu_set_cpustate_pointers(cpu); object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo", diff --git a/target/i386/cpu.h b/target/i386/cpu.h index d4bc19577a21..f3afea765982 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1810,7 +1810,13 @@ typedef struct CPUArchState { TPRAccess tpr_access_type; + /* Number of dies per package. */ unsigned nr_dies; + /* + * Number of modules per die. Module level in x86 cpu topology is + * corresponding to smp.clusters. + */ + unsigned nr_modules; } CPUX86State; struct kvm_msrs;