From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9567345B04;
Thu, 10 Oct 2024 16:23:07 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 621FC4065C;
Thu, 10 Oct 2024 16:23:04 +0200 (CEST)
Received: from EUR05-VI1-obe.outbound.protection.outlook.com
(mail-vi1eur05on2084.outbound.protection.outlook.com [40.107.21.84])
by mails.dpdk.org (Postfix) with ESMTP id C31184026B
for <dev@dpdk.org>; Thu, 10 Oct 2024 16:23:02 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=VkXlXS+xxujB9A7vLdg4MznAG7ewhAjj4Zu45KnyiuArSmJiHKIO9zbl9M8McqrdOro35LZcQuaw2/a522jZ6h1nZZ0+Cj7Neb8YqTjt3+9FUNYVfacsZCwiysq4YAkvWFiCX6IaY4/MvuVhhORuplDTEeUoJ7M1QVsixF8rFLqIXQJ8K6u4fDyffwU0A+HvH9IHYg9Z+NfLIldGoL87CauMmJFguX/7bc8wy+F02cpem9Ho3Ezoe23QdvWPRQf++Mz8gqFb9zH7L7KhNOW2/Et8/ljeExd6ztsI18NNrSbFcwebCgTFqRjCNqE1cRE+EYPGIma5mJKs4GwI/P2zxA==
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=BqPcb0CZHAMsN7CS7hVMSqhGJidwIIpSIHOdrawrTEM=;
b=FuUKSm8WNWIXtQWvEr1trak452GLia/mzHez8i0T/Cxds2tVHmw5AxQ/0r8t81v5ymDfURWIWb73Sk+wnf3AOmwKxCu6gaGvVUB0heRLdA0WWRmejz5Cy0iZ0hNF7gEIdtxl4XHkEmo+cUDokTVkABobhWecU4QgcxorM6tv358nJboCkrF4Z/nB98fer33BbkQIY/QbaRQM4kLUws9dJT57ULYLEb8SYfKNsTgRu3zgijiI2+nQiscim/yjPfJam6rUzqJvTINi16YZS/dtgbC0PLcthaaQpBLe0gqZ1j057JlTMKwzl+RzfI4uYUFjTsMAPakBRnCzBWWRi5F0OA==
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=BqPcb0CZHAMsN7CS7hVMSqhGJidwIIpSIHOdrawrTEM=;
b=A9y7otwepfABNMUB34kBrJvIBdu3L4q0OZm1uXWqZiPKSV7HUebNDzvi4ajyMXscswXNWOXL5YpN0bUrP0IoP/LAmROTOWPrrP0A05F353gyUQLQ5N9hKJcvueTiNn/3HA7FdfYTP4Q+yTq/vOA72OqLu9ROGMtBxw3sy9ZJABiAYfGKrw1XGcBLiA2B1fKRn+nXxv3MndIu2zShEtR3FkCcQwJX05Jr+7tG/zEUPljhdIkxEwSN0k01KMV5Bvf7a5ffosP76nbg6E46P9pSFHaeHO+VoVXxAvEur44UP1ILzZCNDN694D8TPep/bob2GR3wNHpy6z45pkA68RNjsw==
Received: from AM5PR1001CA0039.EURPRD10.PROD.OUTLOOK.COM
(2603:10a6:206:15::16) by GV2PR07MB8961.eurprd07.prod.outlook.com
(2603:10a6:150:b9::17) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.23; Thu, 10 Oct
2024 14:23:00 +0000
Received: from AMS0EPF000001A7.eurprd05.prod.outlook.com
(2603:10a6:206:15:cafe::23) by AM5PR1001CA0039.outlook.office365.com
(2603:10a6:206:15::16) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.18 via Frontend
Transport; Thu, 10 Oct 2024 14:23:00 +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
AMS0EPF000001A7.mail.protection.outlook.com (10.167.16.234) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7918.13 via Frontend Transport; Thu, 10 Oct 2024 14:23:00 +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.1544.11; Thu, 10 Oct 2024 16:22:59 +0200
Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100])
by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id
E382F38007A; Thu, 10 Oct 2024 16:22:58 +0200 (CEST)
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
To: <dev@dpdk.org>
CC: <hofors@lysator.liu.se>, =?UTF-8?q?Morten=20Br=C3=B8rup?=
<mb@smartsharesystems.com>, Stephen Hemminger <stephen@networkplumber.org>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>, David Marchand
<david.marchand@redhat.com>, Jerin Jacob <jerinj@marvell.com>, Luka Jankovic
<luka.jankovic@ericsson.com>, =?UTF-8?q?Mattias=20R=C3=B6nnblom?=
<mattias.ronnblom@ericsson.com>, Konstantin Ananyev
<konstantin.ananyev@huawei.com>, Chengwen Feng <fengchengwen@huawei.com>
Subject: [PATCH v8 5/7] power: keep per-lcore state in lcore variable
Date: Thu, 10 Oct 2024 16:13:47 +0200
Message-ID: <20241010141349.813088-6-mattias.ronnblom@ericsson.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20241010141349.813088-1-mattias.ronnblom@ericsson.com>
References: <20240918082614.725220-2-mattias.ronnblom@ericsson.com>
<20241010141349.813088-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: AMS0EPF000001A7:EE_|GV2PR07MB8961:EE_
X-MS-Office365-Filtering-Correlation-Id: be728f3d-fd98-4a62-913c-08dce9370b40
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: =?utf-8?B?T05MbjVKWWowWTU3SFdBKzZWaFBmWDZNOXlwUHo1SEhOR0VMckNEQ3BGU0N3?=
=?utf-8?B?TncvVVFuc2JUYkhyODUxb2NIVk9PUmlGQXRqVEtKZVN4dmJjZ0VPWkVGMVRq?=
=?utf-8?B?cU84ejVFaTgzamRMdzBBRG1VUnhLUlhqNldZQ3FrSC9HZkMvZnZJVC8ySGph?=
=?utf-8?B?UUk1QVdUSTRLSDB2TDhGOVh2NDFpWkdVVm5PZ3ZGeExDcUFqWSs2am1QN1Jr?=
=?utf-8?B?QU4vWWxkdXNMekFIM0pNYXJZY0ZCK1o1Q1pJMW90U2dPankzQnZBWUdnZnho?=
=?utf-8?B?b0lKYjgxOUtvQ1ZoUkJuSGZBNzNmVlQvRWkySnJWczFPdkRaUE1QM0VOR040?=
=?utf-8?B?aEE1dW9KUEVIYnpqWTBkT0FDbVhINklRdzE4ekQ0dGtDRUN5cXRDNkJQQXU3?=
=?utf-8?B?S29LaS9FSm9iOHpIeXVwRGZwNUpUUWJFazVSdXE2RVF4aldjYmlyck5TWU0w?=
=?utf-8?B?MnduRllCdmF6aytsb2ZqcEpZWkFQUENmT3NQTW9UWTZUWEJReUlBYTUrRGtw?=
=?utf-8?B?Ym1xRS9NaVo4MjkyOTZkL1FSN0ZVWEJTUGJUNTB4TnJ1ZENLS3ZvQ2t4NjlY?=
=?utf-8?B?RTNzNTR2bGFJekFKKzltMkZMTTdieXlhN0QvUFRhYkEvWXVWVVAyZ3kzY3JQ?=
=?utf-8?B?ZHVmUllxQjR5ZkQrbjNrRmhWRXZYaWZYaTBZamw0ZFpoVHRxd0RHbWtFOUI4?=
=?utf-8?B?SGNmcWRXRVJwWk96TGlDU0hNTS9IeFNkYU5nYkhsMTZDWWNZNWFNRzNhaUhV?=
=?utf-8?B?ZWFpZ2MrSGUrNmkwMFI3SVdwZkl5SHN4RXlxdTlRYy91di83T2ZWL1FaZzg2?=
=?utf-8?B?MTNFbkdSaTkxY1ExVCtPU0lCZVhaRG43YVhRSWsyNzRycEFEK2F0aDJ3MVJ2?=
=?utf-8?B?RW9Vb3hNamtGK0kzaVcyeURaU0dsV09IeUdOVzN1NGhSYWMxQlJUOHpaUHBR?=
=?utf-8?B?NFlTK3U2WmJVMVkzTnpDRXpOYjZJZHFRMkVsYnZab3VJcHkvckloZ2JGd3g3?=
=?utf-8?B?QmZnR2JyamhHQnJTeGw0cEh0Z1NEUjJpS1hzeG94NWV2aTBmVTBiWnNMeWZB?=
=?utf-8?B?dUwweXNwcE5WZFNsNDI5ZVZkeDlyVVQ2UmNEajNYaTB4YjAzTUw2K3BKUWY5?=
=?utf-8?B?c0Z4Rm50VjV5TGJITzVrbU9xRW1zSC9Ed1Q4UStIY2IxMHJYZ1pRUmJUOVBa?=
=?utf-8?B?bWFvU080c2ZyV1E4K2pDTFg3dm1hbHN6S0dVVHRiOHVzRnNBNFRCZGl4Rkh6?=
=?utf-8?B?VkRYMmR4dURmMkZlVTQ0ZHpTSFh5SmtDejZ0YWJjcllJSXR0MTBpV3RaUGI1?=
=?utf-8?B?TG83blNqeXV6ZjZMY042ZmpGVDVqZlo4WUw2TnViRTdMM3p4OHgxeTd1WExr?=
=?utf-8?B?Zk5NQUYvSklYV2xneC9hZ0ZZQkw1QXVLOWlFdzZLT0N1Qm9acDFGVFNLa3pI?=
=?utf-8?B?MWdBTGQ3OFAwSWlpWlhrUUI3cEhCa2cyUkdJWHpPZlMxVDUzVnhEYk1CaVJJ?=
=?utf-8?B?WEdPQTdIRm4vcHlCS00xZ2c0djdRVnplUnVyaFNpZlFsMi92QmRYZDYxblg1?=
=?utf-8?B?QXBpZG1tRlk5dnJ5UWFsbzlrKzVpTG43UzVQV2RVcGVMeW54Wi9SN0QzOE83?=
=?utf-8?B?M1k3djFSSzBYOFo4cmhPUzBhYVRHMnZ3bW1FYWFLRURjSk45eXlHeitDQk44?=
=?utf-8?B?Zi9MU3dQcFZ6bGY3ekFsN29oTTl0SVI5ZmhGNmVvSGk0Z2s1SVRGcXdYVVEx?=
=?utf-8?B?dG80RXdYazV1RUhDZ1lnZjRzM3FSbWtURElTWlVoZ3lydGd5R3l3SFE1MnhU?=
=?utf-8?B?ZDE4YnZHRGpJSlVjMzBNc1NWb0ROMHI4cjBQaXBBZjNJaUxOamcwZEZGZGt0?=
=?utf-8?Q?Gp3ZjqbvNbwKa?=
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)(82310400026)(36860700013)(1800799024);
DIR:OUT; SFP:1101;
X-OriginatorOrg: ericsson.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2024 14:23:00.0553 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: be728f3d-fd98-4a62-913c-08dce9370b40
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: AMS0EPF000001A7.eurprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR07MB8961
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=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 <mattias.ronnblom@ericsson.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
--
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 b1c18a5f56..a981db4b39 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -5,6 +5,7 @@
#include <stdlib.h>
#include <rte_lcore.h>
+#include <rte_lcore_var.h>
#include <rte_cycles.h>
#include <rte_cpuflags.h>
#include <rte_malloc.h>
@@ -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_VALUE(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_VALUE(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_VALUE(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_VALUE(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_VALUE(lcore_id, lcore_cfgs);
/* check if other queues are stopped as well */
ret = cfg_queues_stopped(lcore_cfg);
@@ -769,21 +767,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_VALUE(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