From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0CB7745C00; Mon, 28 Oct 2024 20:56:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5232342D45; Mon, 28 Oct 2024 20:56:36 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2062.outbound.protection.outlook.com [40.107.236.62]) by mails.dpdk.org (Postfix) with ESMTP id BB35C427E2 for ; Mon, 28 Oct 2024 20:56:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U/jBdwZ79/hM/uDUrEHl7q2b1gYlpsi+LW5d/IV6Py6oPvmd2CwU4eUpjI6CJL6eGlIOQxT9iM76JI28ppVWHa4AGVJJ4dKLcKCfZxPXgu5PN5VdYrLjxNo5H6pjxh/xzR9qklNob/8kh5BiVNkSWvRlWbSWWYF+OojSOBvdAVDh74w+2bijow74qvhur5+mWjLe2DvhNQoPTQKr6SVbvbQqaNBtbTEH+O+7Nr8m2acyI/HUiQzgBB3uRZ5pYSKPLjPN7esENFREF2OQuI7mEAXeCD+aoZpEy+g7z02M82yZDlVUYJtvJA5gbcUtDOfc/DRhzwkctXr3CADVcXDC3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=A7Uf3Jw2cJ3E7iCkMoYaS7w0bT4qgeYpA3+tXTFvpgs=; b=Fqqe73S/0KYmtKtpa3OfXLksi55xj/tYUY9QFeUMFdHZym2RQeWPJqNIVg80OLAFcKNDRlauHVZaq4i4fgdyVBFoFR+RIPIBe3FGIylcgY1j3VFyjeyDiuwVoAjzqPN8ur2uhRI7Ao+gn3GNPiAAQWmfeMB1qT/CPTjdGSyhhTLmI6O5CAXwpBjkY1yq31RLT6cFZpR05Qie966JQb6UIMgNohDf0SsAHrPvf53pRqflGHIHeGm1O35ELZy+3fVGoy5xDdoUhkYZNjumQ642A27xwf7qrXDBlnxdgl97mxobS8WzRhuesd5H10vEMSwHjxcu1iVkQG3dlYh1cz7SRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=intel.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A7Uf3Jw2cJ3E7iCkMoYaS7w0bT4qgeYpA3+tXTFvpgs=; b=4m4qskLrtXQ5rdf4FKdj+SRU3qcKCUk2Oex3fj8t6elMzvDF4Du98oOOxXu8ZEAwnS/CI7RHKUhfQe1EOirI4V74J4EE1YhT7ONaGTLIS0QXmvPfuqb13UjL2BCJ/1TexcA1gQ9QAeIosQUqyPYo9l56jkhBbz9Lpr/waR8syOw= Received: from BY5PR17CA0029.namprd17.prod.outlook.com (2603:10b6:a03:1b8::42) by DM6PR12MB4044.namprd12.prod.outlook.com (2603:10b6:5:21d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.27; Mon, 28 Oct 2024 19:56:25 +0000 Received: from CO1PEPF000075EF.namprd03.prod.outlook.com (2603:10b6:a03:1b8:cafe::48) by BY5PR17CA0029.outlook.office365.com (2603:10b6:a03:1b8::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.21 via Frontend Transport; Mon, 28 Oct 2024 19:56:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000075EF.mail.protection.outlook.com (10.167.249.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8114.16 via Frontend Transport; Mon, 28 Oct 2024 19:56:24 +0000 Received: from jfw9ny3-os.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 28 Oct 2024 14:56:19 -0500 From: Sivaprasad Tummala To: , , , , , , , , CC: Subject: [PATCH v10 3/6] test/power: removed function pointer validations Date: Mon, 28 Oct 2024 19:55:53 +0000 Message-ID: <20241028195556.450033-4-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241028195556.450033-1-sivaprasad.tummala@amd.com> References: <20241023051139.1066426-1-sivaprasad.tummala@amd.com> <20241028195556.450033-1-sivaprasad.tummala@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000075EF:EE_|DM6PR12MB4044:EE_ X-MS-Office365-Filtering-Correlation-Id: a57dcc7f-8b46-4fc3-29ea-08dcf78a9a21 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?eAnIwaxkbszI+LCYIvcf+SoDduj+omy/t/YInIme9+VlzJi4yInnFbY5tC72?= =?us-ascii?Q?bvNl3FFeZhnjH4tVk6U8RXuqEAB+tA1kZR7b5yZluKreq72QBfuA5rlemIQ5?= =?us-ascii?Q?37oGSHaQU/mkh2OlNlqVrSQJ+5TV3zOIrOkH+hBCshtWg0XtIaW/9Jvmzfd3?= =?us-ascii?Q?lNfNVwpL1U3qH987Hzt7sYauan2JUMa6uuUrX/bKDj/NrB7ezNfs8kAzR/sa?= =?us-ascii?Q?FuPZ7883aKhsb8cfeJQNWsjikjglRdNP6FWf1i9hyCvJU3WFAk7A2bcwwiNd?= =?us-ascii?Q?Wv8BuxPp7BmIM/qspg9jJjOdNyLVkWHZUbir1AcI5OwIu7RERXaWTRDq33+A?= =?us-ascii?Q?IFN8nQWAvR3e6N6OiNw28mkOV5X30ERHza3DJ3v7xdxqIObrtGSieUh+kGQT?= =?us-ascii?Q?IGVp5sKrtVDYml24bKTLmJBeeRQl/lZZrZ6DqUF/9pjKnVMfyDcO9HV2TkJq?= =?us-ascii?Q?oSRT8rghx8sJtQwaPmY5bQBHG4J5z24hhg3w+Gj4A/+eIRH7LHdSCgH/58hP?= =?us-ascii?Q?L5LSP8qVtYDvTWARUUxEvK9OgXUIf/AHUtlaHHksmTgkrmGFewsm0U09YiGl?= =?us-ascii?Q?DZNGga2E9PLhpkI7ABy7a33u5I/aKFLEX0kF6qjLVW/9sJGCxJvX9+QJPbbC?= =?us-ascii?Q?L8ay2ziUT/rTRpEzXHFQeo8YDgXurblLAoPWFVnr7mNSHbes9D44KmNQNG88?= =?us-ascii?Q?OOjgwj2JiPSZV/e7CGpeU5dA5ukxmlxELIC2vMyOEtROxFVSJt4L/mhI1sbz?= =?us-ascii?Q?6uktCMybIqIJVAmWuXJUPgIn1TVWBpIfwKAWh+xqY4U3dpdYIAwQ1J3Yp8kA?= =?us-ascii?Q?blxktQAHzlmNr5CZly96ONq7LzaOaWe17EdhPQJr5+JVAwqi90Bizbxz8zqm?= =?us-ascii?Q?1TrSqmlspl3DBAbLSJVII4zpT3cA/gtU66arktmbkQxKHY9FMtYxKPQGTK2c?= =?us-ascii?Q?OKZF7+OF4SD2Z+zGteppSa6cG5kEDK2IF7kPhnSRuMERS32bRqFl7M6XGy4z?= =?us-ascii?Q?O+VJmjnPv5hJWRorl7gTwkg49yxUml+q8kKUmIB0dDBF/xkLqoxBYd8KF5ry?= =?us-ascii?Q?f1GrSbgDmZHIQoSmwMdpXv2HRqJRQ6LfkuSyeMNqiFMcLQB/B5SguZK8XQvM?= =?us-ascii?Q?KGfmYVR7kBBqm0OU/jSDeKH1NigCE+xdrmSOTJ3aVOCrFKLdnt2oWm1Ik0sC?= =?us-ascii?Q?gtDpGk9BEV0kf5+neL38Kblz1HUrhFtOfi5DYVijW0bobg7i7wolzCkU0j9b?= =?us-ascii?Q?etHSmjDABpqRiUTIWkG78dkY7ffAdI2rLmzelgbrYLfkyOY7ri6fqNkGv0a4?= =?us-ascii?Q?FgJgQxpDaqLJVDcHwDvZrwfkGfTIn9qAlarqOMW2Kv18nKLbl3n0vMVWIF7h?= =?us-ascii?Q?j+cu5u98tajlNWlnjIBvSasckgErZcyMoXQKVNTPk4A2RMQDEw=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2024 19:56:24.0679 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a57dcc7f-8b46-4fc3-29ea-08dcf78a9a21 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000075EF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4044 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org After refactoring the power library, power management operations are now consistently supported regardless of the operating environment, making function pointer checks unnecessary and thus removed from applications. v2: - removed function pointer validation in l3fwd-power app. Signed-off-by: Sivaprasad Tummala --- app/test/test_power.c | 95 ----------------------------------- app/test/test_power_cpufreq.c | 52 ------------------- app/test/test_power_kvm_vm.c | 36 ------------- examples/l3fwd-power/main.c | 12 ++--- 4 files changed, 4 insertions(+), 191 deletions(-) diff --git a/app/test/test_power.c b/app/test/test_power.c index 403adc22d6..5df5848c70 100644 --- a/app/test/test_power.c +++ b/app/test/test_power.c @@ -24,86 +24,6 @@ test_power(void) #include -static int -check_function_ptrs(void) -{ - enum power_management_env env = rte_power_get_env(); - - const bool not_null_expected = !(env == PM_ENV_NOT_SET); - - const char *inject_not_string1 = not_null_expected ? " not" : ""; - const char *inject_not_string2 = not_null_expected ? "" : " not"; - - if ((rte_power_freqs == NULL) == not_null_expected) { - printf("rte_power_freqs should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_get_freq == NULL) == not_null_expected) { - printf("rte_power_get_freq should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_set_freq == NULL) == not_null_expected) { - printf("rte_power_set_freq should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_freq_up == NULL) == not_null_expected) { - printf("rte_power_freq_up should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_freq_down == NULL) == not_null_expected) { - printf("rte_power_freq_down should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_freq_max == NULL) == not_null_expected) { - printf("rte_power_freq_max should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_freq_min == NULL) == not_null_expected) { - printf("rte_power_freq_min should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_turbo_status == NULL) == not_null_expected) { - printf("rte_power_turbo_status should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_freq_enable_turbo == NULL) == not_null_expected) { - printf("rte_power_freq_enable_turbo should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_freq_disable_turbo == NULL) == not_null_expected) { - printf("rte_power_freq_disable_turbo should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - if ((rte_power_get_capabilities == NULL) == not_null_expected) { - printf("rte_power_get_capabilities should%s be NULL, environment has%s been " - "initialised\n", inject_not_string1, - inject_not_string2); - return -1; - } - - return 0; -} - static int test_power(void) { @@ -124,10 +44,6 @@ test_power(void) return -1; } - /* Verify that function pointers are NULL */ - if (check_function_ptrs() < 0) - goto fail_all; - rte_power_unset_env(); /* Perform tests for valid environments.*/ @@ -154,22 +70,11 @@ test_power(void) return -1; } - /* Verify that function pointers are NOT NULL */ - if (check_function_ptrs() < 0) - goto fail_all; - rte_power_unset_env(); - /* Verify that function pointers are NULL */ - if (check_function_ptrs() < 0) - goto fail_all; - } return 0; -fail_all: - rte_power_unset_env(); - return -1; } #endif diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index edbd34424e..f4522747d5 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -534,58 +534,6 @@ test_power_cpufreq(void) goto fail_all; } - /* verify that function pointers are not NULL */ - if (rte_power_freqs == NULL) { - printf("rte_power_freqs should not be NULL, environment has not been " - "initialised\n"); - goto fail_all; - } - if (rte_power_get_freq == NULL) { - printf("rte_power_get_freq should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_set_freq == NULL) { - printf("rte_power_set_freq should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_freq_up == NULL) { - printf("rte_power_freq_up should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_freq_down == NULL) { - printf("rte_power_freq_down should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_freq_max == NULL) { - printf("rte_power_freq_max should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_freq_min == NULL) { - printf("rte_power_freq_min should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_turbo_status == NULL) { - printf("rte_power_turbo_status should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_freq_enable_turbo == NULL) { - printf("rte_power_freq_enable_turbo should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - if (rte_power_freq_disable_turbo == NULL) { - printf("rte_power_freq_disable_turbo should not be NULL, environment has not " - "been initialised\n"); - goto fail_all; - } - ret = rte_power_exit(TEST_POWER_LCORE_ID); if (ret < 0) { printf("Cannot exit power management for lcore %u\n", diff --git a/app/test/test_power_kvm_vm.c b/app/test/test_power_kvm_vm.c index 464e06002e..a7d104e973 100644 --- a/app/test/test_power_kvm_vm.c +++ b/app/test/test_power_kvm_vm.c @@ -47,42 +47,6 @@ test_power_kvm_vm(void) return -1; } - /* verify that function pointers are not NULL */ - if (rte_power_freqs == NULL) { - printf("rte_power_freqs should not be NULL, environment has not been " - "initialised\n"); - return -1; - } - if (rte_power_get_freq == NULL) { - printf("rte_power_get_freq should not be NULL, environment has not " - "been initialised\n"); - return -1; - } - if (rte_power_set_freq == NULL) { - printf("rte_power_set_freq should not be NULL, environment has not " - "been initialised\n"); - return -1; - } - if (rte_power_freq_up == NULL) { - printf("rte_power_freq_up should not be NULL, environment has not " - "been initialised\n"); - return -1; - } - if (rte_power_freq_down == NULL) { - printf("rte_power_freq_down should not be NULL, environment has not " - "been initialised\n"); - return -1; - } - if (rte_power_freq_max == NULL) { - printf("rte_power_freq_max should not be NULL, environment has not " - "been initialised\n"); - return -1; - } - if (rte_power_freq_min == NULL) { - printf("rte_power_freq_min should not be NULL, environment has not " - "been initialised\n"); - return -1; - } /* Test initialisation of an out of bounds lcore */ ret = rte_power_init(TEST_POWER_VM_LCORE_OUT_OF_BOUNDS); if (ret != -1) { diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 2bb6b092c3..6bd76515e6 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -440,8 +440,7 @@ power_timer_cb(__rte_unused struct rte_timer *tim, * check whether need to scale down frequency a step if it sleep a lot. */ if (sleep_time_ratio >= SCALING_DOWN_TIME_RATIO_THRESHOLD) { - if (rte_power_freq_down) - rte_power_freq_down(lcore_id); + rte_power_freq_down(lcore_id); } else if ( (unsigned)(stats[lcore_id].nb_rx_processed / stats[lcore_id].nb_iteration_looped) < MAX_PKT_BURST) { @@ -449,8 +448,7 @@ power_timer_cb(__rte_unused struct rte_timer *tim, * scale down a step if average packet per iteration less * than expectation. */ - if (rte_power_freq_down) - rte_power_freq_down(lcore_id); + rte_power_freq_down(lcore_id); } /** @@ -1344,11 +1342,9 @@ main_legacy_loop(__rte_unused void *dummy) } if (lcore_scaleup_hint == FREQ_HIGHEST) { - if (rte_power_freq_max) - rte_power_freq_max(lcore_id); + rte_power_freq_max(lcore_id); } else if (lcore_scaleup_hint == FREQ_HIGHER) { - if (rte_power_freq_up) - rte_power_freq_up(lcore_id); + rte_power_freq_up(lcore_id); } } else { /** -- 2.34.1