From nobody Thu Nov 14 07:16:23 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1705588756; cv=none; d=zohomail.com; s=zohoarc; b=ansisXNp+YtLZigAmrES0cQ3nEHZp28OG0TU3LFAuUvTm/Hyr5XqSo6N2/cmb/5NEiXXPPLYP78IMh/GXRNSDrLjHetizqQcDzXBnH2hDicrepPwU7vgiX5Sq2+0sOXtpi63o6ih4/vN52FqeEdXPWTPqEoa+7edJA2zxJ2XVk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705588756; 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=43sKxGdw6H3WdcVi0uiYLWdLV8xCFTTLZDPiHfEihrk=; b=XBEV2HAqeKt8tIKRmwAynnI3WgqVmFbPiX9Gli4bnVp8oCF3BtmUGJcT7ljuDkiY1bBeiJL6T72Tmd62N+hw0dmYfUURF4ZNQkELt7IP7bVoJio9H/g6WjsrUHZd4OsUZg6VSw3pGqdEd1iQuxQtPc14h+UAAB2lyJ21H3/SveY= 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 1705588756466148.24768344057134; Thu, 18 Jan 2024 06:39:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTX1-000558-Ey; Thu, 18 Jan 2024 09:38:11 -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 1rQTWu-00050Q-SA for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:38:07 -0500 Received: from mgamail.intel.com ([198.175.65.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQTWo-0004T0-3Z for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:38:03 -0500 Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2024 06:36:23 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa005.jf.intel.com with ESMTP; 18 Jan 2024 06:36:22 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705588678; x=1737124678; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v8gztxmwWpVKZMQIrDxcR5RTygr41UByzroyGNYPL3c=; b=nGB2ltW30t0RvWWyjoydnOND7DPQGyg+SLHL0bzxjh/2UjrJjifNzNtP Q5cTKi24vqyI1KujaRX4RL/LQqXS7mDCt0Cod752LeLldOXjE3oPYCnKn 0RAiEqpdTPIj0Z+PGLE4RgQixjRKfc7egrsrkIV/KR+ZZVXoGkLSQGNyz pxEItb8R/1zHmfyqsofxVyzH3Xh9vydhUvhBAovHjdcHP4uaYqBfYdxDa RS16jVyDEzEfY8BS14xh5YAY5vKT0oGH7WTlqIgHmya9BUoLmTLe65+Ky xmSWeghflJINHxl34ix0tGpr00OKCZxmmy1TrBLag+2mBj0+dDM7hPB+t A==; X-IronPort-AV: E=McAfee;i="6600,9927,10956"; a="19057303" X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="19057303" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="329410" From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang Cc: qemu-devel@nongnu.org, Xiaoling Song , Zhao Liu Subject: [PATCH 7/8] tests/unit/test-smp-parse.c: Test the full 7-levels topology hierarchy Date: Thu, 18 Jan 2024 22:48:56 +0800 Message-Id: <20240118144857.2124034-8-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240118144857.2124034-1-zhao1.liu@linux.intel.com> References: <20240118144857.2124034-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=198.175.65.9; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.806, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=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: 1705588758499100003 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Currently, -smp supports up to 7-levels topology hierarchy: -drawers/books/sockets/dies/clusters/cores/threads. Though no machine supports all these 7 levels yet, these 7 levels have the strict containment relationship and together form the generic CPU topology representation of QEMU. Also, note that the maxcpus is calculated by multiplying all 7 levels: maxcpus =3D drawers * books * sockets * dies * clusters * cores * threads. To cover this code path, it is necessary to test the full topology case (with all 7 levels). This also helps to avoid introducing new issues by further expanding the CPU topology in the future. Signed-off-by: Zhao Liu Acked-by: Thomas Huth --- tests/unit/test-smp-parse.c | 143 ++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index a1ef297248cd..1d1f10b4faf0 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -91,6 +91,24 @@ .has_maxcpus =3D hg, .maxcpus =3D g, \ } =20 +/* + * Currently QEMU supports up to a 7-level topology hierarchy, which is the + * QEMU's unified abstract representation of CPU topology. + * -drawers/books/sockets/dies/clusters/cores/threads + */ +#define SMP_CONFIG_WITH_FULL_TOPO(a, b, c, d, e, f, g, h, i) \ + { \ + .has_cpus =3D true, .cpus =3D a, \ + .has_drawers =3D true, .drawers =3D b, \ + .has_books =3D true, .books =3D c, \ + .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, \ + } + /** * @config - the given SMP configuration * @expect_prefer_sockets - the expected parsing result for the @@ -472,6 +490,40 @@ static const struct SMPTestData data_with_drawers_book= s_invalid[] =3D { }, }; =20 +static const struct SMPTestData data_full_topo_invalid[] =3D { + { + /* + * config: -smp 200,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ + * clusters=3D2,cores=3D7,threads=3D2,maxcpus=3D200 + */ + .config =3D SMP_CONFIG_WITH_FULL_TOPO(200, 3, 5, 2, 4, 2, 7, 2, 20= 0), + .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) " + "!=3D maxcpus (200)", + }, { + /* + * config: -smp 3361,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ + * clusters=3D2,cores=3D7,threads=3D2,maxcpus=3D3360 + */ + .config =3D SMP_CONFIG_WITH_FULL_TOPO(3361, 3, 5, 2, 4, 2, 7, 2, 3= 360), + .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)", + }, { + /* + * config: -smp 1,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ + * clusters=3D2,cores=3D7,threads=3D3,maxcpus=3D5040 + */ + .config =3D SMP_CONFIG_WITH_FULL_TOPO(3361, 3, 5, 2, 4, 2, 7, 3, 5= 040), + .expect_error =3D "Invalid SMP CPUs 5040. The max CPUs supported " + "by machine '" SMP_MACHINE_NAME "' is 4096", + }, +}; + static char *smp_config_to_string(const SMPConfiguration *config) { return g_strdup_printf( @@ -733,6 +785,16 @@ static void machine_with_drawers_books_class_init(Obje= ctClass *oc, void *data) mc->smp_props.books_supported =3D true; } =20 +static void machine_full_topo_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->smp_props.drawers_supported =3D true; + mc->smp_props.books_supported =3D true; + mc->smp_props.dies_supported =3D true; + mc->smp_props.clusters_supported =3D true; +} + static void test_generic_valid(const void *opaque) { const char *machine_type =3D opaque; @@ -1037,6 +1099,80 @@ static void test_with_drawers_books(const void *opaq= ue) object_unref(obj); } =20 +static void test_full_topo(const void *opaque) +{ + const char *machine_type =3D opaque; + Object *obj =3D object_new(machine_type); + 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; + int i; + + multiplier =3D drawers * books * dies * clusters; + for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { + data =3D data_generic_valid[i]; + unsupported_params_init(mc, &data); + + /* + * when drawers, books, dies and clusters 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_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; + + smp_parse_test(ms, &data, true); + + /* when drawers, books, dies and clusters parameters are specified= . */ + data.config.has_drawers =3D true; + data.config.drawers =3D drawers; + data.config.has_books =3D true; + data.config.books =3D books; + data.config.has_dies =3D true; + data.config.dies =3D dies; + data.config.has_clusters =3D true; + data.config.clusters =3D clusters; + + if (data.config.has_cpus) { + data.config.cpus *=3D multiplier; + } + if (data.config.has_maxcpus) { + data.config.maxcpus *=3D multiplier; + } + + data.expect_prefer_sockets.drawers =3D drawers; + 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.cpus *=3D multiplier; + data.expect_prefer_sockets.max_cpus *=3D multiplier; + + data.expect_prefer_cores.drawers =3D drawers; + 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.cpus *=3D multiplier; + data.expect_prefer_cores.max_cpus *=3D multiplier; + + smp_parse_test(ms, &data, true); + } + + for (i =3D 0; i < ARRAY_SIZE(data_full_topo_invalid); i++) { + data =3D data_full_topo_invalid[i]; + unsupported_params_init(mc, &data); + + smp_parse_test(ms, &data, false); + } + + object_unref(obj); +} + /* Type info of the tested machine */ static const TypeInfo smp_machine_types[] =3D { { @@ -1073,6 +1209,10 @@ static const TypeInfo smp_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("smp-with-drawers-books"), .parent =3D TYPE_MACHINE, .class_init =3D machine_with_drawers_books_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("smp-full-topo"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_full_topo_class_init, } }; =20 @@ -1105,6 +1245,9 @@ int main(int argc, char *argv[]) g_test_add_data_func("/test-smp-parse/with_drawers_books", MACHINE_TYPE_NAME("smp-with-drawers-books"), test_with_drawers_books); + g_test_add_data_func("/test-smp-parse/full", + MACHINE_TYPE_NAME("smp-full-topo"), + test_full_topo); =20 g_test_run(); =20 --=20 2.34.1