git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.21.0.0-160-ge5dcd6f21

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via e5dcd6f21ed52d068336a662976fd0e893f639f1 (commit) via 1a3f614126a1cf268f4829387642ab7111c63048 (commit) via a1845466e0410a891db5ebeeae0c3131f2c6ad64 (commit) via 92f040d4669c5e3df5b8f3986e1667f00237c9d1 (commit) from a8fca1ed79b6e5173c14fdfff43ff5460f61ef68 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e5dcd6f21ed52d068336a662976fd0e893f639f1 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jul 4 14:55:02 2019 +0300 test: sched_perf: add wait option to simulate work Added -w option to simulate application work between schedule and queue enqueue calls. Wait is defined in nanoseconds. Wait time cycle consumption is measured and subtracted from test cycles for cycles per event result. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Suggested-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c index 54ee801d5..04d125be0 100644 --- a/test/performance/odp_sched_perf.c +++ b/test/performance/odp_sched_perf.c @@ -31,6 +31,7 @@ typedef struct test_options_t { uint32_t queue_size; uint32_t tot_queue; uint32_t tot_event; + uint64_t wait_ns; } test_options_t; @@ -40,6 +41,7 @@ typedef struct test_stat_t { uint64_t events; uint64_t nsec; uint64_t cycles; + uint64_t waits; } test_stat_t; @@ -85,6 +87,7 @@ static void print_usage(void) " -b, --burst Maximum number of events per operation. Default: 100.\n" " -t, --type Queue type. 0: parallel, 1: atomic, 2: ordered. Default: 0.\n" " -f, --forward 0: Keep event in the original queue, 1: Forward event to the next queue. Default: 0.\n" + " -w, --wait_ns Number of nsec to wait before enqueueing events. Default: 0.\n" " -h, --help This help\n" "\n"); } @@ -107,11 +110,12 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"burst", required_argument, NULL, 'b'}, {"type", required_argument, NULL, 't'}, {"forward", required_argument, NULL, 'f'}, + {"wait_ns", required_argument, NULL, 'w'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:q:d:e:r:g:j:b:t:f:h"; + static const char *shortopts = "+c:q:d:e:r:g:j:b:t:f:w:h"; test_options->num_cpu = 1; test_options->num_queue = 1; @@ -123,6 +127,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) test_options->max_burst = 100; test_options->queue_type = 0; test_options->forward = 0; + test_options->wait_ns = 0; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -161,6 +166,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'f': test_options->forward = atoi(optarg); break; + case 'w': + test_options->wait_ns = atoll(optarg); + break; case 'h': /* fall through */ default: @@ -265,6 +273,7 @@ static int create_pool(test_global_t *global) uint32_t num_group = test_options->num_group; uint32_t num_join = test_options->num_join; int forward = test_options->forward; + uint64_t wait_ns = test_options->wait_ns; printf("\nScheduler performance test\n"); printf(" num cpu %u\n", num_cpu); @@ -279,6 +288,7 @@ static int create_pool(test_global_t *global) printf(" total events %u\n", tot_event); printf(" num rounds %u\n", num_round); printf(" forward events %i\n", forward ? 1 : 0); + printf(" wait nsec %" PRIu64 "\n", wait_ns); if (odp_pool_capability(&pool_capa)) { printf("Error: Pool capa failed.\n"); @@ -548,7 +558,7 @@ static int test_sched(void *arg) int num, num_enq, ret, thr; uint32_t i, rounds; uint64_t c1, c2, cycles, nsec; - uint64_t events, enqueues; + uint64_t events, enqueues, waits; odp_time_t t1, t2; odp_queue_t queue; odp_queue_t *next; @@ -559,6 +569,7 @@ static int test_sched(void *arg) uint32_t max_burst = test_options->max_burst; uint32_t num_group = test_options->num_group; int forward = test_options->forward; + uint64_t wait_ns = test_options->wait_ns; odp_event_t ev[max_burst]; thr = odp_thread_id(); @@ -598,6 +609,7 @@ static int test_sched(void *arg) enqueues = 0; events = 0; + waits = 0; ret = 0; /* Start all workers at the same time */ @@ -619,6 +631,11 @@ static int test_sched(void *arg) queue = *next; } + if (odp_unlikely(wait_ns)) { + waits++; + odp_time_wait_ns(wait_ns); + } + while (num) { num_enq = odp_queue_enq_multi(queue, &ev[i], num); @@ -661,6 +678,7 @@ static int test_sched(void *arg) global->stat[thr].events = events; global->stat[thr].nsec = nsec; global->stat[thr].cycles = cycles; + global->stat[thr].waits = waits; /* Pause scheduling before thread exit */ odp_schedule_pause(); @@ -728,17 +746,51 @@ static int start_workers(test_global_t *global, odp_instance_t instance) return 0; } +static double measure_wait_time_cycles(uint64_t wait_ns) +{ + uint64_t i, c1, c2, diff; + uint64_t rounds; + double wait_cycles; + + if (wait_ns == 0) + return 0.0; + + /* Run measurement for 100msec or at least two times, so that effect + * from CPU frequency scaling is minimized. */ + rounds = (100 * ODP_TIME_MSEC_IN_NS) / wait_ns; + if (rounds == 0) + rounds = 2; + + c1 = odp_cpu_cycles(); + + for (i = 0; i < rounds; i++) + odp_time_wait_ns(wait_ns); + + c2 = odp_cpu_cycles(); + diff = odp_cpu_cycles_diff(c2, c1); + wait_cycles = (double)diff / rounds; + + printf("\nMeasured wait cycles: %.3f\n", wait_cycles); + + return wait_cycles; +} + static void print_stat(test_global_t *global) { int i, num; double rounds_ave, enqueues_ave, events_ave, nsec_ave, cycles_ave; + double waits_ave, wait_cycles, wait_cycles_ave; test_options_t *test_options = &global->test_options; int num_cpu = test_options->num_cpu; + uint64_t wait_ns = test_options->wait_ns; uint64_t rounds_sum = 0; uint64_t enqueues_sum = 0; uint64_t events_sum = 0; uint64_t nsec_sum = 0; uint64_t cycles_sum = 0; + uint64_t waits_sum = 0; + + wait_cycles = measure_wait_time_cycles(wait_ns); /* Averages */ for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) { @@ -747,6 +799,7 @@ static void print_stat(test_global_t *global) events_sum += global->stat[i].events; nsec_sum += global->stat[i].nsec; cycles_sum += global->stat[i].cycles; + waits_sum += global->stat[i].waits; } if (rounds_sum == 0) { @@ -759,6 +812,8 @@ static void print_stat(test_global_t *global) events_ave = events_sum / num_cpu; nsec_ave = nsec_sum / num_cpu; cycles_ave = cycles_sum / num_cpu; + waits_ave = waits_sum / num_cpu; + wait_cycles_ave = waits_ave * wait_cycles; num = 0; printf("\n"); @@ -788,6 +843,10 @@ static void print_stat(test_global_t *global) cycles_ave / rounds_ave); printf(" cycles per event: %.3f\n", cycles_ave / events_ave); + if (wait_ns) { + printf(" without wait_ns cycles: %.3f\n", + (cycles_ave - wait_cycles_ave) / events_ave); + } printf(" ave events received: %.3f\n", events_ave / rounds_ave); printf(" rounds per sec: %.3f M\n", commit 1a3f614126a1cf268f4829387642ab7111c63048 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jul 4 09:52:09 2019 +0300 test: sched_perf: allocate queues and threads into groups Implement queue and thread allocation into schedule groups. Spread all queues evenly into groups. Depending on the -j option, worker threads join either all groups (default) or only a portion of those. By default, ODP_SCHED_GROUP_ALL is used as before. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c index a65b064ef..54ee801d5 100644 --- a/test/performance/odp_sched_perf.c +++ b/test/performance/odp_sched_perf.c @@ -43,17 +43,23 @@ typedef struct test_stat_t { } test_stat_t; +typedef struct thread_arg_t { + void *global; + int first_group; + +} thread_arg_t; + typedef struct test_global_t { test_options_t test_options; - odp_schedule_config_t schedule_config; odp_barrier_t barrier; odp_pool_t pool; odp_cpumask_t cpumask; odp_queue_t queue[MAX_QUEUES]; odp_schedule_group_t group[MAX_GROUPS]; - odph_odpthread_t thread_tbl[ODP_THREAD_COUNT_MAX]; + odph_thread_t thread_tbl[ODP_THREAD_COUNT_MAX]; test_stat_t stat[ODP_THREAD_COUNT_MAX]; + thread_arg_t thread_arg[ODP_THREAD_COUNT_MAX]; } test_global_t; @@ -354,6 +360,7 @@ static int create_queues(test_global_t *global) uint32_t num_event = test_options->num_event; uint32_t queue_size = test_options->queue_size; uint32_t tot_queue = test_options->tot_queue; + uint32_t num_group = test_options->num_group; int type = test_options->queue_type; odp_pool_t pool = global->pool; @@ -391,6 +398,14 @@ static int create_queues(test_global_t *global) queue_param.size = queue_size; for (i = 0; i < tot_queue; i++) { + if (num_group) { + odp_schedule_group_t group; + + /* Divide all queues evenly into groups */ + group = global->group[i % num_group]; + queue_param.sched.group = group; + } + queue = odp_queue_create(NULL, &queue_param); global->queue[i] = queue; @@ -440,6 +455,44 @@ static int create_queues(test_global_t *global) return 0; } +static int join_group(test_global_t *global, int grp_index, int thr) +{ + odp_thrmask_t thrmask; + odp_schedule_group_t group; + + odp_thrmask_zero(&thrmask); + odp_thrmask_set(&thrmask, thr); + group = global->group[grp_index]; + + if (odp_schedule_group_join(group, &thrmask)) { + printf("Error: Group %i join failed (thr %i)\n", + grp_index, thr); + return -1; + } + + return 0; +} + +static int join_all_groups(test_global_t *global, int thr) +{ + uint32_t i; + test_options_t *test_options = &global->test_options; + uint32_t num_group = test_options->num_group; + + if (num_group == 0) + return 0; + + for (i = 0; i < num_group; i++) { + if (join_group(global, i, thr)) { + printf("Error: Group %u join failed (thr %i)\n", + i, thr); + return -1; + } + } + + return 0; +} + static int destroy_queues(test_global_t *global) { uint32_t i; @@ -447,6 +500,10 @@ static int destroy_queues(test_global_t *global) uint64_t wait; test_options_t *test_options = &global->test_options; uint32_t tot_queue = test_options->tot_queue; + int thr = odp_thread_id(); + + if (join_all_groups(global, thr)) + return -1; wait = odp_schedule_wait_time(200 * ODP_TIME_MSEC_IN_NS); @@ -495,15 +552,47 @@ static int test_sched(void *arg) odp_time_t t1, t2; odp_queue_t queue; odp_queue_t *next; - test_global_t *global = arg; + thread_arg_t *thread_arg = arg; + test_global_t *global = thread_arg->global; test_options_t *test_options = &global->test_options; uint32_t num_round = test_options->num_round; uint32_t max_burst = test_options->max_burst; + uint32_t num_group = test_options->num_group; int forward = test_options->forward; odp_event_t ev[max_burst]; thr = odp_thread_id(); + if (num_group) { + uint32_t num_join = test_options->num_join; + + if (num_join) { + int pos = 0; + int n = 512; + char str[n]; + int group_index = thread_arg->first_group; + + pos += snprintf(&str[pos], n - pos, + "Thread %i joined groups:", thr); + + for (i = 0; i < num_join; i++) { + if (join_group(global, group_index, thr)) + return -1; + + pos += snprintf(&str[pos], n - pos, " %i", + group_index); + + group_index = (group_index + 1) % num_group; + } + + printf("%s\n", str); + + } else { + if (join_all_groups(global, thr)) + return -1; + } + } + for (i = 0; i < max_burst; i++) ev[i] = ODP_EVENT_INVALID; @@ -595,19 +684,46 @@ static int test_sched(void *arg) static int start_workers(test_global_t *global, odp_instance_t instance) { - odph_odpthread_params_t thr_params; + odph_thread_common_param_t thr_common; + int i, ret; test_options_t *test_options = &global->test_options; - int num_cpu = test_options->num_cpu; + uint32_t num_group = test_options->num_group; + uint32_t num_join = test_options->num_join; + int num_cpu = test_options->num_cpu; + odph_thread_param_t thr_param[num_cpu]; + + memset(global->thread_tbl, 0, sizeof(global->thread_tbl)); + memset(thr_param, 0, sizeof(thr_param)); + memset(&thr_common, 0, sizeof(thr_common)); + + thr_common.instance = instance; + thr_common.cpumask = &global->cpumask; - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; - thr_params.start = test_sched; - thr_params.arg = global; + for (i = 0; i < num_cpu; i++) { + thr_param[i].start = test_sched; + thr_param[i].arg = &global->thread_arg[i]; + thr_param[i].thr_type = ODP_THREAD_WORKER; - if (odph_odpthreads_create(global->thread_tbl, &global->cpumask, - &thr_params) != num_cpu) + global->thread_arg[i].global = global; + global->thread_arg[i].first_group = 0; + + if (num_group && num_join) { + /* Each thread joins only num_join groups, starting + * from this group index and wraping around the group + * table. */ + int first_group = (i * num_join) % num_group; + + global->thread_arg[i].first_group = first_group; + } + } + + ret = odph_thread_create(global->thread_tbl, &thr_common, thr_param, + num_cpu); + + if (ret != num_cpu) { + printf("Error: thread create failed %i\n", ret); return -1; + } return 0; } @@ -645,6 +761,7 @@ static void print_stat(test_global_t *global) cycles_ave = cycles_sum / num_cpu; num = 0; + printf("\n"); printf("RESULTS - per thread (Million events per sec):\n"); printf("----------------------------------------------\n"); printf(" 1 2 3 4 5 6 7 8 9 10"); @@ -734,7 +851,7 @@ int main(int argc, char **argv) start_workers(global, instance); /* Wait workers to exit */ - odph_odpthreads_join(global->thread_tbl); + odph_thread_join(global->thread_tbl, global->test_options.num_cpu); if (destroy_queues(global)) return -1; commit a1845466e0410a891db5ebeeae0c3131f2c6ad64 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jul 3 15:51:54 2019 +0300 test: sched_perf: add schedule group options Added -g and -j options to test scheduling with a number of schedule groups. This patch adds only option handling and group create/destroy. Queues and threads are not yet allocated into new groups. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c index 3cc4630d5..a65b064ef 100644 --- a/test/performance/odp_sched_perf.c +++ b/test/performance/odp_sched_perf.c @@ -15,6 +15,7 @@ #include <odp/helper/odph_api.h> #define MAX_QUEUES (256 * 1024) +#define MAX_GROUPS 256 typedef struct test_options_t { uint32_t num_cpu; @@ -22,6 +23,8 @@ typedef struct test_options_t { uint32_t num_dummy; uint32_t num_event; uint32_t num_round; + uint32_t num_group; + uint32_t num_join; uint32_t max_burst; int queue_type; int forward; @@ -48,6 +51,7 @@ typedef struct test_global_t { odp_pool_t pool; odp_cpumask_t cpumask; odp_queue_t queue[MAX_QUEUES]; + odp_schedule_group_t group[MAX_GROUPS]; odph_odpthread_t thread_tbl[ODP_THREAD_COUNT_MAX]; test_stat_t stat[ODP_THREAD_COUNT_MAX]; @@ -67,6 +71,11 @@ static void print_usage(void) " -d, --num_dummy Number of empty queues. Default: 0.\n" " -e, --num_event Number of events per queue. Default: 100.\n" " -r, --num_round Number of rounds\n" + " -g, --num_group Number of schedule groups. Round robins threads and queues into groups.\n" + " 0: SCHED_GROUP_ALL (default)\n" + " -j, --num_join Number of groups a thread joins. Threads are divide evenly into groups,\n" + " if num_cpu is multiple of num_group and num_group is multiple of num_join.\n" + " 0: join all groups (default)\n" " -b, --burst Maximum number of events per operation. Default: 100.\n" " -t, --type Queue type. 0: parallel, 1: atomic, 2: ordered. Default: 0.\n" " -f, --forward 0: Keep event in the original queue, 1: Forward event to the next queue. Default: 0.\n" @@ -79,6 +88,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) int opt; int long_index; int ret = 0; + uint32_t num_group, num_join; static const struct option longopts[] = { {"num_cpu", required_argument, NULL, 'c'}, @@ -86,6 +96,8 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"num_dummy", required_argument, NULL, 'd'}, {"num_event", required_argument, NULL, 'e'}, {"num_round", required_argument, NULL, 'r'}, + {"num_group", required_argument, NULL, 'g'}, + {"num_join", required_argument, NULL, 'j'}, {"burst", required_argument, NULL, 'b'}, {"type", required_argument, NULL, 't'}, {"forward", required_argument, NULL, 'f'}, @@ -93,13 +105,15 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:q:d:e:r:b:t:f:h"; + static const char *shortopts = "+c:q:d:e:r:g:j:b:t:f:h"; test_options->num_cpu = 1; test_options->num_queue = 1; test_options->num_dummy = 0; test_options->num_event = 100; test_options->num_round = 100000; + test_options->num_group = 0; + test_options->num_join = 0; test_options->max_burst = 100; test_options->queue_type = 0; test_options->forward = 0; @@ -126,6 +140,12 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'r': test_options->num_round = atoi(optarg); break; + case 'g': + test_options->num_group = atoi(optarg); + break; + case 'j': + test_options->num_join = atoi(optarg); + break; case 'b': test_options->max_burst = atoi(optarg); break; @@ -145,11 +165,36 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) } if ((test_options->num_queue + test_options->num_dummy) > MAX_QUEUES) { - printf("Error: Too many queues. Max supported %i\n.", + printf("Error: Too many queues. Max supported %i.\n", MAX_QUEUES); ret = -1; } + num_group = test_options->num_group; + num_join = test_options->num_join; + if (num_group > MAX_GROUPS) { + printf("Error: Too many groups. Max supported %i.\n", + MAX_GROUPS); + ret = -1; + } + + if (num_join > num_group) { + printf("Error: num_join (%u) larger than num_group (%u).\n", + num_join, num_group); + ret = -1; + } + + if (num_join && num_group > (test_options->num_cpu * num_join)) { + printf("WARNING: Too many groups (%u). Some groups (%u) are not served.\n\n", + num_group, + num_group - (test_options->num_cpu * num_join)); + + if (test_options->forward) { + printf("Error: Cannot forward when some queues are not served.\n"); + ret = -1; + } + } + test_options->tot_queue = test_options->num_queue + test_options->num_dummy; test_options->tot_event = test_options->num_queue * @@ -211,6 +256,8 @@ static int create_pool(test_global_t *global) uint32_t tot_queue = test_options->tot_queue; uint32_t tot_event = test_options->tot_event; uint32_t queue_size = test_options->queue_size; + uint32_t num_group = test_options->num_group; + uint32_t num_join = test_options->num_join; int forward = test_options->forward; printf("\nScheduler performance test\n"); @@ -218,6 +265,8 @@ static int create_pool(test_global_t *global) printf(" num queues %u\n", num_queue); printf(" num empty queues %u\n", num_dummy); printf(" total queues %u\n", tot_queue); + printf(" num groups %u\n", num_group); + printf(" num join %u\n", num_join); printf(" events per queue %u\n", num_event); printf(" queue size %u\n", queue_size); printf(" max burst size %u\n", max_burst); @@ -253,6 +302,46 @@ static int create_pool(test_global_t *global) return 0; } +static int create_groups(test_global_t *global) +{ + odp_schedule_capability_t sched_capa; + odp_thrmask_t thrmask; + uint32_t i; + test_options_t *test_options = &global->test_options; + uint32_t num_group = test_options->num_group; + + if (num_group == 0) + return 0; + + if (odp_schedule_capability(&sched_capa)) { + printf("Error: schedule capability failed\n"); + return -1; + } + + if (num_group > sched_capa.max_groups) { + printf("Error: Too many sched groups (max_groups capa %u)\n", + sched_capa.max_groups); + return -1; + } + + odp_thrmask_zero(&thrmask); + + for (i = 0; i < num_group; i++) { + odp_schedule_group_t group; + + group = odp_schedule_group_create("test_group", &thrmask); + + if (group == ODP_SCHED_GROUP_INVALID) { + printf("Error: Group create failed %u\n", i); + return -1; + } + + global->group[i] = group; + } + + return 0; +} + static int create_queues(test_global_t *global) { odp_queue_param_t queue_param; @@ -376,6 +465,27 @@ static int destroy_queues(test_global_t *global) return 0; } +static int destroy_groups(test_global_t *global) +{ + uint32_t i; + test_options_t *test_options = &global->test_options; + uint32_t num_group = test_options->num_group; + + if (num_group == 0) + return 0; + + for (i = 0; i < num_group; i++) { + odp_schedule_group_t group = global->group[i]; + + if (odp_schedule_group_destroy(group)) { + printf("Error: Group destroy failed %u\n", i); + return -1; + } + } + + return 0; +} + static int test_sched(void *arg) { int num, num_enq, ret, thr; @@ -614,6 +724,9 @@ int main(int argc, char **argv) if (create_pool(global)) return -1; + if (create_groups(global)) + return -1; + if (create_queues(global)) return -1; @@ -626,6 +739,9 @@ int main(int argc, char **argv) if (destroy_queues(global)) return -1; + if (destroy_groups(global)) + return -1; + print_stat(global); if (odp_pool_destroy(global->pool)) { commit 92f040d4669c5e3df5b8f3986e1667f00237c9d1 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jul 3 15:02:13 2019 +0300 test: sched_perf: allocate dummy queues first When firstly created queues are dummy queues, usage of those shift active queues (IDs of active queues) which may have impact to scheduler performance. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c index 65cf63bb9..3cc4630d5 100644 --- a/test/performance/odp_sched_perf.c +++ b/test/performance/odp_sched_perf.c @@ -260,11 +260,10 @@ static int create_queues(test_global_t *global) odp_buffer_t buf; odp_schedule_sync_t sync; const char *type_str; - uint32_t i, j; + uint32_t i, j, first; test_options_t *test_options = &global->test_options; uint32_t num_event = test_options->num_event; uint32_t queue_size = test_options->queue_size; - uint32_t num_queue = test_options->num_queue; uint32_t tot_queue = test_options->tot_queue; int type = test_options->queue_type; odp_pool_t pool = global->pool; @@ -313,15 +312,19 @@ static int create_queues(test_global_t *global) } } - /* Store events into queues. Dummy queues are left empty. */ - for (i = 0; i < num_queue; i++) { + first = test_options->num_dummy; + + /* Store events into queues. Dummy queues are allocated from + * the beginning of the array, so that usage of those affect allocation + * of active queues. Dummy queues are left empty. */ + for (i = first; i < tot_queue; i++) { queue = global->queue[i]; if (test_options->forward) { uint32_t next = i + 1; - if (next == num_queue) - next = 0; + if (next == tot_queue) + next = first; if (odp_queue_context_set(queue, &global->queue[next], sizeof(odp_queue_t))) { ----------------------------------------------------------------------- Summary of changes: test/performance/odp_sched_perf.c | 339 +++++++++++++++++++++++++++++++++++--- 1 file changed, 317 insertions(+), 22 deletions(-) hooks/post-receive --

5 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-156-ga8fca1ed7

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via a8fca1ed79b6e5173c14fdfff43ff5460f61ef68 (commit) from 6d23501cc7d67d9903efcc2c288276b79eef5044 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a8fca1ed79b6e5173c14fdfff43ff5460f61ef68 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jul 3 11:22:42 2019 +0300 test: fix pool capability check Max_num capability value of zero means that only memory size limits the pool size. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_pool_perf.c b/test/performance/odp_pool_perf.c index d771e53e5..89cb109b2 100644 --- a/test/performance/odp_pool_perf.c +++ b/test/performance/odp_pool_perf.c @@ -148,6 +148,7 @@ static int create_pool(test_global_t *global) odp_pool_capability_t pool_capa; odp_pool_param_t pool_param; odp_pool_t pool; + uint32_t max_num; test_options_t *test_options = &global->test_options; uint32_t num_event = test_options->num_event; uint32_t num_round = test_options->num_round; @@ -165,8 +166,10 @@ static int create_pool(test_global_t *global) return -1; } - if (num_event > pool_capa.buf.max_num) { - printf("Max events supported %u\n", pool_capa.buf.max_num); + max_num = pool_capa.buf.max_num; + + if (max_num && num_event > max_num) { + printf("Error: max events supported %u\n", max_num); return -1; } diff --git a/test/performance/odp_queue_perf.c b/test/performance/odp_queue_perf.c index 80d0f1548..2c132ba6a 100644 --- a/test/performance/odp_queue_perf.c +++ b/test/performance/odp_queue_perf.c @@ -154,7 +154,7 @@ static int create_queues(test_global_t *global) odp_pool_param_t pool_param; odp_queue_param_t queue_param; odp_pool_t pool; - uint32_t i, j, max_size; + uint32_t i, j, max_size, max_num; test_options_t *test_options = &global->options; odp_nonblocking_t nonblock = test_options->nonblock; uint32_t num_queue = test_options->num_queue; @@ -243,8 +243,10 @@ static int create_queues(test_global_t *global) return -1; } - if (tot_event > pool_capa.buf.max_num) { - printf("Max events supported %u\n", pool_capa.buf.max_num); + max_num = pool_capa.buf.max_num; + + if (max_num && tot_event > max_num) { + printf("Error: max events supported %u\n", max_num); return -1; } diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c index c301263ef..65cf63bb9 100644 --- a/test/performance/odp_sched_perf.c +++ b/test/performance/odp_sched_perf.c @@ -200,6 +200,7 @@ static int create_pool(test_global_t *global) odp_pool_capability_t pool_capa; odp_pool_param_t pool_param; odp_pool_t pool; + uint32_t max_num; test_options_t *test_options = &global->test_options; uint32_t num_cpu = test_options->num_cpu; uint32_t num_queue = test_options->num_queue; @@ -229,8 +230,10 @@ static int create_pool(test_global_t *global) return -1; } - if (tot_event > pool_capa.buf.max_num) { - printf("Max events supported %u\n", pool_capa.buf.max_num); + max_num = pool_capa.buf.max_num; + + if (max_num && tot_event > max_num) { + printf("Error: max events supported %u\n", max_num); return -1; } ----------------------------------------------------------------------- Summary of changes: test/performance/odp_pool_perf.c | 7 +++++-- test/performance/odp_queue_perf.c | 8 +++++--- test/performance/odp_sched_perf.c | 7 +++++-- 3 files changed, 15 insertions(+), 7 deletions(-) hooks/post-receive --

5 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-155-g6d23501cc

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 6d23501cc7d67d9903efcc2c288276b79eef5044 (commit) via de7c1b2d50edf15815f8c908d09a5cffb1a4ae99 (commit) via 39c9f9f9d33ccebc2a371da45b7ac19d83ff4899 (commit) via fd0bfca978295d9a955e2034d7f2d6c937ce0403 (commit) via 94252435db7b5710be849454de3c6028c16fb0b9 (commit) via 01d0836470d4475db832ae5fe72bfc8b169ad079 (commit) via e9848f21aa601c6f37df574e8e3ce5da28ff58f7 (commit) from 6b581d0633209527f2fb3f63fcd5a4986f5c0891 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6d23501cc7d67d9903efcc2c288276b79eef5044 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 27 12:11:17 2019 +0300 travis: test build with lto Added test cases for GCC build with Link Time Optimization (LTO). Compiler checks code over multiple files simultaneously and thus finds more errors / warnings. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index 9fbc1e47e..e07fadf61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,10 @@ env: - CHECK=0 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print" - CHECK=0 OS=ubuntu_18.04 CONF="CFLAGS=-O3" - CHECK=0 OS=ubuntu_18.04 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print" + - CHECK=0 CONF="--enable-lto" + - CHECK=0 CONF="--enable-lto --disable-abi-compat" + - CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto" + - CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto --disable-abi-compat" - CHECK=0 ARCH=arm64 - CHECK=0 ARCH=armhf - CHECK=0 ARCH=powerpc @@ -85,6 +89,14 @@ matrix: env: CHECK=0 ARCH=arm64 - compiler: gcc env: CHECK=0 ARCH=i386 + - compiler: clang + env: CHECK=0 CONF="--enable-lto" + - compiler: clang + env: CHECK=0 CONF="--enable-lto --disable-abi-compat" + - compiler: clang + env: CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto" + - compiler: clang + env: CHECK=0 OS=ubuntu_18.04 CONF="--enable-lto --disable-abi-compat" install: - if [ ${NETMAP} -eq 1 ] ; then commit de7c1b2d50edf15815f8c908d09a5cffb1a4ae99 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 26 13:47:36 2019 +0300 configure: add --enable-lto option Added option to build with link time optimization (-flto flag). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/configure.ac b/configure.ac index 536999386..a90993e41 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,24 @@ AC_ARG_ENABLE([abi-compat], fi]) AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) +########################################################################## +# Enable/disable link time optimization +########################################################################## +lto_enabled=no +AC_ARG_ENABLE([lto], + [AS_HELP_STRING([--enable-lto], + [Enable Link Time Optimization (LTO) in compiler and linker])], + [if test "x$enableval" = "xyes"; then + lto_enabled=yes + # Fat LTO object file contains GIMPLE bytecodes and the usual + # final code. There are less build problems (e.g. due to older + # binutils), but object files are larger. + ODP_LTO_FLAGS="-flto -ffat-lto-objects" + fi]) +AC_SUBST(ODP_LTO_FLAGS) + +ODP_CFLAGS="$ODP_CFLAGS $ODP_LTO_FLAGS" + ########################################################################## # Determine which platform to build for ########################################################################## @@ -383,6 +401,7 @@ AC_SUBST(ODP_DEPRECATED_API) ########################################################################## CFLAGS="$CFLAGS $ODP_CFLAGS" CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" +LDFLAGS="$LDFLAGS $ODP_LTO_FLAGS" AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([include/Makefile @@ -436,7 +455,8 @@ AC_MSG_RESULT([ static libraries: ${enable_static} shared libraries: ${enable_shared} ABI compatible: ${abi_compat} - Deprecated APIs: ${deprecated} + link time optimization: ${lto_enabled} + deprecated APIs: ${deprecated} debug: ${enable_debug} cunit: ${cunit_support} static tests linkage: ${enable_static_applications} commit 39c9f9f9d33ccebc2a371da45b7ac19d83ff4899 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 26 15:59:46 2019 +0300 test: fix variable may be used uninitialized warnings Fix compiler warning: "X may be used uninitialized in this function". These warnings were found when building with link time optimization (-flto flag). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index 9b779e98c..c89e86d8d 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -519,6 +519,10 @@ static int bench_packet_alloc_free_multi(void) pkts = odp_packet_alloc_multi(gbl_args->pool, gbl_args->pkt.len, gbl_args->pkt_tbl, gbl_args->appl.burst_size); + + if (pkts < 0) + LOG_ABORT("Packet alloc failed\n"); + odp_packet_free_multi(gbl_args->pkt_tbl, pkts); } return i; commit fd0bfca978295d9a955e2034d7f2d6c937ce0403 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 26 15:59:05 2019 +0300 example: fix variable may be used uninitialized warnings Fix compiler warning: "X may be used uninitialized in this function". These warnings were found when building with link time optimization (-flto flag). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/example/ipfragreass/odp_ipfragreass_helpers.c b/example/ipfragreass/odp_ipfragreass_helpers.c index e7755f242..ac737fe44 100644 --- a/example/ipfragreass/odp_ipfragreass_helpers.c +++ b/example/ipfragreass/odp_ipfragreass_helpers.c @@ -20,9 +20,9 @@ static void set_random_payload(odp_packet_t packet, uint32_t payload_offset, uint32_t size) { uint32_t i, j; - uint32_t bytes_remaining; unsigned char *buffer; unsigned char seed = rand() % (UINT8_MAX + 1); + uint32_t bytes_remaining = 0; /* * Set the payload to a run of consecutive numbers from a random seed. @@ -99,11 +99,11 @@ int packet_memcmp(odp_packet_t a, odp_packet_t b, uint32_t offset_a, { uint32_t i = 0; void *data_a, *data_b; + uint32_t bytes_remaining_a = 0; + uint32_t bytes_remaining_b = 0; while (i < length) { int status; - uint32_t bytes_remaining_a; - uint32_t bytes_remaining_b; uint32_t bytes_remaining; data_a = odp_packet_offset(a, offset_a + i, &bytes_remaining_a, commit 94252435db7b5710be849454de3c6028c16fb0b9 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 26 13:46:16 2019 +0300 validation: fix variable may be used uninitialized warnings Fix compiler warning: "X may be used uninitialized in this function". These warnings were found when building with link time optimization (-flto flag). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c index 9b5d8ec0e..80eb9e3c4 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification/odp_classification_common.c @@ -180,8 +180,15 @@ int parse_ipv4_string(const char *ipaddress, uint32_t *addr, uint32_t *mask) void enqueue_pktio_interface(odp_packet_t pkt, odp_pktio_t pktio) { odp_pktout_queue_t pktout; + int ret; + + ret = odp_pktout_queue(pktio, &pktout, 1); + + if (ret != 1) { + CU_FAIL_FATAL("No pktout queue"); + return; + } - CU_ASSERT_FATAL(odp_pktout_queue(pktio, &pktout, 1) == 1); CU_ASSERT(odp_pktout_send(pktout, &pkt, 1) == 1); } diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 31776bd29..1b17f082e 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -398,6 +398,7 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa) { odp_event_t event; odp_ipsec_status_t status; + int ret; CU_ASSERT_EQUAL(IPSEC_SA_CTX, odp_ipsec_sa_context(sa)); @@ -410,12 +411,15 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa) CU_ASSERT_EQUAL(ODP_EVENT_IPSEC_STATUS, odp_event_type(event)); - CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_status(&status, event)); + ret = odp_ipsec_status(&status, event); + CU_ASSERT(ret == 0); - CU_ASSERT_EQUAL(ODP_IPSEC_STATUS_SA_DISABLE, status.id); - CU_ASSERT_EQUAL(sa, status.sa); - CU_ASSERT_EQUAL(0, status.result); - CU_ASSERT_EQUAL(0, status.warn.all); + if (ret == 0) { + CU_ASSERT_EQUAL(ODP_IPSEC_STATUS_SA_DISABLE, status.id); + CU_ASSERT_EQUAL(sa, status.sa); + CU_ASSERT_EQUAL(0, status.result); + CU_ASSERT_EQUAL(0, status.warn.all); + } odp_event_free(event); } @@ -570,11 +574,13 @@ static int ipsec_send_in_one(const ipsec_test_part *part, ODP_EVENT_PACKET_IPSEC); } } else { - odp_queue_t queue; odp_pktout_queue_t pktout; + odp_queue_t queue = ODP_QUEUE_INVALID; - CU_ASSERT_EQUAL_FATAL(1, odp_pktout_queue(suite_context.pktio, - &pktout, 1)); + if (odp_pktout_queue(suite_context.pktio, &pktout, 1) != 1) { + CU_FAIL_FATAL("No pktout queue"); + return 0; + } CU_ASSERT_EQUAL(1, odp_pktout_send(pktout, &pkt, 1)); CU_ASSERT_EQUAL_FATAL(1, @@ -662,9 +668,9 @@ static int ipsec_send_out_one(const ipsec_test_part *part, } } else { struct odp_ipsec_out_inline_param_t inline_param; - odp_queue_t queue; uint32_t hdr_len; uint8_t hdr[32]; + odp_queue_t queue = ODP_QUEUE_INVALID; if (NULL != part->out[0].pkt_out) { hdr_len = part->out[0].pkt_out->l3_offset; diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 0f019f6c9..352fa62c9 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -85,13 +85,16 @@ static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2, uint32_t len = odp_packet_len(pkt1); uint32_t offset = 0; uint32_t seglen1, seglen2, cmplen; + void *pkt1map, *pkt2map; int ret; CU_ASSERT_FATAL(len == odp_packet_len(pkt2)); while (len > 0) { - void *pkt1map = odp_packet_offset(pkt1, offset, &seglen1, NULL); - void *pkt2map = odp_packet_offset(pkt2, offset, &seglen2, NULL); + seglen1 = 0; + seglen2 = 0; + pkt1map = odp_packet_offset(pkt1, offset, &seglen1, NULL); + pkt2map = odp_packet_offset(pkt2, offset, &seglen2, NULL); CU_ASSERT_PTR_NOT_NULL_FATAL(pkt1map); CU_ASSERT_PTR_NOT_NULL_FATAL(pkt2map); @@ -787,7 +790,7 @@ static void packet_test_layer_offsets(void) { odp_packet_t pkt = test_packet; uint8_t *l2_addr, *l3_addr, *l4_addr; - uint32_t seg_len; + uint32_t seg_len = 0; const uint32_t l2_off = 2; const uint32_t l3_off = l2_off + 14; const uint32_t l4_off = l3_off + 14; @@ -1342,6 +1345,7 @@ static void _packet_compare_offset(odp_packet_t pkt1, uint32_t off1, odp_packet_t pkt2, uint32_t off2, uint32_t len, int line) { + void *pkt1map, *pkt2map; uint32_t seglen1, seglen2, cmplen; int ret; @@ -1350,8 +1354,10 @@ static void _packet_compare_offset(odp_packet_t pkt1, uint32_t off1, return; while (len > 0) { - void *pkt1map = odp_packet_offset(pkt1, off1, &seglen1, NULL); - void *pkt2map = odp_packet_offset(pkt2, off2, &seglen2, NULL); + seglen1 = 0; + seglen2 = 0; + pkt1map = odp_packet_offset(pkt1, off1, &seglen1, NULL); + pkt2map = odp_packet_offset(pkt2, off2, &seglen2, NULL); CU_ASSERT_PTR_NOT_NULL_FATAL(pkt1map); CU_ASSERT_PTR_NOT_NULL_FATAL(pkt2map); @@ -2221,9 +2227,9 @@ static void packet_test_offset(void) { odp_packet_t pkt = test_packet; uint32_t seg_len, full_seg_len; - odp_packet_seg_t seg; uint8_t *ptr, *start_ptr; uint32_t offset; + odp_packet_seg_t seg = ODP_PACKET_SEG_INVALID; ptr = odp_packet_offset(pkt, 0, &seg_len, &seg); CU_ASSERT(seg != ODP_PACKET_SEG_INVALID); diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 15f58e95a..ae7ccbb6b 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -550,12 +550,18 @@ static int get_packets(pktio_info_t *pktio_rx, odp_packet_t pkt_tbl[], odp_event_t evt_tbl[num]; int num_evts = 0; int num_pkts = 0; - int i; + int i, ret; if (pktio_rx->in_mode == ODP_PKTIN_MODE_DIRECT) { odp_pktin_queue_t pktin; - CU_ASSERT_FATAL(odp_pktin_queue(pktio_rx->id, &pktin, 1) == 1); + ret = odp_pktin_queue(pktio_rx->id, &pktin, 1); + + if (ret != 1) { + CU_FAIL_FATAL("No pktin queues"); + return -1; + } + return odp_pktin_recv(pktin, pkt_tbl, num); } @@ -837,7 +843,7 @@ static void test_txrx(odp_pktin_mode_t in_mode, int num_pkts, /* create pktios and associate input/output queues */ for (i = 0; i < num_ifaces; ++i) { odp_pktout_queue_t pktout; - odp_queue_t queue; + odp_queue_t queue = ODP_QUEUE_INVALID; odp_pktout_mode_t out_mode = ODP_PKTOUT_MODE_DIRECT; if (mode == TXRX_MODE_MULTI_EVENT) @@ -859,7 +865,6 @@ static void test_txrx(odp_pktin_mode_t in_mode, int num_pkts, CU_ASSERT_FATAL(odp_pktout_queue(io->id, &pktout, 1) == 1); io->pktout = pktout; - queue = ODP_QUEUE_INVALID; } io->queue_out = queue; diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index 0dbdd0ddf..c3def1b05 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -216,6 +216,7 @@ static void pool_test_info_packet(void) pool = odp_pool_create(pool_name, &param); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + memset(&info, 0, sizeof(odp_pool_info_t)); CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0); CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0); @@ -262,7 +263,8 @@ static void pool_test_info_data_range(void) for (i = 0; i < num; i++) { uintptr_t pkt_data, pkt_data_end; - uint32_t offset = 0, seg_len; + uint32_t offset = 0; + uint32_t seg_len = 0; uint32_t pkt_len = odp_packet_len(pkt[i]); while (offset < pkt_len) { diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index 9b9e73b71..f18957d24 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -648,8 +648,9 @@ static int get_ip_tos(odp_packet_t odp_pkt, uint8_t *tos_ptr) { odph_ipv4hdr_t *ipv4_hdr; odph_ipv6hdr_t *ipv6_hdr; - uint32_t hdr_len, ver_tc_flow; + uint32_t ver_tc_flow; uint8_t tos, tc; + uint32_t hdr_len = 0; if (odp_packet_has_ipv4(odp_pkt)) { ipv4_hdr = odp_packet_l3_ptr(odp_pkt, &hdr_len); @@ -2243,6 +2244,7 @@ static void check_threshold_profile(char *threshold_name, { odp_tm_threshold_params_t threshold_params; odp_tm_threshold_t profile; + int ret; profile = odp_tm_thresholds_lookup(threshold_name); CU_ASSERT(profile != ODP_TM_INVALID); @@ -2251,7 +2253,12 @@ static void check_threshold_profile(char *threshold_name, if (profile == threshold_profiles[threshold_idx - 1]) return; - odp_tm_thresholds_params_read(profile, &threshold_params); + ret = odp_tm_thresholds_params_read(profile, &threshold_params); + CU_ASSERT(ret == 0); + + if (ret) + return; + CU_ASSERT(threshold_params.max_pkts == threshold_idx * MIN_PKT_THRESHOLD); CU_ASSERT(threshold_params.max_bytes == @@ -2307,6 +2314,7 @@ static void check_wred_profile(char *wred_name, { odp_tm_wred_params_t wred_params; odp_tm_wred_t profile; + int ret; profile = odp_tm_wred_lookup(wred_name); CU_ASSERT(profile != ODP_TM_INVALID); @@ -2314,7 +2322,12 @@ static void check_wred_profile(char *wred_name, if (profile != wred_profiles[wred_idx - 1][color]) return; - odp_tm_wred_params_read(profile, &wred_params); + ret = odp_tm_wred_params_read(profile, &wred_params); + CU_ASSERT(ret == 0); + + if (ret) + return; + CU_ASSERT(wred_params.min_threshold == wred_idx * MIN_WRED_THRESH); CU_ASSERT(wred_params.med_threshold == wred_idx * MED_WRED_THRESH); CU_ASSERT(wred_params.med_drop_prob == wred_idx * MED_DROP_PROB); commit 01d0836470d4475db832ae5fe72bfc8b169ad079 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 26 15:57:43 2019 +0300 helper: fix variable may be used uninitialized warnings Fix compiler warning: "X may be used uninitialized in this function". These warnings were found when building with link time optimization (-flto flag). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/helper/chksum.c b/helper/chksum.c index 7c7c20a2f..c3e712421 100644 --- a/helper/chksum.c +++ b/helper/chksum.c @@ -106,9 +106,10 @@ static inline int odph_process_l4_hdr(odp_packet_t odp_pkt, odph_udphdr_t *udp_hdr_ptr; odph_tcphdr_t *tcp_hdr_ptr; odp_bool_t split_l4_hdr, is_tcp; - uint32_t l4_offset, l4_len, hdr_len, pkt_chksum_offset; + uint32_t l4_offset, l4_len, pkt_chksum_offset; uint16_t *pkt_chksum_ptr; uint8_t *l4_ptr; + uint32_t hdr_len = 0; /* Parse the TCP/UDP header. */ l4_offset = odp_packet_l4_offset(odp_pkt); @@ -185,9 +186,10 @@ static inline int odph_process_l3_hdr(odp_packet_t odp_pkt, odph_ipv6hdr_t *ipv6_hdr_ptr, ipv6_hdr; odp_bool_t split_l3_hdr; swap_buf_t swap_buf; - uint32_t l3_offset, l4_offset, l3_hdrs_len, hdr_len, addrs_len; + uint32_t l3_offset, l4_offset, l3_hdrs_len, addrs_len; uint32_t protocol, l3_len, l4_len, idx, ipv6_payload_len, sum; uint16_t *addrs_ptr; + uint32_t hdr_len = 0; /* The following computation using the l3 and l4 offsets handles both * the case of IPv4 options and IPv6 extension headers uniformly. */ @@ -271,11 +273,12 @@ int odph_udp_tcp_chksum(odp_packet_t odp_pkt, odph_l4_hdr_t udp_tcp_hdr; odp_bool_t split_l4_hdr, is_tcp, is_last; odp_bool_t has_odd_byte_in; - uint32_t l4_len, sum, ones_compl_sum, remaining_seg_len; + uint32_t l4_len, sum, ones_compl_sum; uint32_t data_len, pkt_chksum_offset, offset; uint16_t *pkt_chksum_ptr, chksum; uint8_t *data_ptr, odd_byte_in_out; int rc, ret_code; + uint32_t remaining_seg_len = 0; /* First parse and process the l4 header */ rc = odph_process_l4_hdr(odp_pkt, op, &udp_tcp_hdr, chksum_ptr, &l4_len, @@ -364,7 +367,7 @@ static uint32_t odph_packet_crc32c(odp_packet_t pkt, return sum; while (length > 0) { - uint32_t seg_len; + uint32_t seg_len = 0; void *data = odp_packet_offset(pkt, offset, &seg_len, NULL); if (seg_len > length) commit e9848f21aa601c6f37df574e8e3ce5da28ff58f7 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 26 13:41:15 2019 +0300 linux-gen: fix variable may be used uninitialized warnings Fix compiler warning: "X may be used uninitialized in this function". These warnings were found when building with link time optimization (-flto flag). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 8430d707c..cd1baa51a 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -1876,7 +1876,7 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, odp_pktout_queue_t pkqueue; if (odp_pktout_queue(inline_param[in_pkt].pktio, - &pkqueue, 1) < 0) { + &pkqueue, 1) <= 0) { status.error.alg = 1; goto err; } diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 1bf0469e7..bb3c46a7b 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1642,6 +1642,11 @@ int odp_pktin_event_queue(odp_pktio_t pktio, odp_queue_t queues[], int num) return -1; } + if (num < 0) { + ODP_DBG("Bad param: num %i\n", num); + return -1; + } + mode = entry->s.param.in_mode; if (mode == ODP_PKTIN_MODE_DISABLED) @@ -1653,8 +1658,11 @@ int odp_pktin_event_queue(odp_pktio_t pktio, odp_queue_t queues[], int num) num_queues = entry->s.num_in_queue; - if (queues && num > 0) { - for (i = 0; i < num && i < num_queues; i++) + if (queues) { + if (num_queues < num) + num = num_queues; + + for (i = 0; i < num; i++) queues[i] = entry->s.in_queue[i].queue; } @@ -1674,6 +1682,11 @@ int odp_pktin_queue(odp_pktio_t pktio, odp_pktin_queue_t queues[], int num) return -1; } + if (num < 0) { + ODP_DBG("Bad param: num %i\n", num); + return -1; + } + mode = entry->s.param.in_mode; if (mode == ODP_PKTIN_MODE_DISABLED) @@ -1684,8 +1697,11 @@ int odp_pktin_queue(odp_pktio_t pktio, odp_pktin_queue_t queues[], int num) num_queues = entry->s.num_in_queue; - if (queues && num > 0) { - for (i = 0; i < num && i < num_queues; i++) + if (queues) { + if (num_queues < num) + num = num_queues; + + for (i = 0; i < num; i++) queues[i] = entry->s.in_queue[i].pktin; } diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index d6d6d9ef6..a9e86cc56 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -777,7 +777,7 @@ static int poll_pktin(sched_elem_t *elem, odp_event_t ev[], int num_evts) /* For ordered queues only */ reorder_context_t *rctx; reorder_window_t *rwin = NULL; - uint32_t sn; + uint32_t sn = 0; uint32_t idx; if (is_ordered(elem)) { diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 23982dce0..19fdd7797 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -503,8 +503,8 @@ static void *tm_common_profile_create(const char *name, _odp_int_name_kind_t handle_kind; _odp_int_name_t name_tbl_id; tm_handle_t profile_handle; - uint32_t idx; void *object_ptr; + uint32_t idx = 0; /* Note that alloc_entry_in_tbl will zero out all of the memory that it * allocates, so an additional memset here is unnecessary. */ @@ -2052,8 +2052,8 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, _odp_vlanhdr_t vlan_hdr, *vlan_hdr_ptr; _odp_ethhdr_t *ether_hdr_ptr; odp_bool_t split_hdr; - uint32_t hdr_len; uint16_t old_tci, new_tci; + uint32_t hdr_len = 0; ether_hdr_ptr = odp_packet_l2_ptr(odp_pkt, &hdr_len); vlan_hdr_ptr = (_odp_vlanhdr_t *)(ether_hdr_ptr + 1); @@ -2091,8 +2091,9 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, { _odp_ipv4hdr_t ipv4_hdr, *ipv4_hdr_ptr; odp_bool_t split_hdr; - uint32_t hdr_len, l3_offset, old_chksum, ones_compl_sum, tos_diff; + uint32_t l3_offset, old_chksum, ones_compl_sum, tos_diff; uint8_t old_tos, new_tos, ecn; + uint32_t hdr_len = 0; l3_offset = odp_packet_l3_offset(odp_pkt); ipv4_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); @@ -2157,8 +2158,9 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, { _odp_ipv6hdr_t ipv6_hdr, *ipv6_hdr_ptr; odp_bool_t split_hdr; - uint32_t hdr_len, old_ver_tc_flow, new_ver_tc_flow, l3_offset; + uint32_t old_ver_tc_flow, new_ver_tc_flow, l3_offset; uint8_t old_tc, new_tc, ecn; + uint32_t hdr_len = 0; l3_offset = odp_packet_l3_offset(odp_pkt); ipv6_hdr_ptr = odp_packet_l3_ptr(odp_pkt, &hdr_len); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index cee97f2c4..cae838e83 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -442,10 +442,9 @@ static uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, uint32_t pkt_len = odp_packet_len(pkt); uint32_t offset = 0; uint32_t iov_count = 0; + uint32_t seglen = 0; while (offset < pkt_len) { - uint32_t seglen; - iovecs[iov_count].iov_base = odp_packet_offset(pkt, offset, &seglen, NULL); iovecs[iov_count].iov_len = seglen; ----------------------------------------------------------------------- Summary of changes: .travis.yml | 12 +++++++++++ configure.ac | 22 +++++++++++++++++++- example/ipfragreass/odp_ipfragreass_helpers.c | 6 +++--- helper/chksum.c | 11 ++++++---- platform/linux-generic/odp_ipsec.c | 2 +- platform/linux-generic/odp_packet_io.c | 24 ++++++++++++++++++---- platform/linux-generic/odp_schedule_scalable.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 10 +++++---- platform/linux-generic/pktio/socket.c | 3 +-- test/performance/odp_bench_packet.c | 4 ++++ .../api/classification/odp_classification_common.c | 9 +++++++- test/validation/api/ipsec/ipsec.c | 24 ++++++++++++++-------- test/validation/api/packet/packet.c | 18 ++++++++++------ test/validation/api/pktio/pktio.c | 13 ++++++++---- test/validation/api/pool/pool.c | 4 +++- test/validation/api/traffic_mngr/traffic_mngr.c | 19 ++++++++++++++--- 16 files changed, 139 insertions(+), 44 deletions(-) hooks/post-receive --

5 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-148-g6b581d063

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 6b581d0633209527f2fb3f63fcd5a4986f5c0891 (commit) via e2b2e2357d6999f62ccecdd5a34adefb7a8735fa (commit) from c317e53fa7268154ca5a50cc2685ca9cdf2a89d8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6b581d0633209527f2fb3f63fcd5a4986f5c0891 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 20 16:18:34 2019 +0300 configure: print CXXFLAGS In addition to CFLAGS print also CXXFLAGS after configure. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/configure.ac b/configure.ac index ab5393dbf..536999386 100644 --- a/configure.ac +++ b/configure.ac @@ -428,6 +428,7 @@ AC_MSG_RESULT([ cc version: ${CC_VERSION} cppflags: ${CPPFLAGS} cflags: ${CFLAGS} + cxxflags: ${CXXFLAGS} ld: ${LD} ldflags: ${LDFLAGS} libs: ${LIBS} commit e2b2e2357d6999f62ccecdd5a34adefb7a8735fa Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 20 16:13:34 2019 +0300 configure: default CFLAGS definition If user defines CFLAGS do not add -march option as user defined flags may contain another -march or other related options. Automake sets CFLAGS to "-g -O2" by default, so CFLAGS check must to be done before AM_INIT. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/configure.ac b/configure.ac index 8f9de1489..ab5393dbf 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,13 @@ AC_SUBST(ODPH_VERSION_MAJOR) ODPH_VERSION_MINOR=odph_version_minor AC_SUBST(ODPH_VERSION_MINOR) +########################################################################## +# Test if user has set CFLAGS. Automake initializes CFLAGS to "-g -O2" +# by default. +########################################################################## +AS_IF([test "$ac_cv_env_CFLAGS_set" = ""], [user_cflags=0], [user_cflags=1]) + +# Initialize automake AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc -Wall -Werror]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) AM_CONFIG_HEADER([include/config.h]) @@ -216,12 +223,16 @@ AC_ARG_ENABLE([abi-compat], [if test "x$enableval" = "xno"; then ODP_ABI_COMPAT=0 abi_compat=no + #if there is no ABI compatibility the .so numbers are meaningless ODP_LIBSO_VERSION=0:0:0 - # do not try -march=native for clang due to possible failures on - # clang optimizations + + # do not use -march=native with clang (due to possible failures on + # clang optimizations) or when user have defined CFLAGS (may contain + # another -march option). $CC --version | grep -q clang - if test $? -ne 0; then + + if test $? -ne 0 -a $user_cflags -eq 0; then ODP_CHECK_CFLAG([-march=native]) fi fi]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) hooks/post-receive --

5 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-146-gc317e53fa

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via c317e53fa7268154ca5a50cc2685ca9cdf2a89d8 (commit) via 5a57b8d273a8325418b536fdc01ba745383c3473 (commit) via 6b86d7138744731f30cab9b8a24bddb34a83941c (commit) via afe842d93388ddf461e6af3ab3a8d5a252f0094e (commit) via 3d618f4324066cc93ce271665e6d5c7b593a5b7e (commit) via 4505a83d3f7bbda476f629765be67834e5f268eb (commit) via 7fb84a671f571d462f63f08c447c79d856426d0f (commit) via 7bd3ad1f4d8ec2f2dbb49da08031e8a0f1219b4c (commit) via 99040617d930f25c2c130cfdf723b7f3fa0be28e (commit) via 159da2538ea888a04caea621d5a8dc4f5ab6e2b7 (commit) via e2dcc95d50f850a8a703d1d0449f4875eda40e76 (commit) from 56834f66e317f4bf941de808cb6529bad3d3baa6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c317e53fa7268154ca5a50cc2685ca9cdf2a89d8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 13 09:22:21 2019 +0300 test: ipsec: run ipsec example in make check Run ipsec examples under linux-generic platform specific test cases, as these examples assume that loop1 and loop2 interfaces are available. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 786507afd..f4b150d28 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_ipsec -dist_bin_SCRIPTS = \ +dist_check_SCRIPTS = \ odp_ipsec_run_ah_in.sh \ odp_ipsec_run_ah_out.sh \ odp_ipsec_run_both_in.sh \ diff --git a/example/ipsec/odp_ipsec_run_esp_out.sh b/example/ipsec/odp_ipsec_run_esp_out.sh index b5a541eda..f8645f0fb 100755 --- a/example/ipsec/odp_ipsec_run_esp_out.sh +++ b/example/ipsec/odp_ipsec_run_esp_out.sh @@ -4,10 +4,15 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -./odp_ipsec -i loop1,loop2 \ + +if [ -z "$IPSEC_EXAMPLE_PATH" ]; then +IPSEC_EXAMPLE_PATH=. +fi + +${IPSEC_EXAMPLE_PATH}/odp_ipsec -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ 3des:201:656c8523255ccc23a66c1917aa0cf30991fce83532a4b224 \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ --c 2 -m $1 +-c 2 "$@" diff --git a/example/ipsec/odp_ipsec_run_simple.sh b/example/ipsec/odp_ipsec_run_simple.sh index 462279161..3c3710f5f 100755 --- a/example/ipsec/odp_ipsec_run_simple.sh +++ b/example/ipsec/odp_ipsec_run_simple.sh @@ -4,7 +4,12 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -./odp_ipsec -i loop1,loop2 \ + +if [ -z "$IPSEC_EXAMPLE_PATH" ]; then +IPSEC_EXAMPLE_PATH=. +fi + +${IPSEC_EXAMPLE_PATH}/odp_ipsec -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ --c 2 -m $1 +-c 2 "$@" diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index daeb779fb..f2ffe995a 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -13,9 +13,12 @@ if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ validation/api/shmem/shmem_linux$(EXEEXT) \ - ipsec/ipsec_api_example.sh + ipsec/ipsec_api_example.sh \ + ipsec/ipsec_example.sh + +dist_check_SCRIPTS = ipsec/ipsec_api_example.sh \ + ipsec/ipsec_example.sh -dist_check_SCRIPTS = ipsec/ipsec_api_example.sh test_SCRIPTS = $(dist_check_SCRIPTS) SUBDIRS += validation/api/pktio\ diff --git a/platform/linux-generic/test/ipsec/ipsec_example.sh b/platform/linux-generic/test/ipsec/ipsec_example.sh new file mode 100755 index 000000000..e38350c03 --- /dev/null +++ b/platform/linux-generic/test/ipsec/ipsec_example.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# +# Copyright (c) 2019, Nokia +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# Skip IPsec example tests when there's no OpenSSL. +if [ -n "$WITH_OPENSSL" ] && [ ${WITH_OPENSSL} -eq 0 ]; then +echo "Crypto not supported. Skipping." +exit 77 +fi + +# Absolute path to the example binary. This is needed during distcheck, which +# keeps scripts and binaries in different directories (scripts are not copied +# into the distribution directory). +export IPSEC_EXAMPLE_PATH=$(pwd)/../../../example/ipsec + +declare -i RESULT=0 + +pushd $(dirname $0)/../../../../example/ipsec + +./odp_ipsec_run_simple.sh +RESULT+=$? + +./odp_ipsec_run_esp_out.sh +RESULT+=$? + +popd + +exit ${RESULT} commit 5a57b8d273a8325418b536fdc01ba745383c3473 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jun 7 11:11:52 2019 +0300 test: ipsec: run ipsec_api example in make check Run ipsec examples under linux-generic platform specific test cases, as these examples assume that loop1 and loop2 interfaces are available. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 8f81e3233..16b1fbfd0 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -2,18 +2,18 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_ipsec_api -dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_api_run_ah_in.sh \ - $(srcdir)/odp_ipsec_api_run_ah_out.sh \ - $(srcdir)/odp_ipsec_api_run_ah_tun_in.sh \ - $(srcdir)/odp_ipsec_api_run_ah_tun_out.sh \ - $(srcdir)/odp_ipsec_api_run_esp_in.sh \ - $(srcdir)/odp_ipsec_api_run_esp_out.sh \ - $(srcdir)/odp_ipsec_api_run_esp_tun_in.sh \ - $(srcdir)/odp_ipsec_api_run_esp_tun_out.sh \ - $(srcdir)/odp_ipsec_api_run_live.sh \ - $(srcdir)/odp_ipsec_api_run_router.sh \ - $(srcdir)/odp_ipsec_api_run_simple.sh +dist_check_SCRIPTS = \ + odp_ipsec_api_run_ah_in.sh \ + odp_ipsec_api_run_ah_out.sh \ + odp_ipsec_api_run_ah_tun_in.sh \ + odp_ipsec_api_run_ah_tun_out.sh \ + odp_ipsec_api_run_esp_in.sh \ + odp_ipsec_api_run_esp_out.sh \ + odp_ipsec_api_run_esp_tun_in.sh \ + odp_ipsec_api_run_esp_tun_out.sh \ + odp_ipsec_api_run_live.sh \ + odp_ipsec_api_run_router.sh \ + odp_ipsec_api_run_simple.sh odp_ipsec_api_SOURCES = \ odp_ipsec.c \ diff --git a/example/ipsec_api/odp_ipsec_api_run_esp_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh index d5dc6e0e6..e846dfbec 100755 --- a/example/ipsec_api/odp_ipsec_api_run_esp_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh @@ -4,7 +4,12 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -./odp_ipsec_api -i loop1,loop2 \ + +if [ -z "$IPSEC_EXAMPLE_PATH" ]; then +IPSEC_EXAMPLE_PATH=. +fi + +${IPSEC_EXAMPLE_PATH}/odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_api_run_simple.sh b/example/ipsec_api/odp_ipsec_api_run_simple.sh index e1698bd2b..8b9b9d7b9 100755 --- a/example/ipsec_api/odp_ipsec_api_run_simple.sh +++ b/example/ipsec_api/odp_ipsec_api_run_simple.sh @@ -4,7 +4,12 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -./odp_ipsec_api -i loop1,loop2 \ + +if [ -z "$IPSEC_EXAMPLE_PATH" ]; then +IPSEC_EXAMPLE_PATH=. +fi + +${IPSEC_EXAMPLE_PATH}/odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ -c 2 "$@" diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 03a1474da..daeb779fb 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -1,12 +1,22 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +if WITH_OPENSSL +TESTS_ENVIRONMENT += WITH_OPENSSL=1 +else +TESTS_ENVIRONMENT += WITH_OPENSSL=0 +endif + SUBDIRS = if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ - validation/api/shmem/shmem_linux$(EXEEXT) + validation/api/shmem/shmem_linux$(EXEEXT) \ + ipsec/ipsec_api_example.sh + +dist_check_SCRIPTS = ipsec/ipsec_api_example.sh +test_SCRIPTS = $(dist_check_SCRIPTS) SUBDIRS += validation/api/pktio\ validation/api/shmem\ diff --git a/platform/linux-generic/test/ipsec/ipsec_api_example.sh b/platform/linux-generic/test/ipsec/ipsec_api_example.sh new file mode 100755 index 000000000..82fd193d9 --- /dev/null +++ b/platform/linux-generic/test/ipsec/ipsec_api_example.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# +# Copyright (c) 2019, Nokia +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# Skip IPsec example tests when there's no OpenSSL. +if [ -n "$WITH_OPENSSL" ] && [ ${WITH_OPENSSL} -eq 0 ]; then +echo "Crypto not supported. Skipping." +exit 77 +fi + +# Absolute path to the example binary. This is needed during distcheck, which +# keeps scripts and binaries in different directories (scripts are not copied +# into the distribution directory). +export IPSEC_EXAMPLE_PATH=$(pwd)/../../../example/ipsec_api + +declare -i RESULT=0 + +pushd $(dirname $0)/../../../../example/ipsec_api + +./odp_ipsec_api_run_simple.sh +RESULT+=$? + +./odp_ipsec_api_run_esp_out.sh +RESULT+=$? + +popd + +exit ${RESULT} commit 6b86d7138744731f30cab9b8a24bddb34a83941c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 6 15:05:45 2019 +0300 example: ipsec: rename scripts with .sh postfix Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 67b5a6f5d..786507afd 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -3,15 +3,15 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ - odp_ipsec_run_ah_in \ - odp_ipsec_run_ah_out \ - odp_ipsec_run_both_in \ - odp_ipsec_run_both_out \ - odp_ipsec_run_esp_in \ - odp_ipsec_run_esp_out \ - odp_ipsec_run_live \ - odp_ipsec_run_router \ - odp_ipsec_run_simple + odp_ipsec_run_ah_in.sh \ + odp_ipsec_run_ah_out.sh \ + odp_ipsec_run_both_in.sh \ + odp_ipsec_run_both_out.sh \ + odp_ipsec_run_esp_in.sh \ + odp_ipsec_run_esp_out.sh \ + odp_ipsec_run_live.sh \ + odp_ipsec_run_router.sh \ + odp_ipsec_run_simple.sh odp_ipsec_SOURCES = odp_ipsec.c \ odp_ipsec_sa_db.c \ diff --git a/example/ipsec/odp_ipsec_run_ah_in b/example/ipsec/odp_ipsec_run_ah_in.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_ah_in rename to example/ipsec/odp_ipsec_run_ah_in.sh diff --git a/example/ipsec/odp_ipsec_run_ah_out b/example/ipsec/odp_ipsec_run_ah_out.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_ah_out rename to example/ipsec/odp_ipsec_run_ah_out.sh diff --git a/example/ipsec/odp_ipsec_run_both_in b/example/ipsec/odp_ipsec_run_both_in.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_both_in rename to example/ipsec/odp_ipsec_run_both_in.sh diff --git a/example/ipsec/odp_ipsec_run_both_out b/example/ipsec/odp_ipsec_run_both_out.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_both_out rename to example/ipsec/odp_ipsec_run_both_out.sh diff --git a/example/ipsec/odp_ipsec_run_esp_in b/example/ipsec/odp_ipsec_run_esp_in.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_esp_in rename to example/ipsec/odp_ipsec_run_esp_in.sh diff --git a/example/ipsec/odp_ipsec_run_esp_out b/example/ipsec/odp_ipsec_run_esp_out.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_esp_out rename to example/ipsec/odp_ipsec_run_esp_out.sh diff --git a/example/ipsec/odp_ipsec_run_live b/example/ipsec/odp_ipsec_run_live.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_live rename to example/ipsec/odp_ipsec_run_live.sh diff --git a/example/ipsec/odp_ipsec_run_router b/example/ipsec/odp_ipsec_run_router.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_router rename to example/ipsec/odp_ipsec_run_router.sh diff --git a/example/ipsec/odp_ipsec_run_simple b/example/ipsec/odp_ipsec_run_simple.sh similarity index 100% rename from example/ipsec/odp_ipsec_run_simple rename to example/ipsec/odp_ipsec_run_simple.sh commit afe842d93388ddf461e6af3ab3a8d5a252f0094e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 5 15:07:34 2019 +0300 example: ipsec: fix script path to binary Binaries are not in PATH, so need to use ./ prefix. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/odp_ipsec_run_ah_in b/example/ipsec/odp_ipsec_run_ah_in index 252f44bfd..5ff168760 100755 --- a/example/ipsec/odp_ipsec_run_ah_in +++ b/example/ipsec/odp_ipsec_run_ah_in @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +./odp_ipsec -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec/odp_ipsec_run_ah_out b/example/ipsec/odp_ipsec_run_ah_out index 9256c0723..53ddd2fb1 100755 --- a/example/ipsec/odp_ipsec_run_ah_out +++ b/example/ipsec/odp_ipsec_run_ah_out @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +./odp_ipsec -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec/odp_ipsec_run_both_in b/example/ipsec/odp_ipsec_run_both_in index c3f169cec..502f14a7d 100755 --- a/example/ipsec/odp_ipsec_run_both_in +++ b/example/ipsec/odp_ipsec_run_both_in @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +./odp_ipsec -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:both \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec/odp_ipsec_run_both_out b/example/ipsec/odp_ipsec_run_both_out index 8ba067223..3086e6f12 100755 --- a/example/ipsec/odp_ipsec_run_both_out +++ b/example/ipsec/odp_ipsec_run_both_out @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +./odp_ipsec -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:both \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec/odp_ipsec_run_esp_in b/example/ipsec/odp_ipsec_run_esp_in index 12fdae691..a206cc401 100755 --- a/example/ipsec/odp_ipsec_run_esp_in +++ b/example/ipsec/odp_ipsec_run_esp_in @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +./odp_ipsec -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec/odp_ipsec_run_esp_out b/example/ipsec/odp_ipsec_run_esp_out index 73c4ff0ef..b5a541eda 100755 --- a/example/ipsec/odp_ipsec_run_esp_out +++ b/example/ipsec/odp_ipsec_run_esp_out @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +./odp_ipsec -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec/odp_ipsec_run_live b/example/ipsec/odp_ipsec_run_live index 90947ad7e..f61d4e38f 100755 --- a/example/ipsec/odp_ipsec_run_live +++ b/example/ipsec/odp_ipsec_run_live @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo ./odp_ipsec -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:both \ diff --git a/example/ipsec/odp_ipsec_run_router b/example/ipsec/odp_ipsec_run_router index 363029737..55ad766f5 100755 --- a/example/ipsec/odp_ipsec_run_router +++ b/example/ipsec/odp_ipsec_run_router @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo ./odp_ipsec -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -c 1 -m $1 diff --git a/example/ipsec/odp_ipsec_run_simple b/example/ipsec/odp_ipsec_run_simple index 12115838d..462279161 100755 --- a/example/ipsec/odp_ipsec_run_simple +++ b/example/ipsec/odp_ipsec_run_simple @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +./odp_ipsec -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ -c 2 -m $1 diff --git a/example/ipsec_api/odp_ipsec_api_run_ah_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh index becfc8928..4f92849b2 100755 --- a/example/ipsec_api/odp_ipsec_api_run_ah_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_api_run_ah_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh index 023809a18..67dff4c32 100755 --- a/example/ipsec_api/odp_ipsec_api_run_ah_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh index 40c488f04..fa33f260c 100755 --- a/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh index d7118586f..acc25e8b2 100755 --- a/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_api_run_esp_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh index cdb302ef4..d71c6f567 100755 --- a/example/ipsec_api/odp_ipsec_api_run_esp_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_api_run_esp_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh index f1c15ffee..d5dc6e0e6 100755 --- a/example/ipsec_api/odp_ipsec_api_run_esp_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh index 5d78479e4..def6f6abd 100755 --- a/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh index f1c15ffee..d5dc6e0e6 100755 --- a/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_api_run_live.sh b/example/ipsec_api/odp_ipsec_api_run_live.sh index 9bc0a60f3..4a455ba85 100755 --- a/example/ipsec_api/odp_ipsec_api_run_live.sh +++ b/example/ipsec_api/odp_ipsec_api_run_live.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec_api -i p7p1,p8p1 \ +sudo ./odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:both \ diff --git a/example/ipsec_api/odp_ipsec_api_run_router.sh b/example/ipsec_api/odp_ipsec_api_run_router.sh index 982a27e97..34573d47f 100755 --- a/example/ipsec_api/odp_ipsec_api_run_router.sh +++ b/example/ipsec_api/odp_ipsec_api_run_router.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec_api -i p7p1,p8p1 \ +sudo ./odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -c 1 "$@" diff --git a/example/ipsec_api/odp_ipsec_api_run_simple.sh b/example/ipsec_api/odp_ipsec_api_run_simple.sh index bdc2777c9..e1698bd2b 100755 --- a/example/ipsec_api/odp_ipsec_api_run_simple.sh +++ b/example/ipsec_api/odp_ipsec_api_run_simple.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec_api -i loop1,loop2 \ +./odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ -c 2 "$@" commit 3d618f4324066cc93ce271665e6d5c7b593a5b7e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Jun 18 10:28:09 2019 +0300 example: ipsec: rename schedule function pointer Rename function pointer to schedule_fn. When the name differs from other schedule definitions it's easier to find references to it and code is more readable. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 96c0fe613..1c26e405c 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -242,7 +242,7 @@ typedef odp_queue_t (*queue_create_func_t) typedef odp_event_t (*schedule_func_t) (odp_queue_t *); static queue_create_func_t queue_create; -static schedule_func_t schedule; +static schedule_func_t schedule_fn; /** * odp_queue_create wrapper to enable polling versus scheduling @@ -1062,7 +1062,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) odp_event_subtype_t subtype; /* Use schedule to get event from any input queue */ - ev = schedule(&dispatchq); + ev = schedule_fn(&dispatchq); if (ev == ODP_EVENT_INVALID) continue; @@ -1211,12 +1211,12 @@ main(int argc, char *argv[]) /* create by default scheduled queues */ queue_create = odp_queue_create; - schedule = odp_schedule_cb; + schedule_fn = odp_schedule_cb; /* check for using poll queues */ if (getenv("ODP_IPSEC_USE_POLL_QUEUES")) { queue_create = polled_odp_queue_create; - schedule = polled_odp_schedule_cb; + schedule_fn = polled_odp_schedule_cb; } /* Let helper collect its own arguments (e.g. --odph_proc) */ diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index 73f5be19f..fa977db8e 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -193,7 +193,7 @@ typedef odp_queue_t (*queue_create_func_t) typedef odp_event_t (*schedule_func_t) (odp_queue_t *); static queue_create_func_t queue_create; -static schedule_func_t schedule; +static schedule_func_t schedule_fn; /** * odp_queue_create wrapper to enable polling versus scheduling @@ -744,7 +744,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) odp_event_subtype_t subtype; /* Use schedule to get event from any input queue */ - ev = schedule(&dispatchq); + ev = schedule_fn(&dispatchq); if (ev == ODP_EVENT_INVALID) continue; @@ -905,12 +905,12 @@ main(int argc, char *argv[]) /* create by default scheduled queues */ queue_create = odp_queue_create; - schedule = odp_schedule_cb; + schedule_fn = odp_schedule_cb; /* check for using poll queues */ if (getenv("ODP_IPSEC_USE_POLL_QUEUES")) { queue_create = polled_odp_queue_create; - schedule = polled_odp_schedule_cb; + schedule_fn = polled_odp_schedule_cb; } /* Let helper collect its own arguments (e.g. --odph_proc) */ @@ -1076,7 +1076,7 @@ main(int argc, char *argv[]) /* Drop any remaining events. ipsec_sa_disable sends status event in * async mode */ - while ((ev = schedule(NULL)) != ODP_EVENT_INVALID) + while ((ev = schedule_fn(NULL)) != ODP_EVENT_INVALID) odp_event_free(ev); if (odp_queue_destroy(global->completionq)) commit 4505a83d3f7bbda476f629765be67834e5f268eb Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Jun 17 14:54:26 2019 +0300 example: ipsec_api: exit workers and destroy resources Modified worker main loop to exit when the main thread commands. Clean up resources before exiting. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index b73cfe90f..73f5be19f 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -96,6 +96,7 @@ typedef struct { odp_barrier_t sync_barrier; odp_queue_t poll_queues[MAX_POLL_QUEUES]; int num_polled_queues; + volatile int stop_workers; } global_data_t; /* helper funcs */ @@ -230,7 +231,7 @@ odp_queue_t polled_odp_queue_create(const char *name, static inline odp_event_t odp_schedule_cb(odp_queue_t *from) { - return odp_schedule(from, ODP_SCHED_WAIT); + return odp_schedule(from, ODP_SCHED_NO_WAIT); } /** @@ -241,22 +242,23 @@ odp_event_t polled_odp_schedule_cb(odp_queue_t *from) { int idx = 0; - while (1) { - if (idx >= global->num_polled_queues) - idx = 0; - + while (idx < global->num_polled_queues) { odp_queue_t queue = global->poll_queues[idx++]; - odp_event_t buf; + odp_event_t ev; + + ev = odp_queue_deq(queue); - buf = odp_queue_deq(queue); + if (ODP_EVENT_INVALID != ev) { + if (from) + *from = queue; - if (ODP_EVENT_INVALID != buf) { - *from = queue; - return buf; + return ev; } } - *from = ODP_QUEUE_INVALID; + if (from) + *from = ODP_QUEUE_INVALID; + return ODP_EVENT_INVALID; } @@ -735,7 +737,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) odp_barrier_wait(&global->sync_barrier); /* Loop packets */ - for (;;) { + while (global->stop_workers == 0) { pkt_disposition_e rc = PKT_CONTINUE; pkt_ctx_t *ctx; odp_queue_t dispatchq; @@ -744,6 +746,9 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) /* Use schedule to get event from any input queue */ ev = schedule(&dispatchq); + if (ev == ODP_EVENT_INVALID) + continue; + /* Determine new work versus completion or sequence number */ if (ODP_EVENT_PACKET == odp_event_types(ev, &subtype)) { pkt = odp_packet_from_event(ev); @@ -875,7 +880,6 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) } } - /* unreachable */ return 0; } @@ -897,6 +901,7 @@ main(int argc, char *argv[]) odp_instance_t instance; odp_init_t init_param; odph_odpthread_params_t thr_params; + odp_event_t ev; /* create by default scheduled queues */ queue_create = odp_queue_create; @@ -1022,6 +1027,7 @@ main(int argc, char *argv[]) /* * Create and init worker threads */ + memset(thread_tbl, 0, sizeof(thread_tbl)); memset(&thr_params, 0, sizeof(thr_params)); thr_params.start = pktio_thread; thr_params.arg = NULL; @@ -1041,10 +1047,13 @@ main(int argc, char *argv[]) sleep(1); } while (!done); printf("All received\n"); - } else { - odph_odpthreads_join(thread_tbl); } + global->stop_workers = 1; + odp_mb_full(); + + odph_odpthreads_join(thread_tbl); + /* Stop and close used pktio devices */ for (i = 0; i < global->appl.if_count; i++) { odp_pktio_t pktio = odp_pktio_lookup(global->appl.if_names[i]); @@ -1062,6 +1071,22 @@ main(int argc, char *argv[]) free(global->appl.if_names); free(global->appl.if_str); + if (destroy_ipsec_cache()) + EXAMPLE_ERR("Error: crypto session destroy failed\n"); + + /* Drop any remaining events. ipsec_sa_disable sends status event in + * async mode */ + while ((ev = schedule(NULL)) != ODP_EVENT_INVALID) + odp_event_free(ev); + + if (odp_queue_destroy(global->completionq)) + EXAMPLE_ERR("Error: queue destroy failed\n"); + + if (odp_pool_destroy(global->pkt_pool)) + EXAMPLE_ERR("Error: pool destroy failed\n"); + if (odp_pool_destroy(global->ctx_pool)) + EXAMPLE_ERR("Error: pool destroy failed\n"); + shm = odp_shm_lookup("shm_ipsec_cache"); if (odp_shm_free(shm) != 0) EXAMPLE_ERR("Error: shm free shm_ipsec_cache failed\n"); @@ -1085,6 +1110,16 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } + if (odp_term_local()) { + EXAMPLE_ERR("Error: term local failed\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + EXAMPLE_ERR("Error: term global failed\n"); + exit(EXIT_FAILURE); + } + printf("Exit\n\n"); return 0; diff --git a/example/ipsec_api/odp_ipsec_cache.c b/example/ipsec_api/odp_ipsec_cache.c index 3a28410eb..e408899ac 100644 --- a/example/ipsec_api/odp_ipsec_cache.c +++ b/example/ipsec_api/odp_ipsec_cache.c @@ -21,6 +21,7 @@ ipsec_cache_t *ipsec_cache; void init_ipsec_cache(void) { odp_shm_t shm; + int i; shm = odp_shm_reserve("shm_ipsec_cache", sizeof(ipsec_cache_t), @@ -39,6 +40,9 @@ void init_ipsec_cache(void) exit(EXIT_FAILURE); } memset(ipsec_cache, 0, sizeof(*ipsec_cache)); + + for (i = 0; i < MAX_DB; i++) + ipsec_cache->array[i].ipsec_sa = ODP_IPSEC_SA_INVALID; } int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, @@ -183,3 +187,20 @@ ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, } return entry; } + +int destroy_ipsec_cache(void) +{ + ipsec_cache_entry_t *entry; + int i; + int ret = 0; + + for (i = 0; i < MAX_DB; i++) { + entry = &ipsec_cache->array[i]; + if (entry->ipsec_sa != ODP_IPSEC_SA_INVALID) { + ret += odp_ipsec_sa_disable(entry->ipsec_sa); + ret += odp_ipsec_sa_destroy(entry->ipsec_sa); + } + } + + return ret; +} diff --git a/example/ipsec_api/odp_ipsec_cache.h b/example/ipsec_api/odp_ipsec_cache.h index 0454ab1b6..b0e1fa3f0 100644 --- a/example/ipsec_api/odp_ipsec_cache.h +++ b/example/ipsec_api/odp_ipsec_cache.h @@ -105,6 +105,8 @@ ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, uint32_t dst_ip, uint8_t proto); +int destroy_ipsec_cache(void); + #ifdef __cplusplus } #endif commit 7fb84a671f571d462f63f08c447c79d856426d0f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Jun 17 13:58:50 2019 +0300 example: ipsec: exit workers and destroy resources Modified worker main loop to exit when the main thread commands. Added destroy and terminate calls to clean up resources before exiting. For example, ODP linux-generic implementation does not free shm memory without proper destroy and terminate calls. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 10bd06e0b..96c0fe613 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -98,6 +98,7 @@ typedef struct { odp_barrier_t sync_barrier; odp_queue_t poll_queues[MAX_POLL_QUEUES]; int num_polled_queues; + volatile int stop_workers; } global_data_t; /* helper funcs */ @@ -279,7 +280,7 @@ odp_queue_t polled_odp_queue_create(const char *name, static inline odp_event_t odp_schedule_cb(odp_queue_t *from) { - return odp_schedule(from, ODP_SCHED_WAIT); + return odp_schedule(from, ODP_SCHED_NO_WAIT); } /** @@ -290,18 +291,15 @@ odp_event_t polled_odp_schedule_cb(odp_queue_t *from) { int idx = 0; - while (1) { - if (idx >= global->num_polled_queues) - idx = 0; - + while (idx < global->num_polled_queues) { odp_queue_t queue = global->poll_queues[idx++]; - odp_event_t buf; + odp_event_t ev; - buf = odp_queue_deq(queue); + ev = odp_queue_deq(queue); - if (ODP_EVENT_INVALID != buf) { + if (ODP_EVENT_INVALID != ev) { *from = queue; - return buf; + return ev; } } @@ -1057,7 +1055,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) odp_barrier_wait(&global->sync_barrier); /* Loop packets */ - for (;;) { + while (global->stop_workers == 0) { pkt_disposition_e rc; pkt_ctx_t *ctx; odp_queue_t dispatchq; @@ -1066,10 +1064,8 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) /* Use schedule to get event from any input queue */ ev = schedule(&dispatchq); - if (ev == ODP_EVENT_INVALID) { - EXAMPLE_ERR("Error: Bad event handle\n"); - exit(EXIT_FAILURE); - } + if (ev == ODP_EVENT_INVALID) + continue; /* Determine new work versus completion or sequence number */ if (ODP_EVENT_PACKET == odp_event_types(ev, &subtype)) { @@ -1191,7 +1187,6 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) } } - /* unreachable */ return 0; } @@ -1338,6 +1333,7 @@ main(int argc, char *argv[]) /* * Create and init worker threads */ + memset(thread_tbl, 0, sizeof(thread_tbl)); memset(&thr_params, 0, sizeof(thr_params)); thr_params.start = pktio_thread; thr_params.arg = NULL; @@ -1356,10 +1352,13 @@ main(int argc, char *argv[]) sleep(1); } while (!done); printf("All received\n"); - } else { - odph_odpthreads_join(thread_tbl); } + global->stop_workers = 1; + odp_mb_full(); + + odph_odpthreads_join(thread_tbl); + /* Stop and close used pktio devices */ for (i = 0; i < global->appl.if_count; i++) { odp_pktio_t pktio = odp_pktio_lookup(global->appl.if_names[i]); @@ -1377,6 +1376,21 @@ main(int argc, char *argv[]) free(global->appl.if_names); free(global->appl.if_str); + if (destroy_ipsec_cache()) + EXAMPLE_ERR("Error: crypto session destroy failed\n"); + + if (odp_queue_destroy(global->completionq)) + EXAMPLE_ERR("Error: queue destroy failed\n"); + if (odp_queue_destroy(global->seqnumq)) + EXAMPLE_ERR("Error: queue destroy failed\n"); + + if (odp_pool_destroy(global->pkt_pool)) + EXAMPLE_ERR("Error: pool destroy failed\n"); + if (odp_pool_destroy(global->ctx_pool)) + EXAMPLE_ERR("Error: pool destroy failed\n"); + if (odp_pool_destroy(global->out_pool)) + EXAMPLE_ERR("Error: pool destroy failed\n"); + shm = odp_shm_lookup("shm_ipsec_cache"); if (odp_shm_free(shm) != 0) EXAMPLE_ERR("Error: shm free shm_ipsec_cache failed\n"); @@ -1400,6 +1414,16 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } + if (odp_term_local()) { + EXAMPLE_ERR("Error: term local failed\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + EXAMPLE_ERR("Error: term global failed\n"); + exit(EXIT_FAILURE); + } + printf("Exit\n\n"); return 0; diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index 5bbc497cf..362e64a44 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -21,6 +21,7 @@ ipsec_cache_t *ipsec_cache; void init_ipsec_cache(void) { odp_shm_t shm; + int i; shm = odp_shm_reserve("shm_ipsec_cache", sizeof(ipsec_cache_t), @@ -38,6 +39,10 @@ void init_ipsec_cache(void) exit(EXIT_FAILURE); } memset(ipsec_cache, 0, sizeof(*ipsec_cache)); + + for (i = 0; i < MAX_DB; i++) + ipsec_cache->array[i].state.session = + ODP_CRYPTO_SESSION_INVALID; } int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, @@ -223,3 +228,18 @@ ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, } return entry; } + +int destroy_ipsec_cache(void) +{ + ipsec_cache_entry_t *entry; + int i; + int ret = 0; + + for (i = 0; i < MAX_DB; i++) { + entry = &ipsec_cache->array[i]; + if (entry->state.session != ODP_CRYPTO_SESSION_INVALID) + ret += odp_crypto_session_destroy(entry->state.session); + } + + return ret; +} diff --git a/example/ipsec/odp_ipsec_cache.h b/example/ipsec/odp_ipsec_cache.h index fb2416823..1523778ff 100644 --- a/example/ipsec/odp_ipsec_cache.h +++ b/example/ipsec/odp_ipsec_cache.h @@ -127,6 +127,8 @@ ipsec_cache_entry_t *find_ipsec_cache_entry_out(uint32_t src_ip, uint32_t dst_ip, uint8_t proto); +int destroy_ipsec_cache(void); + #ifdef __cplusplus } #endif commit 7bd3ad1f4d8ec2f2dbb49da08031e8a0f1219b4c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 13 13:37:29 2019 +0300 example: ipsec: fix short options without argument Short option notation has ":" after an option that has arguments. Remove ":" after short options that do not have arguments. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index b39e2eac0..10bd06e0b 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1435,7 +1435,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:i:m:h:r:p:a:e:t:s:"; + static const char *shortopts = "+c:i:m:r:p:a:e:t:s:h"; printf("\nParsing command line options\n"); diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index e6f085ca7..b73cfe90f 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -1109,7 +1109,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, {"interface", required_argument, NULL, 'i'}, /* return 'i' */ - {"lookup", 0, NULL, 'l'}, + {"lookup", no_argument, NULL, 'l'}, {"mode", required_argument, NULL, 'm'}, /* return 'm' */ {"route", required_argument, NULL, 'r'}, /* return 'r' */ {"policy", required_argument, NULL, 'p'}, /* return 'p' */ @@ -1121,7 +1121,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:i:h:lm:r:p:a:e:t:s:"; + static const char *shortopts = "+c:i:m:r:p:a:e:t:s:lh"; appl_args->cpu_count = 1; /* use one worker by default */ commit 99040617d930f25c2c130cfdf723b7f3fa0be28e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 13 10:49:46 2019 +0300 example: ipsec: fix crypto_op return value check Crypto_op() and crypto_op_enq() return number of input packets consumed. So, return value from a successful operation is the number of input packets. Also, changed abort() calls to error print plus exit() for easier debugging. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 0e726d4b3..b39e2eac0 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -664,13 +664,17 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *pkt, *skip = FALSE; ctx->state = PKT_STATE_IPSEC_IN_FINISH; if (entry->async) { - if (odp_crypto_op_enq(pkt, &out_pkt, &params, 1)) - abort(); + if (odp_crypto_op_enq(pkt, &out_pkt, &params, 1) != 1) { + EXAMPLE_ERR("Error: odp_crypto_op_enq() failed\n"); + exit(EXIT_FAILURE); + } return PKT_POSTED; } - if (odp_crypto_op(pkt, &out_pkt, &params, 1)) - abort(); + if (odp_crypto_op(pkt, &out_pkt, &params, 1) != 1) { + EXAMPLE_ERR("Error: odp_crypto_op() failed\n"); + exit(EXIT_FAILURE); + } *pkt = out_pkt; return PKT_CONTINUE; @@ -958,8 +962,10 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t *pkt, ret = odp_random_data((uint8_t *)ctx->ipsec.tun_hdr_id, sizeof(*ctx->ipsec.tun_hdr_id), 1); - if (ret != sizeof(*ctx->ipsec.tun_hdr_id)) - abort(); + if (ret != sizeof(*ctx->ipsec.tun_hdr_id)) { + EXAMPLE_ERR("Error: Not enough random data\n"); + exit(EXIT_FAILURE); + } } } @@ -968,14 +974,17 @@ pkt_disposition_e do_ipsec_out_seq(odp_packet_t *pkt, /* Issue crypto request */ if (entry->async) { if (odp_crypto_op_enq(pkt, &out_pkt, - &ctx->ipsec.params, 1)) - abort(); + &ctx->ipsec.params, 1) != 1) { + EXAMPLE_ERR("Error: odp_crypto_op_enq() failed\n"); + exit(EXIT_FAILURE); + } return PKT_POSTED; } - if (odp_crypto_op(pkt, &out_pkt, - &ctx->ipsec.params, 1)) - abort(); + if (odp_crypto_op(pkt, &out_pkt, &ctx->ipsec.params, 1) != 1) { + EXAMPLE_ERR("Error: odp_crypto_op() failed\n"); + exit(EXIT_FAILURE); + } *pkt = out_pkt; return PKT_CONTINUE; @@ -1057,6 +1066,11 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) /* Use schedule to get event from any input queue */ ev = schedule(&dispatchq); + if (ev == ODP_EVENT_INVALID) { + EXAMPLE_ERR("Error: Bad event handle\n"); + exit(EXIT_FAILURE); + } + /* Determine new work versus completion or sequence number */ if (ODP_EVENT_PACKET == odp_event_types(ev, &subtype)) { pkt = odp_packet_from_event(ev); @@ -1072,7 +1086,8 @@ int pktio_thread(void *arg EXAMPLE_UNUSED) ctx->state = PKT_STATE_INPUT_VERIFY; } } else { - abort(); + EXAMPLE_ERR("Error: Bad event type\n"); + exit(EXIT_FAILURE); } /* commit 159da2538ea888a04caea621d5a8dc4f5ab6e2b7 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 6 13:54:22 2019 +0300 example: ipsec: do schedule config earlier Scheduler needs to be configured before used. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index d11898810..0e726d4b3 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1249,6 +1249,9 @@ main(int argc, char *argv[]) memset(global, 0, sizeof(global_data_t)); global->shm = shm; + /* Configure scheduler */ + odp_schedule_config(NULL); + /* Must init our databases before parsing args */ ipsec_init_pre(); init_fwd_db(); @@ -1302,9 +1305,6 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } - /* Configure scheduler */ - odp_schedule_config(NULL); - /* Populate our IPsec cache */ printf("Using %s mode for crypto API\n\n", (CRYPTO_API_SYNC == global->appl.mode) ? "SYNC" : diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index 5b83e8b37..e6f085ca7 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -948,6 +948,9 @@ main(int argc, char *argv[]) memset(global, 0, sizeof(global_data_t)); global->shm = shm; + /* Configure scheduler */ + odp_schedule_config(NULL); + /* Must init our databases before parsing args */ ipsec_init_pre(); init_fwd_db(); @@ -1001,9 +1004,6 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } - /* Configure scheduler */ - odp_schedule_config(NULL); - /* Populate our IPsec cache */ printf("Using %s mode for IPsec API\n\n", (ODP_IPSEC_OP_MODE_SYNC == global->appl.mode) ? "SYNC" : commit e2dcc95d50f850a8a703d1d0449f4875eda40e76 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jun 14 12:54:07 2019 +0300 linux-gen: dpdk: reset getopt state after usage Reset getopt library internal state after usage. Otherwise, the next getopt() / getopt_long() call may fail in various ways. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 1d3220578..deef0b31c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1240,6 +1240,9 @@ static int dpdk_pktio_init(void) i = rte_eal_init(dpdk_argc, dpdk_argv); + /* Force getopt() to reset its internal state */ + optind = 0; + if (i < 0) { ODP_ERR("Cannot init the Intel DPDK EAL!\n"); return -1; ----------------------------------------------------------------------- Summary of changes: example/ipsec/Makefile.am | 20 ++-- example/ipsec/odp_ipsec.c | 105 ++++++++++++++------- example/ipsec/odp_ipsec_cache.c | 20 ++++ example/ipsec/odp_ipsec_cache.h | 2 + ...{odp_ipsec_run_ah_in => odp_ipsec_run_ah_in.sh} | 2 +- ...dp_ipsec_run_ah_out => odp_ipsec_run_ah_out.sh} | 2 +- ..._ipsec_run_both_in => odp_ipsec_run_both_in.sh} | 2 +- ...psec_run_both_out => odp_ipsec_run_both_out.sh} | 2 +- ...dp_ipsec_run_esp_in => odp_ipsec_run_esp_in.sh} | 2 +- ..._ipsec_run_esp_out => odp_ipsec_run_esp_out.sh} | 9 +- .../{odp_ipsec_run_live => odp_ipsec_run_live.sh} | 2 +- ...dp_ipsec_run_router => odp_ipsec_run_router.sh} | 2 +- ...dp_ipsec_run_simple => odp_ipsec_run_simple.sh} | 9 +- example/ipsec_api/Makefile.am | 24 ++--- example/ipsec_api/odp_ipsec.c | 83 +++++++++++----- example/ipsec_api/odp_ipsec_api_run_ah_in.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_ah_out.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_esp_in.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_esp_out.sh | 7 +- example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_live.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_router.sh | 2 +- example/ipsec_api/odp_ipsec_api_run_simple.sh | 7 +- example/ipsec_api/odp_ipsec_cache.c | 21 +++++ example/ipsec_api/odp_ipsec_cache.h | 2 + platform/linux-generic/pktio/dpdk.c | 3 + platform/linux-generic/test/Makefile.am | 15 ++- .../linux-generic/test/ipsec/ipsec_api_example.sh | 32 +++++++ platform/linux-generic/test/ipsec/ipsec_example.sh | 32 +++++++ 32 files changed, 321 insertions(+), 102 deletions(-) rename example/ipsec/{odp_ipsec_run_ah_in => odp_ipsec_run_ah_in.sh} (92%) rename example/ipsec/{odp_ipsec_run_ah_out => odp_ipsec_run_ah_out.sh} (92%) rename example/ipsec/{odp_ipsec_run_both_in => odp_ipsec_run_both_in.sh} (93%) rename example/ipsec/{odp_ipsec_run_both_out => odp_ipsec_run_both_out.sh} (93%) rename example/ipsec/{odp_ipsec_run_esp_in => odp_ipsec_run_esp_in.sh} (92%) rename example/ipsec/{odp_ipsec_run_esp_out => odp_ipsec_run_esp_out.sh} (73%) rename example/ipsec/{odp_ipsec_run_live => odp_ipsec_run_live.sh} (95%) rename example/ipsec/{odp_ipsec_run_router => odp_ipsec_run_router.sh} (86%) rename example/ipsec/{odp_ipsec_run_simple => odp_ipsec_run_simple.sh} (63%) create mode 100755 platform/linux-generic/test/ipsec/ipsec_api_example.sh create mode 100755 platform/linux-generic/test/ipsec/ipsec_example.sh hooks/post-receive --

5 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-135-g56834f66e

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 56834f66e317f4bf941de808cb6529bad3d3baa6 (commit) via 7a16f52fb6fbaadbf405bfb2c0f7b9c0ce58b0a9 (commit) via e491dad2b1c781008cd3e7904137adc2f09fd076 (commit) via 66feb78128fa440c2a5a1b0f9bd513949f25f5e8 (commit) via b820eb79b68dbdd22ea8d84b5b88778942f0652a (commit) from d1df2b5511707783c2be6eda6c0d64663538bdfa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 56834f66e317f4bf941de808cb6529bad3d3baa6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Jun 18 15:28:12 2019 +0300 travis: add -O3 and -O0 tests for Ubuntu 18.04 Ubuntu 18.04 has newer compiler version than Ubuntu 16.04. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index 82ff4bb26..9fbc1e47e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,8 @@ env: matrix: - CHECK=0 CONF="CFLAGS=-O3" - CHECK=0 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print" + - CHECK=0 OS=ubuntu_18.04 CONF="CFLAGS=-O3" + - CHECK=0 OS=ubuntu_18.04 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print" - CHECK=0 ARCH=arm64 - CHECK=0 ARCH=armhf - CHECK=0 ARCH=powerpc commit 7a16f52fb6fbaadbf405bfb2c0f7b9c0ce58b0a9 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Jun 18 14:53:17 2019 +0300 travis: remove extra double quotes Quotes are not needed with simple strings (no space characters). For uniformity, quotes are used always with CONF variable. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index 6ae5895ec..82ff4bb26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,21 +49,21 @@ env: # you need to generate a new one at https://codecov.io specific for your # repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - - OS="ubuntu_16.04" + - OS=ubuntu_16.04 - ARCH=x86_64 - CHECK=1 - NETMAP=0 matrix: - CHECK=0 CONF="CFLAGS=-O3" - CHECK=0 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print" - - CHECK=0 ARCH="arm64" - - CHECK=0 ARCH="armhf" - - CHECK=0 ARCH="powerpc" - - CHECK=0 ARCH="i386" - - CHECK=0 ARCH="arm64" CONF="--disable-abi-compat" - - CHECK=0 ARCH="armhf" CONF="--disable-abi-compat" - - CHECK=0 ARCH="powerpc" CONF="--disable-abi-compat" - - CHECK=0 ARCH="i386" CONF="--disable-abi-compat" + - CHECK=0 ARCH=arm64 + - CHECK=0 ARCH=armhf + - CHECK=0 ARCH=powerpc + - CHECK=0 ARCH=i386 + - CHECK=0 ARCH=arm64 CONF="--disable-abi-compat" + - CHECK=0 ARCH=armhf CONF="--disable-abi-compat" + - CHECK=0 ARCH=powerpc CONF="--disable-abi-compat" + - CHECK=0 ARCH=i386 CONF="--disable-abi-compat" - CONF="" - CONF="--disable-abi-compat" - CONF="--enable-deprecated" @@ -73,16 +73,16 @@ env: - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" - CHECK=0 CONF="--enable-pcapng-support" - - CHECK=0 OS="centos_7" + - CHECK=0 OS=centos_7 - CONF="--without-openssl --without-pcap" - - OS="ubuntu_18.04" + - OS=ubuntu_18.04 matrix: exclude: - compiler: gcc - env: CHECK=0 ARCH="arm64" + env: CHECK=0 ARCH=arm64 - compiler: gcc - env: CHECK=0 ARCH="i386" + env: CHECK=0 ARCH=i386 install: - if [ ${NETMAP} -eq 1 ] ; then commit e491dad2b1c781008cd3e7904137adc2f09fd076 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Jun 18 13:50:20 2019 +0300 travis: add -O3 and -O0 build tests Sometimes build fails with compiler optimization level -O3 or -O0, although it builds correctly with -O2 level. Check that code builds with -O3 and -O0 levels. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index 51cf2903a..6ae5895ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,9 +54,8 @@ env: - CHECK=1 - NETMAP=0 matrix: - - CONF="" - - CONF="--disable-abi-compat" - - NETMAP=1 CONF="" + - CHECK=0 CONF="CFLAGS=-O3" + - CHECK=0 CONF="CFLAGS=-O0 --enable-debug --enable-debug-print" - CHECK=0 ARCH="arm64" - CHECK=0 ARCH="armhf" - CHECK=0 ARCH="powerpc" @@ -65,8 +64,11 @@ env: - CHECK=0 ARCH="armhf" CONF="--disable-abi-compat" - CHECK=0 ARCH="powerpc" CONF="--disable-abi-compat" - CHECK=0 ARCH="i386" CONF="--disable-abi-compat" + - CONF="" + - CONF="--disable-abi-compat" - CONF="--enable-deprecated" - CONF="--enable-dpdk-zero-copy --disable-static-applications" + - NETMAP=1 CONF="" - NETMAP=1 CONF="--disable-static-applications" - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" commit 66feb78128fa440c2a5a1b0f9bd513949f25f5e8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Jun 18 13:03:25 2019 +0300 travis: set default ARCH to x86_64 Test cases are build for x86_64 by default. ARCH needs to be set only when building for another CPU architecture. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/.travis.yml b/.travis.yml index a32b48e0b..51cf2903a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ env: # repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - OS="ubuntu_16.04" + - ARCH=x86_64 - CHECK=1 - NETMAP=0 matrix: @@ -69,8 +70,8 @@ env: - NETMAP=1 CONF="--disable-static-applications" - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" - - CHECK=0 ARCH="x86_64" CONF="--enable-pcapng-support" - - CHECK=0 ARCH="x86_64" OS="centos_7" + - CHECK=0 CONF="--enable-pcapng-support" + - CHECK=0 OS="centos_7" - CONF="--without-openssl --without-pcap" - OS="ubuntu_18.04" commit b820eb79b68dbdd22ea8d84b5b88778942f0652a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Jun 18 11:01:54 2019 +0300 linux-gen: schedule_sp: add extra check to suppress compiler warning GCC 7.4 with -O3 optimization level warns (falsely) about array bounds. Suppress the warning with an extra check. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 79e985c09..106874552 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -297,6 +297,12 @@ static void remove_group(sched_group_t *sched_group, int thr, int group) num = thr_group->num_group; + /* Extra array bounds check to suppress warning on GCC 7.4 with -O3 */ + if (num >= NUM_GROUP) { + ODP_ERR("Too many groups"); + return; + } + for (i = 0; i < num; i++) { if (thr_group->group[i] == group) { found = 1; ----------------------------------------------------------------------- Summary of changes: .travis.yml | 35 ++++++++++++++++++-------------- platform/linux-generic/odp_schedule_sp.c | 6 ++++++ 2 files changed, 26 insertions(+), 15 deletions(-) hooks/post-receive --

5 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-130-gd1df2b551

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via d1df2b5511707783c2be6eda6c0d64663538bdfa (commit) from feac45e3ed8fa871ae7f9826d0c045591f22ce42 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d1df2b5511707783c2be6eda6c0d64663538bdfa Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jun 10 12:39:47 2019 +0300 linux-gen: queue: configure max number of plain/scheduled queues Add separate defines (CONFIG_MAX_PLAIN_QUEUES, CONFIG_MAX_SCHED_QUEUES) for configuring the maximum number of plain and scheduled queues. ODP_CONFIG_QUEUES define has been renamed to CONFIG_MAX_QUEUES to clearly separate it from API defines. Queue IDs are now allocated consecutively per queue type (scheduled queues [0, CONFIG_MAX_SCHED_QUEUES[ and plain queues[CONFIG_MAX_SCHED_QUEUES, CONFIG_MAX_QUEUES[). This makes scheduler load balancing more predictable since allocating plain queues won't affect to scheduler internal queue mappings. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 27f1db599..2e1d61d36 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -22,14 +22,28 @@ extern "C" { #define ODP_CONFIG_POOLS 64 /* - * Maximum number of queues + * Queues reserved for ODP internal use */ -#define ODP_CONFIG_QUEUES 1024 +#define CONFIG_INTERNAL_QUEUES 64 /* - * Queues reserved for ODP internal use + * Maximum number of plain ODP queues + */ +#define CONFIG_MAX_PLAIN_QUEUES 1024 + +/* + * Maximum number of scheduled ODP queues + * + * Must be a power of two. + */ +#define CONFIG_MAX_SCHED_QUEUES 1024 + +/* + * Maximum number of queues */ -#define NUM_INTERNAL_QUEUES 64 +#define CONFIG_MAX_QUEUES (CONFIG_INTERNAL_QUEUES + \ + CONFIG_MAX_PLAIN_QUEUES + \ + CONFIG_MAX_SCHED_QUEUES) /* * Maximum number of ordered locks per queue diff --git a/platform/linux-generic/include/odp_queue_basic_internal.h b/platform/linux-generic/include/odp_queue_basic_internal.h index c8ed978ce..06cb34a87 100644 --- a/platform/linux-generic/include/odp_queue_basic_internal.h +++ b/platform/linux-generic/include/odp_queue_basic_internal.h @@ -72,7 +72,7 @@ union queue_entry_u { }; typedef struct queue_global_t { - queue_entry_t queue[ODP_CONFIG_QUEUES]; + queue_entry_t queue[CONFIG_MAX_QUEUES]; uint32_t *ring_data; uint32_t queue_lf_num; uint32_t queue_lf_size; diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 74ed1faad..1a3f0a5bc 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -52,13 +52,13 @@ static int queue_capa(odp_queue_capability_t *capa, int sched ODP_UNUSED) memset(capa, 0, sizeof(odp_queue_capability_t)); /* Reserve some queues for internal use */ - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; - capa->plain.max_num = capa->max_queues; + capa->max_queues = CONFIG_MAX_QUEUES - CONFIG_INTERNAL_QUEUES; + capa->plain.max_num = CONFIG_MAX_PLAIN_QUEUES; capa->plain.max_size = queue_glb->config.max_queue_size; capa->plain.lockfree.max_num = queue_glb->queue_lf_num; capa->plain.lockfree.max_size = queue_glb->queue_lf_size; #if ODP_DEPRECATED_API - capa->sched.max_num = capa->max_queues; + capa->sched.max_num = CONFIG_MAX_SCHED_QUEUES; capa->sched.max_size = queue_glb->config.max_queue_size; if (sched) { @@ -145,7 +145,7 @@ static int queue_init_global(void) memset(queue_glb, 0, sizeof(queue_global_t)); - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { /* init locks */ queue_entry_t *queue = qentry_from_index(i); LOCK_INIT(queue); @@ -159,7 +159,7 @@ static int queue_init_global(void) } queue_glb->queue_gbl_shm = shm; - mem_size = sizeof(uint32_t) * ODP_CONFIG_QUEUES * + mem_size = sizeof(uint32_t) * CONFIG_MAX_QUEUES * (uint64_t)queue_glb->config.max_queue_size; shm = odp_shm_reserve("_odp_queue_rings", mem_size, @@ -206,7 +206,7 @@ static int queue_term_global(void) queue_entry_t *queue; int i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue = qentry_from_index(i); LOCK(queue); if (queue->s.status != QUEUE_STATUS_FREE) { @@ -268,6 +268,7 @@ static odp_queue_t queue_create(const char *name, const odp_queue_param_t *param) { uint32_t i; + uint32_t max_idx; queue_entry_t *queue; void *queue_lf; odp_queue_type_t type; @@ -303,7 +304,18 @@ static odp_queue_t queue_create(const char *name, return ODP_QUEUE_INVALID; } - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + if (type == ODP_QUEUE_TYPE_SCHED) { + /* Start scheduled queue indices from zero to enable direct + * mapping to scheduler implementation indices. */ + i = 0; + max_idx = CONFIG_MAX_SCHED_QUEUES; + } else { + i = CONFIG_MAX_SCHED_QUEUES; + /* All internal queues are of type plain */ + max_idx = CONFIG_MAX_QUEUES; + } + + for (; i < max_idx; i++) { queue = qentry_from_index(i); if (queue->s.status != QUEUE_STATUS_FREE) @@ -446,7 +458,7 @@ static odp_queue_t queue_lookup(const char *name) { uint32_t i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue_entry_t *queue = qentry_from_index(i); if (queue->s.status == QUEUE_STATUS_FREE || @@ -634,7 +646,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) queue_id = queue_to_index(handle); - if (odp_unlikely(queue_id >= ODP_CONFIG_QUEUES)) { + if (odp_unlikely(queue_id >= CONFIG_MAX_QUEUES)) { ODP_ERR("Invalid queue handle: 0x%" PRIx64 "\n", odp_queue_to_u64(handle)); return -1; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index b4e62b08c..862122123 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -48,7 +48,7 @@ extern __thread sched_scalable_thread_state_t *sched_ts; extern _odp_queue_inline_offset_t _odp_queue_inline_offset; typedef struct queue_table_t { - queue_entry_t queue[ODP_CONFIG_QUEUES]; + queue_entry_t queue[CONFIG_MAX_QUEUES]; } queue_table_t; static queue_table_t *queue_tbl; @@ -214,10 +214,10 @@ static int queue_init_global(void) pool_size = sizeof(queue_table_t); /* Add storage required for queues */ pool_size += (CONFIG_SCAL_QUEUE_SIZE * - sizeof(odp_buffer_hdr_t *)) * ODP_CONFIG_QUEUES; + sizeof(odp_buffer_hdr_t *)) * CONFIG_MAX_QUEUES; /* Add the reorder window size */ - pool_size += sizeof(reorder_window_t) * ODP_CONFIG_QUEUES; + pool_size += sizeof(reorder_window_t) * CONFIG_MAX_QUEUES; /* Choose min_alloc and max_alloc such that buddy allocator is * is selected. */ @@ -242,7 +242,7 @@ static int queue_init_global(void) memset(queue_tbl, 0, sizeof(queue_table_t)); - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { /* init locks */ queue_entry_t *queue; @@ -277,7 +277,7 @@ static int queue_term_global(void) queue_entry_t *queue; int i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue = &queue_tbl->queue[i]; if (__atomic_load_n(&queue->s.status, __ATOMIC_RELAXED) != QUEUE_STATUS_FREE) { @@ -312,15 +312,15 @@ static int queue_capability(odp_queue_capability_t *capa) memset(capa, 0, sizeof(odp_queue_capability_t)); /* Reserve some queues for internal use */ - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_QUEUES - CONFIG_INTERNAL_QUEUES; #if ODP_DEPRECATED_API capa->max_ordered_locks = sched_fn->max_ordered_locks(); capa->max_sched_groups = sched_fn->num_grps(); capa->sched_prios = odp_schedule_num_prio(); - capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->sched.max_num = CONFIG_MAX_SCHED_QUEUES; capa->sched.max_size = 0; #endif - capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->plain.max_num = CONFIG_MAX_PLAIN_QUEUES; capa->plain.max_size = 0; return 0; @@ -358,6 +358,7 @@ static odp_queue_t queue_create(const char *name, const odp_queue_param_t *param) { int queue_idx; + int max_idx; queue_entry_t *queue; odp_queue_type_t type; odp_queue_param_t default_param; @@ -378,7 +379,18 @@ static odp_queue_t queue_create(const char *name, } } - for (queue_idx = 0; queue_idx < ODP_CONFIG_QUEUES; queue_idx++) { + if (type == ODP_QUEUE_TYPE_SCHED) { + /* Start scheduled queue indices from zero to enable direct + * mapping to scheduler implementation indices. */ + queue_idx = 0; + max_idx = CONFIG_MAX_SCHED_QUEUES; + } else { + queue_idx = CONFIG_MAX_SCHED_QUEUES; + /* All internal queues are of type plain */ + max_idx = CONFIG_MAX_QUEUES; + } + + for (; queue_idx < max_idx; queue_idx++) { queue = &queue_tbl->queue[queue_idx]; if (queue->s.status != QUEUE_STATUS_FREE) @@ -490,7 +502,7 @@ static odp_queue_t queue_lookup(const char *name) { uint32_t i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue_entry_t *queue = &queue_tbl->queue[i]; if (queue->s.status == QUEUE_STATUS_FREE || @@ -905,7 +917,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) queue_id = queue_to_id(handle); - if (odp_unlikely(queue_id >= ODP_CONFIG_QUEUES)) { + if (odp_unlikely(queue_id >= CONFIG_MAX_QUEUES)) { ODP_ERR("Invalid queue handle:%" PRIu64 "\n", odp_queue_to_u64(handle)); return -1; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 4b054b86c..d70258475 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -67,10 +67,10 @@ /* Maximum priority queue ring size. A ring must be large enough to store all * queues in the worst case (all queues are scheduled, have the same priority * and no spreading). */ -#define MAX_RING_SIZE ODP_CONFIG_QUEUES +#define MAX_RING_SIZE CONFIG_MAX_SCHED_QUEUES /* For best performance, the number of queues should be a power of two. */ -ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(CONFIG_MAX_SCHED_QUEUES), "Number_of_queues_is_not_power_of_two"); /* Ring size must be power of two, so that mask can be used. */ @@ -197,7 +197,7 @@ typedef struct { uint8_t poll_pktin; uint8_t pktio_index; uint8_t pktin_index; - } queue[ODP_CONFIG_QUEUES]; + } queue[CONFIG_MAX_SCHED_QUEUES]; /* Scheduler priority queues */ prio_queue_t prio_q[NUM_SCHED_GRPS][NUM_PRIO][MAX_SPREAD]; @@ -218,7 +218,7 @@ typedef struct { } pktio[NUM_PKTIO]; odp_spinlock_t pktio_lock; - order_context_t order[ODP_CONFIG_QUEUES]; + order_context_t order[CONFIG_MAX_SCHED_QUEUES]; /* Scheduler interface config options (not used in fast path) */ schedule_config_t config_if; @@ -807,7 +807,7 @@ static int schedule_term_local(void) static void schedule_config_init(odp_schedule_config_t *config) { - config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + config->num_queues = CONFIG_MAX_SCHED_QUEUES; config->queue_size = queue_glb->config.max_queue_size; } @@ -1585,7 +1585,7 @@ static int schedule_capability(odp_schedule_capability_t *capa) capa->max_ordered_locks = schedule_max_ordered_locks(); capa->max_groups = schedule_num_grps(); capa->max_prios = schedule_num_prio(); - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_SCHED_QUEUES; capa->max_queue_size = queue_glb->config.max_queue_size; capa->max_flow_id = BUF_HDR_MAX_FLOW_ID; diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 326c49e3f..d6d6d9ef6 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -46,7 +46,7 @@ #define FLAG_PKTIN 0x80 -ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(CONFIG_MAX_SCHED_QUEUES), "Number_of_queues_is_not_power_of_two"); #define SCHED_GROUP_JOIN 0 @@ -1996,7 +1996,7 @@ static int schedule_term_local(void) static void schedule_config_init(odp_schedule_config_t *config) { - config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + config->num_queues = CONFIG_MAX_SCHED_QUEUES; config->queue_size = 0; /* FIXME ? */ } @@ -2128,7 +2128,7 @@ static int schedule_capability(odp_schedule_capability_t *capa) capa->max_ordered_locks = schedule_max_ordered_locks(); capa->max_groups = num_grps(); capa->max_prios = schedule_num_prio(); - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_SCHED_QUEUES; capa->max_queue_size = 0; return 0; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 1c52cc18d..79e985c09 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -24,7 +24,7 @@ #include <odp_queue_basic_internal.h> #define NUM_THREAD ODP_THREAD_COUNT_MAX -#define NUM_QUEUE ODP_CONFIG_QUEUES +#define NUM_QUEUE CONFIG_MAX_SCHED_QUEUES #define NUM_PKTIO ODP_CONFIG_PKTIO_ENTRIES #define NUM_ORDERED_LOCKS 1 #define NUM_STATIC_GROUP 3 @@ -260,7 +260,7 @@ static int term_local(void) static void schedule_config_init(odp_schedule_config_t *config) { - config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + config->num_queues = CONFIG_MAX_SCHED_QUEUES; config->queue_size = queue_glb->config.max_queue_size; } @@ -951,7 +951,7 @@ static int schedule_capability(odp_schedule_capability_t *capa) capa->max_ordered_locks = max_ordered_locks(); capa->max_groups = num_grps(); capa->max_prios = schedule_num_prio(); - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_SCHED_QUEUES; capa->max_queue_size = queue_glb->config.max_queue_size; return 0; ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_config_internal.h | 22 +++++++++++--- .../include/odp_queue_basic_internal.h | 2 +- platform/linux-generic/odp_queue_basic.c | 30 +++++++++++++------ platform/linux-generic/odp_queue_scalable.c | 34 +++++++++++++++------- platform/linux-generic/odp_schedule_basic.c | 12 ++++---- platform/linux-generic/odp_schedule_scalable.c | 6 ++-- platform/linux-generic/odp_schedule_sp.c | 6 ++-- 7 files changed, 75 insertions(+), 37 deletions(-) hooks/post-receive --

5 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-129-gfeac45e3e

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via feac45e3ed8fa871ae7f9826d0c045591f22ce42 (commit) via e4ef7a3b32d375e3e1872a43697d407413ae87aa (commit) via 762e4c51fc0d61bee8e740370fa6c64f86a5ee6c (commit) from 6a30a1beb7ec2182239ea3ba1ef71a6f9a944df9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit feac45e3ed8fa871ae7f9826d0c045591f22ce42 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 5 14:26:13 2019 +0300 example: time: include into make check Run time example as part of 'make check'. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/time/Makefile.am b/example/time/Makefile.am index bda908761..5621ef99e 100644 --- a/example/time/Makefile.am +++ b/example/time/Makefile.am @@ -2,4 +2,8 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_time_global +if test_example +TESTS = odp_time_global +endif + odp_time_global_SOURCES = time_global_test.c commit e4ef7a3b32d375e3e1872a43697d407413ae87aa Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 6 10:32:23 2019 +0300 example: time: fix deadlock with single worker Random id calculation did get stuck when there's only single worker (as id is always one). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index efcd22984..1e5cb0bd4 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -84,20 +84,23 @@ static void print_log(test_globals_t *gbls) printf("Number of errors: %u\n", err_num); } -static void -generate_next_queue(test_globals_t *gbls, odp_queue_t *queue, unsigned int id) +static void generate_next_queue(test_globals_t *gbls, odp_queue_t *queue, + unsigned int id) { int thr; - unsigned int rand_id; + uint8_t rand_u8; char queue_name[sizeof(QUEUE_NAME_PREFIX) + 2]; + unsigned int rand_id = 1; thr = odp_thread_id(); /* generate next random id */ - do { - odp_random_data((uint8_t *)&rand_id, sizeof(rand_id), 1); - rand_id = rand_id % gbls->thread_num + 1; - } while (rand_id == id); + if (gbls->thread_num > 1) { + do { + odp_random_data(&rand_u8, 1, ODP_RANDOM_BASIC); + rand_id = rand_u8 % gbls->thread_num + 1; + } while (rand_id == id); + } sprintf(queue_name, QUEUE_NAME_PREFIX "%d", rand_id); *queue = odp_queue_lookup(queue_name); commit 762e4c51fc0d61bee8e740370fa6c64f86a5ee6c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 5 14:15:19 2019 +0300 example: time: increase pool size Since pool implementation may stash buffers per thread, pool size of one buffer per thread is not enough to ensure that every thread can allocate a buffer. Use similar pool size than other multi-threaded test applications. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index 0c4b5286c..efcd22984 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -11,6 +11,7 @@ #include <odp/helper/odph_api.h> #define MAX_WORKERS 32 +#define MAX_NUM_BUF 8192 #define ITERATION_NUM 2048 #define LOG_BASE 8 #define LOG_ENTRY_SIZE 19 @@ -250,7 +251,8 @@ int main(int argc, char *argv[]) int num_workers; test_globals_t *gbls; odp_cpumask_t cpumask; - odp_pool_param_t params; + odp_pool_capability_t pool_capa; + odp_pool_param_t pool_param; odp_shm_t shm_glbls = ODP_SHM_INVALID; odp_shm_t shm_log = ODP_SHM_INVALID; int log_size, log_enries_num; @@ -319,12 +321,23 @@ int main(int argc, char *argv[]) odp_barrier_init(&gbls->end_barrier, num_workers); memset(gbls->log, 0, log_size); - params.buf.size = sizeof(timestamp_event_t); - params.buf.align = ODP_CACHE_LINE_SIZE; - params.buf.num = num_workers; - params.type = ODP_POOL_BUFFER; + if (odp_pool_capability(&pool_capa)) { + err = 1; + EXAMPLE_ERR("Error: pool capability failed.\n"); + goto err; + } + + odp_pool_param_init(&pool_param); + + pool_param.buf.size = sizeof(timestamp_event_t); + pool_param.buf.align = ODP_CACHE_LINE_SIZE; + pool_param.buf.num = MAX_NUM_BUF; + pool_param.type = ODP_POOL_BUFFER; + + if (pool_capa.buf.max_num && MAX_NUM_BUF > pool_capa.buf.max_num) + pool_param.buf.num = pool_capa.buf.max_num; - pool = odp_pool_create("time buffers pool", &params); + pool = odp_pool_create("time buffers pool", &pool_param); if (pool == ODP_POOL_INVALID) { err = 1; EXAMPLE_ERR("Pool create failed.\n"); ----------------------------------------------------------------------- Summary of changes: example/time/Makefile.am | 4 ++++ example/time/time_global_test.c | 42 ++++++++++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 13 deletions(-) hooks/post-receive --

5 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-126-g6a30a1beb

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 6a30a1beb7ec2182239ea3ba1ef71a6f9a944df9 (commit) via a643bfe4210827d43dde0e6d69097decc2fa77d0 (commit) via 03490694085060aec7de6d21ef674f461adcf373 (commit) from e2786e3ed30405b16da8080e2b0ed11b0fd52fc7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6a30a1beb7ec2182239ea3ba1ef71a6f9a944df9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon May 27 10:19:17 2019 +0300 linux-gen: pcapng: limit internal symbol visibility to odp library Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_pcapng.h b/platform/linux-generic/include/odp_pcapng.h index 8e0e624e8..b88427238 100644 --- a/platform/linux-generic/include/odp_pcapng.h +++ b/platform/linux-generic/include/odp_pcapng.h @@ -1,56 +1,29 @@ /* Copyright (c) 2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ -#include <sys/types.h> +#ifndef ODP_PCAPNG_H_ +#define ODP_PCAPNG_H_ -#include <odp_packet_io_internal.h> - -#define PCAPNG_BLOCK_TYPE_EPB 0x00000006UL -#define PCAPNG_BLOCK_TYPE_SHB 0x0A0D0D0AUL -#define PCAPNG_BLOCK_TYPE_IDB 0x00000001UL -#define PCAPNG_ENDIAN_MAGIC 0x1A2B3C4DUL -#define PCAPNG_DATA_ALIGN 4 -#define PCAPNG_LINKTYPE_ETHERNET 0x1 +#ifdef __cplusplus +extern "C" { +#endif -/* inotify */ -#define INOTIFY_BUF_LEN (16 * (sizeof(struct inotify_event))) -#define PCAPNG_WATCH_DIR "/var/run/odp/" +#include <odp/api/packet.h> +#include <odp_packet_io_internal.h> -/* pcapng: enhanced packet block file encoding */ -typedef struct ODP_PACKED pcapng_section_hdr_block_s { - uint32_t block_type; - uint32_t block_total_length; - uint32_t magic; - uint16_t version_major; - uint16_t version_minor; - int64_t section_len; - uint32_t block_total_length2; -} pcapng_section_hdr_block_t; +#include <stdint.h> -typedef struct pcapng_interface_description_block { - uint32_t block_type; - uint32_t block_total_length; - uint16_t linktype; - uint16_t reserved; - uint32_t snaplen; - uint32_t block_total_length2; -} pcapng_interface_description_block_t; +int _odp_pcapng_start(pktio_entry_t *entry); +void _odp_pcapng_stop(pktio_entry_t *entry); +int _odp_pcapng_write_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num); -typedef struct pcapng_enhanced_packet_block_s { - uint32_t block_type; - uint32_t block_total_length; - uint32_t interface_idx; - uint32_t timestamp_high; - uint32_t timestamp_low; - uint32_t captured_len; - uint32_t packet_len; -} pcapng_enhanced_packet_block_t; +#ifdef __cplusplus +} +#endif -int pcapng_prepare(pktio_entry_t *entry); -void pcapng_destroy(pktio_entry_t *entry); -int write_pcapng_hdr(pktio_entry_t *entry, int qidx); -int write_pcapng_pkts(pktio_entry_t *entry, int qidx, - const odp_packet_t packets[], int num); +#endif /* ODP_PCAPNG_H_ */ diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 097618a3e..1bf0469e7 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -530,8 +530,8 @@ int odp_pktio_start(odp_pktio_t hdl) entry->s.name, entry->s.num_in_queue, entry->s.num_out_queue); if (_ODP_PCAPNG) { - if (pcapng_prepare(entry)) - ODP_ERR("pcap init failed, won't capture\n"); + if (_odp_pcapng_start(entry)) + ODP_ERR("pcapng start failed, won't capture\n"); } return res; @@ -559,7 +559,7 @@ static int _pktio_stop(pktio_entry_t *entry) entry->s.state = PKTIO_STATE_STOPPED; if (_ODP_PCAPNG) - pcapng_destroy(entry); + _odp_pcapng_stop(entry); return res; } @@ -1758,7 +1758,7 @@ static inline void _odp_dump_pcapng_pkts(pktio_entry_t *entry, int qidx, const odp_packet_t packets[], int num) { if (odp_unlikely(entry->s.pcapng.state[qidx] == PCAPNG_WR_PKT)) - write_pcapng_pkts(entry, qidx, packets, num); + _odp_pcapng_write_pkts(entry, qidx, packets, num); } int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num) diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c index cf7cd978e..b6d91fbc8 100644 --- a/platform/linux-generic/odp_pcapng.c +++ b/platform/linux-generic/odp_pcapng.c @@ -28,6 +28,47 @@ #include <sys/inotify.h> #include <sys/select.h> +#define PCAPNG_BLOCK_TYPE_EPB 0x00000006UL +#define PCAPNG_BLOCK_TYPE_SHB 0x0A0D0D0AUL +#define PCAPNG_BLOCK_TYPE_IDB 0x00000001UL +#define PCAPNG_ENDIAN_MAGIC 0x1A2B3C4DUL +#define PCAPNG_DATA_ALIGN 4 +#define PCAPNG_LINKTYPE_ETHERNET 0x1 + +/* inotify */ +#define INOTIFY_BUF_LEN (16 * (sizeof(struct inotify_event))) +#define PCAPNG_WATCH_DIR "/var/run/odp/" + +/* pcapng: enhanced packet block file encoding */ +typedef struct ODP_PACKED pcapng_section_hdr_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t magic; + uint16_t version_major; + uint16_t version_minor; + int64_t section_len; + uint32_t block_total_length2; +} pcapng_section_hdr_block_t; + +typedef struct pcapng_interface_description_block { + uint32_t block_type; + uint32_t block_total_length; + uint16_t linktype; + uint16_t reserved; + uint32_t snaplen; + uint32_t block_total_length2; +} pcapng_interface_description_block_t; + +typedef struct pcapng_enhanced_packet_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t interface_idx; + uint32_t timestamp_high; + uint32_t timestamp_low; + uint32_t captured_len; + uint32_t packet_len; +} pcapng_enhanced_packet_block_t; + typedef struct ODP_ALIGNED_CACHE { odp_shm_t shm; pktio_entry_t *entry[ODP_CONFIG_PKTIO_ENTRIES]; @@ -41,6 +82,8 @@ typedef struct ODP_ALIGNED_CACHE { static pcapng_global_t *pcapng_gbl; +int write_pcapng_hdr(pktio_entry_t *entry, int qidx); + int _odp_pcapng_init_global(void) { odp_shm_t shm; @@ -241,7 +284,7 @@ static int get_fifo_max_size(void) return ret; } -int pcapng_prepare(pktio_entry_t *entry) +int _odp_pcapng_start(pktio_entry_t *entry) { int ret = -1, fd; pthread_attr_t attr; @@ -342,12 +385,12 @@ int pcapng_prepare(pktio_entry_t *entry) out_destroy: odp_spinlock_unlock(&pcapng_gbl->lock); - pcapng_destroy(entry); + _odp_pcapng_stop(entry); return ret; } -void pcapng_destroy(pktio_entry_t *entry) +void _odp_pcapng_stop(pktio_entry_t *entry) { int ret; unsigned int i; @@ -465,8 +508,8 @@ static ssize_t write_fifo(int fd, struct iovec *iov, int iovcnt) return len; } -int write_pcapng_pkts(pktio_entry_t *entry, int qidx, - const odp_packet_t packets[], int num) +int _odp_pcapng_write_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num) { int i = 0; struct iovec packet_iov[3 * num]; commit a643bfe4210827d43dde0e6d69097decc2fa77d0 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 24 17:32:36 2019 +0300 linux-gen: pcapng: support simultaneous capture from multiple devices Previously, one could capture traffic only from the first started pktio device. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Jari Mustajärvi <jari.mustajarvi(a)nokia-bell-labs.com> diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h index a12d12973..fdb057b3e 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -65,10 +65,6 @@ struct odp_global_data_ro_t { /* Modifiable global data. Memory region is shared and synchronized amongst all * worker processes. */ struct odp_global_data_rw_t { - int inotify_pcapng_fd; - int inotify_watch_fd; - pthread_t inotify_thread; - int inotify_pcapng_is_running; odp_bool_t dpdk_initialized; odp_bool_t inline_timers; }; diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 57ea79f98..204f44838 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -25,6 +25,9 @@ int odp_thread_init_local(odp_thread_type_t type); int odp_thread_term_local(void); int odp_thread_term_global(void); +int _odp_pcapng_init_global(void); +int _odp_pcapng_term_global(void); + int odp_pool_init_global(void); int odp_pool_init_local(void); int odp_pool_term_global(void); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4954d5f04..097618a3e 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -97,6 +98,13 @@ int odp_pktio_init_global(void) } } + if (_ODP_PCAPNG) { + if (_odp_pcapng_init_global()) { + ODP_ERR("Failed to initialize pcapng\n"); + return -1; + } + } + return 0; } @@ -1277,6 +1285,12 @@ int odp_pktio_term_global(void) pktio_if); } + if (_ODP_PCAPNG) { + ret = _odp_pcapng_term_global(); + if (ret) + ODP_ERR("Failed to terminate pcapng\n"); + } + ret = odp_shm_free(odp_shm_lookup("_odp_pktio_entries")); if (ret != 0) ODP_ERR("shm free failed for _odp_pktio_entries"); diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c index e1f7ac08f..cf7cd978e 100644 --- a/platform/linux-generic/odp_pcapng.c +++ b/platform/linux-generic/odp_pcapng.c @@ -1,4 +1,5 @@ /* Copyright (c) 2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -8,11 +9,14 @@ #if defined(_ODP_PCAPNG) && _ODP_PCAPNG == 1 +#include <odp_pcapng.h> +#include <odp/api/plat/packet_inlines.h> +#include <odp/api/shared_memory.h> +#include <odp_init_internal.h> #include <odp_macros_internal.h> #include <odp_packet_io_internal.h> -#include <odp/api/plat/packet_inlines.h> #include <odp_posix_extensions.h> -#include <odp_pcapng.h> +#include <odp/api/spinlock.h> #include <errno.h> #include <fcntl.h> @@ -24,6 +28,50 @@ #include <sys/inotify.h> #include <sys/select.h> +typedef struct ODP_ALIGNED_CACHE { + odp_shm_t shm; + pktio_entry_t *entry[ODP_CONFIG_PKTIO_ENTRIES]; + int num_entries; + pthread_t inotify_thread; + int inotify_fd; + int inotify_watch_fd; + int inotify_is_running; + odp_spinlock_t lock; +} pcapng_global_t; + +static pcapng_global_t *pcapng_gbl; + +int _odp_pcapng_init_global(void) +{ + odp_shm_t shm; + + shm = odp_shm_reserve("_odp_pcapng_gbl", sizeof(pcapng_global_t), + ODP_PAGE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + return -1; + + pcapng_gbl = odp_shm_addr(shm); + + memset(pcapng_gbl, 0, sizeof(pcapng_global_t)); + pcapng_gbl->shm = shm; + + odp_spinlock_init(&pcapng_gbl->lock); + + return 0; +} + +int _odp_pcapng_term_global(void) +{ + int ret = 0; + + if (odp_shm_free(pcapng_gbl->shm)) { + ODP_ERR("shm free failed"); + ret = -1; + } + + return ret; +} + static void pcapng_drain_fifo(int fd) { char buffer[4096]; @@ -108,42 +156,66 @@ static int get_qidx_from_fifo(pktio_entry_t *entry, char *name) return -1; } +static pktio_entry_t *pktio_from_event(struct inotify_event *event) +{ + int i; + + odp_spinlock_lock(&pcapng_gbl->lock); + + for (i = 0; i < ODP_CONFIG_PKTIO_ENTRIES; i++) { + pktio_entry_t *entry = pcapng_gbl->entry[i]; + + if (entry == NULL) + continue; + + if (get_qidx_from_fifo(entry, event->name) != -1) { + odp_spinlock_unlock(&pcapng_gbl->lock); + return entry; + } + } + + odp_spinlock_unlock(&pcapng_gbl->lock); + + return NULL; +} + static void *inotify_update(void *arg) { - pktio_entry_t *entry = (pktio_entry_t *)arg; struct timeval time; ssize_t rdlen; int offset; char buffer[INOTIFY_BUF_LEN]; fd_set rfds; + int inotify_fd = *(int *)arg; while (1) { offset = 0; FD_ZERO(&rfds); - FD_SET(odp_global_rw->inotify_pcapng_fd, &rfds); + FD_SET(inotify_fd, &rfds); time.tv_sec = 2; time.tv_usec = 0; - select(odp_global_rw->inotify_pcapng_fd + 1, &rfds, NULL, - NULL, &time); - if (FD_ISSET(odp_global_rw->inotify_pcapng_fd, &rfds)) { - rdlen = read(odp_global_rw->inotify_pcapng_fd, - buffer, INOTIFY_BUF_LEN); + select(inotify_fd + 1, &rfds, NULL, NULL, &time); + if (FD_ISSET(inotify_fd, &rfds)) { + rdlen = read(inotify_fd, buffer, INOTIFY_BUF_LEN); while (offset < rdlen) { int qidx; struct inotify_event *event = (struct inotify_event *)(void *) &buffer[offset]; + pktio_entry_t *entry; - qidx = get_qidx_from_fifo(entry, event->name); - if (qidx == -1) { - offset += sizeof(struct inotify_event) + + offset += sizeof(struct inotify_event) + event->len; + + entry = pktio_from_event(event); + if (entry == NULL) + continue; + + qidx = get_qidx_from_fifo(entry, event->name); + if (qidx == -1) continue; - } inotify_event_handle(entry, qidx, event); - offset += sizeof(struct inotify_event) + - event->len; } } } @@ -222,24 +294,30 @@ int pcapng_prepare(pktio_entry_t *entry) entry->s.pcapng.fd[i] = fd; } + odp_spinlock_lock(&pcapng_gbl->lock); + /* already running from a previous pktio */ - if (odp_global_rw->inotify_pcapng_is_running == 1) + if (pcapng_gbl->inotify_is_running == 1) { + pcapng_gbl->entry[odp_pktio_index(entry->s.handle)] = entry; + pcapng_gbl->num_entries++; + odp_spinlock_unlock(&pcapng_gbl->lock); return 0; + } - odp_global_rw->inotify_pcapng_fd = -1; - odp_global_rw->inotify_watch_fd = -1; + pcapng_gbl->inotify_fd = -1; + pcapng_gbl->inotify_watch_fd = -1; - odp_global_rw->inotify_pcapng_fd = inotify_init(); - if (odp_global_rw->inotify_pcapng_fd == -1) { + pcapng_gbl->inotify_fd = inotify_init(); + if (pcapng_gbl->inotify_fd == -1) { ODP_ERR("can't init inotify. pcap disabled\n"); goto out_destroy; } - odp_global_rw->inotify_watch_fd = - inotify_add_watch(odp_global_rw->inotify_pcapng_fd, - PCAPNG_WATCH_DIR, IN_CLOSE | IN_OPEN); + pcapng_gbl->inotify_watch_fd = inotify_add_watch(pcapng_gbl->inotify_fd, + PCAPNG_WATCH_DIR, + IN_CLOSE | IN_OPEN); - if (odp_global_rw->inotify_watch_fd == -1) { + if (pcapng_gbl->inotify_watch_fd == -1) { ODP_ERR("can't register inotify for %s. pcap disabled\n", strerror(errno)); goto out_destroy; @@ -247,16 +325,23 @@ int pcapng_prepare(pktio_entry_t *entry) /* create a thread to poll inotify triggers */ pthread_attr_init(&attr); - ret = pthread_create(&odp_global_rw->inotify_thread, &attr, - inotify_update, entry); - if (ret) + ret = pthread_create(&pcapng_gbl->inotify_thread, &attr, inotify_update, + &pcapng_gbl->inotify_fd); + if (ret) { ODP_ERR("can't start inotify thread. pcap disabled\n"); - else - odp_global_rw->inotify_pcapng_is_running = 1; + } else { + pcapng_gbl->entry[odp_pktio_index(entry->s.handle)] = entry; + pcapng_gbl->num_entries++; + pcapng_gbl->inotify_is_running = 1; + } + + odp_spinlock_unlock(&pcapng_gbl->lock); return ret; out_destroy: + odp_spinlock_unlock(&pcapng_gbl->lock); + pcapng_destroy(entry); return ret; @@ -269,24 +354,36 @@ void pcapng_destroy(pktio_entry_t *entry) unsigned int max_queue = MAX(entry->s.num_in_queue, entry->s.num_out_queue); - if (odp_global_rw->inotify_pcapng_is_running == 1) { - ret = pthread_cancel(odp_global_rw->inotify_thread); + odp_spinlock_lock(&pcapng_gbl->lock); + + pcapng_gbl->entry[odp_pktio_index(entry->s.handle)] = NULL; + pcapng_gbl->num_entries--; + + if (pcapng_gbl->inotify_is_running == 1 && + pcapng_gbl->num_entries == 0) { + ret = pthread_cancel(pcapng_gbl->inotify_thread); if (ret) ODP_ERR("can't cancel inotify thread %s\n", strerror(errno)); + pcapng_gbl->inotify_is_running = 0; } - /* fd's will be -1 in case of any failure */ - ret = inotify_rm_watch(odp_global_rw->inotify_pcapng_fd, - odp_global_rw->inotify_watch_fd); - if (ret) - ODP_ERR("can't deregister inotify %s\n", strerror(errno)); + if (pcapng_gbl->num_entries == 0) { + /* fd's will be -1 in case of any failure */ + ret = inotify_rm_watch(pcapng_gbl->inotify_fd, + pcapng_gbl->inotify_watch_fd); + if (ret) + ODP_ERR("can't deregister inotify %s\n", + strerror(errno)); + + if (pcapng_gbl->inotify_fd != -1) + close(pcapng_gbl->inotify_fd); - if (odp_global_rw->inotify_pcapng_fd != -1) - close(odp_global_rw->inotify_pcapng_fd); + if (pcapng_gbl->inotify_watch_fd != -1) + close(pcapng_gbl->inotify_watch_fd); + } - if (odp_global_rw->inotify_watch_fd != -1) - close(odp_global_rw->inotify_watch_fd); + odp_spinlock_unlock(&pcapng_gbl->lock); for (i = 0; i < max_queue; i++) { char pcapng_name[128]; commit 03490694085060aec7de6d21ef674f461adcf373 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 24 12:57:06 2019 +0300 linux-gen: pcapng: set pipe read permissions Make pipe readable by other processes. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Jari Mustajärvi <jari.mustajarvi(a)nokia-bell-labs.com> diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c index 21fa7b2c5..e1f7ac08f 100644 --- a/platform/linux-generic/odp_pcapng.c +++ b/platform/linux-generic/odp_pcapng.c @@ -199,6 +199,10 @@ int pcapng_prepare(pktio_entry_t *entry) continue; } + if (chmod(pcapng_path, S_IRUSR | S_IRGRP)) + ODP_ERR("Failed to change file permission for %s %s\n", + pcapng_path, strerror(errno)); + fd = open(pcapng_path, O_RDWR | O_NONBLOCK); if (fd == -1) { ODP_ERR("Fail to open fifo\n"); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_global_data.h | 4 - platform/linux-generic/include/odp_init_internal.h | 3 + platform/linux-generic/include/odp_pcapng.h | 61 ++---- platform/linux-generic/odp_packet_io.c | 22 +- platform/linux-generic/odp_pcapng.c | 234 +++++++++++++++++---- 5 files changed, 227 insertions(+), 97 deletions(-) hooks/post-receive --

5 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-123-ge2786e3ed

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via e2786e3ed30405b16da8080e2b0ed11b0fd52fc7 (commit) via 6c34ea307f8d9ab91d4e3d752468996fbf3a9fc4 (commit) via ccd90637cf66ef20219719cf636be2e84a93b9ad (commit) via 22dcfae29a2dc7f0ee00c6d807db1f4424bf9c63 (commit) via 4f0e6037a7037c0879062f2b1ead0503f45ae623 (commit) via 47fae268aef777b8d523dca43d0b50f8139bc8cf (commit) via 2600af0ade3c254ba00a935a38647d6d15611586 (commit) via 6280e54ea0a69276f3e1cbadd981f28dd2fb253a (commit) via b78412a08ad0435ace4d2980a38fa44b1fddbf96 (commit) via 5422332ff596b8cef9d5518b7bff6ab9b4b38b09 (commit) via 9eeb94e6d03923a67779314c62e32e410e1272d8 (commit) via 064dbc1d3b0d284ae7ab4db5e20fa0f6f2ce8c56 (commit) from 78364dc1d53a1a4c4918ce0a82d02fe56f0abb54 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e2786e3ed30405b16da8080e2b0ed11b0fd52fc7 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 13 16:56:48 2019 +0300 api: update version number to 1.21.6 Increment version number to reflect timer API specification update and additional features. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/configure.ac b/configure.ac index 83765d9c9..8f9de1489 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.5]) ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [21]) -m4_define([odpapi_minor_version], [5]) +m4_define([odpapi_minor_version], [6]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) commit 6c34ea307f8d9ab91d4e3d752468996fbf3a9fc4 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 16 15:26:25 2019 +0300 validation: time: test min and hour constants Check that the new constants are defined. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index 38c0906ba..2113c5461 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -28,6 +28,17 @@ static void time_test_constants(void) { uint64_t ns; + CU_ASSERT(ODP_TIME_USEC_IN_NS == 1000); + + ns = ODP_TIME_HOUR_IN_NS; + CU_ASSERT(ns == 60 * ODP_TIME_MIN_IN_NS); + ns = ODP_TIME_MIN_IN_NS; + CU_ASSERT(ns == 60 * ODP_TIME_SEC_IN_NS); + ns = ODP_TIME_SEC_IN_NS; + CU_ASSERT(ns == 1000 * ODP_TIME_MSEC_IN_NS); + ns = ODP_TIME_MSEC_IN_NS; + CU_ASSERT(ns == 1000 * ODP_TIME_USEC_IN_NS); + ns = ODP_TIME_SEC_IN_NS / 1000; CU_ASSERT(ns == ODP_TIME_MSEC_IN_NS); ns /= 1000; commit ccd90637cf66ef20219719cf636be2e84a93b9ad Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 16 15:16:05 2019 +0300 api: time: add defines for minute and hour Defines for a minute and an hour are useful e.g. when setting timers for a bit longer (background, session lifetime, etc) timeouts. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/time.h b/include/odp/api/spec/time.h index f79f4a8ac..b96fc077e 100644 --- a/include/odp/api/spec/time.h +++ b/include/odp/api/spec/time.h @@ -22,10 +22,20 @@ extern "C" { * @{ */ -/* Time in nanoseconds */ -#define ODP_TIME_USEC_IN_NS 1000ULL /**< Microsecond in nsec */ -#define ODP_TIME_MSEC_IN_NS 1000000ULL /**< Millisecond in nsec */ -#define ODP_TIME_SEC_IN_NS 1000000000ULL /**< Second in nsec */ +/** A microsecond in nanoseconds */ +#define ODP_TIME_USEC_IN_NS 1000ULL + +/** A millisecond in nanoseconds */ +#define ODP_TIME_MSEC_IN_NS 1000000ULL + +/** A second in nanoseconds */ +#define ODP_TIME_SEC_IN_NS 1000000000ULL + +/** A minute in nanoseconds */ +#define ODP_TIME_MIN_IN_NS 60000000000ULL + +/** An hour in nanoseconds */ +#define ODP_TIME_HOUR_IN_NS 3600000000000ULL /** * @typedef odp_time_t commit 22dcfae29a2dc7f0ee00c6d807db1f4424bf9c63 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed May 15 17:21:19 2019 +0300 validation: timer: add timeout limit tests Test min/max timeouts with the highest resolution and longest timeout parameters. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 56702ae2d..c0527c2e1 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -699,7 +699,7 @@ static void timer_test_sched_queue(void) timer_test_queue_type(ODP_QUEUE_TYPE_SCHED); } -static void timer_test_odp_timer_cancel(void) +static void timer_test_cancel(void) { odp_pool_t pool; odp_pool_param_t params; @@ -786,6 +786,213 @@ static void timer_test_odp_timer_cancel(void) CU_FAIL_FATAL("Failed to destroy pool"); } +static void timer_test_tmo_limit(odp_queue_type_t queue_type, + int max_res, int min) +{ + odp_timer_capability_t timer_capa; + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_queue_param_t queue_param; + odp_timer_pool_param_t timer_param; + odp_timer_pool_t timer_pool; + odp_queue_t queue; + odp_timeout_t tmo; + odp_event_t ev; + odp_time_t t1, t2; + uint64_t res_ns, min_tmo, max_tmo; + uint64_t tmo_ns, tmo_tick, diff_ns, max_wait; + int i, ret, num_tmo; + int num = 5; + odp_timer_t timer[num]; + + memset(&timer_capa, 0, sizeof(timer_capa)); + ret = odp_timer_capability(ODP_CLOCK_CPU, &timer_capa); + CU_ASSERT_FATAL(ret == 0); + + if (max_res) { + /* Maximum resolution parameters */ + res_ns = timer_capa.max_res.res_ns; + min_tmo = timer_capa.max_res.min_tmo; + max_tmo = timer_capa.max_res.max_tmo; + } else { + /* Maximum timeout parameters */ + res_ns = timer_capa.max_tmo.res_ns; + min_tmo = timer_capa.max_tmo.min_tmo; + max_tmo = timer_capa.max_tmo.max_tmo; + } + + memset(&timer_param, 0, sizeof(timer_param)); + timer_param.res_ns = res_ns; + timer_param.min_tmo = min_tmo; + timer_param.max_tmo = max_tmo; + timer_param.num_timers = num; + timer_param.clk_src = ODP_CLOCK_CPU; + + timer_pool = odp_timer_pool_create("timer_pool", &timer_param); + if (timer_pool == ODP_TIMER_POOL_INVALID) + CU_FAIL_FATAL("Timer pool create failed"); + + odp_timer_pool_start(); + + odp_pool_param_init(&pool_param); + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num; + + pool = odp_pool_create("timeout_pool", &pool_param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + odp_queue_param_init(&queue_param); + if (queue_type == ODP_QUEUE_TYPE_SCHED) { + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + } + + queue = odp_queue_create("timeout_queue", &queue_param); + if (queue == ODP_QUEUE_INVALID) + CU_FAIL_FATAL("Queue create failed"); + + if (min) + tmo_ns = min_tmo; + else + tmo_ns = max_tmo; + + tmo_tick = odp_timer_ns_to_tick(timer_pool, tmo_ns); + /* Min_tmo maybe zero. Wait min timeouts at least 20ms + resolution */ + max_wait = (20 * ODP_TIME_MSEC_IN_NS + res_ns + 10 * tmo_ns); + + LOG_DBG("\nTimer pool parameters:\n"); + LOG_DBG(" res_ns %" PRIu64 "\n", timer_param.res_ns); + LOG_DBG(" min_tmo %" PRIu64 "\n", timer_param.min_tmo); + LOG_DBG(" max_tmo %" PRIu64 "\n", timer_param.max_tmo); + LOG_DBG(" tmo_ns %" PRIu64 "\n", tmo_ns); + LOG_DBG(" tmo_tick %" PRIu64 "\n\n", tmo_tick); + + for (i = 0; i < num; i++) { + timer[i] = odp_timer_alloc(timer_pool, queue, NULL); + CU_ASSERT_FATAL(timer[i] != ODP_TIMER_INVALID); + } + + num_tmo = 0; + + for (i = 0; i < num; i++) { + tmo = odp_timeout_alloc(pool); + ev = odp_timeout_to_event(tmo); + + CU_ASSERT(ev != ODP_EVENT_INVALID); + + t1 = odp_time_local(); + ret = odp_timer_set_rel(timer[i], tmo_tick, &ev); + + if (ret == ODP_TIMER_TOOEARLY) + LOG_DBG("Too early %i\n", i); + else if (ret == ODP_TIMER_TOOLATE) + LOG_DBG("Too late %i\n", i); + else if (ret == ODP_TIMER_NOEVENT) + LOG_DBG("No event %i\n", i); + + CU_ASSERT(ret == ODP_TIMER_SUCCESS); + + if (min) { + /* Min timeout - wait for events */ + int break_loop = 0; + + while (1) { + if (queue_type == ODP_QUEUE_TYPE_SCHED) + ev = odp_schedule(NULL, + ODP_SCHED_NO_WAIT); + else + ev = odp_queue_deq(queue); + + t2 = odp_time_local(); + diff_ns = odp_time_diff_ns(t2, t1); + + if (ev != ODP_EVENT_INVALID) { + odp_event_free(ev); + num_tmo++; + break_loop = 1; + LOG_DBG("Timeout [%i]: %" PRIu64 + " nsec\n", i, diff_ns); + continue; + } + + /* Ensure that schedule context is free */ + if (break_loop) + break; + + /* Give up after waiting max wait time */ + if (diff_ns > max_wait) + break; + } + } else { + /* Max timeout - cancel events */ + ev = ODP_EVENT_INVALID; + + ret = odp_timer_cancel(timer[i], &ev); + t2 = odp_time_local(); + diff_ns = odp_time_diff_ns(t2, t1); + + CU_ASSERT(ret == 0); + CU_ASSERT(ev != ODP_EVENT_INVALID); + + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + + LOG_DBG("Cancelled [%i]: %" PRIu64 + " nsec\n", i, diff_ns); + } + } + + if (min) + CU_ASSERT(num_tmo == num); + + for (i = 0; i < num; i++) + CU_ASSERT(odp_timer_free(timer[i]) == ODP_EVENT_INVALID); + + odp_timer_pool_destroy(timer_pool); + CU_ASSERT(odp_queue_destroy(queue) == 0); + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +static void timer_test_max_res_min_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 1, 1); +} + +static void timer_test_max_res_min_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 1, 1); +} + +static void timer_test_max_res_max_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 1, 0); +} + +static void timer_test_max_res_max_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 1, 0); +} + +static void timer_test_max_tmo_min_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 0, 1); +} + +static void timer_test_max_tmo_min_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 0, 1); +} + +static void timer_test_max_tmo_max_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 0, 0); +} + +static void timer_test_max_tmo_max_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 0, 0); +} + /* Handle a received (timeout) event */ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) { @@ -1076,8 +1283,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) return CU_get_number_of_failures(); } -/* Timer test case entrypoint */ -static void timer_test_odp_timer_all(void) +static void timer_test_all(void) { int rc; odp_pool_param_t params; @@ -1240,10 +1446,18 @@ odp_testinfo_t timer_suite[] = { ODP_TEST_INFO(timer_test_buf_event_sched), ODP_TEST_INFO(timer_test_pkt_event_plain), ODP_TEST_INFO(timer_test_pkt_event_sched), + ODP_TEST_INFO(timer_test_cancel), + ODP_TEST_INFO(timer_test_max_res_min_tmo_plain), + ODP_TEST_INFO(timer_test_max_res_min_tmo_sched), + ODP_TEST_INFO(timer_test_max_res_max_tmo_plain), + ODP_TEST_INFO(timer_test_max_res_max_tmo_sched), + ODP_TEST_INFO(timer_test_max_tmo_min_tmo_plain), + ODP_TEST_INFO(timer_test_max_tmo_min_tmo_sched), + ODP_TEST_INFO(timer_test_max_tmo_max_tmo_plain), + ODP_TEST_INFO(timer_test_max_tmo_max_tmo_sched), ODP_TEST_INFO(timer_test_plain_queue), ODP_TEST_INFO(timer_test_sched_queue), - ODP_TEST_INFO(timer_test_odp_timer_cancel), - ODP_TEST_INFO(timer_test_odp_timer_all), + ODP_TEST_INFO(timer_test_all), ODP_TEST_INFO_NULL, }; commit 4f0e6037a7037c0879062f2b1ead0503f45ae623 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed May 15 17:16:50 2019 +0300 linux-gen: timer: add warm up period Added warm up period into posix timer pool startup to avoid the first timeout to slip. Otherwise, timer pthread receives the first signal after about 15ms and first timeout of the pool slips. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6cb8c9b39..8e98d51ac 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -195,9 +195,11 @@ typedef struct timer_pool_s { odp_shm_t shm; timer_t timerid; int notify_overrun; - pthread_t timer_thread; /* pthread_t of timer thread */ - pid_t timer_thread_id; /* gettid() for timer thread */ - int timer_thread_exit; /* request to exit for timer thread */ + pthread_t thr_pthread; /* pthread_t of timer thread */ + pid_t thr_pid; /* gettid() for timer thread */ + int thr_warm_up; /* number of warm up rounds */ + odp_atomic_u32_t thr_ready; /* thread ready from warm up */ + int thr_exit; /* request to exit for timer thread */ } timer_pool_t; /* Timer pool index must fit into 8 bits with one index value reserved to @@ -381,8 +383,8 @@ static void stop_timer_thread(timer_pool_t *tp) int ret; ODP_DBG("stop\n"); - tp->timer_thread_exit = 1; - ret = pthread_join(tp->timer_thread, NULL); + tp->thr_exit = 1; + ret = pthread_join(tp->thr_pthread, NULL); if (ret != 0) ODP_ABORT("unable to join thread, err %d\n", ret); } @@ -954,26 +956,41 @@ static void *timer_thread(void *arg) int ret; struct timespec tmo; siginfo_t si; + int warm_up = tp->thr_warm_up; + int num = 0; - tp->timer_thread_id = (pid_t)syscall(SYS_gettid); - - tmo.tv_sec = 0; + tmo.tv_sec = 0; tmo.tv_nsec = ODP_TIME_MSEC_IN_NS * 100; + /* Unblock sigalarm in this thread */ sigemptyset(&sigset); - /* unblock sigalarm in this thread */ sigprocmask(SIG_BLOCK, &sigset, NULL); - sigaddset(&sigset, SIGALRM); + /* Signal that this thread has started */ + odp_mb_full(); + tp->thr_pid = (pid_t)syscall(SYS_gettid); + odp_mb_full(); + while (1) { ret = sigtimedwait(&sigset, &si, &tmo); - if (tp->timer_thread_exit) { - tp->timer_thread_id = 0; + + if (tp->thr_exit) { + tp->thr_pid = 0; return NULL; } - if (ret > 0) - timer_notify(tp); + + if (ret <= 0) + continue; + + timer_notify(tp); + + if (num < warm_up) { + num++; + + if (num == warm_up) + odp_atomic_store_rel_u32(&tp->thr_ready, 1); + } } return NULL; @@ -1067,30 +1084,36 @@ static void itimer_init(timer_pool_t *tp) ODP_DBG("Creating POSIX timer for timer pool %s, period %" PRIu64" ns\n", tp->name, tp->param.res_ns); - tp->timer_thread_id = 0; - ret = pthread_create(&tp->timer_thread, NULL, timer_thread, tp); + res = tp->param.res_ns; + sec = res / ODP_TIME_SEC_IN_NS; + nsec = res - sec * ODP_TIME_SEC_IN_NS; + + tp->thr_pid = 0; + tp->thr_warm_up = 1; + + /* 20ms warm up */ + if (res < (20 * ODP_TIME_MSEC_IN_NS)) + tp->thr_warm_up = (20 * ODP_TIME_MSEC_IN_NS) / res; + + odp_atomic_init_u32(&tp->thr_ready, 0); + ret = pthread_create(&tp->thr_pthread, NULL, timer_thread, tp); if (ret) ODP_ABORT("unable to create timer thread\n"); - /* wait thread set tp->timer_thread_id */ - do { + /* wait thread set tp->thr_pid */ + while (tp->thr_pid == 0) sched_yield(); - } while (tp->timer_thread_id == 0); memset(&sigev, 0, sizeof(sigev)); sigev.sigev_notify = SIGEV_THREAD_ID; sigev.sigev_value.sival_ptr = tp; - sigev._sigev_un._tid = tp->timer_thread_id; + sigev._sigev_un._tid = tp->thr_pid; sigev.sigev_signo = SIGALRM; if (timer_create(CLOCK_MONOTONIC, &sigev, &tp->timerid)) ODP_ABORT("timer_create() returned error %s\n", strerror(errno)); - res = tp->param.res_ns; - sec = res / ODP_TIME_SEC_IN_NS; - nsec = res - sec * ODP_TIME_SEC_IN_NS; - memset(&ispec, 0, sizeof(ispec)); ispec.it_interval.tv_sec = (time_t)sec; ispec.it_interval.tv_nsec = (long)nsec; @@ -1100,6 +1123,11 @@ static void itimer_init(timer_pool_t *tp) if (timer_settime(tp->timerid, 0, &ispec, NULL)) ODP_ABORT("timer_settime() returned error %s\n", strerror(errno)); + + /* Wait response from timer thread that warm up signals have been + * processed. Warm up helps avoiding overrun on the first timeout. */ + while (odp_atomic_load_acq_u32(&tp->thr_ready) == 0) + sched_yield(); } static void itimer_fini(timer_pool_t *tp) commit 47fae268aef777b8d523dca43d0b50f8139bc8cf Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 14 16:57:54 2019 +0300 validation: timer: add capability test Add new test case for timer and resolution capability. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 1faef4e64..56702ae2d 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -181,6 +181,43 @@ static int timer_global_term(odp_instance_t inst) return 0; } +static void timer_test_capa(void) +{ + odp_timer_capability_t capa; + odp_timer_res_capability_t res_capa; + int ret; + + memset(&capa, 0, sizeof(capa)); + ret = odp_timer_capability(ODP_CLOCK_CPU, &capa); + CU_ASSERT_FATAL(ret == 0); + + CU_ASSERT(capa.highest_res_ns == capa.max_res.res_ns); + CU_ASSERT(capa.max_res.res_ns < capa.max_res.max_tmo); + CU_ASSERT(capa.max_res.min_tmo < capa.max_res.max_tmo); + CU_ASSERT(capa.max_tmo.res_ns < capa.max_tmo.max_tmo); + CU_ASSERT(capa.max_tmo.min_tmo < capa.max_tmo.max_tmo); + + /* Set max resolution */ + memset(&res_capa, 0, sizeof(res_capa)); + res_capa.res_ns = capa.max_res.res_ns; + + ret = odp_timer_res_capability(ODP_CLOCK_CPU, &res_capa); + CU_ASSERT_FATAL(ret == 0); + CU_ASSERT(res_capa.res_ns == capa.max_res.res_ns); + CU_ASSERT(res_capa.min_tmo == capa.max_res.min_tmo); + CU_ASSERT(res_capa.max_tmo == capa.max_res.max_tmo); + + /* Set max timeout */ + memset(&res_capa, 0, sizeof(res_capa)); + res_capa.max_tmo = capa.max_tmo.max_tmo; + + ret = odp_timer_res_capability(ODP_CLOCK_CPU, &res_capa); + CU_ASSERT_FATAL(ret == 0); + CU_ASSERT(res_capa.max_tmo == capa.max_tmo.max_tmo); + CU_ASSERT(res_capa.min_tmo == capa.max_tmo.min_tmo); + CU_ASSERT(res_capa.res_ns == capa.max_tmo.res_ns); +} + static void timer_test_timeout_pool_alloc(void) { odp_pool_t pool; @@ -1193,6 +1230,7 @@ static void timer_test_odp_timer_all(void) } odp_testinfo_t timer_suite[] = { + ODP_TEST_INFO(timer_test_capa), ODP_TEST_INFO(timer_test_timeout_pool_alloc), ODP_TEST_INFO(timer_test_timeout_pool_free), ODP_TEST_INFO(timer_pool_create_destroy), commit 2600af0ade3c254ba00a935a38647d6d15611586 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 14 16:39:02 2019 +0300 validation: timer: use resolution capability Limit min/max timeout values according to the used resolution. Most tests use the same resolution and min/max timeout settings. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index ddccec2b1..1faef4e64 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -31,9 +31,7 @@ #define EXTRA_TIMERS 256 #define NAME "timer_pool" -#define RES (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MIN_TMO (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MAX_TMO (1000000 * ODP_TIME_MSEC_IN_NS) +#define THREE_POINT_THREE_MSEC (10 * ODP_TIME_MSEC_IN_NS / 3) #define USER_PTR ((void *)0xdead) #define TICK_INVALID (~(uint64_t)0) @@ -46,19 +44,32 @@ struct test_timer { }; typedef struct { + /* Default resolution / timeout parameters */ + struct { + uint64_t res_ns; + uint64_t min_tmo; + uint64_t max_tmo; + } param; + /* Timeout pool handle used by all threads */ odp_pool_t tbp; + /* Timer pool handle used by all threads */ odp_timer_pool_t tp; + /* Barrier for thread synchronization */ odp_barrier_t test_barrier; + /* Count of timeouts delivered too late */ odp_atomic_u32_t ndelivtoolate; + /* Sum of all allocated timers from all threads. Thread-local * caches may make this number lower than the capacity of the pool */ odp_atomic_u32_t timers_allocated; + /* Number of timers allocated per thread */ uint32_t timers_per_thread; + } global_shared_mem_t; static global_shared_mem_t *global_mem; @@ -68,6 +79,10 @@ static int timer_global_init(odp_instance_t *inst) odp_shm_t global_shm; odp_init_t init_param; odph_helper_options_t helper_options; + odp_timer_capability_t capa; + odp_timer_res_capability_t res_capa; + uint64_t res_ns, min_tmo, max_tmo; + unsigned int range; if (odph_options(&helper_options)) { fprintf(stderr, "error: odph_options() failed.\n"); @@ -100,6 +115,46 @@ static int timer_global_init(odp_instance_t *inst) /* Configure scheduler */ odp_schedule_config(NULL); + memset(&capa, 0, sizeof(capa)); + if (odp_timer_capability(ODP_CLOCK_CPU, &capa)) { + fprintf(stderr, "Timer capability failed\n"); + return -1; + } + + /* By default 20 msec resolution */ + res_ns = 20 * ODP_TIME_MSEC_IN_NS; + if (res_ns < capa.max_res.res_ns) + res_ns = capa.max_res.res_ns; + + memset(&res_capa, 0, sizeof(res_capa)); + res_capa.res_ns = res_ns; + + if (odp_timer_res_capability(ODP_CLOCK_CPU, &res_capa)) { + fprintf(stderr, "Timer resolution capability failed\n"); + return -1; + } + + /* Try to keep min timeout error margin within +-20% */ + min_tmo = 5 * res_ns; + if (min_tmo < res_capa.min_tmo) + min_tmo = res_capa.min_tmo; + + /* Max 1 hour */ + max_tmo = 3600 * ODP_TIME_SEC_IN_NS; + if (max_tmo > res_capa.max_tmo) + max_tmo = res_capa.max_tmo; + + range = (RANGE_MS * 1000) + THREE_POINT_THREE_MSEC; + if ((max_tmo - min_tmo) < range) { + fprintf(stderr, "Validation test needs %u msec range\n", range); + return -1; + } + + /* Default parameters for test cases */ + global_mem->param.res_ns = res_ns; + global_mem->param.min_tmo = min_tmo; + global_mem->param.max_tmo = max_tmo; + return 0; } @@ -213,25 +268,19 @@ static void timer_test_timeout_pool_free(void) static void timer_pool_create_destroy(void) { - odp_timer_capability_t timer_capa; odp_timer_pool_param_t tparam; odp_timer_pool_info_t info; odp_timer_pool_t tp[2]; odp_timer_t tim; odp_queue_t queue; - uint64_t res_ns; queue = odp_queue_create("timer_queue", NULL); CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); - CU_ASSERT_FATAL(odp_timer_capability(ODP_CLOCK_CPU, &timer_capa) == 0); - - res_ns = 10 * timer_capa.highest_res_ns; - memset(&tparam, 0, sizeof(odp_timer_pool_param_t)); - tparam.res_ns = res_ns; - tparam.min_tmo = 5 * res_ns; - tparam.max_tmo = 10000 * tparam.min_tmo; + tparam.res_ns = global_mem->param.res_ns; + tparam.min_tmo = global_mem->param.min_tmo; + tparam.max_tmo = global_mem->param.max_tmo; tparam.num_timers = 100; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -290,7 +339,6 @@ static void timer_test_event_type(odp_queue_type_t queue_type, odp_pool_t pool; odp_pool_param_t pool_param; odp_queue_param_t queue_param; - odp_timer_capability_t timer_capa; odp_timer_pool_param_t timer_param; odp_timer_pool_t timer_pool; odp_queue_t queue; @@ -299,24 +347,16 @@ static void timer_test_event_type(odp_queue_type_t queue_type, odp_packet_t pkt; odp_event_t ev; odp_time_t t1, t2; - uint64_t res_ns, period_ns, period_tick, duration_ns; + uint64_t period_ns, period_tick, duration_ns; int i, ret, num_tmo; int num = 5; odp_timer_t timer[num]; - if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) - CU_FAIL_FATAL("Timer capability failed") - - res_ns = 20 * ODP_TIME_MSEC_IN_NS; - - if (timer_capa.highest_res_ns > res_ns) - res_ns = timer_capa.highest_res_ns; - memset(&timer_param, 0, sizeof(timer_param)); - timer_param.res_ns = res_ns; - timer_param.min_tmo = 5 * res_ns; - period_ns = 2 * timer_param.min_tmo; - timer_param.max_tmo = 100 * period_ns; + timer_param.res_ns = global_mem->param.res_ns; + timer_param.min_tmo = global_mem->param.min_tmo; + period_ns = 2 * global_mem->param.min_tmo; + timer_param.max_tmo = global_mem->param.max_tmo; timer_param.num_timers = num; timer_param.clk_src = ODP_CLOCK_CPU; @@ -478,7 +518,6 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) uint64_t res_ns, period_ns, period_tick, test_period; uint64_t diff_period, diff_test; odp_pool_param_t params; - odp_timer_capability_t timer_capa; odp_time_t t0, t1, t2; odp_pool_param_init(&params); @@ -488,17 +527,11 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) pool = odp_pool_create("timeout_pool", &params); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); - if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) - CU_FAIL_FATAL("Timer capability failed") - - res_ns = 20 * ODP_TIME_MSEC_IN_NS; + res_ns = global_mem->param.res_ns; - if (timer_capa.highest_res_ns > res_ns) - res_ns = timer_capa.highest_res_ns; - - tparam.res_ns = res_ns; - tparam.min_tmo = 5 * res_ns; - tparam.max_tmo = 10000 * tparam.min_tmo; + tparam.res_ns = global_mem->param.res_ns; + tparam.min_tmo = global_mem->param.min_tmo; + tparam.max_tmo = global_mem->param.max_tmo; tparam.num_timers = num + 1; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -641,7 +674,6 @@ static void timer_test_odp_timer_cancel(void) odp_timeout_t tmo; odp_timer_set_t rc; uint64_t tick; - odp_timer_capability_t timer_capa; odp_pool_param_init(&params); params.type = ODP_POOL_TIMEOUT; @@ -652,13 +684,9 @@ static void timer_test_odp_timer_cancel(void) if (pool == ODP_POOL_INVALID) CU_FAIL_FATAL("Timeout pool create failed"); - if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) - CU_FAIL_FATAL("Get timer capability failed") - - tparam.res_ns = MAX(100 * ODP_TIME_MSEC_IN_NS, - timer_capa.highest_res_ns); - tparam.min_tmo = 1 * ODP_TIME_SEC_IN_NS; - tparam.max_tmo = 10 * ODP_TIME_SEC_IN_NS; + tparam.res_ns = global_mem->param.res_ns; + tparam.min_tmo = global_mem->param.min_tmo; + tparam.max_tmo = global_mem->param.max_tmo; tparam.num_timers = 1; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -682,7 +710,7 @@ static void timer_test_odp_timer_cancel(void) if (ev == ODP_EVENT_INVALID) CU_FAIL_FATAL("Failed to allocate timeout"); - tick = odp_timer_ns_to_tick(tp, 2 * ODP_TIME_SEC_IN_NS); + tick = odp_timer_ns_to_tick(tp, tparam.max_tmo / 2); rc = odp_timer_set_rel(tim, tick, &ev); if (rc != ODP_TIMER_SUCCESS) @@ -826,6 +854,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) odp_timer_pool_t tp = global_mem->tp; odp_pool_t tbp = global_mem->tbp; uint32_t num_timers = global_mem->timers_per_thread; + uint64_t min_tmo = global_mem->param.min_tmo; queue = odp_queue_create("timer_queue", NULL); if (queue == ODP_QUEUE_INVALID) @@ -863,7 +892,8 @@ static int worker_entrypoint(void *arg TEST_UNUSED) /* Initial set all timers with a random expiration time */ nset = 0; for (i = 0; i < allocated; i++) { - nsec = MIN_TMO + (rand_r(&seed) % RANGE_MS) * 1000000ULL; + nsec = min_tmo + THREE_POINT_THREE_MSEC + + (rand_r(&seed) % RANGE_MS) * 1000000ULL; tck = odp_timer_current_tick(tp) + odp_timer_ns_to_tick(tp, nsec); timer_rc = odp_timer_set_abs(tt[i].tim, tck, &tt[i].ev); @@ -918,7 +948,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) /* Timer active => reset */ nreset++; - nsec = MIN_TMO + + nsec = min_tmo + THREE_POINT_THREE_MSEC + (rand_r(&seed) % RANGE_MS) * 1000000ULL; tck = odp_timer_ns_to_tick(tp, nsec); @@ -1018,7 +1048,7 @@ static void timer_test_odp_timer_all(void) odp_cpumask_t unused; odp_timer_pool_info_t tpinfo; uint64_t ns, tick, ns2; - uint64_t resolution_ns; + uint64_t res_ns, min_tmo, max_tmo; uint32_t timers_allocated; pthrd_arg thrdarg; odp_pool_capability_t pool_capa; @@ -1065,10 +1095,13 @@ static void timer_test_odp_timer_all(void) tbp = global_mem->tbp; /* Create a timer pool */ - resolution_ns = MAX(RES, timer_capa.highest_res_ns); - tparam.res_ns = resolution_ns; - tparam.min_tmo = MIN_TMO; - tparam.max_tmo = MAX_TMO; + res_ns = global_mem->param.res_ns; + max_tmo = global_mem->param.max_tmo; + min_tmo = global_mem->param.min_tmo; + + tparam.res_ns = res_ns; + tparam.min_tmo = min_tmo; + tparam.max_tmo = max_tmo; tparam.num_timers = num_timers; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -1083,10 +1116,9 @@ static void timer_test_odp_timer_all(void) if (odp_timer_pool_info(tp, &tpinfo) != 0) CU_FAIL("odp_timer_pool_info"); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); - CU_ASSERT(tpinfo.param.res_ns == MAX(RES, - timer_capa.highest_res_ns)); - CU_ASSERT(tpinfo.param.min_tmo == MIN_TMO); - CU_ASSERT(tpinfo.param.max_tmo == MAX_TMO); + CU_ASSERT(tpinfo.param.res_ns == res_ns); + CU_ASSERT(tpinfo.param.min_tmo == min_tmo); + CU_ASSERT(tpinfo.param.max_tmo == max_tmo); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); LOG_DBG("Timer pool handle: %" PRIu64 "\n", odp_timer_pool_to_u64(tp)); @@ -1106,17 +1138,17 @@ static void timer_test_odp_timer_all(void) ns2 = odp_timer_tick_to_ns(tp, tick); CU_ASSERT(ns2 == 0); - for (ns = resolution_ns; ns < MAX_TMO; ns += resolution_ns) { + for (ns = res_ns; ns < max_tmo; ns += res_ns) { tick = odp_timer_ns_to_tick(tp, ns); ns2 = odp_timer_tick_to_ns(tp, tick); - if (ns2 < ns - resolution_ns) { + if (ns2 < ns - res_ns) { LOG_DBG("FAIL ns:%" PRIu64 " tick:%" PRIu64 " ns2:%" PRIu64 "\n", ns, tick, ns2); CU_FAIL("tick conversion: nsec too small\n"); } - if (ns2 > ns + resolution_ns) { + if (ns2 > ns + res_ns) { LOG_DBG("FAIL ns:%" PRIu64 " tick:%" PRIu64 " ns2:%" PRIu64 "\n", ns, tick, ns2); CU_FAIL("tick conversion: nsec too large\n"); commit 6280e54ea0a69276f3e1cbadd981f28dd2fb253a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 14 14:08:14 2019 +0300 linux-gen: timer: implement new capability features Timer implementation does not have limits to timeout values. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6446b1c91..6cb8c9b39 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -70,6 +70,9 @@ * for checking the freshness of received timeouts */ #define TMO_INACTIVE ((uint64_t)0x8000000000000000) +/* Max timeout in capability. One year in nsec (0x0070 09D3 2DA3 0000). */ +#define MAX_TMO_NSEC (365 * 24 * 3600 * ODP_TIME_SEC_IN_NS) + /****************************************************************************** * Mutual exclusion in the absence of CAS16 *****************************************************************************/ @@ -1114,18 +1117,49 @@ static void itimer_fini(timer_pool_t *tp) int odp_timer_capability(odp_timer_clk_src_t clk_src, odp_timer_capability_t *capa) { - int ret = 0; + if (clk_src != ODP_CLOCK_CPU) { + ODP_ERR("Only CPU clock source supported\n"); + return -1; + } - if (clk_src == ODP_CLOCK_CPU) { - capa->max_pools_combined = MAX_TIMER_POOLS; - capa->max_pools = MAX_TIMER_POOLS; - capa->max_timers = 0; - capa->highest_res_ns = timer_global->highest_res_ns; - } else { - ODP_ERR("ODP timer system doesn't support external clock source currently\n"); - ret = -1; + memset(capa, 0, sizeof(odp_timer_capability_t)); + + capa->max_pools_combined = MAX_TIMER_POOLS; + capa->max_pools = MAX_TIMER_POOLS; + capa->max_timers = 0; + capa->highest_res_ns = timer_global->highest_res_ns; + capa->max_res.res_ns = timer_global->highest_res_ns; + capa->max_res.min_tmo = 0; + capa->max_res.max_tmo = MAX_TMO_NSEC; + capa->max_tmo.res_ns = timer_global->highest_res_ns; + capa->max_tmo.min_tmo = 0; + capa->max_tmo.max_tmo = MAX_TMO_NSEC; + + return 0; +} + +int odp_timer_res_capability(odp_timer_clk_src_t clk_src, + odp_timer_res_capability_t *res_capa) +{ + if (clk_src != ODP_CLOCK_CPU) { + ODP_ERR("Only CPU clock source supported\n"); + return -1; + } + + if (res_capa->min_tmo) { + ODP_ERR("Only res_ns or max_tmo based quaries supported\n"); + return -1; } - return ret; + + if (res_capa->res_ns) { + res_capa->min_tmo = 0; + res_capa->max_tmo = MAX_TMO_NSEC; + } else { /* max_tmo */ + res_capa->min_tmo = 0; + res_capa->res_ns = timer_global->highest_res_ns; + } + + return 0; } odp_timer_pool_t odp_timer_pool_create(const char *name, commit b78412a08ad0435ace4d2980a38fa44b1fddbf96 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed May 8 17:15:56 2019 +0300 api: timer: add resolution capability Typically, timer implementation needs to trade-off between highest resolution and longest timeout. Add new capability information and function to check limits between resolution and maximum timeout length. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index c2bf942dc..0e06a9030 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -135,6 +135,21 @@ typedef struct { } odp_timer_pool_param_t; +/** + * Timer resolution capability + */ +typedef struct { + /** Timeout resolution in nanoseconds */ + uint64_t res_ns; + + /** Minimum relative timeout in nanoseconds */ + uint64_t min_tmo; + + /** Maximum relative timeout in nanoseconds */ + uint64_t max_tmo; + +} odp_timer_res_capability_t; + /** * Timer capability */ @@ -160,8 +175,35 @@ typedef struct { * This defines the highest resolution supported by a timer. * It's the minimum valid value for 'res_ns' timer pool * parameter. + * + * This value is equal to 'max_res.res_ns' capability. */ uint64_t highest_res_ns; + + /** + * Maximum resolution + * + * This defines the highest resolution supported by a timer, with + * limits to min/max timeout values. The highest resolution for a timer + * pool is defined by 'max_res.res_ns', therefore it's the minimum value + * for 'res_ns' timer pool parameter. When this resolution is used: + * - 'min_tmo' parameter value must be in minimum 'max_res.min_tmo' + * - 'max_tmo' parameter value must be in maximum 'max_res.max_tmo' + */ + odp_timer_res_capability_t max_res; + + /** + * Maximum timeout length + * + * This defines the maximum relative timeout value supported by a timer, + * with limits to min timeout and max resolution values. The maximum + * value for 'max_tmo' timer pool parameter is defined by + * 'max_tmo.max_tmo'. When this max timeout value is used: + * - 'min_tmo' parameter value must be in minimum 'max_tmo.min_tmo' + * - 'res_ns' parameter value must be in minimum 'max_tmo.res_ns' + */ + odp_timer_res_capability_t max_tmo; + } odp_timer_capability_t; /** @@ -178,6 +220,28 @@ typedef struct { int odp_timer_capability(odp_timer_clk_src_t clk_src, odp_timer_capability_t *capa); +/** + * Timer resolution capability + * + * This function fills in capability limits for timer pool resolution and + * min/max timeout values, based on either resolution or maximum timeout. + * Set the required value to 'res_ns' or 'max_tmo', and set other fields to + * zero. A successful call fills in the other two fields. The call returns + * a failure, if the user defined value ('res_ns' or 'max_tmo)' exceeds + * capability limits. Outputted values are minimums for 'res_ns' and 'min_tmo', + * and a maximum for 'max_tmo'. + * + * @param clk_src Clock source for timers + * @param[in,out] res_capa Resolution capability pointer for input/output. + * Set either 'res_ns' or 'max_tmo', a successful call + * fills in other fields. + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_timer_res_capability(odp_timer_clk_src_t clk_src, + odp_timer_res_capability_t *res_capa); + /** * Create a timer pool * commit 5422332ff596b8cef9d5518b7bff6ab9b4b38b09 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 13 16:52:22 2019 +0300 validation: timer: test pkt and buf event types Test that also buffer and packet type events can be used as timeout events. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 51caed7a5..ddccec2b1 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -284,6 +284,184 @@ static void timer_pool_create_destroy(void) CU_ASSERT(odp_queue_destroy(queue) == 0); } +static void timer_test_event_type(odp_queue_type_t queue_type, + odp_event_type_t event_type) +{ + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_queue_param_t queue_param; + odp_timer_capability_t timer_capa; + odp_timer_pool_param_t timer_param; + odp_timer_pool_t timer_pool; + odp_queue_t queue; + odp_timeout_t tmo; + odp_buffer_t buf; + odp_packet_t pkt; + odp_event_t ev; + odp_time_t t1, t2; + uint64_t res_ns, period_ns, period_tick, duration_ns; + int i, ret, num_tmo; + int num = 5; + odp_timer_t timer[num]; + + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) + CU_FAIL_FATAL("Timer capability failed") + + res_ns = 20 * ODP_TIME_MSEC_IN_NS; + + if (timer_capa.highest_res_ns > res_ns) + res_ns = timer_capa.highest_res_ns; + + memset(&timer_param, 0, sizeof(timer_param)); + timer_param.res_ns = res_ns; + timer_param.min_tmo = 5 * res_ns; + period_ns = 2 * timer_param.min_tmo; + timer_param.max_tmo = 100 * period_ns; + timer_param.num_timers = num; + timer_param.clk_src = ODP_CLOCK_CPU; + + timer_pool = odp_timer_pool_create("timer_pool", &timer_param); + if (timer_pool == ODP_TIMER_POOL_INVALID) + CU_FAIL_FATAL("Timer pool create failed"); + + odp_timer_pool_start(); + + odp_pool_param_init(&pool_param); + + if (event_type == ODP_EVENT_BUFFER) { + pool_param.type = ODP_POOL_BUFFER; + pool_param.buf.num = num; + } else if (event_type == ODP_EVENT_PACKET) { + pool_param.type = ODP_POOL_PACKET; + pool_param.pkt.num = num; + } else if (event_type == ODP_EVENT_TIMEOUT) { + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num; + } else { + CU_FAIL("Bad event_type"); + return; + } + + pool = odp_pool_create("timeout_pool", &pool_param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + odp_queue_param_init(&queue_param); + if (queue_type == ODP_QUEUE_TYPE_SCHED) { + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + } + + queue = odp_queue_create("timeout_queue", &queue_param); + if (queue == ODP_QUEUE_INVALID) + CU_FAIL_FATAL("Queue create failed"); + + period_tick = odp_timer_ns_to_tick(timer_pool, period_ns); + duration_ns = num * period_ns; + + LOG_DBG("\nTimer pool parameters:\n"); + LOG_DBG(" res_ns %" PRIu64 "\n", timer_param.res_ns); + LOG_DBG(" min_tmo %" PRIu64 "\n", timer_param.min_tmo); + LOG_DBG(" max_tmo %" PRIu64 "\n", timer_param.max_tmo); + LOG_DBG(" period_ns %" PRIu64 "\n", period_ns); + LOG_DBG(" period_tick %" PRIu64 "\n", period_tick); + LOG_DBG(" duration_ns %" PRIu64 "\n\n", duration_ns); + + for (i = 0; i < num; i++) { + if (event_type == ODP_EVENT_BUFFER) { + buf = odp_buffer_alloc(pool); + ev = odp_buffer_to_event(buf); + } else if (event_type == ODP_EVENT_PACKET) { + pkt = odp_packet_alloc(pool, 10); + ev = odp_packet_to_event(pkt); + } else { + tmo = odp_timeout_alloc(pool); + ev = odp_timeout_to_event(tmo); + } + + CU_ASSERT(ev != ODP_EVENT_INVALID); + + timer[i] = odp_timer_alloc(timer_pool, queue, NULL); + CU_ASSERT_FATAL(timer[i] != ODP_TIMER_INVALID); + + ret = odp_timer_set_rel(timer[i], (i + 1) * period_tick, &ev); + + if (ret == ODP_TIMER_TOOEARLY) + LOG_DBG("Too early %i\n", i); + else if (ret == ODP_TIMER_TOOLATE) + LOG_DBG("Too late %i\n", i); + else if (ret == ODP_TIMER_NOEVENT) + LOG_DBG("No event %i\n", i); + + CU_ASSERT(ret == ODP_TIMER_SUCCESS); + } + + ev = ODP_EVENT_INVALID; + num_tmo = 0; + t1 = odp_time_local(); + + /* Wait for timers. Make sure that scheduler context is not hold when + * exiting the loop. */ + do { + if (queue_type == ODP_QUEUE_TYPE_SCHED) + ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT); + else + ev = odp_queue_deq(queue); + + if (ev == ODP_EVENT_INVALID) { + t2 = odp_time_local(); + if (odp_time_diff_ns(t2, t1) > (10 * duration_ns)) + break; + + continue; + } + + CU_ASSERT(odp_event_type(ev) == event_type); + + odp_event_free(ev); + num_tmo++; + + } while (num_tmo < num || ev != ODP_EVENT_INVALID); + + CU_ASSERT(num_tmo == num); + + for (i = 0; i < num; i++) + CU_ASSERT(odp_timer_free(timer[i]) == ODP_EVENT_INVALID); + + odp_timer_pool_destroy(timer_pool); + CU_ASSERT(odp_queue_destroy(queue) == 0); + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +static void timer_test_tmo_event_plain(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_PLAIN, ODP_EVENT_TIMEOUT); +} + +static void timer_test_tmo_event_sched(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_SCHED, ODP_EVENT_TIMEOUT); +} + +static void timer_test_buf_event_plain(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_PLAIN, ODP_EVENT_BUFFER); +} + +static void timer_test_buf_event_sched(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_SCHED, ODP_EVENT_BUFFER); +} + +static void timer_test_pkt_event_plain(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_PLAIN, ODP_EVENT_PACKET); +} + +static void timer_test_pkt_event_sched(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_SCHED, ODP_EVENT_PACKET); +} + static void timer_test_queue_type(odp_queue_type_t queue_type) { odp_pool_t pool; @@ -986,6 +1164,12 @@ odp_testinfo_t timer_suite[] = { ODP_TEST_INFO(timer_test_timeout_pool_alloc), ODP_TEST_INFO(timer_test_timeout_pool_free), ODP_TEST_INFO(timer_pool_create_destroy), + ODP_TEST_INFO(timer_test_tmo_event_plain), + ODP_TEST_INFO(timer_test_tmo_event_sched), + ODP_TEST_INFO(timer_test_buf_event_plain), + ODP_TEST_INFO(timer_test_buf_event_sched), + ODP_TEST_INFO(timer_test_pkt_event_plain), + ODP_TEST_INFO(timer_test_pkt_event_sched), ODP_TEST_INFO(timer_test_plain_queue), ODP_TEST_INFO(timer_test_sched_queue), ODP_TEST_INFO(timer_test_odp_timer_cancel), commit 9eeb94e6d03923a67779314c62e32e410e1272d8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 13 14:06:22 2019 +0300 api: timer: documentation style clean up Clean up stylistic issues in documentation: indentation, variable naming, new lines, etc. API functionality or wording not changed. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 1ad7ae4f6..c2bf942dc 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -69,26 +69,29 @@ typedef enum { * Return values of timer set calls. */ typedef enum { -/** - * Timer set operation succeeded - */ + /** + * Timer set operation succeeded + */ ODP_TIMER_SUCCESS = 0, -/** - * Timer set operation failed, expiration too early. - * Either retry with a later expiration time or process the timeout - * immediately. */ + + /** + * Timer set operation failed, expiration too early. + * Either retry with a later expiration time or process the timeout + * immediately. */ ODP_TIMER_TOOEARLY = -1, -/** - * Timer set operation failed, expiration too late. - * Truncate the expiration time against the maximum timeout for the - * timer pool. */ + /** + * Timer set operation failed, expiration too late. + * Truncate the expiration time against the maximum timeout for the + * timer pool. */ ODP_TIMER_TOOLATE = -2, -/** - * Timer set operation failed because no event specified and no event present - * in the timer (timer inactive/expired). - */ + + /** + * Timer set operation failed because no event specified and no event + * present in the timer (timer inactive/expired). + */ ODP_TIMER_NOEVENT = -3 + } odp_timer_set_t; /** @@ -96,8 +99,8 @@ typedef enum { * Maximum timer pool name length in chars including null char */ -/** Timer pool parameters - * Timer pool parameters are used when creating and querying timer pools. +/** + * Timer pool parameters */ typedef struct { /** Timeout resolution in nanoseconds. Timer pool must serve timeouts @@ -187,9 +190,8 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src, * @return Timer pool handle on success * @retval ODP_TIMER_POOL_INVALID on failure and errno set */ -odp_timer_pool_t -odp_timer_pool_create(const char *name, - const odp_timer_pool_param_t *params); +odp_timer_pool_t odp_timer_pool_create(const char *name, + const odp_timer_pool_param_t *params); /** * Start a timer pool @@ -207,60 +209,67 @@ void odp_timer_pool_start(void); * Destroy a timer pool, freeing all resources. * All timers must have been freed. * - * @param tpid Timer pool identifier + * @param timer_pool Timer pool */ -void odp_timer_pool_destroy(odp_timer_pool_t tpid); +void odp_timer_pool_destroy(odp_timer_pool_t timer_pool); /** * Convert timer ticks to nanoseconds * - * @param tpid Timer pool identifier - * @param ticks Timer ticks + * @param timer_pool Timer pool + * @param ticks Timer ticks * * @return Nanoseconds */ -uint64_t odp_timer_tick_to_ns(odp_timer_pool_t tpid, uint64_t ticks); +uint64_t odp_timer_tick_to_ns(odp_timer_pool_t timer_pool, uint64_t ticks); /** * Convert nanoseconds to timer ticks * - * @param tpid Timer pool identifier - * @param ns Nanoseconds + * @param timer_pool Timer pool + * @param ns Nanoseconds * * @return Timer ticks */ -uint64_t odp_timer_ns_to_tick(odp_timer_pool_t tpid, uint64_t ns); +uint64_t odp_timer_ns_to_tick(odp_timer_pool_t timer_pool, uint64_t ns); /** * Current tick value * - * @param tpid Timer pool identifier + * @param timer_pool Timer pool * * @return Current time in timer ticks */ -uint64_t odp_timer_current_tick(odp_timer_pool_t tpid); +uint64_t odp_timer_current_tick(odp_timer_pool_t timer_pool); /** * ODP timer pool information and configuration */ - typedef struct { - odp_timer_pool_param_t param; /**< Parameters specified at creation */ - uint32_t cur_timers; /**< Number of currently allocated timers */ - uint32_t hwm_timers; /**< High watermark of allocated timers */ - const char *name; /**< Name of timer pool */ + /** Parameters specified at creation */ + odp_timer_pool_param_t param; + + /** Number of currently allocated timers */ + uint32_t cur_timers; + + /** High watermark of allocated timers */ + uint32_t hwm_timers; + + /** Name of timer pool */ + const char *name; + } odp_timer_pool_info_t; /** * Query timer pool configuration and current state * - * @param tpid Timer pool identifier - * @param[out] info Pointer to information buffer + * @param timer_pool Timer pool + * @param[out] info Pointer to information buffer * * @retval 0 on success * @retval <0 on failure. Info could not be retrieved. */ -int odp_timer_pool_info(odp_timer_pool_t tpid, +int odp_timer_pool_info(odp_timer_pool_t timer_pool, odp_timer_pool_info_t *info); /** @@ -270,15 +279,14 @@ int odp_timer_pool_info(odp_timer_pool_t tpid, * the timer pool. The user_ptr is copied to timeouts and can be retrieved * using the odp_timeout_user_ptr() call. * - * @param tpid Timer pool identifier - * @param queue Destination queue for timeout notifications - * @param user_ptr User defined pointer or NULL to be copied to timeouts + * @param timer_pool Timer pool + * @param queue Destination queue for timeout notifications + * @param user_ptr User defined pointer or NULL to be copied to timeouts * * @return Timer handle on success * @retval ODP_TIMER_INVALID on failure and errno set. */ -odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid, - odp_queue_t queue, +odp_timer_t odp_timer_alloc(odp_timer_pool_t timer_pool, odp_queue_t queue, void *user_ptr); /** @@ -289,11 +297,12 @@ odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid, * The timeout event for an expired timer will not be returned. It is the * responsibility of the application to handle this timeout when it is received. * - * @param tim Timer handle + * @param timer Timer + * * @return Event handle of timeout event * @retval ODP_EVENT_INVALID on failure */ -odp_event_t odp_timer_free(odp_timer_t tim); +odp_event_t odp_timer_free(odp_timer_t timer); /** * Set (or reset) a timer with absolute expiration time @@ -395,6 +404,7 @@ odp_event_t odp_timeout_to_event(odp_timeout_t tmo); /** * Check for fresh timeout + * * If the corresponding timer has been reset or cancelled since this timeout * was enqueued, the timeout is stale (not fresh). * @@ -424,6 +434,7 @@ uint64_t odp_timeout_tick(odp_timeout_t tmo); /** * Return user pointer for the timeout + * * The user pointer was specified when the timer was allocated. * * @param tmo Timeout handle @@ -456,41 +467,41 @@ void odp_timeout_free(odp_timeout_t tmo); /** * Get printable value for an odp_timer_pool_t * - * @param hdl odp_timer_pool_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param timer_pool odp_timer_pool_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents * an odp_timer_pool_t handle. */ -uint64_t odp_timer_pool_to_u64(odp_timer_pool_t hdl); +uint64_t odp_timer_pool_to_u64(odp_timer_pool_t timer_pool); /** * Get printable value for an odp_timer_t * - * @param hdl odp_timer_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param timer odp_timer_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents * an odp_timer_t handle. */ -uint64_t odp_timer_to_u64(odp_timer_t hdl); +uint64_t odp_timer_to_u64(odp_timer_t timer); /** * Get printable value for an odp_timeout_t * - * @param hdl odp_timeout_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param tmo odp_timeout_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents * an odp_timeout_t handle. */ -uint64_t odp_timeout_to_u64(odp_timeout_t hdl); +uint64_t odp_timeout_to_u64(odp_timeout_t tmo); /** * @} commit 064dbc1d3b0d284ae7ab4db5e20fa0f6f2ce8c56 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri May 10 16:48:08 2019 +0300 api: timer: clarify timer set specification Timer API intention has always been to allow any event type to be used as timeout events. Application should use ODP_EVENT_TIMEOUT type events (odp_timeout_t) by default, but also other event types may be used. Also, clarified timer set/reset functionality of odp_timer_set_abs() and _rel() functions. API functionality not changed, just wording updated. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index ee314914f..1ad7ae4f6 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -1,4 +1,6 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia + * * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -83,8 +85,8 @@ typedef enum { * timer pool. */ ODP_TIMER_TOOLATE = -2, /** - * Timer set operation failed because no timeout event specified and no - * timeout event present in the timer (timer inactive/expired). + * Timer set operation failed because no event specified and no event present + * in the timer (timer inactive/expired). */ ODP_TIMER_NOEVENT = -3 } odp_timer_set_t; @@ -294,73 +296,87 @@ odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid, odp_event_t odp_timer_free(odp_timer_t tim); /** - * Set a timer (absolute time) with a user-provided timeout event + * Set (or reset) a timer with absolute expiration time + * + * This function sets a timer to expire at a specific time. If the timer is + * already running (set and not yet expired), the function updates (resets) it + * with a new expiration time and optionally with a new event. A successful + * reset operation with a new event outputs the old event. A failed reset + * operation does not modify the timer. + * + * The user provided event can be of any event type, but only ODP_EVENT_TIMEOUT + * type events (odp_timeout_t) carry timeout specific metadata. Furthermore, + * timer performance may have been optimized for that event type. When the timer + * expires, the event is enqueued to the destination queue of the timer. * - * Set (arm) the timer to expire at specific time. The timeout - * event will be enqueued when the timer expires. + * @param timer Timer + * @param abs_tick Absolute expiration time in timer ticks + * @param[in,out] tmo_ev Pointer to an event handle. The event is enqueued + * when the timer expires. Use NULL when resetting the + * timer without changing the event. When resetting the + * timer with a new event, a successful operation + * outputs the old event here. * - * @param tim Timer - * @param abs_tck Expiration time in absolute timer ticks - * @param[in,out] tmo_ev Reference to an event variable that points to - * timeout event or NULL to reuse the existing timeout event. Any existing - * timeout event that is replaced by a successful set operation will be - * returned here. + * @retval ODP_TIMER_SUCCESS Success + * @retval ODP_TIMER_TOOEARLY Failure. Expiration time is too near to + * the current time. + * @retval ODP_TIMER_TOOLATE Failure. Expiration time is too far from + * the current time. + * @retval ODP_TIMER_NOEVENT Failure. Set operation: No event provided. + * Reset operation: Too late to reset the timer. * - * @retval ODP_TIMER_SUCCESS Operation succeeded - * @retval ODP_TIMER_TOOEARLY Operation failed because expiration tick too - * early - * @retval ODP_TIMER_TOOLATE Operation failed because expiration tick too - * late - * @retval ODP_TIMER_NOEVENT Operation failed because timeout event not - * specified in odp_timer_set call and not present in timer + * @see odp_timer_set_rel(), odp_timer_alloc(), odp_timer_cancel() */ -int odp_timer_set_abs(odp_timer_t tim, - uint64_t abs_tck, +int odp_timer_set_abs(odp_timer_t timer, uint64_t abs_tick, odp_event_t *tmo_ev); /** - * Set a timer with a relative expiration time and user-provided event. + * Set (or reset) a timer with relative expiration time * - * Set (arm) the timer to expire at a relative future time. + * Like odp_timer_set_abs(), but the expiration time is relative to the current + * time: expiration tick = odp_timer_current_tick() + 'rel_tick'. * - * @param tim Timer - * @param rel_tck Expiration time in timer ticks relative to current time of - * the timer pool the timer belongs to - * @param[in,out] tmo_ev Reference to an event variable that points to - * timeout event or NULL to reuse the existing timeout event. Any existing - * timeout event that is replaced by a successful set operation will be - * returned here. + * @param timer Timer + * @param rel_tick Expiration time relative to current time of + * the timer pool in timer ticks + * @param[in,out] tmo_ev Pointer to an event handle. The event is enqueued + * when the timer expires. Use NULL when resetting the + * timer without changing the event. When resetting the + * timer with a new event, a successful operation + * outputs the old event here. * - * @retval ODP_TIMER_SUCCESS Operation succeeded - * @retval ODP_TIMER_TOOEARLY Operation failed because expiration tick too - * early - * @retval ODP_TIMER_TOOLATE Operation failed because expiration tick too - * late - * @retval ODP_TIMER_NOEVENT Operation failed because timeout event not - * specified in call and not present in timer + * @retval ODP_TIMER_SUCCESS Success + * @retval ODP_TIMER_TOOEARLY Failure. Expiration time is too near to + * the current time. + * @retval ODP_TIMER_TOOLATE Failure. Expiration time is too far from + * the current time. + * @retval ODP_TIMER_NOEVENT Failure. Set operation: No event provided. + * Reset operation: Too late to reset the timer. + * + * @see odp_timer_set_abs(), odp_timer_alloc(), odp_timer_cancel() */ -int odp_timer_set_rel(odp_timer_t tim, - uint64_t rel_tck, +int odp_timer_set_rel(odp_timer_t timer, uint64_t rel_tick, odp_event_t *tmo_ev); /** * Cancel a timer * - * Cancel a timer, preventing future expiration and delivery. Return any - * present timeout event. + * Cancel a timer, preventing future expiration and event delivery. Return any + * present event. * * A timer that has already expired may be impossible to cancel and the timeout * will instead be delivered to the destination queue. * - * @param tim Timer - * @param[out] tmo_ev Pointer to an event variable - * @retval 0 Success, active timer cancelled, timeout returned in '*tmo_ev' - * @retval <0 on failure (timer inactive or already expired) + * @param timer Timer + * @param[out] tmo_ev Pointer to an event handle for output + * + * @retval 0 Success. Active timer cancelled, timeout returned in 'tmo_ev' + * @retval <0 Failure. Timer inactive or already expired. */ -int odp_timer_cancel(odp_timer_t tim, odp_event_t *tmo_ev); +int odp_timer_cancel(odp_timer_t timer, odp_event_t *tmo_ev); /** - * Return timeout handle that is associated with timeout event + * Get timeout handle from a ODP_EVENT_TIMEOUT type event * * @param ev An event of type ODP_EVENT_TIMEOUT * ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- include/odp/api/spec/time.h | 18 +- include/odp/api/spec/timer.h | 293 ++++++++++++------- platform/linux-generic/odp_timer.c | 130 ++++++--- test/validation/api/time/time.c | 11 + test/validation/api/timer/timer.c | 570 +++++++++++++++++++++++++++++++++---- 6 files changed, 833 insertions(+), 191 deletions(-) hooks/post-receive --

5 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
121
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp