git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch master updated. v1.21.0.0-53-ga45047e72

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 a45047e728ca1cc0c97e0201eb9900daae5730b6 (commit) via 11a190a3909c06c7c2042826e6a96d2396cd4428 (commit) via 5062afae2d8dc38c1f7db8b089d22fcc9ed17fb2 (commit) via 88aff57e9b06af8919aaa01b548813f0828f9af0 (commit) via 3e7aa57be6450ed30b2e1706d3dbf9658eabf185 (commit) via f20eb25eb2300884170900c265c845740b8b51c6 (commit) from 86b4f6a67ce8c167ae960978fdb0e43e4a870c2d (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 a45047e728ca1cc0c97e0201eb9900daae5730b6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Apr 16 11:04:42 2019 +0300 api: update version number to 1.21.3 Update version number to reflect init API text modifications. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/configure.ac b/configure.ac index 878110ab2..ae135261e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.5]) ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [21]) -m4_define([odpapi_minor_version], [2]) +m4_define([odpapi_minor_version], [3]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) commit 11a190a3909c06c7c2042826e6a96d2396cd4428 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Apr 16 11:01:31 2019 +0300 validation: buffer: output test result This test suite missed to output return value of odp_cunit_run(). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c index e774c1b39..9f2049034 100644 --- a/test/validation/api/buffer/buffer.c +++ b/test/validation/api/buffer/buffer.c @@ -304,7 +304,7 @@ int main(int argc, char *argv[]) ret = odp_cunit_register(buffer_suites); if (ret == 0) - odp_cunit_run(); + ret = odp_cunit_run(); return ret; } commit 5062afae2d8dc38c1f7db8b089d22fcc9ed17fb2 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Apr 16 10:50:53 2019 +0300 validation: init: add features test case Added test case to set not used features flags in init parameters. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 8a57b254e..071499f18 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -47,6 +47,7 @@ TESTS = \ init/init_abort$(EXEEXT) \ init/init_log$(EXEEXT) \ init/init_num_thr$(EXEEXT) \ + init/init_feature$(EXEEXT) \ ipsec/ipsec_sync$(EXEEXT) \ ipsec/ipsec_async$(EXEEXT) \ ipsec/ipsec_inline_in$(EXEEXT) \ diff --git a/test/validation/api/init/.gitignore b/test/validation/api/init/.gitignore index e2f102ad0..8311f2c3f 100644 --- a/test/validation/api/init/.gitignore +++ b/test/validation/api/init/.gitignore @@ -2,3 +2,4 @@ init_defaults init_abort init_log init_num_thr +init_feature diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 2f668504e..6c0ef301f 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -2,14 +2,16 @@ include ../Makefile.inc # Keep init test cases in separate binaries. Some implementations may not allow # the same application process to call odp_init_global() multiple times. -test_PROGRAMS = init_defaults init_abort init_log init_num_thr +test_PROGRAMS = init_defaults init_abort init_log init_num_thr init_feature init_defaults_CPPFLAGS = -DINIT_TEST=0 $(AM_CPPFLAGS) init_abort_CPPFLAGS = -DINIT_TEST=1 $(AM_CPPFLAGS) init_log_CPPFLAGS = -DINIT_TEST=2 $(AM_CPPFLAGS) init_num_thr_CPPFLAGS = -DINIT_TEST=3 $(AM_CPPFLAGS) +init_feature_CPPFLAGS = -DINIT_TEST=4 $(AM_CPPFLAGS) init_defaults_SOURCES = init_main.c init_abort_SOURCES = init_main.c init_log_SOURCES = init_main.c init_num_thr_SOURCES = init_main.c +init_feature_SOURCES = init_main.c diff --git a/test/validation/api/init/init_main.c b/test/validation/api/init/init_main.c index 2fd3faf8c..742f02522 100644 --- a/test/validation/api/init/init_main.c +++ b/test/validation/api/init/init_main.c @@ -125,11 +125,41 @@ static void init_test_num_thr(void) CU_ASSERT(ret == 0); } +static void init_test_feature(void) +{ + int ret; + odp_instance_t instance; + odp_init_t param; + + odp_init_param_init(&param); + param.not_used.all_feat = 0; + param.not_used.feat.cls = 1; + param.not_used.feat.crypto = 1; + param.not_used.feat.ipsec = 1; + param.not_used.feat.schedule = 1; + param.not_used.feat.time = 1; + param.not_used.feat.timer = 1; + param.not_used.feat.tm = 1; + + ret = odp_init_global(&instance, &param, NULL); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_init_local(instance, ODP_THREAD_CONTROL); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_local(); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_global(instance); + CU_ASSERT(ret == 0); +} + odp_testinfo_t testinfo[] = { ODP_TEST_INFO(init_test_defaults), ODP_TEST_INFO(init_test_abort), ODP_TEST_INFO(init_test_log), - ODP_TEST_INFO(init_test_num_thr) + ODP_TEST_INFO(init_test_num_thr), + ODP_TEST_INFO(init_test_feature) }; odp_testinfo_t init_suite[] = { commit 88aff57e9b06af8919aaa01b548813f0828f9af0 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Apr 15 14:41:31 2019 +0300 validation: init: add num threads test case Added test case to set num_worker and num_control parameters. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index eb8832f4f..8a57b254e 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -46,6 +46,7 @@ TESTS = \ init/init_defaults$(EXEEXT) \ init/init_abort$(EXEEXT) \ init/init_log$(EXEEXT) \ + init/init_num_thr$(EXEEXT) \ ipsec/ipsec_sync$(EXEEXT) \ ipsec/ipsec_async$(EXEEXT) \ ipsec/ipsec_inline_in$(EXEEXT) \ diff --git a/test/validation/api/init/.gitignore b/test/validation/api/init/.gitignore index 6a466ddac..e2f102ad0 100644 --- a/test/validation/api/init/.gitignore +++ b/test/validation/api/init/.gitignore @@ -1,3 +1,4 @@ init_defaults init_abort init_log +init_num_thr diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 141420e82..2f668504e 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -2,12 +2,14 @@ include ../Makefile.inc # Keep init test cases in separate binaries. Some implementations may not allow # the same application process to call odp_init_global() multiple times. -test_PROGRAMS = init_defaults init_abort init_log +test_PROGRAMS = init_defaults init_abort init_log init_num_thr init_defaults_CPPFLAGS = -DINIT_TEST=0 $(AM_CPPFLAGS) init_abort_CPPFLAGS = -DINIT_TEST=1 $(AM_CPPFLAGS) init_log_CPPFLAGS = -DINIT_TEST=2 $(AM_CPPFLAGS) +init_num_thr_CPPFLAGS = -DINIT_TEST=3 $(AM_CPPFLAGS) init_defaults_SOURCES = init_main.c init_abort_SOURCES = init_main.c init_log_SOURCES = init_main.c +init_num_thr_SOURCES = init_main.c diff --git a/test/validation/api/init/init_main.c b/test/validation/api/init/init_main.c index cce4dcac6..2fd3faf8c 100644 --- a/test/validation/api/init/init_main.c +++ b/test/validation/api/init/init_main.c @@ -99,10 +99,37 @@ static void init_test_log(void) CU_ASSERT(ret == 0); } +static void init_test_num_thr(void) +{ + int ret; + odp_instance_t instance; + odp_init_t param; + + odp_init_param_init(&param); + param.mem_model = ODP_MEM_MODEL_THREAD; + param.num_worker = 1; + param.num_control = 1; + param.worker_cpus = NULL; + param.control_cpus = NULL; + + ret = odp_init_global(&instance, &param, NULL); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_init_local(instance, ODP_THREAD_WORKER); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_local(); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_global(instance); + CU_ASSERT(ret == 0); +} + odp_testinfo_t testinfo[] = { ODP_TEST_INFO(init_test_defaults), ODP_TEST_INFO(init_test_abort), ODP_TEST_INFO(init_test_log), + ODP_TEST_INFO(init_test_num_thr) }; odp_testinfo_t init_suite[] = { commit 3e7aa57be6450ed30b2e1706d3dbf9658eabf185 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Apr 15 14:25:35 2019 +0300 validation: init: remove separate files per test case Combining all test cases into a single source file (init_main.c). Create (still) separate binaries per test case as some implementations may assume that an application process won't call odp_global_init() more than once. Added missing local init/term calls to all test cases. Removed non-API compatible assumptions from log test: - ODP_DEBUG_PRINT is not defined in the API - API does not require odp_init_global() to output anything to the log Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc index 36b143b9e..d25843f81 100644 --- a/doc/implementers-guide/implementers-guide.adoc +++ b/doc/implementers-guide/implementers-guide.adoc @@ -320,9 +320,7 @@ TESTS = validation/api/pktio/pktio_run.sh \ $(ALL_API_VALIDATION)/crypto/crypto_main$(EXEEXT) \ $(ALL_API_VALIDATION)/errno/errno_main$(EXEEXT) \ $(ALL_API_VALIDATION)/hash/hash_main$(EXEEXT) \ - $(ALL_API_VALIDATION)/init/init_main_ok$(EXEEXT) \ - $(ALL_API_VALIDATION)/init/init_main_abort$(EXEEXT) \ - $(ALL_API_VALIDATION)/init/init_main_log$(EXEEXT) \ + $(ALL_API_VALIDATION)/init/init_defaults$(EXEEXT) \ $(ALL_API_VALIDATION)/lock/lock_main$(EXEEXT) \ $(ALL_API_VALIDATION)/packet/packet_main$(EXEEXT) \ $(ALL_API_VALIDATION)/pool/pool_main$(EXEEXT) \ diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 257764648..eb8832f4f 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -43,9 +43,9 @@ TESTS = \ errno/errno_main$(EXEEXT) \ event/event_main$(EXEEXT) \ hash/hash_main$(EXEEXT) \ - init/init_main_ok$(EXEEXT) \ - init/init_main_abort$(EXEEXT) \ - init/init_main_log$(EXEEXT) \ + init/init_defaults$(EXEEXT) \ + init/init_abort$(EXEEXT) \ + init/init_log$(EXEEXT) \ ipsec/ipsec_sync$(EXEEXT) \ ipsec/ipsec_async$(EXEEXT) \ ipsec/ipsec_inline_in$(EXEEXT) \ diff --git a/test/validation/api/init/.gitignore b/test/validation/api/init/.gitignore index f433708b0..6a466ddac 100644 --- a/test/validation/api/init/.gitignore +++ b/test/validation/api/init/.gitignore @@ -1,3 +1,3 @@ -init_main_abort -init_main_log -init_main_ok +init_defaults +init_abort +init_log diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 5af2e00bc..141420e82 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -1,9 +1,13 @@ include ../Makefile.inc -# most platforms are expected not to support multiple ODP inits -# following each other: therefore 3 separate binaries are -# created, each containing its ODP init test. -test_PROGRAMS = init_main_abort init_main_log init_main_ok -init_main_abort_SOURCES = init_main_abort.c -init_main_log_SOURCES = init_main_log.c -init_main_ok_SOURCES = init_main_ok.c +# Keep init test cases in separate binaries. Some implementations may not allow +# the same application process to call odp_init_global() multiple times. +test_PROGRAMS = init_defaults init_abort init_log + +init_defaults_CPPFLAGS = -DINIT_TEST=0 $(AM_CPPFLAGS) +init_abort_CPPFLAGS = -DINIT_TEST=1 $(AM_CPPFLAGS) +init_log_CPPFLAGS = -DINIT_TEST=2 $(AM_CPPFLAGS) + +init_defaults_SOURCES = init_main.c +init_abort_SOURCES = init_main.c +init_log_SOURCES = init_main.c diff --git a/test/validation/api/init/init_main.c b/test/validation/api/init/init_main.c new file mode 100644 index 000000000..cce4dcac6 --- /dev/null +++ b/test/validation/api/init/init_main.c @@ -0,0 +1,153 @@ +/* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp_api.h> +#include <odp_cunit_common.h> + +#include <stdarg.h> +#include <stdlib.h> + +/* Replacement abort function */ +static void ODP_NORETURN my_abort_func(void) +{ + abort(); +} + +/* Replacement log function */ +ODP_PRINTF_FORMAT(2, 3) +static int my_log_func(odp_log_level_t level __attribute__((unused)), + const char *fmt, ...) +{ + va_list args; + int r; + + va_start(args, fmt); + r = vfprintf(stderr, fmt, args); + va_end(args); + + return r; +} + +static void init_test_defaults(void) +{ + int ret; + odp_instance_t instance; + odp_init_t param; + + odp_init_param_init(&param); + + ret = odp_init_global(&instance, &param, NULL); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_init_local(instance, ODP_THREAD_WORKER); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_local(); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_global(instance); + CU_ASSERT(ret == 0); +} + +static void init_test_abort(void) +{ + int ret; + odp_instance_t instance; + odp_init_t param; + + odp_init_param_init(&param); + param.abort_fn = &my_abort_func; + + ret = odp_init_global(&instance, &param, NULL); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_init_local(instance, ODP_THREAD_WORKER); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_local(); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_global(instance); + CU_ASSERT(ret == 0); +} + +static void init_test_log(void) +{ + int ret; + odp_instance_t instance; + odp_init_t param; + + odp_init_param_init(&param); + param.log_fn = &my_log_func; + + ret = odp_init_global(&instance, &param, NULL); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_init_local(instance, ODP_THREAD_WORKER); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_local(); + CU_ASSERT_FATAL(ret == 0); + + ret = odp_term_global(instance); + CU_ASSERT(ret == 0); +} + +odp_testinfo_t testinfo[] = { + ODP_TEST_INFO(init_test_defaults), + ODP_TEST_INFO(init_test_abort), + ODP_TEST_INFO(init_test_log), +}; + +odp_testinfo_t init_suite[] = { + ODP_TEST_INFO_NULL, + ODP_TEST_INFO_NULL +}; + +odp_suiteinfo_t init_suites[] = { + {"Init", NULL, NULL, init_suite}, + ODP_SUITE_INFO_NULL, +}; + +static int fill_testinfo(odp_testinfo_t *info, unsigned int test_case) +{ + if (test_case >= (sizeof(testinfo) / sizeof(odp_testinfo_t))) { + printf("Bad test case number %u\n", test_case); + return -1; + } + + *info = testinfo[test_case]; + + return 0; +} + +int main(int argc, char *argv[]) +{ + int ret; + + if (fill_testinfo(&init_suite[0], INIT_TEST)) + return -1; + + /* Parse common options */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + /* Prevent default ODP init */ + odp_cunit_register_global_init(NULL); + odp_cunit_register_global_term(NULL); + + /* Register the tests */ + ret = odp_cunit_register(init_suites); + + /* Run the tests */ + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/validation/api/init/init_main_abort.c b/test/validation/api/init/init_main_abort.c deleted file mode 100644 index 339fba1d0..000000000 --- a/test/validation/api/init/init_main_abort.c +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <stdlib.h> -#include <odp_api.h> -#include <odp_cunit_common.h> - -/* replacement abort function: */ -static void ODP_NORETURN odp_init_abort(void) -{ - abort(); -} - -/* test ODP global init, with alternate abort function */ -static void init_test_odp_init_global_replace_abort(void) -{ - int status; - odp_init_t init_data; - odp_instance_t instance; - - odp_init_param_init(&init_data); - init_data.abort_fn = &odp_init_abort; - - status = odp_init_global(&instance, &init_data, NULL); - CU_ASSERT_FATAL(status == 0); - - status = odp_term_global(instance); - CU_ASSERT(status == 0); -} - -odp_testinfo_t init_suite_abort[] = { - ODP_TEST_INFO(init_test_odp_init_global_replace_abort), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t init_suites_abort[] = { - {"Init", NULL, NULL, init_suite_abort}, - ODP_SUITE_INFO_NULL, -}; - -int main(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - /* prevent default ODP init: */ - odp_cunit_register_global_init(NULL); - odp_cunit_register_global_term(NULL); - - /* run the tests: */ - ret = odp_cunit_register(init_suites_abort); - - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/test/validation/api/init/init_main_log.c b/test/validation/api/init/init_main_log.c deleted file mode 100644 index 9ada02289..000000000 --- a/test/validation/api/init/init_main_log.c +++ /dev/null @@ -1,85 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <stdarg.h> -#include <odp_api.h> -#include <odp_cunit_common.h> - -/* flag set when the replacement logging function is used */ -int replacement_logging_used; - -/* replacement log function: */ -ODP_PRINTF_FORMAT(2, 3) -static int odp_init_log(odp_log_level_t level __attribute__((unused)), - const char *fmt, ...) -{ - va_list args; - int r; - - /* just set a flag to be sure the replacement fn was used */ - replacement_logging_used = 1; - - va_start(args, fmt); - r = vfprintf(stderr, fmt, args); - va_end(args); - - return r; -} - -/* test ODP global init, with alternate log function */ -static void init_test_odp_init_global_replace_log(void) -{ - int status; - odp_init_t init_data; - odp_instance_t instance; - - odp_init_param_init(&init_data); - init_data.log_fn = &odp_init_log; - - replacement_logging_used = 0; - - status = odp_init_global(&instance, &init_data, NULL); - CU_ASSERT_FATAL(status == 0); - - CU_ASSERT_TRUE(replacement_logging_used || ODP_DEBUG_PRINT == 0); - - status = odp_term_global(instance); - CU_ASSERT(status == 0); -} - -odp_testinfo_t init_suite_log[] = { - ODP_TEST_INFO(init_test_odp_init_global_replace_log), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t init_suites_log[] = { - {"Init", NULL, NULL, init_suite_log}, - ODP_SUITE_INFO_NULL, -}; - -int main(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - /* prevent default ODP init: */ - odp_cunit_register_global_init(NULL); - odp_cunit_register_global_term(NULL); - - /* register the tests: */ - ret = odp_cunit_register(init_suites_log); - - /* run the tests: */ - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/test/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c deleted file mode 100644 index 651989aeb..000000000 --- a/test/validation/api/init/init_main_ok.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <odp_api.h> -#include <odp_cunit_common.h> - -/* test normal ODP global init */ -static void init_test_odp_init_global(void) -{ - int status; - odp_instance_t instance; - odp_init_t init_data; - - odp_init_param_init(&init_data); - init_data.mem_model = ODP_MEM_MODEL_THREAD; - - status = odp_init_global(&instance, &init_data, NULL); - CU_ASSERT_FATAL(status == 0); - - status = odp_term_global(instance); - CU_ASSERT(status == 0); -} - -odp_testinfo_t init_suite_ok[] = { - ODP_TEST_INFO(init_test_odp_init_global), - ODP_TEST_INFO_NULL, -}; - -odp_suiteinfo_t init_suites_ok[] = { - {"Init", NULL, NULL, init_suite_ok}, - ODP_SUITE_INFO_NULL, -}; - -int main(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - /* prevent default ODP init: */ - odp_cunit_register_global_init(NULL); - odp_cunit_register_global_term(NULL); - - /* register the tests: */ - ret = odp_cunit_register(init_suites_ok); - - /* run the tests: */ - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} commit f20eb25eb2300884170900c265c845740b8b51c6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Apr 12 17:00:32 2019 +0300 api: init: calls to cpumask functions before init Improve specification of initialization and termination steps. Explicitly list those functions that may be used before global init (those that are needed for setting up parameters). No change to functionality. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Bill Fischofer <billf(a)me.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h index 70249d138..916f19388 100644 --- a/include/odp/api/spec/init.h +++ b/include/odp/api/spec/init.h @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -6,16 +7,6 @@ /** * @file - * - * ODP initialization. - * ODP requires a global level init for the process and a local init per - * thread before the other ODP APIs may be called. - * - odp_init_global() - * - odp_init_local() - * - * For a graceful termination the matching termination APIs exit - * - odp_term_global() - * - odp_term_local() */ #ifndef ODP_API_SPEC_INIT_H_ @@ -234,13 +225,25 @@ void odp_init_param_init(odp_init_t *param); /** * Global ODP initialization * - * This function must be called once (per instance) before calling any other - * ODP API functions. A successful call creates a new ODP instance into the - * system and outputs a handle for it. The handle is used in other calls - * (e.g. odp_init_local()) as a reference to the instance. When user provides - * configuration parameters, the platform may configure and optimize the - * instance to match user requirements. A failure is returned if requirements - * cannot be met. + * An ODP instance is created with an odp_init_global() call. By default, each + * thread of the instance must call odp_init_local() before calling any other + * ODP API functions. Exceptions to this are functions that are needed for + * setting up parameters for odp_init_global() and odp_init_local() calls: + * - odp_init_param_init() + * - odp_cpumask_zero(), odp_cpumask_set(), etc functions to format + * odp_cpumask_t. However, these cpumask functions are excluded as their + * behaviour depend on global initialization parameters: + * odp_cpumask_default_worker(), odp_cpumask_default_control() and + * odp_cpumask_all_available() + * + * A successful odp_init_global() call outputs a handle for the new instance. + * The handle is used in other initialization and termination calls. + * For a graceful termination, odp_term_local() must be called first on each + * thread and then odp_term_global() only once. + * + * When user provides configuration parameters, the platform may configure and + * optimize the instance to match user requirements. A failure is returned if + * requirements cannot be met. * * Configuration parameters are divided into standard and platform specific * parts. Standard parameters are supported by any ODP platform, where as @@ -260,46 +263,25 @@ void odp_init_param_init(odp_init_t *param); * @retval 0 on success * @retval <0 on failure * - * @see odp_term_global() - * @see odp_init_local() which is required per thread before use. + * @see odp_init_local(), odp_term_global(), odp_init_param_init() */ int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params); -/** - * Global ODP termination - * - * This function is the final ODP call made when terminating - * an ODP application in a controlled way. It cannot handle exceptional - * circumstances. In general it calls the API modules terminate functions in - * the reverse order to that which the module init functions were called - * during odp_init_global(). - * - * This function must be called only after all threads of the instance have - * executed odp_term_local(). To simplify synchronization between threads - * odp_term_local() identifies which one is the last thread of an instance. - * - * @param instance Instance handle - * - * @retval 0 on success - * @retval <0 on failure - * - * @warning The unwinding of HW resources to allow them to be reused without - * resetting the device is a complex task that the application is expected to - * coordinate. This api may have platform dependent implications. - * - * @see odp_init_global() - * @see odp_term_local() which must have been called prior to this. - */ -int odp_term_global(odp_instance_t instance); - /** * Thread local ODP initialization * * All threads must call this function before calling any other ODP API - * functions. The instance parameter specifies which ODP instance the thread - * joins. A thread may be simultaneously part of single ODP instance only. + * functions. See odp_init_global() documentation for exceptions to this rule. + * Global initialization (odp_init_global()) must have completed prior calling + * this function. + * + * The instance parameter specifies which ODP instance the thread joins. + * A thread may only join a single ODP instance at a time. The thread + * type parameter indicates if the thread does most part of application + * processing (ODP_THREAD_WORKER), or if it performs mostly background + * tasks (ODP_THREAD_CONTROL). * * @param instance Instance handle * @param thr_type Thread type @@ -307,8 +289,7 @@ int odp_term_global(odp_instance_t instance); * @retval 0 on success * @retval <0 on failure * - * @see odp_term_local() - * @see odp_init_global() which must have been called prior to this. + * @see odp_init_global(), odp_term_local() */ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type); @@ -317,24 +298,40 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type); * * This function is the second to final ODP call made when terminating * an ODP application in a controlled way. It cannot handle exceptional - * circumstances. In general it calls the API modules per thread terminate - * functions in the reverse order to that which the module init functions were - * called during odp_init_local(). + * circumstances. It is recommended that all ODP resources are freed before + * the last thread (of the instance) calls this function. This helps ODP + * to avoid memory and other resource leaks. + * + * odp_term_global() may be called only after all threads of the instance have + * executed odp_term_local(). To simplify synchronization between threads + * a return value identifies which one is the last thread of an instance. * * @retval 1 on success and more ODP threads exist * @retval 0 on success and this is the last ODP thread * @retval <0 on failure * - * @warning The unwinding of HW resources to allow them to be reused without - * resetting the device is a complex task that the application is expected - * to coordinate. - * - * @see odp_init_local() - * @see odp_term_global() should be called by the last ODP thread before exit - * of an application. + * @see odp_init_local(), odp_term_global() */ int odp_term_local(void); +/** + * Global ODP termination + * + * This function is the final ODP call made when terminating an ODP application + * in a controlled way. It cannot handle exceptional circumstances. + * + * This function must be called only after all threads of the instance have + * executed odp_term_local(). + * + * @param instance Instance handle + * + * @retval 0 on success + * @retval <0 on failure + * + * @see odp_init_global(), odp_term_local() + */ +int odp_term_global(odp_instance_t instance); + /** * @} */ ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/implementers-guide/implementers-guide.adoc | 4 +- include/odp/api/spec/init.h | 117 +++++++------- test/validation/api/Makefile.am | 8 +- test/validation/api/buffer/buffer.c | 2 +- test/validation/api/init/.gitignore | 8 +- test/validation/api/init/Makefile.am | 22 ++- test/validation/api/init/init_main.c | 210 +++++++++++++++++++++++++ test/validation/api/init/init_main_abort.c | 65 -------- test/validation/api/init/init_main_log.c | 85 ---------- test/validation/api/init/init_main_ok.c | 59 ------- 11 files changed, 295 insertions(+), 287 deletions(-) create mode 100644 test/validation/api/init/init_main.c delete mode 100644 test/validation/api/init/init_main_abort.c delete mode 100644 test/validation/api/init/init_main_log.c delete mode 100644 test/validation/api/init/init_main_ok.c hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-47-g86b4f6a67

by git＠git-us.linaro.org

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-46-g5cab9bd41

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 5cab9bd4190cec9535f4784c57c9ea9001543516 (commit) via 0a5eff079dfa17ecb5bc67244eeb6983e1bcf296 (commit) from b3cacf62c188e2d2696bb6993a9328127274b9b0 (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 5cab9bd4190cec9535f4784c57c9ea9001543516 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Apr 11 14:44:23 2019 +0300 linux-gen: pool: use pointer ring to store buffer headers Modify pool implementation to store buffer headers instead of indices. This removes the need for pointer <-> index conversion in buffer alloc/free functions. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index a44ad94f5..42a2cf160 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -23,7 +23,7 @@ extern "C" { #include <odp_buffer_internal.h> #include <odp_config_internal.h> -#include <odp_ring_u32_internal.h> +#include <odp_ring_ptr_internal.h> #include <odp/api/plat/strong_types.h> typedef struct ODP_ALIGNED_CACHE pool_cache_t { @@ -38,10 +38,10 @@ typedef struct ODP_ALIGNED_CACHE pool_cache_t { /* Buffer header ring */ typedef struct ODP_ALIGNED_CACHE { /* Ring header */ - ring_u32_t hdr; + ring_ptr_t hdr; /* Ring data: buffer handles */ - uint32_t buf[CONFIG_POOL_MAX_NUM + 1]; + odp_buffer_hdr_t *buf_hdr[CONFIG_POOL_MAX_NUM + 1]; } pool_ring_t; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 136f82c5e..6fc2e0d91 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -20,7 +20,7 @@ #include <odp_packet_dpdk.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> -#include <odp_ring_u32_internal.h> +#include <odp_ring_ptr_internal.h> #include <odp_global_data.h> #include <odp_libconfig_internal.h> #include <odp_shm_internal.h> @@ -132,14 +132,14 @@ static inline void cache_push(pool_cache_t *cache, odp_buffer_hdr_t *buf_hdr[], static void cache_flush(pool_cache_t *cache, pool_t *pool) { odp_buffer_hdr_t *buf_hdr; - ring_u32_t *ring; + ring_ptr_t *ring; uint32_t mask; ring = &pool->ring->hdr; mask = pool->ring_mask; while (cache_pop(cache, &buf_hdr, 1)) - ring_u32_enq(ring, mask, buf_hdr->index.buffer); + ring_ptr_enq(ring, mask, buf_hdr); } static int read_config_file(pool_table_t *pool_tbl) @@ -350,7 +350,7 @@ static void init_buffers(pool_t *pool) void *uarea = NULL; uint8_t *data; uint32_t offset; - ring_u32_t *ring; + ring_ptr_t *ring; uint32_t mask; int type; uint64_t page_size; @@ -429,9 +429,9 @@ static void init_buffers(pool_t *pool) buf_hdr->buf_end = &data[offset + pool->seg_len + pool->tailroom]; - /* Store buffer index into the global pool */ + /* Store buffer into the global pool */ if (!skip) - ring_u32_enq(ring, mask, i); + ring_ptr_enq(ring, mask, buf_hdr); } pool->skipped_blocks = skipped_blocks; } @@ -654,7 +654,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->uarea_base_addr = odp_shm_addr(pool->uarea_shm); } - ring_u32_init(&pool->ring->hdr); + ring_ptr_init(&pool->ring->hdr); init_buffers(pool); /* Create zero-copy DPDK memory pool. NOP if zero-copy is disabled. */ @@ -890,7 +890,7 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) { pool_cache_t *cache = local.cache[pool->pool_idx]; - ring_u32_t *ring; + ring_ptr_t *ring; odp_buffer_hdr_t *hdr; uint32_t mask, num_ch, i; uint32_t num_deq = 0; @@ -908,13 +908,12 @@ int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) if (odp_unlikely(num_deq > burst_size)) burst = num_deq; - uint32_t data[burst]; + odp_buffer_hdr_t *hdr_tmp[burst]; - /* Temporary copy to data[] needed since odp_buffer_t is - * uintptr_t and not uint32_t. */ ring = &pool->ring->hdr; mask = pool->ring_mask; - burst = ring_u32_deq_multi(ring, mask, data, burst); + burst = ring_ptr_deq_multi(ring, mask, (void **)hdr_tmp, + burst); cache_num = burst - num_deq; if (odp_unlikely(burst < num_deq)) { @@ -925,23 +924,14 @@ int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) for (i = 0; i < num_deq; i++) { uint32_t idx = num_ch + i; - hdr = buf_hdr_from_index(pool, data[i]); + hdr = hdr_tmp[i]; odp_prefetch(hdr); buf_hdr[idx] = hdr; } /* Cache possible extra buffers. Cache is currently empty. */ - if (cache_num) { - odp_buffer_hdr_t *buf_hdr[cache_num]; - - for (i = 0; i < cache_num; i++) { - uint32_t idx = num_deq + i; - - buf_hdr[i] = buf_hdr_from_index(pool, - data[idx]); - } - cache_push(cache, buf_hdr, cache_num); - } + if (cache_num) + cache_push(cache, &hdr_tmp[num_deq], cache_num); } return num_ch + num_deq; @@ -951,22 +941,17 @@ static inline void buffer_free_to_pool(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int num) { pool_cache_t *cache = local.cache[pool->pool_idx]; - ring_u32_t *ring; - int i; + ring_ptr_t *ring; uint32_t cache_num, mask; uint32_t cache_size = cache->size; /* Special case of a very large free. Move directly to * the global pool. */ if (odp_unlikely(num > (int)cache_size)) { - uint32_t buf_index[num]; - ring = &pool->ring->hdr; mask = pool->ring_mask; - for (i = 0; i < num; i++) - buf_index[i] = buf_hdr[i]->index.buffer; - ring_u32_enq_multi(ring, mask, buf_index, num); + ring_ptr_enq_multi(ring, mask, (void **)buf_hdr, num); return; } @@ -986,17 +971,11 @@ static inline void buffer_free_to_pool(pool_t *pool, if (odp_unlikely((uint32_t)num > cache_num)) burst = cache_num; - /* Temporary copy needed since odp_buffer_t is - * uintptr_t and not uint32_t. */ odp_buffer_hdr_t *buf_hdr[burst]; - uint32_t data[burst]; cache_pop(cache, buf_hdr, burst); - for (i = 0; i < burst; i++) - data[i] = buf_hdr[i]->index.buffer; - - ring_u32_enq_multi(ring, mask, data, burst); + ring_ptr_enq_multi(ring, mask, (void **)buf_hdr, burst); } cache_push(cache, buf_hdr, num); commit 0a5eff079dfa17ecb5bc67244eeb6983e1bcf296 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Apr 10 15:31:23 2019 +0300 linux-gen: ring: enable storing pointers in ring data Added new ring type ring_ptr_t, which uses the same implementation as old ring_t, but stores pointers instead of indices. The old ring_t type is renamed to ring_u32_t. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 08b6a671f..517ea258b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -126,10 +126,13 @@ noinst_HEADERS = \ include/odp_queue_basic_internal.h \ include/odp_queue_lf.h \ include/odp_queue_scalable_internal.h \ + include/odp_ring_common.h \ include/odp_ring_internal.h \ include/odp_ring_mpmc_internal.h \ + include/odp_ring_ptr_internal.h \ include/odp_ring_spsc_internal.h \ include/odp_ring_st_internal.h \ + include/odp_ring_u32_internal.h \ include/odp_schedule_if.h \ include/odp_schedule_scalable_config.h \ include/odp_schedule_scalable.h \ diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 67d7e7b7b..a44ad94f5 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -23,7 +23,7 @@ extern "C" { #include <odp_buffer_internal.h> #include <odp_config_internal.h> -#include <odp_ring_internal.h> +#include <odp_ring_u32_internal.h> #include <odp/api/plat/strong_types.h> typedef struct ODP_ALIGNED_CACHE pool_cache_t { @@ -38,7 +38,7 @@ typedef struct ODP_ALIGNED_CACHE pool_cache_t { /* Buffer header ring */ typedef struct ODP_ALIGNED_CACHE { /* Ring header */ - ring_t hdr; + ring_u32_t hdr; /* Ring data: buffer handles */ uint32_t buf[CONFIG_POOL_MAX_NUM + 1]; diff --git a/platform/linux-generic/include/odp_ring_common.h b/platform/linux-generic/include/odp_ring_common.h new file mode 100644 index 000000000..88e6bf880 --- /dev/null +++ b/platform/linux-generic/include/odp_ring_common.h @@ -0,0 +1,21 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_RING_COMMON_H_ +#define ODP_RING_COMMON_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define _ODP_RING_TYPE_U32 1 +#define _ODP_RING_TYPE_PTR 2 + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index ad2f37ef2..af6b3294e 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -1,9 +1,13 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ +/* This header should NOT be included directly. There are no include guards for + * the function definitions! */ + #ifndef ODP_RING_INTERNAL_H_ #define ODP_RING_INTERNAL_H_ @@ -17,8 +21,9 @@ extern "C" { #include <odp_align_internal.h> #include <odp/api/plat/atomic_inlines.h> #include <odp/api/plat/cpu_inlines.h> +#include <odp_ring_common.h> -/* Ring of uint32_t data +/* Generic ring implementation * * Ring stores head and tail counters. Ring indexes are formed from these * counters with a mask (mask = ring_size - 1), which requires that ring size @@ -26,7 +31,8 @@ extern "C" { * number of data items that will be stored on it as write operations are * assumed to succeed eventually (after readers complete their current * operations). */ -typedef struct ODP_ALIGNED_CACHE { + +struct ring_common { /* Writer head and tail */ odp_atomic_u32_t w_head; odp_atomic_u32_t w_tail; @@ -35,9 +41,17 @@ typedef struct ODP_ALIGNED_CACHE { /* Reader head and tail */ odp_atomic_u32_t r_head; odp_atomic_u32_t r_tail; +}; +typedef struct ODP_ALIGNED_CACHE { + struct ring_common r; uint32_t data[0]; -} ring_t; +} ring_u32_t; + +typedef struct ODP_ALIGNED_CACHE { + struct ring_common r; + void *data[0]; +} ring_ptr_t; /* 32-bit CAS with memory order selection */ static inline int cas_mo_u32(odp_atomic_u32_t *atom, uint32_t *old_val, @@ -49,35 +63,69 @@ static inline int cas_mo_u32(odp_atomic_u32_t *atom, uint32_t *old_val, mo_failure); } +#endif /* End of include guards */ + +#undef _ring_gen_t +#undef _ring_data_t +#undef _RING_INIT +#undef _RING_DEQ +#undef _RING_DEQ_MULTI +#undef _RING_ENQ +#undef _RING_ENQ_MULTI + +/* Remap generic types and function names to ring data type specific ones. One + * should never use the generic names (e.g. _RING_INIT) directly. */ + +#if _ODP_RING_TYPE == _ODP_RING_TYPE_U32 + #define _ring_gen_t ring_u32_t + #define _ring_data_t uint32_t + + #define _RING_INIT ring_u32_init + #define _RING_DEQ ring_u32_deq + #define _RING_DEQ_MULTI ring_u32_deq_multi + #define _RING_ENQ ring_u32_enq + #define _RING_ENQ_MULTI ring_u32_enq_multi +#elif _ODP_RING_TYPE == _ODP_RING_TYPE_PTR + #define _ring_gen_t ring_ptr_t + #define _ring_data_t void * + + #define _RING_INIT ring_ptr_init + #define _RING_DEQ ring_ptr_deq + #define _RING_DEQ_MULTI ring_ptr_deq_multi + #define _RING_ENQ ring_ptr_enq + #define _RING_ENQ_MULTI ring_ptr_enq_multi +#endif + /* Initialize ring */ -static inline void ring_init(ring_t *ring) +static inline void _RING_INIT(_ring_gen_t *ring) { - odp_atomic_init_u32(&ring->w_head, 0); - odp_atomic_init_u32(&ring->w_tail, 0); - odp_atomic_init_u32(&ring->r_head, 0); - odp_atomic_init_u32(&ring->r_tail, 0); + odp_atomic_init_u32(&ring->r.w_head, 0); + odp_atomic_init_u32(&ring->r.w_tail, 0); + odp_atomic_init_u32(&ring->r.r_head, 0); + odp_atomic_init_u32(&ring->r.r_tail, 0); } /* Dequeue data from the ring head */ -static inline uint32_t ring_deq(ring_t *ring, uint32_t mask, uint32_t *data) +static inline uint32_t _RING_DEQ(_ring_gen_t *ring, uint32_t mask, + _ring_data_t *data) { uint32_t head, tail, new_head; /* Load/CAS acquire of r_head ensures that w_tail load happens after * r_head load, and thus head value is always behind or equal to tail * value. */ - head = odp_atomic_load_acq_u32(&ring->r_head); + head = odp_atomic_load_acq_u32(&ring->r.r_head); /* Move reader head. This thread owns data at the new head. */ do { - tail = odp_atomic_load_acq_u32(&ring->w_tail); + tail = odp_atomic_load_acq_u32(&ring->r.w_tail); if (head == tail) return 0; new_head = head + 1; - } while (odp_unlikely(cas_mo_u32(&ring->r_head, &head, new_head, + } while (odp_unlikely(cas_mo_u32(&ring->r.r_head, &head, new_head, __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE) == 0)); @@ -85,29 +133,29 @@ static inline uint32_t ring_deq(ring_t *ring, uint32_t mask, uint32_t *data) *data = ring->data[new_head & mask]; /* Wait until other readers have updated the tail */ - while (odp_unlikely(odp_atomic_load_u32(&ring->r_tail) != head)) + while (odp_unlikely(odp_atomic_load_u32(&ring->r.r_tail) != head)) odp_cpu_pause(); /* Update the tail. Writers acquire it. */ - odp_atomic_store_rel_u32(&ring->r_tail, new_head); + odp_atomic_store_rel_u32(&ring->r.r_tail, new_head); return 1; } /* Dequeue multiple data from the ring head. Num is smaller than ring size. */ -static inline uint32_t ring_deq_multi(ring_t *ring, uint32_t mask, - uint32_t data[], uint32_t num) +static inline uint32_t _RING_DEQ_MULTI(_ring_gen_t *ring, uint32_t mask, + _ring_data_t data[], uint32_t num) { uint32_t head, tail, new_head, i; /* Load/CAS acquire of r_head ensures that w_tail load happens after * r_head load, and thus head value is always behind or equal to tail * value. */ - head = odp_atomic_load_acq_u32(&ring->r_head); + head = odp_atomic_load_acq_u32(&ring->r.r_head); /* Move reader head. This thread owns data at the new head. */ do { - tail = odp_atomic_load_acq_u32(&ring->w_tail); + tail = odp_atomic_load_acq_u32(&ring->r.w_tail); /* Ring is empty */ if (head == tail) @@ -119,7 +167,7 @@ static inline uint32_t ring_deq_multi(ring_t *ring, uint32_t mask, new_head = head + num; - } while (odp_unlikely(cas_mo_u32(&ring->r_head, &head, new_head, + } while (odp_unlikely(cas_mo_u32(&ring->r.r_head, &head, new_head, __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE) == 0)); @@ -128,29 +176,30 @@ static inline uint32_t ring_deq_multi(ring_t *ring, uint32_t mask, data[i] = ring->data[(head + 1 + i) & mask]; /* Wait until other readers have updated the tail */ - while (odp_unlikely(odp_atomic_load_u32(&ring->r_tail) != head)) + while (odp_unlikely(odp_atomic_load_u32(&ring->r.r_tail) != head)) odp_cpu_pause(); /* Update the tail. Writers acquire it. */ - odp_atomic_store_rel_u32(&ring->r_tail, new_head); + odp_atomic_store_rel_u32(&ring->r.r_tail, new_head); return num; } /* Enqueue data into the ring tail */ -static inline void ring_enq(ring_t *ring, uint32_t mask, uint32_t data) +static inline void _RING_ENQ(_ring_gen_t *ring, uint32_t mask, + _ring_data_t data) { uint32_t old_head, new_head; uint32_t size = mask + 1; /* Reserve a slot in the ring for writing */ - old_head = odp_atomic_fetch_inc_u32(&ring->w_head); + old_head = odp_atomic_fetch_inc_u32(&ring->r.w_head); new_head = old_head + 1; /* Wait for the last reader to finish. This prevents overwrite when * a reader has been left behind (e.g. due to an interrupt) and is * still reading the same slot. */ - while (odp_unlikely(new_head - odp_atomic_load_acq_u32(&ring->r_tail) + while (odp_unlikely(new_head - odp_atomic_load_acq_u32(&ring->r.r_tail) >= size)) odp_cpu_pause(); @@ -158,28 +207,28 @@ static inline void ring_enq(ring_t *ring, uint32_t mask, uint32_t data) ring->data[new_head & mask] = data; /* Wait until other writers have updated the tail */ - while (odp_unlikely(odp_atomic_load_u32(&ring->w_tail) != old_head)) + while (odp_unlikely(odp_atomic_load_u32(&ring->r.w_tail) != old_head)) odp_cpu_pause(); /* Release the new writer tail, readers acquire it. */ - odp_atomic_store_rel_u32(&ring->w_tail, new_head); + odp_atomic_store_rel_u32(&ring->r.w_tail, new_head); } /* Enqueue multiple data into the ring tail. Num is smaller than ring size. */ -static inline void ring_enq_multi(ring_t *ring, uint32_t mask, uint32_t data[], - uint32_t num) +static inline void _RING_ENQ_MULTI(_ring_gen_t *ring, uint32_t mask, + _ring_data_t data[], uint32_t num) { uint32_t old_head, new_head, i; uint32_t size = mask + 1; /* Reserve a slot in the ring for writing */ - old_head = odp_atomic_fetch_add_u32(&ring->w_head, num); + old_head = odp_atomic_fetch_add_u32(&ring->r.w_head, num); new_head = old_head + 1; /* Wait for the last reader to finish. This prevents overwrite when * a reader has been left behind (e.g. due to an interrupt) and is * still reading these slots. */ - while (odp_unlikely(new_head - odp_atomic_load_acq_u32(&ring->r_tail) + while (odp_unlikely(new_head - odp_atomic_load_acq_u32(&ring->r.r_tail) >= size)) odp_cpu_pause(); @@ -188,15 +237,13 @@ static inline void ring_enq_multi(ring_t *ring, uint32_t mask, uint32_t data[], ring->data[(new_head + i) & mask] = data[i]; /* Wait until other writers have updated the tail */ - while (odp_unlikely(odp_atomic_load_u32(&ring->w_tail) != old_head)) + while (odp_unlikely(odp_atomic_load_u32(&ring->r.w_tail) != old_head)) odp_cpu_pause(); /* Release the new writer tail, readers acquire it. */ - odp_atomic_store_rel_u32(&ring->w_tail, old_head + num); + odp_atomic_store_rel_u32(&ring->r.w_tail, old_head + num); } #ifdef __cplusplus } #endif - -#endif diff --git a/platform/linux-generic/include/odp_ring_ptr_internal.h b/platform/linux-generic/include/odp_ring_ptr_internal.h new file mode 100644 index 000000000..13b2b2fbf --- /dev/null +++ b/platform/linux-generic/include/odp_ring_ptr_internal.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_RING_PTR_INTERNAL_H_ +#define ODP_RING_PTR_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_ring_common.h> + +#undef _ODP_RING_TYPE +#define _ODP_RING_TYPE _ODP_RING_TYPE_PTR + +#include <odp_ring_internal.h> + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_ring_u32_internal.h b/platform/linux-generic/include/odp_ring_u32_internal.h new file mode 100644 index 000000000..baa02e4ca --- /dev/null +++ b/platform/linux-generic/include/odp_ring_u32_internal.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_RING_U32_INTERNAL_H_ +#define ODP_RING_U32_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_ring_common.h> + +#undef _ODP_RING_TYPE +#define _ODP_RING_TYPE _ODP_RING_TYPE_U32 + +#include <odp_ring_internal.h> + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 832991d32..136f82c5e 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -20,7 +20,7 @@ #include <odp_packet_dpdk.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> -#include <odp_ring_internal.h> +#include <odp_ring_u32_internal.h> #include <odp_global_data.h> #include <odp_libconfig_internal.h> #include <odp_shm_internal.h> @@ -132,14 +132,14 @@ static inline void cache_push(pool_cache_t *cache, odp_buffer_hdr_t *buf_hdr[], static void cache_flush(pool_cache_t *cache, pool_t *pool) { odp_buffer_hdr_t *buf_hdr; - ring_t *ring; + ring_u32_t *ring; uint32_t mask; ring = &pool->ring->hdr; mask = pool->ring_mask; while (cache_pop(cache, &buf_hdr, 1)) - ring_enq(ring, mask, buf_hdr->index.buffer); + ring_u32_enq(ring, mask, buf_hdr->index.buffer); } static int read_config_file(pool_table_t *pool_tbl) @@ -350,7 +350,7 @@ static void init_buffers(pool_t *pool) void *uarea = NULL; uint8_t *data; uint32_t offset; - ring_t *ring; + ring_u32_t *ring; uint32_t mask; int type; uint64_t page_size; @@ -431,7 +431,7 @@ static void init_buffers(pool_t *pool) /* Store buffer index into the global pool */ if (!skip) - ring_enq(ring, mask, i); + ring_u32_enq(ring, mask, i); } pool->skipped_blocks = skipped_blocks; } @@ -654,7 +654,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->uarea_base_addr = odp_shm_addr(pool->uarea_shm); } - ring_init(&pool->ring->hdr); + ring_u32_init(&pool->ring->hdr); init_buffers(pool); /* Create zero-copy DPDK memory pool. NOP if zero-copy is disabled. */ @@ -890,7 +890,7 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) { pool_cache_t *cache = local.cache[pool->pool_idx]; - ring_t *ring; + ring_u32_t *ring; odp_buffer_hdr_t *hdr; uint32_t mask, num_ch, i; uint32_t num_deq = 0; @@ -914,7 +914,7 @@ int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) * uintptr_t and not uint32_t. */ ring = &pool->ring->hdr; mask = pool->ring_mask; - burst = ring_deq_multi(ring, mask, data, burst); + burst = ring_u32_deq_multi(ring, mask, data, burst); cache_num = burst - num_deq; if (odp_unlikely(burst < num_deq)) { @@ -951,7 +951,7 @@ static inline void buffer_free_to_pool(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int num) { pool_cache_t *cache = local.cache[pool->pool_idx]; - ring_t *ring; + ring_u32_t *ring; int i; uint32_t cache_num, mask; uint32_t cache_size = cache->size; @@ -966,7 +966,7 @@ static inline void buffer_free_to_pool(pool_t *pool, for (i = 0; i < num; i++) buf_index[i] = buf_hdr[i]->index.buffer; - ring_enq_multi(ring, mask, buf_index, num); + ring_u32_enq_multi(ring, mask, buf_index, num); return; } @@ -996,7 +996,7 @@ static inline void buffer_free_to_pool(pool_t *pool, for (i = 0; i < burst; i++) data[i] = buf_hdr[i]->index.buffer; - ring_enq_multi(ring, mask, data, burst); + ring_u32_enq_multi(ring, mask, data, burst); } cache_push(cache, buf_hdr, num); diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index d20fd7356..4b054b86c 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -24,7 +25,7 @@ #include <odp_align_internal.h> #include <odp/api/sync.h> #include <odp/api/packet_io.h> -#include <odp_ring_internal.h> +#include <odp_ring_u32_internal.h> #include <odp_timer_internal.h> #include <odp_queue_basic_internal.h> #include <odp_libconfig_internal.h> @@ -125,7 +126,7 @@ typedef struct ODP_ALIGNED_CACHE { uint16_t ev_index; uint32_t qi; odp_queue_t queue; - ring_t *ring; + ring_u32_t *ring; odp_event_t ev[STASH_SIZE]; } stash; @@ -151,7 +152,7 @@ typedef struct ODP_ALIGNED_CACHE { /* Priority queue */ typedef struct ODP_ALIGNED_CACHE { /* Ring header */ - ring_t ring; + ring_u32_t ring; /* Ring data: queue indexes */ uint32_t queue_index[MAX_RING_SIZE]; @@ -423,7 +424,7 @@ static int schedule_init_global(void) prio_queue_t *prio_q; prio_q = &sched->prio_q[grp][i][j]; - ring_init(&prio_q->ring); + ring_u32_init(&prio_q->ring); } } } @@ -461,10 +462,12 @@ static int schedule_term_global(void) for (grp = 0; grp < NUM_SCHED_GRPS; grp++) { for (i = 0; i < NUM_PRIO; i++) { for (j = 0; j < MAX_SPREAD; j++) { - ring_t *ring = &sched->prio_q[grp][i][j].ring; + ring_u32_t *ring; uint32_t qi; - while (ring_deq(ring, ring_mask, &qi)) { + ring = &sched->prio_q[grp][i][j].ring; + + while (ring_u32_deq(ring, ring_mask, &qi)) { odp_event_t events[1]; int num; @@ -651,9 +654,9 @@ static int schedule_sched_queue(uint32_t queue_index) int grp = sched->queue[queue_index].grp; int prio = sched->queue[queue_index].prio; int spread = sched->queue[queue_index].spread; - ring_t *ring = &sched->prio_q[grp][prio][spread].ring; + ring_u32_t *ring = &sched->prio_q[grp][prio][spread].ring; - ring_enq(ring, sched->ring_mask, queue_index); + ring_u32_enq(ring, sched->ring_mask, queue_index); return 0; } @@ -682,10 +685,10 @@ static void schedule_pktio_start(int pktio_index, int num_pktin, static inline void release_atomic(void) { uint32_t qi = sched_local.stash.qi; - ring_t *ring = sched_local.stash.ring; + ring_u32_t *ring = sched_local.stash.ring; /* Release current atomic queue */ - ring_enq(ring, sched->ring_mask, qi); + ring_u32_enq(ring, sched->ring_mask, qi); /* We don't hold sync context anymore */ sched_local.sync_ctx = NO_SYNC_CONTEXT; @@ -980,7 +983,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], int num; uint8_t sync_ctx, ordered; odp_queue_t handle; - ring_t *ring; + ring_u32_t *ring; int pktin; uint16_t max_deq = burst_def; int stashed = 1; @@ -1000,7 +1003,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], /* Get queue index from the priority queue */ ring = &sched->prio_q[grp][prio][id].ring; - if (ring_deq(ring, ring_mask, &qi) == 0) { + if (ring_u32_deq(ring, ring_mask, &qi) == 0) { /* Priority queue empty */ i++; id++; @@ -1053,7 +1056,8 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], continue; if (num_pkt == 0 || !direct_recv) { - ring_enq(ring, ring_mask, qi); + ring_u32_enq(ring, ring_mask, + qi); break; } @@ -1079,7 +1083,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], sched_local.ordered.src_queue = qi; /* Continue scheduling ordered queues */ - ring_enq(ring, ring_mask, qi); + ring_u32_enq(ring, ring_mask, qi); sched_local.sync_ctx = sync_ctx; } else if (sync_ctx == ODP_SCHED_SYNC_ATOMIC) { @@ -1089,7 +1093,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], sched_local.sync_ctx = sync_ctx; } else { /* Continue scheduling the queue */ - ring_enq(ring, ring_mask, qi); + ring_u32_enq(ring, ring_mask, qi); } handle = queue_from_index(qi); diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index e7b378950..1c52cc18d 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -1,4 +1,5 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -18,7 +19,7 @@ #include <odp_debug_internal.h> #include <odp_align_internal.h> #include <odp_config_internal.h> -#include <odp_ring_internal.h> +#include <odp_ring_u32_internal.h> #include <odp_timer_internal.h> #include <odp_queue_basic_internal.h> @@ -74,7 +75,7 @@ typedef struct ODP_ALIGNED_CACHE sched_cmd_t { typedef struct ODP_ALIGNED_CACHE { /* Ring header */ - ring_t ring; + ring_u32_t ring; /* Ring data: queue indexes */ uint32_t ring_idx[RING_SIZE]; @@ -189,7 +190,7 @@ static int init_global(void) for (i = 0; i < NUM_GROUP; i++) for (j = 0; j < NUM_PRIO; j++) - ring_init(&sched_global->prio_queue[i][j].ring); + ring_u32_init(&sched_global->prio_queue[i][j].ring); sched_group = &sched_global->sched_group; odp_ticketlock_init(&sched_group->s.lock); @@ -411,7 +412,7 @@ static inline void add_tail(sched_cmd_t *cmd) uint32_t idx = cmd->s.ring_idx; prio_queue = &sched_global->prio_queue[group][prio]; - ring_enq(&prio_queue->ring, RING_MASK, idx); + ring_u32_enq(&prio_queue->ring, RING_MASK, idx); } static inline sched_cmd_t *rem_head(int group, int prio) @@ -422,7 +423,7 @@ static inline sched_cmd_t *rem_head(int group, int prio) prio_queue = &sched_global->prio_queue[group][prio]; - if (ring_deq(&prio_queue->ring, RING_MASK, &ring_idx) == 0) + if (ring_u32_deq(&prio_queue->ring, RING_MASK, &ring_idx) == 0) return NULL; pktio = index_from_ring_idx(&index, ring_idx); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 3 + platform/linux-generic/include/odp_pool_internal.h | 6 +- .../linux-generic/include/odp_ring_common.h | 9 +- platform/linux-generic/include/odp_ring_internal.h | 115 +++++++++++++++------ .../linux-generic/include/odp_ring_ptr_internal.h | 25 +++++ .../linux-generic/include/odp_ring_u32_internal.h | 25 +++++ platform/linux-generic/odp_pool.c | 55 +++------- platform/linux-generic/odp_schedule_basic.c | 34 +++--- platform/linux-generic/odp_schedule_sp.c | 11 +- 9 files changed, 184 insertions(+), 99 deletions(-) copy include/odp/arch/x86_32-linux/odp/api/abi/cpu.h => platform/linux-generic/include/odp_ring_common.h (52%) create mode 100644 platform/linux-generic/include/odp_ring_ptr_internal.h create mode 100644 platform/linux-generic/include/odp_ring_u32_internal.h hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-44-gb3cacf62c

by git＠git-us.linaro.org

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-43-g6811aaba

by git＠git-us.linaro.org

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-42-g939166d44

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 939166d4414609717264e6f51f51d4b22cdd022a (commit) via 5fd772d236db2059935d12ab27fcbf1f50d10591 (commit) via 0b9d1e85d1f4d9b98c88c4d34fb26bc801556210 (commit) from 12eaa3d2ce51cc5cd48e54deded2740161162022 (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 939166d4414609717264e6f51f51d4b22cdd022a Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Apr 10 08:45:32 2019 +0300 linux-gen: pool: warn about entire pool fitting into thread local caches Add debug print when entire pool fits into thread local caches. Pool starvation may occur if the pool is used by multiple threads. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Suggested-by: Mikko Kurikka <mikko.kurikka(a)nokia.com> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index e3f53cfaa..832991d32 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -681,12 +681,22 @@ error: static int check_params(odp_pool_param_t *params) { odp_pool_capability_t capa; + odp_bool_t cache_warning = false; + uint32_t cache_size = pool_tbl->config.local_cache_size; + int num_threads = odp_global_ro.init_param.num_control + + odp_global_ro.init_param.num_worker; if (!params || odp_pool_capability(&capa) < 0) return -1; + if (num_threads) + cache_size = num_threads * pool_tbl->config.local_cache_size; + switch (params->type) { case ODP_POOL_BUFFER: + if (params->buf.num <= cache_size) + cache_warning = true; + if (params->buf.num > capa.buf.max_num) { ODP_ERR("buf.num too large %u\n", params->buf.num); return -1; @@ -705,6 +715,9 @@ static int check_params(odp_pool_param_t *params) break; case ODP_POOL_PACKET: + if (params->pkt.num <= cache_size) + cache_warning = true; + if (params->pkt.num > capa.pkt.max_num) { ODP_ERR("pkt.num too large %u\n", params->pkt.num); return -1; @@ -748,6 +761,9 @@ static int check_params(odp_pool_param_t *params) break; case ODP_POOL_TIMEOUT: + if (params->tmo.num <= cache_size) + cache_warning = true; + if (params->tmo.num > capa.tmo.max_num) { ODP_ERR("tmo.num too large %u\n", params->tmo.num); return -1; @@ -759,6 +775,11 @@ static int check_params(odp_pool_param_t *params) return -1; } + if (cache_warning) + ODP_DBG("Entire pool fits into thread local caches. Pool " + "starvation may occur if the pool is used by multiple " + "threads.\n"); + return 0; } commit 5fd772d236db2059935d12ab27fcbf1f50d10591 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Apr 9 11:22:57 2019 +0300 linux-gen: pool: enable setting local cache and burst size using config Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index e00e4a518..fcc5d75aa 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.6" +config_file_version = "0.1.7" # Shared memory options shm: { @@ -45,6 +45,16 @@ shm: { # Pool options pool: { + # Thread local cache size. Value must be a multiple of burst_size + # (min 2 x burst_size). + # + # The total maximum number of cached events is the number of threads + # using the pool multiplied with local_cache_size. + local_cache_size = 256 + + # Transfer size between local cache and global pool. + burst_size = 32 + # Packet pool options pkt: { # Maximum number of packets per pool. Power of two minus one diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 810576b9a..27f1db599 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -142,7 +142,7 @@ extern "C" { /* * Maximum number of events in a thread local pool cache */ -#define CONFIG_POOL_CACHE_SIZE 256 +#define CONFIG_POOL_CACHE_MAX_SIZE 256 #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index a5242d60e..67d7e7b7b 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -27,8 +27,11 @@ extern "C" { #include <odp/api/plat/strong_types.h> typedef struct ODP_ALIGNED_CACHE pool_cache_t { + uint32_t size; /* Size of cache */ + uint32_t burst_size; /* Cache burst size */ uint32_t num; /* Number of buffers in cache */ - odp_buffer_hdr_t *buf_hdr[CONFIG_POOL_CACHE_SIZE]; /* Cached buffers */ + /* Cached buffers */ + odp_buffer_hdr_t *buf_hdr[CONFIG_POOL_CACHE_MAX_SIZE]; } pool_cache_t; @@ -92,6 +95,8 @@ typedef struct pool_table_t { struct { uint32_t pkt_max_num; + uint32_t local_cache_size; + uint32_t burst_size; } config; } pool_table_t; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 2e0898461..e3f53cfaa 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -36,8 +36,7 @@ #define UNLOCK(a) odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) -#define CACHE_BURST 32 -#define RING_SIZE_MIN (2 * CACHE_BURST) +#define RING_SIZE_MIN 64 #define POOL_MAX_NUM_MIN RING_SIZE_MIN /* Make sure packet buffers don't cross huge page boundaries starting from this @@ -51,9 +50,6 @@ * rounded up to this value. */ #define BUFFER_ALIGN_MIN ODP_CACHE_LINE_SIZE -ODP_STATIC_ASSERT(CONFIG_POOL_CACHE_SIZE > (2 * CACHE_BURST), - "cache_burst_size_too_large_compared_to_cache_size"); - ODP_STATIC_ASSERT(CONFIG_PACKET_SEG_LEN_MIN >= 256, "ODP Segment size must be a minimum of 256 bytes"); @@ -94,6 +90,9 @@ static inline pool_t *pool_from_buf(odp_buffer_t buf) static inline void cache_init(pool_cache_t *cache) { memset(cache, 0, sizeof(pool_cache_t)); + + cache->size = pool_tbl->config.local_cache_size; + cache->burst_size = pool_tbl->config.burst_size; } static inline uint32_t cache_pop(pool_cache_t *cache, @@ -150,6 +149,48 @@ static int read_config_file(pool_table_t *pool_tbl) ODP_PRINT("Pool config:\n"); + str = "pool.local_cache_size"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + if (val > CONFIG_POOL_CACHE_MAX_SIZE || val < 0) { + ODP_ERR("Bad value %s = %u, max %d\n", str, val, + CONFIG_POOL_CACHE_MAX_SIZE); + return -1; + } + + pool_tbl->config.local_cache_size = val; + ODP_PRINT(" %s: %i\n", str, val); + + str = "pool.burst_size"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + if (val <= 0) { + ODP_ERR("Bad value %s = %u\n", str, val); + return -1; + } + + pool_tbl->config.burst_size = val; + ODP_PRINT(" %s: %i\n", str, val); + + /* Check local cache size and burst size relation */ + if (pool_tbl->config.local_cache_size % pool_tbl->config.burst_size) { + ODP_ERR("Pool cache size not multiple of burst size\n"); + return -1; + } + + if (pool_tbl->config.local_cache_size && + (pool_tbl->config.local_cache_size / + pool_tbl->config.burst_size < 2)) { + ODP_ERR("Cache burst size too large compared to cache size\n"); + return -1; + } + str = "pool.pkt.max_num"; if (!_odp_libconfig_lookup_int(str, &val)) { ODP_ERR("Config option '%s' not found.\n", str); @@ -832,17 +873,18 @@ int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) odp_buffer_hdr_t *hdr; uint32_t mask, num_ch, i; uint32_t num_deq = 0; + uint32_t burst_size = cache->burst_size; /* First pull packets from local cache */ num_ch = cache_pop(cache, buf_hdr, max_num); /* If needed, get more from the global pool */ if (odp_unlikely(num_ch != (uint32_t)max_num)) { - uint32_t burst = CACHE_BURST; + uint32_t burst = burst_size; uint32_t cache_num; num_deq = max_num - num_ch; - if (odp_unlikely(num_deq > CACHE_BURST)) + if (odp_unlikely(num_deq > burst_size)) burst = num_deq; uint32_t data[burst]; @@ -891,10 +933,11 @@ static inline void buffer_free_to_pool(pool_t *pool, ring_t *ring; int i; uint32_t cache_num, mask; + uint32_t cache_size = cache->size; /* Special case of a very large free. Move directly to * the global pool. */ - if (odp_unlikely(num > CONFIG_POOL_CACHE_SIZE)) { + if (odp_unlikely(num > (int)cache_size)) { uint32_t buf_index[num]; ring = &pool->ring->hdr; @@ -911,13 +954,13 @@ static inline void buffer_free_to_pool(pool_t *pool, * transfer. */ cache_num = cache->num; - if (odp_unlikely((int)(CONFIG_POOL_CACHE_SIZE - cache_num) < num)) { - int burst = CACHE_BURST; + if (odp_unlikely((int)(cache_size - cache_num) < num)) { + int burst = cache->burst_size; ring = &pool->ring->hdr; mask = pool->ring_mask; - if (odp_unlikely(num > CACHE_BURST)) + if (odp_unlikely(num > burst)) burst = num; if (odp_unlikely((uint32_t)num > cache_num)) burst = cache_num; diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf index 6cae241da..36bc7f323 100644 --- a/platform/linux-generic/test/inline-timer.conf +++ b/platform/linux-generic/test/inline-timer.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.6" +config_file_version = "0.1.7" timer: { # Enable inline timer implementation diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index fc8974944..12c79617f 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.6" +config_file_version = "0.1.7" # Shared memory options shm: { commit 0b9d1e85d1f4d9b98c88c4d34fb26bc801556210 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Apr 8 13:48:54 2019 +0300 linux-gen: pool: optimize buffer caching Refactor local buffer caching into separate functions and optimize implementation by caching buffer header pointers instead of indices. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index cfd0872af..a5242d60e 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2013-2018, Linaro Limited +/* Copyright (c) 2019, Nokia + * Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -26,8 +27,8 @@ extern "C" { #include <odp/api/plat/strong_types.h> typedef struct ODP_ALIGNED_CACHE pool_cache_t { - uint32_t num; - uint32_t buf_index[CONFIG_POOL_CACHE_SIZE]; + uint32_t num; /* Number of buffers in cache */ + odp_buffer_hdr_t *buf_hdr[CONFIG_POOL_CACHE_SIZE]; /* Cached buffers */ } pool_cache_t; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index feb25cf39..2e0898461 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -91,6 +91,58 @@ static inline pool_t *pool_from_buf(odp_buffer_t buf) return buf_hdr->pool_ptr; } +static inline void cache_init(pool_cache_t *cache) +{ + memset(cache, 0, sizeof(pool_cache_t)); +} + +static inline uint32_t cache_pop(pool_cache_t *cache, + odp_buffer_hdr_t *buf_hdr[], int max_num) +{ + uint32_t cache_num = cache->num; + uint32_t num_ch = max_num; + uint32_t cache_begin; + uint32_t i; + + /* Cache does not have enough buffers */ + if (odp_unlikely(cache_num < (uint32_t)max_num)) + num_ch = cache_num; + + /* Get buffers from the cache */ + cache_begin = cache_num - num_ch; + for (i = 0; i < num_ch; i++) + buf_hdr[i] = cache->buf_hdr[cache_begin + i]; + + cache->num = cache_num - num_ch; + + return num_ch; +} + +static inline void cache_push(pool_cache_t *cache, odp_buffer_hdr_t *buf_hdr[], + uint32_t num) +{ + uint32_t cache_num = cache->num; + uint32_t i; + + for (i = 0; i < num; i++) + cache->buf_hdr[cache_num + i] = buf_hdr[i]; + + cache->num = cache_num + num; +} + +static void cache_flush(pool_cache_t *cache, pool_t *pool) +{ + odp_buffer_hdr_t *buf_hdr; + ring_t *ring; + uint32_t mask; + + ring = &pool->ring->hdr; + mask = pool->ring_mask; + + while (cache_pop(cache, &buf_hdr, 1)) + ring_enq(ring, mask, buf_hdr->index.buffer); +} + static int read_config_file(pool_table_t *pool_tbl) { const char *str; @@ -193,29 +245,13 @@ int odp_pool_init_local(void) for (i = 0; i < ODP_CONFIG_POOLS; i++) { pool = pool_entry(i); local.cache[i] = &pool->local_cache[thr_id]; - local.cache[i]->num = 0; + cache_init(local.cache[i]); } local.thr_id = thr_id; return 0; } -static void flush_cache(pool_cache_t *cache, pool_t *pool) -{ - ring_t *ring; - uint32_t mask; - uint32_t cache_num, i; - - ring = &pool->ring->hdr; - mask = pool->ring_mask; - cache_num = cache->num; - - for (i = 0; i < cache_num; i++) - ring_enq(ring, mask, cache->buf_index[i]); - - cache->num = 0; -} - int odp_pool_term_local(void) { int i; @@ -223,7 +259,7 @@ int odp_pool_term_local(void) for (i = 0; i < ODP_CONFIG_POOLS; i++) { pool_t *pool = pool_entry(i); - flush_cache(local.cache[i], pool); + cache_flush(local.cache[i], pool); } return 0; @@ -725,7 +761,7 @@ int odp_pool_destroy(odp_pool_t pool_hdl) /* Make sure local caches are empty */ for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) - flush_cache(&pool->local_cache[i], pool); + cache_flush(&pool->local_cache[i], pool); odp_shm_free(pool->shm); @@ -791,40 +827,26 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) { + pool_cache_t *cache = local.cache[pool->pool_idx]; ring_t *ring; - uint32_t mask, i; - pool_cache_t *cache; - uint32_t cache_num, num_ch, num_deq, burst; odp_buffer_hdr_t *hdr; + uint32_t mask, num_ch, i; + uint32_t num_deq = 0; - cache = local.cache[pool->pool_idx]; - - cache_num = cache->num; - num_ch = max_num; - num_deq = 0; - burst = CACHE_BURST; + /* First pull packets from local cache */ + num_ch = cache_pop(cache, buf_hdr, max_num); - if (odp_unlikely(cache_num < (uint32_t)max_num)) { - /* Cache does not have enough buffers */ - num_ch = cache_num; - num_deq = max_num - cache_num; + /* If needed, get more from the global pool */ + if (odp_unlikely(num_ch != (uint32_t)max_num)) { + uint32_t burst = CACHE_BURST; + uint32_t cache_num; + num_deq = max_num - num_ch; if (odp_unlikely(num_deq > CACHE_BURST)) burst = num_deq; - } - - /* Get buffers from the cache */ - for (i = 0; i < num_ch; i++) { - uint32_t j = cache_num - num_ch + i; - - buf_hdr[i] = buf_hdr_from_index(pool, cache->buf_index[j]); - } - /* Declare variable here to fix clang compilation bug */ - uint32_t data[burst]; + uint32_t data[burst]; - /* If needed, get more from the global pool */ - if (odp_unlikely(num_deq)) { /* Temporary copy to data[] needed since odp_buffer_t is * uintptr_t and not uint32_t. */ ring = &pool->ring->hdr; @@ -845,13 +867,18 @@ int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) buf_hdr[idx] = hdr; } - /* Cache extra buffers. Cache is currently empty. */ - for (i = 0; i < cache_num; i++) - cache->buf_index[i] = data[num_deq + i]; + /* Cache possible extra buffers. Cache is currently empty. */ + if (cache_num) { + odp_buffer_hdr_t *buf_hdr[cache_num]; - cache->num = cache_num; - } else { - cache->num = cache_num - num_ch; + for (i = 0; i < cache_num; i++) { + uint32_t idx = num_deq + i; + + buf_hdr[i] = buf_hdr_from_index(pool, + data[idx]); + } + cache_push(cache, buf_hdr, cache_num); + } } return num_ch + num_deq; @@ -860,13 +887,10 @@ int buffer_alloc_multi(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int max_num) static inline void buffer_free_to_pool(pool_t *pool, odp_buffer_hdr_t *buf_hdr[], int num) { - int i; + pool_cache_t *cache = local.cache[pool->pool_idx]; ring_t *ring; - uint32_t mask; - pool_cache_t *cache; - uint32_t cache_num; - - cache = local.cache[pool->pool_idx]; + int i; + uint32_t cache_num, mask; /* Special case of a very large free. Move directly to * the global pool. */ @@ -888,7 +912,6 @@ static inline void buffer_free_to_pool(pool_t *pool, cache_num = cache->num; if (odp_unlikely((int)(CONFIG_POOL_CACHE_SIZE - cache_num) < num)) { - uint32_t index; int burst = CACHE_BURST; ring = &pool->ring->hdr; @@ -899,26 +922,20 @@ static inline void buffer_free_to_pool(pool_t *pool, if (odp_unlikely((uint32_t)num > cache_num)) burst = cache_num; - { - /* Temporary copy needed since odp_buffer_t is - * uintptr_t and not uint32_t. */ - uint32_t data[burst]; - - index = cache_num - burst; + /* Temporary copy needed since odp_buffer_t is + * uintptr_t and not uint32_t. */ + odp_buffer_hdr_t *buf_hdr[burst]; + uint32_t data[burst]; - for (i = 0; i < burst; i++) - data[i] = cache->buf_index[index + i]; + cache_pop(cache, buf_hdr, burst); - ring_enq_multi(ring, mask, data, burst); - } + for (i = 0; i < burst; i++) + data[i] = buf_hdr[i]->index.buffer; - cache_num -= burst; + ring_enq_multi(ring, mask, data, burst); } - for (i = 0; i < num; i++) - cache->buf_index[cache_num + i] = buf_hdr[i]->index.buffer; - - cache->num = cache_num + num; + cache_push(cache, buf_hdr, num); } void buffer_free_multi(odp_buffer_hdr_t *buf_hdr[], int num_total) ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 12 +- .../linux-generic/include/odp_config_internal.h | 2 +- platform/linux-generic/include/odp_pool_internal.h | 12 +- platform/linux-generic/odp_pool.c | 245 ++++++++++++++------- platform/linux-generic/test/inline-timer.conf | 2 +- platform/linux-generic/test/process-mode.conf | 2 +- 6 files changed, 186 insertions(+), 89 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-39-g12eaa3d2c

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 12eaa3d2ce51cc5cd48e54deded2740161162022 (commit) via 36009b1444af036c189046ee4edb50d13d861120 (commit) from 0178075e5e16e843034ac59ad4978e6a70ef86b5 (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 12eaa3d2ce51cc5cd48e54deded2740161162022 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Apr 10 10:28:24 2019 +0300 validation: pktio: improve debug info on magic number miss Linux IPv6 stack sends additional packets during test. Test filters out these with a magic number in test packets. Some times Linux veth bridge interface overflows due to these extra packets and test packets are lost. Added debug information for easier debug of these kind of issues. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index a4f7cecd2..15f58e95a 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -219,8 +219,9 @@ static uint32_t pktio_pkt_seq_hdr(odp_packet_t pkt, size_t l4_hdr_len) } if (head.magic != TEST_SEQ_MAGIC) { - fprintf(stderr, "error: header magic invalid %" PRIu32 "\n", + fprintf(stderr, "error: header magic invalid 0x%" PRIx32 "\n", head.magic); + odp_packet_print(pkt); return TEST_SEQ_INVALID; } @@ -237,7 +238,7 @@ static uint32_t pktio_pkt_seq_hdr(odp_packet_t pkt, size_t l4_hdr_len) CU_ASSERT(seq != TEST_SEQ_INVALID); } else { fprintf(stderr, - "error: tail magic invalid %" PRIu32 "\n", + "error: tail magic invalid 0x%" PRIx32 "\n", tail.magic); } } else { @@ -592,20 +593,24 @@ static int wait_for_packets_hdr(pktio_info_t *pktio_rx, odp_packet_t pkt_tbl[], uint32_t seq_tbl[], int num, txrx_mode_e mode, uint64_t ns, size_t l4_hdr_len) { - odp_time_t wait_time, end; + odp_time_t wait_time, end, start; int num_rx = 0; int i; odp_packet_t pkt_tmp[num]; wait_time = odp_time_local_from_ns(ns); - end = odp_time_sum(odp_time_local(), wait_time); + start = odp_time_local(); + end = odp_time_sum(start, wait_time); - do { + while (num_rx < num && odp_time_cmp(end, odp_time_local()) > 0) { int n = get_packets(pktio_rx, pkt_tmp, num - num_rx, mode); if (n < 0) break; + if (n == 0) + continue; + for (i = 0; i < n; ++i) { if (pktio_pkt_seq_hdr(pkt_tmp[i], l4_hdr_len) == seq_tbl[num_rx]) @@ -613,7 +618,7 @@ static int wait_for_packets_hdr(pktio_info_t *pktio_rx, odp_packet_t pkt_tbl[], else odp_packet_free(pkt_tmp[i]); } - } while (num_rx < num && odp_time_cmp(end, odp_time_local()) > 0); + } return num_rx; } @@ -795,6 +800,10 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, num_rx = wait_for_packets(pktio_b, rx_pkt, tx_seq, num_pkts, mode, ODP_TIME_SEC_IN_NS); CU_ASSERT(num_rx == num_pkts); + if (num_rx != num_pkts) { + fprintf(stderr, "error: received %i, out of %i packets\n", + num_rx, num_pkts); + } for (i = 0; i < num_rx; ++i) { odp_packet_data_range_t range; commit 36009b1444af036c189046ee4edb50d13d861120 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue Apr 9 14:36:56 2019 +0300 linux-gen: packet: print packet input flags Print packet input flag names to improve readability of odp_packet_print() output. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index f4c99ce15..be62557d5 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1736,6 +1736,40 @@ int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, * ******************************************************** * */ +static int packet_print_input_flags(odp_packet_hdr_t *hdr, char *str, int max) +{ + int len = 0; + + if (hdr->p.input_flags.l2) + len += snprintf(&str[len], max - len, "l2 "); + if (hdr->p.input_flags.l3) + len += snprintf(&str[len], max - len, "l3 "); + if (hdr->p.input_flags.l4) + len += snprintf(&str[len], max - len, "l4 "); + if (hdr->p.input_flags.eth) + len += snprintf(&str[len], max - len, "eth "); + if (hdr->p.input_flags.vlan) + len += snprintf(&str[len], max - len, "vlan "); + if (hdr->p.input_flags.arp) + len += snprintf(&str[len], max - len, "arp "); + if (hdr->p.input_flags.ipv4) + len += snprintf(&str[len], max - len, "ipv4 "); + if (hdr->p.input_flags.ipv6) + len += snprintf(&str[len], max - len, "ipv6 "); + if (hdr->p.input_flags.ipsec) + len += snprintf(&str[len], max - len, "ipsec "); + if (hdr->p.input_flags.udp) + len += snprintf(&str[len], max - len, "udp "); + if (hdr->p.input_flags.tcp) + len += snprintf(&str[len], max - len, "tcp "); + if (hdr->p.input_flags.sctp) + len += snprintf(&str[len], max - len, "sctp "); + if (hdr->p.input_flags.icmp) + len += snprintf(&str[len], max - len, "icmp "); + + return len; +} + void odp_packet_print(odp_packet_t pkt) { odp_packet_seg_t seg; @@ -1753,7 +1787,12 @@ void odp_packet_print(odp_packet_t pkt) len += odp_buffer_snprint(&str[len], n - len, buf); len += snprintf(&str[len], n - len, " input_flags 0x%" PRIx64 "\n", hdr->p.input_flags.all); - len += snprintf(&str[len], n - len, " flags 0x%" PRIx32 "\n", + if (hdr->p.input_flags.all) { + len += snprintf(&str[len], n - len, " "); + len += packet_print_input_flags(hdr, &str[len], n - len); + len += snprintf(&str[len], n - len, "\n"); + } + len += snprintf(&str[len], n - len, " flags 0x%" PRIx32 "\n", hdr->p.flags.all_flags); len += snprintf(&str[len], n - len, " l2_offset %" PRIu32 "\n", hdr->p.l2_offset); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet.c | 41 ++++++++++++++++++++++++++++++++++++- test/validation/api/pktio/pktio.c | 21 +++++++++++++------ 2 files changed, 55 insertions(+), 7 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-37-g0178075e5

by git＠git-us.linaro.org

6 years, 10 months

[COMMIT] branch master updated. v1.21.0.0-36-gd102056f2

by git＠git-us.linaro.org

6 years, 10 months

[COMMIT] branch master updated. v1.21.0.0-35-g6a45a52be

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 6a45a52beaab49ab30a06a4cafe60bb869c1800d (commit) from e3217b34b9741560443b972aea71e270b547e7d9 (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 6a45a52beaab49ab30a06a4cafe60bb869c1800d Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Mar 7 13:45:13 2019 +0200 example: add new pipeline example application Add new simple pipeline example application. The application receives packets from one interface and passes them through 0-N worker stages before outputting them from a second network interface. The RX, worker, and TX stages are connected using plain queues and each stage is run on a separate CPU thread. Optionally, the worker stages calculate CRC-32C over packet data. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/doc/application-api-guide/examples.dox b/doc/application-api-guide/examples.dox index 42f7982c9..ec982519f 100644 --- a/doc/application-api-guide/examples.dox +++ b/doc/application-api-guide/examples.dox @@ -59,6 +59,11 @@ * Basic packet IO loopback test application */ + /** + *@example odp_simple_pipeline.c + * Simple pipeline example application + */ + /** * @example odp_switch.c * Minimal learning Ethernet switch example application diff --git a/example/Makefile.am b/example/Makefile.am index 0e12baf1a..359031d61 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -8,6 +8,7 @@ SUBDIRS = classifier \ l2fwd_simple \ l3fwd \ packet \ + simple_pipeline \ switch \ sysinfo \ time \ diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index ee4f44bae..39f01d418 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -27,6 +27,7 @@ AC_CONFIG_FILES([example/classifier/Makefile example/l2fwd_simple/Makefile example/l3fwd/Makefile example/packet/Makefile + example/simple_pipeline/Makefile example/switch/Makefile example/sysinfo/Makefile example/time/Makefile diff --git a/example/simple_pipeline/.gitignore b/example/simple_pipeline/.gitignore new file mode 100644 index 000000000..3b1c20744 --- /dev/null +++ b/example/simple_pipeline/.gitignore @@ -0,0 +1,3 @@ +odp_simple_pipeline +*.log +*.trs diff --git a/example/simple_pipeline/Makefile.am b/example/simple_pipeline/Makefile.am new file mode 100644 index 000000000..e94cd1143 --- /dev/null +++ b/example/simple_pipeline/Makefile.am @@ -0,0 +1,12 @@ +include $(top_srcdir)/example/Makefile.inc + +bin_PROGRAMS = odp_simple_pipeline + +odp_simple_pipeline_SOURCES = odp_simple_pipeline.c + +if test_example +if HAVE_PCAP +TESTS = simple_pipeline_run.sh +endif +endif +EXTRA_DIST = simple_pipeline_run.sh udp64.pcap diff --git a/example/simple_pipeline/odp_simple_pipeline.c b/example/simple_pipeline/odp_simple_pipeline.c new file mode 100644 index 000000000..a8a548e65 --- /dev/null +++ b/example/simple_pipeline/odp_simple_pipeline.c @@ -0,0 +1,948 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdlib.h> +#include <stdio.h> +#include <getopt.h> +#include <signal.h> +#include <unistd.h> +#include <inttypes.h> + +#include <odp_api.h> +#include <odp/helper/odph_api.h> + +#define POOL_PKT_NUM 8192 +#define POOL_PKT_LEN 1536 +#define MAX_PKT_BURST 32 +/* Three threads required for RX, TX and statistics */ +#define MAX_WORKERS (ODP_THREAD_COUNT_MAX - 3) +#define QUEUE_SIZE 1024 +#define MAX_PKTIOS 2 +#define DUMMY_HASH 1234567890 + +/* Get rid of path in filename - only for unix-type paths using '/' */ +#define NO_PATH(file_name) (strrchr((file_name), '/') ? \ + strrchr((file_name), '/') + 1 : (file_name)) + +/* Statistics */ +typedef union ODP_ALIGNED_CACHE { + struct { + uint64_t pps; /* Packet per second */ + uint64_t rx_cnt; /* RX packets */ + uint64_t tx_cnt; /* TX packets */ + uint64_t rx_drops; /* Dropped packets on RX */ + uint64_t tx_drops; /* Dropped packets on TX */ + } s; + uint8_t padding[ODP_CACHE_LINE_SIZE]; +} stats_t; + +/* Thread specific data */ +typedef struct thread_args_t { + odp_queue_t rx_queue; + odp_queue_t tx_queue; + stats_t stats; +} thread_args_t; + +/* Parsed command line application arguments */ +typedef struct { + char **if_names; /* Array of pointers to interface names */ + odph_ethaddr_t dst_addr; /* Destination MAC address */ + int accuracy; /* Statistics print interval in seconds */ + int extra_work; /* Add extra processing to worker stage */ + int dst_change; /* Change destination eth address */ + int src_change; /* Change source eth address */ + int dst_set; /* Custom destination eth address given */ + int time; /* Time in seconds to run. */ + int num_workers; /* Number of pipeline worker stages */ + char *if_str; /* Storage for interface names */ +} appl_args_t; + +/* Global application data */ +typedef struct { + odp_queue_t queue[ODP_THREAD_COUNT_MAX]; + /* Thread specific arguments */ + thread_args_t thread[ODP_THREAD_COUNT_MAX]; + /* Barriers to synchronize main and workers */ + odp_barrier_t init_barrier; + odp_barrier_t term_barrier; + /* Pktio interfaces */ + odp_pktio_t if0, if1; + odp_pktin_queue_t if0in, if1in; + odp_pktout_queue_t if0out, if1out; + odph_ethaddr_t src_addr; /* Source MAC address */ + odph_ethaddr_t dst_addr; /* Destination MAC address */ + int exit_threads; + /* Application (parsed) arguments */ + appl_args_t appl; +} global_data_t; + +static global_data_t *global; + +static void sig_handler(int signo ODP_UNUSED) +{ + global->exit_threads = 1; +} + +static odp_pktio_t create_pktio(const char *name, odp_pool_t pool, + odp_pktin_queue_t *pktin, + odp_pktout_queue_t *pktout) +{ + odp_pktio_param_t pktio_param; + odp_pktin_queue_param_t in_param; + odp_pktout_queue_param_t out_param; + odp_pktio_t pktio; + odp_pktio_config_t config; + + odp_pktio_param_init(&pktio_param); + + pktio = odp_pktio_open(name, pool, &pktio_param); + if (pktio == ODP_PKTIO_INVALID) { + printf("Error: failed to open %s\n", name); + exit(1); + } + + odp_pktio_config_init(&config); + config.parser.layer = ODP_PROTO_LAYER_L2; + odp_pktio_config(pktio, &config); + + odp_pktin_queue_param_init(&in_param); + odp_pktout_queue_param_init(&out_param); + + in_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; + + if (odp_pktin_queue_config(pktio, &in_param)) { + printf("Error: failed to config input queue for %s\n", name); + exit(1); + } + + out_param.op_mode = ODP_PKTIO_OP_MT_UNSAFE; + + if (odp_pktout_queue_config(pktio, &out_param)) { + printf("Error: failed to config output queue for %s\n", name); + exit(1); + } + + if (odp_pktin_queue(pktio, pktin, 1) != 1) { + printf("Error: pktin queue query failed for %s\n", name); + exit(1); + } + if (odp_pktout_queue(pktio, pktout, 1) != 1) { + printf("Error: pktout queue query failed for %s\n", name); + exit(1); + } + return pktio; +} + +/* + * Fill packets' eth addresses and convert packets to events + * + * pkt_tbl Array of packets + * event_tbl[out] Array of events + * num Number of packets in the array + */ +static inline unsigned int prep_events(odp_packet_t pkt_tbl[], + odp_event_t event_tbl[], + unsigned int num) +{ + unsigned int i; + unsigned int events = 0; + + if (!global->appl.dst_change && !global->appl.src_change) { + odp_packet_to_event_multi(pkt_tbl, event_tbl, num); + return num; + } + + for (i = 0; i < num; ++i) { + odp_packet_t pkt = pkt_tbl[i]; + odph_ethhdr_t *eth; + + odp_packet_prefetch(pkt, 0, ODPH_ETHHDR_LEN); + + if (odp_unlikely(!odp_packet_has_eth(pkt))) { + odp_packet_free(pkt); + continue; + } + + eth = odp_packet_data(pkt); + + if (global->appl.src_change) + eth->src = global->src_addr; + + if (global->appl.dst_change) + eth->dst = global->dst_addr; + + event_tbl[events++] = odp_packet_to_event(pkt); + } + return events; +} + +static inline int rx_thread(void *arg) +{ + thread_args_t *thr_args = arg; + odp_event_t event_tbl[MAX_PKT_BURST]; + odp_packet_t pkt_tbl[MAX_PKT_BURST]; + odp_pktin_queue_t pktin_queue = global->if0in; + odp_queue_t out_queue = thr_args->tx_queue; + stats_t *stats = &thr_args->stats; + int pkts, events, sent, drops; + + odp_barrier_wait(&global->init_barrier); + + while (!global->exit_threads) { + pkts = odp_pktin_recv(pktin_queue, pkt_tbl, MAX_PKT_BURST); + if (odp_unlikely(pkts <= 0)) + continue; + + stats->s.rx_cnt += pkts; + + events = prep_events(pkt_tbl, event_tbl, pkts); + drops = events - pkts; + if (odp_unlikely(drops)) + stats->s.rx_drops += pkts - events; + + sent = odp_queue_enq_multi(out_queue, event_tbl, events); + if (odp_unlikely(sent < 0)) + sent = 0; + + stats->s.tx_cnt += sent; + + drops = events - sent; + if (odp_unlikely(drops)) { + stats->s.tx_drops += drops; + odp_packet_free_multi(&pkt_tbl[sent], drops); + } + } + + /* Wait until pktio devices are stopped */ + odp_barrier_wait(&global->term_barrier); + + return 0; +} + +static inline int tx_thread(void *arg) +{ + thread_args_t *thr_args = arg; + odp_event_t event_tbl[MAX_PKT_BURST]; + odp_packet_t pkt_tbl[MAX_PKT_BURST]; + odp_queue_t rx_queue = thr_args->rx_queue; + odp_pktout_queue_t pktout_queue = global->if1out; + stats_t *stats = &thr_args->stats; + int events, sent, tx_drops; + + odp_barrier_wait(&global->init_barrier); + + while (!global->exit_threads) { + events = odp_queue_deq_multi(rx_queue, event_tbl, + MAX_PKT_BURST); + if (odp_unlikely(events <= 0)) + continue; + + stats->s.rx_cnt += events; + + odp_packet_from_event_multi(pkt_tbl, event_tbl, events); + + sent = odp_pktout_send(pktout_queue, pkt_tbl, events); + if (odp_unlikely(sent < 0)) + sent = 0; + + stats->s.tx_cnt += sent; + + tx_drops = events - sent; + if (odp_unlikely(tx_drops)) { + stats->s.tx_drops += tx_drops; + odp_packet_free_multi(&pkt_tbl[sent], tx_drops); + } + } + + /* Wait until pktio devices are stopped */ + odp_barrier_wait(&global->term_barrier); + + /* Empty queue before exiting */ + events = 1; + while (events > 0) { + events = odp_queue_deq_multi(rx_queue, event_tbl, + MAX_PKT_BURST); + + if (events > 0) + odp_event_free_multi(event_tbl, events); + } + + return 0; +} + +/* + * Work on packets + */ +static inline void work_on_events(odp_event_t event_tbl[], unsigned int num) +{ + unsigned int i; + + for (i = 0; i < num; i++) { + odp_packet_t pkt = odp_packet_from_event(event_tbl[i]); + + if (odp_hash_crc32c(odp_packet_data(pkt), + odp_packet_seg_len(pkt), 123) == DUMMY_HASH) + printf("Dummy hash match\n"); + } +} + +static inline int worker_thread(void *arg ODP_UNUSED) +{ + thread_args_t *thr_args = arg; + odp_event_t event_tbl[MAX_PKT_BURST]; + stats_t *stats = &thr_args->stats; + odp_queue_t rx_queue = thr_args->rx_queue; + odp_queue_t tx_queue = thr_args->tx_queue; + int events, sent, tx_drops; + int extra_work = global->appl.extra_work; + + odp_barrier_wait(&global->init_barrier); + + while (!global->exit_threads) { + events = odp_queue_deq_multi(rx_queue, event_tbl, + MAX_PKT_BURST); + + if (odp_unlikely(events <= 0)) + continue; + + stats->s.rx_cnt += events; + + if (extra_work) + work_on_events(event_tbl, events); + + sent = odp_queue_enq_multi(tx_queue, event_tbl, events); + if (odp_unlikely(sent < 0)) + sent = 0; + + stats->s.tx_cnt += sent; + + tx_drops = events - sent; + if (odp_unlikely(tx_drops)) { + stats->s.tx_drops += tx_drops; + odp_event_free_multi(&event_tbl[sent], tx_drops); + } + } + + /* Wait until pktio devices are stopped */ + odp_barrier_wait(&global->term_barrier); + + /* Empty queue before exiting */ + events = 1; + while (events > 0) { + events = odp_queue_deq_multi(rx_queue, event_tbl, + MAX_PKT_BURST); + + if (events > 0) + odp_event_free_multi(event_tbl, events); + } + + return 0; +} + +static int setup_thread_masks(odp_cpumask_t *thr_mask_rx, + odp_cpumask_t *thr_mask_tx, + odp_cpumask_t *thr_mask_workers, + int num_workers) +{ + odp_cpumask_t cpumask; + int num_threads = 0; + int i, cpu; + + if (num_workers > MAX_WORKERS) { + printf("Worker count limited to MAX_WORKERS define (=%d)\n", + MAX_WORKERS); + num_workers = MAX_WORKERS; + } + + /* Two threads required for RX and TX*/ + num_threads = num_workers + 2; + + num_workers = odp_cpumask_default_worker(&cpumask, num_threads); + if (num_workers != num_threads) { + printf("Error: Not enough available CPU cores: %d/%d\n", + num_workers, num_threads); + exit(1); + } + + odp_cpumask_zero(thr_mask_rx); + odp_cpumask_zero(thr_mask_tx); + odp_cpumask_zero(thr_mask_workers); + + cpu = odp_cpumask_first(&cpumask); + for (i = 0; i < num_threads; i++) { + if (i == 0) + odp_cpumask_set(thr_mask_rx, cpu); + else if (i == 1) + odp_cpumask_set(thr_mask_tx, cpu); + else + odp_cpumask_set(thr_mask_workers, cpu); + cpu = odp_cpumask_next(&cpumask, cpu); + } + + return num_threads; +} + +/* + * Print statistics + * + * num_workers Number of worker threads + * thr_stats Pointers to stats storage + * duration Number of seconds to loop in + * timeout Number of seconds for stats calculation + */ +static int print_speed_stats(int num_workers, stats_t **thr_stats, + int duration, int timeout) +{ + uint64_t total_pkts = 0; + uint64_t pkts_prev = 0; + uint64_t maximum_pps = 0; + stats_t thr_stats_prev[num_workers]; + int i; + int elapsed = 0; + int stats_enabled = 1; + int loop_forever = (duration == 0); + + memset(thr_stats_prev, 0, sizeof(thr_stats_prev)); + + if (timeout <= 0) { + stats_enabled = 0; + timeout = 1; + } + + /* Wait for all threads to be ready*/ + odp_barrier_wait(&global->init_barrier); + + do { + uint64_t total_rx_drops = 0; + uint64_t total_tx_drops = 0; + uint64_t pps; + + sleep(timeout); + + for (i = 0; i < num_workers; i++) { + uint64_t rx_cnt = thr_stats[i]->s.rx_cnt; + uint64_t tx_cnt = thr_stats[i]->s.tx_cnt; + uint64_t rx_drops = thr_stats[i]->s.rx_drops; + uint64_t tx_drops = thr_stats[i]->s.tx_drops; + + /* Count only transmitted packets */ + if (i == (num_workers - 1)) + total_pkts = tx_cnt; + + total_rx_drops += rx_drops; + total_tx_drops += tx_drops; + + pps = (tx_cnt - thr_stats_prev[i].s.tx_cnt) / timeout; + thr_stats_prev[i].s.pps = pps; + thr_stats_prev[i].s.rx_cnt = rx_cnt; + thr_stats_prev[i].s.tx_cnt = tx_cnt; + thr_stats_prev[i].s.rx_drops = rx_drops; + thr_stats_prev[i].s.tx_drops = tx_drops; + } + if (stats_enabled) { + printf("----------------------------------------\n"); + for (i = 0; i < num_workers; i++) { + if (i == 0) + printf("RX thread: "); + else if (i == (num_workers - 1)) + printf("TX thread: "); + else + printf("Worker %d: ", i - 1); + + printf("%" PRIu64 " pps, " + "%" PRIu64 " rx drops, " + "%" PRIu64 " tx drops\n", + thr_stats_prev[i].s.pps, + thr_stats_prev[i].s.rx_drops, + thr_stats_prev[i].s.tx_drops); + } + pps = (total_pkts - pkts_prev) / timeout; + if (pps > maximum_pps) + maximum_pps = pps; + printf("TOTAL: %" PRIu64 " pps, " + "%" PRIu64 " rx drops, " + "%" PRIu64 " tx drops, " + "%" PRIu64 " max pps\n", + pps, total_rx_drops, total_tx_drops, + maximum_pps); + + pkts_prev = total_pkts; + } + elapsed += timeout; + } while (!global->exit_threads && (loop_forever || + (elapsed < duration))); + + if (stats_enabled) + printf("TEST RESULT: %" PRIu64 " maximum packets per second.\n", + maximum_pps); + + return total_pkts > 0 ? 0 : -1; +} + +/* + * Print system and application info + */ +static void print_info(char *progname, appl_args_t *appl_args) +{ + odp_sys_info_print(); + + printf("Running ODP appl: \"%s\"\n" + "-----------------\n" + "Using IFs: %s %s\n" + "Worker stages: %d\n" + "Extra work: %d\n\n", + progname, appl_args->if_names[0], appl_args->if_names[1], + appl_args->num_workers, appl_args->extra_work); + + fflush(NULL); +} + +/* + * Print usage information + */ +static void usage(char *progname) +{ + printf("\n" + "OpenDataPlane simple pipeline example application.\n" + "\n" + "Usage: %s [options]\n" + "\n" + " E.g. %s -i eth0,eth1 -e -w 3\n\n" + " ---- ---- ---- ---- ----\n" + " | RX | -> | W1 | -> | W2 | -> | W3 | -> | TX |\n" + " ---- ---- ---- ---- ----\n\n" + " In the above example,\n" + " each application stage is executed by a separate CPU thread and the stages\n" + " are connected using plain queues. The RX stage receives packets from eth0 and\n" + " enqueues them to the first worker stage (W1). The workers stages calculate\n" + " CRC-32C over packet data. After the final worker stage (W3) has processed\n" + " packets they are enqueued to the TX stage, which transmits the packets out\n" + " from interface eth1.\n" + "\n" + "Mandatory OPTIONS:\n" + " -i, --interface <name> Two eth interfaces (comma-separated, no spaces)\n" + "\n" + "Optional OPTIONS:\n" + " -a, --accuracy <sec> Time in seconds get print statistics\n" + " (default is 10 seconds).\n" + " -d, --dst_change <arg> 0: Don't change packets' dst eth addresses\n" + " 1: Change packets' dst eth addresses (default)\n" + " -s, --src_change <arg> 0: Don't change packets' src eth addresses\n" + " 1: Change packets' src eth addresses (default)\n" + " -r, --dst_addr <addr> Destination address\n" + " Requires also the -d flag to be set\n" + " -t, --time <sec> Time in seconds to run\n" + " -w, --workers <num> Number of worker stages (default 0)\n" + " -e, --extra-work Calculate CRC-32C over packet data in worker stage\n" + " -h, --help Display help and exit\n\n" + "\n", NO_PATH(progname), NO_PATH(progname) + ); +} + +/* + * Parse and store the command line arguments + * + * argc Argument count + * argv Argument vector + * appl_args[out] Storage for application arguments + */ +static void parse_args(int argc, char *argv[], appl_args_t *appl_args) +{ + char *token; + size_t len; + int opt; + int long_index; + int i; + int if_count = 0; + static const struct option longopts[] = { + {"accuracy", required_argument, NULL, 'a'}, + {"extra-work", no_argument, NULL, 'e'}, + {"dst_addr", required_argument, NULL, 'r'}, + {"dst_change", required_argument, NULL, 'd'}, + {"src_change", required_argument, NULL, 's'}, + {"interface", required_argument, NULL, 'i'}, + {"time", required_argument, NULL, 't'}, + {"workers", required_argument, NULL, 'w'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + + static const char *shortopts = "+a:d:er:s:t:i:w:h"; + + appl_args->accuracy = 10; /* get and print pps stats second */ + appl_args->dst_change = 1; /* change eth dst address by default */ + appl_args->src_change = 1; /* change eth src address by default */ + appl_args->time = 0; /* loop forever if time to run is 0 */ + appl_args->extra_work = 0; + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'a': + appl_args->accuracy = atoi(optarg); + break; + case 'd': + appl_args->dst_change = atoi(optarg); + break; + case 'e': + appl_args->extra_work = 1; + break; + case 'r': + len = strlen(optarg); + if (len == 0) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + len += 1; /* add room for '\0' */ + + if (odph_eth_addr_parse(&appl_args->dst_addr, + optarg) != 0) { + printf("invalid MAC address\n"); + usage(argv[0]); + exit(EXIT_FAILURE); + } + + appl_args->dst_set = 1; + + break; + case 's': + appl_args->src_change = atoi(optarg); + break; + case 't': + appl_args->time = atoi(optarg); + break; + case 'i': + len = strlen(optarg); + if (len == 0) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + len += 1; /* add room for '\0' */ + + appl_args->if_str = malloc(len); + if (appl_args->if_str == NULL) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + /* count the number of tokens separated by ',' */ + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token != NULL; + token = strtok(NULL, ","), i++) + ; + + if_count = i; + + if (if_count != 2) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + /* allocate storage for the if names */ + appl_args->if_names = calloc(if_count, sizeof(char *)); + + /* store the if names (reset names string) */ + strcpy(appl_args->if_str, optarg); + for (token = strtok(appl_args->if_str, ","), i = 0; + token != NULL; token = strtok(NULL, ","), i++) { + appl_args->if_names[i] = token; + } + break; + case 'w': + appl_args->num_workers = atoi(optarg); + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + default: + break; + } + } + + if (if_count != 2) { + usage(argv[0]); + exit(EXIT_FAILURE); + } + + optind = 1; /* reset 'extern optind' from the getopt lib */ +} + +int main(int argc, char **argv) +{ + odp_cpumask_t thr_mask_rx; + odp_cpumask_t thr_mask_tx; + odp_cpumask_t thr_mask_worker; + odp_init_t init_param; + odp_instance_t instance; + odp_pool_t pool; + odp_pool_capability_t pool_capa; + odp_pool_param_t pool_param; + odp_queue_capability_t queue_capa; + odp_queue_param_t queue_param; + odp_shm_t shm; + odph_helper_options_t helper_options; + odph_odpthread_t thr_tbl[ODP_THREAD_COUNT_MAX]; + odph_ethaddr_t new_addr; + odph_odpthread_params_t thr_params; + stats_t *stats[ODP_THREAD_COUNT_MAX]; + thread_args_t *thr_args; + uint32_t pkt_len, seg_len, pkt_num; + int qid; + int cpu; + int num_threads; + int i; + int ret; + + /* Let helper collect its own arguments (e.g. --odph_proc) */ + argc = odph_parse_options(argc, argv); + if (odph_options(&helper_options)) { + printf("Error: reading ODP helper options failed.\n"); + exit(EXIT_FAILURE); + } + + odp_init_param_init(&init_param); + init_param.mem_model = helper_options.mem_model; + + if (odp_init_global(&instance, &init_param, NULL)) { + printf("Error: ODP global init failed.\n"); + exit(1); + } + + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + printf("Error: ODP local init failed.\n"); + exit(1); + } + + /* Reserve memory for global data */ + shm = odp_shm_reserve("simple_pipeline", sizeof(global_data_t), + ODP_CACHE_LINE_SIZE, 0); + if (shm == ODP_SHM_INVALID) { + printf("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + + global = odp_shm_addr(shm); + if (global == NULL) { + printf("Error: shared mem alloc failed.\n"); + exit(EXIT_FAILURE); + } + + memset(global, 0, sizeof(global_data_t)); + + signal(SIGINT, sig_handler); + + /* Parse and store the application arguments */ + parse_args(argc, argv, &global->appl); + + num_threads = setup_thread_masks(&thr_mask_rx, &thr_mask_tx, + &thr_mask_worker, + global->appl.num_workers); + + /* Print both system and application information */ + print_info(NO_PATH(argv[0]), &global->appl); + + /* Create queues for pipeline */ + if (odp_queue_capability(&queue_capa)) { + printf("Error: reading queue capability failed.\n"); + exit(EXIT_FAILURE); + } + if (queue_capa.plain.max_num < (unsigned int)num_threads) { + printf("Error: insufficient number of queues supported.\n"); + exit(EXIT_FAILURE); + } + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_PLAIN; + queue_param.enq_mode = ODP_QUEUE_OP_MT_UNSAFE; + queue_param.deq_mode = ODP_QUEUE_OP_MT_UNSAFE; + queue_param.size = QUEUE_SIZE; + if (queue_capa.plain.max_size && + queue_param.size > queue_capa.plain.max_size) + queue_param.size = queue_capa.plain.max_size; + for (i = 0; i < num_threads; i++) { + odp_queue_t queue = odp_queue_create("plain_queue", + &queue_param); + + if (queue == ODP_QUEUE_INVALID) { + printf("Error: queue create failed.\n"); + exit(EXIT_FAILURE); + } + global->queue[i] = queue; + } + + /* Create packet pool */ + if (odp_pool_capability(&pool_capa)) { + printf("Error: reading pool capability failed.\n"); + exit(EXIT_FAILURE); + } + + pkt_len = POOL_PKT_LEN; + seg_len = POOL_PKT_LEN; + pkt_num = POOL_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_seg_len && seg_len > pool_capa.pkt.max_seg_len) + seg_len = pool_capa.pkt.max_seg_len; + + if (pool_capa.pkt.max_num && pkt_num > pool_capa.pkt.max_num) + pkt_num = pool_capa.pkt.max_num; + + odp_pool_param_init(&pool_param); + pool_param.pkt.seg_len = seg_len; + pool_param.pkt.len = pkt_len; + pool_param.pkt.num = pkt_num; + pool_param.type = ODP_POOL_PACKET; + + pool = odp_pool_create("packet pool", &pool_param); + if (pool == ODP_POOL_INVALID) { + printf("Error: packet pool create failed.\n"); + exit(1); + } + + global->if0 = create_pktio(global->appl.if_names[0], pool, + &global->if0in, &global->if0out); + global->if1 = create_pktio(global->appl.if_names[1], pool, + &global->if1in, &global->if1out); + + /* Save TX interface Ethernet address */ + if (odp_pktio_mac_addr(global->if1, global->src_addr.addr, + ODPH_ETHADDR_LEN) != ODPH_ETHADDR_LEN) { + printf("Error: TX interface Ethernet address unknown\n"); + exit(EXIT_FAILURE); + } + + /* Save destination Ethernet address */ + if (global->appl.dst_change) { + /* 02:00:00:00:00:XX */ + memset(&new_addr, 0, sizeof(odph_ethaddr_t)); + if (global->appl.dst_set) { + memcpy(&new_addr, &global->appl.dst_addr, + sizeof(odph_ethaddr_t)); + } else { + new_addr.addr[0] = 0x02; + new_addr.addr[5] = 1; + } + global->dst_addr = new_addr; + } + + if (odp_pktio_start(global->if0)) { + printf("Error: unable to start input interface\n"); + exit(1); + } + if (odp_pktio_start(global->if1)) { + printf("Error: unable to start output interface\n"); + exit(1); + } + + odp_barrier_init(&global->init_barrier, num_threads + 1); + odp_barrier_init(&global->term_barrier, num_threads + 1); + + for (i = 0; i < num_threads; i++) + stats[i] = &global->thread[i].stats; + + memset(thr_tbl, 0, sizeof(thr_tbl)); + memset(&thr_params, 0, sizeof(thr_params)); + thr_params.thr_type = ODP_THREAD_WORKER; + thr_params.instance = instance; + + /* RX thread */ + thr_args = &global->thread[0]; + thr_args->tx_queue = global->queue[0]; + thr_params.start = rx_thread; + thr_params.arg = thr_args; + odph_odpthreads_create(&thr_tbl[0], &thr_mask_rx, &thr_params); + + /* Worker threads */ + cpu = odp_cpumask_first(&thr_mask_worker); + for (i = 1, qid = 0; i < (num_threads - 1); i++, qid++) { + odp_cpumask_t thr_mask; + + thr_args = &global->thread[i]; + thr_args->rx_queue = global->queue[qid]; + thr_args->tx_queue = global->queue[qid + 1]; + + thr_params.start = worker_thread; + thr_params.arg = &global->thread[i]; + + odp_cpumask_zero(&thr_mask); + odp_cpumask_set(&thr_mask, cpu); + odph_odpthreads_create(&thr_tbl[i], &thr_mask, + &thr_params); + cpu = odp_cpumask_next(&thr_mask_worker, cpu); + } + + /* TX thread */ + thr_args = &global->thread[num_threads - 1]; + thr_args->rx_queue = global->queue[global->appl.num_workers]; + thr_params.start = tx_thread; + thr_params.arg = thr_args; + odph_odpthreads_create(&thr_tbl[num_threads - 1], &thr_mask_tx, + &thr_params); + + ret = print_speed_stats(num_threads, stats, global->appl.time, + global->appl.accuracy); + + if (odp_pktio_stop(global->if0)) { + printf("Error: failed to stop interface %s\n", argv[1]); + exit(EXIT_FAILURE); + } + if (odp_pktio_stop(global->if1)) { + printf("Error: failed to stop interface %s\n", argv[2]); + exit(EXIT_FAILURE); + } + + global->exit_threads = 1; + odp_barrier_wait(&global->term_barrier); + + for (i = 0; i < num_threads; i++) + odph_odpthreads_join(&thr_tbl[i]); + + if (odp_pktio_close(global->if0)) { + printf("Error: failed to close interface %s\n", argv[1]); + exit(EXIT_FAILURE); + } + if (odp_pktio_close(global->if1)) { + printf("Error: failed to close interface %s\n", argv[2]); + exit(EXIT_FAILURE); + } + + for (i = 0; i < num_threads; i++) { + if (odp_queue_destroy(global->queue[i])) { + printf("Error: failed to destroy queue %d\n", i); + exit(EXIT_FAILURE); + } + } + + if (odp_pool_destroy(pool)) { + printf("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_shm_free(shm)) { + printf("Error: shm free global data\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + printf("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + printf("Error: term global\n"); + exit(EXIT_FAILURE); + } + + return ret; +} diff --git a/example/simple_pipeline/simple_pipeline_run.sh b/example/simple_pipeline/simple_pipeline_run.sh new file mode 100755 index 000000000..3eba3a677 --- /dev/null +++ b/example/simple_pipeline/simple_pipeline_run.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# +# Copyright (c) 2019, Nokia +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# Exit code expected by automake for skipped tests +TEST_SKIPPED=77 + +PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` +echo "using PCAP_IN = ${PCAP_IN}" + +if [ $(nproc --all) -lt 3 ]; then + echo "Not enough CPU cores. Skipping test." + exit $TEST_SKIPPED +fi + +./odp_simple_pipeline${EXEEXT} -i pcap:in=${PCAP_IN},pcap:out=pcapout.pcap -e -t 2 +STATUS=$? + +if [ "$STATUS" -ne 0 ]; then + echo "Error: status was: $STATUS, expected 0" + exit 1 +fi + +if [ `stat -c %s pcapout.pcap` -ne `stat -c %s ${PCAP_IN}` ]; then + echo "File sizes disagree" + exit 1 +fi + +rm -f pcapout.pcap + +exit 0 diff --git a/example/simple_pipeline/udp64.pcap b/example/simple_pipeline/udp64.pcap new file mode 100644 index 000000000..45f9d6e63 Binary files /dev/null and b/example/simple_pipeline/udp64.pcap differ ----------------------------------------------------------------------- Summary of changes: doc/application-api-guide/examples.dox | 5 + example/Makefile.am | 1 + example/m4/configure.m4 | 1 + example/simple_pipeline/.gitignore | 3 + example/simple_pipeline/Makefile.am | 12 + example/simple_pipeline/odp_simple_pipeline.c | 948 +++++++++++++++++++++ .../simple_pipeline_run.sh} | 22 +- .../{l2fwd_simple => simple_pipeline}/udp64.pcap | Bin 8 files changed, 980 insertions(+), 12 deletions(-) create mode 100644 example/simple_pipeline/.gitignore create mode 100644 example/simple_pipeline/Makefile.am create mode 100644 example/simple_pipeline/odp_simple_pipeline.c copy example/{l2fwd_simple/l2fwd_simple_run.sh => simple_pipeline/simple_pipeline_run.sh} (56%) copy example/{l2fwd_simple => simple_pipeline}/udp64.pcap (100%) hooks/post-receive --

6 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
121
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp