git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

Start a nNew thread

[COMMIT] branch master updated. v1.10.1.0-77-gca927a7

by git＠git-us.linaro.org

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-76-gc70e967

by git＠git-us.linaro.org

9 years, 6 months

[COMMIT] branch monarch_lts updated. v1.10.1.0-62-g9ad380f

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, monarch_lts has been updated via 9ad380fa0a113b90e26518b7d659213f05264841 (commit) via b3b97530679ed0fe6f975986270a3fa7d4c59a72 (commit) via 99117760f8bed0d8351c35a2c037e288d5a9280a (commit) via a560c609e78716421e782aa388805937d177ef0e (commit) via 524987a32f9873e59ce265ffba6e831e756a2441 (commit) via ab966018496e7ebb0d1532d6c5c119b9db7d56fa (commit) from 197710ffc229f3db775a97c27e09c2dc063497c4 (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 9ad380fa0a113b90e26518b7d659213f05264841 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Fri Jul 29 20:08:58 2016 +0530 api:crypto: resolve todo items odp_session_proc_info_t is no longer required. Clarified hash_result_offset and its relation with ICV value. Signed-off-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index d8123e9..dea1fe9 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -170,8 +170,6 @@ typedef struct odp_crypto_data_range { /** * Crypto API session creation parameters - * - * @todo Add "odp_session_proc_info_t" */ typedef struct odp_crypto_session_params { odp_crypto_op_t op; /**< Encode versus decode */ @@ -210,8 +208,6 @@ typedef struct odp_crypto_session_params { /** * Crypto API per packet operation parameters - * - * @todo Clarify who zero's ICV and how this relates to "hash_result_offset" */ typedef struct odp_crypto_op_params { odp_crypto_session_t session; /**< Session handle from creation */ @@ -245,6 +241,14 @@ typedef struct odp_crypto_op_params { * indicates the caller wishes the destination packet buffer be allocated * from the output pool specified during session creation. * + * @var odp_crypto_op_params_t::hash_result_offset + * + * Specifies the offset where the hash result is to be stored. In case of + * decode sessions, input hash values will be read from this offset, and + * overwritten with hash results. If this offset lies within specified + * auth_range, implementation will mute this field before calculating the hash + * result. + * * @sa odp_crypto_session_params_t::output_pool. */ commit b3b97530679ed0fe6f975986270a3fa7d4c59a72 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Fri Jul 29 20:08:57 2016 +0530 example:ipsec: removed invalid todos. This todo item is no longer valid. Fixed as a part of following work card. https://cards.linaro.org/browse/LNG-857 Signed-off-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec/odp_ipsec_stream.h index ea480c3..6f6f7df 100644 --- a/example/ipsec/odp_ipsec_stream.h +++ b/example/ipsec/odp_ipsec_stream.h @@ -93,10 +93,6 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, /** * Verify an IPv4 packet received on a loop output queue * - * @todo Better error checking, add counters, add tracing, - * remove magic numbers, add order verification - * (see https://bugs.linaro.org/show_bug.cgi?id=620) - * * @param stream Stream to verify the packet against * @param pkt Packet to verify * commit 99117760f8bed0d8351c35a2c037e288d5a9280a Author: Barry Spinney <spinney(a)mellanox.com> Date: Wed Jul 13 11:59:40 2016 -0500 api: tm: resolve todo This todo just asks a question which is no longer important. Signed-off-by: Barry Spinney <spinney(a)mellanox.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index c9e6f8f..3473648 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -93,7 +93,6 @@ extern "C" { * @def ODP_TM_MAX_TM_NODE_FANIN * The largest number of fan-in "inputs" that can be simultaneously connected * to a single tm_node. - * @todo Does this need to be as large as ODP_TM_MAX_TM_QUEUES? */ /** @@ -886,7 +885,7 @@ typedef struct { /** In the case that sched_modes for a given strict priority level * indicates the use of weighted scheduling, this field supplies the * weighting factors. The weights - when defined - are used such that - * the (adjusted) frame lengths are divided by these 8-bit weights + * the (adjusted) frame lengths are divided by these 8-bit weights * (i.e. they are divisors and not multipliers). Consequently a * weight of 0 (when sched_mode is ODP_TM_BYTE_BASED_WEIGHTS) is * illegal. */ commit a560c609e78716421e782aa388805937d177ef0e Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jun 28 17:35:54 2016 +0530 api: traffic_mngr: Add pktio interface to odp_tm_egress_t struct Replaces pktio interface as input to TM system instead of odp_pktout_queue_t.This creates an 1 to 1 mapping between a TM system and pktio interface. Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index 83b89e7..c9e6f8f 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -270,6 +270,12 @@ typedef struct { * have their fan_in only from tm_queues. */ uint8_t max_levels; + /** egress_fcn_supported indicates whether the tm system supports + * egress function. It is an optional feature used to receive the + * packet from the tm system and its performance might be limited. + */ + odp_bool_t egress_fcn_supported; + /** tm_queue_shaper_supported indicates that the tm_queues support * proper TM shaping. Note that TM Shaping is NOT the same thing as * Ingress Metering/Policing as specified by RFC 2697 (A Single Rate @@ -467,7 +473,7 @@ typedef struct { odp_tm_egress_kind_t egress_kind; /**< Union discriminator */ union { - odp_pktout_queue_t pktout; + odp_pktio_t pktio; odp_tm_egress_fcn_t egress_fcn; }; } odp_tm_egress_t; diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index 15451ac..e4bc5ce 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -380,7 +380,7 @@ typedef struct { tm_queue_info_t priority_info[ODP_TM_MAX_PRIORITIES]; tm_random_data_t tm_random_data; - + odp_pktout_queue_t pktout; uint64_t current_time; uint8_t tm_idx; uint8_t first_enq; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 7a8b647..e668bf9 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -2108,7 +2108,7 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends) tm_system->egress_pkt_desc = EMPTY_PKT_DESC; if (tm_system->egress.egress_kind == ODP_TM_EGRESS_PKT_IO) - odp_pktout_send(tm_system->egress.pktout, &odp_pkt, 1); + odp_pktout_send(tm_system->pktout, &odp_pkt, 1); else if (tm_system->egress.egress_kind == ODP_TM_EGRESS_FN) tm_system->egress.egress_fcn(odp_pkt); else @@ -2426,6 +2426,7 @@ int odp_tm_capabilities(odp_tm_capabilities_t capabilities[] ODP_UNUSED, cap_ptr->max_tm_queues = ODP_TM_MAX_TM_QUEUES; cap_ptr->max_levels = ODP_TM_MAX_LEVELS; cap_ptr->tm_queue_shaper_supported = true; + cap_ptr->egress_fcn_supported = true; cap_ptr->tm_queue_wred_supported = true; cap_ptr->tm_queue_dual_slope_supported = true; cap_ptr->vlan_marking_supported = true; @@ -2607,6 +2608,7 @@ odp_tm_t odp_tm_create(const char *name, tm_system_t *tm_system; odp_bool_t create_fail; odp_tm_t odp_tm; + odp_pktout_queue_t pktout; uint32_t malloc_len, max_num_queues, max_queued_pkts, max_timers; uint32_t max_tm_queues, max_sorted_lists; int rc; @@ -2627,6 +2629,10 @@ odp_tm_t odp_tm_create(const char *name, return ODP_TM_INVALID; } + if (odp_pktout_queue(egress->pktio, &pktout, 1) != 1) + return ODP_TM_INVALID; + + tm_system->pktout = pktout; tm_system->name_tbl_id = name_tbl_id; max_tm_queues = requirements->max_tm_queues; memcpy(&tm_system->egress, egress, sizeof(odp_tm_egress_t)); diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c index 1c4e90b..b857800 100644 --- a/test/validation/traffic_mngr/traffic_mngr.c +++ b/test/validation/traffic_mngr/traffic_mngr.c @@ -323,7 +323,7 @@ static odp_pktio_t pktios[MAX_NUM_IFACES]; static odp_pktin_queue_t pktins[MAX_NUM_IFACES]; static odp_pktout_queue_t pktouts[MAX_NUM_IFACES]; static odp_pktin_queue_t rcv_pktin; -static odp_pktout_queue_t xmt_pktout; +static odp_pktio_t xmt_pktio; static odph_ethaddr_t src_mac; static odph_ethaddr_t dst_mac; @@ -543,7 +543,7 @@ static int open_pktios(void) } if (2 <= num_ifaces) { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[1]; ret = odp_pktio_start(pktios[1]); if (ret != 0) { @@ -551,7 +551,7 @@ static int open_pktios(void) return -1; } } else { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[0]; } @@ -1627,7 +1627,7 @@ static int create_tm_system(void) } egress.egress_kind = ODP_TM_EGRESS_PKT_IO; - egress.pktout = xmt_pktout; + egress.pktio = xmt_pktio; snprintf(tm_name, sizeof(tm_name), "TM_system_%u", num_odp_tm_systems); odp_tm = odp_tm_create(tm_name, &requirements, &egress); commit 524987a32f9873e59ce265ffba6e831e756a2441 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue May 10 18:34:37 2016 +0300 api: system: specify default huge page size System can have different sizes for huge pages. Clarify that this api returns default system huge page size, which is usually 2Mb on x86 reachable with: grep Hugepagesize: /proc/meminfo Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h index 6957731..c5a5fd0 100644 --- a/include/odp/api/spec/system_info.h +++ b/include/odp/api/spec/system_info.h @@ -24,9 +24,9 @@ extern "C" { */ /** - * Huge page size in bytes + * Default system huge page size in bytes * - * @return Huge page size in bytes + * @return Default huge page size in bytes */ uint64_t odp_sys_huge_page_size(void); commit ab966018496e7ebb0d1532d6c5c119b9db7d56fa Author: Brian Brooks <brian.brooks(a)linaro.org> Date: Tue Jul 26 11:38:27 2016 -0500 linux-generic: internal cache line size Define the ODP API for cache line size to the cache line size defined in the internal architecture directories. Prefix internal cache line size identifier with '_odp'. Signed-off-by: Brian Brooks <brian.brooks(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/platform/linux-generic/arch/default/odp/api/cpu_arch.h b/platform/linux-generic/arch/default/odp/api/cpu_arch.h index 29f8889..22b1da2 100644 --- a/platform/linux-generic/arch/default/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/default/odp/api/cpu_arch.h @@ -11,15 +11,7 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -#define ODP_CACHE_LINE_SIZE 64 - -/** - * @} - */ +#define _ODP_CACHE_LINE_SIZE 64 static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h index 7b5bfd2..3582b12 100644 --- a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h @@ -11,18 +11,12 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - #if defined __OCTEON__ -#define ODP_CACHE_LINE_SIZE 128 +#define _ODP_CACHE_LINE_SIZE 128 +#else +#error Please add support for your arch in cpu_arch.h #endif -/** - * @} - */ - static inline void odp_cpu_pause(void) { __asm__ __volatile__ ("nop"); diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h index 29f8889..22b1da2 100644 --- a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h @@ -11,15 +11,7 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -#define ODP_CACHE_LINE_SIZE 64 - -/** - * @} - */ +#define _ODP_CACHE_LINE_SIZE 64 static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h index 3a16fa6..44e6b30 100644 --- a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h +++ b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h @@ -11,15 +11,7 @@ extern "C" { #endif -/** @ingroup odp_compiler_optim - * @{ - */ - -#define ODP_CACHE_LINE_SIZE 64 - -/** - * @} - */ +#define _ODP_CACHE_LINE_SIZE 64 static inline void odp_cpu_pause(void) { diff --git a/platform/linux-generic/include/odp/api/align.h b/platform/linux-generic/include/odp/api/align.h index d8bc653..c238b80 100644 --- a/platform/linux-generic/include/odp/api/align.h +++ b/platform/linux-generic/include/odp/api/align.h @@ -17,6 +17,8 @@ extern "C" { #endif +#include <odp/api/cpu_arch.h> + /** @ingroup odp_compiler_optim * @{ */ @@ -31,16 +33,12 @@ extern "C" { #define ODP_FIELD_SIZEOF(type, member) sizeof(((type *)0)->member) -#if defined __arm__ || defined __aarch64__ - -#define ODP_CACHE_LINE_SIZE 64 - -#endif - #else #error Non-gcc compatible compiler #endif +#define ODP_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE + #define ODP_PAGE_SIZE 4096 #define ODP_ALIGNED_CACHE ODP_ALIGNED(ODP_CACHE_LINE_SIZE) @@ -52,7 +50,6 @@ extern "C" { */ #include <odp/api/spec/align.h> -#include <odp/api/cpu_arch.h> #ifdef __cplusplus } ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec_stream.h | 4 ---- include/odp/api/spec/crypto.h | 12 ++++++++---- include/odp/api/spec/system_info.h | 4 ++-- include/odp/api/spec/traffic_mngr.h | 11 ++++++++--- platform/linux-generic/arch/default/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/arch/mips64/odp/api/cpu_arch.h | 12 +++--------- platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/arch/x86/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/include/odp/api/align.h | 11 ++++------- platform/linux-generic/include/odp_traffic_mngr_internal.h | 2 +- platform/linux-generic/odp_traffic_mngr.c | 8 +++++++- test/validation/traffic_mngr/traffic_mngr.c | 8 ++++---- 12 files changed, 40 insertions(+), 62 deletions(-) hooks/post-receive --

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-75-gabb1be3

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 abb1be33068b60290a252ce10a494338e80848e3 (commit) from b007f9d72b085005ba7b19355885c7f0096899e2 (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 abb1be33068b60290a252ce10a494338e80848e3 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jul 29 16:41:55 2016 +0300 linux-gen: test add termination path for ipc pktio test Add clean termination path for ipc pktio example to destroy all created resources including openned shared memory. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index d97e495..b779ab7 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -727,6 +727,8 @@ static int ipc_start(pktio_entry_t *pktio_entry) static int ipc_stop(pktio_entry_t *pktio_entry) { + unsigned tx_send, tx_free; + odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 0); _ipc_free_ring_packets(pktio_entry->s.ipc.tx.send); @@ -735,21 +737,28 @@ static int ipc_stop(pktio_entry_t *pktio_entry) sleep(1); _ipc_free_ring_packets(pktio_entry->s.ipc.tx.free); + tx_send = _ring_count(pktio_entry->s.ipc.tx.send); + tx_free = _ring_count(pktio_entry->s.ipc.tx.free); + if (tx_send | tx_free) { + ODP_DBG("IPC rings: tx send %d tx free %d\n", + _ring_free_count(pktio_entry->s.ipc.tx.send), + _ring_free_count(pktio_entry->s.ipc.tx.free)); + } + return 0; } static int ipc_close(pktio_entry_t *pktio_entry) { - odp_shm_t shm; char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; char *dev = pktio_entry->s.name; ipc_stop(pktio_entry); - /* unlink this pktio info for both master and slave */ - odp_shm_free(pktio_entry->s.ipc.pinfo_shm); - if (pktio_entry->s.ipc.type == PKTIO_TYPE_IPC_MASTER) { + /* unlink this pktio info for both master and slave */ + odp_shm_free(pktio_entry->s.ipc.pinfo_shm); + /* destroy rings */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); _ring_destroy(ipc_shm_name); @@ -759,20 +768,6 @@ static int ipc_close(pktio_entry_t *pktio_entry) _ring_destroy(ipc_shm_name); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); _ring_destroy(ipc_shm_name); - } else { - /* unlink rings */ - snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - shm = odp_shm_lookup(ipc_shm_name); - odp_shm_free(shm); - snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - shm = odp_shm_lookup(ipc_shm_name); - odp_shm_free(shm); - snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - shm = odp_shm_lookup(ipc_shm_name); - odp_shm_free(shm); - snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - shm = odp_shm_lookup(ipc_shm_name); - odp_shm_free(shm); } return 0; diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c index 2ee326e..387c921 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.c +++ b/test/linux-generic/pktio_ipc/ipc_common.c @@ -10,8 +10,8 @@ int run_time_sec; int ipc_name_space; -int ipc_odp_packet_sendall(odp_pktio_t pktio, - odp_packet_t pkt_tbl[], int num) +int ipc_odp_packet_send_or_free(odp_pktio_t pktio, + odp_packet_t pkt_tbl[], int num) { int ret; int sent = 0; @@ -19,6 +19,7 @@ int ipc_odp_packet_sendall(odp_pktio_t pktio, odp_time_t end_time; odp_time_t wait; odp_pktout_queue_t pktout; + int i; start_time = odp_time_local(); wait = odp_time_local_from_ns(ODP_TIME_SEC_IN_NS); @@ -31,13 +32,19 @@ int ipc_odp_packet_sendall(odp_pktio_t pktio, while (sent != num) { ret = odp_pktout_send(pktout, &pkt_tbl[sent], num - sent); - if (ret < 0) + if (ret < 0) { + for (i = sent; i < num; i++) + odp_packet_free(pkt_tbl[i]); return -1; + } sent += ret; - if (odp_time_cmp(end_time, odp_time_local()) < 0) + if (odp_time_cmp(end_time, odp_time_local()) < 0) { + for (i = sent; i < num; i++) + odp_packet_free(pkt_tbl[i]); return -1; + } } return 0; diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index a6b7c58..99276b5 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -87,5 +87,6 @@ odp_pktio_t create_pktio(odp_pool_t pool); * @param pkt_tbl packets table * @param num number of packets */ -int ipc_odp_packet_sendall(odp_pktio_t pktio, - odp_packet_t pkt_tbl[], int num); +int ipc_odp_packet_send_or_free(odp_pktio_t pktio, + odp_packet_t pkt_tbl[], + int num); diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c index a4eed88..5c1da23 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc1.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c @@ -34,6 +34,7 @@ static int pktio_run_loop(odp_pool_t pool) uint64_t stat_pkts_alloc = 0; uint64_t stat_pkts_prev = 0; uint64_t stat_errors = 0; + uint64_t stat_free = 0; odp_time_t start_cycle; odp_time_t current_cycle; odp_time_t cycle; @@ -118,19 +119,21 @@ static int pktio_run_loop(odp_pool_t pool) &head); if (ret) { stat_errors++; + stat_free++; odp_packet_free(pkt); EXAMPLE_DBG("error\n"); continue; } if (head.magic == TEST_ALLOC_MAGIC) { - stat_pkts_alloc++; + stat_free++; odp_packet_free(pkt); continue; } if (head.magic != TEST_SEQ_MAGIC_2) { stat_errors++; + stat_free++; odp_packet_free(pkt); EXAMPLE_DBG("error\n"); continue; @@ -142,12 +145,14 @@ static int pktio_run_loop(odp_pool_t pool) &tail); if (ret) { stat_errors++; + stat_free++; odp_packet_free(pkt); continue; } if (tail.magic != TEST_SEQ_MAGIC) { stat_errors++; + stat_free++; odp_packet_free(pkt); continue; } @@ -163,6 +168,8 @@ static int pktio_run_loop(odp_pool_t pool) head.seq, cnt_recv, head.seq - cnt_recv); cnt_recv = head.seq; + stat_errors++; + stat_free++; continue; } @@ -182,6 +189,7 @@ static int pktio_run_loop(odp_pool_t pool) if (pkt == ODP_PACKET_INVALID) break; + stat_pkts_alloc++; odp_packet_l4_offset_set(pkt, 30); pkt_tbl[i] = pkt; } @@ -224,7 +232,7 @@ static int pktio_run_loop(odp_pool_t pool) } /* 5. Send packets to ipc_pktio */ - ret = ipc_odp_packet_sendall(ipc_pktio, pkt_tbl, pkts); + ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, pkts); if (ret < 0) { EXAMPLE_DBG("unable to sending to ipc pktio\n"); break; @@ -236,9 +244,11 @@ static int pktio_run_loop(odp_pool_t pool) diff) < 0) { current_cycle = cycle; printf("\rpkts: %" PRIu64 ", alloc %" PRIu64 "," - " errors %" PRIu64 ", pps %" PRIu64 ".", + " errors %" PRIu64 ", pps %" PRIu64 "," + " free %" PRIu64 ".", stat_pkts, stat_pkts_alloc, stat_errors, - (stat_pkts + stat_pkts_alloc - stat_pkts_prev)); + (stat_pkts + stat_pkts_alloc - stat_pkts_prev), + stat_free); fflush(stdout); stat_pkts_prev = stat_pkts + stat_pkts_alloc; } @@ -258,18 +268,6 @@ exit: return -1; } - ret = odp_pool_destroy(pool); - if (ret) { - EXAMPLE_DBG("pool_destroy error %d\n", ret); - /* Remote process can end with reference to our local pool. - * Usully it unmaps it clenealy but some time there are some - * pending packets in the pool in case of remote process was - * trapped or did not call odp_pktio_close() correctly and - * release buffers and free buffer from shared rings. - * return -1; - */ - } - return (stat_errors > 10 || stat_pkts < 1000) ? -1 : 0; } @@ -324,6 +322,21 @@ int main(int argc, char *argv[]) ret = pktio_run_loop(pool); + if (odp_pool_destroy(pool)) { + EXAMPLE_ERR("Error: odp_pool_destroy() failed.\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_local()) { + EXAMPLE_ERR("Error: odp_term_local() failed.\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + EXAMPLE_ERR("Error: odp_term_global() failed.\n"); + exit(EXIT_FAILURE); + } + EXAMPLE_DBG("return %d\n", ret); return ret; } diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c index c0c6ff5..5c1f142 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc2.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c @@ -65,7 +65,7 @@ static int ipc_second_process(void) if (odp_time_cmp(wait, diff) < 0) { printf("timeout exit, run_time_sec %d\n", run_time_sec); - goto exit; + goto not_started; } } @@ -118,10 +118,11 @@ static int ipc_second_process(void) } /* send all packets back */ - ret = ipc_odp_packet_sendall(ipc_pktio, pkt_tbl, pkts); + ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, pkts); if (ret < 0) EXAMPLE_ABORT("can not send packets\n"); - stat_pkts += pkts; + + stat_pkts += ret; /* alloc packet from local pool, set magic to ALLOC_MAGIC, * and send it.*/ @@ -143,7 +144,8 @@ static int ipc_second_process(void) EXAMPLE_ABORT("unable to copy in head data"); pkt_tbl[0] = alloc_pkt; - ret = ipc_odp_packet_sendall(ipc_pktio, pkt_tbl, 1); + ret = ipc_odp_packet_send_or_free(ipc_pktio, + pkt_tbl, 1); if (ret < 0) EXAMPLE_ABORT("can not send packets\n"); stat_pkts += 1; @@ -153,20 +155,20 @@ static int ipc_second_process(void) /* cleanup and exit */ ret = odp_pktio_stop(ipc_pktio); if (ret) { - EXAMPLE_DBG("odp_pktio_stop error %d\n", ret); + EXAMPLE_DBG("ipc2: odp_pktio_stop error %d\n", ret); return -1; } -exit: +not_started: ret = odp_pktio_close(ipc_pktio); if (ret) { - EXAMPLE_DBG("odp_pktio_close error %d\n", ret); + EXAMPLE_DBG("ipc2: odp_pktio_close error %d\n", ret); return -1; } ret = odp_pool_destroy(pool); if (ret) - EXAMPLE_DBG("pool_destroy error %d\n", ret); + EXAMPLE_DBG("ipc2: pool_destroy error %d\n", ret); return stat_pkts > 1000 ? 0 : -1; } @@ -175,6 +177,7 @@ int main(int argc, char *argv[]) { odp_instance_t instance; odp_platform_init_t plat_idata; + int ret; /* Parse and store the application arguments */ parse_args(argc, argv); @@ -193,5 +196,17 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - return ipc_second_process(); + ret = ipc_second_process(); + + if (odp_term_local()) { + EXAMPLE_ERR("Error: odp_term_local() failed.\n"); + exit(EXIT_FAILURE); + } + + if (odp_term_global(instance)) { + EXAMPLE_ERR("Error: odp_term_global() failed.\n"); + exit(EXIT_FAILURE); + } + + return ret; } diff --git a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh index 1128002..2f99f32 100755 --- a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh +++ b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh @@ -49,6 +49,7 @@ run() fi echo "==== run pktio_ipc2 then pktio_ipc1 ====" + IPC_NS=`expr $IPC_NS - 1` pktio_ipc2${EXEEXT} -n ${IPC_NS} -t 10 & IPC_PID=$! ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/ipc.c | 31 ++++++++---------- test/linux-generic/pktio_ipc/ipc_common.c | 15 ++++++--- test/linux-generic/pktio_ipc/ipc_common.h | 5 +-- test/linux-generic/pktio_ipc/pktio_ipc1.c | 45 +++++++++++++++++---------- test/linux-generic/pktio_ipc/pktio_ipc2.c | 33 ++++++++++++++------ test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 1 + 6 files changed, 81 insertions(+), 49 deletions(-) hooks/post-receive --

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-74-gb007f9d

by git＠git-us.linaro.org

9 years, 6 months

[COMMIT] branch api-next updated. v1.10.1.0-119-g65ea121

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 65ea1213c75e323c4ff8ee2de48ce6dd84b1f7f2 (commit) via becb0250ea30f65f3beb02f0094197704f450352 (commit) via 90e456db5f983f3fff9126dd70f6fea907fed361 (commit) via e45799924207308fcac2928a64e6ecc3ca102a8c (commit) via a47f5fbb6ed8122a3453f5f5a3fabf53a98d7fdf (commit) from 414c4c75b0beb8cd4e4d2abe090921bcf058ec69 (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 65ea1213c75e323c4ff8ee2de48ce6dd84b1f7f2 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Fri Jul 29 08:57:26 2016 +0200 test: validation: drv: atomic tests Adding tests for atomic operations performed on the driver (drv) interface. Based on the north API tests. Signed-off-by: Christophe Milard <christophe.milard(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/test/common_plat/validation/drv/atomic/.gitignore b/test/common_plat/validation/drv/atomic/.gitignore new file mode 100644 index 0000000..610ffea --- /dev/null +++ b/test/common_plat/validation/drv/atomic/.gitignore @@ -0,0 +1 @@ +atomic_main diff --git a/test/common_plat/validation/drv/atomic/Makefile.am b/test/common_plat/validation/drv/atomic/Makefile.am index be48623..9b6bd63 100644 --- a/test/common_plat/validation/drv/atomic/Makefile.am +++ b/test/common_plat/validation/drv/atomic/Makefile.am @@ -1,4 +1,10 @@ include ../Makefile.inc +noinst_LTLIBRARIES = libtestatomic.la +libtestatomic_la_SOURCES = atomic.c + test_PROGRAMS = atomic_main$(EXEEXT) dist_atomic_main_SOURCES = atomic_main.c +atomic_main_LDADD = libtestatomic.la $(LIBCUNIT_COMMON) $(LIBODP) + +EXTRA_DIST = atomic.h diff --git a/test/common_plat/validation/drv/atomic/atomic.c b/test/common_plat/validation/drv/atomic/atomic.c new file mode 100644 index 0000000..162f6e4 --- /dev/null +++ b/test/common_plat/validation/drv/atomic/atomic.c @@ -0,0 +1,892 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <malloc.h> +#include <odp_api.h> +#include <odp_drv.h> +#include <CUnit/Basic.h> +#include <odp_cunit_common.h> +#include <unistd.h> +#include "atomic.h" + +#define VERBOSE 0 +#define MAX_ITERATIONS 1000 + +#define ADD_SUB_CNT 5 + +#define CNT 10 +#define U32_INIT_VAL (1UL << 10) +#define U64_INIT_VAL (1ULL << 33) +#define U32_MAGIC 0xa23f65b2 +#define U64_MAGIC 0xf2e1c5430cb6a52e + +#define GLOBAL_SHM_NAME "GlobalLockTest" + +#define UNUSED __attribute__((__unused__)) + +#define CHECK_MAX_MIN (1 << 0) +#define CHECK_XCHG (1 << 2) + +static odpdrv_atomic_u32_t a32u; +static odpdrv_atomic_u64_t a64u; +static odpdrv_atomic_u32_t a32u_min; +static odpdrv_atomic_u32_t a32u_max; +static odpdrv_atomic_u64_t a64u_min; +static odpdrv_atomic_u64_t a64u_max; +static odpdrv_atomic_u32_t a32u_xchg; +static odpdrv_atomic_u64_t a64u_xchg; + +typedef __volatile uint32_t volatile_u32_t; +typedef __volatile uint64_t volatile_u64_t; + +typedef struct { + /* Global variables */ + uint32_t g_num_threads; + uint32_t g_iterations; + uint32_t g_verbose; + uint32_t g_max_num_cores; + + volatile_u32_t global_lock_owner; +} global_shared_mem_t; + +/* Per-thread memory */ +typedef struct { + global_shared_mem_t *global_mem; + + int thread_id; + int thread_core; + + volatile_u64_t delay_counter; +} per_thread_mem_t; + +static odp_shm_t global_shm; +static global_shared_mem_t *global_mem; + +/* Initialise per-thread memory */ +static per_thread_mem_t *thread_init(void) +{ + global_shared_mem_t *global_mem; + per_thread_mem_t *per_thread_mem; + odp_shm_t global_shm; + uint32_t per_thread_mem_len; + + per_thread_mem_len = sizeof(per_thread_mem_t); + per_thread_mem = malloc(per_thread_mem_len); + memset(per_thread_mem, 0, per_thread_mem_len); + + per_thread_mem->delay_counter = 1; + + per_thread_mem->thread_id = odp_thread_id(); + per_thread_mem->thread_core = odp_cpu_id(); + + global_shm = odp_shm_lookup(GLOBAL_SHM_NAME); + global_mem = odp_shm_addr(global_shm); + CU_ASSERT_PTR_NOT_NULL(global_mem); + + per_thread_mem->global_mem = global_mem; + + return per_thread_mem; +} + +static void thread_finalize(per_thread_mem_t *per_thread_mem) +{ + free(per_thread_mem); +} + +static void test_atomic_inc_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_inc_u32(&a32u); +} + +static void test_atomic_inc_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_inc_u64(&a64u); +} + +static void test_atomic_dec_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_dec_u32(&a32u); +} + +static void test_atomic_dec_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_dec_u64(&a64u); +} + +static void test_atomic_fetch_inc_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_inc_u32(&a32u); +} + +static void test_atomic_fetch_inc_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_inc_u64(&a64u); +} + +static void test_atomic_fetch_dec_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_dec_u32(&a32u); +} + +static void test_atomic_fetch_dec_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_dec_u64(&a64u); +} + +static void test_atomic_add_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_add_u32(&a32u, ADD_SUB_CNT); +} + +static void test_atomic_add_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_add_u64(&a64u, ADD_SUB_CNT); +} + +static void test_atomic_sub_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_sub_u32(&a32u, ADD_SUB_CNT); +} + +static void test_atomic_sub_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_sub_u64(&a64u, ADD_SUB_CNT); +} + +static void test_atomic_fetch_add_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_add_u32(&a32u, ADD_SUB_CNT); +} + +static void test_atomic_fetch_add_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_add_u64(&a64u, ADD_SUB_CNT); +} + +static void test_atomic_fetch_sub_32(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_sub_u32(&a32u, ADD_SUB_CNT); +} + +static void test_atomic_fetch_sub_64(void) +{ + int i; + + for (i = 0; i < CNT; i++) + odpdrv_atomic_fetch_sub_u64(&a64u, ADD_SUB_CNT); +} + +static void test_atomic_min_32(void) +{ + int i; + uint32_t tmp; + + for (i = 0; i < CNT; i++) { + tmp = odpdrv_atomic_fetch_dec_u32(&a32u); + odpdrv_atomic_min_u32(&a32u_min, tmp); + } +} + +static void test_atomic_min_64(void) +{ + int i; + uint64_t tmp; + + for (i = 0; i < CNT; i++) { + tmp = odpdrv_atomic_fetch_dec_u64(&a64u); + odpdrv_atomic_min_u64(&a64u_min, tmp); + } +} + +static void test_atomic_max_32(void) +{ + int i; + uint32_t tmp; + + for (i = 0; i < CNT; i++) { + tmp = odpdrv_atomic_fetch_inc_u32(&a32u); + odpdrv_atomic_max_u32(&a32u_max, tmp); + } +} + +static void test_atomic_max_64(void) +{ + int i; + uint64_t tmp; + + for (i = 0; i < CNT; i++) { + tmp = odpdrv_atomic_fetch_inc_u64(&a64u); + odpdrv_atomic_max_u64(&a64u_max, tmp); + } +} + +static void test_atomic_cas_inc_32(void) +{ + int i; + uint32_t old; + + for (i = 0; i < CNT; i++) { + old = odpdrv_atomic_load_u32(&a32u); + + while (odpdrv_atomic_cas_u32(&a32u, &old, old + 1) == 0) + ; + } +} + +static void test_atomic_cas_dec_32(void) +{ + int i; + uint32_t old; + + for (i = 0; i < CNT; i++) { + old = odpdrv_atomic_load_u32(&a32u); + + while (odpdrv_atomic_cas_u32(&a32u, &old, old - 1) == 0) + ; + } +} + +static void test_atomic_cas_inc_64(void) +{ + int i; + uint64_t old; + + for (i = 0; i < CNT; i++) { + old = odpdrv_atomic_load_u64(&a64u); + + while (odpdrv_atomic_cas_u64(&a64u, &old, old + 1) == 0) + ; + } +} + +static void test_atomic_cas_dec_64(void) +{ + int i; + uint64_t old; + + for (i = 0; i < CNT; i++) { + old = odpdrv_atomic_load_u64(&a64u); + + while (odpdrv_atomic_cas_u64(&a64u, &old, old - 1) == 0) + ; + } +} + +static void test_atomic_xchg_32(void) +{ + uint32_t old, new; + int i; + + for (i = 0; i < CNT; i++) { + new = odpdrv_atomic_fetch_inc_u32(&a32u); + old = odpdrv_atomic_xchg_u32(&a32u_xchg, new); + + if (old & 0x1) + odpdrv_atomic_xchg_u32(&a32u_xchg, 0); + else + odpdrv_atomic_xchg_u32(&a32u_xchg, 1); + } + + odpdrv_atomic_sub_u32(&a32u, CNT); + odpdrv_atomic_xchg_u32(&a32u_xchg, U32_MAGIC); +} + +static void test_atomic_xchg_64(void) +{ + uint64_t old, new; + int i; + + for (i = 0; i < CNT; i++) { + new = odpdrv_atomic_fetch_inc_u64(&a64u); + old = odpdrv_atomic_xchg_u64(&a64u_xchg, new); + + if (old & 0x1) + odpdrv_atomic_xchg_u64(&a64u_xchg, 0); + else + odpdrv_atomic_xchg_u64(&a64u_xchg, 1); + } + + odpdrv_atomic_sub_u64(&a64u, CNT); + odpdrv_atomic_xchg_u64(&a64u_xchg, U64_MAGIC); +} + +static void test_atomic_non_relaxed_32(void) +{ + int i; + uint32_t tmp; + + for (i = 0; i < CNT; i++) { + tmp = odpdrv_atomic_load_acq_u32(&a32u); + odpdrv_atomic_store_rel_u32(&a32u, tmp); + + tmp = odpdrv_atomic_load_acq_u32(&a32u_max); + odpdrv_atomic_add_rel_u32(&a32u_max, 1); + + tmp = odpdrv_atomic_load_acq_u32(&a32u_min); + odpdrv_atomic_sub_rel_u32(&a32u_min, 1); + + tmp = odpdrv_atomic_load_u32(&a32u_xchg); + while (odpdrv_atomic_cas_acq_u32(&a32u_xchg, &tmp, tmp + 1) + == 0) + ; + + tmp = odpdrv_atomic_load_u32(&a32u_xchg); + while (odpdrv_atomic_cas_rel_u32(&a32u_xchg, &tmp, tmp + 1) + == 0) + ; + + tmp = odpdrv_atomic_load_u32(&a32u_xchg); + /* finally set value for validation */ + while (odpdrv_atomic_cas_acq_rel_u32(&a32u_xchg, &tmp, + U32_MAGIC) + == 0) + ; + } +} + +static void test_atomic_non_relaxed_64(void) +{ + int i; + uint64_t tmp; + + for (i = 0; i < CNT; i++) { + tmp = odpdrv_atomic_load_acq_u64(&a64u); + odpdrv_atomic_store_rel_u64(&a64u, tmp); + + tmp = odpdrv_atomic_load_acq_u64(&a64u_max); + odpdrv_atomic_add_rel_u64(&a64u_max, 1); + + tmp = odpdrv_atomic_load_acq_u64(&a64u_min); + odpdrv_atomic_sub_rel_u64(&a64u_min, 1); + + tmp = odpdrv_atomic_load_u64(&a64u_xchg); + while (odpdrv_atomic_cas_acq_u64(&a64u_xchg, &tmp, tmp + 1) + == 0) + ; + + tmp = odpdrv_atomic_load_u64(&a64u_xchg); + while (odpdrv_atomic_cas_rel_u64(&a64u_xchg, &tmp, tmp + 1) + == 0) + ; + + tmp = odpdrv_atomic_load_u64(&a64u_xchg); + /* finally set value for validation */ + while (odpdrv_atomic_cas_acq_rel_u64(&a64u_xchg, &tmp, + U64_MAGIC) + == 0) + ; + } +} + +static void test_atomic_inc_dec_32(void) +{ + test_atomic_inc_32(); + test_atomic_dec_32(); +} + +static void test_atomic_inc_dec_64(void) +{ + test_atomic_inc_64(); + test_atomic_dec_64(); +} + +static void test_atomic_fetch_inc_dec_32(void) +{ + test_atomic_fetch_inc_32(); + test_atomic_fetch_dec_32(); +} + +static void test_atomic_fetch_inc_dec_64(void) +{ + test_atomic_fetch_inc_64(); + test_atomic_fetch_dec_64(); +} + +static void test_atomic_add_sub_32(void) +{ + test_atomic_add_32(); + test_atomic_sub_32(); +} + +static void test_atomic_add_sub_64(void) +{ + test_atomic_add_64(); + test_atomic_sub_64(); +} + +static void test_atomic_fetch_add_sub_32(void) +{ + test_atomic_fetch_add_32(); + test_atomic_fetch_sub_32(); +} + +static void test_atomic_fetch_add_sub_64(void) +{ + test_atomic_fetch_add_64(); + test_atomic_fetch_sub_64(); +} + +static void test_atomic_max_min_32(void) +{ + test_atomic_max_32(); + test_atomic_min_32(); +} + +static void test_atomic_max_min_64(void) +{ + test_atomic_max_64(); + test_atomic_min_64(); +} + +static void test_atomic_cas_inc_dec_32(void) +{ + test_atomic_cas_inc_32(); + test_atomic_cas_dec_32(); +} + +static void test_atomic_cas_inc_dec_64(void) +{ + test_atomic_cas_inc_64(); + test_atomic_cas_dec_64(); +} + +static void test_atomic_init(void) +{ + odpdrv_atomic_init_u32(&a32u, 0); + odpdrv_atomic_init_u64(&a64u, 0); + odpdrv_atomic_init_u32(&a32u_min, 0); + odpdrv_atomic_init_u32(&a32u_max, 0); + odpdrv_atomic_init_u64(&a64u_min, 0); + odpdrv_atomic_init_u64(&a64u_max, 0); + odpdrv_atomic_init_u32(&a32u_xchg, 0); + odpdrv_atomic_init_u64(&a64u_xchg, 0); +} + +static void test_atomic_store(void) +{ + odpdrv_atomic_store_u32(&a32u, U32_INIT_VAL); + odpdrv_atomic_store_u64(&a64u, U64_INIT_VAL); + odpdrv_atomic_store_u32(&a32u_min, U32_INIT_VAL); + odpdrv_atomic_store_u32(&a32u_max, U32_INIT_VAL); + odpdrv_atomic_store_u64(&a64u_min, U64_INIT_VAL); + odpdrv_atomic_store_u64(&a64u_max, U64_INIT_VAL); + odpdrv_atomic_store_u32(&a32u_xchg, U32_INIT_VAL); + odpdrv_atomic_store_u64(&a64u_xchg, U64_INIT_VAL); +} + +static void test_atomic_validate(int check) +{ + CU_ASSERT(U32_INIT_VAL == odpdrv_atomic_load_u32(&a32u)); + CU_ASSERT(U64_INIT_VAL == odpdrv_atomic_load_u64(&a64u)); + + if (check & CHECK_MAX_MIN) { + CU_ASSERT(odpdrv_atomic_load_u32(&a32u_max) > + odpdrv_atomic_load_u32(&a32u_min)); + + CU_ASSERT(odpdrv_atomic_load_u64(&a64u_max) > + odpdrv_atomic_load_u64(&a64u_min)); + } + + if (check & CHECK_XCHG) { + CU_ASSERT(odpdrv_atomic_load_u32(&a32u_xchg) == U32_MAGIC); + CU_ASSERT(odpdrv_atomic_load_u64(&a64u_xchg) == U64_MAGIC); + } +} + +int atomic_init(odp_instance_t *inst) +{ + uint32_t workers_count, max_threads; + int ret = 0; + odp_cpumask_t mask; + + if (0 != odp_init_global(inst, NULL, NULL)) { + fprintf(stderr, "error: odp_init_global() failed.\n"); + return -1; + } + if (0 != odp_init_local(*inst, ODP_THREAD_CONTROL)) { + fprintf(stderr, "error: odp_init_local() failed.\n"); + return -1; + } + + global_shm = odp_shm_reserve(GLOBAL_SHM_NAME, + sizeof(global_shared_mem_t), 64, + ODP_SHM_SW_ONLY); + if (ODP_SHM_INVALID == global_shm) { + fprintf(stderr, "Unable reserve memory for global_shm\n"); + return -1; + } + + global_mem = odp_shm_addr(global_shm); + memset(global_mem, 0, sizeof(global_shared_mem_t)); + + global_mem->g_num_threads = MAX_WORKERS; + global_mem->g_iterations = MAX_ITERATIONS; + global_mem->g_verbose = VERBOSE; + + workers_count = odp_cpumask_default_worker(&mask, 0); + + max_threads = (workers_count >= MAX_WORKERS) ? + MAX_WORKERS : workers_count; + + if (max_threads < global_mem->g_num_threads) { + printf("Requested num of threads is too large\n"); + printf("reducing from %" PRIu32 " to %" PRIu32 "\n", + global_mem->g_num_threads, + max_threads); + global_mem->g_num_threads = max_threads; + } + + printf("Num of threads used = %" PRIu32 "\n", + global_mem->g_num_threads); + + return ret; +} + +/* Atomic tests */ +static int test_atomic_inc_dec_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_inc_dec_32(); + test_atomic_inc_dec_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static int test_atomic_add_sub_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_add_sub_32(); + test_atomic_add_sub_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static int test_atomic_fetch_inc_dec_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_fetch_inc_dec_32(); + test_atomic_fetch_inc_dec_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static int test_atomic_fetch_add_sub_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_fetch_add_sub_32(); + test_atomic_fetch_add_sub_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static int test_atomic_max_min_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_max_min_32(); + test_atomic_max_min_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static int test_atomic_cas_inc_dec_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_cas_inc_dec_32(); + test_atomic_cas_inc_dec_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static int test_atomic_xchg_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_xchg_32(); + test_atomic_xchg_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static int test_atomic_non_relaxed_thread(void *arg UNUSED) +{ + per_thread_mem_t *per_thread_mem; + + per_thread_mem = thread_init(); + test_atomic_non_relaxed_32(); + test_atomic_non_relaxed_64(); + + thread_finalize(per_thread_mem); + + return CU_get_number_of_failures(); +} + +static void test_atomic_functional(int func_ptr(void *), int check) +{ + pthrd_arg arg; + + arg.numthrds = global_mem->g_num_threads; + test_atomic_init(); + test_atomic_store(); + odp_cunit_thread_create(func_ptr, &arg); + odp_cunit_thread_exit(&arg); + test_atomic_validate(check); +} + +void atomic_test_atomic_inc_dec(void) +{ + test_atomic_functional(test_atomic_inc_dec_thread, 0); +} + +void atomic_test_atomic_add_sub(void) +{ + test_atomic_functional(test_atomic_add_sub_thread, 0); +} + +void atomic_test_atomic_fetch_inc_dec(void) +{ + test_atomic_functional(test_atomic_fetch_inc_dec_thread, 0); +} + +void atomic_test_atomic_fetch_add_sub(void) +{ + test_atomic_functional(test_atomic_fetch_add_sub_thread, 0); +} + +void atomic_test_atomic_max_min(void) +{ + test_atomic_functional(test_atomic_max_min_thread, CHECK_MAX_MIN); +} + +void atomic_test_atomic_cas_inc_dec(void) +{ + test_atomic_functional(test_atomic_cas_inc_dec_thread, 0); +} + +void atomic_test_atomic_xchg(void) +{ + test_atomic_functional(test_atomic_xchg_thread, CHECK_XCHG); +} + +void atomic_test_atomic_non_relaxed(void) +{ + test_atomic_functional(test_atomic_non_relaxed_thread, + CHECK_MAX_MIN | CHECK_XCHG); +} + +void atomic_test_atomic_op_lock_free(void) +{ + odpdrv_atomic_op_t atomic_op; + int ret_null, ret; + + memset(&atomic_op, 0xff, sizeof(odpdrv_atomic_op_t)); + atomic_op.all_bits = 0; + + CU_ASSERT(atomic_op.all_bits == 0); + CU_ASSERT(atomic_op.op.init == 0); + CU_ASSERT(atomic_op.op.load == 0); + CU_ASSERT(atomic_op.op.store == 0); + CU_ASSERT(atomic_op.op.fetch_add == 0); + CU_ASSERT(atomic_op.op.add == 0); + CU_ASSERT(atomic_op.op.fetch_sub == 0); + CU_ASSERT(atomic_op.op.sub == 0); + CU_ASSERT(atomic_op.op.fetch_inc == 0); + CU_ASSERT(atomic_op.op.inc == 0); + CU_ASSERT(atomic_op.op.fetch_dec == 0); + CU_ASSERT(atomic_op.op.dec == 0); + CU_ASSERT(atomic_op.op.min == 0); + CU_ASSERT(atomic_op.op.max == 0); + CU_ASSERT(atomic_op.op.cas == 0); + CU_ASSERT(atomic_op.op.xchg == 0); + + /* Test setting first, last and couple of other bits */ + atomic_op.op.init = 1; + CU_ASSERT(atomic_op.op.init == 1); + CU_ASSERT(atomic_op.all_bits != 0); + atomic_op.op.init = 0; + CU_ASSERT(atomic_op.all_bits == 0); + + atomic_op.op.xchg = 1; + CU_ASSERT(atomic_op.op.xchg == 1); + CU_ASSERT(atomic_op.all_bits != 0); + atomic_op.op.xchg = 0; + CU_ASSERT(atomic_op.all_bits == 0); + + atomic_op.op.add = 1; + CU_ASSERT(atomic_op.op.add == 1); + CU_ASSERT(atomic_op.all_bits != 0); + atomic_op.op.add = 0; + CU_ASSERT(atomic_op.all_bits == 0); + + atomic_op.op.dec = 1; + CU_ASSERT(atomic_op.op.dec == 1); + CU_ASSERT(atomic_op.all_bits != 0); + atomic_op.op.dec = 0; + CU_ASSERT(atomic_op.all_bits == 0); + + memset(&atomic_op, 0xff, sizeof(odpdrv_atomic_op_t)); + ret = odpdrv_atomic_lock_free_u64(&atomic_op); + ret_null = odpdrv_atomic_lock_free_u64(NULL); + + CU_ASSERT(ret == ret_null); + + /* Init operation is not atomic by the spec. Call to + * odpdrv_atomic_lock_free_u64() zeros it but never sets it. */ + + if (ret == 0) { + /* none are lock free */ + CU_ASSERT(atomic_op.all_bits == 0); + CU_ASSERT(atomic_op.op.init == 0); + CU_ASSERT(atomic_op.op.load == 0); + CU_ASSERT(atomic_op.op.store == 0); + CU_ASSERT(atomic_op.op.fetch_add == 0); + CU_ASSERT(atomic_op.op.add == 0); + CU_ASSERT(atomic_op.op.fetch_sub == 0); + CU_ASSERT(atomic_op.op.sub == 0); + CU_ASSERT(atomic_op.op.fetch_inc == 0); + CU_ASSERT(atomic_op.op.inc == 0); + CU_ASSERT(atomic_op.op.fetch_dec == 0); + CU_ASSERT(atomic_op.op.dec == 0); + CU_ASSERT(atomic_op.op.min == 0); + CU_ASSERT(atomic_op.op.max == 0); + CU_ASSERT(atomic_op.op.cas == 0); + CU_ASSERT(atomic_op.op.xchg == 0); + } + + if (ret == 1) { + /* some are lock free */ + CU_ASSERT(atomic_op.all_bits != 0); + CU_ASSERT(atomic_op.op.init == 0); + } + + if (ret == 2) { + /* all are lock free */ + CU_ASSERT(atomic_op.all_bits != 0); + CU_ASSERT(atomic_op.op.init == 0); + CU_ASSERT(atomic_op.op.load == 1); + CU_ASSERT(atomic_op.op.store == 1); + CU_ASSERT(atomic_op.op.fetch_add == 1); + CU_ASSERT(atomic_op.op.add == 1); + CU_ASSERT(atomic_op.op.fetch_sub == 1); + CU_ASSERT(atomic_op.op.sub == 1); + CU_ASSERT(atomic_op.op.fetch_inc == 1); + CU_ASSERT(atomic_op.op.inc == 1); + CU_ASSERT(atomic_op.op.fetch_dec == 1); + CU_ASSERT(atomic_op.op.dec == 1); + CU_ASSERT(atomic_op.op.min == 1); + CU_ASSERT(atomic_op.op.max == 1); + CU_ASSERT(atomic_op.op.cas == 1); + CU_ASSERT(atomic_op.op.xchg == 1); + } +} + +odp_testinfo_t atomic_suite_atomic[] = { + ODP_TEST_INFO(atomic_test_atomic_inc_dec), + ODP_TEST_INFO(atomic_test_atomic_add_sub), + ODP_TEST_INFO(atomic_test_atomic_fetch_inc_dec), + ODP_TEST_INFO(atomic_test_atomic_fetch_add_sub), + ODP_TEST_INFO(atomic_test_atomic_max_min), + ODP_TEST_INFO(atomic_test_atomic_cas_inc_dec), + ODP_TEST_INFO(atomic_test_atomic_xchg), + ODP_TEST_INFO(atomic_test_atomic_non_relaxed), + ODP_TEST_INFO(atomic_test_atomic_op_lock_free), + ODP_TEST_INFO_NULL, +}; + +odp_suiteinfo_t atomic_suites[] = { + {"atomic", NULL, NULL, + atomic_suite_atomic}, + ODP_SUITE_INFO_NULL +}; + +int atomic_main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(atomic_init); + + ret = odp_cunit_register(atomic_suites); + + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/drv/atomic/atomic.h b/test/common_plat/validation/drv/atomic/atomic.h new file mode 100644 index 0000000..438c0a3 --- /dev/null +++ b/test/common_plat/validation/drv/atomic/atomic.h @@ -0,0 +1,38 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _ODP_TEST_ATOMIC_H_ +#define _ODP_TEST_ATOMIC_H_ + +#include <odp_cunit_common.h> + +/* test functions: */ +void atomic_test_atomic_inc_dec(void); +void atomic_test_atomic_add_sub(void); +void atomic_test_atomic_fetch_inc_dec(void); +void atomic_test_atomic_fetch_add_sub(void); +void atomic_test_atomic_max_min(void); +void atomic_test_atomic_cas_inc_dec(void); +void atomic_test_atomic_xchg(void); +void atomic_test_atomic_non_relaxed(void); +void atomic_test_atomic_op_lock_free(void); + +/* test arrays: */ +extern odp_testinfo_t atomic_suite_atomic[]; + +/* test array init/term functions: */ +int atomic_suite_init(void); + +/* test registry: */ +extern odp_suiteinfo_t atomic_suites[]; + +/* executable init/term functions: */ +int atomic_init(odp_instance_t *inst); + +/* main test program: */ +int atomic_main(int argc, char *argv[]); + +#endif diff --git a/test/common_plat/validation/drv/atomic/atomic_main.c b/test/common_plat/validation/drv/atomic/atomic_main.c index 44fb710..b290087 100644 --- a/test/common_plat/validation/drv/atomic/atomic_main.c +++ b/test/common_plat/validation/drv/atomic/atomic_main.c @@ -4,7 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -int main(void) +#include "atomic.h" + +int main(int argc, char *argv[]) { - return 0; + return atomic_main(argc, argv); } commit becb0250ea30f65f3beb02f0094197704f450352 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Fri Jul 29 08:57:25 2016 +0200 test: validation: drv: adding the new drv interface The new structure for validation tests aiming the drv interface of ODP is added (around a first DRV atomic test empty skeleton) Signed-off-by: Christophe Milard <christophe.milard(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/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 index be878bd..bfde6cb 100644 --- a/test/common_plat/m4/configure.m4 +++ b/test/common_plat/m4/configure.m4 @@ -7,6 +7,7 @@ AC_CONFIG_FILES([test/common_plat/Makefile test/common_plat/miscellaneous/Makefile test/common_plat/performance/Makefile test/common_plat/validation/Makefile + test/common_plat/validation/api/Makefile test/common_plat/validation/api/atomic/Makefile test/common_plat/validation/api/barrier/Makefile test/common_plat/validation/api/buffer/Makefile @@ -17,7 +18,6 @@ AC_CONFIG_FILES([test/common_plat/Makefile test/common_plat/validation/api/hash/Makefile test/common_plat/validation/api/init/Makefile test/common_plat/validation/api/lock/Makefile - test/common_plat/validation/api/Makefile test/common_plat/validation/api/packet/Makefile test/common_plat/validation/api/pktio/Makefile test/common_plat/validation/api/pool/Makefile @@ -30,4 +30,6 @@ AC_CONFIG_FILES([test/common_plat/Makefile test/common_plat/validation/api/thread/Makefile test/common_plat/validation/api/time/Makefile test/common_plat/validation/api/timer/Makefile - test/common_plat/validation/api/traffic_mngr/Makefile]) + test/common_plat/validation/api/traffic_mngr/Makefile + test/common_plat/validation/drv/Makefile + test/common_plat/validation/drv/atomic/Makefile]) diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am index 5d525fb..ef58b25 100644 --- a/test/common_plat/validation/Makefile.am +++ b/test/common_plat/validation/Makefile.am @@ -1,3 +1,4 @@ if cunit_support - SUBDIRS = api + SUBDIRS = api \ + drv endif diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/Makefile.inc similarity index 100% copy from test/common_plat/validation/api/Makefile.inc copy to test/common_plat/validation/Makefile.inc diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index ffba620..757ccad 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -1,16 +1 @@ -include $(top_srcdir)/test/Makefile.inc - -COMMON_DIR = $(top_builddir)/test/common_plat/common - -#the following option ensure that option '-I.' is not passed to gcc, -#therefore distinguishing between '#include "X"' and '#include <X>'. -#It allows common filenames (such as 'errno.h') to be used locally. -AUTOMAKE_OPTIONS = nostdinc - -AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common -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 +include $(top_srcdir)/test/common_plat/validation/Makefile.inc diff --git a/test/common_plat/validation/drv/.gitignore b/test/common_plat/validation/drv/.gitignore new file mode 100644 index 0000000..7e563b8 --- /dev/null +++ b/test/common_plat/validation/drv/.gitignore @@ -0,0 +1,2 @@ +*.log +*.trs diff --git a/test/common_plat/validation/drv/Makefile.am b/test/common_plat/validation/drv/Makefile.am new file mode 100644 index 0000000..0dae3c3 --- /dev/null +++ b/test/common_plat/validation/drv/Makefile.am @@ -0,0 +1,6 @@ +ODPDRV_MODULES = atomic + +SUBDIRS = $(ODPDRV_MODULES) + +#The tests will need to retain the deprecated test implementation +AM_CFLAGS += -Wno-deprecated-declarations diff --git a/test/common_plat/validation/drv/Makefile.inc b/test/common_plat/validation/drv/Makefile.inc new file mode 100644 index 0000000..757ccad --- /dev/null +++ b/test/common_plat/validation/drv/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/test/common_plat/validation/Makefile.inc diff --git a/test/common_plat/validation/drv/README b/test/common_plat/validation/drv/README new file mode 100644 index 0000000..d1a9e6f --- /dev/null +++ b/test/common_plat/validation/drv/README @@ -0,0 +1,35 @@ +Copyright (c) 2016, Linaro Limited +All rights reserved. + +SPDX-License-Identifier: BSD-3-Clause + + +To add tests in here, please observe the rules listed below. This list +is a brief overview, for a more detailed explanation of the test +framework refer to the ODP Implementers' Guide, which can built as +follows: + + ./configure --enable-user-guides + make + +Output will be in doc/output/. If this fails, check the documentation +section of the DEPENDENCIES file. + +Rules for all tests under this tree: + +1. Tests must be placed in the directory of the module they belong to. + +2. Tests must be platform agnostic, i.e. + + - should be written in plain C only. + - may only use C standard library functions, CUnit functions and of + course ODP functions + - should be expected to pass on all ODP implementations + + Tests that do not follow these rules should be placed in the platform + specific test area (currently platform/<platform>/test/). + +3. If a new ODP DRV module is created, please update the Makefile.am. + +4. Symbols exported from test libraries must respect the naming + convention detailed in the ODP Implementers' Guide. diff --git a/test/common_plat/validation/drv/atomic/Makefile.am b/test/common_plat/validation/drv/atomic/Makefile.am new file mode 100644 index 0000000..be48623 --- /dev/null +++ b/test/common_plat/validation/drv/atomic/Makefile.am @@ -0,0 +1,4 @@ +include ../Makefile.inc + +test_PROGRAMS = atomic_main$(EXEEXT) +dist_atomic_main_SOURCES = atomic_main.c diff --git a/test/common_plat/validation/drv/atomic/atomic_main.c b/test/common_plat/validation/drv/atomic/atomic_main.c new file mode 100644 index 0000000..44fb710 --- /dev/null +++ b/test/common_plat/validation/drv/atomic/atomic_main.c @@ -0,0 +1,10 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int main(void) +{ + return 0; +} diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index f5cc52d..1cee6e7 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -2,6 +2,7 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api +ALL_DRV_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/drv SUBDIRS = @@ -33,6 +34,7 @@ TESTS = validation/api/pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) \ + $(ALL_DRV_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ ring/ring_main$(EXEEXT) SUBDIRS += validation/api/pktio\ commit 90e456db5f983f3fff9126dd70f6fea907fed361 Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Fri Jul 29 08:57:24 2016 +0200 linux-generic: drv: fixed macro typo Signed-off-by: Christophe Milard <christophe.milard(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/drv/byteorder.h b/platform/linux-generic/include/odp/drv/byteorder.h index 709a520..3991b26 100644 --- a/platform/linux-generic/include/odp/drv/byteorder.h +++ b/platform/linux-generic/include/odp/drv/byteorder.h @@ -10,8 +10,8 @@ * ODPDRV byteorder */ -#ifndef ODPDRVP_PLAT_BYTEORDER_H_ -#define ODPDRVP_PLAT_BYTEORDER_H_ +#ifndef ODPDRV_PLAT_BYTEORDER_H_ +#define ODPDRV_PLAT_BYTEORDER_H_ #ifdef __cplusplus extern "C" { @@ -27,7 +27,7 @@ extern "C" { static inline uint16_t odpdrv_be_to_cpu_16(odpdrv_u16be_t be16) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return __odpdrv_builtin_bswap16((__odpdrv_force uint16_t)be16); #else return (__odpdrv_force uint16_t)be16; @@ -36,7 +36,7 @@ static inline uint16_t odpdrv_be_to_cpu_16(odpdrv_u16be_t be16) static inline uint32_t odpdrv_be_to_cpu_32(odpdrv_u32be_t be32) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return __builtin_bswap32((__odpdrv_force uint32_t)be32); #else return (__odpdrv_force uint32_t)be32; @@ -45,7 +45,7 @@ static inline uint32_t odpdrv_be_to_cpu_32(odpdrv_u32be_t be32) static inline uint64_t odpdrv_be_to_cpu_64(odpdrv_u64be_t be64) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return __builtin_bswap64((__odpdrv_force uint64_t)be64); #else return (__odpdrv_force uint64_t)be64; @@ -54,7 +54,7 @@ static inline uint64_t odpdrv_be_to_cpu_64(odpdrv_u64be_t be64) static inline odpdrv_u16be_t odpdrv_cpu_to_be_16(uint16_t cpu16) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force odpdrv_u16be_t)__odpdrv_builtin_bswap16(cpu16); #else return (__odpdrv_force odpdrv_u16be_t)cpu16; @@ -63,7 +63,7 @@ static inline odpdrv_u16be_t odpdrv_cpu_to_be_16(uint16_t cpu16) static inline odpdrv_u32be_t odpdrv_cpu_to_be_32(uint32_t cpu32) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force odpdrv_u32be_t)__builtin_bswap32(cpu32); #else return (__odpdrv_force odpdrv_u32be_t)cpu32; @@ -72,7 +72,7 @@ static inline odpdrv_u32be_t odpdrv_cpu_to_be_32(uint32_t cpu32) static inline odpdrv_u64be_t odpdrv_cpu_to_be_64(uint64_t cpu64) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force odpdrv_u64be_t)__builtin_bswap64(cpu64); #else return (__odpdrv_force odpdrv_u64be_t)cpu64; @@ -81,7 +81,7 @@ static inline odpdrv_u64be_t odpdrv_cpu_to_be_64(uint64_t cpu64) static inline uint16_t odpdrv_le_to_cpu_16(odpdrv_u16le_t le16) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force uint16_t)le16; #else return __odpdrv_builtin_bswap16((__odpdrv_force uint16_t)le16); @@ -90,7 +90,7 @@ static inline uint16_t odpdrv_le_to_cpu_16(odpdrv_u16le_t le16) static inline uint32_t odpdrv_le_to_cpu_32(odpdrv_u32le_t le32) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force uint32_t)le32; #else return __builtin_bswap32((__odpdrv_force uint32_t)le32); @@ -99,7 +99,7 @@ static inline uint32_t odpdrv_le_to_cpu_32(odpdrv_u32le_t le32) static inline uint64_t odpdrv_le_to_cpu_64(odpdrv_u64le_t le64) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force uint64_t)le64; #else return __builtin_bswap64((__odpdrv_force uint64_t)le64); @@ -108,7 +108,7 @@ static inline uint64_t odpdrv_le_to_cpu_64(odpdrv_u64le_t le64) static inline odpdrv_u16le_t odpdrv_cpu_to_le_16(uint16_t cpu16) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force odpdrv_u16le_t)cpu16; #else return (__odpdrv_force odpdrv_u16le_t)__odpdrv_builtin_bswap16(cpu16); @@ -117,7 +117,7 @@ static inline odpdrv_u16le_t odpdrv_cpu_to_le_16(uint16_t cpu16) static inline odpdrv_u32le_t odpdrv_cpu_to_le_32(uint32_t cpu32) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force odpdrv_u32le_t)cpu32; #else return (__odpdrv_force odpdrv_u32le_t)__builtin_bswap32(cpu32); @@ -126,7 +126,7 @@ static inline odpdrv_u32le_t odpdrv_cpu_to_le_32(uint32_t cpu32) static inline odpdrv_u64le_t odpdrv_cpu_to_le_64(uint64_t cpu64) { -#if ODPDRVP_BYTE_ORDER == ODPDRVP_LITTLE_ENDIAN +#if ODPDRV_BYTE_ORDER == ODPDRV_LITTLE_ENDIAN return (__odpdrv_force odpdrv_u64le_t)cpu64; #else return (__odpdrv_force odpdrv_u64le_t)__builtin_bswap64(cpu64); commit e45799924207308fcac2928a64e6ecc3ca102a8c Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Fri Jul 29 08:57:23 2016 +0200 linux-generic: drv: fix align.h for new arch structure The arch directory structure has been changed. The linux-generic DRV align.h file, which makes use of the cache line size defined in this arch directory is updated here to match this new structure. Signed-off-by: Christophe Milard <christophe.milard(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/drv/align.h b/platform/linux-generic/include/odp/drv/align.h index eded2e3..7636f89 100644 --- a/platform/linux-generic/include/odp/drv/align.h +++ b/platform/linux-generic/include/odp/drv/align.h @@ -17,6 +17,8 @@ extern "C" { #endif +#include <odp/api/cpu_arch.h> + /** @ingroup odpdrv_compiler_optim * @{ */ @@ -31,16 +33,12 @@ extern "C" { #define ODPDRV_FIELD_SIZEOF(type, member) sizeof(((type *)0)->member) -#if defined __arm__ || defined __aarch64__ - -#define ODPDRV_CACHE_LINE_SIZE 64 - -#endif - #else #error Non-gcc compatible compiler #endif +#define ODPDRV_CACHE_LINE_SIZE _ODP_CACHE_LINE_SIZE + #define ODPDRV_PAGE_SIZE 4096 #define ODPDRV_ALIGNED_CACHE ODPDRV_ALIGNED(ODPDRV_CACHE_LINE_SIZE) commit a47f5fbb6ed8122a3453f5f5a3fabf53a98d7fdf Author: Christophe Milard <christophe.milard(a)linaro.org> Date: Fri Jul 29 08:57:22 2016 +0200 linux-generic: make drv interface part of the distribution Make sure that the file odp_drv.h is part if a distribution, as odp_api.h. Signed-off-by: Christophe Milard <christophe.milard(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/Makefile.am b/platform/linux-generic/Makefile.am index d3ab31b..747e96f 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -9,7 +9,8 @@ AM_CFLAGS += -I$(top_srcdir)/include 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 = \ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 3 +- platform/linux-generic/include/odp/drv/align.h | 10 +- platform/linux-generic/include/odp/drv/byteorder.h | 28 +-- test/common_plat/m4/configure.m4 | 6 +- test/common_plat/validation/Makefile.am | 3 +- test/common_plat/validation/{api => }/Makefile.inc | 0 test/common_plat/validation/api/Makefile.inc | 17 +- .../common_plat/validation/{api => drv}/.gitignore | 0 test/common_plat/validation/drv/Makefile.am | 6 + test/common_plat/validation/drv/Makefile.inc | 1 + test/common_plat/validation/{api => drv}/README | 4 +- .../validation/{api => drv}/atomic/.gitignore | 0 .../validation/{api => drv}/atomic/Makefile.am | 0 .../validation/{api => drv}/atomic/atomic.c | 221 +++++++++++---------- .../validation/{api => drv}/atomic/atomic.h | 2 +- .../validation/{api => drv}/atomic/atomic_main.c | 2 +- test/linux-generic/Makefile.am | 2 + 17 files changed, 154 insertions(+), 151 deletions(-) copy test/common_plat/validation/{api => }/Makefile.inc (100%) copy test/common_plat/validation/{api => drv}/.gitignore (100%) create mode 100644 test/common_plat/validation/drv/Makefile.am create mode 100644 test/common_plat/validation/drv/Makefile.inc copy test/common_plat/validation/{api => drv}/README (91%) copy test/common_plat/validation/{api => drv}/atomic/.gitignore (100%) copy test/common_plat/validation/{api => drv}/atomic/Makefile.am (100%) copy test/common_plat/validation/{api => drv}/atomic/atomic.c (74%) copy test/common_plat/validation/{api => drv}/atomic/atomic.h (95%) copy test/common_plat/validation/{api => drv}/atomic/atomic_main.c (81%) hooks/post-receive --

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-73-gb6a5e70

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 b6a5e7039cc23e4547b11b78a12ba7f9efe6ae93 (commit) via 4c759ad5c0a4d1ece38b5cd93c24faddee9d5292 (commit) from 014a7fab6a34aacb061e53cc0b14d12aa119b03a (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 b6a5e7039cc23e4547b11b78a12ba7f9efe6ae93 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Fri Jul 29 20:08:58 2016 +0530 api:crypto: resolve todo items odp_session_proc_info_t is no longer required. Clarified hash_result_offset and its relation with ICV value. Signed-off-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index d8123e9..dea1fe9 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -170,8 +170,6 @@ typedef struct odp_crypto_data_range { /** * Crypto API session creation parameters - * - * @todo Add "odp_session_proc_info_t" */ typedef struct odp_crypto_session_params { odp_crypto_op_t op; /**< Encode versus decode */ @@ -210,8 +208,6 @@ typedef struct odp_crypto_session_params { /** * Crypto API per packet operation parameters - * - * @todo Clarify who zero's ICV and how this relates to "hash_result_offset" */ typedef struct odp_crypto_op_params { odp_crypto_session_t session; /**< Session handle from creation */ @@ -245,6 +241,14 @@ typedef struct odp_crypto_op_params { * indicates the caller wishes the destination packet buffer be allocated * from the output pool specified during session creation. * + * @var odp_crypto_op_params_t::hash_result_offset + * + * Specifies the offset where the hash result is to be stored. In case of + * decode sessions, input hash values will be read from this offset, and + * overwritten with hash results. If this offset lies within specified + * auth_range, implementation will mute this field before calculating the hash + * result. + * * @sa odp_crypto_session_params_t::output_pool. */ commit 4c759ad5c0a4d1ece38b5cd93c24faddee9d5292 Author: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Date: Fri Jul 29 20:08:57 2016 +0530 example:ipsec: removed invalid todos. This todo item is no longer valid. Fixed as a part of following work card. https://cards.linaro.org/browse/LNG-857 Signed-off-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec/odp_ipsec_stream.h index ea480c3..6f6f7df 100644 --- a/example/ipsec/odp_ipsec_stream.h +++ b/example/ipsec/odp_ipsec_stream.h @@ -93,10 +93,6 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, /** * Verify an IPv4 packet received on a loop output queue * - * @todo Better error checking, add counters, add tracing, - * remove magic numbers, add order verification - * (see https://bugs.linaro.org/show_bug.cgi?id=620) - * * @param stream Stream to verify the packet against * @param pkt Packet to verify * ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec_stream.h | 4 ---- include/odp/api/spec/crypto.h | 12 ++++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive --

9 years, 6 months

[COMMIT] branch master updated. v1.10.1.0-71-g014a7fa

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 014a7fab6a34aacb061e53cc0b14d12aa119b03a (commit) via 48272fd98f3882a708a7302cd4e28308d59f96e9 (commit) via e63a6cc10819fccbc55ec55d4585e0619463320b (commit) from 2b5e5bdfc8b650feba79ccd23c175fad16fd2b33 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/system_info.h | 4 ++-- include/odp/api/spec/traffic_mngr.h | 11 ++++++++--- platform/linux-generic/include/odp_traffic_mngr_internal.h | 2 +- platform/linux-generic/odp_traffic_mngr.c | 8 +++++++- test/common_plat/validation/api/traffic_mngr/traffic_mngr.c | 8 ++++---- 5 files changed, 22 insertions(+), 11 deletions(-) hooks/post-receive --

9 years, 6 months

[COMMIT] branch next updated. v1.10.1.0-71-g014a7fa

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, next has been updated discards 60a2ce06aaf7e6768cb6c8b22ced90cc5d2cb946 (commit) discards 710a73bb19121a880acea4a87e5a6e6cecb276ea (commit) discards 2846f6773314bdb4693cf125a79c9b6367cfff15 (commit) via 014a7fab6a34aacb061e53cc0b14d12aa119b03a (commit) via 48272fd98f3882a708a7302cd4e28308d59f96e9 (commit) via e63a6cc10819fccbc55ec55d4585e0619463320b (commit) via 2b5e5bdfc8b650feba79ccd23c175fad16fd2b33 (commit) via e6fd300ada7529c9ae454c2ce537844a1c822d21 (commit) via 870ef79d2dae0ad94a5079d0ca1e222493937aef (commit) via 4329099f32dc7e097eac6ec263264bc0f31d042c (commit) via b5354ade4337447d2914e5ffa4bdeb36dd689113 (commit) via ec0d570b8f762ea79960d54cf8c4f36efdea2528 (commit) via 20f14c1e726c97cb675c26627c073b730bcb58e6 (commit) via d440fa6b463d9dad5e852d7970c5f77493f190f0 (commit) via 5d5304117434ab340cdd138066561e00a6b0642d (commit) via 79534012879ca74a68256ca40922b3fef7983611 (commit) via efa6bc89a4e7a5823a3c8c27fcdc9573d7ac5694 (commit) via c79b041f389e56a2c713a507b75762e08d75e4b4 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (60a2ce06aaf7e6768cb6c8b22ced90cc5d2cb946) \ N -- N -- N (014a7fab6a34aacb061e53cc0b14d12aa119b03a) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 014a7fab6a34aacb061e53cc0b14d12aa119b03a Author: Barry Spinney <spinney(a)mellanox.com> Date: Wed Jul 13 11:59:40 2016 -0500 api: tm: resolve todo This todo just asks a question which is no longer important. Signed-off-by: Barry Spinney <spinney(a)mellanox.com> Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index c9e6f8f..3473648 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -93,7 +93,6 @@ extern "C" { * @def ODP_TM_MAX_TM_NODE_FANIN * The largest number of fan-in "inputs" that can be simultaneously connected * to a single tm_node. - * @todo Does this need to be as large as ODP_TM_MAX_TM_QUEUES? */ /** @@ -886,7 +885,7 @@ typedef struct { /** In the case that sched_modes for a given strict priority level * indicates the use of weighted scheduling, this field supplies the * weighting factors. The weights - when defined - are used such that - * the (adjusted) frame lengths are divided by these 8-bit weights + * the (adjusted) frame lengths are divided by these 8-bit weights * (i.e. they are divisors and not multipliers). Consequently a * weight of 0 (when sched_mode is ODP_TM_BYTE_BASED_WEIGHTS) is * illegal. */ commit 48272fd98f3882a708a7302cd4e28308d59f96e9 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jun 28 17:35:54 2016 +0530 api: traffic_mngr: Add pktio interface to odp_tm_egress_t struct Replaces pktio interface as input to TM system instead of odp_pktout_queue_t.This creates an 1 to 1 mapping between a TM system and pktio interface. Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index 83b89e7..c9e6f8f 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -270,6 +270,12 @@ typedef struct { * have their fan_in only from tm_queues. */ uint8_t max_levels; + /** egress_fcn_supported indicates whether the tm system supports + * egress function. It is an optional feature used to receive the + * packet from the tm system and its performance might be limited. + */ + odp_bool_t egress_fcn_supported; + /** tm_queue_shaper_supported indicates that the tm_queues support * proper TM shaping. Note that TM Shaping is NOT the same thing as * Ingress Metering/Policing as specified by RFC 2697 (A Single Rate @@ -467,7 +473,7 @@ typedef struct { odp_tm_egress_kind_t egress_kind; /**< Union discriminator */ union { - odp_pktout_queue_t pktout; + odp_pktio_t pktio; odp_tm_egress_fcn_t egress_fcn; }; } odp_tm_egress_t; diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index 15451ac..e4bc5ce 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -380,7 +380,7 @@ typedef struct { tm_queue_info_t priority_info[ODP_TM_MAX_PRIORITIES]; tm_random_data_t tm_random_data; - + odp_pktout_queue_t pktout; uint64_t current_time; uint8_t tm_idx; uint8_t first_enq; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 7a8b647..e668bf9 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -2108,7 +2108,7 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends) tm_system->egress_pkt_desc = EMPTY_PKT_DESC; if (tm_system->egress.egress_kind == ODP_TM_EGRESS_PKT_IO) - odp_pktout_send(tm_system->egress.pktout, &odp_pkt, 1); + odp_pktout_send(tm_system->pktout, &odp_pkt, 1); else if (tm_system->egress.egress_kind == ODP_TM_EGRESS_FN) tm_system->egress.egress_fcn(odp_pkt); else @@ -2426,6 +2426,7 @@ int odp_tm_capabilities(odp_tm_capabilities_t capabilities[] ODP_UNUSED, cap_ptr->max_tm_queues = ODP_TM_MAX_TM_QUEUES; cap_ptr->max_levels = ODP_TM_MAX_LEVELS; cap_ptr->tm_queue_shaper_supported = true; + cap_ptr->egress_fcn_supported = true; cap_ptr->tm_queue_wred_supported = true; cap_ptr->tm_queue_dual_slope_supported = true; cap_ptr->vlan_marking_supported = true; @@ -2607,6 +2608,7 @@ odp_tm_t odp_tm_create(const char *name, tm_system_t *tm_system; odp_bool_t create_fail; odp_tm_t odp_tm; + odp_pktout_queue_t pktout; uint32_t malloc_len, max_num_queues, max_queued_pkts, max_timers; uint32_t max_tm_queues, max_sorted_lists; int rc; @@ -2627,6 +2629,10 @@ odp_tm_t odp_tm_create(const char *name, return ODP_TM_INVALID; } + if (odp_pktout_queue(egress->pktio, &pktout, 1) != 1) + return ODP_TM_INVALID; + + tm_system->pktout = pktout; tm_system->name_tbl_id = name_tbl_id; max_tm_queues = requirements->max_tm_queues; memcpy(&tm_system->egress, egress, sizeof(odp_tm_egress_t)); diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c index 1c4e90b..b857800 100644 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c @@ -323,7 +323,7 @@ static odp_pktio_t pktios[MAX_NUM_IFACES]; static odp_pktin_queue_t pktins[MAX_NUM_IFACES]; static odp_pktout_queue_t pktouts[MAX_NUM_IFACES]; static odp_pktin_queue_t rcv_pktin; -static odp_pktout_queue_t xmt_pktout; +static odp_pktio_t xmt_pktio; static odph_ethaddr_t src_mac; static odph_ethaddr_t dst_mac; @@ -543,7 +543,7 @@ static int open_pktios(void) } if (2 <= num_ifaces) { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[1]; ret = odp_pktio_start(pktios[1]); if (ret != 0) { @@ -551,7 +551,7 @@ static int open_pktios(void) return -1; } } else { - xmt_pktout = pktouts[0]; + xmt_pktio = pktios[0]; rcv_pktin = pktins[0]; } @@ -1627,7 +1627,7 @@ static int create_tm_system(void) } egress.egress_kind = ODP_TM_EGRESS_PKT_IO; - egress.pktout = xmt_pktout; + egress.pktio = xmt_pktio; snprintf(tm_name, sizeof(tm_name), "TM_system_%u", num_odp_tm_systems); odp_tm = odp_tm_create(tm_name, &requirements, &egress); commit e63a6cc10819fccbc55ec55d4585e0619463320b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue May 10 18:34:37 2016 +0300 api: system: specify default huge page size System can have different sizes for huge pages. Clarify that this api returns default system huge page size, which is usually 2Mb on x86 reachable with: grep Hugepagesize: /proc/meminfo Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h index 6957731..c5a5fd0 100644 --- a/include/odp/api/spec/system_info.h +++ b/include/odp/api/spec/system_info.h @@ -24,9 +24,9 @@ extern "C" { */ /** - * Huge page size in bytes + * Default system huge page size in bytes * - * @return Huge page size in bytes + * @return Default huge page size in bytes */ uint64_t odp_sys_huge_page_size(void); ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/implementers-guide/implementers-guide.adoc | 137 +++--- platform/Makefile.inc | 17 + platform/linux-generic/Makefile.am | 17 - .../linux-generic/arch/default/odp/api/cpu_arch.h | 10 +- .../linux-generic/arch/mips64/odp/api/cpu_arch.h | 12 +- .../linux-generic/arch/powerpc/odp/api/cpu_arch.h | 10 +- platform/linux-generic/arch/x86/odp/api/cpu_arch.h | 10 +- platform/linux-generic/include/odp/api/align.h | 11 +- .../linux-generic/include/odp_buffer_inlines.h | 26 +- .../linux-generic/include/odp_buffer_internal.h | 5 +- .../linux-generic/include/odp_config_internal.h | 2 +- platform/linux-generic/include/odp_internal.h | 2 - .../linux-generic/include/odp_packet_internal.h | 4 +- platform/linux-generic/include/odp_packet_netmap.h | 6 + platform/linux-generic/include/odp_packet_socket.h | 1 + platform/linux-generic/include/odp_pool_internal.h | 143 +------ platform/linux-generic/odp_buffer.c | 3 - platform/linux-generic/odp_packet.c | 68 +-- platform/linux-generic/odp_pool.c | 467 ++++++++++++++++++--- platform/linux-generic/pktio/dpdk.c | 24 +- platform/linux-generic/pktio/netmap.c | 127 +++--- platform/linux-generic/pktio/pcap.c | 26 +- platform/linux-generic/pktio/socket.c | 21 +- platform/linux-generic/pktio/socket_mmap.c | 7 +- platform/linux-generic/pktio/tap.c | 7 +- test/Makefile.am | 6 +- test/common_plat/Makefile.am | 7 + .../{validation => common_plat}/common/Makefile.am | 0 .../common/mask_common.c | 0 .../common/mask_common.h | 0 .../common/odp_cunit_common.c | 0 .../common/odp_cunit_common.h | 0 test/common_plat/m4/configure.m4 | 33 ++ test/{ => common_plat}/m4/miscellaneous.m4 | 0 test/{ => common_plat}/m4/performance.m4 | 0 test/{ => common_plat}/m4/validation.m4 | 0 test/{ => common_plat}/miscellaneous/.gitignore | 0 test/{ => common_plat}/miscellaneous/Makefile.am | 0 .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{ => common_plat}/performance/.gitignore | 0 test/{ => common_plat}/performance/Makefile.am | 0 test/{ => common_plat}/performance/odp_crypto.c | 6 +- test/{ => common_plat}/performance/odp_l2fwd.c | 1 - .../{ => common_plat}/performance/odp_l2fwd_run.sh | 11 +- .../{ => common_plat}/performance/odp_pktio_perf.c | 34 +- .../{ => common_plat}/performance/odp_scheduling.c | 67 +-- .../performance/odp_scheduling_run.sh | 0 test/common_plat/validation/Makefile.am | 3 + .../validation/api}/.gitignore | 0 .../validation/api}/Makefile.am | 2 +- .../validation/api}/Makefile.inc | 4 +- .../validation/api}/README | 0 .../validation/api}/atomic/.gitignore | 0 .../validation/api}/atomic/Makefile.am | 0 .../validation/api}/atomic/atomic.c | 0 .../validation/api}/atomic/atomic.h | 0 .../validation/api}/atomic/atomic_main.c | 0 .../validation/api}/barrier/.gitignore | 0 .../validation/api}/barrier/Makefile.am | 0 .../validation/api}/barrier/barrier.c | 0 .../validation/api}/barrier/barrier.h | 0 .../validation/api}/barrier/barrier_main.c | 0 .../validation/api}/buffer/.gitignore | 0 .../validation/api}/buffer/Makefile.am | 0 .../validation/api}/buffer/buffer.c | 0 .../validation/api}/buffer/buffer.h | 0 .../validation/api}/buffer/buffer_main.c | 0 .../validation/api}/classification/.gitignore | 0 .../validation/api}/classification/Makefile.am | 0 .../api}/classification/classification.c | 0 .../api}/classification/classification.h | 0 .../api}/classification/classification_main.c | 0 .../api}/classification/odp_classification_basic.c | 0 .../classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 1 - .../api}/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api}/cpumask/.gitignore | 0 .../validation/api}/cpumask/Makefile.am | 0 .../validation/api}/cpumask/cpumask.c | 0 .../validation/api}/cpumask/cpumask.h | 0 .../validation/api}/cpumask/cpumask_main.c | 0 .../validation/api}/crypto/.gitignore | 0 .../validation/api}/crypto/Makefile.am | 0 .../validation/api}/crypto/crypto.c | 0 .../validation/api}/crypto/crypto.h | 0 .../validation/api}/crypto/crypto_main.c | 0 .../validation/api}/crypto/odp_crypto_test_inp.c | 32 +- .../validation/api}/crypto/odp_crypto_test_inp.h | 0 .../validation/api}/crypto/test_vectors.h | 2 +- .../validation/api}/crypto/test_vectors_len.h | 0 .../validation/api}/errno/.gitignore | 0 .../validation/api}/errno/Makefile.am | 0 .../validation/api}/errno/errno.c | 0 .../validation/api}/errno/errno.h | 0 .../validation/api}/errno/errno_main.c | 0 .../validation/api}/hash/.gitignore | 0 .../validation/api}/hash/Makefile.am | 0 .../validation/api}/hash/hash.c | 1 - .../validation/api}/hash/hash.h | 0 .../validation/api}/hash/hash_main.c | 0 .../validation/api}/init/.gitignore | 0 .../validation/api}/init/Makefile.am | 0 .../validation/api}/init/init.c | 0 .../validation/api}/init/init.h | 0 .../validation/api}/init/init_main_abort.c | 0 .../validation/api}/init/init_main_log.c | 0 .../validation/api}/init/init_main_ok.c | 0 .../validation/api}/lock/.gitignore | 0 .../validation/api}/lock/Makefile.am | 0 .../validation/api}/lock/lock.c | 0 .../validation/api}/lock/lock.h | 0 .../validation/api}/lock/lock_main.c | 0 .../validation/api}/packet/.gitignore | 0 .../validation/api}/packet/Makefile.am | 0 .../validation/api}/packet/packet.c | 0 .../validation/api}/packet/packet.h | 0 .../validation/api}/packet/packet_main.c | 0 .../validation/api}/pktio/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio.c | 2 - .../validation/api}/pktio/pktio.h | 0 .../validation/api}/pktio/pktio_main.c | 0 .../validation/api}/pool/.gitignore | 0 .../validation/api}/pool/Makefile.am | 0 .../validation/api}/pool/pool.c | 0 .../validation/api}/pool/pool.h | 0 .../validation/api}/pool/pool_main.c | 0 .../validation/api}/queue/.gitignore | 0 .../validation/api}/queue/Makefile.am | 0 .../validation/api}/queue/queue.c | 7 +- .../validation/api}/queue/queue.h | 0 .../validation/api}/queue/queue_main.c | 0 .../validation/api}/random/.gitignore | 0 .../validation/api}/random/Makefile.am | 0 .../validation/api}/random/random.c | 0 .../validation/api}/random/random.h | 0 .../validation/api}/random/random_main.c | 0 .../validation/api}/scheduler/.gitignore | 0 .../validation/api}/scheduler/Makefile.am | 0 .../validation/api}/scheduler/scheduler.c | 13 +- .../validation/api}/scheduler/scheduler.h | 0 .../validation/api}/scheduler/scheduler_main.c | 0 .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.c | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_main.c | 0 .../validation/api}/std_clib/.gitignore | 0 .../validation/api}/std_clib/Makefile.am | 0 .../validation/api}/std_clib/std_clib.c | 0 .../validation/api}/std_clib/std_clib.h | 0 .../validation/api}/std_clib/std_clib_main.c | 0 .../validation/api}/system/.gitignore | 0 .../validation/api}/system/Makefile.am | 0 .../validation/api}/system/system.c | 0 .../validation/api}/system/system.h | 0 .../validation/api}/system/system_main.c | 0 .../validation/api}/thread/.gitignore | 0 .../validation/api}/thread/Makefile.am | 0 .../validation/api}/thread/thread.c | 0 .../validation/api}/thread/thread.h | 0 .../validation/api}/thread/thread_main.c | 0 .../validation/api}/time/.gitignore | 0 .../validation/api}/time/Makefile.am | 0 .../validation/api}/time/time.c | 0 .../validation/api}/time/time.h | 0 .../validation/api}/time/time_main.c | 0 .../validation/api}/timer/.gitignore | 0 .../validation/api}/timer/Makefile.am | 0 .../validation/api}/timer/timer.c | 75 ++-- .../validation/api}/timer/timer.h | 0 .../validation/api}/timer/timer_main.c | 0 .../validation/api}/traffic_mngr/.gitignore | 0 .../validation/api}/traffic_mngr/Makefile.am | 0 .../validation/api}/traffic_mngr/traffic_mngr.c | 0 .../validation/api}/traffic_mngr/traffic_mngr.h | 0 .../api}/traffic_mngr/traffic_mngr_main.c | 0 test/{platform => }/linux-generic/.gitignore | 0 test/linux-generic/Makefile.am | 79 ++++ test/{platform => }/linux-generic/Makefile.inc | 4 +- test/linux-generic/m4/configure.m4 | 5 + .../linux-generic/pktio_ipc/.gitignore | 0 .../linux-generic/pktio_ipc/Makefile.am | 0 .../linux-generic/pktio_ipc/ipc_common.c | 0 .../linux-generic/pktio_ipc/ipc_common.h | 0 .../linux-generic/pktio_ipc/pktio_ipc1.c | 0 .../linux-generic/pktio_ipc/pktio_ipc2.c | 0 .../linux-generic/pktio_ipc/pktio_ipc_run.sh | 0 test/{platform => }/linux-generic/ring/.gitignore | 0 test/{platform => }/linux-generic/ring/Makefile.am | 0 .../{platform => }/linux-generic/ring/ring_basic.c | 0 test/{platform => }/linux-generic/ring/ring_main.c | 0 .../linux-generic/ring/ring_stress.c | 0 .../linux-generic/ring/ring_suites.c | 0 .../linux-generic/ring/ring_suites.h | 0 test/{platform => }/linux-generic/run-test | 0 test/linux-generic/validation/Makefile.inc | 1 + test/linux-generic/validation/api/Makefile.inc | 1 + .../validation/api/pktio}/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio_env | 0 .../validation/api}/pktio/pktio_run.sh | 4 +- .../validation/api}/pktio/pktio_run_dpdk.sh | 4 +- .../validation/api}/pktio/pktio_run_netmap.sh | 4 +- .../validation/api}/pktio/pktio_run_pcap.sh | 4 +- .../validation/api}/pktio/pktio_run_tap.sh | 4 +- .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_common.h | 0 .../validation/api}/shmem/shmem_linux.c | 0 .../validation/api}/shmem/shmem_linux.h | 0 .../validation/api}/shmem/shmem_odp.c | 0 .../validation/api}/shmem/shmem_odp.h | 0 test/m4/configure.m4 | 33 +- test/platform/linux-generic/Makefile.am | 74 ---- test/platform/linux-generic/m4/configure.m4 | 5 - 219 files changed, 983 insertions(+), 711 deletions(-) create mode 100644 test/common_plat/Makefile.am rename test/{validation => common_plat}/common/Makefile.am (100%) rename test/{validation => common_plat}/common/mask_common.c (100%) rename test/{validation => common_plat}/common/mask_common.h (100%) rename test/{validation => common_plat}/common/odp_cunit_common.c (100%) rename test/{validation => common_plat}/common/odp_cunit_common.h (100%) create mode 100644 test/common_plat/m4/configure.m4 rename test/{ => common_plat}/m4/miscellaneous.m4 (100%) rename test/{ => common_plat}/m4/performance.m4 (100%) rename test/{ => common_plat}/m4/validation.m4 (100%) rename test/{ => common_plat}/miscellaneous/.gitignore (100%) rename test/{ => common_plat}/miscellaneous/Makefile.am (100%) rename test/{ => common_plat}/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{ => common_plat}/performance/.gitignore (100%) rename test/{ => common_plat}/performance/Makefile.am (100%) rename test/{ => common_plat}/performance/odp_crypto.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd_run.sh (90%) rename test/{ => common_plat}/performance/odp_pktio_perf.c (97%) rename test/{ => common_plat}/performance/odp_scheduling.c (93%) rename test/{ => common_plat}/performance/odp_scheduling_run.sh (100%) create mode 100644 test/common_plat/validation/Makefile.am rename test/{platform/linux-generic/pktio => common_plat/validation/api}/.gitignore (100%) rename test/{validation => common_plat/validation/api}/Makefile.am (93%) rename test/{validation => common_plat/validation/api}/Makefile.inc (83%) rename test/{validation => common_plat/validation/api}/README (100%) rename test/{validation => common_plat/validation/api}/atomic/.gitignore (100%) rename test/{validation => common_plat/validation/api}/atomic/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.c (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.h (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic_main.c (100%) rename test/{validation => common_plat/validation/api}/barrier/.gitignore (100%) rename test/{validation => common_plat/validation/api}/barrier/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.c (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.h (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier_main.c (100%) rename test/{validation => common_plat/validation/api}/buffer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/buffer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.c (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.h (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/.gitignore (100%) rename test/{validation => common_plat/validation/api}/classification/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/classification/classification.c (100%) rename test/{validation => common_plat/validation/api}/classification/classification.h (100%) rename test/{validation => common_plat/validation/api}/classification/classification_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_basic.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_common.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_test_pmr.c (99%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_tests.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_testsuites.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/.gitignore (100%) rename test/{validation => common_plat/validation/api}/cpumask/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.c (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/.gitignore (100%) rename test/{validation => common_plat/validation/api}/crypto/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.c (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.h (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.c (98%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.h (100%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors.h (99%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors_len.h (100%) rename test/{validation => common_plat/validation/api}/errno/.gitignore (100%) rename test/{validation => common_plat/validation/api}/errno/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/errno/errno.c (100%) rename test/{validation => common_plat/validation/api}/errno/errno.h (100%) rename test/{validation => common_plat/validation/api}/errno/errno_main.c (100%) rename test/{validation => common_plat/validation/api}/hash/.gitignore (100%) rename test/{validation => common_plat/validation/api}/hash/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/hash/hash.c (99%) rename test/{validation => common_plat/validation/api}/hash/hash.h (100%) rename test/{validation => common_plat/validation/api}/hash/hash_main.c (100%) rename test/{validation => common_plat/validation/api}/init/.gitignore (100%) rename test/{validation => common_plat/validation/api}/init/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/init/init.c (100%) rename test/{validation => common_plat/validation/api}/init/init.h (100%) rename test/{validation => common_plat/validation/api}/init/init_main_abort.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_log.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_ok.c (100%) rename test/{validation => common_plat/validation/api}/lock/.gitignore (100%) rename test/{validation => common_plat/validation/api}/lock/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/lock/lock.c (100%) rename test/{validation => common_plat/validation/api}/lock/lock.h (100%) rename test/{validation => common_plat/validation/api}/lock/lock_main.c (100%) rename test/{validation => common_plat/validation/api}/packet/.gitignore (100%) rename test/{validation => common_plat/validation/api}/packet/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/packet/packet.c (100%) rename test/{validation => common_plat/validation/api}/packet/packet.h (100%) rename test/{validation => common_plat/validation/api}/packet/packet_main.c (100%) rename test/{validation => common_plat/validation/api}/pktio/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pktio/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio.c (99%) rename test/{validation => common_plat/validation/api}/pktio/pktio.h (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio_main.c (100%) rename test/{validation => common_plat/validation/api}/pool/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pool/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pool/pool.c (100%) rename test/{validation => common_plat/validation/api}/pool/pool.h (100%) rename test/{validation => common_plat/validation/api}/pool/pool_main.c (100%) rename test/{validation => common_plat/validation/api}/queue/.gitignore (100%) rename test/{validation => common_plat/validation/api}/queue/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/queue/queue.c (98%) rename test/{validation => common_plat/validation/api}/queue/queue.h (100%) rename test/{validation => common_plat/validation/api}/queue/queue_main.c (100%) rename test/{validation => common_plat/validation/api}/random/.gitignore (100%) rename test/{validation => common_plat/validation/api}/random/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/random/random.c (100%) rename test/{validation => common_plat/validation/api}/random/random.h (100%) rename test/{validation => common_plat/validation/api}/random/random_main.c (100%) rename test/{validation => common_plat/validation/api}/scheduler/.gitignore (100%) rename test/{validation => common_plat/validation/api}/scheduler/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.c (99%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.h (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler_main.c (100%) rename test/{validation => common_plat/validation/api}/shmem/.gitignore (100%) rename test/{validation => common_plat/validation/api}/shmem/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.c (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.h (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem_main.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/.gitignore (100%) rename test/{validation => common_plat/validation/api}/std_clib/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.h (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib_main.c (100%) rename test/{validation => common_plat/validation/api}/system/.gitignore (100%) rename test/{validation => common_plat/validation/api}/system/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/system/system.c (100%) rename test/{validation => common_plat/validation/api}/system/system.h (100%) rename test/{validation => common_plat/validation/api}/system/system_main.c (100%) rename test/{validation => common_plat/validation/api}/thread/.gitignore (100%) rename test/{validation => common_plat/validation/api}/thread/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/thread/thread.c (100%) rename test/{validation => common_plat/validation/api}/thread/thread.h (100%) rename test/{validation => common_plat/validation/api}/thread/thread_main.c (100%) rename test/{validation => common_plat/validation/api}/time/.gitignore (100%) rename test/{validation => common_plat/validation/api}/time/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/time/time.c (100%) rename test/{validation => common_plat/validation/api}/time/time.h (100%) rename test/{validation => common_plat/validation/api}/time/time_main.c (100%) rename test/{validation => common_plat/validation/api}/timer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/timer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/timer/timer.c (93%) rename test/{validation => common_plat/validation/api}/timer/timer.h (100%) rename test/{validation => common_plat/validation/api}/timer/timer_main.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/.gitignore (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.h (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr_main.c (100%) rename test/{platform => }/linux-generic/.gitignore (100%) create mode 100644 test/linux-generic/Makefile.am rename test/{platform => }/linux-generic/Makefile.inc (78%) create mode 100644 test/linux-generic/m4/configure.m4 rename test/{platform => }/linux-generic/pktio_ipc/.gitignore (100%) rename test/{platform => }/linux-generic/pktio_ipc/Makefile.am (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.h (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc1.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc2.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc_run.sh (100%) rename test/{platform => }/linux-generic/ring/.gitignore (100%) rename test/{platform => }/linux-generic/ring/Makefile.am (100%) rename test/{platform => }/linux-generic/ring/ring_basic.c (100%) rename test/{platform => }/linux-generic/ring/ring_main.c (100%) rename test/{platform => }/linux-generic/ring/ring_stress.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.h (100%) rename test/{platform => }/linux-generic/run-test (100%) create mode 100644 test/linux-generic/validation/Makefile.inc create mode 100644 test/linux-generic/validation/api/Makefile.inc rename test/{validation => linux-generic/validation/api/pktio}/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_env (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run.sh (96%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_dpdk.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_netmap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_pcap.sh (90%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_tap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_common.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.h (100%) delete mode 100644 test/platform/linux-generic/Makefile.am delete mode 100644 test/platform/linux-generic/m4/configure.m4 hooks/post-receive --

9 years, 6 months

[COMMIT] branch api-next updated. v1.10.1.0-114-g414c4c7

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 414c4c75b0beb8cd4e4d2abe090921bcf058ec69 (commit) via 2b5e5bdfc8b650feba79ccd23c175fad16fd2b33 (commit) from 2c494b4a67123c838b4b6915679cca06f9e0bdd2 (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 414c4c75b0beb8cd4e4d2abe090921bcf058ec69 Merge: 2c494b4 2b5e5bd Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Jul 27 19:21:41 2016 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/arch/default/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/arch/mips64/odp/api/cpu_arch.h | 12 +++--------- platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/arch/x86/odp/api/cpu_arch.h | 10 +--------- platform/linux-generic/include/odp/api/align.h | 11 ++++------- 5 files changed, 10 insertions(+), 43 deletions(-) hooks/post-receive --

9 years, 6 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp