From nobody Thu Nov 14 06:59:06 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=1705588767; cv=none; d=zohomail.com; s=zohoarc; b=SsYuAFAL+Fg2uJjWkPssIObXvEMIr8gI30J4chqTw9i+VjZn+us8nK9Uq9tlannHK9W9QpW/Zk8XCiMpHIQjqHh9IkzmYFVQNIVbjQBgu0HiSAqmcWL9GNJ8/iBcB7X7LNsLHTJuLy1gY+H9rV4abAkjN9WmEjdRT1uwPDqMCD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705588767; 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=m3O8hWGUNEdQY2icFDRmUY6R4rB06sx29N5CVfE66JU=; b=gRy/QB7uzDSSW6Yqxzu0HA2Gc3wRXJzSX/bLDF/RVn2xzpmYeSalxQU71AsOCLwYyWdOX9gopJr47/yxZRRwDIsoXOQJkNPcOcRbWbM6qhlQ4D8oHcxpbAzhp5lH7I5vNiJNlW2lPh8Kpr2CTjAimEdr6MuEjnezN/3F9Ckdjo0= 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 1705588767098676.2747532501199; Thu, 18 Jan 2024 06:39:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTX0-0004zX-BH; 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 1rQTWp-0004yl-Dn for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:38:00 -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 1rQTWn-0004TI-2y for qemu-devel@nongnu.org; Thu, 18 Jan 2024 09:37:59 -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:19 -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:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705588677; x=1737124677; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RDgYqj/XVdmu2RMnb6OR9L7CyP8Rr87nWaRWTDOGDU8=; b=XMbyJee3HsSWxrc5GWJvG9pzSATX/0QgrmsgprAVmDFMoELNYS9vnem2 vbbXm2jteZE3O+AJHYHJOSBhm/l9a+WEF17Rl+JkVtUJzXQq80VqOTSn2 +MdGWhK2oShsBOQYvrfwgtJXWBgBiR15HCvSu6+ukHT6g9Pm50Qz+5DvI o3kYA3WthBNIYeA+NNbbLNlwRR/z9XRt0M87p48ikDeZ+IwE1o0bGBh3F ZbX5OfKmvgxUGzZGUBXD+FR0PvaUpC7IRzMFGGIbH/QyfUMz9m3nQ2nfR /KxeOWb3SBImMKgp1FFX8FdAo3OyDHwlr0GmIzFRmjVE2tZBoC98TGWGV w==; X-IronPort-AV: E=McAfee;i="6600,9927,10956"; a="19057223" X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="19057223" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="329370" 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 5/8] tests/unit/test-smp-parse.c: Test "drawers" parameter in -smp Date: Thu, 18 Jan 2024 22:48:54 +0800 Message-Id: <20240118144857.2124034-6-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: 1705588768561100004 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Although drawer was introduced to -smp along with book 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 | 89 +++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 31f3f713e851..d59e220360d5 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -329,6 +329,11 @@ static const struct SMPTestData data_generic_invalid[]= =3D { .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 2,drawers=3D2 */ + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 2, T, 2, F, 0, F, + 0, F, 0, F, 0, F, 0), + .expect_error =3D "drawers not supported by this machine's CPU top= ology", }, { /* 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), @@ -420,6 +425,26 @@ static const struct SMPTestData data_with_books_invali= d[] =3D { }, }; =20 +static const struct SMPTestData data_with_drawers_invalid[] =3D { + { + /* config: -smp 16,drawers=3D2,sockets=3D2,cores=3D4,threads=3D2,m= axcpus=3D16 */ + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, T, 2, F, 1, T, + 2, T, 4, T, 2, T, 16), + .expect_error =3D "Invalid CPU topology: " + "product of the hierarchy must match maxcpus: " + "drawers (2) * sockets (2) * cores (4) * threads (= 2) " + "!=3D maxcpus (16)", + }, { + /* config: -smp 34,drawers=3D2,sockets=3D2,cores=3D4,threads=3D2,m= axcpus=3D32 */ + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, T, 2, F, 1, T, + 2, T, 4, T, 2, T, 32), + .expect_error =3D "Invalid CPU topology: " + "maxcpus must be equal to or greater than smp: " + "drawers (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( @@ -666,6 +691,13 @@ static void machine_with_books_class_init(ObjectClass = *oc, void *data) mc->smp_props.books_supported =3D true; } =20 +static void machine_with_drawers_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->smp_props.drawers_supported =3D true; +} + static void test_generic_valid(const void *opaque) { const char *machine_type =3D opaque; @@ -859,6 +891,56 @@ static void test_with_books(const void *opaque) object_unref(obj); } =20 +static void test_with_drawers(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_drawers =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 drawers parameter is omitted, it will be set as 1 */ + data.expect_prefer_sockets.drawers =3D 1; + data.expect_prefer_cores.drawers =3D 1; + + smp_parse_test(ms, &data, true); + + /* when drawers parameter is specified */ + data.config.has_drawers =3D true; + data.config.drawers =3D num_drawers; + if (data.config.has_cpus) { + data.config.cpus *=3D num_drawers; + } + if (data.config.has_maxcpus) { + data.config.maxcpus *=3D num_drawers; + } + + data.expect_prefer_sockets.drawers =3D num_drawers; + data.expect_prefer_sockets.cpus *=3D num_drawers; + data.expect_prefer_sockets.max_cpus *=3D num_drawers; + data.expect_prefer_cores.drawers =3D num_drawers; + data.expect_prefer_cores.cpus *=3D num_drawers; + data.expect_prefer_cores.max_cpus *=3D num_drawers; + + smp_parse_test(ms, &data, true); + } + + for (i =3D 0; i < ARRAY_SIZE(data_with_drawers_invalid); i++) { + data =3D data_with_drawers_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 { { @@ -887,6 +969,10 @@ static const TypeInfo smp_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("smp-with-books"), .parent =3D TYPE_MACHINE, .class_init =3D machine_with_books_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("smp-with-drawers"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_with_drawers_class_init, } }; =20 @@ -913,6 +999,9 @@ int main(int argc, char *argv[]) g_test_add_data_func("/test-smp-parse/with_books", MACHINE_TYPE_NAME("smp-with-books"), test_with_books); + g_test_add_data_func("/test-smp-parse/with_drawers", + MACHINE_TYPE_NAME("smp-with-drawers"), + test_with_drawers); =20 g_test_run(); =20 --=20 2.34.1