X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_rcu_qsbr.c;h=85d80e0fbdad1fcdeba4c6430e46d41b3d54b29a;hb=b26a63510a59e773353a0cb64cbde1b1bcfb410b;hp=92ab0c20aa797f330e651317d15db1b518037e9e;hpb=cf407431dfd47f30acc3ad4a17cc44eff92ad98c;p=dpdk.git diff --git a/app/test/test_rcu_qsbr.c b/app/test/test_rcu_qsbr.c index 92ab0c20aa..85d80e0fbd 100644 --- a/app/test/test_rcu_qsbr.c +++ b/app/test/test_rcu_qsbr.c @@ -3,7 +3,6 @@ */ #include -#include #include #include #include @@ -26,50 +25,38 @@ /* Make sure that this has the same value as __RTE_QSBR_CNT_INIT */ #define TEST_RCU_QSBR_CNT_INIT 1 -#define TEST_RCU_MAX_LCORE 128 -uint16_t enabled_core_ids[TEST_RCU_MAX_LCORE]; -uint8_t num_cores; +static uint16_t enabled_core_ids[RTE_MAX_LCORE]; +static unsigned int num_cores; static uint32_t *keys; #define TOTAL_ENTRY (1024 * 8) #define COUNTER_VALUE 4096 -static uint32_t *hash_data[TEST_RCU_MAX_LCORE][TOTAL_ENTRY]; +static uint32_t *hash_data[RTE_MAX_LCORE][TOTAL_ENTRY]; static uint8_t writer_done; -static struct rte_rcu_qsbr *t[TEST_RCU_MAX_LCORE]; -struct rte_hash *h[TEST_RCU_MAX_LCORE]; -char hash_name[TEST_RCU_MAX_LCORE][8]; +static struct rte_rcu_qsbr *t[RTE_MAX_LCORE]; +static struct rte_hash *h[RTE_MAX_LCORE]; +static char hash_name[RTE_MAX_LCORE][8]; -static inline int -get_enabled_cores_mask(void) -{ - uint16_t core_id; - uint32_t max_cores = rte_lcore_count(); - - if (max_cores > TEST_RCU_MAX_LCORE) { - printf("Number of cores exceed %d\n", TEST_RCU_MAX_LCORE); - return -1; - } - - core_id = 0; - num_cores = 0; - RTE_LCORE_FOREACH_SLAVE(core_id) { - enabled_core_ids[num_cores] = core_id; - num_cores++; - } - - return 0; -} +struct test_rcu_thread_info { + /* Index in RCU array */ + int ir; + /* Index in hash array */ + int ih; + /* lcore IDs registered on the RCU variable */ + uint16_t r_core_ids[2]; +}; +static struct test_rcu_thread_info thread_info[RTE_MAX_LCORE/4]; static int alloc_rcu(void) { int i; - uint32_t sz; + size_t sz; - sz = rte_rcu_qsbr_get_memsize(TEST_RCU_MAX_LCORE); + sz = rte_rcu_qsbr_get_memsize(RTE_MAX_LCORE); - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) t[i] = (struct rte_rcu_qsbr *)rte_zmalloc(NULL, sz, RTE_CACHE_LINE_SIZE); @@ -81,7 +68,7 @@ free_rcu(void) { int i; - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_free(t[i]); return 0; @@ -94,20 +81,24 @@ free_rcu(void) static int test_rcu_qsbr_get_memsize(void) { - uint32_t sz; + size_t sz; printf("\nTest rte_rcu_qsbr_thread_register()\n"); sz = rte_rcu_qsbr_get_memsize(0); TEST_RCU_QSBR_RETURN_IF_ERROR((sz != 1), "Get Memsize for 0 threads"); - sz = rte_rcu_qsbr_get_memsize(TEST_RCU_MAX_LCORE); + sz = rte_rcu_qsbr_get_memsize(128); /* For 128 threads, * for machines with cache line size of 64B - 8384 * for machines with cache line size of 128 - 16768 */ - TEST_RCU_QSBR_RETURN_IF_ERROR((sz != 8384 && sz != 16768), - "Get Memsize"); + if (RTE_CACHE_LINE_SIZE == 64) + TEST_RCU_QSBR_RETURN_IF_ERROR((sz != 8384), + "Get Memsize for 128 threads"); + else if (RTE_CACHE_LINE_SIZE == 128) + TEST_RCU_QSBR_RETURN_IF_ERROR((sz != 16768), + "Get Memsize for 128 threads"); return 0; } @@ -122,7 +113,7 @@ test_rcu_qsbr_init(void) printf("\nTest rte_rcu_qsbr_init()\n"); - r = rte_rcu_qsbr_init(NULL, TEST_RCU_MAX_LCORE); + r = rte_rcu_qsbr_init(NULL, RTE_MAX_LCORE); TEST_RCU_QSBR_RETURN_IF_ERROR((r != 1), "NULL variable"); return 0; @@ -146,7 +137,7 @@ test_rcu_qsbr_thread_register(void) TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "NULL variable, invalid thread id"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); /* Register valid thread id */ ret = rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[0]); @@ -158,7 +149,7 @@ test_rcu_qsbr_thread_register(void) "Already registered thread id"); /* Register valid thread id - max allowed thread id */ - ret = rte_rcu_qsbr_thread_register(t[0], TEST_RCU_MAX_LCORE - 1); + ret = rte_rcu_qsbr_thread_register(t[0], RTE_MAX_LCORE - 1); TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 1), "Max thread id"); ret = rte_rcu_qsbr_thread_register(t[0], 100000); @@ -175,9 +166,10 @@ test_rcu_qsbr_thread_register(void) static int test_rcu_qsbr_thread_unregister(void) { - int i, j, ret; + unsigned int num_threads[3] = {1, RTE_MAX_LCORE, 1}; + unsigned int i, j; uint64_t token; - uint8_t num_threads[3] = {1, TEST_RCU_MAX_LCORE, 1}; + int ret; printf("\nTest rte_rcu_qsbr_thread_unregister()\n"); @@ -188,7 +180,7 @@ test_rcu_qsbr_thread_unregister(void) TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "NULL variable, invalid thread id"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[0]); @@ -197,7 +189,7 @@ test_rcu_qsbr_thread_unregister(void) "NULL variable, invalid thread id"); /* Find first disabled core */ - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) { + for (i = 0; i < RTE_MAX_LCORE; i++) { if (enabled_core_ids[i] == 0) break; } @@ -222,15 +214,15 @@ test_rcu_qsbr_thread_unregister(void) /* * Test with different thread_ids: * 1 - thread_id = 0 - * 2 - All possible thread_ids, from 0 to TEST_RCU_MAX_LCORE - * 3 - thread_id = TEST_RCU_MAX_LCORE - 1 + * 2 - All possible thread_ids, from 0 to RTE_MAX_LCORE + * 3 - thread_id = RTE_MAX_LCORE - 1 */ for (j = 0; j < 3; j++) { - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); for (i = 0; i < num_threads[j]; i++) rte_rcu_qsbr_thread_register(t[0], - (j == 2) ? (TEST_RCU_MAX_LCORE - 1) : i); + (j == 2) ? (RTE_MAX_LCORE - 1) : i); token = rte_rcu_qsbr_start(t[0]); TEST_RCU_QSBR_RETURN_IF_ERROR( @@ -238,10 +230,10 @@ test_rcu_qsbr_thread_unregister(void) /* Update quiescent state counter */ for (i = 0; i < num_threads[j]; i++) { /* Skip one update */ - if (i == (TEST_RCU_MAX_LCORE - 10)) + if (i == (RTE_MAX_LCORE - 10)) continue; rte_rcu_qsbr_quiescent(t[0], - (j == 2) ? (TEST_RCU_MAX_LCORE - 1) : i); + (j == 2) ? (RTE_MAX_LCORE - 1) : i); } if (j == 1) { @@ -250,7 +242,7 @@ test_rcu_qsbr_thread_unregister(void) TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "Non-blocking QSBR check"); /* Update the previously skipped thread */ - rte_rcu_qsbr_quiescent(t[0], TEST_RCU_MAX_LCORE - 10); + rte_rcu_qsbr_quiescent(t[0], RTE_MAX_LCORE - 10); } /* Validate the updates */ @@ -260,7 +252,7 @@ test_rcu_qsbr_thread_unregister(void) for (i = 0; i < num_threads[j]; i++) rte_rcu_qsbr_thread_unregister(t[0], - (j == 2) ? (TEST_RCU_MAX_LCORE - 1) : i); + (j == 2) ? (RTE_MAX_LCORE - 1) : i); /* Check with no thread registered */ ret = rte_rcu_qsbr_check(t[0], token, true); @@ -282,7 +274,7 @@ test_rcu_qsbr_start(void) printf("\nTest rte_rcu_qsbr_start()\n"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); for (i = 0; i < 3; i++) rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[i]); @@ -321,7 +313,7 @@ test_rcu_qsbr_check(void) printf("\nTest rte_rcu_qsbr_check()\n"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); token = rte_rcu_qsbr_start(t[0]); TEST_RCU_QSBR_RETURN_IF_ERROR( @@ -355,7 +347,7 @@ test_rcu_qsbr_check(void) ret = rte_rcu_qsbr_check(t[0], token, true); TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "Blocking QSBR check"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); for (i = 0; i < 4; i++) rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[i]); @@ -400,11 +392,11 @@ test_rcu_qsbr_synchronize_reader(void *arg) static int test_rcu_qsbr_synchronize(void) { - int i; + unsigned int i; printf("\nTest rte_rcu_qsbr_synchronize()\n"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); /* Test if the API returns when there are no threads reporting * QS on the variable. @@ -414,7 +406,7 @@ test_rcu_qsbr_synchronize(void) /* Test if the API returns when there are threads registered * but not online. */ - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_rcu_qsbr_thread_register(t[0], i); rte_rcu_qsbr_synchronize(t[0], RTE_QSBR_THRID_INVALID); @@ -426,12 +418,12 @@ test_rcu_qsbr_synchronize(void) rte_rcu_qsbr_thread_offline(t[0], 0); /* Check the other boundary */ - rte_rcu_qsbr_thread_online(t[0], TEST_RCU_MAX_LCORE - 1); - rte_rcu_qsbr_synchronize(t[0], TEST_RCU_MAX_LCORE - 1); - rte_rcu_qsbr_thread_offline(t[0], TEST_RCU_MAX_LCORE - 1); + rte_rcu_qsbr_thread_online(t[0], RTE_MAX_LCORE - 1); + rte_rcu_qsbr_synchronize(t[0], RTE_MAX_LCORE - 1); + rte_rcu_qsbr_thread_offline(t[0], RTE_MAX_LCORE - 1); /* Test if the API returns after unregisterng all the threads */ - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_rcu_qsbr_thread_unregister(t[0], i); rte_rcu_qsbr_synchronize(t[0], RTE_QSBR_THRID_INVALID); @@ -464,7 +456,7 @@ test_rcu_qsbr_thread_online(void) printf("Test rte_rcu_qsbr_thread_online()\n"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); /* Register 2 threads to validate that only the * online thread is waited upon. @@ -491,9 +483,9 @@ test_rcu_qsbr_thread_online(void) TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "thread update"); /* Make all the threads online */ - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); token = rte_rcu_qsbr_start(t[0]); - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) { + for (i = 0; i < RTE_MAX_LCORE; i++) { rte_rcu_qsbr_thread_register(t[0], i); rte_rcu_qsbr_thread_online(t[0], i); } @@ -502,7 +494,7 @@ test_rcu_qsbr_thread_online(void) TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "thread online"); /* Check if all the online threads can report QS */ token = rte_rcu_qsbr_start(t[0]); - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_rcu_qsbr_quiescent(t[0], i); ret = rte_rcu_qsbr_check(t[0], token, true); TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "thread update"); @@ -522,7 +514,7 @@ test_rcu_qsbr_thread_offline(void) printf("\nTest rte_rcu_qsbr_thread_offline()\n"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); rte_rcu_qsbr_thread_register(t[0], enabled_core_ids[0]); @@ -550,10 +542,10 @@ test_rcu_qsbr_thread_offline(void) /* * Check a sequence of online/status/offline/status/online/status */ - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); token = rte_rcu_qsbr_start(t[0]); /* Make the threads online */ - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) { + for (i = 0; i < RTE_MAX_LCORE; i++) { rte_rcu_qsbr_thread_register(t[0], i); rte_rcu_qsbr_thread_online(t[0], i); } @@ -564,13 +556,13 @@ test_rcu_qsbr_thread_offline(void) /* Check if all the online threads can report QS */ token = rte_rcu_qsbr_start(t[0]); - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_rcu_qsbr_quiescent(t[0], i); ret = rte_rcu_qsbr_check(t[0], token, true); TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "report QS"); /* Make all the threads offline */ - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_rcu_qsbr_thread_offline(t[0], i); /* Make sure these threads are not being waited on */ token = rte_rcu_qsbr_start(t[0]); @@ -578,11 +570,11 @@ test_rcu_qsbr_thread_offline(void) TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "offline QS"); /* Make the threads online */ - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_rcu_qsbr_thread_online(t[0], i); /* Check if all the online threads can report QS */ token = rte_rcu_qsbr_start(t[0]); - for (i = 0; i < TEST_RCU_MAX_LCORE; i++) + for (i = 0; i < RTE_MAX_LCORE; i++) rte_rcu_qsbr_quiescent(t[0], i); ret = rte_rcu_qsbr_check(t[0], token, true); TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0), "online again"); @@ -605,8 +597,8 @@ test_rcu_qsbr_dump(void) rte_rcu_qsbr_dump(stdout, NULL); rte_rcu_qsbr_dump(NULL, NULL); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); - rte_rcu_qsbr_init(t[1], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); + rte_rcu_qsbr_init(t[1], RTE_MAX_LCORE); /* QS variable with 0 core mask */ rte_rcu_qsbr_dump(stdout, t[0]); @@ -629,11 +621,12 @@ test_rcu_qsbr_reader(void *arg) struct rte_hash *hash = NULL; int i; uint32_t lcore_id = rte_lcore_id(); - uint8_t read_type = (uint8_t)((uintptr_t)arg); + struct test_rcu_thread_info *ti; uint32_t *pdata; - temp = t[read_type]; - hash = h[read_type]; + ti = (struct test_rcu_thread_info *)arg; + temp = t[ti->ir]; + hash = h[ti->ih]; do { rte_rcu_qsbr_thread_register(temp, lcore_id); @@ -642,9 +635,9 @@ test_rcu_qsbr_reader(void *arg) rte_rcu_qsbr_lock(temp, lcore_id); if (rte_hash_lookup_data(hash, keys+i, (void **)&pdata) != -ENOENT) { - *pdata = 0; - while (*pdata < COUNTER_VALUE) - ++*pdata; + pdata[lcore_id] = 0; + while (pdata[lcore_id] < COUNTER_VALUE) + pdata[lcore_id]++; } rte_rcu_qsbr_unlock(temp, lcore_id); } @@ -661,44 +654,42 @@ static int test_rcu_qsbr_writer(void *arg) { uint64_t token; - int32_t pos; + int32_t i, pos, del; + uint32_t c; struct rte_rcu_qsbr *temp; struct rte_hash *hash = NULL; - uint8_t writer_type = (uint8_t)((uintptr_t)arg); + struct test_rcu_thread_info *ti; - temp = t[(writer_type/2) % TEST_RCU_MAX_LCORE]; - hash = h[(writer_type/2) % TEST_RCU_MAX_LCORE]; + ti = (struct test_rcu_thread_info *)arg; + temp = t[ti->ir]; + hash = h[ti->ih]; /* Delete element from the shared data structure */ - pos = rte_hash_del_key(hash, keys + (writer_type % TOTAL_ENTRY)); + del = rte_lcore_id() % TOTAL_ENTRY; + pos = rte_hash_del_key(hash, keys + del); if (pos < 0) { - printf("Delete key failed #%d\n", - keys[writer_type % TOTAL_ENTRY]); + printf("Delete key failed #%d\n", keys[del]); return -1; } /* Start the quiescent state query process */ token = rte_rcu_qsbr_start(temp); /* Check the quiescent state status */ rte_rcu_qsbr_check(temp, token, true); - if (*hash_data[(writer_type/2) % TEST_RCU_MAX_LCORE] - [writer_type % TOTAL_ENTRY] != COUNTER_VALUE && - *hash_data[(writer_type/2) % TEST_RCU_MAX_LCORE] - [writer_type % TOTAL_ENTRY] != 0) { - printf("Reader did not complete #%d = %d\t", writer_type, - *hash_data[(writer_type/2) % TEST_RCU_MAX_LCORE] - [writer_type % TOTAL_ENTRY]); - return -1; + for (i = 0; i < 2; i++) { + c = hash_data[ti->ih][del][ti->r_core_ids[i]]; + if (c != COUNTER_VALUE && c != 0) { + printf("Reader lcore id %u did not complete = %u\t", + rte_lcore_id(), c); + return -1; + } } if (rte_hash_free_key_with_position(hash, pos) < 0) { - printf("Failed to free the key #%d\n", - keys[writer_type % TOTAL_ENTRY]); + printf("Failed to free the key #%d\n", keys[del]); return -1; } - rte_free(hash_data[(writer_type/2) % TEST_RCU_MAX_LCORE] - [writer_type % TOTAL_ENTRY]); - hash_data[(writer_type/2) % TEST_RCU_MAX_LCORE] - [writer_type % TOTAL_ENTRY] = NULL; + rte_free(hash_data[ti->ih][del]); + hash_data[ti->ih][del] = NULL; return 0; } @@ -728,7 +719,8 @@ init_hash(int hash_id) } for (i = 0; i < TOTAL_ENTRY; i++) { - hash_data[hash_id][i] = rte_zmalloc(NULL, sizeof(uint32_t), 0); + hash_data[hash_id][i] = + rte_zmalloc(NULL, sizeof(uint32_t) * RTE_MAX_LCORE, 0); if (hash_data[hash_id][i] == NULL) { printf("No memory\n"); return NULL; @@ -762,6 +754,7 @@ static int test_rcu_qsbr_sw_sv_3qs(void) { uint64_t token[3]; + uint32_t c; int i; int32_t pos[3]; @@ -769,7 +762,7 @@ test_rcu_qsbr_sw_sv_3qs(void) printf("Test: 1 writer, 1 QSBR variable, simultaneous QSBR queries\n"); - rte_rcu_qsbr_init(t[0], TEST_RCU_MAX_LCORE); + rte_rcu_qsbr_init(t[0], RTE_MAX_LCORE); /* Shared data structure created */ h[0] = init_hash(0); @@ -778,9 +771,15 @@ test_rcu_qsbr_sw_sv_3qs(void) goto error; } + /* No need to fill the registered core IDs as the writer + * thread is not launched. + */ + thread_info[0].ir = 0; + thread_info[0].ih = 0; + /* Reader threads are launched */ for (i = 0; i < 4; i++) - rte_eal_remote_launch(test_rcu_qsbr_reader, NULL, + rte_eal_remote_launch(test_rcu_qsbr_reader, &thread_info[0], enabled_core_ids[i]); /* Delete element from the shared data structure */ @@ -812,9 +811,13 @@ test_rcu_qsbr_sw_sv_3qs(void) /* Check the quiescent state status */ rte_rcu_qsbr_check(t[0], token[0], true); - if (*hash_data[0][0] != COUNTER_VALUE && *hash_data[0][0] != 0) { - printf("Reader did not complete #0 = %d\n", *hash_data[0][0]); - goto error; + for (i = 0; i < 4; i++) { + c = hash_data[0][0][enabled_core_ids[i]]; + if (c != COUNTER_VALUE && c != 0) { + printf("Reader lcore %d did not complete #0 = %d\n", + enabled_core_ids[i], c); + goto error; + } } if (rte_hash_free_key_with_position(h[0], pos[0]) < 0) { @@ -826,9 +829,13 @@ test_rcu_qsbr_sw_sv_3qs(void) /* Check the quiescent state status */ rte_rcu_qsbr_check(t[0], token[1], true); - if (*hash_data[0][3] != COUNTER_VALUE && *hash_data[0][3] != 0) { - printf("Reader did not complete #3 = %d\n", *hash_data[0][3]); - goto error; + for (i = 0; i < 4; i++) { + c = hash_data[0][3][enabled_core_ids[i]]; + if (c != COUNTER_VALUE && c != 0) { + printf("Reader lcore %d did not complete #3 = %d\n", + enabled_core_ids[i], c); + goto error; + } } if (rte_hash_free_key_with_position(h[0], pos[1]) < 0) { @@ -840,9 +847,13 @@ test_rcu_qsbr_sw_sv_3qs(void) /* Check the quiescent state status */ rte_rcu_qsbr_check(t[0], token[2], true); - if (*hash_data[0][6] != COUNTER_VALUE && *hash_data[0][6] != 0) { - printf("Reader did not complete #6 = %d\n", *hash_data[0][6]); - goto error; + for (i = 0; i < 4; i++) { + c = hash_data[0][6][enabled_core_ids[i]]; + if (c != COUNTER_VALUE && c != 0) { + printf("Reader lcore %d did not complete #6 = %d\n", + enabled_core_ids[i], c); + goto error; + } } if (rte_hash_free_key_with_position(h[0], pos[2]) < 0) { @@ -882,49 +893,68 @@ error: static int test_rcu_qsbr_mw_mv_mqs(void) { - int i, j; - uint8_t test_cores; + unsigned int i, j; + unsigned int test_cores; writer_done = 0; test_cores = num_cores / 4; test_cores = test_cores * 4; - printf("Test: %d writers, %d QSBR variable, simultaneous QSBR queries\n" - , test_cores / 2, test_cores / 4); + printf("Test: %d writers, %d QSBR variable, simultaneous QSBR queries\n", + test_cores / 2, test_cores / 4); - for (i = 0; i < num_cores / 4; i++) { - rte_rcu_qsbr_init(t[i], TEST_RCU_MAX_LCORE); + for (i = 0; i < test_cores / 4; i++) { + j = i * 4; + rte_rcu_qsbr_init(t[i], RTE_MAX_LCORE); h[i] = init_hash(i); if (h[i] == NULL) { printf("Hash init failed\n"); goto error; } - } + thread_info[i].ir = i; + thread_info[i].ih = i; + thread_info[i].r_core_ids[0] = enabled_core_ids[j]; + thread_info[i].r_core_ids[1] = enabled_core_ids[j + 1]; - /* Reader threads are launched */ - for (i = 0; i < test_cores / 2; i++) + /* Reader threads are launched */ rte_eal_remote_launch(test_rcu_qsbr_reader, - (void *)(uintptr_t)(i / 2), - enabled_core_ids[i]); + (void *)&thread_info[i], + enabled_core_ids[j]); + rte_eal_remote_launch(test_rcu_qsbr_reader, + (void *)&thread_info[i], + enabled_core_ids[j + 1]); - /* Writer threads are launched */ - for (; i < test_cores; i++) + /* Writer threads are launched */ rte_eal_remote_launch(test_rcu_qsbr_writer, - (void *)(uintptr_t)(i - (test_cores / 2)), - enabled_core_ids[i]); + (void *)&thread_info[i], + enabled_core_ids[j + 2]); + rte_eal_remote_launch(test_rcu_qsbr_writer, + (void *)&thread_info[i], + enabled_core_ids[j + 3]); + } + /* Wait and check return value from writer threads */ - for (i = test_cores / 2; i < test_cores; i++) - if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0) + for (i = 0; i < test_cores / 4; i++) { + j = i * 4; + if (rte_eal_wait_lcore(enabled_core_ids[j + 2]) < 0) goto error; + if (rte_eal_wait_lcore(enabled_core_ids[j + 3]) < 0) + goto error; + } writer_done = 1; /* Wait and check return value from reader threads */ - for (i = 0; i < test_cores / 2; i++) - if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0) + for (i = 0; i < test_cores / 4; i++) { + j = i * 4; + if (rte_eal_wait_lcore(enabled_core_ids[j]) < 0) + goto error; + + if (rte_eal_wait_lcore(enabled_core_ids[j + 1]) < 0) goto error; + } - for (i = 0; i < num_cores / 4; i++) + for (i = 0; i < test_cores / 4; i++) rte_hash_free(h[i]); rte_free(keys); @@ -936,10 +966,10 @@ error: /* Wait until all readers and writers have exited */ rte_eal_mp_wait_lcore(); - for (i = 0; i < num_cores / 4; i++) + for (i = 0; i < test_cores / 4; i++) rte_hash_free(h[i]); rte_free(keys); - for (j = 0; j < TEST_RCU_MAX_LCORE; j++) + for (j = 0; j < test_cores / 4; j++) for (i = 0; i < TOTAL_ENTRY; i++) rte_free(hash_data[j][i]); @@ -949,12 +979,17 @@ error: static int test_rcu_qsbr_main(void) { - if (get_enabled_cores_mask() != 0) - return -1; + uint16_t core_id; - if (num_cores < 4) { - printf("Test failed! Need 4 or more cores\n"); - goto test_fail; + if (rte_lcore_count() < 5) { + printf("Not enough cores for rcu_qsbr_autotest, expecting at least 5\n"); + return TEST_SKIPPED; + } + + num_cores = 0; + RTE_LCORE_FOREACH_SLAVE(core_id) { + enabled_core_ids[num_cores] = core_id; + num_cores++; } /* Error-checking test cases */