From nobody Thu Dec 18 12:35:42 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1692934033; cv=none; d=zohomail.com; s=zohoarc; b=EIMuD0rVgm/hEKL0+8b8Hc7bP3PLgGeuc0BvhtDOjjgiFG/Tp38bjXSN+EilBZUBjwltevbJJqiUPgw6fd4jPd6dRSxF9qSx0gyhGoXIGI9DTUc8M/Uzc/ewr+Me38PqTo64Cs67AIELacAA+g5XIEJIH24X2aVyc3uHVyqRrTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692934033; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OBahX0lOtQ7/D8mOwXk/gsMXRRz4I9ocDbWOuGQ/JwU=; b=KIfpH7kisgp0KIbekPEkNeRvSl853LEikGttQP5k2Nr+zq9J1SSDXpOoeG+6OGKLhNQwtIUwAhiCtvSH7kwcikwjtMppeoGIZLjUJwewSXVBvFrsLcvOO3vjN43ubTNDA2d1MWAoRCX01L3WqERqh3wp+WkH8euDyzXBEuIy3NM= 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 1692934033236946.2265651037844; Thu, 24 Aug 2023 20:27:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZNSl-0000JA-SN; Thu, 24 Aug 2023 23:26:20 -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 1qZNSj-0000Iz-8o for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:26:17 -0400 Received: from mgamail.intel.com ([192.55.52.115]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZNSg-0003wW-UC for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:26:17 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 20:26:13 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orsmga006.jf.intel.com with ESMTP; 24 Aug 2023 20:26:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692933974; x=1724469974; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=86B6Djpk3AsAKdgCoiBoDb6/O76cCHLV9R98JvkYgw0=; b=jOR/ay5fADt0tNF20Yv0CLxnG8HVCOwPZPVf7pmeBllSMPpcLEvLDZee 2FOH3jihCHn9Aqnh5rkf7iZH7DsvPNUAKM5Hn7B8yUIb56lu+tCW9NORl ApEVHwdFbwNfqaeOI2PQCM2m1Fv0hUhXZ0EE+garYQQ6C8ajIcixTPMYH u5oXEHFEFEJjrNz04jTO2xWV7mxLMqaHMNmF5ojBVJO5DL1MslwI0kPdi P35PP9VI19DtXe96l4I6ulQ38qWWiIsEGc0t9cYWA3UtF2gfsSpHE4IMD c6uPUnbcQLUHhMb4DB20kIbAN2fkK4XJRRrEf7Qy+FMav0i37c7527wWq w==; X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="374595598" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="374595598" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="714201467" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="714201467" From: Zhao Liu To: "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , qemu-devel@nongnu.org Cc: Michael Tokarev , Zhenyu Wang , Zhao Liu Subject: [PATCH 01/16] tests: test-smp-parse: Add the test for cores/threads per socket helpers Date: Fri, 25 Aug 2023 11:36:04 +0800 Message-Id: <20230825033619.2075837-2-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230825033619.2075837-1-zhao1.liu@linux.intel.com> References: <20230825033619.2075837-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.55.52.115; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.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, 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: 1692934034407100001 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Use the different ways to calculate cores/threads per socket, so that the new CPU topology levels won't be missed in these 2 helpes: * machine_topo_get_cores_per_socket() * machine_topo_get_threads_per_socket() Test the commit a1d027be95bc3 ("machine: Add helpers to get cores/ threads per socket"). Suggested-by: Igor Mammedov Signed-off-by: Zhao Liu Acked-by: Igor Mammedov --- tests/unit/test-smp-parse.c | 67 ++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index fdc39a846ca6..24972666a74d 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -394,20 +394,47 @@ static char *smp_config_to_string(const SMPConfigurat= ion *config) config->has_maxcpus ? "true" : "false", config->maxcpus); } =20 -static char *cpu_topology_to_string(const CpuTopology *topo) +/* Use the different calculation than machine_topo_get_threads_per_socket(= ). */ +static unsigned int cpu_topology_get_threads_per_socket(const CpuTopology = *topo) +{ + /* Check the divisor to avoid invalid topology examples causing SIGFPE= . */ + if (!topo->sockets) { + return 0; + } else { + return topo->max_cpus / topo->sockets; + } +} + +/* Use the different calculation than machine_topo_get_cores_per_socket().= */ +static unsigned int cpu_topology_get_cores_per_socket(const CpuTopology *t= opo) +{ + /* Check the divisor to avoid invalid topology examples causing SIGFPE= . */ + if (!topo->threads) { + return 0; + } else { + return cpu_topology_get_threads_per_socket(topo) / topo->threads; + } +} + +static char *cpu_topology_to_string(const CpuTopology *topo, + unsigned int threads_per_socket, + unsigned int cores_per_socket) { return g_strdup_printf( "(CpuTopology) {\n" - " .cpus =3D %u,\n" - " .sockets =3D %u,\n" - " .dies =3D %u,\n" - " .clusters =3D %u,\n" - " .cores =3D %u,\n" - " .threads =3D %u,\n" - " .max_cpus =3D %u,\n" + " .cpus =3D %u,\n" + " .sockets =3D %u,\n" + " .dies =3D %u,\n" + " .clusters =3D %u,\n" + " .cores =3D %u,\n" + " .threads =3D %u,\n" + " .max_cpus =3D %u,\n" + " .threads_per_socket =3D %u,\n" + " .cores_per_socket =3D %u,\n" "}", topo->cpus, topo->sockets, topo->dies, topo->clusters, - topo->cores, topo->threads, topo->max_cpus); + topo->cores, topo->threads, topo->max_cpus, + threads_per_socket, cores_per_socket); } =20 static void check_parse(MachineState *ms, const SMPConfiguration *config, @@ -415,14 +442,26 @@ static void check_parse(MachineState *ms, const SMPCo= nfiguration *config, bool is_valid) { g_autofree char *config_str =3D smp_config_to_string(config); - g_autofree char *expect_topo_str =3D cpu_topology_to_string(expect_top= o); - g_autofree char *output_topo_str =3D NULL; + g_autofree char *expect_topo_str =3D NULL, *output_topo_str =3D NULL; + unsigned int expect_threads_per_socket, expect_cores_per_socket; + unsigned int ms_threads_per_socket, ms_cores_per_socket; Error *err =3D NULL; =20 + expect_threads_per_socket =3D + cpu_topology_get_threads_per_socket(expect_topo); + expect_cores_per_socket =3D + cpu_topology_get_cores_per_socket(expect_topo); + expect_topo_str =3D cpu_topology_to_string(expect_topo, + expect_threads_per_socket, + expect_cores_per_socket); + /* call the generic parser */ machine_parse_smp_config(ms, config, &err); =20 - output_topo_str =3D cpu_topology_to_string(&ms->smp); + ms_threads_per_socket =3D machine_topo_get_threads_per_socket(ms); + ms_cores_per_socket =3D machine_topo_get_cores_per_socket(ms); + output_topo_str =3D cpu_topology_to_string(&ms->smp, ms_threads_per_so= cket, + ms_cores_per_socket); =20 /* when the configuration is supposed to be valid */ if (is_valid) { @@ -433,7 +472,9 @@ static void check_parse(MachineState *ms, const SMPConf= iguration *config, (ms->smp.clusters =3D=3D expect_topo->clusters) && (ms->smp.cores =3D=3D expect_topo->cores) && (ms->smp.threads =3D=3D expect_topo->threads) && - (ms->smp.max_cpus =3D=3D expect_topo->max_cpus)) { + (ms->smp.max_cpus =3D=3D expect_topo->max_cpus) && + (ms_threads_per_socket =3D=3D expect_threads_per_socket) && + (ms_cores_per_socket =3D=3D expect_cores_per_socket)) { return; } =20 --=20 2.34.1