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 0174245BAE; Wed, 23 Oct 2024 10:02:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7155440EF1; Wed, 23 Oct 2024 10:02:18 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2084.outbound.protection.outlook.com [40.107.22.84]) by mails.dpdk.org (Postfix) with ESMTP id 4649740E3E for ; Wed, 23 Oct 2024 10:02:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uMqQT1RQD/VTauSMYvvS7Vp4lzm23thnG9yKagpVRCDL/19SSOSq2JFfaPVAGuwjnHN/zHXr2q1FSEF8rRVkLzCkSbtSjuawEZH4qLCBNq5XWFa+UoOx2bbC6UyeEtJ2xx7IBcoGvUAf+1KRRk2pwUoFIXVo+uyFD5Wh4Q1Zack39yb1RDhFSQJhpecFsF013UAUOEuWVlzA7aj1aoZGdkBFFvuV5VJn50eaMqpEmYN84Ce+FDDKxwfTOOO5B6Dnq11rM6yxQ1T2ESCDYDtDbCNAjofkdE/9tLYTmIjGxetL9EMe8LQcHqR0yvyKu/F8cjYOhUfsXURf1iq5nYfe+A== 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=JUViexrXDbwH+ykxkmrKOl9oFD2NuR3+ptOQP5fWbe0=; b=b5viHHUp8SqCT8nYSYB0TGw4cJ0QVccO+2Zp9dIuNeYODyd57u+eMEmXxApBwzSSQa5h1gPU8LWI23Pj8Fpt8je5v5Lu/tm+PfW+FxCsN6c1eYZA39kmMI8nWJ4xaOO4Y37O6l5+aevM3sfZUG0C644SfYRsXLqumU9i7p4NniFowlm0fEyh2QunPDOJXJAH0GjUhNRcnEbnWSs6LfIMGCcPX+EWZKLzL+sbgnvX0+CAbCy8/OM+N9j6zjOjHmChhGfj7nUSFFmCb2qF/YC18tQtM+E5RadzvU1Ejqa7kGq+HrDp80AjEHBPiX5xpLYdb+V1roo9I8qlqij/80/g8g== 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=JUViexrXDbwH+ykxkmrKOl9oFD2NuR3+ptOQP5fWbe0=; b=xjguFof5Kf9QPSrSDYFvPQ8O1r6KTUieJsQI++nLiGYD5IE2q9wOOzTBLlSciEfXMgZX8oQ+VgX4AtTJqyNMURNElKOLOOELNoAAh6X8mn1Ma334+QzchZDnD6oFOI+6NRm0zlaYa+WKYVXLvwuKUtaTO8aHjbDAPMe6lvlQX8urA1W6I4vJje+irBM+gujSBjBmKueEv7O4VGaS04d2b3bEUI3r3w+flu6HhNXANkcF55GszTxgSK1HtBPMpkrRZYGK2MG1kpGOM/pfjPL5utQXMqFOaUMTABqBJ6OmQ1jfWSqYiGpHrQALp4MAwPoit5adDFZoy6xZzRwzntlMhQ== Received: from DB8PR03CA0008.eurprd03.prod.outlook.com (2603:10a6:10:be::21) by AS8PR07MB7909.eurprd07.prod.outlook.com (2603:10a6:20b:394::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.16; Wed, 23 Oct 2024 08:02:05 +0000 Received: from DB5PEPF00014B8A.eurprd02.prod.outlook.com (2603:10a6:10:be:cafe::35) by DB8PR03CA0008.outlook.office365.com (2603:10a6:10:be::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29 via Frontend Transport; Wed, 23 Oct 2024 08:02:05 +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 DB5PEPF00014B8A.mail.protection.outlook.com (10.167.8.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Wed, 23 Oct 2024 08:02:05 +0000 Received: from seliicinfr00049.seli.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.68) with Microsoft SMTP Server id 15.2.1544.11; Wed, 23 Oct 2024 10:02:03 +0200 Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100]) by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id 5CDAD3800BA; Wed, 23 Oct 2024 10:02:03 +0200 (CEST) From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= To: CC: , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Stephen Hemminger , Konstantin Ananyev , David Marchand , Jerin Jacob , Luka Jankovic , Thomas Monjalon , =?UTF-8?q?Mattias=20R=C3=B6nnblom?= , Konstantin Ananyev , Chengwen Feng Subject: [PATCH v16 6/8] power: keep per-lcore state in lcore variable Date: Wed, 23 Oct 2024 09:53:00 +0200 Message-ID: <20241023075302.869008-7-mattias.ronnblom@ericsson.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241023075302.869008-1-mattias.ronnblom@ericsson.com> References: <20241017055743.848292-1-mattias.ronnblom@ericsson.com> <20241023075302.869008-1-mattias.ronnblom@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5PEPF00014B8A:EE_|AS8PR07MB7909:EE_ X-MS-Office365-Filtering-Correlation-Id: cf203b04-45b7-4f75-7f76-08dcf338fc20 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Q0VhZ21KU1ZhM0xBN2FieVQ1bmd1WnJNdnpNdzNDd010U3dBcUltREdkSjJv?= =?utf-8?B?MnR5YXdVY2x4bk9ZZ2hJS1BKOGczdFc5MW1kckN5ZnU2MkF1Q2J4YzFUN3Bx?= =?utf-8?B?WlNOeVFtalNKMjVOWEUxYnBzUDZyTjZXcGttckprV2FwdUhoeTd0a2FiVTN0?= =?utf-8?B?MVB6b1MvY1ljL0FDejMzNWd6TmJtOVdBNWdJdkR3eTk0T2lWUG9nTjlXS1g3?= =?utf-8?B?dFBGY1Q3cCtSSGtSZmhYUTREVjZFSDJNdFhNamQwWEtDNEtyRklGR2Jha290?= =?utf-8?B?aG1tbXhYalZrTGF0MnNoRHl2cEZScjVUZFNlL2plS3Z6V2V0NmorV2c0S0Nh?= =?utf-8?B?dFQ5OG1ERnU5QUZ6dWtzMkU0ekx0RTI2UjFyUTMzemFxcmtEbXhVeFZUVDhm?= =?utf-8?B?elBKaHRJSjR4M2pEVEs1MkpFRUNwNWRrNFpNdHVCa0NDTmxxTTVoK2thTkxX?= =?utf-8?B?eHR6bFAvOWYxZDEzMGF2RDNjdm9WRVhmMEVORmRMeGlRc3RyVVcrWTgxVHRC?= =?utf-8?B?VnorSFVTVVljQnliWG1wdTlMdjAxMWFvcWI2T242OFJlcUZIT0psUGRYakZY?= =?utf-8?B?bW9DaENnZkpmSVM3Tnc1MWhYTURyNnNwS1ljUUozQVZ2NURCVVpjSmsxMlFC?= =?utf-8?B?U1dIbzd5dTFxb3AzQzhkemFTMnF2MEsxTTh3V1BFWTJBcUZGK0JPVUUyKzl5?= =?utf-8?B?bHNYYlovYldiZnNJNk9QeTNoUXg4OTZ3MzNqMURGQmFYSGJoVEZFS1pNbWlM?= =?utf-8?B?allTTFRtOXBkdDZrS0U5bjhhaHJMakFXUmU0S2QyZ0M1NnZISGRJdE80ditD?= =?utf-8?B?MmRRRlp6SExNUXJjdG1WU2JWOFQ5aGtXNWdGKzM4MDZsMEpmR0F2TG05MWdR?= =?utf-8?B?eVV0ZE9qVWNpOWVhLzV2V253V2RFMDFLTFdEVnJtbkF2VUpRR2w3VjlLZ0xw?= =?utf-8?B?WlNhL0d1bStDQlNSRjJJQ3hSTlFoU2dNY05aVkFHMkFTVjQ2VGhHeXBUTUNr?= =?utf-8?B?RXlrU0pTb3N2eWs2cHVHS1NIY003S2N2Y0dBZ1VuWFkwbWc2TzFpZHd3YThq?= =?utf-8?B?dUVKK1QxMEFJVCtuZnJmTU41bWh4K3BubDBIL1p1Y0Y1cHVSMzR4clAyU1pI?= =?utf-8?B?bnpBYnhkZ0JFd3dBOXVHSHhMcU96ZXE1SzFWS2xzRFZ3dkZqY2JicHJuT0E3?= =?utf-8?B?dVFsRU9HUnErTlhsSmoxcjU1ekpaTVZXSmRYU2NETmpuMXpYZ2ZDUUJWRWVB?= =?utf-8?B?RDFWNDNzZkUyak5lT0Fuc2EwM2ExenVlYjB5dkwrVS9RMkNlbFhYSEIxcGdm?= =?utf-8?B?ejBwa3BLSDFFdFM4U3ZuQWVhckNGSzd1bGtpRERYQ3ZraUE1MURtUjVWZk1U?= =?utf-8?B?WEsxYy9EWmw2QUF0dXd4L09Hd1BPUmUwRFFrbnNoWXVsVDcyd3hBa1J5VFkz?= =?utf-8?B?QUdVcStVc3JDd0ZOS2RGeCs2a0xaZGczYTAzOEhhZW1vRUwzdWpsTVhGbm1H?= =?utf-8?B?cUFjcFlyRjZ4bjV2eCtVajJMYk5tckJXUktqeE9OdERTTXYySDN5UysxTUFN?= =?utf-8?B?OGRsYXFvZ1prQWNnaldiV2pYUFdmS0FaZU1xNHc5Ull3cFZBZE9SL2JpRFUx?= =?utf-8?B?UHY3bHZyaXNtaEZLNVdvc1UvU3BaUnJzZWNKYTVPSXZpUnJlUC8yc1dpMXZw?= =?utf-8?B?ZFhUWTdSU3BnZ013bU1iZVp3M29MNUhrVFhUUnN0RGNKd05TS0Q5bDdkWDho?= =?utf-8?B?MGtaMDhCcG9DcG1ZMjBoaUY5Y3J5S2VvMHVvYXhvbVVsRGRVTGhXUG1Bcm9C?= =?utf-8?B?QXZIempmVm1XSXgwWG00NllVVW5NSGc3a3pWQ3JrNVNEN1ZkcEx2ejMzdmlo?= =?utf-8?B?UjVuRnlIT1p4WFVRdk5ZdnZScXd3TEwzU0NOODB4U2ZvM2c9PQ==?= 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:(13230040)(376014)(7416014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2024 08:02:05.2067 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf203b04-45b7-4f75-7f76-08dcf338fc20 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: DB5PEPF00014B8A.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7909 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. Signed-off-by: Mattias Rönnblom Acked-by: Morten Brørup Acked-by: Konstantin Ananyev Acked-by: Chengwen Feng Acked-by: Stephen Hemminger -- PATCH v6: * Update FOREACH invocation to match new API. RFC v3: * Replace for loop with FOREACH macro. --- lib/power/rte_power_pmd_mgmt.c | 35 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c index 5e50613f5b..a2fff3b765 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 @@ -69,7 +70,7 @@ struct __rte_cache_aligned pmd_core_cfg { uint64_t sleep_target; /**< Prevent a queue from triggering sleep multiple times */ }; -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(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(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(lcore_cfgs); struct queue_list_entry *queue_conf = arg; if (likely(!empty)) { @@ -519,7 +517,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(lcore_id, lcore_cfgs); /* check if other queues are stopped as well */ ret = cfg_queues_stopped(lcore_cfg); @@ -620,7 +618,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(lcore_id, lcore_cfgs); /* check if other queues are stopped as well */ ret = cfg_queues_stopped(lcore_cfg); @@ -770,21 +768,22 @@ rte_power_pmd_mgmt_get_scaling_freq_max(unsigned int lcore) } RTE_INIT(rte_power_ethdev_pmgmt_init) { - size_t i; - int j; + unsigned int lcore_id; + 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(lcore_id, 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; } } -- 2.43.0