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 CE03045B34; Mon, 14 Oct 2024 09:52:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92FB640273; Mon, 14 Oct 2024 09:52:59 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060.outbound.protection.outlook.com [40.107.22.60]) by mails.dpdk.org (Postfix) with ESMTP id B251F40151 for ; Mon, 14 Oct 2024 09:52:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QuRHUGa3WHBhZHF8wZ9ixVM3cgDJS4YQjtOhwXnYvckHPiJqTXn4eCvFZe4pKRRQueAoIM35/8+u5Dh+UoiC2S9zj/Ruk+3X8hVaevRqDELS2h1HT82cKrwgjzvmhGsiC+Ml3uc2Aoq1aRzB8OJLE/R9zttT5o7O//MO2xJz2e1Bmje/its1mPFYISECmL4fN52tspT2N7hAB2XbQWzwjP0u3LnxHzKN9uRE8e+iJ8DOQ2Jao1RofurFf8LM9oFEUjsxMhP47eoKhkOKmK7R0pZWjm02hCTgUMZoSJyJj5o1nRQ3E/eqxXIPCDAgSM/clSakH6rI1O1f4GfF/ao1Hg== 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=WfDpRZN9IzeevXN/jOQqM/s8CrYpxd166DhfAr/1Ow2Q/xjG0b8xutZ4lZOpJdTVUSj8X3SN/cu17Bz9ANJbqycOCuPyi0V8jTvzfcJPUx4lOkleVS2PxVJg47c69c1JNSKkTALEbp56DOwWJDdEghptvHAbD7qRY0nOKdVOshiZXypuzrV9Jf/ltubV6fbi7phneVbN7JWr06bJGWBOh4epBTzrLTjNedCmBcledhC3wbPXuewaDEkWgzAmwrbIt+3DseHbm7rBiwOX1Tk67uDDpERKRF6n4VuAresVKMDKJCJRRabekA6dq7uOT/MiBedPy3njiHiu6VqY9CoT9Q== 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=UjhyGK1HB7npoD4aob8g5qM9ghIOZodZryLc6PO9+V6k7vtYlzVb/JeEk0WNi5tVbtOxD01hntlNppb+ynjlzTvAOmsgekTPKIgRBO5/4V+nBSCToTQr7Vdo9T/CNvV7nJ9r2MOhQPXwYYfS+mWFM1GDxsfBQzVkqPpi3RmXj1Nqh6wBJkm4KD1+kGJA+M4ANpxTKISRA0RycUQqOvkDgZspBItXg/anxCf630m4D+th94VJTcWRYERPdP3iBTSkNB86Hzsik1/dIdwWQ70TKCX5eVzW0DnOWCIoV5H5H+HF25Id0o0sQlNjZ1btOr63Ehu7wSV0gjqP9AvJK1UB5A== Received: from DU2PR04CA0166.eurprd04.prod.outlook.com (2603:10a6:10:2b0::21) by PAWPR07MB9902.eurprd07.prod.outlook.com (2603:10a6:102:386::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.26; Mon, 14 Oct 2024 07:52:56 +0000 Received: from DB1PEPF000509E6.eurprd03.prod.outlook.com (2603:10a6:10:2b0:cafe::11) by DU2PR04CA0166.outlook.office365.com (2603:10a6:10:2b0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.24 via Frontend Transport; Mon, 14 Oct 2024 07:52:56 +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 DB1PEPF000509E6.mail.protection.outlook.com (10.167.242.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.13 via Frontend Transport; Mon, 14 Oct 2024 07:52:55 +0000 Received: from seliicinfr00050.seli.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.67) with Microsoft SMTP Server id 15.2.1544.11; Mon, 14 Oct 2024 09:52:54 +0200 Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100]) by seliicinfr00050.seli.gic.ericsson.se (Postfix) with ESMTP id 85DFC1C006D; Mon, 14 Oct 2024 09:52:54 +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 , =?UTF-8?q?Mattias=20R=C3=B6nnblom?= , Konstantin Ananyev , Chengwen Feng Subject: [PATCH v11 5/7] power: keep per-lcore state in lcore variable Date: Mon, 14 Oct 2024 09:43:46 +0200 Message-ID: <20241014074348.821962-6-mattias.ronnblom@ericsson.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241014074348.821962-1-mattias.ronnblom@ericsson.com> References: <20241011081901.816211-2-mattias.ronnblom@ericsson.com> <20241014074348.821962-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: DB1PEPF000509E6:EE_|PAWPR07MB9902:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bd9d9fb-431f-482f-f4ef-08dcec2536fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bE8zZU1OYXJPVUdXdGFzMk95djNlU0xFUk9qVnpOdS9SUmFVdnZHbWUvOTVT?= =?utf-8?B?enFWUWNrVW5zVFg0ODh0WUNqVXNGUU1WZktMQ3g3N0xEcEJJMFhoMjNFS0JV?= =?utf-8?B?UUhBRGJpditwRUpBVDhjL3pvdTh5WlhDYjVwb1VHT0hNOXZVeTNjcEk3dWMw?= =?utf-8?B?YVBVOCt3c0ZhM2paczRHWHkrL1BQS1BrbjZETDdFU1JtbS9UU0FUSUlGMzh6?= =?utf-8?B?NWV1RWhOMlBGektKWXVHdm03YnR3Q1d0b0hPY2p6c2QxcWZoV0o5a1YrSUtp?= =?utf-8?B?WnJweTZMUXp6TCt3dWtFYVBiK0NUdGxEOVlJbU4vcExFSDV6RWYzc3JnTnJh?= =?utf-8?B?YWh0dmZ2Q0RydVFXSGsrVnBKL1hBTVI5bFNLOU82MjZTU2xTa3Y3bmFHWmhz?= =?utf-8?B?OVNYWjN0KzcrRDk0ck5QUEw3R2djeDdRZEJmVmNJRUcyTGxCTk1SdEwzM2xP?= =?utf-8?B?bjRCWVl2aDhwRmlXU1k5QVZoaGFieUhTTGQyK0RXUjRLcjU1cTEyckFQUkZP?= =?utf-8?B?dVVDeGc1dFFVSWF0clE4VnhNQ1V1YXR2ZXA5VC8rVXUxemI1SkRZM2ZzYmxM?= =?utf-8?B?Yk1yRjBpekM2RG1hY3c4TmJ1dDloVHNGeW9IV2MzQmRFZkl4SDVhTDFDZXFL?= =?utf-8?B?dkFSY3pjZFJBTlJ4UFJwY2k5c2dWQlM4OXV2SWxSd1R5Qzc2Wlc4K0J4NjhB?= =?utf-8?B?TElISjI4a0ZDMXo3dlBGWkE3eTRwajk4cFJpMjNvOVh3R2ZJbk96bERPSE5z?= =?utf-8?B?SS96dmhYWGVkZXJOVVF0ckhKKzlPLzlMcHI2dnJiMHUyTWQvaHlYMmx2VEht?= =?utf-8?B?MXJqcmpYOXhJUFJDSUJrYkcyc3FFSUlwcEl0ZExLdGRFbnhrdXhNVHhscU5R?= =?utf-8?B?ZHZXMzliZ0I4dlFscjBYRWVycTB2MjVuVTlxdmthNUsxNTJvNWQ3VHJtbWtD?= =?utf-8?B?c1lMRFFlUVczSDFFMkhpSGR1WitCVk5jWXhTSk5VeTFsbG9seXVvQVdBdmk5?= =?utf-8?B?UGphTnpTTXJGNVJqS1ZKTGJ0MDZPcjRvM2Y2MG5mYWoxL0V6THdXajBML00w?= =?utf-8?B?c1VZOHUxVUIxZDRCajc3aVE0OXhORnM1amVQam9FYzFGN2NSQjhLc1JTOStG?= =?utf-8?B?Q2V0blAvc0RmdEFOZ05WTk82amdOT3d5eDBwaTJpQnlTSlcwN0VJMUNONHBs?= =?utf-8?B?QzNGTXRHQldmclBoR2t4bldMSys0R1lEbXVXOXVrOUp6Y2U2M3BSUnIzYyt2?= =?utf-8?B?NXFONEpOeExBZWNHZXIwUmMyUm45N2UwSmMzaXRYVGszMmxyS0Rldk8xOEp0?= =?utf-8?B?Um9CVkhOUEtEeDgyUnhJZmZnRXFrWFBBbmZ2eFoyMnZqMGlNSk8xazdsQ0lF?= =?utf-8?B?YU1Fd3RwKzRORjFsSXdUejd4d1FRdFRpS2RhZDhhS3plVGpFTzBnT2JCNm91?= =?utf-8?B?eDduV1BLVHdrWkMzZmJ5ZVZwN2w2dk9lY3c4TW8xVU5hV2RFU2N3TTBGV3E0?= =?utf-8?B?UkpGMzJuVmh4akNHTkR3OEZrSGk0Ymt5ajZ0UDI5cU9hT2p4RXdJY2gzbmdR?= =?utf-8?B?MDVCUWdxVzhHa1lHZjZ1aWVzSzRzdEV2NHNFeFNBZnhqcWdKVE5GRndDcUFV?= =?utf-8?B?VGk5eUxhRGUxWjRIL0E2YURDdHJwb2tVOXFiTUYyQVZyUlhFR3oyeGRyYW5j?= =?utf-8?B?VkxnOUpNZ2N0ekFtUW1aQnZYMlQvZVNPc0pEczhCWEhQSlRMRnlrdEg1aUUx?= =?utf-8?B?b0l5Z1BTVXVWY1RSUUs2QkVzci9lN3FXZTlkd3dQTUZwRTUyeFhERTJoZTZF?= =?utf-8?B?N3ZTVXJwNTUvZ0pxbWlGcHJabFhpUDRiWC9TbmREQ1JtbUUvZWdKeEVCeHJq?= =?utf-8?Q?MpjLMlL1cxais?= 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)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2024 07:52:55.9610 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5bd9d9fb-431f-482f-f4ef-08dcec2536fe 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: DB1PEPF000509E6.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR07MB9902 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 b1c18a5f56..a981db4b39 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_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