From nobody Mon Feb 9 23:14:48 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=1698053826; cv=none; d=zohomail.com; s=zohoarc; b=R3kvEGyKfgfQ/UlEdVynu5XqR1K2Vw3KlEEZx3f75Ll6XgkegOGR9AXhfh373tGUTc90Xbmk+Kp3uABWQvSrFyxVe0IzV5C2Bt+qD204kId83QKisStkvknRTf4glR7tLsZ8xUpQCaJfoKtOGDRidZNeFgiBd624GD+DurXe4+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698053826; 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=70YlFRvjcpVjBmzyF/e+NKYzom4SICf/HO93MHsgMHY=; b=k8hnRtowBg88IksAFRPsAkYUBXq7RVwkKoimKrE3Y/DFHhL6qbMFlT/vR/CpG+hdkLYNkAZ1UKVwvcyQmmkIHe2O2zrR/HgTPNds88Idf/B9KXBasSctbClZD1kYvRStSdGyvjkSBoQwUVZvon4EnVk5lorWyBzahC905bL+hdg= 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 1698053826909671.4884737546288; Mon, 23 Oct 2023 02:37:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qurLQ-0005xg-Bb; Mon, 23 Oct 2023 05:35:32 -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 1qurLP-0005xH-9r for qemu-devel@nongnu.org; Mon, 23 Oct 2023 05:35:31 -0400 Received: from mgamail.intel.com ([192.198.163.7]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qurLN-0005Hg-FP for qemu-devel@nongnu.org; Mon, 23 Oct 2023 05:35:31 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2023 02:35:29 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orsmga003.jf.intel.com with ESMTP; 23 Oct 2023 02:35:25 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698053730; x=1729589730; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4Dfu9ZqoPZTAoGtRyaqA9NaQufTr4E1/ifxw51jjGuI=; b=dDPrLY6Mpm1ttS1G6Xu8xxDM4E1pKzAh+j1d9Hwt29I2jZ1ydmi4DPLR viaGxTAZITei3DtEkb3W0KC5IHI2nqndhUkRg3uIwgMVJcW0NcwLL+Fis OtYhfNWmVrPsCXzcboK6yzeVLxWixVpTStj1VGpI5DSjKO1Rp0BPB3NWw WYa6EFTBVomlmxQv4bToNt4JCtk2bslPkdbUZguU2fefKR5NpbMnU4Xk3 veVYkXIZKrFEqI0oLQkhRJhmnW932ooWyV9Al6Kg3DSu3xy3UeD8DmqdN VkwRLl50PGCZz25bDsvzTSe53jYrAE6a6OdVZc51zO49sMmXCAdGHZjnu w==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="8359648" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="8359648" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="707883275" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="707883275" From: Zhao Liu To: "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Eduardo Habkost , Yanan Wang Cc: Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Zhenyu Wang , Zhao Liu Subject: [PATCH v3 09/16] tests: bios-tables-test: Extend smbios core count2 test to cover general topology Date: Mon, 23 Oct 2023 17:46:28 +0800 Message-Id: <20231023094635.1588282-10-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023094635.1588282-1-zhao1.liu@linux.intel.com> References: <20231023094635.1588282-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.7; 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.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, 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: 1698053828243100003 Content-Type: text/plain; charset="utf-8" From: Zhao Liu The commit 196ea60a734c3 ("hw/smbios: Fix core count in type4") fixed the miscalculation of cores per socket. The original core count2 test (with the topology configured by "-smp 275") didn't recognize that topology-related but because it just created a special topology with only one socket and one die by default, ignoring the effect of more topology levels (between socket and core) on the cores per socket calculation. So for the topology in this case, there're the following considerations: 1. cores per socket should be more than 255 to ensure we could cover the core count2 field. 2. The original bug was that cores per socket was miscalculated, so now we should include as many topology levels as possible (multiple sockets or dies, no module since x86 hasn't supported it) to cover more general topology scenarios, to ensure that the cores per socket encoded in the core count2 field is correct. Based on these considerations, select the topology with multiple dies: -smp 260,dies=3D2,cores=3D130,threads=3D1 Note, here we doesn't configure multiple sockets to avoid the error ("kvm_init_vcpu: kvm_get_vcpu failed (*): Too many open files") if user uses the default ulimit seeting on his machine. And the cores per socket calculation for multiple sockets has already been covered by the core count test case, so that only multiple dies configuration is enough. The expected core count2 =3D cores per socket =3D cores (130) * dies (2) = =3D 260. Suggested-by: Igor Mammedov Signed-off-by: Zhao Liu Acked-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin --- Changes since v1: * Added description of the consideration for topology selection of this case in commit message. (Igor) --- tests/qtest/bios-tables-test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index c20f6f73d09e..f3af20cf2c7f 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1024,10 +1024,12 @@ static void test_acpi_q35_tcg_core_count2(void) .required_struct_types =3D base_required_struct_types, .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), .smbios_core_count =3D 0xFF, - .smbios_core_count2 =3D 275, + .smbios_core_count2 =3D 260, }; =20 - test_acpi_one("-machine smbios-entry-point-type=3D64 -smp 275", &data); + test_acpi_one("-machine smbios-entry-point-type=3D64 " + "-smp 260,dies=3D2,cores=3D130,threads=3D1", + &data); free_test_data(&data); } =20 --=20 2.34.1