git-lng-odp July 2019

git-lng-odp@lists.linaro.org

1 participants
5 discussions

[COMMIT] branch master updated. v1.21.0.0-165-gfbc5f7d14

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 fbc5f7d1433bd3a9fea7c55fed6ec3336a4fef02 (commit) via d232f60bca28a01f19e7de993d356cab645f62b4 (commit) from 70a21e1b3c797f96ed0768f045be7f1f624a415b (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 fbc5f7d1433bd3a9fea7c55fed6ec3336a4fef02 Author: Stanislaw Kardach <skardach(a)marvell.com> Date: Thu Jul 11 13:05:34 2019 +0200 test: performance: guard against double exit Some applications use SHM to store global state, including a flag used by signal handlers to indicate application termination request (through SIGINT). If that signal is delivered a second time after the SHM segment was freed, it will result in a segmentation fault as the memory is released. Signed-off-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index c89e86d8d..387bd9f25 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -171,6 +171,8 @@ static args_t *gbl_args; static void sig_handler(int signo ODP_UNUSED) { + if (gbl_args == NULL) + return; gbl_args->exit_thread = 1; } @@ -1661,6 +1663,8 @@ int main(int argc, char *argv[]) LOG_ERR("Error: pool destroy\n"); exit(EXIT_FAILURE); } + gbl_args = NULL; + odp_mb_full(); if (odp_shm_free(shm)) { LOG_ERR("Error: shm free\n"); diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c index 4c36aca1e..00efb7a86 100644 --- a/test/performance/odp_cpu_bench.c +++ b/test/performance/odp_cpu_bench.c @@ -177,6 +177,8 @@ static const uint8_t test_udp_packet[] = { static void sig_handler(int signo ODP_UNUSED) { + if (gbl_args == NULL) + return; gbl_args->exit_threads = 1; } @@ -799,6 +801,9 @@ int main(int argc, char *argv[]) } } } + gbl_args = NULL; + odp_mb_full(); + if (odp_pool_destroy(pool)) { LOG_ERR("Error: pool destroy\n"); exit(EXIT_FAILURE); diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 89c979324..2cec9c90c 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -178,6 +178,8 @@ static args_t *gbl_args; static void sig_handler(int signo ODP_UNUSED) { + if (gbl_args == NULL) + return; gbl_args->exit_threads = 1; } @@ -1724,6 +1726,8 @@ int main(int argc, char *argv[]) free(gbl_args->appl.if_names); free(gbl_args->appl.if_str); + gbl_args = NULL; + odp_mb_full(); if (odp_pool_destroy(pool)) { LOG_ERR("Error: pool destroy\n"); diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 393ea3521..bc5da01f3 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -1544,6 +1544,8 @@ quit: if (test_global->tx_pkt_sum > TEST_PASSED_LIMIT) ret += 2; } + test_global = NULL; + odp_mb_full(); if (odp_shm_free(shm)) { printf("Error: shm free failed.\n"); commit d232f60bca28a01f19e7de993d356cab645f62b4 Author: Stanislaw Kardach <skardach(a)marvell.com> Date: Thu Jul 11 13:04:55 2019 +0200 example: guard against double exit Some applications use SHM to store global state, including a flag used by signal handlers to indicate application termination request (through SIGINT). If that signal is delivered a second time after the SHM segment was freed, it will result in a segmentation fault as the memory is released. Signed-off-by: Stanislaw Kardach <skardach(a)marvell.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 313305f01..976dd722a 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -172,7 +172,8 @@ static void print_global_stats(int num_workers); static void sig_handler(int signo ODP_UNUSED) { int i; - + if (args == NULL) + return; for (i = 0; i < args->thread_cnt; i++) args->thread[i].stop = 1; } @@ -1408,6 +1409,8 @@ int main(int argc, char *argv[]) free(ifs); free(args->appl.if_names); free(args->appl.if_str); + args = NULL; + odp_mb_full(); if (0 != odp_pool_destroy(pool)) fprintf(stderr, "unable to destroy pool \"pool\"\n"); if (0 != odp_shm_free(shm)) diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index 7bfa73b75..48f1462dd 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -32,6 +32,8 @@ static global_data_t *global; static void sig_handler(int signo ODP_UNUSED) { printf("sig_handler!\n"); + if (global == NULL) + return; global->exit_thr = 1; } @@ -281,7 +283,9 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - if (odp_shm_free(global->shm)) { + global = NULL; + odp_mb_full(); + if (odp_shm_free(shm)) { printf("Error: shm free global data\n"); exit(EXIT_FAILURE); } ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 5 ++++- example/l2fwd_simple/odp_l2fwd_simple.c | 6 +++++- test/performance/odp_bench_packet.c | 4 ++++ test/performance/odp_cpu_bench.c | 5 +++++ test/performance/odp_l2fwd.c | 4 ++++ test/performance/odp_sched_pktio.c | 2 ++ 6 files changed, 24 insertions(+), 2 deletions(-) hooks/post-receive --

5 years, 7 months

[COMMIT] branch master updated. v1.21.0.0-163-g70a21e1b3

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 70a21e1b3c797f96ed0768f045be7f1f624a415b (commit) via ad1d7b43fd5ed6c94984c4d0279be5ea35ecf420 (commit) via aca1d07eb4ca40ef057e0a8c0738ee2bd45820f7 (commit) from e5dcd6f21ed52d068336a662976fd0e893f639f1 (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 70a21e1b3c797f96ed0768f045be7f1f624a415b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jul 5 10:55:30 2019 +0300 linux-gen: sched: use prio_q prefix for prio queue variables Improve code readability by using prio_q prefix for prio queue related variables. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index b60ba7368..b814c09cc 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -82,10 +82,10 @@ ODP_STATIC_ASSERT(ODP_THREAD_COUNT_MAX < (64 * 1024), "Max_64k_threads_supported"); /* Mask of queues per priority */ -typedef uint8_t pri_mask_t; +typedef uint8_t prio_q_mask_t; -ODP_STATIC_ASSERT((8 * sizeof(pri_mask_t)) >= MAX_SPREAD, - "pri_mask_t_is_too_small"); +ODP_STATIC_ASSERT((8 * sizeof(prio_q_mask_t)) >= MAX_SPREAD, + "prio_q_mask_t_is_too_small"); /* Start of named groups in group mask arrays */ #define SCHED_GROUP_NAMED (ODP_SCHED_GROUP_CONTROL + 1) @@ -182,7 +182,7 @@ typedef struct { uint16_t max_spread; uint32_t ring_mask; - pri_mask_t pri_mask[NUM_PRIO]; + prio_q_mask_t prio_q_mask[NUM_PRIO]; odp_spinlock_t mask_lock; odp_atomic_u32_t grp_epoch; odp_shm_t shm; @@ -202,7 +202,7 @@ typedef struct { /* Scheduler priority queues */ prio_queue_t prio_q[NUM_SCHED_GRPS][NUM_PRIO][MAX_SPREAD]; - uint32_t pri_count[NUM_PRIO][MAX_SPREAD]; + uint32_t prio_q_count[NUM_PRIO][MAX_SPREAD]; odp_thrmask_t mask_all; odp_spinlock_t grp_lock; @@ -576,8 +576,8 @@ static int schedule_create_queue(uint32_t queue_index, odp_spinlock_lock(&sched->mask_lock); /* update scheduler prio queue usage status */ - sched->pri_mask[prio] |= 1 << spread; - sched->pri_count[prio][spread]++; + sched->prio_q_mask[prio] |= 1 << spread; + sched->prio_q_count[prio][spread]++; odp_spinlock_unlock(&sched->mask_lock); @@ -617,10 +617,10 @@ static void schedule_destroy_queue(uint32_t queue_index) odp_spinlock_lock(&sched->mask_lock); /* Clear mask bit when last queue is removed*/ - sched->pri_count[prio][spread]--; + sched->prio_q_count[prio][spread]--; - if (sched->pri_count[prio][spread] == 0) - sched->pri_mask[prio] &= (uint8_t)(~(1 << spread)); + if (sched->prio_q_count[prio][spread] == 0) + sched->prio_q_mask[prio] &= (uint8_t)(~(1 << spread)); odp_spinlock_unlock(&sched->mask_lock); @@ -956,7 +956,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], /* Schedule events */ for (prio = 0; prio < NUM_PRIO; prio++) { - if (sched->pri_mask[prio] == 0) + if (sched->prio_q_mask[prio] == 0) continue; burst_def = sched->config.burst_default[prio]; @@ -978,7 +978,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], id = 0; /* No queues created for this priority queue */ - if (odp_unlikely((sched->pri_mask[prio] & (1 << id)) + if (odp_unlikely((sched->prio_q_mask[prio] & (1 << id)) == 0)) { i++; id++; commit ad1d7b43fd5ed6c94984c4d0279be5ea35ecf420 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jul 5 10:41:52 2019 +0300 linux-gen: sched: remove pri_set and pri_clr functions Improve code readability by removing four small functions that are called only once (merge code into the call site). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 28d70030c..b60ba7368 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -352,8 +352,9 @@ static int read_config_file(sched_global_t *sched) return 0; } -static inline uint8_t prio_spread_index(uint32_t index) +static inline uint8_t spread_index(uint32_t index) { + /* thread/queue index to spread index */ return index % sched->config.num_spread; } @@ -370,15 +371,15 @@ static void sched_local_init(void) sched_local.sync_ctx = NO_SYNC_CONTEXT; sched_local.stash.queue = ODP_QUEUE_INVALID; - spread = prio_spread_index(sched_local.thr); + spread = spread_index(sched_local.thr); prefer_ratio = sched->config.prefer_ratio; for (i = 0; i < SPREAD_TBL_SIZE; i++) { sched_local.spread_tbl[i] = spread; if (num_spread > 1 && (i % prefer_ratio) == 0) { - sched_local.spread_tbl[i] = prio_spread_index(spread + - offset); + sched_local.spread_tbl[i] = spread_index(spread + + offset); offset++; if (offset == num_spread) offset = 1; @@ -559,56 +560,30 @@ static inline int prio_level_from_api(int api_prio) return schedule_max_prio() - api_prio; } -static void pri_set(int id, int prio) -{ - odp_spinlock_lock(&sched->mask_lock); - sched->pri_mask[prio] |= 1 << id; - sched->pri_count[prio][id]++; - odp_spinlock_unlock(&sched->mask_lock); -} - -static void pri_clr(int id, int prio) -{ - odp_spinlock_lock(&sched->mask_lock); - - /* Clear mask bit when last queue is removed*/ - sched->pri_count[prio][id]--; - - if (sched->pri_count[prio][id] == 0) - sched->pri_mask[prio] &= (uint8_t)(~(1 << id)); - - odp_spinlock_unlock(&sched->mask_lock); -} - -static void pri_set_queue(uint32_t queue_index, int prio) -{ - uint8_t id = prio_spread_index(queue_index); - - return pri_set(id, prio); -} - -static void pri_clr_queue(uint32_t queue_index, int prio) -{ - uint8_t id = prio_spread_index(queue_index); - pri_clr(id, prio); -} - static int schedule_create_queue(uint32_t queue_index, const odp_schedule_param_t *sched_param) { uint32_t ring_size; int i; int prio = prio_level_from_api(sched_param->prio); + uint8_t spread = spread_index(queue_index); if (_odp_schedule_configured == 0) { ODP_ERR("Scheduler has not been configured\n"); return -1; } - pri_set_queue(queue_index, prio); + odp_spinlock_lock(&sched->mask_lock); + + /* update scheduler prio queue usage status */ + sched->pri_mask[prio] |= 1 << spread; + sched->pri_count[prio][spread]++; + + odp_spinlock_unlock(&sched->mask_lock); + sched->queue[queue_index].grp = sched_param->group; sched->queue[queue_index].prio = prio; - sched->queue[queue_index].spread = prio_spread_index(queue_index); + sched->queue[queue_index].spread = spread; sched->queue[queue_index].sync = sched_param->sync; sched->queue[queue_index].order_lock_count = sched_param->lock_count; sched->queue[queue_index].poll_pktin = 0; @@ -637,8 +612,18 @@ static inline uint8_t sched_sync_type(uint32_t queue_index) static void schedule_destroy_queue(uint32_t queue_index) { int prio = sched->queue[queue_index].prio; + uint8_t spread = spread_index(queue_index); + + odp_spinlock_lock(&sched->mask_lock); + + /* Clear mask bit when last queue is removed*/ + sched->pri_count[prio][spread]--; + + if (sched->pri_count[prio][spread] == 0) + sched->pri_mask[prio] &= (uint8_t)(~(1 << spread)); + + odp_spinlock_unlock(&sched->mask_lock); - pri_clr_queue(queue_index, prio); sched->queue[queue_index].grp = 0; sched->queue[queue_index].prio = 0; sched->queue[queue_index].spread = 0; commit aca1d07eb4ca40ef057e0a8c0738ee2bd45820f7 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jul 5 09:46:56 2019 +0300 linux-gen: sched: rename queue create callback Rename init_queue to create_queue as this function is called from odp_queue_create(). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 831afdfa8..88f1ea022 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -35,9 +35,8 @@ typedef void (*schedule_pktio_start_fn_t)(int pktio_index, typedef int (*schedule_thr_add_fn_t)(odp_schedule_group_t group, int thr); typedef int (*schedule_thr_rem_fn_t)(odp_schedule_group_t group, int thr); typedef int (*schedule_num_grps_fn_t)(void); -typedef int (*schedule_init_queue_fn_t)(uint32_t queue_index, - const odp_schedule_param_t *sched_param - ); +typedef int (*schedule_create_queue_fn_t)(uint32_t queue_index, + const odp_schedule_param_t *param); typedef void (*schedule_destroy_queue_fn_t)(uint32_t queue_index); typedef int (*schedule_sched_queue_fn_t)(uint32_t queue_index); typedef int (*schedule_unsched_queue_fn_t)(uint32_t queue_index); @@ -60,7 +59,7 @@ typedef struct schedule_fn_t { schedule_thr_add_fn_t thr_add; schedule_thr_rem_fn_t thr_rem; schedule_num_grps_fn_t num_grps; - schedule_init_queue_fn_t init_queue; + schedule_create_queue_fn_t create_queue; schedule_destroy_queue_fn_t destroy_queue; schedule_sched_queue_fn_t sched_queue; schedule_ord_enq_multi_fn_t ord_enq_multi; diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 1a3f0a5bc..4ec564d69 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -365,8 +365,8 @@ static odp_queue_t queue_create(const char *name, return ODP_QUEUE_INVALID; if (type == ODP_QUEUE_TYPE_SCHED) { - if (sched_fn->init_queue(queue->s.index, - &queue->s.param.sched)) { + if (sched_fn->create_queue(queue->s.index, + &queue->s.param.sched)) { queue->s.status = QUEUE_STATUS_FREE; ODP_ERR("schedule queue init failed\n"); return ODP_QUEUE_INVALID; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index d70258475..28d70030c 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -593,8 +593,8 @@ static void pri_clr_queue(uint32_t queue_index, int prio) pri_clr(id, prio); } -static int schedule_init_queue(uint32_t queue_index, - const odp_schedule_param_t *sched_param) +static int schedule_create_queue(uint32_t queue_index, + const odp_schedule_param_t *sched_param) { uint32_t ring_size; int i; @@ -1598,7 +1598,7 @@ const schedule_fn_t schedule_basic_fn = { .thr_add = schedule_thr_add, .thr_rem = schedule_thr_rem, .num_grps = schedule_num_grps, - .init_queue = schedule_init_queue, + .create_queue = schedule_create_queue, .destroy_queue = schedule_destroy_queue, .sched_queue = schedule_sched_queue, .ord_enq_multi = schedule_ord_enq_multi, diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index a9e86cc56..df8fee552 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -2033,8 +2033,8 @@ static int thr_rem(odp_schedule_group_t group, int thr) return 0; } -static int init_queue(uint32_t queue_index, - const odp_schedule_param_t *sched_param) +static int create_queue(uint32_t queue_index, + const odp_schedule_param_t *sched_param) { /* Not used in scalable scheduler. */ (void)queue_index; @@ -2139,7 +2139,7 @@ const schedule_fn_t schedule_scalable_fn = { .thr_add = thr_add, .thr_rem = thr_rem, .num_grps = num_grps, - .init_queue = init_queue, + .create_queue = create_queue, .destroy_queue = destroy_queue, .sched_queue = sched_queue, .ord_enq_multi = ord_enq_multi, diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 106874552..a47899208 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -376,7 +376,7 @@ static int num_grps(void) return NUM_GROUP - NUM_STATIC_GROUP; } -static int init_queue(uint32_t qi, const odp_schedule_param_t *sched_param) +static int create_queue(uint32_t qi, const odp_schedule_param_t *sched_param) { sched_group_t *sched_group = &sched_global->sched_group; odp_schedule_group_t group = sched_param->group; @@ -969,7 +969,7 @@ const schedule_fn_t schedule_sp_fn = { .thr_add = thr_add, .thr_rem = thr_rem, .num_grps = num_grps, - .init_queue = init_queue, + .create_queue = create_queue, .destroy_queue = destroy_queue, .sched_queue = sched_queue, .ord_enq_multi = ord_enq_multi, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_schedule_if.h | 7 +- platform/linux-generic/odp_queue_basic.c | 4 +- platform/linux-generic/odp_schedule_basic.c | 87 ++++++++++-------------- platform/linux-generic/odp_schedule_scalable.c | 6 +- platform/linux-generic/odp_schedule_sp.c | 4 +- 5 files changed, 46 insertions(+), 62 deletions(-) hooks/post-receive --

5 years, 7 months

[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, 7 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, 7 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, 7 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp July 2019