git-lng-odp April 2018

git-lng-odp@lists.linaro.org

1 participants
37 discussions

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

6 years, 9 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 --

6 years, 9 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 --

6 years, 9 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 --

6 years, 9 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 --

6 years, 9 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 --

6 years, 9 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-11-g6947621e

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 6947621e1b3a3c73c3ee351325f505e5e191474f (commit) from 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (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 6947621e1b3a3c73c3ee351325f505e5e191474f Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Apr 23 13:48:22 2018 +0200 linux-gen: fdserver: remove unnecessary locking The locks in fdserver's operations don't serve any purpose, there is no need to acquire a lock when registering a file descriptor to the server, specially because the only place where the registering function is used is already protected by another lock, and the same goes for deregistering. Also, the fdserver handles requests sequentially. On the other hand, removing the lock from the lookup function may return a fd that is being deregistered, but this is not protecting us from misusing it because the operation to be unregistered may be queued right after the lookup request, at which point the fd is already invalid anyway. Signed-off-by: Josep Puigdemont <josep.puigdemont(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_fdserver.c b/platform/linux-generic/odp_fdserver.c index 0e9fb0e4..774fe360 100644 --- a/platform/linux-generic/odp_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -39,7 +39,6 @@ */ #include <odp_posix_extensions.h> -#include <odp/api/spinlock.h> #include <odp_internal.h> #include <odp_debug_internal.h> #include <odp_fdserver_internal.h> @@ -78,9 +77,6 @@ ODP_DBG(fmt, ##__VA_ARGS__);\ } while (0) -/* when accessing the client functions, clients should be mutexed: */ -static odp_spinlock_t *client_lock; - /* define the tables of file descriptors handled by this server: */ #define FDSERVER_MAX_ENTRIES 256 typedef struct fdentry_s { @@ -288,23 +284,18 @@ int _odp_fdserver_register_fd(fd_server_context_e context, uint64_t key, int command; int fd; - odp_spinlock_lock(client_lock); - FD_ODP_DBG("FD client register: pid=%d key=%" PRIu64 ", fd=%d\n", getpid(), key, fd_to_send); s_sock = get_socket(); - if (s_sock < 0) { - odp_spinlock_unlock(client_lock); + if (s_sock < 0) return -1; - } res = send_fdserver_msg(s_sock, FD_REGISTER_REQ, context, key, fd_to_send); if (res < 0) { ODP_ERR("fd registration failure\n"); close(s_sock); - odp_spinlock_unlock(client_lock); return -1; } @@ -313,13 +304,11 @@ int _odp_fdserver_register_fd(fd_server_context_e context, uint64_t key, if ((res < 0) || (command != FD_REGISTER_ACK)) { ODP_ERR("fd registration failure\n"); close(s_sock); - odp_spinlock_unlock(client_lock); return -1; } close(s_sock); - odp_spinlock_unlock(client_lock); return 0; } @@ -334,22 +323,17 @@ int _odp_fdserver_deregister_fd(fd_server_context_e context, uint64_t key) int command; int fd; - odp_spinlock_lock(client_lock); - FD_ODP_DBG("FD client deregister: pid=%d key=%" PRIu64 "\n", getpid(), key); s_sock = get_socket(); - if (s_sock < 0) { - odp_spinlock_unlock(client_lock); + if (s_sock < 0) return -1; - } res = send_fdserver_msg(s_sock, FD_DEREGISTER_REQ, context, key, -1); if (res < 0) { ODP_ERR("fd de-registration failure\n"); close(s_sock); - odp_spinlock_unlock(client_lock); return -1; } @@ -358,13 +342,11 @@ int _odp_fdserver_deregister_fd(fd_server_context_e context, uint64_t key) if ((res < 0) || (command != FD_DEREGISTER_ACK)) { ODP_ERR("fd de-registration failure\n"); close(s_sock); - odp_spinlock_unlock(client_lock); return -1; } close(s_sock); - odp_spinlock_unlock(client_lock); return 0; } @@ -380,19 +362,14 @@ int _odp_fdserver_lookup_fd(fd_server_context_e context, uint64_t key) int command; int fd; - odp_spinlock_lock(client_lock); - s_sock = get_socket(); - if (s_sock < 0) { - odp_spinlock_unlock(client_lock); + if (s_sock < 0) return -1; - } res = send_fdserver_msg(s_sock, FD_LOOKUP_REQ, context, key, -1); if (res < 0) { ODP_ERR("fd lookup failure\n"); close(s_sock); - odp_spinlock_unlock(client_lock); return -1; } @@ -401,7 +378,6 @@ int _odp_fdserver_lookup_fd(fd_server_context_e context, uint64_t key) if ((res < 0) || (command != FD_LOOKUP_ACK)) { ODP_ERR("fd lookup failure\n"); close(s_sock); - odp_spinlock_unlock(client_lock); return -1; } @@ -409,7 +385,6 @@ int _odp_fdserver_lookup_fd(fd_server_context_e context, uint64_t key) ODP_DBG("FD client lookup: pid=%d, key=%" PRIu64 ", fd=%d\n", getpid(), key, fd); - odp_spinlock_unlock(client_lock); return fd; } @@ -421,27 +396,21 @@ static int stop_server(void) int s_sock; /* server socket */ int res; - odp_spinlock_lock(client_lock); - FD_ODP_DBG("FD sending server stop request\n"); s_sock = get_socket(); - if (s_sock < 0) { - odp_spinlock_unlock(client_lock); + if (s_sock < 0) return -1; - } res = send_fdserver_msg(s_sock, FD_SERVERSTOP_REQ, 0, 0, -1); if (res < 0) { ODP_ERR("fd stop request failure\n"); close(s_sock); - odp_spinlock_unlock(client_lock); return -1; } close(s_sock); - odp_spinlock_unlock(client_lock); return 0; } @@ -595,12 +564,6 @@ int _odp_fdserver_init_global(void) pid_t server_pid; int res; - /* create the client spinlock that any client can see: */ - client_lock = mmap(NULL, sizeof(odp_spinlock_t), PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS, -1, 0); - - odp_spinlock_init(client_lock); - snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKDIR_FORMAT, odp_global_data.shm_dir, odp_global_data.uid); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_fdserver.c | 45 ++++------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch api-next updated. v1.19.0.0_tigermoth-10-g29cb8605

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, api-next has been updated discards 1c11eb2f0e612eb9b7a6cbe91a3e4ac3e61c7b80 (commit) via 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit) via acc05760d5060d1782aa597e44c72ccb9a71b63b (commit) via c440dfceff97526d2763383afd8da064faef3d0d (commit) via 93591a6134fbc5655c0cf6a25e0b4e0668357971 (commit) via fec701841dbe2e963cf3adc7c74c98b41e059b9d (commit) via 0e24607e3075a573ebe4ac408703c76daac7236c (commit) via 5d4be5077adeec54d1956c86dcb87b186c39a7cb (commit) via 3aa3f4352083d159260cebc23b87607e73aa6f2b (commit) via 0d4271e31fe685a8a82381d21d5166f0398080c1 (commit) via d324b9de12c510ccf9fa1c1b6ece327c578ee53d (commit) via e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (commit) via 1e0ac11c75eee10959d1fa674a05e746476271b3 (commit) via 8caae505c35444706cff8815c41821d80e791403 (commit) via 4b6787c84e020c350a03ec47d12e1ef68ddb6300 (commit) via 4142652b8eb397963bec48610bdb9ab6599e65fb (commit) via 60777ba4309911df0780bd8de6d96524bc2ca03c (commit) via b2632ac253a3b9f5ba7a4174acf6abe295ec3550 (commit) via 79f5c103310c36dc213a552b9534f68ce8df1132 (commit) via 2c99a9dc1978c9178e711d264aaaca2bc4702352 (commit) via 88ba35773c76c871a222fe48a0dac05765c39936 (commit) via 2e96afe0b7c4e7e41fb03bcda605ab704f538ca1 (commit) via 52ea8d51d522d7013f746748bf84bfc2e9bc042c (commit) via b7ee13d765e5d8da1ef68f0c0777cb5e40fffbf7 (commit) via a2cad95118b79f204bc13914acf43a8fc1dd2682 (commit) via a5340c53957b3174c89d03ecf2c61e9ba98ac57c (commit) via 813cd2df67ae0591b0f792eff82854c5c9c642ca (commit) via 48f8503baf847315dda6609abc01f5befe6e0284 (commit) via b1100fdba29d8f514236dbcfd6f17e7941c0256a (commit) via f96a21992e13cf401a3494f2caeec9d42f56f0d9 (commit) via 1e925d0ccc7340575ddcfa07ab7bd372d751e006 (commit) via c9d31f30ba4fd7818b4ba2ffd7bbaea74761a2d9 (commit) via cabee48a54a68f333569ee1904bc04d53da7c9c6 (commit) via 183ce9babe20e161caef6b55eccfd043b334f748 (commit) via 0fa9977e21010f963892f59a75f03e3ba800bc74 (commit) via b0b07f403ffc22349ac8dd75f47238bea40891be (commit) via bd0377ae95427e80f04b0dd5f3a8dcb0b1ab89e3 (commit) via 5555878edbda765134fbe50f3181f409963037ea (commit) via 009dab38672eaf8ab6eddc551da41a84e86915a5 (commit) via 290decaf3259b036c3a402be428b04ba100f0f81 (commit) via 61d16e162788ac0923c544b4d31bb847fa3d9189 (commit) via 83fda5a447335b95bdd991187d4efb0a15a5709a (commit) via 654507c6eeed83dd84210f7e481ded34f5d4cdca (commit) via 84f8013995d4b96ac9471cc92285c76b50464415 (commit) via 92ebb26bae583ff864bc4bef6a2776329527a069 (commit) via ed4e1bfea15d8502e50b6c210f38dd3f13683d2f (commit) via ef5998dfd0ba1405fef6dd1a7f0e9adf686fca89 (commit) via a430caf661d4a0ad8d69c67dc7a20911e3169a25 (commit) via fbe07de54f3768f32bd39a0ea9aa2a79188b1186 (commit) via 57df98eca15fe64a716f9f555714ef5fb9cd25e9 (commit) via 674ea087fba016e55f03e3966fe64fc908141f8f (commit) via a9584da4284c04e45a9584a58c6dbeb404871119 (commit) via 63123149319eb0e379dc52a3f4691993d026f3bf (commit) via 9a5a18af733c07109224e328ca0ac640ff49f845 (commit) via 06321dc028b83ea78b39eb9673859a40f9da37f7 (commit) via d6de4dfcf1a3a6c861c87d47990f793c71328eda (commit) via fc0a57306aa68a782e8611a9bd08ae10aaa5274a (commit) via 2eaf47b69ea5f2095e26e0ea597d3e8702b0da06 (commit) via 9f3311f92d28ef9fdf6ef3d8ec8b90efe7a832d6 (commit) via 68b1a52611e6ac9be306e5a17d009a6fd46c455e (commit) via 59d636481fd1771107f3eb4632c2a9fc868afc11 (commit) via 0225a8a396ddc7168be096f28b0a711184a48ef9 (commit) via 72febbae5ea55a5fd051978fbfa0f669cf0e99fc (commit) via f80f28c4046b650c180bcb9b41c859c0c8e2564e (commit) via b08aa94548163ae4d4bac2724e68ca9102667f6a (commit) via 4aacfd4d72b80a22d449d865a6c4f063afa823ab (commit) via 71ca38c00c11ebb6b4dede6d09ebdd28eb45d890 (commit) via 7e0c523ad6f209f238277e4116c21ba696edb7f4 (commit) via 12d238d96318cc9d46dd5a2893894824a633805b (commit) via bcd246e3a9948a631eb8eb77886ac1b369b13dba (commit) via c57da8ddc80e0e314957c6d11db288ef11fc1805 (commit) via 535ad269bfc6581a048d3e844576063be5d19501 (commit) via d8dd54f2325cf859703721e7a17b6cbe734d857a (commit) via edc9616a1bbc0fbc2d7f84ddafeb119d689f3f70 (commit) via 31d3492b50b057df853ad51c909ac21d6e95a4ca (commit) via 74f7b6d1a003175f1cddf979212631a0d7832399 (commit) via 3c5cc8070d3bc8b7429f0410de6ef3009ff6a28f (commit) via 4665f6d2987fb26ad006cb56b02b3ef4c170f371 (commit) via d3690d4115441dc69d9571cb5261dd005a112d39 (commit) via 364887331875180c498abb8b7681a228ca21181e (commit) via eca5df13cf7987d6e3cd3cc930851671b071e4b3 (commit) via c8dc27d1fb5c890143338439f1cdbe3b2719174c (commit) via 62ef9d5c92e0f56f45767f4c73df214d4393e158 (commit) via 41fd242a0685e79cb6f1b1e1826e6734bea2f359 (commit) via 35a90a547466db90c00d6375d8d9a3573e84e99b (commit) via 9a1d48b1262d88e55922c4e1ed9f91ed2e3376d7 (commit) via 1e70adc3ae54b0c4518bdb51d94301f1dafe4ebf (commit) via 91282a4c578716f157aa8a5e0a9bf9bd25b19a17 (commit) via e009051a0166fa25e601190354e0333aa30ad58d (commit) via 36f589b5a84804ce246bcd9a3eb9352801aaf41d (commit) via 2bbd7ace9e236d27dcfb52acfef991bd5ce39354 (commit) via 196d8f518071cc8c37dde0835cb7559d6cdd55da (commit) via 42fc5ebdcd5a1e5fbb7a19a2756a310f23a0cdd5 (commit) via bb8015d15ca4b0e2033eeca09906032a88e74bff (commit) via 3e61be54a77ed8ccc2030e88b9a26372d3f76e2c (commit) via c0da87688187c81039cf81790fed3d6ed00a956e (commit) via c2a1c48f5fc17cf4dd870057d17059ad668d29ad (commit) via c67dcec1c034a0c75c093b49e2a172bbd3d50def (commit) via 80b9a1e4d6a297ac916cbaf360e7b2114ef86a7a (commit) via 7135eda6854ba60d6379ca5799b4b58959e998b5 (commit) via 017969502cd0247c9b25e80e002ac563860f5a5d (commit) via 3a4f369fb2019761af5d4d7ad09d48f1e5d44f82 (commit) via 962600ecdbe44d386f95a57ac5a91365af0b6c39 (commit) via 6ea708c0f9f36b9a90f463dd1f7e0332f82e079b (commit) via 534667daec58ce8b2e417709e788934bea6f8f09 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (1c11eb2f0e612eb9b7a6cbe91a3e4ac3e61c7b80) \ N -- N -- N (29cb860583cb906bc16eddf9a4c98d6bb37333e5) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .checkpatch.conf | 5 + .shippable.yml | 21 +- .travis.yml | 20 +- CHANGELOG | 154 ++ DEPENDENCIES | 6 +- Makefile.am | 8 +- config/README | 10 + config/odp-linux-generic.conf | 58 + configure.ac | 21 +- doc/users-guide/users-guide-cls.adoc | 2 +- doc/users-guide/users-guide-crypto.adoc | 2 +- doc/users-guide/users-guide-ipsec.adoc | 4 +- doc/users-guide/users-guide-packet.adoc | 35 + doc/users-guide/users-guide-pktio.adoc | 374 ++++- doc/users-guide/users-guide-tm.adoc | 8 +- doc/users-guide/users-guide.adoc | 68 +- example/Makefile.inc | 2 + example/l2fwd/README | 7 + m4/odp_dpdk.m4 | 11 +- m4/odp_libconfig.m4 | 29 + .../m4/odp_schedule.m4 => m4/odp_scheduler.m4 | 5 + platform/Makefile.inc | 5 +- platform/linux-generic/.gitignore | 1 + platform/linux-generic/Makefile.am | 76 +- .../linux-generic/include/odp_buffer_inlines.h | 5 + ...fdserver_internal.h => odp_fdserver_internal.h} | 0 platform/linux-generic/include/odp_internal.h | 5 + .../{_ishm_internal.h => odp_ishm_internal.h} | 0 ...{_ishmphy_internal.h => odp_ishmphy_internal.h} | 0 ...ishmpool_internal.h => odp_ishmpool_internal.h} | 0 .../linux-generic/include/odp_libconfig_internal.h | 34 + platform/linux-generic/include/odp_packet_dpdk.h | 10 +- .../linux-generic/include/odp_packet_internal.h | 4 + platform/linux-generic/include/odp_packet_netmap.h | 7 + .../linux-generic/include/odp_queue_internal.h | 24 + platform/linux-generic/include/odp_queue_lf.h | 1 - platform/linux-generic/include/odp_schedule_if.h | 8 +- .../include/odp_schedule_scalable_ordered.h | 2 +- platform/linux-generic/libodp-linux.pc.in | 1 + platform/linux-generic/m4/configure.m4 | 5 +- platform/linux-generic/odp_crypto.c | 256 +++- .../linux-generic/{_fdserver.c => odp_fdserver.c} | 77 +- platform/linux-generic/odp_impl.c | 30 +- platform/linux-generic/odp_init.c | 14 + platform/linux-generic/odp_ipsec.c | 214 +-- platform/linux-generic/odp_ipsec_sad.c | 9 + platform/linux-generic/{_ishm.c => odp_ishm.c} | 131 +- .../linux-generic/{_ishmphy.c => odp_ishmphy.c} | 6 +- .../linux-generic/{_ishmpool.c => odp_ishmpool.c} | 4 +- platform/linux-generic/odp_libconfig.c | 135 ++ platform/linux-generic/odp_packet.c | 239 +++ platform/linux-generic/odp_packet_io.c | 145 +- platform/linux-generic/odp_pool.c | 9 +- platform/linux-generic/odp_queue_basic.c | 213 ++- platform/linux-generic/odp_queue_lf.c | 2 +- platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_random.c | 54 + platform/linux-generic/odp_schedule_basic.c | 633 ++++---- platform/linux-generic/odp_schedule_iquery.c | 23 +- platform/linux-generic/odp_schedule_scalable.c | 4 +- platform/linux-generic/odp_schedule_sp.c | 7 +- platform/linux-generic/odp_shared_memory.c | 2 +- platform/linux-generic/odp_system_info.c | 26 +- platform/linux-generic/pktio/dpdk.c | 111 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/loop.c | 110 +- platform/linux-generic/pktio/netmap.c | 63 + .../test/mmap_vlan_ins/mmap_vlan_ins.sh | 3 + platform/linux-generic/test/ring/Makefile.am | 2 + scripts/build-pktio-dpdk | 7 +- scripts/checkpatch.pl | 1552 ++++++++++++++++---- scripts/ci-checkpatches.sh | 4 +- test/Makefile.inc | 2 + test/miscellaneous/odp_api_from_cpp.cpp | 6 +- test/performance/.gitignore | 2 + test/performance/Makefile.am | 11 + test/performance/odp_crypto.c | 271 +++- test/performance/{odp_crypto.c => odp_ipsec.c} | 1035 +++++++------ test/performance/odp_sched_latency.c | 9 +- test/performance/odp_sched_pktio.c | 800 ++++++++++ .../{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} | 69 +- .../api/classification/odp_classification_tests.c | 59 +- .../classification/odp_classification_testsuites.h | 12 + test/validation/api/crypto/odp_crypto_test_inp.c | 95 +- test/validation/api/crypto/test_vectors.h | 209 +++ test/validation/api/crypto/test_vectors_len.h | 10 + test/validation/api/ipsec/ipsec.c | 17 +- test/validation/api/ipsec/ipsec_test_out.c | 194 +++ test/validation/api/ipsec/test_vectors.h | 89 +- test/validation/api/pktio/pktio.c | 669 ++++++--- test/validation/api/scheduler/scheduler.c | 4 +- test/validation/api/timer/timer.c | 336 ++++- 92 files changed, 7070 insertions(+), 1958 deletions(-) create mode 100644 config/odp-linux-generic.conf create mode 100644 m4/odp_libconfig.m4 rename platform/linux-generic/m4/odp_schedule.m4 => m4/odp_scheduler.m4 (73%) rename platform/linux-generic/include/{_fdserver_internal.h => odp_fdserver_internal.h} (100%) rename platform/linux-generic/include/{_ishm_internal.h => odp_ishm_internal.h} (100%) rename platform/linux-generic/include/{_ishmphy_internal.h => odp_ishmphy_internal.h} (100%) rename platform/linux-generic/include/{_ishmpool_internal.h => odp_ishmpool_internal.h} (100%) create mode 100644 platform/linux-generic/include/odp_libconfig_internal.h rename platform/linux-generic/{_fdserver.c => odp_fdserver.c} (91%) rename platform/linux-generic/{_ishm.c => odp_ishm.c} (98%) rename platform/linux-generic/{_ishmphy.c => odp_ishmphy.c} (98%) rename platform/linux-generic/{_ishmpool.c => odp_ishmpool.c} (99%) create mode 100644 platform/linux-generic/odp_libconfig.c create mode 100644 platform/linux-generic/odp_random.c copy test/performance/{odp_crypto.c => odp_ipsec.c} (56%) create mode 100644 test/performance/odp_sched_pktio.c copy test/performance/{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} (50%) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-10-g29cb8605

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 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit) from acc05760d5060d1782aa597e44c72ccb9a71b63b (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 29cb860583cb906bc16eddf9a4c98d6bb37333e5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Apr 23 13:52:31 2018 +0300 test: crypto perf: check algorithm capabilities Test only those algorithms that implementation supports. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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 8841c127..8a5f2c5b 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -187,6 +187,14 @@ typedef struct { struct rusage ru_thread; /**< Rusage value for current thread */ } time_record_t; +/* Arguments for one test run */ +typedef struct test_run_arg_t { + crypto_args_t crypto_args; + crypto_alg_config_t *crypto_alg_config; + odp_crypto_capability_t crypto_capa; + +} test_run_arg_t; + static void parse_args(int argc, char *argv[], crypto_args_t *cargs); static void usage(char *progname); @@ -856,18 +864,106 @@ run_measure_one(crypto_args_t *cargs, return rc < 0 ? rc : 0; } +static int check_cipher_alg(odp_crypto_capability_t *capa, + odp_cipher_alg_t alg) +{ + switch (alg) { + case ODP_CIPHER_ALG_NULL: + if (capa->ciphers.bit.null) + return 0; + case ODP_CIPHER_ALG_DES: + if (capa->ciphers.bit.des) + return 0; + case ODP_CIPHER_ALG_3DES_CBC: + if (capa->ciphers.bit.trides_cbc) + return 0; + case ODP_CIPHER_ALG_AES_CBC: + if (capa->ciphers.bit.aes_cbc) + return 0; + case ODP_CIPHER_ALG_AES_CTR: + if (capa->ciphers.bit.aes_ctr) + return 0; + case ODP_CIPHER_ALG_AES_GCM: + if (capa->ciphers.bit.aes_gcm) + return 0; + case ODP_CIPHER_ALG_AES_CCM: + if (capa->ciphers.bit.aes_ccm) + return 0; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + if (capa->ciphers.bit.chacha20_poly1305) + return 0; + default: + return -1; + } +} + +static int check_auth_alg(odp_crypto_capability_t *capa, + odp_auth_alg_t alg) +{ + switch (alg) { + case ODP_AUTH_ALG_NULL: + if (capa->auths.bit.null) + return 0; + case ODP_AUTH_ALG_MD5_HMAC: + if (capa->auths.bit.md5_hmac) + return 0; + case ODP_AUTH_ALG_SHA1_HMAC: + if (capa->auths.bit.sha1_hmac) + return 0; + case ODP_AUTH_ALG_SHA256_HMAC: + if (capa->auths.bit.sha256_hmac) + return 0; + case ODP_AUTH_ALG_SHA384_HMAC: + if (capa->auths.bit.sha384_hmac) + return 0; + case ODP_AUTH_ALG_SHA512_HMAC: + if (capa->auths.bit.sha512_hmac) + return 0; + case ODP_AUTH_ALG_AES_GCM: + if (capa->auths.bit.aes_gcm) + return 0; + case ODP_AUTH_ALG_AES_GMAC: + if (capa->auths.bit.aes_gmac) + return 0; + case ODP_AUTH_ALG_AES_CCM: + if (capa->auths.bit.aes_ccm) + return 0; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + if (capa->auths.bit.chacha20_poly1305) + return 0; + default: + return -1; + } +} + /** * Process one algorithm. Note if paload size is specicified it is * only one run. Or iterate over set of predefined payloads. */ -static int -run_measure_one_config(crypto_args_t *cargs, - crypto_alg_config_t *config) +static int run_measure_one_config(test_run_arg_t *arg) { crypto_run_result_t result; odp_crypto_session_t session; + crypto_args_t *cargs = &arg->crypto_args; + crypto_alg_config_t *config = arg->crypto_alg_config; + odp_crypto_capability_t crypto_capa = arg->crypto_capa; int rc = 0; + if (check_cipher_alg(&crypto_capa, config->session.cipher_alg)) { + printf(" Cipher algorithm not supported\n"); + rc = 1; + } + + if (check_auth_alg(&crypto_capa, config->session.auth_alg)) { + printf(" Auth algorithm not supported\n"); + rc = 1; + } + + if (rc) { + printf(" => %s skipped\n\n", config->name); + return 0; + } + if (create_session_from_config(&session, config, cargs)) return -1; @@ -898,17 +994,9 @@ run_measure_one_config(crypto_args_t *cargs, return rc; } -typedef struct thr_arg { - crypto_args_t crypto_args; - crypto_alg_config_t *crypto_alg_config; -} thr_arg_t; - static int run_thr_func(void *arg) { - thr_arg_t *thr_args = (thr_arg_t *)arg; - - run_measure_one_config(&thr_args->crypto_args, - thr_args->crypto_alg_config); + run_measure_one_config((test_run_arg_t *)arg); return 0; } @@ -919,13 +1007,14 @@ int main(int argc, char *argv[]) odp_queue_param_t qparam; odp_pool_param_t params; odp_queue_t out_queue = ODP_QUEUE_INVALID; - thr_arg_t thr_arg; + test_run_arg_t test_run_arg; odp_cpumask_t cpumask; char cpumaskstr[ODP_CPUMASK_STR_SIZE]; int num_workers = 1; odph_odpthread_t thr[num_workers]; odp_instance_t instance; - odp_pool_capability_t capa; + odp_pool_capability_t pool_capa; + odp_crypto_capability_t crypto_capa; uint32_t max_seg_len; unsigned i; @@ -943,12 +1032,17 @@ int main(int argc, char *argv[]) /* Init this thread */ odp_init_local(instance, ODP_THREAD_WORKER); - if (odp_pool_capability(&capa)) { + if (odp_crypto_capability(&crypto_capa)) { + app_err("Crypto capability request failed.\n"); + exit(EXIT_FAILURE); + } + + if (odp_pool_capability(&pool_capa)) { app_err("Pool capability request failed.\n"); exit(EXIT_FAILURE); } - max_seg_len = capa.pkt.max_seg_len; + max_seg_len = pool_capa.pkt.max_seg_len; for (i = 0; i < sizeof(payloads) / sizeof(unsigned int); i++) { if (payloads[i] > max_seg_len) @@ -991,9 +1085,6 @@ int main(int argc, char *argv[]) if (cargs.schedule) { printf("Run in async scheduled mode\n"); - - thr_arg.crypto_args = cargs; - thr_arg.crypto_alg_config = cargs.alg_config; num_workers = odp_cpumask_default_worker(&cpumask, num_workers); (void)odp_cpumask_to_str(&cpumask, cpumaskstr, @@ -1012,12 +1103,16 @@ int main(int argc, char *argv[]) memset(thr, 0, sizeof(thr)); + test_run_arg.crypto_args = cargs; + test_run_arg.crypto_alg_config = cargs.alg_config; + test_run_arg.crypto_capa = crypto_capa; + if (cargs.alg_config) { odph_odpthread_params_t thr_params; memset(&thr_params, 0, sizeof(thr_params)); thr_params.start = run_thr_func; - thr_params.arg = &thr_arg; + thr_params.arg = &test_run_arg; thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; @@ -1025,7 +1120,7 @@ int main(int argc, char *argv[]) odph_odpthreads_create(&thr[0], &cpumask, &thr_params); odph_odpthreads_join(&thr[0]); } else { - run_measure_one_config(&cargs, cargs.alg_config); + run_measure_one_config(&test_run_arg); } } else { unsigned int i; @@ -1033,7 +1128,8 @@ int main(int argc, char *argv[]) for (i = 0; i < (sizeof(algs_config) / sizeof(crypto_alg_config_t)); i++) { - run_measure_one_config(&cargs, algs_config + i); + test_run_arg.crypto_alg_config = algs_config + i; + run_measure_one_config(&test_run_arg); } } ----------------------------------------------------------------------- Summary of changes: test/performance/odp_crypto.c | 140 +++++++++++++++++++++++++++++++++++------- 1 file changed, 118 insertions(+), 22 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-9-gacc05760

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 acc05760d5060d1782aa597e44c72ccb9a71b63b (commit) from c440dfceff97526d2763383afd8da064faef3d0d (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 acc05760d5060d1782aa597e44c72ccb9a71b63b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Apr 3 15:48:12 2018 +0300 validation: crypto: zero return code of odp_crypto_op/odp_crypto_op_enq crypto_main test will accept odp_crypto_op/odp_crypto_op_enq returning 0 meaning 0 packets were processed. Instead it should mark test as failedin this case. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3763 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 aa053dd5..676b9b12 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -200,7 +200,7 @@ static int alg_packet_op(odp_packet_t pkt, op_params.hash_result_offset = plaintext_len; rc = odp_crypto_op(&pkt, &out_pkt, &op_params, 1); - if (rc < 0) { + if (rc <= 0) { CU_FAIL("Failed odp_crypto_packet_op()"); return rc; } @@ -261,7 +261,7 @@ static int alg_packet_op_enq(odp_packet_t pkt, op_params.hash_result_offset = plaintext_len; rc = odp_crypto_op_enq(&pkt, &pkt, &op_params, 1); - if (rc < 0) { + if (rc <= 0) { CU_FAIL("Failed odp_crypto_op_enq()"); return rc; } ----------------------------------------------------------------------- Summary of changes: test/validation/api/crypto/odp_crypto_test_inp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

6 years, 9 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp April 2018