From nobody Tue Nov 18 17:31:37 2025 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=1716962699; cv=none; d=zohomail.com; s=zohoarc; b=H6Tw0MSvOQtTzaoPFdeGzb2Hs8MGNQgIli1M4kGJytHChaNWpsUZA5SdfTI7F/isx93x/Ja1enc+wp9JDWU1xvuWfs+DJoaWDcpt2d+MnVKXHJLCoQzALyQq4FIfPfHowziNtH6KaEoRr2vyIWwsnJ/e/IZ1ncW+xAP7SWrqEy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716962699; 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=0qLOP/+vJo8XiFrzoYo53TdwOHvFVGu5BmN3l+tP1Kc=; b=NZ7jgZoLy9eSDPRMzdB3M4PiYYDrDPZX1bsVGnRdbe047LLv9pCTH8PBb4eQI2DZLctAgx8xqIa4Or5Ym2mkMOzftydkD8RGm4Ki5mpqkkBIodKZ6qVUbBfEe8FGs+G6VyLCA7C2pv5R6sDigJnOTfGmr7nP5N1BcMq8GoN4ljY= 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 1716962698997659.424198825408; Tue, 28 May 2024 23:04:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCCQJ-0005f0-MH; Wed, 29 May 2024 02:04:31 -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 1sCCQH-0005aq-HX for qemu-devel@nongnu.org; Wed, 29 May 2024 02:04:29 -0400 Received: from mgamail.intel.com ([198.175.65.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCCQF-0002vg-9j for qemu-devel@nongnu.org; Wed, 29 May 2024 02:04:29 -0400 Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2024 23:04:26 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa003.jf.intel.com with ESMTP; 28 May 2024 23:04:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716962668; x=1748498668; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2vBh3IfNwbawhYc++Jw/OuUr0v/+Zup3/Ru69BmBxJY=; b=XZ612HnBIcRDa48BrnWCHW5YWy5WvgYx7POn5/hsrUk4KNibJnoirkwD /RimfPc/YHuW35nLq8NW9W1jSgGzpgBbJzzecP6tJ3jrFhteCtgsaBKke U1HsZCMtdObxXw8qAjh3aCrej5ya7b4ijEAL8mlFpmgyET4yKA9jBUMol l9lQBdcmcKT+YR7md0V/3QCWE3gTCQWSOVRzEFho/ltWPc8oi5RgGIgX5 BnidGJjuBfBQ/U/xQm9mMW5VNNOdWgLnv3HKscRCnVXppyq6mmYQPm9Dg e/fTbF6pet2QOSfEMiie3TCXPZfOvJMp81ZZWe/o+jRYq8ffrPky77qL/ Q==; X-CSE-ConnectionGUID: jvjBDkJ1Q/e8izCNuLFzJQ== X-CSE-MsgGUID: RlKZhJAyTnWrOs4mHf+F0w== X-IronPort-AV: E=McAfee;i="6600,9927,11085"; a="13187514" X-IronPort-AV: E=Sophos;i="6.08,197,1712646000"; d="scan'208";a="13187514" X-CSE-ConnectionGUID: PKDxyjSFS2GFoLIMhNEEnQ== X-CSE-MsgGUID: q5cuhUeDTpKRHskcoAX6/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,197,1712646000"; d="scan'208";a="40144779" From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Thomas Huth , qemu-devel@nongnu.org Cc: Yongwei Ma , Zhao Liu Subject: [PATCH 8/8] tests/unit/test-smp-parse: Test the full 8-levels topology hierarchy Date: Wed, 29 May 2024 14:19:25 +0800 Message-Id: <20240529061925.350323-9-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240529061925.350323-1-zhao1.liu@intel.com> References: <20240529061925.350323-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=198.175.65.20; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.034, 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: 1716962701021100002 Content-Type: text/plain; charset="utf-8" With module level, QEMU now support 8-levels topology hierarchy. Cover "modules" in SMP_CONFIG_WITH_FULL_TOPO related cases. Signed-off-by: Zhao Liu --- tests/unit/test-smp-parse.c | 129 ++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 44 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 2ca8530e935e..f9bccb56abc7 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -94,11 +94,11 @@ } =20 /* - * Currently QEMU supports up to a 7-level topology hierarchy, which is the + * Currently QEMU supports up to a 8-level topology hierarchy, which is the * QEMU's unified abstract representation of CPU topology. - * -drawers/books/sockets/dies/clusters/cores/threads + * -drawers/books/sockets/dies/clusters/modules/cores/threads */ -#define SMP_CONFIG_WITH_FULL_TOPO(a, b, c, d, e, f, g, h, i) \ +#define SMP_CONFIG_WITH_FULL_TOPO(a, b, c, d, e, f, g, h, i, j) \ { \ .has_cpus =3D true, .cpus =3D a, \ .has_drawers =3D true, .drawers =3D b, \ @@ -106,9 +106,10 @@ .has_sockets =3D true, .sockets =3D d, \ .has_dies =3D true, .dies =3D e, \ .has_clusters =3D true, .clusters =3D f, \ - .has_cores =3D true, .cores =3D g, \ - .has_threads =3D true, .threads =3D h, \ - .has_maxcpus =3D true, .maxcpus =3D i, \ + .has_modules =3D true, .modules =3D g, \ + .has_cores =3D true, .cores =3D h, \ + .has_threads =3D true, .threads =3D i, \ + .has_maxcpus =3D true, .maxcpus =3D j, \ } =20 /** @@ -336,10 +337,10 @@ static const struct SMPTestData data_generic_valid[] = =3D { /* * Unsupported parameters are always allowed to be set to '1' * config: - * -smp 8,drawers=3D1,books=3D1,sockets=3D2,dies=3D1,clusters=3D= 1,cores=3D2,\ - * threads=3D2,maxcpus=3D8 + * -smp 8,drawers=3D1,books=3D1,sockets=3D2,dies=3D1,clusters=3D= 1,modules=3D1,\ + * cores=3D2,threads=3D2,maxcpus=3D8 * expect: cpus=3D8,sockets=3D2,cores=3D2,threads=3D2,maxcpus=3D8 = */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 2, 2, 8), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 1, 2, 2, 8= ), .expect_prefer_sockets =3D CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), .expect_prefer_cores =3D CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), }, @@ -561,32 +562,37 @@ static const struct SMPTestData data_full_topo_invali= d[] =3D { { /* * config: -smp 200,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ - * clusters=3D2,cores=3D7,threads=3D2,maxcpus=3D200 + * clusters=3D2,modules=3D3,cores=3D7,threads=3D2,\ + * maxcpus=3D200 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(200, 3, 5, 2, 4, 2, 7, 2, 20= 0), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(200, 3, 5, 2, 4, 2, 3, 7, 2,= 200), .expect_error =3D "Invalid CPU topology: " "product of the hierarchy must match maxcpus: " "drawers (3) * books (5) * sockets (2) * dies (4) = * " - "clusters (2) * cores (7) * threads (2) " + "clusters (2) * modules (3) * cores (7) * threads = (2) " "!=3D maxcpus (200)", }, { /* - * config: -smp 3361,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ - * clusters=3D2,cores=3D7,threads=3D2,maxcpus=3D3360 + * config: -smp 2881,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ + * clusters=3D2,modules=3D3,cores=3D2,threads=3D2, + * maxcpus=3D2880 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(3361, 3, 5, 2, 4, 2, 7, 2, 3= 360), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(2881, 3, 5, 2, 4, + 2, 3, 2, 2, 2880), .expect_error =3D "Invalid CPU topology: " "maxcpus must be equal to or greater than smp: " - "drawers (3) * books (5) * sockets (2) * dies (4) = * " - "clusters (2) * cores (7) * threads (2) " - "=3D=3D maxcpus (3360) < smp_cpus (3361)", + "drawers (3) * books (5) * sockets (2) * " + "dies (4) * clusters (2) * modules (3) * " + "cores (2) * threads (2) =3D=3D maxcpus (2880) " + "< smp_cpus (2881)", }, { /* * config: -smp 1,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ - * clusters=3D2,cores=3D7,threads=3D3,maxcpus=3D5040 + * clusters=3D2,modules=3D3,cores=3D3,threads=3D3,\ + * maxcpus=3D6480 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 3, 5, 2, 4, 2, 7, 3, 5040= ), - .expect_error =3D "Invalid SMP CPUs 5040. The max CPUs supported " + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 3, 5, 2, 4, 2, 3, 3, 3, 6= 480), + .expect_error =3D "Invalid SMP CPUs 6480. The max CPUs supported " "by machine '" SMP_MACHINE_NAME "' is 4096", }, }; @@ -596,81 +602,100 @@ static const struct SMPTestData data_zero_topo_inval= id[] =3D { /* * Test "cpus=3D0". * config: -smp 0,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(0, 1, 1, 1, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(0, 1, 1, 1, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "drawers=3D0". * config: -smp 1,drawers=3D0,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 0, 1, 1, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 0, 1, 1, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "books=3D0". * config: -smp 1,drawers=3D1,books=3D0,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 0, 1, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 0, 1, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "sockets=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D0,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1, + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 0, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 0, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "dies=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D0,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 0, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 0, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "clusters=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D0,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D0,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 + */ + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 0, 1, 1, 1, 1= ), + .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " + "be greater than zero", + }, { + /* + * Test "modules=3D0". + * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ + * clusters=3D1,modules=3D0,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 0, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 0, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "cores=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D0,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D0,threads=3D1, + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 0, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 0, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "threads=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D0,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D0,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 0, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 1, 0, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "maxcpus=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D0 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D0 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 1, 0), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 1, 1, 0= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, @@ -977,6 +1002,7 @@ static void machine_full_topo_class_init(ObjectClass *= oc, void *data) mc->smp_props.books_supported =3D true; mc->smp_props.dies_supported =3D true; mc->smp_props.clusters_supported =3D true; + mc->smp_props.modules_supported =3D true; } =20 static void test_generic_valid(const void *opaque) @@ -1396,30 +1422,41 @@ static void test_full_topo(const void *opaque) MachineState *ms =3D MACHINE(obj); MachineClass *mc =3D MACHINE_GET_CLASS(obj); SMPTestData data =3D {}; - unsigned int drawers =3D 5, books =3D 3, dies =3D 2, clusters =3D 7, m= ultiplier; + unsigned int drawers, books, dies, clusters, modules, multiplier; int i; =20 - multiplier =3D drawers * books * dies * clusters; + drawers =3D 5; + books =3D 3; + dies =3D 2; + clusters =3D 3; + modules =3D 2; + + multiplier =3D drawers * books * dies * clusters * modules; for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { data =3D data_generic_valid[i]; unsupported_params_init(mc, &data); =20 /* - * when drawers, books, dies and clusters parameters are omitted, - * they will be set as 1. + * when drawers, books, dies, clusters and modules parameters are + * omitted, they will be set as 1. */ data.expect_prefer_sockets.drawers =3D 1; data.expect_prefer_sockets.books =3D 1; data.expect_prefer_sockets.dies =3D 1; data.expect_prefer_sockets.clusters =3D 1; + data.expect_prefer_sockets.modules =3D 1; data.expect_prefer_cores.drawers =3D 1; data.expect_prefer_cores.books =3D 1; data.expect_prefer_cores.dies =3D 1; data.expect_prefer_cores.clusters =3D 1; + data.expect_prefer_cores.modules =3D 1; =20 smp_parse_test(ms, &data, true); =20 - /* when drawers, books, dies and clusters parameters are specified= . */ + /* + * when drawers, books, dies, clusters and modules parameters + * are specified. + */ data.config.has_drawers =3D true; data.config.drawers =3D drawers; data.config.has_books =3D true; @@ -1428,6 +1465,8 @@ static void test_full_topo(const void *opaque) data.config.dies =3D dies; data.config.has_clusters =3D true; data.config.clusters =3D clusters; + data.config.has_modules =3D true; + data.config.modules =3D modules; =20 if (data.config.has_cpus) { data.config.cpus *=3D multiplier; @@ -1440,6 +1479,7 @@ static void test_full_topo(const void *opaque) data.expect_prefer_sockets.books =3D books; data.expect_prefer_sockets.dies =3D dies; data.expect_prefer_sockets.clusters =3D clusters; + data.expect_prefer_sockets.modules =3D modules; data.expect_prefer_sockets.cpus *=3D multiplier; data.expect_prefer_sockets.max_cpus *=3D multiplier; =20 @@ -1447,6 +1487,7 @@ static void test_full_topo(const void *opaque) data.expect_prefer_cores.books =3D books; data.expect_prefer_cores.dies =3D dies; data.expect_prefer_cores.clusters =3D clusters; + data.expect_prefer_cores.modules =3D modules; data.expect_prefer_cores.cpus *=3D multiplier; data.expect_prefer_cores.max_cpus *=3D multiplier; =20 --=20 2.34.1