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 E49A445B04; Thu, 10 Oct 2024 16:23:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7A5F40B9C; Thu, 10 Oct 2024 16:23:10 +0200 (CEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2078.outbound.protection.outlook.com [40.107.249.78]) by mails.dpdk.org (Postfix) with ESMTP id 706CA40669 for ; Thu, 10 Oct 2024 16:23:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kGBjYQfWNk+fxKIodGFUYegHosGgnYRHJiD19eWE7G7hCq8Fa/Y9Is4dNUfE/UIPvAeEpOjFNrRVf/TA3m4uz45ATzqF7n1Xpvq0m0jtz803EFhcyw90WQ2veAN4QKMaEe3MnurWw+N5rTAqF9Xs4BIv4dcSnuzJsLHP90pmtQn+e/q1owr2bnufQoak3mSXbAy0q82fc/O5QTp3bHhaDqSG3dHgrd7VoPdtKNTg85jFxFhd5L1X1LnxQuA8gCnmqz5CBlx0j4jcqP0GBQgHNcSJmwcuV6IjvvK8hjllUTY3w+O+3+yHx0WrZ/WxUpeOON0IObCd7pnW1RXisgwlrA== 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=ZkIKv5i0ytANi2Qv4NhA4vS3QvO0U4Y3yKKe5bexizg=; b=pE0SIdg1IvGGEnGdVHBEV9054I+MjBKhgKoHBhXKwgYHW+9u15GCghXsk8zD7Ex6DvKeLeHgwj/3fteLHFzPCu4NsDUTuiVJPwG9c0bz7M4UCqhgSMPxGpWoaIr1eK3pFSjkJudOIo+YkaF+Ok0jZQc2kCqQ66YHh4u3UAHRVHLfgusRxcJ2S6An9qKg6Z9i2ZT5l9xWNsf67Lkk7leR3O33PlFbSFzHQlga0Tc9D5PSgC2gkBXNFibKouI1VM1r8FBR54hOWSWCn7DT2YodMgsoe8E96QCUBLKf0bWUEuNAwNQUxe1ULtmhMDqmmqsB23VqJM4Tny/Q5ZZguf1LyA== 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=ZkIKv5i0ytANi2Qv4NhA4vS3QvO0U4Y3yKKe5bexizg=; b=WsKFcj04WjQu4B3ur191MCOY0dyP1QVxPweZs0eFLJVCrYlGQH5DGOeFcZFXNBkNeiZOBtMVdjLFyRuk1rvI3ztQqSuoDVgPOt/Lxiwpryt7F1+tviEZnQb6f+5lpys8/WRH/u9HT1pJVJwH2f9W9+gJ7q7iDbUjyQfnigESE0MW/gqbNvHcJWEPzxgNq4z7vPe/O+njXV3C+AWkfsYWdLRrOMvUrZSHMElMEot+TrpHv62ije6+nouy/3ZkiN+5mC/aq3vF5WstxWlNWMYkmd/36DxphKyIJwJII3spPliZGZzFagLVpZo9KBBhKL+g/vWjRLb3g3KJ6Bcg2GIgMw== Received: from DU2PR04CA0297.eurprd04.prod.outlook.com (2603:10a6:10:28c::32) by AS8PR07MB7847.eurprd07.prod.outlook.com (2603:10a6:20b:39e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.16; Thu, 10 Oct 2024 14:23:00 +0000 Received: from DB1PEPF000509EE.eurprd03.prod.outlook.com (2603:10a6:10:28c:cafe::21) by DU2PR04CA0297.outlook.office365.com (2603:10a6:10:28c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.23 via Frontend Transport; Thu, 10 Oct 2024 14:22:59 +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 DB1PEPF000509EE.mail.protection.outlook.com (10.167.242.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.11 via Frontend Transport; Thu, 10 Oct 2024 14:22:59 +0000 Received: from seliicinfr00049.seli.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.69) 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 0123F38007D; Thu, 10 Oct 2024 16:22:59 +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 v8 6/7] service: keep per-lcore state in lcore variable Date: Thu, 10 Oct 2024 16:13:48 +0200 Message-ID: <20241010141349.813088-7-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: DB1PEPF000509EE:EE_|AS8PR07MB7847:EE_ X-MS-Office365-Filtering-Correlation-Id: 8964a590-6b42-4f2f-3ae6-08dce9370b31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?TjRNSEtGbEx4cW9mbEFEYkVzK0VtZ2JQTzVJOHFqdDQ4Vm1GYVoxdTNkR1M4?= =?utf-8?B?S2FMWDNSM1F3U2xVVmcwS2JLdTRQdVM5ZjNsRFhtdWhJK0ZYYUNqZ2Z1a1RH?= =?utf-8?B?a3lnQ05UOWQrUE5DUmEvaUhrb1JpeFpwU2FUT3VKcCtlRGJoRVg2RnpNNzF6?= =?utf-8?B?bEVacG96TkJSS3kzeWwreHFIT1VqNVNMNDZUTXFsY2t5ZENJUlpFWVB5UVNs?= =?utf-8?B?ZXJOdUs1cHZGdlZPZ1diclhyZzFSRGxkTTNlVXFZemNLVTNFMXJZdllYazQv?= =?utf-8?B?WU9od3hlNEd5UDZiWVQ4SHo1TzRwS0pRZ3poT0VWL2pVNjdxM0dyd2NtMlM2?= =?utf-8?B?ZTZkbnBSNWk1TzRCOWFWa0RwakVRRlNLVUwrMEVvYzJyMjhZcWo1TFNTKzJo?= =?utf-8?B?cDVndzNXQkJLSUdqWnJ1M25HWUlqM2ZhQXlmL0w5bFI4aDNXMGRFdHkrckY5?= =?utf-8?B?dy9FMzlFL3pqYkxYdGtTNmVjTXBHV2lPL1Y2NTZ5NjJKaEFnb1R5TGlmNFpp?= =?utf-8?B?UW8rWXRtbEx3Y2ZPNmJNbk4weFZmUUZOOU1lY1JMSjhDejFqMlFrVUswdUVi?= =?utf-8?B?Nms5VUtiNFlCWTQyS0JyeWZPRjNnNjhjTHR0RFd6alBlclRGVmY0RGFYajR6?= =?utf-8?B?T3N3WEVuemlycHFURFhpN0VOZkt4SHIxK2FIRFJTV1ZGMmpkOGMwMkdqUHlP?= =?utf-8?B?RFRMY2JXYjdZOFV5c2lrUk5Yc21JSnBxZ2NaeWYrc2FkM1V5OWpzc3lZL1kv?= =?utf-8?B?U0ZobE9IdWE1VHlZTmFkT0s2T3g5M3Yxc2RlMzdYd3d3dUtmSjRLb2FtNWdq?= =?utf-8?B?SUxEL1NBcnBlTWFxYUorZEEwR1M1VU9VNU1YVTF4Y1pOVWptTVZ0OUF0SHBO?= =?utf-8?B?M0tYRVU2M0trWGlieDNDQlhhYWRSaGEvVm4rWkUzVEZxWnFqRDdKSG1oZXY3?= =?utf-8?B?SFFUcUZRZWhWMFI1TksrMzZXNHVQREw3cEk4Q0xoSE96eENaT1hVT0MvcWtm?= =?utf-8?B?VzRIdmRLb0RocnF0cnBFdFlZVHRJclc5NU03Mm05ak9RN2pvaUFFRmdKWWN4?= =?utf-8?B?cE1jc2ZZQmFqTmJNaHJUeGpYV3UxYm5DWUY0YmxaQ2ZzVEFLQUNGcUptUDZO?= =?utf-8?B?VFdqVy9NSTdPYWlRS2Z3SmR0UkRMN0NlNjRwT21OOGVITEplMHNtbnZnUFo4?= =?utf-8?B?dzNWWkhhRitFUXNiUWhqOGZuZ2J2S2l5TnBJbVVOa3p6am9VRlJ1RFhTQVZq?= =?utf-8?B?dGhGTTBLOHUvbWdEamlwQXIzbEtvM3VnSG8zQmFscnhjbGdJdVBzNGp2NmND?= =?utf-8?B?N1ROand4S0NRRjVBWGFKTWtEUGpLQXllYjNNazBLUWVCL1NBOXptbm9CTCsr?= =?utf-8?B?YnNxS3RDLzMzMGRFMTVpajVLYTRVTFo0KzQ0bzFHd3NDK2V5T0R5YnZ5RUgw?= =?utf-8?B?NWgxUDMyYnV5R1BUWkoxZWZTZnVJNGdmcjJXcEZ2Ni9DMXptUyt4aWttc0lB?= =?utf-8?B?VEFWekU2WnVmNEsrL2FZSEFJSWJnOEI0Y2dacDRLY3RVWVFZKzBTbm9jTHRX?= =?utf-8?B?RWZILzQwSG5NZUNNSHVVcHQ4L2RNSGsvT1d5bjhjZlpzMC8wanRscTR4bFlX?= =?utf-8?B?RkNMSk1BcVRjZHpiNG9GMHY0eTh4Y29Lakk5VE5SRG1uSGp3SGJzUkdwRVlQ?= =?utf-8?B?UEEvRGh5bTd6cjFSM2JhUWdUdHZoY091WUMvZzVnZUZpZTFEUDBwdGd5c3g4?= =?utf-8?B?ZktYMG1xODV5SlNwbkJkbTlNaGFGUk1odDRyVmZxUE5EV3BOTDF6TG9scVFl?= =?utf-8?B?SUwxOSsvWG9GTUM1djFRU2FzZjBUeFBGQk5NcUhseDhwWmtrenoyOTJKSEVQ?= =?utf-8?Q?jMu2VWOVrNIql?= 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)(36860700013)(376014)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2024 14:22:59.9235 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8964a590-6b42-4f2f-3ae6-08dce9370b31 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: DB1PEPF000509EE.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7847 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 v7: * Update to match new FOREACH API. RFC v6: * Remove a now-redundant lcore variable value memset(). RFC v5: * Fix lcore value pointer bug introduced by RFC v4. RFC v4: * Remove strange-looking lcore value lookup potentially containing invalid lcore id. (Morten Brørup) * Replace misplaced tab with space. (Morten Brørup) --- lib/eal/common/rte_service.c | 117 +++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 52 deletions(-) diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c index a38c594ce4..3d2c12c39b 100644 --- a/lib/eal/common/rte_service.c +++ b/lib/eal/common/rte_service.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -77,7 +78,7 @@ struct __rte_cache_aligned core_state { static uint32_t rte_service_count; static struct rte_service_spec_impl *rte_services; -static struct core_state *lcore_states; +static RTE_LCORE_VAR_HANDLE(struct core_state, lcore_states); static uint32_t rte_service_library_initialized; int32_t @@ -103,12 +104,8 @@ rte_service_init(void) goto fail_mem; } - lcore_states = rte_calloc("rte_service_core_states", RTE_MAX_LCORE, - sizeof(struct core_state), RTE_CACHE_LINE_SIZE); - if (!lcore_states) { - EAL_LOG(ERR, "error allocating core states array"); - goto fail_mem; - } + if (lcore_states == NULL) + RTE_LCORE_VAR_ALLOC(lcore_states); int i; struct rte_config *cfg = rte_eal_get_configuration(); @@ -124,7 +121,6 @@ rte_service_init(void) return 0; fail_mem: rte_free(rte_services); - rte_free(lcore_states); return -ENOMEM; } @@ -138,7 +134,6 @@ rte_service_finalize(void) rte_eal_mp_wait_lcore(); rte_free(rte_services); - rte_free(lcore_states); rte_service_library_initialized = 0; } @@ -288,7 +283,6 @@ rte_service_component_register(const struct rte_service_spec *spec, int32_t rte_service_component_unregister(uint32_t id) { - uint32_t i; struct rte_service_spec_impl *s; SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL); @@ -296,9 +290,11 @@ rte_service_component_unregister(uint32_t id) s->internal_flags &= ~(SERVICE_F_REGISTERED); + unsigned int lcore_id; + struct core_state *cs; /* clear the run-bit in all cores */ - for (i = 0; i < RTE_MAX_LCORE; i++) - lcore_states[i].service_mask &= ~(UINT64_C(1) << id); + RTE_LCORE_VAR_FOREACH_VALUE(lcore_id, cs, lcore_states) + cs->service_mask &= ~(UINT64_C(1) << id); memset(&rte_services[id], 0, sizeof(struct rte_service_spec_impl)); @@ -467,7 +463,10 @@ rte_service_may_be_active(uint32_t id) return -EINVAL; for (i = 0; i < lcore_count; i++) { - if (lcore_states[ids[i]].service_active_on_lcore[id]) + struct core_state *cs = + RTE_LCORE_VAR_LCORE_VALUE(ids[i], lcore_states); + + if (cs->service_active_on_lcore[id]) return 1; } @@ -477,7 +476,7 @@ rte_service_may_be_active(uint32_t id) int32_t rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe) { - struct core_state *cs = &lcore_states[rte_lcore_id()]; + struct core_state *cs = RTE_LCORE_VAR_VALUE(lcore_states); struct rte_service_spec_impl *s; SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL); @@ -499,8 +498,7 @@ service_runner_func(void *arg) { RTE_SET_USED(arg); uint8_t i; - const int lcore = rte_lcore_id(); - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_VALUE(lcore_states); rte_atomic_store_explicit(&cs->thread_active, 1, rte_memory_order_seq_cst); @@ -546,13 +544,15 @@ service_runner_func(void *arg) int32_t rte_service_lcore_may_be_active(uint32_t lcore) { - if (lcore >= RTE_MAX_LCORE || !lcore_states[lcore].is_service_core) + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); + + if (lcore >= RTE_MAX_LCORE || !cs->is_service_core) return -EINVAL; /* Load thread_active using ACQUIRE to avoid instructions dependent on * the result being re-ordered before this load completes. */ - return rte_atomic_load_explicit(&lcore_states[lcore].thread_active, + return rte_atomic_load_explicit(&cs->thread_active, rte_memory_order_acquire); } @@ -560,9 +560,12 @@ int32_t rte_service_lcore_count(void) { int32_t count = 0; - uint32_t i; - for (i = 0; i < RTE_MAX_LCORE; i++) - count += lcore_states[i].is_service_core; + + unsigned int lcore_id; + struct core_state *cs; + RTE_LCORE_VAR_FOREACH_VALUE(lcore_id, cs, lcore_states) + count += cs->is_service_core; + return count; } @@ -579,7 +582,8 @@ rte_service_lcore_list(uint32_t array[], uint32_t n) uint32_t i; uint32_t idx = 0; for (i = 0; i < RTE_MAX_LCORE; i++) { - struct core_state *cs = &lcore_states[i]; + struct core_state *cs = + RTE_LCORE_VAR_LCORE_VALUE(i, lcore_states); if (cs->is_service_core) { array[idx] = i; idx++; @@ -595,7 +599,7 @@ rte_service_lcore_count_services(uint32_t lcore) if (lcore >= RTE_MAX_LCORE) return -EINVAL; - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); if (!cs->is_service_core) return -ENOTSUP; @@ -647,30 +651,31 @@ rte_service_start_with_defaults(void) static int32_t service_update(uint32_t sid, uint32_t lcore, uint32_t *set, uint32_t *enabled) { + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); + /* validate ID, or return error value */ if (!service_valid(sid) || lcore >= RTE_MAX_LCORE || - !lcore_states[lcore].is_service_core) + !cs->is_service_core) return -EINVAL; uint64_t sid_mask = UINT64_C(1) << sid; if (set) { - uint64_t lcore_mapped = lcore_states[lcore].service_mask & - sid_mask; + uint64_t lcore_mapped = cs->service_mask & sid_mask; if (*set && !lcore_mapped) { - lcore_states[lcore].service_mask |= sid_mask; + cs->service_mask |= sid_mask; rte_atomic_fetch_add_explicit(&rte_services[sid].num_mapped_cores, 1, rte_memory_order_relaxed); } if (!*set && lcore_mapped) { - lcore_states[lcore].service_mask &= ~(sid_mask); + cs->service_mask &= ~(sid_mask); rte_atomic_fetch_sub_explicit(&rte_services[sid].num_mapped_cores, 1, rte_memory_order_relaxed); } } if (enabled) - *enabled = !!(lcore_states[lcore].service_mask & (sid_mask)); + *enabled = !!(cs->service_mask & (sid_mask)); return 0; } @@ -698,13 +703,14 @@ set_lcore_state(uint32_t lcore, int32_t state) { /* mark core state in hugepage backed config */ struct rte_config *cfg = rte_eal_get_configuration(); + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); cfg->lcore_role[lcore] = state; /* mark state in process local lcore_config */ lcore_config[lcore].core_role = state; /* update per-lcore optimized state tracking */ - lcore_states[lcore].is_service_core = (state == ROLE_SERVICE); + cs->is_service_core = (state == ROLE_SERVICE); rte_eal_trace_service_lcore_state_change(lcore, state); } @@ -715,14 +721,16 @@ rte_service_lcore_reset_all(void) /* loop over cores, reset all to mask 0 */ uint32_t i; for (i = 0; i < RTE_MAX_LCORE; i++) { - if (lcore_states[i].is_service_core) { - lcore_states[i].service_mask = 0; + struct core_state *cs = + RTE_LCORE_VAR_LCORE_VALUE(i, lcore_states); + if (cs->is_service_core) { + cs->service_mask = 0; set_lcore_state(i, ROLE_RTE); /* runstate act as guard variable Use * store-release memory order here to synchronize * with load-acquire in runstate read functions. */ - rte_atomic_store_explicit(&lcore_states[i].runstate, + rte_atomic_store_explicit(&cs->runstate, RUNSTATE_STOPPED, rte_memory_order_release); } } @@ -738,17 +746,19 @@ rte_service_lcore_add(uint32_t lcore) { if (lcore >= RTE_MAX_LCORE) return -EINVAL; - if (lcore_states[lcore].is_service_core) + + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); + if (cs->is_service_core) return -EALREADY; set_lcore_state(lcore, ROLE_SERVICE); /* ensure that after adding a core the mask and state are defaults */ - lcore_states[lcore].service_mask = 0; + cs->service_mask = 0; /* Use store-release memory order here to synchronize with * load-acquire in runstate read functions. */ - rte_atomic_store_explicit(&lcore_states[lcore].runstate, RUNSTATE_STOPPED, + rte_atomic_store_explicit(&cs->runstate, RUNSTATE_STOPPED, rte_memory_order_release); return rte_eal_wait_lcore(lcore); @@ -760,7 +770,7 @@ rte_service_lcore_del(uint32_t lcore) if (lcore >= RTE_MAX_LCORE) return -EINVAL; - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); if (!cs->is_service_core) return -EINVAL; @@ -784,7 +794,7 @@ rte_service_lcore_start(uint32_t lcore) if (lcore >= RTE_MAX_LCORE) return -EINVAL; - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); if (!cs->is_service_core) return -EINVAL; @@ -814,6 +824,8 @@ rte_service_lcore_start(uint32_t lcore) int32_t rte_service_lcore_stop(uint32_t lcore) { + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); + if (lcore >= RTE_MAX_LCORE) return -EINVAL; @@ -821,12 +833,11 @@ rte_service_lcore_stop(uint32_t lcore) * memory order here to synchronize with store-release * in runstate update functions. */ - if (rte_atomic_load_explicit(&lcore_states[lcore].runstate, rte_memory_order_acquire) == + if (rte_atomic_load_explicit(&cs->runstate, rte_memory_order_acquire) == RUNSTATE_STOPPED) return -EALREADY; uint32_t i; - struct core_state *cs = &lcore_states[lcore]; uint64_t service_mask = cs->service_mask; for (i = 0; i < RTE_SERVICE_NUM_MAX; i++) { @@ -847,7 +858,7 @@ rte_service_lcore_stop(uint32_t lcore) /* Use store-release memory order here to synchronize with * load-acquire in runstate read functions. */ - rte_atomic_store_explicit(&lcore_states[lcore].runstate, RUNSTATE_STOPPED, + rte_atomic_store_explicit(&cs->runstate, RUNSTATE_STOPPED, rte_memory_order_release); rte_eal_trace_service_lcore_stop(lcore); @@ -858,7 +869,7 @@ rte_service_lcore_stop(uint32_t lcore) static uint64_t lcore_attr_get_loops(unsigned int lcore) { - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); return rte_atomic_load_explicit(&cs->loops, rte_memory_order_relaxed); } @@ -866,7 +877,7 @@ lcore_attr_get_loops(unsigned int lcore) static uint64_t lcore_attr_get_cycles(unsigned int lcore) { - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); return rte_atomic_load_explicit(&cs->cycles, rte_memory_order_relaxed); } @@ -874,7 +885,7 @@ lcore_attr_get_cycles(unsigned int lcore) static uint64_t lcore_attr_get_service_calls(uint32_t service_id, unsigned int lcore) { - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); return rte_atomic_load_explicit(&cs->service_stats[service_id].calls, rte_memory_order_relaxed); @@ -901,7 +912,7 @@ lcore_attr_get_service_error_calls(uint32_t service_id, unsigned int lcore) static uint64_t lcore_attr_get_service_cycles(uint32_t service_id, unsigned int lcore) { - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); return rte_atomic_load_explicit(&cs->service_stats[service_id].cycles, rte_memory_order_relaxed); @@ -917,7 +928,10 @@ attr_get(uint32_t id, lcore_attr_get_fun lcore_attr_get) uint64_t sum = 0; for (lcore = 0; lcore < RTE_MAX_LCORE; lcore++) { - if (lcore_states[lcore].is_service_core) + struct core_state *cs = + RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); + + if (cs->is_service_core) sum += lcore_attr_get(id, lcore); } @@ -979,12 +993,11 @@ int32_t rte_service_lcore_attr_get(uint32_t lcore, uint32_t attr_id, uint64_t *attr_value) { - struct core_state *cs; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); if (lcore >= RTE_MAX_LCORE || !attr_value) return -EINVAL; - cs = &lcore_states[lcore]; if (!cs->is_service_core) return -ENOTSUP; @@ -1009,7 +1022,8 @@ rte_service_attr_reset_all(uint32_t id) return -EINVAL; for (lcore = 0; lcore < RTE_MAX_LCORE; lcore++) { - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = + RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); cs->service_stats[id] = (struct service_stats) {}; } @@ -1020,12 +1034,11 @@ rte_service_attr_reset_all(uint32_t id) int32_t rte_service_lcore_attr_reset_all(uint32_t lcore) { - struct core_state *cs; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); if (lcore >= RTE_MAX_LCORE) return -EINVAL; - cs = &lcore_states[lcore]; if (!cs->is_service_core) return -ENOTSUP; @@ -1060,7 +1073,7 @@ static void service_dump_calls_per_lcore(FILE *f, uint32_t lcore) { uint32_t i; - struct core_state *cs = &lcore_states[lcore]; + struct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states); fprintf(f, "%02d\t", lcore); for (i = 0; i < RTE_SERVICE_NUM_MAX; i++) { -- 2.43.0