[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-162-g6f07a40c
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 6f07a40cc29b4b9ebc69a3badc31de7497ae6253 (commit)
from 257b08b35ceea41bad5a7f1c626496cf111e657a (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 6f07a40cc29b4b9ebc69a3badc31de7497ae6253
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Feb 7 14:55:56 2018 +0200
linux-gen: dpdk: conf NICs to drop packets if no descriptors are available
Configure DPDK NIC RX rings to automatically drop packets if no free
descriptors are available. Without this option being set, some NICs (e.g.
82599, X540) will stop receiving packets from all RX queues if any of the
RX queues is not emptied fast enough.
Fixes: https://bugs.linaro.org/show_bug.cgi?id=3618
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/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index bd6920e6..53ddf2fc 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -1402,6 +1402,8 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED,
static int dpdk_start(pktio_entry_t *pktio_entry)
{
+ struct rte_eth_dev_info dev_info;
+ struct rte_eth_rxconf *rxconf;
pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk;
uint8_t port_id = pkt_dpdk->port_id;
int ret;
@@ -1420,7 +1422,6 @@ static int dpdk_start(pktio_entry_t *pktio_entry)
}
/* Init TX queues */
for (i = 0; i < pktio_entry->s.num_out_queue; i++) {
- struct rte_eth_dev_info dev_info;
const struct rte_eth_txconf *txconf = NULL;
int ip_ena = pktio_entry->s.config.pktout.bit.ipv4_chksum_ena;
int udp_ena = pktio_entry->s.config.pktout.bit.udp_chksum_ena;
@@ -1469,10 +1470,13 @@ static int dpdk_start(pktio_entry_t *pktio_entry)
}
}
/* Init RX queues */
+ rte_eth_dev_info_get(port_id, &dev_info);
+ rxconf = &dev_info.default_rxconf;
+ rxconf->rx_drop_en = 1;
for (i = 0; i < pktio_entry->s.num_in_queue; i++) {
ret = rte_eth_rx_queue_setup(port_id, i, DPDK_NM_RX_DESC,
rte_eth_dev_socket_id(port_id),
- NULL, pkt_dpdk->pkt_pool);
+ rxconf, pkt_dpdk->pkt_pool);
if (ret < 0) {
ODP_ERR("Queue setup failed: err=%d, port=%" PRIu8 "\n",
ret, port_id);
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/pktio/dpdk.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
6 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-211-gaf7be638
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 af7be638ef9ac98bdb1f2e4917f152889eb1850f (commit)
via dffd44a745bfb4761d9d3faba41aa8259a903f6b (commit)
via 0772569e525e28226475a415f5c2e719795917c2 (commit)
via 87d2f6df094ad402676149622af4e436b19598af (commit)
via 189fc5df9551dd998a1091de863843edd6f98b78 (commit)
from e1175d5a69c65bb465022c9f1381c40fdb5c4069 (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 af7be638ef9ac98bdb1f2e4917f152889eb1850f
Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Date: Mon Feb 5 17:49:43 2018 +0530
linux-gen: schedule: implements async ordered lock
implements asynchronous order context lock
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 8605ca66..66e05043 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -41,6 +41,8 @@ typedef int (*schedule_term_local_fn_t)(void);
typedef void (*schedule_order_lock_fn_t)(void);
typedef void (*schedule_order_unlock_fn_t)(void);
typedef void (*schedule_order_unlock_lock_fn_t)(void);
+typedef void (*schedule_order_lock_start_fn_t)(void);
+typedef void (*schedule_order_lock_wait_fn_t)(void);
typedef uint32_t (*schedule_max_ordered_locks_fn_t)(void);
typedef void (*schedule_save_context_fn_t)(uint32_t queue_index);
@@ -60,6 +62,8 @@ typedef struct schedule_fn_t {
schedule_term_local_fn_t term_local;
schedule_order_lock_fn_t order_lock;
schedule_order_unlock_fn_t order_unlock;
+ schedule_order_lock_start_fn_t start_order_lock;
+ schedule_order_lock_wait_fn_t wait_order_lock;
schedule_order_unlock_lock_fn_t order_unlock_lock;
schedule_max_ordered_locks_fn_t max_ordered_locks;
@@ -105,6 +109,8 @@ typedef struct {
void (*schedule_order_lock)(uint32_t);
void (*schedule_order_unlock)(uint32_t);
void (*schedule_order_unlock_lock)(uint32_t, uint32_t);
+ void (*schedule_order_lock_start)(uint32_t);
+ void (*schedule_order_lock_wait)(uint32_t);
} schedule_api_t;
diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c
index c91a9338..a6581bed 100644
--- a/platform/linux-generic/odp_schedule.c
+++ b/platform/linux-generic/odp_schedule.c
@@ -1152,6 +1152,16 @@ static void schedule_order_unlock_lock(uint32_t unlock_index,
schedule_order_lock(lock_index);
}
+static void schedule_order_lock_start(uint32_t lock_index)
+{
+ (void)lock_index;
+}
+
+static void schedule_order_lock_wait(uint32_t lock_index)
+{
+ schedule_order_lock(lock_index);
+}
+
static void schedule_pause(void)
{
sched_local.pause = 1;
@@ -1438,5 +1448,7 @@ const schedule_api_t schedule_default_api = {
.schedule_group_info = schedule_group_info,
.schedule_order_lock = schedule_order_lock,
.schedule_order_unlock = schedule_order_unlock,
- .schedule_order_unlock_lock = schedule_order_unlock_lock
+ .schedule_order_unlock_lock = schedule_order_unlock_lock,
+ .schedule_order_lock_start = schedule_order_lock_start,
+ .schedule_order_lock_wait = schedule_order_lock_wait
};
diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c
index e5f734ae..6a3b4e4b 100644
--- a/platform/linux-generic/odp_schedule_if.c
+++ b/platform/linux-generic/odp_schedule_if.c
@@ -134,3 +134,14 @@ void odp_schedule_order_unlock_lock(uint32_t unlock_index, uint32_t lock_index)
{
sched_api->schedule_order_unlock_lock(unlock_index, lock_index);
}
+
+void odp_schedule_order_lock_start(uint32_t lock_index)
+{
+ sched_api->schedule_order_lock_start(lock_index);
+}
+
+void odp_schedule_order_lock_wait(uint32_t lock_index)
+{
+ sched_api->schedule_order_lock_wait(lock_index);
+}
+
diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c
index 02396aa0..3ce85394 100644
--- a/platform/linux-generic/odp_schedule_iquery.c
+++ b/platform/linux-generic/odp_schedule_iquery.c
@@ -1308,6 +1308,16 @@ static uint32_t schedule_max_ordered_locks(void)
return CONFIG_QUEUE_MAX_ORD_LOCKS;
}
+static void schedule_order_lock_start(uint32_t lock_index)
+{
+ (void)lock_index;
+}
+
+static void schedule_order_lock_wait(uint32_t lock_index)
+{
+ schedule_order_lock(lock_index);
+}
+
static inline bool is_atomic_queue(unsigned int queue_index)
{
return (sched->queues[queue_index].sync == ODP_SCHED_SYNC_ATOMIC);
@@ -1376,7 +1386,9 @@ const schedule_api_t schedule_iquery_api = {
.schedule_group_info = schedule_group_info,
.schedule_order_lock = schedule_order_lock,
.schedule_order_unlock = schedule_order_unlock,
- .schedule_order_unlock_lock = schedule_order_unlock_lock
+ .schedule_order_unlock_lock = schedule_order_unlock_lock,
+ .schedule_order_lock_start = schedule_order_lock_start,
+ .schedule_order_lock_wait = schedule_order_lock_wait
};
static void thread_set_interest(sched_thread_local_t *thread,
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 761f93d3..f5974442 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -1186,6 +1186,16 @@ static void schedule_order_unlock_lock(uint32_t unlock_index,
schedule_order_lock(lock_index);
}
+static void schedule_order_lock_start(uint32_t lock_index)
+{
+ (void)lock_index;
+}
+
+static void schedule_order_lock_wait(uint32_t lock_index)
+{
+ schedule_order_lock(lock_index);
+}
+
static void schedule_release_atomic(void)
{
sched_scalable_thread_state_t *ts;
@@ -2096,4 +2106,6 @@ const schedule_api_t schedule_scalable_api = {
.schedule_order_lock = schedule_order_lock,
.schedule_order_unlock = schedule_order_unlock,
.schedule_order_unlock_lock = schedule_order_unlock_lock,
+ .schedule_order_lock_start = schedule_order_lock_start,
+ .schedule_order_lock_wait = schedule_order_lock_wait
};
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index bad47cad..e46ae448 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -829,6 +829,16 @@ static void schedule_order_unlock_lock(uint32_t unlock_index,
(void)lock_index;
}
+static void schedule_order_lock_start(uint32_t lock_index)
+{
+ (void)lock_index;
+}
+
+static void schedule_order_lock_wait(uint32_t lock_index)
+{
+ (void)lock_index;
+}
+
static void order_lock(void)
{
}
@@ -879,5 +889,7 @@ const schedule_api_t schedule_sp_api = {
.schedule_group_info = schedule_group_info,
.schedule_order_lock = schedule_order_lock,
.schedule_order_unlock = schedule_order_unlock,
- .schedule_order_unlock_lock = schedule_order_unlock_lock
+ .schedule_order_unlock_lock = schedule_order_unlock_lock,
+ .schedule_order_lock_start = schedule_order_lock_start,
+ .schedule_order_lock_wait = schedule_order_lock_wait
};
commit dffd44a745bfb4761d9d3faba41aa8259a903f6b
Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Date: Mon Feb 5 17:49:26 2018 +0530
api: schedule: add asynchronous order lock
add asynchronous order lock api. schedule order context lock can be
acquired asynchronously using two functions start and wait. application can
utilize the cycles between these functions to increase performance.
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h
index d493cc75..bbc74983 100644
--- a/include/odp/api/spec/schedule.h
+++ b/include/odp/api/spec/schedule.h
@@ -371,6 +371,34 @@ void odp_schedule_order_unlock(uint32_t lock_index);
*/
void odp_schedule_order_unlock_lock(uint32_t unlock_index, uint32_t lock_index);
+/** Asynchronous ordered context lock
+ * Request an ordered context lock to be acquired. Starts an ordered context
+ * lock acquire operation, but does not wait until the lock has been acquired.
+ * Application can use this call to potentially interleave some processing
+ * within waiting for this lock. Each start lock call must be paired with a wait
+ * call that blocks until the lock has been acquired. Locks cannot be acquired
+ * in nested fashion i.e each start call must follow a paring wait and unlock
+ * calls, before using another lock.
+ * The same constraints apply as with odp_schedule_order_lock()
+ *
+ * @param lock_index Index of the ordered lock in the current context to
+ * start acquire operation.
+ * Must be in the range 0..odp_queue_lock_count() - 1.
+ *
+ */
+void odp_schedule_order_lock_start(uint32_t lock_index);
+
+/** Asynchronous ordered context lock wait
+ * Wait for a previously started lock acquire operation to finish.
+ * Lock index must match with the previous start call. Ordered lock acquisition
+ * will be completed during this call.
+ *
+ * @param lock_index Index of the ordered lock in the current context to
+ * complete acquire operation.
+ * Must be in the range 0..odp_queue_lock_count() - 1.
+ */
+void odp_schedule_order_lock_wait(uint32_t lock_index);
+
/**
* @}
*/
commit 0772569e525e28226475a415f5c2e719795917c2
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Feb 2 10:45:29 2018 +0200
linux-gen: shm: use global init max memory
Use global init parameter to allow application to use more than
512 MB of shared memory.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c
index 81d77edc..ab112ace 100644
--- a/platform/linux-generic/_ishm.c
+++ b/platform/linux-generic/_ishm.c
@@ -258,7 +258,7 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align,
ishm_fragment_t *rem_fragmnt;
uintptr_t border;/* possible start of new fragment (next alignement) */
intptr_t left; /* room remaining after, if the segment is allocated */
- uintptr_t remainder = ODP_CONFIG_ISHM_VA_PREALLOC_SZ;
+ uintptr_t remainder = odp_global_data.shm_max_memory;
/*
* search for the best bit, i.e. search for the unallocated fragment
@@ -1436,7 +1436,7 @@ int _odp_ishm_cleanup_files(const char *dirpath)
return 0;
}
-int _odp_ishm_init_global(void)
+int _odp_ishm_init_global(const odp_init_t *init)
{
void *addr;
void *spce_addr;
@@ -1444,7 +1444,15 @@ int _odp_ishm_init_global(void)
uid_t uid;
char *hp_dir = odp_global_data.hugepage_info.default_huge_page_dir;
uint64_t align;
+ uint64_t max_memory = ODP_CONFIG_ISHM_VA_PREALLOC_SZ;
+ uint64_t internal = ODP_CONFIG_ISHM_VA_PREALLOC_SZ / 8;
+ /* user requested memory size + some extra for internal use */
+ if (init && init->shm.max_memory)
+ max_memory = init->shm.max_memory + internal;
+
+ odp_global_data.shm_max_memory = max_memory;
+ odp_global_data.shm_max_size = max_memory - internal;
odp_global_data.main_pid = getpid();
odp_global_data.shm_dir = getenv("ODP_SHM_DIR");
if (odp_global_data.shm_dir) {
@@ -1507,7 +1515,7 @@ int _odp_ishm_init_global(void)
*reserve the address space for _ODP_ISHM_SINGLE_VA reserved blocks,
* only address space!
*/
- spce_addr = _odp_ishmphy_book_va(ODP_CONFIG_ISHM_VA_PREALLOC_SZ, align);
+ spce_addr = _odp_ishmphy_book_va(max_memory, align);
if (!spce_addr) {
ODP_ERR("unable to reserve virtual space\n.");
goto init_glob_err3;
@@ -1516,7 +1524,7 @@ int _odp_ishm_init_global(void)
/* use the first fragment descriptor to describe to whole VA space: */
ishm_ftbl->fragment[0].block_index = -1;
ishm_ftbl->fragment[0].start = spce_addr;
- ishm_ftbl->fragment[0].len = ODP_CONFIG_ISHM_VA_PREALLOC_SZ;
+ ishm_ftbl->fragment[0].len = max_memory;
ishm_ftbl->fragment[0].prev = NULL;
ishm_ftbl->fragment[0].next = NULL;
ishm_ftbl->used_fragmnts = &ishm_ftbl->fragment[0];
diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index a21e93c8..444e1163 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -44,6 +44,8 @@ typedef struct {
struct odp_global_data_s {
char *shm_dir; /*< directory for odp mmaped files */
int shm_dir_from_env; /*< overload default with env */
+ uint64_t shm_max_memory;
+ uint64_t shm_max_size;
pid_t main_pid;
char uid[UID_MAXLEN];
odp_log_func_t log_fn;
@@ -129,7 +131,7 @@ int _odp_int_name_tbl_term_global(void);
int _odp_fdserver_init_global(void);
int _odp_fdserver_term_global(void);
-int _odp_ishm_init_global(void);
+int _odp_ishm_init_global(const odp_init_t *init);
int _odp_ishm_init_local(void);
int _odp_ishm_term_global(void);
int _odp_ishm_term_local(void);
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index be75a530..a2d9d52f 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -66,7 +66,7 @@ int odp_init_global(odp_instance_t *instance,
}
stage = SYSINFO_INIT;
- if (_odp_ishm_init_global()) {
+ if (_odp_ishm_init_global(params)) {
ODP_ERR("ODP ishm init failed.\n");
goto init_failed;
}
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index c322c7eb..c9b04dfd 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -12,6 +12,7 @@
#include <odp/api/shared_memory.h>
#include <odp/api/plat/strong_types.h>
#include <_ishm_internal.h>
+#include <odp_internal.h>
#include <string.h>
ODP_STATIC_ASSERT(ODP_CONFIG_SHM_BLOCKS >= ODP_CONFIG_POOLS,
@@ -47,7 +48,7 @@ int odp_shm_capability(odp_shm_capability_t *capa)
memset(capa, 0, sizeof(odp_shm_capability_t));
capa->max_blocks = ODP_CONFIG_SHM_BLOCKS;
- capa->max_size = 0;
+ capa->max_size = odp_global_data.shm_max_size;
capa->max_align = 0;
return 0;
commit 87d2f6df094ad402676149622af4e436b19598af
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Feb 1 15:32:35 2018 +0200
api: init: add shm memory size parameter
Application memory usage may vary a lot. Implementation may
need to pre-allocate memory or address space already at init
time to be able to guarantee e.g. the same VA address space
for all threads. Total SHM memory usage information is needed
at global init time, as implementation likely uses the same
shared memory for its own global memory allocations.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h
index 21734db2..ee33e7cd 100644
--- a/include/odp/api/spec/init.h
+++ b/include/odp/api/spec/init.h
@@ -107,23 +107,29 @@ typedef int (*odp_log_func_t)(odp_log_level_t level, const char *fmt, ...);
typedef void (*odp_abort_func_t)(void) ODP_NORETURN;
/**
- * ODP initialization data
+ * Global initialization parameters
*
- * Data that is required to initialize the ODP API with the
- * application specific data such as specifying a logging callback, the log
- * level etc.
+ * These parameters may be used at global initialization time to configure and
+ * optimize ODP implementation to match the intended usage. Application
+ * specifies maximum resource usage. Implementation may round up resource
+ * reservations as needed. Initialization function returns a failure if resource
+ * requirements are too high. Init parameters may be used also to override
+ * logging and abort functions.
*
- * @note It is expected that all unassigned members are zero
+ * Use odp_init_param_init() to initialize the parameters into their default
+ * values. Unused parameters are left to default values.
*/
typedef struct odp_init_t {
/** Maximum number of worker threads the user will run concurrently.
Valid range is from 0 to platform specific maximum. Set both
num_worker and num_control to zero for default number of threads. */
int num_worker;
+
/** Maximum number of control threads the user will run concurrently.
Valid range is from 0 to platform specific maximum. Set both
num_worker and num_control to zero for default number of threads. */
int num_control;
+
/** Pointer to bit mask mapping CPUs available to this ODP instance
for running worker threads.
Initialize to a NULL pointer to use default CPU mapping.
@@ -139,6 +145,7 @@ typedef struct odp_init_t {
worker masks
*/
const odp_cpumask_t *worker_cpus;
+
/** Pointer to bit mask mapping CPUs available to this ODP instance
for running control threads.
Initialize to a NULL pointer to use default CPU mapping.
@@ -150,10 +157,13 @@ typedef struct odp_init_t {
worker and control masks do not overlap.
*/
const odp_cpumask_t *control_cpus;
+
/** Replacement for the default log fn */
odp_log_func_t log_fn;
+
/** Replacement for the default abort fn */
odp_abort_func_t abort_fn;
+
/** Unused features. These are hints to the ODP implementation that
* the application will not use any APIs associated with these
* features. Implementations may use this information to provide
@@ -161,6 +171,16 @@ typedef struct odp_init_t {
* that a feature will not be used and it is used anyway.
*/
odp_feature_t not_used;
+
+ /** Shared memory parameters */
+ struct {
+ /** Maximum memory usage in bytes. This is the maximum
+ * amount of shared memory that application will reserve
+ * concurrently. Use 0 when not set. Default value is 0.
+ */
+ uint64_t max_memory;
+ } shm;
+
} odp_init_t;
/**
@@ -189,7 +209,8 @@ void odp_init_param_init(odp_init_t *param);
* system and outputs a handle for it. The handle is used in other calls
* (e.g. odp_init_local()) as a reference to the instance. When user provides
* configuration parameters, the platform may configure and optimize the
- * instance to match user requirements.
+ * instance to match user requirements. A failure is returned if requirements
+ * cannot be met.
*
* Configuration parameters are divided into standard and platform specific
* parts. Standard parameters are supported by any ODP platform, where as
commit 189fc5df9551dd998a1091de863843edd6f98b78
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Feb 1 14:04:24 2018 +0200
validation: shm: test capa and maximum reservation
Added test which uses capability API, and tries to reserve
and use maximum sized block. 100 MB shm memory is assumed
to be available to ODP validation tests.
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/shmem/shmem.c b/test/validation/api/shmem/shmem.c
index bda07011..74eaa32d 100644
--- a/test/validation/api/shmem/shmem.c
+++ b/test/validation/api/shmem/shmem.c
@@ -22,6 +22,8 @@
#define STRESS_SIZE 32 /* power of 2 and <=256 */
#define STRESS_RANDOM_SZ 5
#define STRESS_ITERATION 5000
+#define MAX_SIZE_TESTED (100 * 1000000UL)
+#define MAX_ALIGN_TESTED (1024 * 1024)
typedef enum {
STRESS_FREE, /* entry is free and can be allocated */
@@ -212,6 +214,57 @@ void shmem_test_basic(void)
CU_ASSERT(0 == odp_shm_free(shm));
}
+/*
+ * maximum size reservation
+ */
+static void shmem_test_max_reserve(void)
+{
+ odp_shm_capability_t capa;
+ odp_shm_t shm;
+ uint64_t size, align;
+ uint8_t *data;
+ uint64_t i;
+
+ memset(&capa, 0, sizeof(odp_shm_capability_t));
+ CU_ASSERT_FATAL(odp_shm_capability(&capa) == 0);
+
+ CU_ASSERT(capa.max_blocks > 0);
+
+ size = capa.max_size;
+ align = capa.max_align;
+
+ /* Assuming that system has at least MAX_SIZE_TESTED bytes available */
+ if (capa.max_size == 0 || capa.max_size > MAX_SIZE_TESTED)
+ size = MAX_SIZE_TESTED;
+
+ if (capa.max_align == 0 || capa.max_align > MAX_ALIGN_TESTED)
+ align = MAX_ALIGN_TESTED;
+
+ printf("\n size: %" PRIu64 "\n", size);
+ printf(" align: %" PRIu64 "\n", align);
+
+ shm = odp_shm_reserve("test_max_reserve", size, align, 0);
+ CU_ASSERT(shm != ODP_SHM_INVALID);
+
+ data = odp_shm_addr(shm);
+ CU_ASSERT(data != NULL);
+
+ if (data) {
+ memset(data, 0xde, size);
+ for (i = 0; i < size; i++) {
+ if (data[i] != 0xde) {
+ printf(" data error i:%" PRIu64 ", data %x"
+ "\n", i, data[i]);
+ CU_FAIL("Data error");
+ break;
+ }
+ }
+ }
+
+ if (shm != ODP_SHM_INVALID)
+ CU_ASSERT(odp_shm_free(shm) == 0);
+}
+
/*
* thread part for the shmem_test_reserve_after_fork
*/
@@ -769,6 +822,7 @@ void shmem_test_stress(void)
odp_testinfo_t shmem_suite[] = {
ODP_TEST_INFO(shmem_test_basic),
+ ODP_TEST_INFO(shmem_test_max_reserve),
ODP_TEST_INFO(shmem_test_reserve_after_fork),
ODP_TEST_INFO(shmem_test_singleva_after_fork),
ODP_TEST_INFO(shmem_test_stress),
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/init.h | 33 ++++++++++++---
include/odp/api/spec/schedule.h | 28 ++++++++++++
platform/linux-generic/_ishm.c | 16 +++++--
platform/linux-generic/include/odp_internal.h | 4 +-
platform/linux-generic/include/odp_schedule_if.h | 6 +++
platform/linux-generic/odp_init.c | 2 +-
platform/linux-generic/odp_schedule.c | 14 +++++-
platform/linux-generic/odp_schedule_if.c | 11 +++++
platform/linux-generic/odp_schedule_iquery.c | 14 +++++-
platform/linux-generic/odp_schedule_scalable.c | 12 ++++++
platform/linux-generic/odp_schedule_sp.c | 14 +++++-
platform/linux-generic/odp_shared_memory.c | 3 +-
test/validation/api/shmem/shmem.c | 54 ++++++++++++++++++++++++
13 files changed, 195 insertions(+), 16 deletions(-)
hooks/post-receive
--
6 years, 2 months
- 1
- 0
[COMMIT] branch caterpillar updated. v1.15.0.0-968-gc6440178
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 c6440178415ef0c26ff4f9a1539fc294161d8a2d (commit)
from 30009156994928b0ad9f6c8932c20abef269c098 (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 c6440178415ef0c26ff4f9a1539fc294161d8a2d
Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org>
Date: Wed Jan 31 15:30:28 2018 +0100
linux-gen: add cxgbe RX slot mode support
To use RX slot_mode one needs to redefine CXGB4_RX_BUF_SIZE_INDEX=2 either
in cxgbe4.c locally or via CFLAGS in ./configure
One needs supplementary patch on kernel driver applied as well as load
kernel driver with rx_mode=1 parameter.
Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org>
Signed-off-by: Yi He <yi.he(a)linaro.org>
diff --git a/platform/linux-generic/pktio/mdev/cxgb4.c b/platform/linux-generic/pktio/mdev/cxgb4.c
index 8a34c239..cef4806f 100644
--- a/platform/linux-generic/pktio/mdev/cxgb4.c
+++ b/platform/linux-generic/pktio/mdev/cxgb4.c
@@ -36,6 +36,25 @@
/* RX queue definitions */
#define CXGB4_RX_QUEUE_NUM_MAX 32
+/* RX buffer size indices for firmware */
+#define CXGB4_RX_BUF_SIZE_INDEX_4K 0x0UL
+#define CXGB4_RX_BUF_SIZE_INDEX_64K 0x1UL
+#define CXGB4_RX_BUF_SIZE_INDEX_1500 0x2UL
+#define CXGB4_RX_BUF_SIZE_INDEX_9000 0x3UL
+
+/* Default RX buffer size index to use */
+#ifndef CXGB4_RX_BUF_SIZE_INDEX
+#define CXGB4_RX_BUF_SIZE_INDEX CXGB4_RX_BUF_SIZE_INDEX_4K
+#endif /* CXGB4_RX_BUF_SIZE_INDEX */
+
+#if CXGB4_RX_BUF_SIZE_INDEX == CXGB4_RX_BUF_SIZE_INDEX_4K
+#define CXGB4_RX_BUF_SIZE 4096UL
+#elif CXGB4_RX_BUF_SIZE_INDEX == CXGB4_RX_BUF_SIZE_INDEX_1500
+#define CXGB4_RX_BUF_SIZE 2048UL
+#else /* CXGB4_RX_BUF_SIZE_INDEX */
+#error "Support for requested RX buffer size isn't implemented"
+#endif /* CXGB4_RX_BUF_SIZE_INDEX */
+
/** RX descriptor */
typedef struct {
uint32_t padding[12];
@@ -72,18 +91,15 @@ typedef struct ODP_ALIGNED_CACHE {
uint32_t doorbell_desc_key; /**< 'Key' to the doorbell */
uint16_t rx_queue_len; /**< Number of RX desc entries */
- uint16_t rx_next; /**< Next RX desc to handle */
+ uint16_t cidx; /**< Next RX desc to handle */
uint32_t gen:1; /**< RX queue generation */
odp_u64be_t *free_list; /**< Free list base */
-
- uint8_t free_list_len; /**< Number of free list entries */
- uint8_t commit_pending; /**< Free list entries pending commit */
-
- uint8_t cidx; /**< Free list consumer index */
- uint8_t pidx; /**< Free list producer index */
-
+ uint16_t free_list_len; /**< Number of free list entries */
+ uint16_t commit_pending; /**< Free list entries pending commit */
+ uint16_t free_list_cidx; /**< Free list consumer index */
+ uint16_t free_list_pidx; /**< Free list producer index */
uint32_t offset; /**< Offset into last free fragment */
mdev_dma_area_t rx_data; /**< RX packet payload area */
@@ -214,7 +230,7 @@ typedef struct {
mdev_device_t mdev; /**< Common mdev data */
} pktio_ops_cxgb4_data_t;
-static void cxgb4_rx_refill(cxgb4_rx_queue_t *rxq, uint8_t num);
+static void cxgb4_rx_refill(cxgb4_rx_queue_t *rxq, uint16_t num);
static void cxgb4_wait_link_up(pktio_entry_t *pktio_entry);
static int cxgb4_close(pktio_entry_t *pktio_entry);
@@ -236,7 +252,8 @@ static int cxgb4_mmio_register(pktio_ops_cxgb4_data_t *pkt_cxgb4,
static int cxgb4_rx_queue_register(pktio_ops_cxgb4_data_t *pkt_cxgb4,
uint64_t offset, uint64_t size,
- uint64_t free_list_offset)
+ uint64_t free_list_offset,
+ uint64_t free_list_size)
{
uint16_t rxq_idx = pkt_cxgb4->capa.max_input_queues++;
cxgb4_rx_queue_t *rxq = &pkt_cxgb4->rx_queues[rxq_idx];
@@ -305,17 +322,14 @@ static int cxgb4_rx_queue_register(pktio_ops_cxgb4_data_t *pkt_cxgb4,
return -1;
}
- ODP_ASSERT(rxq->free_list_len * sizeof(*rxq->free_list) <=
- ODP_PAGE_SIZE);
-
- rxq->free_list =
- mdev_region_mmap(&pkt_cxgb4->mdev, free_list_offset, ODP_PAGE_SIZE);
+ rxq->free_list = mdev_region_mmap(&pkt_cxgb4->mdev, free_list_offset,
+ free_list_size);
if (rxq->free_list == MAP_FAILED) {
ODP_ERR("Cannot mmap RX queue free list\n");
return -1;
}
- rxq->rx_data.size = rxq->free_list_len * ODP_PAGE_SIZE;
+ rxq->rx_data.size = rxq->free_list_len * CXGB4_RX_BUF_SIZE;
ret = mdev_dma_area_alloc(&pkt_cxgb4->mdev, &rxq->rx_data);
if (ret) {
ODP_ERR("Cannot allocate RX queue DMA area\n");
@@ -329,7 +343,7 @@ static int cxgb4_rx_queue_register(pktio_ops_cxgb4_data_t *pkt_cxgb4,
* otherwise HW will think the free list is empty.
*/
cxgb4_rx_refill(rxq, rxq->free_list_len - 8);
- rxq->cidx = rxq->free_list_len - 1;
+ rxq->free_list_cidx = rxq->free_list_len - 1;
ODP_DBG("Register RX queue region: 0x%llx@%016llx\n", size, offset);
ODP_DBG(" RX descriptors: %u\n", rxq->rx_queue_len);
@@ -450,12 +464,11 @@ static int cxgb4_region_info_cb(mdev_device_t *mdev,
return -1;
}
- ODP_ASSERT(sparse->areas[1].size == ODP_PAGE_SIZE);
-
return cxgb4_rx_queue_register(pkt_cxgb4,
sparse->areas[0].offset,
sparse->areas[0].size,
- sparse->areas[1].offset);
+ sparse->areas[1].offset,
+ sparse->areas[1].size);
case VFIO_NET_MDEV_TX_RING:
return cxgb4_tx_queue_register(pkt_cxgb4,
@@ -579,18 +592,20 @@ static int cxgb4_close(pktio_entry_t *pktio_entry)
return 0;
}
-static void cxgb4_rx_refill(cxgb4_rx_queue_t *rxq, uint8_t num)
+static void cxgb4_rx_refill(cxgb4_rx_queue_t *rxq, uint16_t num)
{
rxq->commit_pending += num;
while (num) {
- uint64_t iova = rxq->rx_data.iova + rxq->pidx * ODP_PAGE_SIZE;
+ uint64_t iova = rxq->rx_data.iova +
+ rxq->free_list_pidx * CXGB4_RX_BUF_SIZE;
- rxq->free_list[rxq->pidx] = odp_cpu_to_be_64(iova);
+ rxq->free_list[rxq->free_list_pidx] =
+ odp_cpu_to_be_64(iova | CXGB4_RX_BUF_SIZE_INDEX);
- rxq->pidx++;
- if (odp_unlikely(rxq->pidx >= rxq->free_list_len))
- rxq->pidx = 0;
+ rxq->free_list_pidx++;
+ if (odp_unlikely(rxq->free_list_pidx >= rxq->free_list_len))
+ rxq->free_list_pidx = 0;
num--;
}
@@ -618,7 +633,7 @@ static int cxgb4_recv(pktio_entry_t *pktio_entry,
odp_ticketlock_lock(&rxq->lock);
while (rx_pkts < num) {
- volatile cxgb4_rx_desc_t *rxd = &rxq->rx_descs[rxq->rx_next];
+ volatile cxgb4_rx_desc_t *rxd = &rxq->rx_descs[rxq->cidx];
odp_packet_t pkt;
odp_packet_hdr_t *pkt_hdr;
uint32_t pkt_len;
@@ -626,24 +641,6 @@ static int cxgb4_recv(pktio_entry_t *pktio_entry,
if (RX_DESC_TO_GEN(rxd) != rxq->gen)
break;
- /*
- * RX queue shall receive only packet descriptors, so this
- * condition shall never ever become true. Still, we try to
- * be on a safe side and gracefully skip unexpected descriptor.
- */
- if (odp_unlikely(RX_DESC_TO_TYPE(rxd) !=
- RX_DESC_TYPE_FLBUF_X)) {
- ODP_ERR("Invalid rxd type %u\n", RX_DESC_TO_TYPE(rxd));
-
- rxq->rx_next++;
- if (odp_unlikely(rxq->rx_next >= rxq->rx_queue_len)) {
- rxq->rx_next = 0;
- rxq->gen ^= 1;
- }
-
- continue;
- }
-
pkt_len = odp_be_to_cpu_32(rxd->pldbuflen_qid);
pkt =
@@ -657,9 +654,10 @@ static int cxgb4_recv(pktio_entry_t *pktio_entry,
* next one from the beginning.
*/
if (pkt_len & RX_DESC_NEW_BUF_FLAG) {
- rxq->cidx++;
- if (odp_unlikely(rxq->cidx >= rxq->free_list_len))
- rxq->cidx = 0;
+ rxq->free_list_cidx++;
+ if (odp_unlikely(rxq->free_list_cidx >=
+ rxq->free_list_len))
+ rxq->free_list_cidx = 0;
rxq->offset = 0;
refill_count++;
@@ -668,15 +666,15 @@ static int cxgb4_recv(pktio_entry_t *pktio_entry,
}
/* TODO: gracefully put pktio into error state */
- if (odp_unlikely(rxq->offset + pkt_len > ODP_PAGE_SIZE))
+ if (odp_unlikely(rxq->offset + pkt_len > CXGB4_RX_BUF_SIZE))
ODP_ABORT("Packet write beyond buffer boundary\n");
rxq->offset +=
ROUNDUP_ALIGN(pkt_len, pkt_cxgb4->free_list_align);
- rxq->rx_next++;
- if (odp_unlikely(rxq->rx_next >= rxq->rx_queue_len)) {
- rxq->rx_next = 0;
+ rxq->cidx++;
+ if (odp_unlikely(rxq->cidx >= rxq->rx_queue_len)) {
+ rxq->cidx = 0;
rxq->gen ^= 1;
}
@@ -686,8 +684,8 @@ static int cxgb4_recv(pktio_entry_t *pktio_entry,
*/
odp_packet_copy_from_mem(pkt, 0, pkt_len - 2,
(uint8_t *)rxq->rx_data.vaddr +
- rxq->cidx * ODP_PAGE_SIZE +
- rxq->offset + 2);
+ rxq->free_list_cidx *
+ CXGB4_RX_BUF_SIZE + rxq->offset + 2);
pkt_hdr = odp_packet_hdr(pkt);
pkt_hdr->input = pktio_entry->s.handle;
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/pktio/mdev/cxgb4.c | 106 +++++++++++++++---------------
1 file changed, 52 insertions(+), 54 deletions(-)
hooks/post-receive
--
6 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-206-ge1175d5a
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 e1175d5a69c65bb465022c9f1381c40fdb5c4069 (commit)
via e4268984a0424280784a00da46306372b47691e7 (commit)
from 876e2430126a763194046ce7db9302817e125ec6 (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 e1175d5a69c65bb465022c9f1381c40fdb5c4069
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Feb 6 13:44:04 2018 +0200
linux-gen: pktio: fix recv timeout issue with socket mmap
Validation test failed sometimes when select returned that
there are packets but sock_mmap_recv did find those (or it
dropped those). Continue timeout wait with select if
sock_mmap_recv didn't find any packets. Select updates
timeout value automatically to reflect the amount of
time not slept.
Fixes https://bugs.linaro.org/show_bug.cgi?id=3615
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index 04c44bc8..924d8e27 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -692,10 +692,19 @@ static int sock_mmap_recv_tmo(pktio_entry_t *pktio_entry, int index,
FD_ZERO(&readfds);
maxfd = sock_mmap_fd_set(pktio_entry, index, &readfds);
- if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0)
- return 0;
+ while (1) {
+ ret = select(maxfd + 1, &readfds, NULL, NULL, &timeout);
+
+ if (ret <= 0)
+ return ret;
+
+ ret = sock_mmap_recv(pktio_entry, index, pkt_table, num);
+
+ if (ret)
+ return ret;
- return sock_mmap_recv(pktio_entry, index, pkt_table, num);
+ /* If no packets, continue wait until timeout expires */
+ }
}
static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[],
@@ -729,20 +738,25 @@ static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[],
timeout.tv_sec = usecs / (1000 * 1000);
timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL);
- if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0)
- return 0;
+ while (1) {
+ ret = select(maxfd + 1, &readfds, NULL, NULL, &timeout);
- for (i = 0; i < num_q; i++) {
- ret = sock_mmap_recv(pktio_entry[i], index[i], pkt_table, num);
+ if (ret <= 0)
+ return ret;
- if (ret > 0 && from)
- *from = i;
+ for (i = 0; i < num_q; i++) {
+ ret = sock_mmap_recv(pktio_entry[i], index[i],
+ pkt_table, num);
- if (ret != 0)
- return ret;
- }
+ if (ret > 0 && from)
+ *from = i;
- return 0;
+ if (ret)
+ return ret;
+ }
+
+ /* If no packets, continue wait until timeout expires */
+ }
}
static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
commit e4268984a0424280784a00da46306372b47691e7
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Feb 6 13:40:36 2018 +0200
validation: pktio: recv tmo test improvements
Add checks and improve test output when recv tmo function
fails to timeout correctly.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index 6592b260..53a36145 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -511,7 +511,7 @@ static int wait_for_packets(pktio_info_t *pktio_rx, odp_packet_t pkt_tbl[],
static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[],
uint32_t seq_tbl[], int num, recv_tmo_mode_e mode,
- uint64_t tmo, uint64_t ns)
+ uint64_t tmo, uint64_t ns, int no_pkt)
{
odp_packet_t pkt_tmp[num];
odp_pktin_queue_t pktin[MAX_QUEUES];
@@ -542,8 +542,19 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[],
num - num_rx, tmo);
ts2 = odp_time_global();
+ CU_ASSERT(n >= 0);
+
if (n <= 0)
break;
+
+ /* When we don't expect any packets, drop all packets and
+ * retry timeout test. */
+ if (no_pkt) {
+ printf(" drop %i dummy packets\n", n);
+ odp_packet_free_multi(pkt_tmp, n);
+ continue;
+ }
+
for (i = 0; i < n; i++) {
if (pktio_pkt_seq(pkt_tmp[i]) == seq_tbl[num_rx])
pkt_tbl[num_rx++] = pkt_tmp[i];
@@ -554,8 +565,15 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[],
CU_ASSERT(from_val < (unsigned)num_q);
} while (num_rx < num);
- if (num_rx < num)
- CU_ASSERT(odp_time_diff_ns(ts2, ts1) >= ns);
+ if (num_rx < num) {
+ uint64_t diff = odp_time_diff_ns(ts2, ts1);
+
+ if (diff < ns)
+ printf(" diff %" PRIu64 ", ns %" PRIu64 "\n",
+ diff, ns);
+
+ CU_ASSERT(diff >= ns);
+ }
return num_rx;
}
@@ -967,8 +985,9 @@ static void test_recv_tmo(recv_tmo_mode_e mode)
/* No packets sent yet, so should wait */
ns = 100 * ODP_TIME_MSEC_IN_NS;
+
ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode,
- odp_pktin_wait_time(ns), ns);
+ odp_pktin_wait_time(ns), ns, 1);
CU_ASSERT(ret == 0);
ret = create_packets(pkt_tbl, pkt_seq, test_pkt_count, pktio_tx,
@@ -979,19 +998,19 @@ static void test_recv_tmo(recv_tmo_mode_e mode)
CU_ASSERT_FATAL(ret == test_pkt_count);
ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode,
- odp_pktin_wait_time(UINT64_MAX), 0);
+ odp_pktin_wait_time(UINT64_MAX), 0, 0);
CU_ASSERT_FATAL(ret == 1);
ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode,
- ODP_PKTIN_NO_WAIT, 0);
+ ODP_PKTIN_NO_WAIT, 0, 0);
CU_ASSERT_FATAL(ret == 1);
ret = recv_packets_tmo(pktio_rx, &pkt_tbl[2], &pkt_seq[2], 1, mode,
- odp_pktin_wait_time(0), 0);
+ odp_pktin_wait_time(0), 0, 0);
CU_ASSERT_FATAL(ret == 1);
ret = recv_packets_tmo(pktio_rx, &pkt_tbl[3], &pkt_seq[3], 3, mode,
- odp_pktin_wait_time(ns), ns);
+ odp_pktin_wait_time(ns), ns, 0);
CU_ASSERT_FATAL(ret == 3);
for (i = 0; i < test_pkt_count; i++)
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/pktio/socket_mmap.c | 40 ++++++++++++++++++++----------
test/validation/api/pktio/pktio.c | 35 ++++++++++++++++++++------
2 files changed, 54 insertions(+), 21 deletions(-)
hooks/post-receive
--
6 years, 3 months
- 1
- 0
[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-161-g257b08b3
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 257b08b35ceea41bad5a7f1c626496cf111e657a (commit)
from 27a7923236030fed0272cc9072f0cde62496e91d (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 257b08b35ceea41bad5a7f1c626496cf111e657a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Feb 2 05:04:42 2018 +0300
build: limit symbol visibility for libodp-linux
If libodp-linux is linked with static DPDK libraries, it will re-export
all DPDK symbols. Use libtool's -export-symbols-regex to limit symbol
visibility.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 410204bf..a39cf69b 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -8,6 +8,12 @@ lib_LTLIBRARIES = $(LIB)/libodp-linux.la
AM_LDFLAGS = -version-number '$(ODP_LIBSO_VERSION)'
+if ODP_ABI_COMPAT
+AM_LDFLAGS += -export-symbols-regex '^(_deprecated)?odp_'
+else
+AM_LDFLAGS += -export-symbols-regex '^(_deprecated)?_?odp_'
+endif
+
AM_CFLAGS = "-DGIT_HASH=$(VERSION)"
AM_CFLAGS += $(VISIBILITY_CFLAGS)
-----------------------------------------------------------------------
Summary of changes:
platform/Makefile.inc | 6 ++++++
1 file changed, 6 insertions(+)
hooks/post-receive
--
6 years, 3 months
- 1
- 0
[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-204-g876e2430
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 876e2430126a763194046ce7db9302817e125ec6 (commit)
from 1836820278b57de6144c75872e148976d49d28a2 (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 876e2430126a763194046ce7db9302817e125ec6
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Feb 3 06:19:01 2018 +0300
validation: crypto: properly use check_alg for GMAC/CMAC testing
Use check_alg instead of alg_test for GMAC/CMAC testing.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index f310329a..8c0ef5bc 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -1243,31 +1243,22 @@ static int check_alg_aes_gmac(void)
static void crypto_test_gen_alg_aes_gmac(void)
{
- unsigned int test_vec_num = (sizeof(aes_gmac_reference) /
- sizeof(aes_gmac_reference[0]));
- unsigned int i;
-
- for (i = 0; i < test_vec_num; i++)
- check_alg(ODP_CRYPTO_OP_ENCODE,
- ODP_CIPHER_ALG_NULL,
- ODP_AUTH_ALG_AES_GMAC,
- aes_gmac_reference,
- ARRAY_SIZE(aes_gmac_reference),
- false);
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_AES_GMAC,
+ aes_gmac_reference,
+ ARRAY_SIZE(aes_gmac_reference),
+ false);
}
static void crypto_test_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);
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_AES_GMAC,
+ aes_gmac_reference,
+ ARRAY_SIZE(aes_gmac_reference),
+ true);
}
static void crypto_test_check_alg_aes_gmac(void)
@@ -1282,16 +1273,12 @@ static void crypto_test_check_alg_aes_gmac(void)
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);
+ 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 int check_alg_aes_cmac(void)
@@ -1301,17 +1288,12 @@ static int check_alg_aes_cmac(void)
static void crypto_test_gen_alg_aes_cmac(void)
{
- unsigned int test_vec_num = (sizeof(aes_cmac_reference) /
- sizeof(aes_cmac_reference[0]));
- unsigned int i;
-
- for (i = 0; i < test_vec_num; i++)
- check_alg(ODP_CRYPTO_OP_ENCODE,
- ODP_CIPHER_ALG_NULL,
- ODP_AUTH_ALG_AES_CMAC,
- aes_cmac_reference,
- ARRAY_SIZE(aes_cmac_reference),
- false);
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_AES_CMAC,
+ aes_cmac_reference,
+ ARRAY_SIZE(aes_cmac_reference),
+ false);
}
static void crypto_test_check_alg_aes_cmac(void)
-----------------------------------------------------------------------
Summary of changes:
test/validation/api/crypto/odp_crypto_test_inp.c | 66 +++++++++---------------
1 file changed, 24 insertions(+), 42 deletions(-)
hooks/post-receive
--
6 years, 3 months
- 1
- 0
[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-203-g18368202
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 1836820278b57de6144c75872e148976d49d28a2 (commit)
via 9c784027f49393460ee828d7a085c81f55f90c46 (commit)
from fa6d104f6031b9687ae5f60f87f5c2338ad9a83e (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 1836820278b57de6144c75872e148976d49d28a2
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Feb 2 21:52:16 2018 +0300
api: crypto: add AES-XCBC-MAC enumerations
Following SonicWall proposal, add AES-XCBC-MAC algorithm enumerations.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index e27860a3..c59f6602 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -198,6 +198,13 @@ typedef enum {
*/
ODP_AUTH_ALG_AES_CMAC,
+ /** AES-XCBC-MAC
+ *
+ * AES CBC MAC for arbitrary-length messages (XCBC-MAC).
+ *
+ */
+ ODP_AUTH_ALG_AES_XCBC_MAC,
+
/** ChaCha20-Poly1305 AEAD
*
* ChaCha20 with Poly1305 provide both authentication and ciphering of
@@ -299,6 +306,9 @@ typedef union odp_crypto_auth_algos_t {
/** ODP_AUTH_ALG_AES_CMAC*/
uint32_t aes_cmac : 1;
+ /** ODP_AUTH_ALG_AES_XCBC_MAC*/
+ uint32_t aes_xcbc_mac : 1;
+
/** ODP_AUTH_ALG_CHACHA20_POLY1305 */
uint32_t chacha20_poly1305 : 1;
commit 9c784027f49393460ee828d7a085c81f55f90c46
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Feb 2 21:52:16 2018 +0300
api: crypto: add SHA-384 enumerations
Following SonicWall proposal, add SHA-384 algorithm enumerations.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index b7ab5362..e27860a3 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -143,6 +143,12 @@ typedef enum {
*/
ODP_AUTH_ALG_SHA256_HMAC,
+ /** HMAC-SHA-384
+ *
+ * SHA-384 algorithm in HMAC mode
+ */
+ ODP_AUTH_ALG_SHA384_HMAC,
+
/** HMAC-SHA-512
*
* SHA-512 algorithm in HMAC mode
@@ -275,6 +281,9 @@ typedef union odp_crypto_auth_algos_t {
/** ODP_AUTH_ALG_SHA256_HMAC */
uint32_t sha256_hmac : 1;
+ /** ODP_AUTH_ALG_SHA384_HMAC */
+ uint32_t sha384_hmac : 1;
+
/** ODP_AUTH_ALG_SHA512_HMAC */
uint32_t sha512_hmac : 1;
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/crypto.h | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
hooks/post-receive
--
6 years, 3 months
- 1
- 0
[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-160-g27a79232
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 27a7923236030fed0272cc9072f0cde62496e91d (commit)
via bfa24c0b7f035a84dd30e161673e97df244a926f (commit)
via 7f80bdf3a851c1b37e5826327ab5415ac5abe7a4 (commit)
via f74f2facaa16b35618c220f5652dbdb295c527e1 (commit)
via eeb098456bc51314cd6520d05f82f92353ba4a02 (commit)
via 379d527e891e1ad246b0bb796e6fc938618758c4 (commit)
via 637a332968967672395f1d41d809d0eba8d8dbd1 (commit)
via 24847c049d1a3ead549f0ccb5c7da5fbdedaa794 (commit)
via 70217ce609bd28e1982ec9caae2b4d91fca4074d (commit)
via e2023d4f1767d2358c97bc4aab4b21086dba1421 (commit)
via 72aa3ae9e181a90718b42da85561638cf7f3d480 (commit)
from 5865787680be13b47b777e8b0b64646755be41e0 (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 27a7923236030fed0272cc9072f0cde62496e91d
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Jan 30 16:20:19 2018 +0200
linux-gen: packet: inline packet input index function
Inline packet input interface index function which may
be used frequently.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index dc7d464f..0704abb2 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -22,6 +22,7 @@
#include <odp/api/plat/packet_inline_types.h>
#include <odp/api/plat/pool_inline_types.h>
+#include <odp/api/plat/pktio_inlines.h>
#include <string.h>
@@ -89,6 +90,13 @@ static inline odp_pktio_t _odp_packet_input(odp_packet_t pkt)
return _odp_pkt_get(pkt, odp_pktio_t, input);
}
+static inline int _odp_packet_input_index(odp_packet_t pkt)
+{
+ odp_pktio_t pktio = _odp_packet_input(pkt);
+
+ return _odp_pktio_index(pktio);
+}
+
static inline int _odp_packet_num_segs(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint8_t, segcount);
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
index 95adec66..c451c4d6 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
@@ -48,6 +48,11 @@ _ODP_INLINE odp_pktio_t odp_packet_input(odp_packet_t pkt)
return _odp_packet_input(pkt);
}
+_ODP_INLINE int odp_packet_input_index(odp_packet_t pkt)
+{
+ return _odp_packet_input_index(pkt);
+}
+
_ODP_INLINE int odp_packet_num_segs(odp_packet_t pkt)
{
return _odp_packet_num_segs(pkt);
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 1909bae2..9c3be1bc 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -1269,11 +1269,6 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len,
*
*/
-int odp_packet_input_index(odp_packet_t pkt)
-{
- return _odp_pktio_index(packet_hdr(pkt)->input);
-}
-
void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx)
{
packet_hdr(pkt)->buf_hdr.buf_cctx = ctx;
commit bfa24c0b7f035a84dd30e161673e97df244a926f
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Jan 30 12:31:35 2018 +0200
linux-gen: pktio: inline pktio index function
Inline packet IO interface handle to index conversion function
which may be used frequently.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 10e38ac3..1c2b625c 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -30,6 +30,8 @@ odpapiplatinclude_HEADERS = \
include/odp/api/plat/packet_inline_types.h \
include/odp/api/plat/packet_inlines.h \
include/odp/api/plat/packet_inlines_api.h \
+ include/odp/api/plat/pktio_inlines.h \
+ include/odp/api/plat/pktio_inlines_api.h \
include/odp/api/plat/pool_inline_types.h \
include/odp/api/plat/std_clib_inlines.h \
include/odp/api/plat/strong_types.h \
@@ -205,6 +207,7 @@ __LIB__libodp_linux_la_SOURCES += \
odp_byteorder.c \
odp_packet_api.c \
odp_packet_flags_api.c \
+ odp_pktio_api.c \
odp_std_clib.c \
odp_sync.c \
odp_thread_api.c \
diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h
index a84e858e..07931b81 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/packet_io.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/packet_io.h
@@ -51,6 +51,10 @@ typedef struct odp_pktout_queue_t {
* @}
*/
+#define _ODP_INLINE static inline
+#include <odp/api/plat/pktio_inlines.h>
+#include <odp/api/plat/pktio_inlines_api.h>
+
#ifdef __cplusplus
}
#endif
diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h
new file mode 100644
index 00000000..6a2aa72d
--- /dev/null
+++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines.h
@@ -0,0 +1,27 @@
+/* Copyright (c) 2018, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_PLAT_PKTIO_INLINES_H_
+#define ODP_PLAT_PKTIO_INLINES_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @cond _ODP_HIDE_FROM_DOXYGEN_ */
+
+static inline int _odp_pktio_index(odp_pktio_t pktio)
+{
+ return (int)(uintptr_t)pktio - 1;
+}
+
+/** @endcond */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h b/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h
new file mode 100644
index 00000000..5b59a437
--- /dev/null
+++ b/platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h
@@ -0,0 +1,31 @@
+/* Copyright (c) 2018, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ */
+
+#ifndef ODP_PLAT_PKTIO_INLINES_API_H_
+#define ODP_PLAT_PKTIO_INLINES_API_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_ODP_INLINE int odp_pktio_index(odp_pktio_t pktio)
+{
+ return _odp_pktio_index(pktio);
+}
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index ad34e964..1de0cbf9 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -18,6 +18,8 @@
extern "C" {
#endif
+#include <odp/api/packet_io.h>
+#include <odp/api/plat/pktio_inlines.h>
#include <odp/api/spinlock.h>
#include <odp/api/ticketlock.h>
#include <odp_classification_datamodel.h>
@@ -235,13 +237,10 @@ typedef struct pktio_if_ops {
extern void *pktio_entry_ptr[];
-static inline int pktio_to_id(odp_pktio_t pktio)
-{
- return _odp_typeval(pktio) - 1;
-}
-
static inline pktio_entry_t *get_pktio_entry(odp_pktio_t pktio)
{
+ int idx;
+
if (odp_unlikely(pktio == ODP_PKTIO_INVALID))
return NULL;
@@ -251,7 +250,9 @@ static inline pktio_entry_t *get_pktio_entry(odp_pktio_t pktio)
return NULL;
}
- return pktio_entry_ptr[pktio_to_id(pktio)];
+ idx = _odp_pktio_index(pktio);
+
+ return pktio_entry_ptr[idx];
}
static inline int pktio_cls_enabled(pktio_entry_t *entry)
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 488dcbdd..1909bae2 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -13,6 +13,8 @@
#include <odp/api/hints.h>
#include <odp/api/byteorder.h>
#include <odp/api/plat/byteorder_inlines.h>
+#include <odp/api/packet_io.h>
+#include <odp/api/plat/pktio_inlines.h>
#include <protocols/eth.h>
#include <protocols/ip.h>
@@ -1269,7 +1271,7 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len,
int odp_packet_input_index(odp_packet_t pkt)
{
- return odp_pktio_index(packet_hdr(pkt)->input);
+ return _odp_pktio_index(packet_hdr(pkt)->input);
}
void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx)
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 460891d0..4eae4ed1 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -9,6 +9,7 @@
#include <odp_posix_extensions.h>
#include <odp/api/packet_io.h>
+#include <odp/api/plat/pktio_inlines.h>
#include <odp_packet_io_internal.h>
#include <odp/api/packet.h>
#include <odp_packet_internal.h>
@@ -481,7 +482,7 @@ int odp_pktio_start(odp_pktio_t hdl)
}
}
- sched_fn->pktio_start(pktio_to_id(hdl), num, index, odpq);
+ sched_fn->pktio_start(_odp_pktio_index(hdl), num, index, odpq);
}
return res;
@@ -1022,16 +1023,6 @@ int odp_pktio_info(odp_pktio_t hdl, odp_pktio_info_t *info)
return 0;
}
-int odp_pktio_index(odp_pktio_t pktio)
-{
- pktio_entry_t *entry = get_pktio_entry(pktio);
-
- if (!entry || is_free(entry))
- return -1;
-
- return pktio_to_id(pktio);
-}
-
uint64_t odp_pktin_ts_res(odp_pktio_t hdl)
{
pktio_entry_t *entry;
@@ -1361,7 +1352,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio,
mode == ODP_PKTIN_MODE_SCHED) {
odp_queue_param_t queue_param;
char name[ODP_QUEUE_NAME_LEN];
- int pktio_id = pktio_to_id(pktio);
+ int pktio_id = _odp_pktio_index(pktio);
snprintf(name, sizeof(name), "odp-pktin-%i-%i",
pktio_id, i);
@@ -1496,7 +1487,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio,
odp_queue_param_t queue_param;
queue_t q_int;
char name[ODP_QUEUE_NAME_LEN];
- int pktio_id = pktio_to_id(pktio);
+ int pktio_id = _odp_pktio_index(pktio);
snprintf(name, sizeof(name), "odp-pktout-%i-%i",
pktio_id, i);
diff --git a/platform/linux-generic/odp_pktio_api.c b/platform/linux-generic/odp_pktio_api.c
new file mode 100644
index 00000000..f4dc3346
--- /dev/null
+++ b/platform/linux-generic/odp_pktio_api.c
@@ -0,0 +1,14 @@
+/* Copyright (c) 2018, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "config.h"
+
+#include <odp/api/packet_io.h>
+#include <odp/api/plat/pktio_inlines.h>
+
+/* Include non-inlined versions of API functions */
+#define _ODP_INLINE
+#include <odp/api/plat/pktio_inlines_api.h>
commit 7f80bdf3a851c1b37e5826327ab5415ac5abe7a4
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Jan 30 13:25:05 2018 +0200
validation: pktio: don't pass invalid handle to index conversion
Fast path functions cannot be expected to always check against
invalid handles. Also a handle that has been closed (or destroyed)
must not be passed to any API function.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index a2364103..b20272ff 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -1183,7 +1183,7 @@ void pktio_test_lookup(void)
void pktio_test_index(void)
{
- odp_pktio_t pktio, pktio_inval = ODP_PKTIO_INVALID;
+ odp_pktio_t pktio;
odp_pktio_param_t pktio_param;
int ndx;
@@ -1195,10 +1195,8 @@ void pktio_test_index(void)
ndx = odp_pktio_index(pktio);
CU_ASSERT(ndx >= 0);
- CU_ASSERT(odp_pktio_index(pktio_inval) < 0);
CU_ASSERT(odp_pktio_close(pktio) == 0);
- CU_ASSERT(odp_pktio_index(pktio) < 0);
}
static void pktio_test_print(void)
commit f74f2facaa16b35618c220f5652dbdb295c527e1
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 17:13:26 2018 +0200
test: l2fwd: use multi conversion functions
Use multi versions of packet / event conversion functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index 09a12b05..a2b9a9ca 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -270,12 +270,10 @@ static inline int event_queue_send(odp_queue_t queue, odp_packet_t *pkt_tbl,
unsigned pkts)
{
int ret;
- unsigned i;
unsigned sent = 0;
odp_event_t ev_tbl[pkts];
- for (i = 0; i < pkts; i++)
- ev_tbl[i] = odp_packet_to_event(pkt_tbl[i]);
+ odp_packet_to_event_multi(pkt_tbl, ev_tbl, pkts);
while (sent < pkts) {
ret = odp_queue_enq_multi(queue, &ev_tbl[sent], pkts - sent);
@@ -373,8 +371,7 @@ static int run_worker_sched_mode(void *arg)
if (pkts <= 0)
continue;
- for (i = 0; i < pkts; i++)
- pkt_tbl[i] = odp_packet_from_event(ev_tbl[i]);
+ odp_packet_from_event_multi(pkt_tbl, ev_tbl, pkts);
if (odp_unlikely(gbl_args->appl.extra_check)) {
if (gbl_args->appl.chksum)
@@ -499,8 +496,7 @@ static int run_worker_plain_queue_mode(void *arg)
if (odp_unlikely(pkts <= 0))
continue;
- for (i = 0; i < pkts; i++)
- pkt_tbl[i] = odp_packet_from_event(event[i]);
+ odp_packet_from_event_multi(pkt_tbl, event, pkts);
if (odp_unlikely(gbl_args->appl.extra_check)) {
if (gbl_args->appl.chksum)
commit eeb098456bc51314cd6520d05f82f92353ba4a02
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 16:58:47 2018 +0200
linux-gen: packet: inline conversions between packet and event
Inline implementation of packet_from_event and packet_to_event
functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/abi-default/buffer.h b/include/odp/api/abi-default/buffer.h
index d8bfc913..980528ba 100644
--- a/include/odp/api/abi-default/buffer.h
+++ b/include/odp/api/abi-default/buffer.h
@@ -20,7 +20,7 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_buffer_t;
typedef _odp_abi_buffer_t *odp_buffer_t;
-#define ODP_BUFFER_INVALID ((odp_buffer_t)NULL)
+#define ODP_BUFFER_INVALID ((odp_buffer_t)0)
/**
* @}
diff --git a/include/odp/api/abi-default/event.h b/include/odp/api/abi-default/event.h
index b52a1a22..0ed6dd09 100644
--- a/include/odp/api/abi-default/event.h
+++ b/include/odp/api/abi-default/event.h
@@ -22,7 +22,7 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_event_t;
typedef _odp_abi_event_t *odp_event_t;
-#define ODP_EVENT_INVALID ((odp_event_t)NULL)
+#define ODP_EVENT_INVALID ((odp_event_t)0)
typedef enum odp_event_type_t {
ODP_EVENT_BUFFER = 1,
diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h
index 15cf081b..086c4d3b 100644
--- a/include/odp/api/abi-default/packet.h
+++ b/include/odp/api/abi-default/packet.h
@@ -26,7 +26,7 @@ typedef struct { char dummy; /**< *internal Dummy */ } _odp_abi_packet_seg_t;
typedef _odp_abi_packet_t *odp_packet_t;
typedef _odp_abi_packet_seg_t *odp_packet_seg_t;
-#define ODP_PACKET_INVALID ((odp_packet_t)0xffffffff)
+#define ODP_PACKET_INVALID ((odp_packet_t)0)
#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0xffffffff)
#define ODP_PACKET_OFFSET_INVALID 0xffff
diff --git a/platform/linux-generic/include-abi/odp/api/abi/buffer.h b/platform/linux-generic/include-abi/odp/api/abi/buffer.h
index 90b6653a..879c88af 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/buffer.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/buffer.h
@@ -26,7 +26,7 @@ extern "C" {
typedef ODP_HANDLE_T(odp_buffer_t);
-#define ODP_BUFFER_INVALID _odp_cast_scalar(odp_buffer_t, NULL)
+#define ODP_BUFFER_INVALID _odp_cast_scalar(odp_buffer_t, 0)
/**
* @}
diff --git a/platform/linux-generic/include-abi/odp/api/abi/event.h b/platform/linux-generic/include-abi/odp/api/abi/event.h
index 802e431f..49dde956 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/event.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/event.h
@@ -26,7 +26,7 @@ extern "C" {
typedef ODP_HANDLE_T(odp_event_t);
-#define ODP_EVENT_INVALID _odp_cast_scalar(odp_event_t, NULL)
+#define ODP_EVENT_INVALID _odp_cast_scalar(odp_event_t, 0)
typedef enum odp_event_type_t {
ODP_EVENT_BUFFER = 1,
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index 4c0f88aa..dc7d464f 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -263,6 +263,35 @@ static inline int _odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset,
return 0;
}
+static inline odp_packet_t _odp_packet_from_event(odp_event_t ev)
+{
+ return (odp_packet_t)ev;
+}
+
+static inline odp_event_t _odp_packet_to_event(odp_packet_t pkt)
+{
+ return (odp_event_t)pkt;
+}
+
+static inline void _odp_packet_from_event_multi(odp_packet_t pkt[],
+ const odp_event_t ev[],
+ int num)
+{
+ int i;
+
+ for (i = 0; i < num; i++)
+ pkt[i] = _odp_packet_from_event(ev[i]);
+}
+
+static inline void _odp_packet_to_event_multi(const odp_packet_t pkt[],
+ odp_event_t ev[], int num)
+{
+ int i;
+
+ for (i = 0; i < num; i++)
+ ev[i] = _odp_packet_to_event(pkt[i]);
+}
+
/** @endcond */
#endif
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
index 9b31c923..95adec66 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
@@ -152,4 +152,25 @@ _ODP_INLINE int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset,
return _odp_packet_copy_to_mem(pkt, offset, len, dst);
}
+_ODP_INLINE odp_packet_t odp_packet_from_event(odp_event_t ev)
+{
+ return _odp_packet_from_event(ev);
+}
+
+_ODP_INLINE odp_event_t odp_packet_to_event(odp_packet_t pkt)
+{
+ return _odp_packet_to_event(pkt);
+}
+
+_ODP_INLINE void odp_packet_from_event_multi(odp_packet_t pkt[],
+ const odp_event_t ev[], int num)
+{
+ return _odp_packet_from_event_multi(pkt, ev, num);
+}
+
+_ODP_INLINE void odp_packet_to_event_multi(const odp_packet_t pkt[],
+ odp_event_t ev[], int num)
+{
+ return _odp_packet_to_event_multi(pkt, ev, num);
+}
#endif
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 043e4cb5..488dcbdd 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -49,15 +49,14 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = {
#include <odp/visibility_end.h>
-static inline odp_buffer_t buffer_handle(odp_packet_hdr_t *pkt_hdr)
-{
- return (odp_buffer_t)pkt_hdr;
-}
-
-static inline odp_packet_hdr_t *buf_to_packet_hdr(odp_buffer_t buf)
-{
- return (odp_packet_hdr_t *)buf_hdl_to_hdr(buf);
-}
+/* Check that invalid values are the same. Some versions of Clang have trouble
+ * with the strong type casting, and complain that these invalid values are not
+ * integral constants. */
+#ifndef __clang__
+ODP_STATIC_ASSERT(ODP_PACKET_INVALID == 0, "Packet invalid not 0");
+ODP_STATIC_ASSERT(ODP_BUFFER_INVALID == 0, "Buffer invalid not 0");
+ODP_STATIC_ASSERT(ODP_EVENT_INVALID == 0, "Event invalid not 0");
+#endif
odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr)
{
@@ -998,40 +997,6 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len)
return 0;
}
-odp_packet_t odp_packet_from_event(odp_event_t ev)
-{
- if (odp_unlikely(ev == ODP_EVENT_INVALID))
- return ODP_PACKET_INVALID;
-
- return (odp_packet_t)buf_to_packet_hdr((odp_buffer_t)ev);
-}
-
-odp_event_t odp_packet_to_event(odp_packet_t pkt)
-{
- if (odp_unlikely(pkt == ODP_PACKET_INVALID))
- return ODP_EVENT_INVALID;
-
- return (odp_event_t)buffer_handle(packet_hdr(pkt));
-}
-
-void odp_packet_from_event_multi(odp_packet_t pkt[], const odp_event_t ev[],
- int num)
-{
- int i;
-
- for (i = 0; i < num; i++)
- pkt[i] = odp_packet_from_event(ev[i]);
-}
-
-void odp_packet_to_event_multi(const odp_packet_t pkt[], odp_event_t ev[],
- int num)
-{
- int i;
-
- for (i = 0; i < num; i++)
- ev[i] = odp_packet_to_event(pkt[i]);
-}
-
int odp_event_filter_packet(const odp_event_t event[],
odp_packet_t packet[],
odp_event_t remain[], int num)
commit 379d527e891e1ad246b0bb796e6fc938618758c4
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 15:39:16 2018 +0200
linux-gen: packet: implement packet prefetch
For minimal code complexity and negative impact, prefetch
only when the requested address is in the first segment and
prefetch only one cache line.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index dee8f71c..4c0f88aa 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -225,7 +225,14 @@ static inline odp_packet_seg_t _odp_packet_next_seg(odp_packet_t pkt,
static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset,
uint32_t len)
{
- (void)pkt; (void)offset; (void)len;
+ uint32_t seg_len = _odp_packet_seg_len(pkt);
+ uint8_t *data = (uint8_t *)_odp_packet_data(pkt);
+ (void)len;
+
+ if (odp_unlikely(offset >= seg_len))
+ return;
+
+ odp_prefetch(data + offset);
}
static inline int _odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset,
commit 637a332968967672395f1d41d809d0eba8d8dbd1
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 15:22:10 2018 +0200
linux-gen: packet: remove odp_packet_hdr function
Use only one function (packet_hdr) in handle to header pointer
conversion. odp_packet_hdr is bad name for an implementation
internal function as API function prefix is odp_packet_.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index 90e205fd..dee8f71c 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -228,11 +228,6 @@ static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset,
(void)pkt; (void)offset; (void)len;
}
-static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt)
-{
- return (odp_buffer_t)pkt;
-}
-
static inline int _odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset,
uint32_t len, const void *src)
{
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 32e41d7f..89009a02 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -169,7 +169,7 @@ typedef struct {
/**
* Return the packet header
*/
-static inline odp_packet_hdr_t *odp_packet_hdr(odp_packet_t pkt)
+static inline odp_packet_hdr_t *packet_hdr(odp_packet_t pkt)
{
return (odp_packet_hdr_t *)(uintptr_t)pkt;
}
@@ -181,7 +181,7 @@ static inline odp_packet_t packet_handle(odp_packet_hdr_t *pkt_hdr)
static inline odp_buffer_hdr_t *packet_to_buf_hdr(odp_packet_t pkt)
{
- return &odp_packet_hdr(pkt)->buf_hdr;
+ return &packet_hdr(pkt)->buf_hdr;
}
static inline odp_packet_t packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr)
@@ -201,12 +201,12 @@ static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr)
static inline odp_event_subtype_t packet_subtype(odp_packet_t pkt)
{
- return odp_packet_hdr(pkt)->subtype;
+ return packet_hdr(pkt)->subtype;
}
static inline void packet_subtype_set(odp_packet_t pkt, int ev)
{
- odp_packet_hdr(pkt)->subtype = ev;
+ packet_hdr(pkt)->subtype = ev;
}
/**
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 8ae484fd..325a9d06 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -1434,7 +1434,7 @@ odp_event_t odp_crypto_packet_to_event(odp_packet_t pkt)
static
odp_crypto_packet_result_t *get_op_result_from_packet(odp_packet_t pkt)
{
- odp_packet_hdr_t *hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *hdr = packet_hdr(pkt);
return &hdr->crypto_op_result;
}
@@ -1520,7 +1520,7 @@ int odp_crypto_int(odp_packet_t pkt_in,
(rc_cipher == ODP_CRYPTO_ALG_ERR_NONE) &&
(rc_auth == ODP_CRYPTO_ALG_ERR_NONE);
- pkt_hdr = odp_packet_hdr(out_pkt);
+ pkt_hdr = packet_hdr(out_pkt);
pkt_hdr->p.error_flags.crypto_err = !op_result->ok;
/* Synchronous, simply return results */
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 521627f1..586653d4 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -158,7 +158,7 @@ static odp_ipsec_packet_result_t *ipsec_pkt_result(odp_packet_t packet)
ODP_ASSERT(ODP_EVENT_PACKET_IPSEC ==
odp_event_subtype(odp_packet_to_event(packet)));
- return &odp_packet_hdr(packet)->ipsec_ctx;
+ return &packet_hdr(packet)->ipsec_ctx;
}
static inline int _odp_ipv4_csum(odp_packet_t pkt,
@@ -829,7 +829,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
return ipsec_sa;
err:
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
pkt_hdr->p.error_flags.ipsec_err = 1;
*pkt_out = pkt;
@@ -1404,7 +1404,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
return ipsec_sa;
err:
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
pkt_hdr->p.error_flags.ipsec_err = 1;
@@ -1652,7 +1652,7 @@ int _odp_ipsec_try_inline(odp_packet_t pkt)
result->sa = ipsec_sa->ipsec_sa_hdl;
result->flag.inline_mode = 1;
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
pkt_hdr->p.input_flags.dst_queue = 1;
pkt_hdr->dst_queue = queue_fn->from_ext(ipsec_sa->queue);
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 2867e67e..043e4cb5 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -49,11 +49,6 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = {
#include <odp/visibility_end.h>
-static inline odp_packet_hdr_t *packet_hdr(odp_packet_t pkt)
-{
- return (odp_packet_hdr_t *)(uintptr_t)pkt;
-}
-
static inline odp_buffer_t buffer_handle(odp_packet_hdr_t *pkt_hdr)
{
return (odp_buffer_t)pkt_hdr;
@@ -69,6 +64,11 @@ odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr)
return (odp_packet_t)buf_hdr;
}
+static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt)
+{
+ return (odp_buffer_t)pkt;
+}
+
static inline seg_entry_t *seg_entry(odp_packet_hdr_t *hdr,
uint32_t seg_idx)
{
diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c
index 96507c66..2909703f 100644
--- a/platform/linux-generic/odp_packet_flags.c
+++ b/platform/linux-generic/odp_packet_flags.c
@@ -11,18 +11,18 @@
#include <odp_packet_internal.h>
#define retflag(pkt, x) do { \
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); \
return pkt_hdr->p.x; \
} while (0)
#define setflag(pkt, x, v) do { \
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); \
pkt_hdr->p.x = (v) & 1; \
} while (0)
int odp_packet_has_error(odp_packet_t pkt)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
return pkt_hdr->p.error_flags.all != 0;
}
@@ -31,7 +31,7 @@ int odp_packet_has_error(odp_packet_t pkt)
int odp_packet_has_l2_error(odp_packet_t pkt)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
/* L2 parsing is always done by default and hence
no additional check is required */
return pkt_hdr->p.error_flags.frame_len
@@ -46,7 +46,7 @@ int odp_packet_has_l3(odp_packet_t pkt)
int odp_packet_has_l3_error(odp_packet_t pkt)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
return pkt_hdr->p.error_flags.ip_err;
}
@@ -58,7 +58,7 @@ int odp_packet_has_l4(odp_packet_t pkt)
int odp_packet_has_l4_error(odp_packet_t pkt)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
return pkt_hdr->p.error_flags.tcp_err | pkt_hdr->p.error_flags.udp_err;
}
@@ -150,14 +150,14 @@ odp_packet_color_t odp_packet_color(odp_packet_t pkt)
void odp_packet_color_set(odp_packet_t pkt, odp_packet_color_t color)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
pkt_hdr->p.input_flags.color = color;
}
odp_bool_t odp_packet_drop_eligible(odp_packet_t pkt)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
return !pkt_hdr->p.input_flags.nodrop;
}
@@ -174,7 +174,7 @@ int8_t odp_packet_shaper_len_adjust(odp_packet_t pkt)
void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
pkt_hdr->p.output_flags.shaper_len_adj = adj;
}
@@ -288,14 +288,14 @@ void odp_packet_has_icmp_set(odp_packet_t pkt, int val)
void odp_packet_has_flow_hash_clr(odp_packet_t pkt)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
pkt_hdr->p.input_flags.flow_hash = 0;
}
void odp_packet_has_ts_clr(odp_packet_t pkt)
{
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
pkt_hdr->p.input_flags.timestamp = 0;
}
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index b8dd7c90..460891d0 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -570,7 +570,7 @@ static inline int pktin_recv_buf(odp_pktin_queue_t queue,
for (i = 0; i < pkts; i++) {
pkt = packets[i];
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
buf_hdr = packet_to_buf_hdr(pkt);
if (pkt_hdr->p.input_flags.dst_queue) {
@@ -698,7 +698,7 @@ int sched_cb_pktin_poll_one(int pktio_index,
num_rx = 0;
for (i = 0; i < num_pkts; i++) {
pkt = packets[i];
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
if (odp_unlikely(pkt_hdr->p.input_flags.dst_queue)) {
queue = pkt_hdr->dst_queue;
buf_hdr = packet_to_buf_hdr(pkt);
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 86d7a451..bd6920e6 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -262,7 +262,7 @@ static int pool_dequeue_bulk(struct rte_mempool *mp, void **obj_table,
for (i = 0; i < pkts; i++) {
odp_packet_t pkt = packet_tbl[i];
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
struct rte_mbuf *mbuf = (struct rte_mbuf *)
(uintptr_t)pkt_hdr->extra;
if (pkt_hdr->extra_type != PKT_EXTRA_TYPE_DPDK)
@@ -468,7 +468,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
}
pkt = pkt_table[i];
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
pull_tail(pkt_hdr, alloc_len - pkt_len);
if (_odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0)
@@ -636,7 +636,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry,
return 0;
}
for (i = 0; i < num; i++) {
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt_table[i]);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt_table[i]);
pkt_len = packet_len(pkt_hdr);
@@ -697,7 +697,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
pkt_len = rte_pktmbuf_pkt_len(mbuf);
pkt = (odp_packet_t)mbuf->userdata;
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
if (pktio_cls_enabled(pktio_entry)) {
if (cls_classify_packet(pktio_entry,
@@ -754,7 +754,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry,
for (i = 0; i < num; i++) {
odp_packet_t pkt = pkt_table[i];
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
struct rte_mbuf *mbuf = (struct rte_mbuf *)
(uintptr_t)pkt_hdr->extra;
uint16_t pkt_len = odp_packet_len(pkt);
@@ -1606,7 +1606,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index,
for (i = 0; i < mbufs && freed != copy_count; i++) {
odp_packet_t pkt = pkt_table[i];
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
if (pkt_hdr->buf_hdr.segcount > 1) {
if (odp_likely(i < tx_pkts))
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
index b6c493ea..95b52664 100644
--- a/platform/linux-generic/pktio/ipc.c
+++ b/platform/linux-generic/pktio/ipc.c
@@ -507,14 +507,14 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry,
memcpy(pkt_data, rmt_data_ptr, phdr->frame_len);
/* Copy packets L2, L3 parsed offsets and size */
- copy_packet_cls_metadata(phdr, odp_packet_hdr(pkt));
+ copy_packet_cls_metadata(phdr, packet_hdr(pkt));
- odp_packet_hdr(pkt)->frame_len = phdr->frame_len;
- odp_packet_hdr(pkt)->headroom = phdr->headroom;
- odp_packet_hdr(pkt)->tailroom = phdr->tailroom;
+ packet_hdr(pkt)->frame_len = phdr->frame_len;
+ packet_hdr(pkt)->headroom = phdr->headroom;
+ packet_hdr(pkt)->tailroom = phdr->tailroom;
/* Take classification fields */
- odp_packet_hdr(pkt)->p = phdr->p;
+ packet_hdr(pkt)->p = phdr->p;
pkt_table[i] = pkt;
}
@@ -604,7 +604,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry,
odp_packet_hdr_t *pkt_hdr;
pool_t *pool;
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
pool = pkt_hdr->buf_hdr.pool_ptr;
if (pool->pool_idx != ipc_pool->pool_idx ||
@@ -626,7 +626,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry,
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);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
odp_pool_t pool_hdl = odp_packet_pool(pkt);
pool_t *pool = pool_entry_from_hdl(pool_hdl);
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index aecb0263..0cf45acb 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -101,7 +101,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
pkt = packet_from_buf_hdr(hdr_tbl[i]);
pkt_len = odp_packet_len(pkt);
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
packet_parse_reset(pkt_hdr);
if (pktio_cls_enabled(pktio_entry)) {
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index c03564f4..66fe247d 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -647,7 +647,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry,
}
pkt = pkt_tbl[i];
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
pull_tail(pkt_hdr, alloc_len - len);
/* For now copy the data in the mbuf,
diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
index 76cbf9ee..889903dd 100644
--- a/platform/linux-generic/pktio/pcap.c
+++ b/platform/linux-generic/pktio/pcap.c
@@ -248,7 +248,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
if (ts != NULL)
ts_val = odp_time_global();
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
if (_odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) {
ODP_ERR("failed to copy packet data\n");
diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
index 71980b54..749377c0 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -639,7 +639,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
void *base = msgvec[i].msg_hdr.msg_iov->iov_base;
struct ethhdr *eth_hdr = base;
odp_packet_t pkt = pkt_table[i];
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
uint16_t pkt_len = msgvec[i].msg_len;
int ret;
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index 2ace1a59..852bc766 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -243,7 +243,7 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry,
frame_num = next_frame_num;
continue;
}
- hdr = odp_packet_hdr(pkt_table[nb_rx]);
+ hdr = packet_hdr(pkt_table[nb_rx]);
ret = _odp_packet_copy_from_mem(pkt_table[nb_rx], 0,
pkt_len, pkt_buf);
if (ret != 0) {
diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c
index ccfa19b2..56f90b31 100644
--- a/platform/linux-generic/pktio/tap.c
+++ b/platform/linux-generic/pktio/tap.c
@@ -280,7 +280,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data,
return ODP_PACKET_INVALID;
}
- pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = packet_hdr(pkt);
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
commit 24847c049d1a3ead549f0ccb5c7da5fbdedaa794
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 14:48:45 2018 +0200
linux-gen: packet: use inlined copy functions
Use always inlined versions of packet to/from memory copy
functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index 557e77ba..03094cc3 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -1941,8 +1941,8 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking,
* correctness rather then performance. */
split_hdr = hdr_len < (_ODP_ETHHDR_LEN + _ODP_VLANHDR_LEN);
if (split_hdr) {
- odp_packet_copy_to_mem(odp_pkt, _ODP_ETHHDR_LEN,
- _ODP_VLANHDR_LEN, &vlan_hdr);
+ _odp_packet_copy_to_mem(odp_pkt, _ODP_ETHHDR_LEN,
+ _ODP_VLANHDR_LEN, &vlan_hdr);
vlan_hdr_ptr = &vlan_hdr;
}
@@ -1956,8 +1956,8 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking,
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);
+ _odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN,
+ _ODP_VLANHDR_LEN, &vlan_hdr);
}
static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking,
@@ -1980,8 +1980,8 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking,
* correctness rather then performance. */
split_hdr = hdr_len < 12;
if (split_hdr) {
- odp_packet_copy_to_mem(odp_pkt, l3_offset,
- _ODP_IPV4HDR_LEN, &ipv4_hdr);
+ _odp_packet_copy_to_mem(odp_pkt, l3_offset,
+ _ODP_IPV4HDR_LEN, &ipv4_hdr);
ipv4_hdr_ptr = &ipv4_hdr;
}
@@ -2022,8 +2022,8 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking,
ipv4_hdr_ptr->tos = new_tos;
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);
+ _odp_packet_copy_from_mem(odp_pkt, l3_offset,
+ _ODP_IPV4HDR_LEN, &ipv4_hdr);
}
static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking,
@@ -2046,8 +2046,8 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking,
* correctness rather then performance. */
split_hdr = hdr_len < 4;
if (split_hdr) {
- odp_packet_copy_to_mem(odp_pkt, l3_offset,
- _ODP_IPV6HDR_LEN, &ipv6_hdr);
+ _odp_packet_copy_to_mem(odp_pkt, l3_offset,
+ _ODP_IPV6HDR_LEN, &ipv6_hdr);
ipv6_hdr_ptr = &ipv6_hdr;
}
@@ -2075,8 +2075,8 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking,
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,
- _ODP_IPV6HDR_LEN, &ipv6_hdr);
+ _odp_packet_copy_from_mem(odp_pkt, l3_offset,
+ _ODP_IPV6HDR_LEN, &ipv6_hdr);
}
static void tm_egress_marking(tm_system_t *tm_system, odp_packet_t odp_pkt)
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 4ae72e10..86d7a451 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -471,7 +471,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
pkt_hdr = odp_packet_hdr(pkt);
pull_tail(pkt_hdr, alloc_len - pkt_len);
- if (odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0)
+ if (_odp_packet_copy_from_mem(pkt, 0, pkt_len, data) != 0)
goto fail;
pkt_hdr->input = pktio_entry->s.handle;
@@ -649,7 +649,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry,
/* Packet always fits in mbuf */
data = rte_pktmbuf_append(mbuf_table[i], pkt_len);
- odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data);
+ _odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data);
if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) {
odp_pktout_config_opt_t *pktout_capa =
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index a7c47900..c03564f4 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -652,7 +652,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry,
/* For now copy the data in the mbuf,
worry about zero-copy later */
- if (odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0)
+ if (_odp_packet_copy_from_mem(pkt, 0, len, slot.buf) != 0)
goto fail;
pkt_hdr->input = pktio_entry->s.handle;
@@ -938,7 +938,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index,
buf = NETMAP_BUF(ring, ring->slot[slot_id].buf_idx);
- if (odp_packet_copy_to_mem(pkt, 0, pkt_len, buf)) {
+ if (_odp_packet_copy_to_mem(pkt, 0, pkt_len, buf)) {
i = NM_INJECT_RETRIES;
break;
}
diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
index 7fc92514..76cbf9ee 100644
--- a/platform/linux-generic/pktio/pcap.c
+++ b/platform/linux-generic/pktio/pcap.c
@@ -39,6 +39,7 @@
#include <odp_posix_extensions.h>
#include <odp_api.h>
+#include <odp/api/plat/packet_inlines.h>
#include <odp_packet_internal.h>
#include <odp_packet_io_internal.h>
@@ -249,7 +250,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
pkt_hdr = odp_packet_hdr(pkt);
- if (odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) {
+ if (_odp_packet_copy_from_mem(pkt, 0, hdr->caplen, data) != 0) {
ODP_ERR("failed to copy packet data\n");
break;
}
@@ -283,7 +284,7 @@ static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt)
hdr.len = hdr.caplen;
(void)gettimeofday(&hdr.ts, NULL);
- if (odp_packet_copy_to_mem(pkt, 0, hdr.len, pcap->buf) != 0)
+ if (_odp_packet_copy_to_mem(pkt, 0, hdr.len, pcap->buf) != 0)
return -1;
pcap_dump(pcap->tx_dump, &hdr, pcap->buf);
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index b53173d2..2ace1a59 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -26,6 +26,7 @@
#include <time.h>
#include <odp_api.h>
+#include <odp/api/plat/packet_inlines.h>
#include <odp_packet_socket.h>
#include <odp_packet_internal.h>
#include <odp_packet_io_internal.h>
@@ -243,8 +244,8 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry,
continue;
}
hdr = odp_packet_hdr(pkt_table[nb_rx]);
- ret = odp_packet_copy_from_mem(pkt_table[nb_rx], 0,
- pkt_len, pkt_buf);
+ ret = _odp_packet_copy_from_mem(pkt_table[nb_rx], 0,
+ pkt_len, pkt_buf);
if (ret != 0) {
odp_packet_free(pkt_table[nb_rx]);
mmap_rx_user_ready(ppd.raw); /* drop */
@@ -345,7 +346,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring,
buf = (uint8_t *)ppd.raw + TPACKET2_HDRLEN -
sizeof(struct sockaddr_ll);
- odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, buf);
+ _odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, buf);
mmap_tx_user_ready(ppd.raw);
diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c
index ebd4d94b..ccfa19b2 100644
--- a/platform/linux-generic/pktio/tap.c
+++ b/platform/linux-generic/pktio/tap.c
@@ -42,6 +42,7 @@
#include <linux/if_tun.h>
#include <odp_api.h>
+#include <odp/api/plat/packet_inlines.h>
#include <odp_packet_socket.h>
#include <odp_packet_internal.h>
#include <odp_packet_io_internal.h>
@@ -273,7 +274,7 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data,
if (num != 1)
return ODP_PACKET_INVALID;
- if (odp_packet_copy_from_mem(pkt, 0, len, data) < 0) {
+ if (_odp_packet_copy_from_mem(pkt, 0, len, data) < 0) {
ODP_ERR("failed to copy packet data\n");
odp_packet_free(pkt);
return ODP_PACKET_INVALID;
@@ -352,7 +353,7 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry,
break;
}
- if (odp_packet_copy_to_mem(pkts[i], 0, pkt_len, buf) < 0) {
+ if (_odp_packet_copy_to_mem(pkts[i], 0, pkt_len, buf) < 0) {
ODP_ERR("failed to copy packet data\n");
break;
}
commit 70217ce609bd28e1982ec9caae2b4d91fca4074d
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 14:39:49 2018 +0200
linux-gen: packet: inline copy functions
Inline commonly used packet to/from memory copy functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index 765bafb4..90e205fd 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -23,11 +23,19 @@
#include <odp/api/plat/packet_inline_types.h>
#include <odp/api/plat/pool_inline_types.h>
+#include <string.h>
+
/** @cond _ODP_HIDE_FROM_DOXYGEN_ */
void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len,
int *seg_idx);
+int _odp_packet_copy_from_mem_seg(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, const void *src);
+
+int _odp_packet_copy_to_mem_seg(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, void *dst);
+
extern const _odp_packet_inline_offset_t _odp_packet_inline;
extern const _odp_pool_inline_offset_t _odp_pool_inline;
@@ -225,6 +233,34 @@ static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt)
return (odp_buffer_t)pkt;
}
+static inline int _odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, const void *src)
+{
+ uint32_t seg_len = _odp_packet_seg_len(pkt);
+ uint8_t *data = (uint8_t *)_odp_packet_data(pkt);
+
+ if (odp_unlikely(offset + len > seg_len))
+ return _odp_packet_copy_from_mem_seg(pkt, offset, len, src);
+
+ memcpy(data + offset, src, len);
+
+ return 0;
+}
+
+static inline int _odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, void *dst)
+{
+ uint32_t seg_len = _odp_packet_seg_len(pkt);
+ uint8_t *data = (uint8_t *)_odp_packet_data(pkt);
+
+ if (odp_unlikely(offset + len > seg_len))
+ return _odp_packet_copy_to_mem_seg(pkt, offset, len, dst);
+
+ memcpy(dst, data + offset, len);
+
+ return 0;
+}
+
/** @endcond */
#endif
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
index c90a69c5..9b31c923 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
@@ -140,4 +140,16 @@ _ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset,
return _odp_packet_prefetch(pkt, offset, len);
}
+_ODP_INLINE int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, const void *src)
+{
+ return _odp_packet_copy_from_mem(pkt, offset, len, src);
+}
+
+_ODP_INLINE int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, void *dst)
+{
+ return _odp_packet_copy_to_mem(pkt, offset, len, dst);
+}
+
#endif
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 8d618598..2867e67e 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -334,6 +334,54 @@ void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len,
return packet_map(pkt_ptr, offset, seg_len, seg_idx);
}
+int _odp_packet_copy_from_mem_seg(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, const void *src)
+{
+ void *mapaddr;
+ uint32_t seglen = 0; /* GCC */
+ uint32_t cpylen;
+ const uint8_t *srcaddr = (const uint8_t *)src;
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+
+ if (offset + len > pkt_hdr->frame_len)
+ return -1;
+
+ while (len > 0) {
+ mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL);
+ cpylen = len > seglen ? seglen : len;
+ memcpy(mapaddr, srcaddr, cpylen);
+ offset += cpylen;
+ srcaddr += cpylen;
+ len -= cpylen;
+ }
+
+ return 0;
+}
+
+int _odp_packet_copy_to_mem_seg(odp_packet_t pkt, uint32_t offset,
+ uint32_t len, void *dst)
+{
+ void *mapaddr;
+ uint32_t seglen = 0; /* GCC */
+ uint32_t cpylen;
+ uint8_t *dstaddr = (uint8_t *)dst;
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+
+ if (offset + len > pkt_hdr->frame_len)
+ return -1;
+
+ while (len > 0) {
+ mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL);
+ cpylen = len > seglen ? seglen : len;
+ memcpy(dstaddr, mapaddr, cpylen);
+ offset += cpylen;
+ dstaddr += cpylen;
+ len -= cpylen;
+ }
+
+ return 0;
+}
+
#include <odp/visibility_end.h>
void packet_parse_reset(odp_packet_hdr_t *pkt_hdr)
@@ -1595,54 +1643,6 @@ odp_packet_t odp_packet_copy_part(odp_packet_t pkt, uint32_t offset,
return newpkt;
}
-int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset,
- uint32_t len, void *dst)
-{
- void *mapaddr;
- uint32_t seglen = 0; /* GCC */
- uint32_t cpylen;
- uint8_t *dstaddr = (uint8_t *)dst;
- odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
-
- if (offset + len > pkt_hdr->frame_len)
- return -1;
-
- while (len > 0) {
- mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL);
- cpylen = len > seglen ? seglen : len;
- memcpy(dstaddr, mapaddr, cpylen);
- offset += cpylen;
- dstaddr += cpylen;
- len -= cpylen;
- }
-
- return 0;
-}
-
-int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset,
- uint32_t len, const void *src)
-{
- void *mapaddr;
- uint32_t seglen = 0; /* GCC */
- uint32_t cpylen;
- const uint8_t *srcaddr = (const uint8_t *)src;
- odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
-
- if (offset + len > pkt_hdr->frame_len)
- return -1;
-
- while (len > 0) {
- mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL);
- cpylen = len > seglen ? seglen : len;
- memcpy(mapaddr, srcaddr, cpylen);
- offset += cpylen;
- srcaddr += cpylen;
- len -= cpylen;
- }
-
- return 0;
-}
-
int odp_packet_copy_from_pkt(odp_packet_t dst, uint32_t dst_offset,
odp_packet_t src, uint32_t src_offset,
uint32_t len)
commit e2023d4f1767d2358c97bc4aab4b21086dba1421
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 13:39:52 2018 +0200
linux-gen: packet: remove dummy doxygen documentation
Use @cond tag to hide internal functions from Doxygen.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index fb9c524f..765bafb4 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -23,63 +23,52 @@
#include <odp/api/plat/packet_inline_types.h>
#include <odp/api/plat/pool_inline_types.h>
-/** @internal Inline function @param pkt_ptr @param offset @param seg_len
- * @param seg_idx @return */
+/** @cond _ODP_HIDE_FROM_DOXYGEN_ */
+
void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len,
int *seg_idx);
-/** @internal Inline function offsets */
extern const _odp_packet_inline_offset_t _odp_packet_inline;
-
-/** @internal Pool inline function offsets */
-extern const _odp_pool_inline_offset_t _odp_pool_inline;
+extern const _odp_pool_inline_offset_t _odp_pool_inline;
#ifndef _ODP_HAVE_PACKET_SEG_NDX
#include <odp/api/plat/strong_types.h>
-/** @internal Inline function @param seg @return */
static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg)
{
return _odp_typeval(seg);
}
-/** @internal Inline function @param ndx @return */
static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint32_t ndx)
{
return _odp_cast_scalar(odp_packet_seg_t, ndx);
}
#endif
-/** @internal Inline function @param pkt @return */
static inline void *_odp_packet_data(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, void *, data);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_seg_len(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint32_t, seg_len);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_len(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint32_t, frame_len);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_headroom(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint16_t, headroom);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_tailroom(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint16_t, tailroom);
}
-/** @internal Inline function @param pkt @return */
static inline odp_pool_t _odp_packet_pool(odp_packet_t pkt)
{
void *pool = _odp_pkt_get(pkt, void *, pool);
@@ -87,31 +76,26 @@ static inline odp_pool_t _odp_packet_pool(odp_packet_t pkt)
return _odp_pool_get(pool, odp_pool_t, pool_hdl);
}
-/** @internal Inline function @param pkt @return */
static inline odp_pktio_t _odp_packet_input(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, odp_pktio_t, input);
}
-/** @internal Inline function @param pkt @return */
static inline int _odp_packet_num_segs(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint8_t, segcount);
}
-/** @internal Inline function @param pkt @return */
static inline void *_odp_packet_user_ptr(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, void *, user_ptr);
}
-/** @internal Inline function @param pkt @return */
static inline void *_odp_packet_user_area(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, void *, user_area);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt)
{
void *pool = _odp_pkt_get(pkt, void *, pool);
@@ -119,25 +103,21 @@ static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt)
return _odp_pool_get(pool, uint32_t, uarea_size);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_l2_offset(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint16_t, l2_offset);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_l3_offset(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint16_t, l3_offset);
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_l4_offset(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint16_t, l4_offset);
}
-/** @internal Inline function @param pkt @param len @return */
static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len)
{
uint32_t offset = _odp_packet_l2_offset(pkt);
@@ -156,7 +136,6 @@ static inline void *_odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len)
return data + offset;
}
-/** @internal Inline function @param pkt @param len @return */
static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len)
{
uint32_t offset = _odp_packet_l3_offset(pkt);
@@ -175,7 +154,6 @@ static inline void *_odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len)
return data + offset;
}
-/** @internal Inline function @param pkt @param len @return */
static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len)
{
uint32_t offset = _odp_packet_l4_offset(pkt);
@@ -194,31 +172,26 @@ static inline void *_odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len)
return data + offset;
}
-/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_flow_hash(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint32_t, flow_hash);
}
-/** @internal Inline function @param pkt @return */
static inline odp_time_t _odp_packet_ts(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, odp_time_t, timestamp);
}
-/** @internal Inline function @param pkt @return */
static inline void *_odp_packet_head(odp_packet_t pkt)
{
return (uint8_t *)_odp_packet_data(pkt) - _odp_packet_headroom(pkt);
}
-/** @internal Inline function @param pkt @return */
static inline int _odp_packet_is_segmented(odp_packet_t pkt)
{
return _odp_pkt_get(pkt, uint8_t, segcount) > 1;
}
-/** @internal Inline function @param pkt @return */
static inline odp_packet_seg_t _odp_packet_first_seg(odp_packet_t pkt)
{
(void)pkt;
@@ -226,13 +199,11 @@ static inline odp_packet_seg_t _odp_packet_first_seg(odp_packet_t pkt)
return _odp_packet_seg_from_ndx(0);
}
-/** @internal Inline function @param pkt @return */
static inline odp_packet_seg_t _odp_packet_last_seg(odp_packet_t pkt)
{
return _odp_packet_seg_from_ndx(_odp_packet_num_segs(pkt) - 1);
}
-/** @internal Inline function @param pkt @param seg @return */
static inline odp_packet_seg_t _odp_packet_next_seg(odp_packet_t pkt,
odp_packet_seg_t seg)
{
@@ -243,17 +214,17 @@ static inline odp_packet_seg_t _odp_packet_next_seg(odp_packet_t pkt,
return seg + 1;
}
-/** @internal Inline function @param pkt @param offset @param len */
static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset,
uint32_t len)
{
(void)pkt; (void)offset; (void)len;
}
-/** @internal Inline function @param pkt @return */
static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt)
{
return (odp_buffer_t)pkt;
}
+/** @endcond */
+
#endif
commit 72aa3ae9e181a90718b42da85561638cf7f3d480
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jan 29 13:08:21 2018 +0200
linux-gen: packet: use inlined flow hash and ts set
Use inlined version of flow hash set function. Also changed API
to use inlined timestamp function, so that the same function is
not implemented twice.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 01e0cae1..32e41d7f 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -331,6 +331,13 @@ static inline int packet_hdr_has_ipv6(odp_packet_hdr_t *pkt_hdr)
return pkt_hdr->p.input_flags.ipv6;
}
+static inline void packet_set_flow_hash(odp_packet_hdr_t *pkt_hdr,
+ uint32_t flow_hash)
+{
+ pkt_hdr->flow_hash = flow_hash;
+ pkt_hdr->p.input_flags.flow_hash = 1;
+}
+
static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts)
{
if (ts != NULL) {
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index a4cd05f6..8d618598 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -1352,16 +1352,14 @@ void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- pkt_hdr->flow_hash = flow_hash;
- pkt_hdr->p.input_flags.flow_hash = 1;
+ packet_set_flow_hash(pkt_hdr, flow_hash);
}
void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- pkt_hdr->timestamp = timestamp;
- pkt_hdr->p.input_flags.timestamp = 1;
+ packet_set_ts(pkt_hdr, ×tamp);
}
/*
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 6fd4b192..4ae72e10 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -483,7 +483,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
pktio_entry->s.config.parser.layer);
if (mbuf->ol_flags & PKT_RX_RSS_HASH)
- odp_packet_flow_hash_set(pkt, mbuf->hash.rss);
+ packet_set_flow_hash(pkt_hdr, mbuf->hash.rss);
packet_set_ts(pkt_hdr, ts);
@@ -723,7 +723,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
pktio_entry->s.config.parser.layer);
if (mbuf->ol_flags & PKT_RX_RSS_HASH)
- odp_packet_flow_hash_set(pkt, mbuf->hash.rss);
+ packet_set_flow_hash(pkt_hdr, mbuf->hash.rss);
packet_set_ts(pkt_hdr, ts);
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/abi-default/buffer.h | 2 +-
include/odp/api/abi-default/event.h | 2 +-
include/odp/api/abi-default/packet.h | 2 +-
platform/linux-generic/Makefile.am | 3 +
.../linux-generic/include-abi/odp/api/abi/buffer.h | 2 +-
.../linux-generic/include-abi/odp/api/abi/event.h | 2 +-
.../include-abi/odp/api/abi/packet_io.h | 4 +
.../include/odp/api/plat/packet_inlines.h | 120 ++++++++++-----
.../include/odp/api/plat/packet_inlines_api.h | 38 +++++
.../include/odp/api/plat/pktio_inlines.h | 27 ++++
.../include/odp/api/plat/pktio_inlines_api.h | 31 ++++
.../linux-generic/include/odp_packet_internal.h | 15 +-
.../linux-generic/include/odp_packet_io_internal.h | 13 +-
platform/linux-generic/odp_crypto.c | 4 +-
platform/linux-generic/odp_ipsec.c | 8 +-
platform/linux-generic/odp_packet.c | 168 ++++++++-------------
platform/linux-generic/odp_packet_flags.c | 22 +--
platform/linux-generic/odp_packet_io.c | 21 +--
.../{odp_thread_api.c => odp_pktio_api.c} | 7 +-
platform/linux-generic/odp_traffic_mngr.c | 24 +--
platform/linux-generic/pktio/dpdk.c | 20 +--
platform/linux-generic/pktio/ipc.c | 14 +-
platform/linux-generic/pktio/loop.c | 2 +-
platform/linux-generic/pktio/netmap.c | 6 +-
platform/linux-generic/pktio/pcap.c | 7 +-
platform/linux-generic/pktio/socket.c | 2 +-
platform/linux-generic/pktio/socket_mmap.c | 9 +-
platform/linux-generic/pktio/tap.c | 7 +-
test/performance/odp_l2fwd.c | 10 +-
test/validation/api/pktio/pktio.c | 4 +-
30 files changed, 350 insertions(+), 246 deletions(-)
create mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines.h
create mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h
copy platform/linux-generic/{odp_thread_api.c => odp_pktio_api.c} (60%)
hooks/post-receive
--
6 years, 3 months
- 1
- 0
[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-201-gfa6d104f
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 fa6d104f6031b9687ae5f60f87f5c2338ad9a83e (commit)
via 5865787680be13b47b777e8b0b64646755be41e0 (commit)
via c90cbf70a08d8d7124af226086e0525bcf4a9e50 (commit)
via 70f5c00a0713856daae879ebe3652d44c5d783f2 (commit)
via b72a57524cd02abc873c15a451c40e9cb2dd6ee5 (commit)
via c0bf89cf3c36c7f0504e78fe6b337e50e7dc17d4 (commit)
via 9c0c41b80fa0f7f7316115fd2228eec57dde5814 (commit)
via 2596adf51485f1d996e1e084e6f63dbe68b582a3 (commit)
via 545a65fc7064c13deda58fb86b1863365c318500 (commit)
via 84c37a0fa947f1a81eef5aff225ecdf73ad3387c (commit)
via b95ccd3db6eeb7358a877541747e06354429acdd (commit)
via 9a46e749c6da2d4a4aef7337ab8247b0cd0c2be9 (commit)
via 8e826373dcbe52eca0036deab60b4fb83917e237 (commit)
via ae02d6ca65ef5f484258c8ce4d477a06151713b6 (commit)
via 716b3335f9e3003dcb2d79404c91b21551c2077b (commit)
via 01ec93bbfffe740b1a12213ac201c89dd9f2ef71 (commit)
via 7c458a44a785ab664f2f92ed14845fa8ece6e0ec (commit)
via bbdc120cdca0ceb37cb20baa6e85796733083221 (commit)
from 7cc568a011f1623a343399f5cff6688baf834639 (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 fa6d104f6031b9687ae5f60f87f5c2338ad9a83e
Merge: 7cc568a0 58657876
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Feb 5 10:16:16 2018 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 29 ++++--
configure.ac | 113 ++++++++++-----------
doc/platform-api-guide/Makefile.am | 3 +-
m4/odp_check_flag.m4 | 26 +++++
m4/odp_pthread.m4 | 7 ++
platform/Makefile.inc | 2 +
.../linux-generic/include/odp_ipsec_internal.h | 2 +-
platform/linux-generic/m4/configure.m4 | 2 +-
platform/linux-generic/m4/odp_pthread.m4 | 8 --
platform/linux-generic/odp_classification.c | 13 ++-
platform/linux-generic/odp_ipsec_sad.c | 45 ++++----
11 files changed, 149 insertions(+), 101 deletions(-)
create mode 100644 m4/odp_check_flag.m4
create mode 100644 m4/odp_pthread.m4
delete mode 100644 platform/linux-generic/m4/odp_pthread.m4
hooks/post-receive
--
6 years, 3 months
- 1
- 0
[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-183-g7cc568a0
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 7cc568a011f1623a343399f5cff6688baf834639 (commit)
via b962b9194d63b679afc5218858a3742ec6b3dda1 (commit)
via 8483bfa972e4af9ee80ab3318caf99270c37daa0 (commit)
via 506267929ac4b1eee22263abf8721088d7b4a5c7 (commit)
via e204106fb2e255b76e32a1376c935cee4c5a8e90 (commit)
via b11eb35bf651c8e7b636f3ae63f10e756a3132d2 (commit)
via aaf3b3a688dff27255cb318b219651099521a4fb (commit)
via 8ef9bf024d0a42d99ae5218ec9b00d48f4f7ab35 (commit)
via bbc78105ff8a1d9cd591b672eb2bb878a62c76b2 (commit)
via 89c4f15c0c7d63a10161c716367bcb392c23c20b (commit)
via e3e2773d6bf9b25f10b487c048cf61a0a0f1e887 (commit)
via a6e2ebeb671ea322cea1af81a35b1c564f06f33f (commit)
via e89a66c12db16f6ff4619683f58cd1a63f16eb10 (commit)
via ae8385cb0a0f5a222684775eea0efc5bb034252f (commit)
via 22a158d4082d8d810443dd7a4191522c6f95b742 (commit)
via 18d1eb9e00ef871c0da9e60989d83455b7fda4c2 (commit)
via 815f7ada60297c08469ab62cee369df4770ae2aa (commit)
via f8fa58a9061def1f7fdfc5adbb09c7fa67e1d425 (commit)
via 98c59aa12adb2acda489261a631cb85c6bdbb358 (commit)
via 036c1011222ee0e75d8572332aff9043510c3ec3 (commit)
via 5f4692a06e9241411ccba088142782638f1f9f96 (commit)
via 1b2c9fb5cb2a64a6ca0c623173dea966f45c5e4a (commit)
from 5718327018debbb02aacb464493504c95fbe57a3 (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 7cc568a011f1623a343399f5cff6688baf834639
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Jan 18 14:45:03 2018 +0200
api: ipsec: inbound inner packet checksum capability
Add inbound inner packet checksum check capability. When
e.g. L4 checksum checking is not implemented in HW, it may
be better to leave checking for application, as it would
check only those packets that need the check.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index 665dc07b..2d1c4d9b 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -238,6 +238,11 @@ typedef struct odp_ipsec_capability_t {
*/
odp_support_t retain_header;
+ /**
+ * Inner packet checksum check offload support in inbound direction.
+ */
+ odp_proto_chksums_t chksums_in;
+
/** Maximum number of different destination CoSes in classification
* pipelining. The same CoS may be used for many SAs. This is equal or
* less than 'max_cos' capability in classifier API.
commit b962b9194d63b679afc5218858a3742ec6b3dda1
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Jan 23 13:50:24 2018 +0200
api: ipsec: outbound TFC padding and dummy packets
Specify how application can request TFC padding and dummy
packet creation at output. Application can use
odp_ipsec_out_opt_t options to reguest addition of TFC
padding, or creation of a TFC dummy packet
(next header = 59). IP parameter override options are needed
for tunnel mode dummy packet creation as there's no IP header
to copy e.g. DSCP or flow label values to tunnel IP header.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index 721f9685..665dc07b 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -991,6 +991,22 @@ typedef struct odp_ipsec_out_opt_t {
/** Use fragmentation mode option */
uint32_t frag_mode: 1;
+ /** Use TFC padding length option */
+ uint32_t tfc_pad: 1;
+
+ /** Tunnel mode TFC dummy packet. This can be used only
+ * in tunnel mode. When the flag is set, packet length
+ * and content is ignored and instead a TFC dummy
+ * packet is created during IPSEC operation. The dummy
+ * packet length is defined by 'tfc_pad_len' option.
+ * If the SA is configured to copy IP header fields
+ * from inner IP packet, those fields must be passed
+ * with IP parameters option. */
+ uint32_t tfc_dummy: 1;
+
+ /** Use IP parameters option */
+ uint32_t ip_param: 1;
+
} flag;
/** All flag bits */
@@ -1000,6 +1016,26 @@ typedef struct odp_ipsec_out_opt_t {
/** Fragmentation mode */
odp_ipsec_frag_mode_t frag_mode;
+ /** TFC padding length
+ *
+ * Number of TFC padding bytes added to the packet during IPSEC
+ * processing. Resulting packet should not exceed the maximum packet
+ * length of the pool, otherwise IPSEC operation may fail.
+ * Implementation guarantees that the padding does not contain any
+ * confidential information. */
+ uint32_t tfc_pad_len;
+
+ /** Union of IP parameters */
+ union {
+ /** Override IPv4 parameters in outer header creation.
+ * IP addresses are ignored. */
+ odp_ipsec_ipv4_param_t ipv4;
+
+ /** Override IPv6 parameters in outer header creation.
+ * IP addresses are ignored. */
+ odp_ipsec_ipv6_param_t ipv6;
+ };
+
} odp_ipsec_out_opt_t;
/**
@@ -1302,7 +1338,13 @@ int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in,
* The operation does packet transformation according to IPSEC standards (see
* e.g. RFC 4302 and 4303). Resulting packets are well formed IP packets
* with IPSEC, etc headers constructed according to the standards. The amount
- * and content of packet data before the IP header is undefined.
+ * and content of packet data before the IP header is undefined. Use outbound
+ * operation parameters to specify the amount of TFC padding appended to
+ * the packet during IPSEC transformation. Options can be used also to create
+ * TFC dummy packets. Packet data content is ignored in tunnel mode TFC dummy
+ * packet creation as tfc_pad_len option defines solely the packet length.
+ * In all other cases, payload length for the IPSEC transformation is specified
+ * by odp_packet_len() minus odp_packet_l3_offset() plus tfc_pad_len option.
*
* Each successfully transformed packet has a valid value for these metadata:
* - L3 offset: Offset to the first byte of the (outmost) IP header
commit 8483bfa972e4af9ee80ab3318caf99270c37daa0
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Jan 23 13:46:26 2018 +0200
api: ipsec: inbound TFC padding and dummy packets
Specify how application can recognize TFC padding and dummy
packets at input. Packet metadata for L3/L4 protocol type
indicate if the original packet was an IP or a TFC dummy packet.
When packet length is larger than protocol fields indicate,
some TFC padding remain in the packet.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index 08533d80..721f9685 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -1226,12 +1226,23 @@ typedef struct odp_ipsec_status_t {
* e.g. RFC 4302 and 4303). Resulting packets are well formed, reconstructed
* original IP packets, with IPSEC headers removed and valid header field values
* restored. The amount and content of packet data before the IP header is
- * undefined.
+ * undefined. Some amount of TFC padding may follow the IP packet payload,
+ * in which case packet length is larger than protocol headers indicate.
+ * TFC dummy packets have l3_type set to ODP_PROTO_L3_TYPE_NONE in tunnel mode
+ * or l4_type set to ODP_PROTO_L4_TYPE_NO_NEXT in transport mode. Dummy
+ * packets contain implementation specific amount of (dummy) data. Furthermore,
+ * inline IPSEC processing may drop dummy packets.
*
* Each successfully transformed packet has a valid value for these metadata
* regardless of the inner packet parse configuration
* (odp_ipsec_inbound_config_t):
- * - L3 offset: Offset to the first byte of the (outmost) IP header
+ * - l3_offset: Offset to the first byte of the original IP packet. The value
+ * is implementation specific for tunnel mode TFC dummy packets.
+ * - l3_type: Specifies if the original packet is IPv4 or IPv6. For tunnel
+ * mode TFC dummy packets set to ODP_PROTO_L3_TYPE_NONE.
+ * - l4_type: Always set to ODP_PROTO_L4_TYPE_NO_NEXT for transport mode dummy
+ * packets. Otherwise, depends on parse configuration. Default
+ * value is ODP_PROTO_L4_TYPE_NONE.
* - pktio: For inline IPSEC processed packets, original packet input
* interface
*
commit 506267929ac4b1eee22263abf8721088d7b4a5c7
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Jan 23 13:37:20 2018 +0200
api: ipsec: outbound operation option flags
Add flags to select which options application uses. Currently,
there's no ambiguity, but as soon as there are multiple options
implementation needs to know which options are used and which
are ignored.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index 1060a3ee..08533d80 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -983,6 +983,20 @@ typedef struct odp_ipsec_op_flag_t {
* These may be used to override some SA level options
*/
typedef struct odp_ipsec_out_opt_t {
+ /** Union of all flag bits */
+ union {
+ /** Option flags. Set flag for those options that are
+ * used, all other options are ignored. */
+ struct {
+ /** Use fragmentation mode option */
+ uint32_t frag_mode: 1;
+
+ } flag;
+
+ /** All flag bits */
+ uint32_t all_flags;
+ };
+
/** Fragmentation mode */
odp_ipsec_frag_mode_t frag_mode;
commit e204106fb2e255b76e32a1376c935cee4c5a8e90
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Jan 18 13:26:56 2018 +0200
api: ipsec: rename fragmentation mode option
Rename outbound operation fragmentation options to frag_mode.
Frag_mode is used elsewhere in the API and "mode" is too generic
term for it (not future proof).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index c78afbe3..1060a3ee 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -984,7 +984,7 @@ typedef struct odp_ipsec_op_flag_t {
*/
typedef struct odp_ipsec_out_opt_t {
/** Fragmentation mode */
- odp_ipsec_frag_mode_t mode;
+ odp_ipsec_frag_mode_t frag_mode;
} odp_ipsec_out_opt_t;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 43d7b9f5..65be5aff 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -1307,7 +1307,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ipsec_sa = _odp_ipsec_sa_use(sa);
ODP_ASSERT(NULL != ipsec_sa);
- if ((opt && opt->mode == ODP_IPSEC_FRAG_CHECK) ||
+ if ((opt && opt->frag_mode == ODP_IPSEC_FRAG_CHECK) ||
(!opt && ipsec_sa->out.frag_mode == ODP_IPSEC_FRAG_CHECK))
mtu = ipsec_sa->out.mtu;
else
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 0f49c7e1..2850ddfa 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -572,7 +572,7 @@ static void test_out_ipv4_ah_sha256_frag_check(void)
ipsec_test_part test2 = {
.pkt_in = &pkt_ipv4_icmp_0,
.num_opt = 1,
- .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, },
+ .opt = { .frag_mode = ODP_IPSEC_FRAG_DISABLED, },
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -665,7 +665,7 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void)
ipsec_test_part test2 = {
.pkt_in = &pkt_ipv4_icmp_0,
.num_opt = 1,
- .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, },
+ .opt = { .frag_mode = ODP_IPSEC_FRAG_DISABLED, },
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
commit b11eb35bf651c8e7b636f3ae63f10e756a3132d2
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Jan 18 11:02:27 2018 +0200
api: ipsec: IP header parameter types
Create IP header parameter types, so that those can be used
also outside of SA parameter struct.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index 47e3045f..c78afbe3 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -382,6 +382,44 @@ typedef struct odp_ipsec_crypto_param_t {
} odp_ipsec_crypto_param_t;
+/** IPv4 header parameters */
+typedef struct odp_ipsec_ipv4_param_t {
+ /** IPv4 source address (NETWORK ENDIAN) */
+ void *src_addr;
+
+ /** IPv4 destination address (NETWORK ENDIAN) */
+ void *dst_addr;
+
+ /** IPv4 Differentiated Services Code Point */
+ uint8_t dscp;
+
+ /** IPv4 Don't Fragment bit */
+ uint8_t df;
+
+ /** IPv4 Time To Live */
+ uint8_t ttl;
+
+} odp_ipsec_ipv4_param_t;
+
+/** IPv6 header parameters */
+typedef struct odp_ipsec_ipv6_param_t {
+ /** IPv6 source address (NETWORK ENDIAN) */
+ void *src_addr;
+
+ /** IPv6 destination address (NETWORK ENDIAN) */
+ void *dst_addr;
+
+ /** IPv6 flow label */
+ uint32_t flabel;
+
+ /** IPv6 Differentiated Services Code Point */
+ uint8_t dscp;
+
+ /** IPv6 hop limit */
+ uint8_t hlimit;
+
+} odp_ipsec_ipv6_param_t;
+
/**
* IPSEC tunnel parameters
*
@@ -397,40 +435,10 @@ typedef struct odp_ipsec_tunnel_param_t {
/** Variant mappings for tunnel parameters */
union {
/** IPv4 header parameters */
- struct {
- /** IPv4 source address (NETWORK ENDIAN) */
- void *src_addr;
-
- /** IPv4 destination address (NETWORK ENDIAN) */
- void *dst_addr;
-
- /** IPv4 Differentiated Services Code Point */
- uint8_t dscp;
-
- /** IPv4 Don't Fragment bit */
- uint8_t df;
-
- /** IPv4 Time To Live */
- uint8_t ttl;
- } ipv4;
+ odp_ipsec_ipv4_param_t ipv4;
/** IPv6 header parameters */
- struct {
- /** IPv6 source address (NETWORK ENDIAN) */
- void *src_addr;
-
- /** IPv6 destination address (NETWORK ENDIAN) */
- void *dst_addr;
-
- /** IPv6 Differentiated Services Code Point */
- uint8_t dscp;
-
- /** IPv6 flow label */
- uint32_t flabel;
-
- /** IPv6 hop limit */
- uint8_t hlimit;
- } ipv6;
+ odp_ipsec_ipv6_param_t ipv6;
};
} odp_ipsec_tunnel_param_t;
commit aaf3b3a688dff27255cb318b219651099521a4fb
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Jan 31 15:03:20 2018 +0200
api: packet: add protocol type enumeration
Add enumerations for L3 and L4 protocol types, and functions
to request those.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h
index 3d687673..b83288d4 100644
--- a/include/odp/api/abi-default/packet.h
+++ b/include/odp/api/abi-default/packet.h
@@ -30,6 +30,34 @@ typedef _odp_abi_packet_seg_t *odp_packet_seg_t;
#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0xffffffff)
#define ODP_PACKET_OFFSET_INVALID 0xffff
+typedef uint8_t odp_proto_l3_type_t;
+
+#define ODP_PROTO_L3_TYPE_NONE 0
+#define ODP_PROTO_L3_TYPE_ARP 1
+#define ODP_PROTO_L3_TYPE_RARP 2
+#define ODP_PROTO_L3_TYPE_MPLS 3
+#define ODP_PROTO_L3_TYPE_IPV4 4
+#define ODP_PROTO_L3_TYPE_IPV6 6
+
+typedef uint8_t odp_proto_l4_type_t;
+
+/* Numbers from IANA Assigned Internet Protocol Numbers list */
+#define ODP_PROTO_L4_TYPE_NONE 0
+#define ODP_PROTO_L4_TYPE_ICMPV4 1
+#define ODP_PROTO_L4_TYPE_IGMP 2
+#define ODP_PROTO_L4_TYPE_IPV4 4
+#define ODP_PROTO_L4_TYPE_TCP 6
+#define ODP_PROTO_L4_TYPE_UDP 17
+#define ODP_PROTO_L4_TYPE_IPV6 41
+#define ODP_PROTO_L4_TYPE_GRE 47
+#define ODP_PROTO_L4_TYPE_ESP 50
+#define ODP_PROTO_L4_TYPE_AH 51
+#define ODP_PROTO_L4_TYPE_ICMPV6 58
+#define ODP_PROTO_L4_TYPE_NO_NEXT 59
+#define ODP_PROTO_L4_TYPE_IPCOMP 108
+#define ODP_PROTO_L4_TYPE_SCTP 132
+#define ODP_PROTO_L4_TYPE_ROHC 142
+
typedef enum {
ODP_PACKET_GREEN = 0,
ODP_PACKET_YELLOW = 1,
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index 3222ff5c..4be515c7 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -71,6 +71,79 @@ extern "C" {
* Packet is red
*/
+/**
+ * @typedef odp_proto_l3_type_t
+ * Layer 3 protocol type
+ */
+
+/**
+ * @def ODP_PROTO_L3_TYPE_NONE
+ * Layer 3 protocol type not defined
+ *
+ * @def ODP_PROTO_L3_TYPE_ARP
+ * Layer 3 protocol is ARP
+ *
+ * @def ODP_PROTO_L3_TYPE_RARP
+ * Layer 3 protocol is RARP
+ *
+ * @def ODP_PROTO_L3_TYPE_MPLS
+ * Layer 3 protocol is MPLS
+ *
+ * @def ODP_PROTO_L3_TYPE_IPV4
+ * Layer 3 protocol type is IPv4
+ *
+ * @def ODP_PROTO_L3_TYPE_IPV6
+ * Layer 3 protocol type is IPv6
+ */
+
+/**
+ * @def ODP_PROTO_L4_TYPE_NONE
+ * Layer 4 protocol type not defined
+ *
+ * @def ODP_PROTO_L4_TYPE_ICMPV4
+ * Layer 4 protocol type is ICMPv4
+ *
+ * @def ODP_PROTO_L4_TYPE_IGMP
+ * Layer 4 protocol type is IGMP
+ *
+ * @def ODP_PROTO_L4_TYPE_IPV4
+ * Layer 4 protocol type is IPv4
+ *
+ * @def ODP_PROTO_L4_TYPE_TCP
+ * Layer 4 protocol type is TCP
+ *
+ * @def ODP_PROTO_L4_TYPE_UDP
+ * Layer 4 protocol type is UDP
+ *
+ * @def ODP_PROTO_L4_TYPE_IPV6
+ * Layer 4 protocol type is IPv6
+ *
+ * @def ODP_PROTO_L4_TYPE_GRE
+ * Layer 4 protocol type is GRE
+ *
+ * @def ODP_PROTO_L4_TYPE_ESP
+ * Layer 4 protocol type is IPSEC ESP
+ *
+ * @def ODP_PROTO_L4_TYPE_AH
+ * Layer 4 protocol type is IPSEC AH
+ *
+ * @def ODP_PROTO_L4_TYPE_ICMPV6
+ * Layer 4 protocol type is ICMPv6
+ *
+ * @def ODP_PROTO_L4_TYPE_NO_NEXT
+ * Layer 4 protocol type is "No Next Header".
+ * Protocol / next header number is 59.
+ *
+ * @def ODP_PROTO_L4_TYPE_IPCOMP
+ * Layer 4 protocol type is IP Payload Compression Protocol
+ *
+ * @def ODP_PROTO_L4_TYPE_SCTP
+ * Layer 4 protocol type is SCTP
+ *
+ * @def ODP_PROTO_L4_TYPE_ROHC
+ * Layer 4 protocol type is ROHC
+ */
+
/**
* Protocol
*/
@@ -1542,6 +1615,28 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt);
*/
int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset);
+/**
+ * Layer 3 protocol type
+ *
+ * Returns layer 3 protocol type. Initial type value is ODP_PROTO_L3_TYPE_NONE.
+ *
+ * @param pkt Packet handle
+ *
+ * @return Layer 3 protocol type
+ */
+odp_proto_l3_type_t odp_packet_l3_type(odp_packet_t pkt);
+
+/**
+ * Layer 4 protocol type
+ *
+ * Returns layer 4 protocol type. Initial type value is ODP_PROTO_L4_TYPE_NONE.
+ *
+ * @param pkt Packet handle
+ *
+ * @return Layer 4 protocol type
+ */
+odp_proto_l4_type_t odp_packet_l4_type(odp_packet_t pkt);
+
/**
* Layer 3 checksum check status
*
diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h
index 1aa7cbd5..137cd3ec 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/packet.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h
@@ -47,6 +47,34 @@ static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx)
#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1)
+typedef uint8_t odp_proto_l3_type_t;
+
+#define ODP_PROTO_L3_TYPE_NONE 0
+#define ODP_PROTO_L3_TYPE_ARP 1
+#define ODP_PROTO_L3_TYPE_RARP 2
+#define ODP_PROTO_L3_TYPE_MPLS 3
+#define ODP_PROTO_L3_TYPE_IPV4 4
+#define ODP_PROTO_L3_TYPE_IPV6 6
+
+typedef uint8_t odp_proto_l4_type_t;
+
+/* Numbers from IANA Assigned Internet Protocol Numbers list */
+#define ODP_PROTO_L4_TYPE_NONE 0
+#define ODP_PROTO_L4_TYPE_ICMPV4 1
+#define ODP_PROTO_L4_TYPE_IGMP 2
+#define ODP_PROTO_L4_TYPE_IPV4 4
+#define ODP_PROTO_L4_TYPE_TCP 6
+#define ODP_PROTO_L4_TYPE_UDP 17
+#define ODP_PROTO_L4_TYPE_IPV6 41
+#define ODP_PROTO_L4_TYPE_GRE 47
+#define ODP_PROTO_L4_TYPE_ESP 50
+#define ODP_PROTO_L4_TYPE_AH 51
+#define ODP_PROTO_L4_TYPE_ICMPV6 58
+#define ODP_PROTO_L4_TYPE_NO_NEXT 59
+#define ODP_PROTO_L4_TYPE_IPCOMP 108
+#define ODP_PROTO_L4_TYPE_SCTP 132
+#define ODP_PROTO_L4_TYPE_ROHC 142
+
typedef enum {
ODP_PACKET_GREEN = 0,
ODP_PACKET_YELLOW = 1,
commit 8ef9bf024d0a42d99ae5218ec9b00d48f4f7ab35
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Jan 24 08:03:56 2018 +0300
linux-gen: ipsec: support ChaCha20-Poly1305
Support IPsec ChaCha20-Poly1305 on top of linux-generic's crypto
support.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index b6192377..43d7b9f5 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -112,6 +112,7 @@ int odp_ipsec_auth_capability(odp_auth_alg_t auth,
continue;
if (ODP_AUTH_ALG_AES_GCM == auth ||
+ ODP_AUTH_ALG_CHACHA20_POLY1305 == auth ||
ODP_DEPRECATE(ODP_AUTH_ALG_AES128_GCM) == auth) {
uint8_t aad_len = 12;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 031adef6..d9773540 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -210,6 +210,8 @@ uint32_t _odp_ipsec_cipher_iv_len(odp_cipher_alg_t cipher)
#endif
case ODP_CIPHER_ALG_AES_GCM:
return 12;
+ case ODP_CIPHER_ALG_CHACHA20_POLY1305:
+ return 12;
default:
return (uint32_t)-1;
}
@@ -240,6 +242,8 @@ uint32_t _odp_ipsec_auth_digest_len(odp_auth_alg_t auth)
case ODP_AUTH_ALG_AES_GCM:
case ODP_AUTH_ALG_AES_GMAC:
return 16;
+ case ODP_AUTH_ALG_CHACHA20_POLY1305:
+ return 16;
default:
return (uint32_t)-1;
}
@@ -392,6 +396,11 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->esp_iv_len = 8;
ipsec_sa->esp_block_len = 16;
break;
+ case ODP_CIPHER_ALG_CHACHA20_POLY1305:
+ ipsec_sa->use_counter_iv = 1;
+ ipsec_sa->esp_iv_len = 8;
+ ipsec_sa->esp_block_len = 1;
+ break;
default:
goto error;
}
@@ -411,6 +420,9 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->esp_block_len = 16;
crypto_param.auth_iv.length = 12;
break;
+ case ODP_AUTH_ALG_CHACHA20_POLY1305:
+ crypto_param.auth_aad_len = sizeof(ipsec_aad_t);
+ break;
default:
break;
}
commit bbc78105ff8a1d9cd591b672eb2bb878a62c76b2
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Jan 24 08:03:19 2018 +0300
validation: ipsec: add ChaCha20-Poly1305 test vectors
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 5d3112a2..31bd557f 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -177,6 +177,10 @@ int ipsec_check(odp_bool_t ah,
if (!capa.ciphers.bit.aes_gcm)
return ODP_TEST_INACTIVE;
break;
+ case ODP_CIPHER_ALG_CHACHA20_POLY1305:
+ if (!capa.ciphers.bit.chacha20_poly1305)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported cipher algorithm\n");
return ODP_TEST_INACTIVE;
@@ -212,6 +216,10 @@ int ipsec_check(odp_bool_t ah,
if (!capa.auths.bit.aes_gmac)
return ODP_TEST_INACTIVE;
break;
+ case ODP_AUTH_ALG_CHACHA20_POLY1305:
+ if (!capa.auths.bit.chacha20_poly1305)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported authentication algorithm\n");
return ODP_TEST_INACTIVE;
@@ -313,6 +321,12 @@ int ipsec_check_esp_null_aes_gmac_128(void)
ODP_AUTH_ALG_AES_GMAC, 128);
}
+int ipsec_check_esp_chacha20_poly1305(void)
+{
+ return ipsec_check_esp(ODP_CIPHER_ALG_CHACHA20_POLY1305, 256,
+ ODP_AUTH_ALG_CHACHA20_POLY1305, 0);
+}
+
void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
odp_bool_t in,
odp_bool_t ah,
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index 31ebed78..7ba9ef10 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -91,5 +91,6 @@ int ipsec_check_esp_aes_gcm_128(void);
int ipsec_check_esp_aes_gcm_256(void);
int ipsec_check_ah_aes_gmac_128(void);
int ipsec_check_esp_null_aes_gmac_128(void);
+int ipsec_check_esp_chacha20_poly1305(void);
#endif
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 8a82abe4..8138defb 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -1136,6 +1136,37 @@ static void test_in_ipv4_mcgrew_gcm_15_esp(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ipv4_rfc7634_chacha(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 0x01020304, &tunnel,
+ ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634,
+ ODP_AUTH_ALG_CHACHA20_POLY1305, NULL,
+ &key_rfc7634_salt);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_rfc7634_esp,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_rfc7634},
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_ipv4_ah_aes_gmac_128(void)
{
odp_ipsec_sa_param_t param;
@@ -1474,6 +1505,8 @@ odp_testinfo_t ipsec_in_suite[] = {
#endif
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_15_esp,
ipsec_check_esp_null_aes_gmac_128),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_rfc7634_chacha,
+ ipsec_check_esp_chacha20_poly1305),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_tun_ipv4,
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 971fbbf8..0f49c7e1 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -500,6 +500,48 @@ static void test_out_ipv4_esp_null_aes_gmac_128(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ipv4_esp_chacha20_poly1305(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+ odp_ipsec_sa_t sa2;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634,
+ ODP_AUTH_ALG_CHACHA20_POLY1305, NULL,
+ &key_rfc7634_salt);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634,
+ ODP_AUTH_ALG_CHACHA20_POLY1305, NULL,
+ &key_rfc7634_salt);
+
+ sa2 = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0 },
+ },
+ };
+
+ ipsec_check_out_in_one(&test, sa, sa2);
+
+ ipsec_sa_destroy(sa2);
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_ipv4_ah_sha256_frag_check(void)
{
odp_ipsec_sa_param_t param;
@@ -978,6 +1020,8 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_ah_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_chacha20_poly1305,
+ ipsec_check_esp_chacha20_poly1305),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_frag_check,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_frag_check_2,
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 4732d6ca..f14fdb2b 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -48,6 +48,11 @@ KEY(key_mcgrew_gcm_salt_12, 0xd9, 0x66, 0x42, 0x67);
KEY(key_mcgrew_gcm_15, 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda,
0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34);
KEY(key_mcgrew_gcm_salt_15, 0x22, 0x43, 0x3c, 0x64);
+KEY(key_rfc7634, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f);
+KEY(key_rfc7634_salt, 0xa0, 0xa1, 0xa2, 0xa3);
static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0 = {
.len = 142,
@@ -1730,6 +1735,67 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_15_esp = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_rfc7634 = {
+ .len = 98,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH - not a part of RFC, added for simplicity */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x54, 0xa6, 0xf2, 0x00, 0x00,
+ 0x40, 0x01, 0xe7, 0x78, 0xc6, 0x33, 0x64, 0x05,
+ 0xc0, 0x00, 0x02, 0x05,
+
+ /* ICMP */
+ 0x08, 0x00, 0x5b, 0x7a, 0x3a, 0x08, 0x00, 0x00,
+ 0x55, 0x3b, 0xec, 0x10, 0x00, 0x07, 0x36, 0x27,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ },
+};
+
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_rfc7634_esp = {
+ .len = 154,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH - not a part of RFC, added for simplicity */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x8c, 0x23, 0x45, 0x00, 0x00,
+ 0x40, 0x32, 0xde, 0x5b, 0xcb, 0x00, 0x71, 0x99,
+ 0xcb, 0x00, 0x71, 0x05,
+
+ /* ESP */
+ 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00, 0x05,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x24, 0x03, 0x94, 0x28, 0xb9, 0x7f, 0x41, 0x7e,
+ 0x3c, 0x13, 0x75, 0x3a, 0x4f, 0x05, 0x08, 0x7b,
+ 0x67, 0xc3, 0x52, 0xe6, 0xa7, 0xfa, 0xb1, 0xb9,
+ 0x82, 0xd4, 0x66, 0xef, 0x40, 0x7a, 0xe5, 0xc6,
+ 0x14, 0xee, 0x80, 0x99, 0xd5, 0x28, 0x44, 0xeb,
+ 0x61, 0xaa, 0x95, 0xdf, 0xab, 0x4c, 0x02, 0xf7,
+ 0x2a, 0xa7, 0x1e, 0x7c, 0x4c, 0x4f, 0x64, 0xc9,
+ 0xbe, 0xfe, 0x2f, 0xac, 0xc6, 0x38, 0xe8, 0xf3,
+ 0xcb, 0xec, 0x16, 0x3f, 0xac, 0x46, 0x9b, 0x50,
+ 0x27, 0x73, 0xf6, 0xfb, 0x94, 0xe6, 0x64, 0xda,
+ 0x91, 0x65, 0xb8, 0x28, 0x29, 0xf6, 0x41, 0xe0,
+ 0x76, 0xaa, 0xa8, 0x26, 0x6b, 0x7f, 0xb0, 0xf7,
+ 0xb1, 0x1b, 0x36, 0x99, 0x07, 0xe1, 0xad, 0x43,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet
pkt_ipv6_icmp_0_esp_udp_null_sha256_1 = {
.len = 206,
commit 89c4f15c0c7d63a10161c716367bcb392c23c20b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 04:50:06 2018 +0300
linux-gen: crypto: implement AES-CMAC
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index faa415cd..5579ade5 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -25,6 +25,7 @@
#include <openssl/rand.h>
#include <openssl/hmac.h>
+#include <openssl/cmac.h>
#include <openssl/evp.h>
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(OPENSSL_NO_POLY1305)
@@ -108,6 +109,14 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = {
{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0},
.iv_len = 12 } };
+static const odp_crypto_auth_capability_t auth_capa_aes_cmac[] = {
+{.digest_len = 12, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} },
+{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} },
+{.digest_len = 12, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0} },
+{.digest_len = 16, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0} },
+{.digest_len = 12, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} },
+{.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+
#if _ODP_HAVE_CHACHA20_POLY1305
static const odp_crypto_auth_capability_t auth_capa_chacha20_poly1305[] = {
{.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } };
@@ -177,6 +186,7 @@ static odp_crypto_global_t *global;
typedef struct crypto_local_t {
HMAC_CTX *hmac_ctx[MAX_SESSIONS];
+ CMAC_CTX *cmac_ctx[MAX_SESSIONS];
EVP_CIPHER_CTX *cipher_ctx[MAX_SESSIONS];
EVP_CIPHER_CTX *mac_cipher_ctx[MAX_SESSIONS];
uint8_t *ctx_valid;
@@ -344,6 +354,93 @@ odp_crypto_alg_err_t auth_hmac_check(odp_packet_t pkt,
return ODP_CRYPTO_ALG_ERR_NONE;
}
+static void
+auth_cmac_init(odp_crypto_generic_session_t *session)
+{
+ CMAC_CTX *ctx = local.cmac_ctx[session->idx];
+
+ CMAC_Init(ctx,
+ session->auth.key,
+ session->p.auth_key.length,
+ session->auth.evp_cipher,
+ NULL);
+}
+
+static
+void packet_cmac(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session,
+ uint8_t *hash)
+{
+ CMAC_CTX *ctx = local.cmac_ctx[session->idx];
+ uint32_t offset = param->auth_range.offset;
+ uint32_t len = param->auth_range.length;
+ size_t outlen;
+
+ ODP_ASSERT(offset + len <= odp_packet_len(pkt));
+
+ /* Reinitialize CMAC calculation without resetting the key */
+ CMAC_Init(ctx, NULL, 0, NULL, NULL);
+
+ while (len > 0) {
+ uint32_t seglen = 0; /* GCC */
+ void *mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL);
+ uint32_t maclen = len > seglen ? seglen : len;
+
+ CMAC_Update(ctx, mapaddr, maclen);
+ offset += maclen;
+ len -= maclen;
+ }
+
+ CMAC_Final(ctx, hash, &outlen);
+}
+
+static
+odp_crypto_alg_err_t auth_cmac_gen(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
+{
+ uint8_t hash[EVP_MAX_MD_SIZE];
+
+ /* Hash it */
+ packet_cmac(pkt, param, session, hash);
+
+ /* Copy to the output location */
+ odp_packet_copy_from_mem(pkt,
+ param->hash_result_offset,
+ session->p.auth_digest_len,
+ hash);
+
+ return ODP_CRYPTO_ALG_ERR_NONE;
+}
+
+static
+odp_crypto_alg_err_t auth_cmac_check(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
+{
+ uint32_t bytes = session->p.auth_digest_len;
+ uint8_t hash_in[EVP_MAX_MD_SIZE];
+ uint8_t hash_out[EVP_MAX_MD_SIZE];
+
+ /* Copy current value out and clear it before authentication */
+ odp_packet_copy_to_mem(pkt, param->hash_result_offset,
+ bytes, hash_in);
+
+ _odp_packet_set_data(pkt, param->hash_result_offset,
+ 0, bytes);
+
+ /* Hash it */
+ packet_cmac(pkt, param, session, hash_out);
+
+ /* Verify match */
+ if (0 != memcmp(hash_in, hash_out, bytes))
+ return ODP_CRYPTO_ALG_ERR_ICV_CHECK;
+
+ /* Matched */
+ return ODP_CRYPTO_ALG_ERR_NONE;
+}
+
static
int internal_aad(EVP_CIPHER_CTX *ctx,
odp_packet_t pkt,
@@ -1001,6 +1098,35 @@ static int process_auth_hmac_param(odp_crypto_generic_session_t *session,
return 0;
}
+static int process_auth_cmac_param(odp_crypto_generic_session_t *session,
+ const EVP_CIPHER *cipher)
+{
+ /* Verify Key len is valid */
+ if ((uint32_t)EVP_CIPHER_key_length(cipher) !=
+ session->p.auth_key.length)
+ return -1;
+
+ /* Set function */
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
+ session->auth.func = auth_cmac_gen;
+ else
+ session->auth.func = auth_cmac_check;
+ session->auth.init = auth_cmac_init;
+
+ session->auth.evp_cipher = cipher;
+
+ /* Number of valid bytes */
+ if (session->p.auth_digest_len <
+ (unsigned)EVP_CIPHER_block_size(cipher) / 2)
+ return -1;
+
+ /* Convert keys */
+ memcpy(session->auth.key, session->p.auth_key.data,
+ session->p.auth_key.length);
+
+ return 0;
+}
+
int odp_crypto_capability(odp_crypto_capability_t *capa)
{
if (NULL == capa)
@@ -1030,6 +1156,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.aes_gcm = 1;
capa->auths.bit.aes_ccm = 1;
capa->auths.bit.aes_gmac = 1;
+ capa->auths.bit.aes_cmac = 1;
#if _ODP_HAVE_CHACHA20_POLY1305
capa->auths.bit.chacha20_poly1305 = 1;
#endif
@@ -1138,6 +1265,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
src = auth_capa_aes_ccm;
num = sizeof(auth_capa_aes_ccm) / size;
break;
+ case ODP_AUTH_ALG_AES_CMAC:
+ src = auth_capa_aes_cmac;
+ num = sizeof(auth_capa_aes_cmac) / size;
+ break;
#if _ODP_HAVE_CHACHA20_POLY1305
case ODP_AUTH_ALG_CHACHA20_POLY1305:
src = auth_capa_chacha20_poly1305;
@@ -1374,6 +1505,19 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
rc = -1;
}
break;
+ case ODP_AUTH_ALG_AES_CMAC:
+ if (param->auth_key.length == 16)
+ rc = process_auth_cmac_param(session,
+ EVP_aes_128_cbc());
+ else if (param->auth_key.length == 24)
+ rc = process_auth_cmac_param(session,
+ EVP_aes_192_cbc());
+ else if (param->auth_key.length == 32)
+ rc = process_auth_cmac_param(session,
+ EVP_aes_256_cbc());
+ else
+ rc = -1;
+ break;
#if _ODP_HAVE_CHACHA20_POLY1305
case ODP_AUTH_ALG_CHACHA20_POLY1305:
/* ChaCha20_Poly1305 requires to do both auth and
@@ -1561,6 +1705,7 @@ int _odp_crypto_init_local(void)
for (i = 0; i < MAX_SESSIONS; i++) {
local.hmac_ctx[i] = HMAC_CTX_new();
+ local.cmac_ctx[i] = CMAC_CTX_new();
local.cipher_ctx[i] = EVP_CIPHER_CTX_new();
local.mac_cipher_ctx[i] = EVP_CIPHER_CTX_new();
@@ -1584,6 +1729,8 @@ int _odp_crypto_term_local(void)
unsigned i;
for (i = 0; i < MAX_SESSIONS; i++) {
+ if (local.cmac_ctx[i] != NULL)
+ CMAC_CTX_free(local.cmac_ctx[i]);
if (local.hmac_ctx[i] != NULL)
HMAC_CTX_free(local.hmac_ctx[i]);
if (local.cipher_ctx[i] != NULL)
commit e3e2773d6bf9b25f10b487c048cf61a0a0f1e887
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 04:07:42 2018 +0300
linux-gen: crypto: rename auth functions
Point that current authentication functions use HMAC by including hmac
in their names.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index e9d43619..faa415cd 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -149,8 +149,6 @@ struct odp_crypto_generic_session_t {
struct {
uint8_t key[EVP_MAX_KEY_LENGTH];
uint8_t iv_data[EVP_MAX_IV_LENGTH];
- uint32_t key_length;
- uint32_t bytes;
union {
const EVP_MD *evp_md;
const EVP_CIPHER *evp_cipher;
@@ -260,13 +258,13 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
#endif
static void
-auth_init(odp_crypto_generic_session_t *session)
+auth_hmac_init(odp_crypto_generic_session_t *session)
{
HMAC_CTX *ctx = local.hmac_ctx[session->idx];
HMAC_Init_ex(ctx,
session->auth.key,
- session->auth.key_length,
+ session->p.auth_key.length,
session->auth.evp_md,
NULL);
}
@@ -301,9 +299,9 @@ void packet_hmac(odp_packet_t pkt,
}
static
-odp_crypto_alg_err_t auth_gen(odp_packet_t pkt,
- const odp_crypto_packet_op_param_t *param,
- odp_crypto_generic_session_t *session)
+odp_crypto_alg_err_t auth_hmac_gen(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
{
uint8_t hash[EVP_MAX_MD_SIZE];
@@ -320,9 +318,9 @@ odp_crypto_alg_err_t auth_gen(odp_packet_t pkt,
}
static
-odp_crypto_alg_err_t auth_check(odp_packet_t pkt,
- const odp_crypto_packet_op_param_t *param,
- odp_crypto_generic_session_t *session)
+odp_crypto_alg_err_t auth_hmac_check(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
{
uint32_t bytes = session->p.auth_digest_len;
uint8_t hash_in[EVP_MAX_MD_SIZE];
@@ -824,12 +822,24 @@ static int process_aes_gmac_param(odp_crypto_generic_session_t *session,
return 0;
}
+static void
+aes_ccm_encrypt_init(odp_crypto_generic_session_t *session)
+{
+ EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx];
+
+ EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ NULL, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN,
+ session->p.cipher_iv.length, NULL);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+}
+
static
odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt,
const odp_crypto_packet_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- EVP_CIPHER_CTX *ctx;
+ EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx];
const uint8_t *aad_head = param->aad_ptr;
uint32_t aad_len = session->p.auth_aad_len;
void *iv_ptr;
@@ -847,16 +857,9 @@ odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* Encrypt it */
- ctx = EVP_CIPHER_CTX_new();
- EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
- NULL, NULL);
- EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN,
- session->p.cipher_iv.length, NULL);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG,
session->p.auth_digest_len, NULL);
EVP_EncryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr);
- EVP_CIPHER_CTX_set_padding(ctx, 0);
/* Set len */
EVP_EncryptUpdate(ctx, NULL, &dummy_len, NULL, in_len);
@@ -882,18 +885,28 @@ odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt,
odp_packet_copy_from_mem(pkt, param->hash_result_offset,
session->p.auth_digest_len, block);
- EVP_CIPHER_CTX_free(ctx);
-
return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE :
ODP_CRYPTO_ALG_ERR_NONE;
}
+static void
+aes_ccm_decrypt_init(odp_crypto_generic_session_t *session)
+{
+ EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx];
+
+ EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ session->cipher.key_data, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
+ session->p.cipher_iv.length, NULL);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+}
+
static
odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt,
const odp_crypto_packet_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- EVP_CIPHER_CTX *ctx;
+ EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx];
const uint8_t *aad_head = param->aad_ptr;
uint32_t aad_len = session->p.auth_aad_len;
void *iv_ptr;
@@ -911,18 +924,11 @@ odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* Decrypt it */
- ctx = EVP_CIPHER_CTX_new();
- EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
- NULL, NULL);
- EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN,
- session->p.cipher_iv.length, NULL);
odp_packet_copy_to_mem(pkt, param->hash_result_offset,
session->p.auth_digest_len, block);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG,
session->p.auth_digest_len, block);
EVP_DecryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr);
- EVP_CIPHER_CTX_set_padding(ctx, 0);
/* Set len */
EVP_DecryptUpdate(ctx, NULL, &dummy_len, NULL, in_len);
@@ -943,8 +949,6 @@ odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt,
odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len,
data);
- EVP_CIPHER_CTX_free(ctx);
-
return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK :
ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -963,24 +967,26 @@ static int process_aes_ccm_param(odp_crypto_generic_session_t *session,
session->cipher.evp_cipher = cipher;
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == session->p.op)
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op) {
session->cipher.func = aes_ccm_encrypt;
- else
+ session->cipher.init = aes_ccm_encrypt_init;
+ } else {
session->cipher.func = aes_ccm_decrypt;
+ session->cipher.init = aes_ccm_decrypt_init;
+ }
return 0;
}
-static int process_auth_param(odp_crypto_generic_session_t *session,
- uint32_t key_length,
- const EVP_MD *evp_md)
+static int process_auth_hmac_param(odp_crypto_generic_session_t *session,
+ const EVP_MD *evp_md)
{
/* Set function */
if (ODP_CRYPTO_OP_ENCODE == session->p.op)
- session->auth.func = auth_gen;
+ session->auth.func = auth_hmac_gen;
else
- session->auth.func = auth_check;
- session->auth.init = auth_init;
+ session->auth.func = auth_hmac_check;
+ session->auth.init = auth_hmac_init;
session->auth.evp_md = evp_md;
@@ -989,9 +995,8 @@ static int process_auth_param(odp_crypto_generic_session_t *session,
return -1;
/* Convert keys */
- session->auth.key_length = key_length;
memcpy(session->auth.key, session->p.auth_key.data,
- session->auth.key_length);
+ session->p.auth_key.length);
return 0;
}
@@ -1312,10 +1317,10 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
#endif
/* Fallthrough */
case ODP_AUTH_ALG_MD5_HMAC:
- rc = process_auth_param(session, 16, EVP_md5());
+ rc = process_auth_hmac_param(session, EVP_md5());
break;
case ODP_AUTH_ALG_SHA1_HMAC:
- rc = process_auth_param(session, 20, EVP_sha1());
+ rc = process_auth_hmac_param(session, EVP_sha1());
break;
#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_SHA256_128:
@@ -1324,10 +1329,10 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
#endif
/* Fallthrough */
case ODP_AUTH_ALG_SHA256_HMAC:
- rc = process_auth_param(session, 32, EVP_sha256());
+ rc = process_auth_hmac_param(session, EVP_sha256());
break;
case ODP_AUTH_ALG_SHA512_HMAC:
- rc = process_auth_param(session, 64, EVP_sha512());
+ rc = process_auth_hmac_param(session, EVP_sha512());
break;
#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_AES128_GCM:
@@ -1363,6 +1368,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
* cipher at the same time */
if (param->cipher_alg == ODP_CIPHER_ALG_AES_CCM) {
session->auth.func = null_crypto_routine;
+ session->auth.init = null_crypto_init_routine;
rc = 0;
} else {
rc = -1;
commit a6e2ebeb671ea322cea1af81a35b1c564f06f33f
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 03:47:34 2018 +0300
linux-gen: crypto: provide AES-CCM implementation
AES-CCM support in OpenSSL is quite unique: it requires whole data to be
passed in single EVP_EncryptUpdate/EVP_DecryptUpdate call. Supporting
this requires copying data back-and-forth between packet and temporary
buffer.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 66dc8f23..e9d43619 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -61,6 +61,14 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = {
{.key_len = 24, .iv_len = 12},
{.key_len = 32, .iv_len = 12} };
+static const odp_crypto_cipher_capability_t cipher_capa_aes_ccm[] = {
+{.key_len = 16, .iv_len = 11},
+{.key_len = 16, .iv_len = 13},
+{.key_len = 24, .iv_len = 11},
+{.key_len = 24, .iv_len = 13},
+{.key_len = 32, .iv_len = 11},
+{.key_len = 32, .iv_len = 13} };
+
#if _ODP_HAVE_CHACHA20_POLY1305
static const odp_crypto_cipher_capability_t cipher_capa_chacha20_poly1305[] = {
{.key_len = 32, .iv_len = 12} };
@@ -93,6 +101,9 @@ static const odp_crypto_auth_capability_t auth_capa_sha512_hmac[] = {
static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = {
{.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } };
+static const odp_crypto_auth_capability_t auth_capa_aes_ccm[] = {
+{.digest_len = 8, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } };
+
static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = {
{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0},
.iv_len = 12 } };
@@ -813,6 +824,153 @@ static int process_aes_gmac_param(odp_crypto_generic_session_t *session,
return 0;
}
+static
+odp_crypto_alg_err_t aes_ccm_encrypt(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
+{
+ EVP_CIPHER_CTX *ctx;
+ const uint8_t *aad_head = param->aad_ptr;
+ uint32_t aad_len = session->p.auth_aad_len;
+ void *iv_ptr;
+ int dummy_len = 0;
+ int cipher_len;
+ uint32_t in_len = param->cipher_range.length;
+ uint8_t data[in_len];
+ uint8_t block[EVP_MAX_MD_SIZE];
+ int ret;
+
+ if (param->cipher_iv_ptr)
+ iv_ptr = param->cipher_iv_ptr;
+ else if (session->p.cipher_iv.data)
+ iv_ptr = session->cipher.iv_data;
+ else
+ return ODP_CRYPTO_ALG_ERR_IV_INVALID;
+
+ /* Encrypt it */
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ NULL, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN,
+ session->p.cipher_iv.length, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG,
+ session->p.auth_digest_len, NULL);
+ EVP_EncryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ /* Set len */
+ EVP_EncryptUpdate(ctx, NULL, &dummy_len, NULL, in_len);
+
+ /* Authenticate header data (if any) without encrypting them */
+ if (aad_len > 0)
+ EVP_EncryptUpdate(ctx, NULL, &dummy_len,
+ aad_head, aad_len);
+
+ odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len,
+ data);
+
+ EVP_EncryptUpdate(ctx, data, &cipher_len, data, in_len);
+
+ ret = EVP_EncryptFinal_ex(ctx, data + cipher_len, &dummy_len);
+ cipher_len += dummy_len;
+
+ odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len,
+ data);
+
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_GET_TAG,
+ session->p.auth_digest_len, block);
+ odp_packet_copy_from_mem(pkt, param->hash_result_offset,
+ session->p.auth_digest_len, block);
+
+ EVP_CIPHER_CTX_free(ctx);
+
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE :
+ ODP_CRYPTO_ALG_ERR_NONE;
+}
+
+static
+odp_crypto_alg_err_t aes_ccm_decrypt(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
+{
+ EVP_CIPHER_CTX *ctx;
+ const uint8_t *aad_head = param->aad_ptr;
+ uint32_t aad_len = session->p.auth_aad_len;
+ void *iv_ptr;
+ int dummy_len = 0;
+ int cipher_len;
+ uint32_t in_len = param->cipher_range.length;
+ uint8_t data[in_len];
+ uint8_t block[EVP_MAX_MD_SIZE];
+ int ret;
+
+ if (param->cipher_iv_ptr)
+ iv_ptr = param->cipher_iv_ptr;
+ else if (session->p.cipher_iv.data)
+ iv_ptr = session->cipher.iv_data;
+ else
+ return ODP_CRYPTO_ALG_ERR_IV_INVALID;
+
+ /* Decrypt it */
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ NULL, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN,
+ session->p.cipher_iv.length, NULL);
+ odp_packet_copy_to_mem(pkt, param->hash_result_offset,
+ session->p.auth_digest_len, block);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG,
+ session->p.auth_digest_len, block);
+ EVP_DecryptInit_ex(ctx, NULL, NULL, session->cipher.key_data, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ /* Set len */
+ EVP_DecryptUpdate(ctx, NULL, &dummy_len, NULL, in_len);
+
+ /* Authenticate header data (if any) without encrypting them */
+ if (aad_len > 0)
+ EVP_DecryptUpdate(ctx, NULL, &dummy_len,
+ aad_head, aad_len);
+
+ odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len,
+ data);
+
+ ret = EVP_DecryptUpdate(ctx, data, &cipher_len, data, in_len);
+
+ EVP_DecryptFinal_ex(ctx, data + cipher_len, &dummy_len);
+ cipher_len += dummy_len;
+
+ odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len,
+ data);
+
+ EVP_CIPHER_CTX_free(ctx);
+
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK :
+ ODP_CRYPTO_ALG_ERR_NONE;
+}
+
+static int process_aes_ccm_param(odp_crypto_generic_session_t *session,
+ const EVP_CIPHER *cipher)
+{
+ /* Verify Key len is valid */
+ if ((uint32_t)EVP_CIPHER_key_length(cipher) !=
+ session->p.cipher_key.length)
+ return -1;
+
+ memcpy(session->cipher.key_data, session->p.cipher_key.data,
+ session->p.cipher_key.length);
+
+ session->cipher.evp_cipher = cipher;
+
+ /* Set function */
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
+ session->cipher.func = aes_ccm_encrypt;
+ else
+ session->cipher.func = aes_ccm_decrypt;
+
+ return 0;
+}
+
static int process_auth_param(odp_crypto_generic_session_t *session,
uint32_t key_length,
const EVP_MD *evp_md)
@@ -854,6 +1012,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->ciphers.bit.aes_cbc = 1;
capa->ciphers.bit.aes_ctr = 1;
capa->ciphers.bit.aes_gcm = 1;
+ capa->ciphers.bit.aes_ccm = 1;
#if _ODP_HAVE_CHACHA20_POLY1305
capa->ciphers.bit.chacha20_poly1305 = 1;
#endif
@@ -864,6 +1023,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.sha256_hmac = 1;
capa->auths.bit.sha512_hmac = 1;
capa->auths.bit.aes_gcm = 1;
+ capa->auths.bit.aes_ccm = 1;
capa->auths.bit.aes_gmac = 1;
#if _ODP_HAVE_CHACHA20_POLY1305
capa->auths.bit.chacha20_poly1305 = 1;
@@ -911,6 +1071,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
src = cipher_capa_aes_gcm;
num = sizeof(cipher_capa_aes_gcm) / size;
break;
+ case ODP_CIPHER_ALG_AES_CCM:
+ src = cipher_capa_aes_ccm;
+ num = sizeof(cipher_capa_aes_ccm) / size;
+ break;
#if _ODP_HAVE_CHACHA20_POLY1305
case ODP_CIPHER_ALG_CHACHA20_POLY1305:
src = cipher_capa_chacha20_poly1305;
@@ -965,6 +1129,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
src = auth_capa_aes_gmac;
num = sizeof(auth_capa_aes_gmac) / size;
break;
+ case ODP_AUTH_ALG_AES_CCM:
+ src = auth_capa_aes_ccm;
+ num = sizeof(auth_capa_aes_ccm) / size;
+ break;
#if _ODP_HAVE_CHACHA20_POLY1305
case ODP_AUTH_ALG_CHACHA20_POLY1305:
src = auth_capa_chacha20_poly1305;
@@ -1093,6 +1261,20 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
else
rc = -1;
break;
+ case ODP_CIPHER_ALG_AES_CCM:
+ /* AES-CCM requires to do both auth and
+ * cipher at the same time */
+ if (param->auth_alg != ODP_AUTH_ALG_AES_CCM)
+ rc = -1;
+ else if (param->cipher_key.length == 16)
+ rc = process_aes_ccm_param(session, EVP_aes_128_ccm());
+ else if (param->cipher_key.length == 24)
+ rc = process_aes_ccm_param(session, EVP_aes_192_ccm());
+ else if (param->cipher_key.length == 32)
+ rc = process_aes_ccm_param(session, EVP_aes_256_ccm());
+ else
+ rc = -1;
+ break;
#if _ODP_HAVE_CHACHA20_POLY1305
case ODP_CIPHER_ALG_CHACHA20_POLY1305:
/* ChaCha20_Poly1305 requires to do both auth and
@@ -1176,6 +1358,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
else
rc = -1;
break;
+ case ODP_AUTH_ALG_AES_CCM:
+ /* AES-CCM requires to do both auth and
+ * cipher at the same time */
+ if (param->cipher_alg == ODP_CIPHER_ALG_AES_CCM) {
+ session->auth.func = null_crypto_routine;
+ rc = 0;
+ } else {
+ rc = -1;
+ }
+ break;
#if _ODP_HAVE_CHACHA20_POLY1305
case ODP_AUTH_ALG_CHACHA20_POLY1305:
/* ChaCha20_Poly1305 requires to do both auth and
commit e89a66c12db16f6ff4619683f58cd1a63f16eb10
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Jan 24 08:03:56 2018 +0300
linux-gen: crypto: support ChaCha20-Poly1305
OpenSSL >= 1.1.0 supports ChaCha20-Poly1305 AEAD cipher, so let's
support it in linux-generic.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 00db3f9f..66dc8f23 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -27,6 +27,12 @@
#include <openssl/hmac.h>
#include <openssl/evp.h>
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(OPENSSL_NO_POLY1305)
+#define _ODP_HAVE_CHACHA20_POLY1305 1
+#else
+#define _ODP_HAVE_CHACHA20_POLY1305 0
+#endif
+
#define MAX_SESSIONS 32
/*
@@ -55,6 +61,11 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = {
{.key_len = 24, .iv_len = 12},
{.key_len = 32, .iv_len = 12} };
+#if _ODP_HAVE_CHACHA20_POLY1305
+static const odp_crypto_cipher_capability_t cipher_capa_chacha20_poly1305[] = {
+{.key_len = 32, .iv_len = 12} };
+#endif
+
/*
* Authentication algorithm capabilities
*
@@ -86,6 +97,11 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = {
{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0},
.iv_len = 12 } };
+#if _ODP_HAVE_CHACHA20_POLY1305
+static const odp_crypto_auth_capability_t auth_capa_chacha20_poly1305[] = {
+{.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } };
+#endif
+
/** Forward declaration of session structure */
typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t;
@@ -838,6 +854,9 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->ciphers.bit.aes_cbc = 1;
capa->ciphers.bit.aes_ctr = 1;
capa->ciphers.bit.aes_gcm = 1;
+#if _ODP_HAVE_CHACHA20_POLY1305
+ capa->ciphers.bit.chacha20_poly1305 = 1;
+#endif
capa->auths.bit.null = 1;
capa->auths.bit.md5_hmac = 1;
@@ -846,6 +865,9 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.sha512_hmac = 1;
capa->auths.bit.aes_gcm = 1;
capa->auths.bit.aes_gmac = 1;
+#if _ODP_HAVE_CHACHA20_POLY1305
+ capa->auths.bit.chacha20_poly1305 = 1;
+#endif
#if ODP_DEPRECATED_API
capa->ciphers.bit.aes128_cbc = 1;
@@ -889,6 +911,12 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
src = cipher_capa_aes_gcm;
num = sizeof(cipher_capa_aes_gcm) / size;
break;
+#if _ODP_HAVE_CHACHA20_POLY1305
+ case ODP_CIPHER_ALG_CHACHA20_POLY1305:
+ src = cipher_capa_chacha20_poly1305;
+ num = sizeof(cipher_capa_chacha20_poly1305) / size;
+ break;
+#endif
default:
return -1;
}
@@ -937,6 +965,12 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
src = auth_capa_aes_gmac;
num = sizeof(auth_capa_aes_gmac) / size;
break;
+#if _ODP_HAVE_CHACHA20_POLY1305
+ case ODP_AUTH_ALG_CHACHA20_POLY1305:
+ src = auth_capa_chacha20_poly1305;
+ num = sizeof(auth_capa_chacha20_poly1305) / size;
+ break;
+#endif
default:
return -1;
}
@@ -1059,6 +1093,17 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
else
rc = -1;
break;
+#if _ODP_HAVE_CHACHA20_POLY1305
+ case ODP_CIPHER_ALG_CHACHA20_POLY1305:
+ /* ChaCha20_Poly1305 requires to do both auth and
+ * cipher at the same time */
+ if (param->auth_alg != ODP_AUTH_ALG_CHACHA20_POLY1305)
+ rc = -1;
+ else
+ rc = process_aes_gcm_param(session,
+ EVP_chacha20_poly1305());
+ break;
+#endif
default:
rc = -1;
}
@@ -1131,6 +1176,19 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
else
rc = -1;
break;
+#if _ODP_HAVE_CHACHA20_POLY1305
+ case ODP_AUTH_ALG_CHACHA20_POLY1305:
+ /* ChaCha20_Poly1305 requires to do both auth and
+ * cipher at the same time */
+ if (param->cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305) {
+ session->auth.func = null_crypto_routine;
+ session->auth.init = null_crypto_init_routine;
+ rc = 0;
+ } else {
+ rc = -1;
+ }
+ break;
+#endif
default:
rc = -1;
}
commit ae8385cb0a0f5a222684775eea0efc5bb034252f
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Jan 30 07:13:49 2018 +0300
linux-gen: crypto: drop stale enum
Drop crypto_kind_t, unused now.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 93736a2c..00db3f9f 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -159,8 +159,6 @@ typedef struct crypto_local_t {
static __thread crypto_local_t local;
-typedef enum { KIND_HMAC, KIND_CIPHER, KIND_MAC_CIPHER } crypto_kind_t;
-
static inline void crypto_init(odp_crypto_generic_session_t *session)
{
if (local.ctx_valid[session->idx])
commit 22a158d4082d8d810443dd7a4191522c6f95b742
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 04:49:51 2018 +0300
validation: crypto: add AES-CMAC test vectors
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index ae843acf..f310329a 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -54,6 +54,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth)
return "ODP_AUTH_ALG_AES_GMAC";
case ODP_AUTH_ALG_AES_CCM:
return "ODP_AUTH_ALG_AES_CCM";
+ case ODP_AUTH_ALG_AES_CMAC:
+ return "ODP_AUTH_ALG_AES_CMAC";
case ODP_AUTH_ALG_CHACHA20_POLY1305:
return "ODP_AUTH_ALG_CHACHA20_POLY1305";
default:
@@ -503,6 +505,9 @@ static void check_alg(odp_crypto_op_t op,
if (auth_alg == ODP_AUTH_ALG_AES_GMAC &&
!(capa.auths.bit.aes_gmac))
rc = -1;
+ if (auth_alg == ODP_AUTH_ALG_AES_CMAC &&
+ !(capa.auths.bit.aes_cmac))
+ rc = -1;
if (auth_alg == ODP_AUTH_ALG_AES_CCM &&
!(capa.auths.bit.aes_ccm))
rc = -1;
@@ -721,6 +726,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.auths.bit.aes_ccm)
return ODP_TEST_INACTIVE;
break;
+ case ODP_AUTH_ALG_AES_CMAC:
+ if (!capability.auths.bit.aes_cmac)
+ return ODP_TEST_INACTIVE;
+ break;
case ODP_AUTH_ALG_CHACHA20_POLY1305:
if (!capability.auths.bit.chacha20_poly1305)
return ODP_TEST_INACTIVE;
@@ -1285,6 +1294,36 @@ static void crypto_test_check_alg_aes_gmac_ovr_iv(void)
true);
}
+static int check_alg_aes_cmac(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_CMAC);
+}
+
+static void crypto_test_gen_alg_aes_cmac(void)
+{
+ unsigned int test_vec_num = (sizeof(aes_cmac_reference) /
+ sizeof(aes_cmac_reference[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++)
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_AES_CMAC,
+ aes_cmac_reference,
+ ARRAY_SIZE(aes_cmac_reference),
+ false);
+}
+
+static void crypto_test_check_alg_aes_cmac(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_AES_CMAC,
+ aes_cmac_reference,
+ ARRAY_SIZE(aes_cmac_reference),
+ false);
+}
+
int crypto_suite_sync_init(void)
{
suite_context.pool = odp_pool_lookup("packet_pool");
@@ -1414,6 +1453,10 @@ odp_testinfo_t crypto_suite[] = {
check_alg_aes_gmac),
ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac_ovr_iv,
check_alg_aes_gmac),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_cmac,
+ check_alg_aes_cmac),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_cmac,
+ check_alg_aes_cmac),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
index 15cd91d2..23ed9525 100644
--- a/test/validation/api/crypto/test_vectors.h
+++ b/test/validation/api/crypto/test_vectors.h
@@ -605,6 +605,103 @@ static crypto_test_reference_t aes_gmac_reference[] = {
},
};
+/*
+ * Test vectors from SP800-38B / CSRC examples
+ * 12-byte vectors are just truncated 16-byte vectors
+ */
+static crypto_test_reference_t aes_cmac_reference[] = {
+ {
+ .auth_key_length = AES128_KEY_LEN,
+ .auth_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
+ 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c },
+ .length = 16,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a},
+ .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a
+ },
+ .digest_length = 16,
+ .digest = { 0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44,
+ 0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c },
+ },
+ {
+ .auth_key_length = AES192_KEY_LEN,
+ .auth_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52,
+ 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5,
+ 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b },
+ .length = 16,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a},
+ .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a
+ },
+ .digest_length = 16,
+ .digest = { 0x9e, 0x99, 0xa7, 0xbf, 0x31, 0xe7, 0x10, 0x90,
+ 0x06, 0x62, 0xf6, 0x5e, 0x61, 0x7c, 0x51, 0x84 },
+ },
+ {
+ .auth_key_length = AES256_KEY_LEN,
+ .auth_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe,
+ 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81,
+ 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7,
+ 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4 },
+ .length = 16,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a},
+ .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a
+ },
+ .digest_length = 16,
+ .digest = { 0x28, 0xa7, 0x02, 0x3f, 0x45, 0x2e, 0x8f, 0x82,
+ 0xbd, 0x4b, 0xf2, 0x8d, 0x8c, 0x37, 0xc3, 0x5c },
+ },
+ {
+ .auth_key_length = AES128_KEY_LEN,
+ .auth_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
+ 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c },
+ .length = 16,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a},
+ .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a
+ },
+ .digest_length = 12,
+ .digest = { 0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44,
+ 0xf7, 0x9b, 0xdd, 0x9d },
+ },
+ {
+ .auth_key_length = AES192_KEY_LEN,
+ .auth_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52,
+ 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5,
+ 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b },
+ .length = 16,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a},
+ .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a
+ },
+ .digest_length = 12,
+ .digest = { 0x9e, 0x99, 0xa7, 0xbf, 0x31, 0xe7, 0x10, 0x90,
+ 0x06, 0x62, 0xf6, 0x5e },
+ },
+ {
+ .auth_key_length = AES256_KEY_LEN,
+ .auth_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe,
+ 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81,
+ 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7,
+ 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4 },
+ .length = 16,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a},
+ .ciphertext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a
+ },
+ .digest_length = 12,
+ .digest = { 0x28, 0xa7, 0x02, 0x3f, 0x45, 0x2e, 0x8f, 0x82,
+ 0xbd, 0x4b, 0xf2, 0x8d },
+ }
+};
+
/*
* Test vector from RFC 7539, sections 2.8.2, A.5
*/
commit 18d1eb9e00ef871c0da9e60989d83455b7fda4c2
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 03:45:33 2018 +0300
validation: crypto: add test vectors for AES-CCM
Neither RFC 3610 nor SP 800-38C contains test vectors for 192 and 256
bit keys and none contains test vectors for 11-bit IV (used in IPsec).
So I've used 1st test vector from RFC 3610 and generated the rest of
test vectors.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 5c38ae85..ae843acf 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -52,6 +52,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth)
return "ODP_AUTH_ALG_AES_GCM";
case ODP_AUTH_ALG_AES_GMAC:
return "ODP_AUTH_ALG_AES_GMAC";
+ case ODP_AUTH_ALG_AES_CCM:
+ return "ODP_AUTH_ALG_AES_CCM";
case ODP_AUTH_ALG_CHACHA20_POLY1305:
return "ODP_AUTH_ALG_CHACHA20_POLY1305";
default:
@@ -72,6 +74,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher)
return "ODP_CIPHER_ALG_AES_CBC";
case ODP_CIPHER_ALG_AES_GCM:
return "ODP_CIPHER_ALG_AES_GCM";
+ case ODP_CIPHER_ALG_AES_CCM:
+ return "ODP_CIPHER_ALG_AES_CCM";
case ODP_CIPHER_ALG_CHACHA20_POLY1305:
return "ODP_CIPHER_ALG_CHACHA20_POLY1305";
default:
@@ -477,6 +481,9 @@ static void check_alg(odp_crypto_op_t op,
if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
!(capa.ciphers.bit.aes_gcm))
rc = -1;
+ if (cipher_alg == ODP_CIPHER_ALG_AES_CCM &&
+ !(capa.ciphers.bit.aes_ccm))
+ rc = -1;
if (cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305 &&
!(capa.ciphers.bit.chacha20_poly1305))
rc = -1;
@@ -496,6 +503,9 @@ static void check_alg(odp_crypto_op_t op,
if (auth_alg == ODP_AUTH_ALG_AES_GMAC &&
!(capa.auths.bit.aes_gmac))
rc = -1;
+ if (auth_alg == ODP_AUTH_ALG_AES_CCM &&
+ !(capa.auths.bit.aes_ccm))
+ rc = -1;
if (auth_alg == ODP_AUTH_ALG_CHACHA20_POLY1305 &&
!(capa.auths.bit.chacha20_poly1305))
rc = -1;
@@ -664,6 +674,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.ciphers.bit.aes_gcm)
return ODP_TEST_INACTIVE;
break;
+ case ODP_CIPHER_ALG_AES_CCM:
+ if (!capability.ciphers.bit.aes_ccm)
+ return ODP_TEST_INACTIVE;
+ break;
case ODP_CIPHER_ALG_CHACHA20_POLY1305:
if (!capability.ciphers.bit.chacha20_poly1305)
return ODP_TEST_INACTIVE;
@@ -703,6 +717,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.auths.bit.aes_gmac)
return ODP_TEST_INACTIVE;
break;
+ case ODP_AUTH_ALG_AES_CCM:
+ if (!capability.auths.bit.aes_ccm)
+ return ODP_TEST_INACTIVE;
+ break;
case ODP_AUTH_ALG_CHACHA20_POLY1305:
if (!capability.auths.bit.chacha20_poly1305)
return ODP_TEST_INACTIVE;
@@ -912,6 +930,51 @@ static void crypto_test_dec_alg_aes_gcm_ovr_iv(void)
true);
}
+static int check_alg_aes_ccm(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_AES_CCM, ODP_AUTH_ALG_AES_CCM);
+}
+
+static void crypto_test_enc_alg_aes_ccm(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_AES_CCM,
+ ODP_AUTH_ALG_AES_CCM,
+ aes_ccm_reference,
+ ARRAY_SIZE(aes_ccm_reference),
+ false);
+}
+
+static void crypto_test_enc_alg_aes_ccm_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_AES_CCM,
+ ODP_AUTH_ALG_AES_CCM,
+ aes_ccm_reference,
+ ARRAY_SIZE(aes_ccm_reference),
+ true);
+}
+
+static void crypto_test_dec_alg_aes_ccm(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_AES_CCM,
+ ODP_AUTH_ALG_AES_CCM,
+ aes_ccm_reference,
+ ARRAY_SIZE(aes_ccm_reference),
+ false);
+}
+
+static void crypto_test_dec_alg_aes_ccm_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_AES_CCM,
+ ODP_AUTH_ALG_AES_CCM,
+ aes_ccm_reference,
+ ARRAY_SIZE(aes_ccm_reference),
+ true);
+}
+
static int check_alg_aes_cbc(void)
{
return check_alg_support(ODP_CIPHER_ALG_AES_CBC, ODP_AUTH_ALG_NULL);
@@ -1311,6 +1374,14 @@ odp_testinfo_t crypto_suite[] = {
check_alg_aes_gcm),
ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_gcm_ovr_iv,
check_alg_aes_gcm),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ccm,
+ check_alg_aes_ccm),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ccm_ovr_iv,
+ check_alg_aes_ccm),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ccm,
+ check_alg_aes_ccm),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ccm_ovr_iv,
+ check_alg_aes_ccm),
ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305,
check_alg_chacha20_poly1305),
ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305_ovr_iv,
diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
index 97f0620a..15cd91d2 100644
--- a/test/validation/api/crypto/test_vectors.h
+++ b/test/validation/api/crypto/test_vectors.h
@@ -444,6 +444,134 @@ static crypto_test_reference_t aes_gcm_reference[] = {
}
};
+static crypto_test_reference_t aes_ccm_reference[] = {
+ /*
+ * AES-CCM reference from RFC 3610
+ */
+ {
+ .cipher_key_length = AES128_KEY_LEN,
+ .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf},
+ .cipher_iv_length = 13,
+ .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0,
+ 0xa1, 0xa2, 0xa3, 0xa4, 0xa5 },
+ .aad_length = 8,
+ .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 },
+ .length = 23,
+ .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e },
+ .ciphertext = { 0x58, 0x8c, 0x97, 0x9a, 0x61, 0xc6, 0x63, 0xd2,
+ 0xf0, 0x66, 0xd0, 0xc2, 0xc0, 0xf9, 0x89, 0x80,
+ 0x6d, 0x5f, 0x6b, 0x61, 0xda, 0xc3, 0x84 },
+ .digest_length = 8,
+ .digest = { 0x17, 0xe8, 0xd1, 0x2c, 0xfd, 0xf9, 0x26, 0xe0 }
+ },
+ /* The rest of test vectors are generated manually, no "interesting"
+ * vectors for use cases in RFC 3610 or SP 800-38C. */
+ {
+ .cipher_key_length = AES192_KEY_LEN,
+ .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7},
+ .cipher_iv_length = 13,
+ .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0,
+ 0xa1, 0xa2, 0xa3, 0xa4, 0xa5 },
+ .aad_length = 8,
+ .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 },
+ .length = 23,
+ .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e },
+ .ciphertext = { 0x57, 0x9f, 0xb8, 0x6e, 0xdd, 0xb4, 0xa6, 0x4a,
+ 0xae, 0x5f, 0xe9, 0x6d, 0xbd, 0x75, 0x44, 0x05,
+ 0x33, 0xa9, 0xfc, 0x3a, 0x84, 0x57, 0x36 },
+ .digest_length = 8,
+ .digest = { 0x67, 0xae, 0xc8, 0x0a, 0xc5, 0x88, 0xab, 0x16 }
+ },
+ {
+ .cipher_key_length = AES256_KEY_LEN,
+ .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf},
+ .cipher_iv_length = 13,
+ .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0,
+ 0xa1, 0xa2, 0xa3, 0xa4, 0xa5 },
+ .aad_length = 8,
+ .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 },
+ .length = 23,
+ .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e },
+ .ciphertext = { 0x59, 0x61, 0x55, 0x10, 0xa7, 0xc4, 0x3b, 0xfb,
+ 0x12, 0x3d, 0x63, 0x6b, 0x46, 0x13, 0xc0, 0x3c,
+ 0x6c, 0xe2, 0x69, 0x07, 0x10, 0x2a, 0x3f },
+ .digest_length = 8,
+ .digest = { 0xb5, 0x57, 0x2a, 0x17, 0x2d, 0x49, 0x16, 0xd5 }
+ },
+ {
+ .cipher_key_length = AES128_KEY_LEN,
+ .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf},
+ .cipher_iv_length = 11,
+ .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0,
+ 0xa1, 0xa2, 0xa3 },
+ .aad_length = 8,
+ .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 },
+ .length = 23,
+ .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e },
+ .ciphertext = { 0xaa, 0x2d, 0x3e, 0xcb, 0xa6, 0x68, 0x63, 0x75,
+ 0x8f, 0x03, 0x01, 0x51, 0x16, 0xde, 0x30, 0xed,
+ 0x8a, 0xb5, 0x42, 0xdc, 0xfa, 0x72, 0xd0 },
+ .digest_length = 8,
+ .digest = { 0x63, 0xe7, 0x01, 0x5c, 0x69, 0xaf, 0xb4, 0x0c }
+ },
+ {
+ .cipher_key_length = AES192_KEY_LEN,
+ .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7},
+ .cipher_iv_length = 11,
+ .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0,
+ 0xa1, 0xa2, 0xa3 },
+ .aad_length = 8,
+ .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 },
+ .length = 23,
+ .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e },
+ .ciphertext = { 0xee, 0x99, 0x99, 0x1e, 0xc5, 0x8f, 0xd7, 0x7e,
+ 0x56, 0x71, 0x16, 0x39, 0x8e, 0xc4, 0x4f, 0xcc,
+ 0x14, 0x45, 0x57, 0x3e, 0x38, 0x76, 0x51 },
+ .digest_length = 8,
+ .digest = { 0x31, 0x29, 0x47, 0xa4, 0x6d, 0x76, 0x34, 0xb4 }
+ },
+ {
+ .cipher_key_length = AES256_KEY_LEN,
+ .cipher_key = { 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf},
+ .cipher_iv_length = 11,
+ .cipher_iv = { 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0,
+ 0xa1, 0xa2, 0xa3 },
+ .aad_length = 8,
+ .aad = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 },
+ .length = 23,
+ .plaintext = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e },
+ .ciphertext = { 0xfa, 0x07, 0x47, 0x5c, 0xe8, 0xc9, 0x37, 0x88,
+ 0x54, 0x64, 0xb8, 0xc3, 0x85, 0xbb, 0x76, 0x0b,
+ 0xf2, 0xc2, 0x4c, 0x4e, 0x31, 0x16, 0x77 },
+ .digest_length = 8,
+ .digest = { 0x88, 0x56, 0x7e, 0x19, 0x84, 0x13, 0x29, 0xc4 }
+ },
+};
+
static crypto_test_reference_t aes_gmac_reference[] = {
{
.auth_key_length = AES128_KEY_LEN,
commit 815f7ada60297c08469ab62cee369df4770ae2aa
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Jan 24 08:03:19 2018 +0300
validation: crypto: add ChaCha20-Poly1305 test vectors
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 0448972b..5c38ae85 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -52,6 +52,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth)
return "ODP_AUTH_ALG_AES_GCM";
case ODP_AUTH_ALG_AES_GMAC:
return "ODP_AUTH_ALG_AES_GMAC";
+ case ODP_AUTH_ALG_CHACHA20_POLY1305:
+ return "ODP_AUTH_ALG_CHACHA20_POLY1305";
default:
return "Unknown";
}
@@ -70,6 +72,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher)
return "ODP_CIPHER_ALG_AES_CBC";
case ODP_CIPHER_ALG_AES_GCM:
return "ODP_CIPHER_ALG_AES_GCM";
+ case ODP_CIPHER_ALG_CHACHA20_POLY1305:
+ return "ODP_CIPHER_ALG_CHACHA20_POLY1305";
default:
return "Unknown";
}
@@ -473,6 +477,9 @@ static void check_alg(odp_crypto_op_t op,
if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
!(capa.ciphers.bit.aes_gcm))
rc = -1;
+ if (cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305 &&
+ !(capa.ciphers.bit.chacha20_poly1305))
+ rc = -1;
if (cipher_alg == ODP_CIPHER_ALG_DES &&
!(capa.ciphers.bit.des))
rc = -1;
@@ -489,6 +496,9 @@ static void check_alg(odp_crypto_op_t op,
if (auth_alg == ODP_AUTH_ALG_AES_GMAC &&
!(capa.auths.bit.aes_gmac))
rc = -1;
+ if (auth_alg == ODP_AUTH_ALG_CHACHA20_POLY1305 &&
+ !(capa.auths.bit.chacha20_poly1305))
+ rc = -1;
if (auth_alg == ODP_AUTH_ALG_MD5_HMAC &&
!(capa.auths.bit.md5_hmac))
rc = -1;
@@ -654,6 +664,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.ciphers.bit.aes_gcm)
return ODP_TEST_INACTIVE;
break;
+ case ODP_CIPHER_ALG_CHACHA20_POLY1305:
+ if (!capability.ciphers.bit.chacha20_poly1305)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported cipher algorithm\n");
return ODP_TEST_INACTIVE;
@@ -689,6 +703,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.auths.bit.aes_gmac)
return ODP_TEST_INACTIVE;
break;
+ case ODP_AUTH_ALG_CHACHA20_POLY1305:
+ if (!capability.auths.bit.chacha20_poly1305)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported authentication algorithm\n");
return ODP_TEST_INACTIVE;
@@ -785,6 +803,52 @@ static void crypto_test_dec_alg_3des_cbc_ovr_iv(void)
true);
}
+static int check_alg_chacha20_poly1305(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_CHACHA20_POLY1305,
+ ODP_AUTH_ALG_CHACHA20_POLY1305);
+}
+
+static void crypto_test_enc_alg_chacha20_poly1305(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_CHACHA20_POLY1305,
+ ODP_AUTH_ALG_CHACHA20_POLY1305,
+ chacha20_poly1305_reference,
+ ARRAY_SIZE(chacha20_poly1305_reference),
+ false);
+}
+
+static void crypto_test_enc_alg_chacha20_poly1305_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_CHACHA20_POLY1305,
+ ODP_AUTH_ALG_CHACHA20_POLY1305,
+ chacha20_poly1305_reference,
+ ARRAY_SIZE(chacha20_poly1305_reference),
+ true);
+}
+
+static void crypto_test_dec_alg_chacha20_poly1305(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_CHACHA20_POLY1305,
+ ODP_AUTH_ALG_CHACHA20_POLY1305,
+ chacha20_poly1305_reference,
+ ARRAY_SIZE(chacha20_poly1305_reference),
+ false);
+}
+
+static void crypto_test_dec_alg_chacha20_poly1305_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_CHACHA20_POLY1305,
+ ODP_AUTH_ALG_CHACHA20_POLY1305,
+ chacha20_poly1305_reference,
+ ARRAY_SIZE(chacha20_poly1305_reference),
+ true);
+}
+
static int check_alg_aes_gcm(void)
{
return check_alg_support(ODP_CIPHER_ALG_AES_GCM, ODP_AUTH_ALG_AES_GCM);
@@ -1247,6 +1311,14 @@ odp_testinfo_t crypto_suite[] = {
check_alg_aes_gcm),
ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_gcm_ovr_iv,
check_alg_aes_gcm),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305,
+ check_alg_chacha20_poly1305),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_chacha20_poly1305_ovr_iv,
+ check_alg_chacha20_poly1305),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_chacha20_poly1305,
+ check_alg_chacha20_poly1305),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_chacha20_poly1305_ovr_iv,
+ check_alg_chacha20_poly1305),
ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_md5,
check_alg_hmac_md5),
ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_md5,
diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
index ff69717d..97f0620a 100644
--- a/test/validation/api/crypto/test_vectors.h
+++ b/test/validation/api/crypto/test_vectors.h
@@ -477,6 +477,144 @@ static crypto_test_reference_t aes_gmac_reference[] = {
},
};
+/*
+ * Test vector from RFC 7539, sections 2.8.2, A.5
+ */
+static crypto_test_reference_t chacha20_poly1305_reference[] = {
+ {
+ .cipher_key_length = CHACHA20_POLY1305_KEY_LEN,
+ .cipher_key = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f},
+ .cipher_iv_length = CHACHA20_POLY1305_IV_LEN,
+ .cipher_iv = { 0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43,
+ 0x44, 0x45, 0x46, 0x47 },
+ .length = 114,
+ .plaintext = { 0x4c, 0x61, 0x64, 0x69, 0x65, 0x73, 0x20, 0x61,
+ 0x6e, 0x64, 0x20, 0x47, 0x65, 0x6e, 0x74, 0x6c,
+ 0x65, 0x6d, 0x65, 0x6e, 0x20, 0x6f, 0x66, 0x20,
+ 0x74, 0x68, 0x65, 0x20, 0x63, 0x6c, 0x61, 0x73,
+ 0x73, 0x20, 0x6f, 0x66, 0x20, 0x27, 0x39, 0x39,
+ 0x3a, 0x20, 0x49, 0x66, 0x20, 0x49, 0x20, 0x63,
+ 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6f, 0x66, 0x66,
+ 0x65, 0x72, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x6f,
+ 0x6e, 0x6c, 0x79, 0x20, 0x6f, 0x6e, 0x65, 0x20,
+ 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20,
+ 0x74, 0x68, 0x65, 0x20, 0x66, 0x75, 0x74, 0x75,
+ 0x72, 0x65, 0x2c, 0x20, 0x73, 0x75, 0x6e, 0x73,
+ 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x77, 0x6f,
+ 0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, 0x20, 0x69,
+ 0x74, 0x2e },
+ .ciphertext = { 0xd3, 0x1a, 0x8d, 0x34, 0x64, 0x8e, 0x60, 0xdb,
+ 0x7b, 0x86, 0xaf, 0xbc, 0x53, 0xef, 0x7e, 0xc2,
+ 0xa4, 0xad, 0xed, 0x51, 0x29, 0x6e, 0x08, 0xfe,
+ 0xa9, 0xe2, 0xb5, 0xa7, 0x36, 0xee, 0x62, 0xd6,
+ 0x3d, 0xbe, 0xa4, 0x5e, 0x8c, 0xa9, 0x67, 0x12,
+ 0x82, 0xfa, 0xfb, 0x69, 0xda, 0x92, 0x72, 0x8b,
+ 0x1a, 0x71, 0xde, 0x0a, 0x9e, 0x06, 0x0b, 0x29,
+ 0x05, 0xd6, 0xa5, 0xb6, 0x7e, 0xcd, 0x3b, 0x36,
+ 0x92, 0xdd, 0xbd, 0x7f, 0x2d, 0x77, 0x8b, 0x8c,
+ 0x98, 0x03, 0xae, 0xe3, 0x28, 0x09, 0x1b, 0x58,
+ 0xfa, 0xb3, 0x24, 0xe4, 0xfa, 0xd6, 0x75, 0x94,
+ 0x55, 0x85, 0x80, 0x8b, 0x48, 0x31, 0xd7, 0xbc,
+ 0x3f, 0xf4, 0xde, 0xf0, 0x8e, 0x4b, 0x7a, 0x9d,
+ 0xe5, 0x76, 0xd2, 0x65, 0x86, 0xce, 0xc6, 0x4b,
+ 0x61, 0x16 },
+ .aad_length = 12,
+ .aad = { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4,
+ 0xc5, 0xc6, 0xc7 },
+ .digest_length = 16,
+ .digest = { 0x1a, 0xe1, 0x0b, 0x59, 0x4f, 0x09, 0xe2, 0x6a,
+ 0x7e, 0x90, 0x2e, 0xcb, 0xd0, 0x60, 0x06, 0x91 }
+ },
+ {
+ .cipher_key_length = CHACHA20_POLY1305_KEY_LEN,
+ .cipher_key = { 0x1c, 0x92, 0x40, 0xa5, 0xeb, 0x55, 0xd3, 0x8a,
+ 0xf3, 0x33, 0x88, 0x86, 0x04, 0xf6, 0xb5, 0xf0,
+ 0x47, 0x39, 0x17, 0xc1, 0x40, 0x2b, 0x80, 0x09,
+ 0x9d, 0xca, 0x5c, 0xbc, 0x20, 0x70, 0x75, 0xc0},
+ .cipher_iv_length = CHACHA20_POLY1305_IV_LEN,
+ .cipher_iv = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04,
+ 0x05, 0x06, 0x07, 0x08 },
+ .length = 265,
+ .plaintext = { 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74,
+ 0x2d, 0x44, 0x72, 0x61, 0x66, 0x74, 0x73, 0x20,
+ 0x61, 0x72, 0x65, 0x20, 0x64, 0x72, 0x61, 0x66,
+ 0x74, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+ 0x6e, 0x74, 0x73, 0x20, 0x76, 0x61, 0x6c, 0x69,
+ 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, 0x20,
+ 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x20,
+ 0x6f, 0x66, 0x20, 0x73, 0x69, 0x78, 0x20, 0x6d,
+ 0x6f, 0x6e, 0x74, 0x68, 0x73, 0x20, 0x61, 0x6e,
+ 0x64, 0x20, 0x6d, 0x61, 0x79, 0x20, 0x62, 0x65,
+ 0x20, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64,
+ 0x2c, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63,
+ 0x65, 0x64, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x6f,
+ 0x62, 0x73, 0x6f, 0x6c, 0x65, 0x74, 0x65, 0x64,
+ 0x20, 0x62, 0x79, 0x20, 0x6f, 0x74, 0x68, 0x65,
+ 0x72, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+ 0x6e, 0x74, 0x73, 0x20, 0x61, 0x74, 0x20, 0x61,
+ 0x6e, 0x79, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+ 0x20, 0x49, 0x74, 0x20, 0x69, 0x73, 0x20, 0x69,
+ 0x6e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x70, 0x72,
+ 0x69, 0x61, 0x74, 0x65, 0x20, 0x74, 0x6f, 0x20,
+ 0x75, 0x73, 0x65, 0x20, 0x49, 0x6e, 0x74, 0x65,
+ 0x72, 0x6e, 0x65, 0x74, 0x2d, 0x44, 0x72, 0x61,
+ 0x66, 0x74, 0x73, 0x20, 0x61, 0x73, 0x20, 0x72,
+ 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
+ 0x20, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61,
+ 0x6c, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x6f, 0x20,
+ 0x63, 0x69, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65,
+ 0x6d, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20,
+ 0x74, 0x68, 0x61, 0x6e, 0x20, 0x61, 0x73, 0x20,
+ 0x2f, 0xe2, 0x80, 0x9c, 0x77, 0x6f, 0x72, 0x6b,
+ 0x20, 0x69, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x67,
+ 0x72, 0x65, 0x73, 0x73, 0x2e, 0x2f, 0xe2, 0x80,
+ 0x9d },
+ .ciphertext = { 0x64, 0xa0, 0x86, 0x15, 0x75, 0x86, 0x1a, 0xf4,
+ 0x60, 0xf0, 0x62, 0xc7, 0x9b, 0xe6, 0x43, 0xbd,
+ 0x5e, 0x80, 0x5c, 0xfd, 0x34, 0x5c, 0xf3, 0x89,
+ 0xf1, 0x08, 0x67, 0x0a, 0xc7, 0x6c, 0x8c, 0xb2,
+ 0x4c, 0x6c, 0xfc, 0x18, 0x75, 0x5d, 0x43, 0xee,
+ 0xa0, 0x9e, 0xe9, 0x4e, 0x38, 0x2d, 0x26, 0xb0,
+ 0xbd, 0xb7, 0xb7, 0x3c, 0x32, 0x1b, 0x01, 0x00,
+ 0xd4, 0xf0, 0x3b, 0x7f, 0x35, 0x58, 0x94, 0xcf,
+ 0x33, 0x2f, 0x83, 0x0e, 0x71, 0x0b, 0x97, 0xce,
+ 0x98, 0xc8, 0xa8, 0x4a, 0xbd, 0x0b, 0x94, 0x81,
+ 0x14, 0xad, 0x17, 0x6e, 0x00, 0x8d, 0x33, 0xbd,
+ 0x60, 0xf9, 0x82, 0xb1, 0xff, 0x37, 0xc8, 0x55,
+ 0x97, 0x97, 0xa0, 0x6e, 0xf4, 0xf0, 0xef, 0x61,
+ 0xc1, 0x86, 0x32, 0x4e, 0x2b, 0x35, 0x06, 0x38,
+ 0x36, 0x06, 0x90, 0x7b, 0x6a, 0x7c, 0x02, 0xb0,
+ 0xf9, 0xf6, 0x15, 0x7b, 0x53, 0xc8, 0x67, 0xe4,
+ 0xb9, 0x16, 0x6c, 0x76, 0x7b, 0x80, 0x4d, 0x46,
+ 0xa5, 0x9b, 0x52, 0x16, 0xcd, 0xe7, 0xa4, 0xe9,
+ 0x90, 0x40, 0xc5, 0xa4, 0x04, 0x33, 0x22, 0x5e,
+ 0xe2, 0x82, 0xa1, 0xb0, 0xa0, 0x6c, 0x52, 0x3e,
+ 0xaf, 0x45, 0x34, 0xd7, 0xf8, 0x3f, 0xa1, 0x15,
+ 0x5b, 0x00, 0x47, 0x71, 0x8c, 0xbc, 0x54, 0x6a,
+ 0x0d, 0x07, 0x2b, 0x04, 0xb3, 0x56, 0x4e, 0xea,
+ 0x1b, 0x42, 0x22, 0x73, 0xf5, 0x48, 0x27, 0x1a,
+ 0x0b, 0xb2, 0x31, 0x60, 0x53, 0xfa, 0x76, 0x99,
+ 0x19, 0x55, 0xeb, 0xd6, 0x31, 0x59, 0x43, 0x4e,
+ 0xce, 0xbb, 0x4e, 0x46, 0x6d, 0xae, 0x5a, 0x10,
+ 0x73, 0xa6, 0x72, 0x76, 0x27, 0x09, 0x7a, 0x10,
+ 0x49, 0xe6, 0x17, 0xd9, 0x1d, 0x36, 0x10, 0x94,
+ 0xfa, 0x68, 0xf0, 0xff, 0x77, 0x98, 0x71, 0x30,
+ 0x30, 0x5b, 0xea, 0xba, 0x2e, 0xda, 0x04, 0xdf,
+ 0x99, 0x7b, 0x71, 0x4d, 0x6c, 0x6f, 0x2c, 0x29,
+ 0xa6, 0xad, 0x5c, 0xb4, 0x02, 0x2b, 0x02, 0x70,
+ 0x9b },
+ .aad_length = 12,
+ .aad = { 0xf3, 0x33, 0x88, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x4e, 0x91 },
+ .digest_length = CHACHA20_POLY1305_CHECK_LEN,
+ .digest = { 0xee, 0xad, 0x9d, 0x67, 0x89, 0x0c, 0xbb, 0x22,
+ 0x39, 0x23, 0x36, 0xfe, 0xa1, 0x85, 0x1f, 0x38 }
+ },
+};
+
static crypto_test_reference_t hmac_md5_reference[] = {
{
.auth_key_length = HMAC_MD5_KEY_LEN,
diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h
index 8933017b..860840cf 100644
--- a/test/validation/api/crypto/test_vectors_len.h
+++ b/test/validation/api/crypto/test_vectors_len.h
@@ -9,7 +9,7 @@
/* Maximum */
#define MAX_KEY_LEN 64
#define MAX_IV_LEN 16
-#define MAX_DATA_LEN 128
+#define MAX_DATA_LEN 270
#define MAX_AAD_LEN 12
#define MAX_DIGEST_LEN 64
@@ -55,4 +55,9 @@
#define HMAC_SHA512_256_CHECK_LEN 32
#define HMAC_SHA512_CHECK_LEN 64
+/* ChaCha20-Poly1305 */
+#define CHACHA20_POLY1305_KEY_LEN 32
+#define CHACHA20_POLY1305_IV_LEN 12
+#define CHACHA20_POLY1305_CHECK_LEN 16
+
#endif
commit f8fa58a9061def1f7fdfc5adbb09c7fa67e1d425
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 02:37:10 2018 +0300
validation: crypto: use single definitions for AES key lengths
Merge defines for AES-CBC/CTR/GCM keys.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
index 9c0b844d..ff69717d 100644
--- a/test/validation/api/crypto/test_vectors.h
+++ b/test/validation/api/crypto/test_vectors.h
@@ -74,7 +74,7 @@ static crypto_test_reference_t tdes_cbc_reference[] = {
static crypto_test_reference_t aes_cbc_reference[] = {
{
- .cipher_key_length = AES128_CBC_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0x06, 0xa9, 0x21, 0x40, 0x36, 0xb8, 0xa1, 0x5b,
0x51, 0x2e, 0x03, 0xd5, 0x34, 0x12, 0x00, 0x06},
.cipher_iv_length = AES_CBC_IV_LEN,
@@ -86,7 +86,7 @@ static crypto_test_reference_t aes_cbc_reference[] = {
0x27, 0x08, 0x94, 0x2d, 0xbe, 0x77, 0x18, 0x1a }
},
{
- .cipher_key_length = AES128_CBC_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0xc2, 0x86, 0x69, 0x6d, 0x88, 0x7c, 0x9a, 0xa0,
0x61, 0x1b, 0xbb, 0x3e, 0x20, 0x25, 0xa4, 0x5a},
.cipher_iv_length = AES_CBC_IV_LEN,
@@ -103,7 +103,7 @@ static crypto_test_reference_t aes_cbc_reference[] = {
0x1b, 0x82, 0x66, 0xbe, 0xa6, 0xd6, 0x1a, 0xb1 }
},
{
- .cipher_key_length = AES128_CBC_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0x6c, 0x3e, 0xa0, 0x47, 0x76, 0x30, 0xce, 0x21,
0xa2, 0xce, 0x33, 0x4a, 0xa7, 0x46, 0xc2, 0xcd},
.cipher_iv_length = AES_CBC_IV_LEN,
@@ -119,7 +119,7 @@ static crypto_test_reference_t aes_cbc_reference[] = {
0x85, 0x79, 0x69, 0x5d, 0x83, 0xba, 0x26, 0x84 }
},
{
- .cipher_key_length = AES128_CBC_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0x56, 0xe4, 0x7a, 0x38, 0xc5, 0x59, 0x89, 0x74,
0xbc, 0x46, 0x90, 0x3d, 0xba, 0x29, 0x03, 0x49},
.cipher_iv_length = AES_CBC_IV_LEN,
@@ -144,7 +144,7 @@ static crypto_test_reference_t aes_cbc_reference[] = {
0x49, 0xa5, 0x3e, 0x87, 0xf4, 0xc3, 0xda, 0x55 }
},
{
- .cipher_key_length = AES192_CBC_KEY_LEN,
+ .cipher_key_length = AES192_KEY_LEN,
.cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c},
@@ -162,7 +162,7 @@ static crypto_test_reference_t aes_cbc_reference[] = {
0x53, 0x1c, 0xc6, 0x98, 0x85, 0xc3, 0x00, 0xe6},
},
{
- .cipher_key_length = AES256_CBC_KEY_LEN,
+ .cipher_key_length = AES256_KEY_LEN,
.cipher_key = { 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23,
0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab,
0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23,
@@ -188,7 +188,7 @@ static crypto_test_reference_t aes_cbc_reference[] = {
static crypto_test_reference_t aes_ctr_reference[] = {
{
- .cipher_key_length = AES128_CTR_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c},
.cipher_iv_length = AES_CTR_IV_LEN,
@@ -213,7 +213,7 @@ static crypto_test_reference_t aes_ctr_reference[] = {
0x79, 0x21, 0x70, 0xa0, 0xf3, 0x00, 0x9c, 0xee }
},
{
- .cipher_key_length = AES192_CTR_KEY_LEN,
+ .cipher_key_length = AES192_KEY_LEN,
.cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52,
0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5,
0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b},
@@ -239,7 +239,7 @@ static crypto_test_reference_t aes_ctr_reference[] = {
0x5a, 0x97, 0xda, 0xec, 0x58, 0xc6, 0xb0, 0x50 }
},
{
- .cipher_key_length = AES256_CTR_KEY_LEN,
+ .cipher_key_length = AES256_KEY_LEN,
.cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe,
0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81,
0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7,
@@ -272,7 +272,7 @@ static crypto_test_reference_t aes_ctr_reference[] = {
*/
static crypto_test_reference_t aes_gcm_reference[] = {
{
- .cipher_key_length = AES128_GCM_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda,
0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34},
.cipher_iv_length = AES_GCM_IV_LEN,
@@ -305,7 +305,7 @@ static crypto_test_reference_t aes_gcm_reference[] = {
0x2f, 0xd0, 0x47, 0x96, 0x56, 0x2d, 0xfd, 0xb4 }
},
{
- .cipher_key_length = AES128_GCM_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08},
.cipher_iv_length = AES_GCM_IV_LEN,
@@ -335,7 +335,7 @@ static crypto_test_reference_t aes_gcm_reference[] = {
0xc3, 0x09, 0xe9, 0xd8, 0x5a, 0x41, 0xad, 0x4a }
},
{
- .cipher_key_length = AES128_GCM_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
.cipher_iv_length = AES_GCM_IV_LEN,
@@ -365,7 +365,7 @@ static crypto_test_reference_t aes_gcm_reference[] = {
0x8a, 0xd2, 0xb6, 0x9e, 0x47, 0x99, 0xc7, 0x1d }
},
{
- .cipher_key_length = AES128_GCM_KEY_LEN,
+ .cipher_key_length = AES128_KEY_LEN,
.cipher_key = { 0x3d, 0xe0, 0x98, 0x74, 0xb3, 0x88, 0xe6, 0x49,
0x19, 0x88, 0xd0, 0xc3, 0x60, 0x7e, 0xae, 0x1f},
.cipher_iv_length = AES_GCM_IV_LEN,
@@ -388,7 +388,7 @@ static crypto_test_reference_t aes_gcm_reference[] = {
0x95, 0xf1, 0x12, 0xe4, 0xe7, 0xd0, 0x5d, 0x35 }
},
{
- .cipher_key_length = AES192_GCM_KEY_LEN,
+ .cipher_key_length = AES192_KEY_LEN,
.cipher_key = { 0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c},
@@ -413,7 +413,7 @@ static crypto_test_reference_t aes_gcm_reference[] = {
0x18, 0x02, 0x7b, 0x5b, 0x4c, 0xd7, 0xa6, 0x36 }
},
{
- .cipher_key_length = AES256_GCM_KEY_LEN,
+ .cipher_key_length = AES256_KEY_LEN,
.cipher_key = { 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23,
0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x9a, 0xab,
0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23,
@@ -446,7 +446,7 @@ static crypto_test_reference_t aes_gcm_reference[] = {
static crypto_test_reference_t aes_gmac_reference[] = {
{
- .auth_key_length = AES128_GCM_KEY_LEN,
+ .auth_key_length = AES128_KEY_LEN,
.auth_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda,
0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34},
.auth_iv_length = AES_GCM_IV_LEN,
diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h
index 2551b054..8933017b 100644
--- a/test/validation/api/crypto/test_vectors_len.h
+++ b/test/validation/api/crypto/test_vectors_len.h
@@ -17,43 +17,24 @@
#define TDES_CBC_KEY_LEN 24
#define TDES_CBC_IV_LEN 8
-/* AES-CBC common */
-#define AES_CBC_IV_LEN 16
-
-/* AES128-CBC */
-#define AES128_CBC_KEY_LEN 16
+/* AES common */
-/* AES192-CBC */
-#define AES192_CBC_KEY_LEN 24
+#define AES128_KEY_LEN 16
-/* AES256-CBC */
-#define AES256_CBC_KEY_LEN 32
+#define AES192_KEY_LEN 24
-/* AES-CBC common */
-#define AES_CTR_IV_LEN 16
+#define AES256_KEY_LEN 32
-/* AES128-CTR */
-#define AES128_CTR_KEY_LEN 16
-
-/* AES192-CTR */
-#define AES192_CTR_KEY_LEN 24
+/* AES-CBC */
+#define AES_CBC_IV_LEN 16
-/* AES256-CTR */
-#define AES256_CTR_KEY_LEN 32
+/* AES-CTR */
+#define AES_CTR_IV_LEN 16
-/* AES-GCM common */
+/* AES-GCM */
#define AES_GCM_IV_LEN 12
#define AES_GCM_DIGEST_LEN 16
-/* AES128-GCM */
-#define AES128_GCM_KEY_LEN 16
-
-/* AES192-GCM */
-#define AES192_GCM_KEY_LEN 24
-
-/* AES256-GCM */
-#define AES256_GCM_KEY_LEN 32
-
/* HMAC-MD5 */
#define HMAC_MD5_KEY_LEN 16
#define HMAC_MD5_96_CHECK_LEN 12
commit 98c59aa12adb2acda489261a631cb85c6bdbb358
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 04:27:52 2018 +0300
validation: crypto: drop obsolete GMAC-related hack
Checking that cipher is not NULL was required because GMAC used NULL
cipher to specify it's IV. Now it is obosolete, as auths has their own
IV.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 2b0ba1cd..0448972b 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -580,9 +580,6 @@ static void check_alg(odp_crypto_op_t op,
for (i = 0; i < cipher_num; i++) {
cipher_ok |= cipher_tested[i];
if (!cipher_tested[i]) {
- /* GMAC-related hacks */
- if (cipher_alg == ODP_CIPHER_ALG_NULL)
- continue;
printf("\n Untested: alg=%s, key_len=%" PRIu32 ", "
"iv_len=%" PRIu32 "\n",
cipher_alg_name(cipher_alg),
commit 036c1011222ee0e75d8572332aff9043510c3ec3
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Jan 24 21:06:45 2018 +0300
validation: crypto: use unix file format
Merge f925f103c90591776f73863d30159357b08bf71e changed EOL to DOS
convention in this file. Change it back.
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/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 1d92c656..2b0ba1cd 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -1,1296 +1,1296 @@
-/* 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;
-}
+/* 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;
+}
commit 5f4692a06e9241411ccba088142782638f1f9f96
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Jan 24 08:02:26 2018 +0300
api: crypto: add ChaCha20-Poly1305 support
ChaCha20-Poly1305 is a promising AEAD algorithm. Add decarations to
support it.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 421080c2..b7ab5362 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -101,6 +101,15 @@ typedef enum {
*/
ODP_CIPHER_ALG_AES_CCM,
+ /** ChaCha20-Poly1305
+ *
+ * ChaCha20 with Poly1305 provide both authentication and ciphering of
+ * data (authenticated encryption) in the same operation. Hence this
+ * algorithm must be paired always with ODP_AUTH_ALG_CHACHA20_POLY1305
+ * authentication.
+ */
+ ODP_CIPHER_ALG_CHACHA20_POLY1305,
+
/** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */
ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC),
@@ -183,6 +192,15 @@ typedef enum {
*/
ODP_AUTH_ALG_AES_CMAC,
+ /** ChaCha20-Poly1305 AEAD
+ *
+ * ChaCha20 with Poly1305 provide both authentication and ciphering of
+ * data (authenticated encryption) in the same operation. Hence this
+ * algorithm must be paired always with
+ * ODP_CIPHER_ALG_CHACHA20_POLY1305 cipher.
+ */
+ ODP_AUTH_ALG_CHACHA20_POLY1305,
+
/** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */
ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96),
@@ -221,6 +239,9 @@ typedef union odp_crypto_cipher_algos_t {
/** ODP_CIPHER_ALG_AES_CCM */
uint32_t aes_ccm : 1;
+ /** ODP_CIPHER_ALG_CHACHA20_POLY1305 */
+ uint32_t chacha20_poly1305 : 1;
+
/** @deprecated Use aes_cbc instead */
uint32_t ODP_DEPRECATE(aes128_cbc) : 1;
@@ -269,6 +290,9 @@ typedef union odp_crypto_auth_algos_t {
/** ODP_AUTH_ALG_AES_CMAC*/
uint32_t aes_cmac : 1;
+ /** ODP_AUTH_ALG_CHACHA20_POLY1305 */
+ uint32_t chacha20_poly1305 : 1;
+
/** @deprecated Use md5_hmac instead */
uint32_t ODP_DEPRECATE(md5_96) : 1;
commit 1b2c9fb5cb2a64a6ca0c623173dea966f45c5e4a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Jan 27 03:57:16 2018 +0300
api: crypto: add enumeration for AES-CMAC
Add enumeration for AES CMAC authentication algorithm.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index b8c7b9d8..421080c2 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -175,6 +175,14 @@ typedef enum {
*/
ODP_AUTH_ALG_AES_CCM,
+ /** AES-CMAC
+ *
+ * AES Cipher-based Message Authentication Code (CMAC) algorithm. CMAC
+ * is a keyed hash function that is based on a symmetric key block
+ * cipher, such as the AES.
+ */
+ ODP_AUTH_ALG_AES_CMAC,
+
/** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */
ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96),
@@ -258,6 +266,9 @@ typedef union odp_crypto_auth_algos_t {
/** ODP_AUTH_ALG_AES_CCM */
uint32_t aes_ccm : 1;
+ /** ODP_AUTH_ALG_AES_CMAC*/
+ uint32_t aes_cmac : 1;
+
/** @deprecated Use md5_hmac instead */
uint32_t ODP_DEPRECATE(md5_96) : 1;
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/abi-default/packet.h | 28 +
include/odp/api/spec/crypto.h | 35 +
include/odp/api/spec/ipsec.h | 152 +-
include/odp/api/spec/packet.h | 95 +
.../linux-generic/include-abi/odp/api/abi/packet.h | 28 +
platform/linux-generic/odp_crypto.c | 449 +++-
platform/linux-generic/odp_ipsec.c | 3 +-
platform/linux-generic/odp_ipsec_sad.c | 12 +
test/validation/api/crypto/odp_crypto_test_inp.c | 2775 +++++++++++---------
test/validation/api/crypto/test_vectors.h | 395 ++-
test/validation/api/crypto/test_vectors_len.h | 44 +-
test/validation/api/ipsec/ipsec.c | 14 +
test/validation/api/ipsec/ipsec.h | 1 +
test/validation/api/ipsec/ipsec_test_in.c | 33 +
test/validation/api/ipsec/ipsec_test_out.c | 48 +-
test/validation/api/ipsec/test_vectors.h | 66 +
16 files changed, 2774 insertions(+), 1404 deletions(-)
hooks/post-receive
--
6 years, 3 months
- 1
- 0