From patchwork Thu Apr 25 08:58:53 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: 139677 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 4A62A43F04; Thu, 25 Apr 2024 11:10:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 581C7436E1; Thu, 25 Apr 2024 11:10:08 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2082.outbound.protection.outlook.com [40.107.8.82]) by mails.dpdk.org (Postfix) with ESMTP id F3038436D2 for ; Thu, 25 Apr 2024 11:10:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SeaU6kgLdX4UIH4gWQJ2+t4S8SkifHs+8kmw16ZT86Vc0wtaRnbPTMTh8rUkv5HdOvsqMxbWYxPSjSqRaqXwDa1Kc/hS267p0zRd9r+afCtmT9vNrqtCBmZLLOgeVEny4Gwygq93Ahyj/9yjmCXS/k+egGhyF5SDFL4NoJtwayQJg1qR6xc5kgjg3TC8TUMorFCaI0X1GyRRU2KTtufsB6CwdVuazr0krfPD/gqyT/4gHwWFwxEovAz2OH8EbmAKtx9NYhl/GoKXA6Gf6GjWmZUiFgKxNJ4Pdv0+CH3YpgkD+B3NmR1e/wsuntFKVT0LFuI6HRdQ4eZAoo9MOVzaSw== 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=g5NvuycN3WYWkI5PKSiP4/AA/zbW0QK30xpyRr5rjCU=; b=EiLyrIYkTRm4D/ZlJn2wCeVsRu3+OMPTUtZMwdSKMXif47aqMDhXLgd8UAuMNRbh3LwRmLPKtB3i0B+0gCGSTxW0rpkOTp56KmTubViE7S1KFqkLDW2ccd70hkN7JGSjX2JV23cMKoiG2UyaImqDyF7mSGoEFOrEj1kmwLtTrgKCYo/aOrupGkhBUVUZVXr0mpLWwAFw4IKRrOb7UBfiDEDjDF000h+Ju/wYgIMBvXTpTOT02nJEEXTaOk09afG6OX4OORSpkMCkZi0wx5NkLeiSyXY3ex6w+C7yNqZpqqVdROkiReSB+GMlsiNVVD35lv+UaPHn2MnbZul6OyX+kg== 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=g5NvuycN3WYWkI5PKSiP4/AA/zbW0QK30xpyRr5rjCU=; b=GrvOKVAKIzHpD1vU3nURpVVlUmUHb57AnviKBgBFD/Ha3Dx9bhfJzOPnd/RRpN2YiiuNui91x8PKOkI0i7+3MTjb38oVAZMA4SNs9ujrX3Ss7gSk5021XyomHkLX6/Ub3JgQl1MoB5pTHFzUiFtoHtPv1XCghEQqJ4i1oHp3l5fNlfSYnwe+4Hctd7vb3MxFfq+iMqherlOcqk9Z9xy40DHndcBk/7+UsdOmfhwKaGwTyUWZbfLLFYjhjlKc6cqLpf6viTpiUOzfohz/8w551VOXCIuhSyKRaYSjGcE8fS+7iEQamBvcgOzjUIUAVticBJL45VG4+k8/DUtRdOY8Vg== Received: from DUZPR01CA0172.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b3::29) by AS8PR07MB7959.eurprd07.prod.outlook.com (2603:10a6:20b:352::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.44; Thu, 25 Apr 2024 09:10:02 +0000 Received: from DB1PEPF000509E7.eurprd03.prod.outlook.com (2603:10a6:10:4b3:cafe::bb) by DUZPR01CA0172.outlook.office365.com (2603:10a6:10:4b3::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.23 via Frontend Transport; Thu, 25 Apr 2024 09:10:02 +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 DB1PEPF000509E7.mail.protection.outlook.com (10.167.242.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.19 via Frontend Transport; Thu, 25 Apr 2024 09:10:01 +0000 Received: from seliicinfr00050.seli.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.63) with Microsoft SMTP Server id 15.2.1258.12; Thu, 25 Apr 2024 11:09:59 +0200 Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100]) by seliicinfr00050.seli.gic.ericsson.se (Postfix) with ESMTP id 807E41C006A; Thu, 25 Apr 2024 11:09:59 +0200 (CEST) From: =?utf-8?q?Mattias_R=C3=B6nnblom?= To: CC: , Heng Wang , "Stephen Hemminger" , Tyler Retzlaff , =?utf-8?q?Mattias_R=C3=B6nnb?= =?utf-8?q?lom?= Subject: [RFC v2 6/6] eal: add unit tests for atomic bit access functions Date: Thu, 25 Apr 2024 10:58:53 +0200 Message-ID: <20240425085853.97888-7-mattias.ronnblom@ericsson.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425085853.97888-1-mattias.ronnblom@ericsson.com> References: <20240302135328.531940-2-mattias.ronnblom@ericsson.com> <20240425085853.97888-1-mattias.ronnblom@ericsson.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF000509E7:EE_|AS8PR07MB7959:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b0a77bc-1641-4586-0750-08dc65077d04 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?utf-8?q?g3/2zHT16FVO92OoOlyRUGHIdNZkJfb?= =?utf-8?q?TC87puTswdHjr8Af5mjgeuoBWtERKMF4o4ZtKWrl/ZZsKPtgKYHXvD9JUfrD3yHqF?= =?utf-8?q?b7+HBR6onzpv7QY9BsJC675SBe9nACAJgpFNd3Wna9+YZztfO7PzWpCFFB5MDQ2NZ?= =?utf-8?q?IWBrzuorKBT2GYiQIKJxPKMxrI3Vv9VWwdvf2195libhIMTFQ3GF2iVXRWuGfU37X?= =?utf-8?q?QWO/84Hr1C74C2vkXFE3R0LEmFevssRczzuW+qiZSEtTsfnkLie75rRARebplfVzy?= =?utf-8?q?I8E7D0mYFAGGcxbWAkngffKKF4ODoslVi2ue6m8Vjz27wyjluFutAbBptW+yrhovg?= =?utf-8?q?ySMBrP87Dtv6HUkW91D4hPugi14JiCFKBSc5DGO9N47urbDkVB9Ld+ieFt6nAM3eM?= =?utf-8?q?uAfcPVMZb8HRY8i6ZW8/sZ6koNzhpJY9xj1fgQJgtZTnEMewWQ7LMtVoBnS/Hdspl?= =?utf-8?q?mdulzFS4ZBbSmu73V4lT1IHzLPT1daZ/Qtd9y5YDawRTJ4vanKtccxmxJAUvT1HxE?= =?utf-8?q?rRcVpbrH/KvkANZItXSwCyIQORjASJ32qztJAHzdIuMUD6ig9V9bRT/Bnoe6b9XMW?= =?utf-8?q?MGufMgHRlm8D92lW81aAA/l5ppwiPjqnSKxqbT3y5+kST07Scc9ISDhS7JnqFF9nG?= =?utf-8?q?oFi/EGiwY73KrItWqzbXxoZkV0NpT0GTZ2dkXRVIFY4n4GxbNunuQIT003RQwxP+c?= =?utf-8?q?85QEhCejxgkI+1R9IIV1ISttv2qLG0tDZysO7xQZQ7FmS+sglOu0BS7T0+Ctu/qD4?= =?utf-8?q?hN+5MNo7ZCOhlYAlwJP4HI6h2Fc7Ca4lut8Kg0X4pBrEf+nu9fmkcZc8IYZOaaHk9?= =?utf-8?q?CZwUEFVKGtVPzxiRRy6yM3EcJa/DY187ialdlXfLD6bK/9jdOLODv2jI0JKe6Ayil?= =?utf-8?q?q11ZaevvzPS3jl9yAxegZqGuGqvvwlV9pBSEq+sXzR+pXT2cI7+IeETbAtbZb3KJs?= =?utf-8?q?VaqPR0gjitKTlC/0urI+7SPm97hEz+YRk7Ub1Rz/VlLJ+eAShmT3HMz3D5lKtMiS8?= =?utf-8?q?/zcappbf5jsfRsxlRM5ZjYsn8JirAXuqo60j7tFzd9Aq0JNpVca9AHpJXkwrZoQ7d?= =?utf-8?q?+7Us3V8wliTOXbl/rXKEbu2w0jnMVbwM8khROoHAC5usUGm6Zb8g0Wqae+9S8MduE?= =?utf-8?q?YglkUux1u/i0/p5x8WMp5NZOYoXbPSDfVFrbyDFuuZ4DX250zd9/M5mW99gsCC5DB?= =?utf-8?q?haHPo4Z1hdzoJd79+wz4cmn4vRLkVEo2m0Ft7DWN6aclVLCvqxxBLQ5TZTfhTqFvo?= =?utf-8?q?HQhA9t5YO5ovAqj4eUDAVVBNM7cBUh1zP9EqAakc9DWaDiO7Awx8VH8WTxeF5o33O?= =?utf-8?q?AGWQlZ/FkSVq?= 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)(82310400014)(1800799015)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2024 09:10:01.5422 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b0a77bc-1641-4586-0750-08dc65077d04 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: DB1PEPF000509E7.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7959 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 Extend bitops tests to cover the rte_bit_atomic_[set|clear|assign|test|test_and_[set|clear|assign]]() family of functions. Signed-off-by: Mattias Rönnblom --- app/test/test_bitops.c | 233 ++++++++++++++++++++++++++++++++++- lib/eal/include/rte_bitops.h | 1 - 2 files changed, 232 insertions(+), 2 deletions(-) diff --git a/app/test/test_bitops.c b/app/test/test_bitops.c index 12c1027e36..a0967260aa 100644 --- a/app/test/test_bitops.c +++ b/app/test/test_bitops.c @@ -3,10 +3,13 @@ * Copyright(c) 2024 Ericsson AB */ +#include #include -#include #include +#include +#include +#include #include #include "test.h" @@ -60,6 +63,228 @@ GEN_TEST_BIT_ACCESS(test_bit_once_access_64, rte_bit_once_set, \ rte_bit_once_clear, rte_bit_once_assign, \ rte_bit_once_test, 64) +#define bit_atomic_set(addr, nr) \ + rte_bit_atomic_set(addr, nr, rte_memory_order_relaxed) + +#define bit_atomic_clear(addr, nr) \ + rte_bit_atomic_clear(addr, nr, rte_memory_order_relaxed) + +#define bit_atomic_assign(addr, nr, value) \ + rte_bit_atomic_assign(addr, nr, value, rte_memory_order_relaxed) + +#define bit_atomic_test(addr, nr) \ + rte_bit_atomic_test(addr, nr, rte_memory_order_relaxed) + +GEN_TEST_BIT_ACCESS(test_bit_atomic_access_32, bit_atomic_set, \ + bit_atomic_clear, bit_atomic_assign, \ + bit_atomic_test, 32) + +GEN_TEST_BIT_ACCESS(test_bit_atomic_access_64, bit_atomic_set, \ + bit_atomic_clear, bit_atomic_assign, \ + bit_atomic_test, 64) + +#define PARALLEL_TEST_RUNTIME 0.25 + +#define GEN_TEST_BIT_PARALLEL_ASSIGN(size) \ + \ + struct parallel_access_lcore_ ## size \ + { \ + unsigned int bit; \ + uint ## size ##_t *word; \ + bool failed; \ + }; \ + \ + static int \ + run_parallel_assign_ ## size(void *arg) \ + { \ + struct parallel_access_lcore_ ## size *lcore = arg; \ + uint64_t deadline = rte_get_timer_cycles() + \ + PARALLEL_TEST_RUNTIME * rte_get_timer_hz(); \ + bool value = false; \ + \ + do { \ + bool new_value = rte_rand() & 1; \ + bool use_test_and_modify = rte_rand() & 1; \ + bool use_assign = rte_rand() & 1; \ + \ + if (rte_bit_atomic_test(lcore->word, lcore->bit, \ + rte_memory_order_relaxed) != value) { \ + lcore->failed = true; \ + break; \ + } \ + \ + if (use_test_and_modify) { \ + bool old_value; \ + if (use_assign) \ + old_value = rte_bit_atomic_test_and_assign( \ + lcore->word, lcore->bit, new_value, \ + rte_memory_order_relaxed); \ + else { \ + old_value = new_value ? \ + rte_bit_atomic_test_and_set( \ + lcore->word, lcore->bit, \ + rte_memory_order_relaxed) : \ + rte_bit_atomic_test_and_clear( \ + lcore->word, lcore->bit, \ + rte_memory_order_relaxed); \ + } \ + if (old_value != value) { \ + lcore->failed = true; \ + break; \ + } \ + } else { \ + if (use_assign) \ + rte_bit_atomic_assign(lcore->word, lcore->bit, \ + new_value, \ + rte_memory_order_relaxed); \ + else { \ + if (new_value) \ + rte_bit_atomic_set( \ + lcore->word, lcore->bit, \ + rte_memory_order_relaxed); \ + else \ + rte_bit_atomic_clear( \ + lcore->word, lcore->bit, \ + rte_memory_order_relaxed); \ + } \ + } \ + \ + value = new_value; \ + } while (rte_get_timer_cycles() < deadline); \ + \ + return 0; \ + } \ + \ + static int \ + test_bit_atomic_parallel_assign_ ## size(void) \ + { \ + unsigned int worker_lcore_id; \ + uint ## size ## _t word = 0; \ + struct parallel_access_lcore_ ## size main = { \ + .word = &word \ + }; \ + struct parallel_access_lcore_ ## size worker = { \ + .word = &word \ + }; \ + \ + if (rte_lcore_count() < 2) { \ + printf("Need multiple cores to run parallel test.\n"); \ + return TEST_SKIPPED; \ + } \ + \ + worker_lcore_id = rte_get_next_lcore(-1, 1, 0); \ + \ + main.bit = rte_rand_max(size); \ + do { \ + worker.bit = rte_rand_max(size); \ + } while (worker.bit == main.bit); \ + \ + int rc = rte_eal_remote_launch(run_parallel_assign_ ## size, \ + &worker, worker_lcore_id); \ + TEST_ASSERT(rc == 0, "Worker thread launch failed"); \ + \ + run_parallel_assign_ ## size(&main); \ + \ + rte_eal_mp_wait_lcore(); \ + \ + TEST_ASSERT(!main.failed, "Main lcore atomic access failed"); \ + TEST_ASSERT(!worker.failed, "Worker lcore atomic access " \ + "failed"); \ + \ + return TEST_SUCCESS; \ + } + +GEN_TEST_BIT_PARALLEL_ASSIGN(32) +GEN_TEST_BIT_PARALLEL_ASSIGN(64) + +#define GEN_TEST_BIT_PARALLEL_TEST_AND_MODIFY(size) \ + \ + struct parallel_test_and_set_lcore_ ## size \ + { \ + uint ## size ##_t *word; \ + unsigned int bit; \ + uint64_t flips; \ + }; \ + \ + static int \ + run_parallel_test_and_modify_ ## size(void *arg) \ + { \ + struct parallel_test_and_set_lcore_ ## size *lcore = arg; \ + uint64_t deadline = rte_get_timer_cycles() + \ + PARALLEL_TEST_RUNTIME * rte_get_timer_hz(); \ + do { \ + bool old_value; \ + bool new_value = rte_rand() & 1; \ + bool use_assign = rte_rand() & 1; \ + \ + if (use_assign) \ + old_value = rte_bit_atomic_test_and_assign( \ + lcore->word, lcore->bit, new_value, \ + rte_memory_order_relaxed); \ + else \ + old_value = new_value ? \ + rte_bit_atomic_test_and_set( \ + lcore->word, lcore->bit, \ + rte_memory_order_relaxed) : \ + rte_bit_atomic_test_and_clear( \ + lcore->word, lcore->bit, \ + rte_memory_order_relaxed); \ + if (old_value != new_value) \ + lcore->flips++; \ + } while (rte_get_timer_cycles() < deadline); \ + \ + return 0; \ + } \ + \ + static int \ + test_bit_atomic_parallel_test_and_modify_ ## size(void) \ + { \ + unsigned int worker_lcore_id; \ + uint ## size ## _t word = 0; \ + unsigned int bit = rte_rand_max(size); \ + struct parallel_test_and_set_lcore_ ## size main = { \ + .word = &word, \ + .bit = bit \ + }; \ + struct parallel_test_and_set_lcore_ ## size worker = { \ + .word = &word, \ + .bit = bit \ + }; \ + \ + if (rte_lcore_count() < 2) { \ + printf("Need multiple cores to run parallel test.\n"); \ + return TEST_SKIPPED; \ + } \ + \ + worker_lcore_id = rte_get_next_lcore(-1, 1, 0); \ + \ + int rc = rte_eal_remote_launch(run_parallel_test_and_modify_ ## size, \ + &worker, worker_lcore_id); \ + TEST_ASSERT(rc == 0, "Worker thread launch failed"); \ + \ + run_parallel_test_and_modify_ ## size(&main); \ + \ + rte_eal_mp_wait_lcore(); \ + \ + uint64_t total_flips = main.flips + worker.flips; \ + bool expected_value = total_flips % 2; \ + \ + TEST_ASSERT(expected_value == rte_bit_test(&word, bit), \ + "After %"PRId64" flips, the bit value " \ + "should be %d", total_flips, expected_value); \ + \ + uint64_t expected_word = 0; \ + rte_bit_assign(&expected_word, bit, expected_value); \ + \ + TEST_ASSERT(expected_word == word, "Untouched bits have " \ + "changed value"); \ + \ + return TEST_SUCCESS; \ + } + +GEN_TEST_BIT_PARALLEL_TEST_AND_MODIFY(32) +GEN_TEST_BIT_PARALLEL_TEST_AND_MODIFY(64) + static uint32_t val32; static uint64_t val64; @@ -178,6 +403,12 @@ static struct unit_test_suite test_suite = { TEST_CASE(test_bit_access_64), TEST_CASE(test_bit_once_access_32), TEST_CASE(test_bit_once_access_64), + TEST_CASE(test_bit_atomic_access_32), + TEST_CASE(test_bit_atomic_access_64), + TEST_CASE(test_bit_atomic_parallel_assign_32), + TEST_CASE(test_bit_atomic_parallel_assign_64), + TEST_CASE(test_bit_atomic_parallel_test_and_modify_32), + TEST_CASE(test_bit_atomic_parallel_test_and_modify_64), TEST_CASE(test_bit_relaxed_set), TEST_CASE(test_bit_relaxed_clear), TEST_CASE(test_bit_relaxed_test_set_clear), diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h index 8c38a1ac03..bc6d79086b 100644 --- a/lib/eal/include/rte_bitops.h +++ b/lib/eal/include/rte_bitops.h @@ -485,7 +485,6 @@ extern "C" { uint32_t *: __rte_bit_atomic_test_and_clear32, \ uint64_t *: __rte_bit_atomic_test_and_clear64)(addr, nr, \ memory_order) - /** * @warning * @b EXPERIMENTAL: this API may change without prior notice.