git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.13.0.0-61-g05f8f96

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 05f8f96ae606eecfff48e3544885d43b9f541f3c (commit) via e971043e275307634472b35ce394326216c3e301 (commit) from af5205809e3921ea0c4db5771ea1da5d2f0eaaf5 (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 05f8f96ae606eecfff48e3544885d43b9f541f3c Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Feb 14 23:32:00 2017 +0300 travis: catch doxygen errors make doxygen-doc does not return negative code on errors. Do it manually. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index e2937e0..83ec65f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,7 +118,9 @@ script: - ./bootstrap - ./configure - - make doxygen-doc +# doxygen does not trap on warnings, check for them here. + - make doxygen-doc |tee doxygen.log + - fgrep -rvq warning ./doxygen.log - make distcheck - ./bootstrap commit e971043e275307634472b35ce394326216c3e301 Author: Andriy Berestovskyy <Andriy.Berestovskyy(a)cavium.com> Date: Fri Feb 17 11:41:28 2017 +0100 doc: fix k.org links in CONTRIBUTING Fix links for kernel.org code style document. Signed-off-by: Andriy Berestovskyy <Andriy.Berestovskyy(a)cavium.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CONTRIBUTING b/CONTRIBUTING index a81fd8d..ab77fd3 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -13,7 +13,8 @@ the contributing requirements for ODP == New Development -ODP code shall be written with the kernel coding style https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Docume… Coding Style] +ODP code shall be written with the kernel coding style +https://github.com/torvalds/linux/blob/master/Documentation/process/coding-style.rst[Kernel Coding Style] ODP code shall be documented using the doxygen style described in the "Documenting the code" section. @@ -38,7 +39,8 @@ Signed-off-by: tag line a copy of the description follows: Signed-off-by: this is a developer's certification that he or she has the right to submit the patch for inclusion into the [project]. It is an agreement to the Developer's Certificate of Origin, the full text of -which can be found in https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Docume… Patches] +which can be found in +https://github.com/torvalds/linux/blob/master/Documentation/process/submitting-patches.rst[Submitting Patches] Code without a proper signoff cannot be merged into the mainline. ----------------------------------------------------------------------- Summary of changes: .travis.yml | 4 +++- CONTRIBUTING | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch api-next updated. v1.13.0.0-293-gcc9544d

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 via cc9544d7d0289f20bf52636b78ec59b22852816c (commit) via af5205809e3921ea0c4db5771ea1da5d2f0eaaf5 (commit) via 32b94edb4961a3ac1a2e5c90f65ee3f118852151 (commit) via 9420b7953a05f2759524234a26e7e2a774a23769 (commit) via 622103adf9b6d8e73e86c751469ee2523f4dd952 (commit) via 981b778400a726121400dd4535f3cc2006d4ac67 (commit) via 8acb1d0a0c97d6902ad1b9f975facfc9c88f47b5 (commit) via af2c8ff31853d005aaa13247e3a19e5be7138c97 (commit) via 3f9e9b3f17627e35843eef7e3846a75298259b69 (commit) via 6c01f54700e5776d1f1b59517d053f0d9b62a10c (commit) via 96f3c0362b61a415b9ecc319ee3427c8f4b7c081 (commit) via 0ed479bd9d474f1d7588f3370fb306a2e000ff4f (commit) via 483af96a7a14885694496843551ed8fad708192c (commit) via f59d87a65cf1d08f8715a01dceeaf370a29e51f3 (commit) from fbab0b2bab55742ceface59778de8606e3bd062c (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 cc9544d7d0289f20bf52636b78ec59b22852816c Merge: fbab0b2 af52058 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Feb 17 16:10:25 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc test/common_plat/validation/Makefile.inc index 3972ab4,0000000..dda18ad mode 100644,000000..100644 --- a/test/common_plat/validation/Makefile.inc +++ b/test/common_plat/validation/Makefile.inc @@@ -1,16 -1,0 +1,16 @@@ +include $(top_srcdir)/test/Makefile.inc + +COMMON_DIR = $(top_builddir)/test/common_plat/common + +#the following option ensure that option '-I.' is not passed to gcc, +#therefore distinguishing between '#include "X"' and '#include <X>'. +#It allows common filenames (such as 'errno.h') to be used locally. +AUTOMAKE_OPTIONS = nostdinc + +AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common +AM_LDFLAGS += -static + +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la - LIBODP = $(LIB)/libodphelper-linux-generic.la $(LIB)/libodp-linux.la ++LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la ----------------------------------------------------------------------- Summary of changes: .travis.yml | 16 +- configure.ac | 17 +- example/Makefile.inc | 2 +- helper/Makefile.am | 18 +- helper/cuckootable.c | 7 +- helper/hashtable.c | 7 +- .../threads_extn.h => linux/process.h} | 44 +--- helper/include/odp/helper/linux/pthread.h | 66 ++++++ helper/iplookuptable.c | 13 +- helper/lineartable.c | 7 +- helper/{platform/linux-generic => linux}/thread.c | 78 +------ helper/m4/configure.m4 | 8 +- helper/test/.gitignore | 1 + helper/test/Makefile.am | 9 +- helper/test/cuckootable.c | 9 +- helper/test/linux-generic/Makefile.am | 5 - helper/test/linux/Makefile.am | 5 + helper/test/{linux-generic => linux}/process.c | 3 +- .../{linux-generic/thread.c => linux/pthread.c} | 2 +- .../include/odp_classification_inlines.h | 41 +++- test/Makefile.inc | 2 +- test/common_plat/validation/Makefile.inc | 2 +- test/common_plat/validation/api/Makefile.inc | 2 +- .../validation/api/classification/classification.h | 2 + .../api/classification/odp_classification_common.c | 17 +- .../classification/odp_classification_test_pmr.c | 229 +++++++++++++++++++++ .../classification/odp_classification_testsuites.h | 4 +- .../validation/api/crypto/odp_crypto_test_inp.c | 53 ----- test/linux-generic/Makefile.inc | 2 +- 29 files changed, 433 insertions(+), 238 deletions(-) rename helper/include/odp/helper/{platform/linux-generic/threads_extn.h => linux/process.h} (59%) create mode 100644 helper/include/odp/helper/linux/pthread.h rename helper/{platform/linux-generic => linux}/thread.c (70%) delete mode 100644 helper/test/linux-generic/Makefile.am create mode 100644 helper/test/linux/Makefile.am rename helper/test/{linux-generic => linux}/process.c (96%) rename helper/test/{linux-generic/thread.c => linux/pthread.c} (97%) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.13.0.0-59-gaf52058

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 af5205809e3921ea0c4db5771ea1da5d2f0eaaf5 (commit) from 32b94edb4961a3ac1a2e5c90f65ee3f118852151 (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 af5205809e3921ea0c4db5771ea1da5d2f0eaaf5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Feb 3 13:23:59 2017 +0200 helper: linux: renamed threads_extn to linux helpers There's no platform specific helpers. Helpers may depend on Linux and make it easier to do common series of Linux system calls. These kind of helpers are grouped into helper/linux directory. Use --enable-helper-linux configuration option to enable support for Linux helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 6153efd..0280ef1 100644 --- a/configure.ac +++ b/configure.ac @@ -158,18 +158,6 @@ AC_SUBST([with_platform]) AC_SUBST([platform_with_platform], ["platform/${with_platform}"]) ########################################################################## -# Determine which helper platform to build for -########################################################################## -AC_ARG_WITH([helper_platform], - [AS_HELP_STRING([--with-helper_platform=platform], - [select helper platform to be used, default linux-generic])], - [], - [with_helper_platform=${with_platform} - ]) - -AC_SUBST([with_helper_platform]) - -########################################################################## # Run platform specific checks and settings ########################################################################## IMPLEMENTATION_NAME="" @@ -234,7 +222,7 @@ AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) -AM_CONDITIONAL([helper_extn], [test x$helper_extn = xyes ]) +AM_CONDITIONAL([helper_linux], [test x$helper_linux = xyes ]) ########################################################################## # Setup doxygen documentation @@ -367,8 +355,7 @@ AC_MSG_RESULT([ ARCH_DIR ${ARCH_DIR} ARCH_ABI ${ARCH_ABI} with_platform: ${with_platform} - with_helper_platform: ${with_helper_platform} - helper_extn: ${helper_extn} + helper_linux: ${helper_linux} prefix: ${prefix} sysconfdir: ${sysconfdir} libdir: ${libdir} diff --git a/example/Makefile.inc b/example/Makefile.inc index 854e8af..a4f1047 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,6 +1,6 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper-@with_helper_platform@.la +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la AM_CFLAGS += \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --git a/helper/Makefile.am b/helper/Makefile.am index 6b65eb1..5757c7c 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -31,16 +31,18 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/threads.h \ $(srcdir)/include/odp/helper/udp.h -if helper_extn -helperinclude_HEADERS += \ - $(srcdir)/include/odp/helper/platform/@with_helper_platform@/threads_extn.h +if helper_linux +helperlinuxincludedir = $(includedir)/odp/helper/linux +helperlinuxinclude_HEADERS = \ + $(srcdir)/include/odp/helper/linux/pthread.h \ + $(srcdir)/include/odp/helper/linux/process.h endif noinst_HEADERS = \ $(srcdir)/odph_debug.h \ $(srcdir)/odph_list_internal.h -__LIB__libodphelper_@with_platform@_la_SOURCES = \ +__LIB__libodphelper_la_SOURCES = \ eth.c \ ip.c \ chksum.c \ @@ -50,9 +52,9 @@ __LIB__libodphelper_@with_platform@_la_SOURCES = \ iplookuptable.c \ threads.c -if helper_extn -__LIB__libodphelper_@with_platform@_la_SOURCES += \ - platform/@with_helper_platform@/thread.c +if helper_linux +__LIB__libodphelper_la_SOURCES += \ + linux/thread.c endif -lib_LTLIBRARIES = $(LIB)/libodphelper-@with_platform@.la +lib_LTLIBRARIES = $(LIB)/libodphelper.la diff --git a/helper/include/odp/helper/platform/linux-generic/threads_extn.h b/helper/include/odp/helper/linux/process.h similarity index 59% rename from helper/include/odp/helper/platform/linux-generic/threads_extn.h rename to helper/include/odp/helper/linux/process.h index 1d4036d..9d74146 100644 --- a/helper/include/odp/helper/platform/linux-generic/threads_extn.h +++ b/helper/include/odp/helper/linux/process.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2017, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -7,15 +7,15 @@ /** * @file * - * ODP Linux helper extension API + * ODP Linux helper for processes * - * This file is an optional helper to odp.h APIs. These functions are provided - * to ease common setups in a Linux system. User is free to implement the same - * setups in otherways (not via this API). + * This file is not part of ODP APIs, but can be optionally used to ease common + * setups in a Linux system. User is free to implement the same setups in + * otherways (not via this file). */ -#ifndef ODPH_LINUX_EXT_H_ -#define ODPH_LINUX_EXT_H_ +#ifndef ODPH_LINUX_PROCESS_H_ +#define ODPH_LINUX_PROCESS_H_ #include <odp/helper/threads.h> @@ -23,39 +23,11 @@ extern "C" { #endif -/** @addtogroup odph_linux ODPH LINUX +/** @ingroup odph_linux * @{ */ /** - * Creates and launches pthreads - * - * Creates, pins and launches threads to separate CPU's based on the cpumask. - * - * @param[out] pthread_tbl Table of pthread state information records. Table - * must have at least as many entries as there are - * CPUs in the CPU mask. - * @param mask CPU mask - * @param thr_params Linux helper thread parameters - * - * @return Number of threads created - */ -int odph_linux_pthread_create(odph_linux_pthread_t *pthread_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params); - -/** - * Waits pthreads to exit - * - * Returns when all threads have been exit. - * - * @param thread_tbl Thread table - * @param num Number of threads to create - * - */ -void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num); - -/** * Fork a process * * Forks and sets CPU affinity for the child process. Ignores 'start' and 'arg' diff --git a/helper/include/odp/helper/linux/pthread.h b/helper/include/odp/helper/linux/pthread.h new file mode 100644 index 0000000..feeda5e --- /dev/null +++ b/helper/include/odp/helper/linux/pthread.h @@ -0,0 +1,66 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP Linux helper for pthreads + * + * This file is not part of ODP APIs, but can be optionally used to ease common + * setups in a Linux system. User is free to implement the same setups in + * otherways (not via this file). + */ + +#ifndef ODPH_LINUX_PTHREAD_H_ +#define ODPH_LINUX_PTHREAD_H_ + +#include <odp/helper/threads.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** @ingroup odph_linux + * @{ + */ + +/** + * Creates and launches pthreads + * + * Creates, pins and launches threads to separate CPU's based on the cpumask. + * + * @param[out] pthread_tbl Table of pthread state information records. Table + * must have at least as many entries as there are + * CPUs in the CPU mask. + * @param mask CPU mask + * @param thr_params Linux helper thread parameters + * + * @return Number of threads created + */ +int odph_linux_pthread_create(odph_linux_pthread_t *pthread_tbl, + const odp_cpumask_t *mask, + const odph_linux_thr_params_t *thr_params); + +/** + * Waits pthreads to exit + * + * Returns when all threads have been exit. + * + * @param thread_tbl Thread table + * @param num Number of threads to create + * + */ +void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/helper/platform/linux-generic/thread.c b/helper/linux/thread.c similarity index 70% rename from helper/platform/linux-generic/thread.c rename to helper/linux/thread.c index 90fa42a..52d4efc 100644 --- a/helper/platform/linux-generic/thread.c +++ b/helper/linux/thread.c @@ -20,7 +20,8 @@ #include <stdbool.h> #include <odp_api.h> -#include <odp/helper/platform/linux-generic/threads_extn.h> +#include <odp/helper/linux/pthread.h> +#include <odp/helper/linux/process.h> #include "odph_debug.h" static void *_odph_run_start_routine(void *arg) @@ -42,45 +43,6 @@ static void *_odph_run_start_routine(void *arg) return ret_ptr; } -static void *_odph_thread_run_start_routine(void *arg) -{ - int status; - int ret; - odph_odpthread_params_t *thr_params; - - odph_odpthread_start_args_t *start_args = arg; - - thr_params = &start_args->thr_params; - - /* ODP thread local init */ - if (odp_init_local(thr_params->instance, thr_params->thr_type)) { - ODPH_ERR("Local init failed\n"); - if (start_args->linuxtype == ODPTHREAD_PROCESS) - _exit(EXIT_FAILURE); - return (void *)-1; - } - - ODPH_DBG("helper: ODP %s thread started as linux %s. (pid=%d)\n", - thr_params->thr_type == ODP_THREAD_WORKER ? - "worker" : "control", - (start_args->linuxtype == ODPTHREAD_PTHREAD) ? - "pthread" : "process", - (int)getpid()); - - status = thr_params->start(thr_params->arg); - ret = odp_term_local(); - - if (ret < 0) - ODPH_ERR("Local term failed\n"); - - /* for process implementation of odp threads, just return status... */ - if (start_args->linuxtype == ODPTHREAD_PROCESS) - _exit(status); - - /* threads implementation return void* pointers: cast status to that. */ - return (void *)(intptr_t)status; -} - int odph_linux_pthread_create(odph_linux_pthread_t *pthread_tbl, const odp_cpumask_t *mask, const odph_linux_thr_params_t *thr_params) @@ -275,39 +237,3 @@ int odph_linux_process_wait_n(odph_linux_process_t *proc_tbl, int num) return 0; } - -/* - * Create a single ODPthread as a linux thread - */ -static int odph_linux_thread_create(odph_odpthread_t *thread_tbl, - int cpu, - const odph_odpthread_params_t *thr_params) -{ - int ret; - cpu_set_t cpu_set; - - CPU_ZERO(&cpu_set); - CPU_SET(cpu, &cpu_set); - - pthread_attr_init(&thread_tbl->thread.attr); - - thread_tbl->cpu = cpu; - - pthread_attr_setaffinity_np(&thread_tbl->thread.attr, - sizeof(cpu_set_t), &cpu_set); - - thread_tbl->start_args.thr_params = *thr_params; /* copy */ - thread_tbl->start_args.linuxtype = ODPTHREAD_PTHREAD; - - ret = pthread_create(&thread_tbl->thread.thread_id, - &thread_tbl->thread.attr, - _odph_thread_run_start_routine, - &thread_tbl->start_args); - if (ret != 0) { - ODPH_ERR("Failed to start thread on cpu #%d\n", cpu); - thread_tbl->start_args.linuxtype = ODPTHREAD_NOT_STARTED; - return ret; - } - - return 0; -} diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 38c95d9..343f5e3 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -12,11 +12,11 @@ AC_ARG_ENABLE([test-helper], # Enable/disable helper-ext # platform specific non portable extensions ########################################################################## -helper_extn=no -AC_ARG_ENABLE([helper-extn], - [ --enable-helper-extn build helper platform extensions (not portable)], +helper_linux=no +AC_ARG_ENABLE([helper-linux], + [ --enable-helper-linux build helper platform extensions (not portable)], [if test "x$enableval" = "xyes"; then - helper_extn=yes + helper_linux=yes fi]) AC_CONFIG_FILES([helper/Makefile diff --git a/helper/test/.gitignore b/helper/test/.gitignore index e5b6a0f..1a81e00 100644 --- a/helper/test/.gitignore +++ b/helper/test/.gitignore @@ -8,3 +8,4 @@ parse process table thread +pthread diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 1337657..beef919 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -5,12 +5,11 @@ LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/helper/platform/@with_helper_platform@/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/platform/@with_platform@/include \ @@ -32,9 +31,9 @@ EXECUTABLES = chksum$(EXEEXT) \ #They are a convenience to app writers who have chosen to #restrict their application to Linux. -if helper_extn -EXECUTABLES += @with_helper_platform@/thread$(EXEEXT) \ - @with_helper_platform@/process$(EXEEXT) +if helper_linux +EXECUTABLES += linux/pthread$(EXEEXT) \ + linux/process$(EXEEXT) endif COMPILE_ONLY = odpthreads diff --git a/helper/test/linux-generic/Makefile.am b/helper/test/linux-generic/Makefile.am deleted file mode 100644 index 28d54a8..0000000 --- a/helper/test/linux-generic/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -thread_LDADD = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la -dist_thread_SOURCES = thread.c -dist_process_SOURCES = process.c -process_LDADD = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la diff --git a/helper/test/linux/Makefile.am b/helper/test/linux/Makefile.am new file mode 100644 index 0000000..f95e04d --- /dev/null +++ b/helper/test/linux/Makefile.am @@ -0,0 +1,5 @@ + +thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la +dist_thread_SOURCES = pthread.c +dist_process_SOURCES = process.c +process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la diff --git a/helper/test/linux-generic/process.c b/helper/test/linux/process.c similarity index 96% rename from helper/test/linux-generic/process.c rename to helper/test/linux/process.c index f9bdc3e..e08ef86 100644 --- a/helper/test/linux-generic/process.c +++ b/helper/test/linux/process.c @@ -6,7 +6,8 @@ #include <odph_debug.h> #include <odp_api.h> -#include <odp/helper/platform/linux-generic/threads_extn.h> +#include <odp/helper/linux/pthread.h> +#include <odp/helper/linux/process.h> #define NUMBER_WORKERS 16 /* 0 = max */ diff --git a/helper/test/linux-generic/thread.c b/helper/test/linux/pthread.c similarity index 97% rename from helper/test/linux-generic/thread.c rename to helper/test/linux/pthread.c index 919f00e..2bec0d1 100644 --- a/helper/test/linux-generic/thread.c +++ b/helper/test/linux/pthread.c @@ -6,7 +6,7 @@ #include <odph_debug.h> #include <odp_api.h> -#include <odp/helper/platform/linux-generic/threads_extn.h> +#include <odp/helper/linux/pthread.h> #define NUMBER_WORKERS 16 static void *worker_fn(void *arg ODPH_UNUSED) diff --git a/test/Makefile.inc b/test/Makefile.inc index 898249d..1ef2a92 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -4,7 +4,7 @@ LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index a0afd26..dda18ad 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -13,4 +13,4 @@ AM_LDFLAGS += -static LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index 373157b..198087f 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -6,7 +6,7 @@ AM_LDFLAGS += -static LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = \ ----------------------------------------------------------------------- Summary of changes: configure.ac | 17 +---- example/Makefile.inc | 2 +- helper/Makefile.am | 18 ++--- .../threads_extn.h => linux/process.h} | 44 +++--------- helper/include/odp/helper/linux/pthread.h | 66 ++++++++++++++++++ helper/{platform/linux-generic => linux}/thread.c | 78 +--------------------- helper/m4/configure.m4 | 8 +-- helper/test/.gitignore | 1 + helper/test/Makefile.am | 9 ++- helper/test/linux-generic/Makefile.am | 5 -- helper/test/linux/Makefile.am | 5 ++ helper/test/{linux-generic => linux}/process.c | 3 +- .../{linux-generic/thread.c => linux/pthread.c} | 2 +- test/Makefile.inc | 2 +- test/common_plat/validation/api/Makefile.inc | 2 +- test/linux-generic/Makefile.inc | 2 +- 16 files changed, 109 insertions(+), 155 deletions(-) rename helper/include/odp/helper/{platform/linux-generic/threads_extn.h => linux/process.h} (59%) create mode 100644 helper/include/odp/helper/linux/pthread.h rename helper/{platform/linux-generic => linux}/thread.c (70%) delete mode 100644 helper/test/linux-generic/Makefile.am create mode 100644 helper/test/linux/Makefile.am rename helper/test/{linux-generic => linux}/process.c (96%) rename helper/test/{linux-generic/thread.c => linux/pthread.c} (97%) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.13.0.0-58-g32b94ed

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 32b94edb4961a3ac1a2e5c90f65ee3f118852151 (commit) via 9420b7953a05f2759524234a26e7e2a774a23769 (commit) via 622103adf9b6d8e73e86c751469ee2523f4dd952 (commit) from 981b778400a726121400dd4535f3cc2006d4ac67 (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 32b94edb4961a3ac1a2e5c90f65ee3f118852151 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Feb 14 23:31:59 2017 +0300 travis: clang 3.8 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 8a99005..e2937e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,8 +46,11 @@ matrix: - compiler: clang addons: apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.8 packages: - - clang + - clang-3.8 before_install: - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages @@ -60,6 +63,7 @@ before_install: - sudo pip install coverage - gem install asciidoctor - PATH=${PATH//:\.\/node_modules\/\.bin/} + - if [ "$CC" = "clang" ]; then export CXX="clang++-3.8" CC="clang-3.8" LD="clang-3.8"; fi # Install cunit for the validation tests because distro version is too old and fails C99 compile - sudo apt-get remove libcunit1-dev libcunit1 commit 9420b7953a05f2759524234a26e7e2a774a23769 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Feb 14 23:31:58 2017 +0300 travis: switch to ubuntu trusty ubuntu trusty has updated doxygen 1.8.4 which is the same stable version 1.8 which is described in DEPENDANCIES file. Now doxygen do not generate any warnings. Compiler version stays the same 4.8 for gcc. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 66248b4..8a99005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ language: c sudo: required +dist: trusty env: global: # COVERITY_SCAN_TOKEN @@ -34,13 +35,13 @@ env: matrix: include: - - compiler: gcc-4.8 + - compiler: gcc addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-4.8 + - gcc env: MY_CF="-O0 -coverage" MY_LDF="--coverage" DOCOV=1 - compiler: clang addons: @@ -61,6 +62,7 @@ before_install: - PATH=${PATH//:\.\/node_modules\/\.bin/} # Install cunit for the validation tests because distro version is too old and fails C99 compile + - sudo apt-get remove libcunit1-dev libcunit1 - export CUNIT_VERSION=2.1-3 - curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit… - tar -jxf *.bz2 @@ -124,7 +126,7 @@ script: - sudo rm -rf $KSRC after_success: - - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov-4.8 {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy; fi + - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy; fi addons: coverity_scan: commit 622103adf9b6d8e73e86c751469ee2523f4dd952 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Feb 15 20:19:20 2017 +0300 travis: mirror cunit on github because of cunit fails to download from sourceforge.net it's reasonable place source to github. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 9544ec8..66248b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ before_install: # Install cunit for the validation tests because distro version is too old and fails C99 compile - export CUNIT_VERSION=2.1-3 - - curl -sSOL http://sourceforge.net/projects/cunit/files/CUnit/${CUNIT_VERSION}/CUnit-${… + - curl -sSOL https://github.com/Linaro/libcunit/releases/download/${CUNIT_VERSION}/CUnit… - tar -jxf *.bz2 - cd CUnit* - ./bootstrap ----------------------------------------------------------------------- Summary of changes: .travis.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.13.0.0-55-g981b778

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 981b778400a726121400dd4535f3cc2006d4ac67 (commit) via 8acb1d0a0c97d6902ad1b9f975facfc9c88f47b5 (commit) via af2c8ff31853d005aaa13247e3a19e5be7138c97 (commit) via 3f9e9b3f17627e35843eef7e3846a75298259b69 (commit) from 6c01f54700e5776d1f1b59517d053f0d9b62a10c (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 981b778400a726121400dd4535f3cc2006d4ac67 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 10 14:09:16 2017 +0200 validation: crypto: check auth options support before running tests Skip running test if authentication options are not supported. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Nikhil Agarwal <Nikhil.agarwal(a)linaro.org> Reviewed-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index 426f842..43ddb2f 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -21,6 +21,22 @@ struct suite_context_s { static struct suite_context_s suite_context; +static const char *auth_alg_name(odp_auth_alg_t auth) +{ + switch (auth) { + case ODP_AUTH_ALG_NULL: + return "ODP_AUTH_ALG_NULL"; + case ODP_AUTH_ALG_MD5_HMAC: + return "ODP_AUTH_ALG_MD5_HMAC"; + case ODP_AUTH_ALG_SHA256_HMAC: + return "ODP_AUTH_ALG_SHA256_HMAC"; + case ODP_AUTH_ALG_AES_GCM: + return "ODP_AUTH_ALG_AES_GCM"; + default: + return "Unknown"; + } +} + static const char *cipher_alg_name(odp_cipher_alg_t cipher) { switch (cipher) { @@ -365,6 +381,41 @@ static int check_cipher_options(odp_cipher_alg_t cipher, uint32_t key_len, return 1; } +/** + * Check if given authentication options are supported + * + * @param auth Authentication algorithm + * @param key_len Key length + * @param digest_len Digest length + * + * @retval non-zero if both authentication options are supported + * @retval 0 if both options are not supported + */ +static int check_auth_options(odp_auth_alg_t auth, uint32_t key_len, + uint32_t digest_len) +{ + int i; + int num; + odp_crypto_auth_capability_t capa[MAX_ALG_CAPA]; + + num = odp_crypto_auth_capability(auth, capa, MAX_ALG_CAPA); + CU_ASSERT_FATAL(num >= 1); + + for (i = 0; i < num; i++) { + if (key_len == capa[i].key_len && + digest_len == capa[i].digest_len) + break; + } + + if (i == num) { + printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " + "digest_len=%" PRIu32 "\n", auth_alg_name(auth), key_len, + digest_len); + return 0; + } + return 1; +} + static int check_alg_3des_cbc(void) { return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); @@ -546,6 +597,9 @@ void crypto_test_enc_alg_aes128_gcm(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue; alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -586,6 +640,9 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue; alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -629,6 +686,9 @@ void crypto_test_dec_alg_aes128_gcm(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue; alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -670,6 +730,9 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue; alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -870,6 +933,10 @@ void crypto_test_alg_hmac_md5(void) auth_key.data = hmac_md5_reference_key[i]; auth_key.length = sizeof(hmac_md5_reference_key[i]); + if (!check_auth_options(ODP_AUTH_ALG_MD5_HMAC, auth_key.length, + HMAC_MD5_96_CHECK_LEN)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, iv, @@ -913,6 +980,11 @@ void crypto_test_alg_hmac_sha256(void) auth_key.data = hmac_sha256_reference_key[i]; auth_key.length = sizeof(hmac_sha256_reference_key[i]); + if (!check_auth_options(ODP_AUTH_ALG_SHA256_HMAC, + auth_key.length, + HMAC_SHA256_128_CHECK_LEN)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, iv, commit 8acb1d0a0c97d6902ad1b9f975facfc9c88f47b5 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 10 14:09:15 2017 +0200 validation: crypto: check cipher options support before running tests Skip running test if cipher options are not supported. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Nikhil Agarwal <Nikhil.agarwal(a)linaro.org> Reviewed-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index d96fa87..426f842 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -21,6 +21,24 @@ struct suite_context_s { static struct suite_context_s suite_context; +static const char *cipher_alg_name(odp_cipher_alg_t cipher) +{ + switch (cipher) { + case ODP_CIPHER_ALG_NULL: + return "ODP_CIPHER_ALG_NULL"; + case ODP_CIPHER_ALG_DES: + return "ODP_CIPHER_ALG_DES"; + case ODP_CIPHER_ALG_3DES_CBC: + return "ODP_CIPHER_ALG_3DES_CBC"; + case ODP_CIPHER_ALG_AES_CBC: + return "ODP_CIPHER_ALG_AES_CBC"; + case ODP_CIPHER_ALG_AES_GCM: + return "ODP_CIPHER_ALG_AES_GCM"; + default: + return "Unknown"; + } +} + /* Basic algorithm run function for async inplace mode. * Creates a session from input parameters and runs one operation * on input_vec. Checks the output of the crypto operation against @@ -312,6 +330,41 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) return ODP_TEST_ACTIVE; } +/** + * Check if given cipher options are supported + * + * @param cipher Cipher algorithm + * @param key_len Key length + * @param iv_len IV length + * + * @retval non-zero if both cipher options are supported + * @retval 0 if both options are not supported + */ +static int check_cipher_options(odp_cipher_alg_t cipher, uint32_t key_len, + uint32_t iv_len) +{ + int i; + int num; + odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; + + num = odp_crypto_cipher_capability(cipher, cipher_capa, MAX_ALG_CAPA); + CU_ASSERT_FATAL(num >= 1); + + for (i = 0; i < num; i++) { + if (key_len == cipher_capa[i].key_len && + iv_len == cipher_capa[i].iv_len) + break; + } + + if (i == num) { + printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " + "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher), key_len, + iv_len); + return 0; + } + return 1; +} + static int check_alg_3des_cbc(void) { return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); @@ -336,6 +389,10 @@ void crypto_test_enc_alg_3des_cbc(void) iv.data = tdes_cbc_reference_iv[i]; iv.length = sizeof(tdes_cbc_reference_iv[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -367,6 +424,10 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -402,6 +463,10 @@ void crypto_test_dec_alg_3des_cbc(void) iv.data = tdes_cbc_reference_iv[i]; iv.length = sizeof(tdes_cbc_reference_iv[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -435,6 +500,10 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void) cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -474,6 +543,10 @@ void crypto_test_enc_alg_aes128_gcm(void) iv.data = aes128_gcm_reference_iv[i]; iv.length = sizeof(aes128_gcm_reference_iv[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -510,6 +583,10 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void) cipher_key.data = aes128_gcm_reference_key[i]; cipher_key.length = sizeof(aes128_gcm_reference_key[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -549,6 +626,10 @@ void crypto_test_dec_alg_aes128_gcm(void) iv.data = aes128_gcm_reference_iv[i]; iv.length = sizeof(aes128_gcm_reference_iv[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -586,6 +667,10 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void) cipher_key.data = aes128_gcm_reference_key[i]; cipher_key.length = sizeof(aes128_gcm_reference_key[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -629,6 +714,10 @@ void crypto_test_enc_alg_aes128_cbc(void) iv.data = aes128_cbc_reference_iv[i]; iv.length = sizeof(aes128_cbc_reference_iv[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, iv, @@ -660,6 +749,10 @@ void crypto_test_enc_alg_aes128_cbc_ovr_iv(void) cipher_key.data = aes128_cbc_reference_key[i]; cipher_key.length = sizeof(aes128_cbc_reference_key[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, iv, @@ -695,6 +788,10 @@ void crypto_test_dec_alg_aes128_cbc(void) iv.data = aes128_cbc_reference_iv[i]; iv.length = sizeof(aes128_cbc_reference_iv[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, iv, @@ -728,6 +825,10 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void) cipher_key.data = aes128_cbc_reference_key[i]; cipher_key.length = sizeof(aes128_cbc_reference_key[i]); + if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, iv, commit af2c8ff31853d005aaa13247e3a19e5be7138c97 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 10 14:09:14 2017 +0200 validation: crypto: check cipher/auth algorithm support before use Skip test if selected cipher/authentication algorithms are not supported. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Nikhil Agarwal <Nikhil.agarwal(a)linaro.org> Reviewed-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c index 2089016..e7c2bf3 100644 --- a/test/common_plat/validation/api/crypto/crypto.c +++ b/test/common_plat/validation/api/crypto/crypto.c @@ -13,8 +13,10 @@ #define PKT_POOL_LEN (1 * 1024) odp_suiteinfo_t crypto_suites[] = { - {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, NULL, crypto_suite}, - {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, NULL, crypto_suite}, + {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, crypto_suite_term, + crypto_suite}, + {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, crypto_suite_term, + crypto_suite}, ODP_SUITE_INFO_NULL, }; diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index db58344..d96fa87 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -243,6 +243,80 @@ cleanup: odp_packet_free(pkt); } +/** + * Check if given cipher and authentication algorithms are supported + * + * @param cipher Cipher algorithm + * @param auth Authentication algorithm + * + * @retval ODP_TEST_ACTIVE when both algorithms are supported + * @retval ODP_TEST_INACTIVE when either algorithm is not supported + */ +static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) +{ + odp_crypto_capability_t capability; + + if (odp_crypto_capability(&capability)) + return ODP_TEST_INACTIVE; + + /* Cipher algorithms */ + switch (cipher) { + case ODP_CIPHER_ALG_NULL: + if (!capability.ciphers.bit.null) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_DES: + if (!capability.ciphers.bit.des) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_3DES_CBC: + if (!capability.ciphers.bit.trides_cbc) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_AES_CBC: + if (!capability.ciphers.bit.aes_cbc) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_AES_GCM: + if (!capability.ciphers.bit.aes_gcm) + return ODP_TEST_INACTIVE; + break; + default: + fprintf(stderr, "Unsupported cipher algorithm\n"); + return ODP_TEST_INACTIVE; + } + + /* Authentication algorithms */ + switch (auth) { + case ODP_AUTH_ALG_NULL: + if (!capability.auths.bit.null) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_MD5_HMAC: + if (!capability.auths.bit.md5_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA256_HMAC: + if (!capability.auths.bit.sha256_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_AES_GCM: + if (!capability.auths.bit.aes_gcm) + return ODP_TEST_INACTIVE; + break; + default: + fprintf(stderr, "Unsupported authentication algorithm\n"); + return ODP_TEST_INACTIVE; + } + + return ODP_TEST_ACTIVE; +} + +static int check_alg_3des_cbc(void) +{ + return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); +} + /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for 3DES_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the @@ -376,6 +450,11 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void) } } +static int check_alg_aes_gcm(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_GCM, ODP_AUTH_ALG_AES_GCM); +} + /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the @@ -526,6 +605,11 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void) } } +static int check_alg_aes_cbc(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_CBC, ODP_AUTH_ALG_NULL); +} + /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the @@ -659,6 +743,11 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void) } } +static int check_alg_hmac_md5(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC); +} + /* This test verifies the correctness of HMAC_MD5 digest operation. * The output check length is truncated to 12 bytes (96 bits) as * returned by the crypto operation API call. @@ -696,6 +785,11 @@ void crypto_test_alg_hmac_md5(void) } } +static int check_alg_hmac_sha256(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA256_HMAC); +} + /* This test verifies the correctness of HMAC_MD5 digest operation. * The output check length is truncated to 12 bytes (96 bits) as * returned by the crypto operation API call. @@ -759,19 +853,51 @@ int crypto_suite_async_init(void) } odp_testinfo_t crypto_suite[] = { - ODP_TEST_INFO(crypto_test_enc_alg_3des_cbc), - ODP_TEST_INFO(crypto_test_dec_alg_3des_cbc), - ODP_TEST_INFO(crypto_test_enc_alg_3des_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_dec_alg_3des_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_cbc), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_cbc), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_gcm), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_gcm_ovr_iv), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_gcm), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_gcm_ovr_iv), - ODP_TEST_INFO(crypto_test_alg_hmac_md5), - ODP_TEST_INFO(crypto_test_alg_hmac_sha256), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc_ovr_iv, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc_ovr_iv, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_cbc, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_cbc, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_cbc_ovr_iv, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_cbc_ovr_iv, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_gcm, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_gcm_ovr_iv, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_gcm, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_gcm_ovr_iv, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_alg_hmac_md5, + check_alg_hmac_md5), + ODP_TEST_INFO_CONDITIONAL(crypto_test_alg_hmac_sha256, + check_alg_hmac_sha256), ODP_TEST_INFO_NULL, }; + +int crypto_suite_term(void) +{ + int i; + int first = 1; + + for (i = 0; crypto_suite[i].pName; i++) { + if (crypto_suite[i].check_active && + crypto_suite[i].check_active() == ODP_TEST_INACTIVE) { + if (first) { + first = 0; + printf("\n\n Inactive tests:\n"); + } + printf(" %s\n", crypto_suite[i].pName); + } + } + return 0; +} diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h index 8bda344..0f69337 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h @@ -17,5 +17,6 @@ extern odp_testinfo_t crypto_suite[]; int crypto_suite_sync_init(void); int crypto_suite_async_init(void); +int crypto_suite_term(void); #endif commit 3f9e9b3f17627e35843eef7e3846a75298259b69 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 10 14:09:13 2017 +0200 validation: crypto: fix hw cipher/auth algorithm check Some algorithms may be implemented using hardware and some using software. All supported algorithms should be set in capacity.auths /capacity.ciphers independent of implementation types. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Nikhil Agarwal <Nikhil.agarwal(a)linaro.org> Reviewed-by: Balakrishna Garapati <balakrishna.garapati(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index de9d6e4..db58344 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -47,7 +47,7 @@ static void alg_test(odp_crypto_op_t op, uint32_t digest_len) { odp_crypto_session_t session; - odp_crypto_capability_t capability; + odp_crypto_capability_t capa; int rc; odp_crypto_ses_create_err_t status; odp_bool_t posted; @@ -63,50 +63,43 @@ static void alg_test(odp_crypto_op_t op, int num, i; int found; - rc = odp_crypto_capability(&capability); + rc = odp_crypto_capability(&capa); CU_ASSERT(!rc); - if (capability.hw_ciphers.all_bits) { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.hw_ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.hw_ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.hw_ciphers.bit.aes_gcm)) - rc = -1; - } else { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.ciphers.bit.aes_gcm)) - rc = -1; - } + if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && + !(capa.ciphers.bit.trides_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && + !(capa.ciphers.bit.aes_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && + !(capa.ciphers.bit.aes_gcm)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_DES && + !(capa.ciphers.bit.des)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_NULL && + !(capa.ciphers.bit.null)) + rc = -1; CU_ASSERT(!rc); - - if (capability.hw_auths.all_bits) { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.hw_auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.hw_auths.bit.null)) - rc = -1; - } else { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.auths.bit.null)) - rc = -1; - } + CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); + + if (auth_alg == ODP_AUTH_ALG_AES_GCM && + !(capa.auths.bit.aes_gcm)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && + !(capa.auths.bit.md5_hmac)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_NULL && + !(capa.auths.bit.null)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && + !(capa.auths.bit.sha256_hmac)) + rc = -1; CU_ASSERT(!rc); + CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, MAX_ALG_CAPA); ----------------------------------------------------------------------- Summary of changes: test/common_plat/validation/api/crypto/crypto.c | 6 +- .../validation/api/crypto/odp_crypto_test_inp.c | 398 ++++++++++++++++++--- .../validation/api/crypto/odp_crypto_test_inp.h | 1 + 3 files changed, 350 insertions(+), 55 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.13.0.0-51-g6c01f54

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 6c01f54700e5776d1f1b59517d053f0d9b62a10c (commit) via 96f3c0362b61a415b9ecc319ee3427c8f4b7c081 (commit) from 0ed479bd9d474f1d7588f3370fb306a2e000ff4f (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 6c01f54700e5776d1f1b59517d053f0d9b62a10c Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Feb 9 14:32:36 2017 +0530 validation: classification: add test case for outer and inner vlan id Adds test case for outer and inner vlan id packet matching rule Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/api/classification/classification.h b/test/common_plat/validation/api/classification/classification.h index 0192e24..66e3208 100644 --- a/test/common_plat/validation/api/classification/classification.h +++ b/test/common_plat/validation/api/classification/classification.h @@ -98,6 +98,8 @@ void classification_test_pmr_term_udp_sport(void); void classification_test_pmr_term_ipproto(void); void classification_test_pmr_term_dmac(void); void classification_test_pmr_term_packet_len(void); +void classification_test_pmr_term_vlan_id_0(void); +void classification_test_pmr_term_vlan_id_x(void); /* test arrays: */ extern odp_testinfo_t classification_suite_basic[]; diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c index 0ca9083..3b379c1 100644 --- a/test/common_plat/validation/api/classification/odp_classification_common.c +++ b/test/common_plat/validation/api/classification/odp_classification_common.c @@ -245,6 +245,8 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) uint16_t l3_hdr_len = 0; uint16_t l4_hdr_len = 0; uint16_t eth_type; + odp_u16be_t *vlan_type; + odph_vlanhdr_t *vlan_hdr; /* 48 bit ethernet address needs to be left shifted for proper value after changing to be*/ @@ -256,6 +258,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) seqno = odp_atomic_fetch_inc_u32(pkt_info.seq); vlan_hdr_len = pkt_info.vlan ? ODPH_VLANHDR_LEN : 0; + vlan_hdr_len = pkt_info.vlan_qinq ? 2 * vlan_hdr_len : vlan_hdr_len; l3_hdr_len = pkt_info.ipv6 ? ODPH_IPV6HDR_LEN : ODPH_IPV4HDR_LEN; l4_hdr_len = pkt_info.udp ? ODPH_UDPHDR_LEN : ODPH_TCPHDR_LEN; eth_type = pkt_info.ipv6 ? ODPH_ETHTYPE_IPV6 : ODPH_ETHTYPE_IPV4; @@ -275,12 +278,20 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) ethhdr = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); memcpy(ethhdr->src.addr, &src_mac, ODPH_ETHADDR_LEN); memcpy(ethhdr->dst.addr, &dst_mac_be, ODPH_ETHADDR_LEN); + vlan_type = (odp_u16be_t *)&ethhdr->type; + vlan_hdr = (odph_vlanhdr_t *)(ethhdr + 1); + + if (pkt_info.vlan_qinq) { + odp_packet_has_vlan_qinq_set(pkt, 1); + *vlan_type = odp_cpu_to_be_16(ODPH_ETHTYPE_VLAN_OUTER); + vlan_hdr->tci = odp_cpu_to_be_16(0); + vlan_type = (uint16_t *)&vlan_hdr->type; + vlan_hdr++; + } if (pkt_info.vlan) { /* Default vlan header */ - odph_vlanhdr_t *vlan_hdr; odp_packet_has_vlan_set(pkt, 1); - ethhdr->type = odp_cpu_to_be_16(ODPH_ETHTYPE_VLAN); - vlan_hdr = (odph_vlanhdr_t *)(ethhdr + 1); + *vlan_type = odp_cpu_to_be_16(ODPH_ETHTYPE_VLAN); vlan_hdr->tci = odp_cpu_to_be_16(0); vlan_hdr->type = odp_cpu_to_be_16(eth_type); } else { diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c index c714549..d01f716 100644 --- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c +++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c @@ -870,6 +870,233 @@ void classification_test_pmr_term_packet_len(void) odp_pktio_close(pktio); } +void classification_test_pmr_term_vlan_id_0(void) +{ + odp_packet_t pkt; + uint32_t seqno; + uint16_t val; + uint16_t mask; + int retval; + odp_pktio_t pktio; + odp_queue_t queue; + odp_queue_t retqueue; + odp_queue_t default_queue; + odp_cos_t default_cos; + odp_pool_t default_pool; + odp_pool_t pool; + odp_pool_t recvpool; + odp_pmr_t pmr; + odp_cos_t cos; + char cosname[ODP_COS_NAME_LEN]; + odp_cls_cos_param_t cls_param; + odp_pmr_param_t pmr_param; + odph_ethhdr_t *eth; + odph_vlanhdr_t *vlan_0; + cls_packet_info_t pkt_info; + + val = 1024; + mask = 0xff00; + seqno = 0; + + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); + retval = start_pktio(pktio); + CU_ASSERT(retval == 0); + + configure_default_cos(pktio, &default_cos, + &default_queue, &default_pool); + + queue = queue_create("vlan_id_0", true); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + pool = pool_create("vlan_id_0"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + sprintf(cosname, "vlan_id_0"); + odp_cls_cos_param_init(&cls_param); + cls_param.pool = pool; + cls_param.queue = queue; + cls_param.drop_policy = ODP_COS_DROP_POOL; + + cos = odp_cls_cos_create(cosname, &cls_param); + CU_ASSERT_FATAL(cos != ODP_COS_INVALID); + + odp_cls_pmr_param_init(&pmr_param); + pmr_param.term = ODP_PMR_VLAN_ID_0; + pmr_param.match.value = &val; + pmr_param.match.mask = &mask; + pmr_param.val_sz = sizeof(val); + + pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); + CU_ASSERT(pmr != ODP_PMR_INVAL); + + /* create packet of payload length 1024 */ + pkt_info = default_pkt_info; + pkt_info.vlan = true; + pkt_info.vlan_qinq = true; + pkt = create_packet(pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + vlan_0 = (odph_vlanhdr_t *)(eth + 1); + vlan_0->tci = odp_cpu_to_be_16(1024); + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + recvpool = odp_packet_pool(pkt); + CU_ASSERT(recvpool == pool); + CU_ASSERT(retqueue == queue); + odp_packet_free(pkt); + + /* Other packets delivered to default queue */ + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + recvpool = odp_packet_pool(pkt); + CU_ASSERT(recvpool == default_pool); + CU_ASSERT(retqueue == default_queue); + + odp_cos_destroy(cos); + odp_cos_destroy(default_cos); + odp_cls_pmr_destroy(pmr); + odp_packet_free(pkt); + stop_pktio(pktio); + odp_pool_destroy(default_pool); + odp_pool_destroy(pool); + odp_queue_destroy(queue); + odp_queue_destroy(default_queue); + odp_pktio_close(pktio); +} + +void classification_test_pmr_term_vlan_id_x(void) +{ + odp_packet_t pkt; + uint32_t seqno; + uint16_t val; + uint16_t mask; + int retval; + odp_pktio_t pktio; + odp_queue_t queue; + odp_queue_t retqueue; + odp_queue_t default_queue; + odp_cos_t default_cos; + odp_pool_t default_pool; + odp_pool_t pool; + odp_pool_t recvpool; + odp_pmr_t pmr; + odp_cos_t cos; + char cosname[ODP_COS_NAME_LEN]; + odp_cls_cos_param_t cls_param; + odp_pmr_param_t pmr_param; + odph_ethhdr_t *eth; + odph_vlanhdr_t *vlan_x; + cls_packet_info_t pkt_info; + + val = 1024; + mask = 0xff00; + seqno = 0; + + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool); + CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); + retval = start_pktio(pktio); + CU_ASSERT(retval == 0); + + configure_default_cos(pktio, &default_cos, + &default_queue, &default_pool); + + queue = queue_create("vlan_id_x", true); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + pool = pool_create("vlan_id_x"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + sprintf(cosname, "vlan_id_x"); + odp_cls_cos_param_init(&cls_param); + cls_param.pool = pool; + cls_param.queue = queue; + cls_param.drop_policy = ODP_COS_DROP_POOL; + + cos = odp_cls_cos_create(cosname, &cls_param); + CU_ASSERT_FATAL(cos != ODP_COS_INVALID); + + odp_cls_pmr_param_init(&pmr_param); + pmr_param.term = ODP_PMR_VLAN_ID_X; + pmr_param.match.value = &val; + pmr_param.match.mask = &mask; + pmr_param.val_sz = sizeof(val); + + pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); + CU_ASSERT(pmr != ODP_PMR_INVAL); + + /* create packet of payload length 1024 */ + pkt_info = default_pkt_info; + pkt_info.vlan = true; + pkt_info.vlan_qinq = true; + pkt = create_packet(pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + vlan_x = (odph_vlanhdr_t *)(eth + 1); + vlan_x++; + vlan_x->tci = odp_cpu_to_be_16(1024); + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + recvpool = odp_packet_pool(pkt); + CU_ASSERT(recvpool == pool); + CU_ASSERT(retqueue == queue); + odp_packet_free(pkt); + + /* Other packets delivered to default queue */ + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + recvpool = odp_packet_pool(pkt); + CU_ASSERT(recvpool == default_pool); + CU_ASSERT(retqueue == default_queue); + + odp_cos_destroy(cos); + odp_cos_destroy(default_cos); + odp_cls_pmr_destroy(pmr); + odp_packet_free(pkt); + stop_pktio(pktio); + odp_pool_destroy(default_pool); + odp_pool_destroy(pool); + odp_queue_destroy(queue); + odp_queue_destroy(default_queue); + odp_pktio_close(pktio); +} + static void classification_test_pmr_pool_set(void) { odp_packet_t pkt; @@ -1407,5 +1634,7 @@ odp_testinfo_t classification_suite_pmr[] = { ODP_TEST_INFO(classification_test_pmr_term_ipv6saddr), ODP_TEST_INFO(classification_test_pmr_term_ipv6daddr), ODP_TEST_INFO(classification_test_pmr_term_packet_len), + ODP_TEST_INFO(classification_test_pmr_term_vlan_id_0), + ODP_TEST_INFO(classification_test_pmr_term_vlan_id_x), ODP_TEST_INFO_NULL, }; diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h index d5ffef7..d296923 100644 --- a/test/common_plat/validation/api/classification/odp_classification_testsuites.h +++ b/test/common_plat/validation/api/classification/odp_classification_testsuites.h @@ -15,6 +15,7 @@ typedef struct cls_packet_info { odp_pool_t pool; bool vlan; + bool vlan_qinq; odp_atomic_u32_t *seq; bool udp; bool ipv6; @@ -32,9 +33,6 @@ int classification_suite_pmr_term(void); int classification_suite_pmr_init(void); odp_packet_t create_packet(cls_packet_info_t pkt_info); -odp_packet_t create_packet_len(odp_pool_t pool, bool vlan, - odp_atomic_u32_t *seq, bool flag_udp, - bool ipv4, uint16_t len); int cls_pkt_set_seq(odp_packet_t pkt); uint32_t cls_pkt_get_seq(odp_packet_t pkt); odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool); commit 96f3c0362b61a415b9ecc319ee3427c8f4b7c081 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Feb 9 14:32:35 2017 +0530 linux-generic: classification: implement vlan id packet matching rule Add implementation for outer and inner vlan ID packet matching rule Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-and-tested-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_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h index e6f9be9..c9517d6 100644 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ b/platform/linux-generic/include/odp_classification_inlines.h @@ -231,11 +231,26 @@ static inline int verify_pmr_ipv6_daddr(const uint8_t *pkt_addr, return 0; } -static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr ODP_UNUSED, - odp_packet_hdr_t *pkt_hdr ODP_UNUSED, - pmr_term_value_t *term_value ODP_UNUSED) +static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) { - ODP_UNIMPLEMENTED(); + const _odp_ethhdr_t *eth; + const _odp_vlanhdr_t *vlan; + uint16_t tci; + uint16_t vlan_id; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + tci = odp_be_to_cpu_16(vlan->tci); + vlan_id = tci & 0x0fff; + + if (term_value->match.value == (vlan_id & term_value->match.mask)) + return 1; + return 0; } @@ -243,7 +258,23 @@ static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, odp_packet_hdr_t *pkt_hdr ODP_UNUSED, pmr_term_value_t *term_value ODP_UNUSED) { - ODP_UNIMPLEMENTED(); + const _odp_ethhdr_t *eth; + const _odp_vlanhdr_t *vlan; + uint16_t tci; + uint16_t vlan_id; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + vlan++; + tci = odp_be_to_cpu_16(vlan->tci); + vlan_id = tci & 0x0fff; + + if (term_value->match.value == (vlan_id & term_value->match.mask)) + return 1; + return 0; } ----------------------------------------------------------------------- Summary of changes: .../include/odp_classification_inlines.h | 41 +++- .../validation/api/classification/classification.h | 2 + .../api/classification/odp_classification_common.c | 17 +- .../classification/odp_classification_test_pmr.c | 229 +++++++++++++++++++++ .../classification/odp_classification_testsuites.h | 4 +- 5 files changed, 282 insertions(+), 11 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.13.0.0-49-g0ed479b

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 0ed479bd9d474f1d7588f3370fb306a2e000ff4f (commit) via 483af96a7a14885694496843551ed8fad708192c (commit) via f59d87a65cf1d08f8715a01dceeaf370a29e51f3 (commit) from 3528ca70668da492a2f1fe85c167b2024406dd8d (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 0ed479bd9d474f1d7588f3370fb306a2e000ff4f Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Feb 2 18:28:02 2017 -0600 helper: tables: avoid invalid odp_shm_addr() calls In the various table lookup routines, check that odp_shm_lookup() returns a valid handle before attempting to dereference it via odp_shm_addr(). Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/cuckootable.c b/helper/cuckootable.c index 6a7fb21..80ff498 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -151,12 +151,15 @@ align32pow2(uint32_t x) odph_table_t odph_cuckoo_table_lookup(const char *name) { - odph_cuckoo_table_impl *tbl; + odph_cuckoo_table_impl *tbl = NULL; + odp_shm_t shm; if (name == NULL || strlen(name) >= ODPH_TABLE_NAME_LEN) return NULL; - tbl = (odph_cuckoo_table_impl *)odp_shm_addr(odp_shm_lookup(name)); + shm = odp_shm_lookup(name); + if (shm != ODP_SHM_INVALID) + tbl = (odph_cuckoo_table_impl *)odp_shm_addr(shm); if (!tbl || tbl->magicword != ODPH_CUCKOO_TABLE_MAGIC_WORD) return NULL; diff --git a/helper/hashtable.c b/helper/hashtable.c index 1c2b852..9d41144 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -150,12 +150,15 @@ int odph_hash_table_destroy(odph_table_t table) odph_table_t odph_hash_table_lookup(const char *name) { - odph_hash_table_imp *hash_tbl; + odph_hash_table_imp *hash_tbl = NULL; + odp_shm_t shm; if (name == NULL || strlen(name) >= ODPH_TABLE_NAME_LEN) return NULL; - hash_tbl = (odph_hash_table_imp *)odp_shm_addr(odp_shm_lookup(name)); + shm = odp_shm_lookup(name); + if (shm != ODP_SHM_INVALID) + hash_tbl = (odph_hash_table_imp *)odp_shm_addr(shm); if (hash_tbl != NULL && strcmp(hash_tbl->name, name) == 0) return (odph_table_t)hash_tbl; return NULL; diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 9abdab2..aae2199 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -419,11 +419,14 @@ odph_table_t odph_iplookup_table_lookup(const char *name) { odph_iplookup_table_impl *tbl = NULL; + odp_shm_t shm; if (name == NULL || strlen(name) >= ODPH_TABLE_NAME_LEN) return NULL; - tbl = (odph_iplookup_table_impl *)odp_shm_addr(odp_shm_lookup(name)); + shm = odp_shm_lookup(name); + if (shm != ODP_SHM_INVALID) + tbl = (odph_iplookup_table_impl *)odp_shm_addr(shm); if ( tbl != NULL && diff --git a/helper/lineartable.c b/helper/lineartable.c index e1a396c..32c4956 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -128,12 +128,15 @@ int odph_linear_table_destroy(odph_table_t table) odph_table_t odph_linear_table_lookup(const char *name) { - odph_linear_table_imp *tbl; + odph_linear_table_imp *tbl = NULL; + odp_shm_t shm; if (name == NULL || strlen(name) >= ODPH_TABLE_NAME_LEN) return NULL; - tbl = (odph_linear_table_imp *)odp_shm_addr(odp_shm_lookup(name)); + shm = odp_shm_lookup(name); + if (shm != ODP_SHM_INVALID) + tbl = (odph_linear_table_imp *)odp_shm_addr(shm); /* check magicword to make sure the memory block is used by a table */ if (tbl != NULL && commit 483af96a7a14885694496843551ed8fad708192c Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Feb 2 18:28:01 2017 -0600 helper: iplookuptable: removed unused variable Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2829 by avoiding unused variable. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 845125b..9abdab2 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -639,11 +639,9 @@ prefix_insert_iter( /* If this entry contains a nexthop and a small cidr, * push it to the next level. */ - if (entry->cidr > 0) { - state = prefix_insert_into_lx( - tbl, ne, entry->cidr, - push, entry->cidr + 8); - } + if (entry->cidr > 0) + (void)prefix_insert_into_lx(tbl, ne, entry->cidr, + push, entry->cidr + 8); } ne += (ip >> 24); commit f59d87a65cf1d08f8715a01dceeaf370a29e51f3 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Feb 2 18:28:00 2017 -0600 helper: cuckootable: avoid storage leaks on error paths Ensure that malloced storage areas are freed on error paths. This resolves Bug https://bugs.linaro.org/show_bug.cgi?id=2830 Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index 002e52e..be65591 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -453,10 +453,15 @@ static int test_performance(int number) unsigned key_num = key_len * elem_num; key_space = (uint8_t *)malloc(key_num); - key_ptr = (const void **)malloc(sizeof(void *) * elem_num); if (key_space == NULL) return -ENOENT; + key_ptr = (const void **)malloc(sizeof(void *) * elem_num); + if (key_ptr == NULL) { + free(key_space); + return -ENOENT; + } + for (j = 0; j < key_num; j++) { key_space[j] = rand() % 255; if (j % key_len == 0) @@ -473,6 +478,8 @@ static int test_performance(int number) "performance_test", PERFORMANCE_CAPACITY, key_len, 0); if (table == NULL) { printf("cuckoo table creation failed\n"); + free(key_ptr); + free(key_space); return -ENOENT; } ----------------------------------------------------------------------- Summary of changes: helper/cuckootable.c | 7 +++++-- helper/hashtable.c | 7 +++++-- helper/iplookuptable.c | 13 +++++++------ helper/lineartable.c | 7 +++++-- helper/test/cuckootable.c | 9 ++++++++- 5 files changed, 30 insertions(+), 13 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch api-next updated. v1.13.0.0-279-gfbab0b2

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 via fbab0b2bab55742ceface59778de8606e3bd062c (commit) via 3528ca70668da492a2f1fe85c167b2024406dd8d (commit) via 332d48c9c25504b3cbb9451e292a98c15df17ccb (commit) via 0d3ee95d0fb3712631d81c5e6f4fb5f176617c5e (commit) via 0c3ee63ae7b133defa2e74d2573f541d68dae040 (commit) via 8f517b3a278d3742b182b67d6b50f9452dd3e519 (commit) via 2afd00967b751ef3a9fe45d2f966f35956c93520 (commit) via 969d1c74ef21b77df01b120297d4156b87183894 (commit) from a1bcdb71f9c5525e02a9609fb32b767f4f76b082 (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 fbab0b2bab55742ceface59778de8606e3bd062c Merge: a1bcdb7 3528ca7 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Feb 9 22:47:56 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .travis.yml | 15 ++++ helper/include/odp/helper/odph_cuckootable.h | 80 ++++++++++++++++++--- helper/include/odp/helper/odph_hashtable.h | 75 +++++++++++++++++++- helper/include/odp/helper/odph_iplookuptable.h | 97 ++++++++++++++++++++++---- helper/include/odp/helper/odph_lineartable.h | 65 ++++++++++++++++- helper/include/odp/helper/table.h | 10 ++- 6 files changed, 314 insertions(+), 28 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch master updated. v1.13.0.0-46-g3528ca7

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 3528ca70668da492a2f1fe85c167b2024406dd8d (commit) from 332d48c9c25504b3cbb9451e292a98c15df17ccb (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 3528ca70668da492a2f1fe85c167b2024406dd8d Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Thu Feb 9 13:35:35 2017 -0600 doc: helper: add missing doxygen for helper table functions Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2865 by adding missing doxygen documentation for helper table functions Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/include/odp/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h index d569980..55f43fe 100644 --- a/helper/include/odp/helper/odph_cuckootable.h +++ b/helper/include/odp/helper/odph_cuckootable.h @@ -52,28 +52,92 @@ extern "C" { #endif +/** + * @addtogroup odph_cuckootable ODPH CUCKOO TABLE + * @{ + */ + +/** + * Create a cuckoo table + * + * @param name Name of the cuckoo table to be created + * @param capacity Number of elements table may store + * @param key_size Size of the key for each element + * @param value_size Size of the value stored for each element + * + * @return Handle of created cuckoo table + * @retval NULL Create failed + */ odph_table_t odph_cuckoo_table_create( const char *name, uint32_t capacity, uint32_t key_size, uint32_t value_size); +/** + * Lookup a cuckoo table by name + * + * @param name Name of the table to be located + * + * @return Handle of the located cuckoo table + * @retval NULL No table matching supplied name found + */ odph_table_t odph_cuckoo_table_lookup(const char *name); +/** + * Destroy a cuckoo table + * + * @param table Handle of the cuckoo table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_cuckoo_table_destroy(odph_table_t table); -int odph_cuckoo_table_put_value( - odph_table_t table, - void *key, void *value); +/** + * Insert a key/value pair into a cuckoo table + * + * @param table Table into which value is to be stored + * @param key Address of an odph_table_t to be used as key + * @param value Value to be associated with specified key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ +int odph_cuckoo_table_put_value(odph_table_t table, void *key, void *value); -int odph_cuckoo_table_get_value( - odph_table_t table, - void *key, void *buffer, - uint32_t buffer_size); +/** + * Retrieve a value from a cuckoo table + * + * @param table Table from which value is to be retrieved + * @param key Address of an odph_table_t to be used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ +int odph_cuckoo_table_get_value(odph_table_t table, + void *key, void *buffer, + uint32_t buffer_size); +/** + * Remove a value from a cuckoo table + * + * @param table Table from which value is to be removed + * @param key Address of odph_table_t to be used as key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_cuckoo_table_remove_value(odph_table_t table, void *key); -extern odph_table_ops_t odph_cuckoo_table_ops; +extern odph_table_ops_t odph_cuckoo_table_ops; /**< @internal */ + +/** + * @} + */ #ifdef __cplusplus } diff --git a/helper/include/odp/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h index bb75cb9..1f91f31 100644 --- a/helper/include/odp/helper/odph_hashtable.h +++ b/helper/include/odp/helper/odph_hashtable.h @@ -19,22 +19,93 @@ extern "C" { #endif +/** + * @addtogroup odph_hash_table ODPH HASH TABLE + * @{ + */ + +/** + * Create a hash table + * + * @param name Name of the hash table to be created. + * @param capacity Number of elements table may store + * @param key_size Size of the key for each element + * @param value_size Size of the value stored for each element + * + * @return Handle of created hash table + * @retval NULL Create failed + */ odph_table_t odph_hash_table_create(const char *name, uint32_t capacity, uint32_t key_size, uint32_t value_size); + +/** + * Lookup a hash table by name + * + * @param name Name of the table to be located + * + * @return Handle of the located hash table + * @return NULL No table matching supplied name found + */ odph_table_t odph_hash_table_lookup(const char *name); + +/** + * Destroy a hash table + * + * @param table Handle of the hash table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_hash_table_destroy(odph_table_t table); + +/** + * Insert a key/value pair into a hash table + * + * @param table Table into which value is to be stored + * @param key Address of an odph_table_t to be used as key + * @param value Value to be associated with specified key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_hash_put_value(odph_table_t table, void *key, void *value); + +/** + * Retrieve a value from a hash table + * + * @param table Table from which value is to be retrieved + * @param key Address of an odph_table_t to be used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ int odph_hash_get_value(odph_table_t table, void *key, void *buffer, uint32_t buffer_size); + +/** + * Remove a value from a hash table + * + * @param table Table from which value is to be removed + * @param key Address of odph_table_t to be used as key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_hash_remove_value(odph_table_t table, void *key); -extern odph_table_ops_t odph_hash_table_ops; +extern odph_table_ops_t odph_hash_table_ops; /**< @internal */ + +/** + * @} + */ #ifdef __cplusplus } #endif #endif - diff --git a/helper/include/odp/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h index 0ae6b37..84c2cfd 100644 --- a/helper/include/odp/helper/odph_iplookuptable.h +++ b/helper/include/odp/helper/odph_iplookuptable.h @@ -24,32 +24,99 @@ extern "C" { #endif +/** + * @addtogroup odph_iplookuptable ODPH IP LOOKUP TABLE + * @{ + */ + +/** + * IP Lookup Prefix + */ typedef struct { - uint32_t ip; - uint8_t cidr; + uint32_t ip; /**< IPv4 address */ + uint8_t cidr; /**< CIDR value for prefix matching */ } odph_iplookup_prefix_t; -odph_table_t odph_iplookup_table_create( - const char *name, - uint32_t ODP_IGNORED_1, - uint32_t ODP_IGNORED_2, - uint32_t value_size); +/** + * Create an IP lookup table + * + * @param name Name of the table to be created + * @param ODP_IGNORED_1 Unused + * @param ODP_IGNORED_2 Unused + * @param value_size Byte size of each entry in the table + * + * @return Handle of the created ip lookup table + * @retval NULL If table create failed + */ +odph_table_t odph_iplookup_table_create(const char *name, + uint32_t ODP_IGNORED_1, + uint32_t ODP_IGNORED_2, + uint32_t value_size); +/** + * Lookup an IP lookup table by name + * + * @param name Name of the table to be located + * + * @return Handle of the located ip lookup table + * @retval NULL No table matching supplied name found + */ odph_table_t odph_iplookup_table_lookup(const char *name); +/** + * Destroy an IP lookup table + * + * @param table Handle of the ip lookup table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_iplookup_table_destroy(odph_table_t table); -int odph_iplookup_table_put_value( - odph_table_t table, void *key, void *value); +/** + * Insert a key/value pair into an ip lookup table + * + * @param table Table into which value is to be stored + * @param key Address of an odph_iplookup_prefix_t to be used as key + * @param value Value to be associated with specified key + * + * @retval >= 0 Success + * @retval < 0 Failure + */ +int odph_iplookup_table_put_value(odph_table_t table, void *key, void *value); + +/** + * Retrieve a value from an iplookup table + * + * @param table Table from which value is to be retrieved + * @param key Address of an odph_iplookup_prefix_t to be used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ +int odph_iplookup_table_get_value(odph_table_t table, void *key, + void *buffer, uint32_t buffer_size); -int odph_iplookup_table_get_value( - odph_table_t table, void *key, - void *buffer, uint32_t buffer_size); +/** + * Remove a value from an iplookup table + * + * @param table Table from which value is to be removed + * @param key Address of odph_iplookup_prefix_t to be used as key + * + * @retval >= 0 Success + * @retval < 0 Failure + * + */ +int odph_iplookup_table_remove_value(odph_table_t table, void *key); -int odph_iplookup_table_remove_value( - odph_table_t table, void *key); +extern odph_table_ops_t odph_iplookup_table_ops; /**< @internal */ -extern odph_table_ops_t odph_iplookup_table_ops; +/** + * @} + */ #ifdef __cplusplus } diff --git a/helper/include/odp/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h index 0b56b7f..cd9fda3 100644 --- a/helper/include/odp/helper/odph_lineartable.h +++ b/helper/include/odp/helper/odph_lineartable.h @@ -20,21 +20,82 @@ extern "C" { #endif +/** + * @addtogroup odph_lineartable ODPH LINEAR TABLE + * @{ + */ + +/** + * Create a linear table + * + * @param name Name of the linear table to be created + * @param capacity Number of elements table may store + * @param ODP_IGNORED Ignored parameter + * @param value_size Size of the value stored for each element + * + * @return Handle of created linear table + * @return NULL Create failed + */ odph_table_t odph_linear_table_create(const char *name, uint32_t capacity, uint32_t ODP_IGNORED, uint32_t value_size); + +/** + * Lookup a linear table + * + * @param name Name of the table to be located + * + * @return Handle of the located linear table + * @retval NULL No table matching supplied name found + */ odph_table_t odph_linear_table_lookup(const char *name); + +/** + * Destroy a linear table + * + * @param table Handle of linear table to be destroyed + * + * @retval 0 Success + * @retval < 0 Failure + */ int odph_linear_table_destroy(odph_table_t table); + +/** + * Insert a value into a linear table + * + * @param table Table into which value is to be stored + * @param key Index value used as key + * @param value Value to be assoceiated with specified key index + * + * @retval >= 0 Success + * @retval < 0 Failure + */ int odph_linear_put_value(odph_table_t table, void *key, void *value); + +/** + * Retrieve a value from a linear table + * + * @param table Table from which value is to be retrieved + * @param key Index value used as key + * @param[out] buffer Address of buffer to receive resulting value + * @param buffer_size Size of supplied buffer + * + * @retval 0 Success + * @retval 1 Success + * @retval < 0 Failure + */ int odph_linear_get_value(odph_table_t table, void *key, void *buffer, uint32_t buffer_size); -extern odph_table_ops_t odph_linear_table_ops; +extern odph_table_ops_t odph_linear_table_ops; /**< @internal */ + +/** + * @} + */ #ifdef __cplusplus } #endif #endif - diff --git a/helper/include/odp/helper/table.h b/helper/include/odp/helper/table.h index 81022e5..b3440ef 100644 --- a/helper/include/odp/helper/table.h +++ b/helper/include/odp/helper/table.h @@ -80,6 +80,11 @@ extern "C" { #endif +/** + * @addtogroup odph_tables ODPH TABLES + * @{ + */ + #include <stdint.h> /** @@ -228,9 +233,12 @@ typedef struct odph_table_ops_t { odph_table_remove_value f_remove; } odph_table_ops_t; +/** + * @} + */ + #ifdef __cplusplus } #endif #endif - ----------------------------------------------------------------------- Summary of changes: helper/include/odp/helper/odph_cuckootable.h | 80 ++++++++++++++++++--- helper/include/odp/helper/odph_hashtable.h | 75 +++++++++++++++++++- helper/include/odp/helper/odph_iplookuptable.h | 97 ++++++++++++++++++++++---- helper/include/odp/helper/odph_lineartable.h | 65 ++++++++++++++++- helper/include/odp/helper/table.h | 10 ++- 5 files changed, 299 insertions(+), 28 deletions(-) hooks/post-receive --

8 years, 4 months

[COMMIT] branch api-next updated. v1.13.0.0-271-ga1bcdb7

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 via a1bcdb71f9c5525e02a9609fb32b767f4f76b082 (commit) from f21b2d23874d517e147a3e096e99aa272b99dbe4 (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 a1bcdb71f9c5525e02a9609fb32b767f4f76b082 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jan 27 00:11:33 2017 +0300 linux-gen: support older libconfig version Travis CI uses old libconfig8 amd64 1.3.2-2ubuntu2, which does not have defines for errors. Move error print under ifdef to fix compilation. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 2cd8fe3..685e02f 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -130,12 +130,17 @@ static int read_configfile(void) if (config_filename) { ODP_DBG("Reading configuration file: %s\n", config_filename); if (!config_read_file(cf, config_filename)) { +#if defined(LIBCONFIG_VER_MAJOR) && LIBCONFIG_VER_MAJOR >= 1 && \ + LIBCONFIG_VER_MINOR >= 4 ODP_ERR("%s:%d - %s\n", config_error_file(cf), config_error_line(cf), config_error_text(cf)); +#else + ODP_ERR("config_read_file\n"); +#endif config_destroy(cf); - return(-1); + return -1; } } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive --

8 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp