git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] tag v1.22.0.0 created. v1.21.0.0-188-gc8d22107b

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 tag, v1.22.0.0 has been created at c8d22107bd8b64efc91bc064fe20e7aeeac7efff (commit) - Log ----------------------------------------------------------------- commit c8d22107bd8b64efc91bc064fe20e7aeeac7efff Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Aug 22 14:01:06 2019 +0300 configure.ac: update version to v1.22.0.0 Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> ----------------------------------------------------------------------- hooks/post-receive --

5 years, 6 months

[COMMIT] branch master updated. v1.21.0.0-186-gb0ce12f94

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 b0ce12f94111484567ae6314a51b8500cc7363af (commit) via a8030759ec3467206a52bdefadda3b7c5f7bdf27 (commit) from 7fd565206ddfe4acb5c8c44d7aa2f6a6e4218148 (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 b0ce12f94111484567ae6314a51b8500cc7363af Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Aug 20 14:20:01 2019 +0300 test: pool_perf: add packet pool test option Added -t option to select between buffer or packet pool types. This can be used to compare alloc/free performance of packet and buffer pools. Packets have more metadata than buffers, so packet pool performance may be less than buffer pool performance. Also, added -s option to select data size. Data size may affect packet alloc/free performance as a large data size may result segmented packets. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/performance/odp_pool_perf.c b/test/performance/odp_pool_perf.c index d00e4bc92..26fe44be5 100644 --- a/test/performance/odp_pool_perf.c +++ b/test/performance/odp_pool_perf.c @@ -1,4 +1,6 @@ /* Copyright (c) 2018, Linaro Limited + * Copyright (c) 2019, Nokia + * * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -20,6 +22,8 @@ typedef struct test_options_t { uint32_t num_round; uint32_t max_burst; uint32_t num_burst; + uint32_t data_size; + int pool_type; } test_options_t; @@ -57,6 +61,9 @@ static void print_usage(void) " -r, --num_round Number of rounds\n" " -b, --burst Maximum number of events per operation\n" " -n, --num_burst Number of bursts allocated/freed back-to-back\n" + " -s, --data_size Data size in bytes\n" + " -t, --pool_type 0: Buffer pool (default)\n" + " 1: Packet pool\n" " -h, --help This help\n" "\n"); } @@ -73,17 +80,21 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"num_round", required_argument, NULL, 'r'}, {"burst", required_argument, NULL, 'b'}, {"num_burst", required_argument, NULL, 'n'}, + {"data_size", required_argument, NULL, 's'}, + {"pool_type", required_argument, NULL, 't'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:e:r:b:n:h"; + static const char *shortopts = "+c:e:r:b:n:s:t:h"; test_options->num_cpu = 1; test_options->num_event = 1000; test_options->num_round = 100000; test_options->max_burst = 100; test_options->num_burst = 1; + test_options->data_size = 64; + test_options->pool_type = 0; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -107,6 +118,12 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'n': test_options->num_burst = atoi(optarg); break; + case 's': + test_options->data_size = atoi(optarg); + break; + case 't': + test_options->pool_type = atoi(optarg); + break; case 'h': /* fall through */ default: @@ -164,36 +181,62 @@ 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; + uint32_t max_num, max_size; test_options_t *test_options = &global->test_options; uint32_t num_event = test_options->num_event; uint32_t num_round = test_options->num_round; uint32_t max_burst = test_options->max_burst; uint32_t num_burst = test_options->num_burst; uint32_t num_cpu = test_options->num_cpu; + uint32_t data_size = test_options->data_size; + int packet_pool = test_options->pool_type; printf("\nPool performance test\n"); printf(" num cpu %u\n", num_cpu); printf(" num rounds %u\n", num_round); printf(" num events %u\n", num_event); printf(" max burst %u\n", max_burst); - printf(" num bursts %u\n\n", num_burst); + printf(" num bursts %u\n", num_burst); + printf(" data size %u\n", data_size); + printf(" pool type %s\n\n", packet_pool ? "packet" : "buffer"); if (odp_pool_capability(&pool_capa)) { printf("Error: Pool capa failed.\n"); return -1; } - max_num = pool_capa.buf.max_num; + if (packet_pool) { + max_num = pool_capa.pkt.max_num; + max_size = pool_capa.pkt.max_len; + } else { + max_num = pool_capa.buf.max_num; + max_size = pool_capa.buf.max_size; + } if (max_num && num_event > max_num) { printf("Error: max events supported %u\n", max_num); return -1; } + if (max_size && data_size > max_size) { + printf("Error: max data size supported %u\n", max_size); + return -1; + } + odp_pool_param_init(&pool_param); - pool_param.type = ODP_POOL_BUFFER; - pool_param.buf.num = num_event; + + if (packet_pool) { + pool_param.type = ODP_POOL_PACKET; + pool_param.pkt.num = num_event; + pool_param.pkt.len = data_size; + pool_param.pkt.max_num = num_event; + pool_param.pkt.max_len = data_size; + + } else { + pool_param.type = ODP_POOL_BUFFER; + pool_param.buf.num = num_event; + pool_param.buf.size = data_size; + } pool = odp_pool_create("pool perf", &pool_param); @@ -207,7 +250,7 @@ static int create_pool(test_global_t *global) return 0; } -static int test_pool(void *arg) +static int test_buffer_pool(void *arg) { int ret, thr; uint32_t num, num_free, num_freed, i, rounds; @@ -289,18 +332,107 @@ static int test_pool(void *arg) return 0; } +static int test_packet_pool(void *arg) +{ + int ret, thr; + uint32_t num, num_free, num_freed, i, rounds; + uint64_t c1, c2, cycles, nsec; + uint64_t events, frees; + odp_time_t t1, t2; + test_global_t *global = arg; + 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_burst = test_options->num_burst; + uint32_t max_num = num_burst * max_burst; + uint32_t data_size = test_options->data_size; + odp_pool_t pool = global->pool; + odp_packet_t pkt[max_num]; + + thr = odp_thread_id(); + + for (i = 0; i < max_num; i++) + pkt[i] = ODP_PACKET_INVALID; + + events = 0; + frees = 0; + ret = 0; + + /* Start all workers at the same time */ + odp_barrier_wait(&global->barrier); + + t1 = odp_time_local(); + c1 = odp_cpu_cycles(); + + for (rounds = 0; rounds < num_round; rounds++) { + num = 0; + + for (i = 0; i < num_burst; i++) { + ret = odp_packet_alloc_multi(pool, data_size, &pkt[num], + max_burst); + if (odp_unlikely(ret < 0)) { + printf("Error: Alloc failed. Round %u\n", + rounds); + + if (num) + odp_packet_free_multi(pkt, num); + + return -1; + } + + num += ret; + } + + if (odp_unlikely(num == 0)) + continue; + + events += num; + num_freed = 0; + + while (num_freed < num) { + num_free = num - num_freed; + if (num_free > max_burst) + num_free = max_burst; + + odp_packet_free_multi(&pkt[num_freed], num_free); + frees++; + num_freed += num_free; + } + } + + c2 = odp_cpu_cycles(); + t2 = odp_time_local(); + + nsec = odp_time_diff_ns(t2, t1); + cycles = odp_cpu_cycles_diff(c2, c1); + + /* Update stats*/ + global->stat[thr].rounds = rounds; + global->stat[thr].frees = frees; + global->stat[thr].events = events; + global->stat[thr].nsec = nsec; + global->stat[thr].cycles = cycles; + + return 0; +} + static int start_workers(test_global_t *global, odp_instance_t instance) { odph_odpthread_params_t thr_params; test_options_t *test_options = &global->test_options; int num_cpu = test_options->num_cpu; + int packet_pool = test_options->pool_type; memset(&thr_params, 0, sizeof(thr_params)); thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; - thr_params.start = test_pool; thr_params.arg = global; + if (packet_pool) + thr_params.start = test_packet_pool; + else + thr_params.start = test_buffer_pool; + if (odph_odpthreads_create(global->thread_tbl, &global->cpumask, &thr_params) != num_cpu) return -1; commit a8030759ec3467206a52bdefadda3b7c5f7bdf27 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Aug 20 11:27:00 2019 +0300 test: pool_perf: add number of bursts option Added -n option to control how many (bursts) alloc calls are done before freeing allocated events. When more events are allocated before freeing any, it's more likely that alloc needs to synchronize with the global pool (thread local stash gets empty) and performance decreases. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/performance/odp_pool_perf.c b/test/performance/odp_pool_perf.c index 89cb109b2..d00e4bc92 100644 --- a/test/performance/odp_pool_perf.c +++ b/test/performance/odp_pool_perf.c @@ -19,6 +19,7 @@ typedef struct test_options_t { uint32_t num_event; uint32_t num_round; uint32_t max_burst; + uint32_t num_burst; } test_options_t; @@ -55,6 +56,7 @@ static void print_usage(void) " -e, --num_event Number of events\n" " -r, --num_round Number of rounds\n" " -b, --burst Maximum number of events per operation\n" + " -n, --num_burst Number of bursts allocated/freed back-to-back\n" " -h, --help This help\n" "\n"); } @@ -70,16 +72,18 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"num_event", required_argument, NULL, 'e'}, {"num_round", required_argument, NULL, 'r'}, {"burst", required_argument, NULL, 'b'}, + {"num_burst", required_argument, NULL, 'n'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:e:r:b:h"; + static const char *shortopts = "+c:e:r:b:n:h"; test_options->num_cpu = 1; test_options->num_event = 1000; test_options->num_round = 100000; test_options->max_burst = 100; + test_options->num_burst = 1; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -100,6 +104,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'b': test_options->max_burst = atoi(optarg); break; + case 'n': + test_options->num_burst = atoi(optarg); + break; case 'h': /* fall through */ default: @@ -109,6 +116,15 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) } } + if (test_options->num_burst * test_options->max_burst > + test_options->num_event) { + printf("Not enough events (%u) for the burst configuration.\n" + "Use smaller burst size (%u) or less bursts (%u)\n", + test_options->num_event, test_options->max_burst, + test_options->num_burst); + ret = -1; + } + return ret; } @@ -153,13 +169,15 @@ static int create_pool(test_global_t *global) uint32_t num_event = test_options->num_event; uint32_t num_round = test_options->num_round; uint32_t max_burst = test_options->max_burst; + uint32_t num_burst = test_options->num_burst; uint32_t num_cpu = test_options->num_cpu; printf("\nPool performance test\n"); printf(" num cpu %u\n", num_cpu); printf(" num rounds %u\n", num_round); printf(" num events %u\n", num_event); - printf(" max burst %u\n\n", max_burst); + printf(" max burst %u\n", max_burst); + printf(" num bursts %u\n\n", num_burst); if (odp_pool_capability(&pool_capa)) { printf("Error: Pool capa failed.\n"); @@ -191,8 +209,8 @@ static int create_pool(test_global_t *global) static int test_pool(void *arg) { - int num, ret, thr; - uint32_t i, rounds; + int ret, thr; + uint32_t num, num_free, num_freed, i, rounds; uint64_t c1, c2, cycles, nsec; uint64_t events, frees; odp_time_t t1, t2; @@ -200,12 +218,14 @@ static int test_pool(void *arg) 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_burst = test_options->num_burst; + uint32_t max_num = num_burst * max_burst; odp_pool_t pool = global->pool; - odp_buffer_t buf[max_burst]; + odp_buffer_t buf[max_num]; thr = odp_thread_id(); - for (i = 0; i < max_burst; i++) + for (i = 0; i < max_num; i++) buf[i] = ODP_BUFFER_INVALID; events = 0; @@ -219,19 +239,37 @@ static int test_pool(void *arg) c1 = odp_cpu_cycles(); for (rounds = 0; rounds < num_round; rounds++) { - num = odp_buffer_alloc_multi(pool, buf, max_burst); + num = 0; - if (odp_likely(num > 0)) { - events += num; - odp_buffer_free_multi(buf, num); - frees++; - continue; + for (i = 0; i < num_burst; i++) { + ret = odp_buffer_alloc_multi(pool, &buf[num], + max_burst); + if (odp_unlikely(ret < 0)) { + printf("Error: Alloc failed. Round %u\n", + rounds); + if (num) + odp_buffer_free_multi(buf, num); + + return -1; + } + + num += ret; } - if (num < 0) { - printf("Error: Alloc failed. Round %u\n", rounds); - ret = -1; - break; + if (odp_unlikely(num == 0)) + continue; + + events += num; + num_freed = 0; + + while (num_freed < num) { + num_free = num - num_freed; + if (num_free > max_burst) + num_free = max_burst; + + odp_buffer_free_multi(&buf[num_freed], num_free); + frees++; + num_freed += num_free; } } @@ -248,7 +286,7 @@ static int test_pool(void *arg) global->stat[thr].nsec = nsec; global->stat[thr].cycles = cycles; - return ret; + return 0; } static int start_workers(test_global_t *global, odp_instance_t instance) @@ -273,9 +311,11 @@ static int start_workers(test_global_t *global, odp_instance_t instance) static void print_stat(test_global_t *global) { int i, num; - double rounds_ave, frees_ave, events_ave, nsec_ave, cycles_ave; + double rounds_ave, allocs_ave, frees_ave; + double events_ave, nsec_ave, cycles_ave; test_options_t *test_options = &global->test_options; int num_cpu = test_options->num_cpu; + uint32_t num_burst = test_options->num_burst; uint64_t rounds_sum = 0; uint64_t frees_sum = 0; uint64_t events_sum = 0; @@ -297,6 +337,7 @@ static void print_stat(test_global_t *global) } rounds_ave = rounds_sum / num_cpu; + allocs_ave = (num_burst * rounds_sum) / num_cpu; frees_ave = frees_sum / num_cpu; events_ave = events_sum / num_cpu; nsec_ave = nsec_sum / num_cpu; @@ -321,7 +362,7 @@ static void print_stat(test_global_t *global) printf("RESULTS - average over %i threads:\n", num_cpu); printf("----------------------------------\n"); - printf(" alloc calls: %.3f\n", rounds_ave); + printf(" alloc calls: %.3f\n", allocs_ave); printf(" free calls: %.3f\n", frees_ave); printf(" duration: %.3f msec\n", nsec_ave / 1000000); printf(" num cycles: %.3f M\n", cycles_ave / 1000000); @@ -330,9 +371,11 @@ static void print_stat(test_global_t *global) printf(" cycles per event: %.3f\n", cycles_ave / events_ave); printf(" ave events allocated: %.3f\n", - events_ave / rounds_ave); - printf(" operations per sec: %.3f M\n", - (1000.0 * rounds_ave) / nsec_ave); + events_ave / allocs_ave); + printf(" allocs per sec: %.3f M\n", + (1000.0 * allocs_ave) / nsec_ave); + printf(" frees per sec: %.3f M\n", + (1000.0 * frees_ave) / nsec_ave); printf(" events per sec: %.3f M\n\n", (1000.0 * events_ave) / nsec_ave); } ----------------------------------------------------------------------- Summary of changes: test/performance/odp_pool_perf.c | 229 ++++++++++++++++++++++++++++++++++----- 1 file changed, 202 insertions(+), 27 deletions(-) hooks/post-receive --

5 years, 6 months

[COMMIT] branch master updated. v1.21.0.0-184-g7fd565206

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 7fd565206ddfe4acb5c8c44d7aa2f6a6e4218148 (commit) from 807a49cbdebcff68b5aec305513587c3827e77c5 (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 7fd565206ddfe4acb5c8c44d7aa2f6a6e4218148 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Aug 20 15:49:32 2019 +0300 test: correct getopt short option usage Remove extra plus characters from short option string. Only the first char needs to be '+' char: "If the first character of option string is '+' then option processing stops as soon as a nonoption argument is encountered." Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 40038d57c..55e217e54 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -600,7 +600,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:t:h"; + static const char *shortopts = "+c:i:m:t:h"; appl_args->cpu_count = 1; /* use one worker by default */ appl_args->mode = APPL_MODE_PKT_SCHED; diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index c922f7ef4..026af6ec8 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -756,7 +756,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:+t:+a:i:h"; + static const char *shortopts = "+c:t:a:i:h"; appl_args->cpu_count = 1; /* use one worker by default */ appl_args->time = 0; /* loop forever if time to run is 0 */ diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c index 00efb7a86..8ea064535 100644 --- a/test/performance/odp_cpu_bench.c +++ b/test/performance/odp_cpu_bench.c @@ -382,7 +382,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+a:+c:+l:+t:h"; + static const char *shortopts = "+a:c:l:t:h"; appl_args->accuracy = 1; /* Get and print pps stats second */ appl_args->cpu_count = 1; diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index 51ec03ce9..e7383d873 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -864,7 +864,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:+t:+a:i:m:d:r:f:e:h"; + static const char *shortopts = "+c:t:a:i:m:d:r:f:e:h"; appl_args->time = 0; /* loop forever if time to run is 0 */ appl_args->accuracy = DEF_STATS_INT; ----------------------------------------------------------------------- Summary of changes: example/packet/odp_pktio.c | 2 +- example/switch/odp_switch.c | 2 +- test/performance/odp_cpu_bench.c | 2 +- test/performance/odp_pktio_ordered.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive --

5 years, 6 months

[COMMIT] branch master updated. v1.21.0.0-183-g807a49cb

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 807a49cbdebcff68b5aec305513587c3827e77c5 (commit) via 8fb3ebc08684dc35eeb9632abccf1a11b4b512c3 (commit) via b9fdf74d3340ccd88a1bdeb1218f2a6ac4a3e840 (commit) via 0b9207d87fba558d0dd1dfcf192f4310d6bc9f93 (commit) via ca17284c6b3990d30c78900c9968d88feabe02fa (commit) via a891fc391967841e472d06437fa613a64ad3b08a (commit) via 667dbac196c3d015ed70780c793cd1854adf9d7f (commit) via 39387fc5e7acfa58e6478b237292c73c1f6540fd (commit) from 0c2a88257d645890774053261c37290653694cd3 (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 807a49cbdebcff68b5aec305513587c3827e77c5 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Aug 16 17:47:46 2019 +0300 test: l2fwd: use ODPH_ASSERT instead of assert.h Use ODPH_ASSERT macro instead of a call to a C library. This improves performance as the macro does not generate code when it is disabled. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2253862d..bfcd5c18 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -17,7 +17,6 @@ #include <unistd.h> #include <errno.h> #include <inttypes.h> -#include <assert.h> #include <signal.h> #include <test_debug.h> @@ -380,7 +379,7 @@ static int run_worker_sched_mode(void *arg) /* packets from the same queue are from the same interface */ src_idx = odp_packet_input_index(pkt_tbl[0]); - assert(src_idx >= 0); + ODPH_ASSERT(src_idx >= 0); dst_idx = gbl_args->dst_port_from_idx[src_idx]; fill_eth_addrs(pkt_tbl, pkts, dst_idx); commit 8fb3ebc08684dc35eeb9632abccf1a11b4b512c3 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Aug 16 18:04:15 2019 +0300 helper: increment helper version number Increment helper version number to reflect addition of ODPH_ASSERT and other odph_debug.h content into helper API. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/configure.ac b/configure.ac index 1e11b4ba..b7a981c2 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_SUBST(ODP_VERSION_API_MINOR) ########################################################################## m4_define([odph_version_generation], [1]) m4_define([odph_version_major], [0]) -m4_define([odph_version_minor], [1]) +m4_define([odph_version_minor], [2]) m4_define([odph_version], [odph_version_generation.odph_version_major.odph_version_minor]) commit b9fdf74d3340ccd88a1bdeb1218f2a6ac4a3e840 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Aug 19 13:21:43 2019 +0300 helper: debug: add test application for helper debug Test that macros are defined and use assert. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/helper/test/.gitignore b/helper/test/.gitignore index 5a6c60bc..23fab7b3 100644 --- a/helper/test/.gitignore +++ b/helper/test/.gitignore @@ -10,3 +10,4 @@ table thread pthread version +debug diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index bf3aa862..b030ddf4 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/test/Makefile.inc EXECUTABLES = version \ + debug \ chksum \ cuckootable \ parse\ @@ -38,3 +39,4 @@ parse_SOURCES = parse.c table_SOURCES = table.c iplookuptable_SOURCES = iplookuptable.c version_SOURCES = version.c +debug_SOURCES = debug.c diff --git a/helper/test/debug.c b/helper/test/debug.c new file mode 100644 index 00000000..e20fd325 --- /dev/null +++ b/helper/test/debug.c @@ -0,0 +1,31 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp_api.h> +#include <odp/helper/odph_api.h> + +#include <stdio.h> +#include <string.h> + +int main(void) +{ + printf("\nHelper library version is: %s\n\n", odph_version_str()); + + printf("Helper debugging:\n"); + printf(" ODPH_DEBUG: %i\n", ODPH_DEBUG); + printf(" ODPH_DEBUG_PRINT: %i\n\n", ODPH_DEBUG_PRINT); + + /* ASSERT(true) should work always */ + ODPH_ASSERT(1); + + /* ASSERT(false) should not abort when not debugging */ + if (ODPH_DEBUG == 0) + ODPH_ASSERT(0); + + return 0; +} commit 0b9207d87fba558d0dd1dfcf192f4310d6bc9f93 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Aug 16 17:43:48 2019 +0300 helper: debug: move odph_debug.h into helper API Moved the debug header to be part of the helper API. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/helper/Makefile.am b/helper/Makefile.am index a7d5132d..cfeeeeb4 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -13,6 +13,7 @@ AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ include/odp/helper/chksum.h\ + include/odp/helper/odph_debug.h \ include/odp/helper/eth.h\ include/odp/helper/icmp.h\ include/odp/helper/ip.h\ @@ -41,7 +42,6 @@ helperlinuxinclude_HEADERS = \ endif noinst_HEADERS = \ - include/odph_debug.h \ include/odph_list_internal.h __LIB__libodphelper_la_SOURCES = \ diff --git a/helper/cuckootable.c b/helper/cuckootable.c index febfa28e..5609e690 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -44,8 +44,8 @@ #include <errno.h> #include <stdio.h> -#include "odp/helper/odph_cuckootable.h" -#include "odph_debug.h" +#include <odp/helper/odph_cuckootable.h> +#include <odp/helper/odph_debug.h> #include <odp_api.h> /* More efficient access to a map of single ullong */ diff --git a/helper/hashtable.c b/helper/hashtable.c index 16f6c14c..496bca5e 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -10,9 +10,9 @@ #include <string.h> #include <malloc.h> -#include "odp/helper/odph_hashtable.h" +#include <odp/helper/odph_hashtable.h> +#include <odp/helper/odph_debug.h> #include "odph_list_internal.h" -#include "odph_debug.h" #include <odp_api.h> #define ODPH_SUCCESS 0 diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index 4bd10bf4..921914aa 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -18,6 +18,7 @@ extern "C" { #endif +#include <odp/helper/odph_debug.h> #include <odp/helper/chksum.h> #include <odp/helper/odph_cuckootable.h> #include <odp/helper/eth.h> diff --git a/helper/include/odph_debug.h b/helper/include/odp/helper/odph_debug.h similarity index 100% rename from helper/include/odph_debug.h rename to helper/include/odp/helper/odph_debug.h diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 84b4e2cb..1b5538ab 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -12,8 +12,8 @@ #include <stdio.h> #include <odp/helper/odph_iplookuptable.h> +#include <odp/helper/odph_debug.h> #include "odph_list_internal.h" -#include "odph_debug.h" #include <odp_api.h> /** @magic word, write to the first byte of the memory block diff --git a/helper/lineartable.c b/helper/lineartable.c index b27246cb..8479d2f1 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -10,8 +10,8 @@ #include <string.h> #include <malloc.h> -#include "odp/helper/odph_lineartable.h" -#include "odph_debug.h" +#include <odp/helper/odph_lineartable.h> +#include <odp/helper/odph_debug.h> #include <odp_api.h> #define ODPH_SUCCESS 0 diff --git a/helper/linux/thread.c b/helper/linux/thread.c index 6ed1bc8f..eecd6fed 100644 --- a/helper/linux/thread.c +++ b/helper/linux/thread.c @@ -24,7 +24,7 @@ #include <odp_api.h> #include <odp/helper/linux/pthread.h> #include <odp/helper/linux/process.h> -#include "odph_debug.h" +#include <odp/helper/odph_debug.h> static void *_odph_run_start_routine(void *arg) { diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 5c7c650e..9fa4ec18 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -6,7 +6,6 @@ #include "config.h" -#include "odph_debug.h" #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index 3afa490a..ee5f1d83 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -50,7 +50,6 @@ #include <time.h> #include <odp_api.h> -#include <odph_debug.h> #include <odp/helper/odph_api.h> /******************************************************************************* diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index 5e16e711..6637242d 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -13,9 +13,7 @@ #include <errno.h> #include <odp_api.h> -#include <odph_debug.h> #include <odp/helper/odph_api.h> -#include <odp/helper/ip.h> static void print_prefix_info( const char *msg, uint32_t ip, uint8_t cidr) diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c index 92d779d9..26c9649d 100644 --- a/helper/test/linux/process.c +++ b/helper/test/linux/process.c @@ -6,8 +6,8 @@ #include "config.h" -#include <odph_debug.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp/helper/linux/pthread.h> #include <odp/helper/linux/process.h> diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c index 8441805d..b0a57815 100644 --- a/helper/test/linux/pthread.c +++ b/helper/test/linux/pthread.c @@ -6,8 +6,8 @@ #include "config.h" -#include <odph_debug.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp/helper/linux/pthread.h> #include <string.h> diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 55db37e0..dbff4294 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -15,7 +15,6 @@ #include <unistd.h> #include <stdlib.h> -#include <odph_debug.h> #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/test/parse.c b/helper/test/parse.c index f2f12cc0..5f8c5846 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -6,8 +6,6 @@ #include "config.h" -#include <odph_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/test/table.c b/helper/test/table.c index 29d87cb2..2887bd59 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -6,9 +6,8 @@ #include "config.h" -#include <odph_debug.h> -#include <odp/helper/odph_api.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> /** * Address Resolution Protocol (ARP) diff --git a/helper/test/version.c b/helper/test/version.c index bd817bb4..22ee2955 100644 --- a/helper/test/version.c +++ b/helper/test/version.c @@ -6,8 +6,6 @@ #include "config.h" -#include <odph_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/threads.c b/helper/threads.c index e30c9f29..37a0c25d 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -20,7 +20,7 @@ #include <odp_api.h> #include <odp/helper/threads.h> -#include "odph_debug.h" +#include <odp/helper/odph_debug.h> #define FAILED_CPU -1 commit ca17284c6b3990d30c78900c9968d88feabe02fa Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Aug 16 17:25:26 2019 +0300 helper: debug: add ODPH_ASSERT macro Added assert macro to be used by test applications. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/helper/include/odph_debug.h b/helper/include/odph_debug.h index d08918be..c99936f4 100644 --- a/helper/include/odph_debug.h +++ b/helper/include/odph_debug.h @@ -1,16 +1,19 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia + * * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ + /** * @file * - * HELPER debug + * Helper debug */ -#ifndef HELPER_DEBUG_H_ -#define HELPER_DEBUG_H_ +#ifndef ODPH_DEBUG_H_ +#define ODPH_DEBUG_H_ #include <stdio.h> #include <stdlib.h> @@ -19,14 +22,29 @@ extern "C" { #endif +/** + * Assert macro for applications and helper code + * + * No code is generated when ODPH_DEBUG=0. Prints error message and aborts when + * ODPH_DEBUG=1 and 'cond' is false. + */ +#define ODPH_ASSERT(cond) \ + do { \ + if ((ODPH_DEBUG == 1) && (!(cond))) { \ + fprintf(stderr, "%s:%d:%s(): %s\n", __FILE__, __LINE__,\ + __func__, #cond); \ + abort(); \ + } \ + } while (0) + /** * log level. */ -typedef enum HELPER_log_level { +typedef enum odph_log_level { ODPH_LOG_DBG, ODPH_LOG_ERR, ODPH_LOG_ABORT -} HELPER_log_level_e; +} odph_log_level_e; /** * default LOG macro. commit a891fc391967841e472d06437fa613a64ad3b08a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Aug 16 17:00:38 2019 +0300 configure: add enable-helper-debug option Test application code needs also debug code (asserts) that can be turned off/on. Added new preprocessor define (ODPH_DEBUG) and a configure option to control it. All debug options are enabled when --enable-debug=full is used. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/configure.ac b/configure.ac index a90993e4..1e11b4ba 100644 --- a/configure.ac +++ b/configure.ac @@ -362,6 +362,14 @@ AS_IF([test "x$enable_debug" != "xno"], [ODP_DEBUG=1], AC_DEFINE_UNQUOTED([ODP_DEBUG], [$ODP_DEBUG], [Define to 1 to include additional debug code]) +AC_ARG_ENABLE([helper-debug], + [AS_HELP_STRING([--enable-helper-debug], [helpers include additional debugging code])], + [], [AS_IF([test "x$enable_debug" = "xfull"], [enable_helper_debug=yes], + [enable_helper_debug=no])]) +AS_IF([test "x$enable_helper_debug" != "xno"], [ODPH_DEBUG=1], [ODPH_DEBUG=0]) +AC_DEFINE_UNQUOTED([ODPH_DEBUG], [$ODPH_DEBUG], + [Define to 1 to include additional helper debug code]) + ########################################################################## # Enable/disable ODP_DEBUG_PRINT ########################################################################## @@ -383,6 +391,9 @@ AS_IF([test "x$enable_helper_debug_print" != "xno"], [ODPH_DEBUG_PRINT=1], AC_DEFINE_UNQUOTED([ODPH_DEBUG_PRINT], [$ODPH_DEBUG_PRINT], [Define to 1 to display helper debug information]) +debug_settings="ODP_DEBUG=${ODP_DEBUG}, ODP_DEBUG_PRINT=${ODP_DEBUG_PRINT}, \ +ODPH_DEBUG=${ODPH_DEBUG}, ODPH_DEBUG_PRINT=${ODPH_DEBUG_PRINT}" + ########################################################################## # Enable/disable deprecated API definitions ########################################################################## @@ -457,7 +468,7 @@ AC_MSG_RESULT([ ABI compatible: ${abi_compat} link time optimization: ${lto_enabled} deprecated APIs: ${deprecated} - debug: ${enable_debug} + debug: ${debug_settings} cunit: ${cunit_support} static tests linkage: ${enable_static_applications} with_examples: ${with_examples} commit 667dbac196c3d015ed70780c793cd1854adf9d7f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Aug 15 16:32:30 2019 +0300 test: l2fwd: added burst size option Added -b option to control maximum packet receive burst size. It enables easy testing of various burst sizes. Typically, burst size affect significantly to maximum throughput. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2663b68a..2253862d 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -93,6 +93,7 @@ typedef struct { int chksum; /* Checksum offload */ int sched_mode; /* Scheduler mode */ int num_groups; /* Number of scheduling groups */ + int burst_rx; /* Receive burst size */ int verbose; /* Verbose output */ } appl_args_t; @@ -296,6 +297,7 @@ static int run_worker_sched_mode(void *arg) int dst_idx; int i; int pktio, num_pktio; + uint16_t max_burst; odp_pktout_queue_t pktout[MAX_PKTIOS]; odp_queue_t tx_queue[MAX_PKTIOS]; thread_args_t *thr_args = arg; @@ -304,6 +306,7 @@ static int run_worker_sched_mode(void *arg) pktin_mode_t in_mode = gbl_args->appl.in_mode; thr = odp_thread_id(); + max_burst = gbl_args->appl.burst_rx; if (gbl_args->appl.num_groups) { odp_thrmask_t mask; @@ -348,7 +351,7 @@ static int run_worker_sched_mode(void *arg) unsigned tx_drops; int src_idx; - pkts = odp_schedule_multi_no_wait(NULL, ev_tbl, MAX_PKT_BURST); + pkts = odp_schedule_multi_no_wait(NULL, ev_tbl, max_burst); if (pkts <= 0) continue; @@ -432,6 +435,7 @@ static int run_worker_plain_queue_mode(void *arg) { int thr; int pkts; + uint16_t max_burst; odp_packet_t pkt_tbl[MAX_PKT_BURST]; int dst_idx, num_pktio; odp_queue_t queue; @@ -444,6 +448,7 @@ static int run_worker_plain_queue_mode(void *arg) int i; thr = odp_thread_id(); + max_burst = gbl_args->appl.burst_rx; num_pktio = thr_args->num_pktio; dst_idx = thr_args->pktio[pktio].tx_idx; @@ -474,7 +479,7 @@ static int run_worker_plain_queue_mode(void *arg) pktio = 0; } - pkts = odp_queue_deq_multi(queue, event, MAX_PKT_BURST); + pkts = odp_queue_deq_multi(queue, event, max_burst); if (odp_unlikely(pkts <= 0)) continue; @@ -559,6 +564,7 @@ static int run_worker_direct_mode(void *arg) { int thr; int pkts; + uint16_t max_burst; odp_packet_t pkt_tbl[MAX_PKT_BURST]; int dst_idx, num_pktio; odp_pktin_queue_t pktin; @@ -570,6 +576,7 @@ static int run_worker_direct_mode(void *arg) int use_event_queue = gbl_args->appl.out_mode; thr = odp_thread_id(); + max_burst = gbl_args->appl.burst_rx; num_pktio = thr_args->num_pktio; dst_idx = thr_args->pktio[pktio].tx_idx; @@ -599,7 +606,7 @@ static int run_worker_direct_mode(void *arg) pktio = 0; } - pkts = odp_pktin_recv(pktin, pkt_tbl, MAX_PKT_BURST); + pkts = odp_pktin_recv(pktin, pkt_tbl, max_burst); if (odp_unlikely(pkts <= 0)) continue; @@ -1147,6 +1154,8 @@ static void usage(char *progname) " -g, --groups <num> Number of groups to use: 0 ... num\n" " 0: SCHED_GROUP_ALL (default)\n" " num: must not exceed number of interfaces or workers\n" + " -b, --burst_rx <num> 0: Use max burst size (default)\n" + " num: Max number of packets per receive call\n" " -v, --verbose Verbose output.\n" " -h, --help Display help and exit.\n\n" "\n", NO_PATH(progname), NO_PATH(progname), MAX_PKTIOS @@ -1181,12 +1190,13 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"error_check", required_argument, NULL, 'e'}, {"chksum", required_argument, NULL, 'k'}, {"groups", required_argument, NULL, 'g'}, + {"burst_rx", required_argument, NULL, 'b'}, {"verbose", no_argument, NULL, 'v'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:k:g:vh"; + static const char *shortopts = "+c:t:a:i:m:o:r:d:s:e:k:g:b:vh"; appl_args->time = 0; /* loop forever if time to run is 0 */ appl_args->accuracy = 1; /* get and print pps stats second */ @@ -1195,6 +1205,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->src_change = 1; /* change eth src address by default */ appl_args->num_groups = 0; /* use default group */ appl_args->error_check = 0; /* don't check packet errors by default */ + appl_args->burst_rx = 0; appl_args->verbose = 0; appl_args->chksum = 0; /* don't use checksum offload by default */ @@ -1325,6 +1336,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'g': appl_args->num_groups = atoi(optarg); break; + case 'b': + appl_args->burst_rx = atoi(optarg); + break; case 'v': appl_args->verbose = 1; break; @@ -1349,6 +1363,15 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) exit(EXIT_FAILURE); } + if (appl_args->burst_rx > MAX_PKT_BURST) { + printf("Error: Burst size (%i) too large. Maximum is %i.\n", + appl_args->burst_rx, MAX_PKT_BURST); + exit(EXIT_FAILURE); + } + + if (appl_args->burst_rx == 0) + appl_args->burst_rx = MAX_PKT_BURST; + appl_args->extra_check = appl_args->error_check || appl_args->chksum; optind = 1; /* reset 'extern optind' from the getopt lib */ @@ -1384,11 +1407,13 @@ static void print_info(char *progname, appl_args_t *appl_args) printf("PKTIN_SCHED_ORDERED, "); if (appl_args->out_mode) - printf("PKTOUT_QUEUE"); + printf("PKTOUT_QUEUE\n"); else - printf("PKTOUT_DIRECT"); + printf("PKTOUT_DIRECT\n"); + + printf("Burst size: %i\n", appl_args->burst_rx); - printf("\n\n"); + printf("\n"); fflush(NULL); } commit 39387fc5e7acfa58e6478b237292c73c1f6540fd Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Aug 15 14:58:23 2019 +0300 test: l2fwd: use schedule_multi_no_wait Use no_wait version of the schedule function. It may provide better performance than the basic function, which needs to check the wait parameter value on each call. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index e8fa8690..2663b68a 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -348,8 +348,7 @@ static int run_worker_sched_mode(void *arg) unsigned tx_drops; int src_idx; - pkts = odp_schedule_multi(NULL, ODP_SCHED_NO_WAIT, ev_tbl, - MAX_PKT_BURST); + pkts = odp_schedule_multi_no_wait(NULL, ev_tbl, MAX_PKT_BURST); if (pkts <= 0) continue; ----------------------------------------------------------------------- Summary of changes: configure.ac | 15 ++++++++-- helper/Makefile.am | 2 +- helper/cuckootable.c | 4 +-- helper/hashtable.c | 4 +-- helper/include/odp/helper/odph_api.h | 1 + helper/include/{ => odp/helper}/odph_debug.h | 28 ++++++++++++++---- helper/iplookuptable.c | 2 +- helper/lineartable.c | 4 +-- helper/linux/thread.c | 2 +- helper/test/.gitignore | 1 + helper/test/Makefile.am | 2 ++ helper/test/chksum.c | 1 - helper/test/cuckootable.c | 1 - helper/test/debug.c | 31 ++++++++++++++++++++ helper/test/iplookuptable.c | 2 -- helper/test/linux/process.c | 2 +- helper/test/linux/pthread.c | 2 +- helper/test/odpthreads.c | 1 - helper/test/parse.c | 2 -- helper/test/table.c | 3 +- helper/test/version.c | 2 -- helper/threads.c | 2 +- test/performance/odp_l2fwd.c | 43 +++++++++++++++++++++------- 23 files changed, 117 insertions(+), 40 deletions(-) rename helper/include/{ => odp/helper}/odph_debug.h (74%) create mode 100644 helper/test/debug.c hooks/post-receive --

5 years, 6 months

[COMMIT] branch master updated. v1.21.0.0-175-g0c2a88257

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 0c2a88257d645890774053261c37290653694cd3 (commit) via 33f893d4700da16dc554931a03809076b42435db (commit) via 31b91f77e9de4b027eaaa9d4c1fa7cec7bac02e9 (commit) via f56bfbfbc5660de3b0c31d31ab5fc907c63e7649 (commit) via d36f4571f48632f377b9b58f2efd3e0553f0d002 (commit) from e0f627ebce7760a9c6f225285bea9aa6673bc330 (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 0c2a88257d645890774053261c37290653694cd3 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Aug 9 13:16:26 2019 +0300 linux-gen: dpdk: clean up unnecessary pool_alloc() function 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/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 41154dc6f..77e42b094 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -149,8 +149,6 @@ static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ static int dpdk_pktio_init(void); -static int pool_alloc(struct rte_mempool *mp); - static int lookup_opt(const char *opt_name, const char *drv_name, int *val) { const char *base = "pktio_dpdk"; @@ -338,6 +336,8 @@ static struct rte_mempool *mbuf_pool_create(const char *name, goto fail; } + mp->pool_data = pool_entry->pool_hdl; + if (rte_mempool_set_ops_byname(mp, "odp_pool", pool_entry)) { ODP_ERR("Failed setting mempool operations\n"); goto fail; @@ -349,11 +349,6 @@ static struct rte_mempool *mbuf_pool_create(const char *name, RTE_MBUF_PRIV_ALIGN); rte_pktmbuf_pool_init(mp, &mbp_priv); - if (pool_alloc(mp)) { - ODP_ERR("Failed allocating mempool\n"); - goto fail; - } - num = rte_mempool_populate_iova(mp, (char *)pool_entry->base_addr, RTE_BAD_IOVA, pool_entry->shm_size, NULL, NULL); @@ -423,13 +418,8 @@ static int pool_dequeue_bulk(struct rte_mempool *mp, void **obj_table, return 0; } -static int pool_alloc(struct rte_mempool *mp) +static int pool_alloc(struct rte_mempool *mp ODP_UNUSED) { - pool_t *pool_entry = (pool_t *)mp->pool_config; - - mp->pool_data = pool_entry->pool_hdl; - mp->flags |= MEMPOOL_F_POOL_CREATED; - return 0; } commit 33f893d4700da16dc554931a03809076b42435db Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Aug 9 13:12:44 2019 +0300 linux-gen: dpdk: allow memory channel spread 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/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index aa2b159de..41154dc6f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -319,8 +319,7 @@ static struct rte_mempool *mbuf_pool_create(const char *name, goto fail; } - total_size = rte_mempool_calc_obj_size(elt_size, MEMPOOL_F_NO_SPREAD, - &sz); + total_size = rte_mempool_calc_obj_size(elt_size, 0, &sz); if (total_size != pool_entry->block_size) { ODP_ERR("DPDK pool block size not matching to ODP pool: " "%" PRIu32 "/%" PRIu32 "\n", total_size, @@ -333,7 +332,7 @@ static struct rte_mempool *mbuf_pool_create(const char *name, mp = rte_mempool_create_empty(name, num + pool_entry->skipped_blocks, elt_size, cache_size(num), sizeof(struct rte_pktmbuf_pool_private), - rte_socket_id(), MEMPOOL_F_NO_SPREAD); + rte_socket_id(), 0); if (mp == NULL) { ODP_ERR("Failed to create empty DPDK packet pool\n"); goto fail; @@ -515,8 +514,7 @@ uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size) } block_size += sizeof(struct rte_mbuf); - total_size = rte_mempool_calc_obj_size(block_size, MEMPOOL_F_NO_SPREAD, - &sz); + total_size = rte_mempool_calc_obj_size(block_size, 0, &sz); pool->dpdk_elt_size = sz.elt_size; pool->block_offset = sz.header_size + sizeof(struct rte_mbuf); commit 31b91f77e9de4b027eaaa9d4c1fa7cec7bac02e9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Aug 9 13:12:21 2019 +0300 linux-gen: dpdk: set zero-copy pool mbuf private size correctly 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/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 76647798e..aa2b159de 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -263,26 +263,29 @@ static void pktmbuf_init(struct rte_mempool *mp, void *opaque_arg ODP_UNUSED, void *_m, unsigned i ODP_UNUSED) { struct rte_mbuf *m = _m; - uint32_t mbuf_size, buf_len; + uint32_t mbuf_size, buf_len, priv_size; odp_packet_hdr_t *pkt_hdr; void *buf_addr; pkt_hdr = pkt_hdr_from_mbuf(m); buf_addr = pkt_hdr->buf_hdr.base_data - RTE_PKTMBUF_HEADROOM; + priv_size = rte_pktmbuf_priv_size(mp); mbuf_size = sizeof(struct rte_mbuf); buf_len = rte_pktmbuf_data_room_size(mp); + /* odp_packet_hdr_t stored in private data so don't zero */ memset(m, 0, mbuf_size); - m->priv_size = 0; + m->priv_size = priv_size; m->buf_addr = buf_addr; + m->buf_iova = rte_mem_virt2iova(buf_addr); + if (odp_unlikely(m->buf_iova == 0)) + ODP_ABORT("Bad IO virtual address\n"); + m->buf_len = (uint16_t)buf_len; m->data_off = RTE_PKTMBUF_HEADROOM; - if (odp_unlikely(m->buf_iova == RTE_BAD_IOVA || m->buf_iova == 0)) - ODP_ABORT("Failed to map virt addr to iova\n"); - /* Init some constant fields */ m->pool = mp; m->nb_segs = 1; @@ -341,8 +344,10 @@ static struct rte_mempool *mbuf_pool_create(const char *name, goto fail; } - mbp_priv.mbuf_data_room_size = pool_entry->seg_len; - mbp_priv.mbuf_priv_size = 0; + mbp_priv.mbuf_data_room_size = pool_entry->headroom + + pool_entry->seg_len; + mbp_priv.mbuf_priv_size = RTE_ALIGN(sizeof(odp_packet_hdr_t), + RTE_MBUF_PRIV_ALIGN); rte_pktmbuf_pool_init(mp, &mbp_priv); if (pool_alloc(mp)) { commit f56bfbfbc5660de3b0c31d31ab5fc907c63e7649 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Aug 9 11:48:05 2019 +0300 linux-gen: dpdk: remove unnecessary zero-copy block size round up The blocks size is already rounded up by rte_mempool_calc_obj_size(). 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/odp_pool.c b/platform/linux-generic/odp_pool.c index 6fc2e0d91..f021d903d 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -560,11 +560,27 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, strcpy(&uarea_name[name_len], postfix); pool->params = *params; + pool->block_offset = 0; if (params->type == ODP_POOL_PACKET) { + uint32_t dpdk_obj_size; + hdr_size = ROUNDUP_CACHE_LINE(sizeof(odp_packet_hdr_t)); - block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + - seg_len + tailroom); + block_size = hdr_size + align + headroom + seg_len + tailroom; + /* Calculate extra space required for storing DPDK objects and + * mbuf headers. NOP if no DPDK pktio used or zero-copy mode is + * disabled. */ + dpdk_obj_size = _odp_dpdk_pool_obj_size(pool, block_size); + if (!dpdk_obj_size) { + ODP_ERR("Calculating DPDK mempool obj size failed\n"); + return ODP_POOL_INVALID; + } + if (dpdk_obj_size != block_size) { + shmflags |= ODP_SHM_HP; + block_size = dpdk_obj_size; + } else { + block_size = ROUNDUP_CACHE_LINE(block_size); + } } else { /* Header size is rounded up to cache line size, so the * following data can be cache line aligned without extra @@ -579,22 +595,6 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, block_size = ROUNDUP_CACHE_LINE(hdr_size + align_pad + seg_len); } - /* Calculate extra space required for storing DPDK objects and mbuf - * headers. NOP if zero-copy is disabled. */ - pool->block_offset = 0; - if (params->type == ODP_POOL_PACKET) { - uint32_t dpdk_obj_size; - - dpdk_obj_size = _odp_dpdk_pool_obj_size(pool, block_size); - if (!dpdk_obj_size) { - ODP_ERR("Calculating DPDK mempool obj size failed\n"); - return ODP_POOL_INVALID; - } - if (dpdk_obj_size != block_size) - shmflags |= ODP_SHM_HP; - block_size = dpdk_obj_size; - } - /* Allocate extra memory for skipping packet buffers which cross huge * page boundaries. */ if (params->type == ODP_POOL_PACKET) { commit d36f4571f48632f377b9b58f2efd3e0553f0d002 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Aug 9 10:45:42 2019 +0300 linux-gen: dpdk: add functions for rte_mbuf / odp_packet_hdr_t conversions Clean up code by adding inline functions for rte_mbuf /odp_packet_hdr_t type conversions. 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/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index ef729c100..76647798e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -79,8 +79,6 @@ ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM, #define DPDK_MBUF_BUF_SIZE RTE_MBUF_DEFAULT_BUF_SIZE #define DPDK_MEMPOOL_CACHE_SIZE 64 -#define MBUF_OFFSET (ROUNDUP_CACHE_LINE(sizeof(struct rte_mbuf))) - ODP_STATIC_ASSERT((DPDK_NB_MBUF % DPDK_MEMPOOL_CACHE_SIZE == 0) && (DPDK_MEMPOOL_CACHE_SIZE <= RTE_MEMPOOL_CACHE_MAX_SIZE) && (DPDK_MEMPOOL_CACHE_SIZE <= DPDK_MBUF_BUF_SIZE * 10 / 15) @@ -132,6 +130,16 @@ typedef struct ODP_ALIGNED_CACHE { ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_dpdk_t), "PKTIO_PRIVATE_SIZE too small"); +static inline struct rte_mbuf *mbuf_from_pkt_hdr(odp_packet_hdr_t *pkt_hdr) +{ + return ((struct rte_mbuf *)pkt_hdr) - 1; +} + +static inline odp_packet_hdr_t *pkt_hdr_from_mbuf(struct rte_mbuf *mbuf) +{ + return (odp_packet_hdr_t *)(mbuf + 1); +} + static inline pkt_dpdk_t *pkt_priv(pktio_entry_t *pktio_entry) { return (pkt_dpdk_t *)(uintptr_t)(pktio_entry->s.pkt_priv); @@ -259,7 +267,7 @@ static void pktmbuf_init(struct rte_mempool *mp, void *opaque_arg ODP_UNUSED, odp_packet_hdr_t *pkt_hdr; void *buf_addr; - pkt_hdr = (odp_packet_hdr_t *)(uintptr_t)((uint8_t *)m + MBUF_OFFSET); + pkt_hdr = pkt_hdr_from_mbuf(m); buf_addr = pkt_hdr->buf_hdr.base_data - RTE_PKTMBUF_HEADROOM; mbuf_size = sizeof(struct rte_mbuf); @@ -373,8 +381,9 @@ static int pool_enqueue(struct rte_mempool *mp, return 0; for (i = 0; i < num; i++) { - odp_packet_hdr_t *pkt_hdr = (odp_packet_hdr_t *)(uintptr_t) - ((uint8_t *)obj_table[i] + MBUF_OFFSET); + struct rte_mbuf *mbuf = (struct rte_mbuf *)obj_table[i]; + odp_packet_hdr_t *pkt_hdr = pkt_hdr_from_mbuf(mbuf); + pkt_tbl[i] = packet_handle(pkt_hdr); } @@ -404,8 +413,7 @@ static int pool_dequeue_bulk(struct rte_mempool *mp, void **obj_table, for (i = 0; i < pkts; i++) { odp_packet_hdr_t *pkt_hdr = packet_hdr(packet_tbl[i]); - obj_table[i] = (struct rte_mbuf *)(uintptr_t) - ((uint8_t *)pkt_hdr - MBUF_OFFSET); + obj_table[i] = mbuf_from_pkt_hdr(pkt_hdr); } return 0; @@ -501,12 +509,11 @@ uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size) odp_global_rw->dpdk_initialized = 1; } - block_size += MBUF_OFFSET; + block_size += sizeof(struct rte_mbuf); total_size = rte_mempool_calc_obj_size(block_size, MEMPOOL_F_NO_SPREAD, &sz); - pool->dpdk_elt_size = sz.elt_size; - pool->block_offset = sz.header_size + MBUF_OFFSET; + pool->block_offset = sz.header_size + sizeof(struct rte_mbuf); return total_size; } @@ -786,8 +793,7 @@ fail: static inline void prefetch_pkt(struct rte_mbuf *mbuf) { - odp_packet_hdr_t *pkt_hdr = (odp_packet_hdr_t *)(uintptr_t) - ((uint8_t *)mbuf + MBUF_OFFSET); + odp_packet_hdr_t *pkt_hdr = pkt_hdr_from_mbuf(mbuf); void *data = rte_pktmbuf_mtod(mbuf, char *); odp_prefetch(pkt_hdr); @@ -837,8 +843,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, data = rte_pktmbuf_mtod(mbuf, char *); pkt_len = rte_pktmbuf_pkt_len(mbuf); - pkt_hdr = (odp_packet_hdr_t *)(uintptr_t)((uint8_t *)mbuf + - MBUF_OFFSET); + pkt_hdr = pkt_hdr_from_mbuf(mbuf); if (pktio_cls_enabled(pktio_entry)) { packet_parse_reset(&parsed_hdr); @@ -904,8 +909,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, for (i = 0; i < num; i++) { odp_packet_t pkt = pkt_table[i]; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - struct rte_mbuf *mbuf = (struct rte_mbuf *)(uintptr_t) - ((uint8_t *)pkt_hdr - MBUF_OFFSET); + struct rte_mbuf *mbuf = mbuf_from_pkt_hdr(pkt_hdr); uint16_t pkt_len = odp_packet_len(pkt); if (odp_unlikely(pkt_len > pkt_dpdk->mtu)) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_pool.c | 36 ++++++++--------- platform/linux-generic/pktio/dpdk.c | 79 ++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 59 deletions(-) hooks/post-receive --

5 years, 7 months

[COMMIT] branch master updated. v1.21.0.0-170-ge0f627ebc

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 e0f627ebce7760a9c6f225285bea9aa6673bc330 (commit) via 8c5b85e0b4705415764d75981322c0c649dffff7 (commit) via 0416281a1a370c112f5ceffe6f1e29e6dec86453 (commit) from eec882c78e9ce4aefe1209cfc4da2130aea4cc83 (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 e0f627ebce7760a9c6f225285bea9aa6673bc330 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Aug 9 15:32:33 2019 +0300 linux-dpdk: improve dpdk linking Link whole dpdk library with 'whole-archive' flags instead of linking each driver individually. Adds missing mlx5 driver dependency. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index f381ee25e..07acb8fcf 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -1,9 +1,7 @@ # ODP_DPDK_PMDS(DPDK_DRIVER_PATH) # ------------------------------- -# Build a list of DPDK PMD drivers in DPDK_PMDS variable. -# Updated DPDK_LIBS to include dependencies. +# Update DPDK_LIBS to include dependencies. AC_DEFUN([ODP_DPDK_PMDS], [dnl -AS_VAR_SET([DPDK_PMDS], ["-Wl,--whole-archive,"]) AC_MSG_NOTICE([Looking for DPDK PMDs at $1]) for filename in "$1"/librte_pmd_*.a; do cur_driver=`basename "$filename" .a | sed -e 's/^lib//'` @@ -11,11 +9,10 @@ cur_driver=`basename "$filename" .a | sed -e 's/^lib//'` # Match pattern is filled to 'filename' once if no matches are found AS_IF([test "x$cur_driver" = "xrte_pmd_*"], [break]) -AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) AS_CASE([$cur_driver], [rte_pmd_nfp], [AS_VAR_APPEND([DPDK_LIBS], [" -lm"])], [rte_pmd_mlx4], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx4 -libverbs"])], - [rte_pmd_mlx5], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx5 -libverbs"])], + [rte_pmd_mlx5], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx5 -libverbs -lmnl"])], [rte_pmd_pcap], [AS_VAR_APPEND([DPDK_LIBS], [" -lpcap"])], [rte_pmd_aesni_gcm], [AS_VAR_APPEND([DPDK_LIBS], [" -lIPSec_MB"])], [rte_pmd_aesni_mb], [AS_VAR_APPEND([DPDK_LIBS], [" -lIPSec_MB"])], @@ -25,7 +22,6 @@ AS_CASE([$cur_driver], [rte_pmd_qat], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])], [rte_pmd_openssl], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])]) done -AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) ]) # _ODP_DPDK_SET_LIBS @@ -33,11 +29,12 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) # Set DPDK_LIBS/DPDK_LIBS_LT/DPDK_LIBS_LIBODP depending on DPDK setup AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl ODP_DPDK_PMDS([$DPDK_PMD_PATH]) +DPDK_LIB="-Wl,--whole-archive,-ldpdk,--no-whole-archive" AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl # applications don't need to be linked to anything, just rpath DPDK_LIBS_LT="$DPDK_RPATH_LT" # static linking flags will need -ldpdk - DPDK_LIBS_LT_STATIC="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" + DPDK_LIBS_LT_STATIC="$DPDK_LDFLAGS $DPDK_LIB $DPDK_LIBS" DPDK_LIBS="-Wl,--no-as-needed,-ldpdk,--as-needed,`echo $DPDK_LIBS | sed -e 's/ /,/g'`" DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" # link libodp-linux with -ldpdk @@ -46,10 +43,10 @@ AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl # build long list of libraries for applications, which should not be # rearranged by libtool DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" - DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_LIB $DPDK_LIBS_LT $DPDK_LIBS" DPDK_LIBS_LT_STATIC="$DPDK_LIBS_LT" # static linking flags follow the suite - DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_LIB $DPDK_LIBS" # link libodp-linux with libtool linking flags DPDK_LIBS_LIBODP="$DPDK_LIBS_LT" ]) @@ -83,7 +80,7 @@ LIBS="$LIBS -ldpdk $2" AC_MSG_CHECKING([for rte_eal_init in -ldpdk $2]) AC_LINK_IFELSE([AC_LANG_CALL([], [rte_eal_init])], [AC_MSG_RESULT([yes]) - DPDK_LIBS="-ldpdk $2"], + DPDK_LIBS="$2"], [AC_MSG_RESULT([no])]) ########################################################################## diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 3d15c6495..ef729c100 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -139,32 +139,6 @@ static inline pkt_dpdk_t *pkt_priv(pktio_entry_t *pktio_entry) static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ -#ifndef RTE_BUILD_SHARED_LIB -#define MEMPOOL_OPS(hdl) \ -extern void mp_hdlr_init_##hdl(void) - -MEMPOOL_OPS(ops_mp_mc); -MEMPOOL_OPS(ops_sp_sc); -MEMPOOL_OPS(ops_mp_sc); -MEMPOOL_OPS(ops_sp_mc); -MEMPOOL_OPS(ops_stack); - -/* - * This function is not called from anywhere, it's only purpose is to make sure - * that if ODP and DPDK are statically linked to an application, the GCC - * constructors of mempool handlers are linked as well. Otherwise the linker - * would omit them. It's not an issue with dynamic linking. */ -void refer_constructors(void); -void refer_constructors(void) -{ - mp_hdlr_init_ops_mp_mc(); - mp_hdlr_init_ops_sp_sc(); - mp_hdlr_init_ops_mp_sc(); - mp_hdlr_init_ops_sp_mc(); - mp_hdlr_init_ops_stack(); -} -#endif - static int dpdk_pktio_init(void); static int pool_alloc(struct rte_mempool *mp); commit 8c5b85e0b4705415764d75981322c0c649dffff7 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jun 7 15:20:17 2019 +0300 test: performance: use correct test application return value Previously, the return value of 'tee' was used, which returned success even if the actual test application failed. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh index 5745d3279..2d2321aa5 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (c) 2015-2018, Linaro Limited # All rights reserved. @@ -86,7 +86,7 @@ run_l2fwd() # Max 2 workers $STDBUF odp_l2fwd${EXEEXT} -i $IF1,$IF2 -m 0 -t 30 -c 2 | tee $LOG - ret=$? + ret=${PIPESTATUS[0]} kill -2 ${GEN_PID} diff --git a/test/performance/odp_pktio_ordered_run.sh b/test/performance/odp_pktio_ordered_run.sh index 295b8803b..09dd2ab98 100755 --- a/test/performance/odp_pktio_ordered_run.sh +++ b/test/performance/odp_pktio_ordered_run.sh @@ -31,7 +31,7 @@ fi $STDBUF ${TEST_DIR}/odp_pktio_ordered${EXEEXT} \ -i pcap:in=${PCAP_IN}:loops=$LOOPS,pcap:out=${PCAP_OUT} \ -t $DURATION | tee $LOG -ret=$? +ret=${PIPESTATUS[0]} if [ $ret -ne 0 ]; then echo "FAIL: no odp_pktio_ordered${EXEEXT}" commit 0416281a1a370c112f5ceffe6f1e29e6dec86453 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jun 7 16:19:09 2019 +0300 test: l2fwd: allocate odph_thread_t data from shm When using process mode and synchronized thread creation the odph_thread_t data has to be allocated from shared memory. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Carl Wallen <carl.wallen(a)nokia.com> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2cec9c90c..e8fa8690b 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -1,4 +1,5 @@ /* Copyright (c) 2014-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -136,8 +137,10 @@ typedef struct thread_args_t { * Grouping of all global data */ typedef struct { + /* Thread table */ + odph_thread_t thread_tbl[MAX_WORKERS]; /* Thread specific arguments */ - thread_args_t thread[MAX_WORKERS]; + thread_args_t thread_args[MAX_WORKERS]; /* Barriers to synchronize main and workers */ odp_barrier_t init_barrier; odp_barrier_t term_barrier; @@ -954,7 +957,7 @@ static void bind_workers(void) } for (thr = 0; thr < num_workers; thr++) { - thr_args = &gbl_args->thread[thr]; + thr_args = &gbl_args->thread_args[thr]; thr_args->num_pktio = if_count; /* In sched mode, pktios are not cross connected with @@ -975,7 +978,7 @@ static void bind_workers(void) thr = 0; for (rx_idx = 0; rx_idx < if_count; rx_idx++) { - thr_args = &gbl_args->thread[thr]; + thr_args = &gbl_args->thread_args[thr]; pktio = thr_args->num_pktio; /* Cross connect rx to tx */ tx_idx = gbl_args->dst_port[rx_idx]; @@ -996,7 +999,7 @@ static void bind_workers(void) rx_idx = 0; for (thr = 0; thr < num_workers; thr++) { - thr_args = &gbl_args->thread[thr]; + thr_args = &gbl_args->thread_args[thr]; pktio = thr_args->num_pktio; /* Cross connect rx to tx */ tx_idx = gbl_args->dst_port[rx_idx]; @@ -1029,7 +1032,7 @@ static void bind_queues(void) for (thr = 0; thr < num_workers; thr++) { int rx_idx, tx_idx; - thread_args_t *thr_args = &gbl_args->thread[thr]; + thread_args_t *thr_args = &gbl_args->thread_args[thr]; int num = thr_args->num_pktio; printf("worker %i\n", thr); @@ -1428,7 +1431,6 @@ static void create_groups(int num, odp_schedule_group_t *group) int main(int argc, char *argv[]) { odph_helper_options_t helper_options; - odph_thread_t thread_tbl[MAX_WORKERS]; odph_thread_param_t thr_param[MAX_WORKERS]; odph_thread_common_param_t thr_common; odp_pool_t pool; @@ -1521,7 +1523,7 @@ int main(int argc, char *argv[]) gbl_args->appl.num_workers = num_workers; for (i = 0; i < num_workers; i++) - gbl_args->thread[i].thr_idx = i; + gbl_args->thread_args[i].thr_idx = i; if_count = gbl_args->appl.if_count; @@ -1651,7 +1653,6 @@ int main(int argc, char *argv[]) thr_run_func = run_worker_sched_mode; /* Create worker threads */ - memset(thread_tbl, 0, sizeof(thread_tbl)); memset(thr_param, 0, sizeof(thr_param)); memset(&thr_common, 0, sizeof(thr_common)); @@ -1663,18 +1664,18 @@ int main(int argc, char *argv[]) for (i = 0; i < num_workers; ++i) { thr_param[i].start = thr_run_func; - thr_param[i].arg = &gbl_args->thread[i]; + thr_param[i].arg = &gbl_args->thread_args[i]; thr_param[i].thr_type = ODP_THREAD_WORKER; /* Round robin threads to groups */ - gbl_args->thread[i].num_groups = 1; - gbl_args->thread[i].group[0] = group[i % num_groups]; + gbl_args->thread_args[i].num_groups = 1; + gbl_args->thread_args[i].group[0] = group[i % num_groups]; - stats[i] = &gbl_args->thread[i].stats; + stats[i] = &gbl_args->thread_args[i].stats; } - num_thr = odph_thread_create(thread_tbl, &thr_common, thr_param, - num_workers); + num_thr = odph_thread_create(gbl_args->thread_tbl, &thr_common, + thr_param, num_workers); if (num_thr != num_workers) { LOG_ERR("Error: worker create failed %i\n", num_thr); @@ -1710,7 +1711,7 @@ int main(int argc, char *argv[]) odp_barrier_wait(&gbl_args->term_barrier); /* Master thread waits for other threads to exit */ - num_thr = odph_thread_join(thread_tbl, num_workers); + num_thr = odph_thread_join(gbl_args->thread_tbl, num_workers); if (num_thr != num_workers) { LOG_ERR("Error: worker join failed %i\n", num_thr); exit(EXIT_FAILURE); ----------------------------------------------------------------------- Summary of changes: m4/odp_dpdk.m4 | 17 +++++++---------- platform/linux-generic/pktio/dpdk.c | 26 -------------------------- test/performance/odp_l2fwd.c | 31 ++++++++++++++++--------------- test/performance/odp_l2fwd_run.sh | 4 ++-- test/performance/odp_pktio_ordered_run.sh | 2 +- 5 files changed, 26 insertions(+), 54 deletions(-) hooks/post-receive --

5 years, 7 months

[COMMIT] branch master updated. v1.21.0.0-167-geec882c78

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 eec882c78e9ce4aefe1209cfc4da2130aea4cc83 (commit) from 1d26a1ea71eab90d4a761246b7d76f7ffebdbfad (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 eec882c78e9ce4aefe1209cfc4da2130aea4cc83 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jun 20 14:01:42 2019 +0300 linux-gen: timer: don't reserve any resources when timers are disabled Don't reserve any memory or perform initialization if timer feature (odp_feature_t.feat.timer) is marked as not used. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <billf(a)me.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 8e98d51ac..e55c68873 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1413,6 +1413,12 @@ int odp_timer_init_global(const odp_init_t *params) const char *conf_str; int val = 0; + if (params && params->not_used.feat.timer) { + ODP_DBG("Timers disabled\n"); + timer_global = NULL; + return 0; + } + shm = odp_shm_reserve("_odp_timer", sizeof(timer_global_t), ODP_CACHE_LINE_SIZE, 0); @@ -1452,9 +1458,6 @@ int odp_timer_init_global(const odp_init_t *params) } timer_global->inline_poll_interval = val; - if (params && params->not_used.feat.timer) - timer_global->use_inline_timers = false; - timer_global->time_per_ratelimit_period = odp_time_global_from_ns(timer_global->min_res_ns / 2); @@ -1468,7 +1471,7 @@ int odp_timer_init_global(const odp_init_t *params) int odp_timer_term_global(void) { - if (odp_shm_free(timer_global->shm)) { + if (timer_global && odp_shm_free(timer_global->shm)) { ODP_ERR("Shm free failed for odp_timer\n"); return -1; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_timer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) hooks/post-receive --

5 years, 7 months

[COMMIT] branch master updated. v1.21.0.0-166-g1d26a1ea7

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 1d26a1ea71eab90d4a761246b7d76f7ffebdbfad (commit) from fbc5f7d1433bd3a9fea7c55fed6ec3336a4fef02 (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 1d26a1ea71eab90d4a761246b7d76f7ffebdbfad Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jul 16 12:17:39 2019 +0300 linux-gen: dpdk: rename mempool handler ops to avoid naming conflict DPDK registers mempool ops named 'ops_stack' internally causing multiple definition failure when linking DPDK with '--whole-archive' flag. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <billf(a)me.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index deef0b31c..3d15c6495 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -537,7 +537,7 @@ uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size) return total_size; } -static struct rte_mempool_ops ops_stack = { +static struct rte_mempool_ops odp_pool_ops = { .name = "odp_pool", .alloc = pool_alloc, .free = pool_free, @@ -546,7 +546,7 @@ static struct rte_mempool_ops ops_stack = { .get_count = pool_get_count }; -MEMPOOL_REGISTER_OPS(ops_stack); +MEMPOOL_REGISTER_OPS(odp_pool_ops); static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/dpdk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

5 years, 7 months

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp