From nobody Wed Nov 13 07:18:58 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=1705588701; cv=none; d=zohomail.com; s=zohoarc; b=nso807kmZRAOlW1QGLH+pi5EXx1F8bA3C3B47Kn7xjlJ3R9AoEIy0N+5V29FSeNF5Jq6lPJt+7/TlHb4OJZGbrvJcxhNcBlkux1X19aR43tVaidkZB2lNXgc7bkCM+2OckCvepHfk0es2HLy99mNA9Kqh5aBEONpBYy/ZRMowS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705588701; 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=p6zBX5GQCqzot2Krg2+LIWkcfLMnKr8rX98EUEu6M24=; b=Js1H63hIWtP5gy2YV+13gEsF8CN56h6w9GAGK4MyRJRv3hv7S2sWal0z0IQOJ4fDNfhO1HcgkjX53kpq9UeHEs4VoKVktA7BzC+l8lVyv3xi3vc/4HsXUDbksGMaCfUJh7jcmTWuWBArgi024oTiz5FILi4B/ESZd0Oz8Vq9jb4= 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 1705588701334150.0795874158266; Thu, 18 Jan 2024 06:38:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTX0-00054h-UQ; Thu, 18 Jan 2024 09:38:10 -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 1rQTWn-0004yD-4T for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:37:58 -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 1rQTWf-0004T0-Hf for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:37:52 -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:17 -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:15 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705588669; x=1737124669; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QfOinMTK+1ht/wbdQeHTf0b3RVG46r8xv44ktE/vwyY=; b=W3J5p3/0PT/HWCsq3Sf7sODGzdoodPxtM/I3H6wmT5a8e7E0xIzEq39S 0kHErwihIBIsArPgb379pK/Tfl4cEnUPaYV/9fRnmWnr0w+ullXK7bl1Y qauh+uubvWWTs9+Ic7vzTKlm+RB7QPwelgC5HwHj4RnkLa2qcwwvBBpEQ i3k8MQcvHiW9GF+S/RK1/CF6na8SRntUYzAeA1UzwUunyGUE7bthlBhjp DdPhn2INkUtgfWs5foDuOmdxqq1AGXhKSzMSh4Oh8YqX2TUM/B6InjZHG O9pvAJV3EX2skLvSWb5LeVerqNzk+e61vVKVUwyLrbt44iY34O7CY+D/P w==; X-IronPort-AV: E=McAfee;i="6600,9927,10956"; a="19057182" X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="19057182" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="329334" 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 4/8] tests/unit/test-smp-parse.c: Test "books" parameter in -smp Date: Thu, 18 Jan 2024 22:48:53 +0800 Message-Id: <20240118144857.2124034-5-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: 1705588702301100001 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Although book was introduced to -smp along with drawer by s390 machine, as a general topology level in QEMU that may be reused by other arches in the future, it is desirable to cover this parameter's parsing in a separate case. Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth --- tests/unit/test-smp-parse.c | 105 ++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index a8eb3bbb35ed..31f3f713e851 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -75,6 +75,22 @@ .has_maxcpus =3D hf, .maxcpus =3D f, \ } =20 +/* + * Currently a 5-level topology hierarchy is supported on s390 ccw machines + * -drawers/books/sockets/cores/threads + */ +#define SMP_CONFIG_WITH_BOOKS_DRAWERS(ha, a, hb, b, hc, c, hd, \ + d, he, e, hf, f, hg, g) \ + { \ + .has_cpus =3D ha, .cpus =3D a, \ + .has_drawers =3D hb, .drawers =3D b, \ + .has_books =3D hc, .books =3D c, \ + .has_sockets =3D hd, .sockets =3D d, \ + .has_cores =3D he, .cores =3D e, \ + .has_threads =3D hf, .threads =3D f, \ + .has_maxcpus =3D hg, .maxcpus =3D g, \ + } + /** * @config - the given SMP configuration * @expect_prefer_sockets - the expected parsing result for the @@ -308,6 +324,11 @@ static const struct SMPTestData data_generic_invalid[]= =3D { /* config: -smp 2,clusters=3D2 */ .config =3D SMP_CONFIG_WITH_CLUSTERS(T, 2, F, 0, T, 2, F, 0, F, 0,= F, 0), .expect_error =3D "clusters not supported by this machine's CPU to= pology", + }, { + /* config: -smp 2,books=3D2 */ + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 2, F, 0, T, 2, F, + 0, F, 0, F, 0, F, 0), + .expect_error =3D "books not supported by this machine's CPU topol= ogy", }, { /* config: -smp 8,sockets=3D2,cores=3D4,threads=3D2,maxcpus=3D8 */ .config =3D SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 8), @@ -379,6 +400,26 @@ static const struct SMPTestData data_with_clusters_inv= alid[] =3D { }, }; =20 +static const struct SMPTestData data_with_books_invalid[] =3D { + { + /* config: -smp 16,books=3D2,sockets=3D2,cores=3D4,threads=3D2,max= cpus=3D16 */ + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, F, 1, T, 2, T, + 2, T, 4, T, 2, T, 16), + .expect_error =3D "Invalid CPU topology: " + "product of the hierarchy must match maxcpus: " + "books (2) * sockets (2) * cores (4) * threads (2)= " + "!=3D maxcpus (16)", + }, { + /* config: -smp 34,books=3D2,sockets=3D2,cores=3D4,threads=3D2,max= cpus=3D32 */ + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, F, 1, T, 2, T, + 2, T, 4, T, 2, T, 32), + .expect_error =3D "Invalid CPU topology: " + "maxcpus must be equal to or greater than smp: " + "books (2) * sockets (2) * cores (4) * threads (2)= " + "=3D=3D maxcpus (32) < smp_cpus (34)", + }, +}; + static char *smp_config_to_string(const SMPConfiguration *config) { return g_strdup_printf( @@ -618,6 +659,13 @@ static void machine_with_clusters_class_init(ObjectCla= ss *oc, void *data) mc->smp_props.clusters_supported =3D true; } =20 +static void machine_with_books_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->smp_props.books_supported =3D true; +} + static void test_generic_valid(const void *opaque) { const char *machine_type =3D opaque; @@ -761,6 +809,56 @@ static void test_with_clusters(const void *opaque) object_unref(obj); } =20 +static void test_with_books(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 num_books =3D 2; + int i; + + for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { + data =3D data_generic_valid[i]; + unsupported_params_init(mc, &data); + + /* when books parameter is omitted, it will be set as 1 */ + data.expect_prefer_sockets.books =3D 1; + data.expect_prefer_cores.books =3D 1; + + smp_parse_test(ms, &data, true); + + /* when books parameter is specified */ + data.config.has_books =3D true; + data.config.books =3D num_books; + if (data.config.has_cpus) { + data.config.cpus *=3D num_books; + } + if (data.config.has_maxcpus) { + data.config.maxcpus *=3D num_books; + } + + data.expect_prefer_sockets.books =3D num_books; + data.expect_prefer_sockets.cpus *=3D num_books; + data.expect_prefer_sockets.max_cpus *=3D num_books; + data.expect_prefer_cores.books =3D num_books; + data.expect_prefer_cores.cpus *=3D num_books; + data.expect_prefer_cores.max_cpus *=3D num_books; + + smp_parse_test(ms, &data, true); + } + + for (i =3D 0; i < ARRAY_SIZE(data_with_books_invalid); i++) { + data =3D data_with_books_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 { { @@ -785,6 +883,10 @@ static const TypeInfo smp_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("smp-with-clusters"), .parent =3D TYPE_MACHINE, .class_init =3D machine_with_clusters_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("smp-with-books"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_with_books_class_init, } }; =20 @@ -808,6 +910,9 @@ int main(int argc, char *argv[]) g_test_add_data_func("/test-smp-parse/with_clusters", MACHINE_TYPE_NAME("smp-with-clusters"), test_with_clusters); + g_test_add_data_func("/test-smp-parse/with_books", + MACHINE_TYPE_NAME("smp-with-books"), + test_with_books); =20 g_test_run(); =20 --=20 2.34.1