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 4D3E745AE3; Tue, 8 Oct 2024 19:43:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8C6040E09; Tue, 8 Oct 2024 19:43:41 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2087.outbound.protection.outlook.com [40.107.244.87]) by mails.dpdk.org (Postfix) with ESMTP id 3488740DF6 for ; Tue, 8 Oct 2024 19:43:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ORyi/VASwLKLhHS2FwBkN3mRSTm6OdKZi/tq45CKfDjUpcW1/9qSnRFIbeCu2981XZ+c3x3nLgS2ZST4b/SNBNfkym+qlIQhz6FALnbctge0g3XCLmMIr638KqFY3zp362baJJbK0HezS8e16ZM6LQZvxnkJDO3ZJW8fog/v04avZxTKJ4slbQiV+HgvN3tzgOPbAahJcUfJxqRRCrrrzQRGEblSk5txVETZpqXpqS7uq7y0drLo2aFkDrbokEUJqWcmz7RjmNcveeddFE6kdNlG+E/eqR/br58Tpz+j5wa2TROZq/tWo0xKfcWOSzKMDgC0uewKfUaTbM6Dj2gJTA== 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=a/l11avgersTT3lgH8yZeIOS4QEgd7Mi8qn2DVnmhx4W3V6DisF2lzc59XUPJUU9gEYw60xupvctfP2KHiHK4zOswjWq3T1yhSBs1Q71gH/czEI/jw6lLHM9Z3u9/C9hbnt8exZk8n23W75FODoQV6JvK+4uFgR7Y37G4JdK/fdQ/uA83axnS1M6feTgcqFT5V8iGbXwfiveSa/IVXgo+2oSteMY92u9H1/8NdIW2ou7lQ3JApPAM8GQ+IhUsLTEzHQHSR/e5oM3ogCKv+cC32GFn6yYoapGHp7qH1zpFMLGuavHKPxL/+o12gGutSV8krXPiww5481BUsg3EktYeg== 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=Nh0b99ZInfnqAvfHPCBFd40tMf3ryanxzBsRuILMwUE531S6nC0cxMfttvI0K2iDpMgPzQj34gSxNeEsDGcyq87tQi5xJqVCDBMir71dIhTrXqkbKftX25AWs0cO1QeGn6xWUryBKORTcEQc5XVmDqaL9l6oWlQOlDlO2ip1sFM= Received: from BN1PR12CA0012.namprd12.prod.outlook.com (2603:10b6:408:e1::17) by IA1PR12MB6457.namprd12.prod.outlook.com (2603:10b6:208:3ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.23; Tue, 8 Oct 2024 17:43:35 +0000 Received: from BN3PEPF0000B371.namprd21.prod.outlook.com (2603:10b6:408:e1:cafe::db) by BN1PR12CA0012.outlook.office365.com (2603:10b6:408:e1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.24 via Frontend Transport; Tue, 8 Oct 2024 17:43: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 BN3PEPF0000B371.mail.protection.outlook.com (10.167.243.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8069.0 via Frontend Transport; Tue, 8 Oct 2024 17:43:35 +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; Tue, 8 Oct 2024 12:43:32 -0500 From: Sivaprasad Tummala To: , , , , , , , CC: Subject: [PATCH v3 3/5] test/power: removed function pointer validations Date: Tue, 8 Oct 2024 17:43:06 +0000 Message-ID: <20241008174309.1133051-4-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241008174309.1133051-1-sivaprasad.tummala@amd.com> References: <20241008172719.902619-1-sivaprasad.tummala@amd.com> <20241008174309.1133051-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: BN3PEPF0000B371:EE_|IA1PR12MB6457:EE_ X-MS-Office365-Filtering-Correlation-Id: 71a6c4d3-7372-4bca-4dbc-08dce7c0bc04 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RIADHU+vyFpdJHNCIghNffA1pRgXNJSPet9jvdVu0d6EUFLwMlCEkXyflWUp?= =?us-ascii?Q?quSmcV1i/AfYSMqQe+diuF8kNZdB4QQ6RF4K8Smr4JLZYIGrIklo6mXkUrNK?= =?us-ascii?Q?F9EMrCYqVIZzonFyRyFyCnZpsV4R8K3h9smwp/iXsLSv3TKbG57UiLRRxwSB?= =?us-ascii?Q?LTRyUdqxWU/ISeFiMX7lmL1015ltrc6bMRc0+qKd/kK4rSQ9gs27BiwFUdz7?= =?us-ascii?Q?aLTjx2AkTG/5nYSsugQoNSlRtnHs6O/O7BsBHMFIEFJgTbANE8ppfIZZV2ac?= =?us-ascii?Q?k9j/La/07FXCssSx1L8odUCfvSUeH46+PhnE5V/qMrpqXSBTzOgvNcBwBSkY?= =?us-ascii?Q?gwuiSIsQjykAPH4rZQ28jeF8CckvT/hZ9j4lzstJltTYluItbxwb1a3COVR1?= =?us-ascii?Q?Mj9pAZXOGqmV7K3zttM+vza0nM8t95K86aTyPutXXNh0Q0lW/xYNN5dX50l9?= =?us-ascii?Q?LUw2mDJ06c1XxgbNWfGf18Wny2apFKqwj+lVPZJg2aQwgJkkpJBOHn7D5NeS?= =?us-ascii?Q?eDEB3bmi/41W0m0l5Rk5wm9VbkSA/sokmcSX+qS7kVswLbszS9vVsRpisdv6?= =?us-ascii?Q?1m6lSm5Lk5OFHxURS+Ofvk/9TV36yz3Ts43LiUq1UOFU1L862cWGumQWdOad?= =?us-ascii?Q?L86HFsAsCAR+N2iSRLFn/vmBvqe6E8hHYv5tWBLAuyn6Cd6TT/BbVXj10VZi?= =?us-ascii?Q?G0WMFdBi1B7fJH2ChZgtrKcZCDLEyJz+tI8wbQeYiIO7V2FVJgd6AdxO5Tbo?= =?us-ascii?Q?XpxCI4bJvx1F6FrhkjnA5t2kjs3cy/kjuRa604uMZa63EC/ZaPgZnP6KM3o2?= =?us-ascii?Q?lPR1e//pAtUmN1uxHWRjhYulYukB4L/mojWB0p4nsWqjs7adE/7fMJeRg/ID?= =?us-ascii?Q?1SH4GdeIzW/920ynXL73j0oBxBSBCAKHneDcsZFG6TLJKNbi93a43/KfJO5k?= =?us-ascii?Q?o2ECoONE//VxTAa960oLy4Qwyxr1S18cOBU2FypOv+MYR8dYG69QsE6MNzMh?= =?us-ascii?Q?JS07Hwz6T6UtJMh2LTT1auED1CBuVUcfRQTSZCWpilVeHTK0wpSYaWtYKdGJ?= =?us-ascii?Q?ABA6XMjyv/SuG1CxUS/ZmCUNKwNzzM7R403ACF+rq5TlKm50wInmkDU18mT6?= =?us-ascii?Q?u+4JWP03eQf7jqWeiklVBbZckbM1Y/MCGxUYIBuP777xhp7MmVdjH1vmpUUT?= =?us-ascii?Q?/cG/iuk5w/ko9PBgGdjZb981m+RpsjJESzGltq90tFbg/l/VQVIbfP9THLHI?= =?us-ascii?Q?D0CgX6bGGQvzsxKzqMFVFj8ETMI3OWqfUkb2cZLG9VmtqZ1+eINrKXafPGi6?= =?us-ascii?Q?ZQxX+CUW9Skbf1j7Jge+DdIJ5ryoXvYkYuzMjdC0Fb2/nqOB36kcQ4rmvVmJ?= =?us-ascii?Q?RPX8deXKUUm/TAdnj3KkVMmUaKSY?= 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)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2024 17:43:35.3122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71a6c4d3-7372-4bca-4dbc-08dce7c0bc04 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: BN3PEPF0000B371.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6457 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