git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch api-next updated. v1.10.1.0-146-ga8d5848

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via a8d5848de4cd79122ebb2a831d465e05b77e52a3 (commit) via e5492930c13b8b17a6333050fd5078c89b305c17 (commit) via 5ed89eb5eefd985087051e044c5c16980fdd8e5f (commit) via c2d1ed55e871d26cbebae1d0e9080edae9bafe38 (commit) via c2bd39436032f544f1a211425d39d7d68c47d193 (commit) via d5295a9c745e82fbf002d71d3fa8a32ebfb48047 (commit) via a5d7adea4b2487b020371ac554935972ec947385 (commit) via 8e9c4fe4ec0611ddde0b027d7c45a1b92d182a0e (commit) via 5d4f6cbd12a7f079917bc5ad18b710b3e34485b1 (commit) via 26b90314427f088c7f7e2accd41ec7db5d396265 (commit) via e072ea084a27df729d1b94c0bec2d45fb1e4d26f (commit) via 3eb700768b6369e674e5d5a9758eb39f8fd34c3d (commit) via c05c1c608c6dbc367ebb9a819fa4cbbbca882db3 (commit) from e259ced4849018066194b49f723d2d6d2ec559b1 (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 a8d5848de4cd79122ebb2a831d465e05b77e52a3 Merge: e259ced e549293 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Aug 17 18:20:53 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc test/linux-generic/Makefile.am index df10c61,4660cf0..23b8e03 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@@ -2,9 -2,8 +2,9 @@@ include $(top_srcdir)/test/Makefile.in TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api +ALL_DRV_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/drv - SUBDIRS = + SUBDIRS = performance if test_vald TESTS = validation/api/pktio/pktio_run.sh \ ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 + doc/application-api-guide/examples.dox | 15 +- doc/implementers-guide/implementers-guide.adoc | 26 +-- doc/platform-api-guide/Doxyfile | 1 + doc/platform-api-guide/Makefile.am | 8 +- doc/process-guide/release-guide.adoc | 84 +++++-- example/l2fwd/README | 8 + example/l2fwd/odp_l2fwd.c | 1 + platform/linux-generic/doc/platform_specific.dox | 46 ++++ .../include/odp_traffic_mngr_internal.h | 39 +++- platform/linux-generic/odp_schedule.c | 26 ++- platform/linux-generic/odp_traffic_mngr.c | 243 +++++++++++++++++++-- test/README | 9 +- .../validation/api/traffic_mngr/traffic_mngr.c | 2 +- test/linux-generic/Makefile.am | 2 +- test/linux-generic/m4/configure.m4 | 5 +- .../m4/performance.m4 | 10 +- .../api => linux-generic/performance}/.gitignore | 0 test/linux-generic/performance/Makefile.am | 13 ++ .../performance/odp_scheduling_run_proc.sh | 26 +++ test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 10 +- 21 files changed, 501 insertions(+), 75 deletions(-) create mode 100644 example/l2fwd/README create mode 120000 example/l2fwd/odp_l2fwd.c create mode 100644 platform/linux-generic/doc/platform_specific.dox copy test/{common_plat => linux-generic}/m4/performance.m4 (51%) copy test/{common_plat/validation/api => linux-generic/performance}/.gitignore (100%) create mode 100644 test/linux-generic/performance/Makefile.am create mode 100755 test/linux-generic/performance/odp_scheduling_run_proc.sh hooks/post-receive --

9 years, 5 months

[COMMIT] branch master updated. v1.10.1.0-89-ge549293

by git＠git-us.linaro.org

9 years, 5 months

[COMMIT] branch api-next updated. v1.10.1.0-133-ge259ced

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via e259ced4849018066194b49f723d2d6d2ec559b1 (commit) from fa657759a41b23b4fd76c30b8f3ca27d709950d2 (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 e259ced4849018066194b49f723d2d6d2ec559b1 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Wed Aug 17 10:01:55 2016 +0200 test: drv: atomic renamed to drvatomic At installation time (make install) all tests executables are copied into a single directory (lib/odp/tests). Having two modules with identical names on the two interfaces (api and drv) leads to the same test executable name ('atomic_main' in this case). As a consequence one of the test overwrites the other at copy time, and is run twice at make check install (successfully, so no error is shown). We therefore have to guarantee module name unicity over ODP: we cannot have an atomic module on the drv interface if such a module name already exists on the api interface. The atomic module from the drv interface is hence renamed drvatomic. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 index bfde6cb..20c3a3b 100644 --- a/test/common_plat/m4/configure.m4 +++ b/test/common_plat/m4/configure.m4 @@ -32,4 +32,4 @@ AC_CONFIG_FILES([test/common_plat/Makefile test/common_plat/validation/api/timer/Makefile test/common_plat/validation/api/traffic_mngr/Makefile test/common_plat/validation/drv/Makefile - test/common_plat/validation/drv/atomic/Makefile]) + test/common_plat/validation/drv/drvatomic/Makefile]) diff --git a/test/common_plat/validation/drv/Makefile.am b/test/common_plat/validation/drv/Makefile.am index 0dae3c3..eedbad5 100644 --- a/test/common_plat/validation/drv/Makefile.am +++ b/test/common_plat/validation/drv/Makefile.am @@ -1,4 +1,4 @@ -ODPDRV_MODULES = atomic +ODPDRV_MODULES = drvatomic SUBDIRS = $(ODPDRV_MODULES) diff --git a/test/common_plat/validation/drv/atomic/.gitignore b/test/common_plat/validation/drv/atomic/.gitignore deleted file mode 100644 index 610ffea..0000000 --- a/test/common_plat/validation/drv/atomic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -atomic_main diff --git a/test/common_plat/validation/drv/atomic/Makefile.am b/test/common_plat/validation/drv/atomic/Makefile.am deleted file mode 100644 index 9b6bd63..0000000 --- a/test/common_plat/validation/drv/atomic/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include ../Makefile.inc - -noinst_LTLIBRARIES = libtestatomic.la -libtestatomic_la_SOURCES = atomic.c - -test_PROGRAMS = atomic_main$(EXEEXT) -dist_atomic_main_SOURCES = atomic_main.c -atomic_main_LDADD = libtestatomic.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = atomic.h diff --git a/test/common_plat/validation/drv/atomic/atomic.h b/test/common_plat/validation/drv/atomic/atomic.h deleted file mode 100644 index 438c0a3..0000000 --- a/test/common_plat/validation/drv/atomic/atomic.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_ATOMIC_H_ -#define _ODP_TEST_ATOMIC_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void atomic_test_atomic_inc_dec(void); -void atomic_test_atomic_add_sub(void); -void atomic_test_atomic_fetch_inc_dec(void); -void atomic_test_atomic_fetch_add_sub(void); -void atomic_test_atomic_max_min(void); -void atomic_test_atomic_cas_inc_dec(void); -void atomic_test_atomic_xchg(void); -void atomic_test_atomic_non_relaxed(void); -void atomic_test_atomic_op_lock_free(void); - -/* test arrays: */ -extern odp_testinfo_t atomic_suite_atomic[]; - -/* test array init/term functions: */ -int atomic_suite_init(void); - -/* test registry: */ -extern odp_suiteinfo_t atomic_suites[]; - -/* executable init/term functions: */ -int atomic_init(odp_instance_t *inst); - -/* main test program: */ -int atomic_main(int argc, char *argv[]); - -#endif diff --git a/test/common_plat/validation/drv/drvatomic/.gitignore b/test/common_plat/validation/drv/drvatomic/.gitignore new file mode 100644 index 0000000..3b5e510 --- /dev/null +++ b/test/common_plat/validation/drv/drvatomic/.gitignore @@ -0,0 +1 @@ +drvatomic_main diff --git a/test/common_plat/validation/drv/drvatomic/Makefile.am b/test/common_plat/validation/drv/drvatomic/Makefile.am new file mode 100644 index 0000000..53e971c --- /dev/null +++ b/test/common_plat/validation/drv/drvatomic/Makefile.am @@ -0,0 +1,10 @@ +include ../Makefile.inc + +noinst_LTLIBRARIES = libtestdrvatomic.la +libtestdrvatomic_la_SOURCES = drvatomic.c + +test_PROGRAMS = drvatomic_main$(EXEEXT) +dist_drvatomic_main_SOURCES = drvatomic_main.c +drvatomic_main_LDADD = libtestdrvatomic.la $(LIBCUNIT_COMMON) $(LIBODP) + +EXTRA_DIST = drvatomic.h diff --git a/test/common_plat/validation/drv/atomic/atomic.c b/test/common_plat/validation/drv/drvatomic/drvatomic.c similarity index 94% rename from test/common_plat/validation/drv/atomic/atomic.c rename to test/common_plat/validation/drv/drvatomic/drvatomic.c index 162f6e4..cc5e441 100644 --- a/test/common_plat/validation/drv/atomic/atomic.c +++ b/test/common_plat/validation/drv/drvatomic/drvatomic.c @@ -10,7 +10,7 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> -#include "atomic.h" +#include "drvatomic.h" #define VERBOSE 0 #define MAX_ITERATIONS 1000 @@ -541,7 +541,7 @@ static void test_atomic_validate(int check) } } -int atomic_init(odp_instance_t *inst) +int drvatomic_init(odp_instance_t *inst) { uint32_t workers_count, max_threads; int ret = 0; @@ -707,48 +707,48 @@ static void test_atomic_functional(int func_ptr(void *), int check) test_atomic_validate(check); } -void atomic_test_atomic_inc_dec(void) +void drvatomic_test_atomic_inc_dec(void) { test_atomic_functional(test_atomic_inc_dec_thread, 0); } -void atomic_test_atomic_add_sub(void) +void drvatomic_test_atomic_add_sub(void) { test_atomic_functional(test_atomic_add_sub_thread, 0); } -void atomic_test_atomic_fetch_inc_dec(void) +void drvatomic_test_atomic_fetch_inc_dec(void) { test_atomic_functional(test_atomic_fetch_inc_dec_thread, 0); } -void atomic_test_atomic_fetch_add_sub(void) +void drvatomic_test_atomic_fetch_add_sub(void) { test_atomic_functional(test_atomic_fetch_add_sub_thread, 0); } -void atomic_test_atomic_max_min(void) +void drvatomic_test_atomic_max_min(void) { test_atomic_functional(test_atomic_max_min_thread, CHECK_MAX_MIN); } -void atomic_test_atomic_cas_inc_dec(void) +void drvatomic_test_atomic_cas_inc_dec(void) { test_atomic_functional(test_atomic_cas_inc_dec_thread, 0); } -void atomic_test_atomic_xchg(void) +void drvatomic_test_atomic_xchg(void) { test_atomic_functional(test_atomic_xchg_thread, CHECK_XCHG); } -void atomic_test_atomic_non_relaxed(void) +void drvatomic_test_atomic_non_relaxed(void) { test_atomic_functional(test_atomic_non_relaxed_thread, CHECK_MAX_MIN | CHECK_XCHG); } -void atomic_test_atomic_op_lock_free(void) +void drvatomic_test_atomic_op_lock_free(void) { odpdrv_atomic_op_t atomic_op; int ret_null, ret; @@ -854,26 +854,26 @@ void atomic_test_atomic_op_lock_free(void) } } -odp_testinfo_t atomic_suite_atomic[] = { - ODP_TEST_INFO(atomic_test_atomic_inc_dec), - ODP_TEST_INFO(atomic_test_atomic_add_sub), - ODP_TEST_INFO(atomic_test_atomic_fetch_inc_dec), - ODP_TEST_INFO(atomic_test_atomic_fetch_add_sub), - ODP_TEST_INFO(atomic_test_atomic_max_min), - ODP_TEST_INFO(atomic_test_atomic_cas_inc_dec), - ODP_TEST_INFO(atomic_test_atomic_xchg), - ODP_TEST_INFO(atomic_test_atomic_non_relaxed), - ODP_TEST_INFO(atomic_test_atomic_op_lock_free), +odp_testinfo_t drvatomic_suite_atomic[] = { + ODP_TEST_INFO(drvatomic_test_atomic_inc_dec), + ODP_TEST_INFO(drvatomic_test_atomic_add_sub), + ODP_TEST_INFO(drvatomic_test_atomic_fetch_inc_dec), + ODP_TEST_INFO(drvatomic_test_atomic_fetch_add_sub), + ODP_TEST_INFO(drvatomic_test_atomic_max_min), + ODP_TEST_INFO(drvatomic_test_atomic_cas_inc_dec), + ODP_TEST_INFO(drvatomic_test_atomic_xchg), + ODP_TEST_INFO(drvatomic_test_atomic_non_relaxed), + ODP_TEST_INFO(drvatomic_test_atomic_op_lock_free), ODP_TEST_INFO_NULL, }; -odp_suiteinfo_t atomic_suites[] = { - {"atomic", NULL, NULL, - atomic_suite_atomic}, +odp_suiteinfo_t drvatomic_suites[] = { + {"drvatomic", NULL, NULL, + drvatomic_suite_atomic}, ODP_SUITE_INFO_NULL }; -int atomic_main(int argc, char *argv[]) +int drvatomic_main(int argc, char *argv[]) { int ret; @@ -881,9 +881,9 @@ int atomic_main(int argc, char *argv[]) if (odp_cunit_parse_options(argc, argv)) return -1; - odp_cunit_register_global_init(atomic_init); + odp_cunit_register_global_init(drvatomic_init); - ret = odp_cunit_register(atomic_suites); + ret = odp_cunit_register(drvatomic_suites); if (ret == 0) ret = odp_cunit_run(); diff --git a/test/common_plat/validation/drv/drvatomic/drvatomic.h b/test/common_plat/validation/drv/drvatomic/drvatomic.h new file mode 100644 index 0000000..62fb17d --- /dev/null +++ b/test/common_plat/validation/drv/drvatomic/drvatomic.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _ODP_TEST_DRVATOMIC_H_ +#define _ODP_TEST_DRVATOMIC_H_ + +#include <odp_cunit_common.h> + +/* test functions: */ +void drvatomic_test_atomic_inc_dec(void); +void drvatomic_test_atomic_add_sub(void); +void drvatomic_test_atomic_fetch_inc_dec(void); +void drvatomic_test_atomic_fetch_add_sub(void); +void drvatomic_test_atomic_max_min(void); +void drvatomic_test_atomic_cas_inc_dec(void); +void drvatomic_test_atomic_xchg(void); +void drvatomic_test_atomic_non_relaxed(void); +void drvatomic_test_atomic_op_lock_free(void); + +/* test arrays: */ +extern odp_testinfo_t drvatomic_suite_atomic[]; + +/* test registry: */ +extern odp_suiteinfo_t drvatomic_suites[]; + +/* executable init/term functions: */ +int drvatomic_init(odp_instance_t *inst); + +/* main test program: */ +int drvatomic_main(int argc, char *argv[]); + +#endif diff --git a/test/common_plat/validation/drv/atomic/atomic_main.c b/test/common_plat/validation/drv/drvatomic/drvatomic_main.c similarity index 72% rename from test/common_plat/validation/drv/atomic/atomic_main.c rename to test/common_plat/validation/drv/drvatomic/drvatomic_main.c index b290087..390a3e2 100644 --- a/test/common_plat/validation/drv/atomic/atomic_main.c +++ b/test/common_plat/validation/drv/drvatomic/drvatomic_main.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include "atomic.h" +#include "drvatomic.h" int main(int argc, char *argv[]) { - return atomic_main(argc, argv); + return drvatomic_main(argc, argv); } diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index 1cee6e7..df10c61 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -34,7 +34,7 @@ TESTS = validation/api/pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) \ - $(ALL_DRV_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ + $(ALL_DRV_VALIDATION_DIR)/drvatomic/drvatomic_main$(EXEEXT) \ ring/ring_main$(EXEEXT) SUBDIRS += validation/api/pktio\ ----------------------------------------------------------------------- Summary of changes: test/common_plat/m4/configure.m4 | 2 +- test/common_plat/validation/drv/Makefile.am | 2 +- test/common_plat/validation/drv/atomic/.gitignore | 1 - test/common_plat/validation/drv/atomic/Makefile.am | 10 ---- test/common_plat/validation/drv/atomic/atomic.h | 38 --------------- .../validation/drv/drvatomic/.gitignore | 1 + .../validation/drv/drvatomic/Makefile.am | 10 ++++ .../drv/{atomic/atomic.c => drvatomic/drvatomic.c} | 54 +++++++++++----------- .../validation/drv/drvatomic/drvatomic.h | 35 ++++++++++++++ .../atomic_main.c => drvatomic/drvatomic_main.c} | 4 +- test/linux-generic/Makefile.am | 2 +- 11 files changed, 78 insertions(+), 81 deletions(-) delete mode 100644 test/common_plat/validation/drv/atomic/.gitignore delete mode 100644 test/common_plat/validation/drv/atomic/Makefile.am delete mode 100644 test/common_plat/validation/drv/atomic/atomic.h create mode 100644 test/common_plat/validation/drv/drvatomic/.gitignore create mode 100644 test/common_plat/validation/drv/drvatomic/Makefile.am rename test/common_plat/validation/drv/{atomic/atomic.c => drvatomic/drvatomic.c} (94%) create mode 100644 test/common_plat/validation/drv/drvatomic/drvatomic.h rename test/common_plat/validation/drv/{atomic/atomic_main.c => drvatomic/drvatomic_main.c} (72%) hooks/post-receive --

9 years, 5 months

[COMMIT] branch master updated. v1.10.1.0-88-g5ed89eb

by git＠git-us.linaro.org

9 years, 5 months

[COMMIT] branch master updated. v1.10.1.0-87-gc2d1ed5

by git＠git-us.linaro.org

9 years, 5 months

[COMMIT] branch master updated. v1.10.1.0-86-gc2bd394

by git＠git-us.linaro.org

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-85-gd5295a9

by git＠git-us.linaro.org

9 years, 6 months

[COMMIT] branch api-next updated. v1.10.1.0-132-gfa65775

by git＠git-us.linaro.org

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-84-ga5d7ade

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 a5d7adea4b2487b020371ac554935972ec947385 (commit) from 8e9c4fe4ec0611ddde0b027d7c45a1b92d182a0e (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 a5d7adea4b2487b020371ac554935972ec947385 Author: Barry Spinney <spinney(a)mellanox.com> Date: Wed Aug 10 15:44:35 2016 -0400 linux-generic: tm: made tm thread creation more flexible These changes add a new concept called the tm_system_group. This new entity collects together a set of tm_systems that all share some common resources - eg. share the service thread. Signed-off-by: Barry Spinney <spinney(a)mellanox.com> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index e4bc5ce..858183b 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -44,6 +44,11 @@ typedef struct stat file_stat_t; /* Macros to convert handles to internal pointers and vice versa. */ +#define MAKE_ODP_TM_SYSTEM_GROUP(tm_group) \ + ((_odp_tm_group_t)(uintptr_t)tm_group) +#define GET_TM_GROUP(odp_tm_group) \ + ((tm_system_group_t *)(uintptr_t)odp_tm_group) + #define MAKE_ODP_TM_HANDLE(tm_system) ((odp_tm_t)(uintptr_t)tm_system) #define GET_TM_SYSTEM(odp_tm) ((tm_system_t *)(uintptr_t)odp_tm) @@ -347,14 +352,25 @@ typedef struct { tm_tos_marking_t ip_tos_marking[ODP_NUM_PACKET_COLORS]; } tm_marking_t; -typedef struct { +typedef struct tm_system_s tm_system_t; +typedef struct tm_system_group_s tm_system_group_t; +typedef uint64_t _odp_tm_group_t; + +struct tm_system_s { + /* The previous and next tm_system in the same tm_system_group. These + * links form a circle and so to round robin amongst the tm_system's + * one just needs to continue to follow next. In the case where the + * tm_system_group only has one tm_system, the prev and next point to + * this single tm_system. */ + tm_system_t *prev; + tm_system_t *next; + _odp_tm_group_t odp_tm_group; + odp_ticketlock_t tm_system_lock; odp_barrier_t tm_system_barrier; odp_barrier_t tm_system_destroy_barrier; odp_atomic_u64_t destroying; _odp_int_name_t name_tbl_id; - pthread_t thread; - pthread_attr_t attr; void *trace_buffer; uint32_t next_queue_num; @@ -389,7 +405,22 @@ typedef struct { uint64_t shaper_green_cnt; uint64_t shaper_yellow_cnt; uint64_t shaper_red_cnt; -} tm_system_t; +}; + +/* A tm_system_group is a set of 1 to N tm_systems that share some processing + * resources - like a bunch of service threads, input queue, timers, etc. + * Currently a tm_system_group only supports a single service thread - and + * while the input work queue is shared - timers are not. */ + +struct tm_system_group_s { + tm_system_group_t *prev; + tm_system_group_t *next; + + tm_system_t *first_tm_system; + uint32_t num_tm_systems; + pthread_t thread; + pthread_attr_t attr; +}; #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index e668bf9..37d3323 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -78,11 +78,14 @@ static dynamic_tbl_t odp_tm_profile_tbls[ODP_TM_NUM_PROFILES]; /* TM systems table. */ static tm_system_t *odp_tm_systems[ODP_TM_MAX_NUM_SYSTEMS]; +static tm_system_group_t *tm_group_list; + static odp_ticketlock_t tm_create_lock; static odp_ticketlock_t tm_profile_lock; static odp_barrier_t tm_first_enq; static int g_main_thread_cpu = -1; +static int g_tm_cpu_num; /* Forward function declarations. */ static void tm_queue_cnts_decrement(tm_system_t *tm_system, @@ -2312,6 +2315,7 @@ static void *tm_system_thread(void *arg) { _odp_timer_wheel_t _odp_int_timer_wheel; input_work_queue_t *input_work_queue; + tm_system_group_t *tm_group; tm_system_t *tm_system; uint64_t current_ns; uint32_t destroying, work_queue_cnt, timer_cnt; @@ -2319,7 +2323,9 @@ static void *tm_system_thread(void *arg) rc = odp_init_local(INSTANCE_ID, ODP_THREAD_WORKER); ODP_ASSERT(rc == 0); - tm_system = arg; + tm_group = arg; + + tm_system = tm_group->first_tm_system; _odp_int_timer_wheel = tm_system->_odp_int_timer_wheel; input_work_queue = tm_system->input_work_queue; @@ -2371,6 +2377,11 @@ static void *tm_system_thread(void *arg) tm_system->is_idle = (timer_cnt == 0) && (work_queue_cnt == 0); destroying = odp_atomic_load_u64(&tm_system->destroying); + + /* Advance to the next tm_system in the tm_system_group. */ + tm_system = tm_system->next; + _odp_int_timer_wheel = tm_system->_odp_int_timer_wheel; + input_work_queue = tm_system->input_work_queue; } odp_barrier_wait(&tm_system->tm_system_destroy_barrier); @@ -2558,7 +2569,7 @@ static int affinitize_main_thread(void) static uint32_t tm_thread_cpu_select(void) { odp_cpumask_t odp_cpu_mask; - int cpu_count; + int cpu_count, cpu; odp_cpumask_default_worker(&odp_cpu_mask, 0); if ((g_main_thread_cpu != -1) && @@ -2576,30 +2587,224 @@ static uint32_t tm_thread_cpu_select(void) odp_cpumask_all_available(&odp_cpu_mask); } - return odp_cpumask_first(&odp_cpu_mask); + if (g_tm_cpu_num == 0) { + cpu = odp_cpumask_first(&odp_cpu_mask); + } else { + cpu = odp_cpumask_next(&odp_cpu_mask, g_tm_cpu_num); + if (cpu == -1) { + g_tm_cpu_num = 0; + cpu = odp_cpumask_first(&odp_cpu_mask); + } + } + + g_tm_cpu_num++; + return cpu; } -static int tm_thread_create(tm_system_t *tm_system) +static int tm_thread_create(tm_system_group_t *tm_group) { cpu_set_t cpu_set; uint32_t cpu_num; int rc; - pthread_attr_init(&tm_system->attr); + pthread_attr_init(&tm_group->attr); cpu_num = tm_thread_cpu_select(); CPU_ZERO(&cpu_set); CPU_SET(cpu_num, &cpu_set); - pthread_attr_setaffinity_np(&tm_system->attr, sizeof(cpu_set_t), + pthread_attr_setaffinity_np(&tm_group->attr, sizeof(cpu_set_t), &cpu_set); - rc = pthread_create(&tm_system->thread, &tm_system->attr, - tm_system_thread, tm_system); + rc = pthread_create(&tm_group->thread, &tm_group->attr, + tm_system_thread, tm_group); if (rc != 0) ODP_DBG("Failed to start thread on cpu num=%u\n", cpu_num); return rc; } +static _odp_tm_group_t _odp_tm_group_create(const char *name ODP_UNUSED) +{ + tm_system_group_t *tm_group, *first_tm_group, *second_tm_group; + + tm_group = malloc(sizeof(tm_system_group_t)); + memset(tm_group, 0, sizeof(tm_system_group_t)); + + /* Add this group to the tm_group_list linked list. */ + if (tm_group_list == NULL) { + tm_group_list = tm_group; + tm_group->next = tm_group; + tm_group->prev = tm_group; + } else { + first_tm_group = tm_group_list; + second_tm_group = first_tm_group->next; + first_tm_group->next = tm_group; + second_tm_group->prev = tm_group; + tm_group->next = second_tm_group; + tm_group->prev = first_tm_group; + } + + return MAKE_ODP_TM_SYSTEM_GROUP(tm_group); +} + +static void _odp_tm_group_destroy(_odp_tm_group_t odp_tm_group) +{ + tm_system_group_t *tm_group, *prev_tm_group, *next_tm_group; + int rc; + + tm_group = GET_TM_GROUP(odp_tm_group); + + /* Wait for the thread to exit. */ + ODP_ASSERT(tm_group->num_tm_systems <= 1); + rc = pthread_join(tm_group->thread, NULL); + ODP_ASSERT(rc == 0); + pthread_attr_destroy(&tm_group->attr); + if (g_tm_cpu_num > 0) + g_tm_cpu_num--; + + /* Remove this group from the tm_group_list linked list. Special case + * when this is the last tm_group in the linked list. */ + prev_tm_group = tm_group->prev; + next_tm_group = tm_group->next; + if (prev_tm_group == next_tm_group) { + ODP_ASSERT(tm_group_list == tm_group); + tm_group_list = NULL; + } else { + prev_tm_group->next = next_tm_group; + next_tm_group->prev = prev_tm_group; + if (tm_group_list == tm_group) + tm_group_list = next_tm_group; + } + + tm_group->prev = NULL; + tm_group->next = NULL; + free(tm_group); +} + +static int _odp_tm_group_add(_odp_tm_group_t odp_tm_group, odp_tm_t odp_tm) +{ + tm_system_group_t *tm_group; + tm_system_t *tm_system, *first_tm_system, *second_tm_system; + + tm_group = GET_TM_GROUP(odp_tm_group); + tm_system = GET_TM_SYSTEM(odp_tm); + tm_group->num_tm_systems++; + tm_system->odp_tm_group = odp_tm_group; + + /* Link this tm_system into the circular linked list of all tm_systems + * belonging to the same tm_group. */ + if (tm_group->num_tm_systems == 1) { + tm_group->first_tm_system = tm_system; + tm_system->next = tm_system; + tm_system->prev = tm_system; + } else { + first_tm_system = tm_group->first_tm_system; + second_tm_system = first_tm_system->next; + first_tm_system->next = tm_system; + second_tm_system->prev = tm_system; + tm_system->prev = first_tm_system; + tm_system->next = second_tm_system; + tm_group->first_tm_system = tm_system; + } + + /* If this is the first tm_system associated with this group, then + * create the service thread and the input work queue. */ + if (tm_group->num_tm_systems >= 2) + return 0; + + affinitize_main_thread(); + return tm_thread_create(tm_group); +} + +static int _odp_tm_group_remove(_odp_tm_group_t odp_tm_group, odp_tm_t odp_tm) +{ + tm_system_group_t *tm_group; + tm_system_t *tm_system, *prev_tm_system, *next_tm_system; + + tm_group = GET_TM_GROUP(odp_tm_group); + tm_system = GET_TM_SYSTEM(odp_tm); + if (tm_system->odp_tm_group != odp_tm_group) + return -1; + + if ((tm_group->num_tm_systems == 0) || + (tm_group->first_tm_system == NULL)) + return -1; + + /* Remove this tm_system from the tm_group linked list. */ + if (tm_group->first_tm_system == tm_system) + tm_group->first_tm_system = tm_system->next; + + prev_tm_system = tm_system->prev; + next_tm_system = tm_system->next; + prev_tm_system->next = next_tm_system; + next_tm_system->prev = prev_tm_system; + tm_system->next = NULL; + tm_system->prev = NULL; + tm_group->num_tm_systems--; + + /* If this is the last tm_system associated with this group then + * destroy the group (and thread etc). */ + if (tm_group->num_tm_systems == 0) + _odp_tm_group_destroy(odp_tm_group); + + return 0; +} + +static int tm_group_attach(odp_tm_t odp_tm) +{ + tm_system_group_t *tm_group, *min_tm_group; + _odp_tm_group_t odp_tm_group; + odp_cpumask_t all_cpus, worker_cpus; + uint32_t total_cpus, avail_cpus; + + /* If this platform has a small number of cpu's then allocate one + * tm_group and assign all tm_system's to this tm_group. Otherwise in + * the case of a manycore platform try to allocate one tm_group per + * tm_system, as long as there are still extra cpu's left. If not + * enough cpu's left than allocate this tm_system to the next tm_group + * in a round robin fashion. */ + odp_cpumask_all_available(&all_cpus); + odp_cpumask_default_worker(&worker_cpus, 0); + total_cpus = odp_cpumask_count(&all_cpus); + avail_cpus = odp_cpumask_count(&worker_cpus); + + if (total_cpus < 24) { + tm_group = tm_group_list; + odp_tm_group = MAKE_ODP_TM_SYSTEM_GROUP(tm_group); + if (tm_group == NULL) + odp_tm_group = _odp_tm_group_create(""); + + _odp_tm_group_add(odp_tm_group, odp_tm); + return 0; + } + + /* Manycore case. */ + if ((tm_group_list == NULL) || (avail_cpus > 1)) { + odp_tm_group = _odp_tm_group_create(""); + _odp_tm_group_add(odp_tm_group, odp_tm); + return 0; + } + + /* Pick a tm_group according to the smallest number of tm_systems. */ + tm_group = tm_group_list; + min_tm_group = NULL; + while (tm_group != NULL) { + if (min_tm_group == NULL) + min_tm_group = tm_group; + else if (tm_group->num_tm_systems < + min_tm_group->num_tm_systems) + min_tm_group = tm_group; + + tm_group = tm_group->next; + } + + if (min_tm_group == NULL) + return -1; + + odp_tm_group = MAKE_ODP_TM_SYSTEM_GROUP(tm_group); + _odp_tm_group_add(odp_tm_group, odp_tm); + return 0; +} + odp_tm_t odp_tm_create(const char *name, odp_tm_requirements_t *requirements, odp_tm_egress_t *egress) @@ -2693,8 +2898,9 @@ odp_tm_t odp_tm_create(const char *name, } if (create_fail == 0) { + /* Pass any odp_groups or hints to tm_group_attach here. */ affinitize_main_thread(); - rc = tm_thread_create(tm_system); + rc = tm_group_attach(odp_tm); create_fail |= rc < 0; } @@ -2754,7 +2960,6 @@ int odp_tm_capability(odp_tm_t odp_tm, odp_tm_capabilities_t *capabilities) int odp_tm_destroy(odp_tm_t odp_tm) { tm_system_t *tm_system; - int rc; tm_system = GET_TM_SYSTEM(odp_tm); @@ -2765,10 +2970,10 @@ int odp_tm_destroy(odp_tm_t odp_tm) odp_atomic_inc_u64(&tm_system->destroying); odp_barrier_wait(&tm_system->tm_system_destroy_barrier); - /* Next wait for the thread to exit. */ - rc = pthread_join(tm_system->thread, NULL); - ODP_ASSERT(rc == 0); - pthread_attr_destroy(&tm_system->attr); + /* Remove ourselves from the group. If we are the last tm_system in + * this group, odp_tm_group_remove will destroy any service threads + * allocated by this group. */ + _odp_tm_group_remove(tm_system->odp_tm_group, odp_tm); input_work_queue_destroy(tm_system->input_work_queue); _odp_sorted_pool_destroy(tm_system->_odp_int_sorted_pool); ----------------------------------------------------------------------- Summary of changes: .../include/odp_traffic_mngr_internal.h | 39 +++- platform/linux-generic/odp_traffic_mngr.c | 233 +++++++++++++++++++-- 2 files changed, 254 insertions(+), 18 deletions(-) hooks/post-receive --

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-83-g8e9c4fe

by git＠git-us.linaro.org

9 years, 6 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp