From patchwork Thu Feb 8 18:16:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Mattias_R=C3=B6nnblom?= X-Patchwork-Id: 136559 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 5B1F643AE1; Thu, 8 Feb 2024 19:25:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BABE542E65; Thu, 8 Feb 2024 19:24:53 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2080.outbound.protection.outlook.com [40.107.8.80]) by mails.dpdk.org (Postfix) with ESMTP id 01FD3402D1 for ; Thu, 8 Feb 2024 19:24:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oKacDfYbRMlxU1Vp5BjJuhQwWsGV/JCIgEOH7OtBu65T7jzKh/uPZnlQvD1lmOHfDEVFphXZEYoUhG53rqufc9fGl2tkPcJLpPz6HZ96/oHWd6VK2EFOl0PWwG89hzgbnNW4oq6KTgOVfTkkq8fVSc/mP800Ol5oFLezbfQq6tuOM+aq1xZZ03gKeplfcOVXigaDPBsRQI49WcCcQapo5iFmh8AZGg6D8siu3endOZzP2trYQUpsoDb1VhPNT0Ouhr4OWm44UlXCSJMgu+J0BIkc263oFquslZ2whXursf+9ltsq6nld/jsT5z9x1yxTW9FkPwicNCYhS1Rxqi4Wfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=PwVPW22hNXCaG/41uZ2V2v+iJOvFP7KGk1YCJ2lynMI=; b=fBPKeDgRChP3ZSiKPmOfJqyVPKAMyJW6sJ1Mb3Gvfqynb9BZtFO/H30Y1VW6wJfa2Vpdz2g/ZwOvWbsmq0nuakzHSEBKDksYfnM8FaahkEnI1ffVtAer6UQ2LlxTuRVQnkbSBrMVKqL4RJUPcBU0xhmgVnGoZHelHabs7NJkkJzzLT7VzJzOFqrH2bICVeR6d6fxO7bjU6ejy/3LPk8Kk9pKruDXzg9OBTvAfy4BhciOkJ+wrvEj7WQA7FbCycuhpQYgz/LfnNBOM3ebqLsQ+wZmFpz5J/eNG5Dpmrn4xOOzjS1pYautRmFvvm34YlLrtT0u13r3HwivaPspCK/yNw== 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=PwVPW22hNXCaG/41uZ2V2v+iJOvFP7KGk1YCJ2lynMI=; b=GQdn4KkrzW/tQY6hO8V+aQMkFxWiR1APrRQ/diV7D/PnjnDsak+k6VvdIjtM9RlVGXoU+zr01/+ILwjnoC5Pnu3CkD+6pVmMUNhyLGkIVUQLRJvfXyEhnVIThkSBh84dlkooQOouBPa6DKUTsTkhA9jf/EMHmOwJGy1cU8tpBf0t0xYflY1d8FGiGWzi/fQqy1QHuES4CUHRa4wjKlccVjHc5oshSBv/nzuxCLTl4toHKobjFgUDjlUcSIk78EuC9ryUekYZsGbevTvAWY828sssu9E24ks0wj0/uls7LB+tSEnG17Izxnu7LOVX/AZcEhCvRxhTStzvmhw+ca1lcQ== Received: from DUZPR01CA0052.eurprd01.prod.exchangelabs.com (2603:10a6:10:469::8) by AS8PR07MB8236.eurprd07.prod.outlook.com (2603:10a6:20b:37b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.39; Thu, 8 Feb 2024 18:24:48 +0000 Received: from DB5PEPF00014B96.eurprd02.prod.outlook.com (2603:10a6:10:469:cafe::56) by DUZPR01CA0052.outlook.office365.com (2603:10a6:10:469::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.41 via Frontend Transport; Thu, 8 Feb 2024 18:24:48 +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 DB5PEPF00014B96.mail.protection.outlook.com (10.167.8.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Thu, 8 Feb 2024 18:24:48 +0000 Received: from seliicinfr00049.seli.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.60) with Microsoft SMTP Server id 15.2.1258.12; Thu, 8 Feb 2024 19:24:47 +0100 Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100]) by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id 5FC2E380061; Thu, 8 Feb 2024 19:24:47 +0100 (CET) From: =?utf-8?q?Mattias_R=C3=B6nnblom?= To: CC: , =?utf-8?q?Morten_Br=C3=B8rup?= , Stephen Hemminger , =?utf-8?q?Mattias_R=C3=B6nn?= =?utf-8?q?blom?= Subject: [RFC 3/5] random: keep PRNG state in lcore variable Date: Thu, 8 Feb 2024 19:16:42 +0100 Message-ID: <20240208181644.455233-4-mattias.ronnblom@ericsson.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240208181644.455233-1-mattias.ronnblom@ericsson.com> References: <20240208181644.455233-1-mattias.ronnblom@ericsson.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5PEPF00014B96:EE_|AS8PR07MB8236:EE_ X-MS-Office365-Filtering-Correlation-Id: 14a19984-45c4-4651-42e3-08dc28d33b7e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lxtbdspak07E8lSfCHgs1YwMJE0sceGuMSW++N4T/eNKWQ/z52jktfshUuzoo1U3DmWDSWyPzD1QZNmfijvMsUu+CvcymZRTzo7hDe626RjN3sW7Btv01yM79QtF7CQ2GlSwD/I6WXKWgK4EMG/yd0lX5okVULNG2tCvTvPIWqbZJCmiFzDB9MDk+SXvowPiChGU/lSeCgtfiByLClhS3Zfrt595TvNxyVzoaSOajZ1rzLQNtVLDb1qnnO3BMCdnygDoK+Z6bOHY8DVt9ef4Qi+0qnmoCF3zFJyLwWoKNW8vGxVWeCFRheFpWz1kMexf5HWdZD1EmD+2HGLCVy+2YBzk26cW3dw+7k/OhBiSDmILRXHgKbqcvukPulVn8n85sBWyxX7vnj5cvMjFeHqjcfSicJdyGOr0ujUZO6U9ljuLsidNSy4sKYJ/u46paMZP0+TUqI4ZO/WhLAo5iA/yAQpeKjhjfSIHINW0yQ1WyaGdshiO6YQWbjAk+U5aleJ2KFBCfvPXIvdBQks1erjipIAqTgf+N/Y5YJ9vxWbRlGAfdhbhMnzpkAVicY+6yzW3pji7WQ9b7280/E9sKUn+FAfRoT3/Dc4QHlQ1m6Yyuq4= 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:(13230031)(4636009)(376002)(346002)(136003)(39860400002)(396003)(230922051799003)(186009)(64100799003)(82310400011)(1800799012)(451199024)(40470700004)(36840700001)(46966006)(36756003)(41300700001)(54906003)(70206006)(8936002)(6916009)(316002)(70586007)(5660300002)(478600001)(8676002)(4326008)(82960400001)(86362001)(6266002)(336012)(82740400003)(356005)(7636003)(2906002)(83380400001)(1076003)(26005)(6666004)(107886003)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2024 18:24:48.0327 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14a19984-45c4-4651-42e3-08dc28d33b7e 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: DB5PEPF00014B96.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB8236 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 Move keeping PRNG state in a RTE_MAX_LCORE-sized static array of cache-aligned and RTE_CACHE_GUARDed struct instances to keeping the same state in to a more cache-friendly lcore variable. Signed-off-by: Mattias Rönnblom --- lib/eal/common/rte_random.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/eal/common/rte_random.c b/lib/eal/common/rte_random.c index 7709b8f2c6..af9fffd81b 100644 --- a/lib/eal/common/rte_random.c +++ b/lib/eal/common/rte_random.c @@ -11,6 +11,7 @@ #include #include #include +#include #include struct rte_rand_state { @@ -19,14 +20,12 @@ struct rte_rand_state { uint64_t z3; uint64_t z4; uint64_t z5; - RTE_CACHE_GUARD; -} __rte_cache_aligned; +}; -/* One instance each for every lcore id-equipped thread, and one - * additional instance to be shared by all others threads (i.e., all - * unregistered non-EAL threads). - */ -static struct rte_rand_state rand_states[RTE_MAX_LCORE + 1]; +RTE_LCORE_VAR_HANDLE(struct rte_rand_state, rand_state); + +/* instance to be shared by all unregistered non-EAL threads */ +static struct rte_rand_state unregistered_rand_state __rte_cache_aligned; static uint32_t __rte_rand_lcg32(uint32_t *seed) @@ -85,8 +84,14 @@ rte_srand(uint64_t seed) unsigned int lcore_id; /* add lcore_id to seed to avoid having the same sequence */ - for (lcore_id = 0; lcore_id < RTE_DIM(rand_states); lcore_id++) - __rte_srand_lfsr258(seed + lcore_id, &rand_states[lcore_id]); + for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { + struct rte_rand_state *lcore_state = + RTE_LCORE_VAR_LCORE_PTR(lcore_id, rand_state); + + __rte_srand_lfsr258(seed + lcore_id, lcore_state); + } + + __rte_srand_lfsr258(seed + lcore_id, &unregistered_rand_state); } static __rte_always_inline uint64_t @@ -124,11 +129,10 @@ struct rte_rand_state *__rte_rand_get_state(void) idx = rte_lcore_id(); - /* last instance reserved for unregistered non-EAL threads */ if (unlikely(idx == LCORE_ID_ANY)) - idx = RTE_MAX_LCORE; + return &unregistered_rand_state; - return &rand_states[idx]; + return RTE_LCORE_VAR_PTR(rand_state); } uint64_t @@ -228,6 +232,8 @@ RTE_INIT(rte_rand_init) { uint64_t seed; + RTE_LCORE_VAR_ALLOC(rand_state); + seed = __rte_random_initial_seed(); rte_srand(seed);