git-lng-odp

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

8 years, 10 months

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

by git＠git-us.linaro.org

8 years, 10 months

[COMMIT] branch master updated. v1.10.1.0-82-g5d4f6cb

by git＠git-us.linaro.org

8 years, 10 months

[COMMIT] branch master updated. v1.10.1.0-81-g26b9031

by git＠git-us.linaro.org

8 years, 10 months

[COMMIT] branch api-next updated. v1.10.1.0-131-g179074e

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 179074e0d0771c82d064e29a20531b75d17289d7 (commit) from 32e95a4ed19e5cd567d02125c4b74bb6e41ee197 (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 179074e0d0771c82d064e29a20531b75d17289d7 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Tue Jul 12 21:27:05 2016 -0500 api: byteorder: avoid bitfield order doxygen omissions Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2402 by assigning explicit values to ODP_LITTLE_ENDIAN_BITFIELD and ODP_BIT_ENDIAN_BITFIELD to avoid Doxygen warnings. This makes these consistent with the usage for ODP_BIG_ENDIAN and ODP_LITTLE_ENDIAN. Also define the summary variable ODP_BITFIELD_ORDER which can be used similar to ODP_BYTE_ORDER for an explicit test of bitfield endianness. Note that this requires tests of these fields to change from #ifdef to #if. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/include/odp/helper/tcp.h b/helper/include/odp/helper/tcp.h index cabef90..fd234e5 100644 --- a/helper/include/odp/helper/tcp.h +++ b/helper/include/odp/helper/tcp.h @@ -34,7 +34,7 @@ typedef struct ODP_PACKED { odp_u32be_t ack_no; /**< Acknowledgment number */ union { odp_u16be_t doffset_flags; -#if defined(ODP_BIG_ENDIAN_BITFIELD) +#if ODP_BIG_ENDIAN_BITFIELD struct { odp_u16be_t rsvd1:8; odp_u16be_t flags:8; /**< TCP flags as a byte */ @@ -51,7 +51,7 @@ typedef struct ODP_PACKED { odp_u16be_t syn:1; odp_u16be_t fin:1; }; -#elif defined(ODP_LITTLE_ENDIAN_BITFIELD) +#elif ODP_LITTLE_ENDIAN_BITFIELD struct { odp_u16be_t flags:8; odp_u16be_t rsvd1:8; /**< TCP flags as a byte */ diff --git a/include/odp/api/spec/byteorder.h b/include/odp/api/spec/byteorder.h index 6b18eb3..38c0bdb 100644 --- a/include/odp/api/spec/byteorder.h +++ b/include/odp/api/spec/byteorder.h @@ -38,6 +38,9 @@ extern "C" { * * @def ODP_BYTE_ORDER * Selected byte order + * + * @def ODP_BITFIELD_ORDER + * Selected bitfield order */ /** diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_types.h b/platform/linux-generic/include/odp/api/plat/byteorder_types.h index d4bf3d6..20d52bf 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_types.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_types.h @@ -49,12 +49,16 @@ extern "C" { #define ODP_LITTLE_ENDIAN 1 #define ODP_BIG_ENDIAN 0 #define ODP_BYTE_ORDER ODP_LITTLE_ENDIAN - #define ODP_LITTLE_ENDIAN_BITFIELD + #define ODP_LITTLE_ENDIAN_BITFIELD 1 + #define ODP_BIG_ENDIAN_BITFIELD 0 + #define ODP_BITFIELD_ORDER ODP_LITTLE_ENDIAN_BITFIELD #else #define ODP_LITTLE_ENDIAN 0 #define ODP_BIG_ENDIAN 1 #define ODP_BYTE_ORDER ODP_BIG_ENDIAN - #define ODP_BIG_ENDIAN_BITFIELD + #define ODP_LITTLE_ENDIAN_BITFIELD 0 + #define ODP_BIG_ENDIAN_BITFIELD 1 + #define ODP_BITFIELD_ORDER ODP_BIG_ENDIAN_BITFIELD #endif typedef uint16_t __odp_bitwise odp_u16le_t; diff --git a/platform/linux-generic/include/protocols/tcp.h b/platform/linux-generic/include/protocols/tcp.h index 4e92e4b..114262e 100644 --- a/platform/linux-generic/include/protocols/tcp.h +++ b/platform/linux-generic/include/protocols/tcp.h @@ -34,7 +34,7 @@ typedef struct ODP_PACKED { odp_u32be_t ack_no; /**< Acknowledgment number */ union { odp_u16be_t doffset_flags; -#if defined(ODP_BIG_ENDIAN_BITFIELD) +#if ODP_BIG_ENDIAN_BITFIELD struct { odp_u16be_t rsvd1:8; odp_u16be_t flags:8; /**< TCP flags as a byte */ @@ -51,7 +51,7 @@ typedef struct ODP_PACKED { odp_u16be_t syn:1; odp_u16be_t fin:1; }; -#elif defined(ODP_LITTLE_ENDIAN_BITFIELD) +#elif ODP_LITTLE_ENDIAN_BITFIELD struct { odp_u16be_t flags:8; odp_u16be_t rsvd1:8; /**< TCP flags as a byte */ ----------------------------------------------------------------------- Summary of changes: helper/include/odp/helper/tcp.h | 4 ++-- include/odp/api/spec/byteorder.h | 3 +++ platform/linux-generic/include/odp/api/plat/byteorder_types.h | 8 ++++++-- platform/linux-generic/include/protocols/tcp.h | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) hooks/post-receive --

8 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp