common/sfc_efx/base: add NIC magic check on BAR lookup

[dpdk.git] / app / test / test_stack.c

diff --git a/app/test/test_stack.c b/app/test/test_stack.c
index c8dac1f..463460c 100644 (file)
--- a/app/test/test_stack.c
+++ b/app/test/test_stack.c
@@ -273,68 +273,43 @@ test_free_null(void)
 
 struct test_args {
        struct rte_stack *s;
-       rte_atomic64_t *sz;
 };
 
+static struct test_args thread_test_args;
+
 static int
-stack_thread_push_pop(void *args)
+stack_thread_push_pop(__rte_unused void *args)
 {
-       struct test_args *t = args;
-       void **obj_table;
+       void *obj_table[MAX_BULK];
        int i;
 
-       obj_table = rte_calloc(NULL, STACK_SIZE, sizeof(void *), 0);
-       if (obj_table == NULL) {
-               printf("[%s():%u] failed to calloc %zu bytes\n",
-                      __func__, __LINE__, STACK_SIZE * sizeof(void *));
-               return -1;
-       }
-
        for (i = 0; i < NUM_ITERS_PER_THREAD; i++) {
-               unsigned int success, num;
-
-               /* Reserve up to min(MAX_BULK, available slots) stack entries,
-                * then push and pop those stack entries.
-                */
-               do {
-                       uint64_t sz = rte_atomic64_read(t->sz);
-                       volatile uint64_t *sz_addr;
-
-                       sz_addr = (volatile uint64_t *)t->sz;
-
-                       num = RTE_MIN(rte_rand() % MAX_BULK, STACK_SIZE - sz);
+               unsigned int num;
 
-                       success = rte_atomic64_cmpset(sz_addr, sz, sz + num);
-               } while (success == 0);
+               num = rte_rand() % MAX_BULK;
 
-               if (rte_stack_push(t->s, obj_table, num) != num) {
+               if (rte_stack_push(thread_test_args.s, obj_table, num) != num) {
                        printf("[%s():%u] Failed to push %u pointers\n",
                               __func__, __LINE__, num);
-                       rte_free(obj_table);
                        return -1;
                }
 
-               if (rte_stack_pop(t->s, obj_table, num) != num) {
+               if (rte_stack_pop(thread_test_args.s, obj_table, num) != num) {
                        printf("[%s():%u] Failed to pop %u pointers\n",
                               __func__, __LINE__, num);
-                       rte_free(obj_table);
                        return -1;
                }
-
-               rte_atomic64_sub(t->sz, num);
        }
 
-       rte_free(obj_table);
        return 0;
 }
 
 static int
 test_stack_multithreaded(uint32_t flags)
 {
-       struct test_args *args;
        unsigned int lcore_id;
        struct rte_stack *s;
-       rte_atomic64_t size;
+       int result = 0;
 
        if (rte_lcore_count() < 2) {
                printf("Not enough cores for test_stack_multithreaded, expecting at least 2\n");
@@ -344,46 +319,25 @@ test_stack_multithreaded(uint32_t flags)
        printf("[%s():%u] Running with %u lcores\n",
               __func__, __LINE__, rte_lcore_count());
 
-       args = rte_malloc(NULL, sizeof(struct test_args) * RTE_MAX_LCORE, 0);
-       if (args == NULL) {
-               printf("[%s():%u] failed to malloc %zu bytes\n",
-                      __func__, __LINE__,
-                      sizeof(struct test_args) * RTE_MAX_LCORE);
-               return -1;
-       }
-
-       s = rte_stack_create("test", STACK_SIZE, rte_socket_id(), flags);
+       s = rte_stack_create("test", MAX_BULK * rte_lcore_count(), rte_socket_id(), flags);
        if (s == NULL) {
                printf("[%s():%u] Failed to create a stack\n",
                       __func__, __LINE__);
-               rte_free(args);
                return -1;
        }
 
-       rte_atomic64_init(&size);
+       thread_test_args.s = s;
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
-               args[lcore_id].s = s;
-               args[lcore_id].sz = &size;
+       if (rte_eal_mp_remote_launch(stack_thread_push_pop, NULL, CALL_MASTER))
+               rte_panic("Failed to launch tests\n");
 
-               if (rte_eal_remote_launch(stack_thread_push_pop,
-                                         &args[lcore_id], lcore_id))
-                       rte_panic("Failed to launch lcore %d\n", lcore_id);
+       RTE_LCORE_FOREACH(lcore_id) {
+               if (rte_eal_wait_lcore(lcore_id) < 0)
+                       result = -1;
        }
 
-       lcore_id = rte_lcore_id();
-
-       args[lcore_id].s = s;
-       args[lcore_id].sz = &size;
-
-       stack_thread_push_pop(&args[lcore_id]);
-
-       rte_eal_mp_wait_lcore();
-
        rte_stack_free(s);
-       rte_free(args);
-
-       return 0;
+       return result;
 }
 
 static int