From patchwork Sun Feb 25 15:03:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Mattias_R=C3=B6nnblom?= X-Patchwork-Id: 137174 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A10543BD2; Sun, 25 Feb 2024 16:12:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE85242D89; Sun, 25 Feb 2024 16:12:03 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2064.outbound.protection.outlook.com [40.107.6.64]) by mails.dpdk.org (Postfix) with ESMTP id 3C5BE402C8 for ; Sun, 25 Feb 2024 16:11:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MrkN+TsHFXlsU+ETU3g9VI7PDxGHMyEXaon81kuqcYarK5Iou+uJV/DoFOPmFuBSRXGxx+OxSn4rIwBst4O7Y7SjMN4xDpGPEWAB7rUfl+QspqLV4bbHAiSREYeZJeTU2zCCP5I05ZlnHYIGSOPftLMHewtrtvyt1FeuADEvlodNjo3Xq3mZ/rrNX6JKePrWcU5ccCExrzWRK5GRymRTCAul35zLcfPe0SE8si+XBd42mz0vevPst4I7Fd/fl3ozuqmjx9ryDCX+pGCDiJYfXbIuuzVpsrckuy3nahUgdlqk7irdB9FGYiTz8GbWMUeI2BF3ETq9oMizjts5Fb2c2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=hA3eebkW386q9v1GUm1Am8s0DTEito5MB0PqT9AGAX8=; b=PlB6jkbpWWkwXDj2wn/1fgII5tnZzIB8v/mGoCN6hADN8VfTgmhIEpTJVpPQhcBbZ/5lpGToqKe+bCMEQuz0ZDUpWzs7hHDUqjQxlgsjfmGAKqD+Bphvvd0mlhljI3XdiuQc5avqC9HeFC1C9KOhcsIZSRwagaBF9tdfrNvzEDCND37w9gQK3kF6sHzjJDSPTeD+ReU6QfybH2cZvRTqUrKX7Y/yhiALqVj/8opsWu8k8Qv9CljFiQDBGQzKDT3LTMcdRY4gIZMeuUZeoVWoHp828pVGZ9iyGixNjUVMT8/ttm6j55P583heJvD3j9AGENZsOUhwofT0F4oaokK82Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.176.1.74) smtp.rcpttodomain=dpdk.org smtp.mailfrom=ericsson.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=ericsson.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hA3eebkW386q9v1GUm1Am8s0DTEito5MB0PqT9AGAX8=; b=kvMyrR0h7WASK8b+spwUjxxTcY7i1P/sMmkLs34Na8NjC6auqKag2PDIwqsIvHtEqE3penEB8FEiF3qY94/QOKsMcuCHur2UmZq4OxKpd6yzsfDiS6Wki2R6F+tmUQvY/MZVW+Dpa6gS/TuRAQcmowOz5pq4IQs4VmkM4ixdk8HaThtU06DghIUJCOwwW5OGot6o6Irxnj8JMh0peanZIyk8eXwh4WIOuFZQR2cMBlFKoGbKK6s5KHr6a1Dw0FbhPHcokS4CA5Szov9JtF8ni0KG3o94dGXjTlSWs2XquZVLa7quBwtpl7VXjVjPiqUdFdmSYfw8XgFOr1+b+WnyLg== Received: from AS9PR05CA0280.eurprd05.prod.outlook.com (2603:10a6:20b:492::32) by PAXPR07MB8370.eurprd07.prod.outlook.com (2603:10a6:102:227::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Sun, 25 Feb 2024 15:11:54 +0000 Received: from AM4PEPF00027A65.eurprd04.prod.outlook.com (2603:10a6:20b:492:cafe::54) by AS9PR05CA0280.outlook.office365.com (2603:10a6:20b:492::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Sun, 25 Feb 2024 15:11:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.176.1.74) smtp.mailfrom=ericsson.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ericsson.com; Received-SPF: Pass (protection.outlook.com: domain of ericsson.com designates 192.176.1.74 as permitted sender) receiver=protection.outlook.com; client-ip=192.176.1.74; helo=oa.msg.ericsson.com; pr=C Received: from oa.msg.ericsson.com (192.176.1.74) by AM4PEPF00027A65.mail.protection.outlook.com (10.167.16.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Sun, 25 Feb 2024 15:11:54 +0000 Received: from seliicinfr00049.seli.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.63) with Microsoft SMTP Server id 15.2.1258.12; Sun, 25 Feb 2024 16:11:54 +0100 Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100]) by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id 0D11D380061; Sun, 25 Feb 2024 16:11:54 +0100 (CET) From: =?utf-8?q?Mattias_R=C3=B6nnblom?= To: CC: , =?utf-8?q?Morten_Br=C3=B8rup?= , Stephen Hemminger , =?utf-8?q?Mattias_R=C3=B6nn?= =?utf-8?q?blom?= Subject: [RFC v4 4/6] power: keep per-lcore state in lcore variable Date: Sun, 25 Feb 2024 16:03:28 +0100 Message-ID: <20240225150330.517225-5-mattias.ronnblom@ericsson.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240225150330.517225-1-mattias.ronnblom@ericsson.com> References: <20240220084908.488252-2-mattias.ronnblom@ericsson.com> <20240225150330.517225-1-mattias.ronnblom@ericsson.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM4PEPF00027A65:EE_|PAXPR07MB8370:EE_ X-MS-Office365-Filtering-Correlation-Id: cfb3736a-6191-41f2-7133-08dc36141a35 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xYvEZAUCcUC6FFRCDLojceLDJP46OM2FwPNUyVPn9Sa2IXPWxy9mJHBEzIDlqAwgeRQQGxTyxxjCtX2tcKQc8vE3PnyDbT8akzlMYTDmLDXfLHTAAww5Bg4TCenPS9PDzs0VLTOBi3imugf/cd6bBOi/UjKfRfdus3VUuadXGluRS3WMMBqpUOgcjYJ6m8aHywkXjEln/XiqqNcj7qAM3M3gWICLDnFPFvRtcr/1NlIQWX/WCMceePMdE/SlU+nHOSSE5+brWCCjc+gHBJYbV99l6N2YDuWZLbAeqh/Inq0Z6o4lI9ggcCAbOEYWGaL1Zc0uNRhedi7v3Qn+HMAEzd96V+syiGmcXuSJKUXNmOkv+mghACtsDTW7dKHq03tzp8xbNRg94LfrQ9/DP6O26ieDZeyfM/aKBxM7N3OFB35ff9HGKNG30Qy2KsD64/SHNUcZBOx5kQHqVL5nwRaPg9pcVQFhlZROgyhv6+/ynbTJQfJcuUv/RarjreYz7rUvNKwUXNuCNJgtshoMg6rsKBzxbNByuGKA5XuZ/I9VdnJBnwc7ik2UgM/rpr3T2eCh9juxpqafrAgNs0WkMQESs9lqEU3LIMNXbBHgxhELzmKH6C4A4OgfhtOoKOUxDIGOkSoEyHTqQCtqqrGvoO0neNPyzwF1c3mhXi04yPsTIXc= X-Forefront-Antispam-Report: CIP:192.176.1.74; CTRY:SE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:oa.msg.ericsson.com; PTR:office365.se.ericsson.net; CAT:NONE; SFS:(13230031)(36860700004)(46966006)(40470700004); DIR:OUT; SFP:1101; X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2024 15:11:54.6254 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfb3736a-6191-41f2-7133-08dc36141a35 X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=92e84ceb-fbfd-47ab-be52-080c6b87953f; Ip=[192.176.1.74]; Helo=[oa.msg.ericsson.com] X-MS-Exchange-CrossTenant-AuthSource: AM4PEPF00027A65.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR07MB8370 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 Replace static array of cache-aligned structs with an lcore variable, to slightly benefit code simplicity and performance. RFC v3: * Replace for loop with FOREACH macro. Signed-off-by: Mattias Rönnblom --- lib/power/rte_power_pmd_mgmt.c | 36 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c index 591fc69f36..ea30454895 100644 --- a/lib/power/rte_power_pmd_mgmt.c +++ b/lib/power/rte_power_pmd_mgmt.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -68,8 +69,8 @@ struct pmd_core_cfg { /**< Number of queues ready to enter power optimized state */ uint64_t sleep_target; /**< Prevent a queue from triggering sleep multiple times */ -} __rte_cache_aligned; -static struct pmd_core_cfg lcore_cfgs[RTE_MAX_LCORE]; +}; +static RTE_LCORE_VAR_HANDLE(struct pmd_core_cfg, lcore_cfgs); static inline bool queue_equal(const union queue *l, const union queue *r) @@ -252,12 +253,11 @@ clb_multiwait(uint16_t port_id __rte_unused, uint16_t qidx __rte_unused, struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx, uint16_t max_pkts __rte_unused, void *arg) { - const unsigned int lcore = rte_lcore_id(); struct queue_list_entry *queue_conf = arg; struct pmd_core_cfg *lcore_conf; const bool empty = nb_rx == 0; - lcore_conf = &lcore_cfgs[lcore]; + lcore_conf = RTE_LCORE_VAR_PTR(lcore_cfgs); /* early exit */ if (likely(!empty)) @@ -317,13 +317,12 @@ clb_pause(uint16_t port_id __rte_unused, uint16_t qidx __rte_unused, struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx, uint16_t max_pkts __rte_unused, void *arg) { - const unsigned int lcore = rte_lcore_id(); struct queue_list_entry *queue_conf = arg; struct pmd_core_cfg *lcore_conf; const bool empty = nb_rx == 0; uint32_t pause_duration = rte_power_pmd_mgmt_get_pause_duration(); - lcore_conf = &lcore_cfgs[lcore]; + lcore_conf = RTE_LCORE_VAR_PTR(lcore_cfgs); if (likely(!empty)) /* early exit */ @@ -358,9 +357,8 @@ clb_scale_freq(uint16_t port_id __rte_unused, uint16_t qidx __rte_unused, struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx, uint16_t max_pkts __rte_unused, void *arg) { - const unsigned int lcore = rte_lcore_id(); const bool empty = nb_rx == 0; - struct pmd_core_cfg *lcore_conf = &lcore_cfgs[lcore]; + struct pmd_core_cfg *lcore_conf = RTE_LCORE_VAR_PTR(lcore_cfgs); struct queue_list_entry *queue_conf = arg; if (likely(!empty)) { @@ -518,7 +516,7 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id, goto end; } - lcore_cfg = &lcore_cfgs[lcore_id]; + lcore_cfg = RTE_LCORE_VAR_LCORE_PTR(lcore_id, lcore_cfgs); /* check if other queues are stopped as well */ ret = cfg_queues_stopped(lcore_cfg); @@ -619,7 +617,7 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id, } /* no need to check queue id as wrong queue id would not be enabled */ - lcore_cfg = &lcore_cfgs[lcore_id]; + lcore_cfg = RTE_LCORE_VAR_LCORE_PTR(lcore_id, lcore_cfgs); /* check if other queues are stopped as well */ ret = cfg_queues_stopped(lcore_cfg); @@ -769,21 +767,21 @@ rte_power_pmd_mgmt_get_scaling_freq_max(unsigned int lcore) } RTE_INIT(rte_power_ethdev_pmgmt_init) { - size_t i; - int j; + struct pmd_core_cfg *lcore_cfg; + int i; + + RTE_LCORE_VAR_ALLOC(lcore_cfgs); /* initialize all tailqs */ - for (i = 0; i < RTE_DIM(lcore_cfgs); i++) { - struct pmd_core_cfg *cfg = &lcore_cfgs[i]; - TAILQ_INIT(&cfg->head); - } + RTE_LCORE_VAR_FOREACH_VALUE(lcore_cfg, lcore_cfgs) + TAILQ_INIT(&lcore_cfg->head); /* initialize config defaults */ emptypoll_max = 512; pause_duration = 1; /* scaling defaults out of range to ensure not used unless set by user or app */ - for (j = 0; j < RTE_MAX_LCORE; j++) { - scale_freq_min[j] = 0; - scale_freq_max[j] = UINT32_MAX; + for (i = 0; i < RTE_MAX_LCORE; i++) { + scale_freq_min[i] = 0; + scale_freq_max[i] = UINT32_MAX; } }