From patchwork Fri Feb 22 16:06:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eads, Gage" X-Patchwork-Id: 50464 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E050347CE; Fri, 22 Feb 2019 17:07:09 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id CAA9F2BF7 for ; Fri, 22 Feb 2019 17:07:00 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Feb 2019 08:07:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,400,1544515200"; d="scan'208";a="145706383" Received: from txasoft-yocto.an.intel.com ([10.123.72.192]) by fmsmga002.fm.intel.com with ESMTP; 22 Feb 2019 08:06:59 -0800 From: Gage Eads To: dev@dpdk.org Cc: olivier.matz@6wind.com, arybchenko@solarflare.com, bruce.richardson@intel.com, konstantin.ananyev@intel.com, gavin.hu@arm.com, Honnappa.Nagarahalli@arm.com, nd@arm.com, thomas@monjalon.net Date: Fri, 22 Feb 2019 10:06:54 -0600 Message-Id: <20190222160655.3346-7-gage.eads@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20190222160655.3346-1-gage.eads@intel.com> References: <20190222160655.3346-1-gage.eads@intel.com> Subject: [dpdk-dev] [PATCH 6/7] test/stack: add non-blocking stack tests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" This commit adds non-blocking stack variants of stack_autotest (stack_nb_autotest) and stack_perf_autotest (stack_nb_perf_autotest), which differ only in that the non-blocking versions pass the STACK_F_NB flag to all rte_stack_create() calls. Signed-off-by: Gage Eads Reviewed-by: Olivier Matz --- test/test/meson.build | 2 ++ test/test/test_stack.c | 41 +++++++++++++++++++++++++++-------------- test/test/test_stack_perf.c | 17 +++++++++++++++-- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/test/test/meson.build b/test/test/meson.build index ba3cb6261..474611291 100644 --- a/test/test/meson.build +++ b/test/test/meson.build @@ -177,6 +177,7 @@ fast_parallel_test_names = [ 'sched_autotest', 'spinlock_autotest', 'stack_autotest', + 'stack_nb_autotest', 'string_autotest', 'table_autotest', 'tailq_autotest', @@ -242,6 +243,7 @@ perf_test_names = [ 'ring_pmd_perf_autotest', 'pmd_perf_autotest', 'stack_perf_autotest', + 'stack_nb_perf_autotest', ] # All test cases in driver_test_names list are non-parallel diff --git a/test/test/test_stack.c b/test/test/test_stack.c index 510c7aac1..729c25230 100644 --- a/test/test/test_stack.c +++ b/test/test/test_stack.c @@ -81,7 +81,7 @@ test_stack_push_pop(struct rte_stack *s, void **obj_table, unsigned int bulk_sz) } static int -test_stack_basic(void) +test_stack_basic(uint32_t flags) { struct rte_stack *s = NULL; void **obj_table = NULL; @@ -97,7 +97,7 @@ test_stack_basic(void) for (i = 0; i < STACK_SIZE; i++) obj_table[i] = (void *)(uintptr_t)i; - s = rte_stack_create(__func__, STACK_SIZE, rte_socket_id(), 0); + s = rte_stack_create(__func__, STACK_SIZE, rte_socket_id(), flags); if (s == NULL) { printf("[%s():%u] failed to create a stack\n", __func__, __LINE__); @@ -162,18 +162,18 @@ test_stack_basic(void) } static int -test_stack_name_reuse(void) +test_stack_name_reuse(uint32_t flags) { struct rte_stack *s[2]; - s[0] = rte_stack_create("test", STACK_SIZE, rte_socket_id(), 0); + s[0] = rte_stack_create("test", STACK_SIZE, rte_socket_id(), flags); if (s[0] == NULL) { printf("[%s():%u] Failed to create a stack\n", __func__, __LINE__); return -1; } - s[1] = rte_stack_create("test", STACK_SIZE, rte_socket_id(), 0); + s[1] = rte_stack_create("test", STACK_SIZE, rte_socket_id(), flags); if (s[1] != NULL) { printf("[%s():%u] Failed to detect re-used name\n", __func__, __LINE__); @@ -186,14 +186,14 @@ test_stack_name_reuse(void) } static int -test_stack_name_length(void) +test_stack_name_length(uint32_t flags) { char name[RTE_STACK_NAMESIZE + 1]; struct rte_stack *s; memset(name, 's', sizeof(name)); - s = rte_stack_create(name, STACK_SIZE, rte_socket_id(), 0); + s = rte_stack_create(name, STACK_SIZE, rte_socket_id(), flags); if (s != NULL) { printf("[%s():%u] Failed to prevent long name\n", __func__, __LINE__); @@ -312,7 +312,7 @@ stack_thread_push_pop(void *args) } static int -test_stack_multithreaded(void) +test_stack_multithreaded(uint32_t flags) { struct test_args *args; unsigned int lcore_id; @@ -333,7 +333,7 @@ test_stack_multithreaded(void) return -1; } - s = rte_stack_create("test", STACK_SIZE, rte_socket_id(), 0); + s = rte_stack_create("test", STACK_SIZE, rte_socket_id(), flags); if (s == NULL) { printf("[%s():%u] Failed to create a stack\n", __func__, __LINE__); @@ -368,9 +368,9 @@ test_stack_multithreaded(void) } static int -test_stack(void) +__test_stack(uint32_t flags) { - if (test_stack_basic() < 0) + if (test_stack_basic(flags) < 0) return -1; if (test_lookup_null() < 0) @@ -379,16 +379,29 @@ test_stack(void) if (test_free_null() < 0) return -1; - if (test_stack_name_reuse() < 0) + if (test_stack_name_reuse(flags) < 0) return -1; - if (test_stack_name_length() < 0) + if (test_stack_name_length(flags) < 0) return -1; - if (test_stack_multithreaded() < 0) + if (test_stack_multithreaded(flags) < 0) return -1; return 0; } +static int +test_stack(void) +{ + return __test_stack(0); +} + +static int +test_nb_stack(void) +{ + return __test_stack(STACK_F_NB); +} + REGISTER_TEST_COMMAND(stack_autotest, test_stack); +REGISTER_TEST_COMMAND(stack_nb_autotest, test_nb_stack); diff --git a/test/test/test_stack_perf.c b/test/test/test_stack_perf.c index 484370d30..57a0e806b 100644 --- a/test/test/test_stack_perf.c +++ b/test/test/test_stack_perf.c @@ -297,14 +297,14 @@ test_bulk_push_pop(struct rte_stack *s) } static int -test_stack_perf(void) +__test_stack_perf(uint32_t flags) { struct lcore_pair cores; struct rte_stack *s; rte_atomic32_init(&lcore_barrier); - s = rte_stack_create(STACK_NAME, STACK_SIZE, rte_socket_id(), 0); + s = rte_stack_create(STACK_NAME, STACK_SIZE, rte_socket_id(), flags); if (s == NULL) { printf("[%s():%u] failed to create a stack\n", __func__, __LINE__); @@ -340,4 +340,17 @@ test_stack_perf(void) return 0; } +static int +test_stack_perf(void) +{ + return __test_stack_perf(0); +} + +static int +test_nb_stack_perf(void) +{ + return __test_stack_perf(STACK_F_NB); +} + REGISTER_TEST_COMMAND(stack_perf_autotest, test_stack_perf); +REGISTER_TEST_COMMAND(stack_nb_perf_autotest, test_nb_stack_perf);