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 911F4459BF;
Tue, 17 Sep 2024 16:42:40 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 3C08C41109;
Tue, 17 Sep 2024 16:42:09 +0200 (CEST)
Received: from EUR05-AM6-obe.outbound.protection.outlook.com
(mail-am6eur05on2081.outbound.protection.outlook.com [40.107.22.81])
by mails.dpdk.org (Postfix) with ESMTP id 4FA98402D8
for <dev@dpdk.org>; Tue, 17 Sep 2024 16:42:02 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=XhusOdKC2P26QYH1mLgdjnnHtfpTYahbUR7EvQKgr3EwtEehww98NwuJ2N9sbQLtHxgP7/SzHNweCY9NHf+1lfBOPcWLqfW1dHW6ijvjMSfK4XNeIi1FZVpsGNT1iD/KJSjtooi5D0rrYCw8K3SH0oqqQOK3xRsshil0Zy7gnDGEaKXZvCasE4uYjFwC0kMgWXRQJMqVbsD4h5N40Jt9niYfuTUduAc07ssjPpHQpWE91x8jUdbSLzXtN38ZVHZzDT4CLnQUFCNWEdCa65h3AY8rJMo5masZb0jHGeXcLOYutq1wUPZbNtQc4hzcBk25gXbtrgoBTp292rbdHuyB6A==
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=APdZoBWSJd5oP5OcpWYjKS3IGRORFZkwvw19Ez880eg=;
b=p1dhUJGXiHduh89shaU3ZzgMY4KpUsQaC120t79r6yN13AMdgBa6TcwVemp5opZNDEfGqeSBtvWr4dnr7zO+GBEHypQkQ533yTSDmcoL6qL4GlyQCnJkPaguBQ1A0vLcnvPxNHbuCK9z023o+XhcbomqqipfbNoX1FMDm2GtqCAMoHac+/RamMCrwgOK7xyVhkOWN0szUWYiW+eTiU42GirKvO0W14U7JXYcMR7likvgBNxdoFC0c+ZkjQ0qb5ey/N9rBJazb6lFr2qnwWy4OXIHCycqmvvI/cdBOBJjiiIxpHGXxhcxiyGc6nal7K85KKRYcaQ2ZqUml3sj5rkSmw==
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=APdZoBWSJd5oP5OcpWYjKS3IGRORFZkwvw19Ez880eg=;
b=ckRPKhtgaqa5TdJ28zYSEUfj+9E9nRi7ao0Sead8MjjkxvQK+nIMBKD7/dWzzDlNy/q/ZDOVo2n7Z8ZxjV1I/LOCaUBX6V7sgkgZoZeX/TVJ+MR26TX8IFiXQ56q+FPd5wGAY961RsBGrcNPy2S4uz7ct2w/IvedAJ/lNoJlP8DAVdao/gjRsYCScGvx46MBiKeN1o2O0e+Dwxjk+tNvfnmurhriUnXbWU4stIr8ILXQm8oVSXHJ5jhaygr6yq+3n1XwBEk0Gg8D7aY+qEuwkEmJ3PKvV8ZwLiptBt+8TEbJ24ZEQLDyBpk0nZHNlUQU94N8a/3c8LSw/qaJfNYVqg==
Received: from AM6P195CA0045.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:87::22)
by AS2PR07MB9232.eurprd07.prod.outlook.com (2603:10a6:20b:60f::12) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.24; Tue, 17 Sep
2024 14:41:58 +0000
Received: from AMS0EPF000001AC.eurprd05.prod.outlook.com
(2603:10a6:209:87:cafe::7) by AM6P195CA0045.outlook.office365.com
(2603:10a6:209:87::22) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.30 via Frontend
Transport; Tue, 17 Sep 2024 14:41:58 +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
AMS0EPF000001AC.mail.protection.outlook.com (10.167.16.152) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7918.13 via Frontend Transport; Tue, 17 Sep 2024 14:41:57 +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, 17 Sep 2024 16:41:57 +0200
Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100])
by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id
0C99838007A; Tue, 17 Sep 2024 16:41:57 +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>,
=?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>,
Konstantin Ananyev <konstantin.ananyev@huawei.com>
Subject: [PATCH v5 6/7] service: keep per-lcore state in lcore variable
Date: Tue, 17 Sep 2024 16:32:38 +0200
Message-ID: <20240917143239.724069-7-mattias.ronnblom@ericsson.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240917143239.724069-1-mattias.ronnblom@ericsson.com>
References: <20240916105210.721315-2-mattias.ronnblom@ericsson.com>
<20240917143239.724069-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: AMS0EPF000001AC:EE_|AS2PR07MB9232:EE_
X-MS-Office365-Filtering-Correlation-Id: 76afffb5-9fd5-477d-754f-08dcd726e1b4
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?dXZ0d1YzVkZhaFdsdlQxQk9iRHJoSHFvNWgzWE5lRkRtL0wxdFpiS3FKWGlM?=
=?utf-8?B?b09hZXRxL3hSNWM2TGxjR1dvR2M2ekRpNnFub1Jab2FSbUlFWFl0bmY0WEZl?=
=?utf-8?B?ZGRlVEZwdGFZb1cxYjB1dVFRZmtrZEUzQmQrUUJhWjdxV25qWnByMkpYNFIw?=
=?utf-8?B?QmxiaWlyWDRyMzg0RXFaOTFYcUhCdkltaGwwTVF2WGNIeGVxb3VnK3dRUVFD?=
=?utf-8?B?NXhmeUpZVC92SGVVRlRIZ1JUMzF4SGxzbDY4elMrS2lvcTRJV2Z0bFcvTjlJ?=
=?utf-8?B?R2NZREJXb01PRDlaRW4yeXNUVWpma0JPOTN6VE9wYjQ5bTc0WjZFQ25weDlQ?=
=?utf-8?B?dlFqRGhUc1U5SVY2WUVJbTJrZHVzSGZyZjErV05TcS8yUDNJSm5aSGwxWGhl?=
=?utf-8?B?eTFIMmFjTDZMWnZqT1krMUd4Ykp0WXdlTnRVSEZhekVnTjVXZlcxeW1TcWZ0?=
=?utf-8?B?N0RvQWxFNTl2Q0k1bVRydkV3RTVUK0tEdFRjTlFnTFQ2MURFN2kwMUhBNUE2?=
=?utf-8?B?cEM2aDVia3lzK0QvRVBPQURkdzdkaVZrazU4R2Evb1JmM2ZuMG8xekNsVlZn?=
=?utf-8?B?cys3QndtTk5sZy82NVgvdTNiWmdxY055M3YrMFhyR25VMkJwbGJnUHhiRWRZ?=
=?utf-8?B?aldkYXNJSUk5Zm8yYWI5T1JGQVkrcDVwQmF1RVRCRDNPNnNwcHlmTERtZWJ3?=
=?utf-8?B?ZmM1RXpvV0lQcnlsZWdHQk1BODRvMGxNTFN6MEpIVThOWGNBRWl2cUw5TzJK?=
=?utf-8?B?dDVjNnVVWmJ4dXg2RFl0cEZBK05ZaFpNOHB4cFUrRUtxMEE0OStMNXFqb1Fi?=
=?utf-8?B?VTY4MVR5UkpRWmtheW9Kc0wxZEJBUDRQNldXbHJ5ejVEQ2RWZ01jUFpqOGtQ?=
=?utf-8?B?aEF6NUZ6Vmg0YjlEeFdjL0cyT0prSC9YaGhOVW1vM0JLZmtsNGhrQWIzMitI?=
=?utf-8?B?b2Zvc1AwRGYzbjMxTThaMTJrRzNjSzJxZ2hTNjdDajlsQWFHdkdZclJDMy9D?=
=?utf-8?B?UGpOWEtFMWlxRkx3Ykx3WGg1ajcrN29uQy90NUhKWjB1SjVDSUlwd0tQRWgx?=
=?utf-8?B?N2M0dEdvK0NvbEcxQjAxZXhtbGJNWW1mTUlja0hRcDRqaXhXSEtZVWw3RWx3?=
=?utf-8?B?RVRZUHpaandXTFB2YlgvNjVoZGdiTkxuYTFOQVpkcCtzZ0RWaGovRHU3Szdm?=
=?utf-8?B?NkZLR2tiYytkRkFNNHAzbjZjUmg5M0pZS0p3Y3RoUFkydUNIeDl1WkVwdUw5?=
=?utf-8?B?RlRJVnNreXBKNFFKbXNyZ0kyL1VqVWxOVkJhbDROZ3dna05TMWlYQUhzYWxr?=
=?utf-8?B?NjZoMHczZ3VKSFVSVFV4WGNKdEsvYjhvenViL0VlWm1TTERQc2JXTFVhZFhk?=
=?utf-8?B?YWNUcEh1R0tOL0tndHJBdU1KQUpvamgxUngzb1liYWtnblUxWDdVRnQwKzVS?=
=?utf-8?B?ZThENEVaa2g3b0huNXRyOVg4ek05OVZ3OEkxbTBSNm1OTXhXZEI4eEI4djA0?=
=?utf-8?B?TnljNTNmUkhMQlNBaVk3NnRqZ3ZYYzc1VHAyMi81OXNKdkczczVheUMyTzBs?=
=?utf-8?B?Q3pQZWVMNjVIamdRQ24rb0tHN1AxRXRkc3N1TXY2NHVsSTlYMWkxdW1TUDZU?=
=?utf-8?B?VXJDS2VSbjZsODZTRjczNmR6akN1S092dnJYS0xHc3JGWThsNFJ0MUc4NVVX?=
=?utf-8?B?bVlhVGVTa1hMUkx3OUtyQ2tMSk5ubExzTVVDSEo1YitmbUwveUJYQTNZVStn?=
=?utf-8?B?dlFpb0swK2VWZGJSUTRkZit3QWxIVUtEalN3K1ZkaTNwUURQc0RKZ2crM1g3?=
=?utf-8?B?c3hldzRzdHgzcUxFYjZUUnNySWRicVduSW94bjlPTVFzMXpTR1lnYXd5TW5i?=
=?utf-8?Q?nB8gYSeZU5M+0?=
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: 17 Sep 2024 14:41:57.4728 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 76afffb5-9fd5-477d-754f-08dcd726e1b4
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: AMS0EPF000001AC.eurprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR07MB9232
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>
--
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 | 115 +++++++++++++++++++----------------
1 file changed, 63 insertions(+), 52 deletions(-)
diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c
index 56379930b6..03379f1588 100644
--- a/lib/eal/common/rte_service.c
+++ b/lib/eal/common/rte_service.c
@@ -11,6 +11,7 @@
#include <eal_trace_internal.h>
#include <rte_lcore.h>
+#include <rte_lcore_var.h>
#include <rte_branch_prediction.h>
#include <rte_common.h>
#include <rte_cycles.h>
@@ -75,7 +76,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
@@ -101,12 +102,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();
@@ -122,7 +119,6 @@ rte_service_init(void)
return 0;
fail_mem:
rte_free(rte_services);
- rte_free(lcore_states);
return -ENOMEM;
}
@@ -136,7 +132,6 @@ rte_service_finalize(void)
rte_eal_mp_wait_lcore();
rte_free(rte_services);
- rte_free(lcore_states);
rte_service_library_initialized = 0;
}
@@ -286,7 +281,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);
@@ -294,9 +288,10 @@ rte_service_component_unregister(uint32_t id)
s->internal_flags &= ~(SERVICE_F_REGISTERED);
+ 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(cs, lcore_states)
+ cs->service_mask &= ~(UINT64_C(1) << id);
memset(&rte_services[id], 0, sizeof(struct rte_service_spec_impl));
@@ -454,7 +449,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;
}
@@ -464,7 +462,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);
@@ -486,8 +484,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);
@@ -533,13 +530,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);
}
@@ -547,9 +546,11 @@ 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;
+
+ struct core_state *cs;
+ RTE_LCORE_VAR_FOREACH_VALUE(cs, lcore_states)
+ count += cs->is_service_core;
+
return count;
}
@@ -566,7 +567,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++;
@@ -582,7 +584,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;
@@ -634,30 +636,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;
}
@@ -685,13 +688,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);
}
@@ -702,14 +706,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);
}
}
@@ -725,17 +731,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);
@@ -747,7 +755,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;
@@ -771,7 +779,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;
@@ -801,6 +809,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;
@@ -808,12 +818,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++) {
@@ -834,7 +843,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);
@@ -845,7 +854,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);
}
@@ -853,7 +862,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);
}
@@ -861,7 +870,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);
@@ -870,7 +879,7 @@ lcore_attr_get_service_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);
@@ -886,7 +895,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);
}
@@ -930,12 +942,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;
@@ -960,7 +971,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) {};
}
@@ -971,12 +983,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;
@@ -1011,7 +1022,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.34.1