git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-289-gba28192c

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 via ba28192c7622cb924897c0fe0649a33b92fc4a01 (commit) via f1e38303bfdb3089040520e54c89fbd3332663e4 (commit) via 7a85e5003abf2471602d00262b9f0b674c869bff (commit) via 1caa6bb7a5a176a08dfb6f716e1f57d8baf2c750 (commit) via fc42a45b63cad94c7e988f304b5a2bc7709cd1b9 (commit) via b00b3da903d0fb6119f4dd1aaeec867710233878 (commit) via 7afe30301553162e2c17f94d233e11d4cf694d7b (commit) via 17e490743c04688768b38335e678496fa8ca6f07 (commit) via fae927777349fba5bcf1eb558856d2994b483877 (commit) via 6d129fc5aaf50594c2c04a3907d012497a985391 (commit) via 6b78210a7538f212f5ee7a38eef1f20c01c5fac7 (commit) via 89362efefe04306f1f91ab73c0e90f9a49ffbf45 (commit) via 0977cf1ba3a1a514516e8de01c0dfd916af27d6d (commit) via f586a074c3377ae004eec1dd1d90b2b463cb85e5 (commit) via a7ba3dfd6c69f9c8ea4767380f165683c5ad0056 (commit) via 0ab5d3c6a6953b05a1cef183e546370c5e1b4018 (commit) via ea94c80f13bc020580ac4e1ab7530ef07d2a8fba (commit) via 9bc5e8752b73340377665e9c11a13a1d1822f349 (commit) via fa944ab886b990f8b5deae944c6fb674aead29ef (commit) via 60176e6d6d64427dfd9e0fd1688fabcb492a3def (commit) via 5765254404be8772e60fda5143a07e61133c7db6 (commit) via c20e507662bb67ad47429ee3e9c1c4f8e61e7e57 (commit) via 601c8a1c38bd5a284c0df8d7bc88fa7445f42a99 (commit) from 2e58a2fdb2a72f8676c01de429e3d371ad720180 (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 ba28192c7622cb924897c0fe0649a33b92fc4a01 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 14 10:20:10 2018 +0300 linux-gen: add L2 type support for non-ABI-compat mode Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 5d4673fc..ecac4737 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -47,6 +47,11 @@ static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) #define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) +typedef uint8_t odp_proto_l2_type_t; + +#define ODP_PROTO_L2_TYPE_NONE 0 +#define ODP_PROTO_L2_TYPE_ETH 1 + typedef uint8_t odp_proto_l3_type_t; #define ODP_PROTO_L3_TYPE_NONE 0 commit f1e38303bfdb3089040520e54c89fbd3332663e4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 14 10:06:58 2018 +0300 api: packet add L2 packet type to complement L3 and L4 types Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h index d3a1753f..97c0d088 100644 --- a/include/odp/api/abi-default/packet.h +++ b/include/odp/api/abi-default/packet.h @@ -30,6 +30,11 @@ typedef _odp_abi_packet_seg_t *odp_packet_seg_t; #define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0xffffffff) #define ODP_PACKET_OFFSET_INVALID 0xffff +typedef uint8_t odp_proto_l2_type_t; + +#define ODP_PROTO_L2_TYPE_NONE 0 +#define ODP_PROTO_L2_TYPE_ETH 1 + typedef uint8_t odp_proto_l3_type_t; #define ODP_PROTO_L3_TYPE_NONE 0 diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 4be515c7..079a1ae1 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -71,6 +71,19 @@ extern "C" { * Packet is red */ +/** + * @typedef odp_proto_l2_type_t + * Layer 2 protocol type + */ + +/** + * @def ODP_PROTO_L2_TYPE_NONE + * Layer 2 protocol type not defined + * + * @def ODP_PROTO_L2_TYPE_ETH + * Layer 2 protocol is Ethernet + */ + /** * @typedef odp_proto_l3_type_t * Layer 3 protocol type @@ -1615,6 +1628,17 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt); */ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset); +/** + * Layer 2 protocol type + * + * Returns layer 2 protocol type. Initial type value is ODP_PROTO_L2_TYPE_NONE. + * + * @param pkt Packet handle + * + * @return Layer 2 protocol type + */ +odp_proto_l2_type_t odp_packet_l2_type(odp_packet_t pkt); + /** * Layer 3 protocol type * commit 7a85e5003abf2471602d00262b9f0b674c869bff Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Mon Feb 5 17:49:43 2018 +0530 linux-gen: schedule: implements async ordered lock implements asynchronous order context lock Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 8605ca66..66e05043 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -41,6 +41,8 @@ typedef int (*schedule_term_local_fn_t)(void); typedef void (*schedule_order_lock_fn_t)(void); typedef void (*schedule_order_unlock_fn_t)(void); typedef void (*schedule_order_unlock_lock_fn_t)(void); +typedef void (*schedule_order_lock_start_fn_t)(void); +typedef void (*schedule_order_lock_wait_fn_t)(void); typedef uint32_t (*schedule_max_ordered_locks_fn_t)(void); typedef void (*schedule_save_context_fn_t)(uint32_t queue_index); @@ -60,6 +62,8 @@ typedef struct schedule_fn_t { schedule_term_local_fn_t term_local; schedule_order_lock_fn_t order_lock; schedule_order_unlock_fn_t order_unlock; + schedule_order_lock_start_fn_t start_order_lock; + schedule_order_lock_wait_fn_t wait_order_lock; schedule_order_unlock_lock_fn_t order_unlock_lock; schedule_max_ordered_locks_fn_t max_ordered_locks; @@ -105,6 +109,8 @@ typedef struct { void (*schedule_order_lock)(uint32_t); void (*schedule_order_unlock)(uint32_t); void (*schedule_order_unlock_lock)(uint32_t, uint32_t); + void (*schedule_order_lock_start)(uint32_t); + void (*schedule_order_lock_wait)(uint32_t); } schedule_api_t; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index c91a9338..a6581bed 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -1152,6 +1152,16 @@ static void schedule_order_unlock_lock(uint32_t unlock_index, schedule_order_lock(lock_index); } +static void schedule_order_lock_start(uint32_t lock_index) +{ + (void)lock_index; +} + +static void schedule_order_lock_wait(uint32_t lock_index) +{ + schedule_order_lock(lock_index); +} + static void schedule_pause(void) { sched_local.pause = 1; @@ -1438,5 +1448,7 @@ const schedule_api_t schedule_default_api = { .schedule_group_info = schedule_group_info, .schedule_order_lock = schedule_order_lock, .schedule_order_unlock = schedule_order_unlock, - .schedule_order_unlock_lock = schedule_order_unlock_lock + .schedule_order_unlock_lock = schedule_order_unlock_lock, + .schedule_order_lock_start = schedule_order_lock_start, + .schedule_order_lock_wait = schedule_order_lock_wait }; diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index e5f734ae..6a3b4e4b 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -134,3 +134,14 @@ void odp_schedule_order_unlock_lock(uint32_t unlock_index, uint32_t lock_index) { sched_api->schedule_order_unlock_lock(unlock_index, lock_index); } + +void odp_schedule_order_lock_start(uint32_t lock_index) +{ + sched_api->schedule_order_lock_start(lock_index); +} + +void odp_schedule_order_lock_wait(uint32_t lock_index) +{ + sched_api->schedule_order_lock_wait(lock_index); +} + diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index 02396aa0..3ce85394 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1308,6 +1308,16 @@ static uint32_t schedule_max_ordered_locks(void) return CONFIG_QUEUE_MAX_ORD_LOCKS; } +static void schedule_order_lock_start(uint32_t lock_index) +{ + (void)lock_index; +} + +static void schedule_order_lock_wait(uint32_t lock_index) +{ + schedule_order_lock(lock_index); +} + static inline bool is_atomic_queue(unsigned int queue_index) { return (sched->queues[queue_index].sync == ODP_SCHED_SYNC_ATOMIC); @@ -1376,7 +1386,9 @@ const schedule_api_t schedule_iquery_api = { .schedule_group_info = schedule_group_info, .schedule_order_lock = schedule_order_lock, .schedule_order_unlock = schedule_order_unlock, - .schedule_order_unlock_lock = schedule_order_unlock_lock + .schedule_order_unlock_lock = schedule_order_unlock_lock, + .schedule_order_lock_start = schedule_order_lock_start, + .schedule_order_lock_wait = schedule_order_lock_wait }; static void thread_set_interest(sched_thread_local_t *thread, diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 761f93d3..f5974442 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -1186,6 +1186,16 @@ static void schedule_order_unlock_lock(uint32_t unlock_index, schedule_order_lock(lock_index); } +static void schedule_order_lock_start(uint32_t lock_index) +{ + (void)lock_index; +} + +static void schedule_order_lock_wait(uint32_t lock_index) +{ + schedule_order_lock(lock_index); +} + static void schedule_release_atomic(void) { sched_scalable_thread_state_t *ts; @@ -2096,4 +2106,6 @@ const schedule_api_t schedule_scalable_api = { .schedule_order_lock = schedule_order_lock, .schedule_order_unlock = schedule_order_unlock, .schedule_order_unlock_lock = schedule_order_unlock_lock, + .schedule_order_lock_start = schedule_order_lock_start, + .schedule_order_lock_wait = schedule_order_lock_wait }; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index bad47cad..e46ae448 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -829,6 +829,16 @@ static void schedule_order_unlock_lock(uint32_t unlock_index, (void)lock_index; } +static void schedule_order_lock_start(uint32_t lock_index) +{ + (void)lock_index; +} + +static void schedule_order_lock_wait(uint32_t lock_index) +{ + (void)lock_index; +} + static void order_lock(void) { } @@ -879,5 +889,7 @@ const schedule_api_t schedule_sp_api = { .schedule_group_info = schedule_group_info, .schedule_order_lock = schedule_order_lock, .schedule_order_unlock = schedule_order_unlock, - .schedule_order_unlock_lock = schedule_order_unlock_lock + .schedule_order_unlock_lock = schedule_order_unlock_lock, + .schedule_order_lock_start = schedule_order_lock_start, + .schedule_order_lock_wait = schedule_order_lock_wait }; commit 1caa6bb7a5a176a08dfb6f716e1f57d8baf2c750 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Mon Feb 5 17:49:26 2018 +0530 api: schedule: add asynchronous order lock add asynchronous order lock api. schedule order context lock can be acquired asynchronously using two functions start and wait. application can utilize the cycles between these functions to increase performance. Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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/schedule.h b/include/odp/api/spec/schedule.h index d493cc75..bbc74983 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -371,6 +371,34 @@ void odp_schedule_order_unlock(uint32_t lock_index); */ void odp_schedule_order_unlock_lock(uint32_t unlock_index, uint32_t lock_index); +/** Asynchronous ordered context lock + * Request an ordered context lock to be acquired. Starts an ordered context + * lock acquire operation, but does not wait until the lock has been acquired. + * Application can use this call to potentially interleave some processing + * within waiting for this lock. Each start lock call must be paired with a wait + * call that blocks until the lock has been acquired. Locks cannot be acquired + * in nested fashion i.e each start call must follow a paring wait and unlock + * calls, before using another lock. + * The same constraints apply as with odp_schedule_order_lock() + * + * @param lock_index Index of the ordered lock in the current context to + * start acquire operation. + * Must be in the range 0..odp_queue_lock_count() - 1. + * + */ +void odp_schedule_order_lock_start(uint32_t lock_index); + +/** Asynchronous ordered context lock wait + * Wait for a previously started lock acquire operation to finish. + * Lock index must match with the previous start call. Ordered lock acquisition + * will be completed during this call. + * + * @param lock_index Index of the ordered lock in the current context to + * complete acquire operation. + * Must be in the range 0..odp_queue_lock_count() - 1. + */ +void odp_schedule_order_lock_wait(uint32_t lock_index); + /** * @} */ commit fc42a45b63cad94c7e988f304b5a2bc7709cd1b9 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Feb 6 13:44:04 2018 +0200 linux-gen: pktio: fix recv timeout issue with socket mmap Validation test failed sometimes when select returned that there are packets but sock_mmap_recv did find those (or it dropped those). Continue timeout wait with select if sock_mmap_recv didn't find any packets. Select updates timeout value automatically to reflect the amount of time not slept. Fixes https://bugs.linaro.org/show_bug.cgi?id=3615 Signed-off-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index fd823205..deaa6da1 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -693,10 +693,19 @@ static int sock_mmap_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_mmap_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) - return 0; + while (1) { + ret = select(maxfd + 1, &readfds, NULL, NULL, &timeout); + + if (ret <= 0) + return ret; + + ret = sock_mmap_recv(pktio_entry, index, pkt_table, num); + + if (ret) + return ret; - return sock_mmap_recv(pktio_entry, index, pkt_table, num); + /* If no packets, continue wait until timeout expires */ + } } static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], @@ -730,20 +739,25 @@ static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) - return 0; + while (1) { + ret = select(maxfd + 1, &readfds, NULL, NULL, &timeout); - for (i = 0; i < num_q; i++) { - ret = sock_mmap_recv(pktio_entry[i], index[i], pkt_table, num); + if (ret <= 0) + return ret; - if (ret > 0 && from) - *from = i; + for (i = 0; i < num_q; i++) { + ret = sock_mmap_recv(pktio_entry[i], index[i], + pkt_table, num); - if (ret != 0) - return ret; - } + if (ret > 0 && from) + *from = i; - return 0; + if (ret) + return ret; + } + + /* If no packets, continue wait until timeout expires */ + } } static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, commit b00b3da903d0fb6119f4dd1aaeec867710233878 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Feb 6 13:40:36 2018 +0200 validation: pktio: recv tmo test improvements Add checks and improve test output when recv tmo function fails to timeout correctly. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index ecab4448..f5bb2e26 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -510,7 +510,7 @@ static int wait_for_packets(pktio_info_t *pktio_rx, odp_packet_t pkt_tbl[], static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[], uint32_t seq_tbl[], int num, recv_tmo_mode_e mode, - uint64_t tmo, uint64_t ns) + uint64_t tmo, uint64_t ns, int no_pkt) { odp_packet_t pkt_tmp[num]; odp_pktin_queue_t pktin[MAX_QUEUES]; @@ -541,8 +541,19 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[], num - num_rx, tmo); ts2 = odp_time_global(); + CU_ASSERT(n >= 0); + if (n <= 0) break; + + /* When we don't expect any packets, drop all packets and + * retry timeout test. */ + if (no_pkt) { + printf(" drop %i dummy packets\n", n); + odp_packet_free_multi(pkt_tmp, n); + continue; + } + for (i = 0; i < n; i++) { if (pktio_pkt_seq(pkt_tmp[i]) == seq_tbl[num_rx]) pkt_tbl[num_rx++] = pkt_tmp[i]; @@ -553,8 +564,15 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[], CU_ASSERT(from_val < (unsigned)num_q); } while (num_rx < num); - if (num_rx < num) - CU_ASSERT(odp_time_diff_ns(ts2, ts1) >= ns); + if (num_rx < num) { + uint64_t diff = odp_time_diff_ns(ts2, ts1); + + if (diff < ns) + printf(" diff %" PRIu64 ", ns %" PRIu64 "\n", + diff, ns); + + CU_ASSERT(diff >= ns); + } return num_rx; } @@ -966,8 +984,9 @@ static void test_recv_tmo(recv_tmo_mode_e mode) /* No packets sent yet, so should wait */ ns = 100 * ODP_TIME_MSEC_IN_NS; + ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode, - odp_pktin_wait_time(ns), ns); + odp_pktin_wait_time(ns), ns, 1); CU_ASSERT(ret == 0); ret = create_packets(pkt_tbl, pkt_seq, test_pkt_count, pktio_tx, @@ -978,19 +997,19 @@ static void test_recv_tmo(recv_tmo_mode_e mode) CU_ASSERT_FATAL(ret == test_pkt_count); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode, - odp_pktin_wait_time(UINT64_MAX), 0); + odp_pktin_wait_time(UINT64_MAX), 0, 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode, - ODP_PKTIN_NO_WAIT, 0); + ODP_PKTIN_NO_WAIT, 0, 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[2], &pkt_seq[2], 1, mode, - odp_pktin_wait_time(0), 0); + odp_pktin_wait_time(0), 0, 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[3], &pkt_seq[3], 3, mode, - odp_pktin_wait_time(ns), ns); + odp_pktin_wait_time(ns), ns, 0); CU_ASSERT_FATAL(ret == 3); for (i = 0; i < test_pkt_count; i++) commit 7afe30301553162e2c17f94d233e11d4cf694d7b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Feb 3 06:19:01 2018 +0300 validation: crypto: properly use check_alg for GMAC/CMAC testing Use check_alg instead of alg_test for GMAC/CMAC testing. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index b86bd985..ad64111b 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -1224,17 +1224,12 @@ static int check_alg_aes_gmac(void) static void crypto_test_gen_alg_aes_gmac(void) { - unsigned int test_vec_num = (sizeof(aes_gmac_reference) / - sizeof(aes_gmac_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - aes_gmac_reference, - ARRAY_SIZE(aes_gmac_reference), - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_GMAC, + aes_gmac_reference, + ARRAY_SIZE(aes_gmac_reference), + false); } static void crypto_test_check_alg_aes_gmac(void) @@ -1254,17 +1249,12 @@ static int check_alg_aes_cmac(void) static void crypto_test_gen_alg_aes_cmac(void) { - unsigned int test_vec_num = (sizeof(aes_cmac_reference) / - sizeof(aes_cmac_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_CMAC, - aes_cmac_reference, - ARRAY_SIZE(aes_cmac_reference), - false); + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_CMAC, + aes_cmac_reference, + ARRAY_SIZE(aes_cmac_reference), + false); } static void crypto_test_check_alg_aes_cmac(void) commit 17e490743c04688768b38335e678496fa8ca6f07 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 2 21:52:16 2018 +0300 api: crypto: add AES-XCBC-MAC enumerations Following SonicWall proposal, add AES-XCBC-MAC algorithm enumerations. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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 e27860a3..c59f6602 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -198,6 +198,13 @@ typedef enum { */ ODP_AUTH_ALG_AES_CMAC, + /** AES-XCBC-MAC + * + * AES CBC MAC for arbitrary-length messages (XCBC-MAC). + * + */ + ODP_AUTH_ALG_AES_XCBC_MAC, + /** ChaCha20-Poly1305 AEAD * * ChaCha20 with Poly1305 provide both authentication and ciphering of @@ -299,6 +306,9 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_AES_CMAC*/ uint32_t aes_cmac : 1; + /** ODP_AUTH_ALG_AES_XCBC_MAC*/ + uint32_t aes_xcbc_mac : 1; + /** ODP_AUTH_ALG_CHACHA20_POLY1305 */ uint32_t chacha20_poly1305 : 1; commit fae927777349fba5bcf1eb558856d2994b483877 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Feb 2 21:52:16 2018 +0300 api: crypto: add SHA-384 enumerations Following SonicWall proposal, add SHA-384 algorithm enumerations. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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 b7ab5362..e27860a3 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -143,6 +143,12 @@ typedef enum { */ ODP_AUTH_ALG_SHA256_HMAC, + /** HMAC-SHA-384 + * + * SHA-384 algorithm in HMAC mode + */ + ODP_AUTH_ALG_SHA384_HMAC, + /** HMAC-SHA-512 * * SHA-512 algorithm in HMAC mode @@ -275,6 +281,9 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_SHA256_HMAC */ uint32_t sha256_hmac : 1; + /** ODP_AUTH_ALG_SHA384_HMAC */ + uint32_t sha384_hmac : 1; + /** ODP_AUTH_ALG_SHA512_HMAC */ uint32_t sha512_hmac : 1; commit 6d129fc5aaf50594c2c04a3907d012497a985391 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jan 18 14:45:03 2018 +0200 api: ipsec: inbound inner packet checksum capability Add inbound inner packet checksum check capability. When e.g. L4 checksum checking is not implemented in HW, it may be better to leave checking for application, as it would check only those packets that need the check. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 665dc07b..2d1c4d9b 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -238,6 +238,11 @@ typedef struct odp_ipsec_capability_t { */ odp_support_t retain_header; + /** + * Inner packet checksum check offload support in inbound direction. + */ + odp_proto_chksums_t chksums_in; + /** Maximum number of different destination CoSes in classification * pipelining. The same CoS may be used for many SAs. This is equal or * less than 'max_cos' capability in classifier API. commit 6b78210a7538f212f5ee7a38eef1f20c01c5fac7 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jan 23 13:50:24 2018 +0200 api: ipsec: outbound TFC padding and dummy packets Specify how application can request TFC padding and dummy packet creation at output. Application can use odp_ipsec_out_opt_t options to reguest addition of TFC padding, or creation of a TFC dummy packet (next header = 59). IP parameter override options are needed for tunnel mode dummy packet creation as there's no IP header to copy e.g. DSCP or flow label values to tunnel IP header. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 721f9685..665dc07b 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -991,6 +991,22 @@ typedef struct odp_ipsec_out_opt_t { /** Use fragmentation mode option */ uint32_t frag_mode: 1; + /** Use TFC padding length option */ + uint32_t tfc_pad: 1; + + /** Tunnel mode TFC dummy packet. This can be used only + * in tunnel mode. When the flag is set, packet length + * and content is ignored and instead a TFC dummy + * packet is created during IPSEC operation. The dummy + * packet length is defined by 'tfc_pad_len' option. + * If the SA is configured to copy IP header fields + * from inner IP packet, those fields must be passed + * with IP parameters option. */ + uint32_t tfc_dummy: 1; + + /** Use IP parameters option */ + uint32_t ip_param: 1; + } flag; /** All flag bits */ @@ -1000,6 +1016,26 @@ typedef struct odp_ipsec_out_opt_t { /** Fragmentation mode */ odp_ipsec_frag_mode_t frag_mode; + /** TFC padding length + * + * Number of TFC padding bytes added to the packet during IPSEC + * processing. Resulting packet should not exceed the maximum packet + * length of the pool, otherwise IPSEC operation may fail. + * Implementation guarantees that the padding does not contain any + * confidential information. */ + uint32_t tfc_pad_len; + + /** Union of IP parameters */ + union { + /** Override IPv4 parameters in outer header creation. + * IP addresses are ignored. */ + odp_ipsec_ipv4_param_t ipv4; + + /** Override IPv6 parameters in outer header creation. + * IP addresses are ignored. */ + odp_ipsec_ipv6_param_t ipv6; + }; + } odp_ipsec_out_opt_t; /** @@ -1302,7 +1338,13 @@ int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in, * The operation does packet transformation according to IPSEC standards (see * e.g. RFC 4302 and 4303). Resulting packets are well formed IP packets * with IPSEC, etc headers constructed according to the standards. The amount - * and content of packet data before the IP header is undefined. + * and content of packet data before the IP header is undefined. Use outbound + * operation parameters to specify the amount of TFC padding appended to + * the packet during IPSEC transformation. Options can be used also to create + * TFC dummy packets. Packet data content is ignored in tunnel mode TFC dummy + * packet creation as tfc_pad_len option defines solely the packet length. + * In all other cases, payload length for the IPSEC transformation is specified + * by odp_packet_len() minus odp_packet_l3_offset() plus tfc_pad_len option. * * Each successfully transformed packet has a valid value for these metadata: * - L3 offset: Offset to the first byte of the (outmost) IP header commit 89362efefe04306f1f91ab73c0e90f9a49ffbf45 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jan 23 13:46:26 2018 +0200 api: ipsec: inbound TFC padding and dummy packets Specify how application can recognize TFC padding and dummy packets at input. Packet metadata for L3/L4 protocol type indicate if the original packet was an IP or a TFC dummy packet. When packet length is larger than protocol fields indicate, some TFC padding remain in the packet. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 08533d80..721f9685 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -1226,12 +1226,23 @@ typedef struct odp_ipsec_status_t { * e.g. RFC 4302 and 4303). Resulting packets are well formed, reconstructed * original IP packets, with IPSEC headers removed and valid header field values * restored. The amount and content of packet data before the IP header is - * undefined. + * undefined. Some amount of TFC padding may follow the IP packet payload, + * in which case packet length is larger than protocol headers indicate. + * TFC dummy packets have l3_type set to ODP_PROTO_L3_TYPE_NONE in tunnel mode + * or l4_type set to ODP_PROTO_L4_TYPE_NO_NEXT in transport mode. Dummy + * packets contain implementation specific amount of (dummy) data. Furthermore, + * inline IPSEC processing may drop dummy packets. * * Each successfully transformed packet has a valid value for these metadata * regardless of the inner packet parse configuration * (odp_ipsec_inbound_config_t): - * - L3 offset: Offset to the first byte of the (outmost) IP header + * - l3_offset: Offset to the first byte of the original IP packet. The value + * is implementation specific for tunnel mode TFC dummy packets. + * - l3_type: Specifies if the original packet is IPv4 or IPv6. For tunnel + * mode TFC dummy packets set to ODP_PROTO_L3_TYPE_NONE. + * - l4_type: Always set to ODP_PROTO_L4_TYPE_NO_NEXT for transport mode dummy + * packets. Otherwise, depends on parse configuration. Default + * value is ODP_PROTO_L4_TYPE_NONE. * - pktio: For inline IPSEC processed packets, original packet input * interface * commit 0977cf1ba3a1a514516e8de01c0dfd916af27d6d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jan 23 13:37:20 2018 +0200 api: ipsec: outbound operation option flags Add flags to select which options application uses. Currently, there's no ambiguity, but as soon as there are multiple options implementation needs to know which options are used and which are ignored. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 1060a3ee..08533d80 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -983,6 +983,20 @@ typedef struct odp_ipsec_op_flag_t { * These may be used to override some SA level options */ typedef struct odp_ipsec_out_opt_t { + /** Union of all flag bits */ + union { + /** Option flags. Set flag for those options that are + * used, all other options are ignored. */ + struct { + /** Use fragmentation mode option */ + uint32_t frag_mode: 1; + + } flag; + + /** All flag bits */ + uint32_t all_flags; + }; + /** Fragmentation mode */ odp_ipsec_frag_mode_t frag_mode; commit f586a074c3377ae004eec1dd1d90b2b463cb85e5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jan 18 13:26:56 2018 +0200 api: ipsec: rename fragmentation mode option Rename outbound operation fragmentation options to frag_mode. Frag_mode is used elsewhere in the API and "mode" is too generic term for it (not future proof). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index c78afbe3..1060a3ee 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -984,7 +984,7 @@ typedef struct odp_ipsec_op_flag_t { */ typedef struct odp_ipsec_out_opt_t { /** Fragmentation mode */ - odp_ipsec_frag_mode_t mode; + odp_ipsec_frag_mode_t frag_mode; } odp_ipsec_out_opt_t; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 9e329264..3e6a8098 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -1307,7 +1307,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, ipsec_sa = _odp_ipsec_sa_use(sa); ODP_ASSERT(NULL != ipsec_sa); - if ((opt && opt->mode == ODP_IPSEC_FRAG_CHECK) || + if ((opt && opt->frag_mode == ODP_IPSEC_FRAG_CHECK) || (!opt && ipsec_sa->out.frag_mode == ODP_IPSEC_FRAG_CHECK)) mtu = ipsec_sa->out.mtu; else diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c index 0f49c7e1..2850ddfa 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c @@ -572,7 +572,7 @@ static void test_out_ipv4_ah_sha256_frag_check(void) ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, .num_opt = 1, - .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, }, + .opt = { .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, .out_pkt = 1, .out = { { .status.warn.all = 0, @@ -665,7 +665,7 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void) ipsec_test_part test2 = { .pkt_in = &pkt_ipv4_icmp_0, .num_opt = 1, - .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, }, + .opt = { .frag_mode = ODP_IPSEC_FRAG_DISABLED, }, .out_pkt = 1, .out = { { .status.warn.all = 0, commit a7ba3dfd6c69f9c8ea4767380f165683c5ad0056 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jan 18 11:02:27 2018 +0200 api: ipsec: IP header parameter types Create IP header parameter types, so that those can be used also outside of SA parameter struct. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 47e3045f..c78afbe3 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -382,6 +382,44 @@ typedef struct odp_ipsec_crypto_param_t { } odp_ipsec_crypto_param_t; +/** IPv4 header parameters */ +typedef struct odp_ipsec_ipv4_param_t { + /** IPv4 source address (NETWORK ENDIAN) */ + void *src_addr; + + /** IPv4 destination address (NETWORK ENDIAN) */ + void *dst_addr; + + /** IPv4 Differentiated Services Code Point */ + uint8_t dscp; + + /** IPv4 Don't Fragment bit */ + uint8_t df; + + /** IPv4 Time To Live */ + uint8_t ttl; + +} odp_ipsec_ipv4_param_t; + +/** IPv6 header parameters */ +typedef struct odp_ipsec_ipv6_param_t { + /** IPv6 source address (NETWORK ENDIAN) */ + void *src_addr; + + /** IPv6 destination address (NETWORK ENDIAN) */ + void *dst_addr; + + /** IPv6 flow label */ + uint32_t flabel; + + /** IPv6 Differentiated Services Code Point */ + uint8_t dscp; + + /** IPv6 hop limit */ + uint8_t hlimit; + +} odp_ipsec_ipv6_param_t; + /** * IPSEC tunnel parameters * @@ -397,40 +435,10 @@ typedef struct odp_ipsec_tunnel_param_t { /** Variant mappings for tunnel parameters */ union { /** IPv4 header parameters */ - struct { - /** IPv4 source address (NETWORK ENDIAN) */ - void *src_addr; - - /** IPv4 destination address (NETWORK ENDIAN) */ - void *dst_addr; - - /** IPv4 Differentiated Services Code Point */ - uint8_t dscp; - - /** IPv4 Don't Fragment bit */ - uint8_t df; - - /** IPv4 Time To Live */ - uint8_t ttl; - } ipv4; + odp_ipsec_ipv4_param_t ipv4; /** IPv6 header parameters */ - struct { - /** IPv6 source address (NETWORK ENDIAN) */ - void *src_addr; - - /** IPv6 destination address (NETWORK ENDIAN) */ - void *dst_addr; - - /** IPv6 Differentiated Services Code Point */ - uint8_t dscp; - - /** IPv6 flow label */ - uint32_t flabel; - - /** IPv6 hop limit */ - uint8_t hlimit; - } ipv6; + odp_ipsec_ipv6_param_t ipv6; }; } odp_ipsec_tunnel_param_t; commit 0ab5d3c6a6953b05a1cef183e546370c5e1b4018 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jan 31 15:03:20 2018 +0200 api: packet: add protocol type enumeration Add enumerations for L3 and L4 protocol types, and functions to request those. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h index 10eed530..d3a1753f 100644 --- a/include/odp/api/abi-default/packet.h +++ b/include/odp/api/abi-default/packet.h @@ -30,6 +30,34 @@ typedef _odp_abi_packet_seg_t *odp_packet_seg_t; #define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0xffffffff) #define ODP_PACKET_OFFSET_INVALID 0xffff +typedef uint8_t odp_proto_l3_type_t; + +#define ODP_PROTO_L3_TYPE_NONE 0 +#define ODP_PROTO_L3_TYPE_ARP 1 +#define ODP_PROTO_L3_TYPE_RARP 2 +#define ODP_PROTO_L3_TYPE_MPLS 3 +#define ODP_PROTO_L3_TYPE_IPV4 4 +#define ODP_PROTO_L3_TYPE_IPV6 6 + +typedef uint8_t odp_proto_l4_type_t; + +/* Numbers from IANA Assigned Internet Protocol Numbers list */ +#define ODP_PROTO_L4_TYPE_NONE 0 +#define ODP_PROTO_L4_TYPE_ICMPV4 1 +#define ODP_PROTO_L4_TYPE_IGMP 2 +#define ODP_PROTO_L4_TYPE_IPV4 4 +#define ODP_PROTO_L4_TYPE_TCP 6 +#define ODP_PROTO_L4_TYPE_UDP 17 +#define ODP_PROTO_L4_TYPE_IPV6 41 +#define ODP_PROTO_L4_TYPE_GRE 47 +#define ODP_PROTO_L4_TYPE_ESP 50 +#define ODP_PROTO_L4_TYPE_AH 51 +#define ODP_PROTO_L4_TYPE_ICMPV6 58 +#define ODP_PROTO_L4_TYPE_NO_NEXT 59 +#define ODP_PROTO_L4_TYPE_IPCOMP 108 +#define ODP_PROTO_L4_TYPE_SCTP 132 +#define ODP_PROTO_L4_TYPE_ROHC 142 + typedef enum { ODP_PACKET_GREEN = 0, ODP_PACKET_YELLOW = 1, diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 3222ff5c..4be515c7 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -71,6 +71,79 @@ extern "C" { * Packet is red */ +/** + * @typedef odp_proto_l3_type_t + * Layer 3 protocol type + */ + +/** + * @def ODP_PROTO_L3_TYPE_NONE + * Layer 3 protocol type not defined + * + * @def ODP_PROTO_L3_TYPE_ARP + * Layer 3 protocol is ARP + * + * @def ODP_PROTO_L3_TYPE_RARP + * Layer 3 protocol is RARP + * + * @def ODP_PROTO_L3_TYPE_MPLS + * Layer 3 protocol is MPLS + * + * @def ODP_PROTO_L3_TYPE_IPV4 + * Layer 3 protocol type is IPv4 + * + * @def ODP_PROTO_L3_TYPE_IPV6 + * Layer 3 protocol type is IPv6 + */ + +/** + * @def ODP_PROTO_L4_TYPE_NONE + * Layer 4 protocol type not defined + * + * @def ODP_PROTO_L4_TYPE_ICMPV4 + * Layer 4 protocol type is ICMPv4 + * + * @def ODP_PROTO_L4_TYPE_IGMP + * Layer 4 protocol type is IGMP + * + * @def ODP_PROTO_L4_TYPE_IPV4 + * Layer 4 protocol type is IPv4 + * + * @def ODP_PROTO_L4_TYPE_TCP + * Layer 4 protocol type is TCP + * + * @def ODP_PROTO_L4_TYPE_UDP + * Layer 4 protocol type is UDP + * + * @def ODP_PROTO_L4_TYPE_IPV6 + * Layer 4 protocol type is IPv6 + * + * @def ODP_PROTO_L4_TYPE_GRE + * Layer 4 protocol type is GRE + * + * @def ODP_PROTO_L4_TYPE_ESP + * Layer 4 protocol type is IPSEC ESP + * + * @def ODP_PROTO_L4_TYPE_AH + * Layer 4 protocol type is IPSEC AH + * + * @def ODP_PROTO_L4_TYPE_ICMPV6 + * Layer 4 protocol type is ICMPv6 + * + * @def ODP_PROTO_L4_TYPE_NO_NEXT + * Layer 4 protocol type is "No Next Header". + * Protocol / next header number is 59. + * + * @def ODP_PROTO_L4_TYPE_IPCOMP + * Layer 4 protocol type is IP Payload Compression Protocol + * + * @def ODP_PROTO_L4_TYPE_SCTP + * Layer 4 protocol type is SCTP + * + * @def ODP_PROTO_L4_TYPE_ROHC + * Layer 4 protocol type is ROHC + */ + /** * Protocol */ @@ -1542,6 +1615,28 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt); */ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset); +/** + * Layer 3 protocol type + * + * Returns layer 3 protocol type. Initial type value is ODP_PROTO_L3_TYPE_NONE. + * + * @param pkt Packet handle + * + * @return Layer 3 protocol type + */ +odp_proto_l3_type_t odp_packet_l3_type(odp_packet_t pkt); + +/** + * Layer 4 protocol type + * + * Returns layer 4 protocol type. Initial type value is ODP_PROTO_L4_TYPE_NONE. + * + * @param pkt Packet handle + * + * @return Layer 4 protocol type + */ +odp_proto_l4_type_t odp_packet_l4_type(odp_packet_t pkt); + /** * Layer 3 checksum check status * diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 66948aa1..5d4673fc 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -47,6 +47,34 @@ static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) #define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) +typedef uint8_t odp_proto_l3_type_t; + +#define ODP_PROTO_L3_TYPE_NONE 0 +#define ODP_PROTO_L3_TYPE_ARP 1 +#define ODP_PROTO_L3_TYPE_RARP 2 +#define ODP_PROTO_L3_TYPE_MPLS 3 +#define ODP_PROTO_L3_TYPE_IPV4 4 +#define ODP_PROTO_L3_TYPE_IPV6 6 + +typedef uint8_t odp_proto_l4_type_t; + +/* Numbers from IANA Assigned Internet Protocol Numbers list */ +#define ODP_PROTO_L4_TYPE_NONE 0 +#define ODP_PROTO_L4_TYPE_ICMPV4 1 +#define ODP_PROTO_L4_TYPE_IGMP 2 +#define ODP_PROTO_L4_TYPE_IPV4 4 +#define ODP_PROTO_L4_TYPE_TCP 6 +#define ODP_PROTO_L4_TYPE_UDP 17 +#define ODP_PROTO_L4_TYPE_IPV6 41 +#define ODP_PROTO_L4_TYPE_GRE 47 +#define ODP_PROTO_L4_TYPE_ESP 50 +#define ODP_PROTO_L4_TYPE_AH 51 +#define ODP_PROTO_L4_TYPE_ICMPV6 58 +#define ODP_PROTO_L4_TYPE_NO_NEXT 59 +#define ODP_PROTO_L4_TYPE_IPCOMP 108 +#define ODP_PROTO_L4_TYPE_SCTP 132 +#define ODP_PROTO_L4_TYPE_ROHC 142 + typedef enum { ODP_PACKET_GREEN = 0, ODP_PACKET_YELLOW = 1, commit ea94c80f13bc020580ac4e1ab7530ef07d2a8fba Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 08:03:56 2018 +0300 linux-gen: ipsec: support ChaCha20-Poly1305 Support IPsec ChaCha20-Poly1305 on top of linux-generic's crypto support. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 8d897771..9e329264 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -112,6 +112,7 @@ int odp_ipsec_auth_capability(odp_auth_alg_t auth, continue; if (ODP_AUTH_ALG_AES_GCM == auth || + ODP_AUTH_ALG_CHACHA20_POLY1305 == auth || ODP_DEPRECATE(ODP_AUTH_ALG_AES128_GCM) == auth) { uint8_t aad_len = 12; diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index d5348c45..3ac8c49c 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -220,6 +220,8 @@ uint32_t _odp_ipsec_cipher_iv_len(odp_cipher_alg_t cipher) #endif case ODP_CIPHER_ALG_AES_GCM: return 12; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + return 12; default: return (uint32_t)-1; } @@ -250,6 +252,8 @@ uint32_t _odp_ipsec_auth_digest_len(odp_auth_alg_t auth) case ODP_AUTH_ALG_AES_GCM: case ODP_AUTH_ALG_AES_GMAC: return 16; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + return 16; default: return (uint32_t)-1; } @@ -403,6 +407,11 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; break; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + ipsec_sa->use_counter_iv = 1; + ipsec_sa->esp_iv_len = 8; + ipsec_sa->esp_block_len = 1; + break; default: goto error; } @@ -422,6 +431,9 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->esp_block_len = 16; crypto_param.auth_iv.length = 12; break; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + crypto_param.auth_aad_len = sizeof(ipsec_aad_t); + break; default: break; } commit 9bc5e8752b73340377665e9c11a13a1d1822f349 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 08:03:19 2018 +0300 validation: ipsec: add ChaCha20-Poly1305 test vectors Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index e97ff611..cdaf04f5 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -177,6 +177,10 @@ int ipsec_check(odp_bool_t ah, if (!capa.ciphers.bit.aes_gcm) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + if (!capa.ciphers.bit.chacha20_poly1305) + return ODP_TEST_INACTIVE; + break; default: fprintf(stderr, "Unsupported cipher algorithm\n"); return ODP_TEST_INACTIVE; @@ -212,6 +216,10 @@ int ipsec_check(odp_bool_t ah, if (!capa.auths.bit.aes_gmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + if (!capa.auths.bit.chacha20_poly1305) + return ODP_TEST_INACTIVE; + break; default: fprintf(stderr, "Unsupported authentication algorithm\n"); return ODP_TEST_INACTIVE; @@ -313,6 +321,12 @@ int ipsec_check_esp_null_aes_gmac_128(void) ODP_AUTH_ALG_AES_GMAC, 128); } +int ipsec_check_esp_chacha20_poly1305(void) +{ + return ipsec_check_esp(ODP_CIPHER_ALG_CHACHA20_POLY1305, 256, + ODP_AUTH_ALG_CHACHA20_POLY1305, 0); +} + void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param, odp_bool_t in, odp_bool_t ah, diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h index 31ebed78..7ba9ef10 100644 --- a/test/validation/api/ipsec/ipsec.h +++ b/test/validation/api/ipsec/ipsec.h @@ -91,5 +91,6 @@ int ipsec_check_esp_aes_gcm_128(void); int ipsec_check_esp_aes_gcm_256(void); int ipsec_check_ah_aes_gmac_128(void); int ipsec_check_esp_null_aes_gmac_128(void); +int ipsec_check_esp_chacha20_poly1305(void); #endif diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c index 8a82abe4..8138defb 100644 --- a/test/validation/api/ipsec/ipsec_test_in.c +++ b/test/validation/api/ipsec/ipsec_test_in.c @@ -1136,6 +1136,37 @@ static void test_in_ipv4_mcgrew_gcm_15_esp(void) ipsec_sa_destroy(sa); } +static void test_in_ipv4_rfc7634_chacha(void) +{ + odp_ipsec_tunnel_param_t tunnel = {}; + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + true, false, 0x01020304, &tunnel, + ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634, + ODP_AUTH_ALG_CHACHA20_POLY1305, NULL, + &key_rfc7634_salt); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_ipv4_rfc7634_esp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_ipv4_rfc7634}, + }, + }; + + ipsec_check_in_one(&test, sa); + + ipsec_sa_destroy(sa); +} + static void test_in_ipv4_ah_aes_gmac_128(void) { odp_ipsec_sa_param_t param; @@ -1474,6 +1505,8 @@ odp_testinfo_t ipsec_in_suite[] = { #endif ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_15_esp, ipsec_check_esp_null_aes_gmac_128), + ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_rfc7634_chacha, + ipsec_check_esp_chacha20_poly1305), ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256, ipsec_check_ah_sha256), ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_tun_ipv4, diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c index 971fbbf8..0f49c7e1 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c @@ -500,6 +500,48 @@ static void test_out_ipv4_esp_null_aes_gmac_128(void) ipsec_sa_destroy(sa); } +static void test_out_ipv4_esp_chacha20_poly1305(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + odp_ipsec_sa_t sa2; + + ipsec_sa_param_fill(&param, + false, false, 123, NULL, + ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634, + ODP_AUTH_ALG_CHACHA20_POLY1305, NULL, + &key_rfc7634_salt); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_sa_param_fill(&param, + true, false, 123, NULL, + ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634, + ODP_AUTH_ALG_CHACHA20_POLY1305, NULL, + &key_rfc7634_salt); + + sa2 = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2); + + ipsec_test_part test = { + .pkt_in = &pkt_ipv4_icmp_0, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_ipv4_icmp_0 }, + }, + }; + + ipsec_check_out_in_one(&test, sa, sa2); + + ipsec_sa_destroy(sa2); + ipsec_sa_destroy(sa); +} + static void test_out_ipv4_ah_sha256_frag_check(void) { odp_ipsec_sa_param_t param; @@ -978,6 +1020,8 @@ odp_testinfo_t ipsec_out_suite[] = { ipsec_check_ah_aes_gmac_128), ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_aes_gmac_128, ipsec_check_esp_null_aes_gmac_128), + ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_chacha20_poly1305, + ipsec_check_esp_chacha20_poly1305), ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_frag_check, ipsec_check_ah_sha256), ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_frag_check_2, diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h index 4732d6ca..f14fdb2b 100644 --- a/test/validation/api/ipsec/test_vectors.h +++ b/test/validation/api/ipsec/test_vectors.h @@ -48,6 +48,11 @@ KEY(key_mcgrew_gcm_salt_12, 0xd9, 0x66, 0x42, 0x67); KEY(key_mcgrew_gcm_15, 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34); KEY(key_mcgrew_gcm_salt_15, 0x22, 0x43, 0x3c, 0x64); +KEY(key_rfc7634, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f); +KEY(key_rfc7634_salt, 0xa0, 0xa1, 0xa2, 0xa3); static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0 = { .len = 142, @@ -1730,6 +1735,67 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_15_esp = { }, }; +static const ODP_UNUSED ipsec_test_packet pkt_ipv4_rfc7634 = { + .len = 98, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x54, 0xa6, 0xf2, 0x00, 0x00, + 0x40, 0x01, 0xe7, 0x78, 0xc6, 0x33, 0x64, 0x05, + 0xc0, 0x00, 0x02, 0x05, + + /* ICMP */ + 0x08, 0x00, 0x5b, 0x7a, 0x3a, 0x08, 0x00, 0x00, + 0x55, 0x3b, 0xec, 0x10, 0x00, 0x07, 0x36, 0x27, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + }, +}; + +static const ODP_UNUSED ipsec_test_packet pkt_ipv4_rfc7634_esp = { + .len = 154, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x8c, 0x23, 0x45, 0x00, 0x00, + 0x40, 0x32, 0xde, 0x5b, 0xcb, 0x00, 0x71, 0x99, + 0xcb, 0x00, 0x71, 0x05, + + /* ESP */ + 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00, 0x05, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x24, 0x03, 0x94, 0x28, 0xb9, 0x7f, 0x41, 0x7e, + 0x3c, 0x13, 0x75, 0x3a, 0x4f, 0x05, 0x08, 0x7b, + 0x67, 0xc3, 0x52, 0xe6, 0xa7, 0xfa, 0xb1, 0xb9, + 0x82, 0xd4, 0x66, 0xef, 0x40, 0x7a, 0xe5, 0xc6, + 0x14, 0xee, 0x80, 0x99, 0xd5, 0x28, 0x44, 0xeb, + 0x61, 0xaa, 0x95, 0xdf, 0xab, 0x4c, 0x02, 0xf7, + 0x2a, 0xa7, 0x1e, 0x7c, 0x4c, 0x4f, 0x64, 0xc9, + 0xbe, 0xfe, 0x2f, 0xac, 0xc6, 0x38, 0xe8, 0xf3, + 0xcb, 0xec, 0x16, 0x3f, 0xac, 0x46, 0x9b, 0x50, + 0x27, 0x73, 0xf6, 0xfb, 0x94, 0xe6, 0x64, 0xda, + 0x91, 0x65, 0xb8, 0x28, 0x29, 0xf6, 0x41, 0xe0, + 0x76, 0xaa, 0xa8, 0x26, 0x6b, 0x7f, 0xb0, 0xf7, + 0xb1, 0x1b, 0x36, 0x99, 0x07, 0xe1, 0xad, 0x43, + }, +}; + static const ODP_UNUSED ipsec_test_packet pkt_ipv6_icmp_0_esp_udp_null_sha256_1 = { .len = 206, commit fa944ab886b990f8b5deae944c6fb674aead29ef Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 04:50:06 2018 +0300 linux-gen: crypto: implement AES-CMAC Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 40b1dbe4..f1d5fcad 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -25,6 +25,7 @@ #include <openssl/rand.h> #include <openssl/hmac.h> +#include <openssl/cmac.h> #include <openssl/evp.h> #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(OPENSSL_NO_POLY1305) @@ -108,6 +109,14 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { {.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, .iv_len = 12 } }; +static const odp_crypto_auth_capability_t auth_capa_aes_cmac[] = { +{.digest_len = 12, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 12, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 16, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 12, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + #if _ODP_HAVE_CHACHA20_POLY1305 static const odp_crypto_auth_capability_t auth_capa_chacha20_poly1305[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; @@ -177,6 +186,7 @@ static odp_crypto_global_t *global; typedef struct crypto_local_t { HMAC_CTX *hmac_ctx[MAX_SESSIONS]; + CMAC_CTX *cmac_ctx[MAX_SESSIONS]; EVP_CIPHER_CTX *cipher_ctx[MAX_SESSIONS]; EVP_CIPHER_CTX *mac_cipher_ctx[MAX_SESSIONS]; uint8_t *ctx_valid; @@ -344,6 +354,93 @@ odp_crypto_alg_err_t auth_hmac_check(odp_packet_t pkt, return ODP_CRYPTO_ALG_ERR_NONE; } +static void +auth_cmac_init(odp_crypto_generic_session_t *session) +{ + CMAC_CTX *ctx = local.cmac_ctx[session->idx]; + + CMAC_Init(ctx, + session->auth.key, + session->p.auth_key.length, + session->auth.evp_cipher, + NULL); +} + +static +void packet_cmac(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session, + uint8_t *hash) +{ + CMAC_CTX *ctx = local.cmac_ctx[session->idx]; + uint32_t offset = param->auth_range.offset; + uint32_t len = param->auth_range.length; + size_t outlen; + + ODP_ASSERT(offset + len <= odp_packet_len(pkt)); + + /* Reinitialize CMAC calculation without resetting the key */ + CMAC_Init(ctx, NULL, 0, NULL, NULL); + + while (len > 0) { + uint32_t seglen = 0; /* GCC */ + void *mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); + uint32_t maclen = len > seglen ? seglen : len; + + CMAC_Update(ctx, mapaddr, maclen); + offset += maclen; + len -= maclen; + } + + CMAC_Final(ctx, hash, &outlen); +} + +static +odp_crypto_alg_err_t auth_cmac_gen(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + uint8_t hash[EVP_MAX_MD_SIZE]; + + /* Hash it */ + packet_cmac(pkt, param, session, hash); + + /* Copy to the output location */ + odp_packet_copy_from_mem(pkt, + param->hash_result_offset, + session->p.auth_digest_len, + hash); + + return ODP_CRYPTO_ALG_ERR_NONE; +} + +static +odp_crypto_alg_err_t auth_cmac_check(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + uint32_t bytes = session->p.auth_digest_len; + uint8_t hash_in[EVP_MAX_MD_SIZE]; + uint8_t hash_out[EVP_MAX_MD_SIZE]; + + /* Copy current value out and clear it before authentication */ + odp_packet_copy_to_mem(pkt, param->hash_result_offset, + bytes, hash_in); + + _odp_packet_set_data(pkt, param->hash_result_offset, + 0, bytes); + + /* Hash it */ + packet_cmac(pkt, param, session, hash_out); + + /* Verify match */ + if (0 != memcmp(hash_in, hash_out, bytes)) + return ODP_CRYPTO_ALG_ERR_ICV_CHECK; + + /* Matched */ + return ODP_CRYPTO_ALG_ERR_NONE; +} + static int internal_aad(EVP_CIPHER_CTX *ctx, odp_packet_t pkt, @@ -1001,6 +1098,35 @@ static int process_auth_hmac_param(odp_crypto_generic_session_t *session, return 0; } +static int process_auth_cmac_param(odp_crypto_generic_session_t *session, + const EVP_CIPHER *cipher) +{ + /* Verify Key len is valid */ + if ((uint32_t)EVP_CIPHER_key_length(cipher) != + session->p.auth_key.length) + return -1; + + /* Set function */ + if (ODP_CRYPTO_OP_ENCODE == session->p.op) + session->auth.func = auth_cmac_gen; + else + session->auth.func = auth_cmac_check; + session->auth.init = auth_cmac_init; + + session->auth.evp_cipher = cipher; + + /* Number of valid bytes */ + if (session->p.auth_digest_len < + (unsigned)EVP_CIPHER_block_size(cipher) / 2) + return -1; + + /* Convert keys */ + memcpy(session->auth.key, session->p.auth_key.data, + session->p.auth_key.length); + + return 0; +} + int odp_crypto_capability(odp_crypto_capability_t *capa) { if (NULL == capa) @@ -1030,6 +1156,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->auths.bit.aes_gcm = 1; capa->auths.bit.aes_ccm = 1; capa->auths.bit.aes_gmac = 1; + capa->auths.bit.aes_cmac = 1; #if _ODP_HAVE_CHACHA20_POLY1305 capa->auths.bit.chacha20_poly1305 = 1; #endif @@ -1138,6 +1265,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth, src = auth_capa_aes_ccm; num = sizeof(auth_capa_aes_ccm) / size; break; + case ODP_AUTH_ALG_AES_CMAC: + src = auth_capa_aes_cmac; + num = sizeof(auth_capa_aes_cmac) / size; + break; #if _ODP_HAVE_CHACHA20_POLY1305 case ODP_AUTH_ALG_CHACHA20_POLY1305: src = auth_capa_chacha20_poly1305; @@ -1374,6 +1505,19 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, rc = -1; } break; + case ODP_AUTH_ALG_AES_CMAC: + if (param->auth_key.length == 16) + rc = process_auth_cmac_param(session, + EVP_aes_128_cbc()); + else if (param->auth_key.length == 24) + rc = process_auth_cmac_param(session, + EVP_aes_192_cbc()); + else if (param->auth_key.length == 32) + rc = process_auth_cmac_param(session, + EVP_aes_256_cbc()); + else + rc = -1; + break; #if _ODP_HAVE_CHACHA20_POLY1305 case ODP_AUTH_ALG_CHACHA20_POLY1305: /* ChaCha20_Poly1305 requires to do both auth and @@ -1561,6 +1705,7 @@ int _odp_crypto_init_local(void) for (i = 0; i < MAX_SESSIONS; i++) { local.hmac_ctx[i] = HMAC_CTX_new(); + local.cmac_ctx[i] = CMAC_CTX_new(); local.cipher_ctx[i] = EVP_CIPHER_CTX_new(); local.mac_cipher_ctx[i] = EVP_CIPHER_CTX_new(); @@ -1584,6 +1729,8 @@ int _odp_crypto_term_local(void) unsigned i; for (i = 0; i < MAX_SESSIONS; i++) { + if (local.cmac_ctx[i] != NULL) + CMAC_CTX_free(local.cmac_ctx[i]); if (local.hmac_ctx[i] != NULL) HMAC_CTX_free(local.hmac_ctx[i]); if (local.cipher_ctx[i] != NULL) commit 60176e6d6d64427dfd9e0fd1688fabcb492a3def Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 04:07:42 2018 +0300 linux-gen: crypto: rename auth functions Point that current authentication functions use HMAC by including hmac in their names. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index a0fff174..40b1dbe4 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -149,8 +149,6 @@ struct odp_crypto_generic_session_t { struct { uint8_t key[EVP_MAX_KEY_LENGTH]; uint8_t iv_data[EVP_MAX_IV_LENGTH]; - uint32_t key_length; - uint32_t bytes; union { const EVP_MD *evp_md; const EVP_CIPHER *evp_cipher; @@ -260,13 +258,13 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) #endif static void -auth_init(odp_crypto_generic_session_t *session) +auth_hmac_init(odp_crypto_generic_session_t *session) { HMAC_CTX *ctx = local.hmac_ctx[session->idx]; HMAC_Init_ex(ctx, session->auth.key, - session->auth.key_length, + session->p.auth_key.length, session->auth.evp_md, NULL); } @@ -301,9 +299,9 @@ void packet_hmac(odp_packet_t pkt, } static -odp_crypto_alg_err_t auth_gen(odp_packet_t pkt, - const odp_crypto_packet_op_param_t *param, - odp_crypto_generic_session_t *session) +odp_crypto_alg_err_t auth_hmac_gen(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) { uint8_t hash[EVP_MAX_MD_SIZE]; @@ -320,9 +318,9 @@ odp_crypto_alg_err_t auth_gen(odp_packet_t pkt, } static -odp_crypto_alg_err_t auth_check(odp_packet_t pkt, - const odp_crypto_packet_op_param_t *param, - odp_crypto_generic_session_t *session) +odp_crypto_alg_err_t auth_hmac_check(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) { uint32_t bytes = session->p.auth_digest_len; uint8_t hash_in[EVP_MAX_MD_SIZE]; @@ -824,12 +822,24 @@ static int process_aes_gmac_param(odp_crypto_generic_session_t *session, return 0; } +static void +aes_ccm_encrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + NULL, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN, + session->p.cipher_iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; const uint8_t *aad_head = param->aad_ptr; uint32_t aad_len = session->p.auth_aad_len; void *iv_ptr; @@ -847,16 +857,9 @@ odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Encrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - NULL, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN, - session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG, session->p.auth_digest_len, NULL); EVP_EncryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); /* Set len */ EVP_EncryptUpdate(ctx, NULL, &dummy_len, NULL, in_len); @@ -882,18 +885,28 @@ odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt, odp_packet_copy_from_mem(pkt, param->hash_result_offset, session->p.auth_digest_len, block); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : ODP_CRYPTO_ALG_ERR_NONE; } +static void +aes_ccm_decrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.cipher_iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; const uint8_t *aad_head = param->aad_ptr; uint32_t aad_len = session->p.auth_aad_len; void *iv_ptr; @@ -911,18 +924,11 @@ odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Decrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - NULL, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN, - session->p.cipher_iv.length, NULL); odp_packet_copy_to_mem(pkt, param->hash_result_offset, session->p.auth_digest_len, block); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG, session->p.auth_digest_len, block); EVP_DecryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); /* Set len */ EVP_DecryptUpdate(ctx, NULL, &dummy_len, NULL, in_len); @@ -943,8 +949,6 @@ odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt, odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len, data); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK : ODP_CRYPTO_ALG_ERR_NONE; } @@ -963,24 +967,26 @@ static int process_aes_ccm_param(odp_crypto_generic_session_t *session, session->cipher.evp_cipher = cipher; /* Set function */ - if (ODP_CRYPTO_OP_ENCODE == session->p.op) + if (ODP_CRYPTO_OP_ENCODE == session->p.op) { session->cipher.func = aes_ccm_encrypt; - else + session->cipher.init = aes_ccm_encrypt_init; + } else { session->cipher.func = aes_ccm_decrypt; + session->cipher.init = aes_ccm_decrypt_init; + } return 0; } -static int process_auth_param(odp_crypto_generic_session_t *session, - uint32_t key_length, - const EVP_MD *evp_md) +static int process_auth_hmac_param(odp_crypto_generic_session_t *session, + const EVP_MD *evp_md) { /* Set function */ if (ODP_CRYPTO_OP_ENCODE == session->p.op) - session->auth.func = auth_gen; + session->auth.func = auth_hmac_gen; else - session->auth.func = auth_check; - session->auth.init = auth_init; + session->auth.func = auth_hmac_check; + session->auth.init = auth_hmac_init; session->auth.evp_md = evp_md; @@ -989,9 +995,8 @@ static int process_auth_param(odp_crypto_generic_session_t *session, return -1; /* Convert keys */ - session->auth.key_length = key_length; memcpy(session->auth.key, session->p.auth_key.data, - session->auth.key_length); + session->p.auth_key.length); return 0; } @@ -1312,10 +1317,10 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, #endif /* Fallthrough */ case ODP_AUTH_ALG_MD5_HMAC: - rc = process_auth_param(session, 16, EVP_md5()); + rc = process_auth_hmac_param(session, EVP_md5()); break; case ODP_AUTH_ALG_SHA1_HMAC: - rc = process_auth_param(session, 20, EVP_sha1()); + rc = process_auth_hmac_param(session, EVP_sha1()); break; #if ODP_DEPRECATED_API case ODP_AUTH_ALG_SHA256_128: @@ -1324,10 +1329,10 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, #endif /* Fallthrough */ case ODP_AUTH_ALG_SHA256_HMAC: - rc = process_auth_param(session, 32, EVP_sha256()); + rc = process_auth_hmac_param(session, EVP_sha256()); break; case ODP_AUTH_ALG_SHA512_HMAC: - rc = process_auth_param(session, 64, EVP_sha512()); + rc = process_auth_hmac_param(session, EVP_sha512()); break; #if ODP_DEPRECATED_API case ODP_AUTH_ALG_AES128_GCM: @@ -1363,6 +1368,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, * cipher at the same time */ if (param->cipher_alg == ODP_CIPHER_ALG_AES_CCM) { session->auth.func = null_crypto_routine; + session->auth.init = null_crypto_init_routine; rc = 0; } else { rc = -1; commit 5765254404be8772e60fda5143a07e61133c7db6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 03:47:34 2018 +0300 linux-gen: crypto: provide AES-CCM implementation AES-CCM support in OpenSSL is quite unique: it requires whole data to be passed in single EVP_EncryptUpdate/EVP_DecryptUpdate call. Supporting this requires copying data back-and-forth between packet and temporary buffer. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 995e0921..a0fff174 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -61,6 +61,14 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { {.key_len = 24, .iv_len = 12}, {.key_len = 32, .iv_len = 12} }; +static const odp_crypto_cipher_capability_t cipher_capa_aes_ccm[] = { +{.key_len = 16, .iv_len = 11}, +{.key_len = 16, .iv_len = 13}, +{.key_len = 24, .iv_len = 11}, +{.key_len = 24, .iv_len = 13}, +{.key_len = 32, .iv_len = 11}, +{.key_len = 32, .iv_len = 13} }; + #if _ODP_HAVE_CHACHA20_POLY1305 static const odp_crypto_cipher_capability_t cipher_capa_chacha20_poly1305[] = { {.key_len = 32, .iv_len = 12} }; @@ -93,6 +101,9 @@ static const odp_crypto_auth_capability_t auth_capa_sha512_hmac[] = { static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; +static const odp_crypto_auth_capability_t auth_capa_aes_ccm[] = { +{.digest_len = 8, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; + static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { {.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, .iv_len = 12 } }; @@ -813,6 +824,153 @@ static int process_aes_gmac_param(odp_crypto_generic_session_t *session, return 0; } +static +odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx; + const uint8_t *aad_head = param->aad_ptr; + uint32_t aad_len = session->p.auth_aad_len; + void *iv_ptr; + int dummy_len = 0; + int cipher_len; + uint32_t in_len = param->cipher_range.length; + uint8_t data[in_len]; + uint8_t block[EVP_MAX_MD_SIZE]; + int ret; + + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; + else if (session->p.cipher_iv.data) + iv_ptr = session->cipher.iv_data; + else + return ODP_CRYPTO_ALG_ERR_IV_INVALID; + + /* Encrypt it */ + ctx = EVP_CIPHER_CTX_new(); + EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + NULL, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN, + session->p.cipher_iv.length, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG, + session->p.auth_digest_len, NULL); + EVP_EncryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr); + EVP_CIPHER_CTX_set_padding(ctx, 0); + + /* Set len */ + EVP_EncryptUpdate(ctx, NULL, &dummy_len, NULL, in_len); + + /* Authenticate header data (if any) without encrypting them */ + if (aad_len > 0) + EVP_EncryptUpdate(ctx, NULL, &dummy_len, + aad_head, aad_len); + + odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len, + data); + + EVP_EncryptUpdate(ctx, data, &cipher_len, data, in_len); + + ret = EVP_EncryptFinal_ex(ctx, data + cipher_len, &dummy_len); + cipher_len += dummy_len; + + odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len, + data); + + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_GET_TAG, + session->p.auth_digest_len, block); + odp_packet_copy_from_mem(pkt, param->hash_result_offset, + session->p.auth_digest_len, block); + + EVP_CIPHER_CTX_free(ctx); + + return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : + ODP_CRYPTO_ALG_ERR_NONE; +} + +static +odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx; + const uint8_t *aad_head = param->aad_ptr; + uint32_t aad_len = session->p.auth_aad_len; + void *iv_ptr; + int dummy_len = 0; + int cipher_len; + uint32_t in_len = param->cipher_range.length; + uint8_t data[in_len]; + uint8_t block[EVP_MAX_MD_SIZE]; + int ret; + + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; + else if (session->p.cipher_iv.data) + iv_ptr = session->cipher.iv_data; + else + return ODP_CRYPTO_ALG_ERR_IV_INVALID; + + /* Decrypt it */ + ctx = EVP_CIPHER_CTX_new(); + EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + NULL, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN, + session->p.cipher_iv.length, NULL); + odp_packet_copy_to_mem(pkt, param->hash_result_offset, + session->p.auth_digest_len, block); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG, + session->p.auth_digest_len, block); + EVP_DecryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr); + EVP_CIPHER_CTX_set_padding(ctx, 0); + + /* Set len */ + EVP_DecryptUpdate(ctx, NULL, &dummy_len, NULL, in_len); + + /* Authenticate header data (if any) without encrypting them */ + if (aad_len > 0) + EVP_DecryptUpdate(ctx, NULL, &dummy_len, + aad_head, aad_len); + + odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len, + data); + + ret = EVP_DecryptUpdate(ctx, data, &cipher_len, data, in_len); + + EVP_DecryptFinal_ex(ctx, data + cipher_len, &dummy_len); + cipher_len += dummy_len; + + odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len, + data); + + EVP_CIPHER_CTX_free(ctx); + + return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK : + ODP_CRYPTO_ALG_ERR_NONE; +} + +static int process_aes_ccm_param(odp_crypto_generic_session_t *session, + const EVP_CIPHER *cipher) +{ + /* Verify Key len is valid */ + if ((uint32_t)EVP_CIPHER_key_length(cipher) != + session->p.cipher_key.length) + return -1; + + memcpy(session->cipher.key_data, session->p.cipher_key.data, + session->p.cipher_key.length); + + session->cipher.evp_cipher = cipher; + + /* Set function */ + if (ODP_CRYPTO_OP_ENCODE == session->p.op) + session->cipher.func = aes_ccm_encrypt; + else + session->cipher.func = aes_ccm_decrypt; + + return 0; +} + static int process_auth_param(odp_crypto_generic_session_t *session, uint32_t key_length, const EVP_MD *evp_md) @@ -854,6 +1012,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.aes_cbc = 1; capa->ciphers.bit.aes_ctr = 1; capa->ciphers.bit.aes_gcm = 1; + capa->ciphers.bit.aes_ccm = 1; #if _ODP_HAVE_CHACHA20_POLY1305 capa->ciphers.bit.chacha20_poly1305 = 1; #endif @@ -864,6 +1023,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->auths.bit.sha256_hmac = 1; capa->auths.bit.sha512_hmac = 1; capa->auths.bit.aes_gcm = 1; + capa->auths.bit.aes_ccm = 1; capa->auths.bit.aes_gmac = 1; #if _ODP_HAVE_CHACHA20_POLY1305 capa->auths.bit.chacha20_poly1305 = 1; @@ -911,6 +1071,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, src = cipher_capa_aes_gcm; num = sizeof(cipher_capa_aes_gcm) / size; break; + case ODP_CIPHER_ALG_AES_CCM: + src = cipher_capa_aes_ccm; + num = sizeof(cipher_capa_aes_ccm) / size; + break; #if _ODP_HAVE_CHACHA20_POLY1305 case ODP_CIPHER_ALG_CHACHA20_POLY1305: src = cipher_capa_chacha20_poly1305; @@ -965,6 +1129,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth, src = auth_capa_aes_gmac; num = sizeof(auth_capa_aes_gmac) / size; break; + case ODP_AUTH_ALG_AES_CCM: + src = auth_capa_aes_ccm; + num = sizeof(auth_capa_aes_ccm) / size; + break; #if _ODP_HAVE_CHACHA20_POLY1305 case ODP_AUTH_ALG_CHACHA20_POLY1305: src = auth_capa_chacha20_poly1305; @@ -1093,6 +1261,20 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; + case ODP_CIPHER_ALG_AES_CCM: + /* AES-CCM requires to do both auth and + * cipher at the same time */ + if (param->auth_alg != ODP_AUTH_ALG_AES_CCM) + rc = -1; + else if (param->cipher_key.length == 16) + rc = process_aes_ccm_param(session, EVP_aes_128_ccm()); + else if (param->cipher_key.length == 24) + rc = process_aes_ccm_param(session, EVP_aes_192_ccm()); + else if (param->cipher_key.length == 32) + rc = process_aes_ccm_param(session, EVP_aes_256_ccm()); + else + rc = -1; + break; #if _ODP_HAVE_CHACHA20_POLY1305 case ODP_CIPHER_ALG_CHACHA20_POLY1305: /* ChaCha20_Poly1305 requires to do both auth and @@ -1176,6 +1358,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; + case ODP_AUTH_ALG_AES_CCM: + /* AES-CCM requires to do both auth and + * cipher at the same time */ + if (param->cipher_alg == ODP_CIPHER_ALG_AES_CCM) { + session->auth.func = null_crypto_routine; + rc = 0; + } else { + rc = -1; + } + break; #if _ODP_HAVE_CHACHA20_POLY1305 case ODP_AUTH_ALG_CHACHA20_POLY1305: /* ChaCha20_Poly1305 requires to do both auth and commit c20e507662bb67ad47429ee3e9c1c4f8e61e7e57 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 08:03:56 2018 +0300 linux-gen: crypto: support ChaCha20-Poly1305 OpenSSL >= 1.1.0 supports ChaCha20-Poly1305 AEAD cipher, so let's support it in linux-generic. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index b3df87e6..995e0921 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -27,6 +27,12 @@ #include <openssl/hmac.h> #include <openssl/evp.h> +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(OPENSSL_NO_POLY1305) +#define _ODP_HAVE_CHACHA20_POLY1305 1 +#else +#define _ODP_HAVE_CHACHA20_POLY1305 0 +#endif + #define MAX_SESSIONS 32 /* @@ -55,6 +61,11 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { {.key_len = 24, .iv_len = 12}, {.key_len = 32, .iv_len = 12} }; +#if _ODP_HAVE_CHACHA20_POLY1305 +static const odp_crypto_cipher_capability_t cipher_capa_chacha20_poly1305[] = { +{.key_len = 32, .iv_len = 12} }; +#endif + /* * Authentication algorithm capabilities * @@ -86,6 +97,11 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { {.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, .iv_len = 12 } }; +#if _ODP_HAVE_CHACHA20_POLY1305 +static const odp_crypto_auth_capability_t auth_capa_chacha20_poly1305[] = { +{.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; +#endif + /** Forward declaration of session structure */ typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; @@ -838,6 +854,9 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.aes_cbc = 1; capa->ciphers.bit.aes_ctr = 1; capa->ciphers.bit.aes_gcm = 1; +#if _ODP_HAVE_CHACHA20_POLY1305 + capa->ciphers.bit.chacha20_poly1305 = 1; +#endif capa->auths.bit.null = 1; capa->auths.bit.md5_hmac = 1; @@ -846,6 +865,9 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->auths.bit.sha512_hmac = 1; capa->auths.bit.aes_gcm = 1; capa->auths.bit.aes_gmac = 1; +#if _ODP_HAVE_CHACHA20_POLY1305 + capa->auths.bit.chacha20_poly1305 = 1; +#endif #if ODP_DEPRECATED_API capa->ciphers.bit.aes128_cbc = 1; @@ -889,6 +911,12 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, src = cipher_capa_aes_gcm; num = sizeof(cipher_capa_aes_gcm) / size; break; +#if _ODP_HAVE_CHACHA20_POLY1305 + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + src = cipher_capa_chacha20_poly1305; + num = sizeof(cipher_capa_chacha20_poly1305) / size; + break; +#endif default: return -1; } @@ -937,6 +965,12 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth, src = auth_capa_aes_gmac; num = sizeof(auth_capa_aes_gmac) / size; break; +#if _ODP_HAVE_CHACHA20_POLY1305 + case ODP_AUTH_ALG_CHACHA20_POLY1305: + src = auth_capa_chacha20_poly1305; + num = sizeof(auth_capa_chacha20_poly1305) / size; + break; +#endif default: return -1; } @@ -1059,6 +1093,17 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; +#if _ODP_HAVE_CHACHA20_POLY1305 + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + /* ChaCha20_Poly1305 requires to do both auth and + * cipher at the same time */ + if (param->auth_alg != ODP_AUTH_ALG_CHACHA20_POLY1305) + rc = -1; + else + rc = process_aes_gcm_param(session, + EVP_chacha20_poly1305()); + break; +#endif default: rc = -1; } @@ -1131,6 +1176,19 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; +#if _ODP_HAVE_CHACHA20_POLY1305 + case ODP_AUTH_ALG_CHACHA20_POLY1305: + /* ChaCha20_Poly1305 requires to do both auth and + * cipher at the same time */ + if (param->cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305) { + session->auth.func = null_crypto_routine; + session->auth.init = null_crypto_init_routine; + rc = 0; + } else { + rc = -1; + } + break; +#endif default: rc = -1; } commit 601c8a1c38bd5a284c0df8d7bc88fa7445f42a99 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 30 07:13:49 2018 +0300 linux-gen: crypto: drop stale enum Drop crypto_kind_t, unused now. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 4b2b884a..b3df87e6 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -159,8 +159,6 @@ typedef struct crypto_local_t { static __thread crypto_local_t local; -typedef enum { KIND_HMAC, KIND_CIPHER, KIND_MAC_CIPHER } crypto_kind_t; - static inline void crypto_init(odp_crypto_generic_session_t *session) { if (local.ctx_valid[session->idx]) ----------------------------------------------------------------------- Summary of changes: include/odp/api/abi-default/packet.h | 33 ++ include/odp/api/spec/crypto.h | 19 + include/odp/api/spec/ipsec.h | 152 +++++-- include/odp/api/spec/packet.h | 119 ++++++ include/odp/api/spec/schedule.h | 28 ++ .../linux-generic/include-abi/odp/api/abi/packet.h | 33 ++ platform/linux-generic/include/odp_schedule_if.h | 6 + platform/linux-generic/odp_crypto.c | 449 +++++++++++++++++++-- platform/linux-generic/odp_ipsec.c | 3 +- platform/linux-generic/odp_ipsec_sad.c | 12 + platform/linux-generic/odp_schedule.c | 14 +- platform/linux-generic/odp_schedule_if.c | 11 + platform/linux-generic/odp_schedule_iquery.c | 14 +- platform/linux-generic/odp_schedule_scalable.c | 12 + platform/linux-generic/odp_schedule_sp.c | 14 +- platform/linux-generic/pktio/socket_mmap.c | 40 +- test/validation/api/crypto/odp_crypto_test_inp.c | 34 +- test/validation/api/ipsec/ipsec.c | 14 + test/validation/api/ipsec/ipsec.h | 1 + test/validation/api/ipsec/ipsec_test_in.c | 33 ++ test/validation/api/ipsec/ipsec_test_out.c | 48 ++- test/validation/api/ipsec/test_vectors.h | 66 +++ test/validation/api/pktio/pktio.c | 35 +- 23 files changed, 1081 insertions(+), 109 deletions(-) hooks/post-receive --

8 years

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-266-g2e58a2fd

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 via 2e58a2fdb2a72f8676c01de429e3d371ad720180 (commit) via 8e1b949823d5f74c172ead490866c218b2594abe (commit) via e7007929b46f50bc7bdf8c3ace0de3f3cd2ff788 (commit) via 9df37f444fa645e1caca15024c158d19785e0abe (commit) via da58e40721c2d6155c56fcd9f12145f3f956561c (commit) via 3f68b9dc79a16816f35bde77d7bf95685d9bc5db (commit) via 492fa2bf50272e473f7387756bc98e46ef78c900 (commit) via 4e1e04346efd3d2ab53f492f297a7dda588e894f (commit) via 1a2b794b4356acea912fddb245186a18f07830d1 (commit) via 95e2a19bb8c3d8f16dcaf70240b83cc782b3f655 (commit) from e85a5453f2f85e4d5794d3ea2fc9e7b8433485a9 (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 2e58a2fdb2a72f8676c01de429e3d371ad720180 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 04:49:51 2018 +0300 validation: crypto: add AES-CMAC test vectors Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index d1b1d662..b86bd985 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -55,6 +55,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_AES_GMAC"; case ODP_AUTH_ALG_AES_CCM: return "ODP_AUTH_ALG_AES_CCM"; + case ODP_AUTH_ALG_AES_CMAC: + return "ODP_AUTH_ALG_AES_CMAC"; case ODP_AUTH_ALG_CHACHA20_POLY1305: return "ODP_AUTH_ALG_CHACHA20_POLY1305"; default: @@ -487,6 +489,9 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_AES_GMAC && !(capa.auths.bit.aes_gmac)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_AES_CMAC && + !(capa.auths.bit.aes_cmac)) + rc = -1; if (auth_alg == ODP_AUTH_ALG_AES_CCM && !(capa.auths.bit.aes_ccm)) rc = -1; @@ -702,6 +707,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.aes_ccm) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_AES_CMAC: + if (!capability.auths.bit.aes_cmac) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_CHACHA20_POLY1305: if (!capability.auths.bit.chacha20_poly1305) return ODP_TEST_INACTIVE; @@ -1238,6 +1247,36 @@ static void crypto_test_check_alg_aes_gmac(void) false); } +static int check_alg_aes_cmac(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_CMAC); +} + +static void crypto_test_gen_alg_aes_cmac(void) +{ + unsigned int test_vec_num = (sizeof(aes_cmac_reference) / + sizeof(aes_cmac_reference[0])); + unsigned int i; + + for (i = 0; i < test_vec_num; i++) + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_CMAC, + aes_cmac_reference, + ARRAY_SIZE(aes_cmac_reference), + false); +} + +static void crypto_test_check_alg_aes_cmac(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_CMAC, + aes_cmac_reference, + ARRAY_SIZE(aes_cmac_reference), + false); +} + static int crypto_suite_sync_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); @@ -1363,6 +1402,10 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_gmac), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac, check_alg_aes_gmac), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_cmac, + check_alg_aes_cmac), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_cmac, + check_alg_aes_cmac), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 08c05356..dd7e6119 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -603,6 +603,103 @@ static crypto_test_reference_t aes_gmac_reference[] = { }, }; +/* + * Test vectors from SP800-38B / CSRC examples + * 12-byte vectors are just truncated 16-byte vectors + */ +static crypto_test_reference_t aes_cmac_reference[] = { + { + .auth_key_length = AES128_KEY_LEN, + .auth_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c }, + .length = 16, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a}, + .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }, + .digest_length = 16, + .digest = { 0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44, + 0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c }, + }, + { + .auth_key_length = AES192_KEY_LEN, + .auth_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, + 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, + 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b }, + .length = 16, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a}, + .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }, + .digest_length = 16, + .digest = { 0x9e, 0x99, 0xa7, 0xbf, 0x31, 0xe7, 0x10, 0x90, + 0x06, 0x62, 0xf6, 0x5e, 0x61, 0x7c, 0x51, 0x84 }, + }, + { + .auth_key_length = AES256_KEY_LEN, + .auth_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, + 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, + 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, + 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4 }, + .length = 16, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a}, + .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }, + .digest_length = 16, + .digest = { 0x28, 0xa7, 0x02, 0x3f, 0x45, 0x2e, 0x8f, 0x82, + 0xbd, 0x4b, 0xf2, 0x8d, 0x8c, 0x37, 0xc3, 0x5c }, + }, + { + .auth_key_length = AES128_KEY_LEN, + .auth_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c }, + .length = 16, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a}, + .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }, + .digest_length = 12, + .digest = { 0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44, + 0xf7, 0x9b, 0xdd, 0x9d }, + }, + { + .auth_key_length = AES192_KEY_LEN, + .auth_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, + 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, + 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b }, + .length = 16, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a}, + .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }, + .digest_length = 12, + .digest = { 0x9e, 0x99, 0xa7, 0xbf, 0x31, 0xe7, 0x10, 0x90, + 0x06, 0x62, 0xf6, 0x5e }, + }, + { + .auth_key_length = AES256_KEY_LEN, + .auth_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, + 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, + 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, + 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4 }, + .length = 16, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a}, + .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a + }, + .digest_length = 12, + .digest = { 0x28, 0xa7, 0x02, 0x3f, 0x45, 0x2e, 0x8f, 0x82, + 0xbd, 0x4b, 0xf2, 0x8d }, + } +}; + /* * Test vector from RFC 7539, sections 2.8.2, A.5 */ commit 8e1b949823d5f74c172ead490866c218b2594abe Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 03:45:33 2018 +0300 validation: crypto: add test vectors for AES-CCM Neither RFC 3610 nor SP 800-38C contains test vectors for 192 and 256 bit keys and none contains test vectors for 11-bit IV (used in IPsec). So I've used 1st test vector from RFC 3610 and generated the rest of test vectors. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index c4cb1dd7..d1b1d662 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -53,6 +53,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_AES_GCM"; case ODP_AUTH_ALG_AES_GMAC: return "ODP_AUTH_ALG_AES_GMAC"; + case ODP_AUTH_ALG_AES_CCM: + return "ODP_AUTH_ALG_AES_CCM"; case ODP_AUTH_ALG_CHACHA20_POLY1305: return "ODP_AUTH_ALG_CHACHA20_POLY1305"; default: @@ -73,6 +75,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_AES_CBC"; case ODP_CIPHER_ALG_AES_GCM: return "ODP_CIPHER_ALG_AES_GCM"; + case ODP_CIPHER_ALG_AES_CCM: + return "ODP_CIPHER_ALG_AES_CCM"; case ODP_CIPHER_ALG_CHACHA20_POLY1305: return "ODP_CIPHER_ALG_CHACHA20_POLY1305"; default: @@ -461,6 +465,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && !(capa.ciphers.bit.aes_gcm)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CCM && + !(capa.ciphers.bit.aes_ccm)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305 && !(capa.ciphers.bit.chacha20_poly1305)) rc = -1; @@ -480,6 +487,9 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_AES_GMAC && !(capa.auths.bit.aes_gmac)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_AES_CCM && + !(capa.auths.bit.aes_ccm)) + rc = -1; if (auth_alg == ODP_AUTH_ALG_CHACHA20_POLY1305 && !(capa.auths.bit.chacha20_poly1305)) rc = -1; @@ -645,6 +655,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.aes_gcm) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_AES_CCM: + if (!capability.ciphers.bit.aes_ccm) + return ODP_TEST_INACTIVE; + break; case ODP_CIPHER_ALG_CHACHA20_POLY1305: if (!capability.ciphers.bit.chacha20_poly1305) return ODP_TEST_INACTIVE; @@ -684,6 +698,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.aes_gmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_AES_CCM: + if (!capability.auths.bit.aes_ccm) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_CHACHA20_POLY1305: if (!capability.auths.bit.chacha20_poly1305) return ODP_TEST_INACTIVE; @@ -893,6 +911,51 @@ static void crypto_test_dec_alg_aes_gcm_ovr_iv(void) true); } +static int check_alg_aes_ccm(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_CCM, ODP_AUTH_ALG_AES_CCM); +} + +static void crypto_test_enc_alg_aes_ccm(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CCM, + ODP_AUTH_ALG_AES_CCM, + aes_ccm_reference, + ARRAY_SIZE(aes_ccm_reference), + false); +} + +static void crypto_test_enc_alg_aes_ccm_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CCM, + ODP_AUTH_ALG_AES_CCM, + aes_ccm_reference, + ARRAY_SIZE(aes_ccm_reference), + true); +} + +static void crypto_test_dec_alg_aes_ccm(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CCM, + ODP_AUTH_ALG_AES_CCM, + aes_ccm_reference, + ARRAY_SIZE(aes_ccm_reference), + false); +} + +static void crypto_test_dec_alg_aes_ccm_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CCM, + ODP_AUTH_ALG_AES_CCM, + aes_ccm_reference, + ARRAY_SIZE(aes_ccm_reference), + true); +} + static int check_alg_aes_cbc(void) { return check_alg_support(ODP_CIPHER_ALG_AES_CBC, ODP_AUTH_ALG_NULL); @@ -1264,6 +1327,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_gcm), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_gcm_ovr_iv, check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ccm, + check_alg_aes_ccm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ccm_ovr_iv, + check_alg_aes_ccm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ccm, + check_alg_aes_ccm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ccm_ovr_iv, + check_alg_aes_ccm), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305, check_alg_chacha20_poly1305), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305_ovr_iv, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 31a3b62d..08c05356 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -442,6 +442,134 @@ static crypto_test_reference_t aes_gcm_reference[] = { } }; +static crypto_test_reference_t aes_ccm_reference[] = { + /* + * AES-CCM reference from RFC 3610 + */ + { + .cipher_key_length = AES128_KEY_LEN, + .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf}, + .cipher_iv_length = 13, + .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0, + 0xa1, 0xa2, 0xa3, 0xa4, 0xa5 }, + .aad_length = 8, + .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }, + .length = 23, + .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e }, + .ciphertext = { 0x58, 0x8c, 0x97, 0x9a, 0x61, 0xc6, 0x63, 0xd2, + 0xf0, 0x66, 0xd0, 0xc2, 0xc0, 0xf9, 0x89, 0x80, + 0x6d, 0x5f, 0x6b, 0x61, 0xda, 0xc3, 0x84 }, + .digest_length = 8, + .digest = { 0x17, 0xe8, 0xd1, 0x2c, 0xfd, 0xf9, 0x26, 0xe0 } + }, + /* The rest of test vectors are generated manually, no "interesting" + * vectors for use cases in RFC 3610 or SP 800-38C. */ + { + .cipher_key_length = AES192_KEY_LEN, + .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7}, + .cipher_iv_length = 13, + .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0, + 0xa1, 0xa2, 0xa3, 0xa4, 0xa5 }, + .aad_length = 8, + .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }, + .length = 23, + .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e }, + .ciphertext = { 0x57, 0x9f, 0xb8, 0x6e, 0xdd, 0xb4, 0xa6, 0x4a, + 0xae, 0x5f, 0xe9, 0x6d, 0xbd, 0x75, 0x44, 0x05, + 0x33, 0xa9, 0xfc, 0x3a, 0x84, 0x57, 0x36 }, + .digest_length = 8, + .digest = { 0x67, 0xae, 0xc8, 0x0a, 0xc5, 0x88, 0xab, 0x16 } + }, + { + .cipher_key_length = AES256_KEY_LEN, + .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf}, + .cipher_iv_length = 13, + .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0, + 0xa1, 0xa2, 0xa3, 0xa4, 0xa5 }, + .aad_length = 8, + .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }, + .length = 23, + .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e }, + .ciphertext = { 0x59, 0x61, 0x55, 0x10, 0xa7, 0xc4, 0x3b, 0xfb, + 0x12, 0x3d, 0x63, 0x6b, 0x46, 0x13, 0xc0, 0x3c, + 0x6c, 0xe2, 0x69, 0x07, 0x10, 0x2a, 0x3f }, + .digest_length = 8, + .digest = { 0xb5, 0x57, 0x2a, 0x17, 0x2d, 0x49, 0x16, 0xd5 } + }, + { + .cipher_key_length = AES128_KEY_LEN, + .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf}, + .cipher_iv_length = 11, + .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0, + 0xa1, 0xa2, 0xa3 }, + .aad_length = 8, + .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }, + .length = 23, + .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e }, + .ciphertext = { 0xaa, 0x2d, 0x3e, 0xcb, 0xa6, 0x68, 0x63, 0x75, + 0x8f, 0x03, 0x01, 0x51, 0x16, 0xde, 0x30, 0xed, + 0x8a, 0xb5, 0x42, 0xdc, 0xfa, 0x72, 0xd0 }, + .digest_length = 8, + .digest = { 0x63, 0xe7, 0x01, 0x5c, 0x69, 0xaf, 0xb4, 0x0c } + }, + { + .cipher_key_length = AES192_KEY_LEN, + .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7}, + .cipher_iv_length = 11, + .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0, + 0xa1, 0xa2, 0xa3 }, + .aad_length = 8, + .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }, + .length = 23, + .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e }, + .ciphertext = { 0xee, 0x99, 0x99, 0x1e, 0xc5, 0x8f, 0xd7, 0x7e, + 0x56, 0x71, 0x16, 0x39, 0x8e, 0xc4, 0x4f, 0xcc, + 0x14, 0x45, 0x57, 0x3e, 0x38, 0x76, 0x51 }, + .digest_length = 8, + .digest = { 0x31, 0x29, 0x47, 0xa4, 0x6d, 0x76, 0x34, 0xb4 } + }, + { + .cipher_key_length = AES256_KEY_LEN, + .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf}, + .cipher_iv_length = 11, + .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0, + 0xa1, 0xa2, 0xa3 }, + .aad_length = 8, + .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }, + .length = 23, + .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e }, + .ciphertext = { 0xfa, 0x07, 0x47, 0x5c, 0xe8, 0xc9, 0x37, 0x88, + 0x54, 0x64, 0xb8, 0xc3, 0x85, 0xbb, 0x76, 0x0b, + 0xf2, 0xc2, 0x4c, 0x4e, 0x31, 0x16, 0x77 }, + .digest_length = 8, + .digest = { 0x88, 0x56, 0x7e, 0x19, 0x84, 0x13, 0x29, 0xc4 } + }, +}; + static crypto_test_reference_t aes_gmac_reference[] = { { .auth_key_length = AES128_KEY_LEN, commit e7007929b46f50bc7bdf8c3ace0de3f3cd2ff788 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 08:03:19 2018 +0300 validation: crypto: add ChaCha20-Poly1305 test vectors Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 1b6cd660..c4cb1dd7 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -53,6 +53,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_AES_GCM"; case ODP_AUTH_ALG_AES_GMAC: return "ODP_AUTH_ALG_AES_GMAC"; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + return "ODP_AUTH_ALG_CHACHA20_POLY1305"; default: return "Unknown"; } @@ -71,6 +73,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_AES_CBC"; case ODP_CIPHER_ALG_AES_GCM: return "ODP_CIPHER_ALG_AES_GCM"; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + return "ODP_CIPHER_ALG_CHACHA20_POLY1305"; default: return "Unknown"; } @@ -457,6 +461,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && !(capa.ciphers.bit.aes_gcm)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305 && + !(capa.ciphers.bit.chacha20_poly1305)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_DES && !(capa.ciphers.bit.des)) rc = -1; @@ -473,6 +480,9 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_AES_GMAC && !(capa.auths.bit.aes_gmac)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_CHACHA20_POLY1305 && + !(capa.auths.bit.chacha20_poly1305)) + rc = -1; if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && !(capa.auths.bit.md5_hmac)) rc = -1; @@ -635,6 +645,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.aes_gcm) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + if (!capability.ciphers.bit.chacha20_poly1305) + return ODP_TEST_INACTIVE; + break; default: fprintf(stderr, "Unsupported cipher algorithm\n"); return ODP_TEST_INACTIVE; @@ -670,6 +684,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.aes_gmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + if (!capability.auths.bit.chacha20_poly1305) + return ODP_TEST_INACTIVE; + break; default: fprintf(stderr, "Unsupported authentication algorithm\n"); return ODP_TEST_INACTIVE; @@ -766,6 +784,52 @@ static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) true); } +static int check_alg_chacha20_poly1305(void) +{ + return check_alg_support(ODP_CIPHER_ALG_CHACHA20_POLY1305, + ODP_AUTH_ALG_CHACHA20_POLY1305); +} + +static void crypto_test_enc_alg_chacha20_poly1305(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_CHACHA20_POLY1305, + ODP_AUTH_ALG_CHACHA20_POLY1305, + chacha20_poly1305_reference, + ARRAY_SIZE(chacha20_poly1305_reference), + false); +} + +static void crypto_test_enc_alg_chacha20_poly1305_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_CHACHA20_POLY1305, + ODP_AUTH_ALG_CHACHA20_POLY1305, + chacha20_poly1305_reference, + ARRAY_SIZE(chacha20_poly1305_reference), + true); +} + +static void crypto_test_dec_alg_chacha20_poly1305(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_CHACHA20_POLY1305, + ODP_AUTH_ALG_CHACHA20_POLY1305, + chacha20_poly1305_reference, + ARRAY_SIZE(chacha20_poly1305_reference), + false); +} + +static void crypto_test_dec_alg_chacha20_poly1305_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_CHACHA20_POLY1305, + ODP_AUTH_ALG_CHACHA20_POLY1305, + chacha20_poly1305_reference, + ARRAY_SIZE(chacha20_poly1305_reference), + true); +} + static int check_alg_aes_gcm(void) { return check_alg_support(ODP_CIPHER_ALG_AES_GCM, ODP_AUTH_ALG_AES_GCM); @@ -1200,6 +1264,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_gcm), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_gcm_ovr_iv, check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305, + check_alg_chacha20_poly1305), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305_ovr_iv, + check_alg_chacha20_poly1305), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_chacha20_poly1305, + check_alg_chacha20_poly1305), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_chacha20_poly1305_ovr_iv, + check_alg_chacha20_poly1305), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_md5, check_alg_hmac_md5), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_md5, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index a194c24d..31a3b62d 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -475,6 +475,144 @@ static crypto_test_reference_t aes_gmac_reference[] = { }, }; +/* + * Test vector from RFC 7539, sections 2.8.2, A.5 + */ +static crypto_test_reference_t chacha20_poly1305_reference[] = { + { + .cipher_key_length = CHACHA20_POLY1305_KEY_LEN, + .cipher_key = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f}, + .cipher_iv_length = CHACHA20_POLY1305_IV_LEN, + .cipher_iv = { 0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43, + 0x44, 0x45, 0x46, 0x47 }, + .length = 114, + .plaintext = { 0x4c, 0x61, 0x64, 0x69, 0x65, 0x73, 0x20, 0x61, + 0x6e, 0x64, 0x20, 0x47, 0x65, 0x6e, 0x74, 0x6c, + 0x65, 0x6d, 0x65, 0x6e, 0x20, 0x6f, 0x66, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6f, 0x66, 0x20, 0x27, 0x39, 0x39, + 0x3a, 0x20, 0x49, 0x66, 0x20, 0x49, 0x20, 0x63, + 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6f, 0x66, 0x66, + 0x65, 0x72, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x6f, + 0x6e, 0x6c, 0x79, 0x20, 0x6f, 0x6e, 0x65, 0x20, + 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x66, 0x75, 0x74, 0x75, + 0x72, 0x65, 0x2c, 0x20, 0x73, 0x75, 0x6e, 0x73, + 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x77, 0x6f, + 0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, 0x20, 0x69, + 0x74, 0x2e }, + .ciphertext = { 0xd3, 0x1a, 0x8d, 0x34, 0x64, 0x8e, 0x60, 0xdb, + 0x7b, 0x86, 0xaf, 0xbc, 0x53, 0xef, 0x7e, 0xc2, + 0xa4, 0xad, 0xed, 0x51, 0x29, 0x6e, 0x08, 0xfe, + 0xa9, 0xe2, 0xb5, 0xa7, 0x36, 0xee, 0x62, 0xd6, + 0x3d, 0xbe, 0xa4, 0x5e, 0x8c, 0xa9, 0x67, 0x12, + 0x82, 0xfa, 0xfb, 0x69, 0xda, 0x92, 0x72, 0x8b, + 0x1a, 0x71, 0xde, 0x0a, 0x9e, 0x06, 0x0b, 0x29, + 0x05, 0xd6, 0xa5, 0xb6, 0x7e, 0xcd, 0x3b, 0x36, + 0x92, 0xdd, 0xbd, 0x7f, 0x2d, 0x77, 0x8b, 0x8c, + 0x98, 0x03, 0xae, 0xe3, 0x28, 0x09, 0x1b, 0x58, + 0xfa, 0xb3, 0x24, 0xe4, 0xfa, 0xd6, 0x75, 0x94, + 0x55, 0x85, 0x80, 0x8b, 0x48, 0x31, 0xd7, 0xbc, + 0x3f, 0xf4, 0xde, 0xf0, 0x8e, 0x4b, 0x7a, 0x9d, + 0xe5, 0x76, 0xd2, 0x65, 0x86, 0xce, 0xc6, 0x4b, + 0x61, 0x16 }, + .aad_length = 12, + .aad = { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, + 0xc5, 0xc6, 0xc7 }, + .digest_length = 16, + .digest = { 0x1a, 0xe1, 0x0b, 0x59, 0x4f, 0x09, 0xe2, 0x6a, + 0x7e, 0x90, 0x2e, 0xcb, 0xd0, 0x60, 0x06, 0x91 } + }, + { + .cipher_key_length = CHACHA20_POLY1305_KEY_LEN, + .cipher_key = { 0x1c, 0x92, 0x40, 0xa5, 0xeb, 0x55, 0xd3, 0x8a, + 0xf3, 0x33, 0x88, 0x86, 0x04, 0xf6, 0xb5, 0xf0, + 0x47, 0x39, 0x17, 0xc1, 0x40, 0x2b, 0x80, 0x09, + 0x9d, 0xca, 0x5c, 0xbc, 0x20, 0x70, 0x75, 0xc0}, + .cipher_iv_length = CHACHA20_POLY1305_IV_LEN, + .cipher_iv = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08 }, + .length = 265, + .plaintext = { 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, + 0x2d, 0x44, 0x72, 0x61, 0x66, 0x74, 0x73, 0x20, + 0x61, 0x72, 0x65, 0x20, 0x64, 0x72, 0x61, 0x66, + 0x74, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, + 0x6e, 0x74, 0x73, 0x20, 0x76, 0x61, 0x6c, 0x69, + 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, 0x20, + 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x20, + 0x6f, 0x66, 0x20, 0x73, 0x69, 0x78, 0x20, 0x6d, + 0x6f, 0x6e, 0x74, 0x68, 0x73, 0x20, 0x61, 0x6e, + 0x64, 0x20, 0x6d, 0x61, 0x79, 0x20, 0x62, 0x65, + 0x20, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, + 0x2c, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x64, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x6f, + 0x62, 0x73, 0x6f, 0x6c, 0x65, 0x74, 0x65, 0x64, + 0x20, 0x62, 0x79, 0x20, 0x6f, 0x74, 0x68, 0x65, + 0x72, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, + 0x6e, 0x74, 0x73, 0x20, 0x61, 0x74, 0x20, 0x61, + 0x6e, 0x79, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x2e, + 0x20, 0x49, 0x74, 0x20, 0x69, 0x73, 0x20, 0x69, + 0x6e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x70, 0x72, + 0x69, 0x61, 0x74, 0x65, 0x20, 0x74, 0x6f, 0x20, + 0x75, 0x73, 0x65, 0x20, 0x49, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x65, 0x74, 0x2d, 0x44, 0x72, 0x61, + 0x66, 0x74, 0x73, 0x20, 0x61, 0x73, 0x20, 0x72, + 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, + 0x20, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, + 0x6c, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x6f, 0x20, + 0x63, 0x69, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, + 0x6d, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, + 0x74, 0x68, 0x61, 0x6e, 0x20, 0x61, 0x73, 0x20, + 0x2f, 0xe2, 0x80, 0x9c, 0x77, 0x6f, 0x72, 0x6b, + 0x20, 0x69, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x67, + 0x72, 0x65, 0x73, 0x73, 0x2e, 0x2f, 0xe2, 0x80, + 0x9d }, + .ciphertext = { 0x64, 0xa0, 0x86, 0x15, 0x75, 0x86, 0x1a, 0xf4, + 0x60, 0xf0, 0x62, 0xc7, 0x9b, 0xe6, 0x43, 0xbd, + 0x5e, 0x80, 0x5c, 0xfd, 0x34, 0x5c, 0xf3, 0x89, + 0xf1, 0x08, 0x67, 0x0a, 0xc7, 0x6c, 0x8c, 0xb2, + 0x4c, 0x6c, 0xfc, 0x18, 0x75, 0x5d, 0x43, 0xee, + 0xa0, 0x9e, 0xe9, 0x4e, 0x38, 0x2d, 0x26, 0xb0, + 0xbd, 0xb7, 0xb7, 0x3c, 0x32, 0x1b, 0x01, 0x00, + 0xd4, 0xf0, 0x3b, 0x7f, 0x35, 0x58, 0x94, 0xcf, + 0x33, 0x2f, 0x83, 0x0e, 0x71, 0x0b, 0x97, 0xce, + 0x98, 0xc8, 0xa8, 0x4a, 0xbd, 0x0b, 0x94, 0x81, + 0x14, 0xad, 0x17, 0x6e, 0x00, 0x8d, 0x33, 0xbd, + 0x60, 0xf9, 0x82, 0xb1, 0xff, 0x37, 0xc8, 0x55, + 0x97, 0x97, 0xa0, 0x6e, 0xf4, 0xf0, 0xef, 0x61, + 0xc1, 0x86, 0x32, 0x4e, 0x2b, 0x35, 0x06, 0x38, + 0x36, 0x06, 0x90, 0x7b, 0x6a, 0x7c, 0x02, 0xb0, + 0xf9, 0xf6, 0x15, 0x7b, 0x53, 0xc8, 0x67, 0xe4, + 0xb9, 0x16, 0x6c, 0x76, 0x7b, 0x80, 0x4d, 0x46, + 0xa5, 0x9b, 0x52, 0x16, 0xcd, 0xe7, 0xa4, 0xe9, + 0x90, 0x40, 0xc5, 0xa4, 0x04, 0x33, 0x22, 0x5e, + 0xe2, 0x82, 0xa1, 0xb0, 0xa0, 0x6c, 0x52, 0x3e, + 0xaf, 0x45, 0x34, 0xd7, 0xf8, 0x3f, 0xa1, 0x15, + 0x5b, 0x00, 0x47, 0x71, 0x8c, 0xbc, 0x54, 0x6a, + 0x0d, 0x07, 0x2b, 0x04, 0xb3, 0x56, 0x4e, 0xea, + 0x1b, 0x42, 0x22, 0x73, 0xf5, 0x48, 0x27, 0x1a, + 0x0b, 0xb2, 0x31, 0x60, 0x53, 0xfa, 0x76, 0x99, + 0x19, 0x55, 0xeb, 0xd6, 0x31, 0x59, 0x43, 0x4e, + 0xce, 0xbb, 0x4e, 0x46, 0x6d, 0xae, 0x5a, 0x10, + 0x73, 0xa6, 0x72, 0x76, 0x27, 0x09, 0x7a, 0x10, + 0x49, 0xe6, 0x17, 0xd9, 0x1d, 0x36, 0x10, 0x94, + 0xfa, 0x68, 0xf0, 0xff, 0x77, 0x98, 0x71, 0x30, + 0x30, 0x5b, 0xea, 0xba, 0x2e, 0xda, 0x04, 0xdf, + 0x99, 0x7b, 0x71, 0x4d, 0x6c, 0x6f, 0x2c, 0x29, + 0xa6, 0xad, 0x5c, 0xb4, 0x02, 0x2b, 0x02, 0x70, + 0x9b }, + .aad_length = 12, + .aad = { 0xf3, 0x33, 0x88, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x4e, 0x91 }, + .digest_length = CHACHA20_POLY1305_CHECK_LEN, + .digest = { 0xee, 0xad, 0x9d, 0x67, 0x89, 0x0c, 0xbb, 0x22, + 0x39, 0x23, 0x36, 0xfe, 0xa1, 0x85, 0x1f, 0x38 } + }, +}; + static crypto_test_reference_t hmac_md5_reference[] = { { .auth_key_length = HMAC_MD5_KEY_LEN, diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 8933017b..860840cf 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -9,7 +9,7 @@ /* Maximum */ #define MAX_KEY_LEN 64 #define MAX_IV_LEN 16 -#define MAX_DATA_LEN 128 +#define MAX_DATA_LEN 270 #define MAX_AAD_LEN 12 #define MAX_DIGEST_LEN 64 @@ -55,4 +55,9 @@ #define HMAC_SHA512_256_CHECK_LEN 32 #define HMAC_SHA512_CHECK_LEN 64 +/* ChaCha20-Poly1305 */ +#define CHACHA20_POLY1305_KEY_LEN 32 +#define CHACHA20_POLY1305_IV_LEN 12 +#define CHACHA20_POLY1305_CHECK_LEN 16 + #endif commit 9df37f444fa645e1caca15024c158d19785e0abe Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 02:37:10 2018 +0300 validation: crypto: use single definitions for AES key lengths Merge defines for AES-CBC/CTR/GCM keys. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index e05ba835..a194c24d 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -72,7 +72,7 @@ static crypto_test_reference_t tdes_cbc_reference[] = { static crypto_test_reference_t aes_cbc_reference[] = { { - .cipher_key_length = AES128_CBC_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x06, 0xa9, 0x21, 0x40, 0x36, 0xb8, 0xa1, 0x5b, 0x51, 0x2e, 0x03, 0xd5, 0x34, 0x12, 0x00, 0x06}, .cipher_iv_length = AES_CBC_IV_LEN, @@ -84,7 +84,7 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x27, 0x08, 0x94, 0x2d, 0xbe, 0x77, 0x18, 0x1a } }, { - .cipher_key_length = AES128_CBC_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0xc2, 0x86, 0x69, 0x6d, 0x88, 0x7c, 0x9a, 0xa0, 0x61, 0x1b, 0xbb, 0x3e, 0x20, 0x25, 0xa4, 0x5a}, .cipher_iv_length = AES_CBC_IV_LEN, @@ -101,7 +101,7 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x1b, 0x82, 0x66, 0xbe, 0xa6, 0xd6, 0x1a, 0xb1 } }, { - .cipher_key_length = AES128_CBC_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x6c, 0x3e, 0xa0, 0x47, 0x76, 0x30, 0xce, 0x21, 0xa2, 0xce, 0x33, 0x4a, 0xa7, 0x46, 0xc2, 0xcd}, .cipher_iv_length = AES_CBC_IV_LEN, @@ -117,7 +117,7 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x85, 0x79, 0x69, 0x5d, 0x83, 0xba, 0x26, 0x84 } }, { - .cipher_key_length = AES128_CBC_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x56, 0xe4, 0x7a, 0x38, 0xc5, 0x59, 0x89, 0x74, 0xbc, 0x46, 0x90, 0x3d, 0xba, 0x29, 0x03, 0x49}, .cipher_iv_length = AES_CBC_IV_LEN, @@ -142,7 +142,7 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x49, 0xa5, 0x3e, 0x87, 0xf4, 0xc3, 0xda, 0x55 } }, { - .cipher_key_length = AES192_CBC_KEY_LEN, + .cipher_key_length = AES192_KEY_LEN, .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, @@ -160,7 +160,7 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x53, 0x1c, 0xc6, 0x98, 0x85, 0xc3, 0x00, 0xe6}, }, { - .cipher_key_length = AES256_CBC_KEY_LEN, + .cipher_key_length = AES256_KEY_LEN, .cipher_key = { 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, @@ -186,7 +186,7 @@ static crypto_test_reference_t aes_cbc_reference[] = { static crypto_test_reference_t aes_ctr_reference[] = { { - .cipher_key_length = AES128_CTR_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, .cipher_iv_length = AES_CTR_IV_LEN, @@ -211,7 +211,7 @@ static crypto_test_reference_t aes_ctr_reference[] = { 0x79, 0x21, 0x70, 0xa0, 0xf3, 0x00, 0x9c, 0xee } }, { - .cipher_key_length = AES192_CTR_KEY_LEN, + .cipher_key_length = AES192_KEY_LEN, .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, @@ -237,7 +237,7 @@ static crypto_test_reference_t aes_ctr_reference[] = { 0x5a, 0x97, 0xda, 0xec, 0x58, 0xc6, 0xb0, 0x50 } }, { - .cipher_key_length = AES256_CTR_KEY_LEN, + .cipher_key_length = AES256_KEY_LEN, .cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, @@ -270,7 +270,7 @@ static crypto_test_reference_t aes_ctr_reference[] = { */ static crypto_test_reference_t aes_gcm_reference[] = { { - .cipher_key_length = AES128_GCM_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, .cipher_iv_length = AES_GCM_IV_LEN, @@ -303,7 +303,7 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0x2f, 0xd0, 0x47, 0x96, 0x56, 0x2d, 0xfd, 0xb4 } }, { - .cipher_key_length = AES128_GCM_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08}, .cipher_iv_length = AES_GCM_IV_LEN, @@ -333,7 +333,7 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0xc3, 0x09, 0xe9, 0xd8, 0x5a, 0x41, 0xad, 0x4a } }, { - .cipher_key_length = AES128_GCM_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, .cipher_iv_length = AES_GCM_IV_LEN, @@ -363,7 +363,7 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0x8a, 0xd2, 0xb6, 0x9e, 0x47, 0x99, 0xc7, 0x1d } }, { - .cipher_key_length = AES128_GCM_KEY_LEN, + .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x3d, 0xe0, 0x98, 0x74, 0xb3, 0x88, 0xe6, 0x49, 0x19, 0x88, 0xd0, 0xc3, 0x60, 0x7e, 0xae, 0x1f}, .cipher_iv_length = AES_GCM_IV_LEN, @@ -386,7 +386,7 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0x95, 0xf1, 0x12, 0xe4, 0xe7, 0xd0, 0x5d, 0x35 } }, { - .cipher_key_length = AES192_GCM_KEY_LEN, + .cipher_key_length = AES192_KEY_LEN, .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, @@ -411,7 +411,7 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0x18, 0x02, 0x7b, 0x5b, 0x4c, 0xd7, 0xa6, 0x36 } }, { - .cipher_key_length = AES256_GCM_KEY_LEN, + .cipher_key_length = AES256_KEY_LEN, .cipher_key = { 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, @@ -444,7 +444,7 @@ static crypto_test_reference_t aes_gcm_reference[] = { static crypto_test_reference_t aes_gmac_reference[] = { { - .auth_key_length = AES128_GCM_KEY_LEN, + .auth_key_length = AES128_KEY_LEN, .auth_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, .cipher_iv_length = AES_GCM_IV_LEN, diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 2551b054..8933017b 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -17,43 +17,24 @@ #define TDES_CBC_KEY_LEN 24 #define TDES_CBC_IV_LEN 8 -/* AES-CBC common */ -#define AES_CBC_IV_LEN 16 - -/* AES128-CBC */ -#define AES128_CBC_KEY_LEN 16 +/* AES common */ -/* AES192-CBC */ -#define AES192_CBC_KEY_LEN 24 +#define AES128_KEY_LEN 16 -/* AES256-CBC */ -#define AES256_CBC_KEY_LEN 32 +#define AES192_KEY_LEN 24 -/* AES-CBC common */ -#define AES_CTR_IV_LEN 16 +#define AES256_KEY_LEN 32 -/* AES128-CTR */ -#define AES128_CTR_KEY_LEN 16 - -/* AES192-CTR */ -#define AES192_CTR_KEY_LEN 24 +/* AES-CBC */ +#define AES_CBC_IV_LEN 16 -/* AES256-CTR */ -#define AES256_CTR_KEY_LEN 32 +/* AES-CTR */ +#define AES_CTR_IV_LEN 16 -/* AES-GCM common */ +/* AES-GCM */ #define AES_GCM_IV_LEN 12 #define AES_GCM_DIGEST_LEN 16 -/* AES128-GCM */ -#define AES128_GCM_KEY_LEN 16 - -/* AES192-GCM */ -#define AES192_GCM_KEY_LEN 24 - -/* AES256-GCM */ -#define AES256_GCM_KEY_LEN 32 - /* HMAC-MD5 */ #define HMAC_MD5_KEY_LEN 16 #define HMAC_MD5_96_CHECK_LEN 12 commit da58e40721c2d6155c56fcd9f12145f3f956561c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 04:27:52 2018 +0300 validation: crypto: drop obsolete GMAC-related hack Checking that cipher is not NULL was required because GMAC used NULL cipher to specify it's IV. Now it is obosolete, as auths has their own IV. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 88218f8f..1b6cd660 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -561,9 +561,6 @@ static void check_alg(odp_crypto_op_t op, for (i = 0; i < cipher_num; i++) { cipher_ok |= cipher_tested[i]; if (!cipher_tested[i]) { - /* GMAC-related hacks */ - if (cipher_alg == ODP_CIPHER_ALG_NULL) - continue; printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), commit 3f68b9dc79a16816f35bde77d7bf95685d9bc5db Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 08:02:26 2018 +0300 api: crypto: add ChaCha20-Poly1305 support ChaCha20-Poly1305 is a promising AEAD algorithm. Add decarations to support it. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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 421080c2..b7ab5362 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -101,6 +101,15 @@ typedef enum { */ ODP_CIPHER_ALG_AES_CCM, + /** ChaCha20-Poly1305 + * + * ChaCha20 with Poly1305 provide both authentication and ciphering of + * data (authenticated encryption) in the same operation. Hence this + * algorithm must be paired always with ODP_AUTH_ALG_CHACHA20_POLY1305 + * authentication. + */ + ODP_CIPHER_ALG_CHACHA20_POLY1305, + /** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */ ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC), @@ -183,6 +192,15 @@ typedef enum { */ ODP_AUTH_ALG_AES_CMAC, + /** ChaCha20-Poly1305 AEAD + * + * ChaCha20 with Poly1305 provide both authentication and ciphering of + * data (authenticated encryption) in the same operation. Hence this + * algorithm must be paired always with + * ODP_CIPHER_ALG_CHACHA20_POLY1305 cipher. + */ + ODP_AUTH_ALG_CHACHA20_POLY1305, + /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */ ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96), @@ -221,6 +239,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_AES_CCM */ uint32_t aes_ccm : 1; + /** ODP_CIPHER_ALG_CHACHA20_POLY1305 */ + uint32_t chacha20_poly1305 : 1; + /** @deprecated Use aes_cbc instead */ uint32_t ODP_DEPRECATE(aes128_cbc) : 1; @@ -269,6 +290,9 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_AES_CMAC*/ uint32_t aes_cmac : 1; + /** ODP_AUTH_ALG_CHACHA20_POLY1305 */ + uint32_t chacha20_poly1305 : 1; + /** @deprecated Use md5_hmac instead */ uint32_t ODP_DEPRECATE(md5_96) : 1; commit 492fa2bf50272e473f7387756bc98e46ef78c900 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 27 03:57:16 2018 +0300 api: crypto: add enumeration for AES-CMAC Add enumeration for AES CMAC authentication algorithm. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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 b8c7b9d8..421080c2 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -175,6 +175,14 @@ typedef enum { */ ODP_AUTH_ALG_AES_CCM, + /** AES-CMAC + * + * AES Cipher-based Message Authentication Code (CMAC) algorithm. CMAC + * is a keyed hash function that is based on a symmetric key block + * cipher, such as the AES. + */ + ODP_AUTH_ALG_AES_CMAC, + /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */ ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96), @@ -258,6 +266,9 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_AES_CCM */ uint32_t aes_ccm : 1; + /** ODP_AUTH_ALG_AES_CMAC*/ + uint32_t aes_cmac : 1; + /** @deprecated Use md5_hmac instead */ uint32_t ODP_DEPRECATE(md5_96) : 1; commit 4e1e04346efd3d2ab53f492f297a7dda588e894f Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jan 25 10:43:30 2018 +0200 api: crypto: add enumeration for AES-CCM Added enumerations for AES CCM authentication / encryption algorithm. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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 e4b0e8ce..b8c7b9d8 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -92,6 +92,15 @@ typedef enum { */ ODP_CIPHER_ALG_AES_GCM, + /** AES-CCM + * + * AES in Counter with CBC-MAC (CCM) mode algorithm. CCM provides both + * authentication and ciphering of data (authenticated encryption) + * in the same operation. Hence this algorithm must be paired always + * with ODP_AUTH_ALG_AES_CCM authentication. + */ + ODP_CIPHER_ALG_AES_CCM, + /** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */ ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC), @@ -157,6 +166,15 @@ typedef enum { */ ODP_AUTH_ALG_AES_GMAC, + /** AES-CCM + * + * AES in Counter with CBC-MAC (CCM) mode algorithm. CCM provides both + * authentication and ciphering of data (authenticated encryption) + * in the same operation. Hence this algorithm must be paired always + * with ODP_CIPHER_ALG_AES_CCM cipher. + */ + ODP_AUTH_ALG_AES_CCM, + /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */ ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96), @@ -192,6 +210,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_AES_GCM */ uint32_t aes_gcm : 1; + /** ODP_CIPHER_ALG_AES_CCM */ + uint32_t aes_ccm : 1; + /** @deprecated Use aes_cbc instead */ uint32_t ODP_DEPRECATE(aes128_cbc) : 1; @@ -234,6 +255,9 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_AES_GMAC*/ uint32_t aes_gmac : 1; + /** ODP_AUTH_ALG_AES_CCM */ + uint32_t aes_ccm : 1; + /** @deprecated Use md5_hmac instead */ uint32_t ODP_DEPRECATE(md5_96) : 1; commit 1a2b794b4356acea912fddb245186a18f07830d1 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jan 25 10:27:17 2018 +0200 api: crypto: clarify special nature of gcm and gmac Reword specification text to be more clear about special nature of GCM (authenticate encryption in general) and GMAC (cannot be paired with cipher) algorithms. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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 77ea317b..e4b0e8ce 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -83,9 +83,12 @@ typedef enum { /** AES with counter mode */ ODP_CIPHER_ALG_AES_CTR, - /** AES in Galois/Counter Mode + /** AES-GCM * - * @note Must be paired with cipher ODP_AUTH_ALG_AES_GCM + * AES in Galois/Counter Mode (GCM) algorithm. GCM provides both + * authentication and ciphering of data (authenticated encryption) + * in the same operation. Hence this algorithm must be paired always + * with ODP_AUTH_ALG_AES_GCM authentication. */ ODP_CIPHER_ALG_AES_GCM, @@ -128,23 +131,29 @@ typedef enum { */ ODP_AUTH_ALG_SHA512_HMAC, - /** AES in Galois/Counter Mode + /** AES-GCM * - * @note Must be paired with cipher ODP_CIPHER_ALG_AES_GCM + * AES in Galois/Counter Mode (GCM) algorithm. GCM provides both + * authentication and ciphering of data (authenticated encryption) + * in the same operation. Hence this algorithm must be paired always + * with ODP_CIPHER_ALG_AES_GCM cipher. */ ODP_AUTH_ALG_AES_GCM, - /** AES in Galois/Counter MAC Mode + /** AES-GMAC * - * NIST and RFC specifications of GCM/GMAC refer to all data to be - * authenticated as AAD. In constrast to that, ODP API specifies the - * bulk of authenticated data to be located in packet payload for all - * authentication algorithms, including GMAC. Thus for GMAC application - * should also pass all data to be authenticated as packet data. AAD is - * not used for GMAC. GMAC IV should be passed via session IV or - * per-packet IV override. + * AES Galois Message Authentication Code (GMAC) algorithm. AES-GMAC + * is based on AES-GCM operation, but provides authentication only. + * Hence this algorithm can be paired only with ODP_CIPHER_ALG_NULL + * cipher. * - * @note Must be paired with cipher ODP_CIPHER_ALG_NULL + * NIST and RFC specifications of GMAC refer to all data to be + * authenticated as AAD. In constrast to that, ODP API specifies + * the bulk of authenticated data to be located in packet payload for + * all authentication algorithms. Thus GMAC operation authenticates + * only packet payload and AAD is not used. GMAC needs + * an initialization vector, which can be passed via session (auth_iv) + * or packet (auth_iv_ptr) level parameters. */ ODP_AUTH_ALG_AES_GMAC, commit 95e2a19bb8c3d8f16dcaf70240b83cc782b3f655 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Fri Jan 19 09:23:30 2018 -0600 linux-generic: pktio: drop support for indefinite waits in recv_tmo Drop support for the deprecated ODP_PKTIN_WAIT option on odp_pktin_recv_tmo() and odp_pktin_recv_mq_tmo() Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/packet_io.h b/include/odp/api/abi-default/packet_io.h index 16ce54b8..a97b574d 100644 --- a/include/odp/api/abi-default/packet_io.h +++ b/include/odp/api/abi-default/packet_io.h @@ -46,7 +46,6 @@ typedef struct odp_pktout_queue_t { #define ODP_PKTIO_MACADDR_MAXSIZE 16 #define ODP_PKTIN_NO_WAIT 0 -#define ODP_PKTIN_WAIT UINT64_MAX /** * @} diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index c655947d..ae8e390b 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -41,6 +41,9 @@ * Must be power of two. */ #define SLEEP_CHECK 32 +/* Max wait time supported to avoid potential overflow */ +#define MAX_WAIT_TIME (UINT64_MAX / 1024) + static pktio_table_t *pktio_tbl; /* pktio pointer entries ( for inlines) */ @@ -1690,33 +1693,31 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, while (1) { ret = entry->s.ops->recv(entry, queue.index, packets, num); - if (ret != 0) + if (ret != 0 || wait == 0) return ret; - if (wait == 0) - return 0; - - if (wait != ODP_PKTIN_WAIT) { - /* Avoid unnecessary system calls. Record the start time - * only when needed and after the first call to recv. */ - if (odp_unlikely(!started)) { - odp_time_t t; - - t = odp_time_local_from_ns(wait * 1000); - started = 1; - t1 = odp_time_sum(odp_time_local(), t); - } + /* Avoid unnecessary system calls. Record the start time + * only when needed and after the first call to recv. */ + if (odp_unlikely(!started)) { + odp_time_t t; + + /* Avoid overflow issues for large wait times */ + if (wait > MAX_WAIT_TIME) + wait = MAX_WAIT_TIME; + t = odp_time_local_from_ns(wait * 1000); + started = 1; + t1 = odp_time_sum(odp_time_local(), t); + } - /* Check every SLEEP_CHECK rounds if total wait time - * has been exceeded. */ - if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { - t2 = odp_time_local(); + /* Check every SLEEP_CHECK rounds if total wait time + * has been exceeded. */ + if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { + t2 = odp_time_local(); - if (odp_time_cmp(t2, t1) > 0) - return 0; - } - wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; + if (odp_time_cmp(t2, t1) > 0) + return 0; } + wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; nanosleep(&ts, NULL); } @@ -1770,25 +1771,26 @@ int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, if (wait == 0) return 0; - if (wait != ODP_PKTIN_WAIT) { - if (odp_unlikely(!started)) { - odp_time_t t; + if (odp_unlikely(!started)) { + odp_time_t t; - t = odp_time_local_from_ns(wait * 1000); - started = 1; - t1 = odp_time_sum(odp_time_local(), t); - } + /* Avoid overflow issues for large wait times */ + if (wait > MAX_WAIT_TIME) + wait = MAX_WAIT_TIME; + t = odp_time_local_from_ns(wait * 1000); + started = 1; + t1 = odp_time_sum(odp_time_local(), t); + } - /* Check every SLEEP_CHECK rounds if total wait time - * has been exceeded. */ - if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { - t2 = odp_time_local(); + /* Check every SLEEP_CHECK rounds if total wait time + * has been exceeded. */ + if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { + t2 = odp_time_local(); - if (odp_time_cmp(t2, t1) > 0) - return 0; - } - wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; + if (odp_time_cmp(t2, t1) > 0) + return 0; } + wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; nanosleep(&ts, NULL); } diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index f54e0908..4276d4bc 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -834,8 +834,7 @@ static int netmap_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = netmap_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return netmap_recv(pktio_entry, index, pkt_table, num); @@ -872,8 +871,7 @@ static int netmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c index c49d515c..49500cab 100644 --- a/platform/linux-generic/pktio/null.c +++ b/platform/linux-generic/pktio/null.c @@ -51,8 +51,7 @@ static int null_recv_tmo(pktio_entry_t *pktio_entry ODP_UNUSED, timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); FD_ZERO(&readfds); - select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout); + select(maxfd + 1, &readfds, NULL, NULL, &timeout); return 0; } @@ -72,8 +71,7 @@ static int null_recv_mq_tmo(pktio_entry_t *pktio_entry[] ODP_UNUSED, FD_ZERO(&readfds); - select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout); + select(maxfd + 1, &readfds, NULL, NULL, &timeout); return 0; } diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index f6fb4a73..c7a1c3ab 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -107,8 +107,7 @@ static int sock_recv_mq_tmo_select(pktio_entry_t * const *entry, timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index b3d3f46e..f6f3288c 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -726,8 +726,7 @@ static int sock_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return sock_mmsg_recv(pktio_entry, index, pkt_table, num); @@ -764,8 +763,7 @@ static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], maxfd = maxfd2; } - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 013b7607..fd823205 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -693,8 +693,7 @@ static int sock_mmap_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_mmap_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return sock_mmap_recv(pktio_entry, index, pkt_table, num); @@ -731,8 +730,7 @@ static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { ----------------------------------------------------------------------- Summary of changes: include/odp/api/abi-default/packet_io.h | 1 - include/odp/api/spec/crypto.h | 94 +++++- platform/linux-generic/odp_packet_io.c | 76 ++--- platform/linux-generic/pktio/netmap.c | 6 +- platform/linux-generic/pktio/null.c | 6 +- platform/linux-generic/pktio/pktio_common.c | 3 +- platform/linux-generic/pktio/socket.c | 6 +- platform/linux-generic/pktio/socket_mmap.c | 6 +- test/validation/api/crypto/odp_crypto_test_inp.c | 189 ++++++++++- test/validation/api/crypto/test_vectors.h | 395 ++++++++++++++++++++++- test/validation/api/crypto/test_vectors_len.h | 44 +-- 11 files changed, 709 insertions(+), 117 deletions(-) hooks/post-receive --

8 years

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-256-ge85a5453

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 via e85a5453f2f85e4d5794d3ea2fc9e7b8433485a9 (commit) via 1f99d8573bff477f7190ed167947ca654921ac7a (commit) via b6c25e4c84437304ffc0376f1150682fd19b5c21 (commit) via e1dd174435abfbc8886fcc48e758c080cbc6975b (commit) via 5c47f45bc42f062e94d4e8d8c4e851eb104659a0 (commit) via dc8da17b1a507bc4e35d5e5b094c565a7dfbd211 (commit) via 225de4341d55fa2ad7783e16fd406d47f5a1119e (commit) from 3f4dd655d9e6f097d1c809f7f3ab6f32b345c038 (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 e85a5453f2f85e4d5794d3ea2fc9e7b8433485a9 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Fri Jan 19 09:24:32 2018 -0600 api: pktio: drop support for indefinite waits on recv_tmo calls The ODP_PKTIN_WAIT option on odp_pktin_recv_tmo() and odp_pktin_recv_mq_tmo() is deprecated and removed. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index ad9b29fd..a55c2678 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -72,11 +72,6 @@ extern "C" { * Do not wait on packet input */ -/** - * @def ODP_PKTIN_WAIT - * Wait infinitely on packet input - */ - /** * Packet input mode */ @@ -884,7 +879,6 @@ int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num); * @param num Maximum number of packets to receive * @param wait Wait time specified as as follows: * * ODP_PKTIN_NO_WAIT: Do not wait - * * ODP_PKTIN_WAIT: Wait infinitely * * Other values specify the minimum time to wait. * Use odp_pktin_wait_time() to convert nanoseconds * to a valid parameter value. Wait time may be @@ -923,7 +917,6 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], * @param num Maximum number of packets to receive * @param wait Wait time specified as as follows: * * ODP_PKTIN_NO_WAIT: Do not wait - * * ODP_PKTIN_WAIT: Wait infinitely * * Other values specify the minimum time to wait. * Use odp_pktin_wait_time() to convert nanoseconds * to a valid parameter value. Wait time may be commit 1f99d8573bff477f7190ed167947ca654921ac7a Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Fri Jan 19 09:21:22 2018 -0600 test: validation: drop use of indefinite wait in pktio test Drop use of deprecated ODP_PKTIN_WAIT timeout option in pktio tests. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 884292fa..ecab4448 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -553,10 +553,8 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[], CU_ASSERT(from_val < (unsigned)num_q); } while (num_rx < num); - if (tmo == ODP_PKTIN_WAIT) - CU_ASSERT(num_rx == num); if (num_rx < num) - CU_ASSERT(odp_time_to_ns(odp_time_diff(ts2, ts1)) >= ns); + CU_ASSERT(odp_time_diff_ns(ts2, ts1) >= ns); return num_rx; } @@ -980,7 +978,7 @@ static void test_recv_tmo(recv_tmo_mode_e mode) CU_ASSERT_FATAL(ret == test_pkt_count); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode, - ODP_PKTIN_WAIT, 0); + odp_pktin_wait_time(UINT64_MAX), 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode, commit b6c25e4c84437304ffc0376f1150682fd19b5c21 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 17:06:38 2018 +0200 validation: packet: test user pointer init to NULL Test if user pointer is NULL after alloc and reset. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index c8ef92df..3e8e00d9 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -322,6 +322,9 @@ static void packet_test_alloc_free(void) CU_ASSERT(odp_packet_to_u64(packet) != odp_packet_to_u64(ODP_PACKET_INVALID)); + /* User pointer should be NULL after alloc */ + CU_ASSERT(odp_packet_user_ptr(packet) == NULL); + /* Pool should have only one packet */ CU_ASSERT_FATAL(odp_packet_alloc(pool, packet_len) == ODP_PACKET_INVALID); @@ -401,6 +404,9 @@ static void packet_test_alloc_free_multi(void) CU_ASSERT(subtype == ODP_EVENT_PACKET_BASIC); CU_ASSERT(odp_packet_to_u64(packet[i]) != odp_packet_to_u64(ODP_PACKET_INVALID)); + + /* User pointer should be NULL after alloc */ + CU_ASSERT(odp_packet_user_ptr(packet[i]) == NULL); } /* Pools should have no more packets */ @@ -680,7 +686,15 @@ static void packet_test_context(void) CU_ASSERT(memcmp(udat, &test_packet_udata, sizeof(struct udata_struct)) == 0); + odp_packet_user_ptr_set(pkt, NULL); + CU_ASSERT(odp_packet_user_ptr(pkt) == NULL); + odp_packet_user_ptr_set(pkt, (void *)0xdead); + CU_ASSERT(odp_packet_user_ptr(pkt) == (void *)0xdead); + odp_packet_reset(pkt, packet_len); + + /* User pointer should be NULL after reset */ + CU_ASSERT(odp_packet_user_ptr(pkt) == NULL); } static void packet_test_layer_offsets(void) commit e1dd174435abfbc8886fcc48e758c080cbc6975b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 16:10:04 2018 +0200 linux-gen: packet: initialize user ptr to NULL Use a flag to record if user pointer has been set. This avoids resetting the pointer in every alloc. Signed-off-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index e0ef31a0..2e8efecb 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -44,6 +44,7 @@ typedef struct _odp_packet_inline_offset_t { uint16_t flow_hash; uint16_t timestamp; uint16_t input_flags; + uint16_t flags; } _odp_packet_inline_offset_t; @@ -108,7 +109,12 @@ typedef union { uint32_t all_flags; struct { - uint32_t reserved1: 12; + uint32_t reserved1: 11; + + /* + * Init flags + */ + uint32_t user_ptr_set: 1; /* User has set a non-NULL value */ /* * Packet output flags @@ -134,8 +140,8 @@ typedef union { /* Flag groups */ struct { - uint32_t reserved2: 12; - uint32_t other: 12; /* All other flags */ + uint32_t reserved2: 11; + uint32_t other: 13; /* All other flags */ uint32_t error: 8; /* All error flags */ } all; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 276c69df..b6b49336 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -104,6 +104,13 @@ static inline int _odp_packet_num_segs(odp_packet_t pkt) static inline void *_odp_packet_user_ptr(odp_packet_t pkt) { + _odp_packet_flags_t flags; + + flags.all_flags = _odp_pkt_get(pkt, uint32_t, flags); + + if (flags.user_ptr_set == 0) + return NULL; + return _odp_pkt_get(pkt, void *, user_ptr); } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 2642bac6..22df7d67 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -45,7 +45,8 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .l4_offset = offsetof(odp_packet_hdr_t, p.l4_offset), .flow_hash = offsetof(odp_packet_hdr_t, flow_hash), .timestamp = offsetof(odp_packet_hdr_t, timestamp), - .input_flags = offsetof(odp_packet_hdr_t, p.input_flags) + .input_flags = offsetof(odp_packet_hdr_t, p.input_flags), + .flags = offsetof(odp_packet_hdr_t, p.flags) }; @@ -1265,7 +1266,15 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ptr) { - packet_hdr(pkt)->buf_hdr.user_ptr = ptr; + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + if (odp_unlikely(ptr == NULL)) { + pkt_hdr->p.flags.user_ptr_set = 0; + return; + } + + pkt_hdr->buf_hdr.user_ptr = ptr; + pkt_hdr->p.flags.user_ptr_set = 1; } int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) commit 5c47f45bc42f062e94d4e8d8c4e851eb104659a0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 12:53:11 2018 +0200 api: packet: initialize user ptr to NULL Require that implementation initializes the pointer value to NULL. Application can use the pointer more robustly when it can tell if the pointer has been set previously or not. Signed-off-by: Petri Savolainen <petri.savolainen(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/packet.h b/include/odp/api/spec/packet.h index a1111325..3222ff5c 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1341,7 +1341,10 @@ int odp_packet_input_index(odp_packet_t pkt); /** * User context pointer * - * Return previously stored user context pointer. + * Return previously stored user context pointer. If not otherwise documented, + * the pointer value is maintained over packet manipulating operations. + * Implementation initializes the pointer value to NULL during new packet + * creation (e.g. alloc and packet input) and reset. * * @param pkt Packet handle * @@ -1357,10 +1360,10 @@ void *odp_packet_user_ptr(odp_packet_t pkt); * value of type intptr_t. ODP may use the pointer for data prefetching, but * must ignore any invalid addresses. * - * @param pkt Packet handle - * @param ctx User context pointer + * @param pkt Packet handle + * @param user_ptr User context pointer */ -void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx); +void odp_packet_user_ptr_set(odp_packet_t pkt, const void *user_ptr); /** * User area address commit dc8da17b1a507bc4e35d5e5b094c565a7dfbd211 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jan 15 13:33:58 2018 +0200 linux-gen: packet: clean up error and output flags Removed three unused error flags. Combined error and output flags into a single uint32_t. This saves four bytes and init of those bytes. There's still room for 12 flags in this word. Later on, these and input flags could be also combined. Moved the combined flag structure to packet types header, so that it can be accessed from inlined packet code. Signed-off-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 7331c1c6..e0ef31a0 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -100,6 +100,47 @@ typedef union { } _odp_packet_input_flags_t; +/* + * Additional packet flags + */ +typedef union { + /* All flags */ + uint32_t all_flags; + + struct { + uint32_t reserved1: 12; + + /* + * Packet output flags + */ + uint32_t l3_chksum_set: 1; /* L3 chksum bit is valid */ + uint32_t l3_chksum: 1; /* L3 chksum override */ + uint32_t l4_chksum_set: 1; /* L4 chksum bit is valid */ + uint32_t l4_chksum: 1; /* L4 chksum override */ + uint32_t shaper_len_adj: 8; /* Adjustment for traffic mgr */ + + /* + * Error flags + */ + uint32_t snap_len_err: 1; /* Snap length error */ + uint32_t ip_err: 1; /* IP error */ + uint32_t l3_chksum_err: 1; /* L3 checksum error */ + uint32_t tcp_err: 1; /* TCP error */ + uint32_t udp_err: 1; /* UDP error */ + uint32_t l4_chksum_err: 1; /* L4 checksum error */ + uint32_t ipsec_err: 1; /* IPsec error */ + uint32_t crypto_err: 1; /* Crypto packet operation error */ + }; + + /* Flag groups */ + struct { + uint32_t reserved2: 12; + uint32_t other: 12; /* All other flags */ + uint32_t error: 8; /* All error flags */ + } all; + +} _odp_packet_flags_t; + /** @endcond */ #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 9db53e7c..75b4ce9e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -33,65 +33,21 @@ extern "C" { /** Minimum segment length expected by packet_parse_common() */ #define PACKET_PARSE_SEG_LEN 96 - ODP_STATIC_ASSERT(sizeof(_odp_packet_input_flags_t) == sizeof(uint64_t), "INPUT_FLAGS_SIZE_ERROR"); -/** - * Packet error flags - */ -typedef union { - /* All error flags */ - uint32_t all; - - struct { - /* Bitfield flags for each detected error */ - uint32_t app_error:1; /**< Error bit for application use */ - uint32_t frame_len:1; /**< Frame length error */ - uint32_t snap_len:1; /**< Snap length error */ - uint32_t l2_chksum:1; /**< L2 checksum error, checks TBD */ - uint32_t ip_err:1; /**< IP error, checks TBD */ - uint32_t l3_chksum:1; /**< L3 checksum error */ - uint32_t tcp_err:1; /**< TCP error, checks TBD */ - uint32_t udp_err:1; /**< UDP error, checks TBD */ - uint32_t ipsec_err:1; /**< IPsec error */ - uint32_t crypto_err:1; /**< Crypto packet operation error */ - uint32_t l4_chksum:1; /**< L4 checksum error */ - }; -} error_flags_t; - -ODP_STATIC_ASSERT(sizeof(error_flags_t) == sizeof(uint32_t), - "ERROR_FLAGS_SIZE_ERROR"); - -/** - * Packet output flags - */ -typedef union { - /* All output flags */ - uint32_t all; - - struct { - /** adjustment for traffic mgr */ - uint32_t shaper_len_adj:8; - - /* Bitfield flags for each output option */ - uint32_t l3_chksum_set:1; /**< L3 chksum bit is valid */ - uint32_t l3_chksum:1; /**< L3 chksum override */ - uint32_t l4_chksum_set:1; /**< L3 chksum bit is valid */ - uint32_t l4_chksum:1; /**< L4 chksum override */ - }; -} output_flags_t; - -ODP_STATIC_ASSERT(sizeof(output_flags_t) == sizeof(uint32_t), - "OUTPUT_FLAGS_SIZE_ERROR"); +ODP_STATIC_ASSERT(sizeof(_odp_packet_flags_t) == sizeof(uint32_t), + "PACKET_FLAGS_SIZE_ERROR"); /** * Packet parser metadata */ typedef struct { + /* Packet input flags */ _odp_packet_input_flags_t input_flags; - error_flags_t error_flags; - output_flags_t output_flags; + + /* Other flags */ + _odp_packet_flags_t flags; /* offset to L2 hdr, e.g. Eth */ uint16_t l2_offset; @@ -232,8 +188,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) } pkt_hdr->p.input_flags.all = 0; - pkt_hdr->p.output_flags.all = 0; - pkt_hdr->p.error_flags.all = 0; + pkt_hdr->p.flags.all_flags = 0; pkt_hdr->p.l2_offset = 0; pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 7c77885f..14720924 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -947,7 +947,7 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry, default_cos = cls->default_cos; /* Return error cos for error packet */ - if (pkt_hdr->p.error_flags.all) + if (pkt_hdr->p.flags.all.error) return cls->error_cos; /* Calls all the PMRs attached at the PKTIO level*/ for (i = 0; i < odp_atomic_load_u32(&default_cos->s.num_rule); i++) { diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 7ad3d5c7..4b2b884a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1533,7 +1533,7 @@ int odp_crypto_int(odp_packet_t pkt_in, (rc_auth == ODP_CRYPTO_ALG_ERR_NONE); pkt_hdr = packet_hdr(out_pkt); - pkt_hdr->p.error_flags.crypto_err = !op_result->ok; + pkt_hdr->p.flags.crypto_err = !op_result->ok; /* Synchronous, simply return results */ *pkt_out = out_pkt; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index b28547a2..8d897771 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -831,7 +831,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, err: pkt_hdr = packet_hdr(pkt); - pkt_hdr->p.error_flags.ipsec_err = 1; + pkt_hdr->p.flags.ipsec_err = 1; *pkt_out = pkt; @@ -1408,7 +1408,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, err: pkt_hdr = packet_hdr(pkt); - pkt_hdr->p.error_flags.ipsec_err = 1; + pkt_hdr->p.flags.ipsec_err = 1; *pkt_out = pkt; return ipsec_sa; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 37449845..2642bac6 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -383,9 +383,8 @@ int _odp_packet_copy_to_mem_seg(odp_packet_t pkt, uint32_t offset, void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) { /* Reset parser metadata before new parse */ - pkt_hdr->p.error_flags.all = 0; pkt_hdr->p.input_flags.all = 0; - pkt_hdr->p.output_flags.all = 0; + pkt_hdr->p.flags.all.error = 0; pkt_hdr->p.l2_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; @@ -1315,16 +1314,16 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - pkt_hdr->p.output_flags.l3_chksum_set = 1; - pkt_hdr->p.output_flags.l3_chksum = insert; + pkt_hdr->p.flags.l3_chksum_set = 1; + pkt_hdr->p.flags.l3_chksum = insert; } void odp_packet_l4_chksum_insert(odp_packet_t pkt, int insert) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - pkt_hdr->p.output_flags.l4_chksum_set = 1; - pkt_hdr->p.output_flags.l4_chksum = insert; + pkt_hdr->p.flags.l4_chksum_set = 1; + pkt_hdr->p.flags.l4_chksum = insert; } odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt) @@ -1334,7 +1333,7 @@ odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt) if (!pkt_hdr->p.input_flags.l3_chksum_done) return ODP_PACKET_CHKSUM_UNKNOWN; - if (pkt_hdr->p.error_flags.l3_chksum) + if (pkt_hdr->p.flags.l3_chksum_err) return ODP_PACKET_CHKSUM_BAD; return ODP_PACKET_CHKSUM_OK; @@ -1347,7 +1346,7 @@ odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt) if (!pkt_hdr->p.input_flags.l4_chksum_done) return ODP_PACKET_CHKSUM_UNKNOWN; - if (pkt_hdr->p.error_flags.l4_chksum) + if (pkt_hdr->p.flags.l4_chksum_err) return ODP_PACKET_CHKSUM_BAD; return ODP_PACKET_CHKSUM_OK; @@ -1739,11 +1738,8 @@ void odp_packet_print(odp_packet_t pkt) len += odp_buffer_snprint(&str[len], n - len, buf); len += snprintf(&str[len], n - len, " input_flags 0x%" PRIx64 "\n", hdr->p.input_flags.all); - len += snprintf(&str[len], n - len, " error_flags 0x%" PRIx32 "\n", - hdr->p.error_flags.all); - len += snprintf(&str[len], n - len, - " output_flags 0x%" PRIx32 "\n", - hdr->p.output_flags.all); + len += snprintf(&str[len], n - len, " flags 0x%" PRIx32 "\n", + hdr->p.flags.all_flags); len += snprintf(&str[len], n - len, " l2_offset %" PRIu32 "\n", hdr->p.l2_offset); len += snprintf(&str[len], n - len, @@ -1950,7 +1946,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, if (odp_unlikely(ethtype < _ODP_ETH_LEN_MAX)) { input_flags.snap = 1; if (ethtype > frame_len - *offset) { - prs->error_flags.snap_len = 1; + prs->flags.snap_len_err = 1; ethtype = 0; goto error; } @@ -2001,7 +1997,7 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, if (odp_unlikely(ihl < _ODP_IPV4HDR_IHL_MIN || ver != 4 || (l3_len > frame_len - *offset))) { - prs->error_flags.ip_err = 1; + prs->flags.ip_err = 1; return 0; } @@ -2045,7 +2041,7 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, /* Basic sanity checks on IPv6 header */ if ((_odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || l3_len > frame_len - *offset) { - prs->error_flags.ip_err = 1; + prs->flags.ip_err = 1; return 0; } @@ -2074,7 +2070,7 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, if (*offset >= prs->l3_offset + _odp_be_to_cpu_16(ipv6->payload_len)) { - prs->error_flags.ip_err = 1; + prs->flags.ip_err = 1; return 0; } @@ -2101,7 +2097,7 @@ static inline void parse_tcp(packet_parser_t *prs, const uint8_t **parseptr) uint32_t len = tcp->hl * 4; if (odp_unlikely(tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t))) - prs->error_flags.tcp_err = 1; + prs->flags.tcp_err = 1; *parseptr += len; } @@ -2116,7 +2112,7 @@ static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr) uint16_t ipsec_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) - prs->error_flags.udp_err = 1; + prs->flags.udp_err = 1; if (odp_unlikely(ipsec_port == udp->dst_port && udplen > 4)) { uint32_t val; @@ -2142,7 +2138,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, prs->l3_offset = offset; if (odp_unlikely(layer <= ODP_PROTO_LAYER_L2)) - return prs->error_flags.all != 0; + return prs->flags.all.error != 0; /* Set l3 flag only for known ethtypes */ prs->input_flags.l3 = 1; @@ -2173,7 +2169,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, } if (layer == ODP_PROTO_LAYER_L3) - return prs->error_flags.all != 0; + return prs->flags.all.error != 0; /* Set l4 flag only for known ip_proto */ prs->input_flags.l4 = 1; @@ -2224,7 +2220,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, break; } - return prs->error_flags.all != 0; + return prs->flags.all.error != 0; } /** diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index 79472131..efd564d0 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -24,7 +24,7 @@ int odp_packet_has_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - return pkt_hdr->p.error_flags.all != 0; + return pkt_hdr->p.flags.all.error != 0; } /* Get Input Flags */ @@ -34,9 +34,7 @@ int odp_packet_has_l2_error(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); /* L2 parsing is always done by default and hence no additional check is required */ - return pkt_hdr->p.error_flags.frame_len - | pkt_hdr->p.error_flags.snap_len - | pkt_hdr->p.error_flags.l2_chksum; + return pkt_hdr->p.flags.snap_len_err; } int odp_packet_has_l3(odp_packet_t pkt) @@ -48,7 +46,7 @@ int odp_packet_has_l3_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - return pkt_hdr->p.error_flags.ip_err; + return pkt_hdr->p.flags.ip_err; } int odp_packet_has_l4(odp_packet_t pkt) @@ -60,7 +58,7 @@ int odp_packet_has_l4_error(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - return pkt_hdr->p.error_flags.tcp_err | pkt_hdr->p.error_flags.udp_err; + return pkt_hdr->p.flags.tcp_err | pkt_hdr->p.flags.udp_err; } int odp_packet_has_eth_bcast(odp_packet_t pkt) @@ -169,14 +167,14 @@ void odp_packet_drop_eligible_set(odp_packet_t pkt, odp_bool_t drop) int8_t odp_packet_shaper_len_adjust(odp_packet_t pkt) { - retflag(pkt, output_flags.shaper_len_adj); + retflag(pkt, flags.shaper_len_adj); } void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - pkt_hdr->p.output_flags.shaper_len_adj = adj; + pkt_hdr->p.flags.shaper_len_adj = adj; } /* Set Input Flags */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index a2ec0f8d..a31b0dbb 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -380,8 +380,8 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, return -1; pkt_hdr->p.input_flags.l3_chksum_done = 1; - pkt_hdr->p.error_flags.ip_err = 1; - pkt_hdr->p.error_flags.l3_chksum = 1; + pkt_hdr->p.flags.ip_err = 1; + pkt_hdr->p.flags.l3_chksum_err = 1; } } @@ -396,8 +396,8 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, return -1; pkt_hdr->p.input_flags.l4_chksum_done = 1; - pkt_hdr->p.error_flags.udp_err = 1; - pkt_hdr->p.error_flags.l4_chksum = 1; + pkt_hdr->p.flags.udp_err = 1; + pkt_hdr->p.flags.l4_chksum_err = 1; } } else if (pktin_cfg->bit.tcp_chksum && HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_TCP)) { @@ -410,8 +410,8 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg, return -1; pkt_hdr->p.input_flags.l4_chksum_done = 1; - pkt_hdr->p.error_flags.tcp_err = 1; - pkt_hdr->p.error_flags.l4_chksum = 1; + pkt_hdr->p.flags.tcp_err = 1; + pkt_hdr->p.flags.l4_chksum_err = 1; } } @@ -573,18 +573,18 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, ipv4_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.ipv4_chksum, pktout_capa->bit.ipv4_chksum, l3_proto_v4, - pkt_p->output_flags.l3_chksum_set, - pkt_p->output_flags.l3_chksum); + pkt_p->flags.l3_chksum_set, + pkt_p->flags.l3_chksum); udp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.udp_chksum, pktout_capa->bit.udp_chksum, (l4_proto == _ODP_IPPROTO_UDP), - pkt_p->output_flags.l4_chksum_set, - pkt_p->output_flags.l4_chksum); + pkt_p->flags.l4_chksum_set, + pkt_p->flags.l4_chksum); tcp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.tcp_chksum, pktout_capa->bit.tcp_chksum, (l4_proto == _ODP_IPPROTO_TCP), - pkt_p->output_flags.l4_chksum_set, - pkt_p->output_flags.l4_chksum); + pkt_p->flags.l4_chksum_set, + pkt_p->flags.l4_chksum); if (!ipv4_chksum_pkt && !udp_chksum_pkt && !tcp_chksum_pkt) return; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 6b531c08..7fc0fd61 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -156,7 +156,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, /* Try IPsec inline processing */ if (pktio_entry->s.config.inbound_ipsec && - !pkt_hdr->p.error_flags.ip_err && + !pkt_hdr->p.flags.ip_err && _odp_packet_has_ipsec(pkt)) _odp_ipsec_try_inline(&pkt); commit 225de4341d55fa2ad7783e16fd406d47f5a1119e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jan 15 13:23:21 2018 +0200 linux-gen: packet: hide internal definitions from Doxygen This internal header file is included from API files and thus Doxygen sees it. Use Doxygen tag @cond to hide implementation internal definitions. Dummy Doxygen doxumentation is not needed any more. Signed-off-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 880fd01f..7331c1c6 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -20,100 +20,88 @@ extern "C" { #include <stdint.h> -/** @internal Packet field accessor */ +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +/* Packet field accessor */ #define _odp_pkt_get(pkt, cast, field) \ (*(cast *)(uintptr_t)((uint8_t *)pkt + _odp_packet_inline.field)) -/** @internal Packet header field offsets for inline functions */ +/* Packet header field offsets for inline functions */ typedef struct _odp_packet_inline_offset_t { - /** @internal field offset */ uint16_t data; - /** @internal field offset */ uint16_t seg_len; - /** @internal field offset */ uint16_t frame_len; - /** @internal field offset */ uint16_t headroom; - /** @internal field offset */ uint16_t tailroom; - /** @internal field offset */ uint16_t pool; - /** @internal field offset */ uint16_t input; - /** @internal field offset */ uint16_t segcount; - /** @internal field offset */ uint16_t user_ptr; - /** @internal field offset */ uint16_t user_area; - /** @internal field offset */ uint16_t l2_offset; - /** @internal field offset */ uint16_t l3_offset; - /** @internal field offset */ uint16_t l4_offset; - /** @internal field offset */ uint16_t flow_hash; - /** @internal field offset */ uint16_t timestamp; - /** @internal field offset */ uint16_t input_flags; } _odp_packet_inline_offset_t; -/** @internal Packet input & protocol flags */ +/* Packet input & protocol flags */ typedef union { - /** All input flags */ + /* All input flags */ uint64_t all; - /** Individual input flags */ + /* Individual input flags */ struct { - uint64_t dst_queue:1; /**< Dst queue present */ + uint64_t dst_queue:1; /* Dst queue present */ - uint64_t flow_hash:1; /**< Flow hash present */ - uint64_t timestamp:1; /**< Timestamp present */ + uint64_t flow_hash:1; /* Flow hash present */ + uint64_t timestamp:1; /* Timestamp present */ - uint64_t l2:1; /**< known L2 protocol present */ - uint64_t l3:1; /**< known L3 protocol present */ - uint64_t l4:1; /**< known L4 protocol present */ + uint64_t l2:1; /* known L2 protocol present */ + uint64_t l3:1; /* known L3 protocol present */ + uint64_t l4:1; /* known L4 protocol present */ - uint64_t eth:1; /**< Ethernet */ - uint64_t eth_bcast:1; /**< Ethernet broadcast */ - uint64_t eth_mcast:1; /**< Ethernet multicast */ - uint64_t jumbo:1; /**< Jumbo frame */ - uint64_t vlan:1; /**< VLAN hdr found */ - uint64_t vlan_qinq:1; /**< Stacked VLAN found, QinQ */ + uint64_t eth:1; /* Ethernet */ + uint64_t eth_bcast:1; /* Ethernet broadcast */ + uint64_t eth_mcast:1; /* Ethernet multicast */ + uint64_t jumbo:1; /* Jumbo frame */ + uint64_t vlan:1; /* VLAN hdr found */ + uint64_t vlan_qinq:1; /* Stacked VLAN found, QinQ */ - uint64_t snap:1; /**< SNAP */ - uint64_t arp:1; /**< ARP */ + uint64_t snap:1; /* SNAP */ + uint64_t arp:1; /* ARP */ - uint64_t ipv4:1; /**< IPv4 */ - uint64_t ipv6:1; /**< IPv6 */ - uint64_t ip_bcast:1; /**< IP broadcast */ - uint64_t ip_mcast:1; /**< IP multicast */ - uint64_t ipfrag:1; /**< IP fragment */ - uint64_t ipopt:1; /**< IP optional headers */ + uint64_t ipv4:1; /* IPv4 */ + uint64_t ipv6:1; /* IPv6 */ + uint64_t ip_bcast:1; /* IP broadcast */ + uint64_t ip_mcast:1; /* IP multicast */ + uint64_t ipfrag:1; /* IP fragment */ + uint64_t ipopt:1; /* IP optional headers */ - uint64_t ipsec:1; /**< IPSec packet. Required by the + uint64_t ipsec:1; /* IPSec packet. Required by the odp_packet_has_ipsec_set() func. */ - uint64_t ipsec_ah:1; /**< IPSec authentication header */ - uint64_t ipsec_esp:1; /**< IPSec encapsulating security + uint64_t ipsec_ah:1; /* IPSec authentication header */ + uint64_t ipsec_esp:1; /* IPSec encapsulating security payload */ - uint64_t udp:1; /**< UDP */ - uint64_t tcp:1; /**< TCP */ - uint64_t sctp:1; /**< SCTP */ - uint64_t icmp:1; /**< ICMP */ + uint64_t udp:1; /* UDP */ + uint64_t tcp:1; /* TCP */ + uint64_t sctp:1; /* SCTP */ + uint64_t icmp:1; /* ICMP */ - uint64_t color:2; /**< Packet color for traffic mgmt */ - uint64_t nodrop:1; /**< Drop eligibility status */ + uint64_t color:2; /* Packet color for traffic mgmt */ + uint64_t nodrop:1; /* Drop eligibility status */ - uint64_t l3_chksum_done:1; /**< L3 checksum validation done */ - uint64_t l4_chksum_done:1; /**< L4 checksum validation done */ - uint64_t ipsec_udp:1; /**< UDP-encapsulated IPsec packet */ + uint64_t l3_chksum_done:1; /* L3 checksum validation done */ + uint64_t l4_chksum_done:1; /* L4 checksum validation done */ + uint64_t ipsec_udp:1; /* UDP-encapsulated IPsec packet */ }; } _odp_packet_input_flags_t; +/** @endcond */ + #ifdef __cplusplus } #endif ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet.h | 11 +- include/odp/api/spec/packet_io.h | 7 - .../include/odp/api/plat/packet_inline_types.h | 141 +++++++++++++-------- .../include/odp/api/plat/packet_inlines.h | 7 + .../linux-generic/include/odp_packet_internal.h | 59 +-------- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_crypto.c | 2 +- platform/linux-generic/odp_ipsec.c | 4 +- platform/linux-generic/odp_packet.c | 53 ++++---- platform/linux-generic/odp_packet_flags.c | 14 +- platform/linux-generic/pktio/dpdk.c | 24 ++-- platform/linux-generic/pktio/loop.c | 2 +- test/validation/api/packet/packet.c | 14 ++ test/validation/api/pktio/pktio.c | 6 +- 14 files changed, 177 insertions(+), 169 deletions(-) hooks/post-receive --

8 years

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-249-g3f4dd655

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 via 3f4dd655d9e6f097d1c809f7f3ab6f32b345c038 (commit) via 1e97499b79e3a99596db6e309ae0cb67772bf767 (commit) via badb7b96640d964bb5fa3b5cfed89d7ebe7dd450 (commit) via 99b3ec8c1889a876dcf8f0ea4ef53d77b2e3cd5b (commit) via 24b4bc45465c35e49c5734d2b776799ce104e4a5 (commit) via 86f6510923f5e438bd8bb052875000661750b8c8 (commit) via 08215084ecd932d35bf663327e37e417949750d9 (commit) from e4842694a95771c87694aedae015669427bf2b21 (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 3f4dd655d9e6f097d1c809f7f3ab6f32b345c038 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 12 12:36:18 2018 +0200 linux-gen: packet: single user ptr field Remove unnecessary union of user context u64/pointer. Rename the field for better code readability. Signed-off-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index d78c6c37..bd90ee15 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -84,13 +84,7 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; /* --- Mostly read only data --- */ - - /* User context pointer or u64 */ - union { - uint64_t buf_u64; - void *buf_ctx; - const void *buf_cctx; /* const alias for ctx */ - }; + const void *user_ptr; /* Reference count */ odp_atomic_u32_t ref_cnt; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 64af81bf..37449845 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -38,7 +38,7 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .pool = offsetof(odp_packet_hdr_t, buf_hdr.pool_ptr), .input = offsetof(odp_packet_hdr_t, input), .segcount = offsetof(odp_packet_hdr_t, buf_hdr.segcount), - .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.buf_ctx), + .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.user_ptr), .user_area = offsetof(odp_packet_hdr_t, buf_hdr.uarea_addr), .l2_offset = offsetof(odp_packet_hdr_t, p.l2_offset), .l3_offset = offsetof(odp_packet_hdr_t, p.l3_offset), @@ -262,7 +262,7 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, dst->timestamp = src->timestamp; /* buffer header side packet metadata */ - dst->buf_hdr.buf_u64 = src->buf_hdr.buf_u64; + dst->buf_hdr.user_ptr = src->buf_hdr.user_ptr; dst->buf_hdr.uarea_addr = src->buf_hdr.uarea_addr; /* segmentation data is not copied: @@ -1264,9 +1264,9 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, * */ -void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx) +void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ptr) { - packet_hdr(pkt)->buf_hdr.buf_cctx = ctx; + packet_hdr(pkt)->buf_hdr.user_ptr = ptr; } int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) @@ -1887,7 +1887,7 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) dsthdr->input = srchdr->input; dsthdr->dst_queue = srchdr->dst_queue; - dsthdr->buf_hdr.buf_u64 = srchdr->buf_hdr.buf_u64; + dsthdr->buf_hdr.user_ptr = srchdr->buf_hdr.user_ptr; if (dsthdr->buf_hdr.uarea_addr != NULL && srchdr->buf_hdr.uarea_addr != NULL) { memcpy(dsthdr->buf_hdr.uarea_addr, srchdr->buf_hdr.uarea_addr, commit 1e97499b79e3a99596db6e309ae0cb67772bf767 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Feb 22 15:06:46 2018 +0300 update Linaro Copyrights to 2018 year part2 update Copyrights with the same script in rebased branch. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/atomic.h b/include/odp/api/abi-default/atomic.h index 796e512e..9a541351 100644 --- a/include/odp/api/abi-default/atomic.h +++ b/include/odp/api/abi-default/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/byteorder.h b/include/odp/api/abi-default/byteorder.h index 92f9743a..66a721b9 100644 --- a/include/odp/api/abi-default/byteorder.h +++ b/include/odp/api/abi-default/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/cpu.h b/include/odp/api/abi-default/cpu.h index af22dafd..a9b9f2c2 100644 --- a/include/odp/api/abi-default/cpu.h +++ b/include/odp/api/abi-default/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/debug.h b/include/odp/api/abi-default/debug.h index 4ccd2148..2c498f71 100644 --- a/include/odp/api/abi-default/debug.h +++ b/include/odp/api/abi-default/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/ipsec.h b/include/odp/api/abi-default/ipsec.h index dbd66d9d..7ec43372 100644 --- a/include/odp/api/abi-default/ipsec.h +++ b/include/odp/api/abi-default/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/packet_flags.h b/include/odp/api/abi-default/packet_flags.h index 8ee9fc1a..11001e93 100644 --- a/include/odp/api/abi-default/packet_flags.h +++ b/include/odp/api/abi-default/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/packet_io.h b/include/odp/api/abi-default/packet_io.h index 4795f8fc..16ce54b8 100644 --- a/include/odp/api/abi-default/packet_io.h +++ b/include/odp/api/abi-default/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/schedule.h b/include/odp/api/abi-default/schedule.h index 009b14ec..f43ea780 100644 --- a/include/odp/api/abi-default/schedule.h +++ b/include/odp/api/abi-default/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/sync.h b/include/odp/api/abi-default/sync.h index d325507c..1609dbf7 100644 --- a/include/odp/api/abi-default/sync.h +++ b/include/odp/api/abi-default/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/timer.h b/include/odp/api/abi-default/timer.h index 36759b18..21a8961d 100644 --- a/include/odp/api/abi-default/timer.h +++ b/include/odp/api/abi-default/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/align.h b/include/odp/api/align.h index 35609971..4364d583 100644 --- a/include/odp/api/align.h +++ b/include/odp/api/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/atomic.h b/include/odp/api/atomic.h index 8e515ec6..a81b9abb 100644 --- a/include/odp/api/atomic.h +++ b/include/odp/api/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/classification.h b/include/odp/api/classification.h index ecdf9203..64303322 100644 --- a/include/odp/api/classification.h +++ b/include/odp/api/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/cpu.h b/include/odp/api/cpu.h index 41c21b8a..08a0536e 100644 --- a/include/odp/api/cpu.h +++ b/include/odp/api/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/debug.h b/include/odp/api/debug.h index 625dec59..83691480 100644 --- a/include/odp/api/debug.h +++ b/include/odp/api/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/packet.h b/include/odp/api/packet.h index 88c4f027..46b5e775 100644 --- a/include/odp/api/packet.h +++ b/include/odp/api/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/queue.h b/include/odp/api/queue.h index 6a67b176..b8b5e48c 100644 --- a/include/odp/api/queue.h +++ b/include/odp/api/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/thread_types.h b/include/odp/api/spec/thread_types.h index a5ddb78e..5a59223e 100644 --- a/include/odp/api/spec/thread_types.h +++ b/include/odp/api/spec/thread_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/std_types.h b/include/odp/api/std_types.h index c99cbf97..a18835cb 100644 --- a/include/odp/api/std_types.h +++ b/include/odp/api/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/sync.h b/include/odp/api/sync.h index b84289ca..183cdda0 100644 --- a/include/odp/api/sync.h +++ b/include/odp/api/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h index 2fd53414..eb383cd3 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h index d991896d..c64bf2a6 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/debug.h b/include/odp/arch/arm32-linux/odp/api/abi/debug.h index b37b8f9c..97d028d5 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/debug.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/init.h b/include/odp/arch/arm32-linux/odp/api/abi/init.h index 81eafefe..7ad523fd 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/init.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h index b6747d29..13151bee 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h index a60c8bd0..2ff0e001 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h index 79b49262..ec02e3a2 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h index cba0743e..96dbc9b8 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h index 841710d3..14c964c9 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h index 18427744..748c6aa8 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h index b3ea96b5..d5164ff7 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h index 4894095b..fbfbce5c 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h index a7a49bd4..cc93b6ac 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h index 72898878..249bfe71 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h index 91130000..594e6f9d 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/sync.h b/include/odp/arch/arm32-linux/odp/api/abi/sync.h index 8e5f8132..37b03bcd 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/sync.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thread.h b/include/odp/arch/arm32-linux/odp/api/abi/thread.h index dc29a7da..be44ad8a 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/thread.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h index 0c1dc0ce..ab05cd83 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h index 0065ce02..0750f7e7 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/time.h b/include/odp/arch/arm32-linux/odp/api/abi/time.h index 2672d789..a86a526d 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/time.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/timer.h b/include/odp/arch/arm32-linux/odp/api/abi/timer.h index e52a3e12..1a5b5bb0 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/timer.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h index 4245cbf7..0e6bc798 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/version.h b/include/odp/arch/arm32-linux/odp/api/abi/version.h index b36d5395..429d4f3f 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/version.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/align.h b/include/odp/arch/arm64-linux/odp/api/abi/align.h index fb704d58..7fa34307 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/align.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h index 8848ad19..da89426c 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h index 9d6c256e..56b64b81 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h index 2fd53414..eb383cd3 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h index d991896d..c64bf2a6 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/debug.h b/include/odp/arch/arm64-linux/odp/api/abi/debug.h index b37b8f9c..97d028d5 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/debug.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/init.h b/include/odp/arch/arm64-linux/odp/api/abi/init.h index 81eafefe..7ad523fd 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/init.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h index b6747d29..13151bee 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h index a60c8bd0..2ff0e001 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h index 79b49262..ec02e3a2 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h index cba0743e..96dbc9b8 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h index 841710d3..14c964c9 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h index 18427744..748c6aa8 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h index b3ea96b5..d5164ff7 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h index 4894095b..fbfbce5c 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h index a7a49bd4..cc93b6ac 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h index 72898878..249bfe71 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_types.h b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h index 91130000..594e6f9d 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/sync.h b/include/odp/arch/arm64-linux/odp/api/abi/sync.h index 8e5f8132..37b03bcd 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thread.h b/include/odp/arch/arm64-linux/odp/api/abi/thread.h index dc29a7da..be44ad8a 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h index 0c1dc0ce..ab05cd83 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h index 0065ce02..0750f7e7 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/time.h b/include/odp/arch/arm64-linux/odp/api/abi/time.h index 2672d789..a86a526d 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/time.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/timer.h b/include/odp/arch/arm64-linux/odp/api/abi/timer.h index e52a3e12..1a5b5bb0 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h index 4245cbf7..0e6bc798 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/version.h b/include/odp/arch/arm64-linux/odp/api/abi/version.h index b36d5395..429d4f3f 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/version.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/align.h b/include/odp/arch/default-linux/odp/api/abi/align.h index a4692f5d..250338cf 100644 --- a/include/odp/arch/default-linux/odp/api/abi/align.h +++ b/include/odp/arch/default-linux/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/atomic.h b/include/odp/arch/default-linux/odp/api/abi/atomic.h index df1c2cd9..d224edfa 100644 --- a/include/odp/arch/default-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/default-linux/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/barrier.h b/include/odp/arch/default-linux/odp/api/abi/barrier.h index 5ccdf017..156a6e20 100644 --- a/include/odp/arch/default-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/default-linux/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/buffer.h b/include/odp/arch/default-linux/odp/api/abi/buffer.h index e030559a..74e8aadc 100644 --- a/include/odp/arch/default-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/default-linux/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/byteorder.h b/include/odp/arch/default-linux/odp/api/abi/byteorder.h index 27219f94..b2d174ce 100644 --- a/include/odp/arch/default-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/default-linux/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/classification.h b/include/odp/arch/default-linux/odp/api/abi/classification.h index 4c3ba327..0e127188 100644 --- a/include/odp/arch/default-linux/odp/api/abi/classification.h +++ b/include/odp/arch/default-linux/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/cpumask.h b/include/odp/arch/default-linux/odp/api/abi/cpumask.h index b4e7a5df..f9900949 100644 --- a/include/odp/arch/default-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/default-linux/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/crypto.h b/include/odp/arch/default-linux/odp/api/abi/crypto.h index 4f4b4368..69efdd76 100644 --- a/include/odp/arch/default-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/default-linux/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/debug.h b/include/odp/arch/default-linux/odp/api/abi/debug.h index 1bc03109..8bce796a 100644 --- a/include/odp/arch/default-linux/odp/api/abi/debug.h +++ b/include/odp/arch/default-linux/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/event.h b/include/odp/arch/default-linux/odp/api/abi/event.h index f87d6195..90b5eb28 100644 --- a/include/odp/arch/default-linux/odp/api/abi/event.h +++ b/include/odp/arch/default-linux/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/init.h b/include/odp/arch/default-linux/odp/api/abi/init.h index bd64cf14..9ab42ec8 100644 --- a/include/odp/arch/default-linux/odp/api/abi/init.h +++ b/include/odp/arch/default-linux/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/ipsec.h b/include/odp/arch/default-linux/odp/api/abi/ipsec.h index 5073680b..17fcc634 100644 --- a/include/odp/arch/default-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/default-linux/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/packet.h b/include/odp/arch/default-linux/odp/api/abi/packet.h index a1e9b1a8..a6cbeed7 100644 --- a/include/odp/arch/default-linux/odp/api/abi/packet.h +++ b/include/odp/arch/default-linux/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_flags.h b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h index fd3e10d0..48bc878f 100644 --- a/include/odp/arch/default-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_io.h b/include/odp/arch/default-linux/odp/api/abi/packet_io.h index e4220c63..b322ba88 100644 --- a/include/odp/arch/default-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/default-linux/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/pool.h b/include/odp/arch/default-linux/odp/api/abi/pool.h index 72055635..3e8ab7e4 100644 --- a/include/odp/arch/default-linux/odp/api/abi/pool.h +++ b/include/odp/arch/default-linux/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/queue.h b/include/odp/arch/default-linux/odp/api/abi/queue.h index 04f0c6eb..7860f6fa 100644 --- a/include/odp/arch/default-linux/odp/api/abi/queue.h +++ b/include/odp/arch/default-linux/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock.h b/include/odp/arch/default-linux/odp/api/abi/rwlock.h index a6aa377d..2e073cb2 100644 --- a/include/odp/arch/default-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h index a78a2181..c266ef1b 100644 --- a/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule.h b/include/odp/arch/default-linux/odp/api/abi/schedule.h index 027265c1..ca4cf77b 100644 --- a/include/odp/arch/default-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/default-linux/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule_types.h b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h index f9aa2005..93c4db55 100644 --- a/include/odp/arch/default-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/shared_memory.h b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h index 51e35e90..1184fb0d 100644 --- a/include/odp/arch/default-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock.h b/include/odp/arch/default-linux/odp/api/abi/spinlock.h index 46da3024..7b162c01 100644 --- a/include/odp/arch/default-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h index e75e753e..8666a2df 100644 --- a/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/std_clib.h b/include/odp/arch/default-linux/odp/api/abi/std_clib.h index 048c9fc2..2fa1a595 100644 --- a/include/odp/arch/default-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/default-linux/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/std_types.h b/include/odp/arch/default-linux/odp/api/abi/std_types.h index fa360e01..8cd05f78 100644 --- a/include/odp/arch/default-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/default-linux/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/sync.h b/include/odp/arch/default-linux/odp/api/abi/sync.h index cdab3a94..809c31f2 100644 --- a/include/odp/arch/default-linux/odp/api/abi/sync.h +++ b/include/odp/arch/default-linux/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/thread.h b/include/odp/arch/default-linux/odp/api/abi/thread.h index e34b7c7b..e9012828 100644 --- a/include/odp/arch/default-linux/odp/api/abi/thread.h +++ b/include/odp/arch/default-linux/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/thrmask.h b/include/odp/arch/default-linux/odp/api/abi/thrmask.h index 14ff7770..b7f6ff4c 100644 --- a/include/odp/arch/default-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/default-linux/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/ticketlock.h b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h index 268b8094..e3220d32 100644 --- a/include/odp/arch/default-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/time.h b/include/odp/arch/default-linux/odp/api/abi/time.h index 85c7dd03..ffa8cd9a 100644 --- a/include/odp/arch/default-linux/odp/api/abi/time.h +++ b/include/odp/arch/default-linux/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/timer.h b/include/odp/arch/default-linux/odp/api/abi/timer.h index b1664959..7ba2115a 100644 --- a/include/odp/arch/default-linux/odp/api/abi/timer.h +++ b/include/odp/arch/default-linux/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h index fcd83801..2c9b0125 100644 --- a/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/version.h b/include/odp/arch/default-linux/odp/api/abi/version.h index 36559ec8..89b7d361 100644 --- a/include/odp/arch/default-linux/odp/api/abi/version.h +++ b/include/odp/arch/default-linux/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/align.h b/include/odp/arch/mips64-linux/odp/api/abi/align.h index fb704d58..7fa34307 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/align.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h index 8848ad19..da89426c 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h index 9d6c256e..56b64b81 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h index 2fd53414..eb383cd3 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpu.h b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h index 589e9d03..450bd092 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h index d991896d..c64bf2a6 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/debug.h b/include/odp/arch/mips64-linux/odp/api/abi/debug.h index b37b8f9c..97d028d5 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/debug.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/init.h b/include/odp/arch/mips64-linux/odp/api/abi/init.h index 81eafefe..7ad523fd 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/init.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h index b6747d29..13151bee 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h index a60c8bd0..2ff0e001 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h index 79b49262..ec02e3a2 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h index cba0743e..96dbc9b8 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h index 841710d3..14c964c9 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h index 18427744..748c6aa8 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h index b3ea96b5..d5164ff7 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h index 4894095b..fbfbce5c 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h index a7a49bd4..cc93b6ac 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h index 72898878..249bfe71 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_types.h b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h index 91130000..594e6f9d 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/sync.h b/include/odp/arch/mips64-linux/odp/api/abi/sync.h index 8e5f8132..37b03bcd 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thread.h b/include/odp/arch/mips64-linux/odp/api/abi/thread.h index dc29a7da..be44ad8a 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h index 0c1dc0ce..ab05cd83 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h index 0065ce02..0750f7e7 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/time.h b/include/odp/arch/mips64-linux/odp/api/abi/time.h index 2672d789..a86a526d 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/time.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/timer.h b/include/odp/arch/mips64-linux/odp/api/abi/timer.h index e52a3e12..1a5b5bb0 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h index 4245cbf7..0e6bc798 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/version.h b/include/odp/arch/mips64-linux/odp/api/abi/version.h index b36d5395..429d4f3f 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/version.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/align.h b/include/odp/arch/power64-linux/odp/api/abi/align.h index fb704d58..7fa34307 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/align.h +++ b/include/odp/arch/power64-linux/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/atomic.h b/include/odp/arch/power64-linux/odp/api/abi/atomic.h index 8848ad19..da89426c 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/power64-linux/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/barrier.h b/include/odp/arch/power64-linux/odp/api/abi/barrier.h index 9d6c256e..56b64b81 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/power64-linux/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h index 2fd53414..eb383cd3 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpu.h b/include/odp/arch/power64-linux/odp/api/abi/cpu.h index 7e835f06..90bb8787 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/power64-linux/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h index d991896d..c64bf2a6 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/debug.h b/include/odp/arch/power64-linux/odp/api/abi/debug.h index b37b8f9c..97d028d5 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/debug.h +++ b/include/odp/arch/power64-linux/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/init.h b/include/odp/arch/power64-linux/odp/api/abi/init.h index 81eafefe..7ad523fd 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/init.h +++ b/include/odp/arch/power64-linux/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h index b6747d29..13151bee 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h index a60c8bd0..2ff0e001 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_io.h b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h index 79b49262..ec02e3a2 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h index cba0743e..96dbc9b8 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h index 841710d3..14c964c9 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule.h b/include/odp/arch/power64-linux/odp/api/abi/schedule.h index 18427744..748c6aa8 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h index b3ea96b5..d5164ff7 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h index 4894095b..fbfbce5c 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h index a7a49bd4..cc93b6ac 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_clib.h b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h index 72898878..249bfe71 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_types.h b/include/odp/arch/power64-linux/odp/api/abi/std_types.h index 91130000..594e6f9d 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/power64-linux/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/sync.h b/include/odp/arch/power64-linux/odp/api/abi/sync.h index 8e5f8132..37b03bcd 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/power64-linux/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/thread.h b/include/odp/arch/power64-linux/odp/api/abi/thread.h index dc29a7da..be44ad8a 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/power64-linux/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h index 0c1dc0ce..ab05cd83 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h index 0065ce02..0750f7e7 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/time.h b/include/odp/arch/power64-linux/odp/api/abi/time.h index 2672d789..a86a526d 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/time.h +++ b/include/odp/arch/power64-linux/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/timer.h b/include/odp/arch/power64-linux/odp/api/abi/timer.h index e52a3e12..1a5b5bb0 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/power64-linux/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h index 4245cbf7..0e6bc798 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/version.h b/include/odp/arch/power64-linux/odp/api/abi/version.h index b36d5395..429d4f3f 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/version.h +++ b/include/odp/arch/power64-linux/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/align.h b/include/odp/arch/x86_32-linux/odp/api/abi/align.h index fb704d58..7fa34307 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/align.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h index 8848ad19..da89426c 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h index 9d6c256e..56b64b81 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h index 2fd53414..eb383cd3 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h index d991896d..c64bf2a6 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/debug.h b/include/odp/arch/x86_32-linux/odp/api/abi/debug.h index b37b8f9c..97d028d5 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/debug.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/init.h b/include/odp/arch/x86_32-linux/odp/api/abi/init.h index 81eafefe..7ad523fd 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/init.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h index b6747d29..13151bee 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h index a60c8bd0..2ff0e001 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h index 79b49262..ec02e3a2 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h index cba0743e..96dbc9b8 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h index 841710d3..14c964c9 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h index 18427744..748c6aa8 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h index b3ea96b5..d5164ff7 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h index 4894095b..fbfbce5c 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h index a7a49bd4..cc93b6ac 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h index 72898878..249bfe71 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h index 91130000..594e6f9d 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h index 8e5f8132..37b03bcd 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h index dc29a7da..be44ad8a 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h index 0c1dc0ce..ab05cd83 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h index 0065ce02..0750f7e7 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/time.h b/include/odp/arch/x86_32-linux/odp/api/abi/time.h index 2672d789..a86a526d 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/time.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h index e52a3e12..1a5b5bb0 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h index 4245cbf7..0e6bc798 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/version.h b/include/odp/arch/x86_32-linux/odp/api/abi/version.h index b36d5395..429d4f3f 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/version.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/align.h b/include/odp/arch/x86_64-linux/odp/api/abi/align.h index fb704d58..7fa34307 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/align.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h index 8848ad19..da89426c 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h index 9d6c256e..56b64b81 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h index 2fd53414..eb383cd3 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h index d991896d..c64bf2a6 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/debug.h b/include/odp/arch/x86_64-linux/odp/api/abi/debug.h index b37b8f9c..97d028d5 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/debug.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/init.h b/include/odp/arch/x86_64-linux/odp/api/abi/init.h index 81eafefe..7ad523fd 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/init.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h index b6747d29..13151bee 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h index a60c8bd0..2ff0e001 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h index 79b49262..ec02e3a2 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h index cba0743e..96dbc9b8 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h index 841710d3..14c964c9 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h index 18427744..748c6aa8 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h index b3ea96b5..d5164ff7 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h index 4894095b..fbfbce5c 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h index a7a49bd4..cc93b6ac 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h index 72898878..249bfe71 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h index 91130000..594e6f9d 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h index 8e5f8132..37b03bcd 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h index dc29a7da..be44ad8a 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h index 0c1dc0ce..ab05cd83 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h index 0065ce02..0750f7e7 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/time.h b/include/odp/arch/x86_64-linux/odp/api/abi/time.h index 2672d789..a86a526d 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/time.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h index e52a3e12..1a5b5bb0 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h index 4245cbf7..0e6bc798 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/version.h b/include/odp/arch/x86_64-linux/odp/api/abi/version.h index b36d5395..429d4f3f 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/version.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h index 1e483966..0ab5b8e1 100644 --- a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/arm/odp/api/abi/cpu.h b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h index 1e483966..0ab5b8e1 100644 --- a/platform/linux-generic/arch/arm/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/arm/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu.h b/platform/linux-generic/arch/default/odp/api/abi/cpu.h index 0765339b..8f64790c 100644 --- a/platform/linux-generic/arch/default/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h b/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h index 7e835f06..90bb8787 100644 --- a/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h index a5314439..523fa99e 100644 --- a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/align.h b/platform/linux-generic/include-abi/odp/api/abi/align.h index fb704d58..7fa34307 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/align.h +++ b/platform/linux-generic/include-abi/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/atomic.h b/platform/linux-generic/include-abi/odp/api/abi/atomic.h index 67127aa4..ceedb5ed 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/atomic.h +++ b/platform/linux-generic/include-abi/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/barrier.h b/platform/linux-generic/include-abi/odp/api/abi/barrier.h index 51d91377..cff12c57 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/barrier.h +++ b/platform/linux-generic/include-abi/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/cpumask.h b/platform/linux-generic/include-abi/odp/api/abi/cpumask.h index d991896d..c64bf2a6 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/cpumask.h +++ b/platform/linux-generic/include-abi/odp/api/abi/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/init.h b/platform/linux-generic/include-abi/odp/api/abi/init.h index 81eafefe..7ad523fd 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/init.h +++ b/platform/linux-generic/include-abi/odp/api/abi/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index 1aa7cbd5..66948aa1 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h index 9a8474a3..58aee1f4 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/rwlock.h b/platform/linux-generic/include-abi/odp/api/abi/rwlock.h index cba0743e..96dbc9b8 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/rwlock.h +++ b/platform/linux-generic/include-abi/odp/api/abi/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h b/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h index 841710d3..14c964c9 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h +++ b/platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/schedule.h b/platform/linux-generic/include-abi/odp/api/abi/schedule.h index 18427744..748c6aa8 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/schedule.h +++ b/platform/linux-generic/include-abi/odp/api/abi/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h b/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h index b3ea96b5..d5164ff7 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/spinlock.h b/platform/linux-generic/include-abi/odp/api/abi/spinlock.h index 4894095b..fbfbce5c 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/spinlock.h +++ b/platform/linux-generic/include-abi/odp/api/abi/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h b/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h index a7a49bd4..cc93b6ac 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h +++ b/platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/std_clib.h b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h index 8ef9e9ad..d41dd140 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/std_clib.h +++ b/platform/linux-generic/include-abi/odp/api/abi/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/std_types.h b/platform/linux-generic/include-abi/odp/api/abi/std_types.h index 91130000..594e6f9d 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/std_types.h +++ b/platform/linux-generic/include-abi/odp/api/abi/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/sync.h b/platform/linux-generic/include-abi/odp/api/abi/sync.h index 9ecc40f2..cbb6f753 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/sync.h +++ b/platform/linux-generic/include-abi/odp/api/abi/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/thread.h b/platform/linux-generic/include-abi/odp/api/abi/thread.h index eb92d43c..8cd36bda 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/thread.h +++ b/platform/linux-generic/include-abi/odp/api/abi/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/thrmask.h b/platform/linux-generic/include-abi/odp/api/abi/thrmask.h index 0c1dc0ce..ab05cd83 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/thrmask.h +++ b/platform/linux-generic/include-abi/odp/api/abi/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h index f6600988..5d335946 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/time.h b/platform/linux-generic/include-abi/odp/api/abi/time.h index 2672d789..a86a526d 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/time.h +++ b/platform/linux-generic/include-abi/odp/api/abi/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h b/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h index 4245cbf7..0e6bc798 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h +++ b/platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/version.h b/platform/linux-generic/include-abi/odp/api/abi/version.h index b36d5395..429d4f3f 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/version.h +++ b/platform/linux-generic/include-abi/odp/api/abi/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h index ef81d74d..f979f601 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h index 6a2aa72d..c7398dd5 100644 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h index 5b59a437..6b264ea1 100644 --- a/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/pool_inline_types.h b/platform/linux-generic/include/odp/api/plat/pool_inline_types.h index 784c3846..041d54a3 100644 --- a/platform/linux-generic/include/odp/api/plat/pool_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/pool_inline_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines.h b/platform/linux-generic/include/odp/api/plat/thread_inlines.h index 048df50b..deecc653 100644 --- a/platform/linux-generic/include/odp/api/plat/thread_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/thread_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h b/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h index 1c282a5c..08193e2b 100644 --- a/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_macros_internal.h b/platform/linux-generic/include/odp_macros_internal.h index 35757275..22977237 100644 --- a/platform/linux-generic/include/odp_macros_internal.h +++ b/platform/linux-generic/include/odp_macros_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_null.h b/platform/linux-generic/include/odp_packet_null.h index 849f87d6..bd9036f1 100644 --- a/platform/linux-generic/include/odp_packet_null.h +++ b/platform/linux-generic/include/odp_packet_null.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_atomic_api.c b/platform/linux-generic/odp_atomic_api.c index a1aabb07..d99f8052 100644 --- a/platform/linux-generic/odp_atomic_api.c +++ b/platform/linux-generic/odp_atomic_api.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_packet_api.c b/platform/linux-generic/odp_packet_api.c index dd038e81..f2e4f860 100644 --- a/platform/linux-generic/odp_packet_api.c +++ b/platform/linux-generic/odp_packet_api.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_packet_flags_api.c b/platform/linux-generic/odp_packet_flags_api.c index 6b373843..c9441bb4 100644 --- a/platform/linux-generic/odp_packet_flags_api.c +++ b/platform/linux-generic/odp_packet_flags_api.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_pktio_api.c b/platform/linux-generic/odp_pktio_api.c index f4dc3346..52f0b571 100644 --- a/platform/linux-generic/odp_pktio_api.c +++ b/platform/linux-generic/odp_pktio_api.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_thread_api.c b/platform/linux-generic/odp_thread_api.c index ee5beb16..7f07f6a3 100644 --- a/platform/linux-generic/odp_thread_api.c +++ b/platform/linux-generic/odp_thread_api.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c index 5a11076c..c49d515c 100644 --- a/platform/linux-generic/pktio/null.c +++ b/platform/linux-generic/pktio/null.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/example/generator/generator_run.sh b/platform/linux-generic/test/example/generator/generator_run.sh index 3e7fabfe..85368d2e 100755 --- a/platform/linux-generic/test/example/generator/generator_run.sh +++ b/platform/linux-generic/test/example/generator/generator_run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2018, Linaro Limited +# Copyright (c) 2018-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause commit badb7b96640d964bb5fa3b5cfed89d7ebe7dd450 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Jan 17 17:30:46 2018 +0300 update Linaro Copyrights to 2018 year Using simple commands: find . -not -path .git -type f -exec \ sed -i -E 's/ (201[0-9]), Linaro/ \1-2018, Linaro/g' {} + find . -not -path .git -type f -exec \ sed -i -E 's/ (201[0-9])(-201[0-9]), Linaro/ \1-2018, Linaro/g' {} + Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index d9423adc..ca513581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/LICENSE b/LICENSE index 441ba51f..57beb816 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013-2014, Linaro Limited +Copyright (c) 2013-2018, Linaro Limited All rights reserved. SPDX-License-Identifier: BSD-3-Clause diff --git a/README b/README index 987d1481..b720de42 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Copyright (c) 2013-2014, Linaro Limited +Copyright (c) 2013-2018, Linaro Limited All rights reserved. SPDX-License-Identifier: BSD-3-Clause diff --git a/doc/application-api-guide/api_guide_lines.dox b/doc/application-api-guide/api_guide_lines.dox index a6488c32..957d525f 100644 --- a/doc/application-api-guide/api_guide_lines.dox +++ b/doc/application-api-guide/api_guide_lines.dox @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved * diff --git a/doc/application-api-guide/examples.dox b/doc/application-api-guide/examples.dox index 80fe4670..afafcc52 100644 --- a/doc/application-api-guide/examples.dox +++ b/doc/application-api-guide/examples.dox @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/doc/application-api-guide/odp.dox b/doc/application-api-guide/odp.dox index 72fcfb37..a6adf623 100644 --- a/doc/application-api-guide/odp.dox +++ b/doc/application-api-guide/odp.dox @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/doc/application-api-guide/release.dox b/doc/application-api-guide/release.dox index eb6eca73..5708a1cb 100644 --- a/doc/application-api-guide/release.dox +++ b/doc/application-api-guide/release.dox @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/doc/helper-guide/odp.dox b/doc/helper-guide/odp.dox index 79f4121b..82db060b 100644 --- a/doc/helper-guide/odp.dox +++ b/doc/helper-guide/odp.dox @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 11b8580b..ddb934be 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/example_debug.h b/example/example_debug.h index dd3aa7f3..84f8af1b 100644 --- a/example/example_debug.h +++ b/example/example_debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index d31b6851..9b62d145 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/hello/odp_hello.c b/example/hello/odp_hello.c index dba34954..4e762bb8 100644 --- a/example/hello/odp_hello.c +++ b/example/hello/odp_hello.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass.c b/example/ipfragreass/odp_ipfragreass.c index 6668263b..2d11ac0c 100644 --- a/example/ipfragreass/odp_ipfragreass.c +++ b/example/ipfragreass/odp_ipfragreass.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_atomics.h b/example/ipfragreass/odp_ipfragreass_atomics.h index 691978e5..2f3bb51b 100644 --- a/example/ipfragreass/odp_ipfragreass_atomics.h +++ b/example/ipfragreass/odp_ipfragreass_atomics.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_atomics_arm.h b/example/ipfragreass/odp_ipfragreass_atomics_arm.h index e75ae588..d539fa18 100644 --- a/example/ipfragreass/odp_ipfragreass_atomics_arm.h +++ b/example/ipfragreass/odp_ipfragreass_atomics_arm.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_fragment.c b/example/ipfragreass/odp_ipfragreass_fragment.c index b2fe6ad2..2cce75e9 100644 --- a/example/ipfragreass/odp_ipfragreass_fragment.c +++ b/example/ipfragreass/odp_ipfragreass_fragment.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_fragment.h b/example/ipfragreass/odp_ipfragreass_fragment.h index f497fad7..e0e8cfea 100644 --- a/example/ipfragreass/odp_ipfragreass_fragment.h +++ b/example/ipfragreass/odp_ipfragreass_fragment.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_helpers.c b/example/ipfragreass/odp_ipfragreass_helpers.c index e8d89b97..e7755f24 100644 --- a/example/ipfragreass/odp_ipfragreass_helpers.c +++ b/example/ipfragreass/odp_ipfragreass_helpers.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_helpers.h b/example/ipfragreass/odp_ipfragreass_helpers.h index ffb3bfb7..3678b7db 100644 --- a/example/ipfragreass/odp_ipfragreass_helpers.h +++ b/example/ipfragreass/odp_ipfragreass_helpers.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_ip.h b/example/ipfragreass/odp_ipfragreass_ip.h index e7281e5a..9c8f2a5f 100644 --- a/example/ipfragreass/odp_ipfragreass_ip.h +++ b/example/ipfragreass/odp_ipfragreass_ip.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_reassemble.c b/example/ipfragreass/odp_ipfragreass_reassemble.c index fd1618f5..35742d3a 100644 --- a/example/ipfragreass/odp_ipfragreass_reassemble.c +++ b/example/ipfragreass/odp_ipfragreass_reassemble.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipfragreass/odp_ipfragreass_reassemble.h b/example/ipfragreass/odp_ipfragreass_reassemble.h index ffc4bfb5..26826edf 100644 --- a/example/ipfragreass/odp_ipfragreass_reassemble.h +++ b/example/ipfragreass/odp_ipfragreass_reassemble.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/README b/example/ipsec/README index a8b741c7..30c66699 100644 --- a/example/ipsec/README +++ b/example/ipsec/README @@ -1,4 +1,4 @@ -Copyright (c) 2014, Linaro Limited +Copyright (c) 2014-2018, Linaro Limited All rights reserved. SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index c0978d0d..9f7efcaa 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index 220df782..5bbc497c 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_cache.h b/example/ipsec/odp_ipsec_cache.h index 45010249..fb241682 100644 --- a/example/ipsec/odp_ipsec_cache.h +++ b/example/ipsec/odp_ipsec_cache.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_fwd_db.c b/example/ipsec/odp_ipsec_fwd_db.c index d52c3490..da9abf94 100644 --- a/example/ipsec/odp_ipsec_fwd_db.c +++ b/example/ipsec/odp_ipsec_fwd_db.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_fwd_db.h b/example/ipsec/odp_ipsec_fwd_db.h index 771f58e0..27825972 100644 --- a/example/ipsec/odp_ipsec_fwd_db.h +++ b/example/ipsec/odp_ipsec_fwd_db.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h index 346cc1c2..71d8f63c 100644 --- a/example/ipsec/odp_ipsec_misc.h +++ b/example/ipsec/odp_ipsec_misc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c index 10bbcb8f..626380c6 100644 --- a/example/ipsec/odp_ipsec_sa_db.c +++ b/example/ipsec/odp_ipsec_sa_db.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_sa_db.h b/example/ipsec/odp_ipsec_sa_db.h index cdcd9c1a..729d98d5 100644 --- a/example/ipsec/odp_ipsec_sa_db.h +++ b/example/ipsec/odp_ipsec_sa_db.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_sp_db.c b/example/ipsec/odp_ipsec_sp_db.c index ed631c7b..265c9c7e 100644 --- a/example/ipsec/odp_ipsec_sp_db.c +++ b/example/ipsec/odp_ipsec_sp_db.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_sp_db.h b/example/ipsec/odp_ipsec_sp_db.h index 735c20ed..ffb52eb8 100644 --- a/example/ipsec/odp_ipsec_sp_db.h +++ b/example/ipsec/odp_ipsec_sp_db.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index 3773ce52..7487dddf 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec/odp_ipsec_stream.h index 4d047360..91ccb0be 100644 --- a/example/ipsec/odp_ipsec_stream.h +++ b/example/ipsec/odp_ipsec_stream.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c index 6e7350c9..c428927d 100644 --- a/example/ipsec_api/odp_ipsec.c +++ b/example/ipsec_api/odp_ipsec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_api/odp_ipsec_cache.c b/example/ipsec_api/odp_ipsec_cache.c index a9cf62dd..62edb9bc 100644 --- a/example/ipsec_api/odp_ipsec_cache.c +++ b/example/ipsec_api/odp_ipsec_cache.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_api/odp_ipsec_cache.h b/example/ipsec_api/odp_ipsec_cache.h index 91064de6..0454ab1b 100644 --- a/example/ipsec_api/odp_ipsec_cache.h +++ b/example/ipsec_api/odp_ipsec_cache.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload.c b/example/ipsec_offload/odp_ipsec_offload.c index a2c6ef51..890de682 100644 --- a/example/ipsec_offload/odp_ipsec_offload.c +++ b/example/ipsec_offload/odp_ipsec_offload.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * Copyright (C) 2017 NXP * All rights reserved. * diff --git a/example/ipsec_offload/odp_ipsec_offload_cache.c b/example/ipsec_offload/odp_ipsec_offload_cache.c index 74585d2c..58271bfd 100644 --- a/example/ipsec_offload/odp_ipsec_offload_cache.c +++ b/example/ipsec_offload/odp_ipsec_offload_cache.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 NXP. All rights reserved. */ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_cache.h b/example/ipsec_offload/odp_ipsec_offload_cache.h index eecdd6be..c922b180 100644 --- a/example/ipsec_offload/odp_ipsec_offload_cache.h +++ b/example/ipsec_offload/odp_ipsec_offload_cache.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_fwd_db.c b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c index ea07c9b0..f707ab9a 100644 --- a/example/ipsec_offload/odp_ipsec_offload_fwd_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_fwd_db.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_fwd_db.h b/example/ipsec_offload/odp_ipsec_offload_fwd_db.h index 492dddd8..864c0ab5 100644 --- a/example/ipsec_offload/odp_ipsec_offload_fwd_db.h +++ b/example/ipsec_offload/odp_ipsec_offload_fwd_db.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_misc.h b/example/ipsec_offload/odp_ipsec_offload_misc.h index 2a679983..81c14999 100644 --- a/example/ipsec_offload/odp_ipsec_offload_misc.h +++ b/example/ipsec_offload/odp_ipsec_offload_misc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_sa_db.c b/example/ipsec_offload/odp_ipsec_offload_sa_db.c index 602ed8db..a0fb3fbf 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sa_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_sa_db.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_sa_db.h b/example/ipsec_offload/odp_ipsec_offload_sa_db.h index 02b49d40..f004028a 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sa_db.h +++ b/example/ipsec_offload/odp_ipsec_offload_sa_db.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_sp_db.c b/example/ipsec_offload/odp_ipsec_offload_sp_db.c index a286a1c4..1001d5f3 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sp_db.c +++ b/example/ipsec_offload/odp_ipsec_offload_sp_db.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/ipsec_offload/odp_ipsec_offload_sp_db.h b/example/ipsec_offload/odp_ipsec_offload_sp_db.h index bc6ba1aa..ac14f0dc 100644 --- a/example/ipsec_offload/odp_ipsec_offload_sp_db.h +++ b/example/ipsec_offload/odp_ipsec_offload_sp_db.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh b/example/l2fwd_simple/l2fwd_simple_run.sh index d09bd3cf..10f4e6dc 100755 --- a/example/l2fwd_simple/l2fwd_simple_run.sh +++ b/example/l2fwd_simple/l2fwd_simple_run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index c74a523a..36b76ee1 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index 3946546f..b12348cc 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l3fwd/odp_l3fwd_db.c b/example/l3fwd/odp_l3fwd_db.c index 0670aa45..f39b5430 100644 --- a/example/l3fwd/odp_l3fwd_db.c +++ b/example/l3fwd/odp_l3fwd_db.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l3fwd/odp_l3fwd_db.h b/example/l3fwd/odp_l3fwd_db.h index 015f3832..b26c67e4 100644 --- a/example/l3fwd/odp_l3fwd_db.h +++ b/example/l3fwd/odp_l3fwd_db.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l3fwd/odp_l3fwd_lpm.c b/example/l3fwd/odp_l3fwd_lpm.c index 65a33891..cb9d9df0 100644 --- a/example/l3fwd/odp_l3fwd_lpm.c +++ b/example/l3fwd/odp_l3fwd_lpm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l3fwd/odp_l3fwd_lpm.h b/example/l3fwd/odp_l3fwd_lpm.h index 92566425..4f2b9ad7 100644 --- a/example/l3fwd/odp_l3fwd_lpm.h +++ b/example/l3fwd/odp_l3fwd_lpm.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/l3fwd/odp_l3fwd_run.sh b/example/l3fwd/odp_l3fwd_run.sh index dff3afd7..acffb843 100755 --- a/example/l3fwd/odp_l3fwd_run.sh +++ b/example/l3fwd/odp_l3fwd_run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 14466fd6..caf82b7b 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh index 122418b6..6abaec16 100755 --- a/example/packet/pktio_run.sh +++ b/example/packet/pktio_run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 954c667c..cc28eb6c 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh index 9a8e8480..5fa1ae1c 100755 --- a/example/switch/switch_run.sh +++ b/example/switch/switch_run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index e24e9f43..a879745d 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/timer/odp_timer_simple.c b/example/timer/odp_timer_simple.c index 6c76f2a2..116f8ba6 100644 --- a/example/timer/odp_timer_simple.c +++ b/example/timer/odp_timer_simple.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index 4a82af40..1b0645a8 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c index e02a1af8..2af106ab 100644 --- a/example/traffic_mgmt/odp_traffic_mgmt.c +++ b/example/traffic_mgmt/odp_traffic_mgmt.c @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/chksum.c b/helper/chksum.c index f8303b4e..da5625a7 100644 --- a/helper/chksum.c +++ b/helper/chksum.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/cuckootable.c b/helper/cuckootable.c index 29298d42..1dc43b57 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/eth.c b/helper/eth.c index b7c2c6b7..d46283b2 100644 --- a/helper/eth.c +++ b/helper/eth.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/hashtable.c b/helper/hashtable.c index b124c2d7..16f6c14c 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/chksum.h b/helper/include/odp/helper/chksum.h index ed2de91f..c03abeb7 100644 --- a/helper/include/odp/helper/chksum.h +++ b/helper/include/odp/helper/chksum.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/eth.h b/helper/include/odp/helper/eth.h index 9f47ddfa..31ced14b 100644 --- a/helper/include/odp/helper/eth.h +++ b/helper/include/odp/helper/eth.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/icmp.h b/helper/include/odp/helper/icmp.h index bef96784..3be0c345 100644 --- a/helper/include/odp/helper/icmp.h +++ b/helper/include/odp/helper/icmp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h index 7ef8dbc3..cdc43062 100644 --- a/helper/include/odp/helper/ip.h +++ b/helper/include/odp/helper/ip.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/ipsec.h b/helper/include/odp/helper/ipsec.h index 034a3411..d506d2a4 100644 --- a/helper/include/odp/helper/ipsec.h +++ b/helper/include/odp/helper/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/linux.h b/helper/include/odp/helper/linux.h index 396203a2..f63385ec 100644 --- a/helper/include/odp/helper/linux.h +++ b/helper/include/odp/helper/linux.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/linux/process.h b/helper/include/odp/helper/linux/process.h index 9d74146b..679c6c90 100644 --- a/helper/include/odp/helper/linux/process.h +++ b/helper/include/odp/helper/linux/process.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/linux/pthread.h b/helper/include/odp/helper/linux/pthread.h index feeda5e2..33109ec6 100644 --- a/helper/include/odp/helper/linux/pthread.h +++ b/helper/include/odp/helper/linux/pthread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index 7ed0e778..8ad8a27f 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h index 55f43fed..5b0a48e5 100644 --- a/helper/include/odp/helper/odph_cuckootable.h +++ b/helper/include/odp/helper/odph_cuckootable.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h index 1f91f31e..03c07c43 100644 --- a/helper/include/odp/helper/odph_hashtable.h +++ b/helper/include/odp/helper/odph_hashtable.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h index 84c2cfdd..14bb2495 100644 --- a/helper/include/odp/helper/odph_iplookuptable.h +++ b/helper/include/odp/helper/odph_iplookuptable.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h index cd9fda39..b8d8cecc 100644 --- a/helper/include/odp/helper/odph_lineartable.h +++ b/helper/include/odp/helper/odph_lineartable.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/strong_types.h b/helper/include/odp/helper/strong_types.h index f1acf6cc..645d0bfd 100644 --- a/helper/include/odp/helper/strong_types.h +++ b/helper/include/odp/helper/strong_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/table.h b/helper/include/odp/helper/table.h index 96c9c5fe..b1f8b446 100644 --- a/helper/include/odp/helper/table.h +++ b/helper/include/odp/helper/table.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/tcp.h b/helper/include/odp/helper/tcp.h index e91b52e2..ebc8ddf1 100644 --- a/helper/include/odp/helper/tcp.h +++ b/helper/include/odp/helper/tcp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h index 526f0d48..ed7d7f39 100644 --- a/helper/include/odp/helper/threads.h +++ b/helper/include/odp/helper/threads.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odp/helper/udp.h b/helper/include/odp/helper/udp.h index 1ba2dff3..17a7e712 100644 --- a/helper/include/odp/helper/udp.h +++ b/helper/include/odp/helper/udp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odph_debug.h b/helper/include/odph_debug.h index 36c743c2..d08918be 100644 --- a/helper/include/odph_debug.h +++ b/helper/include/odph_debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/include/odph_list_internal.h b/helper/include/odph_list_internal.h index f870ee30..bfcf77ab 100644 --- a/helper/include/odph_list_internal.h +++ b/helper/include/odph_list_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/ip.c b/helper/ip.c index 463a45d0..8ecda69e 100644 --- a/helper/ip.c +++ b/helper/ip.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 7b1faa29..61f63402 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/lineartable.c b/helper/lineartable.c index 831eb11b..b27246cb 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/linux/thread.c b/helper/linux/thread.c index 94ab83a9..6ed1bc8f 100644 --- a/helper/linux/thread.c +++ b/helper/linux/thread.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 9eb7ee06..5c7c650e 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index ebe79167..7798f94e 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index e56e22c4..5e16e711 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c index 3ed2032b..92d779d9 100644 --- a/helper/test/linux/process.c +++ b/helper/test/linux/process.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c index 0863283d..8441805d 100644 --- a/helper/test/linux/pthread.c +++ b/helper/test/linux/pthread.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 9ac269e8..aa61e635 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/odpthreads_as_processes b/helper/test/odpthreads_as_processes index 01d65883..88f75927 100755 --- a/helper/test/odpthreads_as_processes +++ b/helper/test/odpthreads_as_processes @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/odpthreads_as_pthreads b/helper/test/odpthreads_as_pthreads index cd68a9e9..92f43ef9 100755 --- a/helper/test/odpthreads_as_pthreads +++ b/helper/test/odpthreads_as_pthreads @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/parse.c b/helper/test/parse.c index d5f7b251..f2f12cc0 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/helper/test/table.c b/helper/test/table.c index b3d17e1f..29d87cb2 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier:BSD-3-Clause diff --git a/helper/threads.c b/helper/threads.c index 32a09282..f9216c7e 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp.h b/include/odp.h index 26c2f7a6..02246480 100644 --- a/include/odp.h +++ b/include/odp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/align.h b/include/odp/api/abi-default/align.h index 7a95078f..c1150feb 100644 --- a/include/odp/api/abi-default/align.h +++ b/include/odp/api/abi-default/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/barrier.h b/include/odp/api/abi-default/barrier.h index 51d91377..cff12c57 100644 --- a/include/odp/api/abi-default/barrier.h +++ b/include/odp/api/abi-default/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/buffer.h b/include/odp/api/abi-default/buffer.h index 980528ba..2bc27bba 100644 --- a/include/odp/api/abi-default/buffer.h +++ b/include/odp/api/abi-default/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/classification.h b/include/odp/api/abi-default/classification.h index 771907ae..67c26517 100644 --- a/include/odp/api/abi-default/classification.h +++ b/include/odp/api/abi-default/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/cpumask.h b/include/odp/api/abi-default/cpumask.h index 4c350822..5e7f24bf 100644 --- a/include/odp/api/abi-default/cpumask.h +++ b/include/odp/api/abi-default/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/crypto.h b/include/odp/api/abi-default/crypto.h index f0793a19..e7c0a651 100644 --- a/include/odp/api/abi-default/crypto.h +++ b/include/odp/api/abi-default/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/event.h b/include/odp/api/abi-default/event.h index 0ed6dd09..b0eee9cb 100644 --- a/include/odp/api/abi-default/event.h +++ b/include/odp/api/abi-default/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/init.h b/include/odp/api/abi-default/init.h index b478310f..bab17f9a 100644 --- a/include/odp/api/abi-default/init.h +++ b/include/odp/api/abi-default/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h index 086c4d3b..10eed530 100644 --- a/include/odp/api/abi-default/packet.h +++ b/include/odp/api/abi-default/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/pool.h b/include/odp/api/abi-default/pool.h index 4637d19f..f3489ff9 100644 --- a/include/odp/api/abi-default/pool.h +++ b/include/odp/api/abi-default/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/queue.h b/include/odp/api/abi-default/queue.h index 378b069c..007ded71 100644 --- a/include/odp/api/abi-default/queue.h +++ b/include/odp/api/abi-default/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/rwlock.h b/include/odp/api/abi-default/rwlock.h index 3542c388..219e1c58 100644 --- a/include/odp/api/abi-default/rwlock.h +++ b/include/odp/api/abi-default/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/rwlock_recursive.h b/include/odp/api/abi-default/rwlock_recursive.h index f5f78bfa..66a52c19 100644 --- a/include/odp/api/abi-default/rwlock_recursive.h +++ b/include/odp/api/abi-default/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/schedule_types.h b/include/odp/api/abi-default/schedule_types.h index 10065a98..31ee27f1 100644 --- a/include/odp/api/abi-default/schedule_types.h +++ b/include/odp/api/abi-default/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/shared_memory.h b/include/odp/api/abi-default/shared_memory.h index 5805f957..888e140b 100644 --- a/include/odp/api/abi-default/shared_memory.h +++ b/include/odp/api/abi-default/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/spinlock.h b/include/odp/api/abi-default/spinlock.h index b9703b10..52af523c 100644 --- a/include/odp/api/abi-default/spinlock.h +++ b/include/odp/api/abi-default/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/spinlock_recursive.h b/include/odp/api/abi-default/spinlock_recursive.h index 235f7ac6..38efd1b3 100644 --- a/include/odp/api/abi-default/spinlock_recursive.h +++ b/include/odp/api/abi-default/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/std_clib.h b/include/odp/api/abi-default/std_clib.h index 88ea770a..15bb7953 100644 --- a/include/odp/api/abi-default/std_clib.h +++ b/include/odp/api/abi-default/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/std_types.h b/include/odp/api/abi-default/std_types.h index aa449512..27c6a75c 100644 --- a/include/odp/api/abi-default/std_types.h +++ b/include/odp/api/abi-default/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/thread.h b/include/odp/api/abi-default/thread.h index 682d8500..0420e245 100644 --- a/include/odp/api/abi-default/thread.h +++ b/include/odp/api/abi-default/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/thrmask.h b/include/odp/api/abi-default/thrmask.h index 1fafd229..5aa9b557 100644 --- a/include/odp/api/abi-default/thrmask.h +++ b/include/odp/api/abi-default/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/ticketlock.h b/include/odp/api/abi-default/ticketlock.h index d771ffbe..77e11f77 100644 --- a/include/odp/api/abi-default/ticketlock.h +++ b/include/odp/api/abi-default/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/time.h b/include/odp/api/abi-default/time.h index d3b5abda..94587371 100644 --- a/include/odp/api/abi-default/time.h +++ b/include/odp/api/abi-default/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/traffic_mngr.h b/include/odp/api/abi-default/traffic_mngr.h index b43ab1a0..b7b04b83 100644 --- a/include/odp/api/abi-default/traffic_mngr.h +++ b/include/odp/api/abi-default/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/abi-default/version.h b/include/odp/api/abi-default/version.h index 0f48ecc1..59cf3240 100644 --- a/include/odp/api/abi-default/version.h +++ b/include/odp/api/abi-default/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/barrier.h b/include/odp/api/barrier.h index 7101b4c6..95dc808f 100644 --- a/include/odp/api/barrier.h +++ b/include/odp/api/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/buffer.h b/include/odp/api/buffer.h index 15734ca7..a7ee933e 100644 --- a/include/odp/api/buffer.h +++ b/include/odp/api/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/byteorder.h b/include/odp/api/byteorder.h index cbb45429..6f33a84e 100644 --- a/include/odp/api/byteorder.h +++ b/include/odp/api/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/chksum.h b/include/odp/api/chksum.h index 6dd1554c..591534e4 100644 --- a/include/odp/api/chksum.h +++ b/include/odp/api/chksum.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/cpumask.h b/include/odp/api/cpumask.h index f5140df1..f5649106 100644 --- a/include/odp/api/cpumask.h +++ b/include/odp/api/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/crypto.h b/include/odp/api/crypto.h index 3f410467..5f68e670 100644 --- a/include/odp/api/crypto.h +++ b/include/odp/api/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/deprecated.h b/include/odp/api/deprecated.h index 881f23d1..992330ee 100644 --- a/include/odp/api/deprecated.h +++ b/include/odp/api/deprecated.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/errno.h b/include/odp/api/errno.h index 420d5d07..a0da42ff 100644 --- a/include/odp/api/errno.h +++ b/include/odp/api/errno.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/event.h b/include/odp/api/event.h index 71c64eb9..73774a60 100644 --- a/include/odp/api/event.h +++ b/include/odp/api/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/feature.h b/include/odp/api/feature.h index 6bbde3c3..f8f62b66 100644 --- a/include/odp/api/feature.h +++ b/include/odp/api/feature.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/hash.h b/include/odp/api/hash.h index 8e1699cc..b1ddf897 100644 --- a/include/odp/api/hash.h +++ b/include/odp/api/hash.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/hints.h b/include/odp/api/hints.h index c4d134b7..4b1c61ca 100644 --- a/include/odp/api/hints.h +++ b/include/odp/api/hints.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/init.h b/include/odp/api/init.h index af3f1f74..50a880a8 100644 --- a/include/odp/api/init.h +++ b/include/odp/api/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/ipsec.h b/include/odp/api/ipsec.h index cb39750e..8116610b 100644 --- a/include/odp/api/ipsec.h +++ b/include/odp/api/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/packet_flags.h b/include/odp/api/packet_flags.h index 2b3006b5..c1066347 100644 --- a/include/odp/api/packet_flags.h +++ b/include/odp/api/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/packet_io.h b/include/odp/api/packet_io.h index a854d7b9..a7edf17c 100644 --- a/include/odp/api/packet_io.h +++ b/include/odp/api/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/packet_io_stats.h b/include/odp/api/packet_io_stats.h index b2b32075..cdb7a576 100644 --- a/include/odp/api/packet_io_stats.h +++ b/include/odp/api/packet_io_stats.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/pool.h b/include/odp/api/pool.h index 845ed5fb..0790b43a 100644 --- a/include/odp/api/pool.h +++ b/include/odp/api/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/random.h b/include/odp/api/random.h index 4ce97384..bdedc2e9 100644 --- a/include/odp/api/random.h +++ b/include/odp/api/random.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/rwlock.h b/include/odp/api/rwlock.h index 1aab7596..2240c187 100644 --- a/include/odp/api/rwlock.h +++ b/include/odp/api/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/rwlock_recursive.h b/include/odp/api/rwlock_recursive.h index f205f434..1b33039f 100644 --- a/include/odp/api/rwlock_recursive.h +++ b/include/odp/api/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/schedule.h b/include/odp/api/schedule.h index dcdc0ff4..88d1712b 100644 --- a/include/odp/api/schedule.h +++ b/include/odp/api/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/schedule_types.h b/include/odp/api/schedule_types.h index 7c347ae4..ced5752b 100644 --- a/include/odp/api/schedule_types.h +++ b/include/odp/api/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/shared_memory.h b/include/odp/api/shared_memory.h index 94012648..988c30f0 100644 --- a/include/odp/api/shared_memory.h +++ b/include/odp/api/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/align.h b/include/odp/api/spec/align.h index 0a9db348..7fe8b2b2 100644 --- a/include/odp/api/spec/align.h +++ b/include/odp/api/spec/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/atomic.h b/include/odp/api/spec/atomic.h index d828ea47..1ce594d6 100644 --- a/include/odp/api/spec/atomic.h +++ b/include/odp/api/spec/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/barrier.h b/include/odp/api/spec/barrier.h index 8351ef88..2f90fc2c 100644 --- a/include/odp/api/spec/barrier.h +++ b/include/odp/api/spec/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/buffer.h b/include/odp/api/spec/buffer.h index b2f90f94..9e38854a 100644 --- a/include/odp/api/spec/buffer.h +++ b/include/odp/api/spec/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/byteorder.h b/include/odp/api/spec/byteorder.h index 814438d3..29856b40 100644 --- a/include/odp/api/spec/byteorder.h +++ b/include/odp/api/spec/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/chksum.h b/include/odp/api/spec/chksum.h index 8f35e253..8902a949 100644 --- a/include/odp/api/spec/chksum.h +++ b/include/odp/api/spec/chksum.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index d90d9658..38389301 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/cpu.h b/include/odp/api/spec/cpu.h index 7cab4d76..d107f283 100644 --- a/include/odp/api/spec/cpu.h +++ b/include/odp/api/spec/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/cpumask.h b/include/odp/api/spec/cpumask.h index 68a705d2..d2fe719c 100644 --- a/include/odp/api/spec/cpumask.h +++ b/include/odp/api/spec/cpumask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index d2a1d1dd..77ea317b 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/debug.h b/include/odp/api/spec/debug.h index c2896a82..1bc0caf5 100644 --- a/include/odp/api/spec/debug.h +++ b/include/odp/api/spec/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/deprecated.h.in b/include/odp/api/spec/deprecated.h.in index 25520b9d..ae7ae53b 100644 --- a/include/odp/api/spec/deprecated.h.in +++ b/include/odp/api/spec/deprecated.h.in @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/errno.h b/include/odp/api/spec/errno.h index ca74f741..e5659824 100644 --- a/include/odp/api/spec/errno.h +++ b/include/odp/api/spec/errno.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/event.h b/include/odp/api/spec/event.h index 49cfdf82..d9f7ab73 100644 --- a/include/odp/api/spec/event.h +++ b/include/odp/api/spec/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/feature.h b/include/odp/api/spec/feature.h index b64b2c7d..f6a360e5 100644 --- a/include/odp/api/spec/feature.h +++ b/include/odp/api/spec/feature.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/hash.h b/include/odp/api/spec/hash.h index e86b2c6d..8761d17e 100644 --- a/include/odp/api/spec/hash.h +++ b/include/odp/api/spec/hash.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/hints.h b/include/odp/api/spec/hints.h index 64995737..816dcf3b 100644 --- a/include/odp/api/spec/hints.h +++ b/include/odp/api/spec/hints.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h index 97c10935..ee33e7cd 100644 --- a/include/odp/api/spec/init.h +++ b/include/odp/api/spec/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index b7852903..47e3045f 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index 474309b3..a1111325 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/packet_flags.h b/include/odp/api/spec/packet_flags.h index 1007a360..500ecc14 100644 --- a/include/odp/api/spec/packet_flags.h +++ b/include/odp/api/spec/packet_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 8f48dc80..ad9b29fd 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/packet_io_stats.h b/include/odp/api/spec/packet_io_stats.h index 18619143..a412c153 100644 --- a/include/odp/api/spec/packet_io_stats.h +++ b/include/odp/api/spec/packet_io_stats.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index 67367753..e6cd77c9 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index d5a0fe3e..3015d779 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/random.h b/include/odp/api/spec/random.h index 8bed969b..11bf3302 100644 --- a/include/odp/api/spec/random.h +++ b/include/odp/api/spec/random.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/rwlock.h b/include/odp/api/spec/rwlock.h index 3e5c47ba..7924a50a 100644 --- a/include/odp/api/spec/rwlock.h +++ b/include/odp/api/spec/rwlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/rwlock_recursive.h b/include/odp/api/spec/rwlock_recursive.h index 03a4dce4..bec4a350 100644 --- a/include/odp/api/spec/rwlock_recursive.h +++ b/include/odp/api/spec/rwlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index 8c55b4ec..d493cc75 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index a13cc4f1..44eb663a 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 08bfef24..898f4123 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/spinlock.h b/include/odp/api/spec/spinlock.h index fc7629dd..b156bd91 100644 --- a/include/odp/api/spec/spinlock.h +++ b/include/odp/api/spec/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/spinlock_recursive.h b/include/odp/api/spec/spinlock_recursive.h index 7546e75e..e5c98248 100644 --- a/include/odp/api/spec/spinlock_recursive.h +++ b/include/odp/api/spec/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/std_clib.h b/include/odp/api/spec/std_clib.h index d3084420..9ffcf714 100644 --- a/include/odp/api/spec/std_clib.h +++ b/include/odp/api/spec/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/std_types.h b/include/odp/api/spec/std_types.h index 83fa3bd1..083523a3 100644 --- a/include/odp/api/spec/std_types.h +++ b/include/odp/api/spec/std_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/support.h b/include/odp/api/spec/support.h index df732d18..42a9621b 100644 --- a/include/odp/api/spec/support.h +++ b/include/odp/api/spec/support.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/sync.h b/include/odp/api/spec/sync.h index 1306687c..0b75ffae 100644 --- a/include/odp/api/spec/sync.h +++ b/include/odp/api/spec/sync.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h index 38767640..e7fb570f 100644 --- a/include/odp/api/spec/system_info.h +++ b/include/odp/api/spec/system_info.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/thread.h b/include/odp/api/spec/thread.h index 125e7a11..54d4a00e 100644 --- a/include/odp/api/spec/thread.h +++ b/include/odp/api/spec/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/threshold.h b/include/odp/api/spec/threshold.h index 721fcc8e..f9100cb9 100644 --- a/include/odp/api/spec/threshold.h +++ b/include/odp/api/spec/threshold.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/thrmask.h b/include/odp/api/spec/thrmask.h index cd37e614..12d1d70a 100644 --- a/include/odp/api/spec/thrmask.h +++ b/include/odp/api/spec/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/ticketlock.h b/include/odp/api/spec/ticketlock.h index bf706cb3..fd42355b 100644 --- a/include/odp/api/spec/ticketlock.h +++ b/include/odp/api/spec/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/time.h b/include/odp/api/spec/time.h index 2bdb31fa..dd49feef 100644 --- a/include/odp/api/spec/time.h +++ b/include/odp/api/spec/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index a85edda5..d88faaae 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index d31b7b60..0327852c 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2015, Linaro Limited +/** Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spec/version.h.in b/include/odp/api/spec/version.h.in index 1a9a83f9..35df9ba2 100644 --- a/include/odp/api/spec/version.h.in +++ b/include/odp/api/spec/version.h.in @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spinlock.h b/include/odp/api/spinlock.h index 0f41216d..cc195d48 100644 --- a/include/odp/api/spinlock.h +++ b/include/odp/api/spinlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/spinlock_recursive.h b/include/odp/api/spinlock_recursive.h index 23f79db2..403510e7 100644 --- a/include/odp/api/spinlock_recursive.h +++ b/include/odp/api/spinlock_recursive.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/std_clib.h b/include/odp/api/std_clib.h index 16973ad6..43ba7506 100644 --- a/include/odp/api/std_clib.h +++ b/include/odp/api/std_clib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/support.h b/include/odp/api/support.h index 6c1759d4..a6a3ef5a 100644 --- a/include/odp/api/support.h +++ b/include/odp/api/support.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/system_info.h b/include/odp/api/system_info.h index 7b95a876..a69e2a2c 100644 --- a/include/odp/api/system_info.h +++ b/include/odp/api/system_info.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/thread.h b/include/odp/api/thread.h index d11c1671..acc65159 100644 --- a/include/odp/api/thread.h +++ b/include/odp/api/thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/threshold.h b/include/odp/api/threshold.h index 17943256..021d1181 100644 --- a/include/odp/api/threshold.h +++ b/include/odp/api/threshold.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/thrmask.h b/include/odp/api/thrmask.h index 568beb1c..0300622a 100644 --- a/include/odp/api/thrmask.h +++ b/include/odp/api/thrmask.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/ticketlock.h b/include/odp/api/ticketlock.h index d875c0e3..90ac5ff8 100644 --- a/include/odp/api/ticketlock.h +++ b/include/odp/api/ticketlock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/time.h b/include/odp/api/time.h index 629677d4..125e9118 100644 --- a/include/odp/api/time.h +++ b/include/odp/api/time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/timer.h b/include/odp/api/timer.h index e69a8532..12d3f999 100644 --- a/include/odp/api/timer.h +++ b/include/odp/api/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/traffic_mngr.h b/include/odp/api/traffic_mngr.h index 6360ccf9..7ae9b40b 100644 --- a/include/odp/api/traffic_mngr.h +++ b/include/odp/api/traffic_mngr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/api/version.h b/include/odp/api/version.h index 35c844e7..3e584e0f 100644 --- a/include/odp/api/version.h +++ b/include/odp/api/version.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/align.h b/include/odp/arch/arm32-linux/odp/api/abi/align.h index fb704d58..7fa34307 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/align.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/align.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h index 8848ad19..da89426c 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h index 9d6c256e..56b64b81 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h index 68a67896..217ed4a9 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/classification.h b/include/odp/arch/arm32-linux/odp/api/abi/classification.h index 5a0cac98..732eb27e 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/classification.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpu.h b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h index 1e483966..0ab5b8e1 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h index d33a777b..38638428 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/event.h b/include/odp/arch/arm32-linux/odp/api/abi/event.h index cbbf47f1..408433ad 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/event.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet.h b/include/odp/arch/arm32-linux/odp/api/abi/packet.h index ca28eed2..be8809ae 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/packet.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/pool.h b/include/odp/arch/arm32-linux/odp/api/abi/pool.h index b59365eb..3b1f21d9 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/pool.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/queue.h b/include/odp/arch/arm32-linux/odp/api/abi/queue.h index 66e2a341..53f046f8 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/queue.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h index e80c4f32..784170ab 100644 --- a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h index 68a67896..217ed4a9 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/classification.h b/include/odp/arch/arm64-linux/odp/api/abi/classification.h index 5a0cac98..732eb27e 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpu.h b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h index 1e483966..0ab5b8e1 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h index d33a777b..38638428 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/event.h b/include/odp/arch/arm64-linux/odp/api/abi/event.h index cbbf47f1..408433ad 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/event.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet.h b/include/odp/arch/arm64-linux/odp/api/abi/packet.h index ca28eed2..be8809ae 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/pool.h b/include/odp/arch/arm64-linux/odp/api/abi/pool.h index b59365eb..3b1f21d9 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/queue.h b/include/odp/arch/arm64-linux/odp/api/abi/queue.h index 66e2a341..53f046f8 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h index e80c4f32..784170ab 100644 --- a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/default-linux/odp/api/abi/cpu.h b/include/odp/arch/default-linux/odp/api/abi/cpu.h index 0765339b..bddc7627 100644 --- a/include/odp/arch/default-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/default-linux/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h index 68a67896..217ed4a9 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/classification.h b/include/odp/arch/mips64-linux/odp/api/abi/classification.h index 5a0cac98..732eb27e 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h index d33a777b..38638428 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/event.h b/include/odp/arch/mips64-linux/odp/api/abi/event.h index cbbf47f1..408433ad 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/event.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet.h b/include/odp/arch/mips64-linux/odp/api/abi/packet.h index ca28eed2..be8809ae 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/pool.h b/include/odp/arch/mips64-linux/odp/api/abi/pool.h index b59365eb..3b1f21d9 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/queue.h b/include/odp/arch/mips64-linux/odp/api/abi/queue.h index 66e2a341..53f046f8 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h index e80c4f32..784170ab 100644 --- a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/buffer.h b/include/odp/arch/power64-linux/odp/api/abi/buffer.h index 68a67896..217ed4a9 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/power64-linux/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/classification.h b/include/odp/arch/power64-linux/odp/api/abi/classification.h index 5a0cac98..732eb27e 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/power64-linux/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/crypto.h b/include/odp/arch/power64-linux/odp/api/abi/crypto.h index d33a777b..38638428 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/power64-linux/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/event.h b/include/odp/arch/power64-linux/odp/api/abi/event.h index cbbf47f1..408433ad 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/event.h +++ b/include/odp/arch/power64-linux/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet.h b/include/odp/arch/power64-linux/odp/api/abi/packet.h index ca28eed2..be8809ae 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/power64-linux/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/pool.h b/include/odp/arch/power64-linux/odp/api/abi/pool.h index b59365eb..3b1f21d9 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/power64-linux/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/queue.h b/include/odp/arch/power64-linux/odp/api/abi/queue.h index 66e2a341..53f046f8 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/power64-linux/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h index e80c4f32..784170ab 100644 --- a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h index 68a67896..217ed4a9 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h index 5a0cac98..732eb27e 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h index a5314439..523fa99e 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h index d33a777b..38638428 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/event.h b/include/odp/arch/x86_32-linux/odp/api/abi/event.h index cbbf47f1..408433ad 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/event.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h index ca28eed2..be8809ae 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h index b59365eb..3b1f21d9 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h index 66e2a341..53f046f8 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h index e80c4f32..784170ab 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h index 68a67896..217ed4a9 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h index 5a0cac98..732eb27e 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h index a4695e60..d4fcf892 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h index d33a777b..38638428 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/event.h b/include/odp/arch/x86_64-linux/odp/api/abi/event.h index cbbf47f1..408433ad 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/event.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h index ca28eed2..be8809ae 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h index b59365eb..3b1f21d9 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h index 66e2a341..53f046f8 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h index e80c4f32..784170ab 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/visibility_begin.h b/include/odp/visibility_begin.h index 1bbb43de..e335dab3 100644 --- a/include/odp/visibility_begin.h +++ b/include/odp/visibility_begin.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp/visibility_end.h b/include/odp/visibility_end.h index 748af510..48942467 100644 --- a/include/odp/visibility_end.h +++ b/include/odp/visibility_end.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/include/odp_api.h b/include/odp_api.h index 51558d6b..2185e60a 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/README b/platform/linux-generic/README index 3e05dabf..532f3768 100644 --- a/platform/linux-generic/README +++ b/platform/linux-generic/README @@ -1,4 +1,4 @@ -Copyright (c) 2014, Linaro Limited +Copyright (c) 2014-2018, Linaro Limited All rights reserved. SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/_fdserver.c b/platform/linux-generic/_fdserver.c index 60bb9139..065736f0 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 1a149dea..ab112ace 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/_ishmphy.c b/platform/linux-generic/_ishmphy.c index 76ec5728..8dde2831 100644 --- a/platform/linux-generic/_ishmphy.c +++ b/platform/linux-generic/_ishmphy.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/_ishmpool.c b/platform/linux-generic/_ishmpool.c index c72209d9..4ff24c02 100644 --- a/platform/linux-generic/_ishmpool.c +++ b/platform/linux-generic/_ishmpool.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/aarch64/odp_atomic.h b/platform/linux-generic/arch/aarch64/odp_atomic.h index 23bf96c7..8b6c3aec 100644 --- a/platform/linux-generic/arch/aarch64/odp_atomic.h +++ b/platform/linux-generic/arch/aarch64/odp_atomic.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/aarch64/odp_cpu.h b/platform/linux-generic/arch/aarch64/odp_cpu.h index 170f23d8..0da6e3c6 100644 --- a/platform/linux-generic/arch/aarch64/odp_cpu.h +++ b/platform/linux-generic/arch/aarch64/odp_cpu.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/aarch64/odp_cpu_idling.h b/platform/linux-generic/arch/aarch64/odp_cpu_idling.h index e7dec7d9..8528c859 100644 --- a/platform/linux-generic/arch/aarch64/odp_cpu_idling.h +++ b/platform/linux-generic/arch/aarch64/odp_cpu_idling.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/aarch64/odp_global_time.c b/platform/linux-generic/arch/aarch64/odp_global_time.c index a1b48ea0..fac2088c 100644 --- a/platform/linux-generic/arch/aarch64/odp_global_time.c +++ b/platform/linux-generic/arch/aarch64/odp_global_time.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/aarch64/odp_llsc.h b/platform/linux-generic/arch/aarch64/odp_llsc.h index f5679293..cf55be13 100644 --- a/platform/linux-generic/arch/aarch64/odp_llsc.h +++ b/platform/linux-generic/arch/aarch64/odp_llsc.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/arm/odp_atomic.h b/platform/linux-generic/arch/arm/odp_atomic.h index 590bdf4a..d85a0184 100644 --- a/platform/linux-generic/arch/arm/odp_atomic.h +++ b/platform/linux-generic/arch/arm/odp_atomic.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/arm/odp_cpu.h b/platform/linux-generic/arch/arm/odp_cpu.h index 4e8acc7f..d3d2de34 100644 --- a/platform/linux-generic/arch/arm/odp_cpu.h +++ b/platform/linux-generic/arch/arm/odp_cpu.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/arm/odp_cpu_idling.h b/platform/linux-generic/arch/arm/odp_cpu_idling.h index e7dec7d9..8528c859 100644 --- a/platform/linux-generic/arch/arm/odp_cpu_idling.h +++ b/platform/linux-generic/arch/arm/odp_cpu_idling.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/arm/odp_llsc.h b/platform/linux-generic/arch/arm/odp_llsc.h index fd12c63c..2fea6a0d 100644 --- a/platform/linux-generic/arch/arm/odp_llsc.h +++ b/platform/linux-generic/arch/arm/odp_llsc.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/default/odp_cpu.h b/platform/linux-generic/arch/default/odp_cpu.h index 2df6f65c..18dd968f 100644 --- a/platform/linux-generic/arch/default/odp_cpu.h +++ b/platform/linux-generic/arch/default/odp_cpu.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/default/odp_cpu_cycles.c b/platform/linux-generic/arch/default/odp_cpu_cycles.c index 548aa817..3e3df087 100644 --- a/platform/linux-generic/arch/default/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/default/odp_cpu_cycles.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/default/odp_cpu_idling.h b/platform/linux-generic/arch/default/odp_cpu_idling.h index db1eebd1..70b8cae6 100644 --- a/platform/linux-generic/arch/default/odp_cpu_idling.h +++ b/platform/linux-generic/arch/default/odp_cpu_idling.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/default/odp_global_time.c b/platform/linux-generic/arch/default/odp_global_time.c index ae8a6bbd..faa0ec3f 100644 --- a/platform/linux-generic/arch/default/odp_global_time.c +++ b/platform/linux-generic/arch/default/odp_global_time.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c index 68d3d9ca..f1bad96c 100644 --- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h index 7bf62d48..45d95e9e 100644 --- a/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/mips64/odp/api/abi/cpu.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c index 85a95f09..26b92878 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index 313e58e8..fe600c55 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/odp_arch_time_internal.h b/platform/linux-generic/arch/odp_arch_time_internal.h index ce27101d..c3b90ac5 100644 --- a/platform/linux-generic/arch/odp_arch_time_internal.h +++ b/platform/linux-generic/arch/odp_arch_time_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c index 461edf9d..fd265920 100644 --- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index b59a3581..0fcaa477 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/x86/cpu_flags.h b/platform/linux-generic/arch/x86/cpu_flags.h index f709ca08..b0d26888 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.h +++ b/platform/linux-generic/arch/x86/cpu_flags.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/x86/odp_cpu_cycles.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c index a474ac25..12af1c17 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c index c372f089..70a1a1a7 100644 --- a/platform/linux-generic/arch/x86/odp_global_time.c +++ b/platform/linux-generic/arch/x86/odp_global_time.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index b99e523d..b334a276 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/doc/platform_specific.dox b/platform/linux-generic/doc/platform_specific.dox index 41ad53f4..be048666 100644 --- a/platform/linux-generic/doc/platform_specific.dox +++ b/platform/linux-generic/doc/platform_specific.dox @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/buffer.h b/platform/linux-generic/include-abi/odp/api/abi/buffer.h index 879c88af..60292d50 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/buffer.h +++ b/platform/linux-generic/include-abi/odp/api/abi/buffer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h index ee03a17b..8be28603 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/classification.h b/platform/linux-generic/include-abi/odp/api/abi/classification.h index 3f866c67..1266e3f1 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/classification.h +++ b/platform/linux-generic/include-abi/odp/api/abi/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/crypto.h b/platform/linux-generic/include-abi/odp/api/abi/crypto.h index fe3a9212..b57667e7 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/crypto.h +++ b/platform/linux-generic/include-abi/odp/api/abi/crypto.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/debug.h b/platform/linux-generic/include-abi/odp/api/abi/debug.h index e0397957..a3a86e64 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/debug.h +++ b/platform/linux-generic/include-abi/odp/api/abi/debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/event.h b/platform/linux-generic/include-abi/odp/api/abi/event.h index 49dde956..7ba426a6 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/event.h +++ b/platform/linux-generic/include-abi/odp/api/abi/event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/ipsec.h b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h index 75d84c43..b91da795 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/ipsec.h +++ b/platform/linux-generic/include-abi/odp/api/abi/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h index 07931b81..41ea94a1 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/pool.h b/platform/linux-generic/include-abi/odp/api/abi/pool.h index 586e80f7..cd161d5a 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/pool.h +++ b/platform/linux-generic/include-abi/odp/api/abi/pool.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/queue.h b/platform/linux-generic/include-abi/odp/api/abi/queue.h index 28c721a7..41b44221 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/queue.h +++ b/platform/linux-generic/include-abi/odp/api/abi/queue.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h index 05922238..4e6d4805 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h +++ b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include-abi/odp/api/abi/timer.h b/platform/linux-generic/include-abi/odp/api/abi/timer.h index 19b6a4b0..49752df7 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/timer.h +++ b/platform/linux-generic/include-abi/odp/api/abi/timer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/_fdserver_internal.h b/platform/linux-generic/include/_fdserver_internal.h index 22b28028..8518a5b7 100644 --- a/platform/linux-generic/include/_fdserver_internal.h +++ b/platform/linux-generic/include/_fdserver_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/_ishm_internal.h b/platform/linux-generic/include/_ishm_internal.h index 34068bc0..56c7f5a9 100644 --- a/platform/linux-generic/include/_ishm_internal.h +++ b/platform/linux-generic/include/_ishm_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/_ishmphy_internal.h b/platform/linux-generic/include/_ishmphy_internal.h index 4fe560fd..05e3fcec 100644 --- a/platform/linux-generic/include/_ishmphy_internal.h +++ b/platform/linux-generic/include/_ishmphy_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/_ishmpool_internal.h b/platform/linux-generic/include/_ishmpool_internal.h index 5c5304a7..94bcddae 100644 --- a/platform/linux-generic/include/_ishmpool_internal.h +++ b/platform/linux-generic/include/_ishmpool_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/ishmphy_internal.h b/platform/linux-generic/include/ishmphy_internal.h index 0bc4207a..3ed29f40 100644 --- a/platform/linux-generic/include/ishmphy_internal.h +++ b/platform/linux-generic/include/ishmphy_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h index 1c58c77d..02eda195 100644 --- a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h index b559d4f0..56a2b31c 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h index 4e79ee25..b677cf45 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h index f4e143aa..bbe5f68f 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 984783d5..880fd01f 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 0704abb2..276c69df 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h index c451c4d6..d0f3adc1 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h index bb6f9d02..c07b57b7 100644 --- a/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/std_clib_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/strong_types.h b/platform/linux-generic/include/odp/api/plat/strong_types.h index b253a8f0..6b61c7c2 100644 --- a/platform/linux-generic/include/odp/api/plat/strong_types.h +++ b/platform/linux-generic/include/odp/api/plat/strong_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/sync_inlines.h b/platform/linux-generic/include/odp/api/plat/sync_inlines.h index 76eb6810..34a74444 100644 --- a/platform/linux-generic/include/odp/api/plat/sync_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/sync_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index 185d77de..ac8031ae 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h index 4f850956..ee2613db 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_align_internal.h b/platform/linux-generic/include/odp_align_internal.h index 61ff200c..df2182df 100644 --- a/platform/linux-generic/include/odp_align_internal.h +++ b/platform/linux-generic/include/odp_align_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_atomic_internal.h b/platform/linux-generic/include/odp_atomic_internal.h index 43c29a76..ad43b9fe 100644 --- a/platform/linux-generic/include/odp_atomic_internal.h +++ b/platform/linux-generic/include/odp_atomic_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_bitmap_internal.h b/platform/linux-generic/include/odp_bitmap_internal.h index bd0b15d7..5800fc28 100644 --- a/platform/linux-generic/include/odp_bitmap_internal.h +++ b/platform/linux-generic/include/odp_bitmap_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_bitset.h b/platform/linux-generic/include/odp_bitset.h index 4b7dd6d6..8b403bcd 100644 --- a/platform/linux-generic/include/odp_bitset.h +++ b/platform/linux-generic/include/odp_bitset.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h index a5658e81..9abe79fc 100644 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ b/platform/linux-generic/include/odp_buffer_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index b5266938..d78c6c37 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index 29b39f9c..bca0dfcb 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h index df664c70..3f1d9ce6 100644 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ b/platform/linux-generic/include/odp_classification_inlines.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index 8882a717..47f80dc2 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 3a852a49..6fcb1cc0 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h index 4c44bebe..58054e9e 100644 --- a/platform/linux-generic/include/odp_debug_internal.h +++ b/platform/linux-generic/include/odp_debug_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_errno_define.h b/platform/linux-generic/include/odp_errno_define.h index 94c30e79..570d3738 100644 --- a/platform/linux-generic/include/odp_errno_define.h +++ b/platform/linux-generic/include/odp_errno_define.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_forward_typedefs_internal.h b/platform/linux-generic/include/odp_forward_typedefs_internal.h index f8832f77..fc2d7485 100644 --- a/platform/linux-generic/include/odp_forward_typedefs_internal.h +++ b/platform/linux-generic/include/odp_forward_typedefs_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index f85a2f53..444e1163 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h index 8a7b42c5..a449462a 100644 --- a/platform/linux-generic/include/odp_ipsec_internal.h +++ b/platform/linux-generic/include/odp_ipsec_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_llqueue.h b/platform/linux-generic/include/odp_llqueue.h index 99b12e66..cc4b84ec 100644 --- a/platform/linux-generic/include/odp_llqueue.h +++ b/platform/linux-generic/include/odp_llqueue.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_name_table_internal.h b/platform/linux-generic/include/odp_name_table_internal.h index 52b202ca..fbd64311 100644 --- a/platform/linux-generic/include/odp_name_table_internal.h +++ b/platform/linux-generic/include/odp_name_table_internal.h @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index ec60b872..94fe376a 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 5058c02d..9db53e7c 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 1de0cbf9..e4852cc9 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h index 9d8943a6..2af9bb34 100644 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_io_ring_internal.h b/platform/linux-generic/include/odp_packet_io_ring_internal.h index 5a60a4ee..e459e3a5 100644 --- a/platform/linux-generic/include/odp_packet_io_ring_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ring_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index fa950158..bb81f5f8 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index 88d2306c..f5612222 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * Copyright (c) 2013, Nokia Solutions and Networks * All rights reserved. * diff --git a/platform/linux-generic/include/odp_pkt_queue_internal.h b/platform/linux-generic/include/odp_pkt_queue_internal.h index 83375d02..23eb2b41 100644 --- a/platform/linux-generic/include/odp_pkt_queue_internal.h +++ b/platform/linux-generic/include/odp_pkt_queue_internal.h @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 8284bcd7..c5e73fe7 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_posix_extensions.h b/platform/linux-generic/include/odp_posix_extensions.h index 2c468b4b..93c8fdb6 100644 --- a/platform/linux-generic/include/odp_posix_extensions.h +++ b/platform/linux-generic/include/odp_posix_extensions.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 4d98d467..b14f3ea8 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_queue_lf.h b/platform/linux-generic/include/odp_queue_lf.h index 9bd61e42..ef178e07 100644 --- a/platform/linux-generic/include/odp_queue_lf.h +++ b/platform/linux-generic/include/odp_queue_lf.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index 605d8750..b108346d 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index c2eedb8e..2db07548 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 06a70bdd..8605ca66 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_schedule_scalable.h b/platform/linux-generic/include/odp_schedule_scalable.h index 92d60276..16052a6a 100644 --- a/platform/linux-generic/include/odp_schedule_scalable.h +++ b/platform/linux-generic/include/odp_schedule_scalable.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_schedule_scalable_config.h b/platform/linux-generic/include/odp_schedule_scalable_config.h index b9a9a55f..a84dc072 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_config.h +++ b/platform/linux-generic/include/odp_schedule_scalable_config.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index 14e411e2..fb4720a5 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h index 8bd105d9..a835b8f3 100644 --- a/platform/linux-generic/include/odp_shm_internal.h +++ b/platform/linux-generic/include/odp_shm_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_sorted_list_internal.h b/platform/linux-generic/include/odp_sorted_list_internal.h index 3266c433..9e5a457d 100644 --- a/platform/linux-generic/include/odp_sorted_list_internal.h +++ b/platform/linux-generic/include/odp_sorted_list_internal.h @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h index 0759f727..8dda9e6f 100644 --- a/platform/linux-generic/include/odp_timer_internal.h +++ b/platform/linux-generic/include/odp_timer_internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_timer_wheel_internal.h b/platform/linux-generic/include/odp_timer_wheel_internal.h index a60ab516..c0c411b9 100644 --- a/platform/linux-generic/include/odp_timer_wheel_internal.h +++ b/platform/linux-generic/include/odp_timer_wheel_internal.h @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index 2d1fc549..e4a7dc29 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/protocols/eth.h b/platform/linux-generic/include/protocols/eth.h index 6d00e7fb..36d0bd8b 100644 --- a/platform/linux-generic/include/protocols/eth.h +++ b/platform/linux-generic/include/protocols/eth.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h index e92a3899..f0298069 100644 --- a/platform/linux-generic/include/protocols/ip.h +++ b/platform/linux-generic/include/protocols/ip.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/protocols/ipsec.h b/platform/linux-generic/include/protocols/ipsec.h index 093177fb..7838076d 100644 --- a/platform/linux-generic/include/protocols/ipsec.h +++ b/platform/linux-generic/include/protocols/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/protocols/tcp.h b/platform/linux-generic/include/protocols/tcp.h index 114262e9..5971aea4 100644 --- a/platform/linux-generic/include/protocols/tcp.h +++ b/platform/linux-generic/include/protocols/tcp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/protocols/thash.h b/platform/linux-generic/include/protocols/thash.h index 6b07d4e4..0f10a3cb 100644 --- a/platform/linux-generic/include/protocols/thash.h +++ b/platform/linux-generic/include/protocols/thash.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/include/protocols/udp.h b/platform/linux-generic/include/protocols/udp.h index 85984c99..9d8eb42e 100644 --- a/platform/linux-generic/include/protocols/udp.h +++ b/platform/linux-generic/include/protocols/udp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c index 8c46bb5b..79b96749 100644 --- a/platform/linux-generic/odp_atomic.c +++ b/platform/linux-generic/odp_atomic.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c index f70bdbf8..6006add5 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_bitmap.c b/platform/linux-generic/odp_bitmap.c index b43c8fb9..09de8733 100644 --- a/platform/linux-generic/odp_bitmap.c +++ b/platform/linux-generic/odp_bitmap.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index a0e0cd10..fcab5e81 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index 9cfb05d3..ec7d261d 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_chksum.c b/platform/linux-generic/odp_chksum.c index a792971e..d018e33a 100644 --- a/platform/linux-generic/odp_chksum.c +++ b/platform/linux-generic/odp_chksum.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index ceef1fc1..7c77885f 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_cpu.c b/platform/linux-generic/odp_cpu.c index d208331d..cfdb1cfd 100644 --- a/platform/linux-generic/odp_cpu.c +++ b/platform/linux-generic/odp_cpu.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index ed5cb432..71f7d071 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_cpumask_task.c b/platform/linux-generic/odp_cpumask_task.c index d05ae6d0..c1b79f07 100644 --- a/platform/linux-generic/odp_cpumask_task.c +++ b/platform/linux-generic/odp_cpumask_task.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 62e3a75a..7ad3d5c7 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_errno.c b/platform/linux-generic/odp_errno.c index 57726d17..d3b76654 100644 --- a/platform/linux-generic/odp_errno.c +++ b/platform/linux-generic/odp_errno.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index d8cc0051..986b7317 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_hash.c b/platform/linux-generic/odp_hash.c index 4c7c83e8..dd97d246 100644 --- a/platform/linux-generic/odp_hash.c +++ b/platform/linux-generic/odp_hash.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c index 5b452fba..b6994295 100644 --- a/platform/linux-generic/odp_impl.c +++ b/platform/linux-generic/odp_impl.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 0c5adf33..a2d9d52f 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 98af98c6..b28547a2 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 3a7ebd6e..93f838a5 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 64507d2a..d5348c45 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_name_table.c b/platform/linux-generic/odp_name_table.c index 60af095e..233f6f74 100644 --- a/platform/linux-generic/odp_name_table.c +++ b/platform/linux-generic/odp_name_table.c @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 1c1b45ff..64af81bf 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c index 2909703f..79472131 100644 --- a/platform/linux-generic/odp_packet_flags.c +++ b/platform/linux-generic/odp_packet_flags.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4eae4ed1..c655947d 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 41f0e4df..010856f2 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index e5ba8982..14433d08 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 7cb60562..a7933c9b 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index 9f509082..74f52946 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Linaro Limited +/* Copyright (c) 2018-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 846239a6..895133cd 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index 55d717e8..119ead89 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c index d484ba5a..397a054b 100644 --- a/platform/linux-generic/odp_rwlock_recursive.c +++ b/platform/linux-generic/odp_rwlock_recursive.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 118f9eb1..c91a9338 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 08ca813a..e5f734ae 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index 33767c1f..02396aa0 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 642e7ee7..761f93d3 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index 9bc12f2a..2b3feaa1 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -1,6 +1,6 @@ /* Copyright (c) 2017, ARM Limited. All rights reserved. * - * Copyright (c) 2017, Linaro Limited + * Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 017eaee3..bad47cad 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index bd86e84d..c9b04dfd 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_sorted_list.c b/platform/linux-generic/odp_sorted_list.c index 511fd090..e17f9384 100644 --- a/platform/linux-generic/odp_sorted_list.c +++ b/platform/linux-generic/odp_sorted_list.c @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c index 8ce7b173..2e51aabc 100644 --- a/platform/linux-generic/odp_spinlock.c +++ b/platform/linux-generic/odp_spinlock.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_spinlock_recursive.c b/platform/linux-generic/odp_spinlock_recursive.c index d6d91420..d5288969 100644 --- a/platform/linux-generic/odp_spinlock_recursive.c +++ b/platform/linux-generic/odp_spinlock_recursive.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_std_clib.c b/platform/linux-generic/odp_std_clib.c index b267ea65..f43f62c9 100644 --- a/platform/linux-generic/odp_std_clib.c +++ b/platform/linux-generic/odp_std_clib.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_sync.c b/platform/linux-generic/odp_sync.c index b9e85593..a20278ce 100644 --- a/platform/linux-generic/odp_sync.c +++ b/platform/linux-generic/odp_sync.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 3cbe1d3d..d460a198 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 971837b0..998bad7c 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_thrmask.c b/platform/linux-generic/odp_thrmask.c index f2144287..51986805 100644 --- a/platform/linux-generic/odp_thrmask.c +++ b/platform/linux-generic/odp_thrmask.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c index 63381f44..6a2c3be6 100644 --- a/platform/linux-generic/odp_ticketlock.c +++ b/platform/linux-generic/odp_ticketlock.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 1be2c02a..cfb4ac4a 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index bdb25c60..adc92497 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_timer_wheel.c b/platform/linux-generic/odp_timer_wheel.c index ee7b5694..0320103d 100644 --- a/platform/linux-generic/odp_timer_wheel.c +++ b/platform/linux-generic/odp_timer_wheel.c @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index a6f066c2..96dde266 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -1,6 +1,6 @@ /* Copyright 2015 EZchip Semiconductor Ltd. All Rights Reserved. * - * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_version.c b/platform/linux-generic/odp_version.c index 84547acd..d46fddba 100644 --- a/platform/linux-generic/odp_version.c +++ b/platform/linux-generic/odp_version.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/odp_weak.c b/platform/linux-generic/odp_weak.c index e8273009..6977ef10 100644 --- a/platform/linux-generic/odp_weak.c +++ b/platform/linux-generic/odp_weak.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 6dc60238..a2ec0f8d 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index 7d9869bf..71651abf 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index 3bbb5cd4..ae3daa66 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 95b52664..6dcc7a59 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 3ee2e33a..6b531c08 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * Copyright (c) 2013, Nokia Solutions and Networks * All rights reserved. * diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 66fe247d..f54e0908 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 889903dd..3df7f960 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index 7b26b4c6..f6fb4a73 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * Copyright (c) 2013, Nokia Solutions and Networks * All rights reserved. * diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index 3b708f72..db6eb226 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 749377c0..b3d3f46e 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * Copyright (c) 2013, Nokia Solutions and Networks * All rights reserved. * diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 852bc766..013b7607 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * Copyright (c) 2013, Nokia Solutions and Networks * All rights reserved. * diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c index c3d4faea..ec2bb949 100644 --- a/platform/linux-generic/pktio/sysfs.c +++ b/platform/linux-generic/pktio/sysfs.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c index 3238f9af..678978be 100644 --- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c +++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh index 3c6df8ec..91f78311 100755 --- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh +++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/mmap_vlan_ins/pktio_env b/platform/linux-generic/test/mmap_vlan_ins/pktio_env index 345b5bd5..ba9998e6 100644 --- a/platform/linux-generic/test/mmap_vlan_ins/pktio_env +++ b/platform/linux-generic/test/mmap_vlan_ins/pktio_env @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015, Linaro Limited +# Copyright (c) 2015-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh index 598e5b83..c16bcb86 100755 --- a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh +++ b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.c b/platform/linux-generic/test/pktio_ipc/ipc_common.c index b0fa12a1..9ff0463e 100644 --- a/platform/linux-generic/test/pktio_ipc/ipc_common.c +++ b/platform/linux-generic/test/pktio_ipc/ipc_common.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.h b/platform/linux-generic/test/pktio_ipc/ipc_common.h index 2b04b144..5723a00e 100644 --- a/platform/linux-generic/test/pktio_ipc/ipc_common.h +++ b/platform/linux-generic/test/pktio_ipc/ipc_common.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c index ee46d1da..1b4fba8e 100644 --- a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c +++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c index deb6eddf..89ebea6d 100644 --- a/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c +++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh b/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh index b713c63c..fd3d1bcc 100755 --- a/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh +++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015, Linaro Limited +# Copyright (c) 2015-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/ring/ring_basic.c b/platform/linux-generic/test/ring/ring_basic.c index 62382bec..553e82b5 100644 --- a/platform/linux-generic/test/ring/ring_basic.c +++ b/platform/linux-generic/test/ring/ring_basic.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/ring/ring_main.c b/platform/linux-generic/test/ring/ring_main.c index b1f59a9b..9b08b634 100644 --- a/platform/linux-generic/test/ring/ring_main.c +++ b/platform/linux-generic/test/ring/ring_main.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/ring/ring_stress.c b/platform/linux-generic/test/ring/ring_stress.c index 115d130e..c9bd5308 100644 --- a/platform/linux-generic/test/ring/ring_stress.c +++ b/platform/linux-generic/test/ring/ring_stress.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/ring/ring_suites.c b/platform/linux-generic/test/ring/ring_suites.c index 153826ff..baecba6e 100644 --- a/platform/linux-generic/test/ring/ring_suites.c +++ b/platform/linux-generic/test/ring/ring_suites.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/ring/ring_suites.h b/platform/linux-generic/test/ring/ring_suites.h index 5fa5b9c5..1735f2d7 100644 --- a/platform/linux-generic/test/ring/ring_suites.h +++ b/platform/linux-generic/test/ring/ring_suites.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_env b/platform/linux-generic/test/validation/api/pktio/pktio_env index 345b5bd5..ba9998e6 100644 --- a/platform/linux-generic/test/validation/api/pktio/pktio_env +++ b/platform/linux-generic/test/validation/api/pktio/pktio_env @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015, Linaro Limited +# Copyright (c) 2015-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh index 5b861bbb..5465d0c0 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015, Linaro Limited +# Copyright (c) 2015-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh index 24194cbc..6140fb4c 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh index 610be3bd..2b58f28f 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh index 5ab45094..e141bfd1 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015, Linaro Limited +# Copyright (c) 2015-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_common.h b/platform/linux-generic/test/validation/api/shmem/shmem_common.h index 0a90297f..33df4476 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_common.h +++ b/platform/linux-generic/test/validation/api/shmem/shmem_common.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c index 7f0343cf..2bc7f1bd 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c +++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_linux.h b/platform/linux-generic/test/validation/api/shmem/shmem_linux.h index a07a7758..24646ae7 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_linux.h +++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c index d3b951ef..d44e94c3 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c +++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.h b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.h index 614bbf80..241637e5 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.h +++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c index 4f4fc3fe..7573644c 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c +++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.h b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.h index a8db909a..0493d6ca 100644 --- a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.h +++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/README b/test/README index fa00394e..b2a9048d 100644 --- a/test/README +++ b/test/README @@ -1,4 +1,4 @@ -Copyright (c) 2014, Linaro Limited +Copyright (c) 2014-2018, Linaro Limited All rights reserved. SPDX-License-Identifier: BSD-3-Clause diff --git a/test/common/mask_common.c b/test/common/mask_common.c index 5f872f3e..aa003119 100644 --- a/test/common/mask_common.c +++ b/test/common/mask_common.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/common/mask_common.h b/test/common/mask_common.h index e7a38a7c..60c2390b 100644 --- a/test/common/mask_common.h +++ b/test/common/mask_common.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index d8a17a75..79c3df1e 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/common/odp_cunit_common.h b/test/common/odp_cunit_common.h index f6d38432..a4bfa357 100644 --- a/test/common/odp_cunit_common.h +++ b/test/common/odp_cunit_common.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/common/test_debug.h b/test/common/test_debug.h index aec0977d..e2177941 100644 --- a/test/common/test_debug.h +++ b/test/common/test_debug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/common/test_packet_parser.h b/test/common/test_packet_parser.h index 09c998c9..2d02b98c 100644 --- a/test/common/test_packet_parser.h +++ b/test/common/test_packet_parser.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/dummy_crc.h b/test/performance/dummy_crc.h index 38da4445..68928abe 100644 --- a/test/performance/dummy_crc.h +++ b/test/performance/dummy_crc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index 29539e0e..df41b41f 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 1d598ebb..e4f49fb7 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index a2b9a9ca..26051c2d 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh index 0cb293dc..6166c8b2 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015, Linaro Limited +# Copyright (c) 2015-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index db9bfe76..af2e9574 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_pktio_ordered_run.sh b/test/performance/odp_pktio_ordered_run.sh index d6c2be52..d7f23812 100755 --- a/test/performance/odp_pktio_ordered_run.sh +++ b/test/performance/odp_pktio_ordered_run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 4c09b12e..75f4abf2 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c index ae7a5914..d49a212a 100644 --- a/test/performance/odp_sched_latency.c +++ b/test/performance/odp_sched_latency.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, Linaro Limited +/* Copyright (c) 2016-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_sched_latency_run.sh b/test/performance/odp_sched_latency_run.sh index 6048f581..bcccd77a 100755 --- a/test/performance/odp_sched_latency_run.sh +++ b/test/performance/odp_sched_latency_run.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2016, Linaro Limited +# Copyright (c) 2016-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index 8d2574b7..6b7cff77 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/performance/odp_scheduling_run.sh b/test/performance/odp_scheduling_run.sh index a22326d4..ae3d1c8f 100755 --- a/test/performance/odp_scheduling_run.sh +++ b/test/performance/odp_scheduling_run.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015, Linaro Limited +# Copyright (c) 2015-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/README b/test/validation/api/README index 1baebaaf..7ee90347 100644 --- a/test/validation/api/README +++ b/test/validation/api/README @@ -1,4 +1,4 @@ -Copyright (c) 2015, Linaro Limited +Copyright (c) 2015-2018, Linaro Limited All rights reserved. SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c index 17d5743d..71af2d12 100644 --- a/test/validation/api/atomic/atomic.c +++ b/test/validation/api/atomic/atomic.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c index 7201cca3..a3be4be4 100644 --- a/test/validation/api/barrier/barrier.c +++ b/test/validation/api/barrier/barrier.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c index 7d13bc18..e774c1b3 100644 --- a/test/validation/api/buffer/buffer.c +++ b/test/validation/api/buffer/buffer.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/chksum/chksum.c b/test/validation/api/chksum/chksum.c index 42bda779..45ecbdb8 100644 --- a/test/validation/api/chksum/chksum.c +++ b/test/validation/api/chksum/chksum.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/classification/classification.c b/test/validation/api/classification/classification.c index e89ffbee..d4285411 100644 --- a/test/validation/api/classification/classification.c +++ b/test/validation/api/classification/classification.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/classification/classification.h b/test/validation/api/classification/classification.h index 4a540218..ae8d5722 100644 --- a/test/validation/api/classification/classification.h +++ b/test/validation/api/classification/classification.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c index 8b3738b7..31067345 100644 --- a/test/validation/api/classification/odp_classification_basic.c +++ b/test/validation/api/classification/odp_classification_basic.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c index 60e20ea8..7b54ef15 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification/odp_classification_common.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index f21b8add..626e7013 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index 4cd727f9..7e157970 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/classification/odp_classification_testsuites.h b/test/validation/api/classification/odp_classification_testsuites.h index e1624162..20f6b82d 100644 --- a/test/validation/api/classification/odp_classification_testsuites.h +++ b/test/validation/api/classification/odp_classification_testsuites.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c index 9da68a76..a67a81a2 100644 --- a/test/validation/api/cpumask/cpumask.c +++ b/test/validation/api/cpumask/cpumask.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 9398c5da..88218f8f 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 195f9ce5..e05ba835 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 140bef2a..2551b054 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/errno/errno.c b/test/validation/api/errno/errno.c index 95468a3f..e407382e 100644 --- a/test/validation/api/errno/errno.c +++ b/test/validation/api/errno/errno.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c index ec0fec2d..52ae4f67 100644 --- a/test/validation/api/event/event.c +++ b/test/validation/api/event/event.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash/hash.c index 2216dff8..f7aa9caf 100644 --- a/test/validation/api/hash/hash.c +++ b/test/validation/api/hash/hash.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/init/init.c b/test/validation/api/init/init.c index 3dc40ea5..39023bd6 100644 --- a/test/validation/api/init/init.c +++ b/test/validation/api/init/init.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/init/init.h b/test/validation/api/init/init.h index cad9cf98..c5bcf9a2 100644 --- a/test/validation/api/init/init.h +++ b/test/validation/api/init/init.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/init/init_main_abort.c b/test/validation/api/init/init_main_abort.c index 1b043154..8702a0a7 100644 --- a/test/validation/api/init/init_main_abort.c +++ b/test/validation/api/init/init_main_abort.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/init/init_main_log.c b/test/validation/api/init/init_main_log.c index d5d1ba6d..9dc6cba0 100644 --- a/test/validation/api/init/init_main_log.c +++ b/test/validation/api/init/init_main_log.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c index bb205f6d..3512fca8 100644 --- a/test/validation/api/init/init_main_ok.c +++ b/test/validation/api/init/init_main_ok.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index b16f84ac..e97ff611 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h index f2ebd388..31ebed78 100644 --- a/test/validation/api/ipsec/ipsec.h +++ b/test/validation/api/ipsec/ipsec.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec_async.c b/test/validation/api/ipsec/ipsec_async.c index 79687923..0e979772 100644 --- a/test/validation/api/ipsec/ipsec_async.c +++ b/test/validation/api/ipsec/ipsec_async.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec_inline_in.c b/test/validation/api/ipsec/ipsec_inline_in.c index 2a595353..e2415d1b 100644 --- a/test/validation/api/ipsec/ipsec_inline_in.c +++ b/test/validation/api/ipsec/ipsec_inline_in.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec_inline_out.c b/test/validation/api/ipsec/ipsec_inline_out.c index 0a34e03a..a9d1e222 100644 --- a/test/validation/api/ipsec/ipsec_inline_out.c +++ b/test/validation/api/ipsec/ipsec_inline_out.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec_sync.c b/test/validation/api/ipsec/ipsec_sync.c index c22980a8..49c59601 100644 --- a/test/validation/api/ipsec/ipsec_sync.c +++ b/test/validation/api/ipsec/ipsec_sync.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c index 6262f4cb..8a82abe4 100644 --- a/test/validation/api/ipsec/ipsec_test_in.c +++ b/test/validation/api/ipsec/ipsec_test_in.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c index 4751e6ec..971fbbf8 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h index a6b8616b..4732d6ca 100644 --- a/test/validation/api/ipsec/test_vectors.h +++ b/test/validation/api/ipsec/test_vectors.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c index 4ed1f8d8..67e1e3c8 100644 --- a/test/validation/api/lock/lock.c +++ b/test/validation/api/lock/lock.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index bda8d7c7..c8ef92df 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index e0431441..76df47b1 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h index 688990fb..4424737f 100644 --- a/test/validation/api/pktio/parser.h +++ b/test/validation/api/pktio/parser.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, Linaro Limited +/* Copyright (c) 2017-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index a0496642..884292fa 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index 34f97357..b5e0253b 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 876a90bb..b854c46b 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/random/random.c b/test/validation/api/random/random.c index 9a583e34..9026ba9a 100644 --- a/test/validation/api/random/random.c +++ b/test/validation/api/random/random.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 9d1e08ca..098c03a0 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index fb1898eb..5a262daf 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, Linaro Limited +/* Copyright (c) 2014-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c index 3ef5aab7..ccae5412 100644 --- a/test/validation/api/std_clib/std_clib.c +++ b/test/validation/api/std_clib/std_clib.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/system/system.c b/test/validation/api/system/system.c index 71d48480..75fd26f3 100644 --- a/test/validation/api/system/system.c +++ b/test/validation/api/system/system.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c index fe504e88..2fab1a7d 100644 --- a/test/validation/api/thread/thread.c +++ b/test/validation/api/thread/thread.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index 2be9914b..e2401228 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 26a5b608..60dbbdd0 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index 7bcd8e5f..700b14fd 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2015-2018, Linaro Limited * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause diff --git a/test/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr/traffic_mngr.sh index c88aa805..c8f8d95a 100755 --- a/test/validation/api/traffic_mngr/traffic_mngr.sh +++ b/test/validation/api/traffic_mngr/traffic_mngr.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2017, Linaro Limited +# Copyright (c) 2017-2018, Linaro Limited # All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause commit 99b3ec8c1889a876dcf8f0ea4ef53d77b2e3cd5b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Dec 12 15:12:37 2017 +0200 linux-gen: queue: lock-free implementation Simple implementation of non-blocking, lock-free plain queues. Enqueues are done freely to any free ring node with an atomically increasing counter value. Dequeue operation finds the node with lowest counter value. Implementation requires lockfree 128 bit atomics. Lock-free queues are not supported when those are not available. Signed-off-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7f212fe5..1feecd3b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -113,6 +113,7 @@ noinst_HEADERS = \ include/odp_queue_scalable_internal.h \ include/odp_ring_internal.h \ include/odp_queue_if.h \ + include/odp_queue_lf.h \ include/odp_schedule_if.h \ include/odp_schedule_scalable.h \ include/odp_schedule_scalable_config.h \ @@ -173,6 +174,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_pool.c \ odp_queue.c \ odp_queue_if.c \ + odp_queue_lf.c \ odp_queue_scalable.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 158b1d5f..4d98d467 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -54,6 +54,7 @@ struct queue_entry_s { odp_queue_param_t param; odp_pktin_queue_t pktin; odp_pktout_queue_t pktout; + void *queue_lf; char name[ODP_QUEUE_NAME_LEN]; }; diff --git a/platform/linux-generic/include/odp_queue_lf.h b/platform/linux-generic/include/odp_queue_lf.h new file mode 100644 index 00000000..9bd61e42 --- /dev/null +++ b/platform/linux-generic/include/odp_queue_lf.h @@ -0,0 +1,36 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_QUEUE_LF_H_ +#define ODP_QUEUE_LF_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_queue_if.h> +#include <odp_queue_internal.h> + +/* Lock-free queue functions */ +typedef struct { + queue_enq_fn_t enq; + queue_enq_multi_fn_t enq_multi; + queue_deq_fn_t deq; + queue_deq_multi_fn_t deq_multi; + +} queue_lf_func_t; + +uint32_t queue_lf_init_global(uint32_t *queue_lf_size, + queue_lf_func_t *lf_func); +void queue_lf_term_global(void); +void *queue_lf_create(queue_entry_t *queue); +void queue_lf_destroy(void *queue_lf); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 6a69eb84..7cb60562 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -8,6 +8,7 @@ #include <odp/api/queue.h> #include <odp_queue_internal.h> +#include <odp_queue_lf.h> #include <odp_queue_if.h> #include <odp/api/std_types.h> #include <odp/api/align.h> @@ -39,11 +40,16 @@ static int queue_init(queue_entry_t *queue, const char *name, const odp_queue_param_t *param); -typedef struct queue_table_t { - queue_entry_t queue[ODP_CONFIG_QUEUES]; -} queue_table_t; +typedef struct queue_global_t { + queue_entry_t queue[ODP_CONFIG_QUEUES]; -static queue_table_t *queue_tbl; + uint32_t queue_lf_num; + uint32_t queue_lf_size; + queue_lf_func_t queue_lf_func; + +} queue_global_t; + +static queue_global_t *queue_glb; static queue_entry_t *get_qentry(uint32_t queue_id); @@ -64,26 +70,28 @@ static inline odp_queue_t queue_from_id(uint32_t queue_id) static queue_entry_t *get_qentry(uint32_t queue_id) { - return &queue_tbl->queue[queue_id]; + return &queue_glb->queue[queue_id]; } static int queue_init_global(void) { uint32_t i; odp_shm_t shm; + uint32_t lf_size = 0; + queue_lf_func_t *lf_func; ODP_DBG("Queue init ... "); shm = odp_shm_reserve("odp_queues", - sizeof(queue_table_t), + sizeof(queue_global_t), sizeof(queue_entry_t), 0); - queue_tbl = odp_shm_addr(shm); + queue_glb = odp_shm_addr(shm); - if (queue_tbl == NULL) + if (queue_glb == NULL) return -1; - memset(queue_tbl, 0, sizeof(queue_table_t)); + memset(queue_glb, 0, sizeof(queue_global_t)); for (i = 0; i < ODP_CONFIG_QUEUES; i++) { /* init locks */ @@ -93,6 +101,10 @@ static int queue_init_global(void) queue->s.handle = queue_from_id(i); } + lf_func = &queue_glb->queue_lf_func; + queue_glb->queue_lf_num = queue_lf_init_global(&lf_size, lf_func); + queue_glb->queue_lf_size = lf_size; + ODP_DBG("done\n"); ODP_DBG("Queue init global\n"); ODP_DBG(" struct queue_entry_s size %zu\n", @@ -122,7 +134,7 @@ static int queue_term_global(void) int i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_tbl->queue[i]; + queue = &queue_glb->queue[i]; LOCK(&queue->s.lock); if (queue->s.status != QUEUE_STATUS_FREE) { ODP_ERR("Not destroyed queue: %s\n", queue->s.name); @@ -131,6 +143,8 @@ static int queue_term_global(void) UNLOCK(&queue->s.lock); } + queue_lf_term_global(); + ret = odp_shm_free(odp_shm_lookup("odp_queues")); if (ret < 0) { ODP_ERR("shm free failed for odp_queues"); @@ -151,6 +165,8 @@ static int queue_capability(odp_queue_capability_t *capa) capa->sched_prios = odp_schedule_num_prio(); capa->plain.max_num = capa->max_queues; capa->sched.max_num = capa->max_queues; + capa->plain.lockfree.max_num = queue_glb->queue_lf_num; + capa->plain.lockfree.max_size = queue_glb->queue_lf_size; return 0; } @@ -188,6 +204,7 @@ static odp_queue_t queue_create(const char *name, { uint32_t i; queue_entry_t *queue; + void *queue_lf; odp_queue_t handle = ODP_QUEUE_INVALID; odp_queue_type_t type = ODP_QUEUE_TYPE_PLAIN; odp_queue_param_t default_param; @@ -198,7 +215,7 @@ static odp_queue_t queue_create(const char *name, } for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_tbl->queue[i]; + queue = &queue_glb->queue[i]; if (queue->s.status != QUEUE_STATUS_FREE) continue; @@ -207,7 +224,26 @@ static odp_queue_t queue_create(const char *name, if (queue->s.status == QUEUE_STATUS_FREE) { if (queue_init(queue, name, param)) { UNLOCK(&queue->s.lock); - return handle; + return ODP_QUEUE_INVALID; + } + + if (param->nonblocking == ODP_NONBLOCKING_LF) { + queue_lf_func_t *lf_func; + + lf_func = &queue_glb->queue_lf_func; + + queue_lf = queue_lf_create(queue); + + if (queue_lf == NULL) { + UNLOCK(&queue->s.lock); + return ODP_QUEUE_INVALID; + } + queue->s.queue_lf = queue_lf; + + queue->s.enqueue = lf_func->enq; + queue->s.enqueue_multi = lf_func->enq_multi; + queue->s.dequeue = lf_func->deq; + queue->s.dequeue_multi = lf_func->deq_multi; } type = queue->s.type; @@ -224,7 +260,10 @@ static odp_queue_t queue_create(const char *name, UNLOCK(&queue->s.lock); } - if (handle != ODP_QUEUE_INVALID && type == ODP_QUEUE_TYPE_SCHED) { + if (handle == ODP_QUEUE_INVALID) + return ODP_QUEUE_INVALID; + + if (type == ODP_QUEUE_TYPE_SCHED) { if (sched_fn->init_queue(queue->s.index, &queue->s.param.sched)) { queue->s.status = QUEUE_STATUS_FREE; @@ -289,6 +328,10 @@ static int queue_destroy(odp_queue_t handle) default: ODP_ABORT("Unexpected queue status\n"); } + + if (queue->s.param.nonblocking == ODP_NONBLOCKING_LF) + queue_lf_destroy(queue->s.queue_lf); + UNLOCK(&queue->s.lock); return 0; @@ -313,7 +356,7 @@ static odp_queue_t queue_lookup(const char *name) uint32_t i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue_entry_t *queue = &queue_tbl->queue[i]; + queue_entry_t *queue = &queue_glb->queue[i]; if (queue->s.status == QUEUE_STATUS_FREE || queue->s.status == QUEUE_STATUS_DESTROYED) diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c new file mode 100644 index 00000000..9f509082 --- /dev/null +++ b/platform/linux-generic/odp_queue_lf.c @@ -0,0 +1,346 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/queue.h> +#include <odp/api/atomic.h> +#include <odp/api/shared_memory.h> +#include <odp_queue_lf.h> +#include <string.h> +#include <stdio.h> + +#include "config.h" +#include <odp_debug_internal.h> + +#define RING_LF_SIZE 32 +#define QUEUE_LF_NUM 128 +#define ENQ_RETRIES (RING_LF_SIZE / 4) +#define DEQ_RETRIES (RING_LF_SIZE / 8) + +#ifdef __SIZEOF_INT128__ + +typedef unsigned __int128 u128_t; + +static inline u128_t atomic_load_u128(u128_t *atomic) +{ + return __atomic_load_n(atomic, __ATOMIC_RELAXED); +} + +static inline void atomic_zero_u128(u128_t *atomic) +{ + __atomic_store_n(atomic, 0, __ATOMIC_RELAXED); +} + +static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return __atomic_compare_exchange_n(atomic, &old_val, new_val, + 0 /* strong */, + __ATOMIC_RELEASE, + __ATOMIC_RELAXED); +} + +static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return __atomic_compare_exchange_n(atomic, &old_val, new_val, + 0 /* strong */, + __ATOMIC_ACQUIRE, + __ATOMIC_RELAXED); +} + +#else + +/* These definitions enable build in non 128 bit compatible systems. + * Implementation is active only when 128 bit lockfree atomics are available. + * So, these are never actually used. */ +typedef struct { + uint64_t u64[2]; +} u128_t ODP_ALIGNED(16); + +static inline u128_t atomic_load_u128(u128_t *atomic) +{ + return *atomic; +} + +static inline void atomic_zero_u128(u128_t *atomic) +{ + atomic->u64[0] = 0; + atomic->u64[1] = 0; +} + +static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + (void)old_val; + *atomic = new_val; + return 1; +} + +static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return atomic_cas_rel_u128(atomic, old_val, new_val); +} + +#endif + +/* Node in lock-free ring */ +typedef union { + u128_t u128; + + struct { + /* 0: empty, 1: data */ + uint64_t mark: 1; + + /* A cache aligned pointer fits into 63 bits, since the least + * significant bits are zero. */ + uint64_t ptr: 63; + + /* Data with lowest counter value is the head. */ + uint64_t count; + } s; + +} ring_lf_node_t; + +/* Lock-free ring */ +typedef struct { + ring_lf_node_t node[RING_LF_SIZE]; + int used; + odp_atomic_u64_t enq_counter; + +} queue_lf_t ODP_ALIGNED_CACHE; + +/* Lock-free queue globals */ +typedef struct { + queue_lf_t queue_lf[QUEUE_LF_NUM]; + odp_shm_t shm; + +} queue_lf_global_t ODP_ALIGNED_CACHE; + +static queue_lf_global_t *queue_lf_glb; + +static inline int next_idx(int idx) +{ + int next = idx + 1; + + if (next == RING_LF_SIZE) + next = 0; + + return next; +} + +static int queue_lf_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +{ + queue_entry_t *queue; + queue_lf_t *queue_lf; + int i, j, i_node; + int found; + ring_lf_node_t node_val; + ring_lf_node_t new_val; + ring_lf_node_t *node; + uint64_t counter; + + queue = qentry_from_int(q_int); + queue_lf = queue->s.queue_lf; + + i_node = 0; + + counter = odp_atomic_fetch_inc_u64(&queue_lf->enq_counter); + + for (j = 0; j < ENQ_RETRIES; j++) { + found = 0; + + /* Find empty node */ + for (i = 0; i < RING_LF_SIZE; i++) { + i_node = next_idx(i_node); + node = &queue_lf->node[i_node]; + node_val.u128 = atomic_load_u128(&node->u128); + + if (node_val.s.mark == 0) { + found = 1; + break; + } + } + + /* Queue is full */ + if (found == 0) + return -1; + + /* Try to insert data */ + new_val.s.mark = 1; + new_val.s.count = counter; + new_val.s.ptr = ((uintptr_t)buf_hdr) >> 1; + + if (atomic_cas_rel_u128(&node->u128, node_val.u128, + new_val.u128)) + return 0; + } + + return -1; +} + +static int queue_lf_enq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, + int num) +{ + (void)num; + + if (queue_lf_enq(q_int, buf_hdr[0]) == 0) + return 1; + + return 0; +} + +static odp_buffer_hdr_t *queue_lf_deq(queue_t q_int) +{ + queue_entry_t *queue; + queue_lf_t *queue_lf; + int i, j, i_node; + int found; + ring_lf_node_t node_val, old_val, new_val; + ring_lf_node_t *node, *old; + uint64_t lowest; + + queue = qentry_from_int(q_int); + queue_lf = queue->s.queue_lf; + i_node = 0; + + for (j = 0; j < DEQ_RETRIES; j++) { + found = 0; + lowest = -1; + + /* Find the head node. The one with data and + * the lowest counter. */ + for (i = 0; i < RING_LF_SIZE; i++) { + i_node = next_idx(i_node); + node = &queue_lf->node[i_node]; + node_val.u128 = atomic_load_u128(&node->u128); + + if (node_val.s.mark == 1 && node_val.s.count < lowest) { + old = node; + old_val.u128 = node_val.u128; + lowest = node_val.s.count; + found = 1; + } + } + + /* Queue is empty */ + if (found == 0) + return NULL; + + /* Try to remove data */ + new_val.u128 = old_val.u128; + new_val.s.mark = 0; + + if (atomic_cas_acq_u128(&old->u128, old_val.u128, + new_val.u128)) + return (void *)(((uintptr_t)old_val.s.ptr) << 1); + } + + return NULL; +} + +static int queue_lf_deq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, + int num) +{ + odp_buffer_hdr_t *buf; + + (void)num; + + buf = queue_lf_deq(q_int); + + if (buf == NULL) + return 0; + + buf_hdr[0] = buf; + return 1; +} + +uint32_t queue_lf_init_global(uint32_t *queue_lf_size, + queue_lf_func_t *lf_func) +{ + odp_shm_t shm; + bool lockfree = 0; + + /* 16 byte lockfree CAS operation is needed. */ +#ifdef __SIZEOF_INT128__ + lockfree = __atomic_is_lock_free(16, NULL); +#endif + + ODP_DBG("\nLock-free queue init\n"); + ODP_DBG(" u128 lock-free: %i\n\n", lockfree); + + if (!lockfree) + return 0; + + shm = odp_shm_reserve("odp_queues_lf", sizeof(queue_lf_global_t), + ODP_CACHE_LINE_SIZE, 0); + + queue_lf_glb = odp_shm_addr(shm); + memset(queue_lf_glb, 0, sizeof(queue_lf_global_t)); + + queue_lf_glb->shm = shm; + + memset(lf_func, 0, sizeof(queue_lf_func_t)); + lf_func->enq = queue_lf_enq; + lf_func->enq_multi = queue_lf_enq_multi; + lf_func->deq = queue_lf_deq; + lf_func->deq_multi = queue_lf_deq_multi; + + *queue_lf_size = RING_LF_SIZE; + + return QUEUE_LF_NUM; +} + +void queue_lf_term_global(void) +{ + odp_shm_t shm; + + if (queue_lf_glb == NULL) + return; + + shm = queue_lf_glb->shm; + + if (odp_shm_free(shm) < 0) + ODP_ERR("shm free failed"); +} + +static void init_queue(queue_lf_t *queue_lf) +{ + int i; + + odp_atomic_init_u64(&queue_lf->enq_counter, 0); + + for (i = 0; i < RING_LF_SIZE; i++) + atomic_zero_u128(&queue_lf->node[i].u128); +} + +void *queue_lf_create(queue_entry_t *queue) +{ + int i; + queue_lf_t *queue_lf = NULL; + + if (queue->s.type != ODP_QUEUE_TYPE_PLAIN) + return NULL; + + for (i = 0; i < QUEUE_LF_NUM; i++) { + if (queue_lf_glb->queue_lf[i].used == 0) { + queue_lf = &queue_lf_glb->queue_lf[i]; + memset(queue_lf, 0, sizeof(queue_lf_t)); + init_queue(queue_lf); + queue_lf->used = 1; + break; + } + } + + return queue_lf; +} + +void queue_lf_destroy(void *queue_lf_ptr) +{ + queue_lf_t *queue_lf = queue_lf_ptr; + + queue_lf->used = 0; +} commit 24b4bc45465c35e49c5734d2b776799ce104e4a5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jan 10 15:44:00 2018 +0200 validation: queue: multi-thread plain queue test Test plain queue enqueue and dequeue with multiple concurrent threads. Test blocking and non-blocking lock-free implementations. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 9c4803bc..876a90bb 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -13,6 +13,22 @@ #define MAX_NUM_EVENT (1 * 1024) #define MAX_ITERATION (100) #define MAX_QUEUES (64 * 1024) +#define GLOBALS_NAME "queue_test_globals" +#define DEQ_RETRIES 100 +#define ENQ_RETRIES 100 + +typedef struct { + pthrd_arg cu_thr; + int num_workers; + odp_barrier_t barrier; + odp_queue_t queue; + odp_atomic_u32_t num_event; + + struct { + uint32_t num_event; + } thread[ODP_THREAD_COUNT_MAX]; + +} test_globals_t; static int queue_context = 0xff; static odp_pool_t pool; @@ -30,7 +46,30 @@ static void generate_name(char *name, uint32_t index) static int queue_suite_init(void) { + odp_shm_t shm; + test_globals_t *globals; odp_pool_param_t params; + int num_workers; + odp_cpumask_t mask; + + shm = odp_shm_reserve(GLOBALS_NAME, sizeof(test_globals_t), + ODP_CACHE_LINE_SIZE, 0); + + if (shm == ODP_SHM_INVALID) { + printf("Shared memory reserve failed\n"); + return -1; + } + + globals = odp_shm_addr(shm); + memset(globals, 0, sizeof(test_globals_t)); + + num_workers = odp_cpumask_default_worker(&mask, 0); + + if (num_workers > MAX_WORKERS) + num_workers = MAX_WORKERS; + + globals->num_workers = num_workers; + odp_barrier_init(&globals->barrier, num_workers); odp_pool_param_init(&params); @@ -50,7 +89,25 @@ static int queue_suite_init(void) static int queue_suite_term(void) { - return odp_pool_destroy(pool); + odp_shm_t shm; + + shm = odp_shm_lookup(GLOBALS_NAME); + if (shm == ODP_SHM_INVALID) { + printf("SHM lookup failed.\n"); + return -1; + } + + if (odp_shm_free(shm)) { + printf("SHM free failed.\n"); + return -1; + } + + if (odp_pool_destroy(pool)) { + printf("Pool destroy failed.\n"); + return -1; + } + + return 0; } static void queue_test_capa(void) @@ -410,12 +467,211 @@ static void queue_test_info(void) CU_ASSERT(odp_queue_destroy(q_order) == 0); } +static uint32_t alloc_and_enqueue(odp_queue_t queue, odp_pool_t pool, + uint32_t num) +{ + uint32_t i, ret; + odp_buffer_t buf; + odp_event_t ev; + + for (i = 0; i < num; i++) { + buf = odp_buffer_alloc(pool); + + CU_ASSERT(buf != ODP_BUFFER_INVALID); + + ev = odp_buffer_to_event(buf); + + ret = odp_queue_enq(queue, ev); + + CU_ASSERT(ret == 0); + + if (ret) + break; + } + + return i; +} + +static uint32_t dequeue_and_free_all(odp_queue_t queue) +{ + odp_event_t ev; + uint32_t num, retries; + + num = 0; + retries = 0; + + while (1) { + ev = odp_queue_deq(queue); + + if (ev == ODP_EVENT_INVALID) { + if (retries >= DEQ_RETRIES) + return num; + + retries++; + continue; + } + + retries = 0; + num++; + + odp_event_free(ev); + } + + return num; +} + +static int enqueue_with_retry(odp_queue_t queue, odp_event_t ev) +{ + int i; + + for (i = 0; i < ENQ_RETRIES; i++) + if (odp_queue_enq(queue, ev) == 0) + return 0; + + return -1; +} + +static int queue_test_worker(void *arg) +{ + uint32_t num, retries, num_workers; + int thr_id, ret; + odp_event_t ev; + odp_queue_t queue; + test_globals_t *globals = arg; + + thr_id = odp_thread_id(); + queue = globals->queue; + num_workers = globals->num_workers; + + if (num_workers > 1) + odp_barrier_wait(&globals->barrier); + + retries = 0; + num = odp_atomic_fetch_inc_u32(&globals->num_event); + + /* On average, each worker deq-enq each event once */ + while (num < (num_workers * MAX_NUM_EVENT)) { + ev = odp_queue_deq(queue); + + if (ev == ODP_EVENT_INVALID) { + if (retries < DEQ_RETRIES) { + retries++; + continue; + } + + /* Prevent thread to starve */ + num = odp_atomic_fetch_inc_u32(&globals->num_event); + retries = 0; + continue; + } + + globals->thread[thr_id].num_event++; + + ret = enqueue_with_retry(queue, ev); + + CU_ASSERT(ret == 0); + + num = odp_atomic_fetch_inc_u32(&globals->num_event); + } + + return 0; +} + +static void reset_thread_stat(test_globals_t *globals) +{ + int i; + + odp_atomic_init_u32(&globals->num_event, 0); + + for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) + globals->thread[i].num_event = 0; +} + +static void multithread_test(odp_nonblocking_t nonblocking) +{ + odp_shm_t shm; + test_globals_t *globals; + odp_queue_t queue; + odp_queue_param_t qparams; + odp_queue_capability_t capa; + uint32_t queue_size, max_size; + uint32_t num, sum, num_free, i; + + CU_ASSERT(odp_queue_capability(&capa) == 0); + + queue_size = 2 * MAX_NUM_EVENT; + + max_size = capa.plain.max_size; + + if (nonblocking == ODP_NONBLOCKING_LF) { + if (capa.plain.lockfree.max_num == 0) + return; + + max_size = capa.plain.lockfree.max_size; + } + + if (max_size && queue_size > max_size) + queue_size = max_size; + + num = MAX_NUM_EVENT; + + if (num > queue_size) + num = queue_size / 2; + + shm = odp_shm_lookup(GLOBALS_NAME); + CU_ASSERT_FATAL(shm != ODP_SHM_INVALID); + + globals = odp_shm_addr(shm); + globals->cu_thr.numthrds = globals->num_workers; + + odp_queue_param_init(&qparams); + qparams.type = ODP_QUEUE_TYPE_PLAIN; + qparams.size = queue_size; + qparams.nonblocking = nonblocking; + + queue = odp_queue_create("queue_test_mt", &qparams); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + globals->queue = queue; + reset_thread_stat(globals); + + CU_ASSERT(alloc_and_enqueue(queue, pool, num) == num); + + odp_cunit_thread_create(queue_test_worker, (pthrd_arg *)globals); + + /* Wait for worker threads to terminate */ + odp_cunit_thread_exit((pthrd_arg *)globals); + + sum = 0; + for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) + sum += globals->thread[i].num_event; + + CU_ASSERT(sum != 0); + + num_free = dequeue_and_free_all(queue); + + CU_ASSERT(num_free == num); + CU_ASSERT(odp_queue_destroy(queue) == 0); +} + +static void queue_test_mt_plain_block(void) +{ + multithread_test(ODP_BLOCKING); +} + +static void queue_test_mt_plain_nonblock_lf(void) +{ + multithread_test(ODP_NONBLOCKING_LF); +} + odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_capa), ODP_TEST_INFO(queue_test_mode), ODP_TEST_INFO(queue_test_lockfree), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), + ODP_TEST_INFO(queue_test_mt_plain_block), + ODP_TEST_INFO(queue_test_mt_plain_nonblock_lf), ODP_TEST_INFO_NULL, }; commit 86f6510923f5e438bd8bb052875000661750b8c8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Dec 20 13:10:55 2017 +0200 validation: queue: test lock-free queue Added simple, single threaded enqueue/dequeue test for lock-free queues. Signed-off-by: Petri Savolainen <petri.savolainen(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/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index eaf305d5..9c4803bc 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -9,9 +9,9 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#define MAX_BUFFER_QUEUE (8) -#define MSG_POOL_SIZE (4 * 1024 * 1024) -#define CONFIG_MAX_ITERATION (100) +#define BURST_SIZE (8) +#define MAX_NUM_EVENT (1 * 1024) +#define MAX_ITERATION (100) #define MAX_QUEUES (64 * 1024) static int queue_context = 0xff; @@ -32,9 +32,11 @@ static int queue_suite_init(void) { odp_pool_param_t params; - params.buf.size = 0; + odp_pool_param_init(&params); + + params.buf.size = 4; params.buf.align = ODP_CACHE_LINE_SIZE; - params.buf.num = 1024 * 10; + params.buf.num = MAX_NUM_EVENT; params.type = ODP_POOL_BUFFER; pool = odp_pool_create("msg_pool", &params); @@ -152,18 +154,105 @@ static void queue_test_mode(void) } } +static odp_event_t dequeue_event(odp_queue_t queue) +{ + odp_event_t ev; + int i; + + for (i = 0; i < MAX_ITERATION; i++) { + ev = odp_queue_deq(queue); + if (ev != ODP_EVENT_INVALID) + break; + } + + return ev; +} + +static void queue_test_lockfree(void) +{ + odp_queue_param_t param; + odp_queue_t queue; + odp_queue_capability_t capa; + uint32_t max_burst, burst, i, j; + odp_pool_t pool; + odp_buffer_t buf; + odp_event_t ev; + uint32_t *data; + + CU_ASSERT_FATAL(odp_queue_capability(&capa) == 0); + + if (capa.plain.lockfree.max_num == 0) + return; + + max_burst = capa.plain.lockfree.max_size; + + if (max_burst == 0 || max_burst > MAX_NUM_EVENT) + max_burst = MAX_NUM_EVENT; + + pool = odp_pool_lookup("msg_pool"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + odp_queue_param_init(&param); + param.type = ODP_QUEUE_TYPE_PLAIN; + param.nonblocking = ODP_NONBLOCKING_LF; + param.size = max_burst; + + queue = odp_queue_create("lockfree_queue", &param); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + CU_ASSERT(odp_queue_deq(queue) == ODP_EVENT_INVALID); + + buf = odp_buffer_alloc(pool); + CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); + ev = odp_buffer_to_event(buf); + CU_ASSERT(odp_queue_enq(queue, ev) == 0); + ev = dequeue_event(queue); + CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID); + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + + for (j = 0; j < 2; j++) { + if (j == 0) + burst = max_burst / 4; + else + burst = max_burst; + + for (i = 0; i < burst; i++) { + buf = odp_buffer_alloc(pool); + CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); + data = odp_buffer_addr(buf); + *data = i; + ev = odp_buffer_to_event(buf); + CU_ASSERT(odp_queue_enq(queue, ev) == 0); + } + + for (i = 0; i < burst; i++) { + ev = dequeue_event(queue); + CU_ASSERT(ev != ODP_EVENT_INVALID); + if (ev != ODP_EVENT_INVALID) { + buf = odp_buffer_from_event(ev); + data = odp_buffer_addr(buf); + CU_ASSERT(*data == i); + odp_event_free(ev); + } + } + } + + CU_ASSERT(odp_queue_destroy(queue) == 0); +} + static void queue_test_param(void) { odp_queue_t queue, null_queue; - odp_event_t enev[MAX_BUFFER_QUEUE]; - odp_event_t deev[MAX_BUFFER_QUEUE]; + odp_event_t enev[BURST_SIZE]; + odp_event_t deev[BURST_SIZE]; odp_buffer_t buf; odp_event_t ev; odp_pool_t msg_pool; odp_event_t *pev_tmp; int i, deq_ret, ret; int nr_deq_entries = 0; - int max_iteration = CONFIG_MAX_ITERATION; + int max_iteration = MAX_ITERATION; odp_queue_param_t qparams; odp_buffer_t enbuf; @@ -222,7 +311,7 @@ static void queue_test_param(void) odp_buffer_free(buf); } - for (i = 0; i < MAX_BUFFER_QUEUE; i++) { + for (i = 0; i < BURST_SIZE; i++) { buf = odp_buffer_alloc(msg_pool); enev[i] = odp_buffer_to_event(buf); } @@ -232,23 +321,22 @@ static void queue_test_param(void) * constraints in the implementation at that given point of time. * But here we assume that we succeed in enqueuing all buffers. */ - ret = odp_queue_enq_multi(queue, enev, MAX_BUFFER_QUEUE); - CU_ASSERT(MAX_BUFFER_QUEUE == ret); + ret = odp_queue_enq_multi(queue, enev, BURST_SIZE); + CU_ASSERT(BURST_SIZE == ret); i = ret < 0 ? 0 : ret; - for ( ; i < MAX_BUFFER_QUEUE; i++) + for ( ; i < BURST_SIZE; i++) odp_event_free(enev[i]); pev_tmp = deev; do { - deq_ret = odp_queue_deq_multi(queue, pev_tmp, - MAX_BUFFER_QUEUE); + deq_ret = odp_queue_deq_multi(queue, pev_tmp, BURST_SIZE); nr_deq_entries += deq_ret; max_iteration--; pev_tmp += deq_ret; CU_ASSERT(max_iteration >= 0); - } while (nr_deq_entries < MAX_BUFFER_QUEUE); + } while (nr_deq_entries < BURST_SIZE); - for (i = 0; i < MAX_BUFFER_QUEUE; i++) { + for (i = 0; i < BURST_SIZE; i++) { enbuf = odp_buffer_from_event(enev[i]); CU_ASSERT(enev[i] == deev[i]); odp_buffer_free(enbuf); @@ -325,6 +413,7 @@ static void queue_test_info(void) odp_testinfo_t queue_suite[] = { ODP_TEST_INFO(queue_test_capa), ODP_TEST_INFO(queue_test_mode), + ODP_TEST_INFO(queue_test_lockfree), ODP_TEST_INFO(queue_test_param), ODP_TEST_INFO(queue_test_info), ODP_TEST_INFO_NULL, commit 08215084ecd932d35bf663327e37e417949750d9 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Dec 12 15:52:38 2017 +0200 api: queue: block-free capabilities Lock-free and wait-free implementations may differ a lot from the default (blocking) implementation. Thus the maximum number of queues and queue sizes may be more limited. Non-blocking enum is not needed anymore as capability, since number of queues may be zero for LF/WF when not implemented. Signed-off-by: Petri Savolainen <petri.savolainen(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/queue.h b/include/odp/api/spec/queue.h index f83dea9f..d5a0fe3e 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -159,35 +159,81 @@ typedef struct odp_queue_capability_t { /** Plain queue capabilities */ struct { - /** Maximum number of plain queues of the default size. */ + /** Maximum number of plain (ODP_BLOCKING) queues of the + * default size. */ uint32_t max_num; - /** Maximum number of events a plain queue can store - * simultaneously. The value of zero means that plain + /** Maximum number of events a plain (ODP_BLOCKING) queue can + * store simultaneously. The value of zero means that plain * queues do not have a size limit, but a single queue can * store all available events. */ uint32_t max_size; - /** The strongest guarantee of block freedom that is supported - * for plain queues. */ - odp_nonblocking_t nonblocking; + /** Lock-free (ODP_NONBLOCKING_LF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Lock-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } lockfree; + + /** Wait-free (ODP_NONBLOCKING_WF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Wait-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } waitfree; } plain; /** Scheduled queue capabilities */ struct { - /** Maximum number of scheduled queues of the default size. */ + /** Maximum number of scheduled (ODP_BLOCKING) queues of the + * default size. */ uint32_t max_num; - /** Maximum number of events a scheduled queue can store - * simultaneously. The value of zero means that scheduled - * queues do not have a size limit, but a single queue can - * store all available events. */ + /** Maximum number of events a scheduled (ODP_BLOCKING) queue + * can store simultaneously. The value of zero means that + * scheduled queues do not have a size limit, but a single + * queue can store all available events. */ uint32_t max_size; - /** The strongest guarantee of block freedom that is supported - * for scheduled queues. */ - odp_nonblocking_t nonblocking; + /** Lock-free (ODP_NONBLOCKING_LF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Lock-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } lockfree; + + /** Wait-free (ODP_NONBLOCKING_WF) implementation capabilities. + * The specification is the same as for the blocking + * implementation. */ + struct { + /** Maximum number of queues. Wait-free queues are not + * supported when zero. */ + uint32_t max_num; + + /** Maximum queue size */ + uint32_t max_size; + + } waitfree; } sched; diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 58103930..6a69eb84 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -150,9 +150,7 @@ static int queue_capability(odp_queue_capability_t *capa) capa->max_sched_groups = sched_fn->num_grps(); capa->sched_prios = odp_schedule_num_prio(); capa->plain.max_num = capa->max_queues; - capa->plain.nonblocking = ODP_BLOCKING; capa->sched.max_num = capa->max_queues; - capa->sched.nonblocking = ODP_BLOCKING; return 0; } diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index da4fd835..846239a6 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -316,10 +316,8 @@ static int queue_capability(odp_queue_capability_t *capa) capa->sched_prios = odp_schedule_num_prio(); capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; capa->plain.max_size = 0; - capa->plain.nonblocking = ODP_BLOCKING; capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; capa->sched.max_size = 0; - capa->sched.nonblocking = ODP_BLOCKING; return 0; } diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 8746f506..eaf305d5 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -68,8 +68,6 @@ static void queue_test_capa(void) CU_ASSERT(capa.sched_prios != 0); CU_ASSERT(capa.plain.max_num != 0); CU_ASSERT(capa.sched.max_num != 0); - CU_ASSERT(capa.plain.nonblocking >= ODP_BLOCKING); - CU_ASSERT(capa.sched.nonblocking >= ODP_BLOCKING); min = capa.plain.max_num; if (min > capa.sched.max_num) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- LICENSE | 2 +- README | 2 +- doc/application-api-guide/api_guide_lines.dox | 2 +- doc/application-api-guide/examples.dox | 2 +- doc/application-api-guide/odp.dox | 2 +- doc/application-api-guide/release.dox | 2 +- doc/helper-guide/odp.dox | 2 +- example/classifier/odp_classifier.c | 2 +- example/example_debug.h | 2 +- example/generator/odp_generator.c | 2 +- example/hello/odp_hello.c | 2 +- example/ipfragreass/odp_ipfragreass.c | 2 +- example/ipfragreass/odp_ipfragreass_atomics.h | 2 +- example/ipfragreass/odp_ipfragreass_atomics_arm.h | 2 +- example/ipfragreass/odp_ipfragreass_fragment.c | 2 +- example/ipfragreass/odp_ipfragreass_fragment.h | 2 +- example/ipfragreass/odp_ipfragreass_helpers.c | 2 +- example/ipfragreass/odp_ipfragreass_helpers.h | 2 +- example/ipfragreass/odp_ipfragreass_ip.h | 2 +- example/ipfragreass/odp_ipfragreass_reassemble.c | 2 +- example/ipfragreass/odp_ipfragreass_reassemble.h | 2 +- example/ipsec/README | 2 +- example/ipsec/odp_ipsec.c | 2 +- example/ipsec/odp_ipsec_cache.c | 2 +- example/ipsec/odp_ipsec_cache.h | 2 +- example/ipsec/odp_ipsec_fwd_db.c | 2 +- example/ipsec/odp_ipsec_fwd_db.h | 2 +- example/ipsec/odp_ipsec_misc.h | 2 +- example/ipsec/odp_ipsec_sa_db.c | 2 +- example/ipsec/odp_ipsec_sa_db.h | 2 +- example/ipsec/odp_ipsec_sp_db.c | 2 +- example/ipsec/odp_ipsec_sp_db.h | 2 +- example/ipsec/odp_ipsec_stream.c | 2 +- example/ipsec/odp_ipsec_stream.h | 2 +- example/ipsec_api/odp_ipsec.c | 2 +- example/ipsec_api/odp_ipsec_cache.c | 2 +- example/ipsec_api/odp_ipsec_cache.h | 2 +- example/ipsec_offload/odp_ipsec_offload.c | 2 +- example/ipsec_offload/odp_ipsec_offload_cache.c | 2 +- example/ipsec_offload/odp_ipsec_offload_cache.h | 2 +- example/ipsec_offload/odp_ipsec_offload_fwd_db.c | 2 +- example/ipsec_offload/odp_ipsec_offload_fwd_db.h | 2 +- example/ipsec_offload/odp_ipsec_offload_misc.h | 2 +- example/ipsec_offload/odp_ipsec_offload_sa_db.c | 2 +- example/ipsec_offload/odp_ipsec_offload_sa_db.h | 2 +- example/ipsec_offload/odp_ipsec_offload_sp_db.c | 2 +- example/ipsec_offload/odp_ipsec_offload_sp_db.h | 2 +- example/l2fwd_simple/l2fwd_simple_run.sh | 2 +- example/l2fwd_simple/odp_l2fwd_simple.c | 2 +- example/l3fwd/odp_l3fwd.c | 2 +- example/l3fwd/odp_l3fwd_db.c | 2 +- example/l3fwd/odp_l3fwd_db.h | 2 +- example/l3fwd/odp_l3fwd_lpm.c | 2 +- example/l3fwd/odp_l3fwd_lpm.h | 2 +- example/l3fwd/odp_l3fwd_run.sh | 2 +- example/packet/odp_pktio.c | 2 +- example/packet/pktio_run.sh | 2 +- example/switch/odp_switch.c | 2 +- example/switch/switch_run.sh | 2 +- example/time/time_global_test.c | 2 +- example/timer/odp_timer_simple.c | 2 +- example/timer/odp_timer_test.c | 2 +- example/traffic_mgmt/odp_traffic_mgmt.c | 2 +- helper/chksum.c | 2 +- helper/cuckootable.c | 2 +- helper/eth.c | 2 +- helper/hashtable.c | 2 +- helper/include/odp/helper/chksum.h | 2 +- helper/include/odp/helper/eth.h | 2 +- helper/include/odp/helper/icmp.h | 2 +- helper/include/odp/helper/ip.h | 2 +- helper/include/odp/helper/ipsec.h | 2 +- helper/include/odp/helper/linux.h | 2 +- helper/include/odp/helper/linux/process.h | 2 +- helper/include/odp/helper/linux/pthread.h | 2 +- helper/include/odp/helper/odph_api.h | 2 +- helper/include/odp/helper/odph_cuckootable.h | 2 +- helper/include/odp/helper/odph_hashtable.h | 2 +- helper/include/odp/helper/odph_iplookuptable.h | 2 +- helper/include/odp/helper/odph_lineartable.h | 2 +- helper/include/odp/helper/strong_types.h | 2 +- helper/include/odp/helper/table.h | 2 +- helper/include/odp/helper/tcp.h | 2 +- helper/include/odp/helper/threads.h | 2 +- helper/include/odp/helper/udp.h | 2 +- helper/include/odph_debug.h | 2 +- helper/include/odph_list_internal.h | 2 +- helper/ip.c | 2 +- helper/iplookuptable.c | 2 +- helper/lineartable.c | 2 +- helper/linux/thread.c | 2 +- helper/test/chksum.c | 2 +- helper/test/cuckootable.c | 2 +- helper/test/iplookuptable.c | 2 +- helper/test/linux/process.c | 2 +- helper/test/linux/pthread.c | 2 +- helper/test/odpthreads.c | 2 +- helper/test/odpthreads_as_processes | 2 +- helper/test/odpthreads_as_pthreads | 2 +- helper/test/parse.c | 2 +- helper/test/table.c | 2 +- helper/threads.c | 2 +- include/odp.h | 2 +- include/odp/api/abi-default/align.h | 2 +- include/odp/api/abi-default/atomic.h | 2 +- include/odp/api/abi-default/barrier.h | 2 +- include/odp/api/abi-default/buffer.h | 2 +- include/odp/api/abi-default/byteorder.h | 2 +- include/odp/api/abi-default/classification.h | 2 +- include/odp/api/abi-default/cpu.h | 2 +- include/odp/api/abi-default/cpumask.h | 2 +- include/odp/api/abi-default/crypto.h | 2 +- include/odp/api/abi-default/debug.h | 2 +- include/odp/api/abi-default/event.h | 2 +- include/odp/api/abi-default/init.h | 2 +- include/odp/api/abi-default/ipsec.h | 2 +- include/odp/api/abi-default/packet.h | 2 +- include/odp/api/abi-default/packet_flags.h | 2 +- include/odp/api/abi-default/packet_io.h | 2 +- include/odp/api/abi-default/pool.h | 2 +- include/odp/api/abi-default/queue.h | 2 +- include/odp/api/abi-default/rwlock.h | 2 +- include/odp/api/abi-default/rwlock_recursive.h | 2 +- include/odp/api/abi-default/schedule.h | 2 +- include/odp/api/abi-default/schedule_types.h | 2 +- include/odp/api/abi-default/shared_memory.h | 2 +- include/odp/api/abi-default/spinlock.h | 2 +- include/odp/api/abi-default/spinlock_recursive.h | 2 +- include/odp/api/abi-default/std_clib.h | 2 +- include/odp/api/abi-default/std_types.h | 2 +- include/odp/api/abi-default/sync.h | 2 +- include/odp/api/abi-default/thread.h | 2 +- include/odp/api/abi-default/thrmask.h | 2 +- include/odp/api/abi-default/ticketlock.h | 2 +- include/odp/api/abi-default/time.h | 2 +- include/odp/api/abi-default/timer.h | 2 +- include/odp/api/abi-default/traffic_mngr.h | 2 +- include/odp/api/abi-default/version.h | 2 +- include/odp/api/align.h | 2 +- include/odp/api/atomic.h | 2 +- include/odp/api/barrier.h | 2 +- include/odp/api/buffer.h | 2 +- include/odp/api/byteorder.h | 2 +- include/odp/api/chksum.h | 2 +- include/odp/api/classification.h | 2 +- include/odp/api/cpu.h | 2 +- include/odp/api/cpumask.h | 2 +- include/odp/api/crypto.h | 2 +- include/odp/api/debug.h | 2 +- include/odp/api/deprecated.h | 2 +- include/odp/api/errno.h | 2 +- include/odp/api/event.h | 2 +- include/odp/api/feature.h | 2 +- include/odp/api/hash.h | 2 +- include/odp/api/hints.h | 2 +- include/odp/api/init.h | 2 +- include/odp/api/ipsec.h | 2 +- include/odp/api/packet.h | 2 +- include/odp/api/packet_flags.h | 2 +- include/odp/api/packet_io.h | 2 +- include/odp/api/packet_io_stats.h | 2 +- include/odp/api/pool.h | 2 +- include/odp/api/queue.h | 2 +- include/odp/api/random.h | 2 +- include/odp/api/rwlock.h | 2 +- include/odp/api/rwlock_recursive.h | 2 +- include/odp/api/schedule.h | 2 +- include/odp/api/schedule_types.h | 2 +- include/odp/api/shared_memory.h | 2 +- include/odp/api/spec/align.h | 2 +- include/odp/api/spec/atomic.h | 2 +- include/odp/api/spec/barrier.h | 2 +- include/odp/api/spec/buffer.h | 2 +- include/odp/api/spec/byteorder.h | 2 +- include/odp/api/spec/chksum.h | 2 +- include/odp/api/spec/classification.h | 2 +- include/odp/api/spec/cpu.h | 2 +- include/odp/api/spec/cpumask.h | 2 +- include/odp/api/spec/crypto.h | 2 +- include/odp/api/spec/debug.h | 2 +- include/odp/api/spec/deprecated.h.in | 2 +- include/odp/api/spec/errno.h | 2 +- include/odp/api/spec/event.h | 2 +- include/odp/api/spec/feature.h | 2 +- include/odp/api/spec/hash.h | 2 +- include/odp/api/spec/hints.h | 2 +- include/odp/api/spec/init.h | 2 +- include/odp/api/spec/ipsec.h | 2 +- include/odp/api/spec/packet.h | 2 +- include/odp/api/spec/packet_flags.h | 2 +- include/odp/api/spec/packet_io.h | 2 +- include/odp/api/spec/packet_io_stats.h | 2 +- include/odp/api/spec/pool.h | 2 +- include/odp/api/spec/queue.h | 76 +++- include/odp/api/spec/random.h | 2 +- include/odp/api/spec/rwlock.h | 2 +- include/odp/api/spec/rwlock_recursive.h | 2 +- include/odp/api/spec/schedule.h | 2 +- include/odp/api/spec/schedule_types.h | 2 +- include/odp/api/spec/shared_memory.h | 2 +- include/odp/api/spec/spinlock.h | 2 +- include/odp/api/spec/spinlock_recursive.h | 2 +- include/odp/api/spec/std_clib.h | 2 +- include/odp/api/spec/std_types.h | 2 +- include/odp/api/spec/support.h | 2 +- include/odp/api/spec/sync.h | 2 +- include/odp/api/spec/system_info.h | 2 +- include/odp/api/spec/thread.h | 2 +- include/odp/api/spec/thread_types.h | 2 +- include/odp/api/spec/threshold.h | 2 +- include/odp/api/spec/thrmask.h | 2 +- include/odp/api/spec/ticketlock.h | 2 +- include/odp/api/spec/time.h | 2 +- include/odp/api/spec/timer.h | 2 +- include/odp/api/spec/traffic_mngr.h | 2 +- include/odp/api/spec/version.h.in | 2 +- include/odp/api/spinlock.h | 2 +- include/odp/api/spinlock_recursive.h | 2 +- include/odp/api/std_clib.h | 2 +- include/odp/api/std_types.h | 2 +- include/odp/api/support.h | 2 +- include/odp/api/sync.h | 2 +- include/odp/api/system_info.h | 2 +- include/odp/api/thread.h | 2 +- include/odp/api/threshold.h | 2 +- include/odp/api/thrmask.h | 2 +- include/odp/api/ticketlock.h | 2 +- include/odp/api/time.h | 2 +- include/odp/api/timer.h | 2 +- include/odp/api/traffic_mngr.h | 2 +- include/odp/api/version.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/align.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/atomic.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/byteorder.h | 2 +- .../arch/arm32-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/cpu.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/debug.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/event.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/init.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/packet.h | 2 +- .../arch/arm32-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/rwlock.h | 2 +- .../arm32-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/schedule.h | 2 +- .../arch/arm32-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/arm32-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/spinlock.h | 2 +- .../arm32-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/thread.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/time.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/timer.h | 2 +- .../arch/arm32-linux/odp/api/abi/traffic_mngr.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/version.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/align.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/atomic.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/byteorder.h | 2 +- .../arch/arm64-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/cpu.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/debug.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/packet.h | 2 +- .../arch/arm64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/rwlock.h | 2 +- .../arm64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/schedule.h | 2 +- .../arch/arm64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/arm64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/spinlock.h | 2 +- .../arm64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/thread.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/timer.h | 2 +- .../arch/arm64-linux/odp/api/abi/traffic_mngr.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/version.h | 2 +- include/odp/arch/default-linux/odp/api/abi/align.h | 2 +- .../odp/arch/default-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/default-linux/odp/api/abi/barrier.h | 2 +- .../odp/arch/default-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/default-linux/odp/api/abi/byteorder.h | 2 +- .../default-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/default-linux/odp/api/abi/cpu.h | 2 +- .../odp/arch/default-linux/odp/api/abi/cpumask.h | 2 +- .../odp/arch/default-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/default-linux/odp/api/abi/debug.h | 2 +- include/odp/arch/default-linux/odp/api/abi/event.h | 2 +- include/odp/arch/default-linux/odp/api/abi/init.h | 2 +- include/odp/arch/default-linux/odp/api/abi/ipsec.h | 2 +- .../odp/arch/default-linux/odp/api/abi/packet.h | 2 +- .../arch/default-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/default-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/default-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/default-linux/odp/api/abi/queue.h | 2 +- .../odp/arch/default-linux/odp/api/abi/rwlock.h | 2 +- .../default-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/default-linux/odp/api/abi/schedule.h | 2 +- .../default-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/default-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/default-linux/odp/api/abi/spinlock.h | 2 +- .../default-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/default-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/default-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/default-linux/odp/api/abi/sync.h | 2 +- .../odp/arch/default-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/default-linux/odp/api/abi/thrmask.h | 2 +- .../arch/default-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/default-linux/odp/api/abi/time.h | 2 +- include/odp/arch/default-linux/odp/api/abi/timer.h | 2 +- .../arch/default-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/default-linux/odp/api/abi/version.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/align.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/byteorder.h | 2 +- .../arch/mips64-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/cpu.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/debug.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/packet.h | 2 +- .../arch/mips64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/rwlock.h | 2 +- .../mips64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/schedule.h | 2 +- .../arch/mips64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/mips64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/spinlock.h | 2 +- .../mips64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/timer.h | 2 +- .../arch/mips64-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/version.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/align.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/barrier.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/byteorder.h | 2 +- .../power64-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/cpu.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/cpumask.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/debug.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/ipsec.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/packet.h | 2 +- .../arch/power64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/queue.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/rwlock.h | 2 +- .../power64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/schedule.h | 2 +- .../power64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/power64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/spinlock.h | 2 +- .../power64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/sync.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/thrmask.h | 2 +- .../arch/power64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/timer.h | 2 +- .../arch/power64-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/version.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/align.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/byteorder.h | 2 +- .../arch/x86_32-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/cpu.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/debug.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/event.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/init.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/packet.h | 2 +- .../arch/x86_32-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h | 2 +- .../x86_32-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/schedule.h | 2 +- .../arch/x86_32-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/x86_32-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/spinlock.h | 2 +- .../x86_32-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/time.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/timer.h | 2 +- .../arch/x86_32-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/version.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/align.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/atomic.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/barrier.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/byteorder.h | 2 +- .../arch/x86_64-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/cpu.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/cpumask.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/debug.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/init.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/packet.h | 2 +- .../arch/x86_64-linux/odp/api/abi/packet_flags.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/packet_io.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/pool.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/queue.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h | 2 +- .../x86_64-linux/odp/api/abi/rwlock_recursive.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/schedule.h | 2 +- .../arch/x86_64-linux/odp/api/abi/schedule_types.h | 2 +- .../arch/x86_64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/spinlock.h | 2 +- .../x86_64-linux/odp/api/abi/spinlock_recursive.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/std_clib.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/std_types.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/sync.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/thread.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/thrmask.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/ticketlock.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/time.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/timer.h | 2 +- .../arch/x86_64-linux/odp/api/abi/traffic_mngr.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/version.h | 2 +- include/odp/visibility_begin.h | 2 +- include/odp/visibility_end.h | 2 +- include/odp_api.h | 2 +- platform/linux-generic/Makefile.am | 2 + platform/linux-generic/README | 2 +- platform/linux-generic/_fdserver.c | 2 +- platform/linux-generic/_ishm.c | 2 +- platform/linux-generic/_ishmphy.c | 2 +- platform/linux-generic/_ishmpool.c | 2 +- .../linux-generic/arch/aarch64/odp/api/abi/cpu.h | 2 +- platform/linux-generic/arch/aarch64/odp_atomic.h | 2 +- platform/linux-generic/arch/aarch64/odp_cpu.h | 2 +- .../linux-generic/arch/aarch64/odp_cpu_idling.h | 2 +- .../linux-generic/arch/aarch64/odp_global_time.c | 2 +- platform/linux-generic/arch/aarch64/odp_llsc.h | 2 +- platform/linux-generic/arch/arm/odp/api/abi/cpu.h | 2 +- platform/linux-generic/arch/arm/odp_atomic.h | 2 +- platform/linux-generic/arch/arm/odp_cpu.h | 2 +- platform/linux-generic/arch/arm/odp_cpu_idling.h | 2 +- platform/linux-generic/arch/arm/odp_llsc.h | 2 +- .../linux-generic/arch/default/odp/api/abi/cpu.h | 2 +- platform/linux-generic/arch/default/odp_cpu.h | 2 +- .../linux-generic/arch/default/odp_cpu_cycles.c | 2 +- .../linux-generic/arch/default/odp_cpu_idling.h | 2 +- .../linux-generic/arch/default/odp_global_time.c | 2 +- .../linux-generic/arch/default/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/mips64/odp/api/abi/cpu.h | 2 +- .../linux-generic/arch/mips64/odp_cpu_cycles.c | 2 +- .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/odp_arch_time_internal.h | 2 +- .../linux-generic/arch/powerpc/odp/api/abi/cpu.h | 2 +- .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 2 +- platform/linux-generic/arch/x86/cpu_flags.c | 2 +- platform/linux-generic/arch/x86/cpu_flags.h | 2 +- platform/linux-generic/arch/x86/odp/api/abi/cpu.h | 2 +- platform/linux-generic/arch/x86/odp_cpu_cycles.c | 2 +- platform/linux-generic/arch/x86/odp_global_time.c | 2 +- .../linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- platform/linux-generic/doc/platform_specific.dox | 2 +- .../linux-generic/include-abi/odp/api/abi/align.h | 2 +- .../linux-generic/include-abi/odp/api/abi/atomic.h | 2 +- .../include-abi/odp/api/abi/barrier.h | 2 +- .../linux-generic/include-abi/odp/api/abi/buffer.h | 2 +- .../include-abi/odp/api/abi/byteorder.h | 2 +- .../include-abi/odp/api/abi/classification.h | 2 +- .../include-abi/odp/api/abi/cpumask.h | 2 +- .../linux-generic/include-abi/odp/api/abi/crypto.h | 2 +- .../linux-generic/include-abi/odp/api/abi/debug.h | 2 +- .../linux-generic/include-abi/odp/api/abi/event.h | 2 +- .../linux-generic/include-abi/odp/api/abi/init.h | 2 +- .../linux-generic/include-abi/odp/api/abi/ipsec.h | 2 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 2 +- .../include-abi/odp/api/abi/packet_flags.h | 2 +- .../include-abi/odp/api/abi/packet_io.h | 2 +- .../linux-generic/include-abi/odp/api/abi/pool.h | 2 +- .../linux-generic/include-abi/odp/api/abi/queue.h | 2 +- .../linux-generic/include-abi/odp/api/abi/rwlock.h | 2 +- .../include-abi/odp/api/abi/rwlock_recursive.h | 2 +- .../include-abi/odp/api/abi/schedule.h | 2 +- .../include-abi/odp/api/abi/schedule_types.h | 2 +- .../include-abi/odp/api/abi/shared_memory.h | 2 +- .../include-abi/odp/api/abi/spinlock.h | 2 +- .../include-abi/odp/api/abi/spinlock_recursive.h | 2 +- .../include-abi/odp/api/abi/std_clib.h | 2 +- .../include-abi/odp/api/abi/std_types.h | 2 +- .../linux-generic/include-abi/odp/api/abi/sync.h | 2 +- .../linux-generic/include-abi/odp/api/abi/thread.h | 2 +- .../include-abi/odp/api/abi/thrmask.h | 2 +- .../include-abi/odp/api/abi/ticketlock.h | 2 +- .../linux-generic/include-abi/odp/api/abi/time.h | 2 +- .../linux-generic/include-abi/odp/api/abi/timer.h | 2 +- .../include-abi/odp/api/abi/traffic_mngr.h | 2 +- .../include-abi/odp/api/abi/version.h | 2 +- .../linux-generic/include/_fdserver_internal.h | 2 +- platform/linux-generic/include/_ishm_internal.h | 2 +- platform/linux-generic/include/_ishmphy_internal.h | 2 +- .../linux-generic/include/_ishmpool_internal.h | 2 +- platform/linux-generic/include/ishmphy_internal.h | 2 +- .../include/odp/api/plat/atomic_inlines.h | 2 +- .../include/odp/api/plat/byteorder_inlines.h | 2 +- .../include/odp/api/plat/byteorder_inlines_api.h | 2 +- .../include/odp/api/plat/packet_flag_inlines.h | 2 +- .../include/odp/api/plat/packet_flag_inlines_api.h | 2 +- .../include/odp/api/plat/packet_inline_types.h | 2 +- .../include/odp/api/plat/packet_inlines.h | 2 +- .../include/odp/api/plat/packet_inlines_api.h | 2 +- .../include/odp/api/plat/pktio_inlines.h | 2 +- .../include/odp/api/plat/pktio_inlines_api.h | 2 +- .../include/odp/api/plat/pool_inline_types.h | 2 +- .../include/odp/api/plat/std_clib_inlines.h | 2 +- .../include/odp/api/plat/strong_types.h | 2 +- .../include/odp/api/plat/sync_inlines.h | 2 +- .../include/odp/api/plat/thread_inlines.h | 2 +- .../include/odp/api/plat/thread_inlines_api.h | 2 +- .../include/odp/api/plat/ticketlock_inlines.h | 2 +- .../include/odp/api/plat/ticketlock_inlines_api.h | 2 +- .../linux-generic/include/odp_align_internal.h | 2 +- .../linux-generic/include/odp_atomic_internal.h | 2 +- .../linux-generic/include/odp_bitmap_internal.h | 2 +- platform/linux-generic/include/odp_bitset.h | 2 +- .../linux-generic/include/odp_buffer_inlines.h | 2 +- .../linux-generic/include/odp_buffer_internal.h | 10 +- .../include/odp_classification_datamodel.h | 2 +- .../include/odp_classification_inlines.h | 2 +- .../include/odp_classification_internal.h | 2 +- .../linux-generic/include/odp_config_internal.h | 2 +- .../linux-generic/include/odp_debug_internal.h | 2 +- platform/linux-generic/include/odp_errno_define.h | 2 +- .../include/odp_forward_typedefs_internal.h | 2 +- platform/linux-generic/include/odp_internal.h | 2 +- .../linux-generic/include/odp_ipsec_internal.h | 2 +- platform/linux-generic/include/odp_llqueue.h | 2 +- .../linux-generic/include/odp_macros_internal.h | 2 +- .../include/odp_name_table_internal.h | 2 +- platform/linux-generic/include/odp_packet_dpdk.h | 2 +- .../linux-generic/include/odp_packet_internal.h | 2 +- .../linux-generic/include/odp_packet_io_internal.h | 2 +- .../include/odp_packet_io_ipc_internal.h | 2 +- .../include/odp_packet_io_ring_internal.h | 2 +- platform/linux-generic/include/odp_packet_netmap.h | 2 +- platform/linux-generic/include/odp_packet_null.h | 2 +- platform/linux-generic/include/odp_packet_socket.h | 2 +- .../linux-generic/include/odp_pkt_queue_internal.h | 2 +- platform/linux-generic/include/odp_pool_internal.h | 2 +- .../linux-generic/include/odp_posix_extensions.h | 2 +- .../linux-generic/include/odp_queue_internal.h | 3 +- platform/linux-generic/include/odp_queue_lf.h | 36 ++ .../include/odp_queue_scalable_internal.h | 2 +- platform/linux-generic/include/odp_ring_internal.h | 2 +- platform/linux-generic/include/odp_schedule_if.h | 2 +- .../linux-generic/include/odp_schedule_scalable.h | 2 +- .../include/odp_schedule_scalable_config.h | 2 +- .../include/odp_schedule_scalable_ordered.h | 2 +- platform/linux-generic/include/odp_shm_internal.h | 2 +- .../include/odp_sorted_list_internal.h | 2 +- .../linux-generic/include/odp_timer_internal.h | 2 +- .../include/odp_timer_wheel_internal.h | 2 +- .../include/odp_traffic_mngr_internal.h | 2 +- platform/linux-generic/include/protocols/eth.h | 2 +- platform/linux-generic/include/protocols/ip.h | 2 +- platform/linux-generic/include/protocols/ipsec.h | 2 +- platform/linux-generic/include/protocols/tcp.h | 2 +- platform/linux-generic/include/protocols/thash.h | 2 +- platform/linux-generic/include/protocols/udp.h | 2 +- platform/linux-generic/odp_atomic.c | 2 +- platform/linux-generic/odp_atomic_api.c | 2 +- platform/linux-generic/odp_barrier.c | 2 +- platform/linux-generic/odp_bitmap.c | 2 +- platform/linux-generic/odp_buffer.c | 2 +- platform/linux-generic/odp_byteorder.c | 2 +- platform/linux-generic/odp_chksum.c | 2 +- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_cpu.c | 2 +- platform/linux-generic/odp_cpumask.c | 2 +- platform/linux-generic/odp_cpumask_task.c | 2 +- platform/linux-generic/odp_crypto.c | 2 +- platform/linux-generic/odp_errno.c | 2 +- platform/linux-generic/odp_event.c | 2 +- platform/linux-generic/odp_hash.c | 2 +- platform/linux-generic/odp_impl.c | 2 +- platform/linux-generic/odp_init.c | 2 +- platform/linux-generic/odp_ipsec.c | 2 +- platform/linux-generic/odp_ipsec_events.c | 2 +- platform/linux-generic/odp_ipsec_sad.c | 2 +- platform/linux-generic/odp_name_table.c | 2 +- platform/linux-generic/odp_packet.c | 12 +- platform/linux-generic/odp_packet_api.c | 2 +- platform/linux-generic/odp_packet_flags.c | 2 +- platform/linux-generic/odp_packet_flags_api.c | 2 +- platform/linux-generic/odp_packet_io.c | 2 +- platform/linux-generic/odp_pkt_queue.c | 2 +- platform/linux-generic/odp_pktio_api.c | 2 +- platform/linux-generic/odp_pool.c | 2 +- platform/linux-generic/odp_queue.c | 75 +++- platform/linux-generic/odp_queue_lf.c | 346 +++++++++++++++++++ platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_rwlock.c | 2 +- platform/linux-generic/odp_rwlock_recursive.c | 2 +- platform/linux-generic/odp_schedule.c | 2 +- platform/linux-generic/odp_schedule_if.c | 2 +- platform/linux-generic/odp_schedule_iquery.c | 2 +- platform/linux-generic/odp_schedule_scalable.c | 2 +- .../linux-generic/odp_schedule_scalable_ordered.c | 2 +- platform/linux-generic/odp_schedule_sp.c | 2 +- platform/linux-generic/odp_shared_memory.c | 2 +- platform/linux-generic/odp_sorted_list.c | 2 +- platform/linux-generic/odp_spinlock.c | 2 +- platform/linux-generic/odp_spinlock_recursive.c | 2 +- platform/linux-generic/odp_std_clib.c | 2 +- platform/linux-generic/odp_sync.c | 2 +- platform/linux-generic/odp_system_info.c | 2 +- platform/linux-generic/odp_thread.c | 2 +- platform/linux-generic/odp_thread_api.c | 2 +- platform/linux-generic/odp_thrmask.c | 2 +- platform/linux-generic/odp_ticketlock.c | 2 +- platform/linux-generic/odp_time.c | 2 +- platform/linux-generic/odp_timer.c | 2 +- platform/linux-generic/odp_timer_wheel.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 2 +- platform/linux-generic/odp_version.c | 2 +- platform/linux-generic/odp_weak.c | 2 +- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/ethtool.c | 2 +- platform/linux-generic/pktio/io_ops.c | 2 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/loop.c | 2 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/null.c | 2 +- platform/linux-generic/pktio/pcap.c | 2 +- platform/linux-generic/pktio/pktio_common.c | 2 +- platform/linux-generic/pktio/ring.c | 2 +- platform/linux-generic/pktio/socket.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- platform/linux-generic/pktio/sysfs.c | 2 +- .../test/example/generator/generator_run.sh | 2 +- .../test/mmap_vlan_ins/mmap_vlan_ins.c | 2 +- .../test/mmap_vlan_ins/mmap_vlan_ins.sh | 2 +- .../linux-generic/test/mmap_vlan_ins/pktio_env | 2 +- .../test/performance/odp_scheduling_run_proc.sh | 2 +- platform/linux-generic/test/pktio_ipc/ipc_common.c | 2 +- platform/linux-generic/test/pktio_ipc/ipc_common.h | 2 +- platform/linux-generic/test/pktio_ipc/pktio_ipc1.c | 2 +- platform/linux-generic/test/pktio_ipc/pktio_ipc2.c | 2 +- .../linux-generic/test/pktio_ipc/pktio_ipc_run.sh | 2 +- platform/linux-generic/test/ring/ring_basic.c | 2 +- platform/linux-generic/test/ring/ring_main.c | 2 +- platform/linux-generic/test/ring/ring_stress.c | 2 +- platform/linux-generic/test/ring/ring_suites.c | 2 +- platform/linux-generic/test/ring/ring_suites.h | 2 +- .../test/validation/api/pktio/pktio_env | 2 +- .../test/validation/api/pktio/pktio_run.sh | 2 +- .../test/validation/api/pktio/pktio_run_dpdk.sh | 2 +- .../test/validation/api/pktio/pktio_run_netmap.sh | 2 +- .../test/validation/api/pktio/pktio_run_pcap.sh | 2 +- .../test/validation/api/shmem/shmem_common.h | 2 +- .../test/validation/api/shmem/shmem_linux.c | 2 +- .../test/validation/api/shmem/shmem_linux.h | 2 +- .../test/validation/api/shmem/shmem_odp1.c | 2 +- .../test/validation/api/shmem/shmem_odp1.h | 2 +- .../test/validation/api/shmem/shmem_odp2.c | 2 +- .../test/validation/api/shmem/shmem_odp2.h | 2 +- test/README | 2 +- test/common/mask_common.c | 2 +- test/common/mask_common.h | 2 +- test/common/odp_cunit_common.c | 2 +- test/common/odp_cunit_common.h | 2 +- test/common/test_debug.h | 2 +- test/common/test_packet_parser.h | 2 +- test/performance/dummy_crc.h | 2 +- test/performance/odp_bench_packet.c | 2 +- test/performance/odp_crypto.c | 2 +- test/performance/odp_l2fwd.c | 2 +- test/performance/odp_l2fwd_run.sh | 2 +- test/performance/odp_pktio_ordered.c | 2 +- test/performance/odp_pktio_ordered_run.sh | 2 +- test/performance/odp_pktio_perf.c | 2 +- test/performance/odp_sched_latency.c | 2 +- test/performance/odp_sched_latency_run.sh | 2 +- test/performance/odp_scheduling.c | 2 +- test/performance/odp_scheduling_run.sh | 2 +- test/validation/api/README | 2 +- test/validation/api/atomic/atomic.c | 2 +- test/validation/api/barrier/barrier.c | 2 +- test/validation/api/buffer/buffer.c | 2 +- test/validation/api/chksum/chksum.c | 2 +- .../validation/api/classification/classification.c | 2 +- .../validation/api/classification/classification.h | 2 +- .../api/classification/odp_classification_basic.c | 2 +- .../api/classification/odp_classification_common.c | 2 +- .../classification/odp_classification_test_pmr.c | 2 +- .../api/classification/odp_classification_tests.c | 2 +- .../classification/odp_classification_testsuites.h | 2 +- test/validation/api/cpumask/cpumask.c | 2 +- test/validation/api/crypto/odp_crypto_test_inp.c | 2 +- test/validation/api/crypto/test_vectors.h | 2 +- test/validation/api/crypto/test_vectors_len.h | 2 +- test/validation/api/errno/errno.c | 2 +- test/validation/api/event/event.c | 2 +- test/validation/api/hash/hash.c | 2 +- test/validation/api/init/init.c | 2 +- test/validation/api/init/init.h | 2 +- test/validation/api/init/init_main_abort.c | 2 +- test/validation/api/init/init_main_log.c | 2 +- test/validation/api/init/init_main_ok.c | 2 +- test/validation/api/ipsec/ipsec.c | 2 +- test/validation/api/ipsec/ipsec.h | 2 +- test/validation/api/ipsec/ipsec_async.c | 2 +- test/validation/api/ipsec/ipsec_inline_in.c | 2 +- test/validation/api/ipsec/ipsec_inline_out.c | 2 +- test/validation/api/ipsec/ipsec_sync.c | 2 +- test/validation/api/ipsec/ipsec_test_in.c | 2 +- test/validation/api/ipsec/ipsec_test_out.c | 2 +- test/validation/api/ipsec/test_vectors.h | 2 +- test/validation/api/lock/lock.c | 2 +- test/validation/api/packet/packet.c | 2 +- test/validation/api/pktio/parser.c | 2 +- test/validation/api/pktio/parser.h | 2 +- test/validation/api/pktio/pktio.c | 2 +- test/validation/api/pool/pool.c | 2 +- test/validation/api/queue/queue.c | 383 +++++++++++++++++++-- test/validation/api/random/random.c | 2 +- test/validation/api/scheduler/scheduler.c | 2 +- test/validation/api/shmem/shmem.c | 2 +- test/validation/api/std_clib/std_clib.c | 2 +- test/validation/api/system/system.c | 2 +- test/validation/api/thread/thread.c | 2 +- test/validation/api/time/time.c | 2 +- test/validation/api/timer/timer.c | 2 +- test/validation/api/traffic_mngr/traffic_mngr.c | 2 +- test/validation/api/traffic_mngr/traffic_mngr.sh | 2 +- 787 files changed, 1654 insertions(+), 847 deletions(-) create mode 100644 platform/linux-generic/include/odp_queue_lf.h create mode 100644 platform/linux-generic/odp_queue_lf.c hooks/post-receive --

8 years

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-242-ge4842694

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 via e4842694a95771c87694aedae015669427bf2b21 (commit) via 28c81e87089e43692ead705cee56da2513c309b2 (commit) via c397d62bf8b29162e59d8796f10c87ebe5f37168 (commit) via bae3d1f5adbaba5f798b1e08d744f96bab1b6964 (commit) from 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb (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 e4842694a95771c87694aedae015669427bf2b21 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 19:58:00 2017 +0300 linux-gen: crypto, ipsec: use auth_iv Separate handling of authentication IV data. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 71140863..62e3a75a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -35,9 +35,7 @@ * Keep sorted: first by key length, then by IV length */ static const odp_crypto_cipher_capability_t cipher_capa_null[] = { -{.key_len = 0, .iv_len = 0}, -/* Special case for GMAC */ -{.key_len = 0, .iv_len = 12} }; +{.key_len = 0, .iv_len = 0} }; static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = { {.key_len = 24, .iv_len = 8} }; @@ -85,7 +83,8 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { -{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; +{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, + .iv_len = 12 } }; /** Forward declaration of session structure */ typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; @@ -122,6 +121,7 @@ struct odp_crypto_generic_session_t { struct { uint8_t key[EVP_MAX_KEY_LENGTH]; + uint8_t iv_data[EVP_MAX_IV_LENGTH]; uint32_t key_length; uint32_t bytes; union { @@ -710,10 +710,10 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->cipher_iv_ptr) - iv_ptr = param->cipher_iv_ptr; - else if (session->p.cipher_iv.data) - iv_ptr = session->cipher.iv_data; + if (param->auth_iv_ptr) + iv_ptr = param->auth_iv_ptr; + else if (session->p.auth_iv.data) + iv_ptr = session->auth.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -752,10 +752,10 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->cipher_iv_ptr) - iv_ptr = param->cipher_iv_ptr; - else if (session->p.cipher_iv.data) - iv_ptr = session->cipher.iv_data; + if (param->auth_iv_ptr) + iv_ptr = param->auth_iv_ptr; + else if (session->p.auth_iv.data) + iv_ptr = session->auth.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -976,11 +976,21 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, goto err; } + if (session->p.auth_iv.length > EVP_MAX_IV_LENGTH) { + ODP_DBG("Maximum auth IV length exceeded\n"); + *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; + goto err; + } + /* Copy IV data */ if (session->p.cipher_iv.data) memcpy(session->cipher.iv_data, session->p.cipher_iv.data, session->p.cipher_iv.length); + if (session->p.auth_iv.data) + memcpy(session->auth.iv_data, session->p.auth_iv.data, + session->p.auth_iv.length); + /* Derive order */ if (ODP_CRYPTO_OP_ENCODE == param->op) session->do_cipher_first = param->auth_cipher_text; @@ -1172,6 +1182,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, packet_param.session = param->session; packet_param.cipher_iv_ptr = param->cipher_iv_ptr; + packet_param.auth_iv_ptr = param->auth_iv_ptr; packet_param.hash_result_offset = param->hash_result_offset; packet_param.aad_ptr = param->aad_ptr; packet_param.cipher_range = param->cipher_range; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 2a01ccd1..98af98c6 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -480,6 +480,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->in.hdr_len - ipsec_sa->icv_len; param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -562,7 +563,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, return -1; } - param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; state->in.hdr_len = (ah.ah_len + 2) * 4; state->in.trl_len = 0; @@ -1082,6 +1083,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, } param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); @@ -1231,7 +1233,7 @@ static int ipsec_out_ah(odp_packet_t *pkt, return -1; } - param->cipher_iv_ptr = state->iv; + param->auth_iv_ptr = state->iv; if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) { status->error.alg = 1; diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 53dc0943..64507d2a 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -420,7 +420,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; - crypto_param.cipher_iv.length = 12; + crypto_param.auth_iv.length = 12; break; default: break; commit 28c81e87089e43692ead705cee56da2513c309b2 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 19:47:54 2017 +0300 api: crypto: add separate auth IV GMAC auth algorithm requires IV to work. Instead of hacking the ODP_CIPHER_ALG_NULL iv to include value for ODP_AUTH_ALG_GMAC, provide separate iv (in auth capability, session params and operation params). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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 6688879a..d2a1d1dd 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -333,6 +333,9 @@ typedef struct odp_crypto_session_param_t { */ odp_crypto_key_t auth_key; + /** Authentication Initialization Vector (IV) */ + odp_crypto_iv_t auth_iv; + /** Authentication digest length in bytes * * Use odp_crypto_auth_capability() for supported digest lengths. @@ -408,6 +411,9 @@ typedef struct odp_crypto_op_param_t { uint8_t *cipher_iv_ptr; }; + /** Override session authentication IV pointer */ + uint8_t *auth_iv_ptr; + /** Offset from start of packet for hash result * * Specifies the offset where the hash result is to be stored. In case @@ -449,6 +455,9 @@ typedef struct odp_crypto_packet_op_param_t { uint8_t *cipher_iv_ptr; }; + /** Override session IV pointer for authentication */ + uint8_t *auth_iv_ptr; + /** Offset from start of packet for hash result * * Specifies the offset where the hash result is to be stored. In case @@ -614,6 +623,9 @@ typedef struct odp_crypto_auth_capability_t { /** Key length in bytes */ uint32_t key_len; + /** IV length in bytes */ + uint32_t iv_len; + /** Additional Authenticated Data (AAD) lengths */ struct { /** Minimum AAD length in bytes */ commit c397d62bf8b29162e59d8796f10c87ebe5f37168 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 4 01:05:53 2018 +0300 api: crypto: use cipher_iv_ptr instead of override_iv_ptr In preparation to add auth-specific IV, rename override_iv_ptr field to ciper_iv_ptr. Provide deprecated compatibility field override_iv_ptr. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 001f5208..c0978d0d 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -635,7 +635,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t *pkt, if (esp) { params.cipher_range.offset = ipv4_data_p(ip) + hdr_len - buf; params.cipher_range.length = ipv4_data_len(ip) - hdr_len; - params.override_iv_ptr = esp->iv; + params.cipher_iv_ptr = esp->iv; } /* Issue crypto request */ diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 102d1a2e..6688879a 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -400,8 +400,13 @@ typedef struct odp_crypto_op_param_t { */ odp_packet_t out_pkt; - /** Override session IV pointer */ - uint8_t *override_iv_ptr; + /** Override session IV pointer for cipher */ + union { + /** @deprecated use cipher_iv_ptr */ + uint8_t *ODP_DEPRECATE(override_iv_ptr); + /** Override session IV pointer for cipher */ + uint8_t *cipher_iv_ptr; + }; /** Offset from start of packet for hash result * @@ -436,8 +441,13 @@ typedef struct odp_crypto_packet_op_param_t { /** Session handle from creation */ odp_crypto_session_t session; - /** Override session IV pointer */ - uint8_t *override_iv_ptr; + /** Override session IV pointer for cipher */ + union { + /** @deprecated use cipher_iv_ptr */ + uint8_t *ODP_DEPRECATE(override_iv_ptr); + /** Override session IV pointer for cipher */ + uint8_t *cipher_iv_ptr; + }; /** Offset from start of packet for hash result * diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 8e6e1a43..71140863 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -483,8 +483,8 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, void *iv_ptr; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -517,8 +517,8 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, void *iv_ptr; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -588,8 +588,8 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -638,8 +638,8 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -710,8 +710,8 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -752,8 +752,8 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, uint8_t block[EVP_MAX_MD_SIZE]; int ret; - if (param->override_iv_ptr) - iv_ptr = param->override_iv_ptr; + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else @@ -1171,7 +1171,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, int rc; packet_param.session = param->session; - packet_param.override_iv_ptr = param->override_iv_ptr; + packet_param.cipher_iv_ptr = param->cipher_iv_ptr; packet_param.hash_result_offset = param->hash_result_offset; packet_param.aad_ptr = param->aad_ptr; packet_param.cipher_range = param->cipher_range; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 0ef8b88a..2a01ccd1 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -479,7 +479,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->ip_hdr_len - state->in.hdr_len - ipsec_sa->icv_len; - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -562,7 +562,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; state->in.hdr_len = (ah.ah_len + 2) * 4; state->in.trl_len = 0; @@ -1081,7 +1081,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); @@ -1231,7 +1231,7 @@ static int ipsec_out_ah(odp_packet_t *pkt, return -1; } - param->override_iv_ptr = state->iv; + param->cipher_iv_ptr = state->iv; if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) { status->error.alg = 1; diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 526057c7..9398c5da 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -79,7 +79,7 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) static int alg_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -100,8 +100,8 @@ static int alg_op(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; @@ -154,7 +154,7 @@ static int alg_op(odp_packet_t pkt, static int alg_packet_op(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -172,8 +172,8 @@ static int alg_packet_op(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; @@ -211,7 +211,7 @@ static int alg_packet_op(odp_packet_t pkt, static int alg_packet_op_enq(odp_packet_t pkt, odp_bool_t *ok, odp_crypto_session_t session, - uint8_t *op_iv_ptr, + uint8_t *cipher_iv_ptr, odp_packet_data_range_t *cipher_range, odp_packet_data_range_t *auth_range, uint8_t *aad, @@ -230,8 +230,8 @@ static int alg_packet_op_enq(odp_packet_t pkt, op_params.cipher_range = *cipher_range; op_params.auth_range = *auth_range; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; + if (cipher_iv_ptr) + op_params.cipher_iv_ptr = cipher_iv_ptr; op_params.aad_ptr = aad; commit bae3d1f5adbaba5f798b1e08d744f96bab1b6964 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 4 01:05:53 2018 +0300 api: crypto: use cipher_iv instead of iv in session params In preparation to add auth-specific IV, rename iv field to ciper_iv. Provide deprecated compatibility field iv. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c index bd4c1eab..220df782 100644 --- a/example/ipsec/odp_ipsec_cache.c +++ b/example/ipsec/odp_ipsec_cache.c @@ -92,13 +92,13 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, params.cipher_alg = cipher_sa->alg.u.cipher; params.cipher_key.data = cipher_sa->key.data; params.cipher_key.length = cipher_sa->key.length; - params.iv.data = entry->state.iv; - params.iv.length = cipher_sa->iv_len; + params.cipher_iv.data = entry->state.iv; + params.cipher_iv.length = cipher_sa->iv_len; mode = cipher_sa->mode; } else { params.cipher_alg = ODP_CIPHER_ALG_NULL; - params.iv.data = NULL; - params.iv.length = 0; + params.cipher_iv.data = NULL; + params.cipher_iv.length = 0; } /* Auth */ @@ -113,10 +113,10 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa, } /* Generate an IV */ - if (params.iv.length) { - int32_t size = params.iv.length; + if (params.cipher_iv.length) { + int32_t size = params.cipher_iv.length; - int32_t ret = odp_random_data(params.iv.data, size, 1); + int32_t ret = odp_random_data(params.cipher_iv.data, size, 1); if (ret != size) return -1; } diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 4fa7a1c9..102d1a2e 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -313,7 +313,13 @@ typedef struct odp_crypto_session_param_t { odp_crypto_key_t cipher_key; /** Cipher Initialization Vector (IV) */ - odp_crypto_iv_t iv; + union { + /** @deprecated Use cipher_iv */ + odp_crypto_iv_t ODP_DEPRECATE(iv); + + /** Cipher Initialization Vector (IV) */ + odp_crypto_iv_t cipher_iv; + }; /** Authentication algorithm * diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 325a9d06..8e6e1a43 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -485,7 +485,7 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -519,7 +519,7 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -541,8 +541,9 @@ static int process_cipher_param(odp_crypto_generic_session_t *session, return -1; /* Verify IV len is correct */ - if (!((0 == session->p.iv.length) || - ((uint32_t)EVP_CIPHER_iv_length(cipher) == session->p.iv.length))) + if (!((0 == session->p.cipher_iv.length) || + ((uint32_t)EVP_CIPHER_iv_length(cipher) == + session->p.cipher_iv.length))) return -1; session->cipher.evp_cipher = cipher; @@ -570,7 +571,7 @@ aes_gcm_encrypt_init(odp_crypto_generic_session_t *session) EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, session->cipher.key_data, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -589,7 +590,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -620,7 +621,7 @@ aes_gcm_decrypt_init(odp_crypto_generic_session_t *session) EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, session->cipher.key_data, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -639,7 +640,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -695,7 +696,7 @@ aes_gmac_gen_init(odp_crypto_generic_session_t *session) EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -711,7 +712,7 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -737,7 +738,7 @@ aes_gmac_check_init(odp_crypto_generic_session_t *session) EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); + session->p.cipher_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); } @@ -753,7 +754,7 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, if (param->override_iv_ptr) iv_ptr = param->override_iv_ptr; - else if (session->p.iv.data) + else if (session->p.cipher_iv.data) iv_ptr = session->cipher.iv_data; else return ODP_CRYPTO_ALG_ERR_IV_INVALID; @@ -969,16 +970,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, /* Copy parameters */ session->p = *param; - if (session->p.iv.length > EVP_MAX_IV_LENGTH) { + if (session->p.cipher_iv.length > EVP_MAX_IV_LENGTH) { ODP_DBG("Maximum IV length exceeded\n"); *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; goto err; } /* Copy IV data */ - if (session->p.iv.data) - memcpy(session->cipher.iv_data, session->p.iv.data, - session->p.iv.length); + if (session->p.cipher_iv.data) + memcpy(session->cipher.iv_data, session->p.cipher_iv.data, + session->p.cipher_iv.length); /* Derive order */ if (ODP_CRYPTO_OP_ENCODE == param->op) diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 1a63858a..53dc0943 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -362,13 +362,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) crypto_param.auth_alg = param->crypto.auth_alg; crypto_param.auth_key = param->crypto.auth_key; - crypto_param.iv.length = + crypto_param.cipher_iv.length = _odp_ipsec_cipher_iv_len(crypto_param.cipher_alg); crypto_param.auth_digest_len = _odp_ipsec_auth_digest_len(crypto_param.auth_alg); - if ((uint32_t)-1 == crypto_param.iv.length || + if ((uint32_t)-1 == crypto_param.cipher_iv.length || (uint32_t)-1 == crypto_param.auth_digest_len) goto error; @@ -420,7 +420,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; - crypto_param.iv.length = 12; + crypto_param.cipher_iv.length = 12; break; default: break; diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index f6524bc6..1d598ebb 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -193,7 +193,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key24, .length = sizeof(test_key24) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 8, }, @@ -208,7 +208,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key24, .length = sizeof(test_key24) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 8, }, @@ -240,7 +240,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key16, .length = sizeof(test_key16) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 16, }, @@ -255,7 +255,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key16, .length = sizeof(test_key16) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 16, }, @@ -287,7 +287,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_key16, .length = sizeof(test_key16) }, - .iv = { + .cipher_iv = { .data = test_iv, .length = 12, }, diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index ec477535..526057c7 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -315,9 +315,9 @@ static void alg_test(odp_crypto_op_t op, .data = ref->auth_key, .length = ref->auth_key_length }; - odp_crypto_iv_t iv = { - .data = ovr_iv ? NULL : ref->iv, - .length = ref->iv_length + odp_crypto_iv_t cipher_iv = { + .data = ovr_iv ? NULL : ref->cipher_iv, + .length = ref->cipher_iv_length }; /* Create a crypto session */ @@ -331,7 +331,7 @@ static void alg_test(odp_crypto_op_t op, ses_params.compl_queue = suite_context.queue; ses_params.output_pool = suite_context.pool; ses_params.cipher_key = cipher_key; - ses_params.iv = iv; + ses_params.cipher_iv = cipher_iv; ses_params.auth_key = auth_key; ses_params.auth_digest_len = ref->digest_length; ses_params.auth_aad_len = ref->aad_length; @@ -381,17 +381,17 @@ static void alg_test(odp_crypto_op_t op, if (!suite_context.packet) rc = alg_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); else if (ODP_CRYPTO_ASYNC == suite_context.op_mode) rc = alg_packet_op_enq(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); else rc = alg_packet_op(pkt, &ok, session, - ovr_iv ? ref->iv : NULL, + ovr_iv ? ref->cipher_iv : NULL, &cipher_range, &auth_range, ref->aad, ref->length); if (rc < 0) @@ -518,7 +518,7 @@ static void check_alg(odp_crypto_op_t op, if (cipher_capa[i].key_len == ref[idx].cipher_key_length && cipher_capa[i].iv_len == - ref[idx].iv_length) { + ref[idx].cipher_iv_length) { cipher_idx = i; break; } @@ -529,7 +529,7 @@ static void check_alg(odp_crypto_op_t op, ", iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), ref[idx].cipher_key_length, - ref[idx].iv_length); + ref[idx].cipher_iv_length); continue; } diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 6592a335..195f9ce5 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -14,8 +14,8 @@ typedef struct crypto_test_reference_s { uint8_t cipher_key[MAX_KEY_LEN]; uint32_t auth_key_length; uint8_t auth_key[MAX_KEY_LEN]; - uint32_t iv_length; - uint8_t iv[MAX_IV_LEN]; + uint32_t cipher_iv_length; + uint8_t cipher_iv[MAX_IV_LEN]; uint32_t length; uint8_t plaintext[MAX_DATA_LEN]; uint8_t ciphertext[MAX_DATA_LEN]; @@ -49,8 +49,8 @@ static crypto_test_reference_t tdes_cbc_reference[] = { .cipher_key = { 0x62, 0x7f, 0x46, 0x0e, 0x08, 0x10, 0x4a, 0x10, 0x43, 0xcd, 0x26, 0x5d, 0x58, 0x40, 0xea, 0xf1, 0x31, 0x3e, 0xdf, 0x97, 0xdf, 0x2a, 0x8a, 0x8c}, - .iv_length = TDES_CBC_IV_LEN, - .iv = { 0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75 }, + .cipher_iv_length = TDES_CBC_IV_LEN, + .cipher_iv = { 0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75 }, .length = 8, .plaintext = { 0x32, 0x6a, 0x49, 0x4c, 0xd3, 0x3f, 0xe7, 0x56 }, .ciphertext = { 0xb2, 0x2b, 0x8d, 0x66, 0xde, 0x97, 0x06, 0x92 } @@ -60,8 +60,8 @@ static crypto_test_reference_t tdes_cbc_reference[] = { .cipher_key = { 0x37, 0xae, 0x5e, 0xbf, 0x46, 0xdf, 0xf2, 0xdc, 0x07, 0x54, 0xb9, 0x4f, 0x31, 0xcb, 0xb3, 0x85, 0x5e, 0x7f, 0xd3, 0x6d, 0xc8, 0x70, 0xbf, 0xae}, - .iv_length = TDES_CBC_IV_LEN, - .iv = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65 }, + .cipher_iv_length = TDES_CBC_IV_LEN, + .cipher_iv = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65 }, .length = 16, .plaintext = { 0x84, 0x40, 0x1f, 0x78, 0xfe, 0x6c, 0x10, 0x87, 0x6d, 0x8e, 0xa2, 0x30, 0x94, 0xea, 0x53, 0x09 }, @@ -75,9 +75,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x06, 0xa9, 0x21, 0x40, 0x36, 0xb8, 0xa1, 0x5b, 0x51, 0x2e, 0x03, 0xd5, 0x34, 0x12, 0x00, 0x06}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x3d, 0xaf, 0xba, 0x42, 0x9d, 0x9e, 0xb4, 0x30, - 0xb4, 0x22, 0xda, 0x80, 0x2c, 0x9f, 0xac, 0x41 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x3d, 0xaf, 0xba, 0x42, 0x9d, 0x9e, 0xb4, 0x30, + 0xb4, 0x22, 0xda, 0x80, 0x2c, 0x9f, 0xac, 0x41 }, .length = 16, .plaintext = "Single block msg", .ciphertext = { 0xe3, 0x53, 0x77, 0x9c, 0x10, 0x79, 0xae, 0xb8, @@ -87,9 +87,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0xc2, 0x86, 0x69, 0x6d, 0x88, 0x7c, 0x9a, 0xa0, 0x61, 0x1b, 0xbb, 0x3e, 0x20, 0x25, 0xa4, 0x5a}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, - 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, + 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58 }, .length = 32, .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, @@ -104,9 +104,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x6c, 0x3e, 0xa0, 0x47, 0x76, 0x30, 0xce, 0x21, 0xa2, 0xce, 0x33, 0x4a, 0xa7, 0x46, 0xc2, 0xcd}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0xc7, 0x82, 0xdc, 0x4c, 0x09, 0x8c, 0x66, 0xcb, - 0xd9, 0xcd, 0x27, 0xd8, 0x25, 0x68, 0x2c, 0x81 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0xc7, 0x82, 0xdc, 0x4c, 0x09, 0x8c, 0x66, 0xcb, + 0xd9, 0xcd, 0x27, 0xd8, 0x25, 0x68, 0x2c, 0x81 }, .length = 48, .plaintext = "This is a 48-byte message (exactly 3 AES blocks)", .ciphertext = { 0xd0, 0xa0, 0x2b, 0x38, 0x36, 0x45, 0x17, 0x53, @@ -120,9 +120,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key_length = AES128_CBC_KEY_LEN, .cipher_key = { 0x56, 0xe4, 0x7a, 0x38, 0xc5, 0x59, 0x89, 0x74, 0xbc, 0x46, 0x90, 0x3d, 0xba, 0x29, 0x03, 0x49}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c, - 0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c, + 0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9 }, .length = 64, .plaintext = { 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, @@ -146,9 +146,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88, 0x01, 0x23, 0x45, 0x67 }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88, 0x01, 0x23, 0x45, 0x67 }, .length = 32, .plaintext = { 0x45, 0x00, 0x00, 0x28, 0xa4, 0xad, 0x40, 0x00, 0x40, 0x06, 0x78, 0x80, 0x0a, 0x01, 0x03, 0x8f, @@ -165,9 +165,9 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab}, - .iv_length = AES_CBC_IV_LEN, - .iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, - 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c }, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c }, .length = 48, .plaintext = { 0x45, 0x00, 0x00, 0x30, 0x69, 0xa6, 0x40, 0x00, 0x80, 0x06, 0x26, 0x90, 0xc0, 0xa8, 0x01, 0x02, @@ -189,9 +189,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { .cipher_key_length = AES128_CTR_KEY_LEN, .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -215,9 +215,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -242,9 +242,9 @@ static crypto_test_reference_t aes_ctr_reference[] = { 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4}, - .iv_length = AES_CTR_IV_LEN, - .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, .length = 64, .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, @@ -273,9 +273,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x2e, 0x44, 0x3b, 0x68, 0x49, 0x56, 0xed, 0x7e, - 0x3b, 0x24, 0x4c, 0xfe }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x2e, 0x44, 0x3b, 0x68, 0x49, 0x56, 0xed, 0x7e, + 0x3b, 0x24, 0x4c, 0xfe }, .length = 72, .plaintext = { 0x45, 0x00, 0x00, 0x48, 0x69, 0x9a, 0x00, 0x00, 0x80, 0x11, 0x4d, 0xb7, 0xc0, 0xa8, 0x01, 0x02, @@ -306,9 +306,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88 }, .length = 64, .plaintext = { 0x45, 0x00, 0x00, 0x3e, 0x69, 0x8f, 0x00, 0x00, 0x80, 0x11, 0x4d, 0xcc, 0xc0, 0xa8, 0x01, 0x02, @@ -336,9 +336,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, .length = 64, .plaintext = { 0x45, 0x00, 0x00, 0x3c, 0x99, 0xc5, 0x00, 0x00, 0x80, 0x01, 0xcb, 0x7a, 0x40, 0x67, 0x93, 0x18, @@ -366,9 +366,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key_length = AES128_GCM_KEY_LEN, .cipher_key = { 0x3d, 0xe0, 0x98, 0x74, 0xb3, 0x88, 0xe6, 0x49, 0x19, 0x88, 0xd0, 0xc3, 0x60, 0x7e, 0xae, 0x1f}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, - 0xa2, 0xfc, 0xa1, 0xa3 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x57, 0x69, 0x0e, 0x43, 0x4e, 0x28, 0x00, 0x00, + 0xa2, 0xfc, 0xa1, 0xa3 }, .length = 28, .plaintext = { 0x45, 0x00, 0x00, 0x1c, 0x42, 0xa2, 0x00, 0x00, 0x80, 0x01, 0x44, 0x1f, 0x40, 0x67, 0x93, 0xb6, @@ -390,9 +390,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { .cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c, 0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08, 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, - 0xde, 0xca, 0xf8, 0x88 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad, + 0xde, 0xca, 0xf8, 0x88 }, .length = 40, .plaintext = { 0x45, 0x00, 0x00, 0x28, 0xa4, 0xad, 0x40, 0x00, 0x40, 0x06, 0x78, 0x80, 0x0a, 0x01, 0x03, 0x8f, @@ -416,9 +416,9 @@ static crypto_test_reference_t aes_gcm_reference[] = { 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab, 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, 0x05, - 0x06, 0x07, 0x08 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x11, 0x22, 0x33, 0x44, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x07, 0x08 }, .length = 52, .plaintext = { 0x45, 0x00, 0x00, 0x30, 0x69, 0xa6, 0x40, 0x00, 0x80, 0x06, 0x26, 0x90, 0xc0, 0xa8, 0x01, 0x02, @@ -447,9 +447,9 @@ static crypto_test_reference_t aes_gmac_reference[] = { .auth_key_length = AES128_GCM_KEY_LEN, .auth_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda, 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34}, - .iv_length = AES_GCM_IV_LEN, - .iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 }, + .cipher_iv_length = AES_GCM_IV_LEN, + .cipher_iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, .length = 68, .plaintext = { 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ----------------------------------------------------------------------- Summary of changes: example/ipsec/odp_ipsec.c | 2 +- example/ipsec/odp_ipsec_cache.c | 14 +-- include/odp/api/spec/crypto.h | 38 ++++++-- platform/linux-generic/odp_crypto.c | 82 +++++++++-------- platform/linux-generic/odp_ipsec.c | 10 ++- platform/linux-generic/odp_ipsec_sad.c | 6 +- test/performance/odp_crypto.c | 10 +-- test/validation/api/crypto/odp_crypto_test_inp.c | 36 ++++---- test/validation/api/crypto/test_vectors.h | 108 +++++++++++------------ 9 files changed, 174 insertions(+), 132 deletions(-) hooks/post-receive --

8 years

[COMMIT] branch next updated. v1.17.0.0_tigermoth_rc1-238-g5a58bbf2

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 via 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb (commit) via 115de92568af53becceae8300fe2f2b6a3436cfc (commit) via 2f62f234d0b83f4deedcfb75213a6e901e87d902 (commit) via d3e7f84960c29b58ad78de745b4bc3d5f26fc77d (commit) via fd22012f6f8e621fb22d5f4d6c15347f9535a902 (commit) via c2837dee41364443bc95aa97611e3d721ef16813 (commit) via eba4477a5cd5300d608ddfc53ff00cd3e51805a6 (commit) via 3e90ecc0bfa4487a29fbdff7ccc1cf5a2a1e8bc0 (commit) via dfa1ee94dae761166126445739be0dd6843f6792 (commit) via 01014bb374153d7bc879b3e1d26e79a6dfe5c329 (commit) via d7f9a326839de8d731d95ba3a1c45114198887d1 (commit) via b07985be674cef618fabeb7111ffa4dbb3e74fef (commit) via 74948cab5525f59e016dc984d95cb51f2ce2f963 (commit) via 4ffba79dfc573070f61da8894877783601e3aff4 (commit) via 4fc0e934df0bbd0779c6051595add213f752272a (commit) via 69367466a8c3e30509b1f86c4751285aab37efb8 (commit) via d1da7104eb4875287c816aec7e145a7504239156 (commit) via 409d87e542b9f018467c2c62bb07a8e4f2a15993 (commit) via f4d395f2a80646c0609b62fbe37cd14465df74ac (commit) via dab09417bf432da56aeddb2feaef9e6a11b739d7 (commit) via f7938ef11ede6ed6843bb7608a98ab3d15cf8e1c (commit) via 9e40c760b95077a4ca4e652e4d39a4304e5828f6 (commit) via 7c733ea2be5898660a3d02cdd2cf1f0a64a50e0c (commit) via e8d209cc33a34c7ee92053e3f240c542068816dd (commit) via 157737a4629a569f453762f92be2e3d174dfe1e5 (commit) via e4fec7da3e89c20cfe3c4d96c5fbe02ebbea57b3 (commit) from d5419e8857b2bc61d3be17fe53f171550fee426b (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: example/generator/Makefile.am | 5 - example/generator/generator_run.sh | 17 -- platform/linux-generic/m4/configure.m4 | 2 + platform/linux-generic/test/Makefile.am | 4 + platform/linux-generic/test/example/Makefile.am | 1 + .../test/example/generator/Makefile.am | 4 + .../test/example/generator/generator_run.sh | 45 +++++ .../test/validation/api/pktio/pktio_run_pcap.sh | 1 + test/validation/api/atomic/Makefile.am | 2 +- test/validation/api/atomic/atomic.c | 25 ++- test/validation/api/atomic/atomic.h | 39 ---- test/validation/api/atomic/atomic_main.c | 14 -- test/validation/api/barrier/Makefile.am | 2 +- test/validation/api/barrier/barrier.c | 13 +- test/validation/api/barrier/barrier.h | 30 ---- test/validation/api/barrier/barrier_main.c | 14 -- test/validation/api/buffer/Makefile.am | 2 +- test/validation/api/buffer/buffer.c | 17 +- test/validation/api/buffer/buffer.h | 32 ---- test/validation/api/buffer/buffer_main.c | 14 -- test/validation/api/chksum/Makefile.am | 2 +- test/validation/api/chksum/chksum.c | 9 +- test/validation/api/chksum/chksum.h | 26 --- test/validation/api/chksum/chksum_main.c | 12 -- test/validation/api/classification/Makefile.am | 2 +- .../validation/api/classification/classification.c | 2 +- .../validation/api/classification/classification.h | 42 ----- .../api/classification/classification_main.c | 14 -- .../api/classification/odp_classification_basic.c | 14 +- .../classification/odp_classification_test_pmr.c | 24 +-- .../api/classification/odp_classification_tests.c | 8 +- test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/cpumask/cpumask.c | 9 +- test/validation/api/cpumask/cpumask.h | 28 --- test/validation/api/cpumask/cpumask_main.c | 14 -- test/validation/api/crypto/Makefile.am | 5 +- test/validation/api/crypto/crypto.c | 135 -------------- test/validation/api/crypto/crypto.h | 59 ------ test/validation/api/crypto/crypto_main.c | 14 -- test/validation/api/crypto/odp_crypto_test_inp.c | 197 +++++++++++++++++---- test/validation/api/crypto/odp_crypto_test_inp.h | 26 --- test/validation/api/errno/Makefile.am | 2 +- test/validation/api/errno/errno.c | 5 +- test/validation/api/errno/errno.h | 24 --- test/validation/api/errno/errno_main.c | 14 -- test/validation/api/event/Makefile.am | 2 +- test/validation/api/event/event.c | 3 +- test/validation/api/event/event.h | 12 -- test/validation/api/event/event_main.c | 13 -- test/validation/api/hash/Makefile.am | 2 +- test/validation/api/hash/hash.c | 5 +- test/validation/api/hash/hash.h | 24 --- test/validation/api/hash/hash_main.c | 14 -- test/validation/api/lock/Makefile.am | 2 +- test/validation/api/lock/lock.c | 31 ++-- test/validation/api/lock/lock.h | 46 ----- test/validation/api/lock/lock_main.c | 14 -- test/validation/api/packet/Makefile.am | 2 +- test/validation/api/packet/packet.c | 67 ++++--- test/validation/api/packet/packet.h | 57 ------ test/validation/api/packet/packet_main.c | 14 -- test/validation/api/pktio/Makefile.am | 2 +- test/validation/api/pktio/parser.c | 36 ++-- test/validation/api/pktio/parser.h | 12 -- test/validation/api/pktio/pktio.c | 79 ++++----- test/validation/api/pktio/pktio.h | 67 ------- test/validation/api/pktio/pktio_main.c | 14 -- test/validation/api/pool/Makefile.am | 2 +- test/validation/api/pool/pool.c | 17 +- test/validation/api/pool/pool.h | 30 ---- test/validation/api/pool/pool_main.c | 14 -- test/validation/api/queue/Makefile.am | 2 +- test/validation/api/queue/queue.c | 15 +- test/validation/api/queue/queue.h | 31 ---- test/validation/api/queue/queue_main.c | 14 -- test/validation/api/random/Makefile.am | 2 +- test/validation/api/random/random.c | 9 +- test/validation/api/random/random.h | 26 --- test/validation/api/random/random_main.c | 14 -- test/validation/api/scheduler/Makefile.am | 2 +- test/validation/api/scheduler/scheduler.c | 77 ++++---- test/validation/api/scheduler/scheduler.h | 62 ------- test/validation/api/scheduler/scheduler_main.c | 14 -- test/validation/api/shmem/Makefile.am | 2 +- test/validation/api/shmem/shmem.c | 11 +- test/validation/api/shmem/shmem.h | 27 --- test/validation/api/shmem/shmem_main.c | 14 -- test/validation/api/std_clib/Makefile.am | 2 +- test/validation/api/std_clib/std_clib.c | 3 +- test/validation/api/std_clib/std_clib.h | 21 --- test/validation/api/std_clib/std_clib_main.c | 14 -- test/validation/api/system/Makefile.am | 2 +- test/validation/api/system/system.c | 44 ++--- test/validation/api/system/system.h | 45 ----- test/validation/api/system/system_main.c | 14 -- test/validation/api/thread/Makefile.am | 2 +- test/validation/api/thread/thread.c | 13 +- test/validation/api/thread/thread.h | 33 ---- test/validation/api/thread/thread_main.c | 14 -- test/validation/api/time/Makefile.am | 2 +- test/validation/api/time/time.c | 33 ++-- test/validation/api/time/time_main.c | 14 -- test/validation/api/time/time_test.h | 38 ---- test/validation/api/timer/Makefile.am | 2 +- test/validation/api/timer/timer.c | 11 +- test/validation/api/timer/timer.h | 27 --- test/validation/api/timer/timer_main.c | 14 -- test/validation/api/traffic_mngr/Makefile.am | 9 +- test/validation/api/traffic_mngr/traffic_mngr.c | 41 +++-- test/validation/api/traffic_mngr/traffic_mngr.h | 45 ----- .../api/traffic_mngr/traffic_mngr_main.c | 14 -- 111 files changed, 552 insertions(+), 1780 deletions(-) delete mode 100755 example/generator/generator_run.sh create mode 100644 platform/linux-generic/test/example/Makefile.am create mode 100644 platform/linux-generic/test/example/generator/Makefile.am create mode 100755 platform/linux-generic/test/example/generator/generator_run.sh delete mode 100644 test/validation/api/atomic/atomic.h delete mode 100644 test/validation/api/atomic/atomic_main.c delete mode 100644 test/validation/api/barrier/barrier.h delete mode 100644 test/validation/api/barrier/barrier_main.c delete mode 100644 test/validation/api/buffer/buffer.h delete mode 100644 test/validation/api/buffer/buffer_main.c delete mode 100644 test/validation/api/chksum/chksum.h delete mode 100644 test/validation/api/chksum/chksum_main.c delete mode 100644 test/validation/api/classification/classification_main.c delete mode 100644 test/validation/api/cpumask/cpumask.h delete mode 100644 test/validation/api/cpumask/cpumask_main.c delete mode 100644 test/validation/api/crypto/crypto.c delete mode 100644 test/validation/api/crypto/crypto.h delete mode 100644 test/validation/api/crypto/crypto_main.c delete mode 100644 test/validation/api/crypto/odp_crypto_test_inp.h delete mode 100644 test/validation/api/errno/errno.h delete mode 100644 test/validation/api/errno/errno_main.c delete mode 100644 test/validation/api/event/event.h delete mode 100644 test/validation/api/event/event_main.c delete mode 100644 test/validation/api/hash/hash.h delete mode 100644 test/validation/api/hash/hash_main.c delete mode 100644 test/validation/api/lock/lock.h delete mode 100644 test/validation/api/lock/lock_main.c delete mode 100644 test/validation/api/packet/packet.h delete mode 100644 test/validation/api/packet/packet_main.c delete mode 100644 test/validation/api/pktio/pktio.h delete mode 100644 test/validation/api/pktio/pktio_main.c delete mode 100644 test/validation/api/pool/pool.h delete mode 100644 test/validation/api/pool/pool_main.c delete mode 100644 test/validation/api/queue/queue.h delete mode 100644 test/validation/api/queue/queue_main.c delete mode 100644 test/validation/api/random/random.h delete mode 100644 test/validation/api/random/random_main.c delete mode 100644 test/validation/api/scheduler/scheduler.h delete mode 100644 test/validation/api/scheduler/scheduler_main.c delete mode 100644 test/validation/api/shmem/shmem.h delete mode 100644 test/validation/api/shmem/shmem_main.c delete mode 100644 test/validation/api/std_clib/std_clib.h delete mode 100644 test/validation/api/std_clib/std_clib_main.c delete mode 100644 test/validation/api/system/system.h delete mode 100644 test/validation/api/system/system_main.c delete mode 100644 test/validation/api/thread/thread.h delete mode 100644 test/validation/api/thread/thread_main.c delete mode 100644 test/validation/api/time/time_main.c delete mode 100644 test/validation/api/time/time_test.h delete mode 100644 test/validation/api/timer/timer.h delete mode 100644 test/validation/api/timer/timer_main.c delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr.h delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr_main.c hooks/post-receive --

8 years

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-238-g5a58bbf2

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 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb (commit) from 115de92568af53becceae8300fe2f2b6a3436cfc (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 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Feb 14 22:41:18 2018 +0300 example: generator move to platform tests run generator example with null pktio from linux-generic test directory. Null pktio might not be implemented on other odp implementations. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 63f4ae60..7deeef40 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -3,8 +3,3 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_generator odp_generator_SOURCES = odp_generator.c - -if test_example -TESTS = generator_run.sh -endif -EXTRA_DIST = generator_run.sh diff --git a/example/generator/generator_run.sh b/example/generator/generator_run.sh deleted file mode 100755 index 2d741a8d..00000000 --- a/example/generator/generator_run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2018, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -./odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u -STATUS=$? - -if [ "$STATUS" -ne 0 ]; then - echo "Error: status was: $STATUS, expected 0" - exit 1 -fi - -exit 0 diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7fa3652e..935894b8 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -19,6 +19,8 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/test/Makefile + platform/linux-generic/test/example/Makefile + platform/linux-generic/test/example/generator/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile platform/linux-generic/test/mmap_vlan_ins/Makefile diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 99934099..e317ff73 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -3,6 +3,10 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = performance +if test_example +SUBDIRS += example +endif + if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ diff --git a/platform/linux-generic/test/example/Makefile.am b/platform/linux-generic/test/example/Makefile.am new file mode 100644 index 00000000..41d28752 --- /dev/null +++ b/platform/linux-generic/test/example/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = generator diff --git a/platform/linux-generic/test/example/generator/Makefile.am b/platform/linux-generic/test/example/generator/Makefile.am new file mode 100644 index 00000000..3bdfdc69 --- /dev/null +++ b/platform/linux-generic/test/example/generator/Makefile.am @@ -0,0 +1,4 @@ +TESTS_ENVIRONMENT = EXAMPLE_DIR=${top_builddir}/example/generator + +TESTS = generator_run.sh +EXTRA_DIST = generator_run.sh diff --git a/platform/linux-generic/test/example/generator/generator_run.sh b/platform/linux-generic/test/example/generator/generator_run.sh new file mode 100755 index 00000000..3e7fabfe --- /dev/null +++ b/platform/linux-generic/test/example/generator/generator_run.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# Copyright (c) 2018, Linaro Limited +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +# directory where platform test sources are, including scripts +TEST_SRC_DIR=$(dirname $0) + +# exit codes expected by automake for skipped tests +TEST_SKIPPED=77 + +# directories where binary can be found: +# -in the validation dir when running make check (intree or out of tree) +# -in the script directory, when running after 'make install', or +# -in the validation when running standalone intree. +# -in the current directory. +# running stand alone out of tree requires setting PATH +PATH="${EXAMPLE_DIR}/:$PATH" +PATH="`pwd`/example/generator/:$PATH" +PATH="$(dirname $0)/../../../../../example/generator:$PATH" +PATH=".:$PATH" + +bin_path=$(which odp_generator${EXEEXT}) +if [ -x "$bin_path" ] ; then + echo "running with odp_generator: $bin_path" +else + echo "cannot odp_generator: please set you PATH for it." + pwd + echo $PATH + exit 1 +fi + + +odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u +STATUS=$? + +if [ "$STATUS" -ne 0 ]; then + echo "Error: status was: $STATUS, expected 0" + exit 1 +fi + +exit 0 ----------------------------------------------------------------------- Summary of changes: example/generator/Makefile.am | 5 --- example/generator/generator_run.sh | 17 -------- platform/linux-generic/m4/configure.m4 | 2 + platform/linux-generic/test/Makefile.am | 4 ++ platform/linux-generic/test/example/Makefile.am | 1 + .../test/example/generator/Makefile.am | 4 ++ .../test/example/generator/generator_run.sh | 45 ++++++++++++++++++++++ 7 files changed, 56 insertions(+), 22 deletions(-) delete mode 100755 example/generator/generator_run.sh create mode 100644 platform/linux-generic/test/example/Makefile.am create mode 100644 platform/linux-generic/test/example/generator/Makefile.am create mode 100755 platform/linux-generic/test/example/generator/generator_run.sh hooks/post-receive --

8 years

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-237-g115de925

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 115de92568af53becceae8300fe2f2b6a3436cfc (commit) via 2f62f234d0b83f4deedcfb75213a6e901e87d902 (commit) via d3e7f84960c29b58ad78de745b4bc3d5f26fc77d (commit) via fd22012f6f8e621fb22d5f4d6c15347f9535a902 (commit) via c2837dee41364443bc95aa97611e3d721ef16813 (commit) via eba4477a5cd5300d608ddfc53ff00cd3e51805a6 (commit) via 3e90ecc0bfa4487a29fbdff7ccc1cf5a2a1e8bc0 (commit) via dfa1ee94dae761166126445739be0dd6843f6792 (commit) via 01014bb374153d7bc879b3e1d26e79a6dfe5c329 (commit) via d7f9a326839de8d731d95ba3a1c45114198887d1 (commit) via b07985be674cef618fabeb7111ffa4dbb3e74fef (commit) via 74948cab5525f59e016dc984d95cb51f2ce2f963 (commit) via 4ffba79dfc573070f61da8894877783601e3aff4 (commit) via 4fc0e934df0bbd0779c6051595add213f752272a (commit) via 69367466a8c3e30509b1f86c4751285aab37efb8 (commit) via d1da7104eb4875287c816aec7e145a7504239156 (commit) via 409d87e542b9f018467c2c62bb07a8e4f2a15993 (commit) via f4d395f2a80646c0609b62fbe37cd14465df74ac (commit) via dab09417bf432da56aeddb2feaef9e6a11b739d7 (commit) via f7938ef11ede6ed6843bb7608a98ab3d15cf8e1c (commit) via 9e40c760b95077a4ca4e652e4d39a4304e5828f6 (commit) via 7c733ea2be5898660a3d02cdd2cf1f0a64a50e0c (commit) via e8d209cc33a34c7ee92053e3f240c542068816dd (commit) via 157737a4629a569f453762f92be2e3d174dfe1e5 (commit) via e4fec7da3e89c20cfe3c4d96c5fbe02ebbea57b3 (commit) from d5419e8857b2bc61d3be17fe53f171550fee426b (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 115de92568af53becceae8300fe2f2b6a3436cfc Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:25:20 2018 +0300 validation: traffic_mngr: do not run the test twice Currently tm test will be run twice: from the subdir and from main validation/api dir. Run it only once together with the rest of tests. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index 1f49d4cb..a9b8550d 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -2,14 +2,9 @@ include ../Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${builddir} -TESTSCRIPTS = traffic_mngr.sh -TEST_EXTENSIONS = .sh - -TESTS = $(TESTSCRIPTS) - test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr.c LDADD += -lm -dist_check_SCRIPTS = $(TESTSCRIPTS) +dist_check_SCRIPTS = traffic_mngr.sh test_SCRIPTS = $(dist_check_SCRIPTS) commit 2f62f234d0b83f4deedcfb75213a6e901e87d902 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: pktio: simplify test infrastructure Merge separate file with just main() function into main test files. Split single pktio test into pktio and parser tests. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh index bf9fc456..5ab45094 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh @@ -25,6 +25,7 @@ if [ -x "$pktio_main_path" ] ; then echo "running with $pktio_main_path" else echo "cannot find pktio_main${EXEEXT}: please set you PATH for it." + exit 1 fi PCAP_FNAME=vald.pcap diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index a6a16e2f..ffd1827b 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = pktio_main -pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h +pktio_main_SOURCES = pktio.c parser.c parser.h diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index 1788d4d6..e0431441 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -14,7 +14,6 @@ #include <stdlib.h> #include "parser.h" -#include "pktio.h" #define MAX_NUM_IFACES 2 #define PKT_POOL_NUM 256 @@ -208,6 +207,21 @@ static odp_packet_t recv_and_cmp_packet(odp_pktin_queue_t pktin, return pkt; } +static void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst) +{ + uint32_t len; + odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len); + int ret; + + ret = odp_pktio_mac_addr(src, &eth->src, ODP_PKTIO_MACADDR_MAXSIZE); + CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE); + + ret = odp_pktio_mac_addr(dst, &eth->dst, ODP_PKTIO_MACADDR_MAXSIZE); + CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE); +} + /** * Creates a test packet from data array and loops it through the test pktio * interfaces forcing packet parsing. @@ -257,7 +271,7 @@ static odp_packet_t loopback_packet(pktio_info_t *pktio_a, return pkt; } -void parser_test_arp(void) +static void parser_test_arp(void) { odp_packet_t pkt; @@ -273,7 +287,7 @@ void parser_test_arp(void) odp_packet_free(pkt); } -void parser_test_ipv4_icmp(void) +static void parser_test_ipv4_icmp(void) { odp_packet_t pkt; @@ -291,7 +305,7 @@ void parser_test_ipv4_icmp(void) odp_packet_free(pkt); } -void parser_test_ipv4_tcp(void) +static void parser_test_ipv4_tcp(void) { odp_packet_t pkt; @@ -308,7 +322,7 @@ void parser_test_ipv4_tcp(void) odp_packet_free(pkt); } -void parser_test_ipv4_udp(void) +static void parser_test_ipv4_udp(void) { odp_packet_t pkt; @@ -325,7 +339,7 @@ void parser_test_ipv4_udp(void) odp_packet_free(pkt); } -void parser_test_vlan_ipv4_udp(void) +static void parser_test_vlan_ipv4_udp(void) { odp_packet_t pkt; @@ -343,7 +357,7 @@ void parser_test_vlan_ipv4_udp(void) odp_packet_free(pkt); } -void parser_test_vlan_qinq_ipv4_udp(void) +static void parser_test_vlan_qinq_ipv4_udp(void) { odp_packet_t pkt; @@ -362,7 +376,7 @@ void parser_test_vlan_qinq_ipv4_udp(void) odp_packet_free(pkt); } -void parser_test_ipv6_icmp(void) +static void parser_test_ipv6_icmp(void) { odp_packet_t pkt; @@ -380,7 +394,7 @@ void parser_test_ipv6_icmp(void) odp_packet_free(pkt); } -void parser_test_ipv6_tcp(void) +static void parser_test_ipv6_tcp(void) { odp_packet_t pkt; @@ -397,7 +411,7 @@ void parser_test_ipv6_tcp(void) odp_packet_free(pkt); } -void parser_test_ipv6_udp(void) +static void parser_test_ipv6_udp(void) { odp_packet_t pkt; @@ -414,7 +428,7 @@ void parser_test_ipv6_udp(void) odp_packet_free(pkt); } -void parser_test_vlan_ipv6_udp(void) +static void parser_test_vlan_ipv6_udp(void) { odp_packet_t pkt; diff --git a/test/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h index d95ecca1..688990fb 100644 --- a/test/validation/api/pktio/parser.h +++ b/test/validation/api/pktio/parser.h @@ -9,18 +9,6 @@ #include <odp_cunit_common.h> -/* test functions: */ -void parser_test_arp(void); -void parser_test_ipv4_icmp(void); -void parser_test_ipv4_tcp(void); -void parser_test_ipv4_udp(void); -void parser_test_vlan_ipv4_udp(void); -void parser_test_vlan_qinq_ipv4_udp(void); -void parser_test_ipv6_icmp(void); -void parser_test_ipv6_tcp(void); -void parser_test_ipv6_udp(void); -void parser_test_vlan_ipv6_udp(void); - /* test array init/term functions: */ int parser_suite_term(void); int parser_suite_init(void); diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index b20272ff..a0496642 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -12,7 +12,6 @@ #include <odp/helper/odph_api.h> #include <stdlib.h> -#include "pktio.h" #include "parser.h" #define PKT_BUF_NUM 32 @@ -150,7 +149,7 @@ static void set_pool_len(odp_pool_param_t *params, odp_pool_capability_t *capa) } } -void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst) +static void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst) { uint32_t len; odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len); @@ -751,59 +750,59 @@ static void test_txrx(odp_pktin_mode_t in_mode, int num_pkts, } } -void pktio_test_plain_queue(void) +static void pktio_test_plain_queue(void) { test_txrx(ODP_PKTIN_MODE_QUEUE, 1, TXRX_MODE_SINGLE); test_txrx(ODP_PKTIN_MODE_QUEUE, TX_BATCH_LEN, TXRX_MODE_SINGLE); } -void pktio_test_plain_multi(void) +static void pktio_test_plain_multi(void) { test_txrx(ODP_PKTIN_MODE_QUEUE, TX_BATCH_LEN, TXRX_MODE_MULTI); test_txrx(ODP_PKTIN_MODE_QUEUE, 1, TXRX_MODE_MULTI); } -void pktio_test_plain_multi_event(void) +static void pktio_test_plain_multi_event(void) { test_txrx(ODP_PKTIN_MODE_QUEUE, 1, TXRX_MODE_MULTI_EVENT); test_txrx(ODP_PKTIN_MODE_QUEUE, TX_BATCH_LEN, TXRX_MODE_MULTI_EVENT); } -void pktio_test_sched_queue(void) +static void pktio_test_sched_queue(void) { test_txrx(ODP_PKTIN_MODE_SCHED, 1, TXRX_MODE_SINGLE); test_txrx(ODP_PKTIN_MODE_SCHED, TX_BATCH_LEN, TXRX_MODE_SINGLE); } -void pktio_test_sched_multi(void) +static void pktio_test_sched_multi(void) { test_txrx(ODP_PKTIN_MODE_SCHED, TX_BATCH_LEN, TXRX_MODE_MULTI); test_txrx(ODP_PKTIN_MODE_SCHED, 1, TXRX_MODE_MULTI); } -void pktio_test_sched_multi_event(void) +static void pktio_test_sched_multi_event(void) { test_txrx(ODP_PKTIN_MODE_SCHED, 1, TXRX_MODE_MULTI_EVENT); test_txrx(ODP_PKTIN_MODE_SCHED, TX_BATCH_LEN, TXRX_MODE_MULTI_EVENT); } -void pktio_test_recv(void) +static void pktio_test_recv(void) { test_txrx(ODP_PKTIN_MODE_DIRECT, 1, TXRX_MODE_SINGLE); } -void pktio_test_recv_multi(void) +static void pktio_test_recv_multi(void) { test_txrx(ODP_PKTIN_MODE_DIRECT, TX_BATCH_LEN, TXRX_MODE_MULTI); } -void pktio_test_recv_multi_event(void) +static void pktio_test_recv_multi_event(void) { test_txrx(ODP_PKTIN_MODE_DIRECT, 1, TXRX_MODE_MULTI_EVENT); test_txrx(ODP_PKTIN_MODE_DIRECT, TX_BATCH_LEN, TXRX_MODE_MULTI_EVENT); } -void pktio_test_recv_queue(void) +static void pktio_test_recv_queue(void) { odp_pktio_t pktio_tx, pktio_rx; odp_pktio_t pktio[MAX_NUM_IFACES]; @@ -1005,25 +1004,25 @@ static void test_recv_tmo(recv_tmo_mode_e mode) } } -void pktio_test_recv_tmo(void) +static void pktio_test_recv_tmo(void) { test_recv_tmo(RECV_TMO); } -void pktio_test_recv_mq_tmo(void) +static void pktio_test_recv_mq_tmo(void) { test_recv_tmo(RECV_MQ_TMO); test_recv_tmo(RECV_MQ_TMO_NO_IDX); } -void pktio_test_recv_mtu(void) +static void pktio_test_recv_mtu(void) { packet_len = USE_MTU; pktio_test_sched_multi(); packet_len = PKT_LEN_NORMAL; } -void pktio_test_mtu(void) +static void pktio_test_mtu(void) { int ret; uint32_t maxlen; @@ -1046,7 +1045,7 @@ void pktio_test_mtu(void) CU_ASSERT(ret == 0); } -void pktio_test_promisc(void) +static void pktio_test_promisc(void) { int ret; odp_pktio_capability_t capa; @@ -1084,7 +1083,7 @@ void pktio_test_promisc(void) CU_ASSERT(ret == 0); } -void pktio_test_mac(void) +static void pktio_test_mac(void) { unsigned char mac_addr[ODP_PKTIO_MACADDR_MAXSIZE]; unsigned char mac_addr_ref[ODP_PKTIO_MACADDR_MAXSIZE] = { @@ -1137,7 +1136,7 @@ void pktio_test_mac(void) CU_ASSERT(0 == ret); } -void pktio_test_open(void) +static void pktio_test_open(void) { odp_pktio_t pktio; odp_pktio_param_t pktio_param; @@ -1158,7 +1157,7 @@ void pktio_test_open(void) CU_ASSERT(pktio == ODP_PKTIO_INVALID); } -void pktio_test_lookup(void) +static void pktio_test_lookup(void) { odp_pktio_t pktio, pktio_inval; odp_pktio_param_t pktio_param; @@ -1181,7 +1180,7 @@ void pktio_test_lookup(void) CU_ASSERT(odp_pktio_lookup(iface_name[0]) == ODP_PKTIO_INVALID); } -void pktio_test_index(void) +static void pktio_test_index(void) { odp_pktio_t pktio; odp_pktio_param_t pktio_param; @@ -1217,7 +1216,7 @@ static void pktio_test_print(void) } } -void pktio_test_pktio_config(void) +static void pktio_test_pktio_config(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1242,7 +1241,7 @@ void pktio_test_pktio_config(void) CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0); } -void pktio_test_info(void) +static void pktio_test_info(void) { odp_pktio_t pktio; odp_pktio_info_t pktio_info; @@ -1269,7 +1268,7 @@ void pktio_test_info(void) } } -void pktio_test_pktin_queue_config_direct(void) +static void pktio_test_pktin_queue_config_direct(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1310,7 +1309,7 @@ void pktio_test_pktin_queue_config_direct(void) CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0); } -void pktio_test_pktin_queue_config_sched(void) +static void pktio_test_pktin_queue_config_sched(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1348,7 +1347,7 @@ void pktio_test_pktin_queue_config_sched(void) CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0); } -void pktio_test_pktin_queue_config_queue(void) +static void pktio_test_pktin_queue_config_queue(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1384,7 +1383,7 @@ void pktio_test_pktin_queue_config_queue(void) CU_ASSERT(odp_pktio_close(pktio) == 0); } -void pktio_test_pktout_queue_config(void) +static void pktio_test_pktout_queue_config(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1450,7 +1449,7 @@ static void _print_pktio_stats(odp_pktio_stats_t *s, const char *name) * get statistics counters. ethtool strings are not standardised * and sysfs may not be supported. skip pktio_stats test until * we will solve that.*/ -int pktio_check_statistics_counters(void) +static int pktio_check_statistics_counters(void) { odp_pktio_t pktio; odp_pktio_stats_t stats; @@ -1474,7 +1473,7 @@ int pktio_check_statistics_counters(void) return ODP_TEST_INACTIVE; } -void pktio_test_statistics_counters(void) +static void pktio_test_statistics_counters(void) { odp_pktio_t pktio_rx, pktio_tx; odp_pktio_t pktio[MAX_NUM_IFACES] = { @@ -1584,7 +1583,7 @@ void pktio_test_statistics_counters(void) } } -void pktio_test_start_stop(void) +static void pktio_test_start_stop(void) { odp_pktio_t pktio[MAX_NUM_IFACES]; odp_pktio_t pktio_in; @@ -1713,7 +1712,7 @@ void pktio_test_start_stop(void) * biggest packet we can allocate then the test won't be able to * attempt to send packets larger than the max len, so skip the test. */ -int pktio_check_send_failure(void) +static int pktio_check_send_failure(void) { odp_pktio_t pktio_tx; uint32_t maxlen; @@ -1750,7 +1749,7 @@ int pktio_check_send_failure(void) return ODP_TEST_ACTIVE; } -void pktio_test_send_failure(void) +static void pktio_test_send_failure(void) { odp_pktio_t pktio_tx, pktio_rx; odp_packet_t pkt_tbl[TX_BATCH_LEN]; @@ -1907,7 +1906,7 @@ cleanup: CU_ASSERT(odp_pool_destroy(pkt_pool) == 0); } -void pktio_test_recv_on_wonly(void) +static void pktio_test_recv_on_wonly(void) { odp_pktio_t pktio; int ret; @@ -1935,7 +1934,7 @@ void pktio_test_recv_on_wonly(void) CU_ASSERT_FATAL(ret == 0); } -void pktio_test_send_on_ronly(void) +static void pktio_test_send_on_ronly(void) { odp_pktio_t pktio; int ret; @@ -1963,7 +1962,7 @@ void pktio_test_send_on_ronly(void) CU_ASSERT_FATAL(ret == 0); } -int pktio_check_pktin_ts(void) +static int pktio_check_pktin_ts(void) { odp_pktio_t pktio; odp_pktio_capability_t capa; @@ -1986,7 +1985,7 @@ int pktio_check_pktin_ts(void) return ODP_TEST_ACTIVE; } -void pktio_test_pktin_ts(void) +static void pktio_test_pktin_ts(void) { odp_pktio_t pktio_tx, pktio_rx; odp_pktio_t pktio[MAX_NUM_IFACES]; @@ -2142,19 +2141,19 @@ static int pktio_suite_init(void) return 0; } -int pktio_suite_init_unsegmented(void) +static int pktio_suite_init_unsegmented(void) { pool_segmentation = PKT_POOL_UNSEGMENTED; return pktio_suite_init(); } -int pktio_suite_init_segmented(void) +static int pktio_suite_init_segmented(void) { pool_segmentation = PKT_POOL_SEGMENTED; return pktio_suite_init(); } -int pktio_suite_term(void) +static int pktio_suite_term(void) { char pool_name[ODP_POOL_NAME_LEN]; odp_pool_t pool; @@ -2245,7 +2244,7 @@ odp_suiteinfo_t pktio_suites[] = { ODP_SUITE_INFO_NULL }; -int pktio_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/pktio/pktio.h b/test/validation/api/pktio/pktio.h deleted file mode 100644 index b8799d9e..00000000 --- a/test/validation/api/pktio/pktio.h +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_PKTIO_H_ -#define _ODP_TEST_PKTIO_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void pktio_test_plain_queue(void); -void pktio_test_plain_multi(void); -void pktio_test_sched_queue(void); -void pktio_test_sched_multi(void); -void pktio_test_recv(void); -void pktio_test_recv_multi(void); -void pktio_test_recv_queue(void); -void pktio_test_recv_tmo(void); -void pktio_test_recv_mq_tmo(void); -void pktio_test_recv_mtu(void); -void pktio_test_mtu(void); -void pktio_test_promisc(void); -void pktio_test_mac(void); -void pktio_test_inq_remdef(void); -void pktio_test_open(void); -void pktio_test_lookup(void); -void pktio_test_index(void); -void pktio_test_info(void); -void pktio_test_inq(void); -void pktio_test_pktio_config(void); -void pktio_test_pktin_queue_config_direct(void); -void pktio_test_pktin_queue_config_sched(void); -void pktio_test_pktin_queue_config_queue(void); -void pktio_test_pktout_queue_config(void); -void pktio_test_start_stop(void); -int pktio_check_send_failure(void); -void pktio_test_send_failure(void); -void pktio_test_recv_on_wonly(void); -void pktio_test_send_on_ronly(void); -void pktio_test_plain_multi_event(void); -void pktio_test_sched_multi_event(void); -void pktio_test_recv_multi_event(void); -int pktio_check_statistics_counters(void); -void pktio_test_statistics_counters(void); -int pktio_check_pktin_ts(void); -void pktio_test_pktin_ts(void); - -/* test arrays: */ -extern odp_testinfo_t pktio_suite[]; - -/* test array init/term functions: */ -int pktio_suite_term(void); -int pktio_suite_init_segmented(void); -int pktio_suite_init_unsegmented(void); - -/* test registry: */ -extern odp_suiteinfo_t pktio_suites[]; - -/* main test program: */ -int pktio_main(int argc, char *argv[]); - -/* functions shared by parser test suite */ -void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst); - -#endif diff --git a/test/validation/api/pktio/pktio_main.c b/test/validation/api/pktio/pktio_main.c deleted file mode 100644 index 13d2407a..00000000 --- a/test/validation/api/pktio/pktio_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "pktio.h" - -int main(int argc, char *argv[]) -{ - return pktio_main(argc, argv); -} commit d3e7f84960c29b58ad78de745b4bc3d5f26fc77d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: classification: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index 303a3576..e17f9f65 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -1,7 +1,7 @@ include ../Makefile.inc test_PROGRAMS = classification_main -classification_main_SOURCES = classification_main.c \ +classification_main_SOURCES = \ odp_classification_basic.c \ odp_classification_tests.c \ odp_classification_testsuites.h \ diff --git a/test/validation/api/classification/classification.c b/test/validation/api/classification/classification.c index ef621f72..e89ffbee 100644 --- a/test/validation/api/classification/classification.c +++ b/test/validation/api/classification/classification.c @@ -28,7 +28,7 @@ odp_suiteinfo_t classification_suites[] = { ODP_SUITE_INFO_NULL, }; -int classification_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/classification/classification.h b/test/validation/api/classification/classification.h index 326177ad..4a540218 100644 --- a/test/validation/api/classification/classification.h +++ b/test/validation/api/classification/classification.h @@ -76,46 +76,4 @@ #define DEFAULT_TOS ((DEFAULT_DSCP << ODPH_IP_TOS_DSCP_SHIFT) | \ DEFAULT_ECN) -/* test functions: */ -void classification_test_create_cos(void); -void classification_test_destroy_cos(void); -void classification_test_create_pmr_match(void); -void classification_test_cos_set_queue(void); -void classification_test_cos_set_pool(void); -void classification_test_cos_set_drop(void); -void classification_test_pmr_composite_create(void); -void classification_test_pmr_composite_destroy(void); - -void classification_test_pktio_set_skip(void); -void classification_test_pktio_set_headroom(void); -void classification_test_pktio_configure(void); -void classification_test_pktio_test(void); - -void classification_test_pmr_term_tcp_dport(void); -void classification_test_pmr_term_tcp_sport(void); -void classification_test_pmr_term_udp_dport(void); -void classification_test_pmr_term_udp_sport(void); -void classification_test_pmr_term_ipproto(void); -void classification_test_pmr_term_dmac(void); -void classification_test_pmr_term_packet_len(void); -void classification_test_pmr_term_vlan_id_0(void); -void classification_test_pmr_term_vlan_id_x(void); -void classification_test_pmr_term_eth_type_0(void); -void classification_test_pmr_term_eth_type_x(void); -void classification_test_pktin_classifier_flag(void); - -/* test arrays: */ -extern odp_testinfo_t classification_suite_basic[]; -extern odp_testinfo_t classification_suite[]; - -/* test array init/term functions: */ -int classification_suite_init(void); -int classification_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t classification_suites[]; - -/* main test program: */ -int classification_main(int argc, char *argv[]); - #endif diff --git a/test/validation/api/classification/classification_main.c b/test/validation/api/classification/classification_main.c deleted file mode 100644 index 51909d00..00000000 --- a/test/validation/api/classification/classification_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "classification.h" - -int main(int argc, char *argv[]) -{ - return classification_main(argc, argv); -} diff --git a/test/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c index 20f07374..8b3738b7 100644 --- a/test/validation/api/classification/odp_classification_basic.c +++ b/test/validation/api/classification/odp_classification_basic.c @@ -12,7 +12,7 @@ #define PMR_SET_NUM 5 -void classification_test_create_cos(void) +static void classification_test_create_cos(void) { odp_cos_t cos; odp_cls_cos_param_t cls_param; @@ -37,7 +37,7 @@ void classification_test_create_cos(void) odp_queue_destroy(queue); } -void classification_test_destroy_cos(void) +static void classification_test_destroy_cos(void) { odp_cos_t cos; char name[ODP_COS_NAME_LEN]; @@ -69,7 +69,7 @@ void classification_test_destroy_cos(void) odp_queue_destroy(queue); } -void classification_test_create_pmr_match(void) +static void classification_test_create_pmr_match(void) { odp_pmr_t pmr; uint16_t val; @@ -139,7 +139,7 @@ void classification_test_create_pmr_match(void) odp_pktio_close(pktio); } -void classification_test_cos_set_queue(void) +static void classification_test_cos_set_queue(void) { int retval; char cosname[ODP_COS_NAME_LEN]; @@ -182,7 +182,7 @@ void classification_test_cos_set_queue(void) odp_pool_destroy(pool); } -void classification_test_cos_set_pool(void) +static void classification_test_cos_set_pool(void) { int retval; char cosname[ODP_COS_NAME_LEN]; @@ -221,7 +221,7 @@ void classification_test_cos_set_pool(void) odp_pool_destroy(cos_pool); } -void classification_test_cos_set_drop(void) +static void classification_test_cos_set_drop(void) { int retval; char cosname[ODP_COS_NAME_LEN]; @@ -256,7 +256,7 @@ void classification_test_cos_set_drop(void) odp_queue_destroy(queue); } -void classification_test_pmr_composite_create(void) +static void classification_test_pmr_composite_create(void) { odp_pmr_t pmr_composite; int retval; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 87d04b6b..f21b8add 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -88,7 +88,7 @@ int classification_suite_pmr_term(void) return retcode; } -void classification_test_pktin_classifier_flag(void) +static void classification_test_pktin_classifier_flag(void) { odp_packet_t pkt; odph_tcphdr_t *tcp; @@ -184,7 +184,7 @@ void classification_test_pktin_classifier_flag(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_tcp_dport(void) +static void classification_test_pmr_term_tcp_dport(void) { odp_packet_t pkt; odph_tcphdr_t *tcp; @@ -298,7 +298,7 @@ void classification_test_pmr_term_tcp_dport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_tcp_sport(void) +static void classification_test_pmr_term_tcp_sport(void) { odp_packet_t pkt; odph_tcphdr_t *tcp; @@ -410,7 +410,7 @@ void classification_test_pmr_term_tcp_sport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_udp_dport(void) +static void classification_test_pmr_term_udp_dport(void) { odp_packet_t pkt; odph_udphdr_t *udp; @@ -526,7 +526,7 @@ void classification_test_pmr_term_udp_dport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_udp_sport(void) +static void classification_test_pmr_term_udp_sport(void) { odp_packet_t pkt; odph_udphdr_t *udp; @@ -641,7 +641,7 @@ void classification_test_pmr_term_udp_sport(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_ipproto(void) +static void classification_test_pmr_term_ipproto(void) { odp_packet_t pkt; uint32_t seqno; @@ -750,7 +750,7 @@ void classification_test_pmr_term_ipproto(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_dmac(void) +static void classification_test_pmr_term_dmac(void) { odp_packet_t pkt; uint32_t seqno; @@ -856,7 +856,7 @@ void classification_test_pmr_term_dmac(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_packet_len(void) +static void classification_test_pmr_term_packet_len(void) { odp_packet_t pkt; uint32_t seqno; @@ -968,7 +968,7 @@ void classification_test_pmr_term_packet_len(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_vlan_id_0(void) +static void classification_test_pmr_term_vlan_id_0(void) { odp_packet_t pkt; uint32_t seqno; @@ -1081,7 +1081,7 @@ void classification_test_pmr_term_vlan_id_0(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_vlan_id_x(void) +static void classification_test_pmr_term_vlan_id_x(void) { odp_packet_t pkt; uint32_t seqno; @@ -1195,7 +1195,7 @@ void classification_test_pmr_term_vlan_id_x(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_eth_type_0(void) +static void classification_test_pmr_term_eth_type_0(void) { odp_packet_t pkt; uint32_t seqno; @@ -1304,7 +1304,7 @@ void classification_test_pmr_term_eth_type_0(void) odp_pktio_close(pktio); } -void classification_test_pmr_term_eth_type_x(void) +static void classification_test_pmr_term_eth_type_x(void) { odp_packet_t pkt; uint32_t seqno; diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index c7f5d0d4..4cd727f9 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -399,7 +399,7 @@ void test_pktio_error_cos(void) odp_packet_free(pkt); } -void classification_test_pktio_set_skip(void) +static void classification_test_pktio_set_skip(void) { int retval; size_t offset = 5; @@ -417,7 +417,7 @@ void classification_test_pktio_set_skip(void) CU_ASSERT(retval == 0); } -void classification_test_pktio_set_headroom(void) +static void classification_test_pktio_set_headroom(void) { size_t headroom; int retval; @@ -681,7 +681,7 @@ void test_pktio_pmr_composite_cos(void) odp_packet_free(pkt); } -void classification_test_pktio_configure(void) +static void classification_test_pktio_configure(void) { /* Configure the Different CoS for the pktio interface */ if (TEST_DEFAULT) @@ -698,7 +698,7 @@ void classification_test_pktio_configure(void) configure_pktio_pmr_composite(); } -void classification_test_pktio_test(void) +static void classification_test_pktio_test(void) { /* Test Different CoS on the pktio interface */ if (TEST_DEFAULT) commit fd22012f6f8e621fb22d5f4d6c15347f9535a902 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: crypto: simplify test infrastructure Merge separate file with just main() function into main test file. Merge crypto.c file containing several small functions into test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 238ce189..cc4d49d6 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -1,10 +1,7 @@ include ../Makefile.inc test_PROGRAMS = crypto_main -crypto_main_SOURCES = crypto_main.c \ - crypto.c \ - crypto.h \ +crypto_main_SOURCES = \ odp_crypto_test_inp.c \ - odp_crypto_test_inp.h \ test_vectors.h \ test_vectors_len.h diff --git a/test/validation/api/crypto/crypto.c b/test/validation/api/crypto/crypto.c deleted file mode 100644 index 7298d544..00000000 --- a/test/validation/api/crypto/crypto.c +++ /dev/null @@ -1,135 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <odp_api.h> -#include <odp_cunit_common.h> -#include "odp_crypto_test_inp.h" -#include "crypto.h" - -#define PKT_POOL_NUM 64 -#define PKT_POOL_LEN (1 * 1024) - -odp_suiteinfo_t crypto_suites[] = { - {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, - crypto_suite_term, crypto_suite}, - {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, - crypto_suite_term, crypto_suite}, - {ODP_CRYPTO_PACKET_SYNC_INP, crypto_suite_packet_sync_init, - crypto_suite_term, crypto_suite}, - {ODP_CRYPTO_PACKET_ASYNC_INP, crypto_suite_packet_async_init, - crypto_suite_term, crypto_suite}, - ODP_SUITE_INFO_NULL, -}; - -int crypto_init(odp_instance_t *inst) -{ - odp_pool_param_t params; - odp_pool_t pool; - odp_queue_t out_queue; - odp_pool_capability_t pool_capa; - - 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; - } - - if (odp_pool_capability(&pool_capa) < 0) { - fprintf(stderr, "error: odp_pool_capability() failed.\n"); - return -1; - } - - odp_pool_param_init(&params); - params.pkt.seg_len = PKT_POOL_LEN; - params.pkt.len = PKT_POOL_LEN; - params.pkt.num = PKT_POOL_NUM; - params.type = ODP_POOL_PACKET; - - if (pool_capa.pkt.max_seg_len && - PKT_POOL_LEN > pool_capa.pkt.max_seg_len) { - fprintf(stderr, "Warning: small packet segment length\n"); - params.pkt.seg_len = pool_capa.pkt.max_seg_len; - } - - if (pool_capa.pkt.max_len && - PKT_POOL_LEN > pool_capa.pkt.max_len) { - fprintf(stderr, "Pool max packet length too small\n"); - return -1; - } - - pool = odp_pool_create("packet_pool", &params); - - if (ODP_POOL_INVALID == pool) { - fprintf(stderr, "Packet pool creation failed.\n"); - return -1; - } - out_queue = odp_queue_create("crypto-out", NULL); - if (ODP_QUEUE_INVALID == out_queue) { - fprintf(stderr, "Crypto outq creation failed.\n"); - return -1; - } - - return 0; -} - -int crypto_term(odp_instance_t inst) -{ - odp_pool_t pool; - odp_queue_t out_queue; - - out_queue = odp_queue_lookup("crypto-out"); - if (ODP_QUEUE_INVALID != out_queue) { - if (odp_queue_destroy(out_queue)) - fprintf(stderr, "Crypto outq destroy failed.\n"); - } else { - fprintf(stderr, "Crypto outq not found.\n"); - } - - pool = odp_pool_lookup("packet_pool"); - if (ODP_POOL_INVALID != pool) { - if (odp_pool_destroy(pool)) - fprintf(stderr, "Packet pool destroy failed.\n"); - } else { - fprintf(stderr, "Packet pool not found.\n"); - } - - if (0 != odp_term_local()) { - fprintf(stderr, "error: odp_term_local() failed.\n"); - return -1; - } - - if (0 != odp_term_global(inst)) { - fprintf(stderr, "error: odp_term_global() failed.\n"); - return -1; - } - - return 0; -} - -int crypto_main(int argc, char *argv[]) -{ - int ret; - - /* parse common options: */ - if (odp_cunit_parse_options(argc, argv)) - return -1; - - odp_cunit_register_global_init(crypto_init); - odp_cunit_register_global_term(crypto_term); - - ret = odp_cunit_register(crypto_suites); - - if (ret == 0) - ret = odp_cunit_run(); - - return ret; -} diff --git a/test/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h deleted file mode 100644 index 078a1909..00000000 --- a/test/validation/api/crypto/crypto.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_CRYPTO_H_ -#define _ODP_TEST_CRYPTO_H_ - -#include "odp_cunit_common.h" - -/* test functions: */ -void crypto_test_enc_alg_null(void); -void crypto_test_dec_alg_null(void); -void crypto_test_enc_alg_3des_cbc(void); -void crypto_test_enc_alg_3des_cbc_ovr_iv(void); -void crypto_test_dec_alg_3des_cbc(void); -void crypto_test_dec_alg_3des_cbc_ovr_iv(void); -void crypto_test_enc_alg_aes_cbc(void); -void crypto_test_enc_alg_aes_cbc_ovr_iv(void); -void crypto_test_dec_alg_aes_cbc(void); -void crypto_test_dec_alg_aes_cbc_ovr_iv(void); -void crypto_test_enc_alg_aes_ctr(void); -void crypto_test_enc_alg_aes_ctr_ovr_iv(void); -void crypto_test_dec_alg_aes_ctr(void); -void crypto_test_dec_alg_aes_ctr_ovr_iv(void); -void crypto_test_enc_alg_aes_gcm(void); -void crypto_test_enc_alg_aes_gcm_ovr_iv(void); -void crypto_test_dec_alg_aes_gcm(void); -void crypto_test_dec_alg_aes_gcm_ovr_iv(void); -void crypto_test_gen_alg_hmac_md5(void); -void crypto_test_check_alg_hmac_md5(void); -void crypto_test_gen_alg_hmac_sha1(void); -void crypto_test_check_alg_hmac_sha1(void); -void crypto_test_gen_alg_hmac_sha256(void); -void crypto_test_check_alg_hmac_sha256(void); -void crypto_test_gen_alg_hmac_sha512(void); -void crypto_test_check_alg_hmac_sha512(void); -void crypto_test_gen_alg_aes_gmac(void); -void crypto_test_check_alg_aes_gmac(void); - -/* test arrays: */ -extern odp_testinfo_t crypto_suite[]; - -/* test array init/term functions: */ -int crypto_suite_sync_init(void); -int crypto_suite_async_init(void); - -/* test registry: */ -extern odp_suiteinfo_t crypto_suites[]; - -/* executable init/term functions: */ -int crypto_init(odp_instance_t *inst); -int crypto_term(odp_instance_t inst); - -/* main test program: */ -int crypto_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/crypto/crypto_main.c b/test/validation/api/crypto/crypto_main.c deleted file mode 100644 index 2d5c6c7e..00000000 --- a/test/validation/api/crypto/crypto_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "crypto.h" - -int main(int argc, char *argv[]) -{ - return crypto_main(argc, argv); -} diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index df1c7b6f..ec477535 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -10,11 +10,12 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include "test_vectors.h" -#include "odp_crypto_test_inp.h" -#include "crypto.h" #define MAX_ALG_CAPA 32 +#define PKT_POOL_NUM 64 +#define PKT_POOL_LEN (1 * 1024) + struct suite_context_s { odp_bool_t packet; odp_crypto_op_mode_t op_mode; @@ -686,7 +687,7 @@ static int check_alg_null(void) } #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -void crypto_test_enc_alg_null(void) +static void crypto_test_enc_alg_null(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -696,7 +697,7 @@ void crypto_test_enc_alg_null(void) false); } -void crypto_test_dec_alg_null(void) +static void crypto_test_dec_alg_null(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -715,7 +716,7 @@ static int check_alg_3des_cbc(void) * operation for 3DES_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_3des_cbc(void) +static void crypto_test_enc_alg_3des_cbc(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, @@ -728,7 +729,7 @@ void crypto_test_enc_alg_3des_cbc(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for 3DES_CBC algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_3des_cbc_ovr_iv(void) +static void crypto_test_enc_alg_3des_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, @@ -743,7 +744,7 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_3des_cbc(void) +static void crypto_test_dec_alg_3des_cbc(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, @@ -758,7 +759,7 @@ void crypto_test_dec_alg_3des_cbc(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_3des_cbc_ovr_iv(void) +static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, @@ -777,7 +778,7 @@ static int check_alg_aes_gcm(void) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_gcm(void) +static void crypto_test_enc_alg_aes_gcm(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -791,7 +792,7 @@ void crypto_test_enc_alg_aes_gcm(void) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_gcm_ovr_iv(void) +static void crypto_test_enc_alg_aes_gcm_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -806,7 +807,7 @@ void crypto_test_enc_alg_aes_gcm_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_gcm(void) +static void crypto_test_dec_alg_aes_gcm(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -821,7 +822,7 @@ void crypto_test_dec_alg_aes_gcm(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_gcm_ovr_iv(void) +static void crypto_test_dec_alg_aes_gcm_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -840,7 +841,7 @@ static int check_alg_aes_cbc(void) * operation for AES128_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_cbc(void) +static void crypto_test_enc_alg_aes_cbc(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, @@ -853,7 +854,7 @@ void crypto_test_enc_alg_aes_cbc(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CBC algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_aes_cbc_ovr_iv(void) +static void crypto_test_enc_alg_aes_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, @@ -868,7 +869,7 @@ void crypto_test_enc_alg_aes_cbc_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_cbc(void) +static void crypto_test_dec_alg_aes_cbc(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, @@ -883,7 +884,7 @@ void crypto_test_dec_alg_aes_cbc(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_cbc_ovr_iv(void) +static void crypto_test_dec_alg_aes_cbc_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, @@ -902,7 +903,7 @@ static int check_alg_aes_ctr(void) * operation for AES128_CTR algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer.*/ -void crypto_test_enc_alg_aes_ctr(void) +static void crypto_test_enc_alg_aes_ctr(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CTR, @@ -915,7 +916,7 @@ void crypto_test_enc_alg_aes_ctr(void) /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CTR algorithm. IV for the operation is the operation IV. * */ -void crypto_test_enc_alg_aes_ctr_ovr_iv(void) +static void crypto_test_enc_alg_aes_ctr_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CTR, @@ -930,7 +931,7 @@ void crypto_test_enc_alg_aes_ctr_ovr_iv(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_ctr(void) +static void crypto_test_dec_alg_aes_ctr(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CTR, @@ -945,7 +946,7 @@ void crypto_test_dec_alg_aes_ctr(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_dec_alg_aes_ctr_ovr_iv(void) +static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CTR, @@ -967,7 +968,7 @@ static int check_alg_hmac_md5(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_md5(void) +static void crypto_test_gen_alg_hmac_md5(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -977,7 +978,7 @@ void crypto_test_gen_alg_hmac_md5(void) false); } -void crypto_test_check_alg_hmac_md5(void) +static void crypto_test_check_alg_hmac_md5(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -999,7 +1000,7 @@ static int check_alg_hmac_sha1(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha1(void) +static void crypto_test_gen_alg_hmac_sha1(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -1009,7 +1010,7 @@ void crypto_test_gen_alg_hmac_sha1(void) false); } -void crypto_test_check_alg_hmac_sha1(void) +static void crypto_test_check_alg_hmac_sha1(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1031,7 +1032,7 @@ static int check_alg_hmac_sha256(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha256(void) +static void crypto_test_gen_alg_hmac_sha256(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -1041,7 +1042,7 @@ void crypto_test_gen_alg_hmac_sha256(void) false); } -void crypto_test_check_alg_hmac_sha256(void) +static void crypto_test_check_alg_hmac_sha256(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1063,7 +1064,7 @@ static int check_alg_hmac_sha512(void) * In addition the test verifies if the implementation can use the * packet buffer as completion event buffer. * */ -void crypto_test_gen_alg_hmac_sha512(void) +static void crypto_test_gen_alg_hmac_sha512(void) { check_alg(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, @@ -1073,7 +1074,7 @@ void crypto_test_gen_alg_hmac_sha512(void) false); } -void crypto_test_check_alg_hmac_sha512(void) +static void crypto_test_check_alg_hmac_sha512(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1088,7 +1089,7 @@ static int check_alg_aes_gmac(void) return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_GMAC); } -void crypto_test_gen_alg_aes_gmac(void) +static void crypto_test_gen_alg_aes_gmac(void) { unsigned int test_vec_num = (sizeof(aes_gmac_reference) / sizeof(aes_gmac_reference[0])); @@ -1103,7 +1104,7 @@ void crypto_test_gen_alg_aes_gmac(void) false); } -void crypto_test_check_alg_aes_gmac(void) +static void crypto_test_check_alg_aes_gmac(void) { check_alg(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_NULL, @@ -1113,7 +1114,7 @@ void crypto_test_check_alg_aes_gmac(void) false); } -int crypto_suite_sync_init(void) +static int crypto_suite_sync_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); if (suite_context.pool == ODP_POOL_INVALID) @@ -1124,7 +1125,7 @@ int crypto_suite_sync_init(void) return 0; } -int crypto_suite_async_init(void) +static int crypto_suite_async_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); if (suite_context.pool == ODP_POOL_INVALID) @@ -1137,7 +1138,7 @@ int crypto_suite_async_init(void) return 0; } -int crypto_suite_packet_sync_init(void) +static int crypto_suite_packet_sync_init(void) { suite_context.packet = true; suite_context.op_mode = ODP_CRYPTO_SYNC; @@ -1150,7 +1151,7 @@ int crypto_suite_packet_sync_init(void) return 0; } -int crypto_suite_packet_async_init(void) +static int crypto_suite_packet_async_init(void) { suite_context.packet = true; suite_context.op_mode = ODP_CRYPTO_ASYNC; @@ -1225,7 +1226,7 @@ odp_testinfo_t crypto_suite[] = { ODP_TEST_INFO_NULL, }; -int crypto_suite_term(void) +static int crypto_suite_term(void) { int i; int first = 1; @@ -1242,3 +1243,129 @@ int crypto_suite_term(void) } return 0; } + +/* Suite names */ +#define ODP_CRYPTO_SYNC_INP "odp_crypto_sync_inp" +#define ODP_CRYPTO_ASYNC_INP "odp_crypto_async_inp" +#define ODP_CRYPTO_PACKET_SYNC_INP "odp_crypto_packet_sync_inp" +#define ODP_CRYPTO_PACKET_ASYNC_INP "odp_crypto_packet_async_inp" + +odp_suiteinfo_t crypto_suites[] = { + {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, + crypto_suite_term, crypto_suite}, + {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, + crypto_suite_term, crypto_suite}, + {ODP_CRYPTO_PACKET_SYNC_INP, crypto_suite_packet_sync_init, + crypto_suite_term, crypto_suite}, + {ODP_CRYPTO_PACKET_ASYNC_INP, crypto_suite_packet_async_init, + crypto_suite_term, crypto_suite}, + ODP_SUITE_INFO_NULL, +}; + +static int crypto_init(odp_instance_t *inst) +{ + odp_pool_param_t params; + odp_pool_t pool; + odp_queue_t out_queue; + odp_pool_capability_t pool_capa; + + 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; + } + + if (odp_pool_capability(&pool_capa) < 0) { + fprintf(stderr, "error: odp_pool_capability() failed.\n"); + return -1; + } + + odp_pool_param_init(&params); + params.pkt.seg_len = PKT_POOL_LEN; + params.pkt.len = PKT_POOL_LEN; + params.pkt.num = PKT_POOL_NUM; + params.type = ODP_POOL_PACKET; + + if (pool_capa.pkt.max_seg_len && + PKT_POOL_LEN > pool_capa.pkt.max_seg_len) { + fprintf(stderr, "Warning: small packet segment length\n"); + params.pkt.seg_len = pool_capa.pkt.max_seg_len; + } + + if (pool_capa.pkt.max_len && + PKT_POOL_LEN > pool_capa.pkt.max_len) { + fprintf(stderr, "Pool max packet length too small\n"); + return -1; + } + + pool = odp_pool_create("packet_pool", &params); + + if (ODP_POOL_INVALID == pool) { + fprintf(stderr, "Packet pool creation failed.\n"); + return -1; + } + out_queue = odp_queue_create("crypto-out", NULL); + if (ODP_QUEUE_INVALID == out_queue) { + fprintf(stderr, "Crypto outq creation failed.\n"); + return -1; + } + + return 0; +} + +static int crypto_term(odp_instance_t inst) +{ + odp_pool_t pool; + odp_queue_t out_queue; + + out_queue = odp_queue_lookup("crypto-out"); + if (ODP_QUEUE_INVALID != out_queue) { + if (odp_queue_destroy(out_queue)) + fprintf(stderr, "Crypto outq destroy failed.\n"); + } else { + fprintf(stderr, "Crypto outq not found.\n"); + } + + pool = odp_pool_lookup("packet_pool"); + if (ODP_POOL_INVALID != pool) { + if (odp_pool_destroy(pool)) + fprintf(stderr, "Packet pool destroy failed.\n"); + } else { + fprintf(stderr, "Packet pool not found.\n"); + } + + if (0 != odp_term_local()) { + fprintf(stderr, "error: odp_term_local() failed.\n"); + return -1; + } + + if (0 != odp_term_global(inst)) { + fprintf(stderr, "error: odp_term_global() failed.\n"); + return -1; + } + + return 0; +} + +int main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + odp_cunit_register_global_init(crypto_init); + odp_cunit_register_global_term(crypto_term); + + ret = odp_cunit_register(crypto_suites); + + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/validation/api/crypto/odp_crypto_test_inp.h b/test/validation/api/crypto/odp_crypto_test_inp.h deleted file mode 100644 index c50b8493..00000000 --- a/test/validation/api/crypto/odp_crypto_test_inp.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#ifndef ODP_CRYPTO_TEST_ASYNC_INP_ -#define ODP_CRYPTO_TEST_ASYNC_INP_ - -#include <odp_cunit_common.h> - -/* Suite names */ -#define ODP_CRYPTO_SYNC_INP "odp_crypto_sync_inp" -#define ODP_CRYPTO_ASYNC_INP "odp_crypto_async_inp" -#define ODP_CRYPTO_PACKET_SYNC_INP "odp_crypto_packet_sync_inp" -#define ODP_CRYPTO_PACKET_ASYNC_INP "odp_crypto_packet_async_inp" - -/* Suite test array */ -extern odp_testinfo_t crypto_suite[]; - -int crypto_suite_sync_init(void); -int crypto_suite_async_init(void); -int crypto_suite_packet_sync_init(void); -int crypto_suite_packet_async_init(void); -int crypto_suite_term(void); - -#endif commit c2837dee41364443bc95aa97611e3d721ef16813 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: traffic_mngr: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index 82996afe..1f49d4cb 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -8,7 +8,7 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) test_PROGRAMS = traffic_mngr_main -traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h +traffic_mngr_main_SOURCES = traffic_mngr.c LDADD += -lm dist_check_SCRIPTS = $(TESTSCRIPTS) diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index fb7bb461..7bcd8e5f 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -19,7 +19,6 @@ #include <odp/helper/odph_api.h> #include <test_debug.h> #include "odp_cunit_common.h" -#include "traffic_mngr.h" #define TM_DEBUG 0 @@ -2044,7 +2043,7 @@ static int destroy_tm_systems(void) return 0; } -int traffic_mngr_suite_init(void) +static int traffic_mngr_suite_init(void) { uint32_t payload_len, copy_len; @@ -2088,7 +2087,7 @@ int traffic_mngr_suite_init(void) return 0; } -int traffic_mngr_suite_term(void) +static int traffic_mngr_suite_term(void) { uint32_t iface; @@ -2133,7 +2132,7 @@ static void check_shaper_profile(char *shaper_name, uint32_t shaper_idx) CU_ASSERT(shaper_params.dual_rate == 0); } -void traffic_mngr_test_shaper_profile(void) +static void traffic_mngr_test_shaper_profile(void) { odp_tm_shaper_params_t shaper_params; odp_tm_shaper_t profile; @@ -2197,7 +2196,7 @@ static void check_sched_profile(char *sched_name, uint32_t sched_idx) } } -void traffic_mngr_test_sched_profile(void) +static void traffic_mngr_test_sched_profile(void) { odp_tm_sched_params_t sched_params; odp_tm_sched_t profile; @@ -2261,7 +2260,7 @@ static void check_threshold_profile(char *threshold_name, CU_ASSERT(threshold_params.enable_max_bytes == 1); } -void traffic_mngr_test_threshold_profile(void) +static void traffic_mngr_test_threshold_profile(void) { odp_tm_threshold_params_t threshold_params; odp_tm_threshold_t profile; @@ -2325,7 +2324,7 @@ static void check_wred_profile(char *wred_name, CU_ASSERT(wred_params.use_byte_fullness == 0); } -void traffic_mngr_test_wred_profile(void) +static void traffic_mngr_test_wred_profile(void) { odp_tm_wred_params_t wred_params; odp_tm_wred_t profile; @@ -2416,7 +2415,7 @@ static int set_shaper(const char *node_name, return odp_tm_node_shaper_config(tm_node, shaper_profile); } -int traffic_mngr_check_shaper(void) +static int traffic_mngr_check_shaper(void) { odp_cpumask_t cpumask; int cpucount = odp_cpumask_all_available(&cpumask); @@ -2431,7 +2430,7 @@ int traffic_mngr_check_shaper(void) return ODP_TEST_ACTIVE; } -int traffic_mngr_check_scheduler(void) +static int traffic_mngr_check_scheduler(void) { odp_cpumask_t cpumask; int cpucount = odp_cpumask_all_available(&cpumask); @@ -3808,19 +3807,19 @@ static int test_fanin_info(const char *node_name) return walk_tree_backwards(node_desc->node); } -void traffic_mngr_test_capabilities(void) +static void traffic_mngr_test_capabilities(void) { CU_ASSERT(test_overall_capabilities() == 0); } -void traffic_mngr_test_tm_create(void) +static void traffic_mngr_test_tm_create(void) { /* Create the first/primary TM system. */ CU_ASSERT_FATAL(create_tm_system() == 0); dump_tm_tree(0); } -void traffic_mngr_test_shaper(void) +static void traffic_mngr_test_shaper(void) { CU_ASSERT(test_shaper_bw("bw1", "node_1_1_1", 0, 1 * MBPS) == 0); CU_ASSERT(test_shaper_bw("bw4", "node_1_1_1", 1, 4 * MBPS) == 0); @@ -3829,7 +3828,7 @@ void traffic_mngr_test_shaper(void) CU_ASSERT(test_shaper_bw("bw100", "node_1_1_2", 0, 100 * MBPS) == 0); } -void traffic_mngr_test_scheduler(void) +static void traffic_mngr_test_scheduler(void) { CU_ASSERT(test_sched_queue_priority("que_prio", "node_1_1_3", 10) == 0); return; @@ -3848,7 +3847,7 @@ void traffic_mngr_test_scheduler(void) INCREASING_WEIGHTS) == 0); } -void traffic_mngr_test_thresholds(void) +static void traffic_mngr_test_thresholds(void) { CU_ASSERT(test_threshold("thresh_A", "shaper_A", "node_1_2_1", 0, 16, 0) == 0); @@ -3856,7 +3855,7 @@ void traffic_mngr_test_thresholds(void) 0, 6400) == 0); } -void traffic_mngr_test_byte_wred(void) +static void traffic_mngr_test_byte_wred(void) { if (!tm_capabilities.tm_queue_wred_supported) { LOG_DBG("\nwas not run because tm_capabilities indicates" @@ -3879,7 +3878,7 @@ void traffic_mngr_test_byte_wred(void) ODP_PACKET_GREEN, TM_PERCENT(30), false) == 0); } -void traffic_mngr_test_pkt_wred(void) +static void traffic_mngr_test_pkt_wred(void) { int rc; @@ -3912,13 +3911,13 @@ void traffic_mngr_test_pkt_wred(void) ODP_PACKET_RED, TM_PERCENT(70), true) == 0); } -void traffic_mngr_test_query(void) +static void traffic_mngr_test_query(void) { CU_ASSERT(test_query_functions("query_shaper", "node_1_3_3", 3, 10) == 0); } -void traffic_mngr_test_marking(void) +static void traffic_mngr_test_marking(void) { odp_packet_color_t color; odp_bool_t test_ecn, test_drop_prec; @@ -3967,14 +3966,14 @@ void traffic_mngr_test_marking(void) } } -void traffic_mngr_test_fanin_info(void) +static void traffic_mngr_test_fanin_info(void) { CU_ASSERT(test_fanin_info("node_1") == 0); CU_ASSERT(test_fanin_info("node_1_2") == 0); CU_ASSERT(test_fanin_info("node_1_3_7") == 0); } -void traffic_mngr_test_destroy(void) +static void traffic_mngr_test_destroy(void) { CU_ASSERT(destroy_tm_systems() == 0); } @@ -4006,7 +4005,7 @@ odp_suiteinfo_t traffic_mngr_suites[] = { ODP_SUITE_INFO_NULL }; -int traffic_mngr_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { /* parse common options: */ if (odp_cunit_parse_options(argc, argv)) diff --git a/test/validation/api/traffic_mngr/traffic_mngr.h b/test/validation/api/traffic_mngr/traffic_mngr.h deleted file mode 100644 index af115fef..00000000 --- a/test/validation/api/traffic_mngr/traffic_mngr.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_TRAFFIC_MNGR_H_ -#define _ODP_TEST_TRAFFIC_MNGR_H_ - -#include <odp_cunit_common.h> - -int traffic_mngr_check_shaper(void); -int traffic_mngr_check_scheduler(void); - -/* test functions: */ -void traffic_mngr_test_capabilities(void); -void traffic_mngr_test_tm_create(void); -void traffic_mngr_test_shaper_profile(void); -void traffic_mngr_test_sched_profile(void); -void traffic_mngr_test_threshold_profile(void); -void traffic_mngr_test_wred_profile(void); -void traffic_mngr_test_shaper(void); -void traffic_mngr_test_scheduler(void); -void traffic_mngr_test_thresholds(void); -void traffic_mngr_test_byte_wred(void); -void traffic_mngr_test_pkt_wred(void); -void traffic_mngr_test_query(void); -void traffic_mngr_test_marking(void); -void traffic_mngr_test_fanin_info(void); -void traffic_mngr_test_destroy(void); - -/* test arrays: */ -extern odp_testinfo_t traffic_mngr_suite[]; - -/* test suite init/term functions: */ -int traffic_mngr_suite_init(void); -int traffic_mngr_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t traffic_mngr_suites[]; - -/* main test program: */ -int traffic_mngr_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/traffic_mngr/traffic_mngr_main.c b/test/validation/api/traffic_mngr/traffic_mngr_main.c deleted file mode 100644 index ec4555e6..00000000 --- a/test/validation/api/traffic_mngr/traffic_mngr_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "traffic_mngr.h" - -int main(int argc, char *argv[]) -{ - return traffic_mngr_main(argc, argv); -} commit eba4477a5cd5300d608ddfc53ff00cd3e51805a6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: timer: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index 57617440..bc33e731 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = timer_main -timer_main_SOURCES = timer_main.c timer.c timer.h +timer_main_SOURCES = timer.c diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 7ea508aa..26a5b608 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -20,7 +20,6 @@ #include <odp/helper/odph_api.h> #include "odp_cunit_common.h" #include "test_debug.h" -#include "timer.h" #define MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -56,7 +55,7 @@ struct test_timer { #define TICK_INVALID (~(uint64_t)0) -void timer_test_timeout_pool_alloc(void) +static void timer_test_timeout_pool_alloc(void) { odp_pool_t pool; const int num = 3; @@ -110,7 +109,7 @@ void timer_test_timeout_pool_alloc(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void timer_test_timeout_pool_free(void) +static void timer_test_timeout_pool_free(void) { odp_pool_t pool; odp_timeout_t tmo; @@ -141,7 +140,7 @@ void timer_test_timeout_pool_free(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void timer_test_odp_timer_cancel(void) +static void timer_test_odp_timer_cancel(void) { odp_pool_t pool; odp_pool_param_t params; @@ -504,7 +503,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) } /* @private Timer test case entrypoint */ -void timer_test_odp_timer_all(void) +static void timer_test_odp_timer_all(void) { int rc; odp_pool_param_t params; @@ -630,7 +629,7 @@ odp_suiteinfo_t timer_suites[] = { ODP_SUITE_INFO_NULL, }; -int timer_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { /* parse common options: */ if (odp_cunit_parse_options(argc, argv)) diff --git a/test/validation/api/timer/timer.h b/test/validation/api/timer/timer.h deleted file mode 100644 index bd304fff..00000000 --- a/test/validation/api/timer/timer.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_TIMER_H_ -#define _ODP_TEST_TIMER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void timer_test_timeout_pool_alloc(void); -void timer_test_timeout_pool_free(void); -void timer_test_odp_timer_cancel(void); -void timer_test_odp_timer_all(void); - -/* test arrays: */ -extern odp_testinfo_t timer_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t timer_suites[]; - -/* main test program: */ -int timer_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/timer/timer_main.c b/test/validation/api/timer/timer_main.c deleted file mode 100644 index f65c1e3a..00000000 --- a/test/validation/api/timer/timer_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "timer.h" - -int main(int argc, char *argv[]) -{ - return timer_main(argc, argv); -} commit 3e90ecc0bfa4487a29fbdff7ccc1cf5a2a1e8bc0 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: time: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index bedbfa37..9b0392eb 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = time_main -time_main_SOURCES = time_main.c time.c time_test.h +time_main_SOURCES = time.c diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index d7d5b790..2be9914b 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "time_test.h" #include <time.h> #define BUSY_LOOP_CNT 30000000 /* used for t > min resolution */ @@ -25,7 +24,7 @@ typedef odp_time_t time_cb(void); typedef uint64_t time_res_cb(void); typedef odp_time_t time_from_ns_cb(uint64_t ns); -void time_test_constants(void) +static void time_test_constants(void) { uint64_t ns; @@ -48,12 +47,12 @@ static void time_test_res(time_res_cb time_res, uint64_t *res) (*res)++; } -void time_test_local_res(void) +static void time_test_local_res(void) { time_test_res(odp_time_local_res, &local_res); } -void time_test_global_res(void) +static void time_test_global_res(void) { time_test_res(odp_time_global_res, &global_res); } @@ -92,17 +91,17 @@ static void time_test_conversion(time_from_ns_cb time_from_ns, uint64_t res) CU_ASSERT(ns1 == 0); } -void time_test_local_conversion(void) +static void time_test_local_conversion(void) { time_test_conversion(odp_time_local_from_ns, local_res); } -void time_test_global_conversion(void) +static void time_test_global_conversion(void) { time_test_conversion(odp_time_global_from_ns, global_res); } -void time_test_monotony(void) +static void time_test_monotony(void) { volatile uint64_t count = 0; odp_time_t l_t1, l_t2, l_t3; @@ -183,12 +182,12 @@ static void time_test_cmp(time_cb time_cur, time_from_ns_cb time_from_ns) CU_ASSERT(odp_time_cmp(t1, ODP_TIME_NULL) == 0); } -void time_test_local_cmp(void) +static void time_test_local_cmp(void) { time_test_cmp(odp_time_local, odp_time_local_from_ns); } -void time_test_global_cmp(void) +static void time_test_global_cmp(void) { time_test_cmp(odp_time_global, odp_time_global_from_ns); } @@ -278,12 +277,12 @@ static void time_test_diff(time_cb time_cur, CU_ASSERT(diff_ns == 0); } -void time_test_local_diff(void) +static void time_test_local_diff(void) { time_test_diff(odp_time_local, odp_time_local_from_ns, local_res); } -void time_test_global_diff(void) +static void time_test_global_diff(void) { time_test_diff(odp_time_global, odp_time_global_from_ns, global_res); } @@ -330,12 +329,12 @@ static void time_test_sum(time_cb time_cur, CU_ASSERT(odp_time_cmp(t2, sum) == 0); } -void time_test_local_sum(void) +static void time_test_local_sum(void) { time_test_sum(odp_time_local, odp_time_local_from_ns, local_res); } -void time_test_global_sum(void) +static void time_test_global_sum(void) { time_test_sum(odp_time_global, odp_time_global_from_ns, global_res); } @@ -376,17 +375,17 @@ static void time_test_wait_until(time_cb time_cur, time_from_ns_cb time_from_ns) } } -void time_test_local_wait_until(void) +static void time_test_local_wait_until(void) { time_test_wait_until(odp_time_local, odp_time_local_from_ns); } -void time_test_global_wait_until(void) +static void time_test_global_wait_until(void) { time_test_wait_until(odp_time_global, odp_time_global_from_ns); } -void time_test_wait_ns(void) +static void time_test_wait_ns(void) { int i; odp_time_t lower_limit, upper_limit; @@ -494,7 +493,7 @@ odp_suiteinfo_t time_suites[] = { ODP_SUITE_INFO_NULL }; -int time_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/time/time_main.c b/test/validation/api/time/time_main.c deleted file mode 100644 index c39a0ea1..00000000 --- a/test/validation/api/time/time_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "time_test.h" - -int main(int argc, char *argv[]) -{ - return time_main(argc, argv); -} diff --git a/test/validation/api/time/time_test.h b/test/validation/api/time/time_test.h deleted file mode 100644 index 10956294..00000000 --- a/test/validation/api/time/time_test.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_TIME_H_ -#define _ODP_TEST_TIME_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void time_test_constants(void); -void time_test_local_res(void); -void time_test_global_res(void); -void time_test_local_conversion(void); -void time_test_global_conversion(void); -void time_test_local_cmp(void); -void time_test_global_cmp(void); -void time_test_local_diff(void); -void time_test_global_diff(void); -void time_test_local_sum(void); -void time_test_global_sum(void); -void time_test_local_wait_until(void); -void time_test_global_wait_until(void); -void time_test_wait_ns(void); -void time_test_monotony(void); - -/* test arrays: */ -extern odp_testinfo_t time_suite_time[]; - -/* test registry: */ -extern odp_suiteinfo_t time_suites[]; - -/* main test program: */ -int time_main(int argc, char *argv[]); - -#endif commit dfa1ee94dae761166126445739be0dd6843f6792 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: thread: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 2282169b..cbd8b2a7 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -2,5 +2,5 @@ include ../Makefile.inc test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK -thread_main_SOURCES = thread_main.c thread.c thread.h +thread_main_SOURCES = thread.c LDADD += $(LIBTHRMASK_COMMON) diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c index ada4affc..fe504e88 100644 --- a/test/validation/api/thread/thread.c +++ b/test/validation/api/thread/thread.c @@ -10,25 +10,24 @@ #include <odp_cunit_common.h> #include <mask_common.h> #include <test_debug.h> -#include "thread.h" /* Test thread entry and exit synchronization barriers */ odp_barrier_t bar_entry; odp_barrier_t bar_exit; -void thread_test_odp_cpu_id(void) +static void thread_test_odp_cpu_id(void) { (void)odp_cpu_id(); CU_PASS(); } -void thread_test_odp_thread_id(void) +static void thread_test_odp_thread_id(void) { (void)odp_thread_id(); CU_PASS(); } -void thread_test_odp_thread_count(void) +static void thread_test_odp_thread_count(void) { (void)odp_thread_count(); CU_PASS(); @@ -47,7 +46,7 @@ static int thread_func(void *arg TEST_UNUSED) return CU_get_number_of_failures(); } -void thread_test_odp_thrmask_worker(void) +static void thread_test_odp_thrmask_worker(void) { odp_thrmask_t mask; int ret; @@ -84,7 +83,7 @@ void thread_test_odp_thrmask_worker(void) odp_cunit_thread_exit(&args); } -void thread_test_odp_thrmask_control(void) +static void thread_test_odp_thrmask_control(void) { odp_thrmask_t mask; int ret; @@ -125,7 +124,7 @@ odp_suiteinfo_t thread_suites[] = { ODP_SUITE_INFO_NULL, }; -int thread_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/thread/thread.h b/test/validation/api/thread/thread.h deleted file mode 100644 index d511c925..00000000 --- a/test/validation/api/thread/thread.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_THREAD_H_ -#define _ODP_TEST_THREAD_H_ - -#include <odp_api.h> -#include <odp_cunit_common.h> - -/* test functions: */ -#ifndef TEST_THRMASK -#define TEST_THRMASK -#endif -#include "mask_common.h" -void thread_test_odp_cpu_id(void); -void thread_test_odp_thread_id(void); -void thread_test_odp_thread_count(void); -void thread_test_odp_thrmask_control(void); -void thread_test_odp_thrmask_worker(void); - -/* test arrays: */ -extern odp_testinfo_t thread_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t thread_suites[]; - -/* main test program: */ -int thread_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/thread/thread_main.c b/test/validation/api/thread/thread_main.c deleted file mode 100644 index 2e832836..00000000 --- a/test/validation/api/thread/thread_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "thread.h" - -int main(int argc, char *argv[]) -{ - return thread_main(argc, argv); -} commit 01014bb374153d7bc879b3e1d26e79a6dfe5c329 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: system: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index e6fbb0ea..8090b0b5 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = system_main -system_main_SOURCES = system_main.c system.c system.h +system_main_SOURCES = system.c diff --git a/test/validation/api/system/system.c b/test/validation/api/system/system.c index a2749003..71d48480 100644 --- a/test/validation/api/system/system.c +++ b/test/validation/api/system/system.c @@ -11,13 +11,15 @@ #include <odp/api/cpumask.h> #include "odp_cunit_common.h" #include "test_debug.h" -#include "system.h" #define DIFF_TRY_NUM 160 #define RES_TRY_NUM 10 #define PAGESZ_NUM 10 -void system_test_odp_version_numbers(void) +#define GIGA_HZ 1000000000ULL +#define KILO_HZ 1000ULL + +static void system_test_odp_version_numbers(void) { int char_ok = 0; char version_string[128]; @@ -39,7 +41,7 @@ void system_test_odp_version_numbers(void) CU_ASSERT(char_ok); } -void system_test_odp_cpu_count(void) +static void system_test_odp_cpu_count(void) { int cpus; @@ -47,7 +49,7 @@ void system_test_odp_cpu_count(void) CU_ASSERT(0 < cpus); } -void system_test_odp_cpu_cycles(void) +static void system_test_odp_cpu_cycles(void) { uint64_t c2, c1; @@ -58,7 +60,7 @@ void system_test_odp_cpu_cycles(void) CU_ASSERT(c2 != c1); } -void system_test_odp_cpu_cycles_max(void) +static void system_test_odp_cpu_cycles_max(void) { uint64_t c2, c1; uint64_t max1, max2; @@ -77,7 +79,7 @@ void system_test_odp_cpu_cycles_max(void) CU_ASSERT(c1 <= max1 && c2 <= max1); } -void system_test_odp_cpu_cycles_resolution(void) +static void system_test_odp_cpu_cycles_resolution(void) { int i; uint64_t res; @@ -99,7 +101,7 @@ void system_test_odp_cpu_cycles_resolution(void) } } -void system_test_odp_cpu_cycles_diff(void) +static void system_test_odp_cpu_cycles_diff(void) { int i; uint64_t c2, c1, c3, max; @@ -165,7 +167,7 @@ void system_test_odp_cpu_cycles_diff(void) printf("wrap was not detected..."); } -void system_test_odp_sys_cache_line_size(void) +static void system_test_odp_sys_cache_line_size(void) { uint64_t cache_size; @@ -174,7 +176,7 @@ void system_test_odp_sys_cache_line_size(void) CU_ASSERT(ODP_CACHE_LINE_SIZE == cache_size); } -void system_test_odp_cpu_model_str(void) +static void system_test_odp_cpu_model_str(void) { char model[128]; @@ -183,7 +185,7 @@ void system_test_odp_cpu_model_str(void) CU_ASSERT(strlen(model) < 127); } -void system_test_odp_cpu_model_str_id(void) +static void system_test_odp_cpu_model_str_id(void) { char model[128]; odp_cpumask_t mask; @@ -200,7 +202,7 @@ void system_test_odp_cpu_model_str_id(void) } } -void system_test_odp_sys_page_size(void) +static void system_test_odp_sys_page_size(void) { uint64_t page; @@ -209,7 +211,7 @@ void system_test_odp_sys_page_size(void) CU_ASSERT(ODP_PAGE_SIZE == page); } -void system_test_odp_sys_huge_page_size(void) +static void system_test_odp_sys_huge_page_size(void) { uint64_t page; @@ -217,7 +219,7 @@ void system_test_odp_sys_huge_page_size(void) CU_ASSERT(0 < page); } -void system_test_odp_sys_huge_page_size_all(void) +static void system_test_odp_sys_huge_page_size_all(void) { uint64_t pagesz_tbs[PAGESZ_NUM]; uint64_t prev_pagesz = 0; @@ -236,7 +238,7 @@ void system_test_odp_sys_huge_page_size_all(void) } } -int system_check_odp_cpu_hz(void) +static int system_check_odp_cpu_hz(void) { if (odp_cpu_hz() == 0) { fprintf(stderr, "odp_cpu_hz is not supported, skipping\n"); @@ -246,7 +248,7 @@ int system_check_odp_cpu_hz(void) return ODP_TEST_ACTIVE; } -void system_test_odp_cpu_hz(void) +static void system_test_odp_cpu_hz(void) { uint64_t hz = odp_cpu_hz(); @@ -257,7 +259,7 @@ void system_test_odp_cpu_hz(void) CU_ASSERT(hz > 1 * KILO_HZ); } -int system_check_odp_cpu_hz_id(void) +static int system_check_odp_cpu_hz_id(void) { uint64_t hz; odp_cpumask_t mask; @@ -280,7 +282,7 @@ int system_check_odp_cpu_hz_id(void) return ODP_TEST_ACTIVE; } -void system_test_odp_cpu_hz_id(void) +static void system_test_odp_cpu_hz_id(void) { uint64_t hz; odp_cpumask_t mask; @@ -299,7 +301,7 @@ void system_test_odp_cpu_hz_id(void) } } -void system_test_odp_cpu_hz_max(void) +static void system_test_odp_cpu_hz_max(void) { uint64_t hz; @@ -307,7 +309,7 @@ void system_test_odp_cpu_hz_max(void) CU_ASSERT(0 < hz); } -void system_test_odp_cpu_hz_max_id(void) +static void system_test_odp_cpu_hz_max_id(void) { uint64_t hz; odp_cpumask_t mask; @@ -323,7 +325,7 @@ void system_test_odp_cpu_hz_max_id(void) } } -void system_test_info_print(void) +static void system_test_info_print(void) { printf("\n\nCalling system info print...\n"); odp_sys_info_print(); @@ -358,7 +360,7 @@ odp_suiteinfo_t system_suites[] = { ODP_SUITE_INFO_NULL, }; -int system_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/system/system.h b/test/validation/api/system/system.h deleted file mode 100644 index 0ea72dcd..00000000 --- a/test/validation/api/system/system.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_SYSTEM_H_ -#define _ODP_TEST_SYSTEM_H_ - -#include <odp_cunit_common.h> - -#define GIGA_HZ 1000000000ULL -#define KILO_HZ 1000ULL - -/* test functions: */ -void system_test_odp_version_numbers(void); -void system_test_odp_cpu_count(void); -void system_test_odp_sys_cache_line_size(void); -void system_test_odp_cpu_model_str(void); -void system_test_odp_cpu_model_str_id(void); -void system_test_odp_sys_page_size(void); -void system_test_odp_sys_huge_page_size(void); -void system_test_odp_sys_huge_page_size_all(void); -int system_check_odp_cpu_hz(void); -void system_test_odp_cpu_hz(void); -int system_check_odp_cpu_hz_id(void); -void system_test_odp_cpu_hz_id(void); -void system_test_odp_cpu_hz_max(void); -void system_test_odp_cpu_hz_max_id(void); -void system_test_odp_cpu_cycles_max(void); -void system_test_odp_cpu_cycles(void); -void system_test_odp_cpu_cycles_diff(void); -void system_test_odp_cpu_cycles_resolution(void); -void system_test_info_print(void); - -/* test arrays: */ -extern odp_testinfo_t system_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t system_suites[]; - -/* main test program: */ -int system_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/system/system_main.c b/test/validation/api/system/system_main.c deleted file mode 100644 index 01720c6a..00000000 --- a/test/validation/api/system/system_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "system.h" - -int main(int argc, char *argv[]) -{ - return system_main(argc, argv); -} commit d7f9a326839de8d731d95ba3a1c45114198887d1 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: std_clib: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index 34b888bb..9d3b32d3 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = std_clib_main -std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h +std_clib_main_SOURCES = std_clib.c diff --git a/test/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c index 33128eef..3ef5aab7 100644 --- a/test/validation/api/std_clib/std_clib.c +++ b/test/validation/api/std_clib/std_clib.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "std_clib.h" #include <string.h> @@ -95,7 +94,7 @@ odp_suiteinfo_t std_clib_suites[] = { ODP_SUITE_INFO_NULL }; -int std_clib_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/std_clib/std_clib.h b/test/validation/api/std_clib/std_clib.h deleted file mode 100644 index 2804f27e..00000000 --- a/test/validation/api/std_clib/std_clib.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_STD_CLIB_H_ -#define _ODP_TEST_STD_CLIB_H_ - -#include <odp_cunit_common.h> - -/* test arrays: */ -extern odp_testinfo_t std_clib_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t std_clib_suites[]; - -/* main test program: */ -int std_clib_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/std_clib/std_clib_main.c b/test/validation/api/std_clib/std_clib_main.c deleted file mode 100644 index dc63bb5b..00000000 --- a/test/validation/api/std_clib/std_clib_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "std_clib.h" - -int main(int argc, char *argv[]) -{ - return std_clib_main(argc, argv); -} commit b07985be674cef618fabeb7111ffa4dbb3e74fef Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: shmem: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index 9a10668f..52e33fdc 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = shmem_main -shmem_main_SOURCES = shmem_main.c shmem.c shmem.h +shmem_main_SOURCES = shmem.c diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index 4e0e327c..fb1898eb 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "shmem.h" #include <stdlib.h> #define ALIGN_SIZE (128) @@ -131,7 +130,7 @@ static int run_test_basic_thread(void *arg ODP_UNUSED) /* * test basic things: shmem creation, info, share, and free */ -void shmem_test_basic(void) +static void shmem_test_basic(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -342,7 +341,7 @@ static int run_test_reserve_after_fork(void *arg ODP_UNUSED) /* * test sharing memory reserved after odp_thread creation (e.g. fork()): */ -void shmem_test_reserve_after_fork(void) +static void shmem_test_reserve_after_fork(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -531,7 +530,7 @@ static int run_test_singleva_after_fork(void *arg ODP_UNUSED) * test sharing memory reserved after odp_thread creation (e.g. fork()): * with single VA flag. */ -void shmem_test_singleva_after_fork(void) +static void shmem_test_singleva_after_fork(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -771,7 +770,7 @@ static int run_test_stress(void *arg ODP_UNUSED) /* * stress tests */ -void shmem_test_stress(void) +static void shmem_test_stress(void) { pthrd_arg thrdarg; odp_shm_t shm; @@ -834,7 +833,7 @@ odp_suiteinfo_t shmem_suites[] = { ODP_SUITE_INFO_NULL, }; -int shmem_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/shmem/shmem.h b/test/validation/api/shmem/shmem.h deleted file mode 100644 index 092aa800..00000000 --- a/test/validation/api/shmem/shmem.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_SHMEM_H_ -#define _ODP_TEST_SHMEM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void shmem_test_basic(void); -void shmem_test_reserve_after_fork(void); -void shmem_test_singleva_after_fork(void); -void shmem_test_stress(void); - -/* test arrays: */ -extern odp_testinfo_t shmem_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t shmem_suites[]; - -/* main test program: */ -int shmem_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/shmem/shmem_main.c b/test/validation/api/shmem/shmem_main.c deleted file mode 100644 index d51d4d83..00000000 --- a/test/validation/api/shmem/shmem_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "shmem.h" - -int main(int argc, char *argv[]) -{ - return shmem_main(argc, argv); -} commit 74948cab5525f59e016dc984d95cb51f2ce2f963 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: scheduler: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 3673ad7c..050f2230 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = scheduler_main -scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h +scheduler_main_SOURCES = scheduler.c diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 0be6ce3f..9d1e08ca 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "scheduler.h" #define MAX_WORKERS_THREADS 32 #define MAX_ORDERED_LOCKS 2 @@ -139,7 +138,7 @@ static void release_context(odp_schedule_sync_t sync) odp_schedule_release_ordered(); } -void scheduler_test_wait_time(void) +static void scheduler_test_wait_time(void) { int i; odp_queue_t queue; @@ -193,7 +192,7 @@ void scheduler_test_wait_time(void) CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); } -void scheduler_test_num_prio(void) +static void scheduler_test_num_prio(void) { int prio; @@ -203,7 +202,7 @@ void scheduler_test_num_prio(void) CU_ASSERT(prio == odp_schedule_num_prio()); } -void scheduler_test_queue_destroy(void) +static void scheduler_test_queue_destroy(void) { odp_pool_t p; odp_pool_param_t params; @@ -268,7 +267,7 @@ void scheduler_test_queue_destroy(void) CU_ASSERT_FATAL(odp_pool_destroy(p) == 0); } -void scheduler_test_groups(void) +static void scheduler_test_groups(void) { odp_pool_t p; odp_pool_param_t params; @@ -662,22 +661,22 @@ static void chaos_run(unsigned int qtype) CU_ASSERT(rc == 0); } -void scheduler_test_parallel(void) +static void scheduler_test_parallel(void) { chaos_run(0); } -void scheduler_test_atomic(void) +static void scheduler_test_atomic(void) { chaos_run(1); } -void scheduler_test_ordered(void) +static void scheduler_test_ordered(void) { chaos_run(2); } -void scheduler_test_chaos(void) +static void scheduler_test_chaos(void) { chaos_run(3); } @@ -1083,25 +1082,25 @@ static void parallel_execute(odp_schedule_sync_t sync, int num_queues, } /* 1 queue 1 thread ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_1q_1t_n(void) +static void scheduler_test_1q_1t_n(void) { schedule_common(ODP_SCHED_SYNC_PARALLEL, ONE_Q, ONE_PRIO, SCHD_ONE); } /* 1 queue 1 thread ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_1q_1t_a(void) +static void scheduler_test_1q_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_ONE); } /* 1 queue 1 thread ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_1q_1t_o(void) +static void scheduler_test_1q_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, ONE_Q, ONE_PRIO, SCHD_ONE); } /* Many queues 1 thread ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_mq_1t_n(void) +static void scheduler_test_mq_1t_n(void) { /* Only one priority involved in these tests, but use the same number of queues the more general case uses */ @@ -1109,19 +1108,19 @@ void scheduler_test_mq_1t_n(void) } /* Many queues 1 thread ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_mq_1t_a(void) +static void scheduler_test_mq_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, MANY_QS, ONE_PRIO, SCHD_ONE); } /* Many queues 1 thread ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_mq_1t_o(void) +static void scheduler_test_mq_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, MANY_QS, ONE_PRIO, SCHD_ONE); } /* Many queues 1 thread check priority ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_mq_1t_prio_n(void) +static void scheduler_test_mq_1t_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1129,7 +1128,7 @@ void scheduler_test_mq_1t_prio_n(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_mq_1t_prio_a(void) +static void scheduler_test_mq_1t_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1137,7 +1136,7 @@ void scheduler_test_mq_1t_prio_a(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_mq_1t_prio_o(void) +static void scheduler_test_mq_1t_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1145,7 +1144,7 @@ void scheduler_test_mq_1t_prio_o(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_PARALLEL */ -void scheduler_test_mq_mt_prio_n(void) +static void scheduler_test_mq_mt_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1154,7 +1153,7 @@ void scheduler_test_mq_mt_prio_n(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ATOMIC */ -void scheduler_test_mq_mt_prio_a(void) +static void scheduler_test_mq_mt_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1163,7 +1162,7 @@ void scheduler_test_mq_mt_prio_a(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ORDERED */ -void scheduler_test_mq_mt_prio_o(void) +static void scheduler_test_mq_mt_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1172,32 +1171,32 @@ void scheduler_test_mq_mt_prio_o(void) } /* 1 queue many threads check exclusive access on ATOMIC queues */ -void scheduler_test_1q_mt_a_excl(void) +static void scheduler_test_1q_mt_a_excl(void) { parallel_execute(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_ONE, ENABLE_EXCL_ATOMIC); } /* 1 queue 1 thread ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_1q_1t_n(void) +static void scheduler_test_multi_1q_1t_n(void) { schedule_common(ODP_SCHED_SYNC_PARALLEL, ONE_Q, ONE_PRIO, SCHD_MULTI); } /* 1 queue 1 thread ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_1q_1t_a(void) +static void scheduler_test_multi_1q_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_MULTI); } /* 1 queue 1 thread ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_1q_1t_o(void) +static void scheduler_test_multi_1q_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, ONE_Q, ONE_PRIO, SCHD_MULTI); } /* Many queues 1 thread ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_mq_1t_n(void) +static void scheduler_test_multi_mq_1t_n(void) { /* Only one priority involved in these tests, but use the same number of queues the more general case uses */ @@ -1205,19 +1204,19 @@ void scheduler_test_multi_mq_1t_n(void) } /* Many queues 1 thread ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_mq_1t_a(void) +static void scheduler_test_multi_mq_1t_a(void) { schedule_common(ODP_SCHED_SYNC_ATOMIC, MANY_QS, ONE_PRIO, SCHD_MULTI); } /* Many queues 1 thread ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_mq_1t_o(void) +static void scheduler_test_multi_mq_1t_o(void) { schedule_common(ODP_SCHED_SYNC_ORDERED, MANY_QS, ONE_PRIO, SCHD_MULTI); } /* Many queues 1 thread check priority ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_mq_1t_prio_n(void) +static void scheduler_test_multi_mq_1t_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1225,7 +1224,7 @@ void scheduler_test_multi_mq_1t_prio_n(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_mq_1t_prio_a(void) +static void scheduler_test_multi_mq_1t_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1233,7 +1232,7 @@ void scheduler_test_multi_mq_1t_prio_a(void) } /* Many queues 1 thread check priority ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_mq_1t_prio_o(void) +static void scheduler_test_multi_mq_1t_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1241,7 +1240,7 @@ void scheduler_test_multi_mq_1t_prio_o(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_PARALLEL multi */ -void scheduler_test_multi_mq_mt_prio_n(void) +static void scheduler_test_multi_mq_mt_prio_n(void) { int prio = odp_schedule_num_prio(); @@ -1249,7 +1248,7 @@ void scheduler_test_multi_mq_mt_prio_n(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ATOMIC multi */ -void scheduler_test_multi_mq_mt_prio_a(void) +static void scheduler_test_multi_mq_mt_prio_a(void) { int prio = odp_schedule_num_prio(); @@ -1257,7 +1256,7 @@ void scheduler_test_multi_mq_mt_prio_a(void) } /* Many queues many threads check priority ODP_SCHED_SYNC_ORDERED multi */ -void scheduler_test_multi_mq_mt_prio_o(void) +static void scheduler_test_multi_mq_mt_prio_o(void) { int prio = odp_schedule_num_prio(); @@ -1265,13 +1264,13 @@ void scheduler_test_multi_mq_mt_prio_o(void) } /* 1 queue many threads check exclusive access on ATOMIC queues multi */ -void scheduler_test_multi_1q_mt_a_excl(void) +static void scheduler_test_multi_1q_mt_a_excl(void) { parallel_execute(ODP_SCHED_SYNC_ATOMIC, ONE_Q, ONE_PRIO, SCHD_MULTI, ENABLE_EXCL_ATOMIC); } -void scheduler_test_pause_resume(void) +static void scheduler_test_pause_resume(void) { odp_queue_t queue; odp_buffer_t buf; @@ -1545,7 +1544,7 @@ static int create_queues(void) return 0; } -int scheduler_suite_init(void) +static int scheduler_suite_init(void) { odp_cpumask_t mask; odp_shm_t shm; @@ -1657,7 +1656,7 @@ static int destroy_queues(void) return 0; } -int scheduler_suite_term(void) +static int scheduler_suite_term(void) { odp_pool_t pool; odp_shm_t shm; @@ -1729,7 +1728,7 @@ odp_suiteinfo_t scheduler_suites[] = { ODP_SUITE_INFO_NULL, }; -int scheduler_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/scheduler/scheduler.h b/test/validation/api/scheduler/scheduler.h deleted file mode 100644 index a619d89b..00000000 --- a/test/validation/api/scheduler/scheduler.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_SCHEDULER_H_ -#define _ODP_TEST_SCHEDULER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void scheduler_test_wait_time(void); -void scheduler_test_num_prio(void); -void scheduler_test_queue_destroy(void); -void scheduler_test_groups(void); -void scheduler_test_chaos(void); -void scheduler_test_parallel(void); -void scheduler_test_atomic(void); -void scheduler_test_ordered(void); -void scheduler_test_1q_1t_n(void); -void scheduler_test_1q_1t_a(void); -void scheduler_test_1q_1t_o(void); -void scheduler_test_mq_1t_n(void); -void scheduler_test_mq_1t_a(void); -void scheduler_test_mq_1t_o(void); -void scheduler_test_mq_1t_prio_n(void); -void scheduler_test_mq_1t_prio_a(void); -void scheduler_test_mq_1t_prio_o(void); -void scheduler_test_mq_mt_prio_n(void); -void scheduler_test_mq_mt_prio_a(void); -void scheduler_test_mq_mt_prio_o(void); -void scheduler_test_1q_mt_a_excl(void); -void scheduler_test_multi_1q_1t_n(void); -void scheduler_test_multi_1q_1t_a(void); -void scheduler_test_multi_1q_1t_o(void); -void scheduler_test_multi_mq_1t_n(void); -void scheduler_test_multi_mq_1t_a(void); -void scheduler_test_multi_mq_1t_o(void); -void scheduler_test_multi_mq_1t_prio_n(void); -void scheduler_test_multi_mq_1t_prio_a(void); -void scheduler_test_multi_mq_1t_prio_o(void); -void scheduler_test_multi_mq_mt_prio_n(void); -void scheduler_test_multi_mq_mt_prio_a(void); -void scheduler_test_multi_mq_mt_prio_o(void); -void scheduler_test_multi_1q_mt_a_excl(void); -void scheduler_test_pause_resume(void); - -/* test arrays: */ -extern odp_testinfo_t scheduler_suite[]; - -/* test array init/term functions: */ -int scheduler_suite_init(void); -int scheduler_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t scheduler_suites[]; - -/* main test program: */ -int scheduler_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/scheduler/scheduler_main.c b/test/validation/api/scheduler/scheduler_main.c deleted file mode 100644 index 73f3cedd..00000000 --- a/test/validation/api/scheduler/scheduler_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "scheduler.h" - -int main(int argc, char *argv[]) -{ - return scheduler_main(argc, argv); -} commit 4ffba79dfc573070f61da8894877783601e3aff4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: random: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index 8f1ba9fe..e24ce0af 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = random_main -random_main_SOURCES = random_main.c random.c random.h +random_main_SOURCES = random.c diff --git a/test/validation/api/random/random.c b/test/validation/api/random/random.c index 071c265f..9a583e34 100644 --- a/test/validation/api/random/random.c +++ b/test/validation/api/random/random.c @@ -8,9 +8,8 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "random.h" -void random_test_get_size(void) +static void random_test_get_size(void) { int32_t ret; uint8_t buf[32]; @@ -19,7 +18,7 @@ void random_test_get_size(void) CU_ASSERT(ret == sizeof(buf)); } -void random_test_kind(void) +static void random_test_kind(void) { int32_t rc; uint8_t buf[4096]; @@ -45,7 +44,7 @@ void random_test_kind(void) } } -void random_test_repeat(void) +static void random_test_repeat(void) { uint8_t buf1[1024]; uint8_t buf2[1024]; @@ -75,7 +74,7 @@ odp_suiteinfo_t random_suites[] = { ODP_SUITE_INFO_NULL, }; -int random_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/random/random.h b/test/validation/api/random/random.h deleted file mode 100644 index c4bca782..00000000 --- a/test/validation/api/random/random.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_RANDOM_H_ -#define _ODP_TEST_RANDOM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void random_test_get_size(void); -void random_test_kind(void); -void random_test_repeat(void); - -/* test arrays: */ -extern odp_testinfo_t random_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t random_suites[]; - -/* main test program: */ -int random_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/random/random_main.c b/test/validation/api/random/random_main.c deleted file mode 100644 index ca9f5262..00000000 --- a/test/validation/api/random/random_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "random.h" - -int main(int argc, char *argv[]) -{ - return random_main(argc, argv); -} commit 4fc0e934df0bbd0779c6051595add213f752272a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: queue: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index 5ed4638b..94a6b28a 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = queue_main -queue_main_SOURCES = queue_main.c queue.c queue.h +queue_main_SOURCES = queue.c diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index 3c6db33a..8746f506 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "queue.h" #define MAX_BUFFER_QUEUE (8) #define MSG_POOL_SIZE (4 * 1024 * 1024) @@ -29,7 +28,7 @@ static void generate_name(char *name, uint32_t index) name[5] = 'A' + (index % 26); } -int queue_suite_init(void) +static int queue_suite_init(void) { odp_pool_param_t params; @@ -47,12 +46,12 @@ int queue_suite_init(void) return 0; } -int queue_suite_term(void) +static int queue_suite_term(void) { return odp_pool_destroy(pool); } -void queue_test_capa(void) +static void queue_test_capa(void) { odp_queue_capability_t capa; odp_queue_param_t qparams; @@ -115,7 +114,7 @@ void queue_test_capa(void) } } -void queue_test_mode(void) +static void queue_test_mode(void) { odp_queue_param_t qparams; odp_queue_t queue; @@ -155,7 +154,7 @@ void queue_test_mode(void) } } -void queue_test_param(void) +static void queue_test_param(void) { odp_queue_t queue, null_queue; odp_event_t enev[MAX_BUFFER_QUEUE]; @@ -260,7 +259,7 @@ void queue_test_param(void) CU_ASSERT(odp_queue_destroy(queue) == 0); } -void queue_test_info(void) +static void queue_test_info(void) { odp_queue_t q_plain, q_order; const char *const nq_plain = "test_q_plain"; @@ -338,7 +337,7 @@ odp_suiteinfo_t queue_suites[] = { ODP_SUITE_INFO_NULL, }; -int queue_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/queue/queue.h b/test/validation/api/queue/queue.h deleted file mode 100644 index 6b787b1d..00000000 --- a/test/validation/api/queue/queue.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_QUEUE_H_ -#define _ODP_TEST_QUEUE_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void queue_test_capa(void); -void queue_test_mode(void); -void queue_test_param(void); -void queue_test_info(void); - -/* test arrays: */ -extern odp_testinfo_t queue_suite[]; - -/* test array init/term functions: */ -int queue_suite_init(void); -int queue_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t queue_suites[]; - -/* main test program: */ -int queue_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/queue/queue_main.c b/test/validation/api/queue/queue_main.c deleted file mode 100644 index 7ed05411..00000000 --- a/test/validation/api/queue/queue_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "queue.h" - -int main(int argc, char *argv[]) -{ - return queue_main(argc, argv); -} commit 69367466a8c3e30509b1f86c4751285aab37efb8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: pool: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 7951d048..1b0d5934 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = pool_main -pool_main_SOURCES = pool_main.c pool.c pool.h +pool_main_SOURCES = pool.c diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index 3a2c7412..34f97357 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "pool.h" #define PKT_LEN 400 #define PKT_NUM 500 @@ -27,7 +26,7 @@ static void pool_create_destroy(odp_pool_param_t *param) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_create_destroy_buffer(void) +static void pool_test_create_destroy_buffer(void) { odp_pool_param_t param; @@ -41,7 +40,7 @@ void pool_test_create_destroy_buffer(void) pool_create_destroy(&param); } -void pool_test_create_destroy_packet(void) +static void pool_test_create_destroy_packet(void) { odp_pool_param_t param; @@ -54,7 +53,7 @@ void pool_test_create_destroy_packet(void) pool_create_destroy(&param); } -void pool_test_create_destroy_timeout(void) +static void pool_test_create_destroy_timeout(void) { odp_pool_param_t param; @@ -66,7 +65,7 @@ void pool_test_create_destroy_timeout(void) pool_create_destroy(&param); } -void pool_test_lookup_info_print(void) +static void pool_test_lookup_info_print(void) { odp_pool_t pool; const char pool_name[] = "pool_for_lookup_test"; @@ -98,7 +97,7 @@ void pool_test_lookup_info_print(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_alloc_packet(void) +static void pool_test_alloc_packet(void) { odp_pool_t pool; odp_pool_param_t param; @@ -131,7 +130,7 @@ void pool_test_alloc_packet(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_alloc_packet_subparam(void) +static void pool_test_alloc_packet_subparam(void) { odp_pool_t pool; odp_pool_capability_t capa; @@ -191,7 +190,7 @@ void pool_test_alloc_packet_subparam(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void pool_test_info_packet(void) +static void pool_test_info_packet(void) { odp_pool_t pool; odp_pool_info_t info; @@ -236,7 +235,7 @@ odp_suiteinfo_t pool_suites[] = { ODP_SUITE_INFO_NULL, }; -int pool_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/pool/pool.h b/test/validation/api/pool/pool.h deleted file mode 100644 index b284524e..00000000 --- a/test/validation/api/pool/pool.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_POOL_H_ -#define _ODP_TEST_POOL_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void pool_test_create_destroy_buffer(void); -void pool_test_create_destroy_packet(void); -void pool_test_create_destroy_timeout(void); -void pool_test_lookup_info_print(void); -void pool_test_alloc_packet(void); -void pool_test_alloc_packet_subparam(void); -void pool_test_info_packet(void); - -/* test arrays: */ -extern odp_testinfo_t pool_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t pool_suites[]; - -/* main test program: */ -int pool_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/pool/pool_main.c b/test/validation/api/pool/pool_main.c deleted file mode 100644 index c1eb7b7c..00000000 --- a/test/validation/api/pool/pool_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "pool.h" - -int main(int argc, char *argv[]) -{ - return pool_main(argc, argv); -} commit d1da7104eb4875287c816aec7e145a7504239156 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: packet: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index d33cdadb..ad5775d7 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = packet_main -packet_main_SOURCES = packet_main.c packet.c packet.h +packet_main_SOURCES = packet.c diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 054a0d4e..bda8d7c7 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -11,7 +11,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> #include <test_packet_parser.h> -#include "packet.h" /* Reserve some tailroom for tests */ #define PACKET_TAILROOM_RESERVE 4 @@ -143,7 +142,7 @@ static int fill_data_backward(odp_packet_t pkt, uint32_t offset, uint32_t len, return odp_packet_copy_from_mem(pkt, offset, len, buf); } -int packet_suite_init(void) +static int packet_suite_init(void) { odp_pool_param_t params; odp_pool_capability_t capa; @@ -276,7 +275,7 @@ int packet_suite_init(void) return 0; } -int packet_suite_term(void) +static int packet_suite_term(void) { odp_packet_free(test_packet); odp_packet_free(segmented_test_packet); @@ -289,7 +288,7 @@ int packet_suite_term(void) return 0; } -void packet_test_alloc_free(void) +static void packet_test_alloc_free(void) { odp_pool_t pool; odp_packet_t packet; @@ -356,7 +355,7 @@ static int packet_alloc_multi(odp_pool_t pool, uint32_t pkt_len, return total; } -void packet_test_alloc_free_multi(void) +static void packet_test_alloc_free_multi(void) { const int num_pkt = 2; odp_pool_t pool[2]; @@ -429,7 +428,7 @@ void packet_test_alloc_free_multi(void) CU_ASSERT(odp_pool_destroy(pool[1]) == 0); } -void packet_test_free_sp(void) +static void packet_test_free_sp(void) { const int num_pkt = 10; odp_pool_t pool; @@ -473,7 +472,7 @@ void packet_test_free_sp(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_alloc_segmented(void) +static void packet_test_alloc_segmented(void) { const int num = 5; odp_packet_t pkts[num]; @@ -556,7 +555,7 @@ void packet_test_alloc_segmented(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_event_conversion(void) +static void packet_test_event_conversion(void) { odp_packet_t pkt0 = test_packet; odp_packet_t pkt1 = segmented_test_packet; @@ -595,7 +594,7 @@ void packet_test_event_conversion(void) packet_compare_data(pkt[1], pkt1); } -void packet_test_basic_metadata(void) +static void packet_test_basic_metadata(void) { odp_packet_t pkt = test_packet; odp_time_t ts; @@ -628,7 +627,7 @@ void packet_test_basic_metadata(void) CU_ASSERT(!odp_packet_has_ts(pkt)); } -void packet_test_length(void) +static void packet_test_length(void) { odp_packet_t pkt = test_packet; uint32_t buf_len, headroom, tailroom; @@ -647,13 +646,13 @@ void packet_test_length(void) CU_ASSERT(buf_len >= packet_len + headroom + tailroom); } -void packet_test_prefetch(void) +static void packet_test_prefetch(void) { odp_packet_prefetch(test_packet, 0, odp_packet_len(test_packet)); CU_PASS(); } -void packet_test_debug(void) +static void packet_test_debug(void) { CU_ASSERT(odp_packet_is_valid(test_packet) == 1); printf("\n\n"); @@ -662,7 +661,7 @@ void packet_test_debug(void) odp_packet_print_data(test_packet, 14, 20); } -void packet_test_context(void) +static void packet_test_context(void) { odp_packet_t pkt = test_packet; char ptr_test_value = 2; @@ -684,7 +683,7 @@ void packet_test_context(void) odp_packet_reset(pkt, packet_len); } -void packet_test_layer_offsets(void) +static void packet_test_layer_offsets(void) { odp_packet_t pkt = test_packet; uint8_t *l2_addr, *l3_addr, *l4_addr; @@ -787,7 +786,7 @@ static void _verify_headroom_shift(odp_packet_t *pkt, CU_ASSERT(odp_packet_data(*pkt) == data); } -void packet_test_headroom(void) +static void packet_test_headroom(void) { odp_packet_t pkt = odp_packet_copy(test_packet, odp_packet_pool(test_packet)); @@ -907,7 +906,7 @@ static void _verify_tailroom_shift(odp_packet_t *pkt, } } -void packet_test_tailroom(void) +static void packet_test_tailroom(void) { odp_packet_t pkt = odp_packet_copy(test_packet, odp_packet_pool(test_packet)); @@ -948,7 +947,7 @@ void packet_test_tailroom(void) odp_packet_free(pkt); } -void packet_test_segments(void) +static void packet_test_segments(void) { int num_segs, seg_index; uint32_t data_len; @@ -1033,7 +1032,7 @@ void packet_test_segments(void) CU_ASSERT(seg == ODP_PACKET_SEG_INVALID); } -void packet_test_segment_last(void) +static void packet_test_segment_last(void) { odp_packet_t pkt = test_packet; odp_packet_seg_t seg; @@ -1053,7 +1052,7 @@ do { \ CU_ASSERT(odp_packet_has_##flag(packet) != 0); \ } while (0) -void packet_test_in_flags(void) +static void packet_test_in_flags(void) { odp_packet_t pkt = test_packet; @@ -1080,7 +1079,7 @@ void packet_test_in_flags(void) TEST_INFLAG(pkt, icmp); } -void packet_test_error_flags(void) +static void packet_test_error_flags(void) { odp_packet_t pkt = test_packet; int err; @@ -1110,7 +1109,7 @@ struct packet_metadata { uint64_t usr_u64; }; -void packet_test_add_rem_data(void) +static void packet_test_add_rem_data(void) { odp_packet_t pkt, new_pkt; uint32_t pkt_len, offset, add_len; @@ -1275,7 +1274,7 @@ static void _packet_compare_offset(odp_packet_t pkt1, uint32_t off1, } } -void packet_test_copy(void) +static void packet_test_copy(void) { odp_packet_t pkt; odp_packet_t pkt_copy, pkt_part; @@ -1377,7 +1376,7 @@ void packet_test_copy(void) odp_packet_free(pkt); } -void packet_test_copydata(void) +static void packet_test_copydata(void) { odp_packet_t pkt = test_packet; uint32_t pkt_len = odp_packet_len(pkt); @@ -1436,7 +1435,7 @@ void packet_test_copydata(void) odp_packet_free(pkt); } -void packet_test_concatsplit(void) +static void packet_test_concatsplit(void) { odp_packet_t pkt, pkt2; uint32_t pkt_len; @@ -1509,7 +1508,7 @@ void packet_test_concatsplit(void) odp_packet_free(pkt); } -void packet_test_concat_small(void) +static void packet_test_concat_small(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1572,7 +1571,7 @@ void packet_test_concat_small(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_concat_extend_trunc(void) +static void packet_test_concat_extend_trunc(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1660,7 +1659,7 @@ void packet_test_concat_extend_trunc(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_small(void) +static void packet_test_extend_small(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1752,7 +1751,7 @@ void packet_test_extend_small(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_large(void) +static void packet_test_extend_large(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1872,7 +1871,7 @@ void packet_test_extend_large(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_mix(void) +static void packet_test_extend_mix(void) { odp_pool_capability_t capa; odp_pool_t pool; @@ -1986,7 +1985,7 @@ void packet_test_extend_mix(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void packet_test_extend_ref(void) +static void packet_test_extend_ref(void) { odp_packet_t max_pkt, ref; uint32_t hr, tr, max_len; @@ -2060,7 +2059,7 @@ void packet_test_extend_ref(void) odp_packet_free(max_pkt); } -void packet_test_align(void) +static void packet_test_align(void) { odp_packet_t pkt; uint32_t pkt_len, seg_len, offset, aligned_seglen; @@ -2118,7 +2117,7 @@ void packet_test_align(void) odp_packet_free(pkt); } -void packet_test_offset(void) +static void packet_test_offset(void) { odp_packet_t pkt = test_packet; uint32_t seg_len, full_seg_len; @@ -2164,7 +2163,7 @@ void packet_test_offset(void) CU_ASSERT_PTR_NOT_NULL(ptr); } -void packet_test_ref(void) +static void packet_test_ref(void) { odp_packet_t base_pkt, segmented_base_pkt, hdr_pkt[4], ref_pkt[4], refhdr_pkt[4], hdr_cpy; @@ -3331,7 +3330,7 @@ odp_suiteinfo_t packet_suites[] = { ODP_SUITE_INFO_NULL, }; -int packet_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/packet/packet.h b/test/validation/api/packet/packet.h deleted file mode 100644 index 798b272b..00000000 --- a/test/validation/api/packet/packet.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_PACKET_H_ -#define _ODP_TEST_PACKET_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void packet_test_alloc_free(void); -void packet_test_alloc_free_multi(void); -void packet_test_free_sp(void); -void packet_test_alloc_segmented(void); -void packet_test_event_conversion(void); -void packet_test_basic_metadata(void); -void packet_test_length(void); -void packet_test_prefetch(void); -void packet_test_debug(void); -void packet_test_context(void); -void packet_test_layer_offsets(void); -void packet_test_headroom(void); -void packet_test_tailroom(void); -void packet_test_segments(void); -void packet_test_segment_last(void); -void packet_test_in_flags(void); -void packet_test_error_flags(void); -void packet_test_add_rem_data(void); -void packet_test_copy(void); -void packet_test_copydata(void); -void packet_test_concatsplit(void); -void packet_test_concat_small(void); -void packet_test_concat_extend_trunc(void); -void packet_test_extend_small(void); -void packet_test_extend_large(void); -void packet_test_extend_mix(void); -void packet_test_extend_ref(void); -void packet_test_align(void); -void packet_test_offset(void); -void packet_test_ref(void); - -/* test arrays: */ -extern odp_testinfo_t packet_suite[]; - -/* test array init/term functions: */ -int packet_suite_init(void); -int packet_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t packet_suites[]; - -/* main test program: */ -int packet_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/packet/packet_main.c b/test/validation/api/packet/packet_main.c deleted file mode 100644 index a80e29a2..00000000 --- a/test/validation/api/packet/packet_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "packet.h" - -int main(int argc, char *argv[]) -{ - return packet_main(argc, argv); -} commit 409d87e542b9f018467c2c62bb07a8e4f2a15993 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: lock: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index c5518b3a..ad75e185 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = lock_main -lock_main_SOURCES = lock_main.c lock.c lock.h +lock_main_SOURCES = lock.c diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c index 48a659e8..4ed1f8d8 100644 --- a/test/validation/api/lock/lock.c +++ b/test/validation/api/lock/lock.c @@ -11,7 +11,6 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> -#include "lock.h" #define VERBOSE 0 @@ -1004,7 +1003,7 @@ static int rwlock_recursive_functional_test(void *arg UNUSED) } /* Thread-unsafe tests */ -void lock_test_no_lock_functional(void) +static void lock_test_no_lock_functional(void) { pthrd_arg arg; @@ -1019,7 +1018,7 @@ odp_testinfo_t lock_suite_no_locking[] = { }; /* Spin lock tests */ -void lock_test_spinlock_api(void) +static void lock_test_spinlock_api(void) { pthrd_arg arg; @@ -1028,7 +1027,7 @@ void lock_test_spinlock_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_spinlock_functional(void) +static void lock_test_spinlock_functional(void) { pthrd_arg arg; @@ -1038,7 +1037,7 @@ void lock_test_spinlock_functional(void) odp_cunit_thread_exit(&arg); } -void lock_test_spinlock_recursive_api(void) +static void lock_test_spinlock_recursive_api(void) { pthrd_arg arg; @@ -1047,7 +1046,7 @@ void lock_test_spinlock_recursive_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_spinlock_recursive_functional(void) +static void lock_test_spinlock_recursive_functional(void) { pthrd_arg arg; @@ -1070,7 +1069,7 @@ odp_testinfo_t lock_suite_spinlock_recursive[] = { }; /* Ticket lock tests */ -void lock_test_ticketlock_api(void) +static void lock_test_ticketlock_api(void) { pthrd_arg arg; @@ -1079,7 +1078,7 @@ void lock_test_ticketlock_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_ticketlock_functional(void) +static void lock_test_ticketlock_functional(void) { pthrd_arg arg; @@ -1097,7 +1096,7 @@ odp_testinfo_t lock_suite_ticketlock[] = { }; /* RW lock tests */ -void lock_test_rwlock_api(void) +static void lock_test_rwlock_api(void) { pthrd_arg arg; @@ -1106,7 +1105,7 @@ void lock_test_rwlock_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_rwlock_functional(void) +static void lock_test_rwlock_functional(void) { pthrd_arg arg; @@ -1122,7 +1121,7 @@ odp_testinfo_t lock_suite_rwlock[] = { ODP_TEST_INFO_NULL }; -void lock_test_rwlock_recursive_api(void) +static void lock_test_rwlock_recursive_api(void) { pthrd_arg arg; @@ -1131,7 +1130,7 @@ void lock_test_rwlock_recursive_api(void) odp_cunit_thread_exit(&arg); } -void lock_test_rwlock_recursive_functional(void) +static void lock_test_rwlock_recursive_functional(void) { pthrd_arg arg; @@ -1147,7 +1146,7 @@ odp_testinfo_t lock_suite_rwlock_recursive[] = { ODP_TEST_INFO_NULL }; -int lock_suite_init(void) +static int lock_suite_init(void) { uint32_t num_threads, idx; @@ -1159,7 +1158,7 @@ int lock_suite_init(void) return 0; } -int lock_init(odp_instance_t *inst) +static int lock_init(odp_instance_t *inst) { uint32_t workers_count, max_threads; int ret = 0; @@ -1208,7 +1207,7 @@ int lock_init(odp_instance_t *inst) return ret; } -int lock_term(odp_instance_t inst) +static int lock_term(odp_instance_t inst) { odp_shm_t shm; @@ -1247,7 +1246,7 @@ odp_suiteinfo_t lock_suites[] = { ODP_SUITE_INFO_NULL }; -int lock_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/lock/lock.h b/test/validation/api/lock/lock.h deleted file mode 100644 index e0f49728..00000000 --- a/test/validation/api/lock/lock.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_LOCK_H_ -#define _ODP_TEST_LOCK_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void lock_test_no_lock_functional(void); -void lock_test_spinlock_api(void); -void lock_test_spinlock_functional(void); -void lock_test_spinlock_recursive_api(void); -void lock_test_spinlock_recursive_functional(void); -void lock_test_ticketlock_api(void); -void lock_test_ticketlock_functional(void); -void lock_test_rwlock_api(void); -void lock_test_rwlock_functional(void); -void lock_test_rwlock_recursive_api(void); -void lock_test_rwlock_recursive_functional(void); - -/* test arrays: */ -extern odp_testinfo_t lock_suite_no_locking[]; -extern odp_testinfo_t lock_suite_spinlock[]; -extern odp_testinfo_t lock_suite_spinlock_recursive[]; -extern odp_testinfo_t lock_suite_ticketlock[]; -extern odp_testinfo_t lock_suite_rwlock[]; -extern odp_testinfo_t lock_suite_rwlock_recursive[]; - -/* test array init/term functions: */ -int lock_suite_init(void); - -/* test registry: */ -extern odp_suiteinfo_t lock_suites[]; - -/* executable init/term functions: */ -int lock_init(odp_instance_t *inst); -int lock_term(odp_instance_t inst); - -/* main test program: */ -int lock_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/lock/lock_main.c b/test/validation/api/lock/lock_main.c deleted file mode 100644 index e182f77a..00000000 --- a/test/validation/api/lock/lock_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "lock.h" - -int main(int argc, char *argv[]) -{ - return lock_main(argc, argv); -} commit f4d395f2a80646c0609b62fbe37cd14465df74ac Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: hash: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index 8f005778..0d843ea7 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = hash_main -hash_main_SOURCES = hash_main.c hash.c hash.h +hash_main_SOURCES = hash.c diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash/hash.c index 886df502..2216dff8 100644 --- a/test/validation/api/hash/hash.c +++ b/test/validation/api/hash/hash.c @@ -8,9 +8,8 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "hash.h" -void hash_test_crc32c(void) +static void hash_test_crc32c(void) { uint32_t test_value = 0x12345678; uint32_t ret = odp_hash_crc32c(&test_value, 4, 0); @@ -39,7 +38,7 @@ odp_suiteinfo_t hash_suites[] = { ODP_SUITE_INFO_NULL }; -int hash_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/hash/hash.h b/test/validation/api/hash/hash.h deleted file mode 100644 index 936571e6..00000000 --- a/test/validation/api/hash/hash.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_HASH_H_ -#define _ODP_TEST_HASH_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void hash_test_crc32c(void); - -/* test arrays: */ -extern odp_testinfo_t hash_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t hash_suites[]; - -/* main test program: */ -int hash_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/hash/hash_main.c b/test/validation/api/hash/hash_main.c deleted file mode 100644 index 089b1f95..00000000 --- a/test/validation/api/hash/hash_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "hash.h" - -int main(int argc, char *argv[]) -{ - return hash_main(argc, argv); -} commit dab09417bf432da56aeddb2feaef9e6a11b739d7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: event: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am index 762f9356..0d26035e 100644 --- a/test/validation/api/event/Makefile.am +++ b/test/validation/api/event/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = event_main -event_main_SOURCES = event_main.c event.c event.h +event_main_SOURCES = event.c diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c index 5add99c3..ec0fec2d 100644 --- a/test/validation/api/event/event.c +++ b/test/validation/api/event/event.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp_api.h> #include <odp_cunit_common.h> -#include "event.h" #define NUM_EVENTS 100 #define EVENT_SIZE 100 @@ -400,7 +399,7 @@ odp_suiteinfo_t event_suites[] = { ODP_SUITE_INFO_NULL, }; -int event_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/event/event.h b/test/validation/api/event/event.h deleted file mode 100644 index 1d2b6e69..00000000 --- a/test/validation/api/event/event.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_EVENT_H_ -#define _ODP_TEST_EVENT_H_ - -int event_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/event/event_main.c b/test/validation/api/event/event_main.c deleted file mode 100644 index 3fbefdb8..00000000 --- a/test/validation/api/event/event_main.c +++ /dev/null @@ -1,13 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" -#include "event.h" - -int main(int argc, char *argv[]) -{ - return event_main(argc, argv); -} commit f7938ef11ede6ed6843bb7608a98ab3d15cf8e1c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: errno: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index ad5c7ded..de13afbf 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = errno_main -errno_main_SOURCES = errno_main.c errno.c errno.h +errno_main_SOURCES = errno.c diff --git a/test/validation/api/errno/errno.c b/test/validation/api/errno/errno.c index 929e0f40..95468a3f 100644 --- a/test/validation/api/errno/errno.c +++ b/test/validation/api/errno/errno.c @@ -8,9 +8,8 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "errno.h" -void errno_test_odp_errno_sunny_day(void) +static void errno_test_odp_errno_sunny_day(void) { int my_errno; @@ -31,7 +30,7 @@ odp_suiteinfo_t errno_suites[] = { ODP_SUITE_INFO_NULL, }; -int errno_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/errno/errno.h b/test/validation/api/errno/errno.h deleted file mode 100644 index 72038519..00000000 --- a/test/validation/api/errno/errno.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_ERRNO_H_ -#define _ODP_TEST_ERRNO_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void errno_test_odp_errno_sunny_day(void); - -/* test arrays: */ -extern odp_testinfo_t errno_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t errno_suites[]; - -/* main test program: */ -int errno_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/errno/errno_main.c b/test/validation/api/errno/errno_main.c deleted file mode 100644 index 2f2e3155..00000000 --- a/test/validation/api/errno/errno_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "errno.h" - -int main(int argc, char *argv[]) -{ - return errno_main(argc, argv); -} commit 9e40c760b95077a4ca4e652e4d39a4304e5828f6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: cpumask: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index e5c78d92..3872c1bd 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -1,5 +1,5 @@ include ../Makefile.inc test_PROGRAMS = cpumask_main -cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h +cpumask_main_SOURCES = cpumask.c LDADD += $(LIBCPUMASK_COMMON) diff --git a/test/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c index e6ac8394..9da68a76 100644 --- a/test/validation/api/cpumask/cpumask.c +++ b/test/validation/api/cpumask/cpumask.c @@ -9,13 +9,12 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "cpumask.h" #include "mask_common.h" /* default worker parameter to get all that may be available */ #define ALL_AVAILABLE 0 -void cpumask_test_odp_cpumask_def_control(void) +static void cpumask_test_odp_cpumask_def_control(void) { unsigned num; unsigned mask_count; @@ -30,7 +29,7 @@ void cpumask_test_odp_cpumask_def_control(void) CU_ASSERT(num <= max_cpus); } -void cpumask_test_odp_cpumask_def_worker(void) +static void cpumask_test_odp_cpumask_def_worker(void) { unsigned num; unsigned mask_count; @@ -45,7 +44,7 @@ void cpumask_test_odp_cpumask_def_worker(void) CU_ASSERT(num <= max_cpus); } -void cpumask_test_odp_cpumask_def(void) +static void cpumask_test_odp_cpumask_def(void) { unsigned mask_count; unsigned num_worker; @@ -101,7 +100,7 @@ odp_suiteinfo_t cpumask_suites[] = { ODP_SUITE_INFO_NULL, }; -int cpumask_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/cpumask/cpumask.h b/test/validation/api/cpumask/cpumask.h deleted file mode 100644 index 87a4512b..00000000 --- a/test/validation/api/cpumask/cpumask.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_CPUMASK_H_ -#define _ODP_TEST_CPUMASK_H_ - -#include <odp_api.h> -#include <odp_cunit_common.h> - -/* test functions: */ -#include "mask_common.h" -void cpumask_test_odp_cpumask_def_control(void); -void cpumask_test_odp_cpumask_def_worker(void); -void cpumask_test_odp_cpumask_def(void); - -/* test arrays: */ -extern odp_testinfo_t cpumask_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t cpumask_suites[]; - -/* main test program: */ -int cpumask_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/cpumask/cpumask_main.c b/test/validation/api/cpumask/cpumask_main.c deleted file mode 100644 index 77fdd228..00000000 --- a/test/validation/api/cpumask/cpumask_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "cpumask.h" - -int main(int argc, char *argv[]) -{ - return cpumask_main(argc, argv); -} commit 7c733ea2be5898660a3d02cdd2cf1f0a64a50e0c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: chksum: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am index 9bd44385..349fdd64 100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = chksum_main -chksum_main_SOURCES = chksum_main.c chksum.c chksum.h +chksum_main_SOURCES = chksum.c diff --git a/test/validation/api/chksum/chksum.c b/test/validation/api/chksum/chksum.c index f8687955..42bda779 100644 --- a/test/validation/api/chksum/chksum.c +++ b/test/validation/api/chksum/chksum.c @@ -6,7 +6,6 @@ #include <odp_api.h> #include <odp_cunit_common.h> -#include "chksum.h" #define NUM_IP_HDR 5 #define IP_HDR_LEN 20 @@ -244,7 +243,7 @@ static uint8_t ODP_ALIGNED(4) udp_test_vect_long[] = { }; /* Test ones complement sum with IPv4 headers */ -void chksum_ones_complement_ip(void) +static void chksum_ones_complement_ip(void) { int i; uint16_t sum, res; @@ -258,7 +257,7 @@ void chksum_ones_complement_ip(void) } /* Test ones complement sum with various length pseudo UDP packets */ -void chksum_ones_complement_udp(void) +static void chksum_ones_complement_udp(void) { int i; uint16_t sum, res; @@ -273,7 +272,7 @@ void chksum_ones_complement_udp(void) } /* Test ones complement sum with a long pseudo UDP packet */ -void chksum_ones_complement_udp_long(void) +static void chksum_ones_complement_udp_long(void) { int i; uint16_t sum, res; @@ -326,7 +325,7 @@ odp_suiteinfo_t chksum_suites[] = { ODP_SUITE_INFO_NULL }; -int chksum_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/chksum/chksum.h b/test/validation/api/chksum/chksum.h deleted file mode 100644 index 50ed66ee..00000000 --- a/test/validation/api/chksum/chksum.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_CHKSUM_H_ -#define _ODP_TEST_CHKSUM_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void chksum_ones_complement_ip(void); -void chksum_ones_complement_udp(void); -void chksum_ones_complement_udp_long(void); - -/* test arrays: */ -extern odp_testinfo_t chksum_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t chksum_suites[]; - -/* main test program: */ -int chksum_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/chksum/chksum_main.c b/test/validation/api/chksum/chksum_main.c deleted file mode 100644 index bec10ddd..00000000 --- a/test/validation/api/chksum/chksum_main.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "chksum.h" - -int main(int argc, char *argv[]) -{ - return chksum_main(argc, argv); -} commit e8d209cc33a34c7ee92053e3f240c542068816dd Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: buffer: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index 901fdadc..f459010c 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = buffer_main -buffer_main_SOURCES = buffer_main.c buffer.c buffer.h +buffer_main_SOURCES = buffer.c diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c index 91353a7c..7d13bc18 100644 --- a/test/validation/api/buffer/buffer.c +++ b/test/validation/api/buffer/buffer.c @@ -8,7 +8,6 @@ #include <odp_api.h> #include "odp_cunit_common.h" -#include "buffer.h" #define BUF_ALIGN ODP_CACHE_LINE_SIZE #define BUF_SIZE 1500 @@ -16,7 +15,7 @@ static odp_pool_t raw_pool; static odp_buffer_t raw_buffer = ODP_BUFFER_INVALID; -int buffer_suite_init(void) +static int buffer_suite_init(void) { odp_pool_param_t params; @@ -35,7 +34,7 @@ int buffer_suite_init(void) return 0; } -int buffer_suite_term(void) +static int buffer_suite_term(void) { odp_buffer_free(raw_buffer); if (odp_pool_destroy(raw_pool) != 0) @@ -43,7 +42,7 @@ int buffer_suite_term(void) return 0; } -void buffer_test_pool_alloc(void) +static void buffer_test_pool_alloc(void) { odp_pool_t pool; const int num = 3; @@ -127,7 +126,7 @@ static int buffer_alloc_multi(odp_pool_t pool, odp_buffer_t buffer[], int num) return total; } -void buffer_test_pool_alloc_multi(void) +static void buffer_test_pool_alloc_multi(void) { odp_pool_t pool; const int num = 3; @@ -192,7 +191,7 @@ void buffer_test_pool_alloc_multi(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void buffer_test_pool_free(void) +static void buffer_test_pool_free(void) { odp_pool_t pool; odp_buffer_t buffer; @@ -223,7 +222,7 @@ void buffer_test_pool_free(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } -void buffer_test_pool_free_multi(void) +static void buffer_test_pool_free_multi(void) { odp_pool_t pool[2]; odp_buffer_t buffer[4]; @@ -261,7 +260,7 @@ void buffer_test_pool_free_multi(void) CU_ASSERT(odp_pool_destroy(pool[1]) == 0); } -void buffer_test_management_basic(void) +static void buffer_test_management_basic(void) { odp_event_t ev = odp_buffer_to_event(raw_buffer); odp_event_subtype_t subtype; @@ -294,7 +293,7 @@ odp_suiteinfo_t buffer_suites[] = { ODP_SUITE_INFO_NULL, }; -int buffer_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/buffer/buffer.h b/test/validation/api/buffer/buffer.h deleted file mode 100644 index 48331e3f..00000000 --- a/test/validation/api/buffer/buffer.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_BUFFER_H_ -#define _ODP_TEST_BUFFER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void buffer_test_pool_alloc(void); -void buffer_test_pool_free(void); -void buffer_test_pool_alloc_multi(void); -void buffer_test_pool_free_multi(void); -void buffer_test_management_basic(void); - -/* test arrays: */ -extern odp_testinfo_t buffer_suite[]; - -/* test array init/term functions: */ -int buffer_suite_init(void); -int buffer_suite_term(void); - -/* test registry: */ -extern odp_suiteinfo_t buffer_suites[]; - -/* main test program: */ -int buffer_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/buffer/buffer_main.c b/test/validation/api/buffer/buffer_main.c deleted file mode 100644 index 8642560d..00000000 --- a/test/validation/api/buffer/buffer_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "buffer.h" - -int main(int argc, char *argv[]) -{ - return buffer_main(argc, argv); -} commit 157737a4629a569f453762f92be2e3d174dfe1e5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: barrier: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index aad5ddd6..f5f751b8 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = barrier_main -barrier_main_SOURCES = barrier_main.c barrier.c barrier.h +barrier_main_SOURCES = barrier.c diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c index b75d6204..7201cca3 100644 --- a/test/validation/api/barrier/barrier.c +++ b/test/validation/api/barrier/barrier.c @@ -11,7 +11,6 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> -#include "barrier.h" #define VERBOSE 0 #define MAX_ITERATIONS 1000 @@ -278,7 +277,7 @@ static void barrier_test_init(void) } /* Barrier tests */ -void barrier_test_memory_barrier(void) +static void barrier_test_memory_barrier(void) { volatile int a = 0; volatile int b = 0; @@ -298,7 +297,7 @@ void barrier_test_memory_barrier(void) temp_result = a + b + c + d; } -void barrier_test_no_barrier_functional(void) +static void barrier_test_no_barrier_functional(void) { pthrd_arg arg; @@ -308,7 +307,7 @@ void barrier_test_no_barrier_functional(void) odp_cunit_thread_exit(&arg); } -void barrier_test_barrier_functional(void) +static void barrier_test_barrier_functional(void) { pthrd_arg arg; @@ -325,7 +324,7 @@ odp_testinfo_t barrier_suite_barrier[] = { ODP_TEST_INFO_NULL }; -int barrier_init(odp_instance_t *inst) +static int barrier_init(odp_instance_t *inst) { uint32_t workers_count, max_threads; int ret = 0; @@ -374,7 +373,7 @@ int barrier_init(odp_instance_t *inst) return ret; } -int barrier_term(odp_instance_t inst) +static int barrier_term(odp_instance_t inst) { odp_shm_t shm; @@ -403,7 +402,7 @@ odp_suiteinfo_t barrier_suites[] = { ODP_SUITE_INFO_NULL }; -int barrier_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/barrier/barrier.h b/test/validation/api/barrier/barrier.h deleted file mode 100644 index 188bcb8f..00000000 --- a/test/validation/api/barrier/barrier.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_TEST_BARRIER_H_ -#define _ODP_TEST_BARRIER_H_ - -#include <odp_cunit_common.h> - -/* test functions: */ -void barrier_test_memory_barrier(void); -void barrier_test_no_barrier_functional(void); -void barrier_test_barrier_functional(void); - -/* test arrays: */ -extern odp_testinfo_t barrier_suite_barrier[]; - -/* test registry: */ -extern odp_suiteinfo_t barrier_suites[]; - -/* executable init/term functions: */ -int barrier_init(odp_instance_t *inst); -int barrier_term(odp_instance_t inst); - -/* main test program: */ -int barrier_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/barrier/barrier_main.c b/test/validation/api/barrier/barrier_main.c deleted file mode 100644 index 28df6afa..00000000 --- a/test/validation/api/barrier/barrier_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "barrier.h" - -int main(int argc, char *argv[]) -{ - return barrier_main(argc, argv); -} commit e4fec7da3e89c20cfe3c4d96c5fbe02ebbea57b3 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Feb 15 03:04:03 2018 +0300 validation: atomic: simplify test infrastructure Merge separate file with just main() function into main test file. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index 4de45970..41ad2e6b 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -1,4 +1,4 @@ include ../Makefile.inc test_PROGRAMS = atomic_main -atomic_main_SOURCES = atomic_main.c atomic.c atomic.h +atomic_main_SOURCES = atomic.c diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c index 5bf2fe87..17d5743d 100644 --- a/test/validation/api/atomic/atomic.c +++ b/test/validation/api/atomic/atomic.c @@ -11,7 +11,6 @@ #include <CUnit/Basic.h> #include <odp_cunit_common.h> #include <unistd.h> -#include "atomic.h" #define VERBOSE 0 #define MAX_ITERATIONS 1000 @@ -536,7 +535,7 @@ static void test_atomic_validate(int check) } } -int atomic_init(odp_instance_t *inst) +static int atomic_init(odp_instance_t *inst) { uint32_t workers_count, max_threads; int ret = 0; @@ -585,7 +584,7 @@ int atomic_init(odp_instance_t *inst) return ret; } -int atomic_term(odp_instance_t inst) +static int atomic_term(odp_instance_t inst) { odp_shm_t shm; @@ -725,48 +724,48 @@ static void test_atomic_functional(int func_ptr(void *), int check) test_atomic_validate(check); } -void atomic_test_atomic_inc_dec(void) +static void atomic_test_atomic_inc_dec(void) { test_atomic_functional(test_atomic_inc_dec_thread, 0); } -void atomic_test_atomic_add_sub(void) +static void atomic_test_atomic_add_sub(void) { test_atomic_functional(test_atomic_add_sub_thread, 0); } -void atomic_test_atomic_fetch_inc_dec(void) +static 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) +static 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) +static 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) +static void atomic_test_atomic_cas_inc_dec(void) { test_atomic_functional(test_atomic_cas_inc_dec_thread, 0); } -void atomic_test_atomic_xchg(void) +static void atomic_test_atomic_xchg(void) { test_atomic_functional(test_atomic_xchg_thread, CHECK_XCHG); } -void atomic_test_atomic_non_relaxed(void) +static 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) +static void atomic_test_atomic_op_lock_free(void) { odp_atomic_op_t atomic_op; int ret_null, ret; @@ -891,7 +890,7 @@ odp_suiteinfo_t atomic_suites[] = { ODP_SUITE_INFO_NULL }; -int atomic_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int ret; diff --git a/test/validation/api/atomic/atomic.h b/test/validation/api/atomic/atomic.h deleted file mode 100644 index 66796c8e..00000000 --- a/test/validation/api/atomic/atomic.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2015, 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); -int atomic_term(odp_instance_t inst); - -/* main test program: */ -int atomic_main(int argc, char *argv[]); - -#endif diff --git a/test/validation/api/atomic/atomic_main.c b/test/validation/api/atomic/atomic_main.c deleted file mode 100644 index b6028393..00000000 --- a/test/validation/api/atomic/atomic_main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include "atomic.h" - -int main(int argc, char *argv[]) -{ - return atomic_main(argc, argv); -} ----------------------------------------------------------------------- Summary of changes: .../test/validation/api/pktio/pktio_run_pcap.sh | 1 + test/validation/api/atomic/Makefile.am | 2 +- test/validation/api/atomic/atomic.c | 25 ++- test/validation/api/atomic/atomic.h | 39 ---- test/validation/api/atomic/atomic_main.c | 14 -- test/validation/api/barrier/Makefile.am | 2 +- test/validation/api/barrier/barrier.c | 13 +- test/validation/api/barrier/barrier.h | 30 ---- test/validation/api/barrier/barrier_main.c | 14 -- test/validation/api/buffer/Makefile.am | 2 +- test/validation/api/buffer/buffer.c | 17 +- test/validation/api/buffer/buffer.h | 32 ---- test/validation/api/buffer/buffer_main.c | 14 -- test/validation/api/chksum/Makefile.am | 2 +- test/validation/api/chksum/chksum.c | 9 +- test/validation/api/chksum/chksum.h | 26 --- test/validation/api/chksum/chksum_main.c | 12 -- test/validation/api/classification/Makefile.am | 2 +- .../validation/api/classification/classification.c | 2 +- .../validation/api/classification/classification.h | 42 ----- .../api/classification/classification_main.c | 14 -- .../api/classification/odp_classification_basic.c | 14 +- .../classification/odp_classification_test_pmr.c | 24 +-- .../api/classification/odp_classification_tests.c | 8 +- test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/cpumask/cpumask.c | 9 +- test/validation/api/cpumask/cpumask.h | 28 --- test/validation/api/cpumask/cpumask_main.c | 14 -- test/validation/api/crypto/Makefile.am | 5 +- test/validation/api/crypto/crypto.c | 135 -------------- test/validation/api/crypto/crypto.h | 59 ------ test/validation/api/crypto/crypto_main.c | 14 -- test/validation/api/crypto/odp_crypto_test_inp.c | 197 +++++++++++++++++---- test/validation/api/crypto/odp_crypto_test_inp.h | 26 --- test/validation/api/errno/Makefile.am | 2 +- test/validation/api/errno/errno.c | 5 +- test/validation/api/errno/errno.h | 24 --- test/validation/api/errno/errno_main.c | 14 -- test/validation/api/event/Makefile.am | 2 +- test/validation/api/event/event.c | 3 +- test/validation/api/event/event.h | 12 -- test/validation/api/event/event_main.c | 13 -- test/validation/api/hash/Makefile.am | 2 +- test/validation/api/hash/hash.c | 5 +- test/validation/api/hash/hash.h | 24 --- test/validation/api/hash/hash_main.c | 14 -- test/validation/api/lock/Makefile.am | 2 +- test/validation/api/lock/lock.c | 31 ++-- test/validation/api/lock/lock.h | 46 ----- test/validation/api/lock/lock_main.c | 14 -- test/validation/api/packet/Makefile.am | 2 +- test/validation/api/packet/packet.c | 67 ++++--- test/validation/api/packet/packet.h | 57 ------ test/validation/api/packet/packet_main.c | 14 -- test/validation/api/pktio/Makefile.am | 2 +- test/validation/api/pktio/parser.c | 36 ++-- test/validation/api/pktio/parser.h | 12 -- test/validation/api/pktio/pktio.c | 79 ++++----- test/validation/api/pktio/pktio.h | 67 ------- test/validation/api/pktio/pktio_main.c | 14 -- test/validation/api/pool/Makefile.am | 2 +- test/validation/api/pool/pool.c | 17 +- test/validation/api/pool/pool.h | 30 ---- test/validation/api/pool/pool_main.c | 14 -- test/validation/api/queue/Makefile.am | 2 +- test/validation/api/queue/queue.c | 15 +- test/validation/api/queue/queue.h | 31 ---- test/validation/api/queue/queue_main.c | 14 -- test/validation/api/random/Makefile.am | 2 +- test/validation/api/random/random.c | 9 +- test/validation/api/random/random.h | 26 --- test/validation/api/random/random_main.c | 14 -- test/validation/api/scheduler/Makefile.am | 2 +- test/validation/api/scheduler/scheduler.c | 77 ++++---- test/validation/api/scheduler/scheduler.h | 62 ------- test/validation/api/scheduler/scheduler_main.c | 14 -- test/validation/api/shmem/Makefile.am | 2 +- test/validation/api/shmem/shmem.c | 11 +- test/validation/api/shmem/shmem.h | 27 --- test/validation/api/shmem/shmem_main.c | 14 -- test/validation/api/std_clib/Makefile.am | 2 +- test/validation/api/std_clib/std_clib.c | 3 +- test/validation/api/std_clib/std_clib.h | 21 --- test/validation/api/std_clib/std_clib_main.c | 14 -- test/validation/api/system/Makefile.am | 2 +- test/validation/api/system/system.c | 44 ++--- test/validation/api/system/system.h | 45 ----- test/validation/api/system/system_main.c | 14 -- test/validation/api/thread/Makefile.am | 2 +- test/validation/api/thread/thread.c | 13 +- test/validation/api/thread/thread.h | 33 ---- test/validation/api/thread/thread_main.c | 14 -- test/validation/api/time/Makefile.am | 2 +- test/validation/api/time/time.c | 33 ++-- test/validation/api/time/time_main.c | 14 -- test/validation/api/time/time_test.h | 38 ---- test/validation/api/timer/Makefile.am | 2 +- test/validation/api/timer/timer.c | 11 +- test/validation/api/timer/timer.h | 27 --- test/validation/api/timer/timer_main.c | 14 -- test/validation/api/traffic_mngr/Makefile.am | 9 +- test/validation/api/traffic_mngr/traffic_mngr.c | 41 +++-- test/validation/api/traffic_mngr/traffic_mngr.h | 45 ----- .../api/traffic_mngr/traffic_mngr_main.c | 14 -- 104 files changed, 496 insertions(+), 1758 deletions(-) delete mode 100644 test/validation/api/atomic/atomic.h delete mode 100644 test/validation/api/atomic/atomic_main.c delete mode 100644 test/validation/api/barrier/barrier.h delete mode 100644 test/validation/api/barrier/barrier_main.c delete mode 100644 test/validation/api/buffer/buffer.h delete mode 100644 test/validation/api/buffer/buffer_main.c delete mode 100644 test/validation/api/chksum/chksum.h delete mode 100644 test/validation/api/chksum/chksum_main.c delete mode 100644 test/validation/api/classification/classification_main.c delete mode 100644 test/validation/api/cpumask/cpumask.h delete mode 100644 test/validation/api/cpumask/cpumask_main.c delete mode 100644 test/validation/api/crypto/crypto.c delete mode 100644 test/validation/api/crypto/crypto.h delete mode 100644 test/validation/api/crypto/crypto_main.c delete mode 100644 test/validation/api/crypto/odp_crypto_test_inp.h delete mode 100644 test/validation/api/errno/errno.h delete mode 100644 test/validation/api/errno/errno_main.c delete mode 100644 test/validation/api/event/event.h delete mode 100644 test/validation/api/event/event_main.c delete mode 100644 test/validation/api/hash/hash.h delete mode 100644 test/validation/api/hash/hash_main.c delete mode 100644 test/validation/api/lock/lock.h delete mode 100644 test/validation/api/lock/lock_main.c delete mode 100644 test/validation/api/packet/packet.h delete mode 100644 test/validation/api/packet/packet_main.c delete mode 100644 test/validation/api/pktio/pktio.h delete mode 100644 test/validation/api/pktio/pktio_main.c delete mode 100644 test/validation/api/pool/pool.h delete mode 100644 test/validation/api/pool/pool_main.c delete mode 100644 test/validation/api/queue/queue.h delete mode 100644 test/validation/api/queue/queue_main.c delete mode 100644 test/validation/api/random/random.h delete mode 100644 test/validation/api/random/random_main.c delete mode 100644 test/validation/api/scheduler/scheduler.h delete mode 100644 test/validation/api/scheduler/scheduler_main.c delete mode 100644 test/validation/api/shmem/shmem.h delete mode 100644 test/validation/api/shmem/shmem_main.c delete mode 100644 test/validation/api/std_clib/std_clib.h delete mode 100644 test/validation/api/std_clib/std_clib_main.c delete mode 100644 test/validation/api/system/system.h delete mode 100644 test/validation/api/system/system_main.c delete mode 100644 test/validation/api/thread/thread.h delete mode 100644 test/validation/api/thread/thread_main.c delete mode 100644 test/validation/api/time/time_main.c delete mode 100644 test/validation/api/time/time_test.h delete mode 100644 test/validation/api/timer/timer.h delete mode 100644 test/validation/api/timer/timer_main.c delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr.h delete mode 100644 test/validation/api/traffic_mngr/traffic_mngr_main.c hooks/post-receive --

8 years

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-252-gea2afab6

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 ea2afab619ae74108a03798bc358fdfcd29fdd88 (commit) via 3c51188fd0b30fdddad377e485b856429a4f2bc8 (commit) from 27328232ed2f01dd70aa431f5fa19bd058014305 (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 ea2afab619ae74108a03798bc358fdfcd29fdd88 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 7 06:45:01 2018 +0300 validation: api: check l3/l4 proto types after parsing Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 7d19e012..f829d0cb 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -2552,6 +2552,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_udp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV4); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_UDP); } odp_packet_free_multi(pkt, num_pkt); @@ -2582,6 +2586,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_udp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV4); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_UDP); } odp_packet_free_multi(pkt, num_pkt); @@ -2612,6 +2620,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_tcp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv6(pkt[i])); CU_ASSERT(!odp_packet_has_udp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV4); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_TCP); } odp_packet_free_multi(pkt, num_pkt); @@ -2643,6 +2655,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_udp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); CU_ASSERT(!odp_packet_has_tcp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV6); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_UDP); } odp_packet_free_multi(pkt, num_pkt); @@ -2674,6 +2690,10 @@ void packet_test_parse(void) CU_ASSERT(odp_packet_has_tcp(pkt[i])); CU_ASSERT(!odp_packet_has_ipv4(pkt[i])); CU_ASSERT(!odp_packet_has_udp(pkt[i])); + CU_ASSERT_EQUAL(odp_packet_l3_type(pkt[i]), + ODP_PROTO_L3_TYPE_IPV6); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt[i]), + ODP_PROTO_L4_TYPE_TCP); } odp_packet_free_multi(pkt, num_pkt); commit 3c51188fd0b30fdddad377e485b856429a4f2bc8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Feb 7 06:44:44 2018 +0300 linux-gen: packet: implement packet l3/l4 proto types Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(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/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 82001103..46b11cba 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2505,3 +2505,41 @@ int odp_packet_has_ref(odp_packet_t pkt) return 0; } + +odp_proto_l3_type_t odp_packet_l3_type(odp_packet_t pkt) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + if (pkt_hdr->p.input_flags.ipv4) + return ODP_PROTO_L3_TYPE_IPV4; + else if (pkt_hdr->p.input_flags.ipv6) + return ODP_PROTO_L3_TYPE_IPV6; + else if (pkt_hdr->p.input_flags.arp) + return ODP_PROTO_L3_TYPE_ARP; + + return ODP_PROTO_L3_TYPE_NONE; +} + +odp_proto_l4_type_t odp_packet_l4_type(odp_packet_t pkt) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + if (pkt_hdr->p.input_flags.tcp) + return ODP_PROTO_L4_TYPE_TCP; + else if (pkt_hdr->p.input_flags.udp) + return ODP_PROTO_L4_TYPE_UDP; + else if (pkt_hdr->p.input_flags.sctp) + return ODP_PROTO_L4_TYPE_SCTP; + else if (pkt_hdr->p.input_flags.ipsec_ah) + return ODP_PROTO_L4_TYPE_AH; + else if (pkt_hdr->p.input_flags.ipsec_esp) + return ODP_PROTO_L4_TYPE_ESP; + else if (pkt_hdr->p.input_flags.icmp && + pkt_hdr->p.input_flags.ipv4) + return ODP_PROTO_L4_TYPE_ICMPV4; + else if (pkt_hdr->p.input_flags.icmp && + pkt_hdr->p.input_flags.ipv6) + return ODP_PROTO_L4_TYPE_ICMPV6; + + return ODP_PROTO_L4_TYPE_NONE; +} ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_packet.c | 38 +++++++++++++++++++++++++++++++++++++ test/validation/api/packet/packet.c | 20 +++++++++++++++++++ 2 files changed, 58 insertions(+) hooks/post-receive --

8 years

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-212-gd5419e88

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 d5419e8857b2bc61d3be17fe53f171550fee426b (commit) from 94665734b42bb11f98bf18205c4df7ad13c6f2a4 (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: m4/odp_dpdk.m4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) hooks/post-receive --

8 years

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp