From patchwork Thu Feb 8 18:16:41 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: 136558 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 C25E343AE1; Thu, 8 Feb 2024 19:25:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A39242E5E; Thu, 8 Feb 2024 19:24:52 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2048.outbound.protection.outlook.com [40.107.21.48]) by mails.dpdk.org (Postfix) with ESMTP id 81CCB402D1 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=UsgGUnpdPei8Pbxzx9KX9xZff6lcaAkhn8qAGar9egPjp5lL9fL0mXHr8J9FDppPImr6ns+vePMAiJrJn0ulOi48yL/K1Ff5y2/LXVWg/XpeWJhTrM2ZCDnP/xUhDvYlByfhbPlILSNKYCY+xZDtJ4ASy+ISfTBA46dvTb/oQ/74vAMUvM/uzSpk7nacvXufDghMVox7ax28U6ZPdZ/Xi3QhwVggeoNkvYbhMIJWcwRJ6mblqwGxq1ng/+hbdb/aHSJwCPn8YRm7xhRMIyVqXhP3Joi60acJjmwg7G/y6peNhWUsshp8YTbn3wHNOWlY+AGC4ZPecX8VxBHr/YDVQQ== 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=ZOMLdiBdVDZxM95hhq8RR8gJEdhE5xReFfNoLsshPc4=; b=GBEsj/pmff/+RSDKTDAnBnkrDTgKUxwU6QofUdHEyEsH1Ed5LyKb21L4jun73wDttZNzMtXIhzrF/e06FmaG5m5WAzaYk+oal6gbxSaZ8dZbXGPHu+so9lPdPQyj1h7AJzr8G1456X1eGlyLSU8gycFNxnk9JhJVgBQlHuKgxe63TMF9SAGTTje5XqIsgRF4alf8I1Sa+Qs1tCDswfojXEp1gp2TzDmwj4x8pGoXPZmUBz2EDy1S6ZwgFp+Uc4/9j2FcevqoFs2nXQMnEVAa1uh+CYIqPZa7nYGFlHFIdWZLAAGHKEgsQUaedqUvub+CC5GOFMBPiAk6fsLxj70evw== 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=ZOMLdiBdVDZxM95hhq8RR8gJEdhE5xReFfNoLsshPc4=; b=BnCGTS1j7ReTF+GtOYGJjIoy2SrhNRrm72Bt2rBlV5t+p8eNmlwZtbAcvsZoZa60i23m3DOZUqbq2VMQmlcCqdLdkrs52brcJp/Qvt4BD4ohnT45V/z6RIpL7CK3n3SgEhMgAlYD5/wbkgAF0QLtM3eF92Q8iLBSxfuGVHdSr+r/nnTX+HuHnawciO1bnBOiLgOU5H+Pk/CAozeug1Soxv5vQNejZzjK2atAkvltWQiZ2QqgDAnJRq4KbyiFW+GVkrk38kQAMLhoXMjuSKgGKe4JM5mR1fRyYuJwn0t3qsbRbSvbg39+mvKKoCtWFPMrtAI3s8XOzicnbVRXZ+kNXA== Received: from AM0PR03CA0016.eurprd03.prod.outlook.com (2603:10a6:208:14::29) by PAXPR07MB7968.eurprd07.prod.outlook.com (2603:10a6:102:13e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.41; Thu, 8 Feb 2024 18:24:47 +0000 Received: from AM3PEPF0000A793.eurprd04.prod.outlook.com (2603:10a6:208:14:cafe::19) by AM0PR03CA0016.outlook.office365.com (2603:10a6:208:14::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.37 via Frontend Transport; Thu, 8 Feb 2024 18:24:47 +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 AM3PEPF0000A793.mail.protection.outlook.com (10.167.16.122) 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:47 +0000 Received: from seliicinfr00049.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, 8 Feb 2024 19:24:46 +0100 Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100]) by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id C84DE380061; Thu, 8 Feb 2024 19:24:46 +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 2/5] eal: add lcore variable test suite Date: Thu, 8 Feb 2024 19:16:41 +0100 Message-ID: <20240208181644.455233-3-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: AM3PEPF0000A793:EE_|PAXPR07MB7968:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b494fcf-19a3-41ac-fea3-08dc28d33b10 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ic/ViIC6RkmlQ3SpbLq8lhqUC5goZiktrZVfzvX4snDnQ2W/ElJzep5qkFD/0VnSTxnDrvkORYbnoXBl5qr3710VnVfN+qFc5JhwWJJkyD+7hsgaJ9P24FyQVOwiQVefnu+rlq9H+GYatVMuHg8i/lQN4uMK+BXrARfJDW7fAyarW6PPFHD5MUP3/6Bh66HbkWtVet4+SavEf6br6cOdcgs0JH+evZMs4f9M6nw8sCkK7CjQnepom1jvT3MX0ZfTc1J65KlKsTuK8lhWHR4SsZtHFJqZ6IDAS/dJHTVyFWjMg6jqaJiyuCiOKW8BkpRj7+FQFc2XoxrcI4ys6nmkGOypyVuBWFCjXkvotR/aFZRqaQxXmNr4KcmHFBs+Rov5UB+gw6s4SzlseCBpy03YfN2nwF2dXYcvFRyWfeXVwoDWYomxBUbLTJgUe+LH7i7Khpryl7NOFZ5BfRZC5IX4ZU4mubCFfYerFf2uGqUEx8qcdTUlt1iDpmtgYrQIiWFvgJXo57GvAMeWY/ijVPY2C5dR+ZWyWoHUFSQEPFFMR8y3lsxVBGjKvqj0KCI5IjAZP7tOvxg4OaUjNngSwcaROZ9skPdloHibd6aMak4s5k8= 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)(346002)(136003)(396003)(39860400002)(376002)(230922051799003)(82310400011)(186009)(64100799003)(1800799012)(451199024)(36840700001)(46966006)(40470700004)(2906002)(8936002)(30864003)(41300700001)(5660300002)(4326008)(8676002)(82960400001)(83380400001)(356005)(7636003)(86362001)(36756003)(26005)(1076003)(66574015)(70586007)(107886003)(336012)(6666004)(478600001)(6916009)(6266002)(54906003)(70206006)(2616005)(316002)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2024 18:24:47.3479 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b494fcf-19a3-41ac-fea3-08dc28d33b10 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: AM3PEPF0000A793.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR07MB7968 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 Signed-off-by: Mattias Rönnblom --- app/test/meson.build | 1 + app/test/test_lcore_var.c | 384 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 385 insertions(+) create mode 100644 app/test/test_lcore_var.c diff --git a/app/test/meson.build b/app/test/meson.build index 6389ae83ee..93412cce51 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -101,6 +101,7 @@ source_file_deps = { 'test_ipsec_sad.c': ['ipsec'], 'test_kvargs.c': ['kvargs'], 'test_latencystats.c': ['ethdev', 'latencystats', 'metrics'] + sample_packet_forward_deps, + 'test_lcore_var.c': [], 'test_lcores.c': [], 'test_link_bonding.c': ['ethdev', 'net_bond', 'net'] + packet_burst_generator_deps + virtual_pmd_deps, diff --git a/app/test/test_lcore_var.c b/app/test/test_lcore_var.c new file mode 100644 index 0000000000..0229f90bf2 --- /dev/null +++ b/app/test/test_lcore_var.c @@ -0,0 +1,384 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2024 Ericsson AB + */ + +#include +#include +#include + +#include +#include +#include + +#include "test.h" + +#define MIN_LCORES 2 + +RTE_LCORE_VAR_HANDLE(int, test_int); + +struct int_checker_state { + int old_value; + int new_value; + bool success; +}; + +static bool +rand_bool(void) +{ + return rte_rand() & 1; +} + +static void +rand_blk(void *blk, size_t size) +{ + size_t i; + + for (i = 0; i < size; i++) + ((unsigned char *)blk)[i] = (unsigned char)rte_rand(); +} + +static int +check_int(void *arg) +{ + struct int_checker_state *state = arg; + + int *ptr = RTE_LCORE_VAR_PTR(test_int); + + bool naturally_aligned = RTE_PTR_ALIGN_CEIL(ptr, sizeof(int)) == ptr; + + bool equal; + + if (rand_bool()) + equal = RTE_LCORE_VAR_GET(test_int) == state->old_value; + else + equal = *(RTE_LCORE_VAR_PTR(test_int)) == state->old_value; + + state->success = equal && naturally_aligned; + + if (rand_bool()) + RTE_LCORE_VAR_SET(test_int, state->new_value); + else + *ptr = state->new_value; + + return 0; +} + +RTE_LCORE_VAR_INIT(test_int); + +static int +test_int_lvar(void) +{ + unsigned int lcore_id; + + struct int_checker_state states[RTE_MAX_LCORE] = {}; + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + struct int_checker_state *state = &states[lcore_id]; + + state->old_value = (int)rte_rand(); + state->new_value = (int)rte_rand(); + + RTE_LCORE_VAR_LCORE_SET(lcore_id, test_int, state->old_value); + } + + RTE_LCORE_FOREACH_WORKER(lcore_id) + rte_eal_remote_launch(check_int, &states[lcore_id], lcore_id); + + rte_eal_mp_wait_lcore(); + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + struct int_checker_state *state = &states[lcore_id]; + + TEST_ASSERT(state->success, "Unexpected value " + "encountered on lcore %d", lcore_id); + + TEST_ASSERT_EQUAL(state->new_value, + RTE_LCORE_VAR_LCORE_GET(lcore_id, test_int), + "Lcore %d failed to update int", lcore_id); + } + + /* take the opportunity to test the foreach macro */ + int *v; + lcore_id = 0; + RTE_LCORE_VAR_FOREACH(v, test_int) { + printf("expected %d actual %d\n", + states[lcore_id].new_value, *v); + TEST_ASSERT_EQUAL(states[lcore_id].new_value, *v, + "Unexpected value on lcore %d during " + "iteration", lcore_id); + lcore_id++; + } + + return TEST_SUCCESS; +} + +/* private, larger, struct */ +#define TEST_STRUCT_DATA_SIZE 1234 + +struct test_struct { + uint8_t data[TEST_STRUCT_DATA_SIZE]; +}; + +static RTE_LCORE_VAR_HANDLE(char, before_struct); +static RTE_LCORE_VAR_HANDLE(struct test_struct, test_struct); +static RTE_LCORE_VAR_HANDLE(char, after_struct); + +struct struct_checker_state { + struct test_struct old_value; + struct test_struct new_value; + bool success; +}; + +static int check_struct(void *arg) +{ + struct struct_checker_state *state = arg; + + struct test_struct *lcore_struct = RTE_LCORE_VAR_PTR(test_struct); + + /* + * Lcore variable alignment is based on object size, not any + * particular requirements on the struct's field. + */ + bool properly_aligned = + RTE_PTR_ALIGN_CEIL(lcore_struct, 16) == lcore_struct; + + bool equal = memcmp(lcore_struct->data, state->old_value.data, + TEST_STRUCT_DATA_SIZE) == 0; + + state->success = equal && properly_aligned; + + memcpy(lcore_struct->data, state->new_value.data, + TEST_STRUCT_DATA_SIZE); + + return 0; +} + +static int +test_struct_lvar(void) +{ + unsigned int lcore_id; + + RTE_LCORE_VAR_ALLOC(before_struct); + RTE_LCORE_VAR_ALLOC(test_struct); + RTE_LCORE_VAR_ALLOC(after_struct); + + struct struct_checker_state states[RTE_MAX_LCORE]; + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + struct struct_checker_state *state = &states[lcore_id]; + + rand_blk(state->old_value.data, TEST_STRUCT_DATA_SIZE); + rand_blk(state->new_value.data, TEST_STRUCT_DATA_SIZE); + + memcpy(RTE_LCORE_VAR_LCORE_PTR(lcore_id, test_struct)->data, + state->old_value.data, TEST_STRUCT_DATA_SIZE); + } + + RTE_LCORE_FOREACH_WORKER(lcore_id) + rte_eal_remote_launch(check_struct, &states[lcore_id], + lcore_id); + + rte_eal_mp_wait_lcore(); + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + struct struct_checker_state *state = &states[lcore_id]; + struct test_struct *lstruct = + RTE_LCORE_VAR_LCORE_PTR(lcore_id, test_struct); + + TEST_ASSERT(state->success, "Unexpected value encountered on " + "lcore %d", lcore_id); + + bool equal = memcmp(lstruct->data, state->new_value.data, + TEST_STRUCT_DATA_SIZE) == 0; + + TEST_ASSERT(equal, "Lcore %d failed to update struct", + lcore_id); + } + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + char before = RTE_LCORE_VAR_LCORE_GET(lcore_id, before_struct); + char after = RTE_LCORE_VAR_LCORE_GET(lcore_id, after_struct); + + TEST_ASSERT_EQUAL(before, 0, "Lcore variable before test " + "struct was modified on lcore %d", lcore_id); + TEST_ASSERT_EQUAL(after, 0, "Lcore variable after test " + "struct was modified on lcore %d", lcore_id); + } + + return TEST_SUCCESS; +} + +#define TEST_ARRAY_SIZE 99 + +typedef uint16_t test_array_t[TEST_ARRAY_SIZE]; + +static void test_array_init_rand(test_array_t a) +{ + size_t i; + for (i = 0; i < TEST_ARRAY_SIZE; i++) + a[i] = (uint16_t)rte_rand(); +} + +static bool test_array_equal(test_array_t a, test_array_t b) +{ + size_t i; + for (i = 0; i < TEST_ARRAY_SIZE; i++) { + if (a[i] != b[i]) + return false; + } + return true; +} + +static void test_array_copy(test_array_t dst, const test_array_t src) +{ + size_t i; + for (i = 0; i < TEST_ARRAY_SIZE; i++) + dst[i] = src[i]; +} + +static RTE_LCORE_VAR_HANDLE(char, before_array); +static RTE_LCORE_VAR_HANDLE(test_array_t, test_array); +static RTE_LCORE_VAR_HANDLE(char, after_array); + +struct array_checker_state +{ + test_array_t old_value; + test_array_t new_value; + bool success; +}; + +static int check_array(void *arg) +{ + struct array_checker_state *state = arg; + + test_array_t *lcore_array = RTE_LCORE_VAR_PTR(test_array); + + /* + * Lcore variable alignment is based on object size, not any + * particular requirements on the struct's field. + */ + bool properly_aligned = + RTE_PTR_ALIGN_CEIL(lcore_array, 16) == lcore_array; + + bool equal = test_array_equal(*lcore_array, state->old_value); + + state->success = equal && properly_aligned; + + test_array_copy(*lcore_array, state->new_value); + + return 0; +} + +static int +test_array_lvar(void) +{ + unsigned int lcore_id; + + RTE_LCORE_VAR_ALLOC(before_array); + RTE_LCORE_VAR_ALLOC(test_array); + RTE_LCORE_VAR_ALLOC(after_array); + + struct array_checker_state states[RTE_MAX_LCORE]; + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + struct array_checker_state *state = &states[lcore_id]; + + test_array_init_rand(state->new_value); + test_array_init_rand(state->old_value); + + test_array_copy(RTE_LCORE_VAR_LCORE_GET(lcore_id, test_array), + state->old_value); + } + + RTE_LCORE_FOREACH_WORKER(lcore_id) + rte_eal_remote_launch(check_array, &states[lcore_id], + lcore_id); + + rte_eal_mp_wait_lcore(); + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + struct array_checker_state *state = &states[lcore_id]; + test_array_t *larray = + RTE_LCORE_VAR_LCORE_PTR(lcore_id, test_array); + + TEST_ASSERT(state->success, "Unexpected value encountered on " + "lcore %d", lcore_id); + + bool equal = test_array_equal(*larray, state->new_value); + + TEST_ASSERT(equal, "Lcore %d failed to update array", + lcore_id); + } + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + char before = RTE_LCORE_VAR_LCORE_GET(lcore_id, before_array); + char after = RTE_LCORE_VAR_LCORE_GET(lcore_id, after_array); + + TEST_ASSERT_EQUAL(before, 0, "Lcore variable before test " + "array was modified on lcore %d", lcore_id); + TEST_ASSERT_EQUAL(after, 0, "Lcore variable after test " + "array was modified on lcore %d", lcore_id); + } + + return TEST_SUCCESS; +} + +#define MANY_LVARS (RTE_MAX_LCORE_VAR / 2) + +static int +test_many_lvars(void) +{ + void **handlers = malloc(sizeof(void *) * MANY_LVARS); + int i; + + TEST_ASSERT(handlers != NULL, "Unable to allocate memory"); + + for (i = 0; i < MANY_LVARS; i++) { + void *handle = rte_lcore_var_alloc(1); + + uint8_t *b = __RTE_LCORE_VAR_LCORE_PTR(rte_lcore_id(), handle); + + *b = (uint8_t)i; + + handlers[i] = handle; + } + + for (i = 0; i < MANY_LVARS; i++) { + unsigned int lcore_id; + + RTE_LCORE_FOREACH_WORKER(lcore_id) { + uint8_t *b = __RTE_LCORE_VAR_LCORE_PTR(rte_lcore_id(), + handlers[i]); + TEST_ASSERT_EQUAL((uint8_t)i, *b, + "Unexpected lcore variable value."); + } + } + + free(handlers); + + return TEST_SUCCESS; +} + +static struct unit_test_suite lcore_var_testsuite = { + .suite_name = "lcore variable autotest", + .unit_test_cases = { + TEST_CASE(test_int_lvar), + TEST_CASE(test_struct_lvar), + TEST_CASE(test_array_lvar), + TEST_CASE(test_many_lvars), + TEST_CASES_END() + }, +}; + +static int test_lcore_var(void) +{ + if (rte_lcore_count() < MIN_LCORES) { + printf("Not enough cores for lcore_var_autotest; expecting at " + "least %d.\n", MIN_LCORES); + return TEST_SKIPPED; + } + + return unit_test_suite_runner(&lcore_var_testsuite); +} + +REGISTER_FAST_TEST(lcore_var_autotest, true, false, test_lcore_var);