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 EBADE45B3C; Tue, 15 Oct 2024 04:51:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1246940652; Tue, 15 Oct 2024 04:51:40 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2043.outbound.protection.outlook.com [40.107.220.43]) by mails.dpdk.org (Postfix) with ESMTP id 69A5140652 for ; Tue, 15 Oct 2024 04:51:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=l5kPZqs1+w1ok4HifYYuEoNor3A4gYCetabA5btKjiZeQCrwW5RbcIg1IiC/Hyf8OySCAYgosXGZmPvV2I0P1azjliELyg/ezC+4T9bMKiQzV9BsemezbztW2DBoT2XxFdzQ6NwJ3gPZS+t2XBBB1SFe7ej+NL5LjJGeYQaLcslwN+ZVjobhkY1H4KcixWI9fPfLfZ2g83FWN3nawCh7VHfCUgF+vYixlVHVnXcEydLt7jNdCkXGBoKH+/lIjz3lQIhRWIMD7Tq1oj3a9AJwzS8/DI9qkjAsRwkeIUlGTb+zTkpEneq4kNblff8aKa901SfcE9nSfj2ValzPtDDmpw== 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=l9CAsKWfalPHzN4JTj01lLBSxrkkNvX4zoltm9rUe2Y=; b=hCiCaEj9iuxZNoTmznv4zX7OtzGym+a713ZR5wYYIwIs2IEJQziFEf5aDzc6PeF1m0VxG0zUXrhTfJtSEGkIGbsdE7yhnaQxN4JaHTuS494709xYUD7GonLGI1k6HwveZMsa1hTsgaSY2G4MPyAf95wK9gFpTOgLzFOlQWuDEorjP0cyHQZRjy3eGTqQFOJfBi+cx2wvS6hRCOrqOl6FLA6mSl6bbDQFsJD2j37M1R4hCJxDM9okhbXc1sYipAHS2HW9nUJL3z86fUwCqMzN6VJnSwz+AZ0xfbY1eOUQTFMfoKg3tTv4w1Zi2zaeqlS5YEBmA06pDMT+PlDA1RR9dA== 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=l9CAsKWfalPHzN4JTj01lLBSxrkkNvX4zoltm9rUe2Y=; b=Ahbpn5W8dGjpMHxTiTd2mdsdvjQY+3KM0uJcVU/7q/85Kd6l9bwHivf4tktYWZiIyeUYgmMgm28Ogw4oph17K8bO3Qy0YhhTJSdHnEhbSNTNb5wLetHGI6QvCPUBElserJIFDpfUgFyd79iKbesvng/6ct/r1vQUl5QYSf/ne2s= Received: from SJ0PR03CA0209.namprd03.prod.outlook.com (2603:10b6:a03:2ef::34) by MW4PR12MB6997.namprd12.prod.outlook.com (2603:10b6:303:20a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Tue, 15 Oct 2024 02:51:35 +0000 Received: from SJ5PEPF000001D2.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::cc) by SJ0PR03CA0209.outlook.office365.com (2603:10b6:a03:2ef::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27 via Frontend Transport; Tue, 15 Oct 2024 02:51:35 +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 SJ5PEPF000001D2.mail.protection.outlook.com (10.167.242.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8069.17 via Frontend Transport; Tue, 15 Oct 2024 02:51:22 +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, 14 Oct 2024 21:51:18 -0500 From: Sivaprasad Tummala To: , , , , , , , CC: Subject: [PATCH v4 3/5] test/power: removed function pointer validations Date: Tue, 15 Oct 2024 02:49:56 +0000 Message-ID: <20241015024959.3478399-4-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241015024959.3478399-1-sivaprasad.tummala@amd.com> References: <20241008172719.902619-1-sivaprasad.tummala@amd.com> <20241015024959.3478399-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: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D2:EE_|MW4PR12MB6997:EE_ X-MS-Office365-Filtering-Correlation-Id: 8623eda2-efa8-45a7-4335-08dcecc4486c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?T0NFheCsZm19eJQVB11RGe1g26Sr3G96OuoSKB+2n7ipN3YWMNhEingcG234?= =?us-ascii?Q?i4laVJU1QDiQC5Bb3ktE9VxDxLshHZZKFfTK6WRiq1dPHIQIjSaZByKcSeRY?= =?us-ascii?Q?mmu8I7C1iJnKNs/57UMcXNCK+s9xCd9qH8Vh4WkuDv1qLZ67ihirv6sCGkVl?= =?us-ascii?Q?Hn5Ba91mTcoDyArwintYrDxzZwrsZBRADJiFjTtbWIUrDvu81umvZ+Z8CfUb?= =?us-ascii?Q?2Psy9ts9Uoe6oEe11ltcwjoL3/tIeyVNpapxNL7XGT8KoRUHiMahd1vJgGmA?= =?us-ascii?Q?bjULMfgTX/hGB1Yu0VNfZx7VZVQ63g3JUbUpHA9P6YYVzaDSqG+IAsvxH0k1?= =?us-ascii?Q?1dCw+Z/3sYETZ8qYe+knl+lksX3HS6wjROLYDFlzzslbIlJ1GWJQMGNrmNOu?= =?us-ascii?Q?dIDaVblphFkTLkPEd7Yqrn+NP3OhMk81kJY7Z0c8NrN5gQLZiQS2XOzRvjIn?= =?us-ascii?Q?PPT8KmZ2SXLHl/OP3SOENzwwnKPPMZL6seUP37ZKDQ/FDY3gaAUgW6KrOnD8?= =?us-ascii?Q?DcN2s1CzBBa8xI8IDH43TMPo0QR3xMiy1SApdUrs6TtlBsi3rhowTQR4FbtR?= =?us-ascii?Q?NC0plKV1/HVrD6GKj3gf4KJv3t6QzALjE7x9vvpS2ckPPOIkRKGRfLtWuVon?= =?us-ascii?Q?6VeJAbnLIm8uOsAlmagESD+E5DbJp8FkVL3lPMsk0hv9UW6XGtN4f/5Foas4?= =?us-ascii?Q?Eug/KXnkvsGcw6vt3vLGdXQk3HCPcTIbBTPtlj6lav/gdaUfMzMjE7DIstO4?= =?us-ascii?Q?N/Ns2gEfIoYjApMe/RqFhTRR3aVa5CFtpiZ8Hdi9OSXK/ECU2Br7gNtnhvCO?= =?us-ascii?Q?BEH5jG95H8E2gTVMYdS64/qp2AU/iK1dXlscfudRtk1XiQaEj4tgpL3hrJE3?= =?us-ascii?Q?NJIya/6Jo+PpGL0qce08gGeMwymhnEwvS+QDufBsroTgDjVt/YQOvM+r3VGc?= =?us-ascii?Q?cCIAuE/jfbgyhhOfJgr2G6OUpjT0m0tbfiSkxk7Pq2kFWWDCwZbroOP5NaYO?= =?us-ascii?Q?6+bzbM6/wenWvX/SSxrGcZqp9J06Lm9o3BrPj3JFLBj90JiSDuqLJXFmgokm?= =?us-ascii?Q?iiMa3/7nBTE2NWT17oPHQvGmQGVuHotHzUgv5G5F1P6qcBMedTvYDC9qK2wj?= =?us-ascii?Q?EOiDDy2J4wCnoBE2ER0mHxjMpJkDEoDLM5RZ5xXZv3fnUX8gSxwPGOH86QiY?= =?us-ascii?Q?3oBfZS75XIFlqltxSHzrO/E+RswSYnYFXSdQvXuAmqn0VVdS3MYnDNIktV+1?= =?us-ascii?Q?XCU56ifNRSVqe88X1cWUZZ3BdOgufikSoGidzEtpdk5ofBiuY5WjIRbmG1o0?= =?us-ascii?Q?weJZhIbtSxL4UO86G/PqdK3AZ2YVa8xcr+j1hb0FxFbntuPIde3qzcICVtm/?= =?us-ascii?Q?fgKHn8cEzvm5QTsJbdh6WzVGMaIb?= 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)(376014)(82310400026)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 02:51:22.5067 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8623eda2-efa8-45a7-4335-08dcecc4486c 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: SJ5PEPF000001D2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6997 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 619b2811c6..8cb67e662c 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -519,58 +519,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