git-lng-odp March 2018

git-lng-odp@lists.linaro.org

1 participants
37 discussions

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-27-g57df98ec

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 57df98eca15fe64a716f9f555714ef5fb9cd25e9 (commit) from 674ea087fba016e55f03e3966fe64fc908141f8f (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 57df98eca15fe64a716f9f555714ef5fb9cd25e9 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Mar 29 11:47:02 2018 +0300 linux-gen: dpdk: fix runtime/default config read order Signed-off-by: Bogdan Pricope <bogdan.pricope(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/include/odp_libconfig_internal.h b/platform/linux-generic/include/odp_libconfig_internal.h index 04291775..727f6886 100644 --- a/platform/linux-generic/include/odp_libconfig_internal.h +++ b/platform/linux-generic/include/odp_libconfig_internal.h @@ -22,6 +22,11 @@ int _odp_libconfig_term_global(void); int _odp_libconfig_lookup_int(const char *path, int *value); +int _odp_libconfig_lookup_ext_int(const char *base_path, + const char *local_path, + const char *name, + int *value); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c index 85acc572..316ed067 100644 --- a/platform/linux-generic/odp_libconfig.c +++ b/platform/linux-generic/odp_libconfig.c @@ -95,3 +95,41 @@ int _odp_libconfig_lookup_int(const char *path, int *value) return (ret_def == CONFIG_TRUE || ret_rt == CONFIG_TRUE) ? 1 : 0; } + +static int lookup_int(config_t *cfg, + const char *base_path, + const char *local_path, + const char *name, + int *value) +{ + char path[256]; + + if (local_path) { + snprintf(path, sizeof(path), "%s.%s.%s", base_path, + local_path, name); + if (config_lookup_int(cfg, path, value) == CONFIG_TRUE) + return 1; + } + + snprintf(path, sizeof(path), "%s.%s", base_path, name); + if (config_lookup_int(cfg, path, value) == CONFIG_TRUE) + return 1; + + return 0; +} + +int _odp_libconfig_lookup_ext_int(const char *base_path, + const char *local_path, + const char *name, + int *value) +{ + if (lookup_int(&odp_global_data.libconfig_runtime, + base_path, local_path, name, value)) + return 1; + + if (lookup_int(&odp_global_data.libconfig_default, + base_path, local_path, name, value)) + return 1; + + return 0; +} diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index d40ad954..7bccab87 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -95,22 +95,16 @@ void refer_constructors(void) } #endif -static int lookup_opt(const char *path, const char *drv_name, int *val) +static int lookup_opt(const char *opt_name, const char *drv_name, int *val) { const char *base = "pktio_dpdk"; - char opt_path[256]; - int ret = 0; - - /* Default option */ - snprintf(opt_path, sizeof(opt_path), "%s.%s", base, path); - ret += _odp_libconfig_lookup_int(opt_path, val); - - /* Driver specific option overrides default option */ - snprintf(opt_path, sizeof(opt_path), "%s.%s.%s", base, drv_name, path); - ret += _odp_libconfig_lookup_int(opt_path, val); + int ret; + ret = _odp_libconfig_lookup_ext_int(base, drv_name, opt_name, val); if (ret == 0) - ODP_ERR("Unable to find DPDK configuration option: %s\n", path); + ODP_ERR("Unable to find DPDK configuration option: %s\n", + opt_name); + return ret; } ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_libconfig_internal.h | 5 +++ platform/linux-generic/odp_libconfig.c | 38 ++++++++++++++++++++++ platform/linux-generic/pktio/dpdk.c | 18 ++++------ 3 files changed, 49 insertions(+), 12 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-26-g674ea087

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 674ea087fba016e55f03e3966fe64fc908141f8f (commit) via a9584da4284c04e45a9584a58c6dbeb404871119 (commit) from 63123149319eb0e379dc52a3f4691993d026f3bf (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 674ea087fba016e55f03e3966fe64fc908141f8f Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Mar 30 19:09:07 2018 +0300 add odp_ipsec to .gitignore Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/.gitignore b/test/performance/.gitignore index 259f690c..4c4ab6ed 100644 --- a/test/performance/.gitignore +++ b/test/performance/.gitignore @@ -3,6 +3,7 @@ odp_atomic odp_bench_packet odp_crypto +odp_ipsec odp_l2fwd odp_pktio_ordered odp_pktio_perf commit a9584da4284c04e45a9584a58c6dbeb404871119 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Mar 28 17:14:28 2018 +0300 build: fix autoconf error caused by double-registering config item Autoconf uses provided tag as is, when registering config command. Require platform code to pass platform argument, so that different config commands will be registered. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/m4/odp_libconfig.m4 b/m4/odp_libconfig.m4 index c9d770bb..302dc506 100644 --- a/m4/odp_libconfig.m4 +++ b/m4/odp_libconfig.m4 @@ -1,5 +1,5 @@ -# ODP_LIBCONFIG -# ------------- +# ODP_LIBCONFIG(PLATFORM) +# ----------------------- AC_DEFUN([ODP_LIBCONFIG], [dnl ########################################################################## @@ -18,12 +18,12 @@ AS_IF([test -z "$OD"], [AC_MSG_ERROR([Could not find 'od'])]) # Create a header file odp_libconfig_config.h which containins null # terminated hex dump of odp-linux.conf ########################################################################## -AC_CONFIG_COMMANDS([platform/${with_platform}/include/odp_libconfig_config.h], -[mkdir -p platform/${with_platform}/include +AC_CONFIG_COMMANDS([platform/$1/include/odp_libconfig_config.h], +[mkdir -p platform/$1/include (echo "static const char config_builtin[[]] = {"; \ - $OD -An -v -tx1 < ${srcdir}/config/odp-${with_platform}.conf | \ + $OD -An -v -tx1 < ${srcdir}/config/odp-$1.conf | \ $SED -e 's/[[0-9a-f]]\+/0x\0,/g' ; \ echo "0x00 };") > \ - platform/${with_platform}/include/odp_libconfig_config.h], + platform/$1/include/odp_libconfig_config.h], [with_platform=$with_platform OD=$OD SED=$SED]) ]) # ODP_LIBCONFIG diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index d4aa9cd0..7cf0a9b6 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -6,7 +6,7 @@ ODP_ATOMIC ODP_PTHREAD ODP_TIMER ODP_OPENSSL -ODP_LIBCONFIG +ODP_LIBCONFIG([linux-generic]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) ----------------------------------------------------------------------- Summary of changes: m4/odp_libconfig.m4 | 12 ++++++------ platform/linux-generic/m4/configure.m4 | 2 +- test/performance/.gitignore | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-24-g63123149

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 63123149319eb0e379dc52a3f4691993d026f3bf (commit) from 9a5a18af733c07109224e328ca0ac640ff49f845 (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 63123149319eb0e379dc52a3f4691993d026f3bf Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Mar 23 04:36:41 2018 +0300 build: don't use xxd to hexdump config file Use standard od and sed programs to hexdump config file, removing dependency on xxd. 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/DEPENDENCIES b/DEPENDENCIES index f328e787..48f5a839 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -21,8 +21,6 @@ Prerequisites for building the OpenDataPlane (ODP) API Libraries currently required to link: openssl, libatomic, libconfig - Required tools: xxd - 3.1 OpenSSL native compile For native compilation, simply load the necessary libraries using the appropriate diff --git a/m4/odp_libconfig.m4 b/m4/odp_libconfig.m4 index 632c271e..c9d770bb 100644 --- a/m4/odp_libconfig.m4 +++ b/m4/odp_libconfig.m4 @@ -8,12 +8,11 @@ AC_DEFUN([ODP_LIBCONFIG], PKG_CHECK_MODULES([LIBCONFIG], [libconfig]) ########################################################################## -# Check for xxd availability +# Check for od availability ########################################################################## -AC_CHECK_PROGS([XXD], [xxd]) -if test -z "$XXD"; - then AC_MSG_ERROR([Could not find 'xxd']) -fi +AC_CHECK_PROGS([OD], [od]) +AC_PROG_SED +AS_IF([test -z "$OD"], [AC_MSG_ERROR([Could not find 'od'])]) ########################################################################## # Create a header file odp_libconfig_config.h which containins null @@ -21,8 +20,10 @@ fi ########################################################################## AC_CONFIG_COMMANDS([platform/${with_platform}/include/odp_libconfig_config.h], [mkdir -p platform/${with_platform}/include - (cd ${srcdir}/config ; xxd -i odp-${with_platform}.conf) | \ - sed 's/$[[0-9a-f]]$$/\0, 0x00/' > \ + (echo "static const char config_builtin[[]] = {"; \ + $OD -An -v -tx1 < ${srcdir}/config/odp-${with_platform}.conf | \ + $SED -e 's/[[0-9a-f]]\+/0x\0,/g' ; \ + echo "0x00 };") > \ platform/${with_platform}/include/odp_libconfig_config.h], - [with_platform=$with_platform]) + [with_platform=$with_platform OD=$OD SED=$SED]) ]) # ODP_LIBCONFIG diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c index 3b3b3170..85acc572 100644 --- a/platform/linux-generic/odp_libconfig.c +++ b/platform/linux-generic/odp_libconfig.c @@ -16,8 +16,6 @@ #include <odp_libconfig_internal.h> #include <odp_libconfig_config.h> -#define CONF_STR_NAME ((const char *)odp_linux_generic_conf) - extern struct odp_global_data_s odp_global_data; int _odp_libconfig_init_global(void) @@ -33,7 +31,7 @@ int _odp_libconfig_init_global(void) config_init(config); config_init(config_rt); - if (!config_read_string(config, CONF_STR_NAME)) { + if (!config_read_string(config, config_builtin)) { ODP_ERR("Failed to read default config: %s(%d): %s\n", config_error_file(config), config_error_line(config), config_error_text(config)); ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 2 -- m4/odp_libconfig.m4 | 17 +++++++++-------- platform/linux-generic/odp_libconfig.c | 4 +--- 3 files changed, 10 insertions(+), 13 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-23-g9a5a18af

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 9a5a18af733c07109224e328ca0ac640ff49f845 (commit) via 06321dc028b83ea78b39eb9673859a40f9da37f7 (commit) from d6de4dfcf1a3a6c861c87d47990f793c71328eda (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 9a5a18af733c07109224e328ca0ac640ff49f845 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Mar 24 05:42:25 2018 +0300 build: another DPDK-linking fix Try our best to link with DPDK, if we are doing static linking of examples and tests and we detected shared DPDK library. Build the list of static libraries, in hope they are present on the system (like in Debian/Ubuntu DPDK packages). Linking can still fail, as we have warned during configure time. 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/example/Makefile.inc b/example/Makefile.inc index 3c8060da..083c537f 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -6,6 +6,8 @@ LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la # Do not link to DPDK twice in case of dynamic linking with ODP if STATIC_APPS +LDADD += $(DPDK_LIBS_LT_STATIC) +else LDADD += $(DPDK_LIBS_LT) endif diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index dccc6569..ec248e76 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -21,20 +21,22 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) # -------------------- # Set DPDK_LIBS/DPDK_LIBS_LT/DPDK_LIBS_LIBODP depending on DPDK setup AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl +ODP_DPDK_PMDS([$DPDK_PMD_PATH]) AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl # applications don't need to be linked to anything, just rpath DPDK_LIBS_LT="$DPDK_RPATH_LT" # static linking flags will need -ldpdk + DPDK_LIBS_LT_STATIC="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" DPDK_LIBS="-Wl,--no-as-needed,-ldpdk,--as-needed,`echo $DPDK_LIBS | sed -e 's/ /,/g'`" DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" # link libodp-linux with -ldpdk DPDK_LIBS_LIBODP="$DPDK_LIBS" ], [dnl - ODP_DPDK_PMDS([$DPDK_PMD_PATH]) # build long list of libraries for applications, which should not be # rearranged by libtool DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + DPDK_LIBS_LT_STATIC="$DPDK_LIBS_LT" # static linking flags follow the suite DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" # link libodp-linux with libtool linking flags @@ -43,6 +45,7 @@ AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl AC_SUBST([DPDK_LIBS]) AC_SUBST([DPDK_LIBS_LIBODP]) AC_SUBST([DPDK_LIBS_LT]) +AC_SUBST([DPDK_LIBS_LT_STATIC]) ]) # _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS]) diff --git a/test/Makefile.inc b/test/Makefile.inc index 55a493a8..0706cac8 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -21,6 +21,8 @@ AM_CPPFLAGS = \ # Do not link to DPDK twice in case of dynamic linking with ODP if STATIC_APPS +LDADD += $(DPDK_LIBS_LT_STATIC) +else LDADD += $(DPDK_LIBS_LT) endif commit 06321dc028b83ea78b39eb9673859a40f9da37f7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Mar 24 04:54:37 2018 +0300 build: move odp scheduler setting to common m4 file 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_schedule.m4 b/m4/odp_scheduler.m4 similarity index 73% rename from platform/linux-generic/m4/odp_schedule.m4 rename to m4/odp_scheduler.m4 index 70be5a7d..23cc7da3 100644 --- a/platform/linux-generic/m4/odp_schedule.m4 +++ b/m4/odp_scheduler.m4 @@ -1,6 +1,11 @@ +# ODP_SCHEDULER +# ------------- +# Select default scheduler +AC_DEFUN([ODP_SCHEDULER], [dnl AC_ARG_ENABLE([scheduler-default], [AS_HELP_STRING([enable-scheduler-default], [Choose default scheduler (default is basic)])], [], [enable_scheduler_default=basic]) AC_DEFINE_UNQUOTED([ODP_SCHEDULE_DEFAULT], ["$enable_scheduler_default"], [Define to name default scheduler]) +]) # ODP_SCHEDULER diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index e3f276af..d4aa9cd0 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -10,7 +10,7 @@ ODP_LIBCONFIG m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) -m4_include([platform/linux-generic/m4/odp_schedule.m4]) +ODP_SCHEDULER m4_include([platform/linux-generic/m4/performance.m4]) ----------------------------------------------------------------------- Summary of changes: example/Makefile.inc | 2 ++ m4/odp_dpdk.m4 | 5 ++++- platform/linux-generic/m4/odp_schedule.m4 => m4/odp_scheduler.m4 | 5 +++++ platform/linux-generic/m4/configure.m4 | 2 +- test/Makefile.inc | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) rename platform/linux-generic/m4/odp_schedule.m4 => m4/odp_scheduler.m4 (73%) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-21-gd6de4dfc

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 d6de4dfcf1a3a6c861c87d47990f793c71328eda (commit) via fc0a57306aa68a782e8611a9bd08ae10aaa5274a (commit) via 2eaf47b69ea5f2095e26e0ea597d3e8702b0da06 (commit) via 9f3311f92d28ef9fdf6ef3d8ec8b90efe7a832d6 (commit) via 68b1a52611e6ac9be306e5a17d009a6fd46c455e (commit) via 59d636481fd1771107f3eb4632c2a9fc868afc11 (commit) from 0225a8a396ddc7168be096f28b0a711184a48ef9 (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 d6de4dfcf1a3a6c861c87d47990f793c71328eda Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Mar 23 18:56:59 2018 +0300 linux-gen: ipsec: add proper support for AES-CCM Make linux-generic's IPsec actually support AES-CCM algorithm. 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_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 05865eb3..8dab489c 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -220,6 +220,8 @@ uint32_t _odp_ipsec_cipher_iv_len(odp_cipher_alg_t cipher) #endif case ODP_CIPHER_ALG_AES_GCM: return 12; + case ODP_CIPHER_ALG_AES_CCM: + return 11; case ODP_CIPHER_ALG_CHACHA20_POLY1305: return 12; default: @@ -252,6 +254,8 @@ uint32_t _odp_ipsec_auth_digest_len(odp_auth_alg_t auth) case ODP_AUTH_ALG_AES_GCM: case ODP_AUTH_ALG_AES_GMAC: return 16; + case ODP_AUTH_ALG_AES_CCM: + return 16; case ODP_AUTH_ALG_CHACHA20_POLY1305: return 16; default: @@ -411,6 +415,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) case ODP_CIPHER_ALG_AES128_GCM: #endif case ODP_CIPHER_ALG_AES_GCM: + case ODP_CIPHER_ALG_AES_CCM: ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; commit fc0a57306aa68a782e8611a9bd08ae10aaa5274a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Mar 23 18:55:54 2018 +0300 linux-gen: crypto: add IV length checks Check IV length on crypto session creation, fixing possible issues later, during en/decryption. 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_crypto.c b/platform/linux-generic/odp_crypto.c index a7fddb5b..21449cfe 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -661,9 +661,8 @@ static int process_cipher_param(odp_crypto_generic_session_t *session, return -1; /* Verify IV len is correct */ - if (!((0 == session->p.cipher_iv.length) || - ((uint32_t)EVP_CIPHER_iv_length(cipher) == - session->p.cipher_iv.length))) + if ((uint32_t)EVP_CIPHER_iv_length(cipher) != + session->p.cipher_iv.length) return -1; session->cipher.evp_cipher = cipher; @@ -791,6 +790,10 @@ static int process_aes_gcm_param(odp_crypto_generic_session_t *session, session->p.cipher_key.length) return -1; + /* Verify IV len is correct */ + if (12 != session->p.cipher_iv.length) + return -1; + memcpy(session->cipher.key_data, session->p.cipher_key.data, session->p.cipher_key.length); @@ -902,6 +905,10 @@ static int process_aes_gmac_param(odp_crypto_generic_session_t *session, session->p.auth_key.length) return -1; + /* Verify IV len is correct */ + if (12 != session->p.auth_iv.length) + return -1; + memcpy(session->auth.key, session->p.auth_key.data, session->p.auth_key.length); @@ -1058,6 +1065,11 @@ static int process_aes_ccm_param(odp_crypto_generic_session_t *session, session->p.cipher_key.length) return -1; + /* Verify IV len is correct */ + if (11 != session->p.cipher_iv.length && + 13 != session->p.cipher_iv.length) + return -1; + memcpy(session->cipher.key_data, session->p.cipher_key.data, session->p.cipher_key.length); @@ -1078,6 +1090,10 @@ static int process_aes_ccm_param(odp_crypto_generic_session_t *session, static int process_auth_hmac_param(odp_crypto_generic_session_t *session, const EVP_MD *evp_md) { + /* Verify IV len is correct */ + if (0 != session->p.auth_iv.length) + return -1; + /* Set function */ if (ODP_CRYPTO_OP_ENCODE == session->p.op) session->auth.func = auth_hmac_gen; @@ -1106,6 +1122,9 @@ static int process_auth_cmac_param(odp_crypto_generic_session_t *session, session->p.auth_key.length) return -1; + if (0 != session->p.auth_iv.length) + return -1; + /* Set function */ if (ODP_CRYPTO_OP_ENCODE == session->p.op) session->auth.func = auth_cmac_gen; commit 2eaf47b69ea5f2095e26e0ea597d3e8702b0da06 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Mar 23 18:42:42 2018 +0300 performance: crypto: add more algorithms Run more performance tests on crypto transformation. 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/performance/odp_crypto.c b/test/performance/odp_crypto.c index e4f49fb7..8841c127 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -51,6 +51,30 @@ static uint8_t test_key24[24] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x15, 0x16, 0x17, 0x18 }; +static uint8_t test_key32[32] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, + 0x15, 0x16, 0x17, 0x18, 0x19, + 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, + 0x1f, 0x20, +}; + +static uint8_t test_key64[64] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, + 0x15, 0x16, 0x17, 0x18, 0x19, + 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, + 0x1f, 0x20, 0x21, 0x22, 0x23, + 0x24, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2a, 0x4b, 0x2c, 0x2d, + 0x2e, 0x2f, 0x30, 0x31, 0x32, + 0x33, 0x34, 0x55, 0x36, 0x37, + 0x38, 0x39, 0x5a, 0x3b, 0x3c, + 0x3d, 0x3e, 0x5f, 0x40, +}; + /** * Structure that holds template for session create call * for different algorithms supported by test @@ -279,6 +303,81 @@ static crypto_alg_config_t algs_config[] = { .auth_digest_len = 12, }, }, + { + .name = "aes-ctr-null", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_CTR, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .cipher_iv = { + .data = test_iv, + .length = 16, + }, + .auth_alg = ODP_AUTH_ALG_NULL + }, + }, + { + .name = "aes-ctr-hmac-sha1-96", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_CTR, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .cipher_iv = { + .data = test_iv, + .length = 16, + }, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + .auth_digest_len = 12, + }, + }, + { + .name = "null-hmac-sha256-128", + .session = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_SHA256_HMAC, + .auth_key = { + .data = test_key32, + .length = sizeof(test_key32) + }, + .auth_digest_len = 16, + }, + }, + { + .name = "null-hmac-sha512-256", + .session = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_SHA512_HMAC, + .auth_key = { + .data = test_key64, + .length = sizeof(test_key64) + }, + .auth_digest_len = 32, + }, + }, + { + .name = "null-aes-gmac", + .session = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_AES_GMAC, + .auth_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .auth_iv = { + .data = test_iv, + .length = 12, + }, + .auth_digest_len = 16, + }, + }, { .name = "aes-gcm", .session = { @@ -295,6 +394,38 @@ static crypto_alg_config_t algs_config[] = { .auth_digest_len = 16, }, }, + { + .name = "aes-ccm", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_CCM, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .cipher_iv = { + .data = test_iv, + .length = 11, + }, + .auth_alg = ODP_AUTH_ALG_AES_CCM, + .auth_digest_len = 16, + }, + }, + { + .name = "chacha20-poly1305", + .session = { + .cipher_alg = ODP_CIPHER_ALG_CHACHA20_POLY1305, + .cipher_key = { + .data = test_key32, + .length = sizeof(test_key32) + }, + .cipher_iv = { + .data = test_iv, + .length = 12, + }, + .auth_alg = ODP_AUTH_ALG_CHACHA20_POLY1305, + .auth_digest_len = 16, + }, + }, }; /** commit 9f3311f92d28ef9fdf6ef3d8ec8b90efe7a832d6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Mar 23 18:42:42 2018 +0300 performance: ipsec: add more algorithms Run more performance tests on IPsec transformation. 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/performance/odp_ipsec.c b/test/performance/odp_ipsec.c index 6fdd033c..587293db 100644 --- a/test/performance/odp_ipsec.c +++ b/test/performance/odp_ipsec.c @@ -51,6 +51,30 @@ static uint8_t test_key24[24] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x15, 0x16, 0x17, 0x18 }; +static uint8_t test_key32[32] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, + 0x15, 0x16, 0x17, 0x18, 0x19, + 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, + 0x1f, 0x20, +}; + +static uint8_t test_key64[64] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, + 0x15, 0x16, 0x17, 0x18, 0x19, + 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, + 0x1f, 0x20, 0x21, 0x22, 0x23, + 0x24, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2a, 0x4b, 0x2c, 0x2d, + 0x2e, 0x2f, 0x30, 0x31, 0x32, + 0x33, 0x34, 0x55, 0x36, 0x37, + 0x38, 0x39, 0x5a, 0x3b, 0x3c, + 0x3d, 0x3e, 0x5f, 0x40, +}; + /** * Structure that holds template for sa create call * for different algorithms supported by test @@ -245,6 +269,32 @@ static ipsec_alg_config_t algs_config[] = { }, }, }, + { + .name = "aes-ctr-null", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_AES_CTR, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .auth_alg = ODP_AUTH_ALG_NULL + }, + }, + { + .name = "aes-ctr-hmac-sha1-96", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_AES_CTR, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + }, + }, { .name = "null-hmac-sha1-96", .crypto = { @@ -256,6 +306,43 @@ static ipsec_alg_config_t algs_config[] = { }, }, }, + { + .name = "null-hmac-sha256-128", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_SHA256_HMAC, + .auth_key = { + .data = test_key32, + .length = sizeof(test_key32) + }, + }, + }, + { + .name = "null-hmac-sha512-256", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_SHA512_HMAC, + .auth_key = { + .data = test_key64, + .length = sizeof(test_key64) + }, + }, + }, + { + .name = "null-aes-gmac", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_AES_GMAC, + .auth_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .cipher_key_extra = { + .data = test_salt, + .length = 4, + }, + }, + }, { .name = "aes-gcm", .crypto = { @@ -271,6 +358,36 @@ static ipsec_alg_config_t algs_config[] = { .auth_alg = ODP_AUTH_ALG_AES_GCM, }, }, + { + .name = "aes-ccm", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_AES_CCM, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .cipher_key_extra = { + .data = test_salt, + .length = 3, + }, + .auth_alg = ODP_AUTH_ALG_AES_CCM, + }, + }, + { + .name = "chacha20-poly1305", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_CHACHA20_POLY1305, + .cipher_key = { + .data = test_key32, + .length = sizeof(test_key32) + }, + .cipher_key_extra = { + .data = test_salt, + .length = 4, + }, + .auth_alg = ODP_AUTH_ALG_CHACHA20_POLY1305, + }, + }, }; /** commit 68b1a52611e6ac9be306e5a17d009a6fd46c455e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Mar 23 18:19:48 2018 +0300 performance: ipsec: add AH measurements 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/performance/odp_ipsec.c b/test/performance/odp_ipsec.c index 6552c0e0..6fdd033c 100644 --- a/test/performance/odp_ipsec.c +++ b/test/performance/odp_ipsec.c @@ -122,6 +122,12 @@ typedef struct { * Specified through -t argument. */ int tunnel; + + /* + * Use AH transformation. + * Specified through -u argument. + */ + int ah; } ipsec_args_t; /* @@ -778,6 +784,7 @@ static void usage(char *progname) " -s, --schedule Use scheduler for completion events.\n" " -p, --poll Poll completion queue for completion events.\n" " -t, --tunnel Use tunnel-mode IPsec transformation.\n" + " -u, --ah Use AH transformation instead of ESP.\n" " -h, --help Display help and exit.\n" "\n"); } @@ -798,10 +805,11 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) {"poll", no_argument, NULL, 'p'}, {"schedule", no_argument, NULL, 's'}, {"tunnel", no_argument, NULL, 't'}, + {"ah", no_argument, NULL, 'u'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+a:c:df:hi:m:nl:spt"; + static const char *shortopts = "+a:c:df:hi:m:nl:sptu"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -813,6 +821,7 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) cargs->payload_length = 0; cargs->alg_config = NULL; cargs->schedule = 0; + cargs->ah = 0; opterr = 0; /* do not issue errors on helper options */ @@ -860,6 +869,9 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) case 't': cargs->tunnel = 1; break; + case 'u': + cargs->ah = 1; + break; default: break; } @@ -1011,6 +1023,10 @@ int main(int argc, char *argv[]) for (i = 0; i < (sizeof(algs_config) / sizeof(ipsec_alg_config_t)); i++) { + if (cargs.ah && + algs_config[i].crypto.cipher_alg != + ODP_CIPHER_ALG_NULL) + continue; run_measure_one_config(&cargs, algs_config + i); } } commit 59d636481fd1771107f3eb4632c2a9fc868afc11 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Mar 15 15:50:22 2018 +0300 tests: add IPsec performance test Use this tool to measure IPsec performance with different algorithms For now only outbound direction is supported. 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/performance/Makefile.am b/test/performance/Makefile.am index 458c8fb0..c8f0bdec 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -4,6 +4,7 @@ TESTS_ENVIRONMENT += TEST_DIR=${builddir} EXECUTABLES = odp_bench_packet \ odp_crypto \ + odp_ipsec \ odp_pktio_perf COMPILE_ONLY = odp_l2fwd \ @@ -30,6 +31,7 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) odp_bench_packet_SOURCES = odp_bench_packet.c odp_crypto_SOURCES = odp_crypto.c +odp_ipsec_SOURCES = odp_ipsec.c odp_pktio_ordered_SOURCES = odp_pktio_ordered.c dummy_crc.h odp_sched_latency_SOURCES = odp_sched_latency.c odp_sched_pktio_SOURCES = odp_sched_pktio.c diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c new file mode 100644 index 00000000..6552c0e0 --- /dev/null +++ b/test/performance/odp_ipsec.c @@ -0,0 +1,1037 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif /* _GNU_SOURCE */ + +#include <stdlib.h> +#include <string.h> +#include <getopt.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/time.h> +#include <sys/resource.h> + +#include <odp_api.h> +#include <odp/helper/odph_api.h> + +#define app_err(fmt, ...) \ + fprintf(stderr, "%s:%d:%s(): Error: " fmt, __FILE__, \ + __LINE__, __func__, ##__VA_ARGS__) + +/** @def POOL_NUM_PKT + * Number of packets in the pool + */ +#define POOL_NUM_PKT 64 + +static uint8_t test_salt[16] = "0123456789abcdef"; + +static uint8_t test_key16[16] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, +}; + +static uint8_t test_key20[20] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, +}; + +static uint8_t test_key24[24] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, + 0x15, 0x16, 0x17, 0x18 +}; + +/** + * Structure that holds template for sa create call + * for different algorithms supported by test + */ +typedef struct { + const char *name; /**< Algorithm name */ + odp_ipsec_crypto_param_t crypto; /**< Prefilled SA crypto param */ +} ipsec_alg_config_t; + +/** + * Parsed command line crypto arguments. Describes test configuration. + */ +typedef struct { + /** + * If non zero prints content of packets. Enabled by -d or + * --debug option. + */ + int debug_packets; + + /** + * If non zero Try to run crypto operation in place. Note some + * implementation may not support such mode. Enabled by -n or + * --inplace option. + */ + int in_place; + + /** + * Maximum number of outstanding encryption requests. Note code + * poll for results over queue and if nothing is available it can + * submit more encryption requests up to maximum number specified by + * this option. Specified through -f or --flight option. + */ + int in_flight; + + /** + * Number of iteration to repeat crypto operation to get good + * average number. Specified through -i or --terations option. + * Default is 10000. + */ + int iteration_count; + + /** + * Payload size to test. If 0 set of predefined payload sizes + * is tested. Specified through -p or --payload option. + */ + unsigned int payload_length; + + /** + * Pointer to selected algorithm to test. If NULL all available + * alogorthims are tested. Name of algorithm is passed through + * -a or --algorithm option. + */ + ipsec_alg_config_t *alg_config; + + /** + * Use scheduler to get completion events from crypto operation. + * Specified through -s argument. + * */ + int schedule; + + /* + * Poll completion queue for crypto completion events. + * Specified through -p argument. + */ + int poll; + + /* + * Use tunnel instead of transport mode. + * Specified through -t argument. + */ + int tunnel; +} ipsec_args_t; + +/* + * Helper structure that holds averages for test of one algorithm + * for given payload size. + */ +typedef struct { + /** + * Elapsed time for one crypto operation. + */ + double elapsed; + + /** + * CPU time spent pre one crypto operation by whole process + * i.e include current and all other threads in process. + * It is filled with 'getrusage(RUSAGE_SELF, ...)' call. + */ + double rusage_self; + + /** + * CPU time spent per one crypto operation by current thread + * only. It is filled with 'getrusage(RUSAGE_THREAD, ...)' + * call. + */ + double rusage_thread; +} ipsec_run_result_t; + +/** + * Structure holds one snap to misc times of current process. + */ +typedef struct { + struct timeval tv; /**< Elapsed time */ + struct rusage ru_self; /**< Rusage value for whole process */ + struct rusage ru_thread; /**< Rusage value for current thread */ +} time_record_t; + +/** + * Set of predefined payloads. + */ +static unsigned int global_payloads[] = { + 64, + 256, + 1024, + 8192, + 16384 +}; + +/** Number of payloads used in the test */ +static unsigned int global_num_payloads; + +/** + * Set of known algorithms to test + */ +static ipsec_alg_config_t algs_config[] = { + { + .name = "3des-cbc-null", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_3DES_CBC, + .cipher_key = { + .data = test_key24, + .length = sizeof(test_key24) + }, + .auth_alg = ODP_AUTH_ALG_NULL + }, + }, + { + .name = "3des-cbc-hmac-md5-96", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_3DES_CBC, + .cipher_key = { + .data = test_key24, + .length = sizeof(test_key24) + }, + .auth_alg = ODP_AUTH_ALG_MD5_HMAC, + .auth_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + }, + }, + { + .name = "null-hmac-md5-96", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_MD5_HMAC, + .auth_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + }, + }, + { + .name = "aes-cbc-null", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_AES_CBC, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .auth_alg = ODP_AUTH_ALG_NULL + }, + }, + { + .name = "aes-cbc-hmac-sha1-96", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_AES_CBC, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + }, + }, + { + .name = "null-hmac-sha1-96", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + }, + }, + { + .name = "aes-gcm", + .crypto = { + .cipher_alg = ODP_CIPHER_ALG_AES_GCM, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .cipher_key_extra = { + .data = test_salt, + .length = 4, + }, + .auth_alg = ODP_AUTH_ALG_AES_GCM, + }, + }, +}; + +/** + * Find corresponding config for given name. Returns NULL + * if config for given name is not found. + */ +static ipsec_alg_config_t * +find_config_by_name(const char *name) +{ + unsigned int i; + ipsec_alg_config_t *ret = NULL; + + for (i = 0; i < (sizeof(algs_config) / sizeof(ipsec_alg_config_t)); + i++) { + if (strcmp(algs_config[i].name, name) == 0) { + ret = algs_config + i; + break; + } + } + return ret; +} + +/** + * Helper function that prints list of algorithms that this + * test understands. + */ +static void +print_config_names(const char *prefix) +{ + unsigned int i; + + for (i = 0; i < (sizeof(algs_config) / sizeof(ipsec_alg_config_t)); + i++) { + printf("%s %s\n", prefix, algs_config[i].name); + } +} + +/** + * Snap current time values and put them into 'rec'. + */ +static void +fill_time_record(time_record_t *rec) +{ + gettimeofday(&rec->tv, NULL); + getrusage(RUSAGE_SELF, &rec->ru_self); + getrusage(RUSAGE_THREAD, &rec->ru_thread); +} + +/** + * Calculated CPU time difference for given two rusage structures. + * Note it adds user space and system time together. + */ +static unsigned long long +get_rusage_diff(struct rusage *start, struct rusage *end) +{ + unsigned long long rusage_diff; + unsigned long long rusage_start; + unsigned long long rusage_end; + + rusage_start = (start->ru_utime.tv_sec * 1000000) + + (start->ru_utime.tv_usec); + rusage_start += (start->ru_stime.tv_sec * 1000000) + + (start->ru_stime.tv_usec); + + rusage_end = (end->ru_utime.tv_sec * 1000000) + + (end->ru_utime.tv_usec); + rusage_end += (end->ru_stime.tv_sec * 1000000) + + (end->ru_stime.tv_usec); + + rusage_diff = rusage_end - rusage_start; + + return rusage_diff; +} + +/** + * Get diff for RUSAGE_SELF (whole process) between two time snap + * records. + */ +static unsigned long long +get_rusage_self_diff(time_record_t *start, time_record_t *end) +{ + return get_rusage_diff(&start->ru_self, &end->ru_self); +} + +/** + * Get diff for RUSAGE_THREAD (current thread only) between two + * time snap records. + */ +static unsigned long long +get_rusage_thread_diff(time_record_t *start, time_record_t *end) +{ + return get_rusage_diff(&start->ru_thread, &end->ru_thread); +} + +/** + * Get diff of elapsed time between two time snap records + */ +static unsigned long long +get_elapsed_usec(time_record_t *start, time_record_t *end) +{ + unsigned long long s; + unsigned long long e; + + s = (start->tv.tv_sec * 1000000) + (start->tv.tv_usec); + e = (end->tv.tv_sec * 1000000) + (end->tv.tv_usec); + + return e - s; +} + +/** + * Print header line for our report. + */ +static void +print_result_header(void) +{ + printf("\n%30.30s %15s %15s %15s %15s %15s %15s\n", + "algorithm", "avg over #", "payload (bytes)", "elapsed (us)", + "rusg self (us)", "rusg thrd (us)", "throughput (Kb)"); +} + +/** + * Print one line of our report. + */ +static void +print_result(ipsec_args_t *cargs, + unsigned int payload_length, + ipsec_alg_config_t *config, + ipsec_run_result_t *result) +{ + unsigned int throughput; + + throughput = (1000000.0 / result->elapsed) * payload_length / 1024; + printf("%30.30s %15d %15d %15.3f %15.3f %15.3f %15d\n", + config->name, cargs->iteration_count, payload_length, + result->elapsed, result->rusage_self, result->rusage_thread, + throughput); +} + +#define IPV4ADDR(a, b, c, d) odp_cpu_to_be_32((a << 24) | \ + (b << 16) | \ + (c << 8) | \ + (d << 0)) + +/** + * Create ODP IPsec SA for given config. + */ +static odp_ipsec_sa_t +create_sa_from_config(ipsec_alg_config_t *config, + ipsec_args_t *cargs) +{ + odp_ipsec_sa_param_t param; + odp_queue_t out_queue; + + odp_ipsec_sa_param_init(&param); + memcpy(&param.crypto, &config->crypto, + sizeof(odp_ipsec_crypto_param_t)); + + param.proto = ODP_IPSEC_ESP; + param.dir = ODP_IPSEC_DIR_OUTBOUND; + + if (cargs->tunnel) { + uint32_t src = IPV4ADDR(10, 0, 111, 2); + uint32_t dst = IPV4ADDR(10, 0, 222, 2); + odp_ipsec_tunnel_param_t tunnel; + + memset(&tunnel, 0, sizeof(tunnel)); + tunnel.type = ODP_IPSEC_TUNNEL_IPV4; + tunnel.ipv4.src_addr = &src; + tunnel.ipv4.dst_addr = &dst; + tunnel.ipv4.ttl = 64; + + param.mode = ODP_IPSEC_MODE_TUNNEL; + param.outbound.tunnel = tunnel; + } else { + param.mode = ODP_IPSEC_MODE_TRANSPORT; + } + + if (cargs->schedule || cargs->poll) { + out_queue = odp_queue_lookup("ipsec-out"); + if (out_queue == ODP_QUEUE_INVALID) { + app_err("ipsec-out queue not found\n"); + return ODP_IPSEC_SA_INVALID; + } + param.dest_queue = out_queue; + } else { + param.dest_queue = ODP_QUEUE_INVALID; + } + + return odp_ipsec_sa_create(&param); +} + +static uint8_t test_data[] = { + /* IP */ + 0x45, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x01, 0xac, 0x27, 0xc0, 0xa8, 0x6f, 0x02, + 0xc0, 0xa8, 0xde, 0x02, + + /* ICMP */ + 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00 +}; + +static odp_packet_t +make_packet(odp_pool_t pkt_pool, unsigned int payload_length) +{ + odp_packet_t pkt; + + if (payload_length < sizeof(test_data)) + return ODP_PACKET_INVALID; + + pkt = odp_packet_alloc(pkt_pool, payload_length); + if (pkt == ODP_PACKET_INVALID) { + app_err("failed to allocate buffer\n"); + return pkt; + } + + odp_packet_copy_from_mem(pkt, 0, sizeof(test_data), test_data); + odp_packet_l3_offset_set(pkt, 0); + + uint8_t *mem = odp_packet_data(pkt); + ((odph_ipv4hdr_t *)mem)->tot_len = odp_cpu_to_be_16(payload_length); + memset(mem + sizeof(test_data), 1, payload_length - sizeof(test_data)); + + return pkt; +} + +/** + * Run measurement iterations for given config and payload size. + * Result of run returned in 'result' out parameter. + */ +static int +run_measure_one(ipsec_args_t *cargs, + odp_ipsec_sa_t sa, + unsigned int payload_length, + time_record_t *start, + time_record_t *end) +{ + odp_ipsec_out_param_t param; + odp_pool_t pkt_pool; + odp_packet_t pkt = ODP_PACKET_INVALID; + int rc = 0; + + pkt_pool = odp_pool_lookup("packet_pool"); + if (pkt_pool == ODP_POOL_INVALID) { + app_err("pkt_pool not found\n"); + return -1; + } + + int packets_sent = 0; + int packets_received = 0; + + /* Initialize parameters block */ + memset(&param, 0, sizeof(param)); + param.num_sa = 1; + param.num_opt = 0; + param.sa = &sa; + + fill_time_record(start); + + while ((packets_sent < cargs->iteration_count) || + (packets_received < cargs->iteration_count)) { + if ((packets_sent < cargs->iteration_count) && + (packets_sent - packets_received < + cargs->in_flight)) { + odp_packet_t out_pkt; + int num_out = 1; + + pkt = make_packet(pkt_pool, payload_length); + if (ODP_PACKET_INVALID == pkt) + return -1; + + out_pkt = cargs->in_place ? pkt : ODP_PACKET_INVALID; + + if (cargs->debug_packets) + odp_packet_print_data(pkt, 0, + odp_packet_len(pkt)); + + rc = odp_ipsec_out(&pkt, 1, + &out_pkt, &num_out, + &param); + if (rc <= 0) { + app_err("failed odp_ipsec_out: rc = %d\n", + rc); + odp_packet_free(pkt); + break; + } + if (odp_packet_has_error(out_pkt)) { + odp_ipsec_packet_result_t result; + + odp_ipsec_result(&result, out_pkt); + app_err("Received error packet: %d\n", + result.status.error.all); + } + packets_sent += rc; + packets_received += num_out; + if (cargs->debug_packets) + odp_packet_print_data(out_pkt, 0, + odp_packet_len(out_pkt)); + odp_packet_free(out_pkt); + } + } + + fill_time_record(end); + + return rc < 0 ? rc : 0; +} + +static int +run_measure_one_async(ipsec_args_t *cargs, + odp_ipsec_sa_t sa, + unsigned int payload_length, + time_record_t *start, + time_record_t *end) +{ + odp_ipsec_out_param_t param; + odp_pool_t pkt_pool; + odp_queue_t out_queue; + odp_packet_t pkt = ODP_PACKET_INVALID; + int rc = 0; + + pkt_pool = odp_pool_lookup("packet_pool"); + if (pkt_pool == ODP_POOL_INVALID) { + app_err("pkt_pool not found\n"); + return -1; + } + + out_queue = odp_queue_lookup("ipsec-out"); + if (out_queue == ODP_QUEUE_INVALID) { + app_err("ipsec-out queue not found\n"); + return -1; + } + + int packets_sent = 0; + int packets_received = 0; + + /* Initialize parameters block */ + memset(&param, 0, sizeof(param)); + param.num_sa = 1; + param.num_opt = 0; + param.sa = &sa; + + fill_time_record(start); + + while ((packets_sent < cargs->iteration_count) || + (packets_received < cargs->iteration_count)) { + odp_event_t ev; + + if ((packets_sent < cargs->iteration_count) && + (packets_sent - packets_received < + cargs->in_flight)) { + pkt = make_packet(pkt_pool, payload_length); + if (ODP_PACKET_INVALID == pkt) + return -1; + + if (cargs->debug_packets) + odp_packet_print_data(pkt, 0, + odp_packet_len(pkt)); + + rc = odp_ipsec_out_enq(&pkt, 1, + &param); + if (rc <= 0) { + app_err("failed odp_crypto_packet_op_enq: rc = %d\n", + rc); + odp_packet_free(pkt); + break; + } + packets_sent += rc; + } + + if (cargs->schedule) + ev = odp_schedule(NULL, + ODP_SCHED_NO_WAIT); + else + ev = odp_queue_deq(out_queue); + + while (ev != ODP_EVENT_INVALID) { + odp_packet_t out_pkt; + odp_ipsec_packet_result_t result; + + out_pkt = odp_ipsec_packet_from_event(ev); + odp_ipsec_result(&result, out_pkt); + + if (cargs->debug_packets) + odp_packet_print_data(out_pkt, 0, + odp_packet_len(out_pkt)); + odp_packet_free(out_pkt); + packets_received++; + if (cargs->schedule) + ev = odp_schedule(NULL, + ODP_SCHED_NO_WAIT); + else + ev = odp_queue_deq(out_queue); + } + } + + fill_time_record(end); + + return rc < 0 ? rc : 0; +} + +/** + * 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(ipsec_args_t *cargs, + ipsec_alg_config_t *config) +{ + odp_ipsec_sa_t sa; + int rc = 0; + unsigned int num_payloads = global_num_payloads; + unsigned int *payloads = global_payloads; + unsigned int i; + + sa = create_sa_from_config(config, cargs); + if (sa == ODP_IPSEC_SA_INVALID) { + app_err("IPsec SA create failed.\n"); + return -1; + } + + print_result_header(); + if (cargs->payload_length) { + num_payloads = 1; + payloads = &cargs->payload_length; + } + + for (i = 0; i < num_payloads; i++) { + double count; + ipsec_run_result_t result; + time_record_t start, end; + + if (cargs->schedule || cargs->poll) + rc = run_measure_one_async(cargs, sa, + payloads[i], + &start, &end); + else + rc = run_measure_one(cargs, sa, + payloads[i], + &start, &end); + if (rc) + break; + + count = get_elapsed_usec(&start, &end); + result.elapsed = count / cargs->iteration_count; + + count = get_rusage_self_diff(&start, &end); + result.rusage_self = count / cargs->iteration_count; + + count = get_rusage_thread_diff(&start, &end); + result.rusage_thread = count / cargs->iteration_count; + + print_result(cargs, payloads[i], + config, &result); + } + + odp_ipsec_sa_disable(sa); + if (cargs->schedule || cargs->poll) { + odp_queue_t out_queue = odp_queue_lookup("ipsec-out"); + odp_ipsec_status_t status; + + while (1) { + odp_event_t event = odp_queue_deq(out_queue); + + if (event != ODP_EVENT_INVALID && + odp_event_type(event) == ODP_EVENT_IPSEC_STATUS && + odp_ipsec_status(&status, event) == ODP_IPSEC_OK && + status.id == ODP_IPSEC_STATUS_SA_DISABLE && + status.sa == sa) + break; + } + } + odp_ipsec_sa_destroy(sa); + + return rc; +} + +typedef struct thr_arg { + ipsec_args_t ipsec_args; + ipsec_alg_config_t *ipsec_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->ipsec_args, + thr_args->ipsec_alg_config); + return 0; +} + +/** + * Prinf usage information + */ +static void usage(char *progname) +{ + printf("\n" + "Usage: %s OPTIONS\n" + " E.g. %s -i 100000\n" + "\n" + "OpenDataPlane crypto speed measure.\n" + "Optional OPTIONS\n" + " -a, --algorithm <name> Specify algorithm name (default all)\n" + " Supported values are:\n", + progname, progname); + + print_config_names(" "); + printf(" -d, --debug Enable dump of processed packets.\n" + " -f, --flight <number> Max number of packet processed in parallel (default 1)\n" + " -i, --iterations <number> Number of iterations.\n" + " -n, --inplace Encrypt on place.\n" + " -l, --payload Payload length.\n" + " -s, --schedule Use scheduler for completion events.\n" + " -p, --poll Poll completion queue for completion events.\n" + " -t, --tunnel Use tunnel-mode IPsec transformation.\n" + " -h, --help Display help and exit.\n" + "\n"); +} + +static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) +{ + int opt; + int long_index; + static const struct option longopts[] = { + {"algorithm", optional_argument, NULL, 'a'}, + {"debug", no_argument, NULL, 'd'}, + {"flight", optional_argument, NULL, 'f'}, + {"help", no_argument, NULL, 'h'}, + {"iterations", optional_argument, NULL, 'i'}, + {"inplace", no_argument, NULL, 'n'}, + {"payload", optional_argument, NULL, 'l'}, + {"sessions", optional_argument, NULL, 'm'}, + {"poll", no_argument, NULL, 'p'}, + {"schedule", no_argument, NULL, 's'}, + {"tunnel", no_argument, NULL, 't'}, + {NULL, 0, NULL, 0} + }; + + static const char *shortopts = "+a:c:df:hi:m:nl:spt"; + + /* let helper collect its own arguments (e.g. --odph_proc) */ + odph_parse_options(argc, argv, shortopts, longopts); + + cargs->in_place = 0; + cargs->in_flight = 1; + cargs->debug_packets = 0; + cargs->iteration_count = 10000; + cargs->payload_length = 0; + cargs->alg_config = NULL; + cargs->schedule = 0; + + opterr = 0; /* do not issue errors on helper options */ + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'a': + cargs->alg_config = find_config_by_name(optarg); + if (!cargs->alg_config) { + printf("cannot test crypto '%s' configuration\n", + optarg); + usage(argv[0]); + exit(-1); + } + break; + case 'd': + cargs->debug_packets = 1; + break; + case 'i': + cargs->iteration_count = atoi(optarg); + break; + case 'f': + cargs->in_flight = atoi(optarg); + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + case 'n': + cargs->in_place = 1; + break; + case 'l': + cargs->payload_length = atoi(optarg); + break; + case 's': + cargs->schedule = 1; + break; + case 'p': + cargs->poll = 1; + break; + case 't': + cargs->tunnel = 1; + break; + default: + break; + } + } + + optind = 1; /* reset 'extern optind' from the getopt lib */ + + if (cargs->schedule && cargs->poll) { + printf("-s (schedule) and -p (poll) options are not compatible\n"); + usage(argv[0]); + exit(-1); + } +} + +int main(int argc, char *argv[]) +{ + ipsec_args_t cargs; + odp_pool_t pool; + odp_queue_param_t qparam; + odp_pool_param_t param; + odp_queue_t out_queue = ODP_QUEUE_INVALID; + thr_arg_t thr_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_ipsec_config_t config; + uint32_t max_seg_len; + unsigned int i; + + memset(&cargs, 0, sizeof(cargs)); + + /* Parse and store the application arguments */ + parse_args(argc, argv, &cargs); + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, NULL, NULL)) { + app_err("ODP global init failed.\n"); + exit(EXIT_FAILURE); + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_WORKER)) { + app_err("ODP local init failed.\n"); + exit(EXIT_FAILURE); + } + + if (odp_pool_capability(&capa)) { + app_err("Pool capability request failed.\n"); + exit(EXIT_FAILURE); + } + + max_seg_len = capa.pkt.max_seg_len; + + for (i = 0; i < sizeof(global_payloads) / sizeof(unsigned int); i++) { + if (global_payloads[i] > max_seg_len) + break; + } + + global_num_payloads = i; + + /* Create packet pool */ + odp_pool_param_init(&param); + param.pkt.seg_len = max_seg_len; + param.pkt.len = max_seg_len; + param.pkt.num = POOL_NUM_PKT; + param.type = ODP_POOL_PACKET; + pool = odp_pool_create("packet_pool", &param); + + if (pool == ODP_POOL_INVALID) { + app_err("packet pool create failed.\n"); + exit(EXIT_FAILURE); + } + odp_pool_print(pool); + + odp_ipsec_config_init(&config); + config.max_num_sa = 2; + config.inbound.chksums.all_chksum = 0; + config.outbound.all_chksum = 0; + + odp_queue_param_init(&qparam); + if (cargs.schedule) { + qparam.type = ODP_QUEUE_TYPE_SCHED; + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; + qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL; + qparam.sched.group = ODP_SCHED_GROUP_ALL; + out_queue = odp_queue_create("ipsec-out", &qparam); + } else if (cargs.poll) { + qparam.type = ODP_QUEUE_TYPE_PLAIN; + out_queue = odp_queue_create("ipsec-out", &qparam); + } + if (cargs.schedule || cargs.poll) { + if (out_queue == ODP_QUEUE_INVALID) { + app_err("ipsec-out queue create failed.\n"); + exit(EXIT_FAILURE); + } + config.inbound_mode = ODP_IPSEC_OP_MODE_ASYNC; + config.outbound_mode = ODP_IPSEC_OP_MODE_ASYNC; + config.inbound.default_queue = out_queue; + } else { + config.inbound_mode = ODP_IPSEC_OP_MODE_SYNC; + config.outbound_mode = ODP_IPSEC_OP_MODE_SYNC; + config.inbound.default_queue = ODP_QUEUE_INVALID; + } + + if (cargs.schedule) { + printf("Run in async scheduled mode\n"); + + thr_arg.ipsec_args = cargs; + thr_arg.ipsec_alg_config = cargs.alg_config; + num_workers = odp_cpumask_default_worker(&cpumask, + num_workers); + (void)odp_cpumask_to_str(&cpumask, cpumaskstr, + sizeof(cpumaskstr)); + printf("num worker threads: %i\n", + num_workers); + printf("first CPU: %i\n", + odp_cpumask_first(&cpumask)); + printf("cpu mask: %s\n", + cpumaskstr); + } else if (cargs.poll) { + printf("Run in async poll mode\n"); + } else { + printf("Run in sync mode\n"); + } + + memset(thr, 0, sizeof(thr)); + + if (cargs.alg_config) { + odph_odpthread_params_t thr_param; + + memset(&thr_param, 0, sizeof(thr_param)); + thr_param.start = run_thr_func; + thr_param.arg = &thr_arg; + thr_param.thr_type = ODP_THREAD_WORKER; + thr_param.instance = instance; + + if (cargs.schedule) { + odph_odpthreads_create(&thr[0], &cpumask, &thr_param); + odph_odpthreads_join(&thr[0]); + } else { + run_measure_one_config(&cargs, cargs.alg_config); + } + } else { + unsigned int i; + + for (i = 0; + i < (sizeof(algs_config) / sizeof(ipsec_alg_config_t)); + i++) { + run_measure_one_config(&cargs, algs_config + i); + } + } + + if (cargs.schedule || cargs.poll) + odp_queue_destroy(out_queue); + if (odp_pool_destroy(pool)) { + app_err("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + app_err("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + app_err("Error: term global\n"); + exit(EXIT_FAILURE); + } + + return 0; +} + ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_crypto.c | 25 +- platform/linux-generic/odp_ipsec_sad.c | 5 + test/performance/Makefile.am | 2 + test/performance/odp_crypto.c | 131 +++ test/performance/{odp_crypto.c => odp_ipsec.c} | 1035 +++++++++++++----------- 5 files changed, 734 insertions(+), 464 deletions(-) copy test/performance/{odp_crypto.c => odp_ipsec.c} (56%) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-15-g0225a8a3

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 0225a8a396ddc7168be096f28b0a711184a48ef9 (commit) from 72febbae5ea55a5fd051978fbfa0f669cf0e99fc (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 0225a8a396ddc7168be096f28b0a711184a48ef9 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Mar 22 08:51:27 2018 +0200 linux-gen: pktio: dpdk: fix IPv4 csum calculation when l4 offset is not set IPv4 header contains length of the header and options in IHL field. It can be used to replace L3 length calculation based on offsets. This patch fixes bug: https://bugs.linaro.org/show_bug.cgi?id=3686. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 83dbec4f..d40ad954 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -656,11 +656,7 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, if (!ipv4_chksum_pkt && !udp_chksum_pkt && !tcp_chksum_pkt) return; - if (pkt_p->l4_offset == ODP_PACKET_OFFSET_INVALID) - return; - mbuf->l2_len = pkt_p->l3_offset - pkt_p->l2_offset; - mbuf->l3_len = pkt_p->l4_offset - pkt_p->l3_offset; if (l3_proto_v4) mbuf->ol_flags = PKT_TX_IPV4; @@ -671,8 +667,14 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, mbuf->ol_flags |= PKT_TX_IP_CKSUM; ((struct ipv4_hdr *)l3_hdr)->hdr_checksum = 0; + mbuf->l3_len = _ODP_IPV4HDR_IHL(*(uint8_t *)l3_hdr) * 4; } + if (pkt_p->l4_offset == ODP_PACKET_OFFSET_INVALID) + return; + + mbuf->l3_len = pkt_p->l4_offset - pkt_p->l3_offset; + l4_hdr = (void *)(mbuf_data + pkt_p->l4_offset); if (udp_chksum_pkt) { ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/dpdk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-14-g72febbae

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 72febbae5ea55a5fd051978fbfa0f669cf0e99fc (commit) from f80f28c4046b650c180bcb9b41c859c0c8e2564e (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 72febbae5ea55a5fd051978fbfa0f669cf0e99fc Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Mar 22 16:57:49 2018 +0200 linux-gen: pktio: dpdk: accept UDPv4 packets with all-zero csum Accept IPv4 UDP packets with all-zero checksum field even if DPDK reported it as bad checksum value. This patch fixes bug: https://bugs.linaro.org/show_bug.cgi?id=3685. Signed-off-by: Bogdan Pricope <bogdan.pricope(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/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 7b9fed72..83dbec4f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -27,6 +27,7 @@ #include <odp_libconfig_internal.h> #include <protocols/eth.h> +#include <protocols/udp.h> #include <rte_config.h> #include <rte_malloc.h> @@ -419,6 +420,7 @@ MEMPOOL_REGISTER_OPS(ops_stack); #define IP4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_IP_CKSUM_MASK) #define L4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_L4_CKSUM_MASK) #define HAS_L4_PROTO(m, proto) ((m->packet_type & RTE_PTYPE_L4_MASK) == proto) +#define UDP4_CSUM(_p) (((_odp_udphdr_t *)_odp_packet_l4_ptr(_p, NULL))->chksum) #define PKTIN_CSUM_BITS 0x1C @@ -451,6 +453,12 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) { pkt_hdr->p.input_flags.l4_chksum_done = 1; } else if (packet_csum_result != PKT_RX_L4_CKSUM_UNKNOWN) { + if (pkt_hdr->p.input_flags.ipv4 && + pkt_hdr->p.input_flags.udp && + !UDP4_CSUM(packet_handle(pkt_hdr))) { + pkt_hdr->p.input_flags.l4_chksum_done = 1; + return 0; + } if (pktin_cfg->bit.drop_udp_err) return -1; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/dpdk.c | 8 ++++++++ 1 file changed, 8 insertions(+) hooks/post-receive --

6 years, 10 months

[COMMIT] annotated tag v1.18.0.1_tigermoth_rc3 created. v1.18.0.1_tigermoth_rc3

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 annotated tag, v1.18.0.1_tigermoth_rc3 has been created at a4b03ec79a8bf5d75925e13a5197bf504dfed808 (tag) tagging 3c5cc8070d3bc8b7429f0410de6ef3009ff6a28f (commit) replaces v1.18.0.0_tigermoth_rc2 tagged by Maxim Uvarov on Thu Mar 29 11:46:47 2018 +0300 - Log ----------------------------------------------------------------- Tiger Moth LTS rc3 Balasubramanian Manoharan (1): validation: cls: add cls capability check Bill Fischofer (1): changelog: updates for odp v1.18.0.1 Dmitry Eremin-Solenikov (6): linux-gen: ipsec: support tfc_pad_len IPsec option linux-gen: ipsec: support TFC dummy packet generation validation: ipsec: verify TFC dummy packet generation build: make so numbering to be tied to ODP versions test: l2fwd: enforce dependency between l2fwd test and generator build: change order of subdirectories Josep Puigdemont (2): odp_dpdk.m4: check for DPDK static libraries odp_dpdk.m4: use correct installation directory Matias Elo (5): linux-gen: add runtime configuration file validation: pktio: remove pktio_test_send_failure test checkpatch: update to the latest version configure: add check for 'xxd' tool test: mmap_vlan_ins: wait before removing test interfaces Maxim Uvarov (7): linux-gen: fix crypto merge aes_gmac_gen_init/aes_gmac_check_init linux-gen: check crypto pool allocation linux-gen: crypto: remove odp prefix from internal crypto_int linux-gen: crypto: set pkt_out to INVALID on error shippable: do not use huge pages shippable: disable abi compat mode tests on aarch64 configure.ac: update version to v1.18.0.1 Petri Savolainen (10): linux-gen: version: implementation name content linux-gen: sysinfo: add content to info string print linux-gen: pktio: add debug prints linux-gen: queue: improve debug print linux-gen: sched: optimize packet input polling linux-gen: sched: optimize atomic packet input queue throughput linux-gen: queue: enqueue may fail linux-gen: sched: optimize parallel packet input queue throughput linux-gen: sched: use stash prefix linux-gen: sched: optimize local variable layout Yi He (1): validation: scheduler: fix test_wait_time failure ----------------------------------------------------------------------- hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc3-13-gf80f28c4

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 f80f28c4046b650c180bcb9b41c859c0c8e2564e (commit) via b08aa94548163ae4d4bac2724e68ca9102667f6a (commit) via 4aacfd4d72b80a22d449d865a6c4f063afa823ab (commit) from 71ca38c00c11ebb6b4dede6d09ebdd28eb45d890 (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 f80f28c4046b650c180bcb9b41c859c0c8e2564e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Mar 15 16:43:55 2018 +0200 test: sched_pktio: new scheduler performance test with pktio Added new test which can be used to test scheduler performance with packet IO. Future development includes multiple application pipeline stages through queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/.gitignore b/test/performance/.gitignore index 72035e00..259f690c 100644 --- a/test/performance/.gitignore +++ b/test/performance/.gitignore @@ -7,4 +7,5 @@ odp_l2fwd odp_pktio_ordered odp_pktio_perf odp_sched_latency +odp_sched_pktio odp_scheduling diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index e50c840b..458c8fb0 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -9,6 +9,7 @@ EXECUTABLES = odp_bench_packet \ COMPILE_ONLY = odp_l2fwd \ odp_pktio_ordered \ odp_sched_latency \ + odp_sched_pktio \ odp_scheduling TESTSCRIPTS = odp_l2fwd_run.sh \ @@ -31,6 +32,7 @@ odp_bench_packet_SOURCES = odp_bench_packet.c odp_crypto_SOURCES = odp_crypto.c odp_pktio_ordered_SOURCES = odp_pktio_ordered.c dummy_crc.h odp_sched_latency_SOURCES = odp_sched_latency.c +odp_sched_pktio_SOURCES = odp_sched_pktio.c odp_scheduling_SOURCES = odp_scheduling.c odp_pktio_perf_SOURCES = odp_pktio_perf.c diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c new file mode 100644 index 00000000..cf6e17f4 --- /dev/null +++ b/test/performance/odp_sched_pktio.c @@ -0,0 +1,722 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <string.h> +#include <signal.h> +#include <stdlib.h> + +#include <odp_api.h> +#include <odp/helper/odph_api.h> + +#define MAX_WORKERS 64 +#define MAX_PKTIOS 32 +#define MAX_PKTIO_NAME 31 +#define MAX_PKTIO_QUEUES MAX_WORKERS +#define MAX_PKT_LEN 1514 +#define MAX_PKT_NUM (16 * 1024) +#define MIN_PKT_SEG_LEN 64 +#define BURST_SIZE 32 +#define CHECK_PERIOD 10000 +#define MAX_PKTIO_INDEXES 256 + +typedef struct { + int worker_id; + void *test_global_ptr; +} worker_arg_t; + +typedef struct { + volatile int stop_workers; + odp_barrier_t worker_start; + + struct { + int num_worker; + int num_pktio; + } opt; + + int max_workers; + odp_cpumask_t cpumask; + odp_instance_t instance; + + int worker_cpu[MAX_WORKERS]; + + odp_pool_t pool; + uint32_t pkt_len; + uint32_t pkt_num; + + unsigned int num_input_queues; + unsigned int num_output_queues; + + struct { + char name[MAX_PKTIO_NAME + 1]; + odp_pktio_t pktio; + int pktio_index; + int started; + odph_ethaddr_t my_addr; + odp_queue_t input_queue[MAX_PKTIO_QUEUES]; + odp_pktout_queue_t pktout[MAX_PKTIO_QUEUES]; + + } pktio[MAX_PKTIOS]; + + worker_arg_t worker_arg[MAX_WORKERS]; + + /* Maps pktio input index to pktio[] index for output */ + uint8_t pktio_map[MAX_PKTIO_INDEXES]; + +} test_global_t; + +static test_global_t *test_global; + +static inline void set_dst_eth_addr(odph_ethaddr_t *eth_addr, int index) +{ + eth_addr->addr[0] = 0x02; + eth_addr->addr[1] = 0; + eth_addr->addr[2] = 0; + eth_addr->addr[3] = 0; + eth_addr->addr[4] = 0; + eth_addr->addr[5] = index; +} + +static inline void fill_eth_addr(odp_packet_t pkt[], int num, + test_global_t *test_global, int out) +{ + odph_ethhdr_t *eth; + int i; + + for (i = 0; i < num; ++i) { + eth = odp_packet_data(pkt[i]); + + eth->src = test_global->pktio[out].my_addr; + set_dst_eth_addr(&eth->dst, out); + } +} + +static int worker_thread(void *arg) +{ + odp_event_t ev[BURST_SIZE]; + int num, sent, drop, in, out; + odp_pktout_queue_t pktout; + worker_arg_t *worker_arg = arg; + test_global_t *test_global = worker_arg->test_global_ptr; + int worker_id = worker_arg->worker_id; + uint32_t polls = 0; + + printf("Worker %i started\n", worker_id); + + /* Wait for other workers to start */ + odp_barrier_wait(&test_global->worker_start); + + while (1) { + odp_packet_t pkt[BURST_SIZE]; + + num = odp_schedule_multi(NULL, ODP_SCHED_NO_WAIT, + ev, BURST_SIZE); + + polls++; + + if (polls == CHECK_PERIOD) { + polls = 0; + if (test_global->stop_workers) + break; + } + + if (num <= 0) + continue; + + odp_packet_from_event_multi(pkt, ev, num); + + in = odp_packet_input_index(pkt[0]); + out = test_global->pktio_map[in]; + pktout = test_global->pktio[out].pktout[worker_id]; + + fill_eth_addr(pkt, num, test_global, out); + + sent = odp_pktout_send(pktout, pkt, num); + + if (odp_unlikely(sent < 0)) + sent = 0; + + drop = num - sent; + + if (odp_unlikely(drop)) + odp_packet_free_multi(&pkt[sent], drop); + } + + printf("Worker %i stopped\n", worker_id); + + return 0; +} + +static void sig_handler(int signo) +{ + (void)signo; + + if (test_global) { + test_global->stop_workers = 1; + odp_mb_full(); + } +} + +/* Get rid of path in filename - only for unix-type paths using '/' */ +#define NO_PATH(x) (strrchr((x), '/') ? strrchr((x), '/') + 1 : (x)) + +static void print_usage(const char *progname) +{ + printf("\n" + "Scheduler with packet IO test application.\n" + "\n" + "Usage: %s [options]\n" + "\n" + "OPTIONS:\n" + " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" + " -c, --count Worker thread count. Default: 1\n" + " -h, --help Display help and exit.\n\n", + NO_PATH(progname)); +} + +static int parse_options(int argc, char *argv[], test_global_t *test_global) +{ + int i, opt, long_index; + char *name, *str; + int len, str_len; + const struct option longopts[] = { + {"interface", required_argument, NULL, 'i'}, + {"count", required_argument, NULL, 'c'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + const char *shortopts = "+i:c:h"; + int ret = 0; + + test_global->opt.num_worker = 1; + + /* let helper collect its own arguments (e.g. --odph_proc) */ + odph_parse_options(argc, argv, shortopts, longopts); + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'i': + i = 0; + str = optarg; + str_len = strlen(str); + + while (str_len > 0) { + len = strcspn(str, ","); + str_len -= len + 1; + + if (i == MAX_PKTIOS) { + printf("Error: Too many interfaces\n"); + ret = -1; + break; + } + + if (len > MAX_PKTIO_NAME) { + printf("Error: Too long interface name %s\n", + str); + ret = -1; + break; + } + + name = test_global->pktio[i].name; + memcpy(name, str, len); + str += len + 1; + i++; + } + + test_global->opt.num_pktio = i; + + break; + case 'c': + test_global->opt.num_worker = atoi(optarg); + break; + case 'h': + print_usage(argv[0]); + ret = -1; + break; + default: + ret = -1; + break; + } + } + + return ret; +} + +static int config_setup(test_global_t *test_global) +{ + int i, cpu; + odp_pool_capability_t pool_capa; + uint32_t pkt_len, pkt_num; + odp_cpumask_t *cpumask = &test_global->cpumask; + + test_global->max_workers = odp_cpumask_default_worker(cpumask, 0); + + if (test_global->opt.num_worker > test_global->max_workers || + test_global->opt.num_worker > MAX_WORKERS) { + printf("Error: Too many workers %i.\n", + test_global->opt.num_worker); + return -1; + } + + cpu = odp_cpumask_first(cpumask); + for (i = 0; i < test_global->opt.num_worker; ++i) { + test_global->worker_cpu[i] = cpu; + cpu = odp_cpumask_next(cpumask, cpu); + } + + if (test_global->opt.num_pktio == 0) { + printf("Error: At least one pktio interface needed.\n"); + return -1; + } + + if (MAX_PKTIO_INDEXES <= odp_pktio_max_index()) { + printf("Error: Larger pktio_map[] table needed: %u\n", + odp_pktio_max_index()); + return -1; + } + + if (odp_pool_capability(&pool_capa)) { + printf("Error: Pool capability failed.\n"); + return -1; + } + + pkt_len = MAX_PKT_LEN; + pkt_num = MAX_PKT_NUM; + + if (pool_capa.pkt.max_len && pkt_len > pool_capa.pkt.max_len) + pkt_len = pool_capa.pkt.max_len; + + if (pool_capa.pkt.max_num && pkt_num > pool_capa.pkt.max_num) + pkt_num = pool_capa.pkt.max_num; + + test_global->pkt_len = pkt_len; + test_global->pkt_num = pkt_num; + + if (test_global->num_input_queues == 0) + test_global->num_input_queues = test_global->opt.num_worker; + + if (test_global->num_output_queues == 0) + test_global->num_output_queues = test_global->opt.num_worker; + + return 0; +} + +static void print_config(test_global_t *test_global) +{ + char cpumask_str[ODP_CPUMASK_STR_SIZE]; + int i; + + odp_cpumask_to_str(&test_global->cpumask, cpumask_str, + ODP_CPUMASK_STR_SIZE); + + printf("\n" + "Test configuration:\n" + " max workers: %i\n" + " available worker cpus: %s\n" + " num workers: %i\n" + " worker cpus: ", + test_global->max_workers, + cpumask_str, + test_global->opt.num_worker); + + for (i = 0; i < test_global->opt.num_worker; i++) + printf(" %i", test_global->worker_cpu[i]); + + printf("\n" + " num interfaces: %i\n" + " interface names: ", test_global->opt.num_pktio); + + for (i = 0; i < test_global->opt.num_pktio; i++) + printf(" %s", test_global->pktio[i].name); + + printf("\n" + " num input queues: %i\n" + " num output queues: %i\n", + test_global->num_input_queues, test_global->num_output_queues); + + printf("\n"); +} + +static int open_pktios(test_global_t *test_global) +{ + odp_pool_param_t pool_param; + odp_pktio_param_t pktio_param; + odp_pool_t pool; + odp_pktio_t pktio; + odp_pktio_capability_t pktio_capa; + odp_pktio_config_t pktio_config; + odp_pktin_queue_param_t pktin_param; + odp_pktout_queue_param_t pktout_param; + odp_schedule_sync_t sched_sync; + unsigned int num_input, num_output; + char *name; + int i, num_pktio, ret; + + num_pktio = test_global->opt.num_pktio; + num_input = test_global->num_input_queues; + num_output = test_global->num_output_queues; + + odp_pool_param_init(&pool_param); + pool_param.pkt.seg_len = MIN_PKT_SEG_LEN; + pool_param.pkt.len = test_global->pkt_len; + pool_param.pkt.num = test_global->pkt_num; + pool_param.type = ODP_POOL_PACKET; + + pool = odp_pool_create("packet pool", &pool_param); + + test_global->pool = pool; + + if (pool == ODP_POOL_INVALID) { + printf("Error: Pool create.\n"); + return -1; + } + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_SCHED; + pktio_param.out_mode = ODP_PKTOUT_MODE_DIRECT; + + sched_sync = ODP_SCHED_SYNC_ATOMIC; + + for (i = 0; i < num_pktio; i++) + test_global->pktio[i].pktio = ODP_PKTIO_INVALID; + + /* Open and configure interfaces */ + for (i = 0; i < num_pktio; i++) { + name = test_global->pktio[i].name; + pktio = odp_pktio_open(name, pool, &pktio_param); + + if (pktio == ODP_PKTIO_INVALID) { + printf("Error (%s): Pktio open failed.\n", name); + return -1; + } + + test_global->pktio[i].pktio = pktio; + test_global->pktio[i].pktio_index = odp_pktio_index(pktio); + + ret = odp_pktio_mac_addr(pktio, + test_global->pktio[i].my_addr.addr, + ODPH_ETHADDR_LEN); + if (ret != ODPH_ETHADDR_LEN) { + printf("Error (%s): Bad MAC address len.\n", name); + return -1; + } + + odp_pktio_print(pktio); + + if (odp_pktio_capability(pktio, &pktio_capa)) { + printf("Error (%s): Pktio capa failed.\n", name); + return -1; + } + + if (num_input > pktio_capa.max_input_queues) { + printf("Error (%s): Too many input queues: %u\n", + name, num_input); + return -1; + } + + if (num_output > pktio_capa.max_output_queues) { + printf("Error (%s): Too many output queues: %u\n", + name, num_output); + return -1; + } + + odp_pktio_config_init(&pktio_config); + pktio_config.parser.layer = ODP_PROTO_LAYER_NONE; + + odp_pktio_config(pktio, &pktio_config); + + odp_pktin_queue_param_init(&pktin_param); + + pktin_param.queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT; + pktin_param.queue_param.sched.sync = sched_sync; + pktin_param.queue_param.sched.group = ODP_SCHED_GROUP_ALL; + + if (num_input > 1) { + pktin_param.hash_enable = 1; + pktin_param.hash_proto.proto.ipv4_udp = 1; + } + + pktin_param.num_queues = num_input; + + if (odp_pktin_queue_config(pktio, &pktin_param)) { + printf("Error (%s): Pktin config failed.\n", name); + return -1; + } + + if (odp_pktin_event_queue(pktio, + test_global->pktio[i].input_queue, + num_input) != (int)num_input) { + printf("Error (%s): Input queue query failed.\n", name); + return -1; + } + + odp_pktout_queue_param_init(&pktout_param); + pktout_param.num_queues = num_output; + pktout_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; + + if (odp_pktout_queue_config(pktio, &pktout_param)) { + printf("Error (%s): Pktout config failed.\n", name); + return -1; + } + + if (odp_pktout_queue(pktio, + test_global->pktio[i].pktout, + num_output) != (int)num_output) { + printf("Error (%s): Output queue query failed.\n", + name); + return -1; + } + } + + return 0; +} + +static void link_pktios(test_global_t *test_global) +{ + int i, num_pktio, input, output; + + num_pktio = test_global->opt.num_pktio; + + printf("Forwarding table (pktio indexes)\n"); + + /* If single interface loopback, otherwise forward to the next + * interface. */ + for (i = 0; i < num_pktio; i++) { + input = test_global->pktio[i].pktio_index; + output = (i + 1) % num_pktio; + test_global->pktio_map[input] = output; + printf(" input %i, output %i\n", + input, + test_global->pktio[output].pktio_index); + } + + printf("\n"); +} + +static int start_pktios(test_global_t *test_global) +{ + int i; + + for (i = 0; i < test_global->opt.num_pktio; i++) { + if (odp_pktio_start(test_global->pktio[i].pktio)) { + printf("Error (%s): Pktio start failed.\n", + test_global->pktio[i].name); + + return -1; + } + + test_global->pktio[i].started = 1; + } + + return 0; +} + +static int stop_pktios(test_global_t *test_global) +{ + odp_pktio_t pktio; + int i, ret = 0; + + for (i = 0; i < test_global->opt.num_pktio; i++) { + pktio = test_global->pktio[i].pktio; + + if (pktio == ODP_PKTIO_INVALID || + test_global->pktio[i].started == 0) + continue; + + if (odp_pktio_stop(pktio)) { + printf("Error (%s): Pktio stop failed.\n", + test_global->pktio[i].name); + ret = -1; + } + } + + return ret; +} + +static void empty_queues(void) +{ + odp_event_t ev; + uint64_t wait_time = odp_schedule_wait_time(ODP_TIME_SEC_IN_NS / 2); + + /* Drop all events from all queues */ + while (1) { + ev = odp_schedule(NULL, wait_time); + + if (ev == ODP_EVENT_INVALID) + break; + + odp_event_free(ev); + } +} + +static int close_pktios(test_global_t *test_global) +{ + odp_pktio_t pktio; + odp_pool_t pool; + int i, ret = 0; + + for (i = 0; i < test_global->opt.num_pktio; i++) { + pktio = test_global->pktio[i].pktio; + + if (pktio == ODP_PKTIO_INVALID) + continue; + + if (odp_pktio_close(pktio)) { + printf("Error (%s): Pktio close failed.\n", + test_global->pktio[i].name); + ret = -1; + } + } + + pool = test_global->pool; + + if (pool == ODP_POOL_INVALID) + return ret; + + if (odp_pool_destroy(pool)) { + printf("Error: Pool destroy failed.\n"); + ret = -1; + } + + return ret; +} + +static void start_workers(odph_odpthread_t thread[], + test_global_t *test_global) +{ + int i; + odp_cpumask_t cpumask; + odph_odpthread_params_t param; + int num = test_global->opt.num_worker; + + memset(&param, 0, sizeof(odph_odpthread_params_t)); + param.start = worker_thread; + param.thr_type = ODP_THREAD_WORKER; + param.instance = test_global->instance; + + memset(thread, 0, num * sizeof(odph_odpthread_t)); + + for (i = 0; i < num; i++) { + odp_cpumask_zero(&cpumask); + odp_cpumask_set(&cpumask, test_global->worker_cpu[i]); + test_global->worker_arg[i].worker_id = i; + test_global->worker_arg[i].test_global_ptr = test_global; + param.arg = &test_global->worker_arg[i]; + + odph_odpthreads_create(&thread[i], &cpumask, &param); + } +} + +static void wait_workers(odph_odpthread_t thread[], test_global_t *test_global) +{ + int i; + + for (i = 0; i < test_global->opt.num_worker; ++i) + odph_odpthreads_join(&thread[i]); +} + +int main(int argc, char *argv[]) +{ + odp_instance_t instance; + odp_init_t init; + odp_shm_t shm; + odph_odpthread_t thread[MAX_WORKERS]; + + signal(SIGINT, sig_handler); + + /* List features not to be used (may optimize performance) */ + odp_init_param_init(&init); + init.not_used.feat.cls = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.timer = 1; + init.not_used.feat.tm = 1; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, &init, NULL)) { + printf("Error: Global init failed.\n"); + return -1; + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + printf("Error: Local init failed.\n"); + return -1; + } + + /* Reserve memory for args from shared mem */ + shm = odp_shm_reserve("test_global", sizeof(test_global_t), + ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + printf("Error: shm reserve failed.\n"); + return -1; + } + + test_global = odp_shm_addr(shm); + memset(test_global, 0, sizeof(test_global_t)); + + test_global->instance = instance; + test_global->pool = ODP_POOL_INVALID; + + if (parse_options(argc, argv, test_global)) + goto quit; + + odp_sys_info_print(); + + if (config_setup(test_global)) + goto quit; + + print_config(test_global); + + if (open_pktios(test_global)) + goto quit; + + link_pktios(test_global); + + odp_barrier_init(&test_global->worker_start, + test_global->opt.num_worker + 1); + + start_workers(thread, test_global); + + /* Synchronize pktio configuration with workers. Worker are now ready + * to process packets. */ + odp_barrier_wait(&test_global->worker_start); + + if (start_pktios(test_global)) { + test_global->stop_workers = 1; + odp_mb_full(); + } + + wait_workers(thread, test_global); + +quit: + stop_pktios(test_global); + empty_queues(); + close_pktios(test_global); + + if (odp_shm_free(shm)) { + printf("Error: shm free failed.\n"); + return -1; + } + + if (odp_term_local()) { + printf("Error: term local failed.\n"); + return -1; + } + + if (odp_term_global(instance)) { + printf("Error: term global failed.\n"); + return -1; + } + + return 0; +} commit b08aa94548163ae4d4bac2724e68ca9102667f6a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Mar 16 11:37:20 2018 +0200 linux-gen: pktio: add index to pktio print Print also pktio index. It is often more useful information to the user than handle (which may be e.g. a pointer). 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_packet_io.c b/platform/linux-generic/odp_packet_io.c index 5b019579..bf7aef14 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1169,13 +1169,15 @@ void odp_pktio_print(odp_pktio_t hdl) len += snprintf(&str[len], n - len, "pktio\n"); - len += snprintf(&str[len], n - len, - " handle %" PRIu64 "\n", - odp_pktio_to_u64(hdl)); len += snprintf(&str[len], n - len, " name %s\n", entry->s.name); len += snprintf(&str[len], n - len, " type %s\n", entry->s.ops->name); + len += snprintf(&str[len], n - len, + " index %i\n", _odp_pktio_index(hdl)); + len += snprintf(&str[len], n - len, + " handle (u64) %" PRIu64 "\n", + odp_pktio_to_u64(hdl)); len += snprintf(&str[len], n - len, " state %s\n", entry->s.state == PKTIO_STATE_STARTED ? "start" : commit 4aacfd4d72b80a22d449d865a6c4f063afa823ab Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Mar 15 16:47:09 2018 +0200 linux-gen: pktio: add error prints Added error prints for failures due to a bad handle. 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_packet_io.c b/platform/linux-generic/odp_packet_io.c index 56e9f686..5b019579 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -376,8 +376,10 @@ int odp_pktio_close(odp_pktio_t hdl) int res; entry = get_pktio_entry(hdl); - if (entry == NULL) + if (entry == NULL) { + ODP_ERR("Bad handle\n"); return -1; + } if (entry->s.state == PKTIO_STATE_STARTED) { ODP_DBG("Missing odp_pktio_stop() before close.\n"); @@ -416,8 +418,10 @@ int odp_pktio_config(odp_pktio_t hdl, const odp_pktio_config_t *config) int res = 0; entry = get_pktio_entry(hdl); - if (!entry) + if (!entry) { + ODP_ERR("Bad handle\n"); return -1; + } if (config == NULL) { odp_pktio_config_init(&default_config); @@ -466,12 +470,15 @@ int odp_pktio_start(odp_pktio_t hdl) int res = 0; entry = get_pktio_entry(hdl); - if (!entry) + if (!entry) { + ODP_ERR("Bad handle\n"); return -1; + } lock_entry(entry); if (entry->s.state == PKTIO_STATE_STARTED) { unlock_entry(entry); + ODP_ERR("Already started\n"); return -1; } if (entry->s.ops->start) @@ -513,8 +520,10 @@ static int _pktio_stop(pktio_entry_t *entry) int res = 0; odp_pktin_mode_t mode = entry->s.param.in_mode; - if (entry->s.state != PKTIO_STATE_STARTED) + if (entry->s.state != PKTIO_STATE_STARTED) { + ODP_ERR("Not started\n"); return -1; + } if (entry->s.ops->stop) res = entry->s.ops->stop(entry); @@ -536,8 +545,10 @@ int odp_pktio_stop(odp_pktio_t hdl) int res; entry = get_pktio_entry(hdl); - if (!entry) + if (!entry) { + ODP_ERR("Bad handle\n"); return -1; + } lock_entry(entry); res = _pktio_stop(entry); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet_io.c | 29 +- test/performance/.gitignore | 1 + test/performance/Makefile.am | 2 + test/performance/odp_sched_pktio.c | 722 +++++++++++++++++++++++++++++++++ 4 files changed, 746 insertions(+), 8 deletions(-) create mode 100644 test/performance/odp_sched_pktio.c hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.18.0.0_tigermoth_rc3-10-g71ca38c0

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 71ca38c00c11ebb6b4dede6d09ebdd28eb45d890 (commit) from 7e0c523ad6f209f238277e4116c21ba696edb7f4 (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 71ca38c00c11ebb6b4dede6d09ebdd28eb45d890 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Mar 13 08:44:50 2018 +0200 linux-gen: dpdk: bump supported dpdk version to v17.11 Bump supported DPDK version to LTS version 17.11. Also adds dependecies for optional Mellanox PMD drivers. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bogdan Pricope <bogdan.pricope(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/.travis.yml b/.travis.yml index 1f5ef42e..2f47ed79 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.08" + - DPDK_VERS="17.11" matrix: - CONF="" - CONF="--disable-abi-compat" @@ -59,8 +59,6 @@ env: - CONF="--disable-host-optimization" - CONF="--disable-host-optimization --disable-abi-compat" - DPDK_SHARED="y" CONF="--disable-static-applications" - - DPDK_VERS="17.11" CONF="" - - DPDK_VERS="17.11" DPDK_SHARED="y" CONF="--disable-static-applications" compiler: - gcc @@ -196,7 +194,7 @@ install: fi DPDK_TARGET="${DPDK_TARGET}gcc" if [ ! -f "dpdk/${TARGET}/usr/local/lib/libdpdk.$LIBDPDKEXT" ]; then - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk + 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 @@ -207,6 +205,10 @@ install: make config T=${DPDK_TARGET} O=${TARGET} pushd ${TARGET} sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config + # OCTEON TX driver includes ARM v8.1 instructions + sed -ri 's,(CONFIG_RTE_LIBRTE_OCTEONTX_PMD=).*,\1n,' .config + sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=).*,\1n,' .config + sed -ri 's,(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=).*,\1n,' .config if test -n "${DPDK_MACHINE}" ; then sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config fi diff --git a/DEPENDENCIES b/DEPENDENCIES index 2cd8ccb4..f328e787 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -174,7 +174,7 @@ Prerequisites for building the OpenDataPlane (ODP) API 3.4.1 Building DPDK and ODP with DPDK pktio support - DPDK packet I/O has been tested to work with DPDK v17.08. + DPDK packet I/O has been tested to work with DPDK v17.11. Follow steps in ./scripts/build-pktio-dpdk diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index b94c9b55..dccc6569 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -9,6 +9,8 @@ cur_driver=`basename "$filename" .a | sed -e 's/^lib//'` AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) AS_CASE([$cur_driver], [rte_pmd_nfp], [AS_VAR_APPEND([DPDK_LIBS], [" -lm"])], + [rte_pmd_mlx4], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx4 -libverbs"])], + [rte_pmd_mlx5], [AS_VAR_APPEND([DPDK_LIBS], [" -lmlx5 -libverbs"])], [rte_pmd_pcap], [AS_VAR_APPEND([DPDK_LIBS], [" -lpcap"])], [rte_pmd_openssl], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])]) done diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk index 26afd97c..b0c0a4d0 100755 --- a/scripts/build-pktio-dpdk +++ b/scripts/build-pktio-dpdk @@ -16,7 +16,7 @@ if [ "$?" != "0" ]; then exit 1 fi -git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.08 http://dpdk.org/git/dpdk dpdk +git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=17.11 http://dpdk.org/git/dpdk-stable dpdk pushd dpdk git log --oneline --decorate ----------------------------------------------------------------------- Summary of changes: .travis.yml | 10 ++++++---- DEPENDENCIES | 2 +- m4/odp_dpdk.m4 | 2 ++ scripts/build-pktio-dpdk | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) hooks/post-receive --

6 years, 11 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp March 2018