Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/137420/?format=api
{ "id": 137420, "url": "http://patches.dpdk.org/api/patches/137420/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240228100928.524277-6-mattias.ronnblom@ericsson.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20240228100928.524277-6-mattias.ronnblom@ericsson.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240228100928.524277-6-mattias.ronnblom@ericsson.com", "date": "2024-02-28T10:09:27", "name": "[RFC,v5,5/6] service: keep per-lcore state in lcore variable", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e7f3c44248def3e166518449c16a08dde08103e5", "submitter": { "id": 1077, "url": "http://patches.dpdk.org/api/people/1077/?format=api", "name": "Mattias Rönnblom", "email": "mattias.ronnblom@ericsson.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240228100928.524277-6-mattias.ronnblom@ericsson.com/mbox/", "series": [ { "id": 31270, "url": "http://patches.dpdk.org/api/series/31270/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31270", "date": "2024-02-28T10:09:22", "name": "Lcore variables", "version": 5, "mbox": "http://patches.dpdk.org/series/31270/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/137420/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/137420/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 050B843C1F;\n\tWed, 28 Feb 2024 11:18:06 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C3B0242EC1;\n\tWed, 28 Feb 2024 11:17:40 +0100 (CET)", "from EUR04-VI1-obe.outbound.protection.outlook.com\n (mail-vi1eur04on2087.outbound.protection.outlook.com [40.107.8.87])\n by mails.dpdk.org (Postfix) with ESMTP id 5C2AF40ED3\n for <dev@dpdk.org>; Wed, 28 Feb 2024 11:17:25 +0100 (CET)", "from DU7P195CA0016.EURP195.PROD.OUTLOOK.COM (2603:10a6:10:54d::23)\n by AM8PR07MB8278.eurprd07.prod.outlook.com (2603:10a6:20b:325::12) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.36; Wed, 28 Feb\n 2024 10:17:23 +0000", "from DU2PEPF00028D00.eurprd03.prod.outlook.com\n (2603:10a6:10:54d:cafe::7b) by DU7P195CA0016.outlook.office365.com\n (2603:10a6:10:54d::23) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.50 via Frontend\n Transport; Wed, 28 Feb 2024 10:17:23 +0000", "from oa.msg.ericsson.com (192.176.1.74) by\n DU2PEPF00028D00.mail.protection.outlook.com (10.167.242.184) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.7292.25 via Frontend Transport; Wed, 28 Feb 2024 10:17:23 +0000", "from seliicinfr00049.seli.gic.ericsson.se (153.88.142.248) by\n smtp-central.internal.ericsson.com (100.87.178.61) with Microsoft SMTP Server\n id 15.2.1258.12; Wed, 28 Feb 2024 11:17:22 +0100", "from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100])\n by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id\n 8F57E380061; Wed, 28 Feb 2024 11:17:22 +0100 (CET)" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=SGoSO4jGvaxmFPllsjxRswyEVJ7uqA1gVOjSuqGaqMRrGqSahnuLQcRqptnEmWJYLxY+Bw/+NWMuiWHnzuWTb3UKhEKVc9/SDor7WuAddIPXCeg8mG6g9VrDh0wLcBTjlRQSaG9hyrVqlcXAvul16ycLWV5JvoY75lkaiU5yzN1y9DtHZntdEDUPCuxZe/DlZ5VIouujSPzLF6WuZiDVJ73/AHoHWKnJngLqXONRLOTUTEHTDDh4y8WJRwUPEmEYOHDGCoJ7ooIw9L+R8qmHVPC9Woe86zZytjbc2u4PWue3u9/1SubRTi9UFQtnWmyfQkJPTW6ewCZJ74ZGUnc5Sg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=Zje9q7DJMu0UxiO9XmpivsL8yq5KgzW3xDAjmWeERKg=;\n b=HrZfh05V12EiQaLsONty88HgfJRApkg8n+Uymjfht9D6+0MQw9Fb2eLpnXIvlzHdnTZyT8gC1tqSd0nuuBbnF8r3Ae9W0twI8UV1xmV+2avbM5qOd/2nE3R7DDTgrsV6vfeMXXpc2Jzvj3BLmIaz1OHk6+KTzsToDB9IdR5EDqDt1hTgRJi7/iahF6rKljfBYp2yeZY4DKbVymjGhPeSmsXHpcbVMCJ6XkWSnIMtZkecZgLxv9wjVayM7O6jaIvPM0mIU8giRILQK0CT8XA0WooQ5Z+uf8vbdLb+A44xpo8o+Lh6lEnn3LrkfZ5Y0TDXurSxbLmElfl7mRWi9+wpaw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 192.176.1.74) smtp.rcpttodomain=dpdk.org smtp.mailfrom=ericsson.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=ericsson.com;\n dkim=none (message not signed); arc=none (0)", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=Zje9q7DJMu0UxiO9XmpivsL8yq5KgzW3xDAjmWeERKg=;\n b=gj/OzfJHCvh64uZ4Vh5beX+KFdxN07acjxWw7jb6wIBvsXg8YTRIsT2mN+Ia/6FovzbQhfDIjKuMXs2D1TnJ8qrn5W+kfCu7B4csjNe8+CKsn4YbEdFAiRmLzUZ1CNqkPht3Zv5VHyRT/S/yO+SC68Osdog97AO8bNpWwkW5JFaJmw3EYNBqMf7Qzhq/IKrkdPIqMq+tM/yYKM9avD1WxhkL0Ywoqha9IrLqs0We1WiLvvfvhRc4pdDMiE4yzBzNdgtAoRpNxLOF5nXF1L6rDP2xqxY6PS46VKlB6Fc1Q1dna7zClNsW/O4xwqjiZzSHidLF1sH9ulrpHzWGSpEsMA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 192.176.1.74)\n smtp.mailfrom=ericsson.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=ericsson.com;", "Received-SPF": "Pass (protection.outlook.com: domain of ericsson.com designates\n 192.176.1.74 as permitted sender)\n receiver=protection.outlook.com;\n client-ip=192.176.1.74; helo=oa.msg.ericsson.com; pr=C", "From": "=?utf-8?q?Mattias_R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>", "To": "<dev@dpdk.org>", "CC": "<hofors@lysator.liu.se>,\n =?utf-8?q?Morten_Br=C3=B8rup?= <mb@smartsharesystems.com>,\n Stephen Hemminger <stephen@networkplumber.org>, =?utf-8?q?Mattias_R=C3=B6nn?=\n\t=?utf-8?q?blom?= <mattias.ronnblom@ericsson.com>", "Subject": "[RFC v5 5/6] service: keep per-lcore state in lcore variable", "Date": "Wed, 28 Feb 2024 11:09:27 +0100", "Message-ID": "<20240228100928.524277-6-mattias.ronnblom@ericsson.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20240228100928.524277-1-mattias.ronnblom@ericsson.com>", "References": "<20240225150330.517225-2-mattias.ronnblom@ericsson.com>\n <20240228100928.524277-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": "DU2PEPF00028D00:EE_|AM8PR07MB8278:EE_", "X-MS-Office365-Filtering-Correlation-Id": "a6d4beeb-cf77-4422-af00-08dc38467481", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 7RjevXsCnfLplDaGx04wqwbeWayTACEos6ws/S2lQmmxqZTInIeV5F5PN+3WO+raqw6UhjFDmnpEkrs5JI2CYRmgv/QMg33PjdRa1D+ankJY3dVvU5MsToHZcVo1SZ9KdpVuJIDkV/mPCUfHpLZW2zEvxj26EQTg72yeM04WyiDR3GZS/5D3Jvc2+VnOFfMFCf1Pj9AQIZOjXFubXPIQjhZK1wx6YRYqq3M9ISmawtQ8jZUFNt0Z9oWHqLM1taBObR0jwu/K+hrVWoOL3oklZdPvXENU0q8aH9sU9qCIR3uJzNbX+LHzcpiMItckZoCBDR8hojGsJJ80QVif52h+qpfwjXtd6yplxV0JY9QGfTYyW5u9ZE5pSg0pp4ffunYyMOKYygstXlHI3LqZWI6tJxgxlKBQ22hQOfdes7PoBWsL/XxnYYb/vb78PPMe++aCaK17NXirFXI6vULMy6qOusWRBSp48g2C++Hr314DzEvMRdm3gvNiQBB7FbhrPZwLY8lwfjYYybBhJUu3nMEUR6EtjF/7dnH29yfUimqjig25QNnZqNKKkR2y9SF++iK2dEacdgH28KP6uOhKn6sTHXUq4nWjiHThFQIZlRhAw2oaNC+NkXmwtzmw34D5vd4njZxJGjZ6OsAB7cKSbjwu04J3ibVN78C+dEWJAAHqoH8xNdd1NL84VdPH5Ncx2ynlcmQ+0ezRG/mwswQgPM8F0F80QQ6cX+JLjTStsliXeqcdgiTJzs5jKC1xj3YrXgh7", "X-Forefront-Antispam-Report": "CIP:192.176.1.74; CTRY:SE; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:oa.msg.ericsson.com; PTR:office365.se.ericsson.net;\n CAT:NONE; SFS:(13230031)(36860700004)(82310400014); DIR:OUT; SFP:1101;", "X-OriginatorOrg": "ericsson.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "28 Feb 2024 10:17:23.2508 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n a6d4beeb-cf77-4422-af00-08dc38467481", "X-MS-Exchange-CrossTenant-Id": "92e84ceb-fbfd-47ab-be52-080c6b87953f", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=92e84ceb-fbfd-47ab-be52-080c6b87953f; Ip=[192.176.1.74];\n Helo=[oa.msg.ericsson.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n DU2PEPF00028D00.eurprd03.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM8PR07MB8278", "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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Replace static array of cache-aligned structs with an lcore variable,\nto slightly benefit code simplicity and performance.\n\nRFC v5:\n * Fix lcore value pointer bug introduced by RFC v4.\n\nRFC v4:\n * Remove strange-looking lcore value lookup potentially containing\n invalid lcore id. (Morten Brørup)\n * Replace misplaced tab with space. (Morten Brørup)\n\nSigned-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>\nAcked-by: Morten Brørup <mb@smartsharesystems.com>\n---\n lib/eal/common/rte_service.c | 118 ++++++++++++++++++++---------------\n 1 file changed, 67 insertions(+), 51 deletions(-)", "diff": "diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c\nindex d959c91459..5429ddce41 100644\n--- a/lib/eal/common/rte_service.c\n+++ b/lib/eal/common/rte_service.c\n@@ -11,6 +11,7 @@\n \n #include <eal_trace_internal.h>\n #include <rte_lcore.h>\n+#include <rte_lcore_var.h>\n #include <rte_branch_prediction.h>\n #include <rte_common.h>\n #include <rte_cycles.h>\n@@ -75,7 +76,7 @@ struct core_state {\n \n static uint32_t rte_service_count;\n static struct rte_service_spec_impl *rte_services;\n-static struct core_state *lcore_states;\n+static RTE_LCORE_VAR_HANDLE(struct core_state, lcore_states);\n static uint32_t rte_service_library_initialized;\n \n int32_t\n@@ -101,11 +102,12 @@ rte_service_init(void)\n \t\tgoto fail_mem;\n \t}\n \n-\tlcore_states = rte_calloc(\"rte_service_core_states\", RTE_MAX_LCORE,\n-\t\t\tsizeof(struct core_state), RTE_CACHE_LINE_SIZE);\n-\tif (!lcore_states) {\n-\t\tEAL_LOG(ERR, \"error allocating core states array\");\n-\t\tgoto fail_mem;\n+\tif (lcore_states == NULL)\n+\t\tRTE_LCORE_VAR_ALLOC(lcore_states);\n+\telse {\n+\t\tstruct core_state *cs;\n+\t\tRTE_LCORE_VAR_FOREACH_VALUE(cs, lcore_states)\n+\t\t\tmemset(cs, 0, sizeof(struct core_state));\n \t}\n \n \tint i;\n@@ -122,7 +124,6 @@ rte_service_init(void)\n \treturn 0;\n fail_mem:\n \trte_free(rte_services);\n-\trte_free(lcore_states);\n \treturn -ENOMEM;\n }\n \n@@ -136,7 +137,6 @@ rte_service_finalize(void)\n \trte_eal_mp_wait_lcore();\n \n \trte_free(rte_services);\n-\trte_free(lcore_states);\n \n \trte_service_library_initialized = 0;\n }\n@@ -286,7 +286,6 @@ rte_service_component_register(const struct rte_service_spec *spec,\n int32_t\n rte_service_component_unregister(uint32_t id)\n {\n-\tuint32_t i;\n \tstruct rte_service_spec_impl *s;\n \tSERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL);\n \n@@ -294,9 +293,10 @@ rte_service_component_unregister(uint32_t id)\n \n \ts->internal_flags &= ~(SERVICE_F_REGISTERED);\n \n+\tstruct core_state *cs;\n \t/* clear the run-bit in all cores */\n-\tfor (i = 0; i < RTE_MAX_LCORE; i++)\n-\t\tlcore_states[i].service_mask &= ~(UINT64_C(1) << id);\n+\tRTE_LCORE_VAR_FOREACH_VALUE(cs, lcore_states)\n+\t\tcs->service_mask &= ~(UINT64_C(1) << id);\n \n \tmemset(&rte_services[id], 0, sizeof(struct rte_service_spec_impl));\n \n@@ -454,7 +454,10 @@ rte_service_may_be_active(uint32_t id)\n \t\treturn -EINVAL;\n \n \tfor (i = 0; i < lcore_count; i++) {\n-\t\tif (lcore_states[ids[i]].service_active_on_lcore[id])\n+\t\tstruct core_state *cs =\n+\t\t\tRTE_LCORE_VAR_LCORE_VALUE(ids[i], lcore_states);\n+\n+\t\tif (cs->service_active_on_lcore[id])\n \t\t\treturn 1;\n \t}\n \n@@ -464,7 +467,7 @@ rte_service_may_be_active(uint32_t id)\n int32_t\n rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)\n {\n-\tstruct core_state *cs = &lcore_states[rte_lcore_id()];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_VALUE(lcore_states);\n \tstruct rte_service_spec_impl *s;\n \n \tSERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL);\n@@ -486,8 +489,7 @@ service_runner_func(void *arg)\n {\n \tRTE_SET_USED(arg);\n \tuint8_t i;\n-\tconst int lcore = rte_lcore_id();\n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs = RTE_LCORE_VAR_VALUE(lcore_states);\n \n \trte_atomic_store_explicit(&cs->thread_active, 1, rte_memory_order_seq_cst);\n \n@@ -533,13 +535,15 @@ service_runner_func(void *arg)\n int32_t\n rte_service_lcore_may_be_active(uint32_t lcore)\n {\n-\tif (lcore >= RTE_MAX_LCORE || !lcore_states[lcore].is_service_core)\n+\tstruct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n+\n+\tif (lcore >= RTE_MAX_LCORE || !cs->is_service_core)\n \t\treturn -EINVAL;\n \n \t/* Load thread_active using ACQUIRE to avoid instructions dependent on\n \t * the result being re-ordered before this load completes.\n \t */\n-\treturn rte_atomic_load_explicit(&lcore_states[lcore].thread_active,\n+\treturn rte_atomic_load_explicit(&cs->thread_active,\n \t\t\t rte_memory_order_acquire);\n }\n \n@@ -547,9 +551,11 @@ int32_t\n rte_service_lcore_count(void)\n {\n \tint32_t count = 0;\n-\tuint32_t i;\n-\tfor (i = 0; i < RTE_MAX_LCORE; i++)\n-\t\tcount += lcore_states[i].is_service_core;\n+\n+\tstruct core_state *cs;\n+\tRTE_LCORE_VAR_FOREACH_VALUE(cs, lcore_states)\n+\t\tcount += cs->is_service_core;\n+\n \treturn count;\n }\n \n@@ -566,7 +572,8 @@ rte_service_lcore_list(uint32_t array[], uint32_t n)\n \tuint32_t i;\n \tuint32_t idx = 0;\n \tfor (i = 0; i < RTE_MAX_LCORE; i++) {\n-\t\tstruct core_state *cs = &lcore_states[i];\n+\t\tstruct core_state *cs =\n+\t\t\tRTE_LCORE_VAR_LCORE_VALUE(i, lcore_states);\n \t\tif (cs->is_service_core) {\n \t\t\tarray[idx] = i;\n \t\t\tidx++;\n@@ -582,7 +589,7 @@ rte_service_lcore_count_services(uint32_t lcore)\n \tif (lcore >= RTE_MAX_LCORE)\n \t\treturn -EINVAL;\n \n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs = RTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \tif (!cs->is_service_core)\n \t\treturn -ENOTSUP;\n \n@@ -634,30 +641,31 @@ rte_service_start_with_defaults(void)\n static int32_t\n service_update(uint32_t sid, uint32_t lcore, uint32_t *set, uint32_t *enabled)\n {\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n+\n \t/* validate ID, or return error value */\n \tif (!service_valid(sid) || lcore >= RTE_MAX_LCORE ||\n-\t\t\t!lcore_states[lcore].is_service_core)\n+\t\t\t!cs->is_service_core)\n \t\treturn -EINVAL;\n \n \tuint64_t sid_mask = UINT64_C(1) << sid;\n \tif (set) {\n-\t\tuint64_t lcore_mapped = lcore_states[lcore].service_mask &\n-\t\t\tsid_mask;\n+\t\tuint64_t lcore_mapped = cs->service_mask & sid_mask;\n \n \t\tif (*set && !lcore_mapped) {\n-\t\t\tlcore_states[lcore].service_mask |= sid_mask;\n+\t\t\tcs->service_mask |= sid_mask;\n \t\t\trte_atomic_fetch_add_explicit(&rte_services[sid].num_mapped_cores,\n \t\t\t\t1, rte_memory_order_relaxed);\n \t\t}\n \t\tif (!*set && lcore_mapped) {\n-\t\t\tlcore_states[lcore].service_mask &= ~(sid_mask);\n+\t\t\tcs->service_mask &= ~(sid_mask);\n \t\t\trte_atomic_fetch_sub_explicit(&rte_services[sid].num_mapped_cores,\n \t\t\t\t1, rte_memory_order_relaxed);\n \t\t}\n \t}\n \n \tif (enabled)\n-\t\t*enabled = !!(lcore_states[lcore].service_mask & (sid_mask));\n+\t\t*enabled = !!(cs->service_mask & (sid_mask));\n \n \treturn 0;\n }\n@@ -685,13 +693,14 @@ set_lcore_state(uint32_t lcore, int32_t state)\n {\n \t/* mark core state in hugepage backed config */\n \tstruct rte_config *cfg = rte_eal_get_configuration();\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \tcfg->lcore_role[lcore] = state;\n \n \t/* mark state in process local lcore_config */\n \tlcore_config[lcore].core_role = state;\n \n \t/* update per-lcore optimized state tracking */\n-\tlcore_states[lcore].is_service_core = (state == ROLE_SERVICE);\n+\tcs->is_service_core = (state == ROLE_SERVICE);\n \n \trte_eal_trace_service_lcore_state_change(lcore, state);\n }\n@@ -702,14 +711,16 @@ rte_service_lcore_reset_all(void)\n \t/* loop over cores, reset all to mask 0 */\n \tuint32_t i;\n \tfor (i = 0; i < RTE_MAX_LCORE; i++) {\n-\t\tif (lcore_states[i].is_service_core) {\n-\t\t\tlcore_states[i].service_mask = 0;\n+\t\tstruct core_state *cs =\n+\t\t\tRTE_LCORE_VAR_LCORE_VALUE(i, lcore_states);\n+\t\tif (cs->is_service_core) {\n+\t\t\tcs->service_mask = 0;\n \t\t\tset_lcore_state(i, ROLE_RTE);\n \t\t\t/* runstate act as guard variable Use\n \t\t\t * store-release memory order here to synchronize\n \t\t\t * with load-acquire in runstate read functions.\n \t\t\t */\n-\t\t\trte_atomic_store_explicit(&lcore_states[i].runstate,\n+\t\t\trte_atomic_store_explicit(&cs->runstate,\n \t\t\t\tRUNSTATE_STOPPED, rte_memory_order_release);\n \t\t}\n \t}\n@@ -725,17 +736,19 @@ rte_service_lcore_add(uint32_t lcore)\n {\n \tif (lcore >= RTE_MAX_LCORE)\n \t\treturn -EINVAL;\n-\tif (lcore_states[lcore].is_service_core)\n+\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n+\tif (cs->is_service_core)\n \t\treturn -EALREADY;\n \n \tset_lcore_state(lcore, ROLE_SERVICE);\n \n \t/* ensure that after adding a core the mask and state are defaults */\n-\tlcore_states[lcore].service_mask = 0;\n+\tcs->service_mask = 0;\n \t/* Use store-release memory order here to synchronize with\n \t * load-acquire in runstate read functions.\n \t */\n-\trte_atomic_store_explicit(&lcore_states[lcore].runstate, RUNSTATE_STOPPED,\n+\trte_atomic_store_explicit(&cs->runstate, RUNSTATE_STOPPED,\n \t\trte_memory_order_release);\n \n \treturn rte_eal_wait_lcore(lcore);\n@@ -747,7 +760,7 @@ rte_service_lcore_del(uint32_t lcore)\n \tif (lcore >= RTE_MAX_LCORE)\n \t\treturn -EINVAL;\n \n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \tif (!cs->is_service_core)\n \t\treturn -EINVAL;\n \n@@ -771,7 +784,7 @@ rte_service_lcore_start(uint32_t lcore)\n \tif (lcore >= RTE_MAX_LCORE)\n \t\treturn -EINVAL;\n \n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \tif (!cs->is_service_core)\n \t\treturn -EINVAL;\n \n@@ -801,6 +814,8 @@ rte_service_lcore_start(uint32_t lcore)\n int32_t\n rte_service_lcore_stop(uint32_t lcore)\n {\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n+\n \tif (lcore >= RTE_MAX_LCORE)\n \t\treturn -EINVAL;\n \n@@ -808,12 +823,11 @@ rte_service_lcore_stop(uint32_t lcore)\n \t * memory order here to synchronize with store-release\n \t * in runstate update functions.\n \t */\n-\tif (rte_atomic_load_explicit(&lcore_states[lcore].runstate, rte_memory_order_acquire) ==\n+\tif (rte_atomic_load_explicit(&cs->runstate, rte_memory_order_acquire) ==\n \t\t\tRUNSTATE_STOPPED)\n \t\treturn -EALREADY;\n \n \tuint32_t i;\n-\tstruct core_state *cs = &lcore_states[lcore];\n \tuint64_t service_mask = cs->service_mask;\n \n \tfor (i = 0; i < RTE_SERVICE_NUM_MAX; i++) {\n@@ -834,7 +848,7 @@ rte_service_lcore_stop(uint32_t lcore)\n \t/* Use store-release memory order here to synchronize with\n \t * load-acquire in runstate read functions.\n \t */\n-\trte_atomic_store_explicit(&lcore_states[lcore].runstate, RUNSTATE_STOPPED,\n+\trte_atomic_store_explicit(&cs->runstate, RUNSTATE_STOPPED,\n \t\trte_memory_order_release);\n \n \trte_eal_trace_service_lcore_stop(lcore);\n@@ -845,7 +859,7 @@ rte_service_lcore_stop(uint32_t lcore)\n static uint64_t\n lcore_attr_get_loops(unsigned int lcore)\n {\n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \treturn rte_atomic_load_explicit(&cs->loops, rte_memory_order_relaxed);\n }\n@@ -853,7 +867,7 @@ lcore_attr_get_loops(unsigned int lcore)\n static uint64_t\n lcore_attr_get_cycles(unsigned int lcore)\n {\n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \treturn rte_atomic_load_explicit(&cs->cycles, rte_memory_order_relaxed);\n }\n@@ -861,7 +875,7 @@ lcore_attr_get_cycles(unsigned int lcore)\n static uint64_t\n lcore_attr_get_service_calls(uint32_t service_id, unsigned int lcore)\n {\n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \treturn rte_atomic_load_explicit(&cs->service_stats[service_id].calls,\n \t\trte_memory_order_relaxed);\n@@ -870,7 +884,7 @@ lcore_attr_get_service_calls(uint32_t service_id, unsigned int lcore)\n static uint64_t\n lcore_attr_get_service_cycles(uint32_t service_id, unsigned int lcore)\n {\n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \treturn rte_atomic_load_explicit(&cs->service_stats[service_id].cycles,\n \t\trte_memory_order_relaxed);\n@@ -886,7 +900,10 @@ attr_get(uint32_t id, lcore_attr_get_fun lcore_attr_get)\n \tuint64_t sum = 0;\n \n \tfor (lcore = 0; lcore < RTE_MAX_LCORE; lcore++) {\n-\t\tif (lcore_states[lcore].is_service_core)\n+\t\tstruct core_state *cs =\n+\t\t\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n+\n+\t\tif (cs->is_service_core)\n \t\t\tsum += lcore_attr_get(id, lcore);\n \t}\n \n@@ -930,12 +947,11 @@ int32_t\n rte_service_lcore_attr_get(uint32_t lcore, uint32_t attr_id,\n \t\t\t uint64_t *attr_value)\n {\n-\tstruct core_state *cs;\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \tif (lcore >= RTE_MAX_LCORE || !attr_value)\n \t\treturn -EINVAL;\n \n-\tcs = &lcore_states[lcore];\n \tif (!cs->is_service_core)\n \t\treturn -ENOTSUP;\n \n@@ -960,7 +976,8 @@ rte_service_attr_reset_all(uint32_t id)\n \t\treturn -EINVAL;\n \n \tfor (lcore = 0; lcore < RTE_MAX_LCORE; lcore++) {\n-\t\tstruct core_state *cs = &lcore_states[lcore];\n+\t\tstruct core_state *cs =\n+\t\t\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \t\tcs->service_stats[id] = (struct service_stats) {};\n \t}\n@@ -971,12 +988,11 @@ rte_service_attr_reset_all(uint32_t id)\n int32_t\n rte_service_lcore_attr_reset_all(uint32_t lcore)\n {\n-\tstruct core_state *cs;\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \tif (lcore >= RTE_MAX_LCORE)\n \t\treturn -EINVAL;\n \n-\tcs = &lcore_states[lcore];\n \tif (!cs->is_service_core)\n \t\treturn -ENOTSUP;\n \n@@ -1011,7 +1027,7 @@ static void\n service_dump_calls_per_lcore(FILE *f, uint32_t lcore)\n {\n \tuint32_t i;\n-\tstruct core_state *cs = &lcore_states[lcore];\n+\tstruct core_state *cs =\tRTE_LCORE_VAR_LCORE_VALUE(lcore, lcore_states);\n \n \tfprintf(f, \"%02d\\t\", lcore);\n \tfor (i = 0; i < RTE_SERVICE_NUM_MAX; i++) {\n", "prefixes": [ "RFC", "v5", "5/6" ] }