git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch master updated. v1.13.0.0-7-gc15da68

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 c15da68b8dc3187c1929ff7d7705a0958856cbad (commit) via 16dd00616f73f7e49c53e4b0ea957ac789125b25 (commit) from a5609cc551f4bc71fb69746f3d6cafaf64b87fbf (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 c15da68b8dc3187c1929ff7d7705a0958856cbad Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jan 20 11:14:03 2017 +0200 linux-gen: align: clean up macros Removed unused macros from odp_align_internal.h. Renamed remaining macros without ODP_ prefix and with shorter names. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_align_internal.h b/platform/linux-generic/include/odp_align_internal.h index e5b2f37..61ff200 100644 --- a/platform/linux-generic/include/odp_align_internal.h +++ b/platform/linux-generic/include/odp_align_internal.h @@ -20,14 +20,6 @@ extern "C" { #include <odp/api/align.h> #include <stdint.h> -/** @addtogroup odp_compiler_optim - * @{ - */ - -/* - * Round up - */ - /* Macros to calculate ODP_ROUNDUP_POWER2_U32() in five rounds of shift * and OR operations. */ #define _RSHIFT_U32(x, y) (((uint32_t)(x)) >> (y)) @@ -42,95 +34,31 @@ extern "C" { * The value is not round up, if it's already a power of two (including 1). * The value must be larger than 0 and not exceed 0x80000000. */ -#define ODP_ROUNDUP_POWER2_U32(x) \ +#define ROUNDUP_POWER2_U32(x) \ ((((uint32_t)(x)) > 0x80000000) ? 0 : (_POW2_U32_R5(x - 1) + 1)) -/** - * @internal +/* * Round up 'x' to alignment 'align' */ -#define ODP_ALIGN_ROUNDUP(x, align)\ +#define ROUNDUP_ALIGN(x, align)\ ((align) * (((x) + (align) - 1) / (align))) -/** - * @internal - * Round up pointer 'x' to alignment 'align' - */ -#define ODP_ALIGN_ROUNDUP_PTR(x, align)\ - ((void *)ODP_ALIGN_ROUNDUP((uintptr_t)(x), (uintptr_t)(align))) - -/** - * @internal +/* * Round up 'x' to cache line size alignment */ -#define ODP_CACHE_LINE_SIZE_ROUNDUP(x)\ - ODP_ALIGN_ROUNDUP(x, ODP_CACHE_LINE_SIZE) - -/** - * @internal - * Round up pointer 'x' to cache line size alignment - */ -#define ODP_CACHE_LINE_SIZE_ROUNDUP_PTR(x)\ - ((void *)ODP_CACHE_LINE_SIZE_ROUNDUP((uintptr_t)(x))) - -/** - * @internal - * Round up 'x' to page size alignment - */ -#define ODP_PAGE_SIZE_ROUNDUP(x)\ - ODP_ALIGN_ROUNDUP(x, ODP_PAGE_SIZE) +#define ROUNDUP_CACHE_LINE(x)\ + ROUNDUP_ALIGN(x, ODP_CACHE_LINE_SIZE) /* - * Round down - */ - -/** - * @internal * Round down 'x' to 'align' alignment, which is a power of two */ -#define ODP_ALIGN_ROUNDDOWN_POWER_2(x, align)\ +#define ROUNDDOWN_POWER2(x, align)\ ((x) & (~((align) - 1))) -/** - * @internal - * Round down 'x' to cache line size alignment - */ -#define ODP_CACHE_LINE_SIZE_ROUNDDOWN(x)\ - ODP_ALIGN_ROUNDDOWN_POWER_2(x, ODP_CACHE_LINE_SIZE) - -/** - * @internal - * Round down pointer 'x' to 'align' alignment, which is a power of two - */ -#define ODP_ALIGN_ROUNDDOWN_PTR_POWER_2(x, align)\ -((void *)ODP_ALIGN_ROUNDDOWN_POWER_2((uintptr_t)(x), (uintptr_t)(align))) - -/** - * @internal - * Round down pointer 'x' to cache line size alignment - */ -#define ODP_CACHE_LINE_SIZE_ROUNDDOWN_PTR(x)\ - ((void *)ODP_CACHE_LINE_SIZE_ROUNDDOWN((uintptr_t)(x))) /* - * Check align - */ - -/** - * @internal - * Check if pointer 'x' is aligned to 'align', which is a power of two - */ -#define ODP_ALIGNED_CHECK_POWER_2(x, align)\ - ((((uintptr_t)(x)) & (((uintptr_t)(align))-1)) == 0) - -/** - * @internal * Check if value is a power of two */ -#define ODP_VAL_IS_POWER_2(x) ((((x)-1) & (x)) == 0) - -/** - * @} - */ +#define CHECK_IS_POWER2(x) ((((x) - 1) & (x)) == 0) #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index 8505c67..f6393ee 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -92,7 +92,7 @@ struct cos_s { typedef union cos_u { struct cos_s s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct cos_s))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct cos_s))]; } cos_t; @@ -112,7 +112,7 @@ struct pmr_s { typedef union pmr_u { struct pmr_s s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct pmr_s))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pmr_s))]; } pmr_t; /** diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index c63685e..4d7e0fc 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -42,7 +42,7 @@ struct pkt_cache_t { typedef union { struct pkt_cache_t s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct pkt_cache_t))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pkt_cache_t))]; } pkt_cache_t ODP_ALIGNED_CACHE; /** Packet IO using DPDK interface */ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 2001c42..89bb6f3 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -176,7 +176,7 @@ struct pktio_entry { typedef union { struct pktio_entry s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct pktio_entry))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pktio_entry))]; } pktio_entry_t; typedef struct { diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index 2aadbed..a6f68d5 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -32,7 +32,7 @@ struct netmap_ring_t { typedef union { struct netmap_ring_t s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct netmap_ring_t))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct netmap_ring_t))]; } netmap_ring_t ODP_ALIGNED_CACHE; /** Netmap ring slot */ diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 8b55de1..560f826 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -79,7 +79,7 @@ struct queue_entry_s { union queue_entry_u { struct queue_entry_s s; - uint8_t pad[ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(struct queue_entry_s))]; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))]; }; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index f632a51..34d720c 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1498,7 +1498,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, if (seglen >= len) { misalign = align <= 1 ? 0 : - ODP_ALIGN_ROUNDUP(uaddr, align) - uaddr; + ROUNDUP_ALIGN(uaddr, align) - uaddr; if (misalign == 0) return 0; shift = align - misalign; @@ -1508,7 +1508,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, shift = len - seglen; uaddr -= shift; misalign = align <= 1 ? 0 : - ODP_ALIGN_ROUNDUP(uaddr, align) - uaddr; + ROUNDUP_ALIGN(uaddr, align) - uaddr; if (misalign) shift += align - misalign; } diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 0d12d0b..cf7c2c4 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -311,7 +311,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, /* Validate requested buffer alignment */ if (align > ODP_CONFIG_BUFFER_ALIGN_MAX || - align != ODP_ALIGN_ROUNDDOWN_POWER_2(align, align)) { + align != ROUNDDOWN_POWER2(align, align)) { ODP_ERR("Bad align requirement"); return ODP_POOL_INVALID; } @@ -349,7 +349,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, } if (uarea_size) - uarea_size = ODP_CACHE_LINE_SIZE_ROUNDUP(uarea_size); + uarea_size = ROUNDUP_CACHE_LINE(uarea_size); pool = reserve_pool(); @@ -373,15 +373,15 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, pool->params = *params; hdr_size = sizeof(odp_packet_hdr_t); - hdr_size = ODP_CACHE_LINE_SIZE_ROUNDUP(hdr_size); + hdr_size = ROUNDUP_CACHE_LINE(hdr_size); - block_size = ODP_CACHE_LINE_SIZE_ROUNDUP(hdr_size + align + headroom + - data_size + tailroom); + block_size = ROUNDUP_CACHE_LINE(hdr_size + align + headroom + + data_size + tailroom); if (num <= RING_SIZE_MIN) ring_size = RING_SIZE_MIN; else - ring_size = ODP_ROUNDUP_POWER2_U32(num); + ring_size = ROUNDUP_POWER2_U32(num); pool->ring_mask = ring_size - 1; pool->num = num; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 645630a..e14d145 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -82,20 +82,20 @@ ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) && #define PRIO_QUEUE_EMPTY ((uint32_t)-1) /* For best performance, the number of queues should be a power of two. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(ODP_CONFIG_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), "Number_of_queues_is_not_power_of_two"); /* Ring size must be power of two, so that MAX_QUEUE_IDX_MASK can be used. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(PRIO_QUEUE_RING_SIZE), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(PRIO_QUEUE_RING_SIZE), "Ring_size_is_not_power_of_two"); /* Ring size must be power of two, so that PKTIO_RING_MASK can be used. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(PKTIO_RING_SIZE), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(PKTIO_RING_SIZE), "pktio_ring_size_is_not_power_of_two"); /* Number of commands queues must be power of two, so that PKTIO_CMD_QUEUE_MASK * can be used. */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(PKTIO_CMD_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(PKTIO_CMD_QUEUES), "pktio_cmd_queues_is_not_power_of_two"); /* Mask of queues per priority */ diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 5ccd32d..ad01bfe 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -27,18 +27,17 @@ #define PKTIN_PRIO (NUM_PRIO - 1) #define CMD_QUEUE 0 #define CMD_PKTIO 1 -#define ROUNDUP_CACHE(x) ODP_CACHE_LINE_SIZE_ROUNDUP(x) #define GROUP_ALL ODP_SCHED_GROUP_ALL #define GROUP_WORKER ODP_SCHED_GROUP_WORKER #define GROUP_CONTROL ODP_SCHED_GROUP_CONTROL #define GROUP_PKTIN GROUP_ALL /* Maximum number of commands: one priority/group for all queues and pktios */ -#define RING_SIZE (ODP_ROUNDUP_POWER2_U32(NUM_QUEUE + NUM_PKTIO)) +#define RING_SIZE (ROUNDUP_POWER2_U32(NUM_QUEUE + NUM_PKTIO)) #define RING_MASK (RING_SIZE - 1) /* Ring size must be power of two */ -ODP_STATIC_ASSERT(ODP_VAL_IS_POWER_2(RING_SIZE), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(RING_SIZE), "Ring_size_is_not_power_of_two"); ODP_STATIC_ASSERT(NUM_ORDERED_LOCKS <= CONFIG_QUEUE_MAX_ORD_LOCKS, @@ -60,7 +59,7 @@ struct sched_cmd_s { typedef struct sched_cmd_t { struct sched_cmd_s s; - uint8_t pad[ROUNDUP_CACHE(sizeof(struct sched_cmd_s)) - + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct sched_cmd_s)) - sizeof(struct sched_cmd_s)]; } sched_cmd_t ODP_ALIGNED_CACHE; diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 53fec08..cf610bf 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -233,12 +233,9 @@ static odp_timer_pool_t odp_timer_pool_new(const char *name, __odp_errno = ENFILE; /* Table overflow */ return ODP_TIMER_POOL_INVALID; } - size_t sz0 = ODP_ALIGN_ROUNDUP(sizeof(odp_timer_pool), - ODP_CACHE_LINE_SIZE); - size_t sz1 = ODP_ALIGN_ROUNDUP(sizeof(tick_buf_t) * param->num_timers, - ODP_CACHE_LINE_SIZE); - size_t sz2 = ODP_ALIGN_ROUNDUP(sizeof(odp_timer) * param->num_timers, - ODP_CACHE_LINE_SIZE); + size_t sz0 = ROUNDUP_CACHE_LINE(sizeof(odp_timer_pool)); + size_t sz1 = ROUNDUP_CACHE_LINE(sizeof(tick_buf_t) * param->num_timers); + size_t sz2 = ROUNDUP_CACHE_LINE(sizeof(odp_timer) * param->num_timers); odp_shm_t shm = odp_shm_reserve(name, sz0 + sz1 + sz2, ODP_CACHE_LINE_SIZE, ODP_SHM_SW_ONLY); if (odp_unlikely(shm == ODP_SHM_INVALID)) commit 16dd00616f73f7e49c53e4b0ea957ac789125b25 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Jan 20 11:14:02 2017 +0200 linux-gen: align: round up power of two as macro Implement round up to power of two as a macro. Macro enables preprocessor to calculate the constant value and avoid code generation. Also dependency to __builtin_clz() is not needed anymore. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_align_internal.h b/platform/linux-generic/include/odp_align_internal.h index d9cd30b..e5b2f37 100644 --- a/platform/linux-generic/include/odp_align_internal.h +++ b/platform/linux-generic/include/odp_align_internal.h @@ -18,6 +18,7 @@ extern "C" { #endif #include <odp/api/align.h> +#include <stdint.h> /** @addtogroup odp_compiler_optim * @{ @@ -27,6 +28,23 @@ extern "C" { * Round up */ +/* Macros to calculate ODP_ROUNDUP_POWER2_U32() in five rounds of shift + * and OR operations. */ +#define _RSHIFT_U32(x, y) (((uint32_t)(x)) >> (y)) +#define _POW2_U32_R1(x) (((uint32_t)(x)) | _RSHIFT_U32(x, 1)) +#define _POW2_U32_R2(x) (_POW2_U32_R1(x) | _RSHIFT_U32(_POW2_U32_R1(x), 2)) +#define _POW2_U32_R3(x) (_POW2_U32_R2(x) | _RSHIFT_U32(_POW2_U32_R2(x), 4)) +#define _POW2_U32_R4(x) (_POW2_U32_R3(x) | _RSHIFT_U32(_POW2_U32_R3(x), 8)) +#define _POW2_U32_R5(x) (_POW2_U32_R4(x) | _RSHIFT_U32(_POW2_U32_R4(x), 16)) + +/* Round up a uint32_t value 'x' to the next power of two. + * + * The value is not round up, if it's already a power of two (including 1). + * The value must be larger than 0 and not exceed 0x80000000. + */ +#define ODP_ROUNDUP_POWER2_U32(x) \ + ((((uint32_t)(x)) > 0x80000000) ? 0 : (_POW2_U32_R5(x - 1) + 1)) + /** * @internal * Round up 'x' to alignment 'align' @@ -36,14 +54,6 @@ extern "C" { /** * @internal - * When 'x' is not already a power of two, round it up to the next - * power of two value. Zero is not supported as an input value. - */ -#define ODP_ROUNDUP_POWER_2(x)\ - (1 << (((int)(8 * sizeof(x))) - __builtin_clz((x) - 1))) - -/** - * @internal * Round up pointer 'x' to alignment 'align' */ #define ODP_ALIGN_ROUNDUP_PTR(x, align)\ diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 090a55f..0d12d0b 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -381,7 +381,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, if (num <= RING_SIZE_MIN) ring_size = RING_SIZE_MIN; else - ring_size = ODP_ROUNDUP_POWER_2(num); + ring_size = ODP_ROUNDUP_POWER2_U32(num); pool->ring_mask = ring_size - 1; pool->num = num; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 5150d28..5ccd32d 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -34,7 +34,7 @@ #define GROUP_PKTIN GROUP_ALL /* Maximum number of commands: one priority/group for all queues and pktios */ -#define RING_SIZE (ODP_ROUNDUP_POWER_2(NUM_QUEUE + NUM_PKTIO)) +#define RING_SIZE (ODP_ROUNDUP_POWER2_U32(NUM_QUEUE + NUM_PKTIO)) #define RING_MASK (RING_SIZE - 1) /* Ring size must be power of two */ ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_align_internal.h | 108 +++++---------------- .../include/odp_classification_datamodel.h | 4 +- platform/linux-generic/include/odp_packet_dpdk.h | 2 +- .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/odp_packet_netmap.h | 2 +- .../linux-generic/include/odp_queue_internal.h | 2 +- platform/linux-generic/odp_packet.c | 4 +- platform/linux-generic/odp_pool.c | 12 +-- platform/linux-generic/odp_schedule.c | 8 +- platform/linux-generic/odp_schedule_sp.c | 7 +- platform/linux-generic/odp_timer.c | 9 +- 11 files changed, 47 insertions(+), 113 deletions(-) hooks/post-receive --

9 years

[COMMIT] branch master updated. v1.13.0.0-5-ga5609cc

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 a5609cc551f4bc71fb69746f3d6cafaf64b87fbf (commit) from 03aafc317489232bab7e9048f9bd96a24e6f598d (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 a5609cc551f4bc71fb69746f3d6cafaf64b87fbf Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jan 23 16:35:35 2017 +0200 test: perf: add new packet function microbenchmark application The application calls each packet function TEST_REPEAT_COUNT times and calculates the average cycle count per call. Main options: -b: Burst size for *_multi operations -i: Benchmark index to run indefinitely The application prints benchmark results as a table, which can be copied as is to a spreadsheet application. Signed-off-by: Matias Elo <matias.elo(a)nokia.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/test/common_plat/performance/.gitignore b/test/common_plat/performance/.gitignore index 1527d25..eeacf2f 100644 --- a/test/common_plat/performance/.gitignore +++ b/test/common_plat/performance/.gitignore @@ -1,6 +1,7 @@ *.log *.trs odp_atomic +odp_bench_packet odp_crypto odp_l2fwd odp_pktio_perf diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index f184609..bcbf9cd 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -2,7 +2,9 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${builddir} -EXECUTABLES = odp_crypto$(EXEEXT) odp_pktio_perf$(EXEEXT) +EXECUTABLES = odp_bench_packet$(EXEEXT) \ + odp_crypto$(EXEEXT) \ + odp_pktio_perf$(EXEEXT) COMPILE_ONLY = odp_l2fwd$(EXEEXT) \ odp_sched_latency$(EXEEXT) \ @@ -20,6 +22,8 @@ endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) +odp_bench_packet_LDFLAGS = $(AM_LDFLAGS) -static +odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test odp_crypto_LDFLAGS = $(AM_LDFLAGS) -static odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test odp_sched_latency_LDFLAGS = $(AM_LDFLAGS) -static @@ -30,6 +34,7 @@ odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test noinst_HEADERS = \ $(top_srcdir)/test/test_debug.h +dist_odp_bench_packet_SOURCES = odp_bench_packet.c dist_odp_crypto_SOURCES = odp_crypto.c dist_odp_sched_latency_SOURCES = odp_sched_latency.c dist_odp_scheduling_SOURCES = odp_scheduling.c diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/common_plat/performance/odp_bench_packet.c new file mode 100644 index 0000000..1aa9d81 --- /dev/null +++ b/test/common_plat/performance/odp_bench_packet.c @@ -0,0 +1,1611 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * @example odp_bench_packet.c Microbenchmarks for packet functions + */ + +#include <stdlib.h> +#include <getopt.h> +#include <unistd.h> +#include <errno.h> +#include <inttypes.h> +#include <signal.h> + +#include <test_debug.h> + +#include <odp_api.h> +#include <odp/helper/threads.h> +#include <odp/helper/eth.h> +#include <odp/helper/ip.h> +#include <odp/helper/udp.h> + +/** Minimum number of packet data bytes in the first segment */ +#define PKT_POOL_SEG_LEN 128 + +/** Packet user area size in bytes */ +#define PKT_POOL_UAREA_SIZE 8 + +/** Minimum test packet size */ +#define TEST_MIN_PKT_SIZE 64 + +/** Maximum test packet size */ +#define TEST_MAX_PKT_SIZE 2048 + +/** Number of test runs per individual benchmark */ +#define TEST_REPEAT_COUNT 1000 + +/** Number of times to run tests for each packet size */ +#define TEST_SIZE_RUN_COUNT 10 + +/** Maximum burst size for *_multi operations */ +#define TEST_MAX_BURST 64 + +/** Offset of the contiguous area */ +#define TEST_ALIGN_OFFSET 16 + +/** Length of the contiguous area */ +#define TEST_ALIGN_LEN 32 + +/** Minimum byte alignment of contiguous area */ +#define TEST_ALIGN 32 + +/** Test packet offsets */ +#define TEST_L2_OFFSET 0 +#define TEST_L3_OFFSET (TEST_MIN_PKT_SIZE / 4) +#define TEST_L4_OFFSET (TEST_MIN_PKT_SIZE / 2) + +/** Default burst size for *_multi operations */ +#define TEST_DEF_BURST 8 + +/** 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)) + +#define BENCH_INFO(run, init, term, name) \ + {#run, run, init, term, name} + +ODP_STATIC_ASSERT((TEST_ALIGN_OFFSET + TEST_ALIGN_LEN) <= TEST_MIN_PKT_SIZE, + "Invalid_alignment"); + +/** Warm up round packet size */ +#define WARM_UP TEST_MIN_PKT_SIZE + +/** Test packet sizes */ +const uint32_t test_packet_len[] = {WARM_UP, TEST_MIN_PKT_SIZE, 128, 256, 512, + 1024, 1518, TEST_MAX_PKT_SIZE}; + +/** + * Parsed command line arguments + */ +typedef struct { + int bench_idx; /** Benchmark index to run indefinitely */ + int burst_size; /** Burst size for *_multi operations */ +} appl_args_t; + +/** + * Initialize benchmark resources + */ +typedef void (*bench_init_fn_t)(void); + +/** + * Run benchmark + * + * @retval >0 on success + * */ +typedef int (*bench_run_fn_t)(void); + +/** + * Release benchmark resources + */ +typedef void (*bench_term_fn_t)(void); + +/** + * Benchmark data + */ +typedef struct { + const char *name; + bench_run_fn_t run; + bench_init_fn_t init; + bench_term_fn_t term; + const char *desc; +} bench_info_t; + +/** + * Grouping of all global data + */ +typedef struct { + /** Application (parsed) arguments */ + appl_args_t appl; + /** Packet pool */ + odp_pool_t pool; + /** Benchmark functions */ + bench_info_t *bench; + /** Number of benchmark functions */ + int num_bench; + struct { + /** Test packet length */ + uint32_t len; + /** Minimum test packet headroom */ + uint32_t headroom; + /** Minimum test packet tailroom */ + uint32_t tailroom; + /** Minimum test packet segment length */ + uint32_t seg_len; + } pkt; + /** Array for storing test packets */ + odp_packet_t pkt_tbl[TEST_REPEAT_COUNT * TEST_MAX_BURST]; + /** Array for storing test packets */ + odp_packet_t pkt2_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test event */ + odp_event_t event_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test pointers */ + void *ptr_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test segments */ + odp_packet_seg_t seg_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test outputs */ + uint32_t output_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test pool handles */ + odp_pool_t pool_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test pktio handles */ + odp_pktio_t pktio_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test timestamps */ + odp_time_t ts_tbl[TEST_REPEAT_COUNT]; + /** Array for storing test data */ + uint8_t data_tbl[TEST_REPEAT_COUNT][TEST_MAX_PKT_SIZE]; + /** Benchmark run failed */ + uint8_t bench_failed; +} args_t; + +/** Global pointer to args */ +static args_t *gbl_args; +/** Global barrier to synchronize main and worker */ +static odp_barrier_t barrier; +/** Break worker loop if set to 1 */ +static int exit_thread; + +static void sig_handler(int signo ODP_UNUSED) +{ + exit_thread = 1; +} + +/** + * Run given benchmark indefinitely + */ +static void run_indef(args_t *args, int idx) +{ + const char *desc; + + desc = args->bench[idx].desc != NULL ? + args->bench[idx].desc : args->bench[idx].name; + + printf("Running %s() indefinitely\n", desc); + + while (!exit_thread) { + int ret; + + if (args->bench[idx].init != NULL) + args->bench[idx].init(); + + ret = args->bench[idx].run(); + + if (args->bench[idx].term != NULL) + args->bench[idx].term(); + + if (!ret) + LOG_ABORT("Benchmark %s failed\n", desc); + } +} + +/** + * Master function for running the microbenchmarks + */ +static int run_benchmarks(void *arg) +{ + int i, j, k; + args_t *args = arg; + int num_sizes = sizeof(test_packet_len) / sizeof(test_packet_len[0]); + double results[gbl_args->num_bench][num_sizes]; + + memset(results, 0, sizeof(results)); + + printf("\nRunning benchmarks (cycles per call)\n" + "------------------------------------\n"); + + for (i = 0; i < num_sizes; i++) { + uint64_t tot_cycles = 0; + + printf("\nPacket length: %6d bytes\n" + "---------------------------\n", test_packet_len[i]); + + gbl_args->pkt.len = test_packet_len[i]; + + for (j = 0, k = 1; j < gbl_args->num_bench; k++) { + int ret; + uint64_t c1, c2; + const char *desc; + + if (args->appl.bench_idx && + (j + 1) != args->appl.bench_idx) { + j++; + continue; + } else if (args->appl.bench_idx && + (j + 1) == args->appl.bench_idx) { + run_indef(args, j); + return 0; + } + + desc = args->bench[j].desc != NULL ? + args->bench[j].desc : + args->bench[j].name; + + if (args->bench[j].init != NULL) + args->bench[j].init(); + + c1 = odp_cpu_cycles(); + ret = args->bench[j].run(); + c2 = odp_cpu_cycles(); + + if (args->bench[j].term != NULL) + args->bench[j].term(); + + if (!ret) { + LOG_ERR("Benchmark %s failed\n", desc); + args->bench_failed = 1; + return -1; + } + + tot_cycles += odp_cpu_cycles_diff(c2, c1); + + if (k >= TEST_SIZE_RUN_COUNT) { + double cycles; + + /** Each benchmark runs internally + * TEST_REPEAT_COUNT times. */ + cycles = ((double)tot_cycles) / + (TEST_SIZE_RUN_COUNT * + TEST_REPEAT_COUNT); + results[j][i] = cycles; + + printf("%-30s: %8.1f\n", desc, cycles); + + j++; + k = 0; + tot_cycles = 0; + } + } + } + printf("\n%-30s", "Benchmark / packet_size [B]"); + for (i = 0; i < num_sizes; i++) { + if (i == 0) + printf(" WARM UP "); + else + printf("%8.1d ", test_packet_len[i]); + } + printf("\n---------------------------------"); + for (i = 0; i < num_sizes; i++) + printf("----------"); + + for (i = 0; i < gbl_args->num_bench; i++) { + printf("\n[%02d] %-30s", i + 1, args->bench[i].desc != NULL ? + args->bench[i].desc : args->bench[i].name); + + for (j = 0; j < num_sizes; j++) + printf("%8.1f ", results[i][j]); + } + printf("\n\n"); + return 0; +} + +static void allocate_test_packets(uint32_t len, odp_packet_t pkt[], int num) +{ + int pkts = 0; + + while (pkts < num) { + int ret; + + ret = odp_packet_alloc_multi(gbl_args->pool, len, &pkt[pkts], + num - pkts); + if (ret < 0) + LOG_ABORT("Allocating test packets failed\n"); + + pkts += ret; + } +} + +static void alloc_packets_half(void) +{ + allocate_test_packets(gbl_args->pkt.len / 2, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); +} + +static void alloc_packets_multi(void) +{ + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT * gbl_args->appl.burst_size); +} + +static void alloc_concat_packets(void) +{ + allocate_test_packets(gbl_args->pkt.len / 2, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); + allocate_test_packets(gbl_args->pkt.len / 2, gbl_args->pkt2_tbl, + TEST_REPEAT_COUNT); +} + +static void alloc_packets_twice(void) +{ + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt2_tbl, + TEST_REPEAT_COUNT); +} + +static void create_packets(void) +{ + int i; + uint32_t headroom, tailroom, seg_len; + uint32_t min_headroom = 0; + uint32_t min_tailroom = 0; + uint32_t min_seg_len = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + allocate_test_packets(gbl_args->pkt.len, gbl_args->pkt_tbl, + TEST_REPEAT_COUNT); + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + headroom = odp_packet_headroom(pkt_tbl[i]); + tailroom = odp_packet_tailroom(pkt_tbl[i]); + seg_len = odp_packet_seg_len(pkt_tbl[i]); + + seg_tbl[i] = odp_packet_first_seg(pkt_tbl[i]); + + if (i == 0) { + min_headroom = headroom; + min_tailroom = tailroom; + min_seg_len = seg_len; + } else { + if (headroom < min_headroom) + min_headroom = headroom; + if (tailroom < min_tailroom) + min_tailroom = tailroom; + if (seg_len < min_seg_len) + min_seg_len = seg_len; + } + + if (odp_packet_l2_offset_set(pkt_tbl[i], TEST_L2_OFFSET) || + odp_packet_l3_offset_set(pkt_tbl[i], TEST_L3_OFFSET) || + odp_packet_l4_offset_set(pkt_tbl[i], TEST_L4_OFFSET)) + LOG_ABORT("Setting test packet offsets failed\n"); + + odp_packet_flow_hash_set(pkt_tbl[i], i); + odp_packet_ts_set(pkt_tbl[i], odp_time_local()); + } + gbl_args->pkt.headroom = min_headroom; + gbl_args->pkt.tailroom = min_tailroom; + gbl_args->pkt.seg_len = min_seg_len; +} + +static void create_events(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + create_packets(); + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->event_tbl[i] = odp_packet_to_event(pkt_tbl[i]); +} + +static void free_packets(void) +{ + odp_packet_free_multi(gbl_args->pkt_tbl, TEST_REPEAT_COUNT); +} + +static void free_packets_multi(void) +{ + odp_packet_free_multi(gbl_args->pkt_tbl, + TEST_REPEAT_COUNT * gbl_args->appl.burst_size); +} + +static void free_packets_twice(void) +{ + odp_packet_free_multi(gbl_args->pkt_tbl, TEST_REPEAT_COUNT); + odp_packet_free_multi(gbl_args->pkt2_tbl, TEST_REPEAT_COUNT); +} + +static int bench_empty(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->output_tbl[i] = i; + + return i; +} + +static int bench_packet_alloc(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + odp_packet_t pkt; + + pkt = odp_packet_alloc(gbl_args->pool, gbl_args->pkt.len); + + gbl_args->pkt_tbl[i] = pkt; + } + + return i; +} + +static int bench_packet_alloc_multi(void) +{ + int i; + int pkts = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + pkts += odp_packet_alloc_multi(gbl_args->pool, + gbl_args->pkt.len, + &gbl_args->pkt_tbl[pkts], + gbl_args->appl.burst_size); + return pkts; +} + +static int bench_packet_free(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_free(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_free_multi(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + int pkt_idx = i * gbl_args->appl.burst_size; + + odp_packet_free_multi(&gbl_args->pkt_tbl[pkt_idx], + gbl_args->appl.burst_size); + } + return i; +} + +static int bench_packet_alloc_free(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + odp_packet_t pkt; + + pkt = odp_packet_alloc(gbl_args->pool, gbl_args->pkt.len); + + odp_packet_free(pkt); + } + return i; +} + +static int bench_packet_alloc_free_multi(void) +{ + int i; + int pkts; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) { + pkts = odp_packet_alloc_multi(gbl_args->pool, gbl_args->pkt.len, + gbl_args->pkt_tbl, + gbl_args->appl.burst_size); + odp_packet_free_multi(gbl_args->pkt_tbl, pkts); + } + return i; +} + +static int bench_packet_reset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_reset(gbl_args->pkt_tbl[i], + gbl_args->pkt.len); + return !ret; +} + +static int bench_packet_from_event(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + pkt_tbl[i] = odp_packet_from_event(gbl_args->event_tbl[i]); + + return i; +} + +static int bench_packet_to_event(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->event_tbl[i] = odp_packet_to_event(pkt_tbl[i]); + + return i; +} + +static int bench_packet_head(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_head(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_buf_len(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_buf_len(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_data(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_data(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_seg_len(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_seg_len(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_len(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_len(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_headroom(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_headroom(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_tailroom(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_tailroom(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_tail(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_tail(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_offset(void) +{ + int i; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_offset(gbl_args->pkt_tbl[i], + offset, NULL, NULL); + return i; +} + +static int bench_packet_prefetch(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_prefetch(gbl_args->pkt_tbl[i], 0, gbl_args->pkt.len); + + return i; +} + +static int bench_packet_push_head(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t hroom = gbl_args->pkt.headroom; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_push_head(pkt_tbl[i], hroom); + + return i; +} + +static int bench_packet_pull_head(void) +{ + int i; + uint32_t len = gbl_args->pkt.seg_len - 1; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_pull_head(pkt_tbl[i], len); + + return i; +} + +static int bench_packet_push_tail(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t troom = gbl_args->pkt.tailroom; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_push_tail(pkt_tbl[i], troom); + + return i; +} + +static int bench_packet_pull_tail(void) +{ + int i; + uint32_t len = gbl_args->pkt.seg_len - 1; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_pull_tail(pkt_tbl[i], len); + + return i; +} + +static int bench_packet_extend_head(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_extend_head(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_trunc_head(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_trunc_head(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_extend_tail(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_extend_tail(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_trunc_tail(void) +{ + int i; + int ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + void **ptr_tbl = gbl_args->ptr_tbl; + uint32_t *data_tbl = gbl_args->output_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_trunc_tail(&pkt_tbl[i], len, ptr_tbl[i], + &data_tbl[i]); + return ret >= 0; +} + +static int bench_packet_add_data(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t len = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_add_data(&pkt_tbl[i], 0, len); + + return ret >= 0; +} + +static int bench_packet_rem_data(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + uint32_t len = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_rem_data(&pkt_tbl[i], 0, len); + + return ret >= 0; +} + +static int bench_packet_align(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_align(&pkt_tbl[i], TEST_ALIGN_OFFSET, + TEST_ALIGN_LEN, TEST_ALIGN); + return ret >= 0; +} + +static int bench_packet_is_segmented(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_is_segmented(gbl_args->pkt_tbl[i]); + + return (ret == 0) ? 1 : ret; +} + +static int bench_packet_num_segs(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_num_segs(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_first_seg(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->seg_tbl[i] = odp_packet_first_seg(pkt_tbl[i]); + + return i; +} + +static int bench_packet_last_seg(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->seg_tbl[i] = odp_packet_last_seg(pkt_tbl[i]); + + return i; +} + +static int bench_packet_next_seg(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->seg_tbl[i] = odp_packet_next_seg(pkt_tbl[i], + seg_tbl[i]); + return i; +} + +static int bench_packet_seg_data(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_seg_data(pkt_tbl[i], + seg_tbl[i]); + return i; +} + +static int bench_packet_seg_data_len(void) +{ + int i; + uint32_t ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_seg_t *seg_tbl = gbl_args->seg_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_seg_data_len(pkt_tbl[i], seg_tbl[i]); + + return ret; +} + +static int bench_packet_concat(void) +{ + int i; + int ret = 0; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *frag_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_concat(&pkt_tbl[i], frag_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_split(void) +{ + int i; + int ret = 0; + uint32_t head_len; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *frag_tbl = gbl_args->pkt2_tbl; + + head_len = odp_packet_len(pkt_tbl[0]) / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_split(&pkt_tbl[i], head_len, &frag_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_copy(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *cpy_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + cpy_tbl[i] = odp_packet_copy(pkt_tbl[i], gbl_args->pool); + + return i; +} + +static int bench_packet_copy_part(void) +{ + int i; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + odp_packet_t *cpy_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + cpy_tbl[i] = odp_packet_copy_part(pkt_tbl[i], 0, len, + gbl_args->pool); + return i; +} + +static int bench_packet_copy_to_mem(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_to_mem(pkt_tbl[i], 0, len, + gbl_args->data_tbl[i]); + return !ret; +} + +static int bench_packet_copy_from_mem(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_from_mem(pkt_tbl[i], 0, len, + gbl_args->data_tbl[i]); + return !ret; +} + +static int bench_packet_copy_from_pkt(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len; + odp_packet_t *dst_tbl = gbl_args->pkt_tbl; + odp_packet_t *src_tbl = gbl_args->pkt2_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_from_pkt(dst_tbl[i], 0, src_tbl[i], 0, + len); + return !ret; +} + +static int bench_packet_copy_data(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_copy_data(pkt_tbl[i], 0, len, len); + + return !ret; +} + +static int bench_packet_move_data(void) +{ + int i; + uint32_t ret = 0; + uint32_t len = gbl_args->pkt.len / 2; + uint32_t offset = len / 2; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_move_data(pkt_tbl[i], offset, len, len); + + return !ret; +} + +static int bench_packet_pool(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->pool_tbl[i] = odp_packet_pool(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_input(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->pktio_tbl[i] = odp_packet_input(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_input_index(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_input_index(gbl_args->pkt_tbl[i]); + + return (ret == 0) ? 1 : ret; +} + +static int bench_packet_user_ptr(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_user_ptr(pkt_tbl[i]); + + return i; +} + +static int bench_packet_user_ptr_set(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_user_ptr_set(gbl_args->pkt_tbl[i], + gbl_args->ptr_tbl[i]); + + return i; +} + +static int bench_packet_user_area(void) +{ + int i; + odp_packet_t *pkt_tbl = gbl_args->pkt_tbl; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_user_area(pkt_tbl[i]); + + return i; +} + +static int bench_packet_user_area_size(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_user_area_size(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_l2_ptr(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_l2_ptr(gbl_args->pkt_tbl[i], + NULL); + return i; +} + +static int bench_packet_l2_offset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l2_offset(gbl_args->pkt_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_l2_offset_set(void) +{ + int i; + uint32_t ret = 0; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l2_offset_set(gbl_args->pkt_tbl[i], offset); + + return !ret; +} + +static int bench_packet_l3_ptr(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_l3_ptr(gbl_args->pkt_tbl[i], + NULL); + return i; +} + +static int bench_packet_l3_offset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l3_offset(gbl_args->pkt_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_l3_offset_set(void) +{ + int i; + uint32_t ret = 0; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l3_offset_set(gbl_args->pkt_tbl[i], offset); + + return !ret; +} + +static int bench_packet_l4_ptr(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ptr_tbl[i] = odp_packet_l4_ptr(gbl_args->pkt_tbl[i], + NULL); + return i; +} + +static int bench_packet_l4_offset(void) +{ + int i; + int ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l4_offset(gbl_args->pkt_tbl[i]); + + return ret >= 0; +} + +static int bench_packet_l4_offset_set(void) +{ + int i; + uint32_t ret = 0; + uint32_t offset = gbl_args->pkt.len / 2; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_l4_offset_set(gbl_args->pkt_tbl[i], offset); + + return !ret; +} + +static int bench_packet_flow_hash(void) +{ + int i; + uint32_t ret = 0; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + ret += odp_packet_flow_hash(gbl_args->pkt_tbl[i]); + + return ret; +} + +static int bench_packet_flow_hash_set(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_flow_hash_set(gbl_args->pkt_tbl[i], i); + + return i; +} + +static int bench_packet_ts(void) +{ + int i; + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + gbl_args->ts_tbl[i] = odp_packet_ts(gbl_args->pkt_tbl[i]); + + return i; +} + +static int bench_packet_ts_set(void) +{ + int i; + odp_time_t ts = odp_time_local(); + + for (i = 0; i < TEST_REPEAT_COUNT; i++) + odp_packet_ts_set(gbl_args->pkt_tbl[i], ts); + + return i; +} + +/** + * Prinf usage information + */ +static void usage(char *progname) +{ + printf("\n" + "OpenDataPlane Packet function microbenchmark.\n" + "\n" + "Usage: %s OPTIONS\n" + " E.g. %s\n" + "\n" + "Optional OPTIONS:\n" + " -b, --burst Test packet burst size.\n" + " -i, --index Benchmark index to run indefinitely.\n" + " -h, --help Display help and exit.\n\n" + "\n", NO_PATH(progname), NO_PATH(progname)); +} + +/** + * Parse and store the command line arguments + * + * @param argc argument count + * @param argv[] argument vector + * @param appl_args Store application arguments here + */ +static void parse_args(int argc, char *argv[], appl_args_t *appl_args) +{ + int opt; + int long_index; + static const struct option longopts[] = { + {"burst", required_argument, NULL, 'b'}, + {"help", no_argument, NULL, 'h'}, + {"index", required_argument, NULL, 'i'}, + {NULL, 0, NULL, 0} + }; + + static const char *shortopts = "b:i:h"; + + /* Let helper collect its own arguments (e.g. --odph_proc) */ + odph_parse_options(argc, argv, shortopts, longopts); + + opterr = 0; /* Do not issue errors on helper options */ + + appl_args->bench_idx = 0; /* Run all benchmarks */ + appl_args->burst_size = TEST_DEF_BURST; + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'b': + appl_args->burst_size = atoi(optarg); + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + case 'i': + appl_args->bench_idx = atoi(optarg); + break; + default: + break; + } + } + + if (appl_args->burst_size < 1 || + appl_args->burst_size > TEST_MAX_BURST) { + printf("Invalid burst size (max %d)\n", TEST_MAX_BURST); + exit(EXIT_FAILURE); + } + + optind = 1; /* Reset 'extern optind' from the getopt lib */ +} + +/** + * Print system and application info + */ +static void print_info(char *progname, appl_args_t *appl_args ODP_UNUSED) +{ + printf("\n" + "ODP system info\n" + "---------------\n" + "ODP API version: %s\n" + "ODP impl name: %s\n" + "CPU model: %s\n" + "CPU freq (hz): %" PRIu64 "\n" + "Cache line size: %i\n" + "CPU count: %i\n" + "\n", + odp_version_api_str(), odp_version_impl_name(), + odp_cpu_model_str(), odp_cpu_hz_max(), + odp_sys_cache_line_size(), odp_cpu_count()); + + printf("Running ODP appl: \"%s\"\n" + "-----------------\n", progname); + fflush(NULL); +} + +/** + * Test functions + */ +bench_info_t test_suite[] = { + BENCH_INFO(bench_empty, NULL, NULL, NULL), + BENCH_INFO(bench_packet_alloc, NULL, free_packets, NULL), + BENCH_INFO(bench_packet_alloc_multi, NULL, free_packets_multi, + NULL), + BENCH_INFO(bench_packet_free, create_packets, NULL, NULL), + BENCH_INFO(bench_packet_free_multi, alloc_packets_multi, NULL, + NULL), + BENCH_INFO(bench_packet_alloc_free, NULL, NULL, NULL), + BENCH_INFO(bench_packet_alloc_free_multi, NULL, NULL, NULL), + BENCH_INFO(bench_packet_reset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_from_event, create_events, free_packets, + NULL), + BENCH_INFO(bench_packet_to_event, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_head, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_buf_len, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_seg_len, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_len, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_headroom, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_tailroom, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_tail, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_prefetch, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_push_head, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_pull_head, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_push_tail, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_pull_tail, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_extend_head, alloc_packets_half, + free_packets, NULL), + BENCH_INFO(bench_packet_trunc_head, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_extend_tail, alloc_packets_half, + free_packets, NULL), + BENCH_INFO(bench_packet_trunc_tail, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_add_data, alloc_packets_half, + free_packets, NULL), + BENCH_INFO(bench_packet_rem_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_align, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_is_segmented, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_num_segs, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_first_seg, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_last_seg, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_next_seg, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_seg_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_seg_data_len, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_concat, alloc_concat_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_split, create_packets, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy, create_packets, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy_part, create_packets, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy_to_mem, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_copy_from_mem, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_copy_from_pkt, alloc_packets_twice, + free_packets_twice, NULL), + BENCH_INFO(bench_packet_copy_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_move_data, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_pool, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_input, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_input_index, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_user_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_user_ptr_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_user_area, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_user_area_size, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_l2_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l2_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l2_offset_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_l3_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l3_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l3_offset_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_l4_ptr, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l4_offset, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_l4_offset_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_flow_hash, create_packets, free_packets, + NULL), + BENCH_INFO(bench_packet_flow_hash_set, create_packets, + free_packets, NULL), + BENCH_INFO(bench_packet_ts, create_packets, free_packets, NULL), + BENCH_INFO(bench_packet_ts_set, create_packets, free_packets, + NULL), +}; + +/** + * ODP packet microbenchmark application + */ +int main(int argc, char *argv[]) +{ + odph_odpthread_t worker_thread; + int cpu; + odp_shm_t shm; + odp_cpumask_t cpumask; + char cpumaskstr[ODP_CPUMASK_STR_SIZE]; + odp_pool_capability_t capa; + odp_pool_param_t params; + odp_instance_t instance; + uint32_t pkt_num; + uint8_t ret; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, NULL, NULL)) { + LOG_ERR("Error: ODP global init failed.\n"); + exit(EXIT_FAILURE); + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + LOG_ERR("Error: ODP local init failed.\n"); + exit(EXIT_FAILURE); + } + + /* Reserve memory for args from shared mem */ + shm = odp_shm_reserve("shm_args", sizeof(args_t), + ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + LOG_ERR("Error: shared mem reserve failed.\n"); + exit(EXIT_FAILURE); + } + + gbl_args = odp_shm_addr(shm); + + if (gbl_args == NULL) { + LOG_ERR("Error: shared mem alloc failed.\n"); + exit(EXIT_FAILURE); + } + + memset(gbl_args, 0, sizeof(args_t)); + + gbl_args->bench = test_suite; + gbl_args->num_bench = sizeof(test_suite) / sizeof(test_suite[0]); + + /* Parse and store the application arguments */ + parse_args(argc, argv, &gbl_args->appl); + + /* Print both system and application information */ + print_info(NO_PATH(argv[0]), &gbl_args->appl); + + /* Get default worker cpumask */ + if (odp_cpumask_default_worker(&cpumask, 1) != 1) { + LOG_ERR("Error: unable to allocate worker thread.\n"); + exit(EXIT_FAILURE); + } + + (void)odp_cpumask_to_str(&cpumask, cpumaskstr, sizeof(cpumaskstr)); + + /* Check pool capability */ + if (odp_pool_capability(&capa)) { + LOG_ERR("Error: unable to query pool capability.\n"); + exit(EXIT_FAILURE); + } + + /* At least 2 x TEST_REPEAT_COUNT packets required */ + pkt_num = (gbl_args->appl.burst_size > 2) ? + gbl_args->appl.burst_size * TEST_REPEAT_COUNT : + 2 * TEST_REPEAT_COUNT; + + if (capa.pkt.max_num && capa.pkt.max_num < pkt_num) { + LOG_ERR("Error: packet pool size not supported.\n"); + printf("MAX: %" PRIu32 "\n", capa.pkt.max_num); + exit(EXIT_FAILURE); + } else if (capa.pkt.max_len && capa.pkt.max_len < TEST_MAX_PKT_SIZE) { + LOG_ERR("Error: packet length not supported.\n"); + exit(EXIT_FAILURE); + } else if (capa.pkt.max_seg_len && + capa.pkt.max_seg_len < PKT_POOL_SEG_LEN) { + LOG_ERR("Error: segment length not supported.\n"); + exit(EXIT_FAILURE); + } else if (capa.pkt.max_uarea_size && + capa.pkt.max_uarea_size < PKT_POOL_UAREA_SIZE) { + LOG_ERR("Error: user area size not supported.\n"); + exit(EXIT_FAILURE); + } + + /* Create packet pool */ + odp_pool_param_init(&params); + params.pkt.seg_len = PKT_POOL_SEG_LEN; + params.pkt.len = TEST_MAX_PKT_SIZE; + params.pkt.num = pkt_num; + params.pkt.uarea_size = PKT_POOL_UAREA_SIZE; + params.type = ODP_POOL_PACKET; + + gbl_args->pool = odp_pool_create("packet pool", &params); + + if (gbl_args->pool == ODP_POOL_INVALID) { + LOG_ERR("Error: packet pool create failed.\n"); + exit(EXIT_FAILURE); + } + + printf("CPU: %i\n", odp_cpumask_first(&cpumask)); + printf("CPU mask: %s\n", cpumaskstr); + printf("Burst size: %d\n", gbl_args->appl.burst_size); + printf("Bench repeat: %d\n", TEST_REPEAT_COUNT); + + odp_pool_print(gbl_args->pool); + + memset(&worker_thread, 0, sizeof(odph_odpthread_t)); + + odp_barrier_init(&barrier, 1 + 1); + + signal(SIGINT, sig_handler); + + /* Create worker threads */ + cpu = odp_cpumask_first(&cpumask); + + odp_cpumask_t thd_mask; + odph_odpthread_params_t thr_params; + + memset(&thr_params, 0, sizeof(thr_params)); + thr_params.start = run_benchmarks; + thr_params.arg = gbl_args; + thr_params.thr_type = ODP_THREAD_WORKER; + thr_params.instance = instance; + + odp_cpumask_zero(&thd_mask); + odp_cpumask_set(&thd_mask, cpu); + odph_odpthreads_create(&worker_thread, &thd_mask, + &thr_params); + + odph_odpthreads_join(&worker_thread); + + ret = gbl_args->bench_failed; + + if (odp_pool_destroy(gbl_args->pool)) { + LOG_ERR("Error: pool destroy\n"); + exit(EXIT_FAILURE); + } + + if (odp_shm_free(shm)) { + LOG_ERR("Error: shm free\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + LOG_ERR("Error: term local\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + LOG_ERR("Error: term global\n"); + exit(EXIT_FAILURE); + } + + return ret; +} ----------------------------------------------------------------------- Summary of changes: test/common_plat/performance/.gitignore | 1 + test/common_plat/performance/Makefile.am | 7 +- test/common_plat/performance/odp_bench_packet.c | 1611 +++++++++++++++++++++++ 3 files changed, 1618 insertions(+), 1 deletion(-) create mode 100644 test/common_plat/performance/odp_bench_packet.c hooks/post-receive --

9 years

[COMMIT] branch api-next updated. v1.12.0.0-240-g1588c49

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 discards 49c833125d8f9e072080579221532d0d4a978e6b (commit) discards 3875d6ebf690e07b69f11621caefab1afc58e100 (commit) discards b99095485be4ac14d16bef372b5c6521b396abaa (commit) discards f53fda91d2919eee33b5a177ef818be1092c890b (commit) discards 46e088c2f56d1463a598b4ac23308e19bf2b9031 (commit) discards 0b1dc8a9a69252ce56d13521284683faff0e3e35 (commit) discards 4132497ff67871d67c088c99b782cba10817bd28 (commit) discards cd83d5d1114a40abf554c59bd92c8a8199b10c7a (commit) discards 112209c3fc672aee4a3074aa784aefe00f32d250 (commit) discards 1837825e219b6bd62a3ecda2ed68873a958b8171 (commit) discards fda9a9e4887eff3f0526c7bcef5e29ff511cd4d8 (commit) discards 4aaa74fceecee7b1538546d0b67347569c1239c6 (commit) discards 4d0b7588251ed6a5de781f9220c3ace2831a68b2 (commit) discards 41febe9fe6ac762174579e86874d65ec8a2c5485 (commit) discards 6e09a7a90079b6789b83d9234306ac02a8f6d8da (commit) discards 6388e398998426c4b18cde893131d54630879bdf (commit) discards ca3b3950cc901d0e8db1f2bb9961c3bac9491c88 (commit) discards dd3031076b80cf6d8b9df6024c44555c77b150fb (commit) discards dfeba061509fb1451351ffb168a458e7d9ae4126 (commit) discards f20066c7949466430186cce217589910fa75fd61 (commit) discards 9fe4043f4cf402a4695e8c0e4887e87da60fcb33 (commit) discards 4d9de3d54c49ec69d2366a01ad5b2b987943a5c5 (commit) discards 970f7a4ae91932c49d1b9dc00bfa861f7f2a0197 (commit) discards 8ae51b0364e25e45eddb4cf2e175b269c0736436 (commit) discards 76543549b422a53dde44de5900071554f65aa212 (commit) discards 2c060a9d3b9f067f4cca2094be845e54392077ec (commit) discards b6e1fea7ef8a443579c8f197c96ca2acc7c0577d (commit) discards fe182fb0a97c1989747ae96b401a10d34c878480 (commit) discards 82c67c0b1755f4d4e0f5b1df2e6356150cca4166 (commit) discards 80a30e1513a9614622e08657b94dca56db9e250f (commit) discards 8ab727c5f3a5b5aa556a84e04870f1f3fe3a073b (commit) discards 2b36166d647c64aa545e6ecc23a1d464fcd2c3c0 (commit) discards d3a7028a5708506b63dc6a06846cd05c7552bbf4 (commit) discards 4208ef3e2ce9f6093ae540af7de20759849782b6 (commit) discards dba0f42c9e24d090b29df165f610fc0df051b018 (commit) discards 46b88467e667e26fed282b234c481a14fcecff62 (commit) discards f195caa92ef8457c2c670fd3449ea6521e7ad823 (commit) discards 7f97683b1afc4826825f0db0fcac40858892494a (commit) discards 52592157f25c9e2e3876dc3624cf91b1b71127ad (commit) discards 4a320c0af291c07f33b1a295f72704215169d562 (commit) discards f5cde8870a425d51d08df7a1b4b3fb1cf06406f0 (commit) discards c3830c3936b76faa423563bbd104e732120f9523 (commit) discards cc52f0675d1674a80cf1806dc8c1c4e3887afdd1 (commit) discards 4b698023210b7f742c053707ba131097b570276d (commit) discards 2eb3e87bc56b2a02cb10637e5ce3a7d1157472cf (commit) discards ba203281cfd10b88a5d5b8f143ea34d14d373b58 (commit) discards 527ee67cb434e5e7c8015fa8c7d15f2ac25b1d20 (commit) discards 101e8188088b91e8d85e0fef0d6674dae05c306e (commit) discards 343579dda50fcefd5498cfe146a438b8fdb3c065 (commit) discards b4e0a8b91a422cbf28e0406a5076025894103984 (commit) discards a611a514682dea61ca142b51a28194a39a286fa7 (commit) discards d345d75c975bd98f61bc2e04907b3e232d88083c (commit) discards 7e40217271ae17ce19abd873140439c51a525fb1 (commit) discards fbc400dc8c35c220cbb41531d12c933f7c4226d1 (commit) discards 6cef872afcac78016d095d426fa9f3d9055c3856 (commit) discards ffb22c37e4a483cc647c8ba8f4a9329fa83639aa (commit) discards 3fd85fb6f45d859e6f19eeadda69992858f06f22 (commit) discards e91877df47118468e940a58047d94fe4195e4b1e (commit) discards 4194d93ab8095ef850e332a1433d8d810b7418a1 (commit) discards f723bcef66945acb0738acc8a40b8ebd5851b84d (commit) discards fa4063b4104784bdc1c20fe3b519716e4413c245 (commit) discards 9c4d778148d514adf8586939123acdcdc022e8e5 (commit) discards b06ee329f944aeb7f3d03646aac384f88a00a7a5 (commit) discards a2676059469f61f1ffd58090b74f4dd975d172ac (commit) discards 39acf771084aa4f16b60a6bdf9e5f3bed4f88cd9 (commit) discards 0d6d0923b2dd4d3097ea992af76408fd4281d84e (commit) discards 2997a78f270cdb34c82f805f8103f660ed1bcdf2 (commit) discards bacd73a34768ce859f8136f29bda70bbccbdb45e (commit) discards 63ef9b3714c9410dd1b5a55e3bd50de49f23dfcb (commit) discards 4ee154864b47712a45cfdb23ea6c22b46bfb1abf (commit) discards 552e46339939933ee7ed305f1dda82ead362ece9 (commit) discards 1d61093f4ea7a9f62cc69e6fdb6fb82b246af817 (commit) discards 6d78d33df6d33ebe1b933383c4858df5e9f7f33b (commit) discards 4cf84d158adc7e84bed69ceac34bbbb3dee9587e (commit) discards 67abee1a4548878ccc93b57fbd84c3fe68147bf6 (commit) discards afb2ecf5e45e10b0e1258c85fc1b80f8ce447646 (commit) discards fe9c6cc8e5e88e068ee9f1f4dc29b7f32411f4d7 (commit) discards 6b5b78245c2ebbc0c907dba9809e9002c7214959 (commit) discards ba23aa731a85709a84ea0137a918b07cf4811fc2 (commit) discards 4b7e6b82f14ef2d09b91b1c197e84dbfe0e8a09b (commit) discards 683a975963d150e5dae12649cbd1abc003ee2c39 (commit) discards dcffa7faecf3bf4a66e6f5ce745bcde3a4f0b7ed (commit) discards c247659448bfd45c1bb648d7508f7db0b225b7b8 (commit) discards 95918aa496a22794af654c582830e2a2d8b914a7 (commit) discards 7bcd45812c020a9e67cf4d848e5bbef1384f58af (commit) discards 9e95d6a1a9025bfafb846b4d805b1dc146657a10 (commit) discards bd4a9492d862e0636fba99bd76aaa19952de2f44 (commit) discards d858987a1dfea90625389ab5a8e14379a23dbb52 (commit) discards 01ea9db19e2eb2f978d4fd22b1e341a741bb1e9c (commit) discards 0a0e4a684f8e5420295eda3df4fece6361b4d797 (commit) discards c6dc829d0c6a54a08756e13e2f3388f0bda61245 (commit) discards a296693d3dbbe98a5616406d6535dee85cbd31ba (commit) discards ec7a8e0fabe2269cf824ab809ad52a8763739be1 (commit) discards 02c46a3a671bca6de5159a59be45663bca516753 (commit) discards 123327606c2dd95a6a85c80e74ad172932195631 (commit) discards 936ce9f30a85285f70e26038eb5ea8637622fea2 (commit) discards ac2d233f2bcfb8d70fa005ae8fa19cce41b4a238 (commit) discards 97f2672e48ea08abd00ed7f3b1fd8420a217779c (commit) discards d9615289bf6f60bd3a04f8138d5b487efda96a49 (commit) discards b9877d54ec4c2259dec17751f6580f110fd447a5 (commit) discards ac563d15b95d884764ffa2f48eedce6f5b408fca (commit) discards 279ecc54b69ad1621fbba837bee31adcc9fd704a (commit) discards ad7f8f4ea11a8e40d853cd9b2b0bc3e6f7876a8b (commit) discards 50cfbff244a1fa29314520eb9ca9bdf5df445df6 (commit) discards 234dd2f623d73b069e43282baf96b48473d0ef1c (commit) discards b93fd7af775a04c50a064a241d82ba3b7bf999f7 (commit) discards 1e1312c15e96be77eccc0fb8e3aa35d4c7da72f6 (commit) discards eda2ce7c6d9998155edde42617501cbaea5e03f5 (commit) discards 9b648c4cd201ff8fbcbaf12512482b0a8f952d8f (commit) discards f62c9aa3f3f48080a61a1e71cd649f1d65539ff5 (commit) discards 244916315fdcb665f66b4f235782feee26a53c89 (commit) discards e5d2edccc685fcde88793f5514d1fdb2654ecfa4 (commit) discards 52553fa3972109a47e948321236dcabf29503f61 (commit) discards 4b751b4dd7e2f000d2ed0268d51878c5ff982c2b (commit) discards 21dad81b51443c49dc51ede63516f4a434e217cc (commit) discards 474dac39b8d4ad7f2ac3768887e36610188c16c2 (commit) discards b8c6689e4c81277067a2dd5f30598e0ddc7dc2c5 (commit) discards ff56734fa58db5043a6bb358611cdc2a1c5de4a3 (commit) discards fd86c7fd19820e21c182e2c0e043331e6aab6282 (commit) discards 4a58145d0ca4e62ff41b052ed800acee7d0a97e1 (commit) discards b2d4275c2df6a7fcd9796fafed74b59292cee26e (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (1588c49a0bf0332512d5e08e1feaad5e4005df31) \ O -- O -- O (49c833125d8f9e072080579221532d0d4a978e6b) The removed revisions are not necessarily gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: CHANGELOG | 178 -------- configure.ac | 6 +- platform/linux-generic/Makefile.am | 5 - .../linux-generic/include/odp_config_internal.h | 6 +- platform/linux-generic/odp_packet.c | 12 - platform/linux-generic/odp_schedule.c | 21 - .../validation/api/crypto/odp_crypto_test_inp.c | 53 --- test/common_plat/validation/api/packet/packet.c | 477 --------------------- 8 files changed, 8 insertions(+), 750 deletions(-) hooks/post-receive --

9 years

[COMMIT] branch master updated. v1.13.0.0-4-g03aafc3

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 03aafc317489232bab7e9048f9bd96a24e6f598d (commit) via 19a457a86880a6bc33afe891a6204752bde70088 (commit) via 7025b1b430237cddc10a0338c7b120d23b7985a8 (commit) via 0f18e317ede15081828deca1ff61d65b72e12926 (commit) from 3875d6ebf690e07b69f11621caefab1afc58e100 (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 03aafc317489232bab7e9048f9bd96a24e6f598d Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Fri Jan 20 15:32:03 2017 -0500 helper: remove dependence on test dir There is no reason that the helpers need to depend on the test directory so remove the offending links Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 7d55ae6..1c50282 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,9 +1,25 @@ -include $(top_srcdir)/test/Makefile.inc +include $(top_srcdir)/platform/@with_platform@/Makefile.inc -AM_CFLAGS += -I$(srcdir)/common -AM_LDFLAGS += -static +LIB = $(top_builddir)/lib + +#in the following line, the libs using the symbols should come before +#the libs containing them! The includer is given a chance to add things +#before libodp by setting PRE_LDADD before the inclusion. +LDADD = $(PRE_LDADD) $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la + +INCFLAGS = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ + -I$(top_srcdir)/helper/platform/@with_helper_platform@/include \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/helper -TESTS_ENVIRONMENT += TEST_DIR=${builddir} +ODP_PLATFORM=${with_platform} + +AM_CFLAGS += $(INCFLAGS) +AM_LDFLAGS += -static EXECUTABLES = chksum$(EXEEXT) \ cuckootable$(EXEEXT) \ @@ -38,7 +54,6 @@ EXTRA_DIST = odpthreads_as_processes odpthreads_as_pthreads dist_chksum_SOURCES = chksum.c dist_cuckootable_SOURCES = cuckootable.c dist_odpthreads_SOURCES = odpthreads.c -odpthreads_LDADD = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la dist_parse_SOURCES = parse.c dist_table_SOURCES = table.c dist_iplookuptable_SOURCES = iplookuptable.c diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 749d495..7c572ae 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <test_debug.h> +#include "odph_debug.h" #include <odp_api.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> @@ -21,7 +21,7 @@ struct udata_struct { }; /* Create additional dataplane threads */ -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) +int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) { odp_instance_t instance; int status = 0; @@ -41,17 +41,17 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) odp_pool_capability_t capa; if (odp_init_global(&instance, NULL, NULL)) { - LOG_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } if (odp_init_local(instance, ODP_THREAD_WORKER)) { - LOG_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } if (odp_pool_capability(&capa) < 0) { - LOG_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } @@ -91,12 +91,12 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) eth->type = odp_cpu_to_be_16(ODPH_ETHTYPE_IPV4); if (odph_ipv4_addr_parse(&dstip, "192.168.0.1")) { - LOG_ERR("Error: parse ip\n"); + ODPH_ERR("Error: parse ip\n"); return -1; } if (odph_ipv4_addr_parse(&srcip, "192.168.0.2")) { - LOG_ERR("Error: parse ip\n"); + ODPH_ERR("Error: parse ip\n"); return -1; } @@ -139,12 +139,12 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) return -1; if (odp_term_local()) { - LOG_ERR("Error: ODP local term failed.\n"); + ODPH_ERR("Error: ODP local term failed.\n"); exit(EXIT_FAILURE); } if (odp_term_global(instance)) { - LOG_ERR("Error: ODP global term failed.\n"); + ODPH_ERR("Error: ODP global term failed.\n"); exit(EXIT_FAILURE); } diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index 5b4333b..6736f2b 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -48,7 +48,7 @@ #include <time.h> #include <odp_api.h> -#include <test_debug.h> +#include <odph_debug.h> #include <../odph_cuckootable.h> /******************************************************************************* @@ -534,7 +534,7 @@ test_cuckoo_hash_table(void) return 0; } -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) +int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) { odp_instance_t instance; int ret = 0; diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index e1d2820..86aa1b3 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -11,7 +11,7 @@ #include <errno.h> #include <odp_api.h> -#include <test_debug.h> +#include <odph_debug.h> #include <../odph_iplookuptable.h> #include <odp/helper/ip.h> @@ -138,7 +138,7 @@ static int test_ip_lookup_table(void) return 0; } -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) +int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) { odp_instance_t instance; int ret = 0; diff --git a/helper/test/linux-generic/process.c b/helper/test/linux-generic/process.c index f641128..f9bdc3e 100644 --- a/helper/test/linux-generic/process.c +++ b/helper/test/linux-generic/process.c @@ -4,13 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <test_debug.h> +#include <odph_debug.h> #include <odp_api.h> #include <odp/helper/platform/linux-generic/threads_extn.h> #define NUMBER_WORKERS 16 /* 0 = max */ -static void *worker_fn(void *arg TEST_UNUSED) +static void *worker_fn(void *arg ODPH_UNUSED) { /* depend on the odp helper to call odp_init_local */ printf("Worker thread on CPU %d\n", odp_cpu_id()); @@ -19,7 +19,7 @@ static void *worker_fn(void *arg TEST_UNUSED) } /* Create additional dataplane processes */ -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) +int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) { odp_cpumask_t cpu_mask; int num_workers; @@ -31,12 +31,12 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) odph_linux_thr_params_t thr_params; if (odp_init_global(&instance, NULL, NULL)) { - LOG_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - LOG_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -71,7 +71,7 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) ret = odph_linux_process_fork_n(proc, &cpu_mask, &thr_params); if (ret < 0) { - LOG_ERR("Fork workers failed %i\n", ret); + ODPH_ERR("Fork workers failed %i\n", ret); return -1; } @@ -83,7 +83,7 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) odph_linux_process_wait_n(proc, num_workers); if (odp_term_global(instance)) { - LOG_ERR("Error: ODP global term failed.\n"); + ODPH_ERR("Error: ODP global term failed.\n"); exit(EXIT_FAILURE); } } diff --git a/helper/test/linux-generic/thread.c b/helper/test/linux-generic/thread.c index f1ca1b7..919f00e 100644 --- a/helper/test/linux-generic/thread.c +++ b/helper/test/linux-generic/thread.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <test_debug.h> +#include <odph_debug.h> #include <odp_api.h> #include <odp/helper/platform/linux-generic/threads_extn.h> #define NUMBER_WORKERS 16 -static void *worker_fn(void *arg TEST_UNUSED) +static void *worker_fn(void *arg ODPH_UNUSED) { /* depend on the odp helper to call odp_init_local */ @@ -21,7 +21,7 @@ static void *worker_fn(void *arg TEST_UNUSED) } /* Create additional dataplane threads */ -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) +int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) { odph_linux_pthread_t thread_tbl[NUMBER_WORKERS]; odp_cpumask_t cpu_mask; @@ -32,12 +32,12 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) odph_linux_thr_params_t thr_params; if (odp_init_global(&instance, NULL, NULL)) { - LOG_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - LOG_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -74,12 +74,12 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) odph_linux_pthread_join(thread_tbl, num_workers); if (odp_term_local()) { - LOG_ERR("Error: ODP local term failed.\n"); + ODPH_ERR("Error: ODP local term failed.\n"); exit(EXIT_FAILURE); } if (odp_term_global(instance)) { - LOG_ERR("Error: ODP global term failed.\n"); + ODPH_ERR("Error: ODP global term failed.\n"); exit(EXIT_FAILURE); } diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 216bccd..4bb3c3b 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -13,7 +13,7 @@ #include <unistd.h> #include <stdlib.h> -#include <test_debug.h> +#include <odph_debug.h> #include <odp_api.h> #include <odp/helper/threads.h> @@ -25,7 +25,7 @@ static void main_exit(void); /* ODP application instance */ static odp_instance_t odp_instance; -static int worker_fn(void *arg TEST_UNUSED) +static int worker_fn(void *arg ODPH_UNUSED) { int cpu; odp_cpumask_t workers; @@ -74,12 +74,12 @@ int main(int argc, char *argv[]) odph_parse_options(argc, argv, NULL, NULL); if (odp_init_global(&odp_instance, NULL, NULL)) { - LOG_ERR("Error: ODP global init failed.\n"); + ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } if (odp_init_local(odp_instance, ODP_THREAD_CONTROL)) { - LOG_ERR("Error: ODP local init failed.\n"); + ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -89,13 +89,13 @@ int main(int argc, char *argv[]) odp_cpumask_zero(&cpu_mask); /* allocate the 1st available control cpu to main process */ if (odp_cpumask_default_control(&cpu_mask, 1) != 1) { - LOG_ERR("Allocate main process CPU core failed.\n"); + ODPH_ERR("Allocate main process CPU core failed.\n"); exit(EXIT_FAILURE); } cpu = odp_cpumask_first(&cpu_mask); if (odph_odpthread_setaffinity(cpu) != 0) { - LOG_ERR("Set main process affinify to " + ODPH_ERR("Set main process affinify to " "cpu(%d) failed.\n", cpu); exit(EXIT_FAILURE); } @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) /* read back affinity to verify */ affinity = odph_odpthread_getaffinity(); if ((affinity < 0) || (cpu != affinity)) { - LOG_ERR("Verify main process affinity failed: " + ODPH_ERR("Verify main process affinity failed: " "set(%d) read(%d).\n", cpu, affinity); exit(EXIT_FAILURE); } @@ -152,12 +152,12 @@ int main(int argc, char *argv[]) static void main_exit(void) { if (odp_term_local()) { - LOG_ERR("Error: ODP local term failed.\n"); + ODPH_ERR("Error: ODP local term failed.\n"); _exit(EXIT_FAILURE); } if (odp_term_global(odp_instance)) { - LOG_ERR("Error: ODP global term failed.\n"); + ODPH_ERR("Error: ODP global term failed.\n"); _exit(EXIT_FAILURE); } } diff --git a/helper/test/parse.c b/helper/test/parse.c index b5a4ab4..26dfc68 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <test_debug.h> +#include <odph_debug.h> #include <odp_api.h> #include <odp/helper/eth.h> @@ -42,37 +42,37 @@ static int test_mac(void) /* String must not start with other chars */ if (!odph_eth_addr_parse(&mac, "foo 01:02:03:04:05:06")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Missing digit */ if (!odph_eth_addr_parse(&mac, "01:02:03:04:05:")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Missing colon */ if (!odph_eth_addr_parse(&mac, "01:02:03:04:05 06")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Too large value */ if (!odph_eth_addr_parse(&mac, "01:02:03:04:05:1ff")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Negative value */ if (!odph_eth_addr_parse(&mac, "-1:02:03:04:05:06")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Failed function call must not store address */ if (different_mac(&mac, &ref)) { - LOG_ERR("Modified address when failed\n"); + ODPH_ERR("Modified address when failed\n"); return -1; } @@ -86,36 +86,36 @@ static int test_mac(void) /* Zero pre-fixed */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "01:02:03:04:05:06")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } /* Not zero pre-fixed */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "1:2:3:4:5:6")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } /* String may continue with other chars */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "01:02:03:04:05:06 foobar")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -129,24 +129,24 @@ static int test_mac(void) /* Zero pre-fixed */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "0a:0b:0c:0d:0e:0f")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } /* Not zero pre-fixed */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "a:b:c:d:e:f")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -160,12 +160,12 @@ static int test_mac(void) /* Dual digits */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "1a:2b:3c:4d:5e:6f")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -174,12 +174,12 @@ static int test_mac(void) /* All zeros */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "00:00:00:00:00:00")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -188,12 +188,12 @@ static int test_mac(void) /* All ones */ memset(&mac, 0, sizeof(odph_ethaddr_t)); if (odph_eth_addr_parse(&mac, "ff:ff:ff:ff:ff:ff")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_mac(&mac, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -215,37 +215,37 @@ static int test_ipv4(void) /* String must not start with other chars */ if (!odph_ipv4_addr_parse(&ip_addr, "foo 1.2.3.4")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Missing digit */ if (!odph_ipv4_addr_parse(&ip_addr, "1.2.3.")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Missing dot */ if (!odph_ipv4_addr_parse(&ip_addr, "1.2.3 4")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Too large value */ if (!odph_ipv4_addr_parse(&ip_addr, "1.2.3.256")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Negative value */ if (!odph_ipv4_addr_parse(&ip_addr, "-1.2.3.4")) { - LOG_ERR("Accepted bad string\n"); + ODPH_ERR("Accepted bad string\n"); return -1; } /* Failed function call must not store address */ if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Modified address when failed\n"); + ODPH_ERR("Modified address when failed\n"); return -1; } @@ -254,36 +254,36 @@ static int test_ipv4(void) /* Zero pre-fixed */ ip_addr = 0; if (odph_ipv4_addr_parse(&ip_addr, "001.002.003.004")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } /* Not zero pre-fixed */ ip_addr = 0; if (odph_ipv4_addr_parse(&ip_addr, "1.2.3.4")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } /* String may continue with other chars */ ip_addr = 0; if (odph_ipv4_addr_parse(&ip_addr, "1.2.3.4 foobar")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -292,12 +292,12 @@ static int test_ipv4(void) /* Dual digits */ ip_addr = 0; if (odph_ipv4_addr_parse(&ip_addr, "26.43.60.77")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -306,12 +306,12 @@ static int test_ipv4(void) /* Triple digits */ ip_addr = 0; if (odph_ipv4_addr_parse(&ip_addr, "161.178.195.212")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -320,12 +320,12 @@ static int test_ipv4(void) /* All zeros */ ip_addr = 0; if (odph_ipv4_addr_parse(&ip_addr, "0.0.0.0")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } @@ -334,12 +334,12 @@ static int test_ipv4(void) /* All ones */ ip_addr = 0; if (odph_ipv4_addr_parse(&ip_addr, "255.255.255.255")) { - LOG_ERR("Parse call failed\n"); + ODPH_ERR("Parse call failed\n"); return -1; } if (different_ipv4(&ip_addr, &ref)) { - LOG_ERR("Bad parse result\n"); + ODPH_ERR("Bad parse result\n"); return -1; } diff --git a/helper/test/table.c b/helper/test/table.c index abb5b3b..3b74b22 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier:BSD-3-Clause */ -#include <test_debug.h> +#include <odph_debug.h> #include <../odph_hashtable.h> #include <../odph_lineartable.h> #include <odp_api.h> @@ -25,7 +25,7 @@ * value (data): MAC address of the next hop station (6 bytes). */ -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) +int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED) { odp_instance_t instance; int ret = 0; @@ -43,12 +43,12 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) ret = odp_init_global(&instance, NULL, NULL); if (ret != 0) { - LOG_ERR("odp_shm_init_global fail\n"); + ODPH_ERR("odp_shm_init_global fail\n"); exit(EXIT_FAILURE); } ret = odp_init_local(instance, ODP_THREAD_WORKER); if (ret != 0) { - LOG_ERR("odp_shm_init_local fail\n"); + ODPH_ERR("odp_shm_init_local fail\n"); exit(EXIT_FAILURE); } @@ -121,12 +121,12 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) printf("all test finished success!!\n"); if (odp_term_local()) { - LOG_ERR("Error: ODP local term failed.\n"); + ODPH_ERR("Error: ODP local term failed.\n"); exit(EXIT_FAILURE); } if (odp_term_global(instance)) { - LOG_ERR("Error: ODP global term failed.\n"); + ODPH_ERR("Error: ODP global term failed.\n"); exit(EXIT_FAILURE); } commit 19a457a86880a6bc33afe891a6204752bde70088 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Fri Jan 20 15:32:02 2017 -0500 helper: move thread implementation under platform Only the portable api is built by default, use --enable-helper-extn to enable non portable APIs for a helper platform Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 1384130..2cf6536 100644 --- a/configure.ac +++ b/configure.ac @@ -138,6 +138,18 @@ AC_SUBST([with_platform]) AC_SUBST([platform_with_platform], ["platform/${with_platform}"]) ########################################################################## +# Determine which helper platform to build for +########################################################################## +AC_ARG_WITH([helper_platform], + [AS_HELP_STRING([--with-helper_platform=platform], + [select helper platform to be used, default linux-generic])], + [], + [with_helper_platform=${with_platform} + ]) + +AC_SUBST([with_helper_platform]) + +########################################################################## # Run platform specific checks and settings ########################################################################## IMPLEMENTATION_NAME="" @@ -202,6 +214,7 @@ AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) +AM_CONDITIONAL([helper_extn], [test x$helper_extn = xyes ]) ########################################################################## # Setup doxygen documentation @@ -295,7 +308,7 @@ AM_CXXFLAGS="-std=c++11" AC_CONFIG_FILES([Makefile pkgconfig/libodp-linux.pc - pkgconfig/libodphelper-linux.pc + pkgconfig/libodphelper-linux-generic.pc ]) AC_SEARCH_LIBS([timer_create],[rt posix4]) @@ -322,6 +335,8 @@ AC_MSG_RESULT([ implementation_name: ${IMPLEMENTATION_NAME} ARCH_DIR ${ARCH_DIR} with_platform: ${with_platform} + with_helper_platform: ${with_helper_platform} + helper_extn: ${helper_extn} prefix: ${prefix} sysconfdir: ${sysconfdir} libdir: ${libdir} diff --git a/example/Makefile.inc b/example/Makefile.inc index 19d3994..ea596d5 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,6 +1,6 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper-linux.la +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper-@with_helper_platform@.la AM_CFLAGS += \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --git a/helper/Makefile.am b/helper/Makefile.am index 62e55cc..9b2f18a 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper-linux.pc +pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper-linux-generic.pc LIB = $(top_builddir)/lib AM_CFLAGS = -I$(srcdir)/include @@ -25,6 +25,11 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/threads.h \ $(srcdir)/include/odp/helper/udp.h +if helper_extn +helperinclude_HEADERS += \ + $(srcdir)/include/odp/helper/platform/@with_helper_platform@/threads_extn.h +endif + noinst_HEADERS = \ $(srcdir)/odph_debug.h \ $(srcdir)/odph_hashtable.h \ @@ -33,7 +38,7 @@ noinst_HEADERS = \ $(srcdir)/odph_list_internal.h \ $(srcdir)/odph_iplookuptable.h -__LIB__libodphelper_linux_la_SOURCES = \ +__LIB__libodphelper_@with_platform@_la_SOURCES = \ eth.c \ ip.c \ chksum.c \ @@ -43,4 +48,9 @@ __LIB__libodphelper_linux_la_SOURCES = \ iplookuptable.c \ threads.c -lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la +if helper_extn +__LIB__libodphelper_@with_platform@_la_SOURCES += \ + platform/@with_helper_platform@/thread.c +endif + +lib_LTLIBRARIES = $(LIB)/libodphelper-@with_platform@.la diff --git a/helper/include/odp/helper/platform/linux-generic/threads_extn.h b/helper/include/odp/helper/platform/linux-generic/threads_extn.h new file mode 100644 index 0000000..1d4036d --- /dev/null +++ b/helper/include/odp/helper/platform/linux-generic/threads_extn.h @@ -0,0 +1,112 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP Linux helper extension API + * + * This file is an optional helper to odp.h APIs. These functions are provided + * to ease common setups in a Linux system. User is free to implement the same + * setups in otherways (not via this API). + */ + +#ifndef ODPH_LINUX_EXT_H_ +#define ODPH_LINUX_EXT_H_ + +#include <odp/helper/threads.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odph_linux ODPH LINUX + * @{ + */ + +/** + * Creates and launches pthreads + * + * Creates, pins and launches threads to separate CPU's based on the cpumask. + * + * @param[out] pthread_tbl Table of pthread state information records. Table + * must have at least as many entries as there are + * CPUs in the CPU mask. + * @param mask CPU mask + * @param thr_params Linux helper thread parameters + * + * @return Number of threads created + */ +int odph_linux_pthread_create(odph_linux_pthread_t *pthread_tbl, + const odp_cpumask_t *mask, + const odph_linux_thr_params_t *thr_params); + +/** + * Waits pthreads to exit + * + * Returns when all threads have been exit. + * + * @param thread_tbl Thread table + * @param num Number of threads to create + * + */ +void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num); + +/** + * Fork a process + * + * Forks and sets CPU affinity for the child process. Ignores 'start' and 'arg' + * thread parameters. + * + * @param[out] proc Pointer to process state info (for output) + * @param cpu Destination CPU for the child process + * @param thr_params Linux helper thread parameters + * + * @return On success: 1 for the parent, 0 for the child + * On failure: -1 for the parent, -2 for the child + */ +int odph_linux_process_fork(odph_linux_process_t *proc, int cpu, + const odph_linux_thr_params_t *thr_params); + +/** + * Fork a number of processes + * + * Forks and sets CPU affinity for child processes. Ignores 'start' and 'arg' + * thread parameters. + * + * @param[out] proc_tbl Process state info table (for output) + * @param mask CPU mask of processes to create + * @param thr_params Linux helper thread parameters + * + * @return On success: 1 for the parent, 0 for the child + * On failure: -1 for the parent, -2 for the child + */ +int odph_linux_process_fork_n(odph_linux_process_t *proc_tbl, + const odp_cpumask_t *mask, + const odph_linux_thr_params_t *thr_params); + +/** + * Wait for a number of processes + * + * Waits for a number of child processes to terminate. Records process state + * change status into the process state info structure. + * + * @param proc_tbl Process state info table (previously filled by fork) + * @param num Number of processes to wait + * + * @return 0 on success, -1 on failure + */ +int odph_linux_process_wait_n(odph_linux_process_t *proc_tbl, int num); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h index b8d975a..5682bab 100644 --- a/helper/include/odp/helper/threads.h +++ b/helper/include/odp/helper/threads.h @@ -93,82 +93,6 @@ typedef struct { } odph_odpthread_t; /** - * Creates and launches pthreads - * - * Creates, pins and launches threads to separate CPU's based on the cpumask. - * - * @param[out] pthread_tbl Table of pthread state information records. Table - * must have at least as many entries as there are - * CPUs in the CPU mask. - * @param mask CPU mask - * @param thr_params Linux helper thread parameters - * - * @return Number of threads created - */ -int odph_linux_pthread_create(odph_linux_pthread_t *pthread_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params); - -/** - * Waits pthreads to exit - * - * Returns when all threads have been exit. - * - * @param thread_tbl Thread table - * @param num Number of threads to create - * - */ -void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num); - -/** - * Fork a process - * - * Forks and sets CPU affinity for the child process. Ignores 'start' and 'arg' - * thread parameters. - * - * @param[out] proc Pointer to process state info (for output) - * @param cpu Destination CPU for the child process - * @param thr_params Linux helper thread parameters - * - * @return On success: 1 for the parent, 0 for the child - * On failure: -1 for the parent, -2 for the child - */ -int odph_linux_process_fork(odph_linux_process_t *proc, int cpu, - const odph_linux_thr_params_t *thr_params); - - -/** - * Fork a number of processes - * - * Forks and sets CPU affinity for child processes. Ignores 'start' and 'arg' - * thread parameters. - * - * @param[out] proc_tbl Process state info table (for output) - * @param mask CPU mask of processes to create - * @param thr_params Linux helper thread parameters - * - * @return On success: 1 for the parent, 0 for the child - * On failure: -1 for the parent, -2 for the child - */ -int odph_linux_process_fork_n(odph_linux_process_t *proc_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params); - - -/** - * Wait for a number of processes - * - * Waits for a number of child processes to terminate. Records process state - * change status into the process state info structure. - * - * @param proc_tbl Process state info table (previously filled by fork) - * @param num Number of processes to wait - * - * @return 0 on success, -1 on failure - */ -int odph_linux_process_wait_n(odph_linux_process_t *proc_tbl, int num); - -/** * Creates and launches odpthreads (as linux threads or processes) * * Creates, pins and launches threads to separate CPU's based on the cpumask. diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 7b208fa..38c95d9 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -8,5 +8,16 @@ AC_ARG_ENABLE([test-helper], test_helper=yes fi]) +########################################################################## +# Enable/disable helper-ext +# platform specific non portable extensions +########################################################################## +helper_extn=no +AC_ARG_ENABLE([helper-extn], + [ --enable-helper-extn build helper platform extensions (not portable)], + [if test "x$enableval" = "xyes"; then + helper_extn=yes + fi]) + AC_CONFIG_FILES([helper/Makefile helper/test/Makefile]) diff --git a/helper/platform/linux-generic/thread.c b/helper/platform/linux-generic/thread.c new file mode 100644 index 0000000..90fa42a --- /dev/null +++ b/helper/platform/linux-generic/thread.c @@ -0,0 +1,313 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include <sched.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <sys/prctl.h> +#include <sys/syscall.h> + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdbool.h> + +#include <odp_api.h> +#include <odp/helper/platform/linux-generic/threads_extn.h> +#include "odph_debug.h" + +static void *_odph_run_start_routine(void *arg) +{ + odph_linux_thr_params_t *thr_params = arg; + + /* ODP thread local init */ + if (odp_init_local(thr_params->instance, thr_params->thr_type)) { + ODPH_ERR("Local init failed\n"); + return NULL; + } + + void *ret_ptr = thr_params->start(thr_params->arg); + int ret = odp_term_local(); + + if (ret < 0) + ODPH_ERR("Local term failed\n"); + + return ret_ptr; +} + +static void *_odph_thread_run_start_routine(void *arg) +{ + int status; + int ret; + odph_odpthread_params_t *thr_params; + + odph_odpthread_start_args_t *start_args = arg; + + thr_params = &start_args->thr_params; + + /* ODP thread local init */ + if (odp_init_local(thr_params->instance, thr_params->thr_type)) { + ODPH_ERR("Local init failed\n"); + if (start_args->linuxtype == ODPTHREAD_PROCESS) + _exit(EXIT_FAILURE); + return (void *)-1; + } + + ODPH_DBG("helper: ODP %s thread started as linux %s. (pid=%d)\n", + thr_params->thr_type == ODP_THREAD_WORKER ? + "worker" : "control", + (start_args->linuxtype == ODPTHREAD_PTHREAD) ? + "pthread" : "process", + (int)getpid()); + + status = thr_params->start(thr_params->arg); + ret = odp_term_local(); + + if (ret < 0) + ODPH_ERR("Local term failed\n"); + + /* for process implementation of odp threads, just return status... */ + if (start_args->linuxtype == ODPTHREAD_PROCESS) + _exit(status); + + /* threads implementation return void* pointers: cast status to that. */ + return (void *)(intptr_t)status; +} + +int odph_linux_pthread_create(odph_linux_pthread_t *pthread_tbl, + const odp_cpumask_t *mask, + const odph_linux_thr_params_t *thr_params) +{ + int i; + int num; + int cpu_count; + int cpu; + int ret; + + num = odp_cpumask_count(mask); + + memset(pthread_tbl, 0, num * sizeof(odph_linux_pthread_t)); + + cpu_count = odp_cpu_count(); + + if (num < 1 || num > cpu_count) { + ODPH_ERR("Invalid number of threads:%d (%d cores available)\n", + num, cpu_count); + return 0; + } + + cpu = odp_cpumask_first(mask); + for (i = 0; i < num; i++) { + cpu_set_t cpu_set; + + CPU_ZERO(&cpu_set); + CPU_SET(cpu, &cpu_set); + + pthread_attr_init(&pthread_tbl[i].attr); + + pthread_tbl[i].cpu = cpu; + + pthread_attr_setaffinity_np(&pthread_tbl[i].attr, + sizeof(cpu_set_t), &cpu_set); + + pthread_tbl[i].thr_params.start = thr_params->start; + pthread_tbl[i].thr_params.arg = thr_params->arg; + pthread_tbl[i].thr_params.thr_type = thr_params->thr_type; + pthread_tbl[i].thr_params.instance = thr_params->instance; + + ret = pthread_create(&pthread_tbl[i].thread, + &pthread_tbl[i].attr, + _odph_run_start_routine, + &pthread_tbl[i].thr_params); + if (ret != 0) { + ODPH_ERR("Failed to start thread on cpu #%d\n", cpu); + break; + } + + cpu = odp_cpumask_next(mask, cpu); + } + + return i; +} + +void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num) +{ + int i; + int ret; + + for (i = 0; i < num; i++) { + /* Wait thread to exit */ + ret = pthread_join(thread_tbl[i].thread, NULL); + if (ret != 0) { + ODPH_ERR("Failed to join thread from cpu #%d\n", + thread_tbl[i].cpu); + } + pthread_attr_destroy(&thread_tbl[i].attr); + } +} + +int odph_linux_process_fork_n(odph_linux_process_t *proc_tbl, + const odp_cpumask_t *mask, + const odph_linux_thr_params_t *thr_params) +{ + pid_t pid; + int num; + int cpu_count; + int cpu; + int i; + + num = odp_cpumask_count(mask); + + memset(proc_tbl, 0, num * sizeof(odph_linux_process_t)); + + cpu_count = odp_cpu_count(); + + if (num < 1 || num > cpu_count) { + ODPH_ERR("Bad num\n"); + return -1; + } + + cpu = odp_cpumask_first(mask); + for (i = 0; i < num; i++) { + cpu_set_t cpu_set; + + CPU_ZERO(&cpu_set); + CPU_SET(cpu, &cpu_set); + + pid = fork(); + + if (pid < 0) { + ODPH_ERR("fork() failed\n"); + return -1; + } + + /* Parent continues to fork */ + if (pid > 0) { + proc_tbl[i].pid = pid; + proc_tbl[i].cpu = cpu; + + cpu = odp_cpumask_next(mask, cpu); + continue; + } + + /* Child process */ + + /* Request SIGTERM if parent dies */ + prctl(PR_SET_PDEATHSIG, SIGTERM); + /* Parent died already? */ + if (getppid() == 1) + kill(getpid(), SIGTERM); + + if (sched_setaffinity(0, sizeof(cpu_set_t), &cpu_set)) { + ODPH_ERR("sched_setaffinity() failed\n"); + return -2; + } + + if (odp_init_local(thr_params->instance, + thr_params->thr_type)) { + ODPH_ERR("Local init failed\n"); + return -2; + } + + return 0; + } + + return 1; +} + +int odph_linux_process_fork(odph_linux_process_t *proc, int cpu, + const odph_linux_thr_params_t *thr_params) +{ + odp_cpumask_t mask; + + odp_cpumask_zero(&mask); + odp_cpumask_set(&mask, cpu); + return odph_linux_process_fork_n(proc, &mask, thr_params); +} + +int odph_linux_process_wait_n(odph_linux_process_t *proc_tbl, int num) +{ + pid_t pid; + int i, j; + int status = 0; + + for (i = 0; i < num; i++) { + pid = wait(&status); + + if (pid < 0) { + ODPH_ERR("wait() failed\n"); + return -1; + } + + for (j = 0; j < num; j++) { + if (proc_tbl[j].pid == pid) { + proc_tbl[j].status = status; + break; + } + } + + if (j == num) { + ODPH_ERR("Bad pid:%d\n", (int)pid); + return -1; + } + + /* Examine the child process' termination status */ + if (WIFEXITED(status) && WEXITSTATUS(status) != EXIT_SUCCESS) { + ODPH_ERR("Child exit status:%d (pid:%d)\n", + WEXITSTATUS(status), (int)pid); + return -1; + } + if (WIFSIGNALED(status)) { + int signo = WTERMSIG(status); + + ODPH_ERR("Child term signo:%d - %s (pid:%d)\n", + signo, strsignal(signo), (int)pid); + return -1; + } + } + + return 0; +} + +/* + * Create a single ODPthread as a linux thread + */ +static int odph_linux_thread_create(odph_odpthread_t *thread_tbl, + int cpu, + const odph_odpthread_params_t *thr_params) +{ + int ret; + cpu_set_t cpu_set; + + CPU_ZERO(&cpu_set); + CPU_SET(cpu, &cpu_set); + + pthread_attr_init(&thread_tbl->thread.attr); + + thread_tbl->cpu = cpu; + + pthread_attr_setaffinity_np(&thread_tbl->thread.attr, + sizeof(cpu_set_t), &cpu_set); + + thread_tbl->start_args.thr_params = *thr_params; /* copy */ + thread_tbl->start_args.linuxtype = ODPTHREAD_PTHREAD; + + ret = pthread_create(&thread_tbl->thread.thread_id, + &thread_tbl->thread.attr, + _odph_thread_run_start_routine, + &thread_tbl->start_args); + if (ret != 0) { + ODPH_ERR("Failed to start thread on cpu #%d\n", cpu); + thread_tbl->start_args.linuxtype = ODPTHREAD_NOT_STARTED; + return ret; + } + + return 0; +} diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 2bf6765..7d55ae6 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -7,12 +7,19 @@ TESTS_ENVIRONMENT += TEST_DIR=${builddir} EXECUTABLES = chksum$(EXEEXT) \ cuckootable$(EXEEXT) \ - table$(EXEEXT) \ - thread$(EXEEXT) \ parse$(EXEEXT)\ - process$(EXEEXT) \ + table$(EXEEXT) \ iplookuptable$(EXEEXT) +#These are platform specific extensions that are not portable +#They are a convenience to app writers who have chosen to +#restrict their application to Linux. + +if helper_extn +EXECUTABLES += @with_helper_platform@/thread$(EXEEXT) \ + @with_helper_platform@/process$(EXEEXT) +endif + COMPILE_ONLY = odpthreads TESTSCRIPTS = odpthreads_as_processes \ @@ -31,11 +38,7 @@ EXTRA_DIST = odpthreads_as_processes odpthreads_as_pthreads dist_chksum_SOURCES = chksum.c dist_cuckootable_SOURCES = cuckootable.c dist_odpthreads_SOURCES = odpthreads.c -odpthreads_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la -dist_thread_SOURCES = thread.c -thread_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la -dist_process_SOURCES = process.c +odpthreads_LDADD = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la dist_parse_SOURCES = parse.c -process_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la dist_table_SOURCES = table.c dist_iplookuptable_SOURCES = iplookuptable.c diff --git a/helper/test/linux-generic/Makefile.am b/helper/test/linux-generic/Makefile.am new file mode 100644 index 0000000..28d54a8 --- /dev/null +++ b/helper/test/linux-generic/Makefile.am @@ -0,0 +1,5 @@ + +thread_LDADD = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la +dist_thread_SOURCES = thread.c +dist_process_SOURCES = process.c +process_LDADD = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la diff --git a/helper/test/process.c b/helper/test/linux-generic/process.c similarity index 97% rename from helper/test/process.c rename to helper/test/linux-generic/process.c index f3c6d50..f641128 100644 --- a/helper/test/process.c +++ b/helper/test/linux-generic/process.c @@ -6,7 +6,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/platform/linux-generic/threads_extn.h> #define NUMBER_WORKERS 16 /* 0 = max */ diff --git a/helper/test/thread.c b/helper/test/linux-generic/thread.c similarity index 97% rename from helper/test/thread.c rename to helper/test/linux-generic/thread.c index da94b49..f1ca1b7 100644 --- a/helper/test/thread.c +++ b/helper/test/linux-generic/thread.c @@ -6,7 +6,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/threads.h> +#include <odp/helper/platform/linux-generic/threads_extn.h> #define NUMBER_WORKERS 16 static void *worker_fn(void *arg TEST_UNUSED) diff --git a/helper/threads.c b/helper/threads.c index 690b6ca..fe5d2bd 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -9,16 +9,10 @@ #endif #include <sched.h> #include <unistd.h> -#include <sys/types.h> #include <sys/wait.h> #include <sys/prctl.h> #include <sys/syscall.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <stdbool.h> - #include <odp_api.h> #include <odp/helper/threads.h> #include "odph_debug.h" @@ -27,225 +21,11 @@ static struct { int proc; /* true when process mode is required, false otherwise */ } helper_options; -static void *odp_run_start_routine(void *arg) -{ - odph_linux_thr_params_t *thr_params = arg; - - /* ODP thread local init */ - if (odp_init_local(thr_params->instance, thr_params->thr_type)) { - ODPH_ERR("Local init failed\n"); - return NULL; - } - - void *ret_ptr = thr_params->start(thr_params->arg); - int ret = odp_term_local(); - - if (ret < 0) - ODPH_ERR("Local term failed\n"); - - return ret_ptr; -} - -int odph_linux_pthread_create(odph_linux_pthread_t *pthread_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params) -{ - int i; - int num; - int cpu_count; - int cpu; - int ret; - - num = odp_cpumask_count(mask); - - memset(pthread_tbl, 0, num * sizeof(odph_linux_pthread_t)); - - cpu_count = odp_cpu_count(); - - if (num < 1 || num > cpu_count) { - ODPH_ERR("Invalid number of threads:%d (%d cores available)\n", - num, cpu_count); - return 0; - } - - cpu = odp_cpumask_first(mask); - for (i = 0; i < num; i++) { - cpu_set_t cpu_set; - - CPU_ZERO(&cpu_set); - CPU_SET(cpu, &cpu_set); - - pthread_attr_init(&pthread_tbl[i].attr); - - pthread_tbl[i].cpu = cpu; - - pthread_attr_setaffinity_np(&pthread_tbl[i].attr, - sizeof(cpu_set_t), &cpu_set); - - pthread_tbl[i].thr_params.start = thr_params->start; - pthread_tbl[i].thr_params.arg = thr_params->arg; - pthread_tbl[i].thr_params.thr_type = thr_params->thr_type; - pthread_tbl[i].thr_params.instance = thr_params->instance; - - ret = pthread_create(&pthread_tbl[i].thread, - &pthread_tbl[i].attr, - odp_run_start_routine, - &pthread_tbl[i].thr_params); - if (ret != 0) { - ODPH_ERR("Failed to start thread on cpu #%d\n", cpu); - break; - } - - cpu = odp_cpumask_next(mask, cpu); - } - - return i; -} - -void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num) -{ - int i; - int ret; - - for (i = 0; i < num; i++) { - /* Wait thread to exit */ - ret = pthread_join(thread_tbl[i].thread, NULL); - if (ret != 0) { - ODPH_ERR("Failed to join thread from cpu #%d\n", - thread_tbl[i].cpu); - } - pthread_attr_destroy(&thread_tbl[i].attr); - } -} - -int odph_linux_process_fork_n(odph_linux_process_t *proc_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params) -{ - pid_t pid; - int num; - int cpu_count; - int cpu; - int i; - - num = odp_cpumask_count(mask); - - memset(proc_tbl, 0, num * sizeof(odph_linux_process_t)); - - cpu_count = odp_cpu_count(); - - if (num < 1 || num > cpu_count) { - ODPH_ERR("Bad num\n"); - return -1; - } - - cpu = odp_cpumask_first(mask); - for (i = 0; i < num; i++) { - cpu_set_t cpu_set; - - CPU_ZERO(&cpu_set); - CPU_SET(cpu, &cpu_set); - - pid = fork(); - - if (pid < 0) { - ODPH_ERR("fork() failed\n"); - return -1; - } - - /* Parent continues to fork */ - if (pid > 0) { - proc_tbl[i].pid = pid; - proc_tbl[i].cpu = cpu; - - cpu = odp_cpumask_next(mask, cpu); - continue; - } - - /* Child process */ - - /* Request SIGTERM if parent dies */ - prctl(PR_SET_PDEATHSIG, SIGTERM); - /* Parent died already? */ - if (getppid() == 1) - kill(getpid(), SIGTERM); - - if (sched_setaffinity(0, sizeof(cpu_set_t), &cpu_set)) { - ODPH_ERR("sched_setaffinity() failed\n"); - return -2; - } - - if (odp_init_local(thr_params->instance, - thr_params->thr_type)) { - ODPH_ERR("Local init failed\n"); - return -2; - } - - return 0; - } - - return 1; -} - -int odph_linux_process_fork(odph_linux_process_t *proc, int cpu, - const odph_linux_thr_params_t *thr_params) -{ - odp_cpumask_t mask; - - odp_cpumask_zero(&mask); - odp_cpumask_set(&mask, cpu); - return odph_linux_process_fork_n(proc, &mask, thr_params); -} - -int odph_linux_process_wait_n(odph_linux_process_t *proc_tbl, int num) -{ - pid_t pid; - int i, j; - int status = 0; - - for (i = 0; i < num; i++) { - pid = wait(&status); - - if (pid < 0) { - ODPH_ERR("wait() failed\n"); - return -1; - } - - for (j = 0; j < num; j++) { - if (proc_tbl[j].pid == pid) { - proc_tbl[j].status = status; - break; - } - } - - if (j == num) { - ODPH_ERR("Bad pid:%d\n", (int)pid); - return -1; - } - - /* Examine the child process' termination status */ - if (WIFEXITED(status) && WEXITSTATUS(status) != EXIT_SUCCESS) { - ODPH_ERR("Child exit status:%d (pid:%d)\n", - WEXITSTATUS(status), (int)pid); - return -1; - } - if (WIFSIGNALED(status)) { - int signo = WTERMSIG(status); - - ODPH_ERR("Child term signo:%d - %s (pid:%d)\n", - signo, strsignal(signo), (int)pid); - return -1; - } - } - - return 0; -} - /* * wrapper for odpthreads, either implemented as linux threads or processes. * (in process mode, if start_routine returns NULL, the process return FAILURE). */ -static void *odpthread_run_start_routine(void *arg) +static void *_odph_thread_run_start_routine(void *arg) { int status; int ret; @@ -287,9 +67,9 @@ static void *odpthread_run_start_routine(void *arg) /* * Create a single ODPthread as a linux process */ -static int odph_linux_process_create(odph_odpthread_t *thread_tbl, - int cpu, - const odph_odpthread_params_t *thr_params) +static int _odph_linux_process_create(odph_odpthread_t *thread_tbl, + int cpu, + const odph_odpthread_params_t *thr_params) { cpu_set_t cpu_set; pid_t pid; @@ -327,7 +107,7 @@ static int odph_linux_process_create(odph_odpthread_t *thread_tbl, return -2; } - odpthread_run_start_routine(&thread_tbl->start_args); + _odph_thread_run_start_routine(&thread_tbl->start_args); return 0; /* never reached */ } @@ -357,7 +137,7 @@ static int odph_linux_thread_create(odph_odpthread_t *thread_tbl, ret = pthread_create(&thread_tbl->thread.thread_id, &thread_tbl->thread.attr, - odpthread_run_start_routine, + _odph_thread_run_start_routine, &thread_tbl->start_args); if (ret != 0) { ODPH_ERR("Failed to start thread on cpu #%d\n", cpu); @@ -401,9 +181,9 @@ int odph_odpthreads_create(odph_odpthread_t *thread_tbl, thr_params)) break; } else { - if (odph_linux_process_create(&thread_tbl[i], - cpu, - thr_params)) + if (_odph_linux_process_create(&thread_tbl[i], + cpu, + thr_params)) break; } diff --git a/pkgconfig/libodphelper-linux.pc.in b/pkgconfig/libodphelper-linux-generic.pc.in similarity index 72% rename from pkgconfig/libodphelper-linux.pc.in rename to pkgconfig/libodphelper-linux-generic.pc.in index 3987f4c..cab7be2 100644 --- a/pkgconfig/libodphelper-linux.pc.in +++ b/pkgconfig/libodphelper-linux-generic.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libodphelper-linux +Name: libodphelper-linux-generic Description: Helper for the ODP packet processing engine Version: @PKGCONFIG_VERSION@ -Libs: -L${libdir} -lodphelper-linux +Libs: -L${libdir} -lodphelper-linux-generic Libs.private: Cflags: -I${includedir} diff --git a/test/Makefile.inc b/test/Makefile.inc index 1ebc047..243a616 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -4,7 +4,7 @@ LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la +LDADD = $(PRE_LDADD) $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index ffba620..a0afd26 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -13,4 +13,4 @@ AM_LDFLAGS += -static LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index 36745fe..2a49076 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -6,7 +6,7 @@ AM_LDFLAGS += -static LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la +LIBODP = $(LIB)/libodphelper-@with_helper_platform@.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = \ commit 7025b1b430237cddc10a0338c7b120d23b7985a8 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Fri Jan 20 15:32:01 2017 -0500 helper: cleanup Linux rename to thread Remove the OS specific Linux filename and use the name of the generic apis it contains which is for odp_threads Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 1bd2414..c2f69d4 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -12,9 +12,9 @@ #include <example_debug.h> #include <odp_api.h> -#include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> +#include <odp/helper/threads.h> #include <strings.h> #include <errno.h> #include <stdio.h> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index ccd47f6..194c0a0 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -20,7 +20,7 @@ #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> #include <odp/helper/udp.h> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 7e34d06..d686160 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -24,7 +24,7 @@ #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> #include <odp/helper/icmp.h> diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index 0682d2d..2473a11 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -10,9 +10,9 @@ #include <signal.h> #include <odp_api.h> -#include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> +#include <odp/helper/threads.h> #define POOL_NUM_PKT 8192 #define POOL_SEG_LEN 1856 diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 441e812..4e35b64 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -14,11 +14,11 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> #include <odp/helper/udp.h> #include <odp/helper/tcp.h> +#include <odp/helper/threads.h> #include "odp_l3fwd_db.h" #include "odp_l3fwd_lpm.h" diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index d1135cb..6e24deb 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -13,9 +13,9 @@ #include <example_debug.h> #include <odp_api.h> -#include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> +#include <odp/helper/threads.h> /** @def MAX_WORKERS * @brief Maximum number of worker threads diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index f9c7176..2bbce10 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -11,9 +11,9 @@ #include <inttypes.h> #include <odp_api.h> -#include <odp/helper/linux.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> +#include <odp/helper/threads.h> /** Maximum number of worker threads */ #define MAX_WORKERS 32 diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index 380ec52..dd33949 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <inttypes.h> + #include <odp_api.h> #include <example_debug.h> -#include <odp/helper/linux.h> -#include <inttypes.h> +#include <odp/helper/threads.h> #define MAX_WORKERS 32 #define ITERATION_NUM 2048 diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index 035ab2e..b847e2b 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -14,7 +14,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> /* GNU lib C */ #include <getopt.h> diff --git a/helper/Makefile.am b/helper/Makefile.am index 9d0036d..62e55cc 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -14,7 +14,6 @@ AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ - $(srcdir)/include/odp/helper/linux.h \ $(srcdir)/include/odp/helper/chksum.h\ $(srcdir)/include/odp/helper/eth.h\ $(srcdir)/include/odp/helper/icmp.h\ @@ -23,6 +22,7 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/strong_types.h\ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/table.h\ + $(srcdir)/include/odp/helper/threads.h \ $(srcdir)/include/odp/helper/udp.h noinst_HEADERS = \ @@ -37,10 +37,10 @@ __LIB__libodphelper_linux_la_SOURCES = \ eth.c \ ip.c \ chksum.c \ - linux.c \ hashtable.c \ lineartable.c \ cuckootable.c \ - iplookuptable.c + iplookuptable.c \ + threads.c lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la diff --git a/helper/include/odp/helper/linux.h b/helper/include/odp/helper/threads.h similarity index 99% rename from helper/include/odp/helper/linux.h rename to helper/include/odp/helper/threads.h index 238bcf8..b8d975a 100644 --- a/helper/include/odp/helper/linux.h +++ b/helper/include/odp/helper/threads.h @@ -22,8 +22,6 @@ extern "C" { #endif -#include <odp_api.h> - #include <pthread.h> #include <getopt.h> #include <sys/types.h> diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 3d20eaa..216bccd 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -15,7 +15,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #define NUMBER_WORKERS 16 diff --git a/helper/test/process.c b/helper/test/process.c index 0e04224..f3c6d50 100644 --- a/helper/test/process.c +++ b/helper/test/process.c @@ -6,7 +6,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #define NUMBER_WORKERS 16 /* 0 = max */ diff --git a/helper/test/thread.c b/helper/test/thread.c index 8268d9f..da94b49 100644 --- a/helper/test/thread.c +++ b/helper/test/thread.c @@ -6,7 +6,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #define NUMBER_WORKERS 16 static void *worker_fn(void *arg TEST_UNUSED) diff --git a/helper/linux.c b/helper/threads.c similarity index 99% rename from helper/linux.c rename to helper/threads.c index 1f009cd..690b6ca 100644 --- a/helper/linux.c +++ b/helper/threads.c @@ -20,7 +20,7 @@ #include <stdbool.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include "odph_debug.h" static struct { diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c index 2337c92..6d18fa0 100644 --- a/test/common_plat/common/odp_cunit_common.c +++ b/test/common_plat/common/odp_cunit_common.c @@ -7,7 +7,7 @@ #include <string.h> #include <odp_api.h> #include <odp_cunit_common.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> /* Globals */ static odph_odpthread_t thread_tbl[MAX_WORKERS]; static odp_instance_t instance; diff --git a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp index be74c27..2b30786 100644 --- a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp +++ b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp @@ -1,6 +1,6 @@ #include <cstdio> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> int main(int argc ODP_UNUSED, const char *argv[] ODP_UNUSED) { diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index 9936288..bff20e5 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -17,7 +17,7 @@ #include <sys/resource.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #define app_err(fmt, ...) \ fprintf(stderr, "%s:%d:%s(): Error: " fmt, __FILE__, \ diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 82c3a25..fa59d5e 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -25,7 +25,7 @@ #include <test_debug.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c index 92d979d..ee3b8ab 100644 --- a/test/common_plat/performance/odp_pktio_perf.c +++ b/test/common_plat/performance/odp_pktio_perf.c @@ -25,7 +25,7 @@ #include <odp/helper/eth.h> #include <odp/helper/ip.h> #include <odp/helper/udp.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include <getopt.h> #include <stdlib.h> diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/common_plat/performance/odp_sched_latency.c index 063fb21..2066f91 100644 --- a/test/common_plat/performance/odp_sched_latency.c +++ b/test/common_plat/performance/odp_sched_latency.c @@ -20,7 +20,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> /* GNU lib C */ #include <getopt.h> diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c index e2a49d3..713dba1 100644 --- a/test/common_plat/performance/odp_scheduling.c +++ b/test/common_plat/performance/odp_scheduling.c @@ -20,7 +20,7 @@ #include <odp_api.h> /* ODP helper for Linux apps */ -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> /* Needs librt*/ #include <time.h> diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index 1945afa..304b1d5 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -15,7 +15,7 @@ #include <time.h> #include <odp.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include "odp_cunit_common.h" #include "test_debug.h" #include "timer.h" diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c index b91eb53..a12eb3c 100644 --- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c +++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c @@ -10,7 +10,7 @@ #include <signal.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index 8804994..d2a355d 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -17,7 +17,7 @@ #include <example_debug.h> #include <odp.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include <odp/helper/eth.h> #include <odp/helper/ip.h> #include <odp/helper/udp.h> diff --git a/test/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c index bc61c3e..19bd65b 100644 --- a/test/linux-generic/ring/ring_stress.c +++ b/test/linux-generic/ring/ring_stress.c @@ -18,7 +18,7 @@ #include <unistd.h> #include <odp_api.h> -#include <odp/helper/linux.h> +#include <odp/helper/threads.h> #include <odp_packet_io_ring_internal.h> #include <test_debug.h> #include <odp_cunit_common.h> commit 0f18e317ede15081828deca1ff61d65b72e12926 Author: Mike Holmes <mike.holmes(a)linaro.org> Date: Fri Jan 20 15:32:00 2017 -0500 configure: use helper configure.m4 Don't keep helper data in the main configure, split it to an m4 just like the other sub dirs Signed-off-by: Mike Holmes <mike.holmes(a)linaro.org> Reviewed-by: Christophe Milard <christophe.milard(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 67d60d2..1384130 100644 --- a/configure.ac +++ b/configure.ac @@ -294,8 +294,6 @@ AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS" AM_CXXFLAGS="-std=c++11" AC_CONFIG_FILES([Makefile - helper/Makefile - helper/test/Makefile pkgconfig/libodp-linux.pc pkgconfig/libodphelper-linux.pc ]) diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 480f79b..7b208fa 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -7,3 +7,6 @@ AC_ARG_ENABLE([test-helper], [if test "x$enableval" = "xyes"; then test_helper=yes fi]) + +AC_CONFIG_FILES([helper/Makefile + helper/test/Makefile]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 19 +- example/Makefile.inc | 2 +- example/classifier/odp_classifier.c | 2 +- example/generator/odp_generator.c | 2 +- example/ipsec/odp_ipsec.c | 2 +- example/l2fwd_simple/odp_l2fwd_simple.c | 2 +- example/l3fwd/odp_l3fwd.c | 2 +- example/packet/odp_pktio.c | 2 +- example/switch/odp_switch.c | 2 +- example/time/time_global_test.c | 5 +- example/timer/odp_timer_test.c | 2 +- helper/Makefile.am | 22 +- .../helper/platform/linux-generic/threads_extn.h | 112 ++++++++ helper/include/odp/helper/{linux.h => threads.h} | 78 ----- helper/m4/configure.m4 | 14 + helper/platform/linux-generic/thread.c | 313 +++++++++++++++++++++ helper/test/Makefile.am | 42 ++- helper/test/chksum.c | 18 +- helper/test/cuckootable.c | 4 +- helper/test/iplookuptable.c | 4 +- helper/test/linux-generic/Makefile.am | 5 + helper/test/{ => linux-generic}/process.c | 16 +- helper/test/{ => linux-generic}/thread.c | 16 +- helper/test/odpthreads.c | 20 +- helper/test/parse.c | 86 +++--- helper/test/table.c | 12 +- helper/{linux.c => threads.c} | 240 +--------------- ...inux.pc.in => libodphelper-linux-generic.pc.in} | 4 +- test/Makefile.inc | 2 +- test/common_plat/common/odp_cunit_common.c | 2 +- .../common_plat/miscellaneous/odp_api_from_cpp.cpp | 2 +- test/common_plat/performance/odp_crypto.c | 2 +- test/common_plat/performance/odp_l2fwd.c | 2 +- test/common_plat/performance/odp_pktio_perf.c | 2 +- test/common_plat/performance/odp_sched_latency.c | 2 +- test/common_plat/performance/odp_scheduling.c | 2 +- test/common_plat/validation/api/Makefile.inc | 2 +- test/common_plat/validation/api/timer/timer.c | 2 +- test/linux-generic/Makefile.inc | 2 +- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 2 +- test/linux-generic/pktio_ipc/ipc_common.h | 2 +- test/linux-generic/ring/ring_stress.c | 2 +- 42 files changed, 632 insertions(+), 444 deletions(-) create mode 100644 helper/include/odp/helper/platform/linux-generic/threads_extn.h rename helper/include/odp/helper/{linux.h => threads.h} (74%) create mode 100644 helper/platform/linux-generic/thread.c create mode 100644 helper/test/linux-generic/Makefile.am rename helper/test/{ => linux-generic}/process.c (84%) rename helper/test/{ => linux-generic}/thread.c (84%) rename helper/{linux.c => threads.c} (67%) rename pkgconfig/{libodphelper-linux.pc.in => libodphelper-linux-generic.pc.in} (72%) hooks/post-receive --

9 years

[COMMIT] branch api-next updated. v1.13.0.0-216-g49c8331

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 49c833125d8f9e072080579221532d0d4a978e6b (commit) via 3875d6ebf690e07b69f11621caefab1afc58e100 (commit) via b99095485be4ac14d16bef372b5c6521b396abaa (commit) via f53fda91d2919eee33b5a177ef818be1092c890b (commit) via 46e088c2f56d1463a598b4ac23308e19bf2b9031 (commit) via 0b1dc8a9a69252ce56d13521284683faff0e3e35 (commit) via 4132497ff67871d67c088c99b782cba10817bd28 (commit) via cd83d5d1114a40abf554c59bd92c8a8199b10c7a (commit) via 112209c3fc672aee4a3074aa784aefe00f32d250 (commit) via 1837825e219b6bd62a3ecda2ed68873a958b8171 (commit) via fda9a9e4887eff3f0526c7bcef5e29ff511cd4d8 (commit) via 4aaa74fceecee7b1538546d0b67347569c1239c6 (commit) via 4d0b7588251ed6a5de781f9220c3ace2831a68b2 (commit) via 41febe9fe6ac762174579e86874d65ec8a2c5485 (commit) via 6e09a7a90079b6789b83d9234306ac02a8f6d8da (commit) via 6388e398998426c4b18cde893131d54630879bdf (commit) via ca3b3950cc901d0e8db1f2bb9961c3bac9491c88 (commit) via dd3031076b80cf6d8b9df6024c44555c77b150fb (commit) via dfeba061509fb1451351ffb168a458e7d9ae4126 (commit) via f20066c7949466430186cce217589910fa75fd61 (commit) via 9fe4043f4cf402a4695e8c0e4887e87da60fcb33 (commit) via 4d9de3d54c49ec69d2366a01ad5b2b987943a5c5 (commit) via 970f7a4ae91932c49d1b9dc00bfa861f7f2a0197 (commit) via 8ae51b0364e25e45eddb4cf2e175b269c0736436 (commit) via 76543549b422a53dde44de5900071554f65aa212 (commit) via 2c060a9d3b9f067f4cca2094be845e54392077ec (commit) via b6e1fea7ef8a443579c8f197c96ca2acc7c0577d (commit) via fe182fb0a97c1989747ae96b401a10d34c878480 (commit) via 82c67c0b1755f4d4e0f5b1df2e6356150cca4166 (commit) via 80a30e1513a9614622e08657b94dca56db9e250f (commit) via 8ab727c5f3a5b5aa556a84e04870f1f3fe3a073b (commit) via 2b36166d647c64aa545e6ecc23a1d464fcd2c3c0 (commit) via d3a7028a5708506b63dc6a06846cd05c7552bbf4 (commit) via 4208ef3e2ce9f6093ae540af7de20759849782b6 (commit) via dba0f42c9e24d090b29df165f610fc0df051b018 (commit) via 46b88467e667e26fed282b234c481a14fcecff62 (commit) via f195caa92ef8457c2c670fd3449ea6521e7ad823 (commit) via 7f97683b1afc4826825f0db0fcac40858892494a (commit) via 52592157f25c9e2e3876dc3624cf91b1b71127ad (commit) via 4a320c0af291c07f33b1a295f72704215169d562 (commit) via f5cde8870a425d51d08df7a1b4b3fb1cf06406f0 (commit) via c3830c3936b76faa423563bbd104e732120f9523 (commit) via cc52f0675d1674a80cf1806dc8c1c4e3887afdd1 (commit) via 4b698023210b7f742c053707ba131097b570276d (commit) via 2eb3e87bc56b2a02cb10637e5ce3a7d1157472cf (commit) via ba203281cfd10b88a5d5b8f143ea34d14d373b58 (commit) via 527ee67cb434e5e7c8015fa8c7d15f2ac25b1d20 (commit) via 101e8188088b91e8d85e0fef0d6674dae05c306e (commit) via 343579dda50fcefd5498cfe146a438b8fdb3c065 (commit) via b4e0a8b91a422cbf28e0406a5076025894103984 (commit) via a611a514682dea61ca142b51a28194a39a286fa7 (commit) via d345d75c975bd98f61bc2e04907b3e232d88083c (commit) via 7e40217271ae17ce19abd873140439c51a525fb1 (commit) via fbc400dc8c35c220cbb41531d12c933f7c4226d1 (commit) via 6cef872afcac78016d095d426fa9f3d9055c3856 (commit) via ffb22c37e4a483cc647c8ba8f4a9329fa83639aa (commit) via 3fd85fb6f45d859e6f19eeadda69992858f06f22 (commit) via e91877df47118468e940a58047d94fe4195e4b1e (commit) via 4194d93ab8095ef850e332a1433d8d810b7418a1 (commit) via f723bcef66945acb0738acc8a40b8ebd5851b84d (commit) via fa4063b4104784bdc1c20fe3b519716e4413c245 (commit) via 9c4d778148d514adf8586939123acdcdc022e8e5 (commit) via b06ee329f944aeb7f3d03646aac384f88a00a7a5 (commit) via a2676059469f61f1ffd58090b74f4dd975d172ac (commit) via 39acf771084aa4f16b60a6bdf9e5f3bed4f88cd9 (commit) via 0d6d0923b2dd4d3097ea992af76408fd4281d84e (commit) via 2997a78f270cdb34c82f805f8103f660ed1bcdf2 (commit) via bacd73a34768ce859f8136f29bda70bbccbdb45e (commit) via 63ef9b3714c9410dd1b5a55e3bd50de49f23dfcb (commit) via 4ee154864b47712a45cfdb23ea6c22b46bfb1abf (commit) via 552e46339939933ee7ed305f1dda82ead362ece9 (commit) via 1d61093f4ea7a9f62cc69e6fdb6fb82b246af817 (commit) via 6d78d33df6d33ebe1b933383c4858df5e9f7f33b (commit) via 4cf84d158adc7e84bed69ceac34bbbb3dee9587e (commit) via 67abee1a4548878ccc93b57fbd84c3fe68147bf6 (commit) via afb2ecf5e45e10b0e1258c85fc1b80f8ce447646 (commit) via fe9c6cc8e5e88e068ee9f1f4dc29b7f32411f4d7 (commit) via 6b5b78245c2ebbc0c907dba9809e9002c7214959 (commit) via ba23aa731a85709a84ea0137a918b07cf4811fc2 (commit) via 4b7e6b82f14ef2d09b91b1c197e84dbfe0e8a09b (commit) via 683a975963d150e5dae12649cbd1abc003ee2c39 (commit) via dcffa7faecf3bf4a66e6f5ce745bcde3a4f0b7ed (commit) via c247659448bfd45c1bb648d7508f7db0b225b7b8 (commit) via 95918aa496a22794af654c582830e2a2d8b914a7 (commit) via 7bcd45812c020a9e67cf4d848e5bbef1384f58af (commit) via 9e95d6a1a9025bfafb846b4d805b1dc146657a10 (commit) via bd4a9492d862e0636fba99bd76aaa19952de2f44 (commit) via d858987a1dfea90625389ab5a8e14379a23dbb52 (commit) via 01ea9db19e2eb2f978d4fd22b1e341a741bb1e9c (commit) via 0a0e4a684f8e5420295eda3df4fece6361b4d797 (commit) via c6dc829d0c6a54a08756e13e2f3388f0bda61245 (commit) via a296693d3dbbe98a5616406d6535dee85cbd31ba (commit) via ec7a8e0fabe2269cf824ab809ad52a8763739be1 (commit) via 02c46a3a671bca6de5159a59be45663bca516753 (commit) via 123327606c2dd95a6a85c80e74ad172932195631 (commit) via 936ce9f30a85285f70e26038eb5ea8637622fea2 (commit) via ac2d233f2bcfb8d70fa005ae8fa19cce41b4a238 (commit) via 97f2672e48ea08abd00ed7f3b1fd8420a217779c (commit) via d9615289bf6f60bd3a04f8138d5b487efda96a49 (commit) via b9877d54ec4c2259dec17751f6580f110fd447a5 (commit) via ac563d15b95d884764ffa2f48eedce6f5b408fca (commit) via 279ecc54b69ad1621fbba837bee31adcc9fd704a (commit) via ad7f8f4ea11a8e40d853cd9b2b0bc3e6f7876a8b (commit) via 50cfbff244a1fa29314520eb9ca9bdf5df445df6 (commit) via 234dd2f623d73b069e43282baf96b48473d0ef1c (commit) via b93fd7af775a04c50a064a241d82ba3b7bf999f7 (commit) via 1e1312c15e96be77eccc0fb8e3aa35d4c7da72f6 (commit) via eda2ce7c6d9998155edde42617501cbaea5e03f5 (commit) via 9b648c4cd201ff8fbcbaf12512482b0a8f952d8f (commit) via f62c9aa3f3f48080a61a1e71cd649f1d65539ff5 (commit) via 244916315fdcb665f66b4f235782feee26a53c89 (commit) via e5d2edccc685fcde88793f5514d1fdb2654ecfa4 (commit) via 52553fa3972109a47e948321236dcabf29503f61 (commit) via 4b751b4dd7e2f000d2ed0268d51878c5ff982c2b (commit) via 21dad81b51443c49dc51ede63516f4a434e217cc (commit) via 474dac39b8d4ad7f2ac3768887e36610188c16c2 (commit) via b8c6689e4c81277067a2dd5f30598e0ddc7dc2c5 (commit) via ff56734fa58db5043a6bb358611cdc2a1c5de4a3 (commit) via fd86c7fd19820e21c182e2c0e043331e6aab6282 (commit) via 4a58145d0ca4e62ff41b052ed800acee7d0a97e1 (commit) via b2d4275c2df6a7fcd9796fafed74b59292cee26e (commit) from 1588c49a0bf0332512d5e08e1feaad5e4005df31 (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 49c833125d8f9e072080579221532d0d4a978e6b Merge: 1588c49 3875d6e Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Sun Jan 22 13:18:30 2017 +0300 Merge branch 'master' into api-next diff --cc platform/linux-generic/Makefile.am index 74e606d,0bc9842..8a09332 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -11,14 -11,13 +11,19 @@@ AM_CFLAGS += -Iinclud include_HEADERS = \ $(top_srcdir)/include/odp.h \ - $(top_srcdir)/include/odp_api.h + $(top_srcdir)/include/odp_api.h \ + $(top_srcdir)/include/odp_drv.h + +odpincludedir= $(includedir)/odp +odpinclude_HEADERS = \ + $(srcdir)/include/odp/visibility_begin.h \ + $(srcdir)/include/odp/visibility_end.h + odpincludedir= $(includedir)/odp + odpinclude_HEADERS = \ + $(srcdir)/include/odp/visibility_begin.h \ + $(srcdir)/include/odp/visibility_end.h + odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/align.h \ diff --cc platform/linux-generic/include/odp_config_internal.h index dadd59e,e7d84c9..37cf34b --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@@ -92,11 -92,11 +92,7 @@@ extern "C" CONFIG_PACKET_TAILROOM) /* -- * Minimum packet segment length -- * -- * This defines the minimum packet segment buffer length in bytes. The user -- * defined segment length (seg_len in odp_pool_param_t) will be rounded up into -- * this value. ++ * Maximum packet segment size including head- and tailrooms */ #define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN diff --cc platform/linux-generic/odp_packet.c index 170965a,f632a51..0867dee --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@@ -556,6 -507,6 +556,18 @@@ int packet_alloc_multi(odp_pool_t pool_ return num; } ++int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, ++ odp_packet_t pkt[], int max_num) ++{ ++ pool_t *pool = pool_entry_from_hdl(pool_hdl); ++ int num, num_seg; ++ ++ num_seg = num_segments(len); ++ num = packet_alloc(pool, len, max_num, num_seg, pkt, 1); ++ ++ return num; ++} ++ odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len) { pool_t *pool = pool_entry_from_hdl(pool_hdl); diff --cc platform/linux-generic/odp_schedule.c index 704dbd8,645630a..1e7a57a --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@@ -536,6 -536,6 +536,27 @@@ static inline void wait_for_order(queue break; odp_cpu_pause(); } ++ ++ sched_local.ordered.lock_called.all = 0; ++ sched_local.ordered.src_queue = NULL; ++ sched_local.ordered.in_order = 0; ++ ++ ordered_stash_release(); ++ ++ /* Next thread can continue processing */ ++ odp_atomic_add_rel_u64(&queue->s.ordered.ctx, 1); ++} ++ ++static void schedule_release_ordered(void) ++{ ++ queue_entry_t *queue; ++ ++ queue = sched_local.ordered.src_queue; ++ ++ if (odp_unlikely(!queue || sched_local.num)) ++ return; ++ ++ release_ordered(); } /** diff --cc test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index 43ddb2f,de9d6e4..8068938 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@@ -97,63 -63,70 +97,116 @@@ static void alg_test(odp_crypto_op_t op int num, i; int found; - rc = odp_crypto_capability(&capability); + rc = odp_crypto_capability(&capa); CU_ASSERT(!rc); - if (capability.hw_ciphers.all_bits) { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.hw_ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.hw_ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.hw_ciphers.bit.aes_gcm)) - rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && + !(capa.ciphers.bit.trides_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && + !(capa.ciphers.bit.aes_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && + !(capa.ciphers.bit.aes_gcm)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_DES && + !(capa.ciphers.bit.des)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_NULL && + !(capa.ciphers.bit.null)) + rc = -1; + + CU_ASSERT(!rc); + CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); + + if (auth_alg == ODP_AUTH_ALG_AES_GCM && + !(capa.auths.bit.aes_gcm)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && + !(capa.auths.bit.md5_hmac)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_NULL && + !(capa.auths.bit.null)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && + !(capa.auths.bit.sha256_hmac)) + rc = -1; + + CU_ASSERT(!rc); + CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); + + num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, + MAX_ALG_CAPA); + + if (cipher_alg != ODP_CIPHER_ALG_NULL) { + CU_ASSERT(num > 0); + found = 0; } else { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.ciphers.bit.aes_gcm)) - rc = -1; + CU_ASSERT(num == 0); + found = 1; } - CU_ASSERT(!rc); + CU_ASSERT(num <= MAX_ALG_CAPA); + + if (num > MAX_ALG_CAPA) + num = MAX_ALG_CAPA; + + /* Search for the test case */ + for (i = 0; i < num; i++) { + if (cipher_capa[i].key_len == cipher_key.length && ++ cipher_capa[i].iv_len == ses_iv.length) { ++ found = 1; ++ break; ++ } ++ } + - if (capability.hw_auths.all_bits) { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.hw_auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.hw_auths.bit.null)) - rc = -1; ++ CU_ASSERT(found); ++ ++ num = odp_crypto_auth_capability(auth_alg, auth_capa, MAX_ALG_CAPA); ++ ++ if (auth_alg != ODP_AUTH_ALG_NULL) { ++ CU_ASSERT(num > 0); ++ found = 0; + } else { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.auths.bit.null)) - rc = -1; ++ CU_ASSERT(num == 0); ++ found = 1; + } + - CU_ASSERT(!rc); ++ CU_ASSERT(num <= MAX_ALG_CAPA); ++ ++ if (num > MAX_ALG_CAPA) ++ num = MAX_ALG_CAPA; ++ ++ /* Search for the test case */ ++ for (i = 0; i < num; i++) { ++ if (auth_capa[i].digest_len == digest_len && ++ auth_capa[i].key_len == auth_key.length) { ++ found = 1; ++ break; ++ } ++ } ++ ++ CU_ASSERT(found); + + num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, + MAX_ALG_CAPA); + + if (cipher_alg != ODP_CIPHER_ALG_NULL) { + CU_ASSERT(num > 0); + found = 0; + } else { + CU_ASSERT(num == 0); + found = 1; + } + + CU_ASSERT(num <= MAX_ALG_CAPA); + + if (num > MAX_ALG_CAPA) + num = MAX_ALG_CAPA; + + /* Search for the test case */ + for (i = 0; i < num; i++) { + if (cipher_capa[i].key_len == cipher_key.length && cipher_capa[i].iv_len == ses_iv.length) { found = 1; break; diff --cc test/common_plat/validation/api/packet/packet.c index 41a4c87,fa5206f..8eb34b8 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@@ -1435,485 -1434,394 +1435,962 @@@ void packet_test_concat_extend_trunc(vo param.pkt.num = 100; pool = odp_pool_create("packet_pool_concat", &param); + CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + + pkt = odp_packet_alloc(pool, alloc_len); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + cur_len = odp_packet_len(pkt); + + for (i = 0; i < 2; i++) { + pkt2 = odp_packet_alloc(pool, alloc_len); + CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); + + ret = odp_packet_concat(&pkt, pkt2); + CU_ASSERT(ret >= 0); + + if (ret < 0) + odp_packet_free(pkt2); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); + cur_len = odp_packet_len(pkt); + CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); + } + + ret = odp_packet_extend_tail(&pkt, ext_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); + cur_len = odp_packet_len(pkt); + CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); + + ret = odp_packet_extend_head(&pkt, ext_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); + cur_len = odp_packet_len(pkt); + CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); + + pkt2 = odp_packet_alloc(pool, alloc_len); + CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); + + ret = odp_packet_concat(&pkt, pkt2); + CU_ASSERT(ret >= 0); + + if (ret < 0) + odp_packet_free(pkt2); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); + cur_len = odp_packet_len(pkt); + CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); + + ret = odp_packet_trunc_head(&pkt, trunc_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); + cur_len = odp_packet_len(pkt); + CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); + + ret = odp_packet_trunc_tail(&pkt, trunc_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); + cur_len = odp_packet_len(pkt); + CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); + + odp_packet_free(pkt); + + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +void packet_test_extend_small(void) +{ + odp_pool_capability_t capa; + odp_pool_t pool; + odp_pool_param_t param; + odp_packet_t pkt; + int ret, round; + uint8_t *data; + uint32_t i, seg_len; + int tail = 1; + uint32_t len = 32000; + uint8_t buf[len]; + + CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); + + if (capa.pkt.max_len && capa.pkt.max_len < len) + len = capa.pkt.max_len; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.len = len; + param.pkt.num = 100; + + pool = odp_pool_create("packet_pool_extend", &param); + CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + + for (round = 0; round < 2; round++) { + pkt = odp_packet_alloc(pool, 1); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + data = odp_packet_data(pkt); + *data = 0; + + for (i = 0; i < len - 1; i++) { + if (tail) { + ret = odp_packet_extend_tail(&pkt, 1, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } else { + ret = odp_packet_extend_head(&pkt, 1, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } + + if (ret < 0) + break; + + if (tail) { + /* assert needs brackets */ + CU_ASSERT(seg_len == 1); + } else { + CU_ASSERT(seg_len > 0); + } + + *data = i + 1; + } + + CU_ASSERT(odp_packet_len(pkt) == len); + CU_ASSERT(odp_packet_unshared_len(pkt) == len); + + len = odp_packet_len(pkt); + + memset(buf, 0, len); + CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); + + for (i = 0; i < len; i++) { + int match; + + if (tail) { + match = (buf[i] == (i % 256)); + CU_ASSERT(match); + } else { + match = (buf[len - 1 - i] == (i % 256)); + CU_ASSERT(match); + } + + /* Limit the number of failed asserts to + one per packet */ + if (!match) + break; + } + + odp_packet_free(pkt); + + tail = 0; + } + + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +void packet_test_extend_large(void) +{ + odp_pool_capability_t capa; + odp_pool_t pool; + odp_pool_param_t param; + odp_packet_t pkt; + int ret, round; + uint8_t *data; + uint32_t i, seg_len, ext_len, cur_len, cur_data; + int tail = 1; + int num_div = 16; + int div = 1; + uint32_t len = 32000; + uint8_t buf[len]; + + CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); + + if (capa.pkt.max_len && capa.pkt.max_len < len) + len = capa.pkt.max_len; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.len = len; + param.pkt.num = 100; + + pool = odp_pool_create("packet_pool_extend", &param); + CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + + for (round = 0; round < 2 * num_div; round++) { + ext_len = len / div; + cur_len = ext_len; + + pkt = odp_packet_alloc(pool, ext_len); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + cur_data = 0; + + if (tail) { + ret = fill_data_forward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } else { + ret = fill_data_backward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } + + while (cur_len < len) { + if ((len - cur_len) < ext_len) + ext_len = len - cur_len; + + if (tail) { + ret = odp_packet_extend_tail(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } else { + ret = odp_packet_extend_head(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } + + if (ret < 0) + break; + + if (tail) { + /* assert needs brackets */ + CU_ASSERT((seg_len > 0) && + (seg_len <= ext_len)); + ret = fill_data_forward(pkt, cur_len, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } else { + CU_ASSERT(seg_len > 0); + CU_ASSERT(data == odp_packet_data(pkt)); + ret = fill_data_backward(pkt, 0, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } + + cur_len += ext_len; + } + + CU_ASSERT(odp_packet_len(pkt) == len); + + len = odp_packet_len(pkt); + + memset(buf, 0, len); + CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); + + for (i = 0; i < len; i++) { + int match; + + if (tail) { + match = (buf[i] == (i % 256)); + CU_ASSERT(match); + } else { + match = (buf[len - 1 - i] == (i % 256)); + CU_ASSERT(match); + } + + /* Limit the number of failed asserts to + one per packet */ + if (!match) + break; + } + + odp_packet_free(pkt); + + div++; + if (div > num_div) { + /* test extend head */ + div = 1; + tail = 0; + } + } + + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +void packet_test_extend_mix(void) +{ + odp_pool_capability_t capa; + odp_pool_t pool; + odp_pool_param_t param; + odp_packet_t pkt; + int ret, round; + uint8_t *data; + uint32_t i, seg_len, ext_len, cur_len, cur_data; + int small_count; + int tail = 1; + uint32_t len = 32000; + uint8_t buf[len]; + + CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); + + if (capa.pkt.max_len && capa.pkt.max_len < len) + len = capa.pkt.max_len; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.len = len; + param.pkt.num = 100; + + pool = odp_pool_create("packet_pool_extend", &param); + CU_ASSERT_FATAL(packet_pool != ODP_POOL_INVALID); + + for (round = 0; round < 2; round++) { + small_count = 30; + ext_len = len / 10; + cur_len = ext_len; + + pkt = odp_packet_alloc(pool, ext_len); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + cur_data = 0; + + if (tail) { + ret = fill_data_forward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } else { + ret = fill_data_backward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } + + while (cur_len < len) { + if (small_count) { + small_count--; + ext_len = len / 100; + } else { + ext_len = len / 4; + } + + if ((len - cur_len) < ext_len) + ext_len = len - cur_len; + + if (tail) { + ret = odp_packet_extend_tail(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + CU_ASSERT((seg_len > 0) && + (seg_len <= ext_len)); + ret = fill_data_forward(pkt, cur_len, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } else { + ret = odp_packet_extend_head(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + CU_ASSERT(seg_len > 0); + CU_ASSERT(data == odp_packet_data(pkt)); + ret = fill_data_backward(pkt, 0, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } + + cur_len += ext_len; + } + + CU_ASSERT(odp_packet_len(pkt) == len); + + len = odp_packet_len(pkt); + + memset(buf, 0, len); + CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); + + for (i = 0; i < len; i++) { + int match; + + if (tail) { + match = (buf[i] == (i % 256)); + CU_ASSERT(match); + } else { + match = (buf[len - 1 - i] == (i % 256)); + CU_ASSERT(match); + } + + /* Limit the number of failed asserts to + one per packet */ + if (!match) + break; + } + + odp_packet_free(pkt); + + tail = 0; + } + + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +void packet_test_extend_ref(void) +{ + odp_packet_t max_pkt, ref; + uint32_t hr, tr, max_len; + + max_pkt = odp_packet_copy(segmented_test_packet, + odp_packet_pool(segmented_test_packet)); + CU_ASSERT_FATAL(max_pkt != ODP_PACKET_INVALID); + max_len = odp_packet_len(max_pkt); + + /* Maximize the max pkt */ + hr = odp_packet_headroom(max_pkt); + tr = odp_packet_tailroom(max_pkt); + odp_packet_push_head(max_pkt, hr); + odp_packet_push_tail(max_pkt, tr); + + /* Max packet should not be extendable at either end */ + CU_ASSERT(odp_packet_extend_tail(&max_pkt, 1, NULL, NULL) < 0); + CU_ASSERT(odp_packet_extend_head(&max_pkt, 1, NULL, NULL) < 0); + + /* See if we can trunc and extend anyway */ + CU_ASSERT(odp_packet_trunc_tail(&max_pkt, hr + tr + 1, + NULL, NULL) >= 0); + CU_ASSERT(odp_packet_extend_head(&max_pkt, 1, NULL, NULL) >= 0); + CU_ASSERT(odp_packet_len(max_pkt) == max_len); + CU_ASSERT(odp_packet_unshared_len(max_pkt) == max_len); + + /* Now try with a reference in place */ + CU_ASSERT(odp_packet_trunc_tail(&max_pkt, 100, NULL, NULL) >= 0); + ref = odp_packet_ref(max_pkt, 100); + + /* Verify ref lengths */ + CU_ASSERT(ref != ODP_PACKET_INVALID); + CU_ASSERT(odp_packet_len(ref) == max_len - 200); + CU_ASSERT(odp_packet_unshared_len(ref) == 0); + + /* And ref's affect on max_pkt */ + CU_ASSERT(odp_packet_has_ref(max_pkt) == 1); + CU_ASSERT(odp_packet_unshared_len(max_pkt) == 100); + + /* Now extend max_pkt and verify effect */ + CU_ASSERT(odp_packet_extend_head(&max_pkt, 10, NULL, NULL) >= 0); + CU_ASSERT(odp_packet_len(max_pkt) == max_len - 90); + CU_ASSERT(odp_packet_unshared_len(max_pkt) == 110); + CU_ASSERT(odp_packet_has_ref(max_pkt) == 1); + + /* Extend on max_pkt should not affect ref */ + CU_ASSERT(odp_packet_has_ref(ref) == 1); + CU_ASSERT(odp_packet_len(ref) == max_len - 200); + CU_ASSERT(odp_packet_unshared_len(ref) == 0); + + /* Now extend ref and verify effect*/ + CU_ASSERT(odp_packet_extend_head(&ref, 20, NULL, NULL) >= 0); + CU_ASSERT(odp_packet_len(ref) == max_len - 180); + CU_ASSERT(odp_packet_unshared_len(ref) == 20); + + /* Extend on ref should not affect max_pkt */ + CU_ASSERT(odp_packet_len(max_pkt) == max_len - 90); + CU_ASSERT(odp_packet_unshared_len(max_pkt) == 110); + CU_ASSERT(odp_packet_has_ref(max_pkt) == 1); + + /* Trunc max_pkt of all unshared len */ + CU_ASSERT(odp_packet_trunc_head(&max_pkt, + odp_packet_unshared_len(max_pkt), + NULL, NULL) >= 0); + + /* Verify effect on max_pkt */ + CU_ASSERT(odp_packet_len(max_pkt) == max_len - 200); + CU_ASSERT(odp_packet_unshared_len(max_pkt) == 0); + CU_ASSERT(odp_packet_has_ref(max_pkt) == 1); + + /* Verify that ref is unchanged */ + CU_ASSERT(odp_packet_len(ref) == max_len - 180); + CU_ASSERT(odp_packet_unshared_len(ref) == 20); + + /* Free ref and verify that max_pkt is back to being unreferenced */ + odp_packet_free(ref); + CU_ASSERT(odp_packet_has_ref(max_pkt) == 0); + CU_ASSERT(odp_packet_len(max_pkt) == max_len - 200); + CU_ASSERT(odp_packet_unshared_len(max_pkt) == max_len - 200); + + odp_packet_free(max_pkt); +} + ++void packet_test_concat_small(void) ++{ ++ odp_pool_capability_t capa; ++ odp_pool_t pool; ++ odp_pool_param_t param; ++ odp_packet_t pkt, pkt2; ++ int ret; ++ uint8_t *data; ++ uint32_t i; ++ uint32_t len = 32000; ++ uint8_t buf[len]; ++ ++ CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); ++ ++ if (capa.pkt.max_len && capa.pkt.max_len < len) ++ len = capa.pkt.max_len; ++ ++ odp_pool_param_init(&param); ++ ++ param.type = ODP_POOL_PACKET; ++ param.pkt.len = len; ++ param.pkt.num = 100; ++ ++ pool = odp_pool_create("packet_pool_concat", &param); ++ CU_ASSERT(packet_pool != ODP_POOL_INVALID); ++ ++ pkt = odp_packet_alloc(pool, 1); ++ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); ++ ++ data = odp_packet_data(pkt); ++ *data = 0; ++ ++ for (i = 0; i < len - 1; i++) { ++ pkt2 = odp_packet_alloc(pool, 1); ++ CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); ++ ++ data = odp_packet_data(pkt2); ++ *data = i + 1; ++ ++ ret = odp_packet_concat(&pkt, pkt2); ++ CU_ASSERT(ret >= 0); ++ ++ if (ret < 0) { ++ odp_packet_free(pkt2); ++ break; ++ } ++ } ++ ++ CU_ASSERT(odp_packet_len(pkt) == len); ++ ++ len = odp_packet_len(pkt); ++ ++ memset(buf, 0, len); ++ CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); ++ ++ for (i = 0; i < len; i++) ++ CU_ASSERT(buf[i] == (i % 256)); ++ ++ odp_packet_free(pkt); ++ ++ CU_ASSERT(odp_pool_destroy(pool) == 0); ++} ++ ++void packet_test_concat_extend_trunc(void) ++{ ++ odp_pool_capability_t capa; ++ odp_pool_t pool; ++ odp_pool_param_t param; ++ odp_packet_t pkt, pkt2; ++ int i, ret; ++ uint32_t alloc_len, ext_len, trunc_len, cur_len; ++ uint32_t len = 1900; ++ ++ CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); ++ ++ if (capa.pkt.max_len && capa.pkt.max_len < len) ++ len = capa.pkt.max_len; ++ ++ alloc_len = len / 8; ++ ext_len = len / 4; ++ trunc_len = len / 3; ++ ++ odp_pool_param_init(&param); ++ ++ param.type = ODP_POOL_PACKET; ++ param.pkt.len = len; ++ param.pkt.num = 100; ++ ++ pool = odp_pool_create("packet_pool_concat", &param); + CU_ASSERT(packet_pool != ODP_POOL_INVALID); + + pkt = odp_packet_alloc(pool, alloc_len); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + cur_len = odp_packet_len(pkt); + + for (i = 0; i < 2; i++) { + pkt2 = odp_packet_alloc(pool, alloc_len); + CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); + + ret = odp_packet_concat(&pkt, pkt2); + CU_ASSERT(ret >= 0); + + if (ret < 0) + odp_packet_free(pkt2); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); + cur_len = odp_packet_len(pkt); + } + + ret = odp_packet_extend_tail(&pkt, ext_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); + cur_len = odp_packet_len(pkt); + + ret = odp_packet_extend_head(&pkt, ext_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); + cur_len = odp_packet_len(pkt); + + pkt2 = odp_packet_alloc(pool, alloc_len); + CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); + + ret = odp_packet_concat(&pkt, pkt2); + CU_ASSERT(ret >= 0); + + if (ret < 0) + odp_packet_free(pkt2); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); + cur_len = odp_packet_len(pkt); + + ret = odp_packet_trunc_head(&pkt, trunc_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); + cur_len = odp_packet_len(pkt); + + ret = odp_packet_trunc_tail(&pkt, trunc_len, NULL, NULL); + CU_ASSERT(ret >= 0); + + CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); + cur_len = odp_packet_len(pkt); + + odp_packet_free(pkt); + + CU_ASSERT(odp_pool_destroy(pool) == 0); + } + + void packet_test_extend_small(void) + { + odp_pool_capability_t capa; + odp_pool_t pool; + odp_pool_param_t param; + odp_packet_t pkt; + int ret, round; + uint8_t *data; + uint32_t i, seg_len; + int tail = 1; + uint32_t len = 32000; + uint8_t buf[len]; + + CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); + + if (capa.pkt.max_len && capa.pkt.max_len < len) + len = capa.pkt.max_len; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.len = len; + param.pkt.num = 100; + + pool = odp_pool_create("packet_pool_extend", &param); + CU_ASSERT(packet_pool != ODP_POOL_INVALID); + + for (round = 0; round < 2; round++) { + pkt = odp_packet_alloc(pool, 1); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + data = odp_packet_data(pkt); + *data = 0; + + for (i = 0; i < len - 1; i++) { + if (tail) { + ret = odp_packet_extend_tail(&pkt, 1, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } else { + ret = odp_packet_extend_head(&pkt, 1, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } + + if (ret < 0) + break; + + if (tail) { + /* assert needs brackets */ + CU_ASSERT(seg_len == 1); + } else { + CU_ASSERT(seg_len > 0); + } + + *data = i + 1; + } + + CU_ASSERT(odp_packet_len(pkt) == len); + + len = odp_packet_len(pkt); + + memset(buf, 0, len); + CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); + + for (i = 0; i < len; i++) { + int match; + + if (tail) { + match = (buf[i] == (i % 256)); + CU_ASSERT(match); + } else { + match = (buf[len - 1 - i] == (i % 256)); + CU_ASSERT(match); + } + + /* Limit the number of failed asserts to + one per packet */ + if (!match) + break; + } + + odp_packet_free(pkt); + + tail = 0; + } + + CU_ASSERT(odp_pool_destroy(pool) == 0); + } + + void packet_test_extend_large(void) + { + odp_pool_capability_t capa; + odp_pool_t pool; + odp_pool_param_t param; + odp_packet_t pkt; + int ret, round; + uint8_t *data; + uint32_t i, seg_len, ext_len, cur_len, cur_data; + int tail = 1; + int num_div = 16; + int div = 1; + uint32_t len = 32000; + uint8_t buf[len]; + + CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); + + if (capa.pkt.max_len && capa.pkt.max_len < len) + len = capa.pkt.max_len; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.len = len; + param.pkt.num = 100; + + pool = odp_pool_create("packet_pool_extend", &param); + CU_ASSERT(packet_pool != ODP_POOL_INVALID); + + for (round = 0; round < 2 * num_div; round++) { + ext_len = len / div; + cur_len = ext_len; + + pkt = odp_packet_alloc(pool, ext_len); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + cur_data = 0; + + if (tail) { + ret = fill_data_forward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } else { + ret = fill_data_backward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } + + while (cur_len < len) { + if ((len - cur_len) < ext_len) + ext_len = len - cur_len; + + if (tail) { + ret = odp_packet_extend_tail(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } else { + ret = odp_packet_extend_head(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + } + + if (ret < 0) + break; + + if (tail) { + /* assert needs brackets */ + CU_ASSERT((seg_len > 0) && + (seg_len <= ext_len)); + ret = fill_data_forward(pkt, cur_len, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } else { + CU_ASSERT(seg_len > 0); + CU_ASSERT(data == odp_packet_data(pkt)); + ret = fill_data_backward(pkt, 0, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } + + cur_len += ext_len; + } + + CU_ASSERT(odp_packet_len(pkt) == len); + + len = odp_packet_len(pkt); + + memset(buf, 0, len); + CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); + + for (i = 0; i < len; i++) { + int match; + + if (tail) { + match = (buf[i] == (i % 256)); + CU_ASSERT(match); + } else { + match = (buf[len - 1 - i] == (i % 256)); + CU_ASSERT(match); + } + + /* Limit the number of failed asserts to + one per packet */ + if (!match) + break; + } + + odp_packet_free(pkt); + + div++; + if (div > num_div) { + /* test extend head */ + div = 1; + tail = 0; + } + } + + CU_ASSERT(odp_pool_destroy(pool) == 0); + } + + void packet_test_extend_mix(void) + { + odp_pool_capability_t capa; + odp_pool_t pool; + odp_pool_param_t param; + odp_packet_t pkt; + int ret, round; + uint8_t *data; + uint32_t i, seg_len, ext_len, cur_len, cur_data; + int small_count; + int tail = 1; + uint32_t len = 32000; + uint8_t buf[len]; + + CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); + + if (capa.pkt.max_len && capa.pkt.max_len < len) + len = capa.pkt.max_len; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.len = len; + param.pkt.num = 100; + + pool = odp_pool_create("packet_pool_extend", &param); + CU_ASSERT(packet_pool != ODP_POOL_INVALID); + + for (round = 0; round < 2; round++) { + small_count = 30; + ext_len = len / 10; + cur_len = ext_len; + + pkt = odp_packet_alloc(pool, ext_len); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + + cur_data = 0; + + if (tail) { + ret = fill_data_forward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } else { + ret = fill_data_backward(pkt, 0, ext_len, &cur_data); + CU_ASSERT(ret == 0); + } + + while (cur_len < len) { + if (small_count) { + small_count--; + ext_len = len / 100; + } else { + ext_len = len / 4; + } + + if ((len - cur_len) < ext_len) + ext_len = len - cur_len; + + if (tail) { + ret = odp_packet_extend_tail(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + CU_ASSERT((seg_len > 0) && + (seg_len <= ext_len)); + ret = fill_data_forward(pkt, cur_len, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } else { + ret = odp_packet_extend_head(&pkt, ext_len, + (void **)&data, + &seg_len); + CU_ASSERT(ret >= 0); + CU_ASSERT(seg_len > 0); + CU_ASSERT(data == odp_packet_data(pkt)); + ret = fill_data_backward(pkt, 0, ext_len, + &cur_data); + CU_ASSERT(ret == 0); + } + + cur_len += ext_len; + } + + CU_ASSERT(odp_packet_len(pkt) == len); + + len = odp_packet_len(pkt); + + memset(buf, 0, len); + CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); + + for (i = 0; i < len; i++) { + int match; + + if (tail) { + match = (buf[i] == (i % 256)); + CU_ASSERT(match); + } else { + match = (buf[len - 1 - i] == (i % 256)); + CU_ASSERT(match); + } + + /* Limit the number of failed asserts to + one per packet */ + if (!match) + break; + } + + odp_packet_free(pkt); + + tail = 0; + } + + CU_ASSERT(odp_pool_destroy(pool) == 0); + } + void packet_test_align(void) { odp_packet_t pkt; ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 178 ++++++++ configure.ac | 6 +- platform/linux-generic/Makefile.am | 5 + .../linux-generic/include/odp_config_internal.h | 6 +- platform/linux-generic/odp_packet.c | 12 + platform/linux-generic/odp_schedule.c | 21 + .../validation/api/crypto/odp_crypto_test_inp.c | 53 +++ test/common_plat/validation/api/packet/packet.c | 477 +++++++++++++++++++++ 8 files changed, 750 insertions(+), 8 deletions(-) hooks/post-receive --

9 years

[COMMIT] annotated tag v1.13.0.0 created. v1.13.0.0

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The annotated tag, v1.13.0.0 has been created at 3119269aae4a904a235f95748ccc5a74344111c8 (tag) tagging 3875d6ebf690e07b69f11621caefab1afc58e100 (commit) replaces v1.12.0.0 tagged by Maxim Uvarov on Thu Jan 19 16:44:47 2017 +0300 - Log ----------------------------------------------------------------- == OpenDataPlane (1.13.0.0) === New Features ==== APIs ODP v1.13.0.0 represents the initial preview of the Tiger Moth release series and as such introduces new APIs and extensions that will be built on as this release matures. ===== Crypto Parameter Normalization Many ODP APIs take parameter structs of type `odp_xxx_param_t`. The crypto APIs, for historical reasons, failed to follow this convention, using instead structs of type `odp_crypto_params_t`, etc. These pluralized names are now deprecated and their singular forms are introduced as the preferred names for these structs. The old names are retained (for now) to ease migration, however applications should convert to the new forms at their convenience as these deprecated forms will be removed in the final Tiger Moth release. The changes introduced for this include: * `odp_crypto_op_params_t` => `odp_crypto_op_param_t` * `odp_crypto_session_params_t` => `odp_crypto_session_param_t` ===== Crypto Decouple Key Length from Algorithm Specification To provide a more flexible programming for handling all possible key/digest/iv length combinations, the enums used for crypto specification are split to decouple lengths from algorithm names. The only exception is the SHA-2 family of hash routines, which have well-established naming conventions that incorporate digest lengths (SHA-224, SHA-256, etc.) Changes included with this restructure include: * The `odp_crypto_capability_t` structure returned by the `odp_crypto_capability()` API contains streamlined `odp_crypto_cipher_algos_t` and `odp_crypto_auth_algos_t` substructures. * A new `odp_crypto_cipher_capability()` API is added to return detailed information about available cipher capabilities. * A new `odp_crypto_auth_capability()` API is added to return detailed information about available authentication capabilities. ===== `odp_crypto_session_param_init()` API For completeness the `odp_crypto_session_param_init()` API is provided to enable platform-independent initialization of the `odp_crypto_session_param_t` structure used as input to `odp_crypto_session_create()`. ===== Bitfield and Byteorder Cleanup The `ODP_BITFIELD_ORDER` define is added to the ODP specification to parallel the existing `ODP_BYTEFIELD_ORDER` define. This will be set to the value `ODP_BIG_ENDIAN_BITFIELD` or `ODP_LITTLE_ENDIAN_BITFIELD`. This also addresses https://bugs.linaro.org/show_bug.cgi?id=2402[Bug 2402], however since fixing this required a small API change this was deferred until an API release boundary. ===== Improved Name Argument Definitions in `odp_xxx_create()` Functions The use of name arguments to the various resource creation APIs has been standardized and documentation improved to clarify that unique names are not required and that these may be specified as NULL for anonymous resource creation. When non-unique resource names are used, it is unspecified which of these are returned by a corresponding lookup API. ===== Pool Parameters for Packet Pools The `odp_pool_param_t` structure adds the new field `max_len` to be used in packet pools to advise the implementation of the maximum sized packet that the application will allocate with a single `odp_packet_alloc()` call. This may enable storage pool optimization. ===== Packet Clarifications API documentation for `odp_packet_concat()` and `odp_packet_copy_from_pkt()` is clarified to specify that the source and destination packets supplied to these APIs should not refer to the same packet. ===== Packet Allocation Length Clarification API documentation for `odp_packet_alloc()` is clarified to specify that the supplied length for requested packet allocation should be greater than zero. ===== Random API Changes The APIs provided for working with random data have been revised. The third parameter to `odp_random_data()` is now of type `odp_random_kind_t`, which is an `enum` that is used to specify the quality of random data required. The kinds of random data defined are: `ODP_RANDOM_BASIC`:: No specific quality guarantees. This is assumed to be pseudo-random data generated by software where speed of generation is more important than the quality of the results.This is the lowest kind of random. `ODP_RANDOM_CRYPTO`:: Random data suitable for use in cryptographic operations. `ODP_RANDOM_TRUE`:: True random data generated from a hardware entropy source. This is the highest kind of random. The `odp_random_max_kind()` API is provided that returns the highest kind of data available on this implementation. Requests for higher kinds than can be supplied will fail. For testing purposes it is often desirable to generate "random" sequences that are repeatable. To support this use case, the `odp_random_test_data()` API is introduced. This always returns BASIC random data but uses a user-supplied 64-byte seed parameter that is update for each call and can be used to repeat the same sequence as needed. ===== Shared Memory Improvements The `odp_shm_reserve()` API adds two new additional flags to support external memory. * `ODP_SHM_SINGLE_VA` guarantees that all ODP threads sharing this memory will see the block at the same virtual address regardless of whether threads are implemented as pthreads or processes and when `fork()` calls are made to create them. * `ODP_SHM_EXPORT` allows the memory block to be visible to other ODP instances. Other ODP instances can retrieve this block via the new `odp_shm_import()` API. ===== Classification Clarifications The relationship between classification and queue configuration in the `odp_pktin_queue_param_t` structure is clarified to emphasize that classification subsumes queue-based I/O processing. This is an API documentation change only. === Helpers New helper APIs are introduced for IP table lookup support for longest prefix matching as well as cuckoo hash tables. These are designed to provide analogs to functions available in DPDK to assist applications being ported to ODP. === Performance Improvements The odp-linux reference implementation includes a number of improvements to make it more suitable for production use on platforms that rely on software implementations of key ODP APIs. ==== Ring-based Pool Implementation Storage pools used for buffers and packets are now implemented via lockless ring structures that support burst mode read/writes to local caches for significantly improved multi-core scalability ==== Buffer/Packet Header Optimizations The layout of the structs used to support buffers and packets has been optimized to reduce cache footprint and minimize path lengths in packet manipulation. ==== Ordered Queue Improvements The implementation of ordered queues has been streamlined and made more scaleable in multi-core systems. ==== Packet Segmentation Improvements The more advance segmentation capabilities present in the new ODP packet implementation are used to streamline the implementation of APIs like `odp_packet_concat()` and the head/tail extend/trunc APIs. === Bug Fixes ==== https://bugs.linaro.org/show_bug.cgi?id=2405[Bug 2405] A number of "todos" were removed from the packet validation test suite. ==== https://bugs.linaro.org/show_bug.cgi?id=2472[Bug 2472] The CPU affinity is now correctly read from the cpuset. ==== https://bugs.linaro.org/show_bug.cgi?id=2496[Bug 2496] The PktIO validation test no longer uses invalid MAC addresses. ==== https://bugs.linaro.org/show_bug.cgi?id=2512[Bug 2512] The TCP checksum is now properly calculated for generated packets. ==== https://bugs.linaro.org/show_bug.cgi?id=2798[Bug 2798] The odp-linux reference implementation makes use of the OpenSSL library to support the `odp_random_xxx()` APIs and some crypto operations. To support OpenSSL versions prior to 1.1.0, which are not thread safe, support is added for OpenSSL locking callbacks that use ODP ticketlocks to provide OpenSSL thread safety. === Known Issues ==== https://bugs.linaro.org/show_bug.cgi?id=2812[Bug 2812] Make check fails on a single core VM in the process mode helper test. Balakrishna Garapati (1): platform: linux-generic: reading cpu affinity from cpuset Balasubramanian Manoharan (3): validation: classification: fix TCP/UDP checksum update validation: pktio: fix invalid mac addr api: pktio: adds further definition for classification configuration Bill Fischofer (11): validation: packet: remove todos from packet tests test: perf: add assert since src_idx cannot be negative api: byteorder: avoid bitfield order doxygen omissions linux-generic: pool: reset origin_qe on buffer allocation api: random: add explicit controls over random data doc: userguide: move crypto documentation to its own sub-document doc: userguide: expand crypto documentation to cover random apis api: pktio: pktio documentation typo correction linux-generic: pool: defer ring allocation until pool creation linux-generic: crypto: add openssl locking support for thread safety changelog: summary of changes for odp v1.13.0.0 Christophe Milard (38): linux-generic: Makefile: reintroducing lost change for drv linux-generic: moving the visibility files one step up linux-generic: cosmetic changes on sync files linux-generic: cosmetic changes on atomic linux-generic: cosmetic changes on spinlock helper: test: gitignore add iplookuptable linux-gen: cosmetic changes on barrier linux-gen: fdserver: new fdserver added linux-generic: system_info: adding huge page dir linux-generic: _fdserver: fixing comment typo linux-generic: _fdserver: allocating data table dynamicaly linux-gen: init: removing possible obsolete ODP files at startup linux-gen: push internal flag definition api: shm: add flags to shm_reserve and function to find external mem test: api: shmem: new proper tests for shm API doc: updating docs for the shm interface extension test: api: shm: test using the same block name multiple times doc: shm: defining behaviour when blocks have same name linux-gen: _fdserver: request sigterm if parent dies linux-gen: ishm: internal shared memory allocator (ishm) added linux-gen: _ishm: create description file for external memory sharing linux-gen: use ishm as north API mem allocator linux-gen: ishm: adding debug function linux-gen: _ishm: adding function to map memory from other ODP linux-gen: shm: new ODP_SHM_SINGLE_VA flag implementation linux-gen: shm: add flag and function to share memory between ODP instances linux-gen: shared_memory: remove flag forcing mlock linux-gen: _ishm: accept multiple usage of same block name linux_gen: _ishm: decreasing the number of error messages when no huge pages linux-gen: _ishm: fix for alignment request matching page size linux-gen: _ishm: allow memory alloc/free at global init/term linux-gen: _ishm: cleaning remaining block at odp_term_global test: linux-gen: api: shmem: test sharing memory between ODP instances linux-gen: _ishm: unlinking files asap for cleaner termination linux-gen: _ishm: exporting/importing user len and flags test: shm: checking exported vs imported block length linux-gen: _ishm: fixing typos linux-gen: init: avoiding segfault if cleaning files Joe Savage (1): helper: fix odph_ipv4_csum functions for L3 offset 0 Matias Elo (15): example: free reserved shared memory blocks validation: free reserved shared memory blocks api: improve name argument definitions in *_create() functions linux-gen: schedule: fix creating event group with no name linux-gen: queue: fix creating queue with no name linux-gen: classification: fix creating cos with no name linux-gen: timer: fix creating timer pool with no name linux-gen: sched: add internal APIs for locking/unlocking ordered processing linux-gen: sched: remove old ordered queue implementation linux-gen: sched: add internal API for max number of ordered locks per queue linux-gen: sched: new ordered queue implementation linux-gen: sched: new ordered lock implementation api: unify ODP_*_NAME_LEN specifications api: move ODP_*_NAME_LEN definitions from API to implementation validation: test creating pool and timer pool with no name Maxim Uvarov (13): configure.ac: do not disable shared lib for non abi mode test: tm: queue id can be not updated travis: do not print dpdk build log travis: accelerate dpdk cloning scripts/build-pktio-dpdk: do not download full dpdk git helper: cuckootable: add missing return codes linux-gen: pktio ipc: ring changes linux-gen: pktio ipc: more accurate settings of pool flags linux-gen: pktio ipc: update tests linux-gen: pktio ipc: make it work again linux-gen: pktio ipc: tests: remove comment about master-slave linux-gen: pktio ipc: fix clang build update API version number from v1.12.0.0 to v1.13.0.0 Mike Holmes (4): configure: if no ABI reset .so to 0 configure: remove duplicate info helper: remove unused variable doc: driver-guide: initial revision Nicolas Morey-Chaisemartin (3): validation: pktio: use PRIu32 to print uint32_t values validation: traffic_mngr: use PRI macro to print uint* example: traffic_mgmt: use PRIu32 instead of %u Petri Savolainen (49): test: l2fwd: lookup table for sched mode test: l2fwd: lockless output queues in sched mode test: l2fwd: add missing output event queue read linux-gen: ipc: disable build of ipc pktio linux-gen: pktio: do not free zero packets linux-gen: ring: created common ring implementation linux-gen: align: added round up power of two linux-gen: pool: reimplement pool with ring linux-gen: ring: added multi enq and deq linux-gen: pool: use ring multi enq and deq operations linux-gen: pool: optimize buffer alloc linux-gen: pool: clean up pool inlines functions linux-gen: pool: ptr instead of hdl in buffer_alloc_multi test: validation: buf: test alignment test: performance: crypto: use capability to select max packet test: correctly initialize pool parameters test: validation: packet: fix bugs in tailroom and concat tests linux-gen: packet: added support for segmented packets test: validation: packet: improved multi-segment alloc test api: packet: added limits for packet len on alloc linux-gen: packet: remove zero len support from alloc linux-gen: socket: use trunc instead of pull tail validation: crypto: honour pool capability limits validation: pktio: honour pool capability limits linux-gen: pool: check pool parameters linux-gen: packet: enable multi-segment packets api: crypto: rename _params_t to _param_t linux-gen: crypto: rename params to param api: crypto: decouple key length from algorithm enumeration linux-gen: crypto: add algo capability functions linux-gen: crypto: add support to new enumerations api: crypto: added session param init api: crypto: documentation clean up test: crypto: use odp_crypto_session_param_init validation: crypto: use algorithm capability example: ipsec: use op_param_t instead of op_params_t linux-gen: schedule_sp: use ring as priority queue api: packet: src and dst packet must not be the same linux-gen: packet: fix bug in tailroom calculation linux-gen: packet: improve packet print validation: packet: concat-split test bug fix linux-gen: packet: optimize concat validation: packet: add new concat and extend tests linux-gen: config: increase max num of segments linux-gen: packet: clean and pack packet header struct linux-gen: packet: optimize alloc and init linux-gen: packet: replace base_len with constant validation: packet: add line number to compare data checks validation: packet: limit number of failed asserts Ru Jia (4): helper: table: add impl of cuckoo hash table helper: test: add test of cuckoo hash table helper: table: add impl of ip lookup table helper: test: add validation test of ip lookup table Stanislaw Kardach (1): helper: do not break odp_term_global protocol Xuelin Shi (2): linux-generic: move tm system barrier to tm group linux-generic: only enable pktout when egress kind is pktio ----------------------------------------------------------------------- hooks/post-receive --

9 years

[COMMIT] branch master updated. v1.12.0.0-145-g3875d6e

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 3875d6ebf690e07b69f11621caefab1afc58e100 (commit) via b99095485be4ac14d16bef372b5c6521b396abaa (commit) from f53fda91d2919eee33b5a177ef818be1092c890b (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 3875d6ebf690e07b69f11621caefab1afc58e100 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jan 13 16:50:36 2017 +0300 update API version number from v1.12.0.0 to v1.13.0.0 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> diff --git a/configure.ac b/configure.ac index 3a20959..67d60d2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.5]) # Set correct API version ########################################################################## m4_define([odpapi_generation_version], [1]) -m4_define([odpapi_major_version], [12]) +m4_define([odpapi_major_version], [13]) m4_define([odpapi_minor_version], [0]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], @@ -38,10 +38,10 @@ AM_SILENT_RULES([yes]) # 3. if interfaces were removed, then use C+1:0:0 ########################################################################## -ODP_LIBSO_VERSION=112:0:0 +ODP_LIBSO_VERSION=113:0:0 AC_SUBST(ODP_LIBSO_VERSION) -ODPHELPER_LIBSO_VERSION=110:1:1 +ODPHELPER_LIBSO_VERSION=111:0:2 AC_SUBST(ODPHELPER_LIBSO_VERSION) # Checks for programs. commit b99095485be4ac14d16bef372b5c6521b396abaa Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Fri Jan 13 10:14:04 2017 -0600 changelog: summary of changes for odp v1.13.0.0 Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CHANGELOG b/CHANGELOG index 17afe44..72bf225 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,181 @@ +== OpenDataPlane (1.13.0.0) + +=== New Features + +==== APIs +ODP v1.13.0.0 represents the initial preview of the Tiger Moth release series +and as such introduces new APIs and extensions that will be built on as this +release matures. + +===== Crypto Parameter Normalization +Many ODP APIs take parameter structs of type `odp_xxx_param_t`. The crypto APIs, +for historical reasons, failed to follow this convention, using instead structs +of type `odp_crypto_params_t`, etc. These pluralized names are now deprecated +and their singular forms are introduced as the preferred names for these +structs. The old names are retained (for now) to ease migration, however +applications should convert to the new forms at their convenience as these +deprecated forms will be removed in the final Tiger Moth release. + +The changes introduced for this include: + +* `odp_crypto_op_params_t` => `odp_crypto_op_param_t` +* `odp_crypto_session_params_t` => `odp_crypto_session_param_t` + +===== Crypto Decouple Key Length from Algorithm Specification +To provide a more flexible programming for handling all possible +key/digest/iv length combinations, the enums used for crypto specification +are split to decouple lengths from algorithm names. The only exception +is the SHA-2 family of hash routines, which have well-established naming +conventions that incorporate digest lengths (SHA-224, SHA-256, etc.) + +Changes included with this restructure include: + +* The `odp_crypto_capability_t` structure returned by the +`odp_crypto_capability()` API contains streamlined `odp_crypto_cipher_algos_t` +and `odp_crypto_auth_algos_t` substructures. +* A new `odp_crypto_cipher_capability()` API is added to return detailed +information about available cipher capabilities. +* A new `odp_crypto_auth_capability()` API is added to return detailed +information about available authentication capabilities. + +===== `odp_crypto_session_param_init()` API +For completeness the `odp_crypto_session_param_init()` API is provided to +enable platform-independent initialization of the `odp_crypto_session_param_t` +structure used as input to `odp_crypto_session_create()`. + +===== Bitfield and Byteorder Cleanup +The `ODP_BITFIELD_ORDER` define is added to the ODP specification to parallel +the existing `ODP_BYTEFIELD_ORDER` define. This will be set to the value +`ODP_BIG_ENDIAN_BITFIELD` or `ODP_LITTLE_ENDIAN_BITFIELD`. This also addresses +https://bugs.linaro.org/show_bug.cgi?id=2402[Bug 2402], however since fixing +this required a small API change this was deferred until an API release +boundary. + +===== Improved Name Argument Definitions in `odp_xxx_create()` Functions +The use of name arguments to the various resource creation APIs has +been standardized and documentation improved to clarify that unique +names are not required and that these may be specified as NULL for +anonymous resource creation. When non-unique resource names are used, it is +unspecified which of these are returned by a corresponding lookup API. + +===== Pool Parameters for Packet Pools +The `odp_pool_param_t` structure adds the new field `max_len` to be used in +packet pools to advise the implementation of the maximum sized packet that +the application will allocate with a single `odp_packet_alloc()` call. This +may enable storage pool optimization. + +===== Packet Clarifications +API documentation for `odp_packet_concat()` and `odp_packet_copy_from_pkt()` +is clarified to specify that the source and destination packets supplied to +these APIs should not refer to the same packet. + +===== Packet Allocation Length Clarification +API documentation for `odp_packet_alloc()` is clarified to specify that +the supplied length for requested packet allocation should be greater +than zero. + +===== Random API Changes +The APIs provided for working with random data have been revised. The third +parameter to `odp_random_data()` is now of type `odp_random_kind_t`, which is +an `enum` that is used to specify the quality of random data required. The +kinds of random data defined are: + +`ODP_RANDOM_BASIC`:: +No specific quality guarantees. This is assumed to be pseudo-random data +generated by software where speed of generation is more important than the +quality of the results.This is the lowest kind of random. + +`ODP_RANDOM_CRYPTO`:: +Random data suitable for use in cryptographic operations. + +`ODP_RANDOM_TRUE`:: +True random data generated from a hardware entropy source. This is the +highest kind of random. + +The `odp_random_max_kind()` API is provided that returns the highest kind of +data available on this implementation. Requests for higher kinds than can be +supplied will fail. + +For testing purposes it is often desirable to generate "random" sequences that +are repeatable. To support this use case, the `odp_random_test_data()` API is +introduced. This always returns BASIC random data but uses a user-supplied +64-byte seed parameter that is update for each call and can be used to +repeat the same sequence as needed. + +===== Shared Memory Improvements +The `odp_shm_reserve()` API adds two new additional flags to support external +memory. + +* `ODP_SHM_SINGLE_VA` guarantees that all ODP threads sharing this memory +will see the block at the same virtual address regardless of whether threads +are implemented as pthreads or processes and when `fork()` calls are made to +create them. + +* `ODP_SHM_EXPORT` allows the memory block to be visible to other ODP +instances. Other ODP instances can retrieve this block via the new +`odp_shm_import()` API. + +===== Classification Clarifications +The relationship between classification and queue configuration in the +`odp_pktin_queue_param_t` structure is clarified to emphasize that +classification subsumes queue-based I/O processing. This is an API +documentation change only. + +=== Helpers +New helper APIs are introduced for IP table lookup support for longest prefix +matching as well as cuckoo hash tables. These are designed to provide analogs +to functions available in DPDK to assist applications being ported to ODP. + +=== Performance Improvements +The odp-linux reference implementation includes a number of improvements to +make it more suitable for production use on platforms that rely on software +implementations of key ODP APIs. + +==== Ring-based Pool Implementation +Storage pools used for buffers and packets are now implemented via lockless +ring structures that support burst mode read/writes to local caches for +significantly improved multi-core scalability + +==== Buffer/Packet Header Optimizations +The layout of the structs used to support buffers and packets has been +optimized to reduce cache footprint and minimize path lengths in packet +manipulation. + +==== Ordered Queue Improvements +The implementation of ordered queues has been streamlined and made more +scaleable in multi-core systems. + +==== Packet Segmentation Improvements +The more advance segmentation capabilities present in the new ODP packet +implementation are used to streamline the implementation of APIs like +`odp_packet_concat()` and the head/tail extend/trunc APIs. + +=== Bug Fixes + +==== https://bugs.linaro.org/show_bug.cgi?id=2405[Bug 2405] +A number of "todos" were removed from the packet validation test suite. + +==== https://bugs.linaro.org/show_bug.cgi?id=2472[Bug 2472] +The CPU affinity is now correctly read from the cpuset. + +==== https://bugs.linaro.org/show_bug.cgi?id=2496[Bug 2496] +The PktIO validation test no longer uses invalid MAC addresses. + +==== https://bugs.linaro.org/show_bug.cgi?id=2512[Bug 2512] +The TCP checksum is now properly calculated for generated packets. + +==== https://bugs.linaro.org/show_bug.cgi?id=2798[Bug 2798] +The odp-linux reference implementation makes use of the OpenSSL library to +support the `odp_random_xxx()` APIs and some crypto operations. To support +OpenSSL versions prior to 1.1.0, which are not thread safe, support is added +for OpenSSL locking callbacks that use ODP ticketlocks to provide OpenSSL thread +safety. + +=== Known Issues + +==== https://bugs.linaro.org/show_bug.cgi?id=2812[Bug 2812] +Make check fails on a single core VM in the process mode helper test. + == OpenDataPlane (1.12.0.0) === New Features ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 +- 2 files changed, 181 insertions(+), 3 deletions(-) hooks/post-receive --

9 years

[COMMIT] branch api-next updated. v1.12.0.0-240-g1588c49

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 1588c49a0bf0332512d5e08e1feaad5e4005df31 (commit) via 9f88e0b17e7e814f2c15c3c9ee0103196864a7d5 (commit) via 0abda2f57e088c9db6e48a265a417f47b1e4720c (commit) via 9107db16944d821a1c959049acc1fe3ff29f2341 (commit) via 567c2e8a0fd6b51db8b82ce926cc41d4c0e7898b (commit) via 91f1ce71dc3d2694152d71690c1e7638716b9391 (commit) from 00070be1d569bd575b100d52e5e263eb89ac962c (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 1588c49a0bf0332512d5e08e1feaad5e4005df31 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 17 19:18:03 2017 +0100 test: drv: shm: adding buddy allocation stress tests Stress tests for the random size allocator (buddy allocator in linux-generic) are added here. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/drv/drvshmem/drvshmem.c b/test/common_plat/validation/drv/drvshmem/drvshmem.c index d4dedea..0f882ae 100644 --- a/test/common_plat/validation/drv/drvshmem/drvshmem.c +++ b/test/common_plat/validation/drv/drvshmem/drvshmem.c @@ -938,6 +938,182 @@ void drvshmem_test_slab_basic(void) odpdrv_shm_pool_destroy(pool); } +/* + * thread part for the drvshmem_test_buddy_stress + */ +static int run_test_buddy_stress(void *arg ODP_UNUSED) +{ + odpdrv_shm_t shm; + odpdrv_shm_pool_t pool; + uint8_t *address; + shared_test_data_t *glob_data; + uint8_t random_bytes[STRESS_RANDOM_SZ]; + uint32_t index; + uint32_t size; + uint8_t data; + uint32_t iter; + uint32_t i; + + shm = odpdrv_shm_lookup_by_name(MEM_NAME); + glob_data = odpdrv_shm_addr(shm); + CU_ASSERT_PTR_NOT_NULL(glob_data); + + /* get the pool to test */ + pool = odpdrv_shm_pool_lookup(POOL_NAME); + + /* wait for general GO! */ + odpdrv_barrier_wait(&glob_data->test_barrier1); + /* + + * at each iteration: pick up a random index for + * glob_data->stress[index]: If the entry is free, allocated small mem + * randomly. If it is already allocated, make checks and free it: + * Note that different tread can allocate or free a given block + */ + for (iter = 0; iter < STRESS_ITERATION; iter++) { + /* get 4 random bytes from which index, size ,align, flags + * and data will be derived: + */ + odp_random_data(random_bytes, STRESS_RANDOM_SZ, 0); + index = random_bytes[0] & (STRESS_SIZE - 1); + + odp_spinlock_lock(&glob_data->stress_lock); + + switch (glob_data->stress[index].state) { + case STRESS_FREE: + /* allocated a new block for this entry */ + + glob_data->stress[index].state = STRESS_BUSY; + odp_spinlock_unlock(&glob_data->stress_lock); + + size = (random_bytes[1] + 1) << 4; /* up to 4Kb */ + data = random_bytes[2]; + + address = odpdrv_shm_pool_alloc(pool, size); + glob_data->stress[index].address = address; + if (address == NULL) { /* out of mem ? */ + odp_spinlock_lock(&glob_data->stress_lock); + glob_data->stress[index].state = STRESS_ALLOC; + odp_spinlock_unlock(&glob_data->stress_lock); + continue; + } + + glob_data->stress[index].size = size; + glob_data->stress[index].data_val = data; + + /* write some data: */ + for (i = 0; i < size; i++) + address[i] = (data++) & 0xFF; + odp_spinlock_lock(&glob_data->stress_lock); + glob_data->stress[index].state = STRESS_ALLOC; + odp_spinlock_unlock(&glob_data->stress_lock); + + break; + + case STRESS_ALLOC: + /* free the block for this entry */ + + glob_data->stress[index].state = STRESS_BUSY; + odp_spinlock_unlock(&glob_data->stress_lock); + address = glob_data->stress[index].address; + + if (shm == NULL) { /* out of mem ? */ + odp_spinlock_lock(&glob_data->stress_lock); + glob_data->stress[index].state = STRESS_FREE; + odp_spinlock_unlock(&glob_data->stress_lock); + continue; + } + + /* check that data is reachable and correct: */ + data = glob_data->stress[index].data_val; + size = glob_data->stress[index].size; + for (i = 0; i < size; i++) { + CU_ASSERT(address[i] == (data & 0xFF)); + data++; + } + + odpdrv_shm_pool_free(pool, address); + + odp_spinlock_lock(&glob_data->stress_lock); + glob_data->stress[index].state = STRESS_FREE; + odp_spinlock_unlock(&glob_data->stress_lock); + + break; + + case STRESS_BUSY: + default: + odp_spinlock_unlock(&glob_data->stress_lock); + break; + } + } + + fflush(stdout); + return CU_get_number_of_failures(); +} + +/* + * stress tests + */ +void drvshmem_test_buddy_stress(void) +{ + odpdrv_shm_pool_param_t pool_params; + odpdrv_shm_pool_t pool; + pthrd_arg thrdarg; + odpdrv_shm_t shm; + shared_test_data_t *glob_data; + odp_cpumask_t unused; + uint32_t i; + uint8_t *address; + + /* create a pool and check that it can be looked up */ + pool_params.pool_size = POOL_SZ; + pool_params.min_alloc = 0; + pool_params.max_alloc = POOL_SZ; + pool = odpdrv_shm_pool_create(POOL_NAME, &pool_params); + odpdrv_shm_pool_print("Stress test start", pool); + + shm = odpdrv_shm_reserve(MEM_NAME, sizeof(shared_test_data_t), + 0, ODPDRV_SHM_LOCK); + CU_ASSERT(ODPDRV_SHM_INVALID != shm); + glob_data = odpdrv_shm_addr(shm); + CU_ASSERT_PTR_NOT_NULL(glob_data); + + thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0); + if (thrdarg.numthrds > MAX_WORKERS) + thrdarg.numthrds = MAX_WORKERS; + + glob_data->nb_threads = thrdarg.numthrds; + odpdrv_barrier_init(&glob_data->test_barrier1, thrdarg.numthrds); + odp_spinlock_init(&glob_data->stress_lock); + + /* before starting the threads, mark all entries as free: */ + for (i = 0; i < STRESS_SIZE; i++) + glob_data->stress[i].state = STRESS_FREE; + + /* create threads */ + odp_cunit_thread_create(run_test_buddy_stress, &thrdarg); + + /* wait for all thread endings: */ + CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); + + odpdrv_shm_pool_print("Stress test all thread finished", pool); + + /* release left overs: */ + for (i = 0; i < STRESS_SIZE; i++) { + address = glob_data->stress[i].address; + if (glob_data->stress[i].state == STRESS_ALLOC) + odpdrv_shm_pool_free(pool, address); + } + + CU_ASSERT(0 == odpdrv_shm_free_by_name(MEM_NAME)); + + /* check that no memory is left over: */ + odpdrv_shm_pool_print("Stress test all released", pool); + + /* destroy pool: */ + odpdrv_shm_pool_destroy(pool); +} + odp_testinfo_t drvshmem_suite[] = { ODP_TEST_INFO(drvshmem_test_basic), ODP_TEST_INFO(drvshmem_test_reserve_after_fork), @@ -945,6 +1121,7 @@ odp_testinfo_t drvshmem_suite[] = { ODP_TEST_INFO(drvshmem_test_stress), ODP_TEST_INFO(drvshmem_test_buddy_basic), ODP_TEST_INFO(drvshmem_test_slab_basic), + ODP_TEST_INFO(drvshmem_test_buddy_stress), ODP_TEST_INFO_NULL, }; diff --git a/test/common_plat/validation/drv/drvshmem/drvshmem.h b/test/common_plat/validation/drv/drvshmem/drvshmem.h index fdc1080..817b3d5 100644 --- a/test/common_plat/validation/drv/drvshmem/drvshmem.h +++ b/test/common_plat/validation/drv/drvshmem/drvshmem.h @@ -16,6 +16,7 @@ void drvshmem_test_singleva_after_fork(void); void drvshmem_test_stress(void); void drvshmem_test_buddy_basic(void); void drvshmem_test_slab_basic(void); +void drvshmem_test_buddy_stress(void); /* test arrays: */ extern odp_testinfo_t drvshmem_suite[]; commit 9f88e0b17e7e814f2c15c3c9ee0103196864a7d5 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 17 19:18:02 2017 +0100 test: drv: shm: adding basic fixed size allocation tests Basic tests for odpdrv_shm_pool are added here, creating a fixed size pool and performing basic alloc/free on it Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/drv/drvshmem/drvshmem.c b/test/common_plat/validation/drv/drvshmem/drvshmem.c index 5843573..d4dedea 100644 --- a/test/common_plat/validation/drv/drvshmem/drvshmem.c +++ b/test/common_plat/validation/drv/drvshmem/drvshmem.c @@ -853,12 +853,98 @@ void drvshmem_test_buddy_basic(void) odpdrv_shm_pool_destroy(pool); } +void drvshmem_test_slab_basic(void) +{ + odpdrv_shm_pool_param_t pool_params; + odpdrv_shm_pool_t pool, found_pool; + uint8_t *buff; + uint8_t *addrs[TEST_SZ]; + uint16_t length; + int i, j; + + /* create a pool and check that it can be looked up */ + pool_params.pool_size = POOL_SZ; + pool_params.min_alloc = SZ_1K; /* constant size will give slab */ + pool_params.max_alloc = SZ_1K; + pool = odpdrv_shm_pool_create(POOL_NAME, &pool_params); + found_pool = odpdrv_shm_pool_lookup(POOL_NAME); + CU_ASSERT(found_pool == pool); + + /* alloc a 1k buffer, filling its contents: */ + buff = odpdrv_shm_pool_alloc(pool, SZ_1K); + CU_ASSERT_PTR_NOT_NULL(buff); + for (i = 0; i < SZ_1K; i++) + buff[i] = BUFF_PATTERN; + odpdrv_shm_pool_print("buddy test: 1K reserved", pool); + + /* alloc as many 1K buffer a possible */ + for (i = 0; i < TEST_SZ; i++) { + length = SZ_1K; + addrs[i] = odpdrv_shm_pool_alloc(pool, length); + /* if alloc was success, fill buffer for later check */ + if (addrs[i]) { + for (j = 0; j < length; j++) + addrs[i][j] = (uint8_t)(length & 0xFF); + } + } + odpdrv_shm_pool_print("slab test: after many mallocs", pool); + + /* release every 3rth buffer, checking contents: */ + for (i = 0; i < TEST_SZ; i += 3) { + /* if buffer was allocated, check the pattern in it */ + if (addrs[i]) { + length = SZ_1K; + for (j = 0; j < length; j++) + CU_ASSERT(addrs[i][j] == + (uint8_t)(length & 0xFF)); + } + odpdrv_shm_pool_free(pool, addrs[i]); + } + odpdrv_shm_pool_print("slab test: after 1/3 free:", pool); + + /* realloc them:*/ + for (i = 0; i < TEST_SZ; i += 3) { + length = SZ_1K; + addrs[i] = odpdrv_shm_pool_alloc(pool, length); + /* if alloc was success, fill buffer for later check */ + if (addrs[i]) { + for (j = 0; j < length; j++) + addrs[i][j] = (uint8_t)(length & 0xFF); + } + } + odpdrv_shm_pool_print("slab test: after realloc:", pool); + + /* free all (except buff), checking contents: */ + for (i = 0; i < TEST_SZ; i++) { + /* if buffer was allocated, check the pattern in it */ + if (addrs[i]) { + length = SZ_1K; + for (j = 0; j < length; j++) + CU_ASSERT(addrs[i][j] == + (uint8_t)(length & 0xFF)) + } + odpdrv_shm_pool_free(pool, addrs[i]); + } + odpdrv_shm_pool_print("slab test: after all but 1K free:", pool); + + /* check contents of our initial 1K buffer: */ + for (i = 0; i < SZ_1K; i++) + CU_ASSERT((buff[i] == BUFF_PATTERN)) + odpdrv_shm_pool_free(pool, buff); + + odpdrv_shm_pool_print("slab test: after all free", pool); + + /* destroy pool: */ + odpdrv_shm_pool_destroy(pool); +} + odp_testinfo_t drvshmem_suite[] = { ODP_TEST_INFO(drvshmem_test_basic), ODP_TEST_INFO(drvshmem_test_reserve_after_fork), ODP_TEST_INFO(drvshmem_test_singleva_after_fork), ODP_TEST_INFO(drvshmem_test_stress), ODP_TEST_INFO(drvshmem_test_buddy_basic), + ODP_TEST_INFO(drvshmem_test_slab_basic), ODP_TEST_INFO_NULL, }; diff --git a/test/common_plat/validation/drv/drvshmem/drvshmem.h b/test/common_plat/validation/drv/drvshmem/drvshmem.h index ab45f7c..fdc1080 100644 --- a/test/common_plat/validation/drv/drvshmem/drvshmem.h +++ b/test/common_plat/validation/drv/drvshmem/drvshmem.h @@ -15,6 +15,7 @@ void drvshmem_test_reserve_after_fork(void); void drvshmem_test_singleva_after_fork(void); void drvshmem_test_stress(void); void drvshmem_test_buddy_basic(void); +void drvshmem_test_slab_basic(void); /* test arrays: */ extern odp_testinfo_t drvshmem_suite[]; commit 0abda2f57e088c9db6e48a265a417f47b1e4720c Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 17 19:18:01 2017 +0100 test: drv: shm: adding basic buddy allocation tests Basic tests for odpdrv_shm_pool are added here, creating a buddy pool and performing basic alloc/free on it Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/validation/drv/drvshmem/drvshmem.c b/test/common_plat/validation/drv/drvshmem/drvshmem.c index 0247a03..5843573 100644 --- a/test/common_plat/validation/drv/drvshmem/drvshmem.c +++ b/test/common_plat/validation/drv/drvshmem/drvshmem.c @@ -21,6 +21,12 @@ #define STRESS_RANDOM_SZ 5 #define STRESS_ITERATION 5000 +#define POOL_NAME "test_pool" +#define POOL_SZ (1UL << 20) /* 1 MBytes */ +#define TEST_SZ 1000 +#define SZ_1K 1024 +#define BUFF_PATTERN 0xA3 + typedef enum { STRESS_FREE, /* entry is free and can be allocated */ STRESS_BUSY, /* entry is being processed: don't touch */ @@ -762,11 +768,97 @@ void drvshmem_test_stress(void) CU_ASSERT(odpdrv_shm_print_all("After stress tests") == base); } +void drvshmem_test_buddy_basic(void) +{ + odpdrv_shm_pool_param_t pool_params; + odpdrv_shm_pool_t pool, found_pool; + uint8_t *buff; + uint8_t *addrs[TEST_SZ]; + uint8_t length; + int i, j; + + /* create a pool and check that it can be looked up */ + pool_params.pool_size = POOL_SZ; + pool_params.min_alloc = 1; + pool_params.max_alloc = POOL_SZ; + pool = odpdrv_shm_pool_create(POOL_NAME, &pool_params); + found_pool = odpdrv_shm_pool_lookup(POOL_NAME); + CU_ASSERT(found_pool == pool); + + /* alloc a 1k buffer, filling its contents: */ + buff = odpdrv_shm_pool_alloc(pool, SZ_1K); + CU_ASSERT_PTR_NOT_NULL(buff); + for (i = 0; i < SZ_1K; i++) + buff[i] = BUFF_PATTERN; + odpdrv_shm_pool_print("buddy test: 1K reserved", pool); + + /* alloc as many buffer a possible on increseasing sz */ + for (i = 0; i < TEST_SZ; i++) { + length = i * 16; + addrs[i] = odpdrv_shm_pool_alloc(pool, length); + /* if alloc was success, fill buffer for later check */ + if (addrs[i]) { + for (j = 0; j < length; j++) + addrs[i][j] = (uint8_t)(length & 0xFF); + } + } + odpdrv_shm_pool_print("buddy test: after many mallocs", pool); + + /* release every 3rth buffer, checking contents: */ + for (i = 0; i < TEST_SZ; i += 3) { + /* if buffer was allocated, check the pattern in it */ + if (addrs[i]) { + length = i * 16; + for (j = 0; j < length; j++) + CU_ASSERT(addrs[i][j] == + (uint8_t)(length & 0xFF)); + } + odpdrv_shm_pool_free(pool, addrs[i]); + } + odpdrv_shm_pool_print("buddy test: after 1/3 free:", pool); + + /* realloc them:*/ + for (i = 0; i < TEST_SZ; i += 3) { + length = i * 16; + addrs[i] = odpdrv_shm_pool_alloc(pool, length); + /* if alloc was success, fill buffer for later check */ + if (addrs[i]) { + for (j = 0; j < length; j++) + addrs[i][j] = (uint8_t)(length & 0xFF); + } + } + odpdrv_shm_pool_print("buddy test: after realloc:", pool); + + /* free all (except buff), checking contents: */ + for (i = 0; i < TEST_SZ; i++) { + /* if buffer was allocated, check the pattern in it */ + if (addrs[i]) { + length = i * 16; + for (j = 0; j < length; j++) + CU_ASSERT(addrs[i][j] == + (uint8_t)(length & 0xFF)) + } + odpdrv_shm_pool_free(pool, addrs[i]); + } + odpdrv_shm_pool_print("buddy test: after all but 1K free:", pool); + + /* check contents of our initial 1K buffer: */ + for (i = 0; i < SZ_1K; i++) + CU_ASSERT((buff[i] == BUFF_PATTERN)) + odpdrv_shm_pool_free(pool, buff); + + odpdrv_shm_pool_print("buddy test: after all free", pool); + + /* destroy pool: */ + odpdrv_shm_pool_destroy(pool); +} + odp_testinfo_t drvshmem_suite[] = { ODP_TEST_INFO(drvshmem_test_basic), ODP_TEST_INFO(drvshmem_test_reserve_after_fork), ODP_TEST_INFO(drvshmem_test_singleva_after_fork), ODP_TEST_INFO(drvshmem_test_stress), + ODP_TEST_INFO(drvshmem_test_buddy_basic), ODP_TEST_INFO_NULL, }; diff --git a/test/common_plat/validation/drv/drvshmem/drvshmem.h b/test/common_plat/validation/drv/drvshmem/drvshmem.h index f4c26a1..ab45f7c 100644 --- a/test/common_plat/validation/drv/drvshmem/drvshmem.h +++ b/test/common_plat/validation/drv/drvshmem/drvshmem.h @@ -14,6 +14,7 @@ void drvshmem_test_basic(void); void drvshmem_test_reserve_after_fork(void); void drvshmem_test_singleva_after_fork(void); void drvshmem_test_stress(void); +void drvshmem_test_buddy_basic(void); /* test arrays: */ extern odp_testinfo_t drvshmem_suite[]; commit 9107db16944d821a1c959049acc1fe3ff29f2341 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 17 19:18:00 2017 +0100 linux-gen: drv: shm: adding pool allocator Adding functions to create memory pools and allocate / free memory from the created pools. These functions calls their _ishm conterpart, of course. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/drv_shm.c b/platform/linux-generic/drv_shm.c index 9b2560d..325632e 100644 --- a/platform/linux-generic/drv_shm.c +++ b/platform/linux-generic/drv_shm.c @@ -8,6 +8,7 @@ #include <odp/api/std_types.h> #include <odp/drv/shm.h> #include <_ishm_internal.h> +#include <_ishmpool_internal.h> static inline uint32_t from_handle(odpdrv_shm_t shm) { @@ -100,3 +101,46 @@ int odpdrv_shm_print_all(const char *title) { return _odp_ishm_status(title); } + +odpdrv_shm_pool_t odpdrv_shm_pool_create(const char *pool_name, + odpdrv_shm_pool_param_t *param) +{ + int flags; + + /* force unique address for all ODP threads */ + flags = _ODP_ISHM_SINGLE_VA; + return (odpdrv_shm_pool_t)_odp_ishm_pool_create(pool_name, + param->pool_size, + param->min_alloc, + param->max_alloc, + flags); +} + +int odpdrv_shm_pool_destroy(odpdrv_shm_pool_t pool) +{ + return _odp_ishm_pool_destroy((_odp_ishm_pool_t *)(void*)pool); +} + +odpdrv_shm_pool_t odpdrv_shm_pool_lookup(const char *name) +{ + return (odpdrv_shm_pool_t)_odp_ishm_pool_lookup(name); +} + +void *odpdrv_shm_pool_alloc(odpdrv_shm_pool_t pool, uint64_t size) +{ + return _odp_ishm_pool_alloc((_odp_ishm_pool_t *)(void*)pool, size); +} + +void odpdrv_shm_pool_free(odpdrv_shm_pool_t pool, void *addr) +{ + (void)_odp_ishm_pool_free((_odp_ishm_pool_t *)(void*)pool, addr); +} + +int odpdrv_shm_pool_print(const char *title, odpdrv_shm_pool_t pool) +{ + return _odp_ishm_pool_status(title, (_odp_ishm_pool_t *)(void*)pool); +} + +/** + * @} + */ commit 567c2e8a0fd6b51db8b82ce926cc41d4c0e7898b Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 17 19:17:59 2017 +0100 drv: adding odpdrv_shm_pool functions Adding functions to create and destroy memory pools (from which memory can be allocated and freed) are added. These functions enable the usage of small memory amount (compared to drvshm_reserve() whose granularity is the page size). The usage of this pool guatantees that allocated memory is sharable between ODP threads. (using malloc would not work when ODP threads are linux processes). Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/drv/spec/shm.h b/include/odp/drv/spec/shm.h index ef64f5d..ee8181f 100644 --- a/include/odp/drv/spec/shm.h +++ b/include/odp/drv/spec/shm.h @@ -220,6 +220,105 @@ int odpdrv_shm_print_all(const char *title); uint64_t odpdrv_shm_to_u64(odpdrv_shm_t hdl); /** + * drv shm pool parameters + * Used to communicate pool creation options. + */ +typedef struct { + /** Sum of all (simultaneous) allocs (bytes)*/ + uint64_t pool_size; + + /** Minimum alloc size user will request from pool (bytes)*/ + uint64_t min_alloc; + + /** Maximum alloc size user will request from pool (bytes)*/ + uint64_t max_alloc; +} odpdrv_shm_pool_param_t; + +/** + * @typedef odpdrv_shm_pool_t + * odpdrv shared memory pool + */ + +/** + * @def ODPDRV_SHM_POOL_INVALID + * Invalid odpdrv shared memory pool + */ + +/** + * Create a memory pool + * + * This routine is used to create a memory pool. The use of pool name is + * optional. + * Unique names are not required. However, odpdrv_shm_pool_lookup() + * returns only a single matching pool. + * + * @param pool_name Name of the pool or NULL. + * @param param Pool parameters. + * + * @return Handle of the created drv shm memory pool + * @retval ODPDRV_SHM_POOL_INVALID Pool could not be created + */ +odpdrv_shm_pool_t odpdrv_shm_pool_create(const char *pool_name, + odpdrv_shm_pool_param_t *param); + +/** + * Destroy a pool previously created by odpdrv_shm_pool_create() + * + * @param pool Handle of the pool to be destroyed + * + * @retval 0 Success + * @retval <0 Failure + * + * @note This routine destroys a previously created pool, and will destroy any + * internal shared memory objects associated with the pool. Results are + * undefined if an attempt is made to destroy a pool that contains allocated + * or otherwise active allocations. + */ +int odpdrv_shm_pool_destroy(odpdrv_shm_pool_t pool); + +/** + * Find a memory pool by name + * + * @param name Name of the pool + * + * @return Handle of the first matching pool + * @retval ODPDRV_SHM_POOL_INVALID Pool could not be found + */ +odpdrv_shm_pool_t odpdrv_shm_pool_lookup(const char *name); + +/** + * Allocate memory from a memory pool + * + * @param pool Memory pool handle + * @param size Number of bytes to allocate (bytes) + * + * @return A pointer to the allocated memory + * @retval NULL on error. + */ +void *odpdrv_shm_pool_alloc(odpdrv_shm_pool_t pool, uint64_t size); + +/** + * Free memory back to a memory pool + * + * @param pool Memory pool handle + * @param addr pointer to a previously allocated memory + * (as returned by a previous call to odpdrv_shm_pool_alloc) + */ +void odpdrv_shm_pool_free(odpdrv_shm_pool_t pool, void *addr); + +/** + * Print memory pool info + * + * @param title A string to be printed as a title (e.g. location) + * @param pool Memory pool handle + * + * @return 0 on success, negative value if pool inconsistency is detected. + * + * @note This routine writes implementation-defined information about the + * specified pool to the ODP log. The intended use is for debugging. + */ +int odpdrv_shm_pool_print(const char *title, odpdrv_shm_pool_t pool); +/** * @} */ diff --git a/platform/linux-generic/include/odp/drv/plat/shm_types.h b/platform/linux-generic/include/odp/drv/plat/shm_types.h index c48eeca..50a0837 100644 --- a/platform/linux-generic/include/odp/drv/plat/shm_types.h +++ b/platform/linux-generic/include/odp/drv/plat/shm_types.h @@ -35,6 +35,9 @@ static inline uint64_t odpdrv_shm_to_u64(odpdrv_shm_t hdl) return _odpdrv_pri(hdl); } +typedef ODPDRV_HANDLE_T(odpdrv_shm_pool_t); + +#define ODPDRV_SHM_POOL_INVALID _odpdrv_cast_scalar(odpdrv_shm_pool_t, NULL) /** * @} */ commit 91f1ce71dc3d2694152d71690c1e7638716b9391 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Tue Jan 17 19:17:58 2017 +0100 linux-gen: _ishm: adding buddy and slab allocation _ishm now provides functions to create/destroy pools for buddy/slab memory allocation, as well as functions to allocated/release memory from the created pools. Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org> Reviewed-and-tested-by: Yi He <yi.he(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index eeb401f..74e606d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -127,6 +127,7 @@ noinst_HEADERS = \ ${srcdir}/include/_fdserver_internal.h \ ${srcdir}/include/_ishm_internal.h \ ${srcdir}/include/_ishmphy_internal.h \ + ${srcdir}/include/_ishmpool_internal.h \ ${srcdir}/include/odp_align_internal.h \ ${srcdir}/include/odp_atomic_internal.h \ ${srcdir}/include/odp_buffer_inlines.h \ @@ -172,6 +173,7 @@ __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ _ishm.c \ _ishmphy.c \ + _ishmpool.c \ odp_atomic.c \ odp_barrier.c \ odp_bitmap.c \ diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 23f620d..4c2578b 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -59,6 +59,7 @@ #include <_fdserver_internal.h> #include <_ishm_internal.h> #include <_ishmphy_internal.h> +#include <_ishmpool_internal.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -1441,8 +1442,19 @@ int _odp_ishm_init_global(void) * is performed for the main thread... Many init_global() functions * indeed assume the availability of odp_shm_reserve()...: */ - return do_odp_ishm_init_local(); + if (do_odp_ishm_init_local()) { + ODP_ERR("unable to init the main thread\n."); + goto init_glob_err4; + } + + /* get ready to create pools: */ + _odp_ishm_pool_init(); + return 0; + +init_glob_err4: + if (_odp_ishmphy_unbook_va()) + ODP_ERR("unable to unbook virtual space\n."); init_glob_err3: if (munmap(ishm_ftbl, sizeof(ishm_ftable_t)) < 0) ODP_ERR("unable to munmap main fragment table\n."); diff --git a/platform/linux-generic/_ishmpool.c b/platform/linux-generic/_ishmpool.c new file mode 100644 index 0000000..df6e49e --- /dev/null +++ b/platform/linux-generic/_ishmpool.c @@ -0,0 +1,811 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* This file gathers the buddy and slab allocation functionality provided + * by _ishm. + * _odp_ishmpool_create() can be used to create a pool for buddy/slab + * allocation. _odp_ishmpool_create() will allocate a memory area using + * ishm_reserve() for both the control part (needed for tracking + * allocation/free...) and the user memory itself (part of which will be given + * at each ishmpool_alloc()). + * The element size provided at pool creation time determines whether + * to pool will of type buddy or slab. + * For buddy, all allocations are rounded to the nearest power of 2. + * + * The implementation of the buddy allocator is very traditional: it + * maintains N lists of free buffers. + * The control part actually contains these N queue heads, (N-M are actually + * used), the free buffers themselves being used for chaining (the chaining info + * is in the buffers: as they are "free" they should not be touched by the + * user). The control part also contains a array of bytes for remembering + * the size (actually the order) of the allocated buffers: + * There are 2^(N-M) such bytes, this number being the maximum number of + * allocated buffers (when all allocation are <= 2^M bytes) + * Buddy allocators handle fragmentation by splitting or merging blocks by 2. + * They guarantee a minimum efficiency of 50%, at worse case fragmentation. + * + * Slab implementation is even simpler, all free elements being queued in + * one single queue at init, taken from this queue when allocated and + * returned to this same queue when freed. + * + * The reason for not using malloc() is that malloc does not guarantee + * memory sharability between ODP threads (regardless of their implememtation) + * which ishm_reserve() can do. see the comments around + * _odp_ishmbud_pool_create() and ishm_reserve() for more details. + * + * This file is divided in 3 sections: the first one regroups functions + * needed by the buddy allocation. + * The second one regroups the functions needed by the slab allocator. + * The third section regroups the common functions exported externally. + */ + +#include <odp_posix_extensions.h> +#include <odp_internal.h> +#include <odp/api/spinlock.h> +#include <odp/api/align.h> +#include <odp/api/debug.h> +#include <odp/drv/shm.h> +#include <odp_shm_internal.h> +#include <odp_debug_internal.h> +#include <odp_align_internal.h> +#include <_ishm_internal.h> +#include <_ishmpool_internal.h> +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <inttypes.h> + +#define BUDDY_MIN_SIZE 32 /* minimal buddy allocation size */ + +typedef _odp_ishm_pool_t pool_t; /* for shorter writing */ + +/* array of ishm block index used for pools. only used for pool + * lookup by name */ +#define MAX_NB_POOL 100 +static int pool_blk_idx[MAX_NB_POOL]; + +/* section 1: functions for buddy allocation: */ + +/* free buddy blocks contains the following structure, used to link the + * free blocks together. + */ +typedef struct bblock_t { + struct bblock_t *next; + uint32_t order; +} bblock_t; + +/* value set in the 'order' table when the block is not allocated: */ +#define BBLOCK_FREE 0 + +/* compute ceil(log2(size)) */ +static uint8_t clog2(uint64_t size) +{ + uint64_t sz; + uint32_t bit; + uint8_t res; + + sz = size; /* we start by computing res = log2(sz)... */ + res = 0; + for (bit = 32; bit ; bit >>= 1) { + if (sz >= ((uint64_t)1 << bit)) { + sz >>= bit; + res += bit; + } + } + if (((uint64_t)1 << res) < size) /* ...and then ceil(x) */ + res++; + + return res; +} + +/* + * given a bblock address, and an order value, returns the address + * of the buddy bblock (the other "half") + */ +static inline bblock_t *get_bblock_buddy(pool_t *bpool, bblock_t *addr, + uint8_t order) +{ + uintptr_t b; + + b = ((uintptr_t)addr - (uintptr_t)bpool->ctrl.user_addr); + b ^= 1 << order; + return (void *)(b + (uintptr_t)bpool->ctrl.user_addr); +} + +/* + * given a buddy block address, return its number (used for busy flags): + */ +static inline uintptr_t get_bblock_nr(pool_t *bpool, void *addr) +{ + uintptr_t b; + uint8_t min_order; + + min_order = bpool->ctrl.min_order; + b = ((uintptr_t)addr - (uintptr_t)bpool->ctrl.user_addr) >> min_order; + return b; +} + +/* remove bblock from the list for bblocks of rank order. The bblock to be + * removed is really expected to be on the list: not finding it is an error */ +static inline void remove_from_list(pool_t *bpool, uint8_t order, + bblock_t *bblock) +{ + bblock_t *curr; /* current bblock (when parsing list) */ + bblock_t *prev; /* previous bblock (when parsing list) */ + + curr = bpool->ctrl.free_heads[order]; + if (!curr) + goto remove_from_list_error; + + if (curr == bblock) { + bpool->ctrl.free_heads[order] = curr->next; + return; + } + + while (curr) { + if (curr == bblock) { + prev->next = curr->next; + return; + } + prev = curr; + curr = curr->next; + } + +remove_from_list_error: + ODP_ERR("List corrupted\n"); +} + +/* + * create a buddy memory pool of given size (actually nearest power of 2), + * where allocation will never be smaller than min_alloc. + * returns a pointer to the created buddy_pool + * The allocated area contains: + * - The _odp_ishm_pool_ctrl_t structure + * - The array of ((order - min_order) of free list heads + * - The array of 'order' values, remembering sizes of allocated bblocks + * - alignment to cache line + * - The user memory + */ +static pool_t *_odp_ishmbud_pool_create(const char *pool_name, int store_idx, + uint64_t size, + uint64_t min_alloc, int flags) +{ + uint8_t order; /* pool order = ceil(log2(size)) */ + uint8_t min_order; /* pool min_order = ceil(log2(min_alloc))*/ + uint32_t max_nb_bblock; /* max number of bblock, when smallest */ + uint32_t control_sz; /* size of control area */ + uint32_t free_head_sz; /* mem area needed for list heads */ + uint32_t saved_order_sz; /* mem area to remember given sizes */ + uint64_t user_sz; /* 2^order bytes */ + uint64_t total_sz; /* total size to request */ + int blk_idx; /* as returned by _ishm_resrve() */ + pool_t *bpool; + int i; + bblock_t *first_block; + + /* a bblock_t must fit in the buffers for linked chain! */ + if (min_alloc < sizeof(bblock_t)) + min_alloc = sizeof(bblock_t); + + /* pool order is such that 2^order = size. same for min_order */ + order = clog2(size); + min_order = clog2(min_alloc); + + /* check parameters obvious wishes: */ + if (order >= 64) + return NULL; + if (order < min_order) + return NULL; + + /* at worst case, all bblocks have smallest (2^min_order) size */ + max_nb_bblock = (1 << (order - min_order)); + + /* space needed for the control area (padded to cache line size)*/ + control_sz = + ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(_odp_ishm_pool_ctrl_t)); + + /* space needed for 'order' free bblock list heads: */ + /* Note that only lists from min_order to order are really used.*/ + free_head_sz = ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(void *) * + (order + 1)); + + /* space needed for order -i.e. size- storage of alloc'd bblock:*/ + saved_order_sz = ODP_CACHE_LINE_SIZE_ROUNDUP(max_nb_bblock * + sizeof(uint8_t)); + + /* space needed for user area is 2^order bytes: */ + user_sz = 1 << order; + + total_sz = control_sz + + free_head_sz + + saved_order_sz + + user_sz; + + /* allocate required memory: */ + blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1, + ODP_CACHE_LINE_SIZE, flags, 0); + if (blk_idx < 0) { + ODP_ERR("_odp_ishm_reserve failed."); + return NULL; + } + + bpool = _odp_ishm_address(blk_idx); + if (bpool == NULL) { + ODP_ERR("_odp_ishm_address failed."); + return NULL; + } + + /* store in pool array (needed for look up): */ + pool_blk_idx[store_idx] = blk_idx; + + /* remember block index, needed when pool is destroyed */ + bpool->ctrl.ishm_blk_idx = blk_idx; + + /* remember element size: 0 means unknown size, i.e. buddy alloation*/ + bpool->ctrl.element_sz = 0; + + /* prepare mutex: */ + odp_spinlock_init(&bpool->ctrl.lock); + + /* initialise pointers and things... */ + bpool->ctrl.order = order; + bpool->ctrl.min_order = min_order; + bpool->ctrl.free_heads = + (void *)((uintptr_t)bpool + control_sz); + bpool->ctrl.alloced_order = + (uint8_t *)((uintptr_t)bpool->ctrl.free_heads + free_head_sz); + bpool->ctrl.user_addr = + (void *)((uintptr_t)bpool->ctrl.alloced_order + saved_order_sz); + + /* initialize all free list to NULL, except the top biggest element:*/ + for (i = 0; i < (order - min_order); i++) + bpool->ctrl.free_heads[i] = NULL; + bpool->ctrl.free_heads[order] = bpool->ctrl.user_addr; + first_block = (bblock_t *)bpool->ctrl.user_addr; + first_block->next = NULL; + first_block->order = order; + + /* set all 'order' of allocated bblocks to free: */ + memset(bpool->ctrl.alloced_order, BBLOCK_FREE, saved_order_sz); + + return bpool; +} + +/* allocated memory from the given buddy pool */ +static void *_odp_ishmbud_alloc(pool_t *bpool, uint64_t size) +{ + uint32_t rq_order; /* requested order */ + uint32_t try_order; + bblock_t *bblock; + bblock_t *buddy; + uintptr_t nr; + + /* if size is zero or too big reject: */ + if ((!size) && (size > (1U << bpool->ctrl.order))) { + ODP_ERR("Invalid alloc size (0 or larger than whole pool)\n"); + return NULL; + } + + /* compute ceil(log2(size)), to get the requested block order: */ + rq_order = clog2(size); + + /* make sure the requested order is bigger (or same) as minimum! */ + if (rq_order < bpool->ctrl.min_order) + rq_order = bpool->ctrl.min_order; + + /* mutex from here: */ + odp_spinlock_lock(&bpool->ctrl.lock); + + /* now, start trying to allocate a bblock of rq_order. If that + * fails keep trying larger orders until pool order is reached */ + bblock = NULL; + for (try_order = rq_order; try_order <= bpool->ctrl.order; + try_order++) { + if (bpool->ctrl.free_heads[try_order]) { + /* remove from list: */ + bblock = + (bblock_t *)(bpool->ctrl.free_heads[try_order]); + bpool->ctrl.free_heads[try_order] = bblock->next; + break; + } + } + + if (!bblock) { + odp_spinlock_unlock(&bpool->ctrl.lock); + ODP_ERR("Out of memory. (Buddy pool full)\n"); + return NULL; + } + + /* OK: we got a block, but possibbly too large (if try_order>rq_order) + * return the extra halves to the pool hence splitting the bblock at + * each 'extra' order: */ + while (try_order-- > rq_order) { + /* split: */ + buddy = (bblock_t *)((uintptr_t)bblock + (1 << try_order)); + buddy->order = try_order; + /* add to list: */ + buddy->next = bpool->ctrl.free_heads[try_order]; + bpool->ctrl.free_heads[try_order] = buddy; + /* mark as free (non allocated block get size 0): */ + nr = get_bblock_nr(bpool, buddy); + bpool->ctrl.alloced_order[nr] = BBLOCK_FREE; + } + + /* remember the size if the allocated block: */ + nr = get_bblock_nr(bpool, bblock); + bpool->ctrl.alloced_order[nr] = rq_order; + + /* and return the allocated block! */ + odp_spinlock_unlock(&bpool->ctrl.lock); + return (void *)bblock; +} + +/* free a previously allocated buffer from a given buddy pool */ +static int _odp_ishmbud_free(pool_t *bpool, void *addr) +{ + uintptr_t user_start; /* start of user area */ + uintptr_t user_stop; /* stop of user area */ + uintptr_t mask; /* 2^min_order - 1 */ + bblock_t *bblock; /* bblock being freed */ + bblock_t *buddy; /* buddy bblock of bblock being freed */ + uint8_t order; /* order of block being freed */ + uintptr_t nr; /* block number */ + + /* freeing NULL is regarded as OK, though without any effect: */ + if (!addr) + return 0; + + user_start = (uintptr_t)bpool->ctrl.user_addr; + user_stop = user_start + ((uintptr_t)1 << bpool->ctrl.order); + mask = ((uintptr_t)1 << bpool->ctrl.min_order) - 1; + + /* some sanity checks: check that given address is within pool and + * that relative address has 2^min_order granularity: */ + if (((uintptr_t)addr < user_start) || + ((uintptr_t)addr > user_stop) || + (((uintptr_t)addr - user_start) & mask)) { + ODP_ERR("Invalid address to be freed\n"); + return -1; + } + + /* mutex from here: */ + odp_spinlock_lock(&bpool->ctrl.lock); + + /* collect saved block order and make sure bblock was allocated */ + bblock = (bblock_t *)addr; + nr = get_bblock_nr(bpool, bblock); + order = bpool->ctrl.alloced_order[nr]; + if (order == BBLOCK_FREE) { + ODP_ERR("Double free error\n"); + odp_spinlock_unlock(&bpool->ctrl.lock); + return -1; + } + + /* this looks like a valid free, mark at least this as free: */ + bpool->ctrl.alloced_order[nr] = BBLOCK_FREE; + + /* go up in orders, trying to merge buddies... */ + while (order < bpool->ctrl.order) { + buddy = get_bblock_buddy(bpool, bblock, order); + /*if buddy is not free: no further merge possible */ + nr = get_bblock_nr(bpool, buddy); + if (bpool->ctrl.alloced_order[nr] != BBLOCK_FREE) + break; + /*merge only bblock of same order:*/ + if (buddy->order != order) + break; + /*merge: remove buddy from free list: */ + remove_from_list(bpool, order, buddy); + /*merge: make sure we point at start of block: */ + if (bblock > buddy) + bblock = buddy; + /*merge: size of bloack has dubbled: increse order: */ + order++; + } + + /* insert the bblock into its correct free block list: */ + bblock->next = bpool->ctrl.free_heads[order]; + bpool->ctrl.free_heads[order] = bblock; + + /* remember the (possibly now merged) block order: */ + bblock->order = order; + + odp_spinlock_unlock(&bpool->ctrl.lock); + return 0; +} + +/* print buddy pool status and performs sanity checks */ +static int _odp_ishmbud_pool_status(const char *title, pool_t *bpool) +{ + uint8_t order, pool_order, pool_min_order; + uint64_t free_q_nb_bblocks[64]; + uint64_t allocated_nb_bblocks[64]; + uint64_t free_q_nb_bblocks_bytes[64]; + uint64_t allocated_nb_bblocks_bytes[64]; + uint64_t total_bytes_free; + uint64_t total_bytes_allocated; + uint64_t nr; + bblock_t *bblock; + int res = 0; + + odp_spinlock_lock(&bpool->ctrl.lock); + + pool_order = bpool->ctrl.order; + pool_min_order = bpool->ctrl.min_order; + + ODP_DBG("\n%s\n", title); + ODP_DBG("Pool Type: BUDDY\n"); + ODP_DBG("pool size: %" PRIu64 " (bytes)\n", (1UL << pool_order)); + ODP_DBG("pool order: %d\n", (int)pool_order); + ODP_DBG("pool min_order: %d\n", (int)pool_min_order); + + /* a pool wholse order is more than 64 cannot even be reached on 64 + * bit machines! */ + if (pool_order > 64) { + odp_spinlock_unlock(&bpool->ctrl.lock); + return -1; + } + + total_bytes_free = 0; + total_bytes_allocated = 0; + + /* for each queue */ + for (order = pool_min_order; order <= pool_order; order++) { + free_q_nb_bblocks[order] = 0; + free_q_nb_bblocks_bytes[order] = 0; + allocated_nb_bblocks[order] = 0; + allocated_nb_bblocks_bytes[order] = 0; + + /* get the number of buffs in the free queue for this order: */ + bblock = bpool->ctrl.free_heads[order]; + while (bblock) { + free_q_nb_bblocks[order]++; + free_q_nb_bblocks_bytes[order] += (1 << order); + bblock = bblock->next; + } + + total_bytes_free += free_q_nb_bblocks_bytes[order]; + + /* get the number of allocated buffers of this order */ + for (nr = 0; + nr < (1U << (pool_order - pool_min_order)); nr++) { + if (bpool->ctrl.alloced_order[nr] == order) + allocated_nb_bblocks[order]++; + } + + allocated_nb_bblocks_bytes[order] = + allocated_nb_bblocks[order] * (1 << order); + + total_bytes_allocated += allocated_nb_bblocks_bytes[order]; + + ODP_DBG("Order %d => Free: %" PRIu64 " buffers " + "(%" PRIu64" bytes) " + "Allocated %" PRIu64 " buffers (%" PRIu64 " bytes) " + "Total: %" PRIu64 " bytes\n", + (int)order, free_q_nb_bblocks[order], + free_q_nb_bblocks_bytes[order], + allocated_nb_bblocks[order], + allocated_nb_bblocks_bytes[order], + free_q_nb_bblocks_bytes[order] + + allocated_nb_bblocks_bytes[order]); + } + + ODP_DBG("Allocated space: %" PRIu64 " (bytes)\n", + total_bytes_allocated); + ODP_DBG("Free space: %" PRIu64 " (bytes)\n", total_bytes_free); + + if (total_bytes_free + total_bytes_allocated != (1U << pool_order)) { + ODP_DBG("Lost bytes on this pool!\n"); + res = -1; + } + + if (res) + ODP_DBG("Pool inconsistent!\n"); + + odp_spinlock_unlock(&bpool->ctrl.lock); + return res; +} + +/* section 2: functions for slab allocation: */ + +/* free slab blocks contains the following structure, used to link the + * free blocks together. + */ +typedef struct sblock_t { + struct sblock_t *next; +} sblock_t; + +/* + * create a slab memory pool of given size (rounded up to the nearest integer + * number of element, where each element has size 'elt_size'). + * returns a pointer to the created slab pool. + * The allocated area contains: + * - The _odp_ishm_pool_ctrl_t structure + * - alignment to cache line + * - The user memory + */ +static pool_t *_odp_ishmslab_pool_create(const char *pool_name, int store_idx, + uint64_t size, + uint64_t elt_size, int flags) +{ + uint32_t nb_sblock; /* number of elements in the pool */ + uint32_t control_sz; /* size of control area */ + uint64_t total_sz; /* total size to request */ + uint64_t user_sz; /* 2^order bytes */ + int blk_idx; /* as returned by _ishm_reserve() */ + pool_t *spool; + unsigned int i; + sblock_t *block; + + /* a sblock_t must fit in the buffers for linked chain! */ + if (elt_size < sizeof(bblock_t)) { + elt_size = sizeof(bblock_t); + size = size * (sizeof(bblock_t) / elt_size + + ((sizeof(bblock_t) % elt_size) ? 1 : 0)); + } + + /* nb of element fitting in the pool is just ceil(size/elt_size)*/ + nb_sblock = (size / elt_size) + ((size % elt_size) ? 1 : 0); + + /* space needed for the control area (padded to cache line size)*/ + control_sz = + ODP_CACHE_LINE_SIZE_ROUNDUP(sizeof(_odp_ishm_pool_ctrl_t)); + + /* space needed for user area is : */ + user_sz = nb_sblock * elt_size; + + total_sz = control_sz + + user_sz; + + /* allocate required memory: */ + blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1, + ODP_CACHE_LINE_SIZE, flags, 0); + if (blk_idx < 0) { + ODP_ERR("_odp_ishm_reserve failed."); + return NULL; + } + + spool = _odp_ishm_address(blk_idx); + if (spool == NULL) { + ODP_ERR("_odp_ishm_address failed."); + return NULL; + } + + /* store in pool array (needed for look up): */ + pool_blk_idx[store_idx] = blk_idx; + + /* remember block index, needed when pool is destroyed */ + spool->ctrl.ishm_blk_idx = blk_idx; + + /* remember element (sblock) size and their number: */ + spool->ctrl.element_sz = elt_size; + spool->ctrl.nb_elem = nb_sblock; + + /* prepare mutex: */ + odp_spinlock_init(&spool->ctrl.lock); + + /* initialise pointers and things... */ + spool->ctrl.user_addr = + (void *)((uintptr_t)spool + control_sz); + + /* initialise the free list with the list of all elements:*/ + spool->ctrl.free_head = spool->ctrl.user_addr; + for (i = 0; i < nb_sblock - 1; i++) { + block = (sblock_t *)((uintptr_t)spool->ctrl.user_addr + + i * (uintptr_t)elt_size); + block->next = (sblock_t *)((uintptr_t)block + + (uintptr_t)elt_size); + } + block = (sblock_t *)((uintptr_t)spool->ctrl.user_addr + + (nb_sblock - 1) * (uintptr_t)elt_size); + block->next = NULL; + + return spool; +} + +/* allocated memory from the given slab pool */ +static void *_odp_ishmslab_alloc(pool_t *spool, uint64_t size) +{ + void *ret; + sblock_t *block; + + if (size > spool->ctrl.element_sz) + return NULL; + + odp_spinlock_lock(&spool->ctrl.lock); + ret = spool->ctrl.free_head; + if (!ret) { + odp_spinlock_unlock(&spool->ctrl.lock); + ODP_ERR("Out of memory. (Slab pool full)\n"); + return NULL; + } + + block = (sblock_t *)ret; + spool->ctrl.free_head = block->next; + + odp_spinlock_unlock(&spool->ctrl.lock); + return ret; +} + +/* free a previously allocated buffer from a given slab pool */ +static int _odp_ishmslab_free(pool_t *spool, void *addr) +{ + uintptr_t user_start; /* start of user area */ + uintptr_t user_stop; /* stop of user area */ + sblock_t *block; + + /* freeing NULL is regarded as OK, though without any effect: */ + if (!addr) + return 0; + + user_start = (uintptr_t)spool->ctrl.user_addr; + user_stop = user_start + spool->ctrl.element_sz * spool->ctrl.nb_elem; + + /* some sanity checks: check that given address is within pool and + * that relative address has element_sz granularity: */ + if (((uintptr_t)addr < user_start) || + ((uintptr_t)addr > user_stop) || + (((uintptr_t)addr - user_start) % spool->ctrl.element_sz)) { + ODP_ERR("Invalid address to be freed\n"); + return -1; + } + + odp_spinlock_lock(&spool->ctrl.lock); + block = (sblock_t *)addr; + block->next = (sblock_t *)spool->ctrl.free_head; + spool->ctrl.free_head = addr; + odp_spinlock_unlock(&spool->ctrl.lock); + + return 0; +} + +/* print slab pool status and performs sanity checks */ +static int _odp_ishmslab_pool_status(const char *title, pool_t *spool) +{ + sblock_t *sblock; + uint64_t nb_free_elts; /* number of free elements */ + + odp_spinlock_lock(&spool->ctrl.lock); + + ODP_DBG("\n%s\n", title); + ODP_DBG("Pool Type: FIXED SIZE\n"); + ODP_DBG("pool size: %" PRIu64 " (bytes)\n", + spool->ctrl.nb_elem * spool->ctrl.element_sz); + + /* count the number of free elements in the free list: */ + nb_free_elts = 0; + sblock = (sblock_t *)spool->ctrl.free_head; + while (sblock) { + nb_free_elts++; + sblock = sblock->next; + } + + ODP_DBG("%" PRIu64 "/%" PRIu64 " available elements.\n", + nb_free_elts, spool->ctrl.nb_elem); + + odp_spinlock_unlock(&spool->ctrl.lock); + return 0; +} + +/* section 3: common, external functions: */ + +/* create a pool: either with fixed alloc size (if max_alloc/min_alloc<2) or + * of variable block size (if max_alloc == 0) */ +pool_t *_odp_ishm_pool_create(const char *pool_name, uint64_t size, + uint64_t min_alloc, uint64_t max_alloc, int flags) +{ + int store_idx; + uint64_t real_pool_sz; + + if (min_alloc > max_alloc) { + ODP_ERR("invalid parameter: min_alloc > max_alloc"); + return NULL; + } + + /* search for a free index in pool_blk_idx for the pool */ + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] < 0) + break; + } + if (store_idx == MAX_NB_POOL) { + ODP_ERR("Max number of pool reached (MAX_NB_POOL)"); + return NULL; + } + + if ((min_alloc == 0) || ((max_alloc / min_alloc) > 2)) { + /* alloc variation is not constant enough: we go for a buddy + * allocator. The pool efficiency may go as low as 50% + * so we double the required size to make sure we can satisfy + * the user request */ + real_pool_sz = 2 * size; + return _odp_ishmbud_pool_create(pool_name, store_idx, + real_pool_sz, + BUDDY_MIN_SIZE, flags); + } else { + /* min and max are close enough so we go for constant size + * allocator: + * make sure the pool can fit the required size, even when + * only min_alloc allocation are performed: */ + real_pool_sz = ((size / min_alloc) + + ((size % min_alloc) ? 1 : 0)) + * max_alloc; + return _odp_ishmslab_pool_create(pool_name, store_idx, + real_pool_sz, + max_alloc, flags); + } +} + +/* destroy a pool. everything goes away. no operation on the pool should + * follow. */ +int _odp_ishm_pool_destroy(pool_t *pool) +{ + int store_idx; + + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] == pool->ctrl.ishm_blk_idx) { + pool_blk_idx[store_idx] = -1; + break; + } + } + + return _odp_ishm_free_by_index(pool->ctrl.ishm_blk_idx); +} + +/* allocated a buffer from a pool */ +void *_odp_ishm_pool_alloc(_odp_ishm_pool_t *pool, uint64_t size) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_alloc(pool, size); + else + return _odp_ishmslab_alloc(pool, size); +} + +/* free a previously allocated buffer from a pool */ +int _odp_ishm_pool_free(_odp_ishm_pool_t *pool, void *addr) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_free(pool, addr); + else + return _odp_ishmslab_free(pool, addr); +} + +/* Print a pool status */ +int _odp_ishm_pool_status(const char *title, _odp_ishm_pool_t *pool) +{ + if (!pool->ctrl.element_sz) + return _odp_ishmbud_pool_status(title, pool); + else + return _odp_ishmslab_pool_status(title, pool); +} + +void _odp_ishm_pool_init(void) +{ + int i; + + for (i = 0; i < MAX_NB_POOL; i++) + pool_blk_idx[i] = -1; +} + +_odp_ishm_pool_t *_odp_ishm_pool_lookup(const char *pool_name) +{ + int block_idx; + int store_idx; + + /* search for a _ishm block with the given name */ + block_idx = _odp_ishm_lookup_by_name(pool_name); + if (block_idx < 0) + return NULL; + + /* a block with that name exists: make sure it is within + * the registered pools */ + for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) { + if (pool_blk_idx[store_idx] == block_idx) + return _odp_ishm_address(block_idx); + } + + return NULL; +} diff --git a/platform/linux-generic/include/_ishmpool_internal.h b/platform/linux-generic/include/_ishmpool_internal.h new file mode 100644 index 0000000..5c5304a --- /dev/null +++ b/platform/linux-generic/include/_ishmpool_internal.h @@ -0,0 +1,56 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ISHMBUDDY_INTERNAL_H_ +#define ODP_ISHMBUDDY_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> +#include <odp/api/spinlock.h> + +typedef struct _odp_ishm_pool_ctrl_t { + uint32_t element_sz; /* 0 for buddy pools, >0 for slab. */ + int ishm_blk_idx; /* the block index returned by _ishm_resrve()*/ + odp_spinlock_t lock; /* for pool access mutex */ + void *user_addr; /* user pool area ('real user pool') */ + union { + struct { /* things needed for buddy pools: */ + uint8_t order; /* pool is 2^order bytes long */ + uint8_t min_order; /*alloc won't go below 2^min_order*/ + void **free_heads; /* 'order' free list heads. */ + uint8_t *alloced_order; /* size of blocks, 0=free */ + }; + struct { /* things needed for slab pools: */ + void *free_head; /* free element list head */ + uint64_t nb_elem;/* total number of elements in pool */ + }; + }; +} _odp_ishm_pool_ctrl_t; + +typedef struct _odp_ishm_pool_t { + _odp_ishm_pool_ctrl_t ctrl; /* control part */ + uint8_t mem[1]; /* area for heads, saved alloc'd orders, data*/ +} _odp_ishm_pool_t; + +_odp_ishm_pool_t *_odp_ishm_pool_create(const char *pool_name, + uint64_t size, + uint64_t min_alloc, + uint64_t max_alloc, int flags); +int _odp_ishm_pool_destroy(_odp_ishm_pool_t *pool); +void *_odp_ishm_pool_alloc(_odp_ishm_pool_t *pool, uint64_t size); +int _odp_ishm_pool_free(_odp_ishm_pool_t *pool, void *addr); +int _odp_ishm_pool_status(const char *title, _odp_ishm_pool_t *pool); +_odp_ishm_pool_t *_odp_ishm_pool_lookup(const char *pool_name); +void _odp_ishm_pool_init(void); + +#ifdef __cplusplus +} +#endif + +#endif ----------------------------------------------------------------------- Summary of changes: include/odp/drv/spec/shm.h | 99 +++ platform/linux-generic/Makefile.am | 2 + platform/linux-generic/_ishm.c | 14 +- platform/linux-generic/_ishmpool.c | 811 +++++++++++++++++++++ platform/linux-generic/drv_shm.c | 44 ++ .../linux-generic/include/_ishmpool_internal.h | 56 ++ .../linux-generic/include/odp/drv/plat/shm_types.h | 3 + .../common_plat/validation/drv/drvshmem/drvshmem.c | 355 +++++++++ .../common_plat/validation/drv/drvshmem/drvshmem.h | 3 + 9 files changed, 1386 insertions(+), 1 deletion(-) create mode 100644 platform/linux-generic/_ishmpool.c create mode 100644 platform/linux-generic/include/_ishmpool_internal.h hooks/post-receive --

9 years

[COMMIT] branch api-next updated. v1.12.0.0-234-g00070be

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 00070be1d569bd575b100d52e5e263eb89ac962c (commit) via 7c24a62ac2cf48e42306db70fcc9967ab7709a8d (commit) from 746253e631e4926b3e2e383ae02c258c0cca583f (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 00070be1d569bd575b100d52e5e263eb89ac962c Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jan 12 15:21:15 2017 +0200 validation: ipsec: add test for odp_ipsec_capability() Signed-off-by: Matias Elo <matias.elo(a)nokia.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/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 index 1fc350d..13a13bd 100644 --- a/test/common_plat/m4/configure.m4 +++ b/test/common_plat/m4/configure.m4 @@ -17,6 +17,7 @@ AC_CONFIG_FILES([test/common_plat/Makefile test/common_plat/validation/api/errno/Makefile test/common_plat/validation/api/hash/Makefile test/common_plat/validation/api/init/Makefile + test/common_plat/validation/api/ipsec/Makefile test/common_plat/validation/api/lock/Makefile test/common_plat/validation/api/packet/Makefile test/common_plat/validation/api/pktio/Makefile diff --git a/test/common_plat/validation/api/Makefile.am b/test/common_plat/validation/api/Makefile.am index e2d30a6..0bab4c4 100644 --- a/test/common_plat/validation/api/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -7,6 +7,7 @@ ODP_MODULES = atomic \ errno \ hash \ init \ + ipsec \ lock \ queue \ packet \ diff --git a/test/common_plat/validation/api/ipsec/.gitignore b/test/common_plat/validation/api/ipsec/.gitignore new file mode 100644 index 0000000..2def047 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/.gitignore @@ -0,0 +1 @@ +ipsec_main diff --git a/test/common_plat/validation/api/ipsec/Makefile.am b/test/common_plat/validation/api/ipsec/Makefile.am new file mode 100644 index 0000000..106b8dc --- /dev/null +++ b/test/common_plat/validation/api/ipsec/Makefile.am @@ -0,0 +1,10 @@ +include ../Makefile.inc + +noinst_LTLIBRARIES = libtestipsec.la +libtestipsec_la_SOURCES = ipsec.c + +test_PROGRAMS = ipsec_main$(EXEEXT) +dist_ipsec_main_SOURCES = ipsec_main.c +ipsec_main_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) + +EXTRA_DIST = ipsec.h diff --git a/test/common_plat/validation/api/ipsec/ipsec.c b/test/common_plat/validation/api/ipsec/ipsec.c new file mode 100644 index 0000000..7834803 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec.c @@ -0,0 +1,44 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp_api.h> +#include <odp_cunit_common.h> +#include <unistd.h> + +#include "ipsec.h" + +void ipsec_test_capability(void) +{ + odp_ipsec_capability_t capa; + + CU_ASSERT(odp_ipsec_capability(&capa) == 0); +} + +odp_testinfo_t ipsec_suite[] = { + ODP_TEST_INFO(ipsec_test_capability), + ODP_TEST_INFO_NULL +}; + +odp_suiteinfo_t ipsec_suites[] = { + {"IPsec", NULL, NULL, ipsec_suite}, + ODP_SUITE_INFO_NULL, +}; + +int ipsec_main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + ret = odp_cunit_register(ipsec_suites); + + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/api/ipsec/ipsec.h b/test/common_plat/validation/api/ipsec/ipsec.h new file mode 100644 index 0000000..290a186 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _ODP_TEST_IPSEC_H_ +#define _ODP_TEST_IPSEC_H_ + +#include <odp_cunit_common.h> + +/* test functions: */ +void ipsec_test_capability(void); + +/* test arrays: */ +extern odp_testinfo_t ipsec_suite[]; + +/* test registry: */ +extern odp_suiteinfo_t ipsec_suites[]; + +/* main test program: */ +int ipsec_main(int argc, char *argv[]); + +#endif diff --git a/test/common_plat/validation/api/ipsec/ipsec_main.c b/test/common_plat/validation/api/ipsec/ipsec_main.c new file mode 100644 index 0000000..63a7a55 --- /dev/null +++ b/test/common_plat/validation/api/ipsec/ipsec_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "ipsec.h" + +int main(int argc, char *argv[]) +{ + return ipsec_main(argc, argv); +} diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index 888da5d..26d39cc 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -21,6 +21,7 @@ TESTS = validation/api/pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/init/init_main_ok$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/init/init_main_abort$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/init/init_main_log$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/ipsec/ipsec_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/lock/lock_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/packet/packet_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/pool/pool_main$(EXEEXT) \ commit 7c24a62ac2cf48e42306db70fcc9967ab7709a8d Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jan 12 15:21:14 2017 +0200 linux-gen: ipsec: add capability function Add IPsec capability function (groundwork for a proper IPsec implementation). Signed-off-by: Matias Elo <matias.elo(a)nokia.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/Makefile.am b/platform/linux-generic/Makefile.am index 6bbe775..eeb401f 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -187,6 +187,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_hash.c \ odp_init.c \ odp_impl.c \ + odp_ipsec.c \ odp_name_table.c \ odp_packet.c \ odp_packet_flags.c \ diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c new file mode 100644 index 0000000..ce7fded --- /dev/null +++ b/platform/linux-generic/odp_ipsec.c @@ -0,0 +1,16 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/ipsec.h> + +#include <string.h> + +int odp_ipsec_capability(odp_ipsec_capability_t *capa) +{ + memset(capa, 0, sizeof(odp_ipsec_capability_t)); + + return 0; +} ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 1 + platform/linux-generic/odp_ipsec.c | 16 ++++++++ test/common_plat/m4/configure.m4 | 1 + test/common_plat/validation/api/Makefile.am | 1 + test/common_plat/validation/api/ipsec/.gitignore | 1 + test/common_plat/validation/api/ipsec/Makefile.am | 10 +++++ test/common_plat/validation/api/ipsec/ipsec.c | 44 ++++++++++++++++++++++ test/common_plat/validation/api/ipsec/ipsec.h | 24 ++++++++++++ .../api/{errno/errno_main.c => ipsec/ipsec_main.c} | 6 +-- test/linux-generic/Makefile.am | 1 + 10 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 platform/linux-generic/odp_ipsec.c create mode 100644 test/common_plat/validation/api/ipsec/.gitignore create mode 100644 test/common_plat/validation/api/ipsec/Makefile.am create mode 100644 test/common_plat/validation/api/ipsec/ipsec.c create mode 100644 test/common_plat/validation/api/ipsec/ipsec.h copy test/common_plat/validation/api/{errno/errno_main.c => ipsec/ipsec_main.c} (56%) hooks/post-receive --

9 years

[COMMIT] branch api-next updated. v1.12.0.0-232-g746253e

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

9 years

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp