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 0A5C845B42;
Tue, 15 Oct 2024 11:43:59 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id F3A9940BA5;
Tue, 15 Oct 2024 11:43:20 +0200 (CEST)
Received: from EUR05-AM6-obe.outbound.protection.outlook.com
(mail-am6eur05on2087.outbound.protection.outlook.com [40.107.22.87])
by mails.dpdk.org (Postfix) with ESMTP id 3D61940B8C
for <dev@dpdk.org>; Tue, 15 Oct 2024 11:43:17 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=CO8LpUvvhSdu6DnFG8zuDjHYPvtZ0XLQ4jgBA4MXZYeG9CzpG/Ju9XJRkfiHV1BOL1z3uuAtioEKpGX3iR2LzDJ9rJazDBOvWJgXvnaJ90BzYf3lnlWihsomkY4/S1Ng0yTFJ50WqIMOiIbUJQSUMKL8TPFCD3elXGyGGK7y9PORYgsW0pIIpd37dh6MuJV993cOga3WSHT6ZkNfabbAw16Iux9WTnUKeJgt5eA0sFx6OIwYC/aDOnhkHDk9nSjYazjqrkrXjn2oRQ2j4QIQUP7d0O1fls3t6KpPRf/AdgjtBa/eDVFQd/KF1am/sVFVDCQTN4xM/BrZmis3aLzUqw==
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=x18fYJECMb+FI7sEVhgJP4HLtTAaQ2iSCaQVb1jNcm0=;
b=C2dTBOR4PK+35LBE7AraMHe0hB+bJZPn/nFiAp1shU/yaM97F45k/VTKQvTUkf7tv2nsI8e+qcm8VWh3xKj576sAXvDU+A2aDCPER8BIIi8EWFzHi509X1UF42VA2J5aqRqfCwBWYEW8zk8EXilos4b466cYCvPhdlFpNJvbNXwWbELwyMWSwGFJsISytUK7gaK+f8CFyabWpFwaINbSNbGcueuwffsIZ97kZCJXP5RCeFFmMlXBxY+va20wMmUEgbscdo/yBVG8DZhB79sN4VeZduvWY9FVIUy3r4TV+PpVuc6zM8STLMFK1N1TKWw5Am4Wu8n2wJve3iggBa6afg==
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=x18fYJECMb+FI7sEVhgJP4HLtTAaQ2iSCaQVb1jNcm0=;
b=f7d3gT4bIj0ArS3wmG2/nN0rrBqNiSybIlwn5HMCD/sKxxmQgk1a5oA/ThxSsUYGMW3NqQb++9D79AYylKvM6YiJxJvpMFdCOWdpH43oPw7RM79ghIIzessnXC0P273m6AJRow6FhW8vGjS2+Z34sNESSW9R2maInQBmfXCjjrz34higd5XdvrPGY7bHDctC4WezdwcDzVgq0OyBppZYiG3mtbnFgGpzkAgWrZoK0N2HDjIAq3iPymKet5jv1S0mpS/058OK/ncyluWDLwvC37Z5t23pdP8HvpCk0Nvp0+T+BRy1ZwXxGa2YeB6YEBYI0ijb9eHMI/PIRQL4PXkxcg==
Received: from DUZPR01CA0149.eurprd01.prod.exchangelabs.com
(2603:10a6:10:4bd::25) by AS8PR07MB7222.eurprd07.prod.outlook.com
(2603:10a6:20b:25f::12) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Tue, 15 Oct
2024 09:43:13 +0000
Received: from DB1PEPF000509FC.eurprd03.prod.outlook.com
(2603:10a6:10:4bd:cafe::f6) by DUZPR01CA0149.outlook.office365.com
(2603:10a6:10:4bd::25) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27 via Frontend
Transport; Tue, 15 Oct 2024 09:43:13 +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
DB1PEPF000509FC.mail.protection.outlook.com (10.167.242.38) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.8069.17 via Frontend Transport; Tue, 15 Oct 2024 09:43:13 +0000
Received: from seliicinfr00049.seli.gic.ericsson.se (153.88.142.248) by
smtp-central.internal.ericsson.com (100.87.178.64) with Microsoft SMTP Server
id 15.2.1544.11; Tue, 15 Oct 2024 11:42:59 +0200
Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100])
by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id
5CAC338007A; Tue, 15 Oct 2024 11:42:59 +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 v13 5/7] power: keep per-lcore state in lcore variable
Date: Tue, 15 Oct 2024 11:33:42 +0200
Message-ID: <20241015093344.824073-6-mattias.ronnblom@ericsson.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20241015093344.824073-1-mattias.ronnblom@ericsson.com>
References: <20241015065505.823840-2-mattias.ronnblom@ericsson.com>
<20241015093344.824073-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: DB1PEPF000509FC:EE_|AS8PR07MB7222:EE_
X-MS-Office365-Filtering-Correlation-Id: e6f4d2d0-0948-4e4d-566f-08dcecfdc9cc
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|376014|82310400026|1800799024|36860700013;
X-Microsoft-Antispam-Message-Info: =?utf-8?B?NW14bmhqL2dteXFVWTBSS3N1U1hQbWUrUnYwRFBOWG1CcnJpUkg4TXJLbEhk?=
=?utf-8?B?dWhsOXpqNDFZOWVNWDBQV1RkSlhGQnd5RWJqUUNCUjJHbG1WQlA3R1RRQlVU?=
=?utf-8?B?QXRsbmpwekhVSzF2R0l3RUpYRWRhdWZ2aXhESWRBUmhWRDc5Nk1sWUZHM2xF?=
=?utf-8?B?VnhzWTJFbnRrdU03SkRIcUg2NGVqakxmRkEwWUFVbHF0eTBBVWU3MUJ2KytD?=
=?utf-8?B?NVc1M0lTQlZpRlVxM28vMkY0ZC9mQk1lSDRIc2R5UjdHelU3L2lsK0NaTEpy?=
=?utf-8?B?UHVHQ1BSVmZ6eTEvNG1JVHdsMVZLQkxRY294eERFSi93WS84VHFtS3Z4UDhV?=
=?utf-8?B?NldIRjRxMzhHSVRrVHR2M0I1UmorK0ptKzFhYkg5eVRvaklqVVBUa2NmaktX?=
=?utf-8?B?dUEwYm5KajNweVcrekJxdzZLanJtcjlVbnovS0o1eDBCek9RUklRZ1NJNHFz?=
=?utf-8?B?MDA4MWJubmJBdUtqd0NCMUFBb04vSTlwM1MxTVRXd2U0RGs4cTVtZmp6Z1pD?=
=?utf-8?B?NXZkVGc0UTdHbk55eTRCenVLV3hONEdKTnMvVXdmT3N0ajhqSHJIUzU0aWRq?=
=?utf-8?B?VjVMUlo1b1ZUQnB1Tmw2K1hxK1VxTW1VRVp2SW1yRjhjZ2xOQjJOR2Rsb1RN?=
=?utf-8?B?Z1lSamVRaXhoZWJmUlhnQzQyZjFSMm16ZTY3RllyWkY1QTJsdVhLSkpELzQw?=
=?utf-8?B?UThaZHE3Z3lzK0ExLzljd0drRk41cDZUWCt6RlhGQjdBOUduOUlmbm15cExj?=
=?utf-8?B?b2JBZEwySnA5SUUvbFJjZnUwMkwxUWQ3eXFsWTcwcmIzVFl0TDhtK1NER09H?=
=?utf-8?B?SVliM0hBWGFra2dSTVpYME9wL2EySlE5aUs0UEhTNWtzQm9sUzZ5anpDdElk?=
=?utf-8?B?ZllQajlqd0ZHNzBGMzJVOHA0ckI0Uy8wUUZpa3E2alR4cUhVcVlTbTU1anZt?=
=?utf-8?B?bDRJNUpqd3lyWklzakNsN0lKZlNkZHVlWjgrdDhtN3Zsd1NpbHFGYlU3eERX?=
=?utf-8?B?SjladzBCd0xGTzE1U2QzaWxUUUlLdWNpSEtxY0dpYXVPNzdGS0ppcFp6eW1u?=
=?utf-8?B?SDJpKzdTZk8xUGg2VVRjeUFsL1ZKZ0VrcjV4emFkaEswZy83RGNnZ1JSS0FG?=
=?utf-8?B?ZVJWNk5zMWlXdGxtbVJCU3JJajZrZGRZQ0tlbFpqcVpJUWNieGk1VFZ0dmZL?=
=?utf-8?B?OEVtN0l4UWRZSFh1cW5GTFU2RU1teXRrR3JqMDgrWHNJZGd6Q3ZLUXFTRmg1?=
=?utf-8?B?Wk5sdXdaVlNjSEZxRTc1R1Z6Q0FHTmNiM1hpeC9ycUlMWG9HenZKb2cwdWZJ?=
=?utf-8?B?NDMyd3BTdnNxOWx0TUlrR1ZxMUlNQVFaVjM1WW9zK2xkRWdRMjlSZjdjUFNE?=
=?utf-8?B?R3FMY3Y2MlNCNW9TWnI5WUJrMFh1RXd5eWhRZ1FxNmtFRWNlOHdmcWFsU05o?=
=?utf-8?B?WU5RNHg1SitIeEwvbUpEY09iNU9VbkRVOTV1NUhraXd5WW4xSC80TXdzdnNW?=
=?utf-8?B?NEc1dFAxWG9yLytJS3RGd3FHRElhMGxYWWFtd25FRHRzbTJqVjJPSHdUb0px?=
=?utf-8?B?bzRtcTRFRUJxU3lzaVRxVi9VaEs2WEhneEd2VnRFakJKQzg4YXZzK1BBZ2Nt?=
=?utf-8?B?emRqTTVZVmRWQytCdGJ4UlR5WVcwci9KRHVIY21YUk1hcFpENXFOUVpydXNn?=
=?utf-8?B?QW9vcHY5d1FlRXl2M3pBaEpFaWxEVlpnYy9maXBFSHZaZno1blZFKzNLUExO?=
=?utf-8?B?dDlvd0l0TzBpRDAyRUozVzBEN3ZEamVtYUQ3U2VCMHgybHJjdDRSOW9sR3VL?=
=?utf-8?B?akY5TytxaGtZU01XdXlLWXhhd0N6cUd4YmtPU2lSMzFOOG54M3RUVGlkUGJa?=
=?utf-8?Q?KLpNi8ua5TGEJ?=
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)(1800799024)(36860700013);
DIR:OUT; SFP:1101;
X-OriginatorOrg: ericsson.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 09:43:13.5479 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: e6f4d2d0-0948-4e4d-566f-08dcecfdc9cc
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: DB1PEPF000509FC.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7222
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..2efcab8287 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(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)) {
@@ -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(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(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(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