From nobody Mon Nov 25 02:28:00 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1718807298; cv=none; d=zohomail.com; s=zohoarc; b=WtiWN23Z7yjrNft4r8SIjadox4M6mJo/QVhNQJjQ5xpX2i79VzFxWgKO6uEub9yzEZ1ZcdGsyN6CSh+zOCZcQN6Hkdpc6M6spLwblHKEtYY789DuDuXpvfK60P4MMSD+F4b59VfC0YOWT19+r+ez50YeTNkN9r8H0mSwwaX7VpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718807298; 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=atwrMXRFB8o4Mvo+HXgTjbf5j6o3GMzp50PJlaxnhs4=; b=a40k9l9jGO6OZQYLX5/oao/OpuK9p/HO52b+z0W0IDZTffPM0QrBMaEYKs8mOxNp4PPEYuOnbtDOspgUMaGVKYrN8YMLHP7W0txx6mR1CwIqh+3g2rmA4NPK5S5lh/meosSbH8mtW3qvpAmCVEi6dT9uMP65rzq7YKP3e/a5QY8= 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 1718807298619574.9027233110587; Wed, 19 Jun 2024 07:28:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJwHK-0004gM-69; Wed, 19 Jun 2024 10:27:14 -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 1sJwHD-0004eZ-MT for qemu-devel@nongnu.org; Wed, 19 Jun 2024 10:27:08 -0400 Received: from mgamail.intel.com ([192.198.163.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJwHB-00021I-E8 for qemu-devel@nongnu.org; Wed, 19 Jun 2024 10:27:07 -0400 Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2024 07:27:02 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by fmviesa007.fm.intel.com with ESMTP; 19 Jun 2024 07:27:01 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718807225; x=1750343225; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dW4JZqyv2HQnY1oRhM4turAV/HChrJd/xE6wbSSCvpA=; b=erNcAOUWXOKfhfWT/XuIunwPDT/1ramGlw52f9bv8bBWeWTxERzPaEfS CZ/vj9h+3tgF6CwUZ821NHoCmRzA8x8tEphX2eEUp8gc/42+wvy+xia1q L0IBr2OilpCO5SPXak9Dc3wfw8GL6xLxxL0GrUSRFsG2Eogd06OXL7pJo QEDRW8fjEGYQvQWYPwdz79QXcYVUNoUhKGbXryWh9kTt6dmnVCDMJ2eV/ zV+5eT92S+X58/mrJe8lmFIkizTLgW8A+nXErhr8p5xVqft22atTFP15b dilfEnGXk1dJJuZ+656jSNaPZklVEADqBnHSUFOHtUiDM32/LnEoEaIT/ g==; X-CSE-ConnectionGUID: Dc88kBqURQaecDq2ZscSnQ== X-CSE-MsgGUID: BMmn2lEmTmOInZKgvaZIbw== X-IronPort-AV: E=McAfee;i="6700,10204,11108"; a="15462618" X-IronPort-AV: E=Sophos;i="6.08,250,1712646000"; d="scan'208";a="15462618" X-CSE-ConnectionGUID: wZbUsAKbT5eNfILqs6JKuw== X-CSE-MsgGUID: lKzIdo7DQSCfFYAMvFcXxg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,250,1712646000"; d="scan'208";a="41788945" From: Zhao Liu To: Paolo Bonzini , Igor Mammedov Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 2/3] target/i386/cpu: Check guest_thread_ids_per_pkg for host-cache-info case Date: Wed, 19 Jun 2024 22:42:14 +0800 Message-Id: <20240619144215.3273989-3-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240619144215.3273989-1-zhao1.liu@intel.com> References: <20240619144215.3273989-1-zhao1.liu@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: pass client-ip=192.198.163.18; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-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: 1718807300050100001 Content-Type: text/plain; charset="utf-8" The CPUID[4].EAX[bits 25:14] encodes the "maximum number of addressable IDs for logical processors", which value may be different with the actual number of threads. For example, there's a Guest with the topology like: 3 threads per core and 3 cores per package. Its maximum ids for package level is 15 (0xf), but it has 9 threads per package. Therefore, using "threads_per_pkg" to check sharing threads overflow (out of package scope) is not sufficient. Use Guest's maximum ids for package level information to compare with Host's. Note the original check is stricter, but it can be mathematically proven that the original check does not contain redundant case (e.g. guest_thread_ids_per_pkg >=3D host_thread_ids_per_cache > threads_per_pkg, which is impossible for the current QEMU APIC ID encoding rule). Therefore, the behavior of this feature is consistent before and after the change. Signed-off-by: Zhao Liu --- target/i386/cpu.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c4d4048ec32a..c20ff69b7b65 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6453,16 +6453,22 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, * set 24..14, 31..26 bit to configured values */ if (*eax & 0x1f) { - int host_vcpus_per_cache =3D 1 + ((*eax & 0x3FFC000) >> 14= ); + int host_thread_ids_per_cache; + int guest_thread_ids_per_pkg; =20 *eax &=3D ~0xFC000000; *eax |=3D max_core_ids_in_package(&topo_info) << 26; - if (host_vcpus_per_cache > threads_per_pkg) { + + host_thread_ids_per_cache =3D 1 + ((*eax & 0x3FFC000) >> 1= 4); + guest_thread_ids_per_pkg =3D + max_thread_ids_for_cache(&topo_info, + CPU_TOPO_LEVEL_PACKAGE); + + if (host_thread_ids_per_cache > guest_thread_ids_per_pkg) { *eax &=3D ~0x3FFC000; =20 /* Share the cache at package level. */ - *eax |=3D max_thread_ids_for_cache(&topo_info, - CPU_TOPO_LEVEL_PACKAGE) << 14; + *eax |=3D guest_thread_ids_per_pkg << 14; } } } else if (cpu->vendor_cpuid_only && IS_AMD_CPU(env)) { --=20 2.34.1