git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-109-g1f1233aa

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 1f1233aab977fcd7ef84b1cb185b7918fb1a138c (commit) from 5fba303faf04d29b616f687ce1f721400b2c6f9c (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 1f1233aab977fcd7ef84b1cb185b7918fb1a138c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jan 22 13:58:22 2018 +0300 mergefix: api,linux-gen: drop leftover headers Drop headers moved to /include in master, which reappeared in api-next. Fixes: f925f103c90591776f73863d30159357b08bf71e 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/include/odp/api/spec/compiler.h b/include/odp/api/spec/compiler.h deleted file mode 100644 index 750b3600..00000000 --- a/include/odp/api/spec/compiler.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * Compiler related - */ - -#ifndef ODP_API_COMPILER_H_ -#define ODP_API_COMPILER_H_ -#include <odp/visibility_begin.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** @addtogroup odp_compiler_optim - * Macro for old compilers - * @{ - */ - -/** @internal GNU compiler version */ -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -/** - * @internal - * Compiler __builtin_bswap16() is not available on all platforms - * until GCC 4.8.0 - work around this by offering __odp_builtin_bswap16() - * Don't use this function directly, instead see odp_byteorder.h - */ -#if GCC_VERSION < 40800 -#define __odp_builtin_bswap16(u16) ((((u16)&0x00ff) << 8)|(((u16)&0xff00) >> 8)) -#else -#define __odp_builtin_bswap16(u16) __builtin_bswap16(u16) -#endif - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#include <odp/visibility_end.h> -#endif diff --git a/platform/linux-generic/include/odp/api/atomic.h b/platform/linux-generic/include/odp/api/atomic.h deleted file mode 100644 index f11225ef..00000000 --- a/platform/linux-generic/include/odp/api/atomic.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (c) 2013-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP atomic operations - */ - -#ifndef ODP_PLAT_ATOMIC_H_ -#define ODP_PLAT_ATOMIC_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/align.h> -#include <odp/api/plat/atomic_types.h> - -/** @ingroup odp_atomic - * @{ - */ - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/atomic_inlines.h> -#endif - -/** - * @} - */ - -#include <odp/api/spec/atomic.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/byteorder.h b/platform/linux-generic/include/odp/api/byteorder.h deleted file mode 100644 index b9a89244..00000000 --- a/platform/linux-generic/include/odp/api/byteorder.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP byteorder - */ - -#ifndef ODP_PLAT_BYTEORDER_H_ -#define ODP_PLAT_BYTEORDER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/std_types.h> -#include <odp/api/plat/byteorder_types.h> -#include <odp/api/compiler.h> - -/** @ingroup odp_compiler_optim - * @{ - */ - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/byteorder_inlines.h> -#endif - -/** - * @} - */ - -#include <odp/api/spec/byteorder.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/classification.h b/platform/linux-generic/include/odp/api/classification.h deleted file mode 100644 index 452a8f1f..00000000 --- a/platform/linux-generic/include/odp/api/classification.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP classification descriptor - */ - -#ifndef ODP_PLAT_CLASSIFICATION_H_ -#define ODP_PLAT_CLASSIFICATION_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/std_types.h> -#include <odp/api/plat/pool_types.h> -#include <odp/api/plat/classification_types.h> -#include <odp/api/plat/packet_types.h> -#include <odp/api/plat/packet_io_types.h> -#include <odp/api/plat/queue_types.h> - -/** @ingroup odp_classification - * @{ - */ - -/* REMOVE THESE FROM API SPEC. Typedefs needed only for suppressing Doxygen - * warning. */ -typedef void odp_flowsig_t; -typedef void odp_cos_flow_set_t; - -/** - * @} - */ - -#include <odp/api/spec/classification.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/packet.h b/platform/linux-generic/include/odp/api/packet.h deleted file mode 100644 index f69e9e58..00000000 --- a/platform/linux-generic/include/odp/api/packet.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2013-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP packet descriptor - */ - -#ifndef ODP_PLAT_PACKET_H_ -#define ODP_PLAT_PACKET_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/std_types.h> -#include <odp/api/plat/event_types.h> -#include <odp/api/plat/packet_io_types.h> -#include <odp/api/plat/packet_types.h> -#include <odp/api/plat/buffer_types.h> -#include <odp/api/plat/pool_types.h> - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/packet_inlines.h> -#endif - -#include <odp/api/spec/packet.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h deleted file mode 100644 index 07c3f7ca..00000000 --- a/platform/linux-generic/include/odp/api/queue.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (c) 2013-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP queue - */ - -#ifndef ODP_PLAT_QUEUE_H_ -#define ODP_PLAT_QUEUE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/std_types.h> -#include <odp/api/plat/event_types.h> -#include <odp/api/plat/queue_types.h> -#include <odp/api/plat/buffer_types.h> -#include <odp/api/plat/pool_types.h> - -/** @ingroup odp_queue - * @{ - */ - -/* REMOVE FROM API SPEC. Typedef needed only for suppressing Doxygen - * warning. */ -typedef void odp_queue_group_t; - -/** - * @} - */ - -#include <odp/api/spec/queue.h> - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/sync.h b/platform/linux-generic/include/odp/api/sync.h deleted file mode 100644 index bf138b4e..00000000 --- a/platform/linux-generic/include/odp/api/sync.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2013-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP synchronisation - */ - -#ifndef ODP_PLAT_SYNC_H_ -#define ODP_PLAT_SYNC_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** @ingroup odp_barrier - * @{ - */ - -#include <odp/api/plat/static_inline.h> -#if ODP_ABI_COMPAT == 0 -#include <odp/api/plat/sync_inlines.h> -#endif - -/** - * @} - */ - -#include <odp/api/spec/sync.h> - -#ifdef __cplusplus -} -#endif - -#endif ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/compiler.h | 53 ---------------------- platform/linux-generic/include/odp/api/atomic.h | 42 ----------------- platform/linux-generic/include/odp/api/byteorder.h | 43 ------------------ .../linux-generic/include/odp/api/classification.h | 46 ------------------- platform/linux-generic/include/odp/api/packet.h | 38 ---------------- platform/linux-generic/include/odp/api/queue.h | 44 ------------------ platform/linux-generic/include/odp/api/sync.h | 39 ---------------- 7 files changed, 305 deletions(-) delete mode 100644 include/odp/api/spec/compiler.h delete mode 100644 platform/linux-generic/include/odp/api/atomic.h delete mode 100644 platform/linux-generic/include/odp/api/byteorder.h delete mode 100644 platform/linux-generic/include/odp/api/classification.h delete mode 100644 platform/linux-generic/include/odp/api/packet.h delete mode 100644 platform/linux-generic/include/odp/api/queue.h delete mode 100644 platform/linux-generic/include/odp/api/sync.h hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-115-gb122176e

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 b122176ee59494dd957f0f5ff41d4b55a1477e13 (commit) via 22193a06524fa8dc43dfd106cf7eab46745b86f4 (commit) via 6582992616b1d95844d41ba93aeb0bb6c7dd6bd7 (commit) via 5911355121d94a192c9336b036cebb3734a78db2 (commit) via d48d55d846c3e711c2632a66db485f9079a768cf (commit) via 3c2b4804a2c3bca57febe2aea8a56b586c44f035 (commit) via a4767f0cbe844cd7f61f43557f0f90eaa2969192 (commit) via 7915f861ea56bbb0f5a0c22d93a7b4ff6b3c76e2 (commit) via 741bdb906e946d22194ab5676c9ea06e3debb2a1 (commit) from ac8b5f2a26edfa6249e134572a151dbd36c8dce6 (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 b122176ee59494dd957f0f5ff41d4b55a1477e13 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jan 18 16:26:44 2018 +0200 linux-gen: pktio: unify send/recv function argument naming Use argument named 'num' on all pktio devices to pass the number of packets to receive/transmit. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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/ipc.c b/platform/linux-generic/pktio/ipc.c index c8880ae9..b6c493ea 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -565,13 +565,13 @@ repeat: } static int ipc_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - odp_packet_t pkt_table[], int len) + odp_packet_t pkt_table[], int num) { int ret; odp_ticketlock_lock(&pktio_entry->s.rxl); - ret = ipc_pktio_recv_lockless(pktio_entry, pkt_table, len); + ret = ipc_pktio_recv_lockless(pktio_entry, pkt_table, num); odp_ticketlock_unlock(&pktio_entry->s.rxl); @@ -579,16 +579,16 @@ static int ipc_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, - const odp_packet_t pkt_table[], int len) + const odp_packet_t pkt_table[], int num) { _ring_t *r; void **rbuf_p; int ret; int i; uint32_t ready = odp_atomic_load_u32(&pktio_entry->s.ipc.ready); - odp_packet_t pkt_table_mapped[len]; /**< Ready to send packet has to be + odp_packet_t pkt_table_mapped[num]; /**< Ready to send packet has to be * in memory mapped pool. */ - uintptr_t offsets[len]; + uintptr_t offsets[num]; if (odp_unlikely(!ready)) return 0; @@ -598,7 +598,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, /* Copy packets to shm shared pool if they are in different * pool, or if they are references (we can't share across IPC). */ - for (i = 0; i < len; i++) { + for (i = 0; i < num; i++) { odp_packet_t pkt = pkt_table[i]; pool_t *ipc_pool = pool_entry_from_hdl(pktio_entry->s.ipc.pool); odp_packet_hdr_t *pkt_hdr; @@ -623,7 +623,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, } /* Set offset to phdr for outgoing packets */ - for (i = 0; i < len; i++) { + for (i = 0; i < num; i++) { uint64_t data_pool_off; odp_packet_t pkt = pkt_table_mapped[i]; odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); @@ -639,7 +639,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, pkt_hdr->buf_hdr.ipc_data_offset = data_pool_off; IPC_ODP_DBG("%d/%d send packet %llx, pool %llx," "phdr = %p, offset %x sendoff %x, addr %llx iaddr %llx\n", - i, len, + i, num, odp_packet_to_u64(pkt), odp_pool_to_u64(pool_hdl), pkt_hdr, pkt_hdr->buf_hdr.ipc_data_offset, offsets[i], odp_shm_addr(pool->shm), @@ -650,7 +650,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, /* Put packets to ring to be processed by other process. */ rbuf_p = (void *)&offsets[0]; r = pktio_entry->s.ipc.tx.send; - ret = _ring_mp_enqueue_burst(r, rbuf_p, len); + ret = _ring_mp_enqueue_burst(r, rbuf_p, num); if (odp_unlikely(ret < 0)) { ODP_ERR("pid %d odp_ring_mp_enqueue_bulk fail, ipc_slave %d, ret %d\n", getpid(), @@ -662,17 +662,17 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, ODP_ABORT("Unexpected!\n"); } - return len; + return num; } static int ipc_pktio_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - const odp_packet_t pkt_table[], int len) + const odp_packet_t pkt_table[], int num) { int ret; odp_ticketlock_lock(&pktio_entry->s.txl); - ret = ipc_pktio_send_lockless(pktio_entry, pkt_table, len); + ret = ipc_pktio_send_lockless(pktio_entry, pkt_table, num); odp_ticketlock_unlock(&pktio_entry->s.txl); diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 1461b64d..aecb0263 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -70,7 +70,7 @@ static int loopback_close(pktio_entry_t *pktio_entry) } static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - odp_packet_t pkts[], int len) + odp_packet_t pkts[], int num) { int nbr, i; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; @@ -82,13 +82,13 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int num_rx = 0; int failed = 0; - if (odp_unlikely(len > QUEUE_MULTI_MAX)) - len = QUEUE_MULTI_MAX; + if (odp_unlikely(num > QUEUE_MULTI_MAX)) + num = QUEUE_MULTI_MAX; odp_ticketlock_lock(&pktio_entry->s.rxl); queue = queue_fn->from_ext(pktio_entry->s.pkt_loop.loopq); - nbr = queue_fn->deq_multi(queue, hdr_tbl, len); + nbr = queue_fn->deq_multi(queue, hdr_tbl, num); if (pktio_entry->s.config.pktin.bit.ts_all || pktio_entry->s.config.pktin.bit.ts_ptp) { @@ -171,7 +171,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - const odp_packet_t pkt_tbl[], int len) + const odp_packet_t pkt_tbl[], int num) { odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; queue_t queue; @@ -179,12 +179,12 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int ret; int nb_tx = 0; uint32_t bytes = 0; - uint32_t out_octets_tbl[len]; + uint32_t out_octets_tbl[num]; - if (odp_unlikely(len > QUEUE_MULTI_MAX)) - len = QUEUE_MULTI_MAX; + if (odp_unlikely(num > QUEUE_MULTI_MAX)) + num = QUEUE_MULTI_MAX; - for (i = 0; i < len; ++i) { + for (i = 0; i < num; ++i) { uint32_t pkt_len = odp_packet_len(pkt_tbl[i]); if (pkt_len > LOOP_MTU) { diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 596bf6f2..7fc92514 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -204,7 +204,7 @@ static int _pcapif_reopen(pkt_pcap_t *pcap) } static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - odp_packet_t pkts[], int len) + odp_packet_t pkts[], int num) { int i; struct pcap_pkthdr *hdr; @@ -226,7 +226,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pktio_entry->s.config.pktin.bit.ts_ptp) ts = &ts_val; - for (i = 0; i < len; ) { + for (i = 0; i < num; ) { int ret; ret = pcap_next_ex(pcap->rx, &hdr, &data); @@ -293,7 +293,7 @@ static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt) } static int pcapif_send_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - const odp_packet_t pkts[], int len) + const odp_packet_t pkts[], int num) { pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; int i; @@ -305,7 +305,7 @@ static int pcapif_send_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, return 0; } - for (i = 0; i < len; ++i) { + for (i = 0; i < num; ++i) { int pkt_len = odp_packet_len(pkts[i]); if (pkt_len > PKTIO_PCAP_MTU) { diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 5c86ff60..71980b54 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -601,15 +601,15 @@ static uint32_t _rx_pkt_to_iovec(odp_packet_t pkt, * ODP_PACKET_SOCKET_MMSG: */ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - odp_packet_t pkt_table[], int len) + odp_packet_t pkt_table[], int num) { pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock; odp_pool_t pool = pkt_sock->pool; odp_time_t ts_val; odp_time_t *ts = NULL; const int sockfd = pkt_sock->sockfd; - struct mmsghdr msgvec[len]; - struct iovec iovecs[len][MAX_SEGS]; + struct mmsghdr msgvec[num]; + struct iovec iovecs[num][MAX_SEGS]; int nb_rx = 0; int nb_pkts; int recv_msgs; @@ -623,7 +623,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, memset(msgvec, 0, sizeof(msgvec)); - nb_pkts = packet_alloc_multi(pool, pkt_sock->mtu, pkt_table, len); + nb_pkts = packet_alloc_multi(pool, pkt_sock->mtu, pkt_table, num); for (i = 0; i < nb_pkts; i++) { msgvec[i].msg_hdr.msg_iovlen = _rx_pkt_to_iovec(pkt_table[i], iovecs[i]); @@ -804,11 +804,11 @@ static uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, * ODP_PACKET_SOCKET_MMSG: */ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - const odp_packet_t pkt_table[], int len) + const odp_packet_t pkt_table[], int num) { pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock; - struct mmsghdr msgvec[len]; - struct iovec iovecs[len][MAX_SEGS]; + struct mmsghdr msgvec[num]; + struct iovec iovecs[num][MAX_SEGS]; int ret; int sockfd; int n, i; @@ -818,14 +818,14 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, sockfd = pkt_sock->sockfd; memset(msgvec, 0, sizeof(msgvec)); - for (i = 0; i < len; i++) { + for (i = 0; i < num; i++) { msgvec[i].msg_hdr.msg_iov = iovecs[i]; msgvec[i].msg_hdr.msg_iovlen = _tx_pkt_to_iovec(pkt_table[i], iovecs[i]); } - for (i = 0; i < len; ) { - ret = sendmmsg(sockfd, &msgvec[i], len - i, MSG_DONTWAIT); + for (i = 0; i < num; ) { + ret = sendmmsg(sockfd, &msgvec[i], num - i, MSG_DONTWAIT); if (odp_unlikely(ret <= -1)) { if (i == 0 && SOCK_ERR_REPORT(errno)) { __odp_errno = errno; diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 20ac9d12..b53173d2 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -163,7 +163,7 @@ static inline unsigned next_frame(unsigned cur_frame, unsigned frame_count) static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, pkt_sock_mmap_t *pkt_sock, - odp_packet_t pkt_table[], unsigned len, + odp_packet_t pkt_table[], unsigned num, unsigned char if_mac[]) { union frame_map ppd; @@ -185,11 +185,11 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, ring = &pkt_sock->rx_ring; frame_num = ring->frame_num; - for (i = 0, nb_rx = 0; i < len; i++) { + for (i = 0, nb_rx = 0; i < num; i++) { odp_packet_hdr_t *hdr; odp_packet_hdr_t parsed_hdr; odp_pool_t pool = pkt_sock->pool; - int num; + int pkts; if (!mmap_rx_kernel_ready(ring->rd[frame_num].iov_base)) break; @@ -234,9 +234,9 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, } } - num = packet_alloc_multi(pool, pkt_len, &pkt_table[nb_rx], 1); + pkts = packet_alloc_multi(pool, pkt_len, &pkt_table[nb_rx], 1); - if (odp_unlikely(num != 1)) { + if (odp_unlikely(pkts != 1)) { pkt_table[nb_rx] = ODP_PACKET_INVALID; mmap_rx_user_ready(ppd.raw); /* drop */ frame_num = next_frame_num; @@ -317,7 +317,7 @@ static unsigned handle_pending_frames(int sock, struct ring *ring, int frames) static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, const odp_packet_t pkt_table[], - unsigned len) + unsigned num) { union frame_map ppd; uint32_t pkt_len; @@ -333,7 +333,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, frame_num = first_frame_num; frame_count = ring->rd_num; - while (i < len) { + while (i < num) { ppd.raw = ring->rd[frame_num].iov_base; if (!odp_unlikely(mmap_tx_kernel_ready(ppd.raw))) break; @@ -661,13 +661,13 @@ static int sock_mmap_fd_set(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } static int sock_mmap_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - odp_packet_t pkt_table[], int len) + odp_packet_t pkt_table[], int num) { pkt_sock_mmap_t *const pkt_sock = &pktio_entry->s.pkt_sock_mmap; int ret; odp_ticketlock_lock(&pktio_entry->s.rxl); - ret = pkt_mmap_v2_rx(pktio_entry, pkt_sock, pkt_table, len, + ret = pkt_mmap_v2_rx(pktio_entry, pkt_sock, pkt_table, num, pkt_sock->if_mac); odp_ticketlock_unlock(&pktio_entry->s.rxl); @@ -748,14 +748,14 @@ static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], } static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - const odp_packet_t pkt_table[], int len) + const odp_packet_t pkt_table[], int num) { int ret; pkt_sock_mmap_t *const pkt_sock = &pktio_entry->s.pkt_sock_mmap; odp_ticketlock_lock(&pktio_entry->s.txl); ret = pkt_mmap_v2_tx(pkt_sock->tx_ring.sock, &pkt_sock->tx_ring, - pkt_table, len); + pkt_table, num); odp_ticketlock_unlock(&pktio_entry->s.txl); return ret; diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index d8b78f3f..ebd4d94b 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -294,7 +294,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, } static int tap_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - odp_packet_t pkts[], int len) + odp_packet_t pkts[], int num) { ssize_t retval; int i; @@ -309,7 +309,7 @@ static int tap_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pktio_entry->s.config.pktin.bit.ts_ptp) ts = &ts_val; - for (i = 0; i < len; i++) { + for (i = 0; i < num; i++) { do { retval = read(tap->fd, buf, BUF_SIZE); } while (retval < 0 && errno == EINTR); @@ -333,7 +333,7 @@ static int tap_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, } static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, - const odp_packet_t pkts[], int len) + const odp_packet_t pkts[], int num) { ssize_t retval; int i, n; @@ -341,7 +341,7 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, uint8_t buf[BUF_SIZE]; pkt_tap_t *tap = &pktio_entry->s.pkt_tap; - for (i = 0; i < len; i++) { + for (i = 0; i < num; i++) { pkt_len = odp_packet_len(pkts[i]); if (pkt_len > tap->mtu) { @@ -385,13 +385,13 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, } static int tap_pktio_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, - const odp_packet_t pkts[], int len) + const odp_packet_t pkts[], int num) { int ret; odp_ticketlock_lock(&pktio_entry->s.txl); - ret = tap_pktio_send_lockless(pktio_entry, pkts, len); + ret = tap_pktio_send_lockless(pktio_entry, pkts, num); odp_ticketlock_unlock(&pktio_entry->s.txl); commit 22193a06524fa8dc43dfd106cf7eab46745b86f4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 16 16:59:10 2018 +0200 linux-gen: netmap: check that packet obeys MTU in receive Some NICs do not automatically drop packets which exceed MTU. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h index 616541b5..fa950158 100644 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ b/platform/linux-generic/include/odp_packet_netmap.h @@ -44,7 +44,6 @@ typedef struct { /** Packet socket using netmap mmaped rings for both Rx and Tx */ typedef struct { odp_pool_t pool; /**< pool to alloc packets from */ - size_t max_frame_len; /**< buf_size - sizeof(pkt_hdr) */ uint32_t if_flags; /**< interface flags */ uint32_t mtu; /**< maximum transmission unit */ int sockfd; /**< control socket */ diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index dd5debb8..a7c47900 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -350,9 +350,6 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, pkt_nm->sockfd = -1; pkt_nm->pool = pool; - /* max frame len taking into account the l2-offset */ - pkt_nm->max_frame_len = pool_entry_from_hdl(pool)->max_len; - /* allow interface to be opened with or without the 'netmap:' prefix */ prefix = "netmap:"; if (strncmp(netdev, "netmap:", 7) == 0) @@ -642,12 +639,6 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, odp_prefetch(slot.buf); - if (odp_unlikely(len > pktio_entry->s.pkt_nm.max_frame_len)) { - ODP_ERR("RX: frame too big %" PRIu16 " %zu!\n", len, - pktio_entry->s.pkt_nm.max_frame_len); - goto fail; - } - if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, (const uint8_t *)slot.buf, len, @@ -692,6 +683,7 @@ static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, netmap_slot_t slot_tbl[num]; char *buf; uint32_t slot_id; + uint32_t mtu = pktio_entry->s.pkt_nm.mtu; int i; int ring_id = desc->cur_rx_ring; int num_rx = 0; @@ -711,10 +703,12 @@ static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, slot_id = ring->cur; buf = NETMAP_BUF(ring, ring->slot[slot_id].buf_idx); - slot_tbl[num_rx].buf = buf; - slot_tbl[num_rx].len = ring->slot[slot_id].len; - num_rx++; - + if (odp_likely(ring->slot[slot_id].len <= mtu)) { + slot_tbl[num_rx].buf = buf; + slot_tbl[num_rx].len = ring->slot[slot_id].len; + ODP_DBG("dropped oversized packet\n"); + num_rx++; + } ring->cur = nm_ring_next(ring, slot_id); } ring->head = ring->cur; commit 6582992616b1d95844d41ba93aeb0bb6c7dd6bd7 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 16 16:07:29 2018 +0200 linux-gen: socket_mmap: check that packet obeys MTU in receive Some NICs do not automatically drop packets which exceed MTU. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index 52d2776b..88d2306c 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -73,6 +73,7 @@ typedef struct { int ODP_ALIGNED_CACHE sockfd; odp_pool_t pool; + int mtu; /**< maximum transmission unit */ size_t frame_offset; /**< frame start offset from start of pkt buf */ uint8_t *mmap_base; unsigned mmap_len; diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 96254f9a..20ac9d12 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -203,6 +203,13 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, pkt_buf = (uint8_t *)ppd.raw + ppd.v2->tp_h.tp_mac; pkt_len = ppd.v2->tp_h.tp_snaplen; + if (odp_unlikely(pkt_len > pkt_sock->mtu)) { + mmap_rx_user_ready(ppd.raw); + frame_num = next_frame_num; + ODP_DBG("dropped oversized packet\n"); + continue; + } + /* Don't receive packets sent by ourselves */ eth_hdr = (struct ethhdr *)pkt_buf; if (odp_unlikely(ethaddrs_equal(if_mac, @@ -593,6 +600,10 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, if (ret != 0) goto error; + pkt_sock->mtu = mtu_get_fd(pkt_sock->sockfd, netdev); + if (!pkt_sock->mtu) + goto error; + if_idx = if_nametoindex(netdev); if (if_idx == 0) { __odp_errno = errno; commit 5911355121d94a192c9336b036cebb3734a78db2 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 16 15:11:49 2018 +0200 linux-gen: socket: drop truncated packets on receive Drop truncated packets received from kernel during sock_mmsg_recv() call. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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.c b/platform/linux-generic/pktio/socket.c index 7843b611..5c86ff60 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -643,6 +643,11 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, uint16_t pkt_len = msgvec[i].msg_len; int ret; + if (odp_unlikely(msgvec[i].msg_hdr.msg_flags & MSG_TRUNC)) { + odp_packet_free(pkt); + ODP_DBG("dropped truncated packet\n"); + continue; + } if (pktio_cls_enabled(pktio_entry)) { uint16_t seg_len = pkt_len; commit d48d55d846c3e711c2632a66db485f9079a768cf Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Jan 16 08:51:43 2018 +0200 linux-gen: socket_mmap: fix short send handling During sock_mmap_send() when all packets are not transmitted by sendto() call the used ring slots have to be marked as TP_STATUS_AVAILABLE or they will be transmitted during the next sock_mmap_send() call, thus breaking the function logic. To reduce the number of failed TX operations (visible to applications) the pktio implementation can call sendto() up to TX_RETRIES times during a single sock_mmap_recv() call. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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 b4357f7b..96254f9a 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -23,6 +23,7 @@ #include <poll.h> #include <sys/ioctl.h> #include <errno.h> +#include <time.h> #include <odp_api.h> #include <odp_packet_socket.h> @@ -37,6 +38,12 @@ #include <protocols/eth.h> #include <protocols/ip.h> +/* Maximum number of retries per sock_mmap_send() call */ +#define TX_RETRIES 10 + +/* Number of nanoseconds to wait between TX retries */ +#define TX_RETRY_NSEC 1000 + /* Maximum number of packets to store in each RX/TX block */ #define MAX_PKTS_PER_BLOCK 512 @@ -149,6 +156,11 @@ static uint8_t *pkt_mmap_vlan_insert(uint8_t *l2_hdr_ptr, return l2_hdr_ptr; } +static inline unsigned next_frame(unsigned cur_frame, unsigned frame_count) +{ + return odp_unlikely(cur_frame + 1 >= frame_count) ? 0 : cur_frame + 1; +} + static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, pkt_sock_mmap_t *pkt_sock, odp_packet_t pkt_table[], unsigned len, @@ -186,7 +198,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, ts_val = odp_time_global(); ppd.raw = ring->rd[frame_num].iov_base; - next_frame_num = (frame_num + 1) % ring->rd_num; + next_frame_num = next_frame(frame_num, ring->rd_num); pkt_buf = (uint8_t *)ppd.raw + ppd.v2->tp_h.tp_mac; pkt_len = ppd.v2->tp_h.tp_snaplen; @@ -252,6 +264,50 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, return nb_rx; } +static unsigned handle_pending_frames(int sock, struct ring *ring, int frames) +{ + int i; + int retry = 0; + unsigned nb_tx = 0; + unsigned frame_num; + unsigned frame_count = ring->rd_num; + unsigned first_frame_num = ring->frame_num; + + for (frame_num = first_frame_num, i = 0; i < frames; i++) { + struct tpacket2_hdr *hdr = ring->rd[frame_num].iov_base; + + if (odp_likely(hdr->tp_status == TP_STATUS_AVAILABLE || + hdr->tp_status == TP_STATUS_SENDING)) { + nb_tx++; + } else if (hdr->tp_status == TP_STATUS_SEND_REQUEST) { + if (retry++ < TX_RETRIES) { + struct timespec ts = { .tv_nsec = TX_RETRY_NSEC, + .tv_sec = 0 }; + + sendto(sock, NULL, 0, MSG_DONTWAIT, NULL, 0); + nanosleep(&ts, NULL); + i--; + continue; + } else { + hdr->tp_status = TP_STATUS_AVAILABLE; + } + } else { /* TP_STATUS_WRONG_FORMAT */ + /* Don't try re-sending frames after failure */ + for (; i < frames; i++) { + hdr = ring->rd[frame_num].iov_base; + hdr->tp_status = TP_STATUS_AVAILABLE; + frame_num = next_frame(frame_num, frame_count); + } + break; + } + frame_num = next_frame(frame_num, frame_count); + } + + ring->frame_num = next_frame(first_frame_num + nb_tx - 1, frame_count); + + return nb_tx; +} + static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, const odp_packet_t pkt_table[], unsigned len) @@ -261,7 +317,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, unsigned first_frame_num, frame_num, frame_count; int ret; uint8_t *buf; - unsigned n, i = 0; + unsigned i = 0; unsigned nb_tx = 0; int send_errno; int total_len = 0; @@ -286,9 +342,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, mmap_tx_user_ready(ppd.raw); - if (++frame_num >= frame_count) - frame_num = 0; - + frame_num = next_frame(frame_num, frame_count); i++; } @@ -302,27 +356,11 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, if (odp_likely(ret == total_len)) { nb_tx = i; ring->frame_num = frame_num; - } else if (ret == -1) { - for (frame_num = first_frame_num, n = 0; n < i; ++n) { - struct tpacket2_hdr *hdr = ring->rd[frame_num].iov_base; - - if (odp_likely(hdr->tp_status == TP_STATUS_AVAILABLE || - hdr->tp_status == TP_STATUS_SENDING)) { - nb_tx++; - } else { - /* The remaining frames weren't sent, clear - * their status to indicate we're not waiting - * for the kernel to process them. */ - hdr->tp_status = TP_STATUS_AVAILABLE; - } - - if (++frame_num >= frame_count) - frame_num = 0; - } - - ring->frame_num = (first_frame_num + nb_tx) % frame_count; + } else { + nb_tx = handle_pending_frames(sock, ring, i); - if (nb_tx == 0 && SOCK_ERR_REPORT(send_errno)) { + if (odp_unlikely(ret == -1 && nb_tx == 0 && + SOCK_ERR_REPORT(send_errno))) { __odp_errno = send_errno; /* ENOBUFS indicates that the transmit queue is full, * which will happen regularly when overloaded so don't @@ -332,16 +370,6 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, strerror(send_errno)); return -1; } - } else { - /* Short send, return value is number of bytes sent so use this - * to determine number of complete frames sent. */ - for (n = 0; n < i && ret > 0; ++n) { - ret -= odp_packet_len(pkt_table[n]); - if (ret >= 0) - nb_tx++; - } - - ring->frame_num = (first_frame_num + nb_tx) % frame_count; } for (i = 0; i < nb_tx; ++i) commit 3c2b4804a2c3bca57febe2aea8a56b586c44f035 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jan 15 13:20:16 2018 +0200 linux-gen: socket_mmap: reduce memory usage Allocating enough memory for storing each packet in the packet pool in each RX/TX block wastes a lot of memory. Also, the following mmap() call in mmap_sock() can start failing when the number of memory blocks increases (large number of CPU cores). Reduce the amount of required memory by limiting the size of memory blocks. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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 b8348677..b4357f7b 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -37,6 +37,9 @@ #include <protocols/eth.h> #include <protocols/ip.h> +/* Maximum number of packets to store in each RX/TX block */ +#define MAX_PKTS_PER_BLOCK 512 + static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ static int set_pkt_sock_fanout_mmap(pkt_sock_mmap_t *const pkt_sock, @@ -349,6 +352,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, static void mmap_fill_ring(struct ring *ring, odp_pool_t pool_hdl, int fanout) { + uint32_t num_frames; int pz = getpagesize(); pool_t *pool; @@ -360,13 +364,15 @@ static void mmap_fill_ring(struct ring *ring, odp_pool_t pool_hdl, int fanout) /* Frame has to capture full packet which can fit to the pool block.*/ ring->req.tp_frame_size = (pool->headroom + pool->seg_len + pool->tailroom + TPACKET_HDRLEN + - TPACKET_ALIGNMENT + + (pz - 1)) & (-pz); + TPACKET_ALIGNMENT + (pz - 1)) & (-pz); - /* Calculate how many pages do we need to hold all pool packets - * and align size to page boundary. - */ - ring->req.tp_block_size = (ring->req.tp_frame_size * - pool->num + (pz - 1)) & (-pz); + /* Calculate how many pages we need to hold at most MAX_PKTS_PER_BLOCK + * packets and align size to page boundary. + */ + num_frames = pool->num < MAX_PKTS_PER_BLOCK ? pool->num : + MAX_PKTS_PER_BLOCK; + ring->req.tp_block_size = (ring->req.tp_frame_size * num_frames + + (pz - 1)) & (-pz); if (!fanout) { /* Single socket is in use. Use 1 block with buf_num frames. */ commit a4767f0cbe844cd7f61f43557f0f90eaa2969192 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jan 12 15:39:22 2018 +0200 linux-gen: pktio: loop: use more realistic MTU value Use more realistic MTU value. The value is also checked in TX. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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/loop.c b/platform/linux-generic/pktio/loop.c index 347b4943..1461b64d 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -25,6 +25,7 @@ #include <stdlib.h> #define MAX_LOOP 16 +#define LOOP_MTU (64 * 1024) /* MAC address for the "loop" interface */ static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01}; @@ -176,6 +177,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, queue_t queue; int i; int ret; + int nb_tx = 0; uint32_t bytes = 0; uint32_t out_octets_tbl[len]; @@ -183,15 +185,25 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, len = QUEUE_MULTI_MAX; for (i = 0; i < len; ++i) { + uint32_t pkt_len = odp_packet_len(pkt_tbl[i]); + + if (pkt_len > LOOP_MTU) { + if (nb_tx == 0) { + __odp_errno = EMSGSIZE; + return -1; + } + break; + } hdr_tbl[i] = packet_to_buf_hdr(pkt_tbl[i]); - bytes += odp_packet_len(pkt_tbl[i]); + bytes += pkt_len; /* Store cumulative byte counts to update 'stats.out_octets' * correctly in case enq_multi() fails to enqueue all packets. */ out_octets_tbl[i] = bytes; + nb_tx++; } - for (i = 0; i < len; ++i) { + for (i = 0; i < nb_tx; ++i) { odp_ipsec_packet_result_t result; if (packet_subtype(pkt_tbl[i]) == @@ -207,7 +219,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.txl); queue = queue_fn->from_ext(pktio_entry->s.pkt_loop.loopq); - ret = queue_fn->enq_multi(queue, hdr_tbl, len); + ret = queue_fn->enq_multi(queue, hdr_tbl, nb_tx); if (ret > 0) { pktio_entry->s.stats.out_ucast_pkts += ret; @@ -224,8 +236,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static uint32_t loopback_mtu_get(pktio_entry_t *pktio_entry ODP_UNUSED) { - /* the loopback interface imposes no maximum transmit size limit */ - return INT_MAX; + return LOOP_MTU; } static int loopback_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, commit 7915f861ea56bbb0f5a0c22d93a7b4ff6b3c76e2 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jan 12 15:27:57 2018 +0200 linux-gen: pktio: loop: update stats.out_octets correctly odp_pktio_stats_t.out_octets was updated incorrectly if all packets were not successfully enqueued. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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/loop.c b/platform/linux-generic/pktio/loop.c index ad2cb39f..347b4943 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -177,6 +177,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int i; int ret; uint32_t bytes = 0; + uint32_t out_octets_tbl[len]; if (odp_unlikely(len > QUEUE_MULTI_MAX)) len = QUEUE_MULTI_MAX; @@ -184,6 +185,10 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, for (i = 0; i < len; ++i) { hdr_tbl[i] = packet_to_buf_hdr(pkt_tbl[i]); bytes += odp_packet_len(pkt_tbl[i]); + /* Store cumulative byte counts to update 'stats.out_octets' + * correctly in case enq_multi() fails to enqueue all packets. + */ + out_octets_tbl[i] = bytes; } for (i = 0; i < len; ++i) { @@ -206,7 +211,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (ret > 0) { pktio_entry->s.stats.out_ucast_pkts += ret; - pktio_entry->s.stats.out_octets += bytes; + pktio_entry->s.stats.out_octets += out_octets_tbl[ret - 1]; } else { ODP_DBG("queue enqueue failed %i\n", ret); ret = -1; commit 741bdb906e946d22194ab5676c9ea06e3debb2a1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jan 12 12:43:15 2018 +0200 linux-gen: pktio: use correct maximum frame length The maximum frame length should include Ethernet header. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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/netmap.c b/platform/linux-generic/pktio/netmap.c index ace0dd85..dd5debb8 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -417,14 +417,13 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, } pkt_nm->sockfd = sockfd; - /* Use either interface MTU (+ ethernet header length) or netmap buffer - * size as MTU, whichever is smaller. */ + /* Use either interface MTU or netmap buffer size as MTU, whichever is + * smaller. */ mtu = mtu_get_fd(pktio_entry->s.pkt_nm.sockfd, pkt_nm->if_name); if (mtu == 0) { ODP_ERR("Unable to read interface MTU\n"); goto error; } - mtu += _ODP_ETHHDR_LEN; pkt_nm->mtu = (mtu < buf_size) ? mtu : buf_size; /* Check if RSS is supported. If not, set 'max_input_queues' to 1. */ diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index c41152d4..7843b611 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -143,7 +143,7 @@ uint32_t mtu_get_fd(int fd, const char *name) ifr.ifr_name); return 0; } - return ifr.ifr_mtu; + return ifr.ifr_mtu + _ODP_ETHHDR_LEN; } /* ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_packet_netmap.h | 1 - platform/linux-generic/include/odp_packet_socket.h | 1 + platform/linux-generic/pktio/ipc.c | 24 ++-- platform/linux-generic/pktio/loop.c | 44 ++++-- platform/linux-generic/pktio/netmap.c | 25 ++-- platform/linux-generic/pktio/pcap.c | 8 +- platform/linux-generic/pktio/socket.c | 27 ++-- platform/linux-generic/pktio/socket_mmap.c | 149 ++++++++++++++------- platform/linux-generic/pktio/tap.c | 12 +- 9 files changed, 175 insertions(+), 116 deletions(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-106-gac8b5f2a

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 ac8b5f2a26edfa6249e134572a151dbd36c8dce6 (commit) via 89b0cbaa9cf4b8d6e93258f4dc2fd5084f3287b3 (commit) from f4e4b30454d6d961d0401717a11c6da06a889a7b (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 ac8b5f2a26edfa6249e134572a151dbd36c8dce6 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Fri Jan 19 00:20:47 2018 +0530 linux-gen: cls: unwind cls queues on failure Fixes: https://bugs.linaro.org/show_bug.cgi?id=3576 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(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_classification.c b/platform/linux-generic/odp_classification.c index 7cefe8ec..b41a5fd8 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -212,6 +212,12 @@ static void _odp_cls_update_hash_proto(cos_t *cos, cos->s.hash_proto.udp = 1; } +static inline void _cls_queue_unwind(uint32_t tbl_index, uint32_t j) +{ + while (j > 0) + odp_queue_destroy(queue_grp_tbl->s.queue[tbl_index + --j]); +} + odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) { int i, j; @@ -255,6 +261,8 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) queue = odp_queue_create(NULL, &cos->s. queue_param); if (queue == ODP_QUEUE_INVALID) { + /* unwind the queues */ + _cls_queue_unwind(tbl_index, j); UNLOCK(&cos->s.lock); return ODP_COS_INVALID; } commit 89b0cbaa9cf4b8d6e93258f4dc2fd5084f3287b3 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Thu Jan 18 22:01:35 2018 +0530 linux-gen: cls: invalid CoS index Fixes: https://bugs.linaro.org/show_bug.cgi?id=3576 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(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_classification.c b/platform/linux-generic/odp_classification.c index 5aa3b84a..7cefe8ec 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -250,7 +250,7 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) cos->s.num_queue = param->num_queue; _odp_cls_update_hash_proto(cos, param->hash_proto); - tbl_index = cos->s.index * CLS_COS_QUEUE_MAX; + tbl_index = i * CLS_COS_QUEUE_MAX; for (j = 0; j < CLS_COS_QUEUE_MAX; j++) { queue = odp_queue_create(NULL, &cos->s. queue_param); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_classification.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-104-gf4e4b304

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 f4e4b30454d6d961d0401717a11c6da06a889a7b (commit) via beb496bad99c91f639ea0aefaed7d4d30ec1368c (commit) via 3f069804f73c39e3bf98a998bbccd169f6c948f7 (commit) via 9836cf55fa6a5177f95fed5f10c01af0254303ce (commit) via a841f6b5448b4190230047dc7307f80ff77d01f5 (commit) from 3ce9d6ab16d064b0f83508e2f0b2e476d64b15e1 (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 f4e4b30454d6d961d0401717a11c6da06a889a7b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Jan 19 00:58:30 2018 +0300 travis: move --with-dpdk-path out of DPDK build if 1b285bbd (travis: also use DPDK when doing cross-compile tests) moved adding --with-dpdk-path to EXTRA_CONF to be executed under DPDK-building if. Move it outside of that if, so that DPDK is enabled even if it's prebuilt. Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 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/.travis.yml b/.travis.yml index bd49fb37..fca06a0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -197,7 +197,8 @@ install: ;; esac - | - if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + if [ -n "$TARGET" ] ; then + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -221,7 +222,8 @@ install: make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" + fi + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" fi # Netmap pktio commit beb496bad99c91f639ea0aefaed7d4d30ec1368c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Jan 19 00:27:29 2018 +0300 travis: use parallel make for all builds Use parallel make to build everything, speeding up builds. 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/.travis.yml b/.travis.yml index a727eda7..bd49fb37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -153,7 +153,7 @@ before_install: automake --add-missing --include-deps --copy autoconf ./configure --prefix=$HOME/cunit-install/$CROSS_ARCH --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test $CROSS || cat config.log - make + make -j $(nproc) sudo make install popd fi @@ -218,7 +218,7 @@ install: sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config fi popd - make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" + make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" @@ -231,7 +231,7 @@ install: git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git pushd netmap/LINUX ./configure - make + make -j $(nproc) popd fi sudo insmod ./netmap/LINUX/netmap.ko @@ -280,6 +280,7 @@ jobs: CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full --enable-helper-linux + - CCACHE_DISABLE=1 make -j $(nproc) - sudo CCACHE_DISABLE=1 LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test @@ -309,6 +310,7 @@ jobs: tar xpvf Release_1_8_13.tar.gz pushd doxygen-Release_1_8_13 cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make -j $(nproc) make install popd fi @@ -341,7 +343,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux - - make + - make -j $(nproc) - stage: "build only" env: CONF="" compiler: clang-3.8 @@ -349,7 +351,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux - - make + - make -j $(nproc) - stage: "build only" env: CROSS_ARCH="i386" compiler: gcc @@ -357,7 +359,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux $CROSS - - make + - make -j $(nproc) - stage: "build only" env: CROSS_ARCH="arm64" compiler: gcc @@ -365,7 +367,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux $CROSS - - make + - make -j $(nproc) after_failure: - cat config.log commit 3f069804f73c39e3bf98a998bbccd169f6c948f7 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 18 03:33:37 2018 +0300 travis: compile doxygen only for doxygen test All other tests do not use doxygen. So let's compile doxygen only for doxygen test, saving few minutes. 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/.travis.yml b/.travis.yml index f3603b18..a727eda7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -160,18 +160,6 @@ before_install: - export PKG_CONFIG_PATH="$HOME/cunit-install/$CROSS_ARCH/lib/pkgconfig:${PKG_CONFIG_PATH}" - find $HOME/cunit-install - # Updated Doxygen - - | - if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then - wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz - tar xpvf Release_1_8_13.tar.gz - pushd doxygen-Release_1_8_13 - cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . - make install - popd - fi - - export PATH=$HOME/doxygen-install/bin:$PATH - install: - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages @@ -314,7 +302,17 @@ jobs: env: TEST=doxygen compiler: gcc install: - - true + # Updated Doxygen + - | + if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then + wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz + tar xpvf Release_1_8_13.tar.gz + pushd doxygen-Release_1_8_13 + cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make install + popd + fi + - export PATH=$HOME/doxygen-install/bin:$PATH script: - ./bootstrap - ./configure commit 9836cf55fa6a5177f95fed5f10c01af0254303ce Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Jan 21 00:43:40 2018 +0300 travis: install packages in single pass To speedup build and to ease debugging in case only several packages are available, install all packages in single apt-get call. 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/.travis.yml b/.travis.yml index 86a0ab6d..f3603b18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,15 +98,18 @@ before_install: sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ; sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ; sudo -E apt-get -y update || true ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential || exit 1; + PKGS="build-essential libc6-dev:$CROSS_ARCH libssl-dev:$CROSS_ARCH zlib1g-dev:$CROSS_ARCH libconfig-dev:$CROSS_ARCH libstdc++-4.8-dev:$CROSS_ARCH libpcap0.8-dev:$CROSS_ARCH" ; if [ "$CROSS_ARCH" = "i386" ] ; then - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib || exit 1; + PKGS="$PKGS g++-multilib" ; else - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" || exit 1; + PKGS="$PKGS g++-$CROSS_GNU_TYPE" ; fi ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" || exit 1; - [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH" || exit 1; + if [ "$CROSS_ARCH" != "armhf" ] ; + then + PKGS="$PKGS libnuma-dev:$CROSS_ARCH" ; + fi ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install $PKGS || exit 1 ; export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi - if [ "${CC#clang}" != "${CC}" ] ; commit a841f6b5448b4190230047dc7307f80ff77d01f5 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jan 18 00:25:38 2018 +0300 travis: stop early when installation of cross-packages has failed If installation of cross-packages fails, installation will abort with obscure error message. Stop early providing more precise "error" point. 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/.travis.yml b/.travis.yml index 14bc1b14..86a0ab6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,15 +98,15 @@ before_install: sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ; sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ; sudo -E apt-get -y update || true ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential || exit 1; if [ "$CROSS_ARCH" = "i386" ] ; then - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib || exit 1; else - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" || exit 1; fi ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" ; - [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH"; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" || exit 1; + [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH" || exit 1; export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi - if [ "${CC#clang}" != "${CC}" ] ; ----------------------------------------------------------------------- Summary of changes: .travis.yml | 59 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-108-g5fba303f

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 5fba303faf04d29b616f687ce1f721400b2c6f9c (commit) from f925f103c90591776f73863d30159357b08bf71e (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 5fba303faf04d29b616f687ce1f721400b2c6f9c Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Jan 22 11:04:54 2018 +0300 mergefix: remove atomic_types.h delete platform/linux-generic/include/odp/api/plat/atomic_types.h as not used and removed with: 47932d2 linux-gen, include: switch atomic.h to api+abi Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/atomic_types.h b/platform/linux-generic/include/odp/api/plat/atomic_types.h deleted file mode 100644 index bc3b9466..00000000 --- a/platform/linux-generic/include/odp/api/plat/atomic_types.h +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP atomic operations - */ - -#ifndef ODP_ATOMIC_TYPES_H_ -#define ODP_ATOMIC_TYPES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/std_types.h> -#include <odp/api/align.h> - -/** - * @internal - * Atomic 64-bit unsigned integer - */ -struct odp_atomic_u64_s { - uint64_t v; /**< Actual storage for the atomic variable */ -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - /* Some architectures do not support lock-free operations on 64-bit - * data types. We use a spin lock to ensure atomicity. */ - char lock; /**< Spin lock (if needed) used to ensure atomic access */ -#endif -} ODP_ALIGNED(sizeof(uint64_t)); /* Enforce alignement! */ - -/** - * @internal - * Atomic 32-bit unsigned integer - */ -struct odp_atomic_u32_s { - uint32_t v; /**< Actual storage for the atomic variable */ -} ODP_ALIGNED(sizeof(uint32_t)); /* Enforce alignement! */ - -#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 - -/** - * @internal - * CAS operation expression for the ATOMIC_OP macro - */ -#define ATOMIC_CAS_OP(ret_ptr, old_val, new_val) \ -({ \ - if (atom->v == (old_val)) { \ - atom->v = (new_val); \ - *(ret_ptr) = 1; \ - } else { \ - *(ret_ptr) = 0; \ - } \ -}) - -/** - * @internal - * Helper macro for lock-based atomic operations on 64-bit integers - * @param[in,out] atom Pointer to the 64-bit atomic variable - * @param expr Expression used update the variable. - * @return The old value of the variable. - */ -#define ATOMIC_OP(atom, expr) \ -({ \ - uint64_t _old_val; \ - /* Loop while lock is already taken, stop when lock becomes clear */ \ - while (__atomic_test_and_set(&(atom)->lock, __ATOMIC_ACQUIRE)) \ - (void)0; \ - _old_val = (atom)->v; \ - (expr); /* Perform whatever update is desired */ \ - __atomic_clear(&(atom)->lock, __ATOMIC_RELEASE); \ - _old_val; /* Return old value */ \ -}) -#endif - -typedef struct odp_atomic_u64_s odp_atomic_u64_t; - -typedef struct odp_atomic_u32_s odp_atomic_u32_t; - -#ifdef __cplusplus -} -#endif - -#endif ----------------------------------------------------------------------- Summary of changes: .../include/odp/api/plat/atomic_types.h | 88 ---------------------- 1 file changed, 88 deletions(-) delete mode 100644 platform/linux-generic/include/odp/api/plat/atomic_types.h hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-99-g3ce9d6ab

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 3ce9d6ab16d064b0f83508e2f0b2e476d64b15e1 (commit) from d7ec85bbba32e9747307bd1cd76a061a39e7c731 (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 3ce9d6ab16d064b0f83508e2f0b2e476d64b15e1 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jan 16 16:06:13 2018 +0200 validation: packet: minimal chksum status test There was no references into chksum status functions in validation test suite. Add minimal test to see at least that functions exist. Parse function should be updated with a checksum implementation, before actual checksum checking can be tested. 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 75e50d53..78ccbeae 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -2466,6 +2466,8 @@ void packet_test_parse(void) odp_packet_parse_param_t parse; int ret, num_test_pkt, i; uint32_t len, max_len; + odp_packet_chksum_status_t chksum_status; + odp_proto_chksums_t all_chksums; int num_pkt = 10; odp_packet_t pkt[num_pkt]; uint32_t offset[num_pkt]; @@ -2480,6 +2482,12 @@ void packet_test_parse(void) sizeof(test_packet_ipv6_udp), sizeof(test_packet_vlan_ipv6_udp) }; + all_chksums.all_chksum = 0; + all_chksums.chksum.ipv4 = 1; + all_chksums.chksum.udp = 1; + all_chksums.chksum.tcp = 1; + all_chksums.chksum.sctp = 1; + num_test_pkt = sizeof(test_pkt_len) / sizeof(uint32_t); max_len = 0; @@ -2509,11 +2517,16 @@ void packet_test_parse(void) CU_ASSERT(ret == 0); offset[i] = 0; + + chksum_status = odp_packet_l3_chksum_status(pkt[i]); + CU_ASSERT(chksum_status == ODP_PACKET_CHKSUM_UNKNOWN); + chksum_status = odp_packet_l4_chksum_status(pkt[i]); + CU_ASSERT(chksum_status == ODP_PACKET_CHKSUM_UNKNOWN); } parse.proto = ODP_PROTO_ETH; parse.last_layer = ODP_PROTO_LAYER_ALL; - parse.chksums.all_chksum = 0; + parse.chksums = all_chksums; CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0); CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1], ----------------------------------------------------------------------- Summary of changes: test/validation/api/packet/packet.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 5 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-98-gd7ec85bb

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 d7ec85bbba32e9747307bd1cd76a061a39e7c731 (commit) via a001621520f769f835ce963d1e7ef8c1af74ad66 (commit) via 33afa2d1d4f6df342214dd9d9e4aab4433da3d7d (commit) via 29e5037571610ee49830dd64a43a47a8ccbadb87 (commit) via 988ae5930a9db1ceb88e46a84a116e67b0108307 (commit) from 5a4502fc6bc53e6503169da3028f456b64811a0b (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 d7ec85bbba32e9747307bd1cd76a061a39e7c731 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 19 16:56:30 2018 +0200 linux-gen: byteorder: use inlined version internally Use always (also in ABI compat build) inlined version of byteorder conversion functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-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/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h index c2e94c63..df664c70 100644 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ b/platform/linux-generic/include/odp_classification_inlines.h @@ -19,6 +19,8 @@ extern "C" { #endif #include <odp/api/debug.h> +#include <odp/api/byteorder.h> +#include <odp/api/plat/byteorder_inlines.h> #include <protocols/eth.h> #include <protocols/ip.h> #include <protocols/ipsec.h> @@ -68,7 +70,7 @@ static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->src_addr); + ipaddr = _odp_be_to_cpu_32(ip->src_addr); if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -84,7 +86,7 @@ static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->dst_addr); + ipaddr = _odp_be_to_cpu_32(ip->dst_addr); if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -100,7 +102,7 @@ static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(tcp->src_port); + sport = _odp_be_to_cpu_16(tcp->src_port); if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -116,7 +118,7 @@ static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(tcp->dst_port); + dport = _odp_be_to_cpu_16(tcp->dst_port); if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -132,7 +134,7 @@ static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(udp->dst_port); + dport = _odp_be_to_cpu_16(udp->dst_port); if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -149,7 +151,7 @@ static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(udp->src_port); + sport = _odp_be_to_cpu_16(udp->src_port); if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -169,9 +171,9 @@ static inline int verify_pmr_dmac(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); - dmac = odp_be_to_cpu_64(dmac_be); + dmac = _odp_be_to_cpu_64(dmac_be); /* since we are converting a 48 bit ethernet address from BE to cpu - format using odp_be_to_cpu_64() the last 16 bits needs to be right + format using _odp_be_to_cpu_64() the last 16 bits needs to be right shifted */ if (dmac_be != dmac) dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); @@ -245,7 +247,7 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - tci = odp_be_to_cpu_16(vlan->tci); + tci = _odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; if (term_value->match.value == (vlan_id & term_value->match.mask)) @@ -269,7 +271,7 @@ static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); vlan++; - tci = odp_be_to_cpu_16(vlan->tci); + tci = _odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; if (term_value->match.value == (vlan_id & term_value->match.mask)) @@ -289,11 +291,11 @@ static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, if (pkt_hdr->p.input_flags.ipsec_ah) { const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr; - spi = odp_be_to_cpu_32(ahhdr->spi); + spi = _odp_be_to_cpu_32(ahhdr->spi); } else if (pkt_hdr->p.input_flags.ipsec_esp) { const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr; - spi = odp_be_to_cpu_32(esphdr->spi); + spi = _odp_be_to_cpu_32(esphdr->spi); } else { return 0; } @@ -343,7 +345,7 @@ static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - ethtype = odp_be_to_cpu_16(eth->type); + ethtype = _odp_be_to_cpu_16(eth->type); if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; @@ -364,7 +366,7 @@ static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - ethtype = odp_be_to_cpu_16(vlan->type); + ethtype = _odp_be_to_cpu_16(vlan->type); if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; diff --git a/platform/linux-generic/include/protocols/thash.h b/platform/linux-generic/include/protocols/thash.h index c938e67e..6b07d4e4 100644 --- a/platform/linux-generic/include/protocols/thash.h +++ b/platform/linux-generic/include/protocols/thash.h @@ -67,10 +67,10 @@ void thash_load_ipv6_addr(const _odp_ipv6hdr_t *ipv6, for (i = 0; i < 4; i++) { *(tuple->v6.src_addr.u32 + i) = - odp_be_to_cpu_32(*(ipv6->src_addr.u32 + i)); + _odp_be_to_cpu_32(*(ipv6->src_addr.u32 + i)); *(tuple->v6.dst_addr.u32 + i) = - odp_be_to_cpu_32(*(ipv6->dst_addr.u32 + i)); + _odp_be_to_cpu_32(*(ipv6->dst_addr.u32 + i)); } } @@ -83,9 +83,9 @@ uint32_t thash_softrss(uint32_t *tuple, uint8_t len, for (j = 0; j < len; j++) { for (i = 0; i < 32; i++) { if (tuple[j] & (1 << (31 - i))) { - ret ^= odp_cpu_to_be_32(((const uint32_t *) + ret ^= _odp_cpu_to_be_32(((const uint32_t *) key.u32)[j]) << i | (uint32_t)((uint64_t) - (odp_cpu_to_be_32(((const uint32_t *)key.u32) + (_odp_cpu_to_be_32(((const uint32_t *)key.u32) [j + 1])) >> (32 - i)); } } diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 27643092..5aa3b84a 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1103,7 +1103,7 @@ cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr, packet_hdr_has_eth(hdr)) { eth = (const _odp_ethhdr_t *)(pkt_addr + hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - qos = odp_be_to_cpu_16(vlan->tci); + qos = _odp_be_to_cpu_16(vlan->tci); qos = ((qos >> 13) & 0x07); cos = l2_cos->cos[qos]; } diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index b023d308..521627f1 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -10,6 +10,8 @@ #include <odp/api/chksum.h> #include <odp/api/plat/packet_inlines.h> +#include <odp/api/byteorder.h> +#include <odp/api/plat/byteorder_inlines.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> @@ -304,11 +306,11 @@ static int ipsec_parse_ipv4(ipsec_state_t *state, odp_packet_t pkt) odp_packet_copy_to_mem(pkt, state->ip_offset, _ODP_IPV4HDR_LEN, &ipv4hdr); - if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ipv4hdr.frag_offset))) + if (_ODP_IPV4HDR_IS_FRAGMENT(_odp_be_to_cpu_16(ipv4hdr.frag_offset))) return -1; state->ip_hdr_len = ipv4_hdr_len(&ipv4hdr); - state->ip_tot_len = odp_be_to_cpu_16(ipv4hdr.tot_len); + state->ip_tot_len = _odp_be_to_cpu_16(ipv4hdr.tot_len); state->ip_next_hdr = ipv4hdr.proto; state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV4HDR_PROTO_OFFSET; @@ -329,7 +331,7 @@ static int ipsec_parse_ipv6(ipsec_state_t *state, odp_packet_t pkt) state->ip_next_hdr = ipv6hdr.next_hdr; state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV6HDR_NHDR_OFFSET; /* FIXME: Jumbo frames */ - state->ip_tot_len = odp_be_to_cpu_16(ipv6hdr.payload_len) + + state->ip_tot_len = _odp_be_to_cpu_16(ipv6hdr.payload_len) + _ODP_IPV6HDR_LEN; memcpy(state->ipv6_addr, &ipv6hdr.dst_addr, _ODP_IPV6ADDR_LEN); @@ -432,8 +434,8 @@ static int ipsec_in_esp(odp_packet_t *pkt, odp_packet_copy_to_mem(*pkt, ipsec_offset, _ODP_UDPHDR_LEN, &udp); - if (udp.dst_port != odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) || - udp.length != odp_cpu_to_be_16(ip_data_len)) { + if (udp.dst_port != _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) || + udp.length != _odp_cpu_to_be_16(ip_data_len)) { status->error.proto = 1; return -1; } @@ -450,7 +452,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, } ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_ESP, - odp_be_to_cpu_32(esp.spi), + _odp_be_to_cpu_32(esp.spi), state->is_ipv4 ? ODP_IPSEC_IPV4 : ODP_IPSEC_IPV6, &state->ipv4_addr, status); @@ -481,7 +483,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; - state->in.seq_no = odp_be_to_cpu_32(esp.seq_no); + state->in.seq_no = _odp_be_to_cpu_32(esp.seq_no); param->aad_ptr = (uint8_t *)&state->esp.aad; @@ -546,7 +548,7 @@ static int ipsec_in_ah(odp_packet_t *pkt, } ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_AH, - odp_be_to_cpu_32(ah.spi), + _odp_be_to_cpu_32(ah.spi), state->is_ipv4 ? ODP_IPSEC_IPV4 : ODP_IPSEC_IPV6, &state->ipv4_addr, status); @@ -587,11 +589,11 @@ static int ipsec_in_ah(odp_packet_t *pkt, state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow; state->ah_ipv6.hop_limit = ipv6hdr->hop_limit; ipv6hdr->ver_tc_flow = - odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); + _odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); ipv6hdr->hop_limit = 0; } - state->in.seq_no = odp_be_to_cpu_32(ah.seq_no); + state->in.seq_no = _odp_be_to_cpu_32(ah.seq_no); param->auth_range.offset = state->ip_offset; param->auth_range.length = state->ip_tot_len; @@ -794,7 +796,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, _odp_ipv4hdr_t *ipv4hdr = odp_packet_l3_ptr(pkt, NULL); if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) - ipv4hdr->tot_len = odp_cpu_to_be_16(state.ip_tot_len); + ipv4hdr->tot_len = _odp_cpu_to_be_16(state.ip_tot_len); else ipv4hdr->ttl -= ipsec_sa->dec_ttl; _odp_ipv4_csum_update(pkt); @@ -803,8 +805,8 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) ipv6hdr->payload_len = - odp_cpu_to_be_16(state.ip_tot_len - - _ODP_IPV6HDR_LEN); + _odp_cpu_to_be_16(state.ip_tot_len - + _ODP_IPV6HDR_LEN); else ipv6hdr->hop_limit -= ipsec_sa->dec_ttl; } else { @@ -849,7 +851,7 @@ static int ipsec_out_tunnel_parse_ipv4(ipsec_state_t *state, ipsec_sa_t *ipsec_sa) { _odp_ipv4hdr_t *ipv4hdr = state->ip; - uint16_t flags = odp_be_to_cpu_16(ipv4hdr->frag_offset); + uint16_t flags = _odp_be_to_cpu_16(ipv4hdr->frag_offset); ipv4hdr->ttl -= ipsec_sa->dec_ttl; state->out_tunnel.ip_tos = ipv4hdr->tos; @@ -894,7 +896,7 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt, state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset; state->ip_tot_len += _ODP_IPV4HDR_LEN; - out_ip.tot_len = odp_cpu_to_be_16(state->ip_tot_len); + out_ip.tot_len = _odp_cpu_to_be_16(state->ip_tot_len); /* No need to convert to BE: ID just should not be duplicated */ out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_ipv4.hdr_id, 1); @@ -902,7 +904,7 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt, flags = state->out_tunnel.ip_df; else flags = ((uint16_t)ipsec_sa->out.tun_ipv4.df) << 14; - out_ip.frag_offset = odp_cpu_to_be_16(flags); + out_ip.frag_offset = _odp_cpu_to_be_16(flags); out_ip.ttl = ipsec_sa->out.tun_ipv4.ttl; /* Will be filled later by packet checksum update */ out_ip.chksum = 0; @@ -957,7 +959,7 @@ static int ipsec_out_tunnel_ipv6(odp_packet_t *pkt, out_ip.ver_tc_flow = odp_cpu_to_be_32(ver); state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset; - out_ip.payload_len = odp_cpu_to_be_16(state->ip_tot_len); + out_ip.payload_len = _odp_cpu_to_be_16(state->ip_tot_len); state->ip_tot_len += _ODP_IPV6HDR_LEN; out_ip.hop_limit = ipsec_sa->out.tun_ipv6.hlimit; @@ -1062,10 +1064,10 @@ static int ipsec_out_esp(odp_packet_t *pkt, if (ipsec_sa->udp_encap) { hdr_len += _ODP_UDPHDR_LEN; proto = _ODP_IPPROTO_UDP; - udphdr.src_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - udphdr.dst_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); - udphdr.length = odp_cpu_to_be_16(ip_data_len + - hdr_len + trl_len); + udphdr.src_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + udphdr.dst_port = _odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT); + udphdr.length = _odp_cpu_to_be_16(ip_data_len + + hdr_len + trl_len); udphdr.chksum = 0; /* should be 0 by RFC */ } @@ -1082,8 +1084,8 @@ static int ipsec_out_esp(odp_packet_t *pkt, param->override_iv_ptr = state->iv; memset(&esp, 0, sizeof(esp)); - esp.spi = odp_cpu_to_be_32(ipsec_sa->spi); - esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + esp.spi = _odp_cpu_to_be_32(ipsec_sa->spi); + esp.seq_no = _odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; @@ -1099,12 +1101,12 @@ static int ipsec_out_esp(odp_packet_t *pkt, if (state->is_ipv4) { _odp_ipv4hdr_t *ipv4hdr = state->ip; - ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len); + ipv4hdr->tot_len = _odp_cpu_to_be_16(state->ip_tot_len); } else { _odp_ipv6hdr_t *ipv6hdr = state->ip; - ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len - - _ODP_IPV6HDR_LEN); + ipv6hdr->payload_len = _odp_cpu_to_be_16(state->ip_tot_len - + _ODP_IPV6HDR_LEN); } if (odp_packet_extend_tail(pkt, trl_len, NULL, NULL) < 0 || @@ -1187,8 +1189,8 @@ static int ipsec_out_ah(odp_packet_t *pkt, } memset(&ah, 0, sizeof(ah)); - ah.spi = odp_cpu_to_be_32(ipsec_sa->spi); - ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); + ah.spi = _odp_cpu_to_be_32(ipsec_sa->spi); + ah.seq_no = _odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa)); ah.next_header = state->ip_next_hdr; odp_packet_copy_from_mem(*pkt, state->ip_next_hdr_offset, 1, &proto); @@ -1205,20 +1207,20 @@ static int ipsec_out_ah(odp_packet_t *pkt, ipv4hdr->ttl = 0; hdr_len = IPSEC_PAD_LEN(hdr_len, 4); state->ip_tot_len += hdr_len; - ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len); + ipv4hdr->tot_len = _odp_cpu_to_be_16(state->ip_tot_len); } else { _odp_ipv6hdr_t *ipv6hdr = state->ip; state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow; state->ah_ipv6.hop_limit = ipv6hdr->hop_limit; ipv6hdr->ver_tc_flow = - odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); + _odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT); ipv6hdr->hop_limit = 0; hdr_len = IPSEC_PAD_LEN(hdr_len, 8); state->ip_tot_len += hdr_len; - ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len - - _ODP_IPV6HDR_LEN); + ipv6hdr->payload_len = _odp_cpu_to_be_16(state->ip_tot_len - + _ODP_IPV6HDR_LEN); } ah.ah_len = hdr_len / 4 - 2; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 77765fb8..a4cd05f6 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -12,6 +12,7 @@ #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp/api/byteorder.h> +#include <odp/api/plat/byteorder_inlines.h> #include <protocols/eth.h> #include <protocols/ip.h> @@ -1964,16 +1965,16 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, eth = (const _odp_ethhdr_t *)*parseptr; /* Handle Ethernet broadcast/multicast addresses */ - macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); + macaddr0 = _odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth)); prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100; if (macaddr0 == 0xffff) { macaddr2 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 1)); + _odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 1)); macaddr4 = - odp_be_to_cpu_16(*((const uint16_t *) - (const void *)eth + 2)); + _odp_be_to_cpu_16(*((const uint16_t *) + (const void *)eth + 2)); prs->input_flags.eth_bcast = (macaddr2 == 0xffff) && (macaddr4 == 0xffff); } else { @@ -1981,7 +1982,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, } /* Get Ethertype */ - ethtype = odp_be_to_cpu_16(eth->type); + ethtype = _odp_be_to_cpu_16(eth->type); *offset += sizeof(*eth); *parseptr += sizeof(*eth); @@ -1992,8 +1993,8 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, prs->error_flags.snap_len = 1; return 0; } - ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) - (parseptr + 6))); + ethtype = _odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t) + (parseptr + 6))); *offset += 8; *parseptr += 8; } @@ -2004,7 +2005,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, prs->input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); + ethtype = _odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -2012,7 +2013,7 @@ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, if (ethtype == _ODP_ETHTYPE_VLAN) { prs->input_flags.vlan = 1; vlan = (const _odp_vlanhdr_t *)*parseptr; - ethtype = odp_be_to_cpu_16(vlan->type); + ethtype = _odp_be_to_cpu_16(vlan->type); *offset += sizeof(_odp_vlanhdr_t); *parseptr += sizeof(_odp_vlanhdr_t); } @@ -2030,8 +2031,8 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, uint8_t ver = _ODP_IPV4HDR_VER(ipv4->ver_ihl); uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl); uint16_t frag_offset; - uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr); - uint32_t l3_len = odp_be_to_cpu_16(ipv4->tot_len); + uint32_t dstaddr = _odp_be_to_cpu_32(ipv4->dst_addr); + uint32_t l3_len = _odp_be_to_cpu_16(ipv4->tot_len); if (odp_unlikely(ihl < _ODP_IPV4HDR_IHL_MIN) || odp_unlikely(ver != 4) || @@ -2051,7 +2052,7 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr, * OR * "fragment offset" field is nonzero (all fragments except the first) */ - frag_offset = odp_be_to_cpu_16(ipv4->frag_offset); + frag_offset = _odp_be_to_cpu_16(ipv4->frag_offset); if (odp_unlikely(_ODP_IPV4HDR_IS_FRAGMENT(frag_offset))) prs->input_flags.ipfrag = 1; @@ -2071,12 +2072,12 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, { const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr; const _odp_ipv6hdr_ext_t *ipv6ext; - uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); - uint32_t l3_len = odp_be_to_cpu_16(ipv6->payload_len) + - _ODP_IPV6HDR_LEN; + uint32_t dstaddr0 = _odp_be_to_cpu_32(ipv6->dst_addr.u8[0]); + uint32_t l3_len = _odp_be_to_cpu_16(ipv6->payload_len) + + _ODP_IPV6HDR_LEN; /* Basic sanity checks on IPv6 header */ - if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || + if ((_odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 || l3_len > frame_len - *offset) { prs->error_flags.ip_err = 1; return 0; @@ -2106,7 +2107,7 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr, *offset < seg_len); if (*offset >= prs->l3_offset + - odp_be_to_cpu_16(ipv6->payload_len)) { + _odp_be_to_cpu_16(ipv6->payload_len)) { prs->error_flags.ip_err = 1; return 0; } @@ -2150,12 +2151,12 @@ static inline void parse_udp(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset) { const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr; - uint32_t udplen = odp_be_to_cpu_16(udp->length); + uint32_t udplen = _odp_be_to_cpu_16(udp->length); if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) prs->error_flags.udp_err = 1; - if (odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) == udp->dst_port && + if (_odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) == udp->dst_port && udplen > 4) { uint32_t val; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 556b2a1f..557e77ba 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -27,6 +27,7 @@ #include <protocols/ip.h> #include <odp_traffic_mngr_internal.h> #include <odp/api/plat/packet_inlines.h> +#include <odp/api/plat/byteorder_inlines.h> /* Local vars */ static const @@ -1945,7 +1946,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, vlan_hdr_ptr = &vlan_hdr; } - old_tci = odp_be_to_cpu_16(vlan_hdr_ptr->tci); + old_tci = _odp_be_to_cpu_16(vlan_hdr_ptr->tci); new_tci = old_tci; if (vlan_marking->drop_eligible_enabled) new_tci |= _ODP_VLANHDR_DEI_MASK; @@ -1953,7 +1954,7 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking, if (new_tci == old_tci) return; - vlan_hdr_ptr->tci = odp_cpu_to_be_16(new_tci); + vlan_hdr_ptr->tci = _odp_cpu_to_be_16(new_tci); if (split_hdr) odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN, _ODP_VLANHDR_LEN, &vlan_hdr); @@ -2010,7 +2011,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, * in this specific case the carry out check does NOT need to be * repeated since it can be proven that the carry in sum cannot * cause another carry out. */ - old_chksum = (uint32_t)odp_be_to_cpu_16(ipv4_hdr_ptr->chksum); + old_chksum = (uint32_t)_odp_be_to_cpu_16(ipv4_hdr_ptr->chksum); ones_compl_sum = (~old_chksum) & 0xFFFF; tos_diff = ((uint32_t)new_tos) + ((~(uint32_t)old_tos) & 0xFFFF); ones_compl_sum += tos_diff; @@ -2019,7 +2020,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking, (ones_compl_sum & 0xFFFF); ipv4_hdr_ptr->tos = new_tos; - ipv4_hdr_ptr->chksum = odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); + ipv4_hdr_ptr->chksum = _odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF); if (split_hdr) odp_packet_copy_from_mem(odp_pkt, l3_offset, _ODP_IPV4HDR_LEN, &ipv4_hdr); @@ -2050,7 +2051,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, ipv6_hdr_ptr = &ipv6_hdr; } - old_ver_tc_flow = odp_be_to_cpu_32(ipv6_hdr_ptr->ver_tc_flow); + old_ver_tc_flow = _odp_be_to_cpu_32(ipv6_hdr_ptr->ver_tc_flow); old_tc = (old_ver_tc_flow & _ODP_IPV6HDR_TC_MASK) >> _ODP_IPV6HDR_TC_SHIFT; new_tc = old_tc; @@ -2071,7 +2072,7 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking, new_ver_tc_flow = (old_ver_tc_flow & ~_ODP_IPV6HDR_TC_MASK) | (new_tc << _ODP_IPV6HDR_TC_SHIFT); - ipv6_hdr_ptr->ver_tc_flow = odp_cpu_to_be_32(new_ver_tc_flow); + ipv6_hdr_ptr->ver_tc_flow = _odp_cpu_to_be_32(new_ver_tc_flow); if (split_hdr) odp_packet_copy_from_mem(odp_pkt, l3_offset, commit a001621520f769f835ce963d1e7ef8c1af74ad66 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 19 16:33:11 2018 +0200 linux-gen: byteorder: internal inline functions Define inline functions for internal use. Implementation uses always internally inlined version. Application uses inlined version only in non ABI compatible mode. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-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/Makefile.am b/platform/linux-generic/Makefile.am index 9b7ee37e..8585080d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -24,6 +24,7 @@ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/byteorder_inlines.h \ + include/odp/api/plat/byteorder_inlines_api.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inline_types.h \ 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 da07c0eb..ee03a17b 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/byteorder.h +++ b/platform/linux-generic/include-abi/odp/api/abi/byteorder.h @@ -77,6 +77,7 @@ typedef uint32_t __odp_bitwise odp_u32sum_t; #define _ODP_INLINE static inline #include <odp/api/plat/byteorder_inlines.h> +#include <odp/api/plat/byteorder_inlines_api.h> /** * @} 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 2f96863b..b559d4f0 100644 --- a/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines.h @@ -43,7 +43,7 @@ extern "C" { #define __odp_builtin_bswap16(u16) __builtin_bswap16(u16) #endif -_ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) +static inline uint16_t _odp_be_to_cpu_16(odp_u16be_t be16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __odp_builtin_bswap16((__odp_force uint16_t)be16); @@ -52,7 +52,7 @@ _ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) #endif } -_ODP_INLINE uint32_t odp_be_to_cpu_32(odp_u32be_t be32) +static inline uint32_t _odp_be_to_cpu_32(odp_u32be_t be32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __builtin_bswap32((__odp_force uint32_t)be32); @@ -61,7 +61,7 @@ _ODP_INLINE uint32_t odp_be_to_cpu_32(odp_u32be_t be32) #endif } -_ODP_INLINE uint64_t odp_be_to_cpu_64(odp_u64be_t be64) +static inline uint64_t _odp_be_to_cpu_64(odp_u64be_t be64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return __builtin_bswap64((__odp_force uint64_t)be64); @@ -70,7 +70,7 @@ _ODP_INLINE uint64_t odp_be_to_cpu_64(odp_u64be_t be64) #endif } -_ODP_INLINE odp_u16be_t odp_cpu_to_be_16(uint16_t cpu16) +static inline odp_u16be_t _odp_cpu_to_be_16(uint16_t cpu16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u16be_t)__odp_builtin_bswap16(cpu16); @@ -79,7 +79,7 @@ _ODP_INLINE odp_u16be_t odp_cpu_to_be_16(uint16_t cpu16) #endif } -_ODP_INLINE odp_u32be_t odp_cpu_to_be_32(uint32_t cpu32) +static inline odp_u32be_t _odp_cpu_to_be_32(uint32_t cpu32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u32be_t)__builtin_bswap32(cpu32); @@ -88,7 +88,7 @@ _ODP_INLINE odp_u32be_t odp_cpu_to_be_32(uint32_t cpu32) #endif } -_ODP_INLINE odp_u64be_t odp_cpu_to_be_64(uint64_t cpu64) +static inline odp_u64be_t _odp_cpu_to_be_64(uint64_t cpu64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u64be_t)__builtin_bswap64(cpu64); @@ -97,7 +97,7 @@ _ODP_INLINE odp_u64be_t odp_cpu_to_be_64(uint64_t cpu64) #endif } -_ODP_INLINE uint16_t odp_le_to_cpu_16(odp_u16le_t le16) +static inline uint16_t _odp_le_to_cpu_16(odp_u16le_t le16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint16_t)le16; @@ -106,7 +106,7 @@ _ODP_INLINE uint16_t odp_le_to_cpu_16(odp_u16le_t le16) #endif } -_ODP_INLINE uint32_t odp_le_to_cpu_32(odp_u32le_t le32) +static inline uint32_t _odp_le_to_cpu_32(odp_u32le_t le32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint32_t)le32; @@ -115,7 +115,7 @@ _ODP_INLINE uint32_t odp_le_to_cpu_32(odp_u32le_t le32) #endif } -_ODP_INLINE uint64_t odp_le_to_cpu_64(odp_u64le_t le64) +static inline uint64_t _odp_le_to_cpu_64(odp_u64le_t le64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force uint64_t)le64; @@ -124,7 +124,7 @@ _ODP_INLINE uint64_t odp_le_to_cpu_64(odp_u64le_t le64) #endif } -_ODP_INLINE odp_u16le_t odp_cpu_to_le_16(uint16_t cpu16) +static inline odp_u16le_t _odp_cpu_to_le_16(uint16_t cpu16) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u16le_t)cpu16; @@ -133,7 +133,7 @@ _ODP_INLINE odp_u16le_t odp_cpu_to_le_16(uint16_t cpu16) #endif } -_ODP_INLINE odp_u32le_t odp_cpu_to_le_32(uint32_t cpu32) +static inline odp_u32le_t _odp_cpu_to_le_32(uint32_t cpu32) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u32le_t)cpu32; @@ -142,7 +142,7 @@ _ODP_INLINE odp_u32le_t odp_cpu_to_le_32(uint32_t cpu32) #endif } -_ODP_INLINE odp_u64le_t odp_cpu_to_le_64(uint64_t cpu64) +static inline odp_u64le_t _odp_cpu_to_le_64(uint64_t cpu64) { #if ODP_BYTE_ORDER == ODP_LITTLE_ENDIAN return (__odp_force odp_u64le_t)cpu64; 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 new file mode 100644 index 00000000..ef81d74d --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h @@ -0,0 +1,88 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP byteorder + */ + +#ifndef ODP_PLAT_BYTEORDER_INLINES_API_H_ +#define ODP_PLAT_BYTEORDER_INLINES_API_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +_ODP_INLINE uint16_t odp_be_to_cpu_16(odp_u16be_t be16) +{ + return _odp_be_to_cpu_16(be16); +} + +_ODP_INLINE uint32_t odp_be_to_cpu_32(odp_u32be_t be32) +{ + return _odp_be_to_cpu_32(be32); +} + +_ODP_INLINE uint64_t odp_be_to_cpu_64(odp_u64be_t be64) +{ + return _odp_be_to_cpu_64(be64); +} + +_ODP_INLINE odp_u16be_t odp_cpu_to_be_16(uint16_t cpu16) +{ + return _odp_cpu_to_be_16(cpu16); +} + +_ODP_INLINE odp_u32be_t odp_cpu_to_be_32(uint32_t cpu32) +{ + return _odp_cpu_to_be_32(cpu32); +} + +_ODP_INLINE odp_u64be_t odp_cpu_to_be_64(uint64_t cpu64) +{ + return _odp_cpu_to_be_64(cpu64); +} + +_ODP_INLINE uint16_t odp_le_to_cpu_16(odp_u16le_t le16) +{ + return _odp_le_to_cpu_16(le16); +} + +_ODP_INLINE uint32_t odp_le_to_cpu_32(odp_u32le_t le32) +{ + return _odp_le_to_cpu_32(le32); +} + +_ODP_INLINE uint64_t odp_le_to_cpu_64(odp_u64le_t le64) +{ + return _odp_le_to_cpu_64(le64); +} + +_ODP_INLINE odp_u16le_t odp_cpu_to_le_16(uint16_t cpu16) +{ + return _odp_cpu_to_le_16(cpu16); +} + +_ODP_INLINE odp_u32le_t odp_cpu_to_le_32(uint32_t cpu32) +{ + return _odp_cpu_to_le_32(cpu32); +} + +_ODP_INLINE odp_u64le_t odp_cpu_to_le_64(uint64_t cpu64) +{ + return _odp_cpu_to_le_64(cpu64); +} + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/odp_byteorder.c b/platform/linux-generic/odp_byteorder.c index ff0b74b2..9cfb05d3 100644 --- a/platform/linux-generic/odp_byteorder.c +++ b/platform/linux-generic/odp_byteorder.c @@ -11,3 +11,4 @@ /* Include non-inlined versions of API functions */ #define _ODP_INLINE #include <odp/api/plat/byteorder_inlines.h> +#include <odp/api/plat/byteorder_inlines_api.h> commit 33afa2d1d4f6df342214dd9d9e4aab4433da3d7d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 19 16:00:39 2018 +0200 linux-gen: remove static_inline header This header file is not referenced anywhere. Remove it. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-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/include/odp/api/plat/static_inline.h b/platform/linux-generic/include/odp/api/plat/static_inline.h deleted file mode 100644 index 633e2f27..00000000 --- a/platform/linux-generic/include/odp/api/plat/static_inline.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * Macro for static inline functions - */ - -#ifndef ODP_PLAT_STATIC_INLINE_H_ -#define ODP_PLAT_STATIC_INLINE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @internal - * @def ODP_ABI_COMPAT - * Control ABI compatibility - */ - -/** - * @internal - * @def _ODP_INLINE - * Define a function as inlined or not inlined (for ABI compatibility) - */ -#if 1 -#define ODP_ABI_COMPAT 1 -#define _ODP_INLINE -#else -#define ODP_ABI_COMPAT 0 -#define _ODP_INLINE static inline -#endif - -#ifdef __cplusplus -} -#endif - -#endif commit 29e5037571610ee49830dd64a43a47a8ccbadb87 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jan 1 23:39:28 2018 +0300 travis: run tests with dynamically-linked tests Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index b614668c..14bc1b14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ env: - CONF="--enable-schedule-iquery" - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" + - CONF="--disable-static-applications" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" commit 988ae5930a9db1ceb88e46a84a116e67b0108307 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Dec 31 04:11:34 2017 +0300 build: provide an option to link examples dynamically Distributions won't like statically-linked binaries. Provide configure switch to link examples and tests dynamically. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 0c8799f1..56a422b4 100644 --- a/configure.ac +++ b/configure.ac @@ -182,6 +182,16 @@ AS_IF([test "${with_platform}" = "linux-generic"], AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], [Define to the name of the implementation]) +########################################################################## +# Build examples/tests dynamically +########################################################################## +AC_ARG_ENABLE([static-applications], + [AS_HELP_STRING([--disable-static-applications], + [disable static linking of examples and tests] + [ with ODP])], [], + [enable_static_applications=yes]) +AM_CONDITIONAL([STATIC_APPS], [test "x$enable_static_applications" != "xno"]) + ########################################################################## # Include m4 files ########################################################################## @@ -393,6 +403,7 @@ AC_MSG_RESULT([ Deprecated APIs: ${deprecated} debug: ${enable_debug} cunit: ${cunit_support} + static tests linkage: ${enable_static_applications} test_vald: ${test_vald} test_perf: ${test_perf} test_perf_proc: ${test_perf_proc} diff --git a/example/Makefile.inc b/example/Makefile.inc index 4a15ee7e..3c8060da 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -2,11 +2,21 @@ include $(top_srcdir)/Makefile.inc TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_LIBS_LT) +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la + +# Do not link to DPDK twice in case of dynamic linking with ODP +if STATIC_APPS +LDADD += $(DPDK_LIBS_LT) +endif + AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ $(ODP_INCLUDES) \ $(HELPER_INCLUDES) +if STATIC_APPS AM_LDFLAGS = -L$(LIB) -static +else +AM_LDFLAGS = +endif diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 97784a02..99934099 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -6,8 +6,7 @@ SUBDIRS = performance if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ - validation/api/shmem/shmem_linux$(EXEEXT) \ - ring/ring_main$(EXEEXT) + validation/api/shmem/shmem_linux$(EXEEXT) SUBDIRS += validation/api/pktio\ validation/api/shmem\ diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index edaf4510..3f774342 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -1,3 +1,7 @@ +# ring test uses internal symbols from libodp-linux which are not available +# when linking test with libodp-linux.so +if STATIC_APPS + include $(top_srcdir)/test/Makefile.inc test_PROGRAMS = ring_main @@ -6,7 +10,27 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c +TESTS = ring_main$(EXEEXT) + PRELDADD += $(LIBCUNIT_COMMON) -AM_CPPFLAGS += \ - -I$(top_srcdir)/platform/linux-generic/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/linux-generic/include + +TESTNAME = linux-generic-ring + +TESTENV = tests-$(TESTNAME).env + +test_DATA = $(TESTENV) + +DISTCLEANFILES = $(TESTENV) +.PHONY: $(TESTENV) +$(TESTENV): + echo "TESTS=\"$(TESTS)\"" > $@ + echo "$(TESTS_ENVIRONMENT)" >> $@ + echo "$(LOG_COMPILER)" >> $@ + +if test_installdir +installcheck-local: + $(DESTDIR)/$(testdir)/run-test.sh $(TESTNAME) +endif +endif diff --git a/test/Makefile.inc b/test/Makefile.inc index 83004f0c..55a493a8 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -11,16 +11,26 @@ LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRELDADD before the inclusion. -LDADD = $(PRELDADD) $(LIBODP) $(DPDK_LIBS_LT) +LDADD = $(PRELDADD) $(LIBODP) PRELDADD = AM_CPPFLAGS = \ $(ODP_INCLUDES) \ $(HELPER_INCLUDES) \ -I$(top_srcdir)/test/common + +# Do not link to DPDK twice in case of dynamic linking with ODP +if STATIC_APPS +LDADD += $(DPDK_LIBS_LT) +endif + AM_CFLAGS = $(CUNIT_CFLAGS) +if STATIC_APPS AM_LDFLAGS = -L$(LIB) -static +else +AM_LDFLAGS = +endif @VALGRIND_CHECK_RULES@ ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 + configure.ac | 11 +++ example/Makefile.inc | 12 ++- platform/linux-generic/Makefile.am | 1 + .../include-abi/odp/api/abi/byteorder.h | 1 + .../include/odp/api/plat/byteorder_inlines.h | 24 +++--- .../include/odp/api/plat/byteorder_inlines_api.h | 88 ++++++++++++++++++++++ .../include/odp/api/plat/static_inline.h | 43 ----------- .../include/odp_classification_inlines.h | 30 ++++---- platform/linux-generic/include/protocols/thash.h | 8 +- platform/linux-generic/odp_byteorder.c | 1 + platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_ipsec.c | 66 ++++++++-------- platform/linux-generic/odp_packet.c | 41 +++++----- platform/linux-generic/odp_traffic_mngr.c | 13 ++-- platform/linux-generic/test/Makefile.am | 3 +- platform/linux-generic/test/ring/Makefile.am | 28 ++++++- test/Makefile.inc | 12 ++- 18 files changed, 247 insertions(+), 138 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h delete mode 100644 platform/linux-generic/include/odp/api/plat/static_inline.h hooks/post-receive --

7 years, 5 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-107-gf925f103

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 f925f103c90591776f73863d30159357b08bf71e (commit) via 5a4502fc6bc53e6503169da3028f456b64811a0b (commit) via ccb6eb85729ad0657b5c852cb2a6ddb519d60898 (commit) via f3b6be23045a924b8d8034a9a490b4fe5928684e (commit) via d4ad3409a51f94df403e0ae27e25baab2b0a1bf4 (commit) via 2bbecec83bc1d8ca1b45f98214d2dbbe13950e25 (commit) via db250be8b7363b24708ebc9476aa26fe1754d3c0 (commit) via 39730f7e46405a44abee01532547fed530c6f906 (commit) via 2c92ee7ef4198ba7b7ab67cf079c2262e70414d2 (commit) via d35f27a2c613e5fa66a6d854b662b435f0e4f402 (commit) via db2587a9a5ade3e9ad3f4e3355db2d4639e100b0 (commit) via 0f628d448a0055cfff6ea759790c60520bbff6b8 (commit) via 42e8e9ac8bf029fb94c4b0d79dba115ba7450958 (commit) via 8d3786410c269d5e9838bacb9dd0a4b0524824ef (commit) via be3696f3617fb05bf55347a724e422814b1be19b (commit) via e3f0ac3bb039d95af55176828539ebfd2697f932 (commit) via ffee6ee63f437bab54151da5f31d54385c3247af (commit) via 22e7c58bf12540c95168f079f6b39375c96f6e94 (commit) via aa698a07e99416663b9b829926efefde1c4e0abb (commit) via 34ba6c32491c9b18f78f49855d76c5e60555dd6e (commit) via 0c8009e48f6bcb254ba06a85e9226d1a0459a36e (commit) via d70c5f1ce3e98c3a7409312ccfdc3ce0087a2d49 (commit) via 47932d20fdf72f73e5de4961569fda760200edc6 (commit) via 585af294de9194f2e5e0bd53b4d5e12eba8ba1ba (commit) via 9fd7bf5ec2096b65248d9be983130396de1c32eb (commit) via 539b6fb552d171d202880c3f5ee6e7ca509db98a (commit) via faa8498d122fcce6321140d9f1c062ebc2bc3d79 (commit) via 94bcafaaccc3aba545cc112da8ff9fd828a25a98 (commit) via 84d5cf917d301d91246f013c3e51da35fa26b903 (commit) via 0689cde60fa90e5ddd24d07fec08ea95251d6db5 (commit) via a8ce5f13b5cbf1583fef04d687cef94d18357520 (commit) via e93535eed4262b76597c193a169fbc94fd91bb25 (commit) via b4b6cdaa390cef0e5a42e6c8fc0f605d7879bee5 (commit) via 96ad2312bfc2d1d0d1d23e61113da55d31b7fbc1 (commit) via 55f928652f0b6accc8ba82fc68eeaebb2fd1426d (commit) via 3c5a55ba323f36a255615983afdb21b17f8b1597 (commit) via 3dc3b1fbfb71b0c81e6ce047f48f51d4e13e81dc (commit) via 4cbcb2d11673fdde483753db67343018aa09e3ad (commit) via 14156f2feae2aa5a2835cf6ff0a3b4a2d7dae4df (commit) via 5399f2f78624599910c574e3c7247378118a8af4 (commit) via cd2dfa966f8c08c99feda2d0622ecc27c0361245 (commit) via f831c691a20ca2d0ffbbf707f43eee7600bca6b6 (commit) via e1883c9e050a5cc3ad838c02f943113f3b1e2383 (commit) via 627c9f51e2de51c3bb20f59161ac8ea1b6c2703f (commit) via edf998617f1744a9a92ed0ebb4905149f5731ed5 (commit) via bece10957f7d85107a71662e308dba8fc1d6c578 (commit) via 08d0c1658cd13bb174cc9c01f132bc98d004efa7 (commit) via 60feb6af342d581f798308563b975974986d9a3c (commit) via 503bc79ee960ea4caa72d639cbc5a42c7524a790 (commit) via cfeb9fa2519ede1f34e3a814079a62095f23e64e (commit) via bd9ab1c7a6ba3ecf4532e36b7d431a6c2df2c72b (commit) via 4d2c80472c0623b406f25c07fcca42849f41d847 (commit) via 3d10b69994b9a4629ae5858c4f13b8fc73137fc3 (commit) via 96874082fe02560068588af59817fa2152982638 (commit) via ad317cdf97c0f19d27bca380d06617937a0e548d (commit) via 7f1ea3704569c50a48f1029c0bd8f3f0bf84f43e (commit) via c99bed8f3a710d25d824cdcb1d109f974650906d (commit) via cd46d6263073efb18c69a621d9cc6c50da76359d (commit) via 3768a6331899a4b17dcd89ec82b0295fb1ef667a (commit) via 6a7c5313178504d4c0d211de231c52b795e26c5f (commit) via c9528e9576a391ee865f7efb3df5fb9a69602c40 (commit) via 77ff03881d844a9d6a4bc773086bd8aaecace541 (commit) via 53b114eac3815099760186f90b64a201d7fac69b (commit) via 1bb6291e4e9050d476fefb02f11024898847e2b7 (commit) via 5e064cd9fa626b8fe7cc6d695b5bbf5065e0e54e (commit) via e3cef11dd0161d49dddc09d8e6263722825953f7 (commit) via 520c170d758f2d37554631bf1467ec50e027cd3e (commit) via f73cd6de167b16bae0256fee65c77d11ee18699e (commit) via 1e2435a49ca5380143546f33aebc32e0b935bc54 (commit) via 2237981c5e20dd4efb2e181ad59785e6f9f099bb (commit) from 04c5bbe3d84aa46bd504e647e82a06cb00fe4555 (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 f925f103c90591776f73863d30159357b08bf71e Merge: 04c5bbe3 5a4502fc Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jan 19 19:08:29 2018 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc include/odp/api/abi-default/align.h index 2c1a2208,7a95078f..3fc29b25 --- a/include/odp/api/abi-default/align.h +++ b/include/odp/api/abi-default/align.h @@@ -1,7 -1,7 +1,7 @@@ -/* Copyright (c) 2015, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited * All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-3-Clause */ /** diff --cc test/validation/api/crypto/odp_crypto_test_inp.c index 3ea871d8,ad9784a6..1d92c656 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@@ -1,1359 -1,1244 +1,1296 @@@ - /* Copyright (c) 2014-2018, Linaro Limited -/* Copyright (c) 2014, Linaro Limited -- * All rights reserved. -- * -- * SPDX-License-Identifier: BSD-3-Clause -- */ -- --#include "config.h" -- --#include <odp_api.h> --#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 -- --struct suite_context_s { -- odp_bool_t packet; -- odp_crypto_op_mode_t op_mode; -- odp_crypto_op_mode_t pref_mode; -- odp_pool_t pool; -- odp_queue_t queue; --}; -- --static struct suite_context_s suite_context; -- --static int packet_cmp_mem(odp_packet_t pkt, uint32_t offset, -- void *s, uint32_t len) --{ -- uint8_t buf[len]; -- -- odp_packet_copy_to_mem(pkt, offset, len, buf); -- -- return memcmp(buf, s, len); --} -- --static const char *auth_alg_name(odp_auth_alg_t auth) --{ -- switch (auth) { -- case ODP_AUTH_ALG_NULL: -- return "ODP_AUTH_ALG_NULL"; -- case ODP_AUTH_ALG_MD5_HMAC: -- return "ODP_AUTH_ALG_MD5_HMAC"; -- case ODP_AUTH_ALG_SHA1_HMAC: -- return "ODP_AUTH_ALG_SHA1_HMAC"; -- case ODP_AUTH_ALG_SHA256_HMAC: -- return "ODP_AUTH_ALG_SHA256_HMAC"; -- case ODP_AUTH_ALG_SHA512_HMAC: -- return "ODP_AUTH_ALG_SHA512_HMAC"; -- case ODP_AUTH_ALG_AES_GCM: -- return "ODP_AUTH_ALG_AES_GCM"; -- case ODP_AUTH_ALG_AES_GMAC: -- return "ODP_AUTH_ALG_AES_GMAC"; -- default: -- return "Unknown"; -- } --} -- --static const char *cipher_alg_name(odp_cipher_alg_t cipher) --{ -- switch (cipher) { -- case ODP_CIPHER_ALG_NULL: -- return "ODP_CIPHER_ALG_NULL"; -- case ODP_CIPHER_ALG_DES: -- return "ODP_CIPHER_ALG_DES"; -- case ODP_CIPHER_ALG_3DES_CBC: -- return "ODP_CIPHER_ALG_3DES_CBC"; -- case ODP_CIPHER_ALG_AES_CBC: -- return "ODP_CIPHER_ALG_AES_CBC"; -- case ODP_CIPHER_ALG_AES_GCM: -- return "ODP_CIPHER_ALG_AES_GCM"; -- default: -- return "Unknown"; -- } --} -- --static int alg_op(odp_packet_t pkt, -- odp_bool_t *ok, -- odp_crypto_session_t session, - uint8_t *cipher_iv_ptr, - uint8_t *auth_iv_ptr, - uint8_t *op_iv_ptr, -- odp_packet_data_range_t *cipher_range, -- odp_packet_data_range_t *auth_range, -- uint8_t *aad, -- unsigned int plaintext_len) --{ -- int rc; -- odp_crypto_op_result_t result; -- odp_crypto_op_param_t op_params; -- odp_bool_t posted; -- odp_event_subtype_t subtype; -- -- /* Prepare input/output params */ -- memset(&op_params, 0, sizeof(op_params)); -- op_params.session = session; -- op_params.pkt = pkt; -- op_params.out_pkt = pkt; -- op_params.ctx = (void *)0xdeadbeef; -- -- op_params.cipher_range = *cipher_range; -- op_params.auth_range = *auth_range; - if (cipher_iv_ptr) - op_params.cipher_iv_ptr = cipher_iv_ptr; - if (auth_iv_ptr) - op_params.auth_iv_ptr = auth_iv_ptr; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; -- -- op_params.aad_ptr = aad; -- -- op_params.hash_result_offset = plaintext_len; -- -- rc = odp_crypto_operation(&op_params, &posted, &result); -- if (rc < 0) { -- CU_FAIL("Failed odp_crypto_operation()"); -- return rc; -- } -- -- if (posted) { -- odp_event_t event; -- odp_crypto_compl_t compl_event; -- -- /* Poll completion queue for results */ -- do { -- event = odp_queue_deq(suite_context.queue); -- } while (event == ODP_EVENT_INVALID); -- -- CU_ASSERT(ODP_EVENT_CRYPTO_COMPL == odp_event_type(event)); -- CU_ASSERT(ODP_EVENT_NO_SUBTYPE == odp_event_subtype(event)); -- CU_ASSERT(ODP_EVENT_CRYPTO_COMPL == -- odp_event_types(event, &subtype)); -- CU_ASSERT(ODP_EVENT_NO_SUBTYPE == subtype); -- -- compl_event = odp_crypto_compl_from_event(event); -- CU_ASSERT(odp_crypto_compl_to_u64(compl_event) == -- odp_crypto_compl_to_u64( -- odp_crypto_compl_from_event(event))); -- odp_crypto_compl_result(compl_event, &result); -- odp_crypto_compl_free(compl_event); -- } -- -- CU_ASSERT(result.pkt == pkt); -- CU_ASSERT(result.ctx == (void *)0xdeadbeef); -- CU_ASSERT(ODP_EVENT_PACKET == -- odp_event_type(odp_packet_to_event(result.pkt))); -- CU_ASSERT(ODP_EVENT_PACKET_BASIC == -- odp_event_subtype(odp_packet_to_event(result.pkt))); -- CU_ASSERT(ODP_EVENT_PACKET == -- odp_event_types(odp_packet_to_event(result.pkt), &subtype)); -- CU_ASSERT(ODP_EVENT_PACKET_BASIC == subtype); -- -- *ok = result.ok; -- -- return 0; --} -- --static int alg_packet_op(odp_packet_t pkt, -- odp_bool_t *ok, -- odp_crypto_session_t session, - uint8_t *cipher_iv_ptr, - uint8_t *auth_iv_ptr, - uint8_t *op_iv_ptr, -- odp_packet_data_range_t *cipher_range, -- odp_packet_data_range_t *auth_range, -- uint8_t *aad, -- unsigned int plaintext_len) --{ -- int rc; -- odp_crypto_packet_result_t result; -- odp_crypto_packet_op_param_t op_params; -- odp_event_subtype_t subtype; -- odp_packet_t out_pkt = pkt; -- -- /* Prepare input/output params */ -- memset(&op_params, 0, sizeof(op_params)); -- op_params.session = session; -- -- op_params.cipher_range = *cipher_range; -- op_params.auth_range = *auth_range; - if (cipher_iv_ptr) - op_params.cipher_iv_ptr = cipher_iv_ptr; - if (auth_iv_ptr) - op_params.auth_iv_ptr = auth_iv_ptr; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; -- -- op_params.aad_ptr = aad; -- -- op_params.hash_result_offset = plaintext_len; -- -- rc = odp_crypto_op(&pkt, &out_pkt, &op_params, 1); -- if (rc < 0) { -- CU_FAIL("Failed odp_crypto_packet_op()"); -- return rc; -- } -- -- CU_ASSERT(out_pkt == pkt); -- CU_ASSERT(ODP_EVENT_PACKET == -- odp_event_type(odp_packet_to_event(pkt))); -- CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == -- odp_event_subtype(odp_packet_to_event(pkt))); -- CU_ASSERT(ODP_EVENT_PACKET == -- odp_event_types(odp_packet_to_event(pkt), &subtype)); -- CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); -- -- rc = odp_crypto_result(&result, pkt); -- if (rc < 0) { -- CU_FAIL("Failed odp_crypto_packet_result()"); -- return rc; -- } -- -- if (!result.ok) -- CU_ASSERT(odp_packet_has_error(pkt)); -- -- *ok = result.ok; -- -- return 0; --} -- --static int alg_packet_op_enq(odp_packet_t pkt, -- odp_bool_t *ok, -- odp_crypto_session_t session, - uint8_t *cipher_iv_ptr, - uint8_t *auth_iv_ptr, - uint8_t *op_iv_ptr, -- odp_packet_data_range_t *cipher_range, -- odp_packet_data_range_t *auth_range, -- uint8_t *aad, -- unsigned int plaintext_len) --{ -- int rc; -- odp_event_t event; -- odp_crypto_packet_result_t result; -- odp_crypto_packet_op_param_t op_params; -- odp_event_subtype_t subtype; -- odp_packet_t out_pkt = pkt; -- -- /* Prepare input/output params */ -- memset(&op_params, 0, sizeof(op_params)); -- op_params.session = session; -- -- op_params.cipher_range = *cipher_range; -- op_params.auth_range = *auth_range; - if (cipher_iv_ptr) - op_params.cipher_iv_ptr = cipher_iv_ptr; - if (auth_iv_ptr) - op_params.auth_iv_ptr = auth_iv_ptr; - if (op_iv_ptr) - op_params.override_iv_ptr = op_iv_ptr; -- -- op_params.aad_ptr = aad; -- -- op_params.hash_result_offset = plaintext_len; -- -- rc = odp_crypto_op_enq(&pkt, &pkt, &op_params, 1); -- if (rc < 0) { -- CU_FAIL("Failed odp_crypto_op_enq()"); -- return rc; -- } -- -- /* Poll completion queue for results */ -- do { -- event = odp_queue_deq(suite_context.queue); -- } while (event == ODP_EVENT_INVALID); -- -- CU_ASSERT(ODP_EVENT_PACKET == odp_event_type(event)); -- CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == odp_event_subtype(event)); -- CU_ASSERT(ODP_EVENT_PACKET == odp_event_types(event, &subtype)); -- CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); -- -- pkt = odp_crypto_packet_from_event(event); -- -- CU_ASSERT(out_pkt == pkt); -- CU_ASSERT(ODP_EVENT_PACKET == -- odp_event_type(odp_packet_to_event(pkt))); -- CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == -- odp_event_subtype(odp_packet_to_event(pkt))); -- CU_ASSERT(ODP_EVENT_PACKET == -- odp_event_types(odp_packet_to_event(pkt), &subtype)); -- CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); -- -- rc = odp_crypto_result(&result, pkt); -- if (rc < 0) { -- CU_FAIL("Failed odp_crypto_packet_result()"); -- return rc; -- } -- -- CU_ASSERT((!odp_packet_has_error(pkt)) == result.ok); -- -- *ok = result.ok; -- -- return 0; --} -- --typedef enum crypto_test { -- NORMAL_TEST = 0, /**< Plain execution */ -- REPEAT_TEST, /**< Rerun without reinitializing the session */ -- WRONG_DIGEST_TEST, /**< Check against wrong digest */ -- MAX_TEST, /**< Final mark */ --} crypto_test; -- --/* Basic algorithm run function for async inplace mode. -- * Creates a session from input parameters and runs one operation -- * on input_vec. Checks the output of the crypto operation against -- * output_vec. Operation completion event is dequeued polling the -- * session output queue. Completion context pointer is retrieved -- * and checked against the one set before the operation. -- * Completion event can be a separate buffer or the input packet -- * buffer can be used. -- * */ --static void alg_test(odp_crypto_op_t op, -- odp_cipher_alg_t cipher_alg, -- odp_auth_alg_t auth_alg, -- crypto_test_reference_t *ref, -- odp_bool_t ovr_iv) --{ -- odp_crypto_session_t session; - odp_crypto_capability_t capa; -- int rc; -- odp_crypto_ses_create_err_t status; -- odp_bool_t ok = false; -- int iteration; -- odp_crypto_session_param_t ses_params; - odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; - odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; -- odp_packet_data_range_t cipher_range; -- odp_packet_data_range_t auth_range; -- odp_crypto_key_t cipher_key = { -- .data = ref->cipher_key, -- .length = ref->cipher_key_length -- }; -- odp_crypto_key_t auth_key = { -- .data = ref->auth_key, -- .length = ref->auth_key_length - }; - odp_crypto_iv_t cipher_iv = { - .data = ovr_iv ? NULL : ref->cipher_iv, - .length = ref->cipher_iv_length -- }; - odp_crypto_iv_t auth_iv = { - .data = ovr_iv ? NULL : ref->auth_iv, - .length = ref->auth_iv_length - odp_crypto_iv_t iv = { - .data = ovr_iv ? NULL : ref->iv, - .length = ref->iv_length -- }; - int num, i; - int found; - - rc = odp_crypto_capability(&capa); - CU_ASSERT(!rc); - - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capa.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capa.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && - !(capa.ciphers.bit.aes_ctr)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capa.ciphers.bit.aes_gcm)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_DES && - !(capa.ciphers.bit.des)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_NULL && - !(capa.ciphers.bit.null)) - rc = -1; - - CU_ASSERT(!rc); - CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); - - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capa.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_AES_GMAC && - !(capa.auths.bit.aes_gmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && - !(capa.auths.bit.md5_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capa.auths.bit.null)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA1_HMAC && - !(capa.auths.bit.sha1_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && - !(capa.auths.bit.sha256_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA512_HMAC && - !(capa.auths.bit.sha512_hmac)) - rc = -1; - - CU_ASSERT(!rc); - CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); - - num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, - MAX_ALG_CAPA); - - CU_ASSERT(num > 0); - found = 0; - - CU_ASSERT(num <= MAX_ALG_CAPA); - - if (num > MAX_ALG_CAPA) - num = MAX_ALG_CAPA; - - /* Search for the test case */ - for (i = 0; i < num; i++) { - if (cipher_capa[i].key_len == cipher_key.length && - cipher_capa[i].iv_len == cipher_iv.length) { - found = 1; - break; - } - } - - if (!found) { - printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " - "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher_alg), - cipher_key.length, cipher_iv.length); - return; - } - - num = odp_crypto_auth_capability(auth_alg, auth_capa, MAX_ALG_CAPA); - - CU_ASSERT(num > 0); - found = 0; - - CU_ASSERT(num <= MAX_ALG_CAPA); - - if (num > MAX_ALG_CAPA) - num = MAX_ALG_CAPA; - - /* Search for the test case */ - for (i = 0; i < num; i++) { - if (auth_capa[i].digest_len == ref->digest_length && - auth_capa[i].iv_len == auth_iv.length && - auth_capa[i].key_len == auth_key.length) { - found = 1; - break; - } - } - - if (!found) { - printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " - "digest_len=%" PRIu32 ", iv_len=%" PRIu32 "\n", - auth_alg_name(auth_alg), auth_key.length, - ref->digest_length, auth_iv.length); - return; - } -- -- /* Create a crypto session */ -- odp_crypto_session_param_init(&ses_params); -- ses_params.op = op; -- ses_params.auth_cipher_text = false; -- ses_params.op_mode = suite_context.op_mode; -- ses_params.pref_mode = suite_context.pref_mode; -- ses_params.cipher_alg = cipher_alg; -- ses_params.auth_alg = auth_alg; -- ses_params.compl_queue = suite_context.queue; -- ses_params.output_pool = suite_context.pool; -- ses_params.cipher_key = cipher_key; - ses_params.cipher_iv = cipher_iv; - ses_params.auth_iv = auth_iv; - ses_params.iv = iv; -- ses_params.auth_key = auth_key; -- ses_params.auth_digest_len = ref->digest_length; -- ses_params.auth_aad_len = ref->aad_length; -- -- rc = odp_crypto_session_create(&ses_params, &session, &status); -- CU_ASSERT_FATAL(!rc); -- CU_ASSERT(status == ODP_CRYPTO_SES_CREATE_ERR_NONE); -- CU_ASSERT(odp_crypto_session_to_u64(session) != -- odp_crypto_session_to_u64(ODP_CRYPTO_SESSION_INVALID)); -- -- cipher_range.offset = 0; -- cipher_range.length = ref->length; -- auth_range.offset = 0; -- auth_range.length = ref->length; -- -- /* Prepare input data */ -- odp_packet_t pkt = odp_packet_alloc(suite_context.pool, -- ref->length + ref->digest_length); -- CU_ASSERT(pkt != ODP_PACKET_INVALID); -- if (pkt == ODP_PACKET_INVALID) -- goto cleanup; -- -- for (iteration = NORMAL_TEST; iteration < MAX_TEST; iteration++) { -- /* checking against wrong digest is meaningless for NULL digest -- * or when generating digest */ -- if (iteration == WRONG_DIGEST_TEST && -- (auth_alg == ODP_AUTH_ALG_NULL || -- op == ODP_CRYPTO_OP_ENCODE)) -- continue; -- -- if (op == ODP_CRYPTO_OP_ENCODE) { -- odp_packet_copy_from_mem(pkt, 0, ref->length, -- ref->plaintext); -- } else { -- odp_packet_copy_from_mem(pkt, 0, ref->length, -- ref->ciphertext); -- odp_packet_copy_from_mem(pkt, ref->length, -- ref->digest_length, -- ref->digest); -- if (iteration == WRONG_DIGEST_TEST) { -- uint8_t byte = ~ref->digest[0]; -- -- odp_packet_copy_from_mem(pkt, ref->length, -- 1, &byte); -- } -- } -- -- if (!suite_context.packet) -- rc = alg_op(pkt, &ok, session, - ovr_iv ? ref->cipher_iv : NULL, - ovr_iv ? ref->auth_iv : NULL, - ovr_iv ? ref->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->cipher_iv : NULL, - ovr_iv ? ref->auth_iv : NULL, - ovr_iv ? ref->iv : NULL, -- &cipher_range, &auth_range, -- ref->aad, ref->length); -- else -- rc = alg_packet_op(pkt, &ok, session, - ovr_iv ? ref->cipher_iv : NULL, - ovr_iv ? ref->auth_iv : NULL, - ovr_iv ? ref->iv : NULL, -- &cipher_range, &auth_range, -- ref->aad, ref->length); -- if (rc < 0) -- break; -- -- if (iteration == WRONG_DIGEST_TEST) { -- CU_ASSERT(!ok); -- continue; -- } -- -- CU_ASSERT(ok); -- -- if (op == ODP_CRYPTO_OP_ENCODE) { -- CU_ASSERT(!packet_cmp_mem(pkt, 0, -- ref->ciphertext, -- ref->length)); -- CU_ASSERT(!packet_cmp_mem(pkt, ref->length, -- ref->digest, -- ref->digest_length)); -- } else { -- CU_ASSERT(!packet_cmp_mem(pkt, 0, -- ref->plaintext, -- ref->length)); -- } -- } -- -- odp_packet_free(pkt); -- --cleanup: -- rc = odp_crypto_session_destroy(session); - CU_ASSERT(!rc); -} - -static void check_alg(odp_crypto_op_t op, - odp_cipher_alg_t cipher_alg, - odp_auth_alg_t auth_alg, - crypto_test_reference_t *ref, - size_t count, - odp_bool_t ovr_iv) -{ - odp_crypto_capability_t capa; - odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; - odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; - int rc, cipher_num, auth_num, i; - odp_bool_t cipher_tested[MAX_ALG_CAPA]; - odp_bool_t auth_tested[MAX_ALG_CAPA]; - odp_bool_t cipher_ok = false; - odp_bool_t auth_ok = false; - size_t idx; - - rc = odp_crypto_capability(&capa); - CU_ASSERT(!rc); - - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capa.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capa.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && - !(capa.ciphers.bit.aes_ctr)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capa.ciphers.bit.aes_gcm)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_DES && - !(capa.ciphers.bit.des)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_NULL && - !(capa.ciphers.bit.null)) - rc = -1; - - CU_ASSERT(!rc); - CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); - - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capa.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_AES_GMAC && - !(capa.auths.bit.aes_gmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && - !(capa.auths.bit.md5_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capa.auths.bit.null)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA1_HMAC && - !(capa.auths.bit.sha1_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && - !(capa.auths.bit.sha256_hmac)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_SHA512_HMAC && - !(capa.auths.bit.sha512_hmac)) - rc = -1; - -- CU_ASSERT(!rc); - CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); - - cipher_num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, - MAX_ALG_CAPA); - - CU_ASSERT(cipher_num > 0); - CU_ASSERT(cipher_num <= MAX_ALG_CAPA); - if (cipher_num > MAX_ALG_CAPA) - cipher_num = MAX_ALG_CAPA; - - auth_num = odp_crypto_auth_capability(auth_alg, auth_capa, - MAX_ALG_CAPA); - - CU_ASSERT(auth_num > 0); - CU_ASSERT(auth_num <= MAX_ALG_CAPA); - if (auth_num > MAX_ALG_CAPA) - auth_num = MAX_ALG_CAPA; - - memset(cipher_tested, 0, sizeof(cipher_tested)); - memset(auth_tested, 0, sizeof(auth_tested)); - - for (idx = 0; idx < count; idx++) { - int cipher_idx = -1, auth_idx = -1; - - for (i = 0; i < cipher_num; i++) { - if (cipher_capa[i].key_len == - ref[idx].cipher_key_length && - cipher_capa[i].iv_len == - ref[idx].iv_length) { - cipher_idx = i; - break; - } - } - - if (cipher_idx < 0) { - printf("\n Unsupported: alg=%s, key_len=%" PRIu32 - ", iv_len=%" PRIu32 "\n", - cipher_alg_name(cipher_alg), - ref[idx].cipher_key_length, - ref[idx].iv_length); - continue; - } - - for (i = 0; i < auth_num; i++) { - if (auth_capa[i].digest_len == - ref[idx].digest_length && - auth_capa[i].key_len == - ref[idx].auth_key_length) { - auth_idx = i; - break; - } - } - - if (auth_idx < 0) { - printf("\n Unsupported: alg=%s, key_len=%" PRIu32 - ", digest_len=%" PRIu32 "\n", - auth_alg_name(auth_alg), - ref[idx].auth_key_length, - ref[idx].digest_length); - continue; - } - - alg_test(op, cipher_alg, auth_alg, &ref[idx], ovr_iv); - - cipher_tested[cipher_idx] = true; - auth_tested[auth_idx] = true; - } - - 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), - cipher_capa[i].key_len, - cipher_capa[i].iv_len); - } - } - - for (i = 0; i < auth_num; i++) { - auth_ok |= auth_tested[i]; - if (!auth_tested[i]) - printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " - "digest_len=%" PRIu32 "\n", - auth_alg_name(auth_alg), - auth_capa[i].key_len, - auth_capa[i].digest_len); - } - - /* Verify that we were able to run at least several tests */ - CU_ASSERT(cipher_ok); - CU_ASSERT(auth_ok); --} -- --/** -- * Check if given cipher and authentication algorithms are supported -- * -- * @param cipher Cipher algorithm -- * @param auth Authentication algorithm -- * -- * @retval ODP_TEST_ACTIVE when both algorithms are supported -- * @retval ODP_TEST_INACTIVE when either algorithm is not supported -- */ --static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) --{ -- odp_crypto_capability_t capability; -- -- if (odp_crypto_capability(&capability)) -- return ODP_TEST_INACTIVE; -- -- if (suite_context.packet) { -- if (suite_context.op_mode == ODP_CRYPTO_SYNC && -- capability.sync_mode == ODP_SUPPORT_NO) -- return ODP_TEST_INACTIVE; -- if (suite_context.op_mode == ODP_CRYPTO_ASYNC && -- capability.async_mode == ODP_SUPPORT_NO) -- return ODP_TEST_INACTIVE; -- } -- -- /* Cipher algorithms */ -- switch (cipher) { -- case ODP_CIPHER_ALG_NULL: -- if (!capability.ciphers.bit.null) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_CIPHER_ALG_DES: -- if (!capability.ciphers.bit.des) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_CIPHER_ALG_3DES_CBC: -- if (!capability.ciphers.bit.trides_cbc) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_CIPHER_ALG_AES_CBC: -- if (!capability.ciphers.bit.aes_cbc) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_CIPHER_ALG_AES_CTR: -- if (!capability.ciphers.bit.aes_ctr) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_CIPHER_ALG_AES_GCM: -- if (!capability.ciphers.bit.aes_gcm) -- return ODP_TEST_INACTIVE; -- break; -- default: -- fprintf(stderr, "Unsupported cipher algorithm\n"); -- return ODP_TEST_INACTIVE; -- } -- -- /* Authentication algorithms */ -- switch (auth) { -- case ODP_AUTH_ALG_NULL: -- if (!capability.auths.bit.null) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_AUTH_ALG_MD5_HMAC: -- if (!capability.auths.bit.md5_hmac) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_AUTH_ALG_SHA1_HMAC: -- if (!capability.auths.bit.sha1_hmac) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_AUTH_ALG_SHA256_HMAC: -- if (!capability.auths.bit.sha256_hmac) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_AUTH_ALG_SHA512_HMAC: -- if (!capability.auths.bit.sha512_hmac) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_AUTH_ALG_AES_GCM: -- if (!capability.auths.bit.aes_gcm) -- return ODP_TEST_INACTIVE; -- break; -- case ODP_AUTH_ALG_AES_GMAC: -- if (!capability.auths.bit.aes_gmac) -- return ODP_TEST_INACTIVE; -- break; -- default: -- fprintf(stderr, "Unsupported authentication algorithm\n"); -- return ODP_TEST_INACTIVE; -- } -- -- return ODP_TEST_ACTIVE; --} -- --static int check_alg_null(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_NULL); --} -- - static void crypto_test_enc_alg_null(void) -#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -void crypto_test_enc_alg_null(void) --{ - unsigned int test_vec_num = (sizeof(null_reference) / - sizeof(null_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_NULL, - &null_reference[i], - false); - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_NULL, - null_reference, - ARRAY_SIZE(null_reference), - false); --} -- - static void crypto_test_dec_alg_null(void) -void crypto_test_dec_alg_null(void) --{ - unsigned int test_vec_num = (sizeof(null_reference) / - sizeof(null_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_NULL, - &null_reference[i], - false); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_NULL, - null_reference, - ARRAY_SIZE(null_reference), - false); --} -- --static int check_alg_3des_cbc(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * operation for 3DES_CBC algorithm. IV for the operation is the session IV. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer.*/ - static void crypto_test_enc_alg_3des_cbc(void) -void crypto_test_enc_alg_3des_cbc(void) --{ - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - false); - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - tdes_cbc_reference, - ARRAY_SIZE(tdes_cbc_reference), - false); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * operation for 3DES_CBC algorithm. IV for the operation is the operation IV. -- * */ - static void crypto_test_enc_alg_3des_cbc_ovr_iv(void) -void crypto_test_enc_alg_3des_cbc_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - true); - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - tdes_cbc_reference, - ARRAY_SIZE(tdes_cbc_reference), - true); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_3des_cbc(void) -void crypto_test_dec_alg_3des_cbc(void) --{ - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - false); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - tdes_cbc_reference, - ARRAY_SIZE(tdes_cbc_reference), - false); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) -void crypto_test_dec_alg_3des_cbc_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(tdes_cbc_reference) / - sizeof(tdes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - &tdes_cbc_reference[i], - true); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_3DES_CBC, - ODP_AUTH_ALG_NULL, - tdes_cbc_reference, - ARRAY_SIZE(tdes_cbc_reference), - true); --} -- --static int check_alg_aes_gcm(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_AES_GCM, ODP_AUTH_ALG_AES_GCM); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * operation for AES128_GCM algorithm. IV for the operation is the session IV. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer.*/ - static void crypto_test_enc_alg_aes_gcm(void) -void crypto_test_enc_alg_aes_gcm(void) --{ - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - false); - } - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - aes_gcm_reference, - ARRAY_SIZE(aes_gcm_reference), - false); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * operation for AES128_GCM algorithm. IV for the operation is the session IV. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer.*/ - static void crypto_test_enc_alg_aes_gcm_ovr_iv(void) -void crypto_test_enc_alg_aes_gcm_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - true); - } - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - aes_gcm_reference, - ARRAY_SIZE(aes_gcm_reference), - true); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_aes_gcm(void) -void crypto_test_dec_alg_aes_gcm(void) --{ - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - false); - } - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - aes_gcm_reference, - ARRAY_SIZE(aes_gcm_reference), - false); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_aes_gcm_ovr_iv(void) -void crypto_test_dec_alg_aes_gcm_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(aes_gcm_reference) / - sizeof(aes_gcm_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - &aes_gcm_reference[i], - true); - } - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_GCM, - ODP_AUTH_ALG_AES_GCM, - aes_gcm_reference, - ARRAY_SIZE(aes_gcm_reference), - true); --} -- --static int check_alg_aes_cbc(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_AES_CBC, ODP_AUTH_ALG_NULL); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * operation for AES128_CBC algorithm. IV for the operation is the session IV. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer.*/ - static void crypto_test_enc_alg_aes_cbc(void) -void crypto_test_enc_alg_aes_cbc(void) --{ - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - false); - } - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - aes_cbc_reference, - ARRAY_SIZE(aes_cbc_reference), - false); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * operation for AES128_CBC algorithm. IV for the operation is the operation IV. -- * */ - static void crypto_test_enc_alg_aes_cbc_ovr_iv(void) -void crypto_test_enc_alg_aes_cbc_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - true); - } - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - aes_cbc_reference, - ARRAY_SIZE(aes_cbc_reference), - true); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_aes_cbc(void) -void crypto_test_dec_alg_aes_cbc(void) --{ - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - false); - } - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - aes_cbc_reference, - ARRAY_SIZE(aes_cbc_reference), - false); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_aes_cbc_ovr_iv(void) -void crypto_test_dec_alg_aes_cbc_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(aes_cbc_reference) / - sizeof(aes_cbc_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - &aes_cbc_reference[i], - true); - } - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CBC, - ODP_AUTH_ALG_NULL, - aes_cbc_reference, - ARRAY_SIZE(aes_cbc_reference), - true); --} -- --static int check_alg_aes_ctr(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_AES_CTR, ODP_AUTH_ALG_NULL); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * 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.*/ - static void crypto_test_enc_alg_aes_ctr(void) -void crypto_test_enc_alg_aes_ctr(void) --{ - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - false); - } - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - aes_ctr_reference, - ARRAY_SIZE(aes_ctr_reference), - false); --} -- --/* This test verifies the correctness of encode (plaintext -> ciphertext) -- * operation for AES128_CTR algorithm. IV for the operation is the operation IV. -- * */ - static void crypto_test_enc_alg_aes_ctr_ovr_iv(void) -void crypto_test_enc_alg_aes_ctr_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - true); - } - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - aes_ctr_reference, - ARRAY_SIZE(aes_ctr_reference), - true); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_aes_ctr(void) -void crypto_test_dec_alg_aes_ctr(void) --{ - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - false); - } - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - aes_ctr_reference, - ARRAY_SIZE(aes_ctr_reference), - false); --} -- --/* This test verifies the correctness of decode (ciphertext -> plaintext) -- * 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. -- * */ - static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) -void crypto_test_dec_alg_aes_ctr_ovr_iv(void) --{ - unsigned int test_vec_num = (sizeof(aes_ctr_reference) / - sizeof(aes_ctr_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) { - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - &aes_ctr_reference[i], - true); - } - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_AES_CTR, - ODP_AUTH_ALG_NULL, - aes_ctr_reference, - ARRAY_SIZE(aes_ctr_reference), - true); --} -- --static int check_alg_hmac_md5(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC); --} -- --/* This test verifies the correctness of HMAC_MD5 digest operation. -- * The output check length is truncated to 12 bytes (96 bits) as -- * returned by the crypto operation API call. -- * Note that hash digest is a one-way operation. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer. -- * */ - static void crypto_test_gen_alg_hmac_md5(void) -void crypto_test_gen_alg_hmac_md5(void) --{ - unsigned int test_vec_num = (sizeof(hmac_md5_reference) / - sizeof(hmac_md5_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_MD5_HMAC, - &hmac_md5_reference[i], - false); - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_MD5_HMAC, - hmac_md5_reference, - ARRAY_SIZE(hmac_md5_reference), - false); --} -- - static void crypto_test_check_alg_hmac_md5(void) -void crypto_test_check_alg_hmac_md5(void) --{ - unsigned int test_vec_num = (sizeof(hmac_md5_reference) / - sizeof(hmac_md5_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_MD5_HMAC, - &hmac_md5_reference[i], - false); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_MD5_HMAC, - hmac_md5_reference, - ARRAY_SIZE(hmac_md5_reference), - false); --} -- --static int check_alg_hmac_sha1(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA1_HMAC); --} -- --/* This test verifies the correctness of HMAC_SHA1 digest operation. -- * The output check length is truncated to 12 bytes (96 bits) as -- * returned by the crypto operation API call. -- * Note that hash digest is a one-way operation. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer. -- * */ - static void crypto_test_gen_alg_hmac_sha1(void) -void crypto_test_gen_alg_hmac_sha1(void) --{ - unsigned int test_vec_num = (sizeof(hmac_sha1_reference) / - sizeof(hmac_sha1_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA1_HMAC, - &hmac_sha1_reference[i], - false); - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA1_HMAC, - hmac_sha1_reference, - ARRAY_SIZE(hmac_sha1_reference), - false); --} -- - static void crypto_test_check_alg_hmac_sha1(void) -void crypto_test_check_alg_hmac_sha1(void) --{ - unsigned int test_vec_num = (sizeof(hmac_sha1_reference) / - sizeof(hmac_sha1_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA1_HMAC, - &hmac_sha1_reference[i], - false); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA1_HMAC, - hmac_sha1_reference, - ARRAY_SIZE(hmac_sha1_reference), - false); --} -- --static int check_alg_hmac_sha256(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA256_HMAC); --} -- --/* This test verifies the correctness of HMAC_SHA256 digest operation. -- * The output check length is truncated to 16 bytes (128 bits) as -- * returned by the crypto operation API call. -- * Note that hash digest is a one-way operation. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer. -- * */ - static void crypto_test_gen_alg_hmac_sha256(void) -void crypto_test_gen_alg_hmac_sha256(void) --{ - unsigned int test_vec_num = (sizeof(hmac_sha256_reference) / - sizeof(hmac_sha256_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA256_HMAC, - &hmac_sha256_reference[i], - false); - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA256_HMAC, - hmac_sha256_reference, - ARRAY_SIZE(hmac_sha256_reference), - false); --} -- - static void crypto_test_check_alg_hmac_sha256(void) -void crypto_test_check_alg_hmac_sha256(void) --{ - unsigned int test_vec_num = (sizeof(hmac_sha256_reference) / - sizeof(hmac_sha256_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA256_HMAC, - &hmac_sha256_reference[i], - false); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA256_HMAC, - hmac_sha256_reference, - ARRAY_SIZE(hmac_sha256_reference), - false); --} -- --static int check_alg_hmac_sha512(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA512_HMAC); --} -- --/* This test verifies the correctness of HMAC_SHA512 digest operation. -- * The output check length is truncated to 32 bytes (256 bits) as -- * returned by the crypto operation API call. -- * Note that hash digest is a one-way operation. -- * In addition the test verifies if the implementation can use the -- * packet buffer as completion event buffer. -- * */ - static void crypto_test_gen_alg_hmac_sha512(void) -void crypto_test_gen_alg_hmac_sha512(void) --{ - unsigned int test_vec_num = (sizeof(hmac_sha512_reference) / - sizeof(hmac_sha512_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA512_HMAC, - &hmac_sha512_reference[i], - false); - check_alg(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA512_HMAC, - hmac_sha512_reference, - ARRAY_SIZE(hmac_sha512_reference), - false); --} -- - static void crypto_test_check_alg_hmac_sha512(void) -void crypto_test_check_alg_hmac_sha512(void) --{ - unsigned int test_vec_num = (sizeof(hmac_sha512_reference) / - sizeof(hmac_sha512_reference[0])); - unsigned int i; - - for (i = 0; i < test_vec_num; i++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA512_HMAC, - &hmac_sha512_reference[i], - false); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_SHA512_HMAC, - hmac_sha512_reference, - ARRAY_SIZE(hmac_sha512_reference), - false); --} -- --static int check_alg_aes_gmac(void) --{ -- return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_GMAC); - } - - 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++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - &aes_gmac_reference[i], - false); - } - - static void crypto_test_gen_alg_aes_gmac_ovr_iv(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++) - alg_test(ODP_CRYPTO_OP_ENCODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - &aes_gmac_reference[i], - true); --} -- - static void crypto_test_check_alg_aes_gmac(void) -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++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - &aes_gmac_reference[i], - 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_ovr_iv(void) -void crypto_test_check_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++) - alg_test(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - &aes_gmac_reference[i], - true); - check_alg(ODP_CRYPTO_OP_DECODE, - ODP_CIPHER_ALG_NULL, - ODP_AUTH_ALG_AES_GMAC, - aes_gmac_reference, - ARRAY_SIZE(aes_gmac_reference), - false); --} -- --int crypto_suite_sync_init(void) --{ -- suite_context.pool = odp_pool_lookup("packet_pool"); -- if (suite_context.pool == ODP_POOL_INVALID) -- return -1; -- -- suite_context.queue = ODP_QUEUE_INVALID; -- suite_context.pref_mode = ODP_CRYPTO_SYNC; -- return 0; --} -- --int crypto_suite_async_init(void) --{ -- suite_context.pool = odp_pool_lookup("packet_pool"); -- if (suite_context.pool == ODP_POOL_INVALID) -- return -1; -- suite_context.queue = odp_queue_lookup("crypto-out"); -- if (suite_context.queue == ODP_QUEUE_INVALID) -- return -1; -- -- suite_context.pref_mode = ODP_CRYPTO_ASYNC; -- return 0; --} -- --int crypto_suite_packet_sync_init(void) --{ -- suite_context.packet = true; -- suite_context.op_mode = ODP_CRYPTO_SYNC; -- -- suite_context.pool = odp_pool_lookup("packet_pool"); -- if (suite_context.pool == ODP_POOL_INVALID) -- return -1; -- -- suite_context.queue = ODP_QUEUE_INVALID; -- return 0; --} -- --int crypto_suite_packet_async_init(void) --{ -- suite_context.packet = true; -- suite_context.op_mode = ODP_CRYPTO_ASYNC; -- -- suite_context.pool = odp_pool_lookup("packet_pool"); -- if (suite_context.pool == ODP_POOL_INVALID) -- return -1; -- -- suite_context.queue = odp_queue_lookup("crypto-out"); -- if (suite_context.queue == ODP_QUEUE_INVALID) -- return -1; -- return 0; --} -- --odp_testinfo_t crypto_suite[] = { -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_null, -- check_alg_null), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_null, -- check_alg_null), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc, -- check_alg_3des_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc, -- check_alg_3des_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc_ovr_iv, -- check_alg_3des_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc_ovr_iv, -- check_alg_3des_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_cbc, -- check_alg_aes_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cbc, -- check_alg_aes_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_cbc_ovr_iv, -- check_alg_aes_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cbc_ovr_iv, -- check_alg_aes_cbc), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr, -- check_alg_aes_ctr), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr, -- check_alg_aes_ctr), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr_ovr_iv, -- check_alg_aes_ctr), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr_ovr_iv, -- check_alg_aes_ctr), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm, -- check_alg_aes_gcm), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm_ovr_iv, -- check_alg_aes_gcm), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_gcm, -- 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_gen_alg_hmac_md5, -- check_alg_hmac_md5), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_md5, -- check_alg_hmac_md5), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha1, -- check_alg_hmac_sha1), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha1, -- check_alg_hmac_sha1), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha256, -- check_alg_hmac_sha256), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha256, -- check_alg_hmac_sha256), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha512, -- check_alg_hmac_sha512), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha512, -- check_alg_hmac_sha512), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac, - check_alg_aes_gmac), - ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac_ovr_iv, -- check_alg_aes_gmac), -- ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac, - check_alg_aes_gmac), - ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac_ovr_iv, -- check_alg_aes_gmac), -- ODP_TEST_INFO_NULL, --}; -- --int crypto_suite_term(void) --{ -- int i; -- int first = 1; -- -- for (i = 0; crypto_suite[i].pName; i++) { -- if (crypto_suite[i].check_active && -- crypto_suite[i].check_active() == ODP_TEST_INACTIVE) { -- if (first) { -- first = 0; -- printf("\n\n Inactive tests:\n"); -- } -- printf(" %s\n", crypto_suite[i].pName); -- } -- } -- return 0; --} ++/* Copyright (c) 2014-2018, Linaro Limited ++ * All rights reserved. ++ * ++ * SPDX-License-Identifier: BSD-3-Clause ++ */ ++ ++#include "config.h" ++ ++#include <odp_api.h> ++#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 ++ ++struct suite_context_s { ++ odp_bool_t packet; ++ odp_crypto_op_mode_t op_mode; ++ odp_crypto_op_mode_t pref_mode; ++ odp_pool_t pool; ++ odp_queue_t queue; ++}; ++ ++static struct suite_context_s suite_context; ++ ++static int packet_cmp_mem(odp_packet_t pkt, uint32_t offset, ++ void *s, uint32_t len) ++{ ++ uint8_t buf[len]; ++ ++ odp_packet_copy_to_mem(pkt, offset, len, buf); ++ ++ return memcmp(buf, s, len); ++} ++ ++static const char *auth_alg_name(odp_auth_alg_t auth) ++{ ++ switch (auth) { ++ case ODP_AUTH_ALG_NULL: ++ return "ODP_AUTH_ALG_NULL"; ++ case ODP_AUTH_ALG_MD5_HMAC: ++ return "ODP_AUTH_ALG_MD5_HMAC"; ++ case ODP_AUTH_ALG_SHA1_HMAC: ++ return "ODP_AUTH_ALG_SHA1_HMAC"; ++ case ODP_AUTH_ALG_SHA256_HMAC: ++ return "ODP_AUTH_ALG_SHA256_HMAC"; ++ case ODP_AUTH_ALG_SHA512_HMAC: ++ return "ODP_AUTH_ALG_SHA512_HMAC"; ++ case ODP_AUTH_ALG_AES_GCM: ++ return "ODP_AUTH_ALG_AES_GCM"; ++ case ODP_AUTH_ALG_AES_GMAC: ++ return "ODP_AUTH_ALG_AES_GMAC"; ++ default: ++ return "Unknown"; ++ } ++} ++ ++static const char *cipher_alg_name(odp_cipher_alg_t cipher) ++{ ++ switch (cipher) { ++ case ODP_CIPHER_ALG_NULL: ++ return "ODP_CIPHER_ALG_NULL"; ++ case ODP_CIPHER_ALG_DES: ++ return "ODP_CIPHER_ALG_DES"; ++ case ODP_CIPHER_ALG_3DES_CBC: ++ return "ODP_CIPHER_ALG_3DES_CBC"; ++ case ODP_CIPHER_ALG_AES_CBC: ++ return "ODP_CIPHER_ALG_AES_CBC"; ++ case ODP_CIPHER_ALG_AES_GCM: ++ return "ODP_CIPHER_ALG_AES_GCM"; ++ default: ++ return "Unknown"; ++ } ++} ++ ++static int alg_op(odp_packet_t pkt, ++ odp_bool_t *ok, ++ odp_crypto_session_t session, ++ uint8_t *cipher_iv_ptr, ++ uint8_t *auth_iv_ptr, ++ odp_packet_data_range_t *cipher_range, ++ odp_packet_data_range_t *auth_range, ++ uint8_t *aad, ++ unsigned int plaintext_len) ++{ ++ int rc; ++ odp_crypto_op_result_t result; ++ odp_crypto_op_param_t op_params; ++ odp_bool_t posted; ++ odp_event_subtype_t subtype; ++ ++ /* Prepare input/output params */ ++ memset(&op_params, 0, sizeof(op_params)); ++ op_params.session = session; ++ op_params.pkt = pkt; ++ op_params.out_pkt = pkt; ++ op_params.ctx = (void *)0xdeadbeef; ++ ++ op_params.cipher_range = *cipher_range; ++ op_params.auth_range = *auth_range; ++ if (cipher_iv_ptr) ++ op_params.cipher_iv_ptr = cipher_iv_ptr; ++ if (auth_iv_ptr) ++ op_params.auth_iv_ptr = auth_iv_ptr; ++ ++ op_params.aad_ptr = aad; ++ ++ op_params.hash_result_offset = plaintext_len; ++ ++ rc = odp_crypto_operation(&op_params, &posted, &result); ++ if (rc < 0) { ++ CU_FAIL("Failed odp_crypto_operation()"); ++ return rc; ++ } ++ ++ if (posted) { ++ odp_event_t event; ++ odp_crypto_compl_t compl_event; ++ ++ /* Poll completion queue for results */ ++ do { ++ event = odp_queue_deq(suite_context.queue); ++ } while (event == ODP_EVENT_INVALID); ++ ++ CU_ASSERT(ODP_EVENT_CRYPTO_COMPL == odp_event_type(event)); ++ CU_ASSERT(ODP_EVENT_NO_SUBTYPE == odp_event_subtype(event)); ++ CU_ASSERT(ODP_EVENT_CRYPTO_COMPL == ++ odp_event_types(event, &subtype)); ++ CU_ASSERT(ODP_EVENT_NO_SUBTYPE == subtype); ++ ++ compl_event = odp_crypto_compl_from_event(event); ++ CU_ASSERT(odp_crypto_compl_to_u64(compl_event) == ++ odp_crypto_compl_to_u64( ++ odp_crypto_compl_from_event(event))); ++ odp_crypto_compl_result(compl_event, &result); ++ odp_crypto_compl_free(compl_event); ++ } ++ ++ CU_ASSERT(result.pkt == pkt); ++ CU_ASSERT(result.ctx == (void *)0xdeadbeef); ++ CU_ASSERT(ODP_EVENT_PACKET == ++ odp_event_type(odp_packet_to_event(result.pkt))); ++ CU_ASSERT(ODP_EVENT_PACKET_BASIC == ++ odp_event_subtype(odp_packet_to_event(result.pkt))); ++ CU_ASSERT(ODP_EVENT_PACKET == ++ odp_event_types(odp_packet_to_event(result.pkt), &subtype)); ++ CU_ASSERT(ODP_EVENT_PACKET_BASIC == subtype); ++ ++ *ok = result.ok; ++ ++ return 0; ++} ++ ++static int alg_packet_op(odp_packet_t pkt, ++ odp_bool_t *ok, ++ odp_crypto_session_t session, ++ uint8_t *cipher_iv_ptr, ++ uint8_t *auth_iv_ptr, ++ odp_packet_data_range_t *cipher_range, ++ odp_packet_data_range_t *auth_range, ++ uint8_t *aad, ++ unsigned int plaintext_len) ++{ ++ int rc; ++ odp_crypto_packet_result_t result; ++ odp_crypto_packet_op_param_t op_params; ++ odp_event_subtype_t subtype; ++ odp_packet_t out_pkt = pkt; ++ ++ /* Prepare input/output params */ ++ memset(&op_params, 0, sizeof(op_params)); ++ op_params.session = session; ++ ++ op_params.cipher_range = *cipher_range; ++ op_params.auth_range = *auth_range; ++ if (cipher_iv_ptr) ++ op_params.cipher_iv_ptr = cipher_iv_ptr; ++ if (auth_iv_ptr) ++ op_params.auth_iv_ptr = auth_iv_ptr; ++ ++ op_params.aad_ptr = aad; ++ ++ op_params.hash_result_offset = plaintext_len; ++ ++ rc = odp_crypto_op(&pkt, &out_pkt, &op_params, 1); ++ if (rc < 0) { ++ CU_FAIL("Failed odp_crypto_packet_op()"); ++ return rc; ++ } ++ ++ CU_ASSERT(out_pkt == pkt); ++ CU_ASSERT(ODP_EVENT_PACKET == ++ odp_event_type(odp_packet_to_event(pkt))); ++ CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == ++ odp_event_subtype(odp_packet_to_event(pkt))); ++ CU_ASSERT(ODP_EVENT_PACKET == ++ odp_event_types(odp_packet_to_event(pkt), &subtype)); ++ CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); ++ ++ rc = odp_crypto_result(&result, pkt); ++ if (rc < 0) { ++ CU_FAIL("Failed odp_crypto_packet_result()"); ++ return rc; ++ } ++ ++ if (!result.ok) ++ CU_ASSERT(odp_packet_has_error(pkt)); ++ ++ *ok = result.ok; ++ ++ return 0; ++} ++ ++static int alg_packet_op_enq(odp_packet_t pkt, ++ odp_bool_t *ok, ++ odp_crypto_session_t session, ++ uint8_t *cipher_iv_ptr, ++ uint8_t *auth_iv_ptr, ++ odp_packet_data_range_t *cipher_range, ++ odp_packet_data_range_t *auth_range, ++ uint8_t *aad, ++ unsigned int plaintext_len) ++{ ++ int rc; ++ odp_event_t event; ++ odp_crypto_packet_result_t result; ++ odp_crypto_packet_op_param_t op_params; ++ odp_event_subtype_t subtype; ++ odp_packet_t out_pkt = pkt; ++ ++ /* Prepare input/output params */ ++ memset(&op_params, 0, sizeof(op_params)); ++ op_params.session = session; ++ ++ op_params.cipher_range = *cipher_range; ++ op_params.auth_range = *auth_range; ++ if (cipher_iv_ptr) ++ op_params.cipher_iv_ptr = cipher_iv_ptr; ++ if (auth_iv_ptr) ++ op_params.auth_iv_ptr = auth_iv_ptr; ++ ++ op_params.aad_ptr = aad; ++ ++ op_params.hash_result_offset = plaintext_len; ++ ++ rc = odp_crypto_op_enq(&pkt, &pkt, &op_params, 1); ++ if (rc < 0) { ++ CU_FAIL("Failed odp_crypto_op_enq()"); ++ return rc; ++ } ++ ++ /* Poll completion queue for results */ ++ do { ++ event = odp_queue_deq(suite_context.queue); ++ } while (event == ODP_EVENT_INVALID); ++ ++ CU_ASSERT(ODP_EVENT_PACKET == odp_event_type(event)); ++ CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == odp_event_subtype(event)); ++ CU_ASSERT(ODP_EVENT_PACKET == odp_event_types(event, &subtype)); ++ CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); ++ ++ pkt = odp_crypto_packet_from_event(event); ++ ++ CU_ASSERT(out_pkt == pkt); ++ CU_ASSERT(ODP_EVENT_PACKET == ++ odp_event_type(odp_packet_to_event(pkt))); ++ CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == ++ odp_event_subtype(odp_packet_to_event(pkt))); ++ CU_ASSERT(ODP_EVENT_PACKET == ++ odp_event_types(odp_packet_to_event(pkt), &subtype)); ++ CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype); ++ ++ rc = odp_crypto_result(&result, pkt); ++ if (rc < 0) { ++ CU_FAIL("Failed odp_crypto_packet_result()"); ++ return rc; ++ } ++ ++ CU_ASSERT((!odp_packet_has_error(pkt)) == result.ok); ++ ++ *ok = result.ok; ++ ++ return 0; ++} ++ ++typedef enum crypto_test { ++ NORMAL_TEST = 0, /**< Plain execution */ ++ REPEAT_TEST, /**< Rerun without reinitializing the session */ ++ WRONG_DIGEST_TEST, /**< Check against wrong digest */ ++ MAX_TEST, /**< Final mark */ ++} crypto_test; ++ ++/* Basic algorithm run function for async inplace mode. ++ * Creates a session from input parameters and runs one operation ++ * on input_vec. Checks the output of the crypto operation against ++ * output_vec. Operation completion event is dequeued polling the ++ * session output queue. Completion context pointer is retrieved ++ * and checked against the one set before the operation. ++ * Completion event can be a separate buffer or the input packet ++ * buffer can be used. ++ * */ ++static void alg_test(odp_crypto_op_t op, ++ odp_cipher_alg_t cipher_alg, ++ odp_auth_alg_t auth_alg, ++ crypto_test_reference_t *ref, ++ odp_bool_t ovr_iv) ++{ ++ odp_crypto_session_t session; ++ int rc; ++ odp_crypto_ses_create_err_t status; ++ odp_bool_t ok = false; ++ int iteration; ++ odp_crypto_session_param_t ses_params; ++ odp_packet_data_range_t cipher_range; ++ odp_packet_data_range_t auth_range; ++ odp_crypto_key_t cipher_key = { ++ .data = ref->cipher_key, ++ .length = ref->cipher_key_length ++ }; ++ odp_crypto_key_t auth_key = { ++ .data = ref->auth_key, ++ .length = ref->auth_key_length ++ }; ++ odp_crypto_iv_t cipher_iv = { ++ .data = ovr_iv ? NULL : ref->cipher_iv, ++ .length = ref->cipher_iv_length ++ }; ++ odp_crypto_iv_t auth_iv = { ++ .data = ovr_iv ? NULL : ref->auth_iv, ++ .length = ref->auth_iv_length ++ }; ++ ++ /* Create a crypto session */ ++ odp_crypto_session_param_init(&ses_params); ++ ses_params.op = op; ++ ses_params.auth_cipher_text = false; ++ ses_params.op_mode = suite_context.op_mode; ++ ses_params.pref_mode = suite_context.pref_mode; ++ ses_params.cipher_alg = cipher_alg; ++ ses_params.auth_alg = auth_alg; ++ ses_params.compl_queue = suite_context.queue; ++ ses_params.output_pool = suite_context.pool; ++ ses_params.cipher_key = cipher_key; ++ ses_params.cipher_iv = cipher_iv; ++ ses_params.auth_iv = auth_iv; ++ ses_params.auth_key = auth_key; ++ ses_params.auth_digest_len = ref->digest_length; ++ ses_params.auth_aad_len = ref->aad_length; ++ ++ rc = odp_crypto_session_create(&ses_params, &session, &status); ++ CU_ASSERT_FATAL(!rc); ++ CU_ASSERT(status == ODP_CRYPTO_SES_CREATE_ERR_NONE); ++ CU_ASSERT(odp_crypto_session_to_u64(session) != ++ odp_crypto_session_to_u64(ODP_CRYPTO_SESSION_INVALID)); ++ ++ cipher_range.offset = 0; ++ cipher_range.length = ref->length; ++ auth_range.offset = 0; ++ auth_range.length = ref->length; ++ ++ /* Prepare input data */ ++ odp_packet_t pkt = odp_packet_alloc(suite_context.pool, ++ ref->length + ref->digest_length); ++ CU_ASSERT(pkt != ODP_PACKET_INVALID); ++ if (pkt == ODP_PACKET_INVALID) ++ goto cleanup; ++ ++ for (iteration = NORMAL_TEST; iteration < MAX_TEST; iteration++) { ++ /* checking against wrong digest is meaningless for NULL digest ++ * or when generating digest */ ++ if (iteration == WRONG_DIGEST_TEST && ++ (auth_alg == ODP_AUTH_ALG_NULL || ++ op == ODP_CRYPTO_OP_ENCODE)) ++ continue; ++ ++ if (op == ODP_CRYPTO_OP_ENCODE) { ++ odp_packet_copy_from_mem(pkt, 0, ref->length, ++ ref->plaintext); ++ } else { ++ odp_packet_copy_from_mem(pkt, 0, ref->length, ++ ref->ciphertext); ++ odp_packet_copy_from_mem(pkt, ref->length, ++ ref->digest_length, ++ ref->digest); ++ if (iteration == WRONG_DIGEST_TEST) { ++ uint8_t byte = ~ref->digest[0]; ++ ++ odp_packet_copy_from_mem(pkt, ref->length, ++ 1, &byte); ++ } ++ } ++ ++ if (!suite_context.packet) ++ rc = alg_op(pkt, &ok, session, ++ ovr_iv ? ref->cipher_iv : NULL, ++ ovr_iv ? ref->auth_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->cipher_iv : NULL, ++ ovr_iv ? ref->auth_iv : NULL, ++ &cipher_range, &auth_range, ++ ref->aad, ref->length); ++ else ++ rc = alg_packet_op(pkt, &ok, session, ++ ovr_iv ? ref->cipher_iv : NULL, ++ ovr_iv ? ref->auth_iv : NULL, ++ &cipher_range, &auth_range, ++ ref->aad, ref->length); ++ if (rc < 0) ++ break; ++ ++ if (iteration == WRONG_DIGEST_TEST) { ++ CU_ASSERT(!ok); ++ continue; ++ } ++ ++ CU_ASSERT(ok); ++ ++ if (op == ODP_CRYPTO_OP_ENCODE) { ++ CU_ASSERT(!packet_cmp_mem(pkt, 0, ++ ref->ciphertext, ++ ref->length)); ++ CU_ASSERT(!packet_cmp_mem(pkt, ref->length, ++ ref->digest, ++ ref->digest_length)); ++ } else { ++ CU_ASSERT(!packet_cmp_mem(pkt, 0, ++ ref->plaintext, ++ ref->length)); ++ } ++ } ++ ++ odp_packet_free(pkt); ++ ++cleanup: ++ rc = odp_crypto_session_destroy(session); ++ CU_ASSERT(!rc); ++} ++ ++static void check_alg(odp_crypto_op_t op, ++ odp_cipher_alg_t cipher_alg, ++ odp_auth_alg_t auth_alg, ++ crypto_test_reference_t *ref, ++ size_t count, ++ odp_bool_t ovr_iv) ++{ ++ odp_crypto_capability_t capa; ++ odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; ++ odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; ++ int rc, cipher_num, auth_num, i; ++ odp_bool_t cipher_tested[MAX_ALG_CAPA]; ++ odp_bool_t auth_tested[MAX_ALG_CAPA]; ++ odp_bool_t cipher_ok = false; ++ odp_bool_t auth_ok = false; ++ size_t idx; ++ ++ rc = odp_crypto_capability(&capa); ++ CU_ASSERT(!rc); ++ ++ if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && ++ !(capa.ciphers.bit.trides_cbc)) ++ rc = -1; ++ if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && ++ !(capa.ciphers.bit.aes_cbc)) ++ rc = -1; ++ if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && ++ !(capa.ciphers.bit.aes_ctr)) ++ rc = -1; ++ if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && ++ !(capa.ciphers.bit.aes_gcm)) ++ rc = -1; ++ if (cipher_alg == ODP_CIPHER_ALG_DES && ++ !(capa.ciphers.bit.des)) ++ rc = -1; ++ if (cipher_alg == ODP_CIPHER_ALG_NULL && ++ !(capa.ciphers.bit.null)) ++ rc = -1; ++ ++ CU_ASSERT(!rc); ++ CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); ++ ++ if (auth_alg == ODP_AUTH_ALG_AES_GCM && ++ !(capa.auths.bit.aes_gcm)) ++ rc = -1; ++ if (auth_alg == ODP_AUTH_ALG_AES_GMAC && ++ !(capa.auths.bit.aes_gmac)) ++ rc = -1; ++ if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && ++ !(capa.auths.bit.md5_hmac)) ++ rc = -1; ++ if (auth_alg == ODP_AUTH_ALG_NULL && ++ !(capa.auths.bit.null)) ++ rc = -1; ++ if (auth_alg == ODP_AUTH_ALG_SHA1_HMAC && ++ !(capa.auths.bit.sha1_hmac)) ++ rc = -1; ++ if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && ++ !(capa.auths.bit.sha256_hmac)) ++ rc = -1; ++ if (auth_alg == ODP_AUTH_ALG_SHA512_HMAC && ++ !(capa.auths.bit.sha512_hmac)) ++ rc = -1; ++ ++ CU_ASSERT(!rc); ++ CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); ++ ++ cipher_num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, ++ MAX_ALG_CAPA); ++ ++ CU_ASSERT(cipher_num > 0); ++ CU_ASSERT(cipher_num <= MAX_ALG_CAPA); ++ if (cipher_num > MAX_ALG_CAPA) ++ cipher_num = MAX_ALG_CAPA; ++ ++ auth_num = odp_crypto_auth_capability(auth_alg, auth_capa, ++ MAX_ALG_CAPA); ++ ++ CU_ASSERT(auth_num > 0); ++ CU_ASSERT(auth_num <= MAX_ALG_CAPA); ++ if (auth_num > MAX_ALG_CAPA) ++ auth_num = MAX_ALG_CAPA; ++ ++ memset(cipher_tested, 0, sizeof(cipher_tested)); ++ memset(auth_tested, 0, sizeof(auth_tested)); ++ ++ for (idx = 0; idx < count; idx++) { ++ int cipher_idx = -1, auth_idx = -1; ++ ++ for (i = 0; i < cipher_num; i++) { ++ if (cipher_capa[i].key_len == ++ ref[idx].cipher_key_length && ++ cipher_capa[i].iv_len == ++ ref[idx].cipher_iv_length) { ++ cipher_idx = i; ++ break; ++ } ++ } ++ ++ if (cipher_idx < 0) { ++ printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ++ ", iv_len=%" PRIu32 "\n", ++ cipher_alg_name(cipher_alg), ++ ref[idx].cipher_key_length, ++ ref[idx].cipher_iv_length); ++ continue; ++ } ++ ++ for (i = 0; i < auth_num; i++) { ++ if (auth_capa[i].digest_len == ++ ref[idx].digest_length && ++ auth_capa[i].iv_len == ++ ref[idx].auth_iv_length && ++ auth_capa[i].key_len == ++ ref[idx].auth_key_length) { ++ auth_idx = i; ++ break; ++ } ++ } ++ ++ if (auth_idx < 0) { ++ printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ++ ", iv_len=%" PRIu32 ", digest_len=%" PRIu32 "\n", ++ auth_alg_name(auth_alg), ++ ref[idx].auth_key_length, ++ ref[idx].auth_iv_length, ++ ref[idx].digest_length); ++ continue; ++ } ++ ++ alg_test(op, cipher_alg, auth_alg, &ref[idx], ovr_iv); ++ ++ cipher_tested[cipher_idx] = true; ++ auth_tested[auth_idx] = true; ++ } ++ ++ 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), ++ cipher_capa[i].key_len, ++ cipher_capa[i].iv_len); ++ } ++ } ++ ++ for (i = 0; i < auth_num; i++) { ++ auth_ok |= auth_tested[i]; ++ if (!auth_tested[i]) ++ printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " ++ "digest_len=%" PRIu32 "\n", ++ auth_alg_name(auth_alg), ++ auth_capa[i].key_len, ++ auth_capa[i].digest_len); ++ } ++ ++ /* Verify that we were able to run at least several tests */ ++ CU_ASSERT(cipher_ok); ++ CU_ASSERT(auth_ok); ++} ++ ++/** ++ * Check if given cipher and authentication algorithms are supported ++ * ++ * @param cipher Cipher algorithm ++ * @param auth Authentication algorithm ++ * ++ * @retval ODP_TEST_ACTIVE when both algorithms are supported ++ * @retval ODP_TEST_INACTIVE when either algorithm is not supported ++ */ ++static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) ++{ ++ odp_crypto_capability_t capability; ++ ++ if (odp_crypto_capability(&capability)) ++ return ODP_TEST_INACTIVE; ++ ++ if (suite_context.packet) { ++ if (suite_context.op_mode == ODP_CRYPTO_SYNC && ++ capability.sync_mode == ODP_SUPPORT_NO) ++ return ODP_TEST_INACTIVE; ++ if (suite_context.op_mode == ODP_CRYPTO_ASYNC && ++ capability.async_mode == ODP_SUPPORT_NO) ++ return ODP_TEST_INACTIVE; ++ } ++ ++ /* Cipher algorithms */ ++ switch (cipher) { ++ case ODP_CIPHER_ALG_NULL: ++ if (!capability.ciphers.bit.null) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_CIPHER_ALG_DES: ++ if (!capability.ciphers.bit.des) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_CIPHER_ALG_3DES_CBC: ++ if (!capability.ciphers.bit.trides_cbc) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_CIPHER_ALG_AES_CBC: ++ if (!capability.ciphers.bit.aes_cbc) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_CIPHER_ALG_AES_CTR: ++ if (!capability.ciphers.bit.aes_ctr) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_CIPHER_ALG_AES_GCM: ++ if (!capability.ciphers.bit.aes_gcm) ++ return ODP_TEST_INACTIVE; ++ break; ++ default: ++ fprintf(stderr, "Unsupported cipher algorithm\n"); ++ return ODP_TEST_INACTIVE; ++ } ++ ++ /* Authentication algorithms */ ++ switch (auth) { ++ case ODP_AUTH_ALG_NULL: ++ if (!capability.auths.bit.null) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_AUTH_ALG_MD5_HMAC: ++ if (!capability.auths.bit.md5_hmac) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_AUTH_ALG_SHA1_HMAC: ++ if (!capability.auths.bit.sha1_hmac) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_AUTH_ALG_SHA256_HMAC: ++ if (!capability.auths.bit.sha256_hmac) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_AUTH_ALG_SHA512_HMAC: ++ if (!capability.auths.bit.sha512_hmac) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_AUTH_ALG_AES_GCM: ++ if (!capability.auths.bit.aes_gcm) ++ return ODP_TEST_INACTIVE; ++ break; ++ case ODP_AUTH_ALG_AES_GMAC: ++ if (!capability.auths.bit.aes_gmac) ++ return ODP_TEST_INACTIVE; ++ break; ++ default: ++ fprintf(stderr, "Unsupported authentication algorithm\n"); ++ return ODP_TEST_INACTIVE; ++ } ++ ++ return ODP_TEST_ACTIVE; ++} ++ ++static int check_alg_null(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_NULL); ++} ++ ++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) ++static void crypto_test_enc_alg_null(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_NULL, ++ null_reference, ++ ARRAY_SIZE(null_reference), ++ false); ++} ++ ++static void crypto_test_dec_alg_null(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_NULL, ++ null_reference, ++ ARRAY_SIZE(null_reference), ++ false); ++} ++ ++static int check_alg_3des_cbc(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * operation for 3DES_CBC algorithm. IV for the operation is the session IV. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer.*/ ++static void crypto_test_enc_alg_3des_cbc(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_3DES_CBC, ++ ODP_AUTH_ALG_NULL, ++ tdes_cbc_reference, ++ ARRAY_SIZE(tdes_cbc_reference), ++ false); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * operation for 3DES_CBC algorithm. IV for the operation is the operation IV. ++ * */ ++static void crypto_test_enc_alg_3des_cbc_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_3DES_CBC, ++ ODP_AUTH_ALG_NULL, ++ tdes_cbc_reference, ++ ARRAY_SIZE(tdes_cbc_reference), ++ true); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_3des_cbc(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_3DES_CBC, ++ ODP_AUTH_ALG_NULL, ++ tdes_cbc_reference, ++ ARRAY_SIZE(tdes_cbc_reference), ++ false); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_3DES_CBC, ++ ODP_AUTH_ALG_NULL, ++ tdes_cbc_reference, ++ ARRAY_SIZE(tdes_cbc_reference), ++ true); ++} ++ ++static int check_alg_aes_gcm(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_AES_GCM, ODP_AUTH_ALG_AES_GCM); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * operation for AES128_GCM algorithm. IV for the operation is the session IV. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer.*/ ++static void crypto_test_enc_alg_aes_gcm(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_AES_GCM, ++ ODP_AUTH_ALG_AES_GCM, ++ aes_gcm_reference, ++ ARRAY_SIZE(aes_gcm_reference), ++ false); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * operation for AES128_GCM algorithm. IV for the operation is the session IV. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer.*/ ++static void crypto_test_enc_alg_aes_gcm_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_AES_GCM, ++ ODP_AUTH_ALG_AES_GCM, ++ aes_gcm_reference, ++ ARRAY_SIZE(aes_gcm_reference), ++ true); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_aes_gcm(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_AES_GCM, ++ ODP_AUTH_ALG_AES_GCM, ++ aes_gcm_reference, ++ ARRAY_SIZE(aes_gcm_reference), ++ false); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_aes_gcm_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_AES_GCM, ++ ODP_AUTH_ALG_AES_GCM, ++ aes_gcm_reference, ++ ARRAY_SIZE(aes_gcm_reference), ++ true); ++} ++ ++static int check_alg_aes_cbc(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_AES_CBC, ODP_AUTH_ALG_NULL); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * operation for AES128_CBC algorithm. IV for the operation is the session IV. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer.*/ ++static void crypto_test_enc_alg_aes_cbc(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_AES_CBC, ++ ODP_AUTH_ALG_NULL, ++ aes_cbc_reference, ++ ARRAY_SIZE(aes_cbc_reference), ++ false); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * operation for AES128_CBC algorithm. IV for the operation is the operation IV. ++ * */ ++static void crypto_test_enc_alg_aes_cbc_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_AES_CBC, ++ ODP_AUTH_ALG_NULL, ++ aes_cbc_reference, ++ ARRAY_SIZE(aes_cbc_reference), ++ true); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_aes_cbc(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_AES_CBC, ++ ODP_AUTH_ALG_NULL, ++ aes_cbc_reference, ++ ARRAY_SIZE(aes_cbc_reference), ++ false); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_aes_cbc_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_AES_CBC, ++ ODP_AUTH_ALG_NULL, ++ aes_cbc_reference, ++ ARRAY_SIZE(aes_cbc_reference), ++ true); ++} ++ ++static int check_alg_aes_ctr(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_AES_CTR, ODP_AUTH_ALG_NULL); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * 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.*/ ++static void crypto_test_enc_alg_aes_ctr(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_AES_CTR, ++ ODP_AUTH_ALG_NULL, ++ aes_ctr_reference, ++ ARRAY_SIZE(aes_ctr_reference), ++ false); ++} ++ ++/* This test verifies the correctness of encode (plaintext -> ciphertext) ++ * operation for AES128_CTR algorithm. IV for the operation is the operation IV. ++ * */ ++static void crypto_test_enc_alg_aes_ctr_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_AES_CTR, ++ ODP_AUTH_ALG_NULL, ++ aes_ctr_reference, ++ ARRAY_SIZE(aes_ctr_reference), ++ true); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_aes_ctr(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_AES_CTR, ++ ODP_AUTH_ALG_NULL, ++ aes_ctr_reference, ++ ARRAY_SIZE(aes_ctr_reference), ++ false); ++} ++ ++/* This test verifies the correctness of decode (ciphertext -> plaintext) ++ * 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. ++ * */ ++static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_AES_CTR, ++ ODP_AUTH_ALG_NULL, ++ aes_ctr_reference, ++ ARRAY_SIZE(aes_ctr_reference), ++ true); ++} ++ ++static int check_alg_hmac_md5(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC); ++} ++ ++/* This test verifies the correctness of HMAC_MD5 digest operation. ++ * The output check length is truncated to 12 bytes (96 bits) as ++ * returned by the crypto operation API call. ++ * Note that hash digest is a one-way operation. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer. ++ * */ ++static void crypto_test_gen_alg_hmac_md5(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_MD5_HMAC, ++ hmac_md5_reference, ++ ARRAY_SIZE(hmac_md5_reference), ++ false); ++} ++ ++static void crypto_test_check_alg_hmac_md5(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_MD5_HMAC, ++ hmac_md5_reference, ++ ARRAY_SIZE(hmac_md5_reference), ++ false); ++} ++ ++static int check_alg_hmac_sha1(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA1_HMAC); ++} ++ ++/* This test verifies the correctness of HMAC_SHA1 digest operation. ++ * The output check length is truncated to 12 bytes (96 bits) as ++ * returned by the crypto operation API call. ++ * Note that hash digest is a one-way operation. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer. ++ * */ ++static void crypto_test_gen_alg_hmac_sha1(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_SHA1_HMAC, ++ hmac_sha1_reference, ++ ARRAY_SIZE(hmac_sha1_reference), ++ false); ++} ++ ++static void crypto_test_check_alg_hmac_sha1(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_SHA1_HMAC, ++ hmac_sha1_reference, ++ ARRAY_SIZE(hmac_sha1_reference), ++ false); ++} ++ ++static int check_alg_hmac_sha256(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA256_HMAC); ++} ++ ++/* This test verifies the correctness of HMAC_SHA256 digest operation. ++ * The output check length is truncated to 16 bytes (128 bits) as ++ * returned by the crypto operation API call. ++ * Note that hash digest is a one-way operation. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer. ++ * */ ++static void crypto_test_gen_alg_hmac_sha256(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_SHA256_HMAC, ++ hmac_sha256_reference, ++ ARRAY_SIZE(hmac_sha256_reference), ++ false); ++} ++ ++static void crypto_test_check_alg_hmac_sha256(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_SHA256_HMAC, ++ hmac_sha256_reference, ++ ARRAY_SIZE(hmac_sha256_reference), ++ false); ++} ++ ++static int check_alg_hmac_sha512(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA512_HMAC); ++} ++ ++/* This test verifies the correctness of HMAC_SHA512 digest operation. ++ * The output check length is truncated to 32 bytes (256 bits) as ++ * returned by the crypto operation API call. ++ * Note that hash digest is a one-way operation. ++ * In addition the test verifies if the implementation can use the ++ * packet buffer as completion event buffer. ++ * */ ++static void crypto_test_gen_alg_hmac_sha512(void) ++{ ++ check_alg(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_SHA512_HMAC, ++ hmac_sha512_reference, ++ ARRAY_SIZE(hmac_sha512_reference), ++ false); ++} ++ ++static void crypto_test_check_alg_hmac_sha512(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_SHA512_HMAC, ++ hmac_sha512_reference, ++ ARRAY_SIZE(hmac_sha512_reference), ++ false); ++} ++ ++static int check_alg_aes_gmac(void) ++{ ++ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_GMAC); ++} ++ ++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); ++} ++ ++static void crypto_test_gen_alg_aes_gmac_ovr_iv(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++) ++ alg_test(ODP_CRYPTO_OP_ENCODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_AES_GMAC, ++ &aes_gmac_reference[i], ++ true); ++} ++ ++static void crypto_test_check_alg_aes_gmac(void) ++{ ++ check_alg(ODP_CRYPTO_OP_DECODE, ++ 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_ovr_iv(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++) ++ alg_test(ODP_CRYPTO_OP_DECODE, ++ ODP_CIPHER_ALG_NULL, ++ ODP_AUTH_ALG_AES_GMAC, ++ &aes_gmac_reference[i], ++ true); ++} ++ ++int crypto_suite_sync_init(void) ++{ ++ suite_context.pool = odp_pool_lookup("packet_pool"); ++ if (suite_context.pool == ODP_POOL_INVALID) ++ return -1; ++ ++ suite_context.queue = ODP_QUEUE_INVALID; ++ suite_context.pref_mode = ODP_CRYPTO_SYNC; ++ return 0; ++} ++ ++int crypto_suite_async_init(void) ++{ ++ suite_context.pool = odp_pool_lookup("packet_pool"); ++ if (suite_context.pool == ODP_POOL_INVALID) ++ return -1; ++ suite_context.queue = odp_queue_lookup("crypto-out"); ++ if (suite_context.queue == ODP_QUEUE_INVALID) ++ return -1; ++ ++ suite_context.pref_mode = ODP_CRYPTO_ASYNC; ++ return 0; ++} ++ ++int crypto_suite_packet_sync_init(void) ++{ ++ suite_context.packet = true; ++ suite_context.op_mode = ODP_CRYPTO_SYNC; ++ ++ suite_context.pool = odp_pool_lookup("packet_pool"); ++ if (suite_context.pool == ODP_POOL_INVALID) ++ return -1; ++ ++ suite_context.queue = ODP_QUEUE_INVALID; ++ return 0; ++} ++ ++int crypto_suite_packet_async_init(void) ++{ ++ suite_context.packet = true; ++ suite_context.op_mode = ODP_CRYPTO_ASYNC; ++ ++ suite_context.pool = odp_pool_lookup("packet_pool"); ++ if (suite_context.pool == ODP_POOL_INVALID) ++ return -1; ++ ++ suite_context.queue = odp_queue_lookup("crypto-out"); ++ if (suite_context.queue == ODP_QUEUE_INVALID) ++ return -1; ++ return 0; ++} ++ ++odp_testinfo_t crypto_suite[] = { ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_null, ++ check_alg_null), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_null, ++ check_alg_null), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc, ++ check_alg_3des_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc, ++ check_alg_3des_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc_ovr_iv, ++ check_alg_3des_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc_ovr_iv, ++ check_alg_3des_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_cbc, ++ check_alg_aes_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cbc, ++ check_alg_aes_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_cbc_ovr_iv, ++ check_alg_aes_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cbc_ovr_iv, ++ check_alg_aes_cbc), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr, ++ check_alg_aes_ctr), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr, ++ check_alg_aes_ctr), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr_ovr_iv, ++ check_alg_aes_ctr), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr_ovr_iv, ++ check_alg_aes_ctr), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm, ++ check_alg_aes_gcm), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm_ovr_iv, ++ check_alg_aes_gcm), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_gcm, ++ 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_gen_alg_hmac_md5, ++ check_alg_hmac_md5), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_md5, ++ check_alg_hmac_md5), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha1, ++ check_alg_hmac_sha1), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha1, ++ check_alg_hmac_sha1), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha256, ++ check_alg_hmac_sha256), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha256, ++ check_alg_hmac_sha256), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha512, ++ check_alg_hmac_sha512), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha512, ++ check_alg_hmac_sha512), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac, ++ check_alg_aes_gmac), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac_ovr_iv, ++ check_alg_aes_gmac), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac, ++ check_alg_aes_gmac), ++ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac_ovr_iv, ++ check_alg_aes_gmac), ++ ODP_TEST_INFO_NULL, ++}; ++ ++int crypto_suite_term(void) ++{ ++ int i; ++ int first = 1; ++ ++ for (i = 0; crypto_suite[i].pName; i++) { ++ if (crypto_suite[i].check_active && ++ crypto_suite[i].check_active() == ODP_TEST_INACTIVE) { ++ if (first) { ++ first = 0; ++ printf("\n\n Inactive tests:\n"); ++ } ++ printf(" %s\n", crypto_suite[i].pName); ++ } ++ } ++ return 0; ++} ----------------------------------------------------------------------- Summary of changes: .travis.yml | 12 + Makefile.inc | 18 + configure.ac | 12 +- example/Makefile.inc | 12 +- example/ipfragreass/odp_ipfragreass.c | 4 +- example/ipsec_api/.gitignore | 2 +- example/l2fwd_simple/odp_l2fwd_simple.c | 3 +- example/l3fwd/odp_l3fwd_db.h | 4 +- example/switch/odp_switch.c | 4 +- example/traffic_mgmt/odp_traffic_mgmt.c | 1 + helper/Makefile.am | 12 +- helper/cuckootable.c | 8 +- helper/iplookuptable.c | 4 +- helper/m4/configure.m4 | 11 +- helper/test/linux/process.c | 2 + helper/test/linux/pthread.c | 2 + helper/threads.c | 1 + include/Makefile.am | 290 ++- include/README | 79 + .../api => include/odp/api/abi-default}/align.h | 12 +- include/odp/api/abi-default/atomic.h | 70 + .../odp/api/abi-default/barrier.h | 4 +- .../default/api/abi => api/abi-default}/buffer.h | 0 .../odp/api/abi-default/byteorder.h | 43 +- .../api/abi => api/abi-default}/classification.h | 0 .../odp/api/abi-default/cpu.h | 10 +- .../odp/api/abi-default/cpumask.h | 9 +- .../default/api/abi => api/abi-default}/crypto.h | 0 include/odp/api/abi-default/debug.h | 35 + .../default/api/abi => api/abi-default}/event.h | 0 .../odp/api/abi-default/init.h | 6 +- include/odp/api/abi-default/ipsec.h | 41 + .../default/api/abi => api/abi-default}/packet.h | 0 include/odp/api/abi-default/packet_flags.h | 24 + .../odp/api/abi-default/packet_io.h | 21 +- .../default/api/abi => api/abi-default}/pool.h | 0 .../default/api/abi => api/abi-default}/queue.h | 0 .../odp/api/abi-default/rwlock.h | 11 +- .../odp/api/abi-default/rwlock_recursive.h | 10 +- include/odp/api/abi-default/schedule.h | 39 + .../odp/api/abi-default}/schedule_types.h | 12 +- .../api/abi => api/abi-default}/shared_memory.h | 0 .../odp/api/abi-default/spinlock.h | 13 +- .../odp/api/abi-default/spinlock_recursive.h | 10 +- .../odp/api/abi-default/std_clib.h | 12 +- .../odp/api/abi-default}/std_types.h | 9 +- .../cpu.h => include/odp/api/abi-default/sync.h | 12 +- .../odp/api/abi-default/thread.h | 4 +- .../odp/api/abi-default/thrmask.h | 4 +- .../odp/api/abi-default/ticketlock.h | 11 +- .../odp/api/abi-default/time.h | 4 +- include/odp/api/abi-default/timer.h | 54 + .../odp/api/abi-default/traffic_mngr.h | 11 +- .../odp/api/abi-default/version.h | 4 +- .../odp/api/errno.h => include/odp/api/align.h | 11 +- include/odp/api/atomic.h | 28 + .../include => include}/odp/api/barrier.h | 8 +- .../include => include}/odp/api/buffer.h | 18 +- .../api/compiler.h => include/odp/api/byteorder.h | 16 +- .../include => include}/odp/api/chksum.h | 12 +- include/odp/api/classification.h | 33 + .../include => include}/odp/api/cpu.h | 6 +- .../include => include}/odp/api/cpumask.h | 6 +- .../include => include}/odp/api/crypto.h | 12 +- .../odp/api/cpu.h => include/odp/api/debug.h | 12 +- .../include => include}/odp/api/deprecated.h | 4 +- .../include => include}/odp/api/errno.h | 5 +- .../include => include}/odp/api/event.h | 14 +- .../include => include}/odp/api/feature.h | 12 +- .../include => include}/odp/api/hash.h | 12 +- .../include => include}/odp/api/hints.h | 12 +- .../include => include}/odp/api/init.h | 14 +- .../include => include}/odp/api/ipsec.h | 14 +- include/odp/api/packet.h | 33 + .../include => include}/odp/api/packet_flags.h | 9 +- .../include => include}/odp/api/packet_io.h | 14 +- .../include => include}/odp/api/packet_io_stats.h | 4 +- .../include => include}/odp/api/pool.h | 17 +- include/odp/api/queue.h | 32 + .../include => include}/odp/api/random.h | 12 +- .../include => include}/odp/api/rwlock.h | 6 +- .../include => include}/odp/api/rwlock_recursive.h | 6 +- .../include => include}/odp/api/schedule.h | 15 +- .../include => include}/odp/api/schedule_types.h | 6 +- .../include => include}/odp/api/shared_memory.h | 14 +- include/odp/api/spec/align.h | 4 +- include/odp/api/spec/atomic.h | 4 +- include/odp/api/spec/barrier.h | 4 +- include/odp/api/spec/buffer.h | 4 +- include/odp/api/spec/byteorder.h | 4 +- include/odp/api/spec/chksum.h | 4 +- include/odp/api/spec/classification.h | 15 +- include/odp/api/spec/cpu.h | 7 +- include/odp/api/spec/cpumask.h | 4 +- include/odp/api/spec/crypto.h | 4 +- include/odp/api/spec/debug.h | 4 +- include/odp/api/spec/deprecated.h.in | 4 +- include/odp/api/spec/errno.h | 4 +- include/odp/api/spec/event.h | 4 +- include/odp/api/spec/feature.h | 4 +- include/odp/api/spec/hash.h | 4 +- include/odp/api/spec/hints.h | 4 +- include/odp/api/spec/init.h | 4 +- include/odp/api/spec/ipsec.h | 4 +- include/odp/api/spec/packet.h | 4 +- include/odp/api/spec/packet_flags.h | 4 +- include/odp/api/spec/packet_io.h | 4 +- include/odp/api/spec/packet_io_stats.h | 4 +- include/odp/api/spec/pool.h | 4 +- include/odp/api/spec/queue.h | 9 +- include/odp/api/spec/random.h | 4 +- include/odp/api/spec/rwlock.h | 4 +- include/odp/api/spec/rwlock_recursive.h | 4 +- include/odp/api/spec/schedule.h | 24 +- include/odp/api/spec/schedule_types.h | 14 +- include/odp/api/spec/shared_memory.h | 4 +- include/odp/api/spec/spinlock.h | 4 +- include/odp/api/spec/spinlock_recursive.h | 4 +- include/odp/api/spec/std_clib.h | 4 +- include/odp/api/spec/std_types.h | 4 +- include/odp/api/spec/support.h | 4 +- include/odp/api/spec/sync.h | 4 +- include/odp/api/spec/system_info.h | 4 +- include/odp/api/spec/thread.h | 4 +- include/odp/api/spec/threshold.h | 5 +- include/odp/api/spec/thrmask.h | 4 +- include/odp/api/spec/ticketlock.h | 4 +- include/odp/api/spec/time.h | 4 +- include/odp/api/spec/timer.h | 4 +- include/odp/api/spec/traffic_mngr.h | 4 +- include/odp/api/spec/version.h.in | 4 +- .../include => include}/odp/api/spinlock.h | 6 +- .../odp/api/spinlock_recursive.h | 6 +- .../odp/api/cpu.h => include/odp/api/std_clib.h | 15 +- include/odp/api/std_types.h | 29 + .../include => include}/odp/api/support.h | 12 +- .../odp/api/cpu.h => include/odp/api/sync.h | 12 +- .../include => include}/odp/api/system_info.h | 5 +- .../include => include}/odp/api/thread.h | 6 +- .../include => include}/odp/api/threshold.h | 12 +- .../include => include}/odp/api/thrmask.h | 14 +- .../include => include}/odp/api/ticketlock.h | 10 +- .../include => include}/odp/api/time.h | 8 +- .../include => include}/odp/api/timer.h | 20 +- .../include => include}/odp/api/traffic_mngr.h | 13 +- .../include => include}/odp/api/version.h | 7 +- include/odp/arch/arm32-linux/odp/api/abi/align.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/atomic.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/barrier.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/byteorder.h | 7 + .../arch/arm32-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/cpu.h | 6 +- include/odp/arch/arm32-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/debug.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/event.h | 2 +- include/odp/arch/arm32-linux/odp/api/abi/init.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/ipsec.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/packet.h | 2 +- .../arch/arm32-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/packet_io.h | 7 + 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 | 7 + .../arm32-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/schedule.h | 7 + .../arch/arm32-linux/odp/api/abi/schedule_types.h | 7 + .../arch/arm32-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/arm32-linux/odp/api/abi/spinlock.h | 7 + .../arm32-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/sync.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/thread.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/arm32-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/time.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/timer.h | 7 + .../arch/arm32-linux/odp/api/abi/traffic_mngr.h | 7 + include/odp/arch/arm32-linux/odp/api/abi/version.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/align.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/atomic.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/barrier.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/byteorder.h | 7 + .../arch/arm64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/cpu.h | 6 +- include/odp/arch/arm64-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/debug.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/arm64-linux/odp/api/abi/init.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/ipsec.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/packet.h | 2 +- .../arch/arm64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/packet_io.h | 7 + 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 | 7 + .../arm64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/schedule.h | 7 + .../arch/arm64-linux/odp/api/abi/schedule_types.h | 7 + .../arch/arm64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/arm64-linux/odp/api/abi/spinlock.h | 7 + .../arm64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/sync.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/thread.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/arm64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/time.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/timer.h | 7 + .../arch/arm64-linux/odp/api/abi/traffic_mngr.h | 7 + include/odp/arch/arm64-linux/odp/api/abi/version.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/align.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/barrier.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/byteorder.h | 7 + .../arch/mips64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/cpu.h | 10 +- .../odp/arch/mips64-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/debug.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/mips64-linux/odp/api/abi/init.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/ipsec.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/packet.h | 2 +- .../arch/mips64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/packet_io.h | 7 + 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 | 7 + .../mips64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/schedule.h | 7 + .../arch/mips64-linux/odp/api/abi/schedule_types.h | 7 + .../arch/mips64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/mips64-linux/odp/api/abi/spinlock.h | 7 + .../mips64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/sync.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/thread.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/time.h | 7 + include/odp/arch/mips64-linux/odp/api/abi/timer.h | 7 + .../arch/mips64-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/mips64-linux/odp/api/abi/version.h | 7 + include/odp/arch/power64-linux/odp/api/abi/align.h | 7 + .../odp/arch/power64-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/power64-linux/odp/api/abi/barrier.h | 7 + .../odp/arch/power64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/byteorder.h | 7 + .../power64-linux/odp/api/abi/classification.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/cpu.h | 8 + .../odp/arch/power64-linux/odp/api/abi/cpumask.h | 7 + .../odp/arch/power64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/debug.h | 7 + include/odp/arch/power64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/power64-linux/odp/api/abi/init.h | 7 + include/odp/arch/power64-linux/odp/api/abi/ipsec.h | 7 + .../odp/arch/power64-linux/odp/api/abi/packet.h | 2 +- .../arch/power64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/power64-linux/odp/api/abi/packet_io.h | 7 + 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 | 7 + .../power64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/power64-linux/odp/api/abi/schedule.h | 7 + .../power64-linux/odp/api/abi/schedule_types.h | 7 + .../arch/power64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/power64-linux/odp/api/abi/spinlock.h | 7 + .../power64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/power64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/power64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/power64-linux/odp/api/abi/sync.h | 7 + .../odp/arch/power64-linux/odp/api/abi/thread.h | 7 + .../odp/arch/power64-linux/odp/api/abi/thrmask.h | 7 + .../arch/power64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/power64-linux/odp/api/abi/time.h | 7 + include/odp/arch/power64-linux/odp/api/abi/timer.h | 7 + .../arch/power64-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/power64-linux/odp/api/abi/version.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/align.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/barrier.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/byteorder.h | 7 + .../arch/x86_32-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/cpu.h | 6 +- .../odp/arch/x86_32-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/debug.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/event.h | 2 +- include/odp/arch/x86_32-linux/odp/api/abi/init.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/packet.h | 2 +- .../arch/x86_32-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/packet_io.h | 7 + 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 | 7 + .../x86_32-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/schedule.h | 7 + .../arch/x86_32-linux/odp/api/abi/schedule_types.h | 7 + .../arch/x86_32-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/x86_32-linux/odp/api/abi/spinlock.h | 7 + .../x86_32-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/sync.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/thread.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/time.h | 7 + include/odp/arch/x86_32-linux/odp/api/abi/timer.h | 7 + .../arch/x86_32-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/x86_32-linux/odp/api/abi/version.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/align.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/atomic.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/barrier.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/buffer.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/byteorder.h | 7 + .../arch/x86_64-linux/odp/api/abi/classification.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/cpu.h | 7 +- .../odp/arch/x86_64-linux/odp/api/abi/cpumask.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/crypto.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/debug.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/event.h | 2 +- include/odp/arch/x86_64-linux/odp/api/abi/init.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/packet.h | 2 +- .../arch/x86_64-linux/odp/api/abi/packet_flags.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/packet_io.h | 7 + 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 | 7 + .../x86_64-linux/odp/api/abi/rwlock_recursive.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/schedule.h | 7 + .../arch/x86_64-linux/odp/api/abi/schedule_types.h | 7 + .../arch/x86_64-linux/odp/api/abi/shared_memory.h | 2 +- .../odp/arch/x86_64-linux/odp/api/abi/spinlock.h | 7 + .../x86_64-linux/odp/api/abi/spinlock_recursive.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/std_clib.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/std_types.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/sync.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/thread.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/thrmask.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/ticketlock.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/time.h | 7 + include/odp/arch/x86_64-linux/odp/api/abi/timer.h | 7 + .../arch/x86_64-linux/odp/api/abi/traffic_mngr.h | 7 + .../odp/arch/x86_64-linux/odp/api/abi/version.h | 7 + .../include => include}/odp/visibility_begin.h | 0 .../include => include}/odp/visibility_end.h | 0 include/odp_api.h | 1 - platform/Makefile.inc | 2 +- platform/linux-generic/.gitignore | 1 - platform/linux-generic/Makefile.am | 174 +- .../api/cpu_arch.h => aarch64/odp/api/abi/cpu.h} | 8 +- .../arch/arm/odp/api/{cpu_arch.h => abi/cpu.h} | 8 +- .../arch/mips64/odp/api/{cpu_arch.h => abi/cpu.h} | 6 +- .../linux-generic/arch/powerpc/odp/api/abi/cpu.h | 8 + platform/linux-generic/arch/x86/cpu_flags.c | 2 +- .../arch/x86/odp/api/{cpu_arch.h => abi/cpu.h} | 8 +- .../linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- .../linux-generic/include-abi/odp/api/abi/align.h | 7 + .../linux-generic/include-abi/odp/api/abi/atomic.h | 76 + .../odp/api/abi/barrier.h} | 6 +- .../odp/api/abi/buffer.h} | 11 +- .../odp/api/abi/byteorder.h} | 15 +- .../odp/api/abi/classification.h} | 11 +- .../include-abi/odp/api/abi/cpumask.h | 7 + .../odp/api/abi/crypto.h} | 11 +- .../odp/api => include-abi/odp/api/abi}/debug.h | 19 +- .../odp/api/abi/event.h} | 12 +- .../linux-generic/include-abi/odp/api/abi/init.h | 7 + .../odp/api/abi/ipsec.h} | 4 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 71 + .../include-abi/odp/api/abi/packet_flags.h | 27 + .../odp/api/abi/packet_io.h} | 10 +- .../odp/api/abi/pool.h} | 26 +- .../odp/api/abi/queue.h} | 11 +- .../linux-generic/include-abi/odp/api/abi/rwlock.h | 7 + .../include-abi/odp/api/abi/rwlock_recursive.h | 7 + .../include-abi/odp/api/abi/schedule.h | 7 + .../include-abi/odp/api/abi/schedule_types.h | 7 + .../odp/api/abi/shared_memory.h} | 11 +- .../include-abi/odp/api/abi/spinlock.h | 7 + .../include-abi/odp/api/abi/spinlock_recursive.h | 7 + .../include-abi/odp/api/abi/std_clib.h | 27 + .../include-abi/odp/api/abi/std_types.h | 7 + .../linux-generic/include-abi/odp/api/abi/sync.h | 35 + .../linux-generic/include-abi/odp/api/abi/thread.h | 7 + .../include-abi/odp/api/abi/thrmask.h | 7 + .../include-abi/odp/api/abi/ticketlock.h | 45 + .../linux-generic/include-abi/odp/api/abi/time.h | 7 + .../odp/api/abi/timer.h} | 4 +- .../include-abi/odp/api/abi/traffic_mngr.h | 7 + .../include-abi/odp/api/abi/version.h | 7 + .../include/odp/api/plat/atomic_inlines.h | 315 ++- .../include/odp/api/plat/byteorder_inlines.h | 22 + .../include/odp/api/plat/packet_flag_inlines.h | 19 +- .../plat/{packet_types.h => packet_inline_types.h} | 53 +- .../include/odp/api/plat/packet_inlines.h | 30 +- .../include/odp/api/plat/pool_inline_types.h | 37 + .../plat/{static_inline.h.in => static_inline.h} | 2 +- .../include/odp/api/plat/std_clib_inlines.h | 1 - .../include/odp/api/plat/strong_types.h | 2 + .../include/odp/api/plat/ticketlock_inlines.h | 20 - .../include/odp/api/plat/ticketlock_inlines_api.h | 6 + platform/linux-generic/include/odp/api/std_clib.h | 28 - .../linux-generic/include/odp_atomic_internal.h | 217 +- .../linux-generic/include/odp_buffer_internal.h | 4 +- .../linux-generic/include/odp_ipsec_internal.h | 2 +- platform/linux-generic/include/odp_packet_dpdk.h | 8 +- .../linux-generic/include/odp_packet_internal.h | 7 +- .../linux-generic/include/odp_packet_io_internal.h | 26 + .../include/odp_packet_io_ring_internal.h | 10 +- platform/linux-generic/include/odp_packet_netmap.h | 4 +- platform/linux-generic/include/odp_packet_socket.h | 6 +- platform/linux-generic/include/odp_pool_internal.h | 10 +- .../linux-generic/include/odp_queue_internal.h | 5 +- .../include/odp_queue_scalable_internal.h | 5 +- platform/linux-generic/include/odp_ring_internal.h | 4 +- .../linux-generic/include/odp_schedule_scalable.h | 24 +- .../include/odp_schedule_scalable_ordered.h | 8 +- platform/linux-generic/m4/configure.m4 | 1 - platform/linux-generic/odp_atomic.c | 3 - platform/linux-generic/odp_atomic_api.c | 13 + platform/linux-generic/odp_byteorder.c | 5 +- platform/linux-generic/odp_name_table.c | 8 +- platform/linux-generic/odp_packet.c | 9 +- platform/linux-generic/odp_packet_api.c | 28 + platform/linux-generic/odp_packet_flags.c | 5 - platform/linux-generic/odp_packet_flags_api.c | 15 + platform/linux-generic/odp_packet_io.c | 72 +- platform/linux-generic/odp_pkt_queue.c | 9 +- platform/linux-generic/odp_pool.c | 3 +- platform/linux-generic/odp_queue_scalable.c | 1 + platform/linux-generic/odp_schedule.c | 18 +- platform/linux-generic/odp_schedule_iquery.c | 14 +- platform/linux-generic/odp_schedule_sp.c | 12 +- platform/linux-generic/odp_std_clib.c | 5 +- platform/linux-generic/odp_sync.c | 5 +- platform/linux-generic/odp_ticketlock.c | 12 +- platform/linux-generic/odp_timer.c | 12 +- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/netmap.c | 117 +- platform/linux-generic/pktio/pktio_common.c | 125 + platform/linux-generic/pktio/socket.c | 86 + platform/linux-generic/pktio/socket_mmap.c | 97 +- platform/linux-generic/test/ring/Makefile.am | 3 + scripts/checkpatch.pl | 1 + test/Makefile.inc | 18 +- test/performance/odp_l2fwd.c | 4 +- test/performance/odp_pktio_ordered.c | 4 +- test/performance/odp_sched_latency.c | 4 +- test/performance/odp_scheduling.c | 4 +- test/validation/api/chksum/chksum.c | 6 +- test/validation/api/crypto/odp_crypto_test_inp.c | 2655 ++++++++++---------- test/validation/api/crypto/test_vectors.h | 251 +- test/validation/api/crypto/test_vectors_len.h | 6 +- 466 files changed, 5523 insertions(+), 2775 deletions(-) create mode 100644 Makefile.inc create mode 100644 include/README rename {platform/linux-generic/include/odp/api => include/odp/api/abi-default}/align.h (77%) create mode 100644 include/odp/api/abi-default/atomic.h copy platform/linux-generic/include/odp/api/plat/barrier_types.h => include/odp/api/abi-default/barrier.h (89%) rename include/odp/{arch/default/api/abi => api/abi-default}/buffer.h (100%) copy platform/linux-generic/include/odp/api/plat/byteorder_types.h => include/odp/api/abi-default/byteorder.h (51%) rename include/odp/{arch/default/api/abi => api/abi-default}/classification.h (100%) rename platform/linux-generic/arch/default/odp/api/cpu_arch.h => include/odp/api/abi-default/cpu.h (61%) rename platform/linux-generic/include/odp/api/plat/cpumask_types.h => include/odp/api/abi-default/cpumask.h (85%) rename include/odp/{arch/default/api/abi => api/abi-default}/crypto.h (100%) create mode 100644 include/odp/api/abi-default/debug.h rename include/odp/{arch/default/api/abi => api/abi-default}/event.h (100%) rename platform/linux-generic/include/odp/api/plat/init_types.h => include/odp/api/abi-default/init.h (79%) create mode 100644 include/odp/api/abi-default/ipsec.h rename include/odp/{arch/default/api/abi => api/abi-default}/packet.h (100%) create mode 100644 include/odp/api/abi-default/packet_flags.h copy platform/linux-generic/include/odp/api/plat/packet_io_types.h => include/odp/api/abi-default/packet_io.h (68%) rename include/odp/{arch/default/api/abi => api/abi-default}/pool.h (100%) rename include/odp/{arch/default/api/abi => api/abi-default}/queue.h (100%) rename platform/linux-generic/include/odp/api/plat/rwlock_types.h => include/odp/api/abi-default/rwlock.h (75%) rename platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h => include/odp/api/abi-default/rwlock_recursive.h (78%) create mode 100644 include/odp/api/abi-default/schedule.h rename {platform/linux-generic/include/odp/api/plat => include/odp/api/abi-default}/schedule_types.h (81%) rename include/odp/{arch/default/api/abi => api/abi-default}/shared_memory.h (100%) rename platform/linux-generic/include/odp/api/plat/spinlock_types.h => include/odp/api/abi-default/spinlock.h (65%) rename platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h => include/odp/api/abi-default/spinlock_recursive.h (71%) copy platform/linux-generic/include/odp/api/cpu.h => include/odp/api/abi-default/std_clib.h (51%) rename {platform/linux-generic/include/odp/api => include/odp/api/abi-default}/std_types.h (83%) copy platform/linux-generic/include/odp/api/cpu.h => include/odp/api/abi-default/sync.h (51%) rename platform/linux-generic/include/odp/api/plat/thread_types.h => include/odp/api/abi-default/thread.h (85%) rename platform/linux-generic/include/odp/api/plat/thrmask_types.h => include/odp/api/abi-default/thrmask.h (91%) rename platform/linux-generic/include/odp/api/plat/ticketlock_types.h => include/odp/api/abi-default/ticketlock.h (72%) rename platform/linux-generic/include/odp/api/plat/time_types.h => include/odp/api/abi-default/time.h (93%) create mode 100644 include/odp/api/abi-default/timer.h rename platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h => include/odp/api/abi-default/traffic_mngr.h (95%) rename platform/linux-generic/include/odp/api/plat/version_types.h => include/odp/api/abi-default/version.h (91%) copy platform/linux-generic/include/odp/api/errno.h => include/odp/api/align.h (50%) create mode 100644 include/odp/api/atomic.h rename {platform/linux-generic/include => include}/odp/api/barrier.h (70%) rename {platform/linux-generic/include => include}/odp/api/buffer.h (58%) rename platform/linux-generic/include/odp/api/compiler.h => include/odp/api/byteorder.h (56%) rename {platform/linux-generic/include => include}/odp/api/chksum.h (72%) create mode 100644 include/odp/api/classification.h copy {platform/linux-generic/include => include}/odp/api/cpu.h (76%) rename {platform/linux-generic/include => include}/odp/api/cpumask.h (74%) rename {platform/linux-generic/include => include}/odp/api/crypto.h (64%) copy platform/linux-generic/include/odp/api/cpu.h => include/odp/api/debug.h (51%) rename {platform/linux-generic/include => include}/odp/api/deprecated.h (82%) rename {platform/linux-generic/include => include}/odp/api/errno.h (83%) rename {platform/linux-generic/include => include}/odp/api/event.h (65%) rename {platform/linux-generic/include => include}/odp/api/feature.h (71%) rename {platform/linux-generic/include => include}/odp/api/hash.h (73%) rename {platform/linux-generic/include => include}/odp/api/hints.h (71%) rename {platform/linux-generic/include => include}/odp/api/init.h (65%) rename {platform/linux-generic/include => include}/odp/api/ipsec.h (67%) create mode 100644 include/odp/api/packet.h rename {platform/linux-generic/include => include}/odp/api/packet_flags.h (60%) rename {platform/linux-generic/include => include}/odp/api/packet_io.h (57%) rename {platform/linux-generic/include => include}/odp/api/packet_io_stats.h (79%) rename {platform/linux-generic/include => include}/odp/api/pool.h (54%) create mode 100644 include/odp/api/queue.h rename {platform/linux-generic/include => include}/odp/api/random.h (70%) rename {platform/linux-generic/include => include}/odp/api/rwlock.h (75%) rename {platform/linux-generic/include => include}/odp/api/rwlock_recursive.h (70%) rename {platform/linux-generic/include => include}/odp/api/schedule.h (63%) rename {platform/linux-generic/include => include}/odp/api/schedule_types.h (71%) rename {platform/linux-generic/include => include}/odp/api/shared_memory.h (62%) rename {platform/linux-generic/include => include}/odp/api/spinlock.h (73%) rename {platform/linux-generic/include => include}/odp/api/spinlock_recursive.h (69%) copy platform/linux-generic/include/odp/api/cpu.h => include/odp/api/std_clib.h (55%) create mode 100644 include/odp/api/std_types.h rename {platform/linux-generic/include => include}/odp/api/support.h (73%) rename platform/linux-generic/include/odp/api/cpu.h => include/odp/api/sync.h (51%) rename {platform/linux-generic/include => include}/odp/api/system_info.h (82%) rename {platform/linux-generic/include => include}/odp/api/thread.h (74%) rename {platform/linux-generic/include => include}/odp/api/threshold.h (72%) rename {platform/linux-generic/include => include}/odp/api/thrmask.h (65%) rename {platform/linux-generic/include => include}/odp/api/ticketlock.h (60%) rename {platform/linux-generic/include => include}/odp/api/time.h (76%) rename {platform/linux-generic/include => include}/odp/api/timer.h (54%) rename {platform/linux-generic/include => include}/odp/api/traffic_mngr.h (62%) rename {platform/linux-generic/include => include}/odp/api/version.h (73%) create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/align.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/byteorder.h copy platform/linux-generic/arch/arm/odp/api/cpu_arch.h => include/odp/arch/arm32-linux/odp/api/abi/cpu.h (84%) create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/debug.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/align.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/byteorder.h rename platform/linux-generic/arch/aarch64/odp/api/cpu_arch.h => include/odp/arch/arm64-linux/odp/api/abi/cpu.h (84%) create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/debug.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/align.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/byteorder.h copy platform/linux-generic/arch/mips64/odp/api/cpu_arch.h => include/odp/arch/mips64-linux/odp/api/abi/cpu.h (65%) create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/debug.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/align.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/byteorder.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/cpu.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/debug.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/align.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h copy platform/linux-generic/arch/x86/odp/api/cpu_arch.h => include/odp/arch/x86_32-linux/odp/api/abi/cpu.h (79%) create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/debug.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/version.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/align.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/atomic.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/barrier.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h rename platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h => include/odp/arch/x86_64-linux/odp/api/abi/cpu.h (65%) create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/debug.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/init.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/schedule.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/std_types.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/sync.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/thread.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/time.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/timer.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/version.h rename {platform/linux-generic/include => include}/odp/visibility_begin.h (100%) rename {platform/linux-generic/include => include}/odp/visibility_end.h (100%) copy platform/linux-generic/arch/{arm/odp/api/cpu_arch.h => aarch64/odp/api/abi/cpu.h} (77%) rename platform/linux-generic/arch/arm/odp/api/{cpu_arch.h => abi/cpu.h} (77%) rename platform/linux-generic/arch/mips64/odp/api/{cpu_arch.h => abi/cpu.h} (83%) create mode 100644 platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h rename platform/linux-generic/arch/x86/odp/api/{cpu_arch.h => abi/cpu.h} (69%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/align.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/atomic.h rename platform/linux-generic/{include/odp/api/plat/barrier_types.h => include-abi/odp/api/abi/barrier.h} (82%) rename platform/linux-generic/{include/odp/api/plat/buffer_types.h => include-abi/odp/api/abi/buffer.h} (73%) rename platform/linux-generic/{include/odp/api/plat/byteorder_types.h => include-abi/odp/api/abi/byteorder.h} (85%) rename platform/linux-generic/{include/odp/api/plat/classification_types.h => include-abi/odp/api/abi/classification.h} (74%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/cpumask.h rename platform/linux-generic/{include/odp/api/plat/crypto_types.h => include-abi/odp/api/abi/crypto.h} (71%) rename platform/linux-generic/{include/odp/api => include-abi/odp/api/abi}/debug.h (74%) rename platform/linux-generic/{include/odp/api/plat/event_types.h => include-abi/odp/api/abi/event.h} (80%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/init.h rename platform/linux-generic/{include/odp/api/plat/ipsec_types.h => include-abi/odp/api/abi/ipsec.h} (88%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/packet.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/packet_flags.h rename platform/linux-generic/{include/odp/api/plat/packet_io_types.h => include-abi/odp/api/abi/packet_io.h} (83%) rename platform/linux-generic/{include/odp/api/plat/pool_types.h => include-abi/odp/api/abi/pool.h} (52%) rename platform/linux-generic/{include/odp/api/plat/queue_types.h => include-abi/odp/api/abi/queue.h} (74%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/rwlock.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/rwlock_recursive.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/schedule.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/schedule_types.h rename platform/linux-generic/{include/odp/api/plat/shared_memory_types.h => include-abi/odp/api/abi/shared_memory.h} (73%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/spinlock.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/spinlock_recursive.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/std_clib.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/std_types.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/sync.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/thread.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/thrmask.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/ticketlock.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/time.h rename platform/linux-generic/{include/odp/api/plat/timer_types.h => include-abi/odp/api/abi/timer.h} (92%) create mode 100644 platform/linux-generic/include-abi/odp/api/abi/traffic_mngr.h create mode 100644 platform/linux-generic/include-abi/odp/api/abi/version.h rename platform/linux-generic/include/odp/api/plat/{packet_types.h => packet_inline_types.h} (78%) create mode 100644 platform/linux-generic/include/odp/api/plat/pool_inline_types.h rename platform/linux-generic/include/odp/api/plat/{static_inline.h.in => static_inline.h} (96%) delete mode 100644 platform/linux-generic/include/odp/api/std_clib.h create mode 100644 platform/linux-generic/odp_atomic_api.c create mode 100644 platform/linux-generic/odp_packet_api.c create mode 100644 platform/linux-generic/odp_packet_flags_api.c hooks/post-receive --

7 years, 5 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-37-g04c5bbe3

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 04c5bbe3d84aa46bd504e647e82a06cb00fe4555 (commit) via 6c0942658b564835e200def502c053f63d55c400 (commit) via 4b06ab1aadb653958dd49b62899929e2720b5c9f (commit) via ea2c187b7ba3ca3b9e21624b139c871c2bd8f11c (commit) via fdcaa6d73a4c577ea92d69d95d851c1b2de86c61 (commit) via fac80a8a4b26b863a85266cd62fb07a5e2cd84e4 (commit) via 13171a0c3f83e905a99250fdfca925231dcaa7e2 (commit) via 4b5776e8e8bbec6340392af74b7ee7a18c191b52 (commit) via 76b9155ed01abcd3287b659d35b9217f77b81cc2 (commit) via d59a6b8a1b049ab3e978accbd420eb25993a5997 (commit) via 8609d2eba06d8e964daff5cb8ecb81bb802ea585 (commit) via cd793bfd9667e25db7cb1dbd9c276374e0ee879b (commit) via 09188114d855456920113c8d6889c5c1e2451d75 (commit) via 8296d0e9a91e2a435ec780052e22095563dfbf12 (commit) via d831814b8d0a1d7817f014aae91031dafd1ceeb6 (commit) via ee5d0385064f4bacb511cfd497abcd014930ffaa (commit) via 5d44e562a5c0c1252dbfd11b49c87084767da2e2 (commit) from e77675624b9cfcd6ea83d11804ed0715b7fad2ec (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 04c5bbe3d84aa46bd504e647e82a06cb00fe4555 Merge: e7767562 6c094265 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jan 19 18:40:40 2018 +0300 Merge commit '6c094265' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> ----------------------------------------------------------------------- Summary of changes: .shippable.yml | 2 + doc/implementers-guide/Makefile.am | 6 +- doc/users-guide/Makefile.am | 6 ++ example/Makefile.inc | 2 +- example/ipfragreass/Makefile.am | 2 + example/ipsec/Makefile.am | 1 + example/ipsec_api/Makefile.am | 30 ++++---- ...sec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} | 2 +- ...c_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} | 2 +- ...ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} | 2 +- ..._tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} | 2 +- ...c_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} | 2 +- ...esp_tun_out.sh => odp_ipsec_api_run_esp_out.sh} | 2 +- ...p_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} | 2 +- ...esp_out.sh => odp_ipsec_api_run_esp_tun_out.sh} | 2 +- ...ipsec_run_live.sh => odp_ipsec_api_run_live.sh} | 2 +- ...c_run_router.sh => odp_ipsec_api_run_router.sh} | 2 +- ...c_run_simple.sh => odp_ipsec_api_run_simple.sh} | 2 +- helper/Makefile.am | 3 + helper/test/Makefile.am | 24 +------ m4/odp_dpdk.m4 | 83 +++++++++++++++++----- platform/linux-generic/Makefile.am | 3 +- platform/linux-generic/libodp-linux.pc.in | 4 +- platform/linux-generic/m4/odp_dpdk.m4 | 24 +------ platform/linux-generic/test/Makefile.inc | 22 ------ platform/linux-generic/test/ring/Makefile.am | 6 +- .../linux-generic/test/validation/Makefile.inc | 1 - .../linux-generic/test/validation/api/Makefile.inc | 2 +- .../test/validation/api/shmem/Makefile.am | 9 +-- test/Makefile.inc | 17 +++-- test/performance/odp_crypto.c | 2 +- test/validation/api/Makefile.am | 2 +- test/validation/api/Makefile.inc | 12 +--- test/validation/api/atomic/Makefile.am | 1 - test/validation/api/barrier/Makefile.am | 1 - test/validation/api/buffer/Makefile.am | 1 - test/validation/api/chksum/Makefile.am | 1 - test/validation/api/classification/Makefile.am | 1 - test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 1 - test/validation/api/errno/Makefile.am | 1 - test/validation/api/event/Makefile.am | 1 - test/validation/api/hash/Makefile.am | 1 - test/validation/api/init/Makefile.am | 3 - test/validation/api/ipsec/Makefile.am | 5 +- test/validation/api/lock/Makefile.am | 1 - test/validation/api/packet/Makefile.am | 1 - test/validation/api/pktio/Makefile.am | 1 - test/validation/api/pool/Makefile.am | 1 - test/validation/api/queue/Makefile.am | 1 - test/validation/api/random/Makefile.am | 1 - test/validation/api/scheduler/Makefile.am | 1 - test/validation/api/shmem/Makefile.am | 1 - test/validation/api/std_clib/Makefile.am | 1 - test/validation/api/system/Makefile.am | 1 - test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 11 --- test/validation/api/time/time.c | 18 +++-- test/validation/api/timer/Makefile.am | 1 - test/validation/api/traffic_mngr/Makefile.am | 2 +- 60 files changed, 157 insertions(+), 191 deletions(-) rename example/ipsec_api/{odp_ipsec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_out.sh => odp_ipsec_api_run_esp_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_out.sh => odp_ipsec_api_run_esp_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_live.sh => odp_ipsec_api_run_live.sh} (94%) rename example/ipsec_api/{odp_ipsec_run_router.sh => odp_ipsec_api_run_router.sh} (85%) rename example/ipsec_api/{odp_ipsec_run_simple.sh => odp_ipsec_api_run_simple.sh} (87%) delete mode 100644 platform/linux-generic/test/Makefile.inc delete mode 100644 platform/linux-generic/test/validation/Makefile.inc hooks/post-receive --

7 years, 5 months

[COMMIT] branch caterpillar updated. v1.15.0.0-960-g987d61ca

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, caterpillar has been updated via 987d61cab96bbc7bb6a144d8b9f5250c076c1328 (commit) from 8f1b3e72d5aa42a336978445a5011758f8044622 (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 987d61cab96bbc7bb6a144d8b9f5250c076c1328 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Tue Jan 16 13:07:22 2018 +0100 pktio: honor config.h settings It's not enough to chech if a macro is defined to enable or disable a pktio, we also need to check if it is set to 1 to match the description in config.h Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index fed562aa..72ba6ac1 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -145,7 +145,7 @@ typedef struct { /* Result for crypto packet op */ odp_crypto_packet_result_t crypto_op_result; -#ifdef ODP_PKTIO_DPDK +#if defined(ODP_PKTIO_DPDK) && ODP_PKTIO_DPDK == 1 /* Type of extra data */ uint8_t extra_type; /* Extra space for packet descriptors. E.g. DPDK mbuf */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 7d39bb1b..3f716ab1 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -6,7 +6,7 @@ #include "config.h" -#ifdef ODP_PKTIO_DPDK +#if defined(ODP_PKTIO_DPDK) && ODP_PKTIO_DPDK == 1 #include <odp_posix_extensions.h> diff --git a/platform/linux-generic/pktio/dpdk.h b/platform/linux-generic/pktio/dpdk.h index 7495b596..d4e8cf06 100644 --- a/platform/linux-generic/pktio/dpdk.h +++ b/platform/linux-generic/pktio/dpdk.h @@ -13,7 +13,7 @@ #include <net/if.h> -#ifdef ODP_PKTIO_DPDK +#if defined(ODP_PKTIO_DPDK) && ODP_PKTIO_DPDK == 1 #include <rte_config.h> #include <rte_mbuf.h> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 9d928c72..4ca7d64e 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -6,7 +6,7 @@ #include "config.h" -#ifdef ODP_PKTIO_IPC +#if defined(ODP_PKTIO_IPC) && ODP_PKTIO_IPC == 1 #include <odp_debug_internal.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/pktio/mdev.c b/platform/linux-generic/pktio/mdev.c index 45ea2d11..e3917146 100644 --- a/platform/linux-generic/pktio/mdev.c +++ b/platform/linux-generic/pktio/mdev.c @@ -6,7 +6,7 @@ #include "config.h" -#ifdef ODP_MDEV +#if defined(ODP_MDEV) && ODP_MDEV == 1 #include <dirent.h> #include <errno.h> diff --git a/platform/linux-generic/pktio/mdev/cxgb4.c b/platform/linux-generic/pktio/mdev/cxgb4.c index 31c3a9f5..f09835d9 100644 --- a/platform/linux-generic/pktio/mdev/cxgb4.c +++ b/platform/linux-generic/pktio/mdev/cxgb4.c @@ -6,7 +6,7 @@ #include "config.h" -#ifdef ODP_MDEV +#if defined(ODP_MDEV) && ODP_MDEV == 1 #include <linux/types.h> #include <protocols/eth.h> diff --git a/platform/linux-generic/pktio/mdev/i40e.c b/platform/linux-generic/pktio/mdev/i40e.c index c69da09c..6f3b7171 100644 --- a/platform/linux-generic/pktio/mdev/i40e.c +++ b/platform/linux-generic/pktio/mdev/i40e.c @@ -6,7 +6,7 @@ #include "config.h" -#ifdef ODP_MDEV +#if defined(ODP_MDEV) && ODP_MDEV == 1 #include <linux/types.h> #include <protocols/eth.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 2631c816..fc17da07 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -6,7 +6,7 @@ #include "config.h" -#ifdef ODP_NETMAP +#if defined(ODP_NETMAP) && ODP_NETMAP == 1 #include <odp_posix_extensions.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 320de973..6c98bc60 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -7,7 +7,7 @@ #include "config.h" -#ifdef ODP_PKTIO_SOCKET +#if defined(ODP_PKTIO_SOCKET) && ODP_PKTIO_SOCKET == 1 #include <odp_posix_extensions.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 26d0a295..1e49d5b2 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -7,7 +7,7 @@ #include "config.h" -#ifdef ODP_PKTIO_SOCKET_MMAP +#if defined(ODP_PKTIO_SOCKET_MMAP) && ODP_PKTIO_SOCKET_MMAP == 1 #include <odp_posix_extensions.h> diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index 9ba3f877..199ed83f 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -22,29 +22,29 @@ ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) /* Temporary variable to enable link modules, * will remove in Makefile scheme changes. */ -#ifdef ODP_PKTIO_DPDK +#if defined(ODP_PKTIO_DPDK) && ODP_PKTIO_DPDK == 1 extern int enable_link_dpdk_pktio_ops; #endif -#ifdef ODP_PKTIO_IPC +#if defined(ODP_PKTIO_IPC) && ODP_PKTIO_IPC == 1 extern int enable_link_ipc_pktio_ops; #endif extern int enable_link_loopback_pktio_ops; -#ifdef ODP_NETMAP +#if defined(ODP_NETMAP) && ODP_NETMAP == 1 extern int enable_link_netmap_pktio_ops; #endif -#ifdef HAVE_PCAP +#if defined(HAVE_PCAP) && HAVE_PCAP == 1 extern int enable_link_pcap_pktio_ops; #endif -#ifdef ODP_PKTIO_SOCKET +#if defined(ODP_PKTIO_SOCKET) && ODP_PKTIO_SOCKET == 1 extern int enable_link_socket_pktio_ops; #endif -#ifdef ODP_PKTIO_SOCKET_MMAP +#if defined(ODP_PKTIO_SOCKET_MMAP) && ODP_PKTIO_SOCKET_MMAP == 1 extern int enable_link_socket_mmap_pktio_ops; #endif -#ifdef ODP_PKTIO_TAP +#if defined(ODP_PKTIO_TAP) && ODP_PKTIO_TAP == 1 extern int enable_link_tap_pktio_ops; #endif -#ifdef ODP_MDEV +#if defined(ODP_MDEV) && ODP_MDEV == 1 extern int enable_link_cxgb4_pktio_ops; extern int enable_link_i40e_pktio_ops; #endif @@ -55,29 +55,29 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) /* Further initialization per subsystem */ -#ifdef ODP_PKTIO_DPDK +#if defined(ODP_PKTIO_DPDK) && ODP_PKTIO_DPDK == 1 enable_link_dpdk_pktio_ops = 1; #endif -#ifdef ODP_PKTIO_IPC +#if defined(ODP_PKTIO_IPC) && ODP_PKTIO_IPC == 1 enable_link_ipc_pktio_ops = 1; #endif enable_link_loopback_pktio_ops = 1; -#ifdef ODP_NETMAP +#if defined(ODP_NETMAP) && ODP_NETMAP == 1 enable_link_netmap_pktio_ops = 1; #endif -#ifdef HAVE_PCAP +#if defined(HAVE_PCAP) && HAVE_PCAP == 1 enable_link_pcap_pktio_ops = 1; #endif -#ifdef ODP_PKTIO_SOCKET +#if defined(ODP_PKTIO_SOCKET) && ODP_PKTIO_SOCKET == 1 enable_link_socket_pktio_ops = 1; #endif -#ifdef ODP_PKTIO_SOCKET_MMAP +#if defined(ODP_PKTIO_SOCKET_MMAP) && ODP_PKTIO_SOCKET_MMAP == 1 enable_link_socket_mmap_pktio_ops = 1; #endif -#ifdef ODP_PKTIO_TAP +#if defined(ODP_PKTIO_TAP) && ODP_PKTIO_TAP == 1 enable_link_tap_pktio_ops = 1; #endif -#ifdef ODP_MDEV +#if defined(ODP_MDEV) && ODP_MDEV == 1 enable_link_cxgb4_pktio_ops = 1; enable_link_i40e_pktio_ops = 1; #endif diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index bb404d91..81eaffef 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -6,7 +6,7 @@ #include "config.h" -#ifdef ODP_PKTIO_TAP +#if defined(ODP_PKTIO_TAP) && ODP_PKTIO_TAP == 1 /** * @file ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_packet_internal.h | 2 +- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/dpdk.h | 2 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/mdev.c | 2 +- platform/linux-generic/pktio/mdev/cxgb4.c | 2 +- platform/linux-generic/pktio/mdev/i40e.c | 2 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/socket.c | 2 +- platform/linux-generic/pktio/socket_mmap.c | 2 +- platform/linux-generic/pktio/subsystem.c | 32 +++++++++++----------- platform/linux-generic/pktio/tap.c | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) hooks/post-receive --

7 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp