}
static int
-test_stack_basic(void)
+test_stack_basic(uint32_t flags)
{
struct rte_stack *s = NULL;
void **obj_table = NULL;
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__);
}
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__);
}
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));
name[RTE_STACK_NAMESIZE] = '\0';
- 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__);
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;
+ unsigned int num;
- sz_addr = (volatile uint64_t *)t->sz;
+ num = rte_rand() % MAX_BULK;
- num = RTE_MIN(rte_rand() % MAX_BULK, STACK_SIZE - sz);
-
- success = rte_atomic64_cmpset(sz_addr, sz, sz + num);
- } while (success == 0);
-
- 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(void)
+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");
+ return TEST_SKIPPED;
+ }
printf("[%s():%u] Running with %u lcores\n",
__func__, __LINE__, rte_lcore_count());
- if (rte_lcore_count() < 2)
- return 0;
-
- 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(), 0);
+ 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_MAIN))
+ 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
-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)
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_lf_stack(void)
+{
+ return __test_stack(RTE_STACK_F_LF);
+}
+
REGISTER_TEST_COMMAND(stack_autotest, test_stack);
+REGISTER_TEST_COMMAND(stack_lf_autotest, test_lf_stack);
git.droids-corp.org / dpdk.git / blobdiff