From patchwork Mon Aug 2 10:18:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joyce Kong X-Patchwork-Id: 96522 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 9F091A0C41; Mon, 2 Aug 2021 12:20:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DC0F41123; Mon, 2 Aug 2021 12:20:39 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 87EA540140 for ; Mon, 2 Aug 2021 12:20:37 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 026F6D6E; Mon, 2 Aug 2021 03:20:37 -0700 (PDT) Received: from net-arm-n1sdp.shanghai.arm.com (net-arm-n1sdp.shanghai.arm.com [10.169.208.222]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 49AEE3F70D; Mon, 2 Aug 2021 03:20:30 -0700 (PDT) From: Joyce Kong To: thomas@monjalon.net, david.marchand@redhat.com, honnappa.nagarahalli@arm.com, ruifeng.wang@arm.com, konstantin.ananyev@intel.com, rsanford@akamai.com, erik.g.carrillo@intel.com, olivier.matz@6wind.com, yipeng1.wang@intel.com, sameh.gobriel@intel.com, bruce.richardson@intel.com, vladimir.medvedkin@intel.com, anatoly.burakov@intel.com, andrew.rybchenko@oktetlabs.ru, jerinj@marvell.com, declan.doherty@intel.com, ciara.power@intel.com, xiaoyun.li@intel.com, nicolas.chautru@intel.com, maryam.tahhan@intel.com, reshma.pattan@intel.com, cristian.dumitrescu@intel.com Cc: dev@dpdk.org, nd@arm.com Date: Mon, 2 Aug 2021 05:18:41 -0500 Message-Id: <20210802101847.3462-7-joyce.kong@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210802101847.3462-1-joyce.kong@arm.com> References: <20210802101847.3462-1-joyce.kong@arm.com> Subject: [dpdk-dev] [PATCH v1 06/12] test/func_reentrancy: use compiler atomic for data sync 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 Sender: "dev" Convert rte_atomic usages to compiler atomic built-ins for data sync in func_reentrancy test cases. Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang Reviewed-by: Honnappa Nagarahalli --- app/test/test_func_reentrancy.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c index 231c99a9eb..c00ecb8110 100644 --- a/app/test/test_func_reentrancy.c +++ b/app/test/test_func_reentrancy.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -54,12 +53,12 @@ typedef void (*case_clean_t)(unsigned lcore_id); #define MAX_LCORES (RTE_MAX_MEMZONE / (MAX_ITER_MULTI * 4U)) -static rte_atomic32_t obj_count = RTE_ATOMIC32_INIT(0); -static rte_atomic32_t synchro = RTE_ATOMIC32_INIT(0); +static uint32_t obj_count; +static uint32_t synchro; #define WAIT_SYNCHRO_FOR_WORKERS() do { \ if (lcore_self != rte_get_main_lcore()) \ - while (rte_atomic32_read(&synchro) == 0); \ + rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED); \ } while(0) /* @@ -72,7 +71,7 @@ test_eal_init_once(__rte_unused void *arg) WAIT_SYNCHRO_FOR_WORKERS(); - rte_atomic32_set(&obj_count, 1); /* silent the check in the caller */ + __atomic_store_n(&obj_count, 1, __ATOMIC_RELAXED); /* silent the check in the caller */ if (rte_eal_init(0, NULL) != -1) return -1; @@ -112,7 +111,7 @@ ring_create_lookup(__rte_unused void *arg) for (i = 0; i < MAX_ITER_ONCE; i++) { rp = rte_ring_create("fr_test_once", 4096, SOCKET_ID_ANY, 0); if (rp != NULL) - rte_atomic32_inc(&obj_count); + __atomic_fetch_add(&obj_count, 1, __ATOMIC_RELAXED); } /* create/lookup new ring several times */ @@ -176,7 +175,7 @@ mempool_create_lookup(__rte_unused void *arg) my_obj_init, NULL, SOCKET_ID_ANY, 0); if (mp != NULL) - rte_atomic32_inc(&obj_count); + __atomic_fetch_add(&obj_count, 1, __ATOMIC_RELAXED); } /* create/lookup new ring several times */ @@ -239,7 +238,7 @@ hash_create_free(__rte_unused void *arg) for (i = 0; i < MAX_ITER_ONCE; i++) { handle = rte_hash_create(&hash_params); if (handle != NULL) - rte_atomic32_inc(&obj_count); + __atomic_fetch_add(&obj_count, 1, __ATOMIC_RELAXED); } /* create mutiple times simultaneously */ @@ -303,7 +302,7 @@ fbk_create_free(__rte_unused void *arg) for (i = 0; i < MAX_ITER_ONCE; i++) { handle = rte_fbk_hash_create(&fbk_params); if (handle != NULL) - rte_atomic32_inc(&obj_count); + __atomic_fetch_add(&obj_count, 1, __ATOMIC_RELAXED); } /* create mutiple fbk tables simultaneously */ @@ -365,7 +364,7 @@ lpm_create_free(__rte_unused void *arg) for (i = 0; i < MAX_ITER_ONCE; i++) { lpm = rte_lpm_create("fr_test_once", SOCKET_ID_ANY, &config); if (lpm != NULL) - rte_atomic32_inc(&obj_count); + __atomic_fetch_add(&obj_count, 1, __ATOMIC_RELAXED); } /* create mutiple fbk tables simultaneously */ @@ -427,8 +426,8 @@ launch_test(struct test_case *pt_case) if (pt_case->func == NULL) return -1; - rte_atomic32_set(&obj_count, 0); - rte_atomic32_set(&synchro, 0); + __atomic_store_n(&obj_count, 0, __ATOMIC_RELAXED); + __atomic_store_n(&synchro, 0, __ATOMIC_RELAXED); RTE_LCORE_FOREACH_WORKER(lcore_id) { if (cores == 1) @@ -437,7 +436,7 @@ launch_test(struct test_case *pt_case) rte_eal_remote_launch(pt_case->func, pt_case->arg, lcore_id); } - rte_atomic32_set(&synchro, 1); + __atomic_store_n(&synchro, 1, __ATOMIC_RELAXED); if (pt_case->func(pt_case->arg) < 0) ret = -1; @@ -454,7 +453,7 @@ launch_test(struct test_case *pt_case) pt_case->clean(lcore_id); } - count = rte_atomic32_read(&obj_count); + count = __atomic_load_n(&obj_count, __ATOMIC_RELAXED); if (count != 1) { printf("%s: common object allocated %d times (should be 1)\n", pt_case->name, count);