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 7653445B5D; Thu, 17 Oct 2024 12:27:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6133740662; Thu, 17 Oct 2024 12:27:33 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2070.outbound.protection.outlook.com [40.107.101.70]) by mails.dpdk.org (Postfix) with ESMTP id 6C5BE4066A for ; Thu, 17 Oct 2024 12:27:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q53oCs2NZ4lU2F9Uhh/LzcdOd2p605JYMvR4bv9FGCLzDPWG64LEcra407RQ/SQJLznwxoCpas+cgESJS9qyUHV4P0lB9UN4mQrBlXVRrSbc+s8+62o1BAZEazSG6oy+clsFHZyHLJ2NXock7gAGC1OgicSjN1twrukkVElGzdHyCYTbHEYbql81TQkaCY6F23EziJ+NqlJn9tA1ATKm6uKU0I+ffm5OJ3ONvsYwwsnqpwvYe1IftxZ54XHh95pbrUc4iFEsNGcnSRM8bT3B31gYPwWQczHdQIwokZ5mPURsxxW4EBYPBuBe+kPrNxmeNvPyDMy9abmXdiLqekjUHA== 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=UZjqh9aS+N/OrRMSDe/FmBk1/eNneMwB67cdXGY3glnQgbuRg0No3qE+W99Nyv3f9a9WgRwkrUMuHQaJxsAaugMrz7o9JUyn7DFQNo2/zCjkgVD5p/CcHLhb+z2a1ksopc/5qniY3X/o700yA61TLkkEPMKSPRFtgSBXofC5xcOuxAIA89e4ciflvEvnNVCOE/tGwk1BfZG0A2SDZzlPL6EIhnW7+wdf8aOM0fCz96fUqCenDhr2G/zY4pNkTLobE1ckmcq+PVWKH2fmsdli6zVvi0XMqcnQTgqyyefZUVE+Y5rbK6zMOrDlyZn4kt6DGyzIZpZUqILDfwaSXMdL+w== 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=r1a7LyqJ3slBsn9ccxsdjK/c/9MvpI6GWFkGfmRB/emjg8FFLdjEYRox4b6U7zXWIywFmzgLH3650/2Wj/SyqbZpZXPZsY/kRkJfqBkI/Qg1EWN7JGrio8EV3X2bJZDpkVOFHTtFIB67igfwKfXonjZRRr0dSHvVfZ/VNopLDCI= Received: from SJ0PR13CA0151.namprd13.prod.outlook.com (2603:10b6:a03:2c7::6) by PH7PR12MB9068.namprd12.prod.outlook.com (2603:10b6:510:1f4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.18; Thu, 17 Oct 2024 10:27:22 +0000 Received: from SJ5PEPF000001ED.namprd05.prod.outlook.com (2603:10b6:a03:2c7:cafe::e1) by SJ0PR13CA0151.outlook.office365.com (2603:10b6:a03:2c7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.8 via Frontend Transport; Thu, 17 Oct 2024 10:27:22 +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 SJ5PEPF000001ED.mail.protection.outlook.com (10.167.242.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8069.17 via Frontend Transport; Thu, 17 Oct 2024 10:27: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; Thu, 17 Oct 2024 05:27:19 -0500 From: Sivaprasad Tummala To: , , , , , , , CC: Subject: [PATCH v5 3/5] test/power: removed function pointer validations Date: Thu, 17 Oct 2024 10:26:47 +0000 Message-ID: <20241017102650.1041030-4-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241017102650.1041030-1-sivaprasad.tummala@amd.com> References: <20241015024959.3478399-1-sivaprasad.tummala@amd.com> <20241017102650.1041030-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: SJ5PEPF000001ED:EE_|PH7PR12MB9068:EE_ X-MS-Office365-Filtering-Correlation-Id: 56fbc773-d2ca-4dd9-25ef-08dcee9649a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Eudx8QRq87gyd8OJ2qj0ixjjO5Uck0LB6uuHz3jW0XDTCjwJ0ivrcQCbKyJn?= =?us-ascii?Q?7iHgT12Cr+hTexmFhy9cfDi9fbFEHoFXur+65Y9pWw6QcA4+AaU2Xeu6VygT?= =?us-ascii?Q?WiUcjBXZyxhk6iKratdntrJP8T8He+GYJkx05K2iz1SAb54TeO1aObdbYay3?= =?us-ascii?Q?wFXZcEuJZXCjyoPsfbkLon9+lliqLzle8r+0PNG8Ax9ztouZuvaWPAsBFGK5?= =?us-ascii?Q?BK1zykseSCiw/89hmXg5onzp9pBHLnWMySn+tFPfaAqSC2i4IuyrsqGP8Zal?= =?us-ascii?Q?ybVpyUwh38cTYFcHQdQ7/l2JwrdivFdB+x4IL6R+cQ9Zxne+S+qP34Ega6lh?= =?us-ascii?Q?H5unvkr0PGfDeVAYA6Hs2G18KcHaN+dY8zISDsV3igHlw4R92OUeF+oq2rtM?= =?us-ascii?Q?bmyu/ITJfp/WcsJOtT/3/HemdF3ps4yEAdrMoXKTJ4XcSAb3ShvLSaGzJFCr?= =?us-ascii?Q?uoHsHeMCtObvefGFiM7HX9ezFwZ1kvlmZSTtd/CF1WsaKUZYyjJEED7dfcMr?= =?us-ascii?Q?c2qOH+i2kzfGnhLQCVw3rerrMGUAeCa68HHjdzCo4k2TpfV5oEl7X9GI6cNS?= =?us-ascii?Q?6RpYVnuPm/LW7cbvovBLy8J7aNjeG7WDGLYk8o2PwpAIjItw68g6plyJnOn9?= =?us-ascii?Q?bSajgfzy0CeTFvtrjEIaN2nWlbtTXTlgN8lyhpZxRk3n2K5KfkQg0Sjv8Gvx?= =?us-ascii?Q?KuMjqTaaC/M0V8Nf3NlN2I+QPF0+n6gCFuXje1UkGtL16vq0Ilk8Nv3KBi5E?= =?us-ascii?Q?A28TM9Z6IAK1OXUeQpsD6U59zvHMFSRbTPMviuL1cBRAc++3JnE/rDBQ/Qw9?= =?us-ascii?Q?8N6AzW3+7HFyXPf+T+eHH/SK34VtSCbQI6LGBUYxBLNijeM+Li1A26rq78Y3?= =?us-ascii?Q?lXIi/t3XUbQWEt8GOoWoIwIkcXyc6yRh7yTLDEdYoRxkfAE5BtD1Lms9Al++?= =?us-ascii?Q?hyiDxJ3MTDwqBd1/DeryaeuFg3VSMrOnDfvYqI6z/39vj3UTzKevJYgWJQQj?= =?us-ascii?Q?0cm6wJRoWM5L1reidRXwJgFk4jqj/nkgOhDRpHSDj2L2fTwvCnPo+fv3R6uf?= =?us-ascii?Q?KJc0hgAhG6b5TE19fx9UB9cWWtNP2pc55192vEjIp9ePlZLk/jOtqnyO/QcY?= =?us-ascii?Q?OSzuE8KKXlBEBz5tvMUY35hYS8SCw49hxsdyoD8r5VOe8ke7UYAdplDd4Rg1?= =?us-ascii?Q?kiVbbe1iDIct7cBEDzhMSLxfX8YqR4Xu7KzCJwlA0L2SvZknstbWlyr5VBTC?= =?us-ascii?Q?5rB4YCVLGsY1GchWh65680Gca76NtMQ0ne0IuHzWdE0WBHu9OwTFOa4BuxfM?= =?us-ascii?Q?FEkyuKAiirSSkDNoHUwaESoBvnTLhHzm852sqre5pWwDZoR51poLycOGTaob?= =?us-ascii?Q?2e0I9LFkyFT/WZfllhKCxUbr8W6JgWgjcD4cinX4n0QIT8uvWQ=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)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2024 10:27:22.6557 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56fbc773-d2ca-4dd9-25ef-08dcee9649a7 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: SJ5PEPF000001ED.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9068 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