git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

[COMMIT] branch master updated. v1.19.0.0_tigermoth-33-g79781031

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 79781031e28dee010425f575d1bf5de5b18af0d6 (commit) via 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 (commit) from d189d704a29f490583057ccb5c762432a4e4b7a7 (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 79781031e28dee010425f575d1bf5de5b18af0d6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed May 2 11:58:33 2018 +0300 example: timer_accuracy: simple timer accuracy measurement app Added simple application to measure timer accuracy. Uses time API to measure accuracy of received timeouts from timer. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/timer/.gitignore b/example/timer/.gitignore index eaa9a361..2b077829 100644 --- a/example/timer/.gitignore +++ b/example/timer/.gitignore @@ -1,4 +1,5 @@ *.log *.trs +odp_timer_accuracy odp_timer_test odp_timer_simple diff --git a/example/timer/Makefile.am b/example/timer/Makefile.am index 64e722a3..c7d58922 100644 --- a/example/timer/Makefile.am +++ b/example/timer/Makefile.am @@ -1,11 +1,16 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_timer_test \ - odp_timer_simple -odp_timer_test_SOURCES = odp_timer_test.c +bin_PROGRAMS = odp_timer_accuracy \ + odp_timer_simple \ + odp_timer_test + +odp_timer_accuracy_SOURCES = odp_timer_accuracy.c odp_timer_simple_SOURCES = odp_timer_simple.c +odp_timer_test_SOURCES = odp_timer_test.c + if test_example -TESTS = odp_timer_simple +TESTS = odp_timer_accuracy \ + odp_timer_simple endif diff --git a/example/timer/odp_timer_accuracy.c b/example/timer/odp_timer_accuracy.c new file mode 100644 index 00000000..f1a088cb --- /dev/null +++ b/example/timer/odp_timer_accuracy.c @@ -0,0 +1,461 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <string.h> +#include <inttypes.h> +#include <stdlib.h> + +#include <unistd.h> +#include <getopt.h> + +#include <odp_api.h> + +#define START_OFFSET_NS ((uint64_t)(300 * ODP_TIME_MSEC_IN_NS)) + +typedef struct test_global_t { + struct { + unsigned long long int period_ns; + unsigned long long int res_ns; + int num; + int init; + } opt; + + odp_queue_t queue; + odp_timer_pool_t timer_pool; + odp_pool_t timeout_pool; + odp_timer_t *timer; + uint64_t period_ns; + uint64_t first_ns; + +} test_global_t; + +static void print_usage(void) +{ + printf("\n" + "Timer accuracy test application.\n" + "\n" + "OPTIONS:\n" + " -p, --period <nsec> Timeout period. Default: 200 milliseconds\n" + " -r, --resolution <nsec> Timeout resolution. Default: period / 10\n" + " -n, --num <number> Number of timeouts. Default: 50\n" + " -i, --init Set global init parameters. Default: init params not set.\n" + " -h, --help Display help and exit.\n\n"); +} + +static int parse_options(int argc, char *argv[], test_global_t *test_global) +{ + int opt, long_index; + const struct option longopts[] = { + {"period", required_argument, NULL, 'p'}, + {"resolution", required_argument, NULL, 'r'}, + {"num", required_argument, NULL, 'n'}, + {"init", no_argument, NULL, 'i'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + const char *shortopts = "+p:r:n:ih"; + int ret = 0; + + test_global->opt.period_ns = 200 * ODP_TIME_MSEC_IN_NS; + test_global->opt.res_ns = 0; + test_global->opt.num = 50; + test_global->opt.init = 0; + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'p': + test_global->opt.period_ns = strtoull(optarg, NULL, 0); + break; + case 'r': + test_global->opt.res_ns = strtoull(optarg, NULL, 0); + break; + case 'n': + test_global->opt.num = atoi(optarg); + break; + case 'i': + test_global->opt.init = 1; + break; + case 'h': + print_usage(); + ret = -1; + break; + default: + print_usage(); + ret = -1; + break; + } + } + + if (test_global->opt.res_ns == 0) + test_global->opt.res_ns = test_global->opt.period_ns / 10; + + return ret; +} + +static int start_timers(test_global_t *test_global) +{ + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_timer_pool_t timer_pool; + odp_timer_pool_param_t timer_param; + odp_timer_capability_t timer_capa; + odp_timer_t timer; + odp_queue_t queue; + odp_queue_param_t queue_param; + uint64_t tick, first_tick, period_tick, offset_tick; + uint64_t period_ns, res_ns, first_ns, res_capa; + odp_event_t event; + odp_timeout_t timeout; + odp_timer_set_t ret; + odp_time_t time; + int i, num; + + num = test_global->opt.num; + period_ns = test_global->opt.period_ns; + test_global->period_ns = period_ns; + + /* Always init globals for destroy calls */ + test_global->queue = ODP_QUEUE_INVALID; + test_global->timer_pool = ODP_TIMER_POOL_INVALID; + test_global->timeout_pool = ODP_POOL_INVALID; + + for (i = 0; i < num; i++) + test_global->timer[i] = ODP_TIMER_INVALID; + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT; + queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + queue_param.sched.group = ODP_SCHED_GROUP_ALL; + + queue = odp_queue_create("timeout_queue", &queue_param); + if (queue == ODP_QUEUE_INVALID) { + printf("Queue create failed.\n"); + return -1; + } + + test_global->queue = queue; + + odp_pool_param_init(&pool_param); + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num; + + pool = odp_pool_create("timeout pool", &pool_param); + + if (pool == ODP_POOL_INVALID) { + printf("Timeout pool create failed.\n"); + return -1; + } + + test_global->timeout_pool = pool; + + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) { + printf("Timer capa failed\n"); + return -1; + } + + res_capa = timer_capa.highest_res_ns; + + res_ns = test_global->opt.res_ns; + + if (res_ns < res_capa) { + printf("Resolution %" PRIu64 " nsec too high. " + "Highest resolution %" PRIu64 " nsec. " + "Default resolution is period / 10.\n\n", + res_ns, res_capa); + return -1; + } + + memset(&timer_param, 0, sizeof(odp_timer_pool_param_t)); + + timer_param.res_ns = res_ns; + timer_param.min_tmo = period_ns; + timer_param.max_tmo = START_OFFSET_NS + (num * period_ns); + timer_param.num_timers = num; + timer_param.clk_src = ODP_CLOCK_CPU; + + printf("\nTest parameters:\n"); + printf(" resolution capa: %" PRIu64 " nsec\n", res_capa); + printf(" start offset: %" PRIu64 " nsec\n", START_OFFSET_NS); + printf(" period: %" PRIu64 " nsec\n", period_ns); + printf(" resolution: %" PRIu64 " nsec\n", timer_param.res_ns); + printf(" min timeout: %" PRIu64 " nsec\n", timer_param.min_tmo); + printf(" max timeout: %" PRIu64 " nsec\n", timer_param.max_tmo); + printf(" num timers: %u\n", timer_param.num_timers); + printf(" test run time: %.1f sec\n\n", + timer_param.max_tmo / 1000000000.0); + + timer_pool = odp_timer_pool_create("timer_accuracy", &timer_param); + + if (timer_pool == ODP_TIMER_POOL_INVALID) { + printf("Timer pool create failed\n"); + return -1; + } + + odp_timer_pool_start(); + + test_global->timer_pool = timer_pool; + first_tick = 0; + offset_tick = odp_timer_ns_to_tick(timer_pool, START_OFFSET_NS); + period_tick = odp_timer_ns_to_tick(timer_pool, period_ns); + + for (i = 0; i < num; i++) { + timer = odp_timer_alloc(timer_pool, queue, NULL); + + if (timer == ODP_TIMER_INVALID) { + printf("Timer alloc failed.\n"); + return -1; + } + + test_global->timer[i] = timer; + } + + for (i = 0; i < num; i++) { + timer = test_global->timer[i]; + + timeout = odp_timeout_alloc(pool); + if (timeout == ODP_TIMEOUT_INVALID) { + printf("Timeout alloc failed\n"); + return -1; + } + + event = odp_timeout_to_event(timeout); + + if (i == 0) { + first_tick = odp_timer_current_tick(timer_pool); + time = odp_time_local(); + first_ns = odp_time_to_ns(time); + test_global->first_ns = first_ns + START_OFFSET_NS; + } + + tick = first_tick + offset_tick + (i * period_tick); + ret = odp_timer_set_abs(timer, tick, &event); + + if (ret != ODP_TIMER_SUCCESS) { + printf("Timer[%i] set failed: ret %i\n", i, ret); + return -1; + } + } + + return 0; +} + +static int destroy_timers(test_global_t *test_global) +{ + int i, num; + odp_timer_t timer; + odp_event_t ev; + int ret = 0; + + num = test_global->opt.num; + + for (i = 0; i < num; i++) { + timer = test_global->timer[i]; + + if (timer == ODP_TIMER_INVALID) + break; + + ev = odp_timer_free(timer); + + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + } + + if (test_global->timer_pool != ODP_TIMER_POOL_INVALID) + odp_timer_pool_destroy(test_global->timer_pool); + + if (test_global->timeout_pool != ODP_POOL_INVALID) { + if (odp_pool_destroy(test_global->timeout_pool)) { + printf("Pool destroy failed.\n"); + ret = -1; + } + } + + if (test_global->queue != ODP_QUEUE_INVALID) { + if (odp_queue_destroy(test_global->queue)) { + printf("Queue destroy failed.\n"); + ret = -1; + } + } + + return ret; +} + +static void run_test(test_global_t *test_global) +{ + int num, num_left; + odp_event_t ev; + odp_time_t time; + uint64_t time_ns, diff_ns, next_tmo, res_ns; + uint64_t after = 0; + uint64_t min_after = UINT64_MAX; + uint64_t max_after = 0; + uint64_t before = 0; + uint64_t min_before = UINT64_MAX; + uint64_t max_before = 0; + double ave_after = 0.0; + double ave_before = 0.0; + int num_after = 0; + int num_exact = 0; + int num_before = 0; + + res_ns = test_global->opt.res_ns; + num = test_global->opt.num; + num_left = num; + next_tmo = test_global->first_ns; + + while (num_left) { + ev = odp_schedule(NULL, ODP_SCHED_WAIT); + + time = odp_time_local(); + time_ns = odp_time_to_ns(time); + + if (time_ns > next_tmo) { + diff_ns = time_ns - next_tmo; + num_after++; + after += diff_ns; + if (diff_ns < min_after) + min_after = diff_ns; + if (diff_ns > max_after) + max_after = diff_ns; + + } else if (time_ns < next_tmo) { + diff_ns = next_tmo - time_ns; + num_before++; + before += diff_ns; + if (diff_ns < min_before) + min_before = diff_ns; + if (diff_ns > max_before) + max_before = diff_ns; + + } else { + num_exact++; + } + + odp_event_free(ev); + + next_tmo += test_global->period_ns; + num_left--; + } + + /* Free current scheduler context. There should be no more events. */ + while ((ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT)) + != ODP_EVENT_INVALID) { + printf("Dropping extra event\n"); + odp_event_free(ev); + } + + if (num_after) + ave_after = (double)after / num_after; + else + min_after = 0; + + if (num_before) + ave_before = (double)before / num_before; + else + min_before = 0; + + printf("\n Test results:\n"); + printf(" num after: %12i / %.2f%%\n", + num_after, 100.0 * num_after / num); + printf(" num before: %12i / %.2f%%\n", + num_before, 100.0 * num_before / num); + printf(" num exact: %12i / %.2f%%\n", + num_exact, 100.0 * num_exact / num); + printf(" error after (nsec):\n"); + printf(" min: %12" PRIu64 " / %.3fx resolution\n", + min_after, (double)min_after / res_ns); + printf(" max: %12" PRIu64 " / %.3fx resolution\n", + max_after, (double)max_after / res_ns); + printf(" ave: %12.0f / %.3fx resolution\n", + ave_after, ave_after / res_ns); + printf(" error before (nsec):\n"); + printf(" min: %12" PRIu64 " / %.3fx resolution\n", + min_before, (double)min_before / res_ns); + printf(" max: %12" PRIu64 " / %.3fx resolution\n", + max_before, (double)max_before / res_ns); + printf(" ave: %12.0f / %.3fx resolution\n", + ave_before, ave_before / res_ns); + printf("\n"); +} + +int main(int argc, char *argv[]) +{ + odp_instance_t instance; + odp_init_t init; + int num; + test_global_t test_global; + odp_init_t *init_ptr = NULL; + int ret = 0; + + memset(&test_global, 0, sizeof(test_global_t)); + + if (parse_options(argc, argv, &test_global)) + return -1; + + /* List features not to be used (may optimize performance) */ + odp_init_param_init(&init); + init.not_used.feat.cls = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.tm = 1; + + if (test_global.opt.init) + init_ptr = &init; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, init_ptr, NULL)) { + printf("Global init failed.\n"); + return -1; + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_WORKER)) { + printf("Local init failed.\n"); + return -1; + } + + odp_sys_info_print(); + + num = test_global.opt.num; + + test_global.timer = calloc(num, sizeof(odp_timer_t)); + + if (test_global.timer == NULL) { + printf("Malloc failed.\n"); + goto quit; + } + + if (start_timers(&test_global)) + goto quit; + + run_test(&test_global); + +quit: + if (destroy_timers(&test_global)) + ret = -1; + + if (test_global.timer) + free(test_global.timer); + + if (odp_term_local()) { + printf("Term local failed.\n"); + ret = -1; + } + + if (odp_term_global(instance)) { + printf("Term global failed.\n"); + ret = -1; + } + + return ret; +} commit 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 4 10:39:48 2018 +0300 linux-gen: packet: rearrange odp_packet_hdr_t members Save 64 bytes by rearranging odp_packet_hdr_t members. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index be17cac8..04112662 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -96,6 +96,9 @@ typedef struct { * Members below are not initialized by packet_init() */ + /* Type of extra data */ + uint8_t extra_type; + /* Flow hash value */ uint32_t flow_hash; @@ -108,16 +111,14 @@ typedef struct { /* Result for crypto packet op */ odp_crypto_packet_result_t crypto_op_result; -#ifdef ODP_PKTIO_DPDK - /* Type of extra data */ - uint8_t extra_type; - /* Extra space for packet descriptors. E.g. DPDK mbuf */ - uint8_t ODP_ALIGNED_CACHE extra[PKT_EXTRA_LEN]; -#endif - /* Context for IPsec */ odp_ipsec_packet_result_t ipsec_ctx; +#ifdef ODP_PKTIO_DPDK + /* Extra space for packet descriptors. E.g. DPDK mbuf. Keep as the last + * member before data. */ + uint8_t ODP_ALIGNED_CACHE extra[PKT_EXTRA_LEN]; +#endif /* Packet data storage */ uint8_t data[0]; } odp_packet_hdr_t; ----------------------------------------------------------------------- Summary of changes: example/timer/.gitignore | 1 + example/timer/Makefile.am | 13 +- example/timer/odp_timer_accuracy.c | 461 +++++++++++++++++++++ .../linux-generic/include/odp_packet_internal.h | 15 +- 4 files changed, 479 insertions(+), 11 deletions(-) create mode 100644 example/timer/odp_timer_accuracy.c hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-31-gd189d704

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 d189d704a29f490583057ccb5c762432a4e4b7a7 (commit) from 122b74c0074329f1758b2ed5d241e0e9a790087b (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 d189d704a29f490583057ccb5c762432a4e4b7a7 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri May 4 12:33:26 2018 +0300 linux-gen: pktio: ipc free ring memory on error ipc pktio can fail on open if second process is not yet ready to connect. But on this error free of ring memory is missing which leads to taking all available shm descriptors. https://bugs.linaro.org/show_bug.cgi?id=3788 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 08e3e4bc..d1e30ab8 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -347,6 +347,8 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, pktio_entry->s.ipc.rx.cache = _ring_create("ipc_rx_cache", PKTIO_IPC_ENTRIES, _RING_NO_LIST); + if (!pktio_entry->s.ipc.rx.cache) + return -1; /* Shared info about remote pktio */ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) { @@ -355,12 +357,15 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, snprintf(name, sizeof(name), "ipc:%s_info", tail); IPC_ODP_DBG("lookup for name %s for pid %d\n", name, pid); shm = odp_shm_import(name, pid, name); - if (ODP_SHM_INVALID == shm) + if (ODP_SHM_INVALID == shm) { + _ring_destroy("ipc_rx_cache"); return -1; + } pinfo = odp_shm_addr(shm); if (!pinfo->master.init_done) { odp_shm_free(shm); + _ring_destroy("ipc_rx_cache"); return -1; } pktio_entry->s.ipc.pinfo = pinfo; @@ -374,6 +379,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, ODP_CACHE_LINE_SIZE, _ODP_ISHM_EXPORT | _ODP_ISHM_LOCK); if (ODP_SHM_INVALID == shm) { + _ring_destroy("ipc_rx_cache"); ODP_ERR("can not create shm %s\n", name); return -1; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/ipc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-30-g122b74c0

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 122b74c0074329f1758b2ed5d241e0e9a790087b (commit) from bd37df82b49faefef078558cdb2a54477bec6c5a (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 122b74c0074329f1758b2ed5d241e0e9a790087b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Apr 23 15:59:38 2018 +0300 build: odp_dpdk: add dependencies for crypto PMDs Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index ec248e76..2ef5253c 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -12,6 +12,12 @@ AS_CASE([$cur_driver], [rte_pmd_mlx4], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx4 -libverbs"])], [rte_pmd_mlx5], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx5 -libverbs"])], [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"])], + [rte_pmd_kasumi], [AS_VAR_APPEND([DPDK_LIBS], [" -lsso_kasumi"])], + [rte_pmd_snow3g], [AS_VAR_APPEND([DPDK_LIBS], [" -lsso_snow3g"])], + [rte_pmd_zuc], [AS_VAR_APPEND([DPDK_LIBS], [" -lsso_zuc"])], + [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]) ----------------------------------------------------------------------- Summary of changes: m4/odp_dpdk.m4 | 6 ++++++ 1 file changed, 6 insertions(+) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-29-gbd37df82

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 bd37df82b49faefef078558cdb2a54477bec6c5a (commit) via dea03d0a24117764ea9b8763e640a4836031e82b (commit) via 5c745f55a160b0a72d8e493604917a0d63dd71a5 (commit) via 15a30694560ba62160fa3a8ffddeb51b800e351a (commit) via 27a84cdfc0dfb82e3b86067e473658c091377892 (commit) from 3600304c30c4a345538f6c06ca50183b14cd12b1 (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 bd37df82b49faefef078558cdb2a54477bec6c5a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Apr 27 13:33:58 2018 +0300 test: sched_pktio: add inactivity timer Add a timer per packet input queue to test timer performance with packet IO. The timer is reset every time packets are received from a queue, or when timer expires. Timer testing is enabled by setting the timeout period in usec with -t option. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 840fe8da..46a08c92 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -25,8 +25,10 @@ #define BURST_SIZE 32 #define CHECK_PERIOD 10000 #define TEST_PASSED_LIMIT 5000 +#define TIMEOUT_OFFSET_NS 1000000 typedef struct test_options_t { + long int timeout_us; int num_worker; int num_pktio; int num_pktio_queue; @@ -80,6 +82,14 @@ typedef struct { } pktio[MAX_PKTIOS]; + struct { + odp_timer_pool_t timer_pool; + odp_pool_t timeout_pool; + uint64_t timeout_tick; + odp_timer_t timer[MAX_PKTIOS][MAX_PKTIO_QUEUES]; + + } timer; + worker_arg_t worker_arg[MAX_WORKERS]; worker_stat_t worker_stat[MAX_WORKERS]; @@ -186,6 +196,121 @@ static int worker_thread(void *arg) return 0; } +static int worker_thread_timers(void *arg) +{ + odp_event_t ev[BURST_SIZE]; + int num, sent, drop, out, tmos, i, src_pktio, src_queue; + odp_pktout_queue_t pktout; + odp_queue_t queue; + queue_context_t *queue_context; + odp_timer_t timer; + odp_timer_set_t ret; + worker_arg_t *worker_arg = arg; + test_global_t *test_global = worker_arg->test_global_ptr; + int worker_id = worker_arg->worker_id; + uint32_t polls = 0; + uint64_t tick = test_global->timer.timeout_tick; + + printf("Worker (timers) %i started\n", worker_id); + + /* Wait for other workers to start */ + odp_barrier_wait(&test_global->worker_start); + + while (1) { + odp_packet_t pkt[BURST_SIZE]; + + num = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, + ev, BURST_SIZE); + + polls++; + + if (polls == CHECK_PERIOD) { + polls = 0; + if (test_global->stop_workers) + break; + } + + if (num <= 0) + continue; + + tmos = 0; + queue_context = odp_queue_context(queue); + src_pktio = queue_context->src_pktio; + src_queue = queue_context->src_queue; + timer = test_global->timer.timer[src_pktio][src_queue]; + + for (i = 0; i < num; i++) { + if (odp_unlikely(odp_event_type(ev[i]) == + ODP_EVENT_TIMEOUT)) { + tmos++; + ret = odp_timer_set_rel(timer, tick, &ev[i]); + + if (odp_unlikely(ret != ODP_TIMER_SUCCESS)) { + /* Should never happen */ + printf("Expired timer reset failed\n"); + odp_event_free(ev[i]); + } + + if (odp_unlikely(tmos > 1)) { + /* Should never happen */ + printf("Too many timeouts\n"); + } + } else { + pkt[i - tmos] = odp_packet_from_event(ev[i]); + } + } + + if (tmos == 0) { + /* Reset timer with existing timeout event */ + ret = odp_timer_set_rel(timer, tick, NULL); + + if (odp_unlikely(ret != ODP_TIMER_SUCCESS && + ret != ODP_TIMER_TOOEARLY)) { + /* Should never happen. Reset should either + * succeed or be too close to timer expiration + * in which case timeout event will be received + * soon. */ + printf("Timer reset failed %i\n", ret); + } + } + + num = num - tmos; + + if (DEBUG_PRINT) + printf("worker %i: [%i/%i] -> [%i/%i], %i packets " + "%i timeouts\n", + worker_id, + queue_context->src_pktio, + queue_context->src_queue, + queue_context->dst_pktio, + queue_context->dst_queue, num, tmos); + + pktout = queue_context->dst_pktout; + out = queue_context->dst_pktio; + + fill_eth_addr(pkt, num, test_global, out); + + sent = odp_pktout_send(pktout, pkt, num); + + if (odp_unlikely(sent < 0)) + sent = 0; + + drop = num - sent; + + if (odp_unlikely(drop)) + odp_packet_free_multi(&pkt[sent], drop); + + if (odp_unlikely(test_global->opt.collect_stat)) { + test_global->worker_stat[worker_id].rx_pkt += num; + test_global->worker_stat[worker_id].tx_pkt += sent; + } + } + + printf("Worker %i stopped\n", worker_id); + + return 0; +} + static void sig_handler(int signo) { (void)signo; @@ -210,6 +335,7 @@ static void print_usage(const char *progname) " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" " -c, --num_cpu <number> Worker thread count. Default: 1\n" " -q, --num_queue <number> Number of pktio queues. Default: Worker thread count\n" + " -t, --timeout <number> Flow inactivity timeout (in usec) per packet. Default: 0 (don't use timers)\n" " -s, --stat Collect statistics.\n" " -h, --help Display help and exit.\n\n", NO_PATH(progname)); @@ -224,11 +350,12 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"interface", required_argument, NULL, 'i'}, {"num_cpu", required_argument, NULL, 'c'}, {"num_queue", required_argument, NULL, 'q'}, + {"timeout", required_argument, NULL, 't'}, {"stat", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+i:c:q:sh"; + const char *shortopts = "+i:c:q:t:sh"; int ret = 0; memset(test_options, 0, sizeof(test_options_t)); @@ -283,6 +410,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 'q': test_options->num_pktio_queue = atoi(optarg); break; + case 't': + test_options->timeout_us = atol(optarg); + break; case 's': test_options->collect_stat = 1; break; @@ -382,6 +512,7 @@ static void print_config(test_global_t *test_global) test_global->opt.num_pktio_queue); printf(" collect statistics: %u\n", test_global->opt.collect_stat); + printf(" timeout usec: %li\n", test_global->opt.timeout_us); printf("\n"); } @@ -691,6 +822,178 @@ static int close_pktios(test_global_t *test_global) return ret; } +static int create_timers(test_global_t *test_global) +{ + int num_timer, num_pktio, num_queue, i, j; + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_timer_pool_t timer_pool; + odp_timer_pool_param_t timer_param; + odp_timer_capability_t timer_capa; + odp_timer_t timer; + odp_queue_t queue; + uint64_t res_ns, tick; + uint64_t timeout_ns = 1000 * test_global->opt.timeout_us; + + num_pktio = test_global->opt.num_pktio; + num_queue = test_global->opt.num_pktio_queue; + num_timer = num_pktio * num_queue; + + /* Always init globals for destroy calls */ + test_global->timer.timer_pool = ODP_TIMER_POOL_INVALID; + test_global->timer.timeout_pool = ODP_POOL_INVALID; + + for (i = 0; i < num_pktio; i++) + for (j = 0; j < num_queue; j++) + test_global->timer.timer[i][j] = ODP_TIMER_INVALID; + + /* Timers not used */ + if (test_global->opt.timeout_us == 0) + return 0; + + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) { + printf("Timer capa failed\n"); + return -1; + } + + res_ns = timeout_ns / 10; + + if (timer_capa.highest_res_ns > res_ns) { + printf("Timeout too short. Min timeout %" PRIu64 " usec\n", + timer_capa.highest_res_ns / 100); + return -1; + } + + memset(&timer_param, 0, sizeof(odp_timer_pool_param_t)); + + timer_param.res_ns = res_ns; + timer_param.min_tmo = timeout_ns; + timer_param.max_tmo = timeout_ns; + timer_param.num_timers = num_timer; + timer_param.clk_src = ODP_CLOCK_CPU; + + timer_pool = odp_timer_pool_create("sched_pktio_timer", &timer_param); + + if (timer_pool == ODP_TIMER_POOL_INVALID) { + printf("Timer pool create failed\n"); + return -1; + } + + test_global->timer.timer_pool = timer_pool; + tick = odp_timer_ns_to_tick(timer_pool, timeout_ns); + test_global->timer.timeout_tick = tick; + + odp_timer_pool_start(); + + for (i = 0; i < num_pktio; i++) { + for (j = 0; j < num_queue; j++) { + queue = test_global->pktio[i].input_queue[j]; + timer = odp_timer_alloc(timer_pool, queue, NULL); + + if (timer == ODP_TIMER_INVALID) { + printf("Timer alloc failed.\n"); + return -1; + } + + test_global->timer.timer[i][j] = timer; + } + } + + odp_pool_param_init(&pool_param); + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num_timer; + + pool = odp_pool_create("timeout pool", &pool_param); + + if (pool == ODP_POOL_INVALID) { + printf("Timeout pool create failed.\n"); + return -1; + } + + test_global->timer.timeout_pool = pool; + + return 0; +} + +static int start_timers(test_global_t *test_global) +{ + int i, j; + odp_event_t event; + odp_timeout_t timeout; + odp_timer_t timer; + odp_timer_set_t ret; + uint64_t timeout_tick = test_global->timer.timeout_tick; + int num_pktio = test_global->opt.num_pktio; + int num_queue = test_global->opt.num_pktio_queue; + odp_pool_t pool = test_global->timer.timeout_pool; + + /* Timers not used */ + if (test_global->opt.timeout_us == 0) + return 0; + + /* Delay the first timeout so that workers have time to startup */ + timeout_tick += odp_timer_ns_to_tick(test_global->timer.timer_pool, + TIMEOUT_OFFSET_NS); + + for (i = 0; i < num_pktio; i++) { + for (j = 0; j < num_queue; j++) { + timer = test_global->timer.timer[i][j]; + + timeout = odp_timeout_alloc(pool); + if (timeout == ODP_TIMEOUT_INVALID) { + printf("Timeout alloc failed\n"); + return -1; + } + + event = odp_timeout_to_event(timeout); + + ret = odp_timer_set_rel(timer, timeout_tick, &event); + + if (ret != ODP_TIMER_SUCCESS) { + printf("Timer set failed\n"); + return -1; + } + } + } + + return 0; +} + +static void destroy_timers(test_global_t *test_global) +{ + int i, j; + odp_event_t event; + odp_timer_t timer; + int num_pktio = test_global->opt.num_pktio; + int num_queue = test_global->opt.num_pktio_queue; + odp_timer_pool_t timer_pool = test_global->timer.timer_pool; + odp_pool_t pool = test_global->timer.timeout_pool; + + if (timer_pool == ODP_TIMER_POOL_INVALID) + return; + + for (i = 0; i < num_pktio; i++) { + for (j = 0; j < num_queue; j++) { + timer = test_global->timer.timer[i][j]; + + if (timer == ODP_TIMER_INVALID) + break; + + event = odp_timer_free(timer); + + if (event != ODP_EVENT_INVALID) + odp_event_free(event); + } + } + + if (pool != ODP_POOL_INVALID) { + if (odp_pool_destroy(pool)) + printf("Timeout pool destroy failed\n"); + } + + odp_timer_pool_destroy(timer_pool); +} + static void start_workers(odph_odpthread_t thread[], test_global_t *test_global) { @@ -700,7 +1003,12 @@ static void start_workers(odph_odpthread_t thread[], int num = test_global->opt.num_worker; memset(&param, 0, sizeof(odph_odpthread_params_t)); - param.start = worker_thread; + + if (test_global->opt.timeout_us) + param.start = worker_thread_timers; + else + param.start = worker_thread; + param.thr_type = ODP_THREAD_WORKER; param.instance = test_global->instance; @@ -745,8 +1053,11 @@ int main(int argc, char *argv[]) init.not_used.feat.cls = 1; init.not_used.feat.crypto = 1; init.not_used.feat.ipsec = 1; - init.not_used.feat.timer = 1; init.not_used.feat.tm = 1; + init.not_used.feat.timer = 1; + + if (test_options.timeout_us) + init.not_used.feat.timer = 0; /* Init ODP before calling anything else */ if (odp_init_global(&instance, &init, NULL)) { @@ -789,6 +1100,12 @@ int main(int argc, char *argv[]) link_pktios(test_global); + if (create_timers(test_global)) + goto quit; + + if (start_timers(test_global)) + goto quit; + odp_barrier_init(&test_global->worker_start, test_global->opt.num_worker + 1); @@ -813,6 +1130,7 @@ quit: stop_pktios(test_global); empty_queues(); close_pktios(test_global); + destroy_timers(test_global); if (test_global->opt.collect_stat) { print_stat(test_global, odp_time_diff_ns(t2, t1)); commit dea03d0a24117764ea9b8763e640a4836031e82b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 26 17:13:40 2018 +0300 test: sched_pktio: parse options before odp global init Options can be used to set parameters for odp_init_global(). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index f03c2911..840fe8da 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -26,6 +26,15 @@ #define CHECK_PERIOD 10000 #define TEST_PASSED_LIMIT 5000 +typedef struct test_options_t { + int num_worker; + int num_pktio; + int num_pktio_queue; + uint8_t collect_stat; + char pktio_name[MAX_PKTIOS][MAX_PKTIO_NAME + 1]; + +} test_options_t; + typedef struct { int worker_id; void *test_global_ptr; @@ -48,12 +57,7 @@ typedef struct { volatile int stop_workers; odp_barrier_t worker_start; - struct { - int num_worker; - int num_pktio; - int num_pktio_queue; - uint8_t collect_stat; - } opt; + test_options_t opt; int max_workers; odp_cpumask_t cpumask; @@ -66,7 +70,6 @@ typedef struct { uint32_t pkt_num; struct { - char name[MAX_PKTIO_NAME + 1]; odp_pktio_t pktio; int pktio_index; int started; @@ -212,7 +215,7 @@ static void print_usage(const char *progname) NO_PATH(progname)); } -static int parse_options(int argc, char *argv[], test_global_t *test_global) +static int parse_options(int argc, char *argv[], test_options_t *test_options) { int i, opt, long_index; char *name, *str; @@ -228,8 +231,10 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) const char *shortopts = "+i:c:q:sh"; int ret = 0; - test_global->opt.num_worker = 1; - test_global->opt.num_pktio_queue = 0; + memset(test_options, 0, sizeof(test_options_t)); + + test_options->num_worker = 1; + test_options->num_pktio_queue = 0; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -263,23 +268,23 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) break; } - name = test_global->pktio[i].name; + name = test_options->pktio_name[i]; memcpy(name, str, len); str += len + 1; i++; } - test_global->opt.num_pktio = i; + test_options->num_pktio = i; break; case 'c': - test_global->opt.num_worker = atoi(optarg); + test_options->num_worker = atoi(optarg); break; case 'q': - test_global->opt.num_pktio_queue = atoi(optarg); + test_options->num_pktio_queue = atoi(optarg); break; case 's': - test_global->opt.collect_stat = 1; + test_options->collect_stat = 1; break; case 'h': print_usage(argv[0]); @@ -291,8 +296,8 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) } } - if (test_global->opt.num_pktio_queue == 0) - test_global->opt.num_pktio_queue = test_global->opt.num_worker; + if (test_options->num_pktio_queue == 0) + test_options->num_pktio_queue = test_options->num_worker; return ret; } @@ -370,7 +375,7 @@ static void print_config(test_global_t *test_global) " interface names: ", test_global->opt.num_pktio); for (i = 0; i < test_global->opt.num_pktio; i++) - printf(" %s", test_global->pktio[i].name); + printf(" %s", test_global->opt.pktio_name[i]); printf("\n" " queues per interface: %i\n", @@ -462,7 +467,7 @@ static int open_pktios(test_global_t *test_global) /* Open and configure interfaces */ for (i = 0; i < num_pktio; i++) { - name = test_global->pktio[i].name; + name = test_global->opt.pktio_name[i]; pktio = odp_pktio_open(name, pool, &pktio_param); if (pktio == ODP_PKTIO_INVALID) { @@ -605,7 +610,7 @@ static int start_pktios(test_global_t *test_global) for (i = 0; i < test_global->opt.num_pktio; i++) { if (odp_pktio_start(test_global->pktio[i].pktio)) { printf("Error (%s): Pktio start failed.\n", - test_global->pktio[i].name); + test_global->opt.pktio_name[i]); return -1; } @@ -630,7 +635,7 @@ static int stop_pktios(test_global_t *test_global) if (odp_pktio_stop(pktio)) { printf("Error (%s): Pktio stop failed.\n", - test_global->pktio[i].name); + test_global->opt.pktio_name[i]); ret = -1; } } @@ -668,7 +673,7 @@ static int close_pktios(test_global_t *test_global) if (odp_pktio_close(pktio)) { printf("Error (%s): Pktio close failed.\n", - test_global->pktio[i].name); + test_global->opt.pktio_name[i]); ret = -1; } } @@ -727,10 +732,14 @@ int main(int argc, char *argv[]) odp_shm_t shm; odp_time_t t1, t2; odph_odpthread_t thread[MAX_WORKERS]; + test_options_t test_options; int ret = 0; signal(SIGINT, sig_handler); + if (parse_options(argc, argv, &test_options)) + return -1; + /* List features not to be used (may optimize performance) */ odp_init_param_init(&init); init.not_used.feat.cls = 1; @@ -766,8 +775,7 @@ int main(int argc, char *argv[]) test_global->instance = instance; test_global->pool = ODP_POOL_INVALID; - if (parse_options(argc, argv, test_global)) - goto quit; + memcpy(&test_global->opt, &test_options, sizeof(test_options_t)); odp_sys_info_print(); commit 5c745f55a160b0a72d8e493604917a0d63dd71a5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 26 14:18:57 2018 +0300 test: sched_pktio: ensure packet order per flow Select pktout queue based on input queue, instead of worker id. Packet order is maintained from input to output as each flow is routed always through the same queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 1a16bb50..f03c2911 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -14,6 +14,7 @@ #include <odp_api.h> #include <odp/helper/odph_api.h> +#define DEBUG_PRINT 0 #define MAX_WORKERS 64 #define MAX_PKTIOS 32 #define MAX_PKTIO_NAME 31 @@ -23,7 +24,6 @@ #define MIN_PKT_SEG_LEN 64 #define BURST_SIZE 32 #define CHECK_PERIOD 10000 -#define MAX_PKTIO_INDEXES 256 #define TEST_PASSED_LIMIT 5000 typedef struct { @@ -36,6 +36,14 @@ typedef struct ODP_ALIGNED_CACHE { uint64_t tx_pkt; } worker_stat_t; +typedef struct queue_context_t { + odp_pktout_queue_t dst_pktout; + uint8_t dst_pktio; + uint8_t dst_queue; + uint8_t src_pktio; + uint8_t src_queue; +} queue_context_t; + typedef struct { volatile int stop_workers; odp_barrier_t worker_start; @@ -65,14 +73,12 @@ typedef struct { odph_ethaddr_t my_addr; odp_queue_t input_queue[MAX_PKTIO_QUEUES]; odp_pktout_queue_t pktout[MAX_PKTIO_QUEUES]; + queue_context_t queue_context[MAX_PKTIO_QUEUES]; } pktio[MAX_PKTIOS]; worker_arg_t worker_arg[MAX_WORKERS]; - /* Maps pktio input index to pktio[] index for output */ - uint8_t pktio_map[MAX_PKTIO_INDEXES]; - worker_stat_t worker_stat[MAX_WORKERS]; uint64_t rx_pkt_sum; uint64_t tx_pkt_sum; @@ -108,8 +114,10 @@ static inline void fill_eth_addr(odp_packet_t pkt[], int num, static int worker_thread(void *arg) { odp_event_t ev[BURST_SIZE]; - int num, sent, drop, in, out; + int num, sent, drop, out; odp_pktout_queue_t pktout; + odp_queue_t queue; + queue_context_t *queue_context; worker_arg_t *worker_arg = arg; test_global_t *test_global = worker_arg->test_global_ptr; int worker_id = worker_arg->worker_id; @@ -123,7 +131,7 @@ static int worker_thread(void *arg) while (1) { odp_packet_t pkt[BURST_SIZE]; - num = odp_schedule_multi(NULL, ODP_SCHED_NO_WAIT, + num = odp_schedule_multi(&queue, ODP_SCHED_NO_WAIT, ev, BURST_SIZE); polls++; @@ -137,11 +145,20 @@ static int worker_thread(void *arg) if (num <= 0) continue; + queue_context = odp_queue_context(queue); + + if (DEBUG_PRINT) + printf("worker %i: [%i/%i] -> [%i/%i], %i packets\n", + worker_id, + queue_context->src_pktio, + queue_context->src_queue, + queue_context->dst_pktio, + queue_context->dst_queue, num); + odp_packet_from_event_multi(pkt, ev, num); - in = odp_packet_input_index(pkt[0]); - out = test_global->pktio_map[in]; - pktout = test_global->pktio[out].pktout[worker_id]; + pktout = queue_context->dst_pktout; + out = queue_context->dst_pktio; fill_eth_addr(pkt, num, test_global, out); @@ -307,12 +324,6 @@ static int config_setup(test_global_t *test_global) return -1; } - if (MAX_PKTIO_INDEXES <= odp_pktio_max_index()) { - printf("Error: Larger pktio_map[] table needed: %u\n", - odp_pktio_max_index()); - return -1; - } - if (odp_pool_capability(&pool_capa)) { printf("Error: Pool capability failed.\n"); return -1; @@ -420,6 +431,7 @@ static int open_pktios(test_global_t *test_global) unsigned int num_queue; char *name; int i, num_pktio, ret; + unsigned int j; num_pktio = test_global->opt.num_pktio; num_queue = test_global->opt.num_pktio_queue; @@ -518,6 +530,21 @@ static int open_pktios(test_global_t *test_global) return -1; } + for (j = 0; j < num_queue; j++) { + odp_queue_t queue; + void *ctx; + uint32_t len = sizeof(queue_context_t); + + queue = test_global->pktio[i].input_queue[j]; + ctx = &test_global->pktio[i].queue_context[j]; + + if (odp_queue_context_set(queue, ctx, len)) { + printf("Error (%s): Queue ctx set failed.\n", + name); + return -1; + } + } + odp_pktout_queue_param_init(&pktout_param); pktout_param.num_queues = num_queue; pktout_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; @@ -542,20 +569,30 @@ static int open_pktios(test_global_t *test_global) static void link_pktios(test_global_t *test_global) { int i, num_pktio, input, output; + int num_queue; + odp_pktout_queue_t pktout; + queue_context_t *ctx; num_pktio = test_global->opt.num_pktio; + num_queue = test_global->opt.num_pktio_queue; printf("Forwarding table (pktio indexes)\n"); /* If single interface loopback, otherwise forward to the next * interface. */ - for (i = 0; i < num_pktio; i++) { - input = test_global->pktio[i].pktio_index; - output = (i + 1) % num_pktio; - test_global->pktio_map[input] = output; - printf(" input %i, output %i\n", - input, - test_global->pktio[output].pktio_index); + for (input = 0; input < num_pktio; input++) { + output = (input + 1) % num_pktio; + printf(" input %i, output %i\n", input, output); + + for (i = 0; i < num_queue; i++) { + ctx = &test_global->pktio[input].queue_context[i]; + pktout = test_global->pktio[output].pktout[i]; + ctx->dst_pktout = pktout; + ctx->dst_pktio = output; + ctx->dst_queue = i; + ctx->src_pktio = input; + ctx->src_queue = i; + } } printf("\n"); commit 15a30694560ba62160fa3a8ffddeb51b800e351a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 26 14:50:39 2018 +0300 test: sched_pktio: add pktio queue count option Added option for selecting number of input / output queues per pktio interface. For simplicity, the same number of queues is configured for all interfaces and both (input / output) directions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 16d14b19..1a16bb50 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -43,6 +43,7 @@ typedef struct { struct { int num_worker; int num_pktio; + int num_pktio_queue; uint8_t collect_stat; } opt; @@ -56,9 +57,6 @@ typedef struct { uint32_t pkt_len; uint32_t pkt_num; - unsigned int num_input_queues; - unsigned int num_output_queues; - struct { char name[MAX_PKTIO_NAME + 1]; odp_pktio_t pktio; @@ -189,10 +187,11 @@ static void print_usage(const char *progname) "Usage: %s [options]\n" "\n" "OPTIONS:\n" - " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" - " -c, --count <number> Worker thread count. Default: 1\n" - " -s, --stat Collect statistics.\n" - " -h, --help Display help and exit.\n\n", + " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" + " -c, --num_cpu <number> Worker thread count. Default: 1\n" + " -q, --num_queue <number> Number of pktio queues. Default: Worker thread count\n" + " -s, --stat Collect statistics.\n" + " -h, --help Display help and exit.\n\n", NO_PATH(progname)); } @@ -203,15 +202,17 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) int len, str_len; const struct option longopts[] = { {"interface", required_argument, NULL, 'i'}, - {"count", required_argument, NULL, 'c'}, + {"num_cpu", required_argument, NULL, 'c'}, + {"num_queue", required_argument, NULL, 'q'}, {"stat", no_argument, NULL, 's'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - const char *shortopts = "+i:c:sh"; + const char *shortopts = "+i:c:q:sh"; int ret = 0; test_global->opt.num_worker = 1; + test_global->opt.num_pktio_queue = 0; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -257,6 +258,9 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) case 'c': test_global->opt.num_worker = atoi(optarg); break; + case 'q': + test_global->opt.num_pktio_queue = atoi(optarg); + break; case 's': test_global->opt.collect_stat = 1; break; @@ -270,6 +274,9 @@ static int parse_options(int argc, char *argv[], test_global_t *test_global) } } + if (test_global->opt.num_pktio_queue == 0) + test_global->opt.num_pktio_queue = test_global->opt.num_worker; + return ret; } @@ -323,12 +330,6 @@ static int config_setup(test_global_t *test_global) test_global->pkt_len = pkt_len; test_global->pkt_num = pkt_num; - if (test_global->num_input_queues == 0) - test_global->num_input_queues = test_global->opt.num_worker; - - if (test_global->num_output_queues == 0) - test_global->num_output_queues = test_global->opt.num_worker; - return 0; } @@ -361,9 +362,8 @@ static void print_config(test_global_t *test_global) printf(" %s", test_global->pktio[i].name); printf("\n" - " num input queues: %i\n" - " num output queues: %i\n", - test_global->num_input_queues, test_global->num_output_queues); + " queues per interface: %i\n", + test_global->opt.num_pktio_queue); printf(" collect statistics: %u\n", test_global->opt.collect_stat); @@ -417,13 +417,12 @@ static int open_pktios(test_global_t *test_global) odp_pktin_queue_param_t pktin_param; odp_pktout_queue_param_t pktout_param; odp_schedule_sync_t sched_sync; - unsigned int num_input, num_output; + unsigned int num_queue; char *name; int i, num_pktio, ret; - num_pktio = test_global->opt.num_pktio; - num_input = test_global->num_input_queues; - num_output = test_global->num_output_queues; + num_pktio = test_global->opt.num_pktio; + num_queue = test_global->opt.num_pktio_queue; odp_pool_param_init(&pool_param); pool_param.pkt.seg_len = MIN_PKT_SEG_LEN; @@ -477,15 +476,15 @@ static int open_pktios(test_global_t *test_global) return -1; } - if (num_input > pktio_capa.max_input_queues) { + if (num_queue > pktio_capa.max_input_queues) { printf("Error (%s): Too many input queues: %u\n", - name, num_input); + name, num_queue); return -1; } - if (num_output > pktio_capa.max_output_queues) { + if (num_queue > pktio_capa.max_output_queues) { printf("Error (%s): Too many output queues: %u\n", - name, num_output); + name, num_queue); return -1; } @@ -500,12 +499,12 @@ static int open_pktios(test_global_t *test_global) pktin_param.queue_param.sched.sync = sched_sync; pktin_param.queue_param.sched.group = ODP_SCHED_GROUP_ALL; - if (num_input > 1) { + if (num_queue > 1) { pktin_param.hash_enable = 1; pktin_param.hash_proto.proto.ipv4_udp = 1; } - pktin_param.num_queues = num_input; + pktin_param.num_queues = num_queue; if (odp_pktin_queue_config(pktio, &pktin_param)) { printf("Error (%s): Pktin config failed.\n", name); @@ -514,13 +513,13 @@ static int open_pktios(test_global_t *test_global) if (odp_pktin_event_queue(pktio, test_global->pktio[i].input_queue, - num_input) != (int)num_input) { + num_queue) != (int)num_queue) { printf("Error (%s): Input queue query failed.\n", name); return -1; } odp_pktout_queue_param_init(&pktout_param); - pktout_param.num_queues = num_output; + pktout_param.num_queues = num_queue; pktout_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; if (odp_pktout_queue_config(pktio, &pktout_param)) { @@ -530,7 +529,7 @@ static int open_pktios(test_global_t *test_global) if (odp_pktout_queue(pktio, test_global->pktio[i].pktout, - num_output) != (int)num_output) { + num_queue) != (int)num_queue) { printf("Error (%s): Output queue query failed.\n", name); return -1; commit 27a84cdfc0dfb82e3b86067e473658c091377892 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Apr 27 12:50:52 2018 +0300 linux-gen: timer: set and check highest resolution When using inline_timers, highest resolution was left to 0 ns and was checked to be non-zero. In practice, few nanosecond resolution is not needed or practical. Limit highest supported resolution to 500 ns. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index a445a57b..37d0304c 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -76,7 +76,7 @@ static _odp_atomic_flag_t locks[NUM_LOCKS]; /* Multiple locks per cache line! */ #endif /* Max timer resolution in nanoseconds */ -static uint64_t highest_res_ns; +static uint64_t highest_res_ns = 500; static uint64_t min_res_ns = INT64_MAX; /****************************************************************************** @@ -1077,13 +1077,10 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src, return ret; } -odp_timer_pool_t -odp_timer_pool_create(const char *name, - const odp_timer_pool_param_t *param) +odp_timer_pool_t odp_timer_pool_create(const char *name, + const odp_timer_pool_param_t *param) { - /* Verify that buffer pool can be used for timeouts */ - /* Verify that we have a valid (non-zero) timer resolution */ - if (param->res_ns == 0) { + if (param->res_ns < highest_res_ns) { __odp_errno = EINVAL; return ODP_TIMER_POOL_INVALID; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_timer.c | 11 +- test/performance/odp_sched_pktio.c | 510 +++++++++++++++++++++++++++++++------ 2 files changed, 440 insertions(+), 81 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-24-g3600304c

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 3600304c30c4a345538f6c06ca50183b14cd12b1 (commit) via 4ec4a756c7607e3a78878e6699a82ccf6d0a1461 (commit) from 0f700e1a4b8e66c269081eba64eb5be8c37de868 (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 3600304c30c4a345538f6c06ca50183b14cd12b1 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Apr 28 16:06:42 2018 +0300 doc: allow user to provide exta asciidoctor flags Allow user to provide extra asciidoctor flags. E.g. this allows one to override icons and/or fonts placement. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 23703127..1732c355 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -13,4 +13,5 @@ SUFFIXES = .svg .msc .gv .html .adoc .adoc.html: asciidoctor $(ASCIIDOC_FLAGS) --out-file=$@ $< -ASCIIDOC_FLAGS =-a data-uri -b html5 -a icons=font -a toc2 +ASCIIDOC_FLAGS =-a data-uri -b html5 -a icons=font -a toc2 \ + $(EXTRA_ASCIIDOC_FLAGS) commit 4ec4a756c7607e3a78878e6699a82ccf6d0a1461 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Apr 28 10:57:32 2018 +0300 travis: do not run gcov before executing codecov script There is no need to manually run gcov from Travis script, codecov.io will do that for us. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index a6cce816..cb05b839 100644 --- a/.travis.yml +++ b/.travis.yml @@ -310,7 +310,7 @@ jobs: - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=sp LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=iquery LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - sudo CCACHE_DISABLE=1 ODP_SCHEDULER=scalable LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make check - - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy + - bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test env: TEST=distcheck compiler: gcc ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- doc/Makefile.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-22-g0f700e1a

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 0f700e1a4b8e66c269081eba64eb5be8c37de868 (commit) via f0d0fd91978a8127ed270b03853ac0e04492a333 (commit) via 2ee48570ed824d5caff4f8cb121b7c293a481820 (commit) from 82499a9a4c80670de20825992478ccd4d764e28c (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 0f700e1a4b8e66c269081eba64eb5be8c37de868 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Apr 24 17:15:38 2018 +0300 validation: timer: add timer pool create-destroy test Added a test case that creates, uses and destroyes multiple timer pools. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 1cd49a35..e0f06882 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -144,6 +144,79 @@ static void timer_test_timeout_pool_free(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } +static void timer_pool_create_destroy(void) +{ + odp_timer_capability_t timer_capa; + odp_timer_pool_param_t tparam; + odp_timer_pool_info_t info; + odp_timer_pool_t tp[2]; + odp_timer_t tim; + odp_queue_t queue; + uint64_t res_ns; + + queue = odp_queue_create("timer_queue", NULL); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + CU_ASSERT_FATAL(odp_timer_capability(ODP_CLOCK_CPU, &timer_capa) == 0); + + res_ns = 10 * timer_capa.highest_res_ns; + + memset(&tparam, 0, sizeof(odp_timer_pool_param_t)); + tparam.res_ns = res_ns; + tparam.min_tmo = 5 * res_ns; + tparam.max_tmo = 10000 * tparam.min_tmo; + tparam.num_timers = 100; + tparam.priv = 0; + tparam.clk_src = ODP_CLOCK_CPU; + + tp[0] = odp_timer_pool_create("timer_pool_a", &tparam); + CU_ASSERT(tp[0] != ODP_TIMER_POOL_INVALID); + + odp_timer_pool_start(); + + tim = odp_timer_alloc(tp[0], queue, USER_PTR); + CU_ASSERT(tim != ODP_TIMER_INVALID); + CU_ASSERT(odp_timer_free(tim) == ODP_EVENT_INVALID); + + odp_timer_pool_destroy(tp[0]); + + tp[0] = odp_timer_pool_create("timer_pool_b", &tparam); + CU_ASSERT(tp[0] != ODP_TIMER_POOL_INVALID); + tp[1] = odp_timer_pool_create("timer_pool_c", &tparam); + CU_ASSERT(tp[1] != ODP_TIMER_POOL_INVALID); + + odp_timer_pool_start(); + + odp_timer_pool_destroy(tp[0]); + + tp[0] = odp_timer_pool_create("timer_pool_d", &tparam); + CU_ASSERT(tp[0] != ODP_TIMER_POOL_INVALID); + + odp_timer_pool_start(); + + memset(&info, 0, sizeof(odp_timer_pool_info_t)); + CU_ASSERT(odp_timer_pool_info(tp[1], &info) == 0); + CU_ASSERT(strcmp(info.name, "timer_pool_c") == 0); + + tim = odp_timer_alloc(tp[1], queue, USER_PTR); + CU_ASSERT(tim != ODP_TIMER_INVALID); + CU_ASSERT(odp_timer_free(tim) == ODP_EVENT_INVALID); + + odp_timer_pool_destroy(tp[1]); + + memset(&info, 0, sizeof(odp_timer_pool_info_t)); + CU_ASSERT(odp_timer_pool_info(tp[0], &info) == 0); + CU_ASSERT(strcmp(info.name, "timer_pool_d") == 0); + + tim = odp_timer_alloc(tp[0], queue, USER_PTR); + CU_ASSERT(tim != ODP_TIMER_INVALID); + CU_ASSERT(odp_timer_free(tim) == ODP_EVENT_INVALID); + + odp_timer_pool_destroy(tp[0]); + + CU_ASSERT(odp_queue_destroy(queue) == 0); +} + static void timer_test_queue_type(odp_queue_type_t queue_type) { odp_pool_t pool; @@ -819,6 +892,7 @@ static void timer_test_odp_timer_all(void) odp_testinfo_t timer_suite[] = { ODP_TEST_INFO(timer_test_timeout_pool_alloc), ODP_TEST_INFO(timer_test_timeout_pool_free), + ODP_TEST_INFO(timer_pool_create_destroy), ODP_TEST_INFO(timer_test_plain_queue), ODP_TEST_INFO(timer_test_sched_queue), ODP_TEST_INFO(timer_test_odp_timer_cancel), commit f0d0fd91978a8127ed270b03853ac0e04492a333 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Apr 25 12:57:33 2018 +0300 linux-gen: timer: reduce number of timer pools Typical application needs only couple of timer pools. Reduce number of timer pools to reduce global data structure size. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index ed56e25d..a445a57b 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -197,7 +197,9 @@ typedef struct timer_pool_s { int timer_thread_exit; /* request to exit for timer thread */ } timer_pool_t; -#define MAX_TIMER_POOLS 255 /* Leave one for ODP_TIMER_INVALID */ +/* Timer pool index must fit into 8 bits with one index value reserved to + * ODP_TIMER_POOL_INVALID. */ +#define MAX_TIMER_POOLS 32 #define INDEX_BITS 24 #define TIMER_RES_TEST_LOOP_COUNT 10 #define TIMER_RES_ROUNDUP_FACTOR 10 commit 2ee48570ed824d5caff4f8cb121b7c293a481820 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Apr 25 12:37:06 2018 +0300 linux-gen: timer: fix timer pool index allocation Timer pool index was allocated using atomic counters, so that a combination of timer_pool_create and _destroy calls resulted the same index to be allocated for multiple timers. Use a global data structure protected with a lock to maintain pool status. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3772 Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6ecddbdb..ed56e25d 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -201,16 +201,24 @@ typedef struct timer_pool_s { #define INDEX_BITS 24 #define TIMER_RES_TEST_LOOP_COUNT 10 #define TIMER_RES_ROUNDUP_FACTOR 10 -static odp_atomic_u32_t num_timer_pools; -static timer_pool_t *timer_pool[MAX_TIMER_POOLS]; + +typedef struct timer_global_t { + odp_ticketlock_t lock; + int num_timer_pools; + uint8_t timer_pool_used[MAX_TIMER_POOLS]; + timer_pool_t *timer_pool[MAX_TIMER_POOLS]; + +} timer_global_t; + +static timer_global_t timer_global; static inline timer_pool_t *handle_to_tp(odp_timer_t hdl) { uint32_t tp_idx = _odp_typeval(hdl) >> INDEX_BITS; if (odp_likely(tp_idx < MAX_TIMER_POOLS)) { - timer_pool_t *tp = timer_pool[tp_idx]; + timer_pool_t *tp = timer_global.timer_pool[tp_idx]; if (odp_likely(tp != NULL)) - return timer_pool[tp_idx]; + return timer_global.timer_pool[tp_idx]; } ODP_ABORT("Invalid timer handle %#x\n", hdl); } @@ -239,17 +247,32 @@ static void itimer_fini(timer_pool_t *tp); static odp_timer_pool_t timer_pool_new(const char *name, const odp_timer_pool_param_t *param) { - uint32_t tp_idx = odp_atomic_fetch_add_u32(&num_timer_pools, 1); - if (odp_unlikely(tp_idx >= MAX_TIMER_POOLS)) { - /* Restore the previous value */ - odp_atomic_sub_u32(&num_timer_pools, 1); - __odp_errno = ENFILE; /* Table overflow */ + uint32_t i, tp_idx; + size_t sz0, sz1, sz2; + + odp_ticketlock_lock(&timer_global.lock); + + if (timer_global.num_timer_pools >= MAX_TIMER_POOLS) { + odp_ticketlock_unlock(&timer_global.lock); return ODP_TIMER_POOL_INVALID; } - size_t sz0 = ROUNDUP_CACHE_LINE(sizeof(timer_pool_t)); - size_t sz1 = ROUNDUP_CACHE_LINE(sizeof(tick_buf_t) * param->num_timers); - size_t sz2 = ROUNDUP_CACHE_LINE(sizeof(_odp_timer_t) * - param->num_timers); + + for (i = 0; i < MAX_TIMER_POOLS; i++) { + if (timer_global.timer_pool_used[i] == 0) { + timer_global.timer_pool_used[i] = 1; + break; + } + } + + tp_idx = i; + timer_global.num_timer_pools++; + + odp_ticketlock_unlock(&timer_global.lock); + + sz0 = ROUNDUP_CACHE_LINE(sizeof(timer_pool_t)); + sz1 = ROUNDUP_CACHE_LINE(sizeof(tick_buf_t) * param->num_timers); + sz2 = ROUNDUP_CACHE_LINE(sizeof(_odp_timer_t) * + param->num_timers); odp_shm_t shm = odp_shm_reserve(name, sz0 + sz1 + sz2, ODP_CACHE_LINE_SIZE, ODP_SHM_SW_ONLY); if (odp_unlikely(shm == ODP_SHM_INVALID)) @@ -276,8 +299,8 @@ static odp_timer_pool_t timer_pool_new(const char *name, tp->notify_overrun = 1; tp->tick_buf = (void *)((char *)odp_shm_addr(shm) + sz0); tp->timers = (void *)((char *)odp_shm_addr(shm) + sz0 + sz1); + /* Initialize all odp_timer entries */ - uint32_t i; for (i = 0; i < tp->param.num_timers; i++) { tp->timers[i].queue = ODP_QUEUE_INVALID; set_next_free(&tp->timers[i], i + 1); @@ -291,7 +314,9 @@ static odp_timer_pool_t timer_pool_new(const char *name, } tp->tp_idx = tp_idx; odp_spinlock_init(&tp->lock); - timer_pool[tp_idx] = tp; + odp_ticketlock_lock(&timer_global.lock); + timer_global.timer_pool[tp_idx] = tp; + odp_ticketlock_unlock(&timer_global.lock); if (!inline_timers) { if (tp->param.clk_src == ODP_CLOCK_CPU) itimer_init(tp); @@ -321,8 +346,10 @@ static void stop_timer_thread(timer_pool_t *tp) static void odp_timer_pool_del(timer_pool_t *tp) { + int rc; + odp_shm_t shm; + odp_spinlock_lock(&tp->lock); - timer_pool[tp->tp_idx] = NULL; if (!inline_timers) { /* Stop POSIX itimer signals */ @@ -335,13 +362,23 @@ static void odp_timer_pool_del(timer_pool_t *tp) if (tp->num_alloc != 0) { /* It's a programming error to attempt to destroy a */ /* timer pool which is still in use */ + odp_spinlock_unlock(&tp->lock); ODP_ABORT("%s: timers in use\n", tp->name); } - int rc = odp_shm_free(tp->shm); + + odp_spinlock_unlock(&tp->lock); + + odp_ticketlock_lock(&timer_global.lock); + shm = tp->shm; + timer_global.timer_pool[tp->tp_idx] = NULL; + timer_global.timer_pool_used[tp->tp_idx] = 0; + timer_global.num_timer_pools--; + odp_ticketlock_unlock(&timer_global.lock); + + rc = odp_shm_free(shm); + if (rc != 0) ODP_ABORT("Failed to free shared memory (%d)\n", rc); - - odp_atomic_sub_u32(&num_timer_pools, 1); } static inline odp_timer_t timer_alloc(timer_pool_t *tp, @@ -758,7 +795,7 @@ static unsigned process_timer_pools(void) unsigned nexp = 0; for (size_t i = 0; i < MAX_TIMER_POOLS; i++) { - tp = timer_pool[i]; + tp = timer_global.timer_pool[i]; if (tp == NULL) continue; @@ -803,7 +840,7 @@ unsigned _timer_run(void) CONFIG_TIMER_RUN_RATELIMIT_ROUNDS; odp_time_t now; - if (odp_atomic_load_u32(&num_timer_pools) == 0) + if (timer_global.num_timer_pools == 0) return 0; /* Rate limit how often this thread checks the timer pools. */ @@ -1245,6 +1282,9 @@ void odp_timeout_free(odp_timeout_t tmo) int odp_timer_init_global(const odp_init_t *params) { + memset(&timer_global, 0, sizeof(timer_global_t)); + odp_ticketlock_init(&timer_global.lock); + #ifndef ODP_ATOMIC_U128 uint32_t i; for (i = 0; i < NUM_LOCKS; i++) @@ -1252,7 +1292,6 @@ int odp_timer_init_global(const odp_init_t *params) #else ODP_DBG("Using lock-less timer implementation\n"); #endif - odp_atomic_init_u32(&num_timer_pools, 0); if (params) inline_timers = ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_timer.c | 87 ++++++++++++++++++++++++++++---------- test/validation/api/timer/timer.c | 74 ++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 23 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-19-g82499a9a

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 82499a9a4c80670de20825992478ccd4d764e28c (commit) from c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 (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 82499a9a4c80670de20825992478ccd4d764e28c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 23:49:15 2018 +0300 linux-gen: dpdk: fix linking to libnuma Linking to dpdk/numa can fail with the following message: /usr/bin/x86_64-linux-gnu-ld: lib/.libs/libodp-linux.a(dpdk.o): undefined reference to symbol 'numa_num_configured_nodes@@libnuma_1.2' //usr/lib/x86_64-linux-gnu/libnuma.so.1: error adding symbols: DSO missing from command line Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index cb2ed60d..09dde35a 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -40,6 +40,14 @@ then ;; esac + OLD_LIBS=$LIBS + LIBS="-lnuma" + AC_TRY_LINK_FUNC([numa_num_configured_nodes], + [AC_DEFINE([HAVE_NUMA_LIBRARY], [1], + [Define to 1 if numa library is usable]) + AS_VAR_APPEND([DPDK_LIBS_LIBODP], [" -lnuma"])]) + LIBS=$OLD_LIBS + AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 0550416b..14d59d8e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -50,7 +50,7 @@ #include <rte_version.h> /* NUMA is not supported on all platforms */ -#ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES +#ifdef HAVE_NUMA_LIBRARY #include <numa.h> #else #define numa_num_configured_nodes() 1 ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/m4/odp_dpdk.m4 | 8 ++++++++ platform/linux-generic/pktio/dpdk.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-18-gc164ad60

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 c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 (commit) via 53dca8426775ed5bf40f2c2708915f02b2dccc74 (commit) from f69f033da3b6900acdd170668cae07ac6cd959f3 (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 c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Apr 25 16:25:20 2018 +0300 test: crypto perf: add missing breaks to switch case Breaks are needed for switch-cases. Missing breaks were breaking build for GCC 7.2. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 8a5f2c5b..0404aca2 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -871,30 +871,40 @@ static int check_cipher_alg(odp_crypto_capability_t *capa, case ODP_CIPHER_ALG_NULL: if (capa->ciphers.bit.null) return 0; + break; case ODP_CIPHER_ALG_DES: if (capa->ciphers.bit.des) return 0; + break; case ODP_CIPHER_ALG_3DES_CBC: if (capa->ciphers.bit.trides_cbc) return 0; + break; case ODP_CIPHER_ALG_AES_CBC: if (capa->ciphers.bit.aes_cbc) return 0; + break; case ODP_CIPHER_ALG_AES_CTR: if (capa->ciphers.bit.aes_ctr) return 0; + break; case ODP_CIPHER_ALG_AES_GCM: if (capa->ciphers.bit.aes_gcm) return 0; + break; case ODP_CIPHER_ALG_AES_CCM: if (capa->ciphers.bit.aes_ccm) return 0; + break; case ODP_CIPHER_ALG_CHACHA20_POLY1305: if (capa->ciphers.bit.chacha20_poly1305) return 0; + break; default: - return -1; + break; } + + return -1; } static int check_auth_alg(odp_crypto_capability_t *capa, @@ -904,36 +914,48 @@ static int check_auth_alg(odp_crypto_capability_t *capa, case ODP_AUTH_ALG_NULL: if (capa->auths.bit.null) return 0; + break; case ODP_AUTH_ALG_MD5_HMAC: if (capa->auths.bit.md5_hmac) return 0; + break; case ODP_AUTH_ALG_SHA1_HMAC: if (capa->auths.bit.sha1_hmac) return 0; + break; case ODP_AUTH_ALG_SHA256_HMAC: if (capa->auths.bit.sha256_hmac) return 0; + break; case ODP_AUTH_ALG_SHA384_HMAC: if (capa->auths.bit.sha384_hmac) return 0; + break; case ODP_AUTH_ALG_SHA512_HMAC: if (capa->auths.bit.sha512_hmac) return 0; + break; case ODP_AUTH_ALG_AES_GCM: if (capa->auths.bit.aes_gcm) return 0; + break; case ODP_AUTH_ALG_AES_GMAC: if (capa->auths.bit.aes_gmac) return 0; + break; case ODP_AUTH_ALG_AES_CCM: if (capa->auths.bit.aes_ccm) return 0; + break; case ODP_AUTH_ALG_CHACHA20_POLY1305: if (capa->auths.bit.chacha20_poly1305) return 0; + break; default: - return -1; + break; } + + return -1; } /** commit 53dca8426775ed5bf40f2c2708915f02b2dccc74 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Apr 24 16:23:53 2018 +0300 validation: timer: loosen period accuracy requirement Test passes if measured: * timeout period is within +-20% (+-4x resolution) of the requested period, and * test period is within +-10% (+- 1 timeout period) of the requested 10 periods. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index a34885c0..1cd49a35 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -256,15 +256,17 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) if (ev != ODP_EVENT_INVALID) { diff_period = odp_time_diff_ns(t2, t1); - t1 = odp_time_local(); + t1 = t2; tmo = odp_timeout_from_event(ev); tim = odp_timeout_timer(tmo); tick = odp_timeout_tick(tmo); - CU_ASSERT(diff_period > (period_ns - (2 * res_ns))); - CU_ASSERT(diff_period < (period_ns + (2 * res_ns))); + CU_ASSERT(diff_period > (period_ns - (4 * res_ns))); + CU_ASSERT(diff_period < (period_ns + (4 * res_ns))); - LOG_DBG("timeout tick %" PRIu64 "\n", tick); + LOG_DBG("timeout tick %" PRIu64 ", " + "timeout period %" PRIu64 "\n", + tick, diff_period); odp_timeout_free(tmo); CU_ASSERT(odp_timer_free(tim) == ODP_EVENT_INVALID); @@ -274,9 +276,11 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) } while (diff_test < (2 * test_period) && num_tmo < num); + LOG_DBG("test period %" PRIu64 "\n", diff_test); + CU_ASSERT(num_tmo == num); - CU_ASSERT(diff_test > (test_period - tparam.min_tmo)); - CU_ASSERT(diff_test < (test_period + tparam.min_tmo)); + CU_ASSERT(diff_test > (test_period - period_ns)); + CU_ASSERT(diff_test < (test_period + period_ns)); /* Scalable scheduler needs this pause sequence. Otherwise, it gets * stuck on terminate. */ ----------------------------------------------------------------------- Summary of changes: test/performance/odp_crypto.c | 26 ++++++++++++++++++++++++-- test/validation/api/timer/timer.c | 16 ++++++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-16-gf69f033d

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 f69f033da3b6900acdd170668cae07ac6cd959f3 (commit) via 8d957f16105fa44d483478b2c05bae735680c007 (commit) via 5028177e4e795305b514d7164ff882dcf1d3622b (commit) from 24262a9aae62290dfd1a041d0bd5c6943270251d (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 f69f033da3b6900acdd170668cae07ac6cd959f3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Apr 24 17:39:17 2018 +0300 validation: crypto: add missing ODP_CIPHER_ALG_AES_CTR name Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 676b9b12..83070290 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -79,6 +79,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_3DES_CBC"; case ODP_CIPHER_ALG_AES_CBC: return "ODP_CIPHER_ALG_AES_CBC"; + case ODP_CIPHER_ALG_AES_CTR: + return "ODP_CIPHER_ALG_AES_CTR"; case ODP_CIPHER_ALG_AES_GCM: return "ODP_CIPHER_ALG_AES_GCM"; case ODP_CIPHER_ALG_AES_CCM: commit 8d957f16105fa44d483478b2c05bae735680c007 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Apr 24 11:56:15 2018 +0300 travis: bump DPDK version to 17.11.2 - latest LTS release Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 70eff748..a6cce816 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e - - DPDK_VERS="17.11" + - DPDK_VERS="17.11.2" matrix: - CONF="" - CONF="--disable-abi-compat" commit 5028177e4e795305b514d7164ff882dcf1d3622b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Apr 24 11:53:05 2018 +0300 travis: fetch explicitly specified DPDK version Use tag to fetch DPDK, rather than fetching top of corresponding branch. This allows us to specify stable version and stop unnecessary playing with the cache. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 2f47ed79..70eff748 100644 --- a/.travis.yml +++ b/.travis.yml @@ -154,12 +154,7 @@ install: fi - gem install asciidoctor - # DPDK pktio. Note that cache must be purged if dpdk version changes. - - | - CACHED_DPDK_VERS=`fgrep Version dpdk/pkg/dpdk.spec | cut -d " " -f 2` - if [ "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then - rm -rf dpdk - fi + # DPDK pktio. Cache will be updated automatically to ${DPDK_VERS} - | case "$CROSS_ARCH" in "arm64") @@ -193,8 +188,17 @@ install: LIBDPDKEXT=a fi DPDK_TARGET="${DPDK_TARGET}gcc" + CACHED_DPDK_VERS=`fgrep Version dpdk/pkg/dpdk.spec | cut -d " " -f 2` + if [ ! -d dpdk -o "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then + rm -rf dpdk + mkdir dpdk + pushd dpdk + git init + git -c advice.detachedHead=false fetch -q --depth=1 http://dpdk.org/git/dpdk-stable v${DPDK_VERS} + git checkout -f FETCH_HEAD + popd + fi if [ ! -f "dpdk/${TARGET}/usr/local/lib/libdpdk.$LIBDPDKEXT" ]; then - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=${DPDK_VERS} http://dpdk.org/git/dpdk-stable dpdk pushd dpdk git log --oneline --decorate # AArch64 && ARMv7 fixup ----------------------------------------------------------------------- Summary of changes: .travis.yml | 20 ++++++++++++-------- test/validation/api/crypto/odp_crypto_test_inp.c | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) hooks/post-receive --

7 years, 10 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-13-g24262a9a

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 24262a9aae62290dfd1a041d0bd5c6943270251d (commit) via 7e355890905a9195ff1027377991b4134e285a03 (commit) from 6947621e1b3a3c73c3ee351325f505e5e191474f (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 24262a9aae62290dfd1a041d0bd5c6943270251d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Apr 24 15:53:59 2018 +0300 test: mmap_vlan_ins: wait for background process Each 'make check' run was still leaving a mmap_vlan_ins process behind. Wait until both processes (also the background process) has finished before tearing down the interfaces. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh index ae263ee3..b0eb046b 100755 --- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh +++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh @@ -69,8 +69,8 @@ plat_mmap_vlan_ins${EXEEXT} pktiop0p1 pcap:out=${PCAP_OUT} \ plat_mmap_vlan_ins${EXEEXT} pcap:in=${PCAP_IN} pktiop1p0 \ 01:02:03:04:05:06 01:08:09:0a:0b:0c -# Give both processes time to close before removing interfaces -sleep 4 +# Wait both processes to exit before removing the interfaces +wait $! rm -f ${PCAP_OUT} cleanup_pktio_env commit 7e355890905a9195ff1027377991b4134e285a03 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Apr 23 23:10:03 2018 +0300 linux-gen: ipsec: parse IPv6 next header in tunnel case IPsec parsing code will fail to update next header field in internal state in case of outbound tunnel processing of IPv6 packets. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3764 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 782cbf45..7401f590 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -844,6 +844,7 @@ static int ipsec_out_tunnel_parse_ipv6(ipsec_state_t *state, state->out_tunnel.ip_flabel = (ipv6hdr->ver_tc_flow & _ODP_IPV6HDR_FLOW_LABEL_MASK) >> _ODP_IPV6HDR_FLOW_LABEL_SHIFT; + state->ip_next_hdr = ipv6hdr->next_hdr; return 0; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_ipsec.c | 1 + platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 10 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp