[COMMIT] branch api-next updated. v1.15.0.0-355-g4bcd15e2
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 4bcd15e2bfb839ac0ef6419aa9e7b720958638f7 (commit)
from 58a8ec90b57eae43be6461d1ae407e70a87c65d2 (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 4bcd15e2bfb839ac0ef6419aa9e7b720958638f7
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jun 12 14:11:33 2017 +0300
linux-gen: queue: clean up after modular interface
Clean up function and parameter naming after modular interface
patch. Queue_t type is referred as "queue internal": queue_int or
q_int. Term "handle" is reserved for API level handles (e.g.
odp_queue_t, odp_pktio_t, etc) through out linux-gen implementation.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h
index 4359435f..168d0e9e 100644
--- a/platform/linux-generic/include/odp_queue_if.h
+++ b/platform/linux-generic/include/odp_queue_if.h
@@ -53,24 +53,24 @@ typedef int (*queue_term_global_fn_t)(void);
typedef int (*queue_init_local_fn_t)(void);
typedef int (*queue_term_local_fn_t)(void);
typedef queue_t (*queue_from_ext_fn_t)(odp_queue_t handle);
-typedef odp_queue_t (*queue_to_ext_fn_t)(queue_t handle);
-typedef int (*queue_enq_fn_t)(queue_t handle, odp_buffer_hdr_t *);
-typedef int (*queue_enq_multi_fn_t)(queue_t handle, odp_buffer_hdr_t **, int);
-typedef odp_buffer_hdr_t *(*queue_deq_fn_t)(queue_t handle);
-typedef int (*queue_deq_multi_fn_t)(queue_t handle, odp_buffer_hdr_t **, int);
-typedef odp_pktout_queue_t (*queue_get_pktout_fn_t)(queue_t handle);
-typedef void (*queue_set_pktout_fn_t)(queue_t handle, odp_pktio_t pktio,
+typedef odp_queue_t (*queue_to_ext_fn_t)(queue_t q_int);
+typedef int (*queue_enq_fn_t)(queue_t q_int, odp_buffer_hdr_t *);
+typedef int (*queue_enq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int);
+typedef odp_buffer_hdr_t *(*queue_deq_fn_t)(queue_t q_int);
+typedef int (*queue_deq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int);
+typedef odp_pktout_queue_t (*queue_get_pktout_fn_t)(queue_t q_int);
+typedef void (*queue_set_pktout_fn_t)(queue_t q_int, odp_pktio_t pktio,
int index);
-typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(queue_t handle);
-typedef void (*queue_set_pktin_fn_t)(queue_t handle, odp_pktio_t pktio,
+typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(queue_t q_int);
+typedef void (*queue_set_pktin_fn_t)(queue_t q_int, odp_pktio_t pktio,
int index);
-typedef void (*queue_set_enq_fn_t)(queue_t handle, queue_enq_fn_t func);
-typedef void (*queue_set_enq_multi_fn_t)(queue_t handle,
+typedef void (*queue_set_enq_fn_t)(queue_t q_int, queue_enq_fn_t func);
+typedef void (*queue_set_enq_multi_fn_t)(queue_t q_int,
queue_enq_multi_fn_t func);
-typedef void (*queue_set_deq_fn_t)(queue_t handle, queue_deq_fn_t func);
-typedef void (*queue_set_deq_multi_fn_t)(queue_t handle,
+typedef void (*queue_set_deq_fn_t)(queue_t q_int, queue_deq_fn_t func);
+typedef void (*queue_set_deq_multi_fn_t)(queue_t q_int,
queue_deq_multi_fn_t func);
-typedef void (*queue_set_type_fn_t)(queue_t handle, odp_queue_type_t type);
+typedef void (*queue_set_type_fn_t)(queue_t q_int, odp_queue_type_t type);
/* Queue functions towards other internal components */
typedef struct {
diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h
index 0c31ce8a..d79abd23 100644
--- a/platform/linux-generic/include/odp_queue_internal.h
+++ b/platform/linux-generic/include/odp_queue_internal.h
@@ -78,9 +78,9 @@ static inline uint32_t queue_to_id(odp_queue_t handle)
return _odp_typeval(handle) - 1;
}
-static inline queue_entry_t *qentry_from_int(queue_t handle)
+static inline queue_entry_t *qentry_from_int(queue_t q_int)
{
- return (queue_entry_t *)(void *)(handle);
+ return (queue_entry_t *)(void *)(q_int);
}
static inline queue_t qentry_to_int(queue_entry_t *qentry)
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 9adacef7..5d10cd37 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -26,7 +26,7 @@ typedef int (*schedule_init_queue_fn_t)(uint32_t queue_index,
typedef void (*schedule_destroy_queue_fn_t)(uint32_t queue_index);
typedef int (*schedule_sched_queue_fn_t)(uint32_t queue_index);
typedef int (*schedule_unsched_queue_fn_t)(uint32_t queue_index);
-typedef int (*schedule_ord_enq_multi_fn_t)(queue_t handle,
+typedef int (*schedule_ord_enq_multi_fn_t)(queue_t q_int,
void *buf_hdr[], int num, int *ret);
typedef int (*schedule_init_global_fn_t)(void);
typedef int (*schedule_term_global_fn_t)(void);
diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
index 3e18f578..19945584 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -35,20 +35,22 @@
#include <string.h>
#include <inttypes.h>
+static int queue_init(queue_entry_t *queue, const char *name,
+ const odp_queue_param_t *param);
+
typedef struct queue_table_t {
queue_entry_t queue[ODP_CONFIG_QUEUES];
} queue_table_t;
static queue_table_t *queue_tbl;
-static queue_t queue_from_ext(odp_queue_t handle);
-static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr);
-static odp_buffer_hdr_t *_queue_deq(queue_t handle);
+static inline queue_entry_t *handle_to_qentry(odp_queue_t handle)
+{
+ uint32_t queue_id;
-static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
- int num);
-static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
- int num);
+ queue_id = queue_to_id(handle);
+ return get_qentry(queue_id);
+}
static inline odp_queue_t queue_from_id(uint32_t queue_id)
{
@@ -70,50 +72,6 @@ queue_entry_t *get_qentry(uint32_t queue_id)
return &queue_tbl->queue[queue_id];
}
-static int queue_init(queue_entry_t *queue, const char *name,
- const odp_queue_param_t *param)
-{
- if (name == NULL) {
- queue->s.name[0] = 0;
- } else {
- strncpy(queue->s.name, name, ODP_QUEUE_NAME_LEN - 1);
- queue->s.name[ODP_QUEUE_NAME_LEN - 1] = 0;
- }
- memcpy(&queue->s.param, param, sizeof(odp_queue_param_t));
- if (queue->s.param.sched.lock_count > sched_fn->max_ordered_locks())
- return -1;
-
- if (param->type == ODP_QUEUE_TYPE_SCHED) {
- queue->s.param.deq_mode = ODP_QUEUE_OP_DISABLED;
-
- if (param->sched.sync == ODP_SCHED_SYNC_ORDERED) {
- unsigned i;
-
- odp_atomic_init_u64(&queue->s.ordered.ctx, 0);
- odp_atomic_init_u64(&queue->s.ordered.next_ctx, 0);
-
- for (i = 0; i < queue->s.param.sched.lock_count; i++)
- odp_atomic_init_u64(&queue->s.ordered.lock[i],
- 0);
- }
- }
- queue->s.type = queue->s.param.type;
-
- queue->s.enqueue = _queue_enq;
- queue->s.dequeue = _queue_deq;
- queue->s.enqueue_multi = _queue_enq_multi;
- queue->s.dequeue_multi = _queue_deq_multi;
-
- queue->s.pktin = PKTIN_INVALID;
- queue->s.pktout = PKTOUT_INVALID;
-
- queue->s.head = NULL;
- queue->s.tail = NULL;
-
- return 0;
-}
-
-
static int queue_init_global(void)
{
uint32_t i;
@@ -204,27 +162,27 @@ static int queue_capability(odp_queue_capability_t *capa)
static odp_queue_type_t queue_type(odp_queue_t handle)
{
- return qentry_from_int(queue_from_ext(handle))->s.type;
+ return handle_to_qentry(handle)->s.type;
}
static odp_schedule_sync_t queue_sched_type(odp_queue_t handle)
{
- return qentry_from_int(queue_from_ext(handle))->s.param.sched.sync;
+ return handle_to_qentry(handle)->s.param.sched.sync;
}
static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle)
{
- return qentry_from_int(queue_from_ext(handle))->s.param.sched.prio;
+ return handle_to_qentry(handle)->s.param.sched.prio;
}
static odp_schedule_group_t queue_sched_group(odp_queue_t handle)
{
- return qentry_from_int(queue_from_ext(handle))->s.param.sched.group;
+ return handle_to_qentry(handle)->s.param.sched.group;
}
static int queue_lock_count(odp_queue_t handle)
{
- queue_entry_t *queue = qentry_from_int(queue_from_ext(handle));
+ queue_entry_t *queue = handle_to_qentry(handle);
return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ?
(int)queue->s.param.sched.lock_count : -1;
@@ -299,7 +257,7 @@ void sched_cb_queue_destroy_finalize(uint32_t queue_index)
static int queue_destroy(odp_queue_t handle)
{
queue_entry_t *queue;
- queue = qentry_from_int(queue_from_ext(handle));
+ queue = handle_to_qentry(handle);
if (handle == ODP_QUEUE_INVALID)
return -1;
@@ -352,14 +310,14 @@ static int queue_context_set(odp_queue_t handle, void *context,
uint32_t len ODP_UNUSED)
{
odp_mb_full();
- qentry_from_int(queue_from_ext(handle))->s.param.context = context;
+ handle_to_qentry(handle)->s.param.context = context;
odp_mb_full();
return 0;
}
static void *queue_context(odp_queue_t handle)
{
- return qentry_from_int(queue_from_ext(handle))->s.param.context;
+ return handle_to_qentry(handle)->s.param.context;
}
static odp_queue_t queue_lookup(const char *name)
@@ -385,7 +343,7 @@ static odp_queue_t queue_lookup(const char *name)
return ODP_QUEUE_INVALID;
}
-static inline int enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
+static inline int enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[],
int num)
{
int sched = 0;
@@ -393,8 +351,8 @@ static inline int enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
queue_entry_t *queue;
odp_buffer_hdr_t *hdr, *tail, *next_hdr;
- queue = qentry_from_int(handle);
- if (sched_fn->ord_enq_multi(handle, (void **)buf_hdr, num, &ret))
+ queue = qentry_from_int(q_int);
+ if (sched_fn->ord_enq_multi(q_int, (void **)buf_hdr, num, &ret))
return ret;
/* Optimize the common case of single enqueue */
@@ -462,17 +420,17 @@ static inline int enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
return num; /* All events enqueued */
}
-static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
- int num)
+static int queue_int_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[],
+ int num)
{
- return enq_multi(handle, buf_hdr, num);
+ return enq_multi(q_int, buf_hdr, num);
}
-static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr)
+static int queue_int_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr)
{
int ret;
- ret = enq_multi(handle, &buf_hdr, 1);
+ ret = enq_multi(q_int, &buf_hdr, 1);
if (ret == 1)
return 0;
@@ -489,7 +447,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num)
if (num > QUEUE_MULTI_MAX)
num = QUEUE_MULTI_MAX;
- queue = qentry_from_int(queue_from_ext(handle));
+ queue = handle_to_qentry(handle);
for (i = 0; i < num; i++)
buf_hdr[i] = buf_hdl_to_hdr(odp_buffer_from_event(ev[i]));
@@ -503,13 +461,13 @@ static int queue_enq(odp_queue_t handle, odp_event_t ev)
odp_buffer_hdr_t *buf_hdr;
queue_entry_t *queue;
- queue = qentry_from_int(queue_from_ext(handle));
+ queue = handle_to_qentry(handle);
buf_hdr = buf_hdl_to_hdr(odp_buffer_from_event(ev));
return queue->s.enqueue(qentry_to_int(queue), buf_hdr);
}
-static inline int deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
+static inline int deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[],
int num)
{
odp_buffer_hdr_t *hdr, *next;
@@ -517,7 +475,7 @@ static inline int deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
queue_entry_t *queue;
int updated = 0;
- queue = qentry_from_int(handle);
+ queue = qentry_from_int(q_int);
LOCK(&queue->s.lock);
if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) {
/* Bad queue, or queue has been destroyed.
@@ -583,18 +541,18 @@ static inline int deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
return i;
}
-static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[],
- int num)
+static int queue_int_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[],
+ int num)
{
- return deq_multi(handle, buf_hdr, num);
+ return deq_multi(q_int, buf_hdr, num);
}
-static odp_buffer_hdr_t *_queue_deq(queue_t handle)
+static odp_buffer_hdr_t *queue_int_deq(queue_t q_int)
{
odp_buffer_hdr_t *buf_hdr = NULL;
int ret;
- ret = deq_multi(handle, &buf_hdr, 1);
+ ret = deq_multi(q_int, &buf_hdr, 1);
if (ret == 1)
return buf_hdr;
@@ -611,7 +569,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t events[], int num)
if (num > QUEUE_MULTI_MAX)
num = QUEUE_MULTI_MAX;
- queue = qentry_from_int(queue_from_ext(handle));
+ queue = handle_to_qentry(handle);
ret = queue->s.dequeue_multi(qentry_to_int(queue), buf_hdr, num);
@@ -627,7 +585,7 @@ static odp_event_t queue_deq(odp_queue_t handle)
queue_entry_t *queue;
odp_buffer_hdr_t *buf_hdr;
- queue = qentry_from_int(queue_from_ext(handle));
+ queue = handle_to_qentry(handle);
buf_hdr = queue->s.dequeue(qentry_to_int(queue));
if (buf_hdr)
@@ -636,6 +594,49 @@ static odp_event_t queue_deq(odp_queue_t handle)
return ODP_EVENT_INVALID;
}
+static int queue_init(queue_entry_t *queue, const char *name,
+ const odp_queue_param_t *param)
+{
+ if (name == NULL) {
+ queue->s.name[0] = 0;
+ } else {
+ strncpy(queue->s.name, name, ODP_QUEUE_NAME_LEN - 1);
+ queue->s.name[ODP_QUEUE_NAME_LEN - 1] = 0;
+ }
+ memcpy(&queue->s.param, param, sizeof(odp_queue_param_t));
+ if (queue->s.param.sched.lock_count > sched_fn->max_ordered_locks())
+ return -1;
+
+ if (param->type == ODP_QUEUE_TYPE_SCHED) {
+ queue->s.param.deq_mode = ODP_QUEUE_OP_DISABLED;
+
+ if (param->sched.sync == ODP_SCHED_SYNC_ORDERED) {
+ unsigned i;
+
+ odp_atomic_init_u64(&queue->s.ordered.ctx, 0);
+ odp_atomic_init_u64(&queue->s.ordered.next_ctx, 0);
+
+ for (i = 0; i < queue->s.param.sched.lock_count; i++)
+ odp_atomic_init_u64(&queue->s.ordered.lock[i],
+ 0);
+ }
+ }
+ queue->s.type = queue->s.param.type;
+
+ queue->s.enqueue = queue_int_enq;
+ queue->s.dequeue = queue_int_deq;
+ queue->s.enqueue_multi = queue_int_enq_multi;
+ queue->s.dequeue_multi = queue_int_deq_multi;
+
+ queue->s.pktin = PKTIN_INVALID;
+ queue->s.pktout = PKTOUT_INVALID;
+
+ queue->s.head = NULL;
+ queue->s.tail = NULL;
+
+ return 0;
+}
+
void queue_lock(queue_entry_t *queue)
{
LOCK(&queue->s.lock);
@@ -776,64 +777,65 @@ static uint64_t queue_to_u64(odp_queue_t hdl)
return _odp_pri(hdl);
}
-static odp_pktout_queue_t queue_get_pktout(queue_t handle)
+static odp_pktout_queue_t queue_get_pktout(queue_t q_int)
{
- return qentry_from_int(handle)->s.pktout;
+ return qentry_from_int(q_int)->s.pktout;
}
-static void queue_set_pktout(queue_t handle, odp_pktio_t pktio, int index)
+static void queue_set_pktout(queue_t q_int, odp_pktio_t pktio, int index)
{
- qentry_from_int(handle)->s.pktout.pktio = pktio;
- qentry_from_int(handle)->s.pktout.index = index;
+ queue_entry_t *qentry = qentry_from_int(q_int);
+
+ qentry->s.pktout.pktio = pktio;
+ qentry->s.pktout.index = index;
}
-static odp_pktin_queue_t queue_get_pktin(queue_t handle)
+static odp_pktin_queue_t queue_get_pktin(queue_t q_int)
{
- return qentry_from_int(handle)->s.pktin;
+ return qentry_from_int(q_int)->s.pktin;
}
-static void queue_set_pktin(queue_t handle, odp_pktio_t pktio, int index)
+static void queue_set_pktin(queue_t q_int, odp_pktio_t pktio, int index)
{
- qentry_from_int(handle)->s.pktin.pktio = pktio;
- qentry_from_int(handle)->s.pktin.index = index;
+ queue_entry_t *qentry = qentry_from_int(q_int);
+
+ qentry->s.pktin.pktio = pktio;
+ qentry->s.pktin.index = index;
}
-static void queue_set_enq_func(queue_t handle, queue_enq_fn_t func)
+static void queue_set_enq_func(queue_t q_int, queue_enq_fn_t func)
{
- qentry_from_int(handle)->s.enqueue = func;
+ qentry_from_int(q_int)->s.enqueue = func;
}
-static void queue_set_enq_multi_func(queue_t handle, queue_enq_multi_fn_t func)
+static void queue_set_enq_multi_func(queue_t q_int, queue_enq_multi_fn_t func)
{
- qentry_from_int(handle)->s.enqueue_multi = func;
+ qentry_from_int(q_int)->s.enqueue_multi = func;
}
-static void queue_set_deq_func(queue_t handle, queue_deq_fn_t func)
+static void queue_set_deq_func(queue_t q_int, queue_deq_fn_t func)
{
- qentry_from_int(handle)->s.dequeue = func;
+ qentry_from_int(q_int)->s.dequeue = func;
}
-static void queue_set_deq_multi_func(queue_t handle, queue_deq_multi_fn_t func)
+static void queue_set_deq_multi_func(queue_t q_int, queue_deq_multi_fn_t func)
{
- qentry_from_int(handle)->s.dequeue_multi = func;
+ qentry_from_int(q_int)->s.dequeue_multi = func;
}
-static void queue_set_type(queue_t handle, odp_queue_type_t type)
+static void queue_set_type(queue_t q_int, odp_queue_type_t type)
{
- qentry_from_int(handle)->s.type = type;
+ qentry_from_int(q_int)->s.type = type;
}
static queue_t queue_from_ext(odp_queue_t handle)
{
- uint32_t queue_id;
-
- queue_id = queue_to_id(handle);
- return qentry_to_int(get_qentry(queue_id));
+ return qentry_to_int(handle_to_qentry(handle));
}
-static odp_queue_t queue_to_ext(queue_t handle)
+static odp_queue_t queue_to_ext(queue_t q_int)
{
- return qentry_from_int(handle)->s.handle;
+ return qentry_from_int(q_int)->s.handle;
}
/* API functions */
@@ -866,10 +868,10 @@ queue_fn_t queue_default_fn = {
.term_local = queue_term_local,
.from_ext = queue_from_ext,
.to_ext = queue_to_ext,
- .enq = _queue_enq,
- .enq_multi = _queue_enq_multi,
- .deq = _queue_deq,
- .deq_multi = _queue_deq_multi,
+ .enq = queue_int_enq,
+ .enq_multi = queue_int_enq_multi,
+ .deq = queue_int_deq,
+ .deq_multi = queue_int_deq_multi,
.get_pktout = queue_get_pktout,
.set_pktout = queue_set_pktout,
.get_pktin = queue_get_pktin,
diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c
index 011d4dc4..92634235 100644
--- a/platform/linux-generic/odp_schedule.c
+++ b/platform/linux-generic/odp_schedule.c
@@ -712,12 +712,12 @@ static inline int copy_events(odp_event_t out_ev[], unsigned int max)
return i;
}
-static int schedule_ord_enq_multi(queue_t handle, void *buf_hdr[],
+static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[],
int num, int *ret)
{
int i;
uint32_t stash_num = sched_local.ordered.stash_num;
- queue_entry_t *dst_queue = qentry_from_int(handle);
+ queue_entry_t *dst_queue = qentry_from_int(q_int);
queue_entry_t *src_queue = sched_local.ordered.src_queue;
if (!sched_local.ordered.src_queue || sched_local.ordered.in_order)
diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c
index bdf1a460..79086843 100644
--- a/platform/linux-generic/odp_schedule_iquery.c
+++ b/platform/linux-generic/odp_schedule_iquery.c
@@ -1159,12 +1159,12 @@ static inline void schedule_release_context(void)
schedule_release_atomic();
}
-static int schedule_ord_enq_multi(queue_t handle, void *buf_hdr[],
+static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[],
int num, int *ret)
{
int i;
uint32_t stash_num = thread_local.ordered.stash_num;
- queue_entry_t *dst_queue = qentry_from_int(handle);
+ queue_entry_t *dst_queue = qentry_from_int(q_int);
queue_entry_t *src_queue = thread_local.ordered.src_queue;
if (!thread_local.ordered.src_queue || thread_local.ordered.in_order)
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index 91d70e3a..66715c13 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -414,10 +414,10 @@ static int unsched_queue(uint32_t qi ODP_UNUSED)
return 0;
}
-static int ord_enq_multi(queue_t handle, void *buf_hdr[], int num,
+static int ord_enq_multi(queue_t q_int, void *buf_hdr[], int num,
int *ret)
{
- (void)handle;
+ (void)q_int;
(void)buf_hdr;
(void)num;
(void)ret;
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/include/odp_queue_if.h | 28 +--
.../linux-generic/include/odp_queue_internal.h | 4 +-
platform/linux-generic/include/odp_schedule_if.h | 2 +-
platform/linux-generic/odp_queue.c | 218 +++++++++++----------
platform/linux-generic/odp_schedule.c | 4 +-
platform/linux-generic/odp_schedule_iquery.c | 4 +-
platform/linux-generic/odp_schedule_sp.c | 4 +-
7 files changed, 133 insertions(+), 131 deletions(-)
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch master updated. v1.15.0.0-3-gf4337956
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 f4337956ee3be1e783e2389eb5a5ceecb4b0b0ca (commit)
via cd1f187d33d65cb54781b5a3c0864229b19c11c3 (commit)
from 0d24adacfe17c8e0e1348f19cd8b75b64cb13ccf (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 f4337956ee3be1e783e2389eb5a5ceecb4b0b0ca
Author: Joe Savage <joe.savage(a)arm.com>
Date: Thu Apr 13 15:46:15 2017 +0100
example: add IPv4 fragmentation/reassembly example
Add an example application implementing lock-free IPv4 fragmentation
and reassembly functionality using ODP's packet "concat" and "split".
Signed-off-by: Joe Savage <joe.savage(a)arm.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/application-api-guide/examples.dox b/doc/application-api-guide/examples.dox
index 60d4058f..80fe4670 100644
--- a/doc/application-api-guide/examples.dox
+++ b/doc/application-api-guide/examples.dox
@@ -28,3 +28,8 @@
* @example odp_timer_test.c
* ODP timer example application
*/
+
+ /**
+ * @example odp_ipfragreass.c
+ * ODP IPv4 lock-free fragmentation and reassembly example application
+ */
diff --git a/example/Makefile.am b/example/Makefile.am
index dfc07b67..9503a1ba 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = classifier \
generator \
hello \
ipsec \
+ ipfragreass \
l2fwd_simple \
l3fwd \
packet \
diff --git a/example/ipfragreass/.gitignore b/example/ipfragreass/.gitignore
new file mode 100644
index 00000000..d25d7584
--- /dev/null
+++ b/example/ipfragreass/.gitignore
@@ -0,0 +1,3 @@
+odp_ipfragreass
+*.log
+*.trs
diff --git a/example/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am
new file mode 100644
index 00000000..f805a69b
--- /dev/null
+++ b/example/ipfragreass/Makefile.am
@@ -0,0 +1,23 @@
+include $(top_srcdir)/example/Makefile.inc
+
+bin_PROGRAMS = odp_ipfragreass$(EXEEXT)
+odp_ipfragreass_LDFLAGS = $(AM_LDFLAGS) -static
+odp_ipfragreass_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
+
+noinst_HEADERS = \
+ $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics.h \
+ $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics_arm.h \
+ $(top_srcdir)/example/ipfragreass/odp_ipfragreass_fragment.h \
+ $(top_srcdir)/example/ipfragreass/odp_ipfragreass_helpers.h \
+ $(top_srcdir)/example/ipfragreass/odp_ipfragreass_ip.h \
+ $(top_srcdir)/example/ipfragreass/odp_ipfragreass_reassemble.h \
+ $(top_srcdir)/example/example_debug.h
+
+dist_odp_ipfragreass_SOURCES = odp_ipfragreass.c \
+ odp_ipfragreass_fragment.c \
+ odp_ipfragreass_helpers.c \
+ odp_ipfragreass_reassemble.c
+
+if test_example
+TESTS = odp_ipfragreass
+endif
diff --git a/example/ipfragreass/odp_ipfragreass.c b/example/ipfragreass/odp_ipfragreass.c
new file mode 100644
index 00000000..6ad0db9f
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass.c
@@ -0,0 +1,376 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * @example odp_ipfragreass.c ODP IPv4 lock-free fragmentation and reassembly
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <assert.h>
+
+#include <odp/helper/odph_api.h>
+#include <example_debug.h>
+
+#include "odp_ipfragreass_fragment.h"
+#include "odp_ipfragreass_reassemble.h"
+#include "odp_ipfragreass_helpers.h"
+
+#define NUM_PACKETS 200 /**< Number of packets to fragment/reassemble */
+#define MAX_WORKERS 32 /**< Maximum number of worker threads */
+#define FRAGLISTS 16384 /**< Hash map size for reassembly */
+
+#define MIN_MF_FRAG_SIZE 576 /**< Minimum fragment size */
+#define MAX_PKT_LEN 8192 /**< Maximum packet size */
+#define MAX_FRAGS_PER_PKT 6 /**< Maximum number of fragments per packet */
+
+/**
+ * Derived parameters for packet storage (inc. pool configuration)
+ */
+#define POOL_MIN_SEG_LEN IP_HDR_LEN_MIN
+#define POOL_UAREA_SIZE sizeof(struct packet)
+#define MAX_FRAGS (MAX_FRAGS_PER_PKT * NUM_PACKETS)
+
+/** Output queue for fragmentation, input queue for reassembly */
+static odp_queue_t fragments;
+
+/** Output queue for reassembly, input queue for validation */
+static odp_queue_t reassembled_pkts;
+
+/** Number of packets reassembled thus far */
+static odp_atomic_u32_t packets_reassembled;
+
+/** Number of fragments processed per thread in reassembly (for printing) */
+static struct {
+ uint32_t frags;
+} ODP_ALIGNED_CACHE thread_stats[MAX_WORKERS];
+
+/** Shared hash map structure for reassembly */
+static union fraglist *fraglists;
+
+/** Barrier for synchronising reassembly worker threads */
+static odp_barrier_t barrier;
+
+/**
+ * Initialise the base structures required for execution of this application
+ *
+ * @param[out] instance ODP instance handle to initialise
+ * @param[out] fragment_pool Output for fragment pool creation
+ * @param[out] shm Output for reassembly shared memory creation
+ * @param[out] cpumask Output for worker threads CPU mask
+ * @param[out] num_workers Output for number of worker threads
+ */
+static void init(odp_instance_t *instance, odp_pool_t *fragment_pool,
+ odp_shm_t *shm, odp_cpumask_t *cpumask, int *num_workers)
+{
+ unsigned int seed = time(NULL);
+ int i;
+ odp_pool_param_t pool_params;
+ odp_queue_param_t frag_queue_params;
+ odp_queue_param_t reass_queue_params;
+ char cpumask_str[ODP_CPUMASK_STR_SIZE];
+
+ srand(seed);
+ printf("= Seed: %d\n", seed);
+ printf("= MTU: %d\n", MTU);
+
+ /* ODP initialisation */
+ if (odp_init_global(instance, NULL, NULL)) {
+ fprintf(stderr, "ERROR: ODP global init failed.\n");
+ exit(1);
+ }
+ if (odp_init_local(*instance, ODP_THREAD_CONTROL)) {
+ fprintf(stderr, "ERROR: ODP local init failed.\n");
+ exit(1);
+ }
+
+ /* Create a pool for packet storage */
+ odp_pool_param_init(&pool_params);
+ pool_params.pkt.seg_len = POOL_MIN_SEG_LEN;
+ pool_params.pkt.len = MAX_PKT_LEN;
+ pool_params.pkt.num = 2 * MAX_FRAGS + MAX_WORKERS;
+ pool_params.pkt.uarea_size = POOL_UAREA_SIZE;
+ pool_params.type = ODP_POOL_PACKET;
+ *fragment_pool = odp_pool_create("packet pool", &pool_params);
+ if (*fragment_pool == ODP_POOL_INVALID) {
+ fprintf(stderr, "ERROR: packet pool create failed.\n");
+ exit(1);
+ }
+
+ /* Reserve (and initialise) shared memory for reassembly fraglists */
+ *shm = odp_shm_reserve("fraglists", FRAGLISTS * sizeof(union fraglist),
+ ODP_CACHE_LINE_SIZE, 0);
+ if (*shm == ODP_SHM_INVALID) {
+ fprintf(stderr, "ERROR: odp_shm_reserve\n");
+ exit(1);
+ }
+ fraglists = odp_shm_addr(*shm);
+ if (fraglists == NULL) {
+ fprintf(stderr, "ERROR: odp_shm_addr\n");
+ exit(1);
+ }
+ for (i = 0; i < FRAGLISTS; ++i)
+ init_fraglist(&fraglists[i]);
+
+ /* Create a queue for holding fragments */
+ odp_queue_param_init(&frag_queue_params);
+ frag_queue_params.type = ODP_QUEUE_TYPE_PLAIN;
+ frag_queue_params.enq_mode = ODP_QUEUE_OP_MT_UNSAFE;
+ fragments = odp_queue_create("fragments", &frag_queue_params);
+ if (fragments == ODP_QUEUE_INVALID) {
+ fprintf(stderr, "ERROR: odp_queue_create\n");
+ exit(1);
+ }
+
+ /* Create a queue for holding reassembled packets */
+ odp_queue_param_init(&reass_queue_params);
+ reass_queue_params.type = ODP_QUEUE_TYPE_PLAIN;
+ reass_queue_params.deq_mode = ODP_QUEUE_OP_MT_UNSAFE;
+ reassembled_pkts = odp_queue_create("reassembled packets",
+ &reass_queue_params);
+ if (reassembled_pkts == ODP_QUEUE_INVALID) {
+ fprintf(stderr, "ERROR: odp_queue_create\n");
+ exit(1);
+ }
+
+ /* Set up worker threads */
+ *num_workers = odp_cpumask_default_worker(cpumask, *num_workers);
+ odp_barrier_init(&barrier, *num_workers + 1);
+ odp_cpumask_to_str(cpumask, cpumask_str, sizeof(cpumask_str));
+ printf("= Workers: %d\n", *num_workers);
+ printf("= CPU Mask: %s (first CPU: %d)\n\n", cpumask_str,
+ odp_cpumask_first(cpumask));
+}
+
+/**
+ * Reassembly worker thread function
+ *
+ * Repeatedly dequeues input fragments, validating them and then passing them
+ * to the reassembly procedure "reassemble_ipv4_packets". When a packet has
+ * been reassembled, it is added to the output queue, and when NUM_PACKETS
+ * packets have been completed the function returns. Thread 0 additionally
+ * executes the garbage collection procedure to clean up stale fragments.
+ *
+ * @param arg The thread number of this worker (masquerading as a pointer)
+ *
+ * @return Always returns zero
+ */
+static int run_worker(void *arg EXAMPLE_UNUSED)
+{
+ int threadno = odp_thread_id() - 1;
+ int iterations = 0;
+ odp_event_t ev;
+
+ odp_barrier_wait(&barrier);
+ while (odp_atomic_load_u32(&packets_reassembled) < NUM_PACKETS) {
+ odp_packet_t pkt;
+ odp_time_t timestamp;
+ odph_ipv4hdr_t *hdr;
+ struct packet *fragment;
+ int reassembled;
+
+ ev = odp_queue_deq(fragments);
+ if (ev == ODP_EVENT_INVALID)
+ break;
+ assert(odp_event_type(ev) == ODP_EVENT_PACKET);
+ ++thread_stats[threadno].frags;
+
+ pkt = odp_packet_from_event(ev);
+ hdr = odp_packet_data(pkt);
+ fragment = odp_packet_user_area(pkt);
+ timestamp = odp_time_global();
+ assert(fragment != NULL);
+ assert(odp_packet_len(pkt) == ipv4hdr_payload_len(*hdr)
+ + ipv4hdr_ihl(*hdr));
+ assert(!ipv4hdr_more_fragments(*hdr) ||
+ (odp_packet_len(pkt) >= MIN_MF_FRAG_SIZE &&
+ (odp_packet_len(pkt)
+ - ipv4hdr_ihl(*hdr)) % 8 == 0));
+ assert(odp_packet_len(pkt) <= MAX_PKT_LEN);
+ fragment->handle = pkt;
+ fragment->prev = NULL;
+ fragment->arrival.t = odp_time_to_ns(timestamp) / TS_RES_NS;
+
+ reassembled = reassemble_ipv4_packets(fraglists, FRAGLISTS,
+ fragment, 1,
+ reassembled_pkts);
+ if (reassembled > 0)
+ odp_atomic_add_u32(&packets_reassembled, reassembled);
+
+ /*
+ * Perform garbage collection of stale fragments every 50
+ * iterations. (In real applications, use a timer!)
+ */
+ if (threadno == 0 && iterations++ > 50) {
+ iterations = 0;
+ garbage_collect_fraglists(fraglists, FRAGLISTS,
+ reassembled_pkts, 0);
+ }
+ }
+
+ while ((ev = odp_queue_deq(fragments)) != ODP_EVENT_INVALID) {
+ assert(odp_event_type(ev) == ODP_EVENT_PACKET);
+ odp_packet_free(odp_packet_from_event(ev));
+ }
+
+ return 0;
+}
+
+/**
+ * ODP fragmentation and reassembly example main function
+ */
+int main(void)
+{
+ odp_instance_t instance;
+ odp_pool_t fragment_pool;
+ odp_shm_t shm;
+ odp_cpumask_t cpumask;
+ odph_odpthread_t threads[MAX_WORKERS] = {};
+ odph_odpthread_params_t thread_params;
+ odp_packet_t dequeued_pkts[NUM_PACKETS];
+ odp_event_t ev;
+ odp_u16be_t ip_id = 0;
+ odp_packet_t orig_pkts[NUM_PACKETS];
+ odp_packet_t fragment_buffer[MAX_FRAGS];
+ int total_fragments = 0;
+ int i;
+ int num_workers = MAX_WORKERS;
+ int reassembled;
+
+ init(&instance, &fragment_pool, &shm, &cpumask, &num_workers);
+
+ /* Packet generation & fragmentation */
+ printf("\n= Fragmenting %d packets...\n", NUM_PACKETS);
+ for (i = 0; i < NUM_PACKETS; ++i) {
+ odp_packet_t packet;
+ int num_fragments;
+
+ packet = pack_udp_ipv4_packet(fragment_pool, ip_id++,
+ MAX_PKT_LEN,
+ MTU + IP_HDR_LEN_MAX + 1);
+ if (packet == ODP_PACKET_INVALID) {
+ fprintf(stderr, "ERROR: pack_udp_ipv4_packet\n");
+ return 1;
+ }
+
+ orig_pkts[i] = odp_packet_copy(packet, fragment_pool);
+ if (orig_pkts[i] == ODP_PACKET_INVALID) {
+ fprintf(stderr, "ERROR: odp_packet_copy\n");
+ return 1;
+ }
+
+ if (fragment_ipv4_packet(packet,
+ &fragment_buffer[total_fragments],
+ &num_fragments)) {
+ fprintf(stderr, "ERROR: fragment_ipv4_packet\n");
+ return 1;
+ }
+
+ total_fragments += num_fragments;
+ }
+
+ /* Shuffle the fragments around so they aren't necessarily in order */
+ printf("\n= Shuffling %d fragments...\n", total_fragments);
+ shuffle(fragment_buffer, total_fragments);
+
+ /* Insert the fragments into a queue for consumption */
+ for (i = 0; i < total_fragments; ++i) {
+ ev = odp_packet_to_event(fragment_buffer[i]);
+
+ if (odp_queue_enq(fragments, ev) < 0) {
+ fprintf(stderr, "ERROR: odp_queue_enq\n");
+ return 1;
+ }
+ }
+
+ /* Spawn the worker threads for reassembly */
+ memset(&thread_params, 0, sizeof(thread_params));
+ thread_params.start = run_worker;
+ thread_params.arg = 0;
+ thread_params.thr_type = ODP_THREAD_WORKER;
+ thread_params.instance = instance;
+ odph_odpthreads_create(threads, &cpumask, &thread_params);
+
+ /* Go! */
+ printf("\n= Starting reassembly...\n");
+ odp_barrier_wait(&barrier);
+
+ /* Wait for all threads to complete and output statistics */
+ odph_odpthreads_join(threads);
+ for (i = 0; i < num_workers; ++i)
+ printf("=== Thread %02d processed %3d fragments\n", i,
+ thread_stats[i].frags);
+
+ /* Dequeue the reassembled packets */
+ for (reassembled = 0; (ev = odp_queue_deq(reassembled_pkts)) !=
+ ODP_EVENT_INVALID; ++reassembled) {
+ assert(reassembled < NUM_PACKETS);
+ assert(odp_event_type(ev) == ODP_EVENT_PACKET);
+ dequeued_pkts[reassembled] = odp_packet_from_event(ev);
+ }
+
+ /* Check reassembled packets against the originals */
+ printf("\n= Checking reassembled packets...\n");
+ for (i = 0; i < reassembled; ++i) {
+ int j = -1;
+ int k;
+ odp_packet_t packet = dequeued_pkts[i];
+ uint32_t len = odp_packet_len(packet);
+ odph_ipv4hdr_t hdr;
+ odph_ipv4hdr_t reassembled_hdr;
+
+ reassembled_hdr = *(odph_ipv4hdr_t *)odp_packet_data(packet);
+ for (k = 0; k < reassembled; ++k) {
+ hdr = *(odph_ipv4hdr_t *)odp_packet_data(orig_pkts[k]);
+ if (hdr.src_addr == reassembled_hdr.src_addr &&
+ hdr.dst_addr == reassembled_hdr.dst_addr &&
+ hdr.id == reassembled_hdr.id &&
+ hdr.proto == reassembled_hdr.proto) {
+ assert(j < 0);
+ j = k;
+ }
+ }
+ assert(j >= 0);
+
+ assert(odp_packet_is_valid(packet));
+ assert(len == odp_packet_len(orig_pkts[j]));
+ assert(!packet_memcmp(orig_pkts[j], packet, 0, 0, len));
+ }
+ printf("=== Successfully reassembled %d of %d packets\n", reassembled,
+ NUM_PACKETS);
+ assert(reassembled == NUM_PACKETS);
+ printf("\n= Complete!\n");
+
+ /* Free packets */
+ for (i = 0; i < reassembled; ++i)
+ odp_packet_free(dequeued_pkts[i]);
+ for (i = 0; i < NUM_PACKETS; ++i)
+ odp_packet_free(orig_pkts[i]);
+ garbage_collect_fraglists(fraglists, FRAGLISTS, reassembled_pkts, 1);
+
+ /* ODP cleanup and termination */
+ assert(!odp_queue_destroy(fragments));
+ assert(!odp_queue_destroy(reassembled_pkts));
+ assert(!odp_shm_free(shm));
+ if (odp_pool_destroy(fragment_pool)) {
+ fprintf(stderr,
+ "ERROR: fragment_pool destruction failed\n");
+ return 1;
+ }
+ if (odp_term_local()) {
+ fprintf(stderr, "ERROR: odp_term_local\n");
+ return 1;
+ }
+ if (odp_term_global(instance)) {
+ fprintf(stderr, "ERROR: odp_term_global\n");
+ return 1;
+ }
+
+ return 0;
+}
diff --git a/example/ipfragreass/odp_ipfragreass_atomics.h b/example/ipfragreass/odp_ipfragreass_atomics.h
new file mode 100644
index 00000000..691978e5
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_atomics.h
@@ -0,0 +1,55 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_FRAGREASS_PP_ATOMICS_H_
+#define ODP_FRAGREASS_PP_ATOMICS_H_
+
+#include <example_debug.h>
+
+#if __SIZEOF_POINTER__ == 4
+/**
+ * A wrapper function to perform a 64-bit "strong" atomic compare and swap
+ * (CAS) operation. This generic version of the function is used if an
+ * architecture-specific (e.g. lockless) variant is not specified.
+ *
+ * @param var The location at which the CAS should take place
+ * @param exp A pointer to the expected value
+ * @param neu A pointer to the new value to be written on success
+ * @param mo_success The memory order on success
+ * @param mo_failure The memory order on failure
+ *
+ * @return Whether the operation succeeded
+ */
+static inline bool atomic_strong_cas_dblptr(uint64_t *var, uint64_t *exp,
+ uint64_t neu, int mo_success,
+ int mo_failure)
+{
+ return __atomic_compare_exchange_n(var, exp, neu, 0, mo_success,
+ mo_failure);
+}
+#elif __SIZEOF_POINTER__ == 8
+/**
+ * A wrapper function to perform a 128-bit "strong" atomic compare and swap
+ * (CAS) operation. This generic version of the function is used if an
+ * architecture-specific (e.g. lockless) variant is not specified.
+ *
+ * @param var The location at which the CAS should take place
+ * @param exp A pointer to the expected value
+ * @param neu A pointer to the new value to be written on success
+ * @param mo_success The memory order on success
+ * @param mo_failure The memory order on failure
+ *
+ * @return Whether the operation succeeded
+ */
+static inline bool atomic_strong_cas_dblptr(__int128 *var, __int128 *exp,
+ __int128 neu, int mo_success,
+ int mo_failure)
+{
+ return __atomic_compare_exchange_n(var, exp, neu, 0, mo_success,
+ mo_failure);
+}
+#endif
+#endif
diff --git a/example/ipfragreass/odp_ipfragreass_atomics_arm.h b/example/ipfragreass/odp_ipfragreass_atomics_arm.h
new file mode 100644
index 00000000..99c37a77
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_atomics_arm.h
@@ -0,0 +1,120 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_FRAGREASS_PP_ATOMICS_ARM_H_
+#define ODP_FRAGREASS_PP_ATOMICS_ARM_H_
+
+#include <example_debug.h>
+
+#if __SIZEOF_POINTER__ == 8 && defined(__aarch64__)
+static inline __int128 lld(__int128 *var, int mo)
+{
+ __int128 old;
+
+ if (mo == __ATOMIC_ACQUIRE)
+ __asm__ volatile("ldaxp %0, %H0, [%1]" : "=&r" (old)
+ : "r" (var) : "memory");
+ else /* mo == __ATOMIC_RELAXED */
+ __asm__ volatile("ldxp %0, %H0, [%1]" : "=&r" (old)
+ : "r" (var) : );
+ return old;
+}
+
+static inline uint32_t scd(__int128 *var, __int128 neu, int mo)
+{
+ uint32_t ret;
+
+ if (mo == __ATOMIC_RELEASE)
+ __asm__ volatile("stlxp %w0, %1, %H1, [%2]" : "=&r" (ret)
+ : "r" (neu), "r" (var) : "memory");
+ else /* mo == __ATOMIC_RELAXED */
+ __asm__ volatile("stxp %w0, %1, %H1, [%2]" : "=&r" (ret)
+ : "r" (neu), "r" (var) : );
+ return ret;
+}
+
+static inline bool atomic_strong_cas_dblptr(__int128 *var, __int128 *exp,
+ __int128 neu, int mo_success,
+ int mo_failure EXAMPLE_UNUSED)
+{
+ register __int128 old;
+ register __int128 expected = *exp;
+ int ll_mo, sc_mo;
+
+ ll_mo = (mo_success != __ATOMIC_RELAXED &&
+ mo_success != __ATOMIC_RELEASE) ? __ATOMIC_ACQUIRE
+ : __ATOMIC_RELAXED;
+ sc_mo = (mo_success == __ATOMIC_RELEASE ||
+ mo_success == __ATOMIC_ACQ_REL ||
+ mo_success == __ATOMIC_SEQ_CST) ? __ATOMIC_RELEASE
+ : __ATOMIC_RELAXED;
+
+ /*
+ * To prevent spurious failures and ensure atomicity, we must write some
+ * value back -- whether it's the value we wanted to write, or the value
+ * that is currently there. Repeat until we perform a successful write.
+ */
+ do {
+ old = lld(var, ll_mo);
+ } while (scd(var, old == expected ? neu : old, sc_mo));
+
+ *exp = old;
+ return (old == expected);
+}
+#elif __SIZEOF_POINTER__ == 4 && defined(__ARM_ARCH) && __ARM_ARCH == 7
+static inline uint64_t lld(uint64_t *var, int mo)
+{
+ uint64_t old;
+
+ __asm__ volatile("ldrexd %0, %H0, [%1]" : "=&r" (old) : "r" (var) : );
+ if (mo == __ATOMIC_ACQUIRE)
+ __asm__ volatile("dmb ish" ::: "memory");
+ return old;
+}
+
+static inline uint32_t scd(uint64_t *var, uint64_t neu, int mo)
+{
+ uint32_t ret;
+
+ if (mo == __ATOMIC_RELEASE)
+ __asm__ volatile("dmb ish" ::: "memory");
+ __asm__ volatile("strexd %0, %1, %H1, [%2]" : "=&r" (ret)
+ : "r" (neu), "r" (var) : );
+ return ret;
+}
+
+static inline bool atomic_strong_cas_dblptr(uint64_t *var, uint64_t *exp,
+ uint64_t neu, int mo_success,
+ int mo_failure EXAMPLE_UNUSED)
+{
+ register uint64_t old;
+ register uint64_t expected = *exp;
+ int ll_mo, sc_mo;
+
+ ll_mo = (mo_success != __ATOMIC_RELAXED &&
+ mo_success != __ATOMIC_RELEASE) ? __ATOMIC_ACQUIRE
+ : __ATOMIC_RELAXED;
+ sc_mo = (mo_success == __ATOMIC_RELEASE ||
+ mo_success == __ATOMIC_ACQ_REL ||
+ mo_success == __ATOMIC_SEQ_CST) ? __ATOMIC_RELEASE
+ : __ATOMIC_RELAXED;
+
+ /*
+ * To prevent spurious failures and ensure atomicity, we must write some
+ * value back -- whether it's the value we wanted to write, or the value
+ * that is currently there. Repeat until we perform a successful write.
+ */
+ do {
+ old = lld(var, ll_mo);
+ } while (scd(var, old == expected ? neu : old, sc_mo));
+
+ *exp = old;
+ return (old == expected);
+}
+#else
+#include "odp_ipfragreass_atomics.h"
+#endif
+#endif
diff --git a/example/ipfragreass/odp_ipfragreass_fragment.c b/example/ipfragreass/odp_ipfragreass_fragment.c
new file mode 100644
index 00000000..b2fe6ad2
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_fragment.c
@@ -0,0 +1,99 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "odp_ipfragreass_ip.h"
+#include "odp_ipfragreass_fragment.h"
+
+int fragment_ipv4_packet(odp_packet_t orig_packet, odp_packet_t *out,
+ int *out_len)
+{
+ int fragments = 0;
+ odp_bool_t first_fragment = 1;
+ odph_ipv4hdr_t *orig_header = odp_packet_data(orig_packet);
+ uint32_t header_len = ipv4hdr_ihl(*orig_header);
+ uint32_t orig_len = odp_packet_len(orig_packet);
+ uint32_t bytes_remaining = orig_len - header_len;
+ uint32_t frag_offset = 0;
+ odp_packet_t frag = orig_packet;
+ odp_packet_t rest = ODP_PACKET_INVALID;
+
+ if (bytes_remaining <= MTU)
+ return -1;
+
+ /*
+ * The main fragmentation loop (continue until all bytes from the
+ * original payload have been assigned to a fragment)
+ */
+ while (bytes_remaining) {
+ odph_ipv4hdr_t *header;
+ uint32_t frag_len;
+
+ frag_len = (bytes_remaining > MTU ? (MTU + header_len)
+ : (bytes_remaining
+ + header_len));
+ bytes_remaining -= (frag_len - header_len);
+ if (bytes_remaining) {
+ uint32_t split_point;
+ int split_success;
+
+ split_point = first_fragment ? (frag_len)
+ : (frag_len - header_len);
+ split_success = odp_packet_split(&frag, split_point,
+ &rest);
+ if (split_success < 0) {
+ fprintf(stderr,
+ "ERROR: odp_packet_split\n");
+ return -1;
+ } else if (first_fragment && split_success > 0) {
+ orig_header = odp_packet_data(frag);
+ }
+ }
+
+ /* Add a header to the packet if necessary */
+ if (first_fragment) {
+ first_fragment = 0;
+ } else {
+ if (odp_packet_extend_head(&frag, header_len, NULL,
+ NULL) < 0) {
+ fprintf(stderr,
+ "ERROR: odp_packet_extend_head\n");
+ return -1;
+ }
+ if (odp_packet_copy_from_mem(frag, 0, header_len,
+ orig_header)) {
+ fprintf(stderr,
+ "ERROR: odp_packet_copy_from_mem\n");
+ return -1;
+ }
+ }
+
+ /* Update the header */
+ header = odp_packet_data(frag);
+ ipv4hdr_set_more_fragments(header, bytes_remaining != 0);
+ header->tot_len = odp_cpu_to_be_16(frag_len);
+ ipv4hdr_set_fragment_offset_oct(header, (frag_offset / 8));
+ assert((bytes_remaining == 0) ||
+ (odp_packet_len(frag) == (MTU + header_len)));
+ assert((bytes_remaining != 0) ||
+ (ipv4hdr_reass_payload_len(*header) + header_len
+ == orig_len));
+ odp_packet_l3_offset_set(frag, 0);
+ header->chksum = 0;
+ odph_ipv4_csum_update(frag);
+
+ out[fragments++] = frag;
+ frag = rest;
+ frag_offset += (frag_len - header_len);
+ }
+
+ if (out_len)
+ *out_len = fragments;
+
+ return 0;
+}
diff --git a/example/ipfragreass/odp_ipfragreass_fragment.h b/example/ipfragreass/odp_ipfragreass_fragment.h
new file mode 100644
index 00000000..f497fad7
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_fragment.h
@@ -0,0 +1,28 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_FRAGREASS_PP_FRAG_H_
+#define ODP_FRAGREASS_PP_FRAG_H_
+
+#include <odp/helper/ip.h>
+
+#define MTU 1480 /**< IPv4 payload MTU */
+
+ODP_STATIC_ASSERT(!(MTU % 8), "ODPFRAG_MTU__SIZE_ERROR");
+
+/**
+ * Break apart a larger-than-MTU packet into smaller IPv4 fragments
+ *
+ * @param orig_packet The larger-than-MTU packet to fragment
+ * @param[out] out The packet buffer to write fragments out to
+ * @param[out] out_len The number of fragments produced
+ *
+ * @return 0 on success, -1 otherwise
+ */
+int fragment_ipv4_packet(odp_packet_t orig_packet, odp_packet_t *out,
+ int *out_len);
+
+#endif
diff --git a/example/ipfragreass/odp_ipfragreass_helpers.c b/example/ipfragreass/odp_ipfragreass_helpers.c
new file mode 100644
index 00000000..e8d89b97
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_helpers.c
@@ -0,0 +1,124 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <assert.h>
+#include <arpa/inet.h>
+
+#include "odp_ipfragreass_helpers.h"
+#include "odp_ipfragreass_ip.h"
+
+#define IP_SRC_ADDR 0xC0A80001 /* 192.168.0.1 */
+#define IP_DST_ADDR 0xC0A80002 /* 192.168.0.2 */
+
+static void set_random_payload(odp_packet_t packet, uint32_t payload_offset,
+ uint32_t size)
+{
+ uint32_t i, j;
+ uint32_t bytes_remaining;
+ unsigned char *buffer;
+ unsigned char seed = rand() % (UINT8_MAX + 1);
+
+ /*
+ * Set the payload to a run of consecutive numbers from a random seed.
+ * Not completely random as some structure is good for debugging.
+ */
+ for (i = 0; i < size; ++i) {
+ buffer = odp_packet_offset(packet, payload_offset + i,
+ &bytes_remaining, NULL);
+ for (j = 0; i < size && j < bytes_remaining; ++j, ++i)
+ buffer[j] = (unsigned char)(seed + i);
+ }
+}
+
+odp_packet_t pack_udp_ipv4_packet(odp_pool_t pool, odp_u16be_t ip_id,
+ uint32_t max_size, uint32_t min_size)
+{
+ odp_packet_t result;
+ unsigned char *buffer;
+ odph_ipv4hdr_t *header;
+ uint32_t size;
+ uint32_t header_len;
+ uint32_t header_len_words;
+
+ size = (rand() % (max_size - min_size)) + min_size;
+ result = odp_packet_alloc(pool, size);
+ if (result == ODP_PACKET_INVALID)
+ return ODP_PACKET_INVALID;
+ odp_packet_ts_set(result, odp_time_global());
+
+ /* Set the IPv4 header */
+ header_len_words = (rand() % (IP_IHL_MAX - IP_IHL_MIN + 1));
+ header_len_words += IP_IHL_MIN;
+ header_len = WORDS_TO_BYTES(header_len_words);
+ assert(header_len >= IP_HDR_LEN_MIN && header_len <= IP_HDR_LEN_MAX);
+ odp_packet_l3_offset_set(result, 0);
+ odp_packet_has_ipv4_set(result, 1);
+ buffer = odp_packet_data(result);
+ header = (odph_ipv4hdr_t *)buffer;
+ ipv4hdr_init(header);
+ header->id = odp_cpu_to_be_16(ip_id);
+ header->proto = ODPH_IPPROTO_UDP;
+ header->src_addr = odp_cpu_to_be_32(IP_SRC_ADDR);
+ header->dst_addr = odp_cpu_to_be_32(IP_DST_ADDR);
+ ipv4hdr_set_ihl_words(header, header_len_words);
+ ipv4hdr_set_payload_len(header, size - header_len);
+ header->chksum = 0;
+ odph_ipv4_csum_update(result);
+
+ /* Set the payload */
+ size -= header_len;
+ set_random_payload(result, header_len, size);
+
+ return result;
+}
+
+void shuffle(odp_packet_t *packets, int num_packets)
+{
+ int i;
+
+ if (num_packets <= 1)
+ return;
+
+ for (i = 0; i < num_packets; ++i) {
+ odp_packet_t tmp = packets[i];
+ int j = rand() % num_packets;
+
+ packets[i] = packets[j];
+ packets[j] = tmp;
+ }
+}
+
+int packet_memcmp(odp_packet_t a, odp_packet_t b, uint32_t offset_a,
+ uint32_t offset_b, uint32_t length)
+{
+ uint32_t i = 0;
+ void *data_a, *data_b;
+
+ while (i < length) {
+ int status;
+ uint32_t bytes_remaining_a;
+ uint32_t bytes_remaining_b;
+ uint32_t bytes_remaining;
+
+ data_a = odp_packet_offset(a, offset_a + i, &bytes_remaining_a,
+ NULL);
+ data_b = odp_packet_offset(b, offset_b + i, &bytes_remaining_b,
+ NULL);
+ bytes_remaining = min(bytes_remaining_a, bytes_remaining_b);
+ bytes_remaining = min(bytes_remaining, length - i);
+ assert(bytes_remaining != 0 && data_a && data_b);
+
+ status = memcmp(data_a, data_b, bytes_remaining);
+ if (status != 0)
+ return status;
+ i += bytes_remaining;
+ }
+
+ return 0;
+}
diff --git a/example/ipfragreass/odp_ipfragreass_helpers.h b/example/ipfragreass/odp_ipfragreass_helpers.h
new file mode 100644
index 00000000..ffb3bfb7
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_helpers.h
@@ -0,0 +1,79 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_FRAGREASS_PP_HELPERS_H_
+#define ODP_FRAGREASS_PP_HELPERS_H_
+
+#include <odp/helper/ip.h>
+
+#if defined(__ARM_ARCH)
+#include "odp_ipfragreass_atomics_arm.h"
+#else
+#include "odp_ipfragreass_atomics.h"
+#endif
+
+/**
+ * Generate a random IPv4 UDP packet from the specified parameters
+ *
+ * @param pool The pool used to allocate the packet
+ * @param ip_id The IP ID of the packet to be generated
+ * @param max_size The maximum size of the generated packet
+ * @param min_size The minimum size of the generated packet
+ *
+ * @return A handle to the generated packet
+ */
+odp_packet_t pack_udp_ipv4_packet(odp_pool_t pool, odp_u16be_t ip_id,
+ uint32_t max_size, uint32_t min_size);
+
+/**
+ * Roughly perform a random shuffle on an array of packets
+ *
+ * @param packets A pointer to the packets to shuffle
+ * @param num_packets The number of packets in the array
+ */
+void shuffle(odp_packet_t *packets, int num_packets);
+
+/**
+ * Compare the contents of two packets
+ *
+ * @param a The first packet to compare
+ * @param b The second packet to compare
+ * @param offset_a The offset in the first packet to begin comparing at
+ * @param offset_b The offset in the second packet to begin comparing at
+ * @param length The number of bytes to compare
+ *
+ * @return Returns the same values as memcmp (0 if both packets are equal)
+ */
+int packet_memcmp(odp_packet_t a, odp_packet_t b, uint32_t offset_a,
+ uint32_t offset_b, uint32_t length);
+
+/**
+ * Get the smallest of two uint32_t values
+ *
+ * @param a The first value
+ * @param b The second value
+ *
+ * @return The smallest of the two input values
+ */
+static inline uint32_t min(uint32_t a, uint32_t b)
+{
+ return a < b ? a : b;
+}
+
+/**
+ * Get the largest of two uint32_t values
+ *
+ * @param a The first value
+ * @param b The second value
+ *
+ * @return The largest of the two input values
+ */
+static inline uint32_t max(uint32_t a, uint32_t b)
+{
+ return a > b ? a : b;
+}
+
+#endif
diff --git a/example/ipfragreass/odp_ipfragreass_ip.h b/example/ipfragreass/odp_ipfragreass_ip.h
new file mode 100644
index 00000000..e7281e5a
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_ip.h
@@ -0,0 +1,251 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_FRAGREASS_PP_IP_H_
+#define ODP_FRAGREASS_PP_IP_H_
+
+#include <odp/helper/ip.h>
+
+#define IP_HDR_LEN_MIN ODPH_IPV4HDR_LEN
+#define IP_HDR_LEN_MAX 60
+#define IP_IHL_MIN ODPH_IPV4HDR_IHL_MIN
+#define IP_IHL_MAX 15
+#define IP_OCTET_MAX ((1U << 14U) - 1U) /* 65535 bytes, 8192 octs, 14 bits */
+#define IP_FRAGOFF_MAX 8192 /* 13 bits */
+
+#define IP_FRAG_RESV 0x8000 /**< "Reserved" fragment flag (must be zero) */
+#define IP_FRAG_DONT 0x4000 /**< "Don't Fragment" (DF) fragment flag */
+#define IP_FRAG_MORE 0x2000 /**< "More Fragments" (MF) fragment flag */
+#define IP_FRAG_MASK 0x1fff /**< "Fragment Offset" mask */
+
+#define BYTES_TO_OCTS(bytes) (((bytes) + 7U) / 8U)
+#define OCTS_TO_BYTES(bytes) ((bytes) * 8)
+#define WORDS_TO_BYTES(words) ((words) * 4)
+
+/**
+ * Initialise an IPv4 header structure
+ *
+ * @param h A pointer to the header structure to initialise
+ */
+static inline void ipv4hdr_init(odph_ipv4hdr_t *h)
+{
+ h->ver_ihl = 0x45; /* IHL of 5, Version of 4 [0x45 = 0100 0101] */
+ h->tos = 0;
+ h->tot_len = odp_cpu_to_be_16(IP_HDR_LEN_MIN);
+ h->frag_offset = 0;
+ h->ttl = UINT8_MAX;
+ h->chksum = 0;
+}
+
+/**
+ * Get the Internet Header Length (IHL) of an IPv4 header in words
+ *
+ * @param h The header to get the IHL of
+ *
+ * @return The IHL of "h" in words
+ */
+static inline uint8_t ipv4hdr_ihl_words(odph_ipv4hdr_t h)
+{
+ return ODPH_IPV4HDR_IHL(h.ver_ihl);
+}
+
+/**
+ * Get the Internet Header Length (IHL) of an IPv4 header in bytes
+ *
+ * @param h The header to get the IHL of
+ *
+ * @return The IHL of "h" in bytes
+ */
+static inline uint8_t ipv4hdr_ihl(odph_ipv4hdr_t h)
+{
+ return WORDS_TO_BYTES(ipv4hdr_ihl_words(h));
+}
+
+/**
+ * Set the Internet Header Length (IHL) of an IPv4 header in words
+ *
+ * @param h A pointer to the header to set the IHL of
+ * @param ihl The new IHL in words
+ */
+static inline void ipv4hdr_set_ihl_words(odph_ipv4hdr_t *h, uint8_t ihl)
+{
+ h->ver_ihl = (ODPH_IPV4HDR_VER(h->ver_ihl) << 4)
+ | ODPH_IPV4HDR_IHL(ihl);
+}
+
+/**
+ * Check whether the "Don't Fragment" (DF) flag is set in an IPv4 header
+ *
+ * @param h The header to check the DF flag of
+ *
+ * @return Whether the DF flag is set
+ */
+static inline bool ipv4hdr_dont_fragment(odph_ipv4hdr_t h)
+{
+ return (h.frag_offset & odp_cpu_to_be_16(IP_FRAG_DONT));
+}
+
+/**
+ * Set the "Don't Fragment" (DF) flag of an IPv4 header
+ *
+ * @param h A pointer to the header to set the DF of
+ * @param df Whether the DF flag should be set or unset
+ */
+static inline void ipv4hdr_set_dont_fragment(odph_ipv4hdr_t *h, bool df)
+{
+ if (df)
+ h->frag_offset |= odp_cpu_to_be_16(IP_FRAG_DONT);
+ else
+ h->frag_offset &= ~odp_cpu_to_be_16(IP_FRAG_DONT);
+}
+
+/**
+ * Check whether the "More Fragments" (MF) flag is set in an IPv4 header
+ *
+ * @param h The header to check the MF flag of
+ *
+ * @return Whether the MF flag is set
+ */
+static inline bool ipv4hdr_more_fragments(odph_ipv4hdr_t h)
+{
+ return (h.frag_offset & odp_cpu_to_be_16(IP_FRAG_MORE));
+}
+
+/**
+ * Set the "More Fragments" (MF) flag of an IPv4 header
+ *
+ * @param h A pointer to the header to set the MF of
+ * @param mf Whether the MF flag should be set or unset
+ */
+static inline void ipv4hdr_set_more_fragments(odph_ipv4hdr_t *h, bool mf)
+{
+ if (mf)
+ h->frag_offset |= odp_cpu_to_be_16(IP_FRAG_MORE);
+ else
+ h->frag_offset &= ~odp_cpu_to_be_16(IP_FRAG_MORE);
+}
+
+/**
+ * Check whether an IPv4 header represents an IPv4 fragment or not
+ *
+ * @param h The header to check
+ *
+ * @return Whether "h" is the header of an IPv4 fragment or not
+ */
+static inline bool ipv4hdr_is_fragment(odph_ipv4hdr_t h)
+{
+ return (h.frag_offset & odp_cpu_to_be_16(IP_FRAG_MORE | IP_FRAG_MASK));
+}
+
+/**
+ * Get the fragment offset of an IPv4 header in octets
+ *
+ * @param h The header to get the fragment offset of
+ *
+ * @return The fragment offset of "h" in octets
+ */
+static inline uint16_t ipv4hdr_fragment_offset_oct(odph_ipv4hdr_t h)
+{
+ return (odp_be_to_cpu_16(h.frag_offset) & IP_FRAG_MASK);
+}
+
+/**
+ * Set the fragment offset of an IPv4 header in octets
+ *
+ * @param h A pointer to the header to set the fragment offset of
+ * @param offset The new fragment offset in octets
+ */
+static inline void ipv4hdr_set_fragment_offset_oct(odph_ipv4hdr_t *h,
+ uint16_t offset)
+{
+ h->frag_offset = odp_cpu_to_be_16((odp_be_to_cpu_16(h->frag_offset)
+ & ~IP_FRAG_MASK) | offset);
+}
+
+/**
+ * Get the payload length of an IPv4 header in bytes
+ *
+ * @param h The header to get the payload length of
+ *
+ * @return The payload length of "h" in bytes
+ */
+static inline uint16_t ipv4hdr_payload_len(odph_ipv4hdr_t h)
+{
+ uint32_t packet_len = odp_be_to_cpu_16(h.tot_len);
+ uint32_t header_size = ipv4hdr_ihl(h);
+
+ return (uint16_t)(packet_len >= header_size ? (packet_len - header_size)
+ : 0);
+}
+
+/**
+ * Get the payload length of an IPv4 header in octets
+ *
+ * @param h The header to get the payload length of
+ *
+ * @return The payload length of "h" in octets
+ */
+static inline uint16_t ipv4hdr_payload_len_oct(odph_ipv4hdr_t h)
+{
+ return BYTES_TO_OCTS(ipv4hdr_payload_len(h));
+}
+
+/**
+ * Set the payload length of an IPv4 header in bytes
+ *
+ * @param h A pointer to the header to set the payload length of
+ * @param len The new payload length in bytes
+ */
+static inline void ipv4hdr_set_payload_len(odph_ipv4hdr_t *h, uint16_t len)
+{
+ h->tot_len = odp_cpu_to_be_16(len + ipv4hdr_ihl(*h));
+}
+
+/**
+ * Get the upper bound length in bytes of the reassembled payload that this
+ * fragment contributes to from an IPv4 header
+ *
+ * If this is called with the final fragment in a series, the exact length of
+ * the reassembled payload is computed. Otherwise, UINT16_MAX is returned.
+ *
+ * @param h The header to get the reassembled payload length from
+ *
+ * @return The upper bound for the reassembled payload length of "h" in bytes
+ */
+static inline uint16_t ipv4hdr_reass_payload_len(odph_ipv4hdr_t h)
+{
+ uint16_t fragment_offset_oct;
+
+ if (ipv4hdr_more_fragments(h))
+ return UINT16_MAX;
+
+ fragment_offset_oct = ipv4hdr_fragment_offset_oct(h);
+ return OCTS_TO_BYTES(fragment_offset_oct) + ipv4hdr_payload_len(h);
+}
+
+/**
+ * Get the upper bound length in octets of the reassembled payload that this
+ * fragment contributes to from an IPv4 header
+ *
+ * If this is called with the final fragment in a series, the exact length of
+ * the reassembled payload is computed. Otherwise, IP_OCTET_MAX is returned.
+ *
+ * @param h The header to estimate the reassembled payload length from
+ *
+ * @return The estimate for the reassembled payload length of "h" in octets
+ */
+static inline uint16_t ipv4hdr_reass_payload_len_oct(odph_ipv4hdr_t h)
+{
+ uint16_t fragment_offset_oct;
+
+ if (ipv4hdr_more_fragments(h))
+ return IP_OCTET_MAX;
+
+ fragment_offset_oct = ipv4hdr_fragment_offset_oct(h);
+ return fragment_offset_oct + ipv4hdr_payload_len_oct(h);
+}
+
+#endif
diff --git a/example/ipfragreass/odp_ipfragreass_reassemble.c b/example/ipfragreass/odp_ipfragreass_reassemble.c
new file mode 100644
index 00000000..fd1618f5
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_reassemble.c
@@ -0,0 +1,771 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#include "odp_ipfragreass_reassemble.h"
+#include "odp_ipfragreass_helpers.h"
+
+#define ROT(x, k) (((x) << (k)) | ((x) >> (32 - (k))))
+
+/**
+ * Check whether two packets have the same flow (src/dst/id/proto)
+ *
+ * @param current The first packet to compare
+ * @param frag The second packet to compare
+ *
+ * @return true if the flows match, false otherwise
+ */
+static inline odp_bool_t equal_flow(struct packet *current, struct packet *frag)
+{
+ odph_ipv4hdr_t *curr_h = odp_packet_data(current->handle);
+ odph_ipv4hdr_t *frag_h = odp_packet_data(frag->handle);
+
+ return (memcmp(&curr_h->src_addr, &frag_h->src_addr,
+ sizeof(curr_h->src_addr) + sizeof(curr_h->dst_addr))
+ == 0 &&
+ curr_h->id == frag_h->id &&
+ curr_h->proto == frag_h->proto);
+}
+
+/**
+ * Check whether one packet has a "later" flow than another
+ *
+ * @param current The first packet to compare
+ * @param frag The second packet to compare
+ *
+ * @return true if the first packet's flow is later, false otherwise
+ */
+static inline odp_bool_t later_flow(struct packet *current, struct packet *frag)
+{
+ odph_ipv4hdr_t *curr_h = odp_packet_data(current->handle);
+ odph_ipv4hdr_t *frag_h = odp_packet_data(frag->handle);
+
+ return (memcmp(&curr_h->src_addr, &frag_h->src_addr,
+ sizeof(curr_h->src_addr) + sizeof(curr_h->dst_addr))
+ > 0 ||
+ curr_h->id > frag_h->id ||
+ curr_h->proto > frag_h->proto);
+}
+
+/**
+ * Find the earliest of two fraglist timestamps, considering a "now" timestamp
+ *
+ * @param a The first timestamp
+ * @param b The second timestamp
+ * @param now A timestamp indication of the time "now"
+ *
+ * @return The earliest of the first and second timestamps
+ */
+static inline struct flts earliest(struct flts a, struct flts b,
+ struct flts now)
+{
+ struct flts result;
+ struct flts elapsed_a;
+ struct flts elapsed_b;
+
+ now.t += TS_NOW_TOLERANCE;
+ elapsed_a.t = now.t - a.t;
+ elapsed_b.t = now.t - b.t;
+ result.t = now.t - max(elapsed_a.t, elapsed_b.t);
+ return result;
+}
+
+/**
+ * Hash the flow information within an IPv4 header
+ *
+ * @param hdr A pointer to the header to hash
+ *
+ * @return A hash of the src/dst/id/proto information in the header
+ */
+static inline uint32_t hash(odph_ipv4hdr_t *hdr)
+{
+ uint32_t a = hdr->src_addr;
+ uint32_t b = hdr->dst_addr;
+ uint32_t c = hdr->id << 16 | hdr->proto;
+
+ /* A degenerate 3x32-bit Jenkins hash */
+ c ^= b;
+ c -= ROT(b, 14);
+ a ^= c;
+ a -= ROT(c, 11);
+ b ^= a;
+ b -= ROT(a, 25);
+ c ^= b;
+ c -= ROT(b, 16);
+ a ^= c;
+ a -= ROT(c, 4);
+ b ^= a;
+ b -= ROT(a, 14);
+ c ^= b;
+ c -= ROT(b, 24);
+ return c;
+}
+
+/**
+ * Check whether one fragment is "later" than another, considering a timestamp
+ * of "now"
+ *
+ * This definition of "later" relies firstly on flow, then on the endpoint of
+ * the fragment, then on the fragment offset, then on arrival time.
+ *
+ * @param a The first fragment to compare
+ * @param b The second fragment to compare
+ * @param now A timestamp indication of the time "now"
+ *
+ * @return true if the first fragment is "later", false otherwise
+ */
+static inline odp_bool_t later_fragment(struct packet *a, struct packet *b,
+ struct flts now)
+{
+ odph_ipv4hdr_t hdr_a = *(odph_ipv4hdr_t *)odp_packet_data(a->handle);
+ odph_ipv4hdr_t hdr_b = *(odph_ipv4hdr_t *)odp_packet_data(b->handle);
+ uint32_t offset_a = ipv4hdr_fragment_offset_oct(hdr_a);
+ uint32_t offset_b = ipv4hdr_fragment_offset_oct(hdr_b);
+ uint32_t payload_len_a = ipv4hdr_payload_len(hdr_a);
+ uint32_t payload_len_b = ipv4hdr_payload_len(hdr_b);
+ uint32_t endpoint_a = OCTS_TO_BYTES(offset_a) + payload_len_a;
+ uint32_t endpoint_b = OCTS_TO_BYTES(offset_b) + payload_len_b;
+
+ if (later_flow(a, b)) {
+ return 1;
+ } else if (equal_flow(a, b)) {
+ if (endpoint_a > endpoint_b) {
+ return 1;
+ } else if (endpoint_a == endpoint_b) {
+ if (offset_a < offset_b) {
+ return 1;
+ } else if (offset_a == offset_b) {
+ return b->arrival.t == earliest(a->arrival,
+ b->arrival,
+ now).t;
+ }
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * Attempt to extract a whole packet from a list of sorted fragments
+ *
+ * If a complete packet is formed, its tail pointer is returned, and the tail
+ * pointer for the remaining packets is written out to remaining_packets.
+ *
+ * @param[in] tail The tail of the list of fragments to parse
+ * @param[out] remaining_packets The pointer to any remaining packets
+ * @param[out] made_changes Whether any changes were made to the fragments
+ *
+ * @return The tail pointer of any reassembled packet, or NULL otherwise
+ */
+static struct packet *extract_complete_packet(struct packet *tail,
+ struct packet **remaining_packets,
+ int *made_changes)
+{
+ /*
+ * Iterate through the flows in this fragment list (until a packet is
+ * reassembled).
+ */
+ while (tail) {
+ /*
+ * Work backwards through the fragments in a single flow,
+ * attempting to glue together a whole packet. Upon finding a
+ * discontinuity, break out of the loop for this flow and try
+ * the next (if there is one).
+ */
+ struct packet *current = tail;
+ odph_ipv4hdr_t tail_hdr;
+ uint16_t final_frag_offset;
+ uint16_t expected_frag_offset;
+
+ tail_hdr = *(odph_ipv4hdr_t *)odp_packet_data(tail->handle);
+ final_frag_offset = ipv4hdr_fragment_offset_oct(tail_hdr);
+ expected_frag_offset = final_frag_offset;
+ while (current) {
+ odph_ipv4hdr_t curr_hdr;
+ uint16_t curr_offset_oct;
+ odp_bool_t final_fragment;
+ struct packet *prev;
+ void *tmp;
+ odph_ipv4hdr_t prev_hdr;
+ uint16_t prev_off_oct;
+ uint16_t prev_oct;
+
+ tmp = odp_packet_data(current->handle);
+ curr_hdr = *(odph_ipv4hdr_t *)tmp;
+ curr_offset_oct = ipv4hdr_fragment_offset_oct(curr_hdr);
+ final_fragment = (curr_offset_oct == final_frag_offset);
+
+ /*
+ * If the final fragment in the chain has "More
+ * Fragments" set, it's not the final packet of the
+ * datagram as a whole.
+ */
+ if (final_fragment && ipv4hdr_more_fragments(curr_hdr))
+ break;
+
+ /*
+ * If this is the first fragment in a chain, we may have
+ * completed the reassembly of a whole packet.
+ */
+ prev = prev_packet(*current);
+ if (prev == NULL || !equal_flow(current, prev)) {
+ if (curr_offset_oct)
+ break;
+
+ /*
+ * Extract the complete packet from the list of
+ * remaining packets
+ */
+ if (remaining_packets)
+ *remaining_packets = prev;
+ set_prev_packet(current, NULL);
+ if (made_changes)
+ *made_changes = 1;
+ return tail;
+ }
+
+ /*
+ * Fragments should be consistent with those previously
+ * processed
+ */
+ tmp = odp_packet_data(prev->handle);
+ prev_hdr = *(odph_ipv4hdr_t *)tmp;
+ prev_off_oct = ipv4hdr_fragment_offset_oct(prev_hdr);
+ prev_oct = BYTES_TO_OCTS(ipv4hdr_payload_len(prev_hdr));
+ if (curr_offset_oct != prev_off_oct + prev_oct) {
+ if (prev_off_oct + prev_oct < curr_offset_oct) {
+ /*
+ * If there's no overlap, this is just a
+ * regular discontinuity
+ */
+ break;
+ }
+
+ /*
+ * Fragment duplication or overlap has occurred!
+ * We don't handle such occurrences in this
+ * simple example application.
+ */
+ assert(0);
+ break;
+ }
+
+ expected_frag_offset -= prev_oct;
+ current = prev;
+ }
+
+ /*
+ * Since we haven't had any luck finding a whole packet within
+ * this flow, let's try to look at other flows in this fraglist
+ * (if there are any others).
+ */
+ if (!current) {
+ tail = NULL;
+ break;
+ }
+
+ while (prev_packet(*current) &&
+ equal_flow(current, prev_packet(*current))) {
+ current = prev_packet(*current);
+ }
+ tail = prev_packet(*current);
+ remaining_packets = prev_packet_ptr(current);
+ }
+
+ return NULL;
+}
+
+/*
+ * Glue together a list of fragments sorted by fragment offset, writing the
+ * result to an output queue
+ *
+ * @param tail The tail pointer to the list of fragments to reassemble
+ * @param out The output queue to write the result to
+ *
+ * @return 0 on success, -1 otherwise
+ */
+static int send_packet(struct packet *tail, odp_queue_t out)
+{
+ struct packet result = *tail;
+ struct packet *current = prev_packet(result);
+ odph_ipv4hdr_t *header;
+ uint32_t length;
+
+ /*
+ * Reassemble the complete packet (working backwards from the last
+ * fragment)
+ */
+ while (current && equal_flow(current, &result)) {
+ struct packet new_result = *current;
+ int concat_success;
+
+ current = prev_packet(new_result);
+ header = odp_packet_data(result.handle);
+ odp_packet_pull_head(result.handle, ipv4hdr_ihl(*header));
+ concat_success = odp_packet_concat(&new_result.handle,
+ result.handle);
+ if (concat_success < 0) {
+ fprintf(stderr, "ERROR: odp_packet_concat\n");
+ return -1;
+ }
+ result = new_result;
+ }
+
+ /* Fix the header */
+ header = odp_packet_data(result.handle);
+ length = odp_packet_len(result.handle);
+ assert(length >= IP_HDR_LEN_MIN || length <= UINT16_MAX);
+ header->tot_len = odp_cpu_to_be_16(length);
+ ipv4hdr_set_more_fragments(header, 0);
+ ipv4hdr_set_fragment_offset_oct(header, 0);
+ header->chksum = 0;
+ odph_ipv4_csum_update(result.handle);
+
+ assert(odp_queue_enq(out, odp_packet_to_event(result.handle)) >= 0);
+ return 0;
+}
+
+/**
+ * Sort a fraglist using the "later_fragment" function
+ *
+ * @param fl A pointer to the fraglist to sort
+ * @param now A timestamp indication of the time "now"
+ */
+static void sort_fraglist(union fraglist *fl, struct flts now)
+{
+ struct packet *to_insert = fl->tail;
+
+ fl->tail = NULL;
+ while (to_insert) {
+ struct packet *to_insert_next = prev_packet(*to_insert);
+
+ if (fl->tail == NULL ||
+ later_fragment(to_insert, fl->tail, now)) {
+ set_prev_packet(to_insert, fl->tail);
+ fl->tail = to_insert;
+ } else {
+ struct packet *current = fl->tail;
+
+ while (prev_packet(*current) &&
+ later_fragment(prev_packet(*current), to_insert,
+ now)) {
+ current = prev_packet(*current);
+ }
+ set_prev_packet(to_insert, prev_packet(*current));
+ set_prev_packet(current, to_insert);
+ }
+ to_insert = to_insert_next;
+ }
+}
+
+/**
+ * Add a thread local fraglist to a shared fraglist
+ *
+ * @param fl Pointer to the shared fraglist to add "frags" to
+ * @param frags The thread local fraglist to add to "fl"
+ * @param frags_head Pointer to the head fragment of "frags"
+ * @param now A timestamp indication of the time "now"
+ * @param out The queue to which reassembled packets should be written
+ * @param dont_assemble Whether reassembly should be attempted by default
+ *
+ * @return The number of packets reassembled and sent to the output queue
+ */
+static int add_fraglist_to_fraglist(union fraglist *fl, union fraglist frags,
+ struct packet *frags_head, struct flts now,
+ odp_queue_t out, odp_bool_t dont_assemble)
+{
+ int reassembled = 0;
+
+ /*
+ * We may need to recursively call this function a number of times,
+ * keeping count of the total number of packets reassembled. Sadly,
+ * tail call optimisation doesn't seem to be working very well, so
+ * we're using good ol' fashioned GOTOs instead.
+ */
+redo:;
+ union fraglist oldfl;
+ union fraglist newfl;
+ union fraglist nullfl;
+ struct flts oldfl_earliest;
+ struct flts frags_earliest;
+
+ __atomic_load(&fl->half[0], &oldfl.half[0], __ATOMIC_RELAXED);
+ __atomic_load(&fl->half[1], &oldfl.half[1], __ATOMIC_RELAXED);
+
+ /*
+ * If we're updating a non-empty fraglist, we should always attempt
+ * reassembly!
+ */
+ if (oldfl.tail != NULL)
+ dont_assemble = 0;
+
+ /* Insert the new fragment(s) to the tail of the fraglist */
+ set_prev_packet(frags_head, oldfl.tail);
+ newfl.tail = frags.tail;
+
+ /*
+ * Update the fraglist variables (accumulating the length of the
+ * received pieces into "part_len", and updating the perceived 'true'
+ * length of the whole packet along with the timestamp of the earliest
+ * fragment in this list).
+ */
+ oldfl_earliest.t = oldfl.earliest;
+ frags_earliest.t = frags.earliest;
+ newfl.part_len = min(IP_OCTET_MAX, oldfl.part_len + frags.part_len);
+ newfl.whole_len = min(oldfl.whole_len, frags.whole_len);
+ newfl.earliest = (oldfl.tail == NULL ? frags.earliest
+ : earliest(oldfl_earliest,
+ frags_earliest,
+ now).t);
+
+ /*
+ * Check if it looks like we have all the fragments for a whole packet
+ * yet. If not, just write out our changes and move on.
+ */
+ if (newfl.part_len < newfl.whole_len || dont_assemble) {
+ if (!atomic_strong_cas_dblptr(&fl->raw, &oldfl.raw, newfl.raw,
+ __ATOMIC_RELEASE,
+ __ATOMIC_RELAXED)) {
+ /* Failed to add this fragment? Try again. */
+ set_prev_packet(frags_head, NULL);
+ goto redo;
+ }
+ return reassembled;
+ }
+
+ /*
+ * It /appears/ that we have all the fragments for a packet. Things are
+ * not always as they appear, however, particularly in the case of a
+ * hash map collision where part_len and whole_len may be incorrect
+ * (and, hence, must be verified).
+ *
+ * Take exclusive ownership over this fraglist while we attempt
+ * reassembly. If we're truly done with it, then this releases the slot,
+ * otherwise we'll update the slot with our changes later.
+ */
+ init_fraglist(&nullfl);
+ if (!atomic_strong_cas_dblptr(&fl->raw, &oldfl.raw, nullfl.raw,
+ __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) {
+ /* Failed to take this fraglist? Try again. */
+ set_prev_packet(frags_head, NULL);
+ goto redo;
+ }
+
+ /*
+ * Find any complete packets within the fraglist, cut them out of the
+ * list, and send them to the output queue. Note that there may be
+ * several complete packets, as we may have added multiple new fragments
+ * into the fraglist.
+ */
+ struct packet *remaining_packets;
+ struct packet *complete_datagram;
+ int fraglist_changed = 0;
+ int call_changed_fraglist = 0;
+ union fraglist update;
+
+ sort_fraglist(&newfl, now);
+ remaining_packets = newfl.tail;
+ dont_assemble = 1;
+ while ((complete_datagram =
+ extract_complete_packet(remaining_packets, &remaining_packets,
+ &call_changed_fraglist)) ||
+ call_changed_fraglist) {
+ fraglist_changed = 1;
+ if (complete_datagram) {
+ assert(!send_packet(complete_datagram, out));
+ ++reassembled;
+ dont_assemble = 0;
+ }
+ call_changed_fraglist = 0;
+ }
+
+ /* No remaining fragments in this fraglist? We're done. */
+ if (!remaining_packets)
+ return reassembled;
+
+ /*
+ * If there are still fragments in this fraglist, we have changes to
+ * write back.
+ *
+ * Note that we may have to reassemble more packets, as adding the
+ * fragments this thread has exclusive access to into the shared
+ * fraglist may entail new packets being completed. Thus, we have to
+ * repeat this whole add_fraglist_to_fraglist process with the remaining
+ * fragments.
+ */
+ update.tail = remaining_packets;
+ update.part_len = newfl.part_len;
+ update.whole_len = newfl.whole_len;
+ update.earliest = newfl.earliest;
+
+ /*
+ * We've cut fragments from the fragment list chain, and so should
+ * recalculate the part_len, whole_len, and earliest variables before
+ * writing out our changes.
+ */
+ if (fraglist_changed) {
+ struct packet *current = remaining_packets;
+
+ update.earliest = now.t;
+ while (current) {
+ odph_ipv4hdr_t *h;
+ uint16_t part_oct;
+ uint16_t whole_oct;
+ struct flts update_earliest;
+
+ update_earliest.t = update.earliest;
+ h = odp_packet_data(current->handle);
+ part_oct = ipv4hdr_payload_len_oct(*h);
+ whole_oct = ipv4hdr_reass_payload_len_oct(*h);
+ update.part_len = min(IP_OCTET_MAX,
+ update.part_len + part_oct);
+ update.whole_len = min(update.whole_len, whole_oct);
+ update.earliest = earliest(update_earliest,
+ current->arrival, now).t;
+ frags_head = current;
+ current = prev_packet(*current);
+ }
+ frags = update;
+ goto redo;
+ }
+
+ frags = update;
+ frags_head = frags.tail;
+ while (prev_packet(*frags_head))
+ frags_head = prev_packet(*frags_head);
+ goto redo;
+}
+
+/**
+ * Add a single fragment to a shared fraglist
+ *
+ * @param fl Pointer to the shared fraglist to add "frag" to
+ * @param frag Pointer to the fragment to add to "fl"
+ * @param frag_payload_len The payload length of "frag" in octets
+ * @param frag_reass_payload_len The estimated reassembled payload length of
+ * "frag" in octets
+ * @param out The queue to which reassembled packets should be written
+ *
+ * @return The number of packets reassembled and sent to the output
+ */
+static int add_frag_to_fraglist(union fraglist *fl, struct packet *frag,
+ uint16_t frag_payload_len,
+ uint16_t frag_reass_payload_len,
+ odp_queue_t out)
+{
+ union fraglist frags;
+
+ frags.tail = frag;
+ frags.part_len = frag_payload_len;
+ frags.whole_len = frag_reass_payload_len;
+ frags.earliest = frag->arrival.t;
+
+ return add_fraglist_to_fraglist(fl, frags, frags.tail, frag->arrival,
+ out, 0);
+}
+
+/**
+ * Remove the stale flows from a shared fraglist this thread has exclusive
+ * access over
+ *
+ * @param fl Pointer to the shared fraglist to clean stale flows from
+ * @param oldfl The value of the fraglist before we took exclusive access
+ * @param time_now A timestamp indication of the time "now"
+ * @param out The queue to which reassembled packets should be written
+ * @param force Whether all flows in the fraglist should be considered stale
+ */
+static void remove_stale_flows(union fraglist *fl, union fraglist oldfl,
+ struct flts timestamp_now, odp_queue_t out,
+ odp_bool_t force)
+{
+ union fraglist newfl = oldfl;
+ struct packet *current;
+ struct packet *current_tail;
+ struct packet *remaining_frags_head;
+ struct flts flow_earliest;
+
+ /*
+ * Sort the fraglist so we can step through its fragments flow-by-flow
+ */
+ sort_fraglist(&newfl, timestamp_now);
+
+ /* Remove stale flows from the fraglist */
+ current = newfl.tail;
+ current_tail = newfl.tail;
+ remaining_frags_head = NULL;
+ flow_earliest = current->arrival;
+ newfl.earliest = timestamp_now.t;
+ while (current) {
+ struct packet *prev = prev_packet(*current);
+
+ /*
+ * If this is the first fragment in a chain, we can make the
+ * decision on whether this flow should be kept or discarded
+ */
+ if (prev == NULL || !equal_flow(current, prev)) {
+ struct flts elapsed;
+ uint64_t elapsed_ns;
+
+ elapsed.t = timestamp_now.t - flow_earliest.t;
+ elapsed_ns = (elapsed.t * TS_RES_NS);
+ if ((elapsed_ns >= FLOW_TIMEOUT_NS &&
+ elapsed.t + TS_NOW_TOLERANCE >=
+ TS_NOW_TOLERANCE) || force) {
+ struct packet *to_free = current_tail;
+
+ while (to_free != prev) {
+ struct packet *next;
+
+ next = prev_packet(*to_free);
+ odp_packet_free(to_free->handle);
+ to_free = next;
+ }
+
+ if (remaining_frags_head)
+ set_prev_packet(remaining_frags_head,
+ prev);
+ else
+ newfl.tail = prev;
+ } else {
+ odph_ipv4hdr_t *h;
+ uint16_t part_oct;
+ uint16_t whole_oct;
+ struct flts newfl_earliest;
+
+ newfl_earliest.t = newfl.earliest;
+ remaining_frags_head = current;
+ h = odp_packet_data(current->handle);
+ part_oct = ipv4hdr_payload_len_oct(*h);
+ whole_oct = ipv4hdr_reass_payload_len_oct(*h);
+ newfl.part_len = min(IP_OCTET_MAX,
+ newfl.part_len + part_oct);
+ newfl.whole_len = min(newfl.whole_len,
+ whole_oct);
+ newfl.earliest = earliest(newfl_earliest,
+ flow_earliest,
+ timestamp_now).t;
+ }
+
+ current_tail = prev;
+ flow_earliest.t = EARLIEST_MAX;
+ } else {
+ flow_earliest = earliest(flow_earliest,
+ current->arrival,
+ timestamp_now);
+ }
+
+ current = prev;
+ }
+
+ /*
+ * If there are any remaining fragments, write them back into the
+ * fraglist
+ */
+ if (remaining_frags_head)
+ add_fraglist_to_fraglist(fl, newfl, remaining_frags_head,
+ timestamp_now, out, 0);
+}
+
+/**
+ * Clean up any stale flows within a fraglist
+ *
+ * @param fl Pointer to the shared fraglist to clean stale flows from
+ * @param out The queue to which reassembled packets should be written
+ * @param force Whether all flows in the fraglist should be considered stale
+ */
+static void garbage_collect_fraglist(union fraglist *fl, odp_queue_t out,
+ odp_bool_t force)
+{
+ uint64_t time_now;
+ struct flts timestamp_now;
+ struct flts elapsed;
+ uint64_t elapsed_ns;
+ union fraglist oldfl;
+ odp_bool_t success = 1;
+
+ do {
+ time_now = odp_time_to_ns(odp_time_global());
+ timestamp_now.t = time_now / TS_RES_NS;
+ __atomic_load(&fl->half[0], &oldfl.half[0], __ATOMIC_RELAXED);
+ __atomic_load(&fl->half[1], &oldfl.half[1], __ATOMIC_RELAXED);
+ elapsed.t = timestamp_now.t - oldfl.earliest;
+
+ if (oldfl.tail == NULL ||
+ elapsed.t + TS_NOW_TOLERANCE < TS_NOW_TOLERANCE)
+ return;
+
+ elapsed_ns = (elapsed.t * TS_RES_NS);
+ assert(force || elapsed_ns <= 86400000000000);
+ if (elapsed_ns >= FLOW_TIMEOUT_NS || force) {
+ union fraglist nullfl;
+
+ init_fraglist(&nullfl);
+ success = atomic_strong_cas_dblptr(&fl->raw, &oldfl.raw,
+ nullfl.raw,
+ __ATOMIC_ACQUIRE,
+ __ATOMIC_RELAXED);
+
+ if (success)
+ remove_stale_flows(fl, oldfl, timestamp_now,
+ out, force);
+ }
+ } while (!success);
+}
+
+int reassemble_ipv4_packets(union fraglist *fraglists, int num_fraglists,
+ struct packet *fragments, int num_fragments,
+ odp_queue_t out)
+{
+ int i;
+ int packets_reassembled = 0;
+
+ for (i = 0; i < num_fragments; ++i) {
+ struct packet frag;
+ odph_ipv4hdr_t *hdr;
+ uint16_t frag_payload_len;
+ uint16_t frag_reass_payload_len;
+ uint32_t key;
+ union fraglist *fl;
+ int status;
+
+ frag = fragments[i];
+ hdr = odp_packet_data(frag.handle);
+ frag_payload_len = ipv4hdr_payload_len_oct(*hdr);
+ frag_reass_payload_len = ipv4hdr_reass_payload_len_oct(*hdr);
+
+ /*
+ * Find the appropriate hash map bucket for fragments in this
+ * flow. In the case of collisions, fragments for multiple flows
+ * are simply stored in the same list.
+ */
+ key = hash(hdr);
+ fl = &fraglists[key % num_fraglists];
+
+ status = add_frag_to_fraglist(fl, &fragments[i],
+ frag_payload_len,
+ frag_reass_payload_len, out);
+ if (status < 0) {
+ fprintf(stderr,
+ "ERROR: failed to add fragment to fraglist\n");
+ return -1;
+ }
+ packets_reassembled += status;
+ }
+
+ return packets_reassembled;
+}
+
+void garbage_collect_fraglists(union fraglist *fraglists, int num_fraglists,
+ odp_queue_t out, odp_bool_t destroy_all)
+{
+ int i;
+
+ for (i = 0; i < num_fraglists; ++i)
+ garbage_collect_fraglist(&fraglists[i], out, destroy_all);
+}
diff --git a/example/ipfragreass/odp_ipfragreass_reassemble.h b/example/ipfragreass/odp_ipfragreass_reassemble.h
new file mode 100644
index 00000000..ffc4bfb5
--- /dev/null
+++ b/example/ipfragreass/odp_ipfragreass_reassemble.h
@@ -0,0 +1,211 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_FRAGREASS_PP_REASSEMBLE_H_
+#define ODP_FRAGREASS_PP_REASSEMBLE_H_
+
+#include <odp/helper/ip.h>
+
+#include "odp_ipfragreass_ip.h"
+#include "odp_ipfragreass_helpers.h"
+
+ODP_STATIC_ASSERT((__SIZEOF_POINTER__ == 4 || __SIZEOF_POINTER__ == 8),
+ "ODPREASS_PTR__SIZE_ERROR");
+
+/**
+ * The time in nanoseconds after reception of the earliest fragment that a
+ * flow of traffic is considered to be stale
+ */
+#define FLOW_TIMEOUT_NS 15000000000ULL
+
+/** Convert nanoseconds into a unit for packet.arrival */
+#if __SIZEOF_POINTER__ == 4
+#define TS_RES_NS ((uint64_t)5000000000) /**< ns -> 5s */
+#elif __SIZEOF_POINTER__ == 8
+#define TS_RES_NS ((uint64_t)1000000) /**< ns -> 1ms */
+#endif
+
+/**
+ * The maximum value of the packet.arrival field.
+ */
+#if __SIZEOF_POINTER__ == 4
+#define EARLIEST_MAX 15
+#elif __SIZEOF_POINTER__ == 8
+#define EARLIEST_MAX UINT32_MAX
+#endif
+
+/**
+ * The time in packet.arrival ticks that indications of the time "now" are
+ * permitted to be off by.
+ */
+#if __SIZEOF_POINTER__ == 4
+#define TS_NOW_TOLERANCE 1
+#elif __SIZEOF_POINTER__ == 8
+#define TS_NOW_TOLERANCE 5000
+#endif
+
+/**
+ * The timestamp format used for fragments. Sadly, this has to be a structure
+ * as we may need a bit field.
+ */
+struct flts {
+#if __SIZEOF_POINTER__ == 4
+ uint8_t t:4;
+#elif __SIZEOF_POINTER__ == 8
+ uint32_t t;
+#endif
+};
+
+/**
+ * Metadata for reassembly, to be stored alongside each fragment
+ */
+struct packet {
+ odp_packet_t handle; /**< The ODP packet handle for this fragment */
+ struct packet *prev; /**< Pointer to the fragment "before" this one */
+ struct flts arrival; /**< Arrival timestamp for this fragment */
+};
+
+/**
+ * A list of IP fragments associated with one or more traffic flows, along with
+ * some related data
+ *
+ * This is used as an atomically-updated hash map bucket in reassembly, and is
+ * assumed to be packed with no padding.
+ */
+union fraglist {
+ struct {
+ /**
+ * The timestamp of the earliest arriving fragment in this
+ * fraglist
+ */
+#if __SIZEOF_POINTER__ == 4
+ uint32_t earliest:4;
+#elif __SIZEOF_POINTER__ == 8
+ uint32_t earliest;
+#endif
+
+ /**
+ * The sum of the payloads of the fragments in this list
+ *
+ * That is, the size of reassembling all the fragments in this
+ * list into one big packet (minus the header).
+ */
+ uint32_t part_len:14;
+
+ /**
+ * The smallest reassembled payload length upper bound from
+ * all fragments in this list
+ *
+ * This is the threshold over which, given the right
+ * circumstances, "part_len" might indicate that we are able
+ * to reassemble a packet.
+ */
+ uint32_t whole_len:14;
+
+ /**
+ * The tail of a "reverse" linked list of fragments
+ *
+ * Each fragment element has a "prev" pointer to the element
+ * before it in the list. When used in a multi-threaded
+ * environment, new elements should be inserted atomically by
+ * modifying this tail pointer.
+ */
+ struct packet *tail;
+ };
+
+#if __SIZEOF_POINTER__ == 4
+ struct {
+ uint32_t half[2];
+ };
+ uint64_t raw;
+#elif __SIZEOF_POINTER__ == 8
+ struct {
+ uint64_t half[2];
+ };
+ __int128 raw;
+#endif
+};
+
+/**
+ * Initialise a fraglist structure
+ *
+ * @param fl The fraglist to initialise
+ */
+static inline void init_fraglist(union fraglist *fl)
+{
+ fl->earliest = EARLIEST_MAX;
+ fl->part_len = 0;
+ fl->whole_len = IP_OCTET_MAX;
+ fl->tail = NULL;
+}
+
+/**
+ * Get the packet "before" a packet in a linked list
+ *
+ * @param packet The packet from which the previous should be located
+ *
+ * @return A pointer to the packet before the input packet (can be NULL)
+ */
+static inline struct packet *prev_packet(struct packet packet)
+{
+ return packet.prev;
+}
+
+/**
+ * Get the address of the pointer to the packet "before" a packet in a linked
+ * list
+ *
+ * @param packet The packet for which the previous pointer should be located
+ *
+ * @return A pointer to the "prev" packet pointer of the input packet
+ */
+static inline struct packet **prev_packet_ptr(struct packet *packet)
+{
+ return &packet->prev;
+}
+
+/**
+ * Set the packet "before" a packet in a linked list
+ *
+ * @param packet The packet to set the previous packet from
+ * @param prev The packet to set as being before "packet"
+ */
+static inline void set_prev_packet(struct packet *packet, struct packet *prev)
+{
+ packet->prev = prev;
+}
+
+/**
+ * Attempt packet reassembly with the aid of a number of new fragments
+ *
+ * Add "num_fragments" fragments to a fraglist hash map (with "num_fraglist"
+ * entries), attempting reassembly and writing any successfully reassembled
+ * packets out to the "out" queue.
+ *
+ * @param fraglists The hash map structure to add the fragments to
+ * @param num_fraglists The number of entries in the hash map
+ * @param fragments Pointer to the fragments to add
+ * @param num_fragments The number of fragments to add
+ * @param out The queue to which reassembled packets should be written
+ *
+ * @return The number of packets successfully reassembled and written to "out"
+ */
+int reassemble_ipv4_packets(union fraglist *fraglists, int num_fraglists,
+ struct packet *fragments, int num_fragments,
+ odp_queue_t out);
+
+/**
+ * Clean up any stale flows within a fraglist hash map
+ *
+ * @param fraglists The hash map structure to clean flows from
+ * @param num_fraglists The number of entries in the hash map
+ * @param out The queue to which reassembled packets should be written
+ * @param destroy_all Whether all encountered flows should be cleaned up
+ */
+void garbage_collect_fraglists(union fraglist *fraglists, int num_fraglists,
+ odp_queue_t out, odp_bool_t destroy_all);
+
+#endif
diff --git a/example/m4/configure.m4 b/example/m4/configure.m4
index 620db04f..18218d05 100644
--- a/example/m4/configure.m4
+++ b/example/m4/configure.m4
@@ -14,6 +14,7 @@ AC_CONFIG_FILES([example/classifier/Makefile
example/generator/Makefile
example/hello/Makefile
example/ipsec/Makefile
+ example/ipfragreass/Makefile
example/l2fwd_simple/Makefile
example/l3fwd/Makefile
example/packet/Makefile
commit cd1f187d33d65cb54781b5a3c0864229b19c11c3
Author: Joyce Kong <joyce.kong(a)arm.com>
Date: Wed Jun 7 15:19:08 2017 +0800
linux-gen: improve conversion between buf_hdr_t and packet_t
Signed-off-by: Joyce Kong <joyce.kong(a)arm.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Brian Brooks <brian.brooks(a)arm.com>
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 a480a748..cdd139bb 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -148,6 +148,16 @@ static inline odp_packet_t packet_handle(odp_packet_hdr_t *pkt_hdr)
return (odp_packet_t)pkt_hdr;
}
+static inline odp_buffer_hdr_t *packet_to_buf_hdr(odp_packet_t pkt)
+{
+ return &odp_packet_hdr(pkt)->buf_hdr;
+}
+
+static inline odp_packet_t packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr)
+{
+ return (odp_packet_t)(odp_packet_hdr_t *)buf_hdr;
+}
+
static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr,
odp_packet_hdr_t *dst_hdr)
{
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 877978ba..e5436a90 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -554,7 +554,6 @@ static inline int pktin_recv_buf(odp_pktin_queue_t queue,
odp_packet_t packets[num];
odp_packet_hdr_t *pkt_hdr;
odp_buffer_hdr_t *buf_hdr;
- odp_buffer_t buf;
int i;
int pkts;
int num_rx = 0;
@@ -564,8 +563,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);
- buf = _odp_packet_to_buffer(pkt);
- buf_hdr = buf_hdl_to_hdr(buf);
+ buf_hdr = packet_to_buf_hdr(pkt);
if (pkt_hdr->p.input_flags.dst_queue) {
queue_entry_t *dst_queue;
@@ -584,7 +582,7 @@ static inline int pktin_recv_buf(odp_pktin_queue_t queue,
int pktout_enqueue(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr)
{
- odp_packet_t pkt = _odp_packet_from_buffer(buf_hdr->handle.handle);
+ odp_packet_t pkt = packet_from_buf_hdr(buf_hdr);
int len = 1;
int nbr;
@@ -614,7 +612,7 @@ int pktout_enq_multi(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr[],
return nbr;
for (i = 0; i < num; ++i)
- pkt_tbl[i] = _odp_packet_from_buffer(buf_hdr[i]->handle.handle);
+ pkt_tbl[i] = packet_from_buf_hdr(buf_hdr[i]);
nbr = odp_pktout_send(qentry->s.pktout, pkt_tbl, num);
return nbr;
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index e9ad22ba..cc636eba 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -81,7 +81,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
for (i = 0; i < nbr; i++) {
uint32_t pkt_len;
- pkt = _odp_packet_from_buffer(odp_hdr_to_buf(hdr_tbl[i]));
+ pkt = packet_from_buf_hdr(hdr_tbl[i]);
pkt_len = odp_packet_len(pkt);
@@ -163,7 +163,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
len = QUEUE_MULTI_MAX;
for (i = 0; i < len; ++i) {
- hdr_tbl[i] = buf_hdl_to_hdr(_odp_packet_to_buffer(pkt_tbl[i]));
+ hdr_tbl[i] = packet_to_buf_hdr(pkt_tbl[i]);
bytes += odp_packet_len(pkt_tbl[i]);
}
-----------------------------------------------------------------------
Summary of changes:
doc/application-api-guide/examples.dox | 5 +
example/Makefile.am | 1 +
example/ipfragreass/.gitignore | 3 +
example/ipfragreass/Makefile.am | 23 +
example/ipfragreass/odp_ipfragreass.c | 376 ++++++++++
example/ipfragreass/odp_ipfragreass_atomics.h | 55 ++
example/ipfragreass/odp_ipfragreass_atomics_arm.h | 120 ++++
example/ipfragreass/odp_ipfragreass_fragment.c | 99 +++
example/ipfragreass/odp_ipfragreass_fragment.h | 28 +
example/ipfragreass/odp_ipfragreass_helpers.c | 124 ++++
example/ipfragreass/odp_ipfragreass_helpers.h | 79 +++
example/ipfragreass/odp_ipfragreass_ip.h | 251 +++++++
example/ipfragreass/odp_ipfragreass_reassemble.c | 771 +++++++++++++++++++++
example/ipfragreass/odp_ipfragreass_reassemble.h | 211 ++++++
example/m4/configure.m4 | 1 +
.../linux-generic/include/odp_packet_internal.h | 10 +
platform/linux-generic/odp_packet_io.c | 8 +-
platform/linux-generic/pktio/loop.c | 4 +-
18 files changed, 2162 insertions(+), 7 deletions(-)
create mode 100644 example/ipfragreass/.gitignore
create mode 100644 example/ipfragreass/Makefile.am
create mode 100644 example/ipfragreass/odp_ipfragreass.c
create mode 100644 example/ipfragreass/odp_ipfragreass_atomics.h
create mode 100644 example/ipfragreass/odp_ipfragreass_atomics_arm.h
create mode 100644 example/ipfragreass/odp_ipfragreass_fragment.c
create mode 100644 example/ipfragreass/odp_ipfragreass_fragment.h
create mode 100644 example/ipfragreass/odp_ipfragreass_helpers.c
create mode 100644 example/ipfragreass/odp_ipfragreass_helpers.h
create mode 100644 example/ipfragreass/odp_ipfragreass_ip.h
create mode 100644 example/ipfragreass/odp_ipfragreass_reassemble.c
create mode 100644 example/ipfragreass/odp_ipfragreass_reassemble.h
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch api-next updated. v1.15.0.0-354-g58a8ec90
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 58a8ec90b57eae43be6461d1ae407e70a87c65d2 (commit)
via ebbd8301f396e3f2f106ed94ce5c3970ec8bacce (commit)
from a5ef33a6f2575cd011cb05c3fb1b06d1c017f879 (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 58a8ec90b57eae43be6461d1ae407e70a87c65d2
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Jun 2 12:38:20 2017 +0300
api: ipsec: add max number of cos capability
Added capability for maximum number of different CoS in
CLS pipelining.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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 bbb28a31..65f0b066 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -262,6 +262,12 @@ typedef struct odp_ipsec_capability_t {
*/
odp_support_t pipeline_cls;
+ /** 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.
+ */
+ uint32_t max_cls_cos;
+
/** Soft expiry limit in seconds support
*
* 0: Limit is not supported
@@ -674,7 +680,8 @@ typedef struct odp_ipsec_sa_param_t {
* classification through this CoS. Other result events are sent to
* 'dest_queue'. This field is considered only when 'pipeline' is
* ODP_IPSEC_PIPELINE_CLS. The CoS must not be shared between any pktio
- * interface default CoS.
+ * interface default CoS. The maximum number of different CoS supported
+ * is defined by IPsec capability max_cls_cos.
*/
odp_cos_t dest_cos;
commit ebbd8301f396e3f2f106ed94ce5c3970ec8bacce
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Jun 2 12:38:19 2017 +0300
api: ipsec: refine packet order specification
State more explicitly that async ipsec operations maintain packet
order the same way as odp_queue_enq_multi().
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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 15f5e8be..bbb28a31 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -1213,13 +1213,19 @@ int odp_ipsec_out(const odp_ipsec_op_param_t *input,
* results through one or more ODP_EVENT_IPSEC_RESULT events with the following
* ordering considerations.
*
- * Asynchronous mode maintains (operation input) packet order per SA when
- * application calls the operation within an ordered or atomic scheduler context
- * of the same queue. Packet order is also maintained when application
- * otherwise guarantees (e.g. using locks) that the operation is not called
- * simultaneously from multiple threads for the same SA(s). Resulting
- * events for the same SA are enqueued in order, and packet handles (for the
- * same SA) are stored in order within an event.
+ * Asynchronous mode maintains packet order per SA when application calls the
+ * operation within an ordered or atomic scheduler context of the same queue.
+ * Resulting events for the same SA are enqueued in order and packet handles
+ * (for the same SA) are stored in order within an event. Packet order per SA at
+ * a destination queue is the same as if application would have enqueued packets
+ * there with odp_queue_enq_multi().
+ *
+ * Packet order is also maintained when application otherwise guarantees
+ * (e.g. using locks) that the operation is not called simultaneously from
+ * multiple threads for the same SA(s).
+ *
+ * Logically, packet processing (e.g. sequence number check) happens in the
+ * output order as defined above.
*
* The function may be used also in inline processing mode, e.g. for IPSEC
* packets for which inline processing is not possible. Packets for the same SA
@@ -1243,13 +1249,19 @@ int odp_ipsec_in_enq(const odp_ipsec_op_param_t *input);
* results through one or more ODP_EVENT_IPSEC_RESULT events with the following
* ordering considerations.
*
- * Asynchronous mode maintains (operation input) packet order per SA when
- * application calls the operation within an ordered or atomic scheduler context
- * of the same queue. Packet order is also maintained when application
- * otherwise guarantees (e.g. using locks) that the operation is not called
- * simultaneously from multiple threads for the same SA(s). Resulting
- * events for the same SA are enqueued in order, and packet handles (for the
- * same SA) are stored in order within an event.
+ * Asynchronous mode maintains packet order per SA when application calls the
+ * operation within an ordered or atomic scheduler context of the same queue.
+ * Resulting events for the same SA are enqueued in order and packet handles
+ * (for the same SA) are stored in order within an event. Packet order per SA at
+ * a destination queue is the same as if application would have enqueued packets
+ * there with odp_queue_enq_multi().
+ *
+ * Packet order is also maintained when application otherwise guarantees
+ * (e.g. using locks) that the operation is not called simultaneously from
+ * multiple threads for the same SA(s).
+ *
+ * Logically, packet processing (e.g. sequence number assignment) happens in the
+ * output order as defined above.
*
* The function may be used also in inline processing mode, e.g. for IPSEC
* packets for which inline processing is not possible.
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/ipsec.h | 49 ++++++++++++++++++++++++++++++--------------
1 file changed, 34 insertions(+), 15 deletions(-)
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch cloud-dev updated. v1.14.0.0-404-g76edf89d
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, cloud-dev has been updated
via 76edf89deaf0fa126f34b6cd58f4373d211f0c33 (commit)
from f2a1712bdb379b2eb2c6e470a2f2d9a1302f344f (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 76edf89deaf0fa126f34b6cd58f4373d211f0c33
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Tue Jun 13 10:06:25 2017 +0200
drv: driver: fix devio registration race
This fixes a race condition that could arise when registering a devio.
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/drv_driver.c b/platform/linux-generic/drv_driver.c
index 46cbdba9..3c918def 100644
--- a/platform/linux-generic/drv_driver.c
+++ b/platform/linux-generic/drv_driver.c
@@ -529,7 +529,7 @@ odpdrv_devio_t odpdrv_devio_register(odpdrv_devio_param_t *param)
* sure no devio providing the same interface using th esame enumerator
* already exists:
*/
- devio_list_read_lock();
+ devio_list_write_lock();
devio = devio_lst.head;
while (devio) {
if ((strncmp(param->api_name, devio->param.api_name,
@@ -539,12 +539,11 @@ odpdrv_devio_t odpdrv_devio_register(odpdrv_devio_param_t *param)
ODP_ERR("a devio providing interface '%s' for devices "
"of type '%s' is already registered\n!",
param->api_name, param->enumr_api_name);
- devio_list_read_unlock();
+ devio_list_write_unlock();
return ODPDRV_DEVIO_INVALID;
}
devio = devio->next;
}
- devio_list_read_unlock();
/* allocate memory for the new devio:
* If init_global has not been done yet, then, we cannot allocate
@@ -561,13 +560,16 @@ odpdrv_devio_t odpdrv_devio_register(odpdrv_devio_param_t *param)
if (init_global_status == UNDONE) {
devio = malloc(sizeof(_odpdrv_devio_t));
- if (!devio)
+ if (!devio) {
+ devio_list_write_unlock();
return ODPDRV_DEVIO_INVALID;
+ }
devio->pool = NULL;
} else {
devio = _odp_ishm_pool_alloc(list_elt_pool,
sizeof(_odpdrv_devio_t));
if (!devio) {
+ devio_list_write_unlock();
ODP_ERR("_odp_ishm_pool_alloc failed!\n");
return ODPDRV_DEVIO_INVALID;
}
@@ -576,7 +578,6 @@ odpdrv_devio_t odpdrv_devio_register(odpdrv_devio_param_t *param)
/* save init parameters and insert devio in list */
devio->param = *param;
- devio_list_write_lock();
devio->next = devio_lst.head;
devio_lst.head = devio;
devio_list_write_unlock();
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/drv_driver.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch master updated. v1.15.0.0-1-g0d24adac
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 0d24adacfe17c8e0e1348f19cd8b75b64cb13ccf (commit)
from 5dd7d9ed05ee228406cc3c0ae6cd9caa20a71f08 (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 0d24adacfe17c8e0e1348f19cd8b75b64cb13ccf
Author: Brian Brooks <brian.brooks(a)arm.com>
Date: Wed Jun 7 22:46:56 2017 -0500
arch: arm: add CPU global time
Expose ARMv8 Generic Timer through internal CPU global time functions.
Signed-off-by: Brian Brooks <brian.brooks(a)arm.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/arch/arm/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c
index c31f9084..91d439d9 100644
--- a/platform/linux-generic/arch/arm/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/arm/odp_cpu_arch.c
@@ -50,15 +50,51 @@ uint64_t odp_cpu_cycles_resolution(void)
int cpu_has_global_time(void)
{
- return 0;
+ uint64_t hz = cpu_global_time_freq();
+
+ /*
+ * The system counter portion of the architected timer must
+ * provide a uniform view of system time to all processing
+ * elements in the system. This should hold true even for
+ * heterogeneous SoCs.
+ *
+ * Determine whether the system has 'global time' by checking
+ * whether a read of the architected timer frequency sys reg
+ * returns a sane value. Sane is considered to be within
+ * 1MHz and 6GHz (1us and .1667ns period).
+ */
+ return hz >= 1000000 && hz <= 6000000000;
}
uint64_t cpu_global_time(void)
{
+#if __ARM_ARCH == 8
+ uint64_t cntvct;
+
+ /*
+ * To be consistent with other architectures, do not issue a
+ * serializing instruction, e.g. ISB, before reading this
+ * sys reg.
+ */
+
+ /* Memory clobber to minimize optimization around load from sys reg. */
+ __asm__ volatile("mrs %0, cntvct_el0" : "=r"(cntvct) : : "memory");
+
+ return cntvct;
+#else
return 0;
+#endif
}
uint64_t cpu_global_time_freq(void)
{
+#if __ARM_ARCH == 8
+ uint64_t cntfrq;
+
+ __asm__ volatile("mrs %0, cntfrq_el0" : "=r"(cntfrq) : : );
+
+ return cntfrq;
+#else
return 0;
+#endif
}
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/arch/arm/odp_cpu_arch.c | 38 +++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch api-next updated. v1.15.0.0-352-ga5ef33a6
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 a5ef33a6f2575cd011cb05c3fb1b06d1c017f879 (commit)
via 5dd7d9ed05ee228406cc3c0ae6cd9caa20a71f08 (commit)
via 4bda102286cf55b0bc93fdf8f8f276d5528fdf14 (commit)
via 452c37072103864d7117e31f521b5e620e4937b5 (commit)
via 0b5e8c6870b959ad9db426aa067326f4baad5d58 (commit)
via b5f5510a9751ad60915f5b9fcf8763a97f77b5ab (commit)
via 79ed8c746ba13233c111a61d2d4f17e360dd8023 (commit)
via 11a1d56876d14cd715a1906a95a7c3734999bdc0 (commit)
via 40c06707ed485e5e957a413d697f4f1370f98837 (commit)
via 1b8c663ecd3b8a7c34ae52163961cdb442383d31 (commit)
via e24f6b3d0c130af3838ba49661d4bc9cb83e940f (commit)
via 9815336c6c7c64df3b40a1fb0c1c668a36d5550b (commit)
via e5faf09d8dfa9631caa7ccf1461fd4bc9f69d4c0 (commit)
via e248b708ff31467591fb99f7cc8652ab9e3081b2 (commit)
via ff6d71903cdfdd68246e3daabedd645bf30640cc (commit)
via bddd9fb0a5353c611bb9de78f3355d30147f8efc (commit)
via 2156eaa076fe0ca0aaa910c8902d5b60aa3bbed6 (commit)
via ca1ebaa8319604d4f5fe303be7150b7278fe9d94 (commit)
via 8d4ecf491a0af45c499d38c6e72853e756d69f0e (commit)
via b93c17b30d051b114a099ed5219fb2a82f5a864c (commit)
via fec16fd81d4084340f0f9a6893c9772000608031 (commit)
via 2210dc7d26125ac9b8b51fa4de7b2b72e4e8f13e (commit)
via c3d3787ae527291e969a60bc54dd4e2ab220251d (commit)
via 14df663ba9534101305ea4f5201fc2a5e55a974f (commit)
via dcd53771432aeb838f2584458589b3430104abcf (commit)
via 3362bb0eea7b4cdeb97cd2558e9bc5e4ee176852 (commit)
via 2239b759ad0cb09e3a2ec3d132580123ed92ab03 (commit)
via a28dab7edeeee74db65349231ec400d92d491a22 (commit)
via e3a92c5bf48f2279cd4ef5c8d22eafc523445626 (commit)
via 93e9e20c17426d3262aa96a589106e635b755090 (commit)
via ab3003c87e4cc25e3b26c7bddbfbce61525a94ad (commit)
via 93ee286c21a576c265463ca5dcd17b39ef80962b (commit)
via 1ebbb8f882ae6506fc9fa2cb02dadae3d35eaf58 (commit)
via 1adf94727a92a260f3145c3c777cc8cf3ecb419b (commit)
via ad5d48fe658927a7b946533d50fd907e306ec184 (commit)
via ce8bebad45c590ad5b06d31d8be9fae8182f944a (commit)
via 8e9242391f79ed54430b5fdc37e992addf9a26b8 (commit)
via 0344270a085f78d9f6d4fbef3c497750bbcee071 (commit)
via 697c3be9b2155379dee458d66335442375a9354d (commit)
via 2ffff0bc3e07678214a413b5eb89da13e7624055 (commit)
via dfbab7438c8404d5f4af20086e2100d40a5ffc0c (commit)
via 60150bba495711e6fdfc948ffb4ad405878fbcbc (commit)
via fbe34c754b7abe15100779ce9833a7f200517d9f (commit)
via 62f95a564b7b3e08a32e6e72d234eb86292021d0 (commit)
via 17f4cddfcbf47f73761cb869ace264cc8444dc08 (commit)
via f54860c628c16c4f76d555b9d20c28e04af13751 (commit)
via a5116e42abf0452f5ad9fd1920d5377aa0ef36b6 (commit)
via 73954b9142d1ddc2dde7c0f9b6596e2d8bac3caf (commit)
via 89a00a2ed43a99e0d2d78a5baeff1292e41ecd34 (commit)
via 8f07f3de3da7961cd29046d2107f27a0f7391703 (commit)
via 4bb3025e76a81130e8e80cd582ae2433d3450e2b (commit)
via 629be2dd2d166ed1246b8c1982af3a55a7035657 (commit)
via af05215e26c99693c000981fddfaf3cdd2225e3f (commit)
via b9676fc5ba51d0f26a9c8c40f0b65a003113f1b5 (commit)
via 583dbc9adab460c926339353cc882095594b5b60 (commit)
via 867d8fc93d074005b52375995b9beed4a896c1ed (commit)
via 87b108d54a697b0c3704342ec7b4d484d04dfdbb (commit)
via 20d0d4d1a34725dec053ecd7cd46979345f7d625 (commit)
via 8367530231e7cd4c33c63b789a5ed8322b51e58f (commit)
via 48ad38ac169c48ac67e0758d3d45eb146255ed09 (commit)
via a074bc12f6a960c195daf3ceb28e3f717cfc3aa2 (commit)
via 4418eef8a7b7f621047101f284ce5e5df44f0239 (commit)
via 464fdc4efb4148dd8d1ec1aeaa2a7ffcb58d7faf (commit)
via 7394a5c8dead5edcfa5bda571aceba5945c91d16 (commit)
via 93afeeaf4e3dee3099830fccbb53bb32e64e3090 (commit)
via fdddf685fcad06f05f3788705968622b23a569ac (commit)
via 29b29677ed7d5d396f4aec1d0f3197efbf119113 (commit)
via 8c6ca3886ae4ffb111d3a81d09d21b68e0e11349 (commit)
via 19c488fdd9f9868cbe60f1ff8558f48c7bba6f04 (commit)
via 966c1c956a21f4e70c873a3c3546e65299837457 (commit)
via 99478ee923dfd8279a7a5149769aee49df315dde (commit)
via be9ca86f431d5eaab0702f7d76db60cd75982e15 (commit)
via 2b34cda253fd28f3b373dc3ee66753d47a0c9b33 (commit)
via 166e4e6a7f2e289f305203e75c68cea56d015c08 (commit)
via e149fb058c6ea718e22c77c6fc930141004dcba2 (commit)
via e6e666d533615de703993836b958514208de942a (commit)
via 8184de8ef8492a739d30c354628aada2e2bab366 (commit)
via 0ee227d51cdb1cc29853dac0376e6e02b6e585de (commit)
via 658f6f27ed62c651d8555a4de0ef103191c491b1 (commit)
via b8de7dfbadb10da65a0a675db5f588cc3998508a (commit)
via aadd1d62084191bf2fb909a7dbedee628b197929 (commit)
via 248ebf35eaf51d962e9d14a4e2c541d3cbc96268 (commit)
via 373f97f88d327ca0e211df33d6fcaad0b9188a1c (commit)
via 7cf390d11e69f6b677e6fbfd6414944737406fc3 (commit)
via 61a5edca59780fc2a4a0e656e09738145892a3a0 (commit)
via 8d19f94fd96eb5a411eafb75c487dc3f972297bd (commit)
via e6be64e01589f1aa335ea178e8314bf35ad34847 (commit)
via 15ea6562d284bd5f2bd20e9b79bd102db106555c (commit)
via a48979af5b36c11fb5c7f8d2c6029c12bb191b51 (commit)
from 361f0fa4addf83ae9b30d5e705e1f86643a45bab (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 a5ef33a6f2575cd011cb05c3fb1b06d1c017f879
Merge: 361f0fa4 5dd7d9ed
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue Jun 20 18:53:22 2017 +0300
Merge branch 'master' v1.15.0.0 into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --cc .travis.yml
index 1bc82b3c,50b3b9c2..aaa3fe1c
--- a/.travis.yml
+++ b/.travis.yml
@@@ -41,9 -41,8 +41,9 @@@ addons
packages:
- gcc
- clang-3.8
- - automake autoconf libtool libssl-dev graphviz mscgen doxygen
+ - automake autoconf autoconf-archive libtool libssl-dev graphviz mscgen doxygen
- libpcap-dev
+ - libconfig-dev
# coverity_scan:
# project:
# name: "$TRAVIS_REPO_SLUG"
diff --cc platform/Makefile.inc
index 3d609aa7,1903d92d..5343bfe1
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@@ -60,22 -57,10 +60,23 @@@ odpapispecinclude_HEADERS =
$(top_srcdir)/include/odp/api/spec/ticketlock.h \
$(top_srcdir)/include/odp/api/spec/time.h \
$(top_srcdir)/include/odp/api/spec/timer.h \
- $(top_builddir)/include/odp/api/spec/version.h \
- $(top_srcdir)/include/odp/api/spec/traffic_mngr.h
+ $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \
+ $(top_builddir)/include/odp/api/spec/deprecated.h \
+ $(top_builddir)/include/odp/api/spec/version.h
+odpdrvspecincludedir= $(includedir)/odp/drv/spec
+odpdrvspecinclude_HEADERS = \
+ $(top_srcdir)/include/odp/drv/spec/align.h \
+ $(top_srcdir)/include/odp/drv/spec/atomic.h \
+ $(top_srcdir)/include/odp/drv/spec/barrier.h \
+ $(top_srcdir)/include/odp/drv/spec/byteorder.h \
+ $(top_srcdir)/include/odp/drv/spec/compiler.h \
+ $(top_srcdir)/include/odp/drv/spec/driver.h \
+ $(top_srcdir)/include/odp/drv/spec/shm.h \
+ $(top_srcdir)/include/odp/drv/spec/spinlock.h \
+ $(top_srcdir)/include/odp/drv/spec/std_types.h \
+ $(top_srcdir)/include/odp/drv/spec/sync.h
+
odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
odpapiabidefaultinclude_HEADERS = \
$(top_srcdir)/include/odp/arch/default/api/abi/buffer.h \
diff --cc platform/linux-generic/m4/configure.m4
index c37cb39c,e1197f60..55f3cb98
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@@ -28,17 -28,51 +28,62 @@@ AC_LINK_IFELSE
echo "Use newer version. For gcc > 4.7.0"
exit -1)
+# Check for libconfig (required)
+AC_CHECK_HEADERS([libconfig.h], HEADER_LIBCONFIG="yes")
+PKG_CHECK_MODULES([PKGCONFIG], [libconfig >= 1.3.2], LIBRARY_LIBCONFIG="yes")
+if test "x$LIBRARY_LIBCONFIG" != "x" && test "x$HEADER_LIBCONFIG" != "x" ; then
+ CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS"
+ LIBS="$LIBS $PKGCONFIG_LIBS"
+ AM_CPPFLAGS="$AM_CPPFLAGS `pkg-config --cflags-only-I libconfig`"
+else
+ AC_MSG_FAILURE([libconfig not found (required)])
+fi
+
+ dnl Check whether -latomic is needed
+ use_libatomic=no
+
+ AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic built-ins)
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([[
+ static int loc;
+ int main(void)
+ {
+ int prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED);
+ return 0;
+ }
+ ]])],
+ [AC_MSG_RESULT(no)],
+ [AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(
+ [atomic], [__atomic_exchange_8],
+ [use_libatomic=yes],
+ [AC_MSG_FAILURE([__atomic_exchange_8 is not available])])
+ ])
+
+ AC_MSG_CHECKING(whether -latomic is needed for 128-bit atomic built-ins)
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([[
+ static __int128 loc;
+ int main(void)
+ {
+ __int128 prev;
+ prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED);
+ return 0;
+ }
+ ]])],
+ [AC_MSG_RESULT(no)],
+ [AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(
+ [atomic], [__atomic_exchange_16],
+ [use_libatomic=yes],
+ [AC_MSG_CHECKING([cannot detect support for 128-bit atomics])])
+ ])
+
+ if test "x$use_libatomic" = "xyes"; then
+ ATOMIC_LIBS="-latomic"
+ fi
+ AC_SUBST([ATOMIC_LIBS])
+
m4_include([platform/linux-generic/m4/odp_pthread.m4])
m4_include([platform/linux-generic/m4/odp_openssl.m4])
m4_include([platform/linux-generic/m4/odp_pcap.m4])
-----------------------------------------------------------------------
Summary of changes:
.checkpatch.conf | 2 +
.travis.yml | 2 +-
CHANGELOG | 267 +++++++++++++++++++++
DEPENDENCIES | 5 +-
configure.ac | 19 +-
pkgconfig/libodp-linux.pc.in | 2 +-
platform/Makefile.inc | 5 +-
platform/linux-generic/Makefile.am | 2 +
platform/linux-generic/include/odp_packet_socket.h | 7 -
platform/linux-generic/m4/configure.m4 | 45 ++++
platform/linux-generic/pktio/socket.c | 183 ++++----------
scripts/checkpatch.pl | 6 +-
scripts/spelling.txt | 151 +++++++++++-
test/common_plat/validation/api/pktio/pktio.c | 4 +-
14 files changed, 544 insertions(+), 156 deletions(-)
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] annotated tag v1.15.0.0 created. v1.15.0.0
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The annotated tag, v1.15.0.0 has been created
at ac7d1a3026c7d59f7379ff491a5cb8741c27beb3 (tag)
tagging 5dd7d9ed05ee228406cc3c0ae6cd9caa20a71f08 (commit)
replaces v1.14.0.0
tagged by Maxim Uvarov
on Mon Jun 19 18:18:18 2017 +0300
- Log -----------------------------------------------------------------
== opendataplane (1.15.0.0)
=== new features
odp v1.15.0.0 continues the preview of tiger moth, introducing new apis and
extensions, as well as numerous bug fixes and functional improvements.
==== deprecation framework
to permit smoother evolution of the odp api specification, a deprecation
framework is introduced to permit controlled deprecation.
when an odp api or defined struct parameter is deprecated, odp validation
tests will be updated to no longer use that api and instead use the
replacement api. by default, attempts to compile with the older api/feature
will fail and applications wishing to move to the new odp release should be
updated to use the replacement api. to permit evaluation of new odp
releases in advance of such updating, however, odp supports the `configure`
option `--enable-deprecated`, which makes the obsolete apis visible again.
this feature will be used on a case-by-case basis and documented in the
release notes for each release that introduces replacement api(s). in general
the deprecated forms will not be maintained for more than a single release
cycle. after that they will no longer be present in the api specification and
the replacement forms must be used to compile with that level of the api
specification.
==== apis
a number of new and refined apis are introduced in crypto, packet parsing,
and queue configuration:
===== crypto enhancements
the odp crypto apis receive several enhancements in this release:
====== new authentication algorithms
additional enumerations added for hmac-sha-1 and hmac-sha-512 authentication.
====== deprecated cipher/authentication algorithms
the following cipher/authentication algorithms have been deprecated in favor
of newer replacement algorithms:
* `odp_cipher_alg_aes128_cbc` is replaced by `odp_cipher_alg_aes_cbc`
* `odp_cipher_alg_aes128_gcm` is replaced by `odp_cipher_alg_aes_gcm`
* `odp_auth_alg_md5_96` is replaced by `odp_auth_alg_md5_hmac`
* `odp_auth_alg_sha256_128` is replaced by `odp_auth_alg_sha256_hmac`
* `odp_auth_alg_aes128_gcm1 is replaced by `odp_auth_alg_aes_gcm`
====== deprecated name for crypto parameter struct
`odp_crypto_op_params_t` is deprecated in favor of `odp_crypto_op_param_t`
for consistency with other odp `param` structs.
====== digest length session parameter
`odp_crypto_session_param_t` adds the field `auth_digest_len` to permit
specification of the authentication digest length to be used for this
session. the `odp_crypto_auth_capability()` api returns the list of
supported digest lengths.
====== additional authentication data (aad)
the `odp_crypto_op_param_t` struct adds an optional pointer and length for
aad information. this allows applications to specify aad information from
the list of supported lengths provided by `odp_crypto_auth_capability()`.
===== packet range data
the former `odp_crypto_data_range_t` type is deprecated and renamed to
`odp_packet_data_range_t` since it can be used to specify ranges for other
than crypto purposes.
===== parser configuration
applications may now specify the maximum packet layer of interest. for
example, a router may not care about anything beyond iso layer 3 in packets.
this can be used by odp implementations to control the depth of packet
parsing needed by the application and may allow greater efficiency,
especially in software implementations.
this is controlled by a new `odp_pktio_parser_layer_t` enum that is
part of the new `odp_pktio_parser_config_t` struct that is added to the
`odp_pktio_config_t` struct used by the `odp_pktio_config()` api. the
supported parser layers are also returned in this struct as part of the
`odp_pktio_capability_t` struct returned by the `odp_pktio_capability()` api.
===== queue size parameter
the `odp_queue_capability_t` struct returned by the `odp_queue_capability()`
api is enhanced as follows:
* the `max_queues` field is now defined to return the maximum number of event
queues of any type.
* new sub-structs (`plain` and `sched`) are added that detail the `max_num` of
queues of that type supported as well as the new field `max_size` that
specifies the maximum number of elements that each queue of this type can
store. a value of zero for `max_num` indicates no fixed limit.
in addition, the `odp_queue_param_t` passed to `odp_queue_create()` now adds
a `size` field to allow applications to specify the minimum number of events
that this queue should be able to store. a value of zero specified requests that
the implementation default limits be used.
the odp examples have been updated to show this configuration, for example,
the `l2fwd_simple` example does layer 2 forwarding and hence doesn't need
packets to be parsed beyond layer 2. so prior to opening an interface via
`odp_pktio_open()` the configuration processing now includes code of the form:
[source,c]
-----
odp_pktio_config_init(&config);
config.parser.layer = odp_pktio_parser_layer_l2;
odp_pktio_config(pktio, &config);
-----
this serves as a hint to the odp implementation that parsing beyond layer 2
is not required on this interface.
===== removal of `odp_time_to_u64()` api
the `odp_time_to_u64()` api is removed without deprecation in this release.
this is redundant since the `odp_time_to_ns()` api already returns a `uint64_t`
value for `odp_time_t` and can be used for the same purpose.
===== new `odp_sys_info_print()` api
for debugging / diagnostic use, the `odp_sys_info_print()` api is added.
this prints implementation defined information about the system and odp
environment and may contain information about cpus, memory, and other
hardware configuration.
=== helpers
==== linux helpers
odp helper functions fall into two categories: system-independent, and those
that rely on linux. for backwards compatibility, these have been
reorganized into a new `helper/linux` directory that is installed only when
the `--enable-helper-linux` `configure` option is specified.
=== `odp-linux` performance
==== scheduler improvements
the default scheduler is streamlined by using precomputed weight tables and
separated priority queues for different scheduling groups. this improves
both latency and scalability.
also included in this change, the default number of scheduling groups is
lowered from 256 to 32, which experience has shown is sufficient for most
applications.
the scheduler fairness checks are also enhanced to avoid low priority event
starvation if `config_burst_size` is set to 1.
=== `odp_linux` crypto improvements
* errors in implicit packet copy operations performed during crypto operation
are now handled properly.
* if `odp_crypto_session_create()` fails, proper cleanup is now performed to
avoid memory leaks.
* the auth digest len is now used when calculating hmacs, and full-length
digests are now added to supported sha capabilities.
* numerous crypto functions have been rewritten to use the openssl `evp_`
functions for improved efficiency and accuracy.
=== `odp-linux` packet improvements
* the packet parser now recognizes icmpv6 packets in addition to icmpv4.
=== `odp-linux` pktio improvements
* the `ethtool` and `socket` drivers add additional initializations to avoid
valgrind warnings.
* the `dpdk` driver is upgraded to dpdk 17.02 and is now also built with the
`--whole-archive` option, which means that pmds no longer need to be linked
individually but are automatically included in builds that make use of dpdk
pktio support.
=== `odp-linux` time improvements
* the odp time apis are now more efficiently handled by replacing the previous
linux timespec with simple nanoseconds (ns) and using native hardware time
counters in x86 and arm environments, when available.
=== `odp-linux` traffic manager improvements
* weighting is now handled properly when weight=1 is specified. previously
this caused an overflow that distorted packet priorities.
=== miscellaneous fixes and improvements
==== native clang build on armv8
armv8 compilation now works properly when using the clang compiler.
==== test improvements
* the `odp_scheduling` performance test now handles dequeueing from
potentially concurrent queues properly.
* the traffic manager and time tests are now invoked via scripts to better
account for load-sensitivity when running regressions in ci environments.
* the l2fwd test now supports an additional parameter to specify the number
of scheduling groups to use in the test.
* the `odp_sched_latency` performance test now handles queue draining in
a robust manner.
* the crypto validation tests now properly check and validate message digests,
and include negative tests to verify that incorrect digests are properly
flagged. note that this may expose omissions in other odp implementations that
had previously passed this validation test.
* the crypto validation test now adds an explicit test for the null cipher,
as well as hmac-sha-1 and hmac-sha-512.
* the pktio_ipc test now properly cleans up only its own temp files.
==== examples improvements
* the `odp_generator` example now properly honors stop criteria based on
number of packets sent.
* the `odp_generator` example now properly flushes output messages
* the `odp_generator` example now supports port configuration.
=== bug fixes
==== https://bugs.linaro.org/show_bug.cgi?id=2416[bug 2416]
example/generator/odp_generator.c contains todo items
==== https://bugs.linaro.org/show_bug.cgi?id=2779[bug 2779]
error handling issues (checked_return)
==== https://bugs.linaro.org/show_bug.cgi?id=2826[bug 2826]
unchecked return in pool.c
==== https://bugs.linaro.org/show_bug.cgi?id=2831[bug 2831]
unchecked return in mmap_unmap_sock()
==== https://bugs.linaro.org/show_bug.cgi?id=2852[bug 2852]
odp_static_assert() fails when used by c++
==== https://bugs.linaro.org/show_bug.cgi?id=2872[bug 2872]
odp_pktio_ordered_run.sh: line 34: integer expression expected
==== https://bugs.linaro.org/show_bug.cgi?id=2881[bug 2881]
load sensitive tests fail on ci
==== https://bugs.linaro.org/show_bug.cgi?id=2895[bug 2895]
the `odp_crypto_operation()` routine does not work with multi-segment packets.
==== https://bugs.linaro.org/show_bug.cgi?id=2908[bug 2908]
packet validation test fails if implementation does not limit packet length
==== https://bugs.linaro.org/show_bug.cgi?id=2910[bug 2910]
odph_iplookup_table_put_value() uses overlapping pointer addresses
==== https://bugs.linaro.org/show_bug.cgi?id=2933[bug 2933]
miss to call unlock if there are some errors happen in loopback_send() function
==== https://bugs.linaro.org/show_bug.cgi?id=2940[bug 2940]
`odp_packet_seg_t` fails abi compatibility between odp-linux and odp-dpdk
==== https://bugs.linaro.org/show_bug.cgi?id=2942[bug 2942]
compilation fails using clang 4.0.0
==== https://bugs.linaro.org/show_bug.cgi?id=2952[bug 2952]
doxygen errors and travis does not catch them
==== https://bugs.linaro.org/show_bug.cgi?id=2969[bug 2969]
tm validation test does find traffic_mngr_main
==== https://bugs.linaro.org/show_bug.cgi?id=2974[bug 2974]
`odp_rwlock_read_trylock()` fails if lock is already held for read access
==== https://bugs.linaro.org/show_bug.cgi?id=3002[bug 3002]
packet order lost when enqueuing to pktout queue
==== https://bugs.linaro.org/show_bug.cgi?id=3003[bug 3003]
aes-gcm returns 'valid' tag when checking invalid tag
==== https://bugs.linaro.org/show_bug.cgi?id=3013[bug 3013]
various failures if config_packet_max_segs is set to 1
==== https://bugs.linaro.org/show_bug.cgi?id=3017[bug 3017]
travis: time main test out of boundaries
==== https://bugs.linaro.org/show_bug.cgi?id=3027[bug 3027]
compilation failures using gcc 7 series
==== https://bugs.linaro.org/show_bug.cgi?id=3039[bug 3039]
socket pktio recv fails on large number of packet
=== known issues
==== https://bugs.linaro.org/show_bug.cgi?id=3024[bug 3024]
odp_traffic_mngr example is broken
==== https://bugs.linaro.org/show_bug.cgi?id=3026[bug 3026]
pktio_ips_run test can fail due to segfault
Balakrishna Garapati (2):
validation: packet: do assert on newly created pkt reference
linux-generic: decouple odp_errno define from odp-linux
Bill Fischofer (16):
linux-generic: pool: add odp_pool_capability() rc check
validation: packet: do not require a max packet length
abi: packet: restore abi compatibility for odp_packet_seg_t type
linux-generic: debug: enable helper use from c++ programs
bug: linux-generic: add syntax to allow newer clang to compile odp
example: l3fwd: check rc from odph_eth_addr_parse()
scripts: checkpatch: update to allow additional exceptions
api: classification: add additional doxygen documentation
api: pool: add additional doxygen documentation
api: tm: add additional doxygen documentation
linux-generic: types: add additional doxygen documentation
helper: add additional doxygen documentation
linux-generic: time: add additional doxygen doc for time type
api: crypto: correct documentation typos
changelog: updates for odp v1.15.0.0
changelog: add bug 3039 to list of bug fixes for v1.15
Bogdan Pricope (10):
test: generator: compose sending packets from reference packet plus differences
test: generator: send UDP packets in bursts
test: generator: receive packets in bursts
test: generator: use multiple RX queue in receiving mode
test: generator: use multiple TX queues in send UDP mode
test: generator: update global statistics calculation
example: generator: fix stop criteria - number of packets sent
example: generator: flush output messages
examples: generator: UDP ports configuration
test: generator: replace gettimeofday with ODP API calls
Brian Brooks (7):
linux-gen: ring: fix memory ordering in ring dequeue
configure.ac: fix native Clang build on ARMv8
test: odp_scheduling: handle dequeueing from a concurrent queue
test: odp_sched_latency: robust draining of queues
.gitignore: add perf.data
build: GCC 7 fixes
pktio: GCC 7 fixes
Christophe Milard (1):
doc: application-api-guide: excluding drv interface
Dmitriy Krot (1):
linux-gen: tm: fix wrr/wfq bug when weight=1
Dmitry Eremin-Solenikov (39):
linux-generic: pool: don't allocate buffers from invalid pool
test: tm: use script instead of binary when calling traffic manager test
linux-generic: crypto: properly handle errors in packet copy
validation: crypto: add tests for checking message digests
validation: crypto: correct comment for HMAC-SHA-256 tests
linux-generic: crypto: unify auth code
linux-generic: rwlock: fix odp_rwlock_read_trylock()
test: lock: expand rwlock tests
configure.ac: fix mcx16 vs clang check
linux-generic: crypto: don't leak sessions if creation fails
test: linux-generic: stop dropping other ODP files in pktio_ipc test
travis: split build into separate stages
api: packet: introduce odp_packet_data_range_t
test: crypto: add AES-GCM tests with wrong tag value
linux: crypto: fix checking of GCM tags
linux-generic: packet: add functions to optimize memset and memcmp paths
validation: crypto: explicitly pass auth_digest_len to crypto subsystem
validation: crypto: explicitly pass AAD to crypto subsystem
test: odp_crypto: update performance test to set auth_digest_length
example: ipsec: set auth_digest_len
linux-generic: crypto: use auth_digest_len when calculating HMACs
linux-generic: crypto: add SHA* capabilities for full length digests
linux-generic: crypto: update AES-GCM support to reflect aad and auth_digest_len
linux-generic: crypto: remote extra memcpy in AES-GCM
linux-generic: crypto: make AES-GCM thread safe
linux-generic: crypto: explicitly disable padding for AES-GCM
linux-generic: crypto: rewrite AES-CBC support using EVP functions
linux-generic: crypto: rewrite 3DES-CBC support using EVP functions
linux-generic: crypto: merge AES-CBC and 3DES-CBC support
linux-generic: crypto: make HMAC work across segmented packets
linux-generic: crypto: make en/decryption work across packet segments
linux-generic: crypto: NULL session->next pointer on session allocation
test: odp_crypto: bail out if odp_crypto_session_create failed
crypto: linux-generic: add capabilities for CIPHER_NULL and AUTH_NULL
validation: crypto: add tests for NULL cipher
validation: crypto: add HMAC-SHA-1 test cases
validation: crypto: add HMAC-SHA-512 test cases
linux-generic: crypto: add SHA-1 authentication support
linux-generic: crypto: add HMAC-SHA-512 authentication support
Honnappa Nagarahalli (1):
helper: cuckoo: add queue size config to cuckoo table
Janne Kajovuori (1):
linux-generic: makefile: fix staged install support
Janne Peltonen (1):
linux-gen: abi: fix include/odp/api/abi symlink creation
Kevin Wang (3):
linux-gen: pktio: miss an unlock operation before exit if error happens
validation: scheduler: modify the queue size for atomic queue
validation: scheduler: release context according to scheduler sync type
Matias Elo (24):
linux-gen: dpdk: improve pmd driver linking
linux-gen: dpdk: disable pci devices when running make check
linux-gen: dpdk: bump target dpdk version to 17.02
test: bench_packet: add tests for reference functions
test: bench_packet: fix headroom/tailroom test return values
helper: iplookuptable: fix prefix_entry_t member order
validation: packet: increase test pool size
validation: packet: remove invalid check from packet_test_alloc_segmented()
validation: packet: use common define for test pool sizes
linux-gen: pktio: fix valgrind warnings
helper: tables: avoid invalid odp_shm_addr() calls
linux-gen: sched: fix one at a time low priority event scheduling
linux-gen: sched: fix ordered enqueue to pktout queue
linux-gen: packet: fix odp_packet_free_multi() with single segment pool
linux-gen: packet: fix gcc errors with single segment pool
test: pktio: use capability to set test pool packet length
linux-gen: socket: remove limits for maximum RX/TX burst size
linux-gen: socket: streamline sock_mmsg_recv() function
linux-gen: packet: recognize ICMPv6 packets
examples: use odp_pktio_config() to select required packet parsing level
validation: pktio: add tests for packet parsing
validation: pktio: add tests for packet parsing
validation: pktio: remove CRCs from parser test packets
linux-gen: packet: remove lazy parsing
Maxim Uvarov (21):
linux-gen: remove pktio ipc option from configure
linux-gen: pktio: socket mmap: check unmap return code
test: perf: fix bash syntax in odp_pktio_ordered_run.sh
test: tm: skip tm result under travis run
test: tm: add paths to find tm binary
test: pktio_run: exit if binary was not found
codecov: enable threshold for patches
travis: move code style check to separate job
travis: check compile and run from install
travis: expand testing with varios configure options
travis: print failed test logs to screen
test: time: do not fail under gcov
travis: add dependency of autoconf-archive
configure.ac: do not trap if libatomic is not found
Revert "validation: pktio: add tests for packet parsing"
mergefix: remove duplicate declaration
update API version number from v1.14.0.0 to v1.15.0.0
test: l2fwd pass under coverage
build: fix order of test execution
travis: add sudo run make check
travis: do not run performance test in parallel under coverage
Ola Liljedahl (1):
linux-generic: ring.c: use required memory orderings
Petri Savolainen (36):
helper: linux: add common linux helper file
helper: pkgconfig: remove linux-generic from helper lib name
linux-gen: dependencies: update cunit install instructions
linux-gen: packet: make inline table visible
test: l2fwd: add group option
linux-gen: sched: use weight table for preferences
linux-gen: sched: optimize group scheduling
scripts: checkpatch: revert code modification
scripts: checkpatch: ignore volatile and extern warnings
scripts: spelling: update to latest version
api: crypto: add sha-1 and sha-512 enumerations
linux-gen: crypto: sha-1 and sha-512 not implemented yet
api: crypto: enforce deprecated API status
api: crypto: add digest length session parameter
api: crypto: add AAD operation parameters
api: deprecated: add configure option and macros
test: crypto: remove references to deprecated crypto apis
api: hints: remove ODP_DEPRECATED from API
linux-gen: crypto: add algo capability functions
api: pktio: add parser configuration
linux-gen: pktio: parser default config
api: queue: added queue size param
validation: queue: test queue max_num per type
api: time: remove odp_time_to_u64 from API
api: system: added system info print
linux-gen: cpu_flags: added x86 cpu flag read functions
linux-gen: system: implement system info print
test: validation: add odp_sys_info_print test
test: sched_latency: use sys_info_print
test: validation: rename time test header file
test: validation: add time accuracy test
linux-gen: time: use hw time counter when available
linux-gen: time: improve x86 TSC freq measurement accuracy
linux-gen: time: store timespec as nsec
validation: crypto: add stubs for sha-1 and sha-512 tests
linux-gen: makefile: fix out of tree build
Yi He (1):
checkpatch.conf: ignore PREFER_PRINTF, PREFER_SCANF
-----------------------------------------------------------------------
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch master updated. v1.14.0.0-165-g5dd7d9ed
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 5dd7d9ed05ee228406cc3c0ae6cd9caa20a71f08 (commit)
from 4bda102286cf55b0bc93fdf8f8f276d5528fdf14 (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 5dd7d9ed05ee228406cc3c0ae6cd9caa20a71f08
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Jun 19 11:25:19 2017 +0300
linux-gen: makefile: fix out of tree build
Generated files need $(top_builddir) instead of $(top_srcdir)
Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052
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/Makefile.inc b/platform/Makefile.inc
index 9844a58a..1903d92d 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \
$(top_srcdir)/include/odp/api/spec/cpumask.h \
$(top_srcdir)/include/odp/api/spec/crypto.h \
$(top_srcdir)/include/odp/api/spec/debug.h \
- $(top_srcdir)/include/odp/api/spec/deprecated.h \
$(top_srcdir)/include/odp/api/spec/errno.h \
$(top_srcdir)/include/odp/api/spec/event.h \
$(top_srcdir)/include/odp/api/spec/hash.h \
@@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \
$(top_srcdir)/include/odp/api/spec/ticketlock.h \
$(top_srcdir)/include/odp/api/spec/time.h \
$(top_srcdir)/include/odp/api/spec/timer.h \
- $(top_builddir)/include/odp/api/spec/version.h \
- $(top_srcdir)/include/odp/api/spec/traffic_mngr.h
+ $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \
+ $(top_builddir)/include/odp/api/spec/deprecated.h \
+ $(top_builddir)/include/odp/api/spec/version.h
odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
odpapiabidefaultinclude_HEADERS = \
-----------------------------------------------------------------------
Summary of changes:
platform/Makefile.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch master updated. v1.14.0.0-164-g4bda1022
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 4bda102286cf55b0bc93fdf8f8f276d5528fdf14 (commit)
via 452c37072103864d7117e31f521b5e620e4937b5 (commit)
via 0b5e8c6870b959ad9db426aa067326f4baad5d58 (commit)
via b5f5510a9751ad60915f5b9fcf8763a97f77b5ab (commit)
via 79ed8c746ba13233c111a61d2d4f17e360dd8023 (commit)
via 11a1d56876d14cd715a1906a95a7c3734999bdc0 (commit)
via 40c06707ed485e5e957a413d697f4f1370f98837 (commit)
via 1b8c663ecd3b8a7c34ae52163961cdb442383d31 (commit)
via e24f6b3d0c130af3838ba49661d4bc9cb83e940f (commit)
via 9815336c6c7c64df3b40a1fb0c1c668a36d5550b (commit)
via e5faf09d8dfa9631caa7ccf1461fd4bc9f69d4c0 (commit)
via e248b708ff31467591fb99f7cc8652ab9e3081b2 (commit)
via ff6d71903cdfdd68246e3daabedd645bf30640cc (commit)
via bddd9fb0a5353c611bb9de78f3355d30147f8efc (commit)
via 2156eaa076fe0ca0aaa910c8902d5b60aa3bbed6 (commit)
via ca1ebaa8319604d4f5fe303be7150b7278fe9d94 (commit)
via 8d4ecf491a0af45c499d38c6e72853e756d69f0e (commit)
via b93c17b30d051b114a099ed5219fb2a82f5a864c (commit)
via fec16fd81d4084340f0f9a6893c9772000608031 (commit)
via 2210dc7d26125ac9b8b51fa4de7b2b72e4e8f13e (commit)
via c3d3787ae527291e969a60bc54dd4e2ab220251d (commit)
via 14df663ba9534101305ea4f5201fc2a5e55a974f (commit)
via dcd53771432aeb838f2584458589b3430104abcf (commit)
via 3362bb0eea7b4cdeb97cd2558e9bc5e4ee176852 (commit)
via 2239b759ad0cb09e3a2ec3d132580123ed92ab03 (commit)
via a28dab7edeeee74db65349231ec400d92d491a22 (commit)
via e3a92c5bf48f2279cd4ef5c8d22eafc523445626 (commit)
via 93e9e20c17426d3262aa96a589106e635b755090 (commit)
via ab3003c87e4cc25e3b26c7bddbfbce61525a94ad (commit)
via 93ee286c21a576c265463ca5dcd17b39ef80962b (commit)
via 1ebbb8f882ae6506fc9fa2cb02dadae3d35eaf58 (commit)
via 1adf94727a92a260f3145c3c777cc8cf3ecb419b (commit)
via ad5d48fe658927a7b946533d50fd907e306ec184 (commit)
via ce8bebad45c590ad5b06d31d8be9fae8182f944a (commit)
via 8e9242391f79ed54430b5fdc37e992addf9a26b8 (commit)
via 0344270a085f78d9f6d4fbef3c497750bbcee071 (commit)
via 697c3be9b2155379dee458d66335442375a9354d (commit)
via 2ffff0bc3e07678214a413b5eb89da13e7624055 (commit)
via dfbab7438c8404d5f4af20086e2100d40a5ffc0c (commit)
via 60150bba495711e6fdfc948ffb4ad405878fbcbc (commit)
via fbe34c754b7abe15100779ce9833a7f200517d9f (commit)
via 62f95a564b7b3e08a32e6e72d234eb86292021d0 (commit)
via 17f4cddfcbf47f73761cb869ace264cc8444dc08 (commit)
via f54860c628c16c4f76d555b9d20c28e04af13751 (commit)
via a5116e42abf0452f5ad9fd1920d5377aa0ef36b6 (commit)
via 73954b9142d1ddc2dde7c0f9b6596e2d8bac3caf (commit)
via 89a00a2ed43a99e0d2d78a5baeff1292e41ecd34 (commit)
via 8f07f3de3da7961cd29046d2107f27a0f7391703 (commit)
via 4bb3025e76a81130e8e80cd582ae2433d3450e2b (commit)
via 629be2dd2d166ed1246b8c1982af3a55a7035657 (commit)
via af05215e26c99693c000981fddfaf3cdd2225e3f (commit)
via b9676fc5ba51d0f26a9c8c40f0b65a003113f1b5 (commit)
via 583dbc9adab460c926339353cc882095594b5b60 (commit)
via 867d8fc93d074005b52375995b9beed4a896c1ed (commit)
via 87b108d54a697b0c3704342ec7b4d484d04dfdbb (commit)
via 20d0d4d1a34725dec053ecd7cd46979345f7d625 (commit)
via 8367530231e7cd4c33c63b789a5ed8322b51e58f (commit)
via 48ad38ac169c48ac67e0758d3d45eb146255ed09 (commit)
via a074bc12f6a960c195daf3ceb28e3f717cfc3aa2 (commit)
via 4418eef8a7b7f621047101f284ce5e5df44f0239 (commit)
via 464fdc4efb4148dd8d1ec1aeaa2a7ffcb58d7faf (commit)
via 7394a5c8dead5edcfa5bda571aceba5945c91d16 (commit)
via 93afeeaf4e3dee3099830fccbb53bb32e64e3090 (commit)
via fdddf685fcad06f05f3788705968622b23a569ac (commit)
via 29b29677ed7d5d396f4aec1d0f3197efbf119113 (commit)
via 8c6ca3886ae4ffb111d3a81d09d21b68e0e11349 (commit)
via 19c488fdd9f9868cbe60f1ff8558f48c7bba6f04 (commit)
via 966c1c956a21f4e70c873a3c3546e65299837457 (commit)
via 99478ee923dfd8279a7a5149769aee49df315dde (commit)
via be9ca86f431d5eaab0702f7d76db60cd75982e15 (commit)
via 2b34cda253fd28f3b373dc3ee66753d47a0c9b33 (commit)
via 166e4e6a7f2e289f305203e75c68cea56d015c08 (commit)
via e149fb058c6ea718e22c77c6fc930141004dcba2 (commit)
via e6e666d533615de703993836b958514208de942a (commit)
via 8184de8ef8492a739d30c354628aada2e2bab366 (commit)
via 0ee227d51cdb1cc29853dac0376e6e02b6e585de (commit)
via 658f6f27ed62c651d8555a4de0ef103191c491b1 (commit)
via b8de7dfbadb10da65a0a675db5f588cc3998508a (commit)
from aadd1d62084191bf2fb909a7dbedee628b197929 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 4 +-
CHANGELOG | 267 +++++++++
Makefile.am | 4 +-
configure.ac | 26 +-
doc/application-api-guide/api_guide_lines.dox | 6 +-
doc/platform-api-guide/Doxyfile | 5 +-
doc/process-guide/release-guide.adoc | 6 +-
example/generator/odp_generator.c | 4 +-
example/ipsec/odp_ipsec_cache.c | 1 +
example/ipsec/odp_ipsec_misc.h | 4 +-
example/ipsec/odp_ipsec_sa_db.c | 4 +-
example/ipsec/odp_ipsec_stream.c | 12 +-
example/l2fwd_simple/odp_l2fwd_simple.c | 5 +
example/l3fwd/odp_l3fwd.c | 7 +
example/switch/odp_switch.c | 5 +
helper/cuckootable.c | 1 +
helper/include/odp/helper/icmp.h | 11 +-
helper/include/odp/helper/ip.h | 3 +-
helper/include/odp/helper/strong_types.h | 3 +-
helper/include/odp/helper/table.h | 2 +-
helper/include/odp/helper/tcp.h | 35 +-
helper/include/odp/helper/threads.h | 7 +-
include/odp/api/spec/.gitignore | 1 +
include/odp/api/spec/classification.h | 4 +
include/odp/api/spec/crypto.h | 82 ++-
include/odp/api/spec/deprecated.h.in | 50 ++
include/odp/api/spec/hints.h | 6 -
include/odp/api/spec/packet.h | 12 +
include/odp/api/spec/packet_io.h | 36 ++
include/odp/api/spec/pool.h | 6 +
include/odp/api/spec/queue.h | 39 +-
include/odp/api/spec/system_info.h | 9 +
include/odp/api/spec/time.h | 13 -
include/odp/api/spec/traffic_mngr.h | 5 +-
include/odp_api.h | 1 +
platform/Makefile.inc | 5 +-
platform/linux-generic/Makefile.am | 6 +
platform/linux-generic/arch/arm/odp_cpu_arch.c | 16 +
.../linux-generic/arch/arm/odp_sysinfo_parse.c | 4 +
platform/linux-generic/arch/default/odp_cpu_arch.c | 16 +
.../linux-generic/arch/default/odp_sysinfo_parse.c | 4 +
platform/linux-generic/arch/mips64/odp_cpu_arch.c | 16 +
.../linux-generic/arch/mips64/odp_sysinfo_parse.c | 4 +
platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 16 +
.../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 4 +
platform/linux-generic/arch/x86/cpu_flags.c | 368 ++++++++++++
.../odp_errno_define.h => arch/x86/cpu_flags.h} | 12 +-
platform/linux-generic/arch/x86/odp_cpu_arch.c | 68 +++
.../linux-generic/arch/x86/odp_sysinfo_parse.c | 6 +
platform/linux-generic/include/odp/api/debug.h | 8 +
.../{odp_errno_define.h => odp/api/deprecated.h} | 8 +-
.../include/odp/api/plat/packet_types.h | 2 +-
.../include/odp/api/plat/time_types.h | 20 +-
.../include/odp/api/plat/traffic_mngr_types.h | 2 +-
.../linux-generic/include/odp_crypto_internal.h | 17 +-
platform/linux-generic/include/odp_internal.h | 1 +
.../linux-generic/include/odp_packet_internal.h | 45 +-
.../{odp_errno_define.h => odp_time_internal.h} | 16 +-
platform/linux-generic/include/protocols/ip.h | 3 +-
platform/linux-generic/odp_classification.c | 7 +-
platform/linux-generic/odp_crypto.c | 659 +++++++++++----------
platform/linux-generic/odp_packet.c | 409 ++++++-------
platform/linux-generic/odp_packet_flags.c | 111 ++--
platform/linux-generic/odp_packet_io.c | 15 +-
platform/linux-generic/odp_queue.c | 2 +
platform/linux-generic/odp_system_info.c | 30 +
platform/linux-generic/odp_time.c | 256 +++++---
platform/linux-generic/pktio/dpdk.c | 3 +-
platform/linux-generic/pktio/loop.c | 3 +-
platform/linux-generic/pktio/netmap.c | 3 +-
platform/linux-generic/pktio/pcap.c | 3 +-
platform/linux-generic/pktio/socket.c | 4 +-
platform/linux-generic/pktio/socket_mmap.c | 3 +-
platform/linux-generic/pktio/tap.c | 3 +-
test/common_plat/performance/odp_crypto.c | 62 +-
test/common_plat/performance/odp_l2fwd.c | 7 +
test/common_plat/performance/odp_l2fwd_run.sh | 3 +
test/common_plat/performance/odp_pktio_ordered.c | 5 +
test/common_plat/performance/odp_sched_latency.c | 18 +-
test/common_plat/validation/api/crypto/crypto.h | 6 +
.../validation/api/crypto/odp_crypto_test_inp.c | 457 ++++++++++++--
.../validation/api/crypto/test_vectors.h | 183 ++++--
.../validation/api/crypto/test_vectors_len.h | 18 +-
test/common_plat/validation/api/pktio/Makefile.am | 4 +-
test/common_plat/validation/api/pktio/parser.c | 545 +++++++++++++++++
test/common_plat/validation/api/pktio/parser.h | 180 ++++++
test/common_plat/validation/api/pktio/pktio.c | 7 +-
test/common_plat/validation/api/pktio/pktio.h | 3 +
test/common_plat/validation/api/queue/queue.c | 49 +-
.../validation/api/scheduler/scheduler.c | 20 +-
test/common_plat/validation/api/system/system.c | 8 +
test/common_plat/validation/api/system/system.h | 1 +
test/common_plat/validation/api/time/Makefile.am | 2 +-
test/common_plat/validation/api/time/time.c | 77 +--
test/common_plat/validation/api/time/time_main.c | 2 +-
.../validation/api/time/{time.h => time_test.h} | 2 -
96 files changed, 3448 insertions(+), 1075 deletions(-)
create mode 100644 include/odp/api/spec/deprecated.h.in
create mode 100644 platform/linux-generic/arch/x86/cpu_flags.c
copy platform/linux-generic/{include/odp_errno_define.h => arch/x86/cpu_flags.h} (58%)
copy platform/linux-generic/include/{odp_errno_define.h => odp/api/deprecated.h} (60%)
copy platform/linux-generic/include/{odp_errno_define.h => odp_time_internal.h} (52%)
create mode 100644 test/common_plat/validation/api/pktio/parser.c
create mode 100644 test/common_plat/validation/api/pktio/parser.h
rename test/common_plat/validation/api/time/{time.h => time_test.h} (92%)
hooks/post-receive
--
8 years, 7 months
- 1
- 0
[COMMIT] branch next updated. v1.14.0.0-164-g4bda1022
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, next has been updated
discards 8bb1a783339f875bc919791b6029635f8918c9c5 (commit)
discards 70b54b5ac484fffc736003a1ea561b8cd69f0802 (commit)
discards c2648b22ad805a9c84faca5eb114c78faf6a129e (commit)
discards 25e9897154f52f196b452ace7aa6a01899685c18 (commit)
discards 5b8a65b8c1e8bfbc4fc76e8622052ca74ed0f736 (commit)
discards 5c6f27c5d63acf7c2f90f7b5c36ec8669de86937 (commit)
discards bdab41b658cbc0be79d5066b49a9afd154ccce68 (commit)
discards 2b4d0c88d7c5fbd1dbe1923b1ca138b44736502c (commit)
discards c7ca407d0e0b6ce91ff2ba391a0adf2ca18d55de (commit)
discards b5a260b2a47d13fdfa844962725d52c8d7b17c68 (commit)
discards 929d0557c094b2be08fd73bdd7fa7825fa97e531 (commit)
discards db1d1138940913cb97e54078fb0770cfa31172df (commit)
discards 59a99cca904ebd8ab13afc6cda407cd20e9b756e (commit)
discards ee71755ca3e3214554078b47c601857e3c393a76 (commit)
discards 8373f9d777b4b0252fc5d06968626541be6a75a0 (commit)
discards ddcc942ae63f58e3a58e52fa6f5d8c596e625102 (commit)
discards d41fabee1b93fb36e62975cb990ae9dcd0df09e7 (commit)
discards 0813aef0afed59da392b8218b8d6d3777cd1777d (commit)
discards f5c6c9b775286010b5930f06b6d78b0a16ab2016 (commit)
discards a1a4a6ffb2303c796793518a5c54314ff050b9a7 (commit)
discards 6791bf590c93980e453c22ef14cadac1bb7cca16 (commit)
discards 2af9dab0c8bc89f50f0aae7b382d7cacec9218cf (commit)
discards 1f9edf2ed069f2ac73f197b5203226864fd79d8f (commit)
discards 7d4b87da4de62c2f53dc0f225a549eca38e87e9e (commit)
discards 425c921987a95bb2cc06f1fb5c186186d6811365 (commit)
discards 14274658296499a56dfcaf036e8b8291052ff620 (commit)
discards d30d34d638de147bf5eb2e7482135fe10e15f55c (commit)
discards b39467175ef49bc29e1cac251e7d71a89c4c525b (commit)
discards ef102ddff2338f5787536e32fb97cc66b2b8c8db (commit)
discards 726a46374cc9415a52072ddf034216dadd1add11 (commit)
discards 45a0fc8295a3e2fccdfc2cc1245b32ba32c5593b (commit)
discards 38f7ade803e099f5296c521dfb17c1450978dac4 (commit)
discards a68a9acec3e9b5802a388dc6fd726df50f381794 (commit)
discards 252849eec85c8dbbb895539a470b9b6c418cfdf9 (commit)
discards e4f19f20e564c525fa7cb90504297c65a1a72a2d (commit)
discards 7cdc4cc4ec63b65744094ae774724246c2852126 (commit)
discards c232a405d3ea8f51491cb8574315f98ecf128055 (commit)
discards c66da724061d7f78a1398baade2ac40658b8997b (commit)
discards aa2f7c3895fafbaa12228e86b264fe00921d187a (commit)
discards bca5843ca71b8f5ab221d2063ffc4ee303a43090 (commit)
discards 80d4cb134e4a98bcc603bdbdb7eb249de5848797 (commit)
discards 1c4f9921fa1a2b9ebf64d1b0ea11526d0f01b4ef (commit)
discards 7f070a2eb32a651704e4250e703fb9022d4f5144 (commit)
discards 603caf0548f9088068dc58b3ab7ff98e81aabe24 (commit)
discards 28bbfae1f52448da9c128ec31ec1bedcd6366071 (commit)
discards 4d958ef2cdff110bd111133d122d2008d72beae8 (commit)
discards 2c22b5d4645c21a5302a575e041d835c6294456f (commit)
discards 339c01bcd369dba5c9d850c3c5ac44162c902e3d (commit)
discards 802dc7745ce80188897201c753460a54347ea21e (commit)
discards bc90ff19d3e1ac90b28512e12d0396c9bacf48b0 (commit)
discards 545f86c6c63978b1ee490aebca49a1924243b217 (commit)
discards a1fba9580bbb6d3fd1842b59645a080599e49983 (commit)
discards d59537988eaebd01e4c1031c63006fc79c2014ff (commit)
discards a1752d95c4397d085c3e14abb3b589bdf6e36203 (commit)
discards ba0ac7d18ef207f7d4f47ae784b3e47de8f1ddca (commit)
discards 62c0592709cba045b68a6bcb031e3527ea8f9625 (commit)
discards 49c6360a0c0c952c383f37b5bb75b0dd667f7630 (commit)
discards 1b223e0bb8d91721c7f1e54ec8d0ff64d87fcf05 (commit)
discards fc5a5c617340384603b9065f3f6dd5f50141d91d (commit)
discards a13eecc4e4387a480c99d76a7726fbc792fdccda (commit)
discards 377d8619c68bc2a11278138eecef9cab970c9d09 (commit)
discards 0eeae7a4e377c1bd33a12a6623a4f864819c0703 (commit)
discards 56dbb72add9ac4c8f26fbd22dd2eed3c5c8ea603 (commit)
discards 76da04134e7eccb454e3dd4a81a0c42f466fd36b (commit)
discards 49a8dbdc7d0089a5a75c26ac85272187c812718f (commit)
discards 5e6ba45c67d420679bbffb6b8b7a9dbf0afe5127 (commit)
discards 8724ac00d93eb20fd10c139fe43bd1a2095cb24a (commit)
discards fbaf41b303c781a85ee2aafb407fff3e0387b61b (commit)
discards db496fcade3d2a826d257f1e9644cd9b458000b4 (commit)
discards 805e170ca1dbaaccd77a9382c430e0f0895a0b04 (commit)
discards 0668ad8eddbdb6929fafff3bdc553297cb687839 (commit)
discards 366e506fdd8e5eccddd539531b00be5b86d70777 (commit)
discards 5996ca618f25e42849ea48e04f105fa5a1012223 (commit)
discards e9cdcecbf297792bbbeeacea72673c0a0790177b (commit)
discards 6141a22cc643d91e39738810edcc0c26fcaa67aa (commit)
discards 49e70c6fd40b8167aef95bc630be0bbfbb19c13a (commit)
discards 0b4d301594b2c343605b0865ecb39016b4621961 (commit)
discards 00e0d72df592ab9e5fec8febf89746fb038b323a (commit)
via 4bda102286cf55b0bc93fdf8f8f276d5528fdf14 (commit)
via 452c37072103864d7117e31f521b5e620e4937b5 (commit)
via 0b5e8c6870b959ad9db426aa067326f4baad5d58 (commit)
via b5f5510a9751ad60915f5b9fcf8763a97f77b5ab (commit)
via 79ed8c746ba13233c111a61d2d4f17e360dd8023 (commit)
via 11a1d56876d14cd715a1906a95a7c3734999bdc0 (commit)
via 40c06707ed485e5e957a413d697f4f1370f98837 (commit)
via 1b8c663ecd3b8a7c34ae52163961cdb442383d31 (commit)
via e24f6b3d0c130af3838ba49661d4bc9cb83e940f (commit)
via 9815336c6c7c64df3b40a1fb0c1c668a36d5550b (commit)
via e5faf09d8dfa9631caa7ccf1461fd4bc9f69d4c0 (commit)
via e248b708ff31467591fb99f7cc8652ab9e3081b2 (commit)
via ff6d71903cdfdd68246e3daabedd645bf30640cc (commit)
via bddd9fb0a5353c611bb9de78f3355d30147f8efc (commit)
via 2156eaa076fe0ca0aaa910c8902d5b60aa3bbed6 (commit)
via ca1ebaa8319604d4f5fe303be7150b7278fe9d94 (commit)
via 8d4ecf491a0af45c499d38c6e72853e756d69f0e (commit)
via b93c17b30d051b114a099ed5219fb2a82f5a864c (commit)
via fec16fd81d4084340f0f9a6893c9772000608031 (commit)
via 2210dc7d26125ac9b8b51fa4de7b2b72e4e8f13e (commit)
via c3d3787ae527291e969a60bc54dd4e2ab220251d (commit)
via 14df663ba9534101305ea4f5201fc2a5e55a974f (commit)
via dcd53771432aeb838f2584458589b3430104abcf (commit)
via 3362bb0eea7b4cdeb97cd2558e9bc5e4ee176852 (commit)
via 2239b759ad0cb09e3a2ec3d132580123ed92ab03 (commit)
via a28dab7edeeee74db65349231ec400d92d491a22 (commit)
via e3a92c5bf48f2279cd4ef5c8d22eafc523445626 (commit)
via 93e9e20c17426d3262aa96a589106e635b755090 (commit)
via ab3003c87e4cc25e3b26c7bddbfbce61525a94ad (commit)
via 93ee286c21a576c265463ca5dcd17b39ef80962b (commit)
via 1ebbb8f882ae6506fc9fa2cb02dadae3d35eaf58 (commit)
via 1adf94727a92a260f3145c3c777cc8cf3ecb419b (commit)
via ad5d48fe658927a7b946533d50fd907e306ec184 (commit)
via ce8bebad45c590ad5b06d31d8be9fae8182f944a (commit)
via 8e9242391f79ed54430b5fdc37e992addf9a26b8 (commit)
via 0344270a085f78d9f6d4fbef3c497750bbcee071 (commit)
via 697c3be9b2155379dee458d66335442375a9354d (commit)
via 2ffff0bc3e07678214a413b5eb89da13e7624055 (commit)
via dfbab7438c8404d5f4af20086e2100d40a5ffc0c (commit)
via 60150bba495711e6fdfc948ffb4ad405878fbcbc (commit)
via fbe34c754b7abe15100779ce9833a7f200517d9f (commit)
via 62f95a564b7b3e08a32e6e72d234eb86292021d0 (commit)
via 17f4cddfcbf47f73761cb869ace264cc8444dc08 (commit)
via f54860c628c16c4f76d555b9d20c28e04af13751 (commit)
via a5116e42abf0452f5ad9fd1920d5377aa0ef36b6 (commit)
via 73954b9142d1ddc2dde7c0f9b6596e2d8bac3caf (commit)
via 89a00a2ed43a99e0d2d78a5baeff1292e41ecd34 (commit)
via 8f07f3de3da7961cd29046d2107f27a0f7391703 (commit)
via 4bb3025e76a81130e8e80cd582ae2433d3450e2b (commit)
via 629be2dd2d166ed1246b8c1982af3a55a7035657 (commit)
via af05215e26c99693c000981fddfaf3cdd2225e3f (commit)
via b9676fc5ba51d0f26a9c8c40f0b65a003113f1b5 (commit)
via 583dbc9adab460c926339353cc882095594b5b60 (commit)
via 867d8fc93d074005b52375995b9beed4a896c1ed (commit)
via 87b108d54a697b0c3704342ec7b4d484d04dfdbb (commit)
via 20d0d4d1a34725dec053ecd7cd46979345f7d625 (commit)
via 8367530231e7cd4c33c63b789a5ed8322b51e58f (commit)
via 48ad38ac169c48ac67e0758d3d45eb146255ed09 (commit)
via a074bc12f6a960c195daf3ceb28e3f717cfc3aa2 (commit)
via 4418eef8a7b7f621047101f284ce5e5df44f0239 (commit)
via 464fdc4efb4148dd8d1ec1aeaa2a7ffcb58d7faf (commit)
via 7394a5c8dead5edcfa5bda571aceba5945c91d16 (commit)
via 93afeeaf4e3dee3099830fccbb53bb32e64e3090 (commit)
via fdddf685fcad06f05f3788705968622b23a569ac (commit)
via 29b29677ed7d5d396f4aec1d0f3197efbf119113 (commit)
via 8c6ca3886ae4ffb111d3a81d09d21b68e0e11349 (commit)
via 19c488fdd9f9868cbe60f1ff8558f48c7bba6f04 (commit)
via 966c1c956a21f4e70c873a3c3546e65299837457 (commit)
via 99478ee923dfd8279a7a5149769aee49df315dde (commit)
via be9ca86f431d5eaab0702f7d76db60cd75982e15 (commit)
via 2b34cda253fd28f3b373dc3ee66753d47a0c9b33 (commit)
via 166e4e6a7f2e289f305203e75c68cea56d015c08 (commit)
via e149fb058c6ea718e22c77c6fc930141004dcba2 (commit)
via e6e666d533615de703993836b958514208de942a (commit)
via 8184de8ef8492a739d30c354628aada2e2bab366 (commit)
via 0ee227d51cdb1cc29853dac0376e6e02b6e585de (commit)
via 658f6f27ed62c651d8555a4de0ef103191c491b1 (commit)
via b8de7dfbadb10da65a0a675db5f588cc3998508a (commit)
via aadd1d62084191bf2fb909a7dbedee628b197929 (commit)
via 248ebf35eaf51d962e9d14a4e2c541d3cbc96268 (commit)
via 373f97f88d327ca0e211df33d6fcaad0b9188a1c (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (8bb1a783339f875bc919791b6029635f8918c9c5)
\
N -- N -- N (4bda102286cf55b0bc93fdf8f8f276d5528fdf14)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4bda102286cf55b0bc93fdf8f8f276d5528fdf14
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Jun 15 17:02:43 2017 +0300
travis: do not run performance test in parallel under coverage
Performance tests have some limits to detect if they pass or fail
but under coverage execution is slow, running tests in parallel is
also very slow. Without that patch scheduler test simetimes fails.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 7783f13a..50b3b9c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,7 @@ jobs:
script:
- ./bootstrap
- ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage"
- - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check -j ${nproc}
+ - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check
- find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy
- stage: test
env: TEST=distcheck
commit 452c37072103864d7117e31f521b5e620e4937b5
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Jun 15 16:04:55 2017 +0300
travis: add sudo run make check
make check has to be under root to validate pktio like
raw sockets. Also odp temporary files can overlap with
previous root run and permission to overwrite that files
is needed.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 669695d8..7783f13a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,7 @@ jobs:
script:
- ./bootstrap
- ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example --with-dpdk-path=`pwd`/dpdk/${TARGET} --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage"
- - make check -j $(nproc)
+ - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check -j ${nproc}
- find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy
- stage: test
env: TEST=distcheck
@@ -137,7 +137,7 @@ jobs:
script:
- ./bootstrap
- ./configure
- - make distcheck
+ - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck
- stage: test
env: TEST=doxygen
compiler: gcc
commit 0b5e8c6870b959ad9db426aa067326f4baad5d58
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Jun 14 23:45:31 2017 +0300
build: fix order of test execution
l2fwd perf test requires odp_generator from examples.
Make sure that examples already build when make check
is run.
https://bugs.linaro.org/show_bug.cgi?id=2938
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/Makefile.am b/Makefile.am
index 2a9a658d..daa49788 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,10 +8,10 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \
#@with_platform@ works alone in subdir but not as part of a path???
SUBDIRS = @platform_with_platform@ \
helper \
- test \
helper/test \
doc \
- example
+ example . \
+ test
@DX_RULES@
commit b5f5510a9751ad60915f5b9fcf8763a97f77b5ab
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Jun 14 16:50:13 2017 +0300
test: l2fwd pass under coverage
env variable TEST=coverage is set, use it to not fail
under gcov run which is really slow.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh
index dd42ede9..6871e4b0 100755
--- a/test/common_plat/performance/odp_l2fwd_run.sh
+++ b/test/common_plat/performance/odp_l2fwd_run.sh
@@ -96,6 +96,9 @@ run_l2fwd()
ret=1
elif [ $ret -eq 0 ]; then
PASS_PPS=5000
+ if [ "${TEST}" = "coverage" ]; then
+ PASS_PPS=10
+ fi
MAX_PPS=$(awk '/TEST RESULT/ {print $3}' $LOG)
if [ "$MAX_PPS" -lt "$PASS_PPS" ]; then
echo "FAIL: pps below threshold $MAX_PPS < $PASS_PPS"
commit 79ed8c746ba13233c111a61d2d4f17e360dd8023
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Jun 14 12:12:25 2017 -0500
changelog: add bug 3039 to list of bug fixes for v1.15
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/CHANGELOG b/CHANGELOG
index 25e90347..866e51e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -255,6 +255,9 @@ Travis: time main test out of boundaries
==== https://bugs.linaro.org/show_bug.cgi?id=3027[Bug 3027]
Compilation failures using GCC 7 series
+==== https://bugs.linaro.org/show_bug.cgi?id=3039[Bug 3039]
+Socket pktio recv fails on large number of packet
+
=== Known Issues
==== https://bugs.linaro.org/show_bug.cgi?id=3024[Bug 3024]
odp_traffic_mngr example is broken
commit 11a1d56876d14cd715a1906a95a7c3734999bdc0
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Sat Jun 10 10:03:40 2017 -0500
changelog: updates for odp v1.15.0.0
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/CHANGELOG b/CHANGELOG
index a550a723..25e90347 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,267 @@
+== OpenDataPlane (1.15.0.0)
+=== New Features
+ODP v1.15.0.0 continues the preview of Tiger Moth, introducing new APIs and
+extensions, as well as numerous bug fixes and functional improvements.
+
+==== Deprecation Framework
+To permit smoother evolution of the ODP API specification, a deprecation
+framework is introduced to permit controlled deprecation.
+
+When an ODP API or defined struct parameter is deprecated, ODP validation
+tests will be updated to no longer use that API and instead use the
+replacement API. By default, attempts to compile with the older API/feature
+will fail and applications wishing to move to the new ODP release should be
+updated to use the replacement API. To permit evaluation of new ODP
+releases in advance of such updating, however, ODP supports the `configure`
+option `--enable-deprecated`, which makes the obsolete APIs visible again.
+
+This feature will be used on a case-by-case basis and documented in the
+release notes for each release that introduces replacement API(s). In general
+the deprecated forms will not be maintained for more than a single release
+cycle. After that they will no longer be present in the API specification and
+the replacement forms must be used to compile with that level of the API
+specification.
+
+==== APIs
+A number of new and refined APIs are introduced in crypto, packet parsing,
+and queue configuration:
+
+===== Crypto Enhancements
+The ODP crypto APIs receive several enhancements in this release:
+
+====== New Authentication Algorithms
+Additional enumerations added for HMAC-SHA-1 and HMAC-SHA-512 authentication.
+
+====== Deprecated Cipher/Authentication Algorithms
+The following cipher/authentication algorithms have been deprecated in favor
+of newer replacement algorithms:
+
+* `ODP_CIPHER_ALG_AES128_CBC` is replaced by `ODP_CIPHER_ALG_AES_CBC`
+* `ODP_CIPHER_ALG_AES128_GCM` is replaced by `ODP_CIPHER_ALG_AES_GCM`
+* `ODP_AUTH_ALG_MD5_96` is replaced by `ODP_AUTH_ALG_MD5_HMAC`
+* `ODP_AUTH_ALG_SHA256_128` is replaced by `ODP_AUTH_ALG_SHA256_HMAC`
+* `ODP_AUTH_ALG_AES128_GCM1 is replaced by `ODP_AUTH_ALG_AES_GCM`
+
+====== Deprecated Name for Crypto Parameter struct
+`odp_crypto_op_params_t` is deprecated in favor of `odp_crypto_op_param_t`
+for consistency with other ODP `param` structs.
+
+====== Digest Length Session Parameter
+`odp_crypto_session_param_t` adds the field `auth_digest_len` to permit
+specification of the authentication digest length to be used for this
+session. The `odp_crypto_auth_capability()` API returns the list of
+supported digest lengths.
+
+====== Additional Authentication Data (AAD)
+The `odp_crypto_op_param_t` struct adds an optional pointer and length for
+AAD information. This allows applications to specify AAD information from
+the list of supported lengths provided by `odp_crypto_auth_capability()`.
+
+===== Packet Range Data
+The former `odp_crypto_data_range_t` type is deprecated and renamed to
+`odp_packet_data_range_t` since it can be used to specify ranges for other
+than crypto purposes.
+
+===== Parser Configuration
+Applications may now specify the maximum packet layer of interest. For
+example, a router may not care about anything beyond ISO Layer 3 in packets.
+This can be used by ODP implementations to control the depth of packet
+parsing needed by the application and may allow greater efficiency,
+especially in software implementations.
+
+This is controlled by a new `odp_pktio_parser_layer_t` enum that is
+part of the new `odp_pktio_parser_config_t` struct that is added to the
+`odp_pktio_config_t` struct used by the `odp_pktio_config()` API. The
+supported parser layers are also returned in this struct as part of the
+`odp_pktio_capability_t` struct returned by the `odp_pktio_capability()` API.
+
+===== Queue Size Parameter
+The `odp_queue_capability_t` struct returned by the `odp_queue_capability()`
+API is enhanced as follows:
+* The `max_queues` field is now defined to return the maximum number of event
+queues of any type.
+* New sub-structs (`plain` and `sched`) are added that detail the `max_num` of
+queues of that type supported as well as the new field `max_size` that
+specifies the maximum number of elements that each queue of this type can
+store. A value of zero for `max_num` indicates no fixed limit.
+
+In addition, the `odp_queue_param_t` passed to `odp_queue_create()` now adds
+a `size` field to allow applications to specify the minimum number of events
+that this queue should be able to store. A value of zero specified requests that
+the implementation default limits be used.
+
+The ODP examples have been updated to show this configuration, for example,
+the `l2fwd_simple` example does Layer 2 forwarding and hence doesn't need
+packets to be parsed beyond Layer 2. So prior to opening an interface via
+`odp_pktio_open()` the configuration processing now includes code of the form:
+[source,c]
+-----
+odp_pktio_config_init(&config);
+config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2;
+odp_pktio_config(pktio, &config);
+-----
+This serves as a hint to the ODP implementation that parsing beyond Layer 2
+is not required on this interface.
+
+===== Removal of `odp_time_to_u64()` API
+The `odp_time_to_u64()` API is removed without deprecation in this release.
+This is redundant since the `odp_time_to_ns()` API already returns a `uint64_t`
+value for `odp_time_t` and can be used for the same purpose.
+
+===== New `odp_sys_info_print()` API
+For debugging / diagnostic use, the `odp_sys_info_print()` API is added.
+This prints implementation defined information about the system and ODP
+environment and may contain information about CPUs, memory, and other
+hardware configuration.
+
+=== Helpers
+==== Linux Helpers
+ODP helper functions fall into two categories: system-independent, and those
+that rely on Linux. For backwards compatibility, these have been
+reorganized into a new `helper/linux` directory that is installed only when
+the `--enable-helper-linux` `configure` option is specified.
+
+=== `odp-linux` Performance
+==== Scheduler Improvements
+The default scheduler is streamlined by using precomputed weight tables and
+separated priority queues for different scheduling groups. This improves
+both latency and scalability.
+
+Also included in this change, the default number of scheduling groups is
+lowered from 256 to 32, which experience has shown is sufficient for most
+applications.
+
+The scheduler fairness checks are also enhanced to avoid low priority event
+starvation if `CONFIG_BURST_SIZE` is set to 1.
+
+=== `odp_linux` Crypto Improvements
+* Errors in implicit packet copy operations performed during crypto operation
+are now handled properly.
+* If `odp_crypto_session_create()` fails, proper cleanup is now performed to
+avoid memory leaks.
+* The auth digest len is now used when calculating HMACs, and full-length
+digests are now added to supported SHA capabilities.
+* Numerous crypto functions have been rewritten to use the OpenSSL `EVP_`
+functions for improved efficiency and accuracy.
+
+=== `odp-linux` Packet Improvements
+* The packet parser now recognizes ICMPv6 packets in addition to ICMPv4.
+
+=== `odp-linux` PktIO Improvements
+* The `ethtool` and `socket` drivers add additional initializations to avoid
+valgrind warnings.
+* The `dpdk` driver is upgraded to DPDK 17.02 and is now also built with the
+`--whole-archive` option, which means that PMDs no longer need to be linked
+individually but are automatically included in builds that make use of DPDK
+pktio support.
+
+=== `odp-linux` Time Improvements
+* The ODP Time APIs are now more efficiently handled by replacing the previous
+Linux timespec with simple nanoseconds (ns) and using native hardware time
+counters in x86 and ARM environments, when available.
+
+=== `odp-linux` Traffic Manager Improvements
+* Weighting is now handled properly when weight=1 is specified. Previously
+this caused an overflow that distorted packet priorities.
+
+=== Miscellaneous Fixes and Improvements
+==== Native Clang build on ARMv8
+ARMv8 compilation now works properly when using the clang compiler.
+
+==== Test Improvements
+* The `odp_scheduling` performance test now handles dequeueing from
+potentially concurrent queues properly.
+* The traffic manager and time tests are now invoked via scripts to better
+account for load-sensitivity when running regressions in CI environments.
+* The l2fwd test now supports an additional parameter to specify the number
+of scheduling groups to use in the test.
+* The `odp_sched_latency` performance test now handles queue draining in
+a robust manner.
+* The crypto validation tests now properly check and validate message digests,
+and include negative tests to verify that incorrect digests are properly
+flagged. Note that this may expose omissions in other ODP implementations that
+had previously passed this validation test.
+* The crypto validation test now adds an explicit test for the NULL cipher,
+as well as HMAC-SHA-1 and HMAC-SHA-512.
+* The pktio_ipc test now properly cleans up only its own temp files.
+
+==== Examples Improvements
+* The `odp_generator` example now properly honors stop criteria based on
+number of packets sent.
+* The `odp_generator` example now properly flushes output messages
+* The `odp_generator` example now supports port configuration.
+
+=== Bug Fixes
+==== https://bugs.linaro.org/show_bug.cgi?id=2416[Bug 2416]
+example/generator/odp_generator.c contains todo items
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2779[Bug 2779]
+Error handling issues (CHECKED_RETURN)
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2826[Bug 2826]
+Unchecked return in pool.c
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2831[Bug 2831]
+Unchecked return in mmap_unmap_sock()
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2852[Bug 2852]
+ODP_STATIC_ASSERT() fails when used by C++
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2872[Bug 2872]
+odp_pktio_ordered_run.sh: line 34: integer expression expected
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2881[Bug 2881]
+load sensitive tests fail on CI
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2895[Bug 2895]
+The `odp_crypto_operation()` routine does not work with multi-segment packets.
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2908[Bug 2908]
+Packet validation test fails if implementation does not limit packet length
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2910[Bug 2910]
+odph_iplookup_table_put_value() uses overlapping pointer addresses
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2933[Bug 2933]
+Miss to call unlock if there are some errors happen in loopback_send() function
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2940[Bug 2940]
+`odp_packet_seg_t` fails ABI compatibility between odp-linux and odp-dpdk
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2942[Bug 2942]
+Compilation fails using clang 4.0.0
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2952[Bug 2952]
+doxygen errors and travis does not catch them
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2969[Bug 2969]
+TM validation test does find traffic_mngr_main
+
+==== https://bugs.linaro.org/show_bug.cgi?id=2974[Bug 2974]
+`odp_rwlock_read_trylock()` fails if lock is already held for read access
+
+==== https://bugs.linaro.org/show_bug.cgi?id=3002[Bug 3002]
+Packet order lost when enqueuing to pktout queue
+
+==== https://bugs.linaro.org/show_bug.cgi?id=3003[Bug 3003]
+AES-GCM returns 'valid' tag when checking invalid tag
+
+==== https://bugs.linaro.org/show_bug.cgi?id=3013[Bug 3013]
+Various failures if CONFIG_PACKET_MAX_SEGS is set to 1
+
+==== https://bugs.linaro.org/show_bug.cgi?id=3017[Bug 3017]
+Travis: time main test out of boundaries
+
+==== https://bugs.linaro.org/show_bug.cgi?id=3027[Bug 3027]
+Compilation failures using GCC 7 series
+
+=== Known Issues
+==== https://bugs.linaro.org/show_bug.cgi?id=3024[Bug 3024]
+odp_traffic_mngr example is broken
+
+==== https://bugs.linaro.org/show_bug.cgi?id=3026[Bug 3026]
+pktio_ips_run test can fail due to segfault
+
== OpenDataPlane (1.14.0.0)
=== New Features
==== APIs
commit 40c06707ed485e5e957a413d697f4f1370f98837
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Jun 2 15:58:52 2017 +0300
update API version number from v1.14.0.0 to v1.15.0.0
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 4f44f8f6..46c7bbd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.5])
# Set correct API version
##########################################################################
m4_define([odpapi_generation_version], [1])
-m4_define([odpapi_major_version], [14])
+m4_define([odpapi_major_version], [15])
m4_define([odpapi_minor_version], [0])
m4_define([odpapi_point_version], [0])
m4_define([odpapi_version],
@@ -39,10 +39,10 @@ AM_SILENT_RULES([yes])
# 3. if interfaces were removed, then use C+1:0:0
##########################################################################
-ODP_LIBSO_VERSION=114:0:1
+ODP_LIBSO_VERSION=115:0:2
AC_SUBST(ODP_LIBSO_VERSION)
-ODPHELPER_LIBSO_VERSION=112:0:0
+ODPHELPER_LIBSO_VERSION=112:1:0
AC_SUBST(ODPHELPER_LIBSO_VERSION)
# Checks for programs.
commit 1b8c663ecd3b8a7c34ae52163961cdb442383d31
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Mon Jun 5 22:22:19 2017 -0500
api: crypto: correct documentation typos
Correct odp_crypto_auth_capa() to odp_crypto_auth_capability() in
several places in the spec doxygen.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Yi He <yi.he(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 c47d3149..470cba05 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -296,13 +296,13 @@ typedef struct odp_crypto_session_param_t {
/** Authentication key
*
- * Use odp_crypto_auth_capa() for supported key lengths.
+ * Use odp_crypto_auth_capability() for supported key lengths.
*/
odp_crypto_key_t auth_key;
/** Authentication digest length in bytes
*
- * Use odp_crypto_auth_capa() for supported digest lengths.
+ * Use odp_crypto_auth_capability() for supported digest lengths.
*/
uint32_t auth_digest_len;
@@ -377,7 +377,7 @@ typedef struct odp_crypto_op_param_t {
/** Pointer to ADD */
uint8_t *ptr;
- /** AAD length in bytes. Use odp_crypto_auth_capa() for
+ /** AAD length in bytes. Use odp_crypto_auth_capability() for
* supported AAD lengths. */
uint32_t length;
} aad;
commit e24f6b3d0c130af3838ba49661d4bc9cb83e940f
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Fri Jun 2 16:24:49 2017 -0500
linux-generic: time: add additional doxygen doc for time type
Latest doxygen requires all items to be documented so add doxygen for
enclosing union around variant time types.
Signed-off-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/time_types.h b/platform/linux-generic/include/odp/api/plat/time_types.h
index 71e354e6..e7111c8c 100644
--- a/platform/linux-generic/include/odp/api/plat/time_types.h
+++ b/platform/linux-generic/include/odp/api/plat/time_types.h
@@ -26,6 +26,7 @@ extern "C" {
* implementations.
*/
typedef struct odp_time_t {
+ /** @internal Variant mappings for time type */
union {
/** @internal Used with generic 64 bit operations */
uint64_t u64;
commit 9815336c6c7c64df3b40a1fb0c1c668a36d5550b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:39 2017 +0300
linux-generic: crypto: add HMAC-SHA-512 authentication support
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 3117f65d..6fc1907d 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -69,6 +69,10 @@ static const odp_crypto_auth_capability_t auth_capa_sha256_hmac[] = {
{.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} },
{.digest_len = 32, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+static const odp_crypto_auth_capability_t auth_capa_sha512_hmac[] = {
+{.digest_len = 32, .key_len = 64, .aad_len = {.min = 0, .max = 0, .inc = 0} },
+{.digest_len = 64, .key_len = 64, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+
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} } };
@@ -555,7 +559,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.md5_hmac = 1;
capa->auths.bit.sha1_hmac = 1;
capa->auths.bit.sha256_hmac = 1;
- capa->auths.bit.sha512_hmac = 0;
+ capa->auths.bit.sha512_hmac = 1;
capa->auths.bit.aes_gcm = 1;
#if ODP_DEPRECATED_API
@@ -636,6 +640,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
src = auth_capa_sha256_hmac;
num = sizeof(auth_capa_sha256_hmac) / size;
break;
+ case ODP_AUTH_ALG_SHA512_HMAC:
+ src = auth_capa_sha512_hmac;
+ num = sizeof(auth_capa_sha512_hmac) / size;
+ break;
case ODP_AUTH_ALG_AES_GCM:
src = auth_capa_aes_gcm;
num = sizeof(auth_capa_aes_gcm) / size;
@@ -761,6 +769,9 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
case ODP_AUTH_ALG_SHA256_HMAC:
rc = process_auth_param(session, 32, EVP_sha256());
break;
+ case ODP_AUTH_ALG_SHA512_HMAC:
+ rc = process_auth_param(session, 64, EVP_sha512());
+ break;
#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_AES128_GCM:
if (param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM)
commit e5faf09d8dfa9631caa7ccf1461fd4bc9f69d4c0
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:38 2017 +0300
linux-generic: crypto: add SHA-1 authentication support
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 9e5a1190..3117f65d 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -61,6 +61,10 @@ static const odp_crypto_auth_capability_t auth_capa_md5_hmac[] = {
{.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} } };
+static const odp_crypto_auth_capability_t auth_capa_sha1_hmac[] = {
+{.digest_len = 12, .key_len = 20, .aad_len = {.min = 0, .max = 0, .inc = 0} },
+{.digest_len = 20, .key_len = 20, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+
static const odp_crypto_auth_capability_t auth_capa_sha256_hmac[] = {
{.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} },
{.digest_len = 32, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
@@ -549,7 +553,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.null = 1;
capa->auths.bit.md5_hmac = 1;
- capa->auths.bit.sha1_hmac = 0;
+ capa->auths.bit.sha1_hmac = 1;
capa->auths.bit.sha256_hmac = 1;
capa->auths.bit.sha512_hmac = 0;
capa->auths.bit.aes_gcm = 1;
@@ -624,6 +628,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
src = auth_capa_md5_hmac;
num = sizeof(auth_capa_md5_hmac) / size;
break;
+ case ODP_AUTH_ALG_SHA1_HMAC:
+ src = auth_capa_sha1_hmac;
+ num = sizeof(auth_capa_sha1_hmac) / size;
+ break;
case ODP_AUTH_ALG_SHA256_HMAC:
src = auth_capa_sha256_hmac;
num = sizeof(auth_capa_sha256_hmac) / size;
@@ -741,6 +749,9 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
case ODP_AUTH_ALG_MD5_HMAC:
rc = process_auth_param(session, 16, EVP_md5());
break;
+ case ODP_AUTH_ALG_SHA1_HMAC:
+ rc = process_auth_param(session, 20, EVP_sha1());
+ break;
#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_SHA256_128:
/* Fixed digest tag length with deprecated algo */
commit e248b708ff31467591fb99f7cc8652ab9e3081b2
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:37 2017 +0300
validation: crypto: add HMAC-SHA-512 test cases
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h
index 84e67379..dd15b448 100644
--- a/test/common_plat/validation/api/crypto/crypto.h
+++ b/test/common_plat/validation/api/crypto/crypto.h
@@ -30,7 +30,8 @@ void crypto_test_gen_alg_hmac_sha1(void);
void crypto_test_check_alg_hmac_sha1(void);
void crypto_test_gen_alg_hmac_sha256(void);
void crypto_test_check_alg_hmac_sha256(void);
-void crypto_test_alg_hmac_sha512(void);
+void crypto_test_gen_alg_hmac_sha512(void);
+void crypto_test_check_alg_hmac_sha512(void);
/* test arrays: */
extern odp_testinfo_t crypto_suite[];
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 6129d82d..ae600e23 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -32,6 +32,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth)
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";
default:
@@ -139,6 +141,9 @@ static void alg_test(odp_crypto_op_t op,
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);
@@ -1391,9 +1396,106 @@ static int check_alg_hmac_sha512(void)
return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA512_HMAC);
}
-void crypto_test_alg_hmac_sha512(void)
+/* 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.
+ * */
+void crypto_test_gen_alg_hmac_sha512(void)
{
- printf(" TEST NOT IMPLEMENTED YET ");
+ odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
+ auth_key = { .data = NULL, .length = 0 };
+ odp_crypto_iv_t iv = { .data = NULL, .length = 0 };
+
+ unsigned int test_vec_num = (sizeof(hmac_sha512_reference_length) /
+ sizeof(hmac_sha512_reference_length[0]));
+
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ auth_key.data = hmac_sha512_reference_key[i];
+ auth_key.length = sizeof(hmac_sha512_reference_key[i]);
+
+ if (!check_auth_options(ODP_AUTH_ALG_SHA512_HMAC,
+ auth_key.length,
+ HMAC_SHA512_256_CHECK_LEN))
+ continue;
+
+ alg_test(ODP_CRYPTO_OP_ENCODE,
+ 0,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ iv.data,
+ cipher_key,
+ ODP_AUTH_ALG_SHA512_HMAC,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ hmac_sha512_reference_plaintext[i],
+ hmac_sha512_reference_length[i],
+ NULL, 0,
+ hmac_sha512_reference_digest[i],
+ HMAC_SHA512_256_CHECK_LEN);
+ }
+}
+
+void crypto_test_check_alg_hmac_sha512(void)
+{
+ odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
+ auth_key = { .data = NULL, .length = 0 };
+ odp_crypto_iv_t iv = { .data = NULL, .length = 0 };
+ uint8_t wrong_digest[HMAC_SHA512_DIGEST_LEN];
+
+ unsigned int test_vec_num = (sizeof(hmac_sha512_reference_length) /
+ sizeof(hmac_sha512_reference_length[0]));
+
+ unsigned int i;
+
+ memset(wrong_digest, 0xa5, sizeof(wrong_digest));
+
+ for (i = 0; i < test_vec_num; i++) {
+ auth_key.data = hmac_sha512_reference_key[i];
+ auth_key.length = sizeof(hmac_sha512_reference_key[i]);
+
+ if (!check_auth_options(ODP_AUTH_ALG_SHA512_HMAC,
+ auth_key.length,
+ HMAC_SHA512_256_CHECK_LEN))
+ continue;
+
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ 0,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ iv.data,
+ cipher_key,
+ ODP_AUTH_ALG_SHA512_HMAC,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ hmac_sha512_reference_plaintext[i],
+ hmac_sha512_reference_length[i],
+ NULL, 0,
+ hmac_sha512_reference_digest[i],
+ HMAC_SHA512_256_CHECK_LEN);
+
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ 1,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ iv.data,
+ cipher_key,
+ ODP_AUTH_ALG_SHA512_HMAC,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ hmac_sha512_reference_plaintext[i],
+ hmac_sha512_reference_length[i],
+ NULL, 0,
+ wrong_digest,
+ HMAC_SHA512_256_CHECK_LEN);
+ }
}
int crypto_suite_sync_init(void)
@@ -1461,7 +1563,9 @@ odp_testinfo_t crypto_suite[] = {
check_alg_hmac_sha256),
ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha256,
check_alg_hmac_sha256),
- ODP_TEST_INFO_CONDITIONAL(crypto_test_alg_hmac_sha512,
+ 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_NULL,
};
diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h
index 1de54964..bd8bf347 100644
--- a/test/common_plat/validation/api/crypto/test_vectors.h
+++ b/test/common_plat/validation/api/crypto/test_vectors.h
@@ -397,4 +397,54 @@ static uint8_t hmac_sha1_reference_digest[][HMAC_SHA1_DIGEST_LEN] = {
0x11, 0xcd, 0x91, 0xa3, 0x9a, 0xf4 },
};
+static uint8_t hmac_sha512_reference_key[][HMAC_SHA512_KEY_LEN] = {
+ { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b },
+
+ /* "Jefe" */
+ { 0x4a, 0x65, 0x66, 0x65 },
+
+ { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ 0xaa, 0xaa, 0xaa, 0xaa }
+};
+
+static uint32_t hmac_sha512_reference_length[] = { 8, 28, 50 };
+
+static uint8_t
+hmac_sha512_reference_plaintext[][HMAC_SHA512_MAX_DATA_LEN] = {
+ /* "Hi There" */
+ { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65},
+
+ /* what do ya want for nothing?*/
+ { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20,
+ 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20,
+ 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68,
+ 0x69, 0x6e, 0x67, 0x3f },
+
+ { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd }
+};
+
+static uint8_t hmac_sha512_reference_digest[][HMAC_SHA512_DIGEST_LEN] = {
+ { 0x87, 0xaa, 0x7c, 0xde, 0xa5, 0xef, 0x61, 0x9d,
+ 0x4f, 0xf0, 0xb4, 0x24, 0x1a, 0x1d, 0x6c, 0xb0,
+ 0x23, 0x79, 0xf4, 0xe2, 0xce, 0x4e, 0xc2, 0x78,
+ 0x7a, 0xd0, 0xb3, 0x05, 0x45, 0xe1, 0x7c, 0xde },
+
+ { 0x16, 0x4b, 0x7a, 0x7b, 0xfc, 0xf8, 0x19, 0xe2,
+ 0xe3, 0x95, 0xfb, 0xe7, 0x3b, 0x56, 0xe0, 0xa3,
+ 0x87, 0xbd, 0x64, 0x22, 0x2e, 0x83, 0x1f, 0xd6,
+ 0x10, 0x27, 0x0c, 0xd7, 0xea, 0x25, 0x05, 0x54 },
+
+ { 0xfa, 0x73, 0xb0, 0x08, 0x9d, 0x56, 0xa2, 0x84,
+ 0xef, 0xb0, 0xf0, 0x75, 0x6c, 0x89, 0x0b, 0xe9,
+ 0xb1, 0xb5, 0xdb, 0xdd, 0x8e, 0xe8, 0x1a, 0x36,
+ 0x55, 0xf8, 0x3e, 0x33, 0xb2, 0x27, 0x9d, 0x39 }
+};
+
#endif
diff --git a/test/common_plat/validation/api/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h
index 5c3ddcee..20a7ddba 100644
--- a/test/common_plat/validation/api/crypto/test_vectors_len.h
+++ b/test/common_plat/validation/api/crypto/test_vectors_len.h
@@ -41,4 +41,10 @@
#define HMAC_SHA1_DIGEST_LEN 20
#define HMAC_SHA1_96_CHECK_LEN 12
+/* HMAC-SHA512 */
+#define HMAC_SHA512_KEY_LEN 64
+#define HMAC_SHA512_MAX_DATA_LEN 128
+#define HMAC_SHA512_DIGEST_LEN 64
+#define HMAC_SHA512_256_CHECK_LEN 32
+
#endif
commit ff6d71903cdfdd68246e3daabedd645bf30640cc
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:36 2017 +0300
validation: crypto: add HMAC-SHA-1 test cases
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h
index 2a491c3c..84e67379 100644
--- a/test/common_plat/validation/api/crypto/crypto.h
+++ b/test/common_plat/validation/api/crypto/crypto.h
@@ -26,7 +26,8 @@ void crypto_test_dec_alg_aes128_gcm(void);
void crypto_test_dec_alg_aes128_gcm_ovr_iv(void);
void crypto_test_gen_alg_hmac_md5(void);
void crypto_test_check_alg_hmac_md5(void);
-void crypto_test_alg_hmac_sha1(void);
+void crypto_test_gen_alg_hmac_sha1(void);
+void crypto_test_check_alg_hmac_sha1(void);
void crypto_test_gen_alg_hmac_sha256(void);
void crypto_test_check_alg_hmac_sha256(void);
void crypto_test_alg_hmac_sha512(void);
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 4d8f7b54..6129d82d 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -28,6 +28,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth)
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_AES_GCM:
@@ -131,6 +133,9 @@ static void alg_test(odp_crypto_op_t op,
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;
@@ -1167,6 +1172,113 @@ void crypto_test_check_alg_hmac_md5(void)
}
}
+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.
+ * */
+void crypto_test_gen_alg_hmac_sha1(void)
+{
+ odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
+ auth_key = { .data = NULL, .length = 0 };
+ odp_crypto_iv_t iv = { .data = NULL, .length = 0 };
+
+ unsigned int test_vec_num = (sizeof(hmac_sha1_reference_length) /
+ sizeof(hmac_sha1_reference_length[0]));
+
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ auth_key.data = hmac_sha1_reference_key[i];
+ auth_key.length = sizeof(hmac_sha1_reference_key[i]);
+
+ if (!check_auth_options(ODP_AUTH_ALG_SHA1_HMAC,
+ auth_key.length,
+ HMAC_SHA1_96_CHECK_LEN))
+ continue;
+
+ alg_test(ODP_CRYPTO_OP_ENCODE,
+ 0,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ iv.data,
+ cipher_key,
+ ODP_AUTH_ALG_SHA1_HMAC,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ hmac_sha1_reference_plaintext[i],
+ hmac_sha1_reference_length[i],
+ NULL, 0,
+ hmac_sha1_reference_digest[i],
+ HMAC_SHA1_96_CHECK_LEN);
+ }
+}
+
+void crypto_test_check_alg_hmac_sha1(void)
+{
+ odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
+ auth_key = { .data = NULL, .length = 0 };
+ odp_crypto_iv_t iv = { .data = NULL, .length = 0 };
+ uint8_t wrong_digest[HMAC_SHA1_DIGEST_LEN];
+
+ unsigned int test_vec_num = (sizeof(hmac_sha1_reference_length) /
+ sizeof(hmac_sha1_reference_length[0]));
+
+ unsigned int i;
+
+ memset(wrong_digest, 0xa5, sizeof(wrong_digest));
+
+ for (i = 0; i < test_vec_num; i++) {
+ auth_key.data = hmac_sha1_reference_key[i];
+ auth_key.length = sizeof(hmac_sha1_reference_key[i]);
+
+ if (!check_auth_options(ODP_AUTH_ALG_SHA1_HMAC,
+ auth_key.length,
+ HMAC_SHA1_96_CHECK_LEN))
+ continue;
+
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ 0,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ iv.data,
+ cipher_key,
+ ODP_AUTH_ALG_SHA1_HMAC,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ hmac_sha1_reference_plaintext[i],
+ hmac_sha1_reference_length[i],
+ NULL, 0,
+ hmac_sha1_reference_digest[i],
+ HMAC_SHA1_96_CHECK_LEN);
+
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ 1,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ iv.data,
+ cipher_key,
+ ODP_AUTH_ALG_SHA1_HMAC,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ hmac_sha1_reference_plaintext[i],
+ hmac_sha1_reference_length[i],
+ NULL, 0,
+ wrong_digest,
+ HMAC_SHA1_96_CHECK_LEN);
+ }
+}
+
static int check_alg_hmac_sha256(void)
{
return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA256_HMAC);
@@ -1274,16 +1386,6 @@ void crypto_test_check_alg_hmac_sha256(void)
}
}
-static int check_alg_hmac_sha1(void)
-{
- return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA1_HMAC);
-}
-
-void crypto_test_alg_hmac_sha1(void)
-{
- printf(" TEST NOT IMPLEMENTED YET ");
-}
-
static int check_alg_hmac_sha512(void)
{
return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA512_HMAC);
@@ -1351,7 +1453,9 @@ odp_testinfo_t crypto_suite[] = {
check_alg_hmac_md5),
ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_md5,
check_alg_hmac_md5),
- ODP_TEST_INFO_CONDITIONAL(crypto_test_alg_hmac_sha1,
+ 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),
diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h
index 6d568b91..1de54964 100644
--- a/test/common_plat/validation/api/crypto/test_vectors.h
+++ b/test/common_plat/validation/api/crypto/test_vectors.h
@@ -353,4 +353,48 @@ static uint32_t hmac_sha256_reference_digest_length[] = {
16, 16, 16
};
+static uint8_t hmac_sha1_reference_key[][HMAC_SHA1_KEY_LEN] = {
+ { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b },
+
+ /* "Jefe" */
+ { 0x4a, 0x65, 0x66, 0x65 },
+
+ { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ 0xaa, 0xaa, 0xaa, 0xaa }
+};
+
+static uint32_t hmac_sha1_reference_length[] = { 8, 28, 50 };
+
+static uint8_t
+hmac_sha1_reference_plaintext[][HMAC_SHA1_MAX_DATA_LEN] = {
+ /* "Hi There" */
+ { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65},
+
+ /* what do ya want for nothing?*/
+ { 0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20,
+ 0x79, 0x61, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20,
+ 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x68,
+ 0x69, 0x6e, 0x67, 0x3f },
+
+ { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd }
+};
+
+static uint8_t hmac_sha1_reference_digest[][HMAC_SHA1_DIGEST_LEN] = {
+ { 0xb6, 0x17, 0x31, 0x86, 0x55, 0x05,
+ 0x72, 0x64, 0xe2, 0x8b, 0xc0, 0xb6 },
+
+ { 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb,
+ 0x2f, 0xa2, 0xd2, 0x74, 0x16, 0xd5 },
+
+ { 0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac,
+ 0x11, 0xcd, 0x91, 0xa3, 0x9a, 0xf4 },
+};
+
#endif
diff --git a/test/common_plat/validation/api/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h
index c1521dd7..5c3ddcee 100644
--- a/test/common_plat/validation/api/crypto/test_vectors_len.h
+++ b/test/common_plat/validation/api/crypto/test_vectors_len.h
@@ -35,4 +35,10 @@
#define HMAC_SHA256_MAX_DATA_LEN 128
#define HMAC_SHA256_DIGEST_LEN 32
+/* HMAC-SHA1 */
+#define HMAC_SHA1_KEY_LEN 20
+#define HMAC_SHA1_MAX_DATA_LEN 128
+#define HMAC_SHA1_DIGEST_LEN 20
+#define HMAC_SHA1_96_CHECK_LEN 12
+
#endif
commit bddd9fb0a5353c611bb9de78f3355d30147f8efc
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:35 2017 +0300
validation: crypto: add tests for NULL cipher
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h
index 4d810f62..2a491c3c 100644
--- a/test/common_plat/validation/api/crypto/crypto.h
+++ b/test/common_plat/validation/api/crypto/crypto.h
@@ -10,6 +10,8 @@
#include "odp_cunit_common.h"
/* test functions: */
+void crypto_test_enc_alg_null(void);
+void crypto_test_dec_alg_null(void);
void crypto_test_enc_alg_3des_cbc(void);
void crypto_test_enc_alg_3des_cbc_ovr_iv(void);
void crypto_test_dec_alg_3des_cbc(void);
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 470c5bc5..4d8f7b54 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -430,6 +430,73 @@ static int check_auth_options(odp_auth_alg_t auth, uint32_t key_len,
return 1;
}
+static int check_alg_null(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_NULL);
+}
+
+void crypto_test_enc_alg_null(void)
+{
+ odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
+ auth_key = { .data = NULL, .length = 0 };
+ odp_crypto_iv_t iv = { .data = NULL, .length = 0};
+ unsigned int test_vec_num = (sizeof(null_reference_length) /
+ sizeof(null_reference_length[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ if (!check_cipher_options(ODP_CIPHER_ALG_NULL,
+ cipher_key.length, iv.length))
+ continue;
+
+ alg_test(ODP_CRYPTO_OP_ENCODE,
+ 0,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ NULL,
+ cipher_key,
+ ODP_AUTH_ALG_NULL,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ null_reference_plaintext[i],
+ null_reference_length[i],
+ null_reference_plaintext[i],
+ null_reference_length[i], NULL, 0);
+ }
+}
+
+void crypto_test_dec_alg_null(void)
+{
+ odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
+ auth_key = { .data = NULL, .length = 0 };
+ odp_crypto_iv_t iv = { .data = NULL, .length = 0 };
+ unsigned int test_vec_num = (sizeof(null_reference_length) /
+ sizeof(null_reference_length[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ if (!check_cipher_options(ODP_CIPHER_ALG_NULL,
+ cipher_key.length, iv.length))
+ continue;
+
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ 0,
+ ODP_CIPHER_ALG_NULL,
+ iv,
+ NULL,
+ cipher_key,
+ ODP_AUTH_ALG_NULL,
+ auth_key,
+ NULL, NULL,
+ NULL, 0,
+ null_reference_plaintext[i],
+ null_reference_length[i],
+ null_reference_plaintext[i],
+ null_reference_length[i], NULL, 0);
+ }
+}
+
static int check_alg_3des_cbc(void)
{
return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL);
@@ -1252,6 +1319,10 @@ int crypto_suite_async_init(void)
}
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,
diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h
index 0d36c249..6d568b91 100644
--- a/test/common_plat/validation/api/crypto/test_vectors.h
+++ b/test/common_plat/validation/api/crypto/test_vectors.h
@@ -8,6 +8,18 @@
#define _ODP_TEST_CRYPTO_VECTORS_H_
#include "test_vectors_len.h"
+
+/** length in bytes */
+static uint32_t null_reference_length[] = { 8, 16 };
+
+static uint8_t
+null_reference_plaintext[][NULL_MAX_DATA_LEN] = {
+ {0x32, 0x6a, 0x49, 0x4c, 0xd3, 0x3f, 0xe7, 0x56},
+
+ {0x84, 0x40, 0x1f, 0x78, 0xfe, 0x6c, 0x10, 0x87, 0x6d, 0x8e, 0xa2, 0x30,
+ 0x94, 0xea, 0x53, 0x09}
+};
+
/* TDES-CBC reference vectors, according to
* "http://csrc.nist.gov/groups/STM/cavp/documents/des/DESMMT.pdf"
*/
diff --git a/test/common_plat/validation/api/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h
index 80fd927b..c1521dd7 100644
--- a/test/common_plat/validation/api/crypto/test_vectors_len.h
+++ b/test/common_plat/validation/api/crypto/test_vectors_len.h
@@ -6,6 +6,9 @@
#ifndef TEST_VECTORS_LEN_
#define TEST_VECTORS_LEN_
+/* NULL */
+#define NULL_MAX_DATA_LEN 16
+
/* TDES-CBC */
#define TDES_CBC_KEY_LEN 24
#define TDES_CBC_IV_LEN 8
commit 2156eaa076fe0ca0aaa910c8902d5b60aa3bbed6
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:34 2017 +0300
crypto: linux-generic: add capabilities for CIPHER_NULL and AUTH_NULL
There is no point in having separate cases for NULL algorithms. Add
capabilities returning 0 key/digest/iv length.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 32fece30..9e5a1190 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -34,6 +34,9 @@
*
* Keep sorted: first by key length, then by IV length
*/
+static const odp_crypto_cipher_capability_t cipher_capa_null[] = {
+{.key_len = 0, .iv_len = 0} };
+
static const odp_crypto_cipher_capability_t cipher_capa_des[] = {
{.key_len = 24, .iv_len = 8} };
@@ -51,6 +54,9 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = {
*
* Keep sorted: first by digest length, then by key length
*/
+static const odp_crypto_auth_capability_t auth_capa_null[] = {
+{.digest_len = 0, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+
static const odp_crypto_auth_capability_t auth_capa_md5_hmac[] = {
{.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} } };
@@ -571,8 +577,8 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
switch (cipher) {
case ODP_CIPHER_ALG_NULL:
- src = NULL;
- num = 0;
+ src = cipher_capa_null;
+ num = sizeof(cipher_capa_null) / size;
break;
case ODP_CIPHER_ALG_DES:
src = cipher_capa_des;
@@ -611,8 +617,8 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
switch (auth) {
case ODP_AUTH_ALG_NULL:
- src = NULL;
- num = 0;
+ src = auth_capa_null;
+ num = sizeof(auth_capa_null) / size;
break;
case ODP_AUTH_ALG_MD5_HMAC:
src = auth_capa_md5_hmac;
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index c89d04f9..470c5bc5 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -141,13 +141,8 @@ static void alg_test(odp_crypto_op_t op,
num = odp_crypto_cipher_capability(cipher_alg, cipher_capa,
MAX_ALG_CAPA);
- if (cipher_alg != ODP_CIPHER_ALG_NULL) {
- CU_ASSERT(num > 0);
- found = 0;
- } else {
- CU_ASSERT(num == 0);
- found = 1;
- }
+ CU_ASSERT(num > 0);
+ found = 0;
CU_ASSERT(num <= MAX_ALG_CAPA);
@@ -167,13 +162,8 @@ static void alg_test(odp_crypto_op_t op,
num = odp_crypto_auth_capability(auth_alg, auth_capa, MAX_ALG_CAPA);
- if (auth_alg != ODP_AUTH_ALG_NULL) {
- CU_ASSERT(num > 0);
- found = 0;
- } else {
- CU_ASSERT(num == 0);
- found = 1;
- }
+ CU_ASSERT(num > 0);
+ found = 0;
CU_ASSERT(num <= MAX_ALG_CAPA);
commit ca1ebaa8319604d4f5fe303be7150b7278fe9d94
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:33 2017 +0300
test: odp_crypto: bail out if odp_crypto_session_create failed
If odp_crypto_session_create() failed, there is no point in
checking/freeing session, as it might not have been updated.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c
index 6a58294a..c3dd6d38 100644
--- a/test/common_plat/performance/odp_crypto.c
+++ b/test/common_plat/performance/odp_crypto.c
@@ -665,34 +665,32 @@ run_measure_one_config(crypto_args_t *cargs,
int rc = 0;
if (create_session_from_config(&session, config, cargs))
- rc = -1;
-
- if (!rc) {
- if (cargs->payload_length) {
- rc = run_measure_one(cargs, config, &session,
- cargs->payload_length, &result);
- if (!rc) {
- print_result_header();
- print_result(cargs, cargs->payload_length,
- config, &result);
- }
- } else {
- unsigned i;
+ return -1;
+ if (cargs->payload_length) {
+ rc = run_measure_one(cargs, config, &session,
+ cargs->payload_length, &result);
+ if (!rc) {
print_result_header();
- for (i = 0; i < num_payloads; i++) {
- rc = run_measure_one(cargs, config, &session,
- payloads[i], &result);
- if (rc)
- break;
- print_result(cargs, payloads[i],
- config, &result);
- }
+ print_result(cargs, cargs->payload_length,
+ config, &result);
+ }
+ } else {
+ unsigned i;
+
+ print_result_header();
+ for (i = 0; i < num_payloads; i++) {
+ rc = run_measure_one(cargs, config, &session,
+ payloads[i], &result);
+ if (rc)
+ break;
+ print_result(cargs, payloads[i],
+ config, &result);
}
}
- if (session != ODP_CRYPTO_SESSION_INVALID)
- odp_crypto_session_destroy(session);
+ odp_crypto_session_destroy(session);
+
return rc;
}
commit 8d4ecf491a0af45c499d38c6e72853e756d69f0e
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:32 2017 +0300
linux-generic: crypto: NULL session->next pointer on session allocation
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index ea7c7026..32fece30 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -88,8 +88,10 @@ odp_crypto_generic_session_t *alloc_session(void)
odp_spinlock_lock(&global->lock);
session = global->free;
- if (session)
+ if (session) {
global->free = session->next;
+ session->next = NULL;
+ }
odp_spinlock_unlock(&global->lock);
return session;
commit b93c17b30d051b114a099ed5219fb2a82f5a864c
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:31 2017 +0300
linux-generic: crypto: make en/decryption work across packet segments
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 7ea90fb9..ea7c7026 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -190,14 +190,122 @@ odp_crypto_alg_err_t auth_check(odp_crypto_op_param_t *param,
}
static
+int internal_encrypt(EVP_CIPHER_CTX *ctx, odp_crypto_op_param_t *param)
+{
+ odp_packet_t pkt = param->out_pkt;
+ unsigned in_pos = param->cipher_range.offset;
+ unsigned out_pos = param->cipher_range.offset;
+ unsigned in_len = param->cipher_range.length;
+ uint8_t block[2 * EVP_MAX_BLOCK_LENGTH];
+ unsigned block_len = EVP_CIPHER_block_size(EVP_CIPHER_CTX_cipher(ctx));
+ int cipher_len;
+ int ret;
+
+ while (in_len > 0) {
+ uint32_t seglen = 0; /* GCC */
+ uint8_t *insegaddr = odp_packet_offset(pkt, in_pos,
+ &seglen, NULL);
+ unsigned inseglen = in_len < seglen ? in_len : seglen;
+
+ /* There should be at least 1 additional block in out buffer */
+ if (inseglen > block_len) {
+ unsigned part = inseglen - block_len;
+
+ EVP_EncryptUpdate(ctx, insegaddr, &cipher_len,
+ insegaddr, part);
+ in_pos += part;
+ in_len -= part;
+ insegaddr += part;
+ inseglen -= part;
+
+ out_pos += cipher_len;
+ }
+
+ /* Use temporal storage */
+ if (inseglen > 0) {
+ unsigned part = inseglen;
+
+ EVP_EncryptUpdate(ctx, block, &cipher_len,
+ insegaddr, part);
+ in_pos += part;
+ in_len -= part;
+ insegaddr += part;
+ inseglen -= part;
+
+ odp_packet_copy_from_mem(pkt, out_pos,
+ cipher_len, block);
+ out_pos += cipher_len;
+ }
+ }
+
+ ret = EVP_EncryptFinal_ex(ctx, block, &cipher_len);
+ odp_packet_copy_from_mem(pkt, out_pos, cipher_len, block);
+
+ return ret;
+}
+
+static
+int internal_decrypt(EVP_CIPHER_CTX *ctx, odp_crypto_op_param_t *param)
+{
+ odp_packet_t pkt = param->out_pkt;
+ unsigned in_pos = param->cipher_range.offset;
+ unsigned out_pos = param->cipher_range.offset;
+ unsigned in_len = param->cipher_range.length;
+ uint8_t block[2 * EVP_MAX_BLOCK_LENGTH];
+ unsigned block_len = EVP_CIPHER_block_size(EVP_CIPHER_CTX_cipher(ctx));
+ int cipher_len;
+ int ret;
+
+ while (in_len > 0) {
+ uint32_t seglen = 0; /* GCC */
+ uint8_t *insegaddr = odp_packet_offset(pkt, in_pos,
+ &seglen, NULL);
+ unsigned inseglen = in_len < seglen ? in_len : seglen;
+
+ /* There should be at least 1 additional block in out buffer */
+ if (inseglen > block_len) {
+ unsigned part = inseglen - block_len;
+
+ EVP_DecryptUpdate(ctx, insegaddr, &cipher_len,
+ insegaddr, part);
+ in_pos += part;
+ in_len -= part;
+ insegaddr += part;
+ inseglen -= part;
+
+ out_pos += cipher_len;
+ }
+
+ /* Use temporal storage */
+ if (inseglen > 0) {
+ unsigned part = inseglen;
+
+ EVP_DecryptUpdate(ctx, block, &cipher_len,
+ insegaddr, part);
+ in_pos += part;
+ in_len -= part;
+ insegaddr += part;
+ inseglen -= part;
+
+ odp_packet_copy_from_mem(pkt, out_pos,
+ cipher_len, block);
+ out_pos += cipher_len;
+ }
+ }
+
+ ret = EVP_DecryptFinal_ex(ctx, block, &cipher_len);
+ odp_packet_copy_from_mem(pkt, out_pos, cipher_len, block);
+
+ return ret;
+}
+
+static
odp_crypto_alg_err_t cipher_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
EVP_CIPHER_CTX *ctx;
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t plain_len = param->cipher_range.length;
void *iv_ptr;
- int cipher_len = 0;
+ int ret;
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
@@ -206,9 +314,6 @@ odp_crypto_alg_err_t cipher_encrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* Adjust pointer for beginning of area to cipher/auth */
- data += param->cipher_range.offset;
-
/* Encrypt it */
ctx = EVP_CIPHER_CTX_new();
EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
@@ -216,13 +321,12 @@ odp_crypto_alg_err_t cipher_encrypt(odp_crypto_op_param_t *param,
EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
EVP_CIPHER_CTX_set_padding(ctx, 0);
- EVP_EncryptUpdate(ctx, data, &cipher_len, data, plain_len);
-
- EVP_EncryptFinal_ex(ctx, data + cipher_len, &cipher_len);
+ ret = internal_encrypt(ctx, param);
EVP_CIPHER_CTX_free(ctx);
- return ODP_CRYPTO_ALG_ERR_NONE;
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE :
+ ODP_CRYPTO_ALG_ERR_NONE;
}
static
@@ -230,10 +334,8 @@ odp_crypto_alg_err_t cipher_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
EVP_CIPHER_CTX *ctx;
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t cipher_len = param->cipher_range.length;
- int plain_len = 0;
void *iv_ptr;
+ int ret;
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
@@ -242,9 +344,6 @@ odp_crypto_alg_err_t cipher_decrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* Adjust pointer for beginning of area to cipher/auth */
- data += param->cipher_range.offset;
-
/* Decrypt it */
ctx = EVP_CIPHER_CTX_new();
EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
@@ -252,13 +351,12 @@ odp_crypto_alg_err_t cipher_decrypt(odp_crypto_op_param_t *param,
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
EVP_CIPHER_CTX_set_padding(ctx, 0);
- EVP_DecryptUpdate(ctx, data, &plain_len, data, cipher_len);
-
- EVP_DecryptFinal_ex(ctx, data + plain_len, &plain_len);
+ ret = internal_decrypt(ctx, param);
EVP_CIPHER_CTX_free(ctx);
- return ODP_CRYPTO_ALG_ERR_NONE;
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE :
+ ODP_CRYPTO_ALG_ERR_NONE;
}
static int process_cipher_param(odp_crypto_generic_session_t *session,
@@ -293,13 +391,12 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
EVP_CIPHER_CTX *ctx;
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t plain_len = param->cipher_range.length;
const uint8_t *aad_head = param->aad.ptr;
uint32_t aad_len = param->aad.length;
void *iv_ptr;
- int cipher_len = 0;
- uint8_t *tag = data + param->hash_result_offset;
+ int dummy_len = 0;
+ uint8_t block[EVP_MAX_MD_SIZE];
+ int ret;
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
@@ -308,9 +405,6 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* Adjust pointer for beginning of area to cipher/auth */
- data += param->cipher_range.offset;
-
/* Encrypt it */
ctx = EVP_CIPHER_CTX_new();
EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
@@ -322,18 +416,20 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
/* Authenticate header data (if any) without encrypting them */
if (aad_len > 0)
- EVP_EncryptUpdate(ctx, NULL, &cipher_len,
+ EVP_EncryptUpdate(ctx, NULL, &dummy_len,
aad_head, aad_len);
- EVP_EncryptUpdate(ctx, data, &cipher_len, data, plain_len);
+ ret = internal_encrypt(ctx, param);
- EVP_EncryptFinal_ex(ctx, data + cipher_len, &cipher_len);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG,
- session->p.auth_digest_len, tag);
+ session->p.auth_digest_len, block);
+ odp_packet_copy_from_mem(param->out_pkt, param->hash_result_offset,
+ session->p.auth_digest_len, block);
EVP_CIPHER_CTX_free(ctx);
- return ODP_CRYPTO_ALG_ERR_NONE;
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE :
+ ODP_CRYPTO_ALG_ERR_NONE;
}
static
@@ -341,13 +437,12 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
EVP_CIPHER_CTX *ctx;
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t cipher_len = param->cipher_range.length;
const uint8_t *aad_head = param->aad.ptr;
uint32_t aad_len = param->aad.length;
- int plain_len = 0;
+ int dummy_len = 0;
void *iv_ptr;
- uint8_t *tag = data + param->hash_result_offset;
+ uint8_t block[EVP_MAX_MD_SIZE];
+ int ret;
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
@@ -356,9 +451,6 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* Adjust pointer for beginning of area to cipher/auth */
- data += param->cipher_range.offset;
-
/* Decrypt it */
ctx = EVP_CIPHER_CTX_new();
EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
@@ -368,22 +460,22 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
EVP_CIPHER_CTX_set_padding(ctx, 0);
+ odp_packet_copy_to_mem(param->out_pkt, param->hash_result_offset,
+ session->p.auth_digest_len, block);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
- session->p.auth_digest_len, tag);
+ session->p.auth_digest_len, block);
/* Authenticate header data (if any) without encrypting them */
if (aad_len > 0)
- EVP_DecryptUpdate(ctx, NULL, &plain_len,
+ EVP_DecryptUpdate(ctx, NULL, &dummy_len,
aad_head, aad_len);
- EVP_DecryptUpdate(ctx, data, &plain_len, data, cipher_len);
-
- if (EVP_DecryptFinal_ex(ctx, data + plain_len, &plain_len) <= 0)
- return ODP_CRYPTO_ALG_ERR_ICV_CHECK;
+ ret = internal_decrypt(ctx, param);
EVP_CIPHER_CTX_free(ctx);
- return ODP_CRYPTO_ALG_ERR_NONE;
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK :
+ ODP_CRYPTO_ALG_ERR_NONE;
}
static int process_aes_gcm_param(odp_crypto_generic_session_t *session,
commit fec16fd81d4084340f0f9a6893c9772000608031
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:30 2017 +0300
linux-generic: crypto: make HMAC work across segmented packets
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 2ba077f9..7ea90fb9 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -112,29 +112,53 @@ null_crypto_routine(odp_crypto_op_param_t *param ODP_UNUSED,
}
static
+void packet_hmac(odp_crypto_op_param_t *param,
+ odp_crypto_generic_session_t *session,
+ uint8_t *hash)
+{
+ odp_packet_t pkt = param->out_pkt;
+ uint32_t offset = param->auth_range.offset;
+ uint32_t len = param->auth_range.length;
+ HMAC_CTX ctx;
+
+ ODP_ASSERT(offset + len <= odp_packet_len(pkt));
+
+ /* Hash it */
+ HMAC_CTX_init(&ctx);
+ HMAC_Init_ex(&ctx,
+ session->auth.key,
+ session->auth.key_length,
+ session->auth.evp_md,
+ 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;
+
+ HMAC_Update(&ctx, mapaddr, maclen);
+ offset += maclen;
+ len -= maclen;
+ }
+
+ HMAC_Final(&ctx, hash, NULL);
+ HMAC_CTX_cleanup(&ctx);
+}
+
+static
odp_crypto_alg_err_t auth_gen(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint8_t *icv = data;
- uint32_t len = param->auth_range.length;
uint8_t hash[EVP_MAX_MD_SIZE];
- /* Adjust pointer for beginning of area to auth */
- data += param->auth_range.offset;
- icv += param->hash_result_offset;
-
/* Hash it */
- HMAC(session->auth.evp_md,
- session->auth.key,
- session->auth.key_length,
- data,
- len,
- hash,
- NULL);
+ packet_hmac(param, session, hash);
/* Copy to the output location */
- memcpy(icv, hash, session->auth.bytes);
+ odp_packet_copy_from_mem(param->out_pkt,
+ param->hash_result_offset,
+ session->auth.bytes,
+ hash);
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -143,31 +167,19 @@ static
odp_crypto_alg_err_t auth_check(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint8_t *icv = data;
- uint32_t len = param->auth_range.length;
uint32_t bytes = session->auth.bytes;
uint8_t hash_in[EVP_MAX_MD_SIZE];
uint8_t hash_out[EVP_MAX_MD_SIZE];
- /* Adjust pointer for beginning of area to auth */
- data += param->auth_range.offset;
- icv += param->hash_result_offset;
-
/* Copy current value out and clear it before authentication */
- memset(hash_in, 0, sizeof(hash_in));
- memcpy(hash_in, icv, bytes);
- memset(icv, 0, bytes);
- memset(hash_out, 0, sizeof(hash_out));
+ odp_packet_copy_to_mem(param->out_pkt, param->hash_result_offset,
+ bytes, hash_in);
+
+ _odp_packet_set_data(param->out_pkt, param->hash_result_offset,
+ 0, bytes);
/* Hash it */
- HMAC(session->auth.evp_md,
- session->auth.key,
- session->auth.key_length,
- data,
- len,
- hash_out,
- NULL);
+ packet_hmac(param, session, hash_out);
/* Verify match */
if (0 != memcmp(hash_in, hash_out, bytes))
commit 2210dc7d26125ac9b8b51fa4de7b2b72e4e8f13e
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:29 2017 +0300
linux-generic: crypto: merge AES-CBC and 3DES-CBC support
There is now nearly no difference between AES-CBC and 3DES-CBC code.
Merge it into generic 'cipher' support, easing adding support for other
ciphers in future.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h
index f4f1948f..c3b70b23 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -40,18 +40,9 @@ struct odp_crypto_generic_session {
struct {
/* Copy of session IV data */
uint8_t iv_data[MAX_IV_LEN];
+ uint8_t key_data[EVP_MAX_KEY_LENGTH];
- union {
- struct {
- uint8_t key[EVP_MAX_KEY_LENGTH];
- } des;
- struct {
- uint8_t key[EVP_MAX_KEY_LENGTH];
- } aes;
- struct {
- uint8_t key[EVP_MAX_KEY_LENGTH];
- } aes_gcm;
- } data;
+ const EVP_CIPHER *evp_cipher;
crypto_func_t func;
} cipher;
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index bff712d1..2ba077f9 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -178,8 +178,8 @@ odp_crypto_alg_err_t auth_check(odp_crypto_op_param_t *param,
}
static
-odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_param_t *param,
- odp_crypto_generic_session_t *session)
+odp_crypto_alg_err_t cipher_encrypt(odp_crypto_op_param_t *param,
+ odp_crypto_generic_session_t *session)
{
EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
@@ -199,8 +199,8 @@ odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_param_t *param,
/* Encrypt it */
ctx = EVP_CIPHER_CTX_new();
- EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL,
- session->cipher.data.aes.key, NULL);
+ EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ session->cipher.key_data, NULL);
EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
EVP_CIPHER_CTX_set_padding(ctx, 0);
@@ -214,8 +214,8 @@ odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_param_t *param,
}
static
-odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
- odp_crypto_generic_session_t *session)
+odp_crypto_alg_err_t cipher_decrypt(odp_crypto_op_param_t *param,
+ odp_crypto_generic_session_t *session)
{
EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
@@ -235,8 +235,8 @@ odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
/* Decrypt it */
ctx = EVP_CIPHER_CTX_new();
- EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL,
- session->cipher.data.aes.key, NULL);
+ EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ session->cipher.key_data, NULL);
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
EVP_CIPHER_CTX_set_padding(ctx, 0);
@@ -249,20 +249,29 @@ odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
return ODP_CRYPTO_ALG_ERR_NONE;
}
-static int process_aes_param(odp_crypto_generic_session_t *session)
+static int process_cipher_param(odp_crypto_generic_session_t *session,
+ const EVP_CIPHER *cipher)
{
- /* Verify IV len is either 0 or 16 */
- if (!((0 == session->p.iv.length) || (16 == session->p.iv.length)))
+ /* Verify Key len is valid */
+ if ((uint32_t)EVP_CIPHER_key_length(cipher) !=
+ session->p.cipher_key.length)
return -1;
- memcpy(session->cipher.data.aes.key, session->p.cipher_key.data,
+ /* Verify IV len is correct */
+ if (!((0 == session->p.iv.length) ||
+ ((uint32_t)EVP_CIPHER_iv_length(cipher) == session->p.iv.length)))
+ return -1;
+
+ session->cipher.evp_cipher = cipher;
+
+ memcpy(session->cipher.key_data, session->p.cipher_key.data,
session->p.cipher_key.length);
/* Set function */
if (ODP_CRYPTO_OP_ENCODE == session->p.op)
- session->cipher.func = aes_encrypt;
+ session->cipher.func = cipher_encrypt;
else
- session->cipher.func = aes_decrypt;
+ session->cipher.func = cipher_decrypt;
return 0;
}
@@ -292,8 +301,8 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
/* Encrypt it */
ctx = EVP_CIPHER_CTX_new();
- EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL,
- session->cipher.data.aes_gcm.key, NULL);
+ EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ session->cipher.key_data, NULL);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
session->p.iv.length, NULL);
EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
@@ -340,8 +349,8 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
/* Decrypt it */
ctx = EVP_CIPHER_CTX_new();
- EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), NULL,
- session->cipher.data.aes_gcm.key, NULL);
+ EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL,
+ session->cipher.key_data, NULL);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
session->p.iv.length, NULL);
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
@@ -365,15 +374,19 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
return ODP_CRYPTO_ALG_ERR_NONE;
}
-static int process_aes_gcm_param(odp_crypto_generic_session_t *session)
+static int process_aes_gcm_param(odp_crypto_generic_session_t *session,
+ const EVP_CIPHER *cipher)
{
- /* Verify Key len is 16 */
- if (session->p.cipher_key.length != 16)
+ /* Verify Key len is valid */
+ if ((uint32_t)EVP_CIPHER_key_length(cipher) !=
+ session->p.cipher_key.length)
return -1;
- memcpy(session->cipher.data.aes_gcm.key, session->p.cipher_key.data,
+ 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_gcm_encrypt;
@@ -383,96 +396,6 @@ static int process_aes_gcm_param(odp_crypto_generic_session_t *session)
return 0;
}
-static
-odp_crypto_alg_err_t des_encrypt(odp_crypto_op_param_t *param,
- odp_crypto_generic_session_t *session)
-{
- EVP_CIPHER_CTX *ctx;
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t plain_len = param->cipher_range.length;
- void *iv_ptr;
- int cipher_len = 0;
-
- if (param->override_iv_ptr)
- iv_ptr = param->override_iv_ptr;
- else if (session->p.iv.data)
- iv_ptr = session->cipher.iv_data;
- else
- return ODP_CRYPTO_ALG_ERR_IV_INVALID;
-
- /* Adjust pointer for beginning of area to cipher/auth */
- data += param->cipher_range.offset;
-
- /* Encrypt it */
- ctx = EVP_CIPHER_CTX_new();
- EVP_EncryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL,
- session->cipher.data.des.key, NULL);
- EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
- EVP_CIPHER_CTX_set_padding(ctx, 0);
-
- EVP_EncryptUpdate(ctx, data, &cipher_len, data, plain_len);
-
- EVP_EncryptFinal_ex(ctx, data + cipher_len, &cipher_len);
-
- EVP_CIPHER_CTX_cleanup(ctx);
-
- return ODP_CRYPTO_ALG_ERR_NONE;
-}
-
-static
-odp_crypto_alg_err_t des_decrypt(odp_crypto_op_param_t *param,
- odp_crypto_generic_session_t *session)
-{
- EVP_CIPHER_CTX *ctx;
- uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t cipher_len = param->cipher_range.length;
- int plain_len = 0;
- void *iv_ptr;
-
- if (param->override_iv_ptr)
- iv_ptr = param->override_iv_ptr;
- else if (session->p.iv.data)
- iv_ptr = session->cipher.iv_data;
- else
- return ODP_CRYPTO_ALG_ERR_IV_INVALID;
-
- /* Adjust pointer for beginning of area to cipher/auth */
- data += param->cipher_range.offset;
-
- /* Decrypt it */
- ctx = EVP_CIPHER_CTX_new();
- EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL,
- session->cipher.data.des.key, NULL);
- EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
- EVP_CIPHER_CTX_set_padding(ctx, 0);
-
- EVP_DecryptUpdate(ctx, data, &plain_len, data, cipher_len);
-
- EVP_DecryptFinal_ex(ctx, data + plain_len, &plain_len);
-
- EVP_CIPHER_CTX_cleanup(ctx);
-
- return ODP_CRYPTO_ALG_ERR_NONE;
-}
-
-static int process_des_param(odp_crypto_generic_session_t *session)
-{
- /* Verify IV len is either 0 or 8 */
- if (!((0 == session->p.iv.length) || (8 == session->p.iv.length)))
- return -1;
-
- memcpy(session->cipher.data.des.key, session->p.cipher_key.data,
- session->p.cipher_key.length);
-
- /* Set function */
- if (ODP_CRYPTO_OP_ENCODE == session->p.op)
- session->cipher.func = des_encrypt;
- else
- session->cipher.func = des_decrypt;
-
- return 0;
-}
-
static int process_auth_param(odp_crypto_generic_session_t *session,
uint32_t key_length,
const EVP_MD *evp_md)
@@ -656,13 +579,13 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
break;
case ODP_CIPHER_ALG_DES:
case ODP_CIPHER_ALG_3DES_CBC:
- rc = process_des_param(session);
+ rc = process_cipher_param(session, EVP_des_ede3_cbc());
break;
case ODP_CIPHER_ALG_AES_CBC:
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_CBC:
#endif
- rc = process_aes_param(session);
+ rc = process_cipher_param(session, EVP_aes_128_cbc());
break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_GCM:
@@ -674,7 +597,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
/* AES-GCM requires to do both auth and
* cipher at the same time */
if (param->auth_alg == ODP_AUTH_ALG_AES_GCM || aes_gcm)
- rc = process_aes_gcm_param(session);
+ rc = process_aes_gcm_param(session, EVP_aes_128_gcm());
else
rc = -1;
break;
commit c3d3787ae527291e969a60bc54dd4e2ab220251d
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:28 2017 +0300
linux-generic: crypto: rewrite 3DES-CBC support using EVP functions
Rewrite 3DES-CBC to use generic EVP interface following AES-GCM
implementation.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h
index d6fd0400..f4f1948f 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -11,7 +11,6 @@
extern "C" {
#endif
-#include <openssl/des.h>
#include <openssl/evp.h>
#define MAX_IV_LEN 64
@@ -44,9 +43,7 @@ struct odp_crypto_generic_session {
union {
struct {
- DES_key_schedule ks1;
- DES_key_schedule ks2;
- DES_key_schedule ks3;
+ uint8_t key[EVP_MAX_KEY_LENGTH];
} des;
struct {
uint8_t key[EVP_MAX_KEY_LENGTH];
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index f503bd98..bff712d1 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -387,10 +387,11 @@ static
odp_crypto_alg_err_t des_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
+ EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t len = param->cipher_range.length;
- DES_cblock iv;
+ uint32_t plain_len = param->cipher_range.length;
void *iv_ptr;
+ int cipher_len = 0;
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
@@ -399,24 +400,21 @@ odp_crypto_alg_err_t des_encrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /*
- * Create a copy of the IV. The DES library modifies IV
- * and if we are processing packets on parallel threads
- * we could get corruption.
- */
- memcpy(iv, iv_ptr, sizeof(iv));
-
- /* Adjust pointer for beginning of area to cipher */
+ /* Adjust pointer for beginning of area to cipher/auth */
data += param->cipher_range.offset;
+
/* Encrypt it */
- DES_ede3_cbc_encrypt(data,
- data,
- len,
- &session->cipher.data.des.ks1,
- &session->cipher.data.des.ks2,
- &session->cipher.data.des.ks3,
- &iv,
- 1);
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_EncryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL,
+ session->cipher.data.des.key, NULL);
+ EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ EVP_EncryptUpdate(ctx, data, &cipher_len, data, plain_len);
+
+ EVP_EncryptFinal_ex(ctx, data + cipher_len, &cipher_len);
+
+ EVP_CIPHER_CTX_cleanup(ctx);
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -425,9 +423,10 @@ static
odp_crypto_alg_err_t des_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
+ EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t len = param->cipher_range.length;
- DES_cblock iv;
+ uint32_t cipher_len = param->cipher_range.length;
+ int plain_len = 0;
void *iv_ptr;
if (param->override_iv_ptr)
@@ -437,25 +436,21 @@ odp_crypto_alg_err_t des_decrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /*
- * Create a copy of the IV. The DES library modifies IV
- * and if we are processing packets on parallel threads
- * we could get corruption.
- */
- memcpy(iv, iv_ptr, sizeof(iv));
-
- /* Adjust pointer for beginning of area to cipher */
+ /* Adjust pointer for beginning of area to cipher/auth */
data += param->cipher_range.offset;
/* Decrypt it */
- DES_ede3_cbc_encrypt(data,
- data,
- len,
- &session->cipher.data.des.ks1,
- &session->cipher.data.des.ks2,
- &session->cipher.data.des.ks3,
- &iv,
- 0);
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL,
+ session->cipher.data.des.key, NULL);
+ EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ EVP_DecryptUpdate(ctx, data, &plain_len, data, cipher_len);
+
+ EVP_DecryptFinal_ex(ctx, data + plain_len, &plain_len);
+
+ EVP_CIPHER_CTX_cleanup(ctx);
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -466,20 +461,15 @@ static int process_des_param(odp_crypto_generic_session_t *session)
if (!((0 == session->p.iv.length) || (8 == session->p.iv.length)))
return -1;
+ memcpy(session->cipher.data.des.key, session->p.cipher_key.data,
+ session->p.cipher_key.length);
+
/* Set function */
if (ODP_CRYPTO_OP_ENCODE == session->p.op)
session->cipher.func = des_encrypt;
else
session->cipher.func = des_decrypt;
- /* Convert keys */
- DES_set_key((DES_cblock *)&session->p.cipher_key.data[0],
- &session->cipher.data.des.ks1);
- DES_set_key((DES_cblock *)&session->p.cipher_key.data[8],
- &session->cipher.data.des.ks2);
- DES_set_key((DES_cblock *)&session->p.cipher_key.data[16],
- &session->cipher.data.des.ks3);
-
return 0;
}
commit 14df663ba9534101305ea4f5201fc2a5e55a974f
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:27 2017 +0300
linux-generic: crypto: rewrite AES-CBC support using EVP functions
Rewrite AES-CBC to use generic EVP interface following AES-GCM
implementation.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h
index d1020dba..d6fd0400 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -12,7 +12,6 @@ extern "C" {
#endif
#include <openssl/des.h>
-#include <openssl/aes.h>
#include <openssl/evp.h>
#define MAX_IV_LEN 64
@@ -50,7 +49,7 @@ struct odp_crypto_generic_session {
DES_key_schedule ks3;
} des;
struct {
- AES_KEY key;
+ uint8_t key[EVP_MAX_KEY_LENGTH];
} aes;
struct {
uint8_t key[EVP_MAX_KEY_LENGTH];
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index ff3f1ac7..f503bd98 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -181,10 +181,11 @@ static
odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
+ EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t len = param->cipher_range.length;
- unsigned char iv_enc[AES_BLOCK_SIZE];
+ uint32_t plain_len = param->cipher_range.length;
void *iv_ptr;
+ int cipher_len = 0;
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
@@ -193,18 +194,21 @@ odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /*
- * Create a copy of the IV. The DES library modifies IV
- * and if we are processing packets on parallel threads
- * we could get corruption.
- */
- memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
-
- /* Adjust pointer for beginning of area to cipher */
+ /* Adjust pointer for beginning of area to cipher/auth */
data += param->cipher_range.offset;
+
/* Encrypt it */
- AES_cbc_encrypt(data, data, len, &session->cipher.data.aes.key,
- iv_enc, AES_ENCRYPT);
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL,
+ session->cipher.data.aes.key, NULL);
+ EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ EVP_EncryptUpdate(ctx, data, &cipher_len, data, plain_len);
+
+ EVP_EncryptFinal_ex(ctx, data + cipher_len, &cipher_len);
+
+ EVP_CIPHER_CTX_free(ctx);
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -213,9 +217,10 @@ static
odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
+ EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
- uint32_t len = param->cipher_range.length;
- unsigned char iv_enc[AES_BLOCK_SIZE];
+ uint32_t cipher_len = param->cipher_range.length;
+ int plain_len = 0;
void *iv_ptr;
if (param->override_iv_ptr)
@@ -225,18 +230,21 @@ odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /*
- * Create a copy of the IV. The DES library modifies IV
- * and if we are processing packets on parallel threads
- * we could get corruption.
- */
- memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
-
- /* Adjust pointer for beginning of area to cipher */
+ /* Adjust pointer for beginning of area to cipher/auth */
data += param->cipher_range.offset;
- /* Encrypt it */
- AES_cbc_encrypt(data, data, len, &session->cipher.data.aes.key,
- iv_enc, AES_DECRYPT);
+
+ /* Decrypt it */
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL,
+ session->cipher.data.aes.key, NULL);
+ EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ EVP_DecryptUpdate(ctx, data, &plain_len, data, cipher_len);
+
+ EVP_DecryptFinal_ex(ctx, data + plain_len, &plain_len);
+
+ EVP_CIPHER_CTX_free(ctx);
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -247,16 +255,14 @@ static int process_aes_param(odp_crypto_generic_session_t *session)
if (!((0 == session->p.iv.length) || (16 == session->p.iv.length)))
return -1;
+ memcpy(session->cipher.data.aes.key, session->p.cipher_key.data,
+ session->p.cipher_key.length);
+
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == session->p.op) {
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
session->cipher.func = aes_encrypt;
- AES_set_encrypt_key(session->p.cipher_key.data, 128,
- &session->cipher.data.aes.key);
- } else {
+ else
session->cipher.func = aes_decrypt;
- AES_set_decrypt_key(session->p.cipher_key.data, 128,
- &session->cipher.data.aes.key);
- }
return 0;
}
commit dcd53771432aeb838f2584458589b3430104abcf
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:26 2017 +0300
linux-generic: crypto: explicitly disable padding for AES-GCM
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 3deec7de..ff3f1ac7 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -291,6 +291,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
session->p.iv.length, NULL);
EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
/* Authenticate header data (if any) without encrypting them */
if (aad_len > 0)
@@ -338,6 +339,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
session->p.iv.length, NULL);
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
session->p.auth_digest_len, tag);
commit 3362bb0eea7b4cdeb97cd2558e9bc5e4ee176852
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:25 2017 +0300
linux-generic: crypto: make AES-GCM thread safe
Using single context for all operations is not thread safe: multiple
threads can access the same context in parallel, affecting its internal
state. Make AES-GCM functions use local context for en/decryption
operations.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h
index 515cefaa..d1020dba 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -53,7 +53,7 @@ struct odp_crypto_generic_session {
AES_KEY key;
} aes;
struct {
- EVP_CIPHER_CTX *ctx;
+ uint8_t key[EVP_MAX_KEY_LENGTH];
} aes_gcm;
} data;
crypto_func_t func;
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 3f298485..3deec7de 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -265,11 +265,13 @@ static
odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
+ EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
uint32_t plain_len = param->cipher_range.length;
const uint8_t *aad_head = param->aad.ptr;
uint32_t aad_len = param->aad.length;
void *iv_ptr;
+ int cipher_len = 0;
uint8_t *tag = data + param->hash_result_offset;
if (param->override_iv_ptr)
@@ -280,12 +282,14 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
/* Adjust pointer for beginning of area to cipher/auth */
- uint8_t *plaindata = data + param->cipher_range.offset;
+ data += param->cipher_range.offset;
/* Encrypt it */
- EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
- int cipher_len = 0;
-
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL,
+ session->cipher.data.aes_gcm.key, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
+ session->p.iv.length, NULL);
EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
/* Authenticate header data (if any) without encrypting them */
@@ -293,13 +297,14 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
EVP_EncryptUpdate(ctx, NULL, &cipher_len,
aad_head, aad_len);
- EVP_EncryptUpdate(ctx, plaindata, &cipher_len,
- plaindata, plain_len);
+ EVP_EncryptUpdate(ctx, data, &cipher_len, data, plain_len);
- EVP_EncryptFinal_ex(ctx, plaindata + cipher_len, &cipher_len);
+ EVP_EncryptFinal_ex(ctx, data + cipher_len, &cipher_len);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG,
session->p.auth_digest_len, tag);
+ EVP_CIPHER_CTX_free(ctx);
+
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -307,10 +312,12 @@ static
odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
+ EVP_CIPHER_CTX *ctx;
uint8_t *data = odp_packet_data(param->out_pkt);
uint32_t cipher_len = param->cipher_range.length;
const uint8_t *aad_head = param->aad.ptr;
uint32_t aad_len = param->aad.length;
+ int plain_len = 0;
void *iv_ptr;
uint8_t *tag = data + param->hash_result_offset;
@@ -322,11 +329,14 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
/* Adjust pointer for beginning of area to cipher/auth */
- uint8_t *cipherdata = data + param->cipher_range.offset;
- /* Encrypt it */
- EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
- int plain_len = 0;
+ data += param->cipher_range.offset;
+ /* Decrypt it */
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), NULL,
+ session->cipher.data.aes_gcm.key, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
+ session->p.iv.length, NULL);
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
@@ -337,12 +347,13 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
EVP_DecryptUpdate(ctx, NULL, &plain_len,
aad_head, aad_len);
- EVP_DecryptUpdate(ctx, cipherdata, &plain_len,
- cipherdata, cipher_len);
+ EVP_DecryptUpdate(ctx, data, &plain_len, data, cipher_len);
- if (EVP_DecryptFinal_ex(ctx, cipherdata + plain_len, &plain_len) <= 0)
+ if (EVP_DecryptFinal_ex(ctx, data + plain_len, &plain_len) <= 0)
return ODP_CRYPTO_ALG_ERR_ICV_CHECK;
+ EVP_CIPHER_CTX_free(ctx);
+
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -352,27 +363,14 @@ static int process_aes_gcm_param(odp_crypto_generic_session_t *session)
if (session->p.cipher_key.length != 16)
return -1;
- /* Set function */
- EVP_CIPHER_CTX *ctx =
- session->cipher.data.aes_gcm.ctx = EVP_CIPHER_CTX_new();
+ memcpy(session->cipher.data.aes_gcm.key, session->p.cipher_key.data,
+ session->p.cipher_key.length);
- if (ODP_CRYPTO_OP_ENCODE == session->p.op) {
+ /* Set function */
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
session->cipher.func = aes_gcm_encrypt;
- EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL);
- } else {
+ else
session->cipher.func = aes_gcm_decrypt;
- EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL);
- }
-
- EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
- session->p.iv.length, NULL);
- if (ODP_CRYPTO_OP_ENCODE == session->p.op) {
- EVP_EncryptInit_ex(ctx, NULL, NULL,
- session->p.cipher_key.data, NULL);
- } else {
- EVP_DecryptInit_ex(ctx, NULL, NULL,
- session->p.cipher_key.data, NULL);
- }
return 0;
}
@@ -635,17 +633,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
/* Copy parameters */
session->p = *param;
- /* Copy IV data */
- if (session->p.iv.data) {
- if (session->p.iv.length > MAX_IV_LEN) {
- ODP_DBG("Maximum IV length exceeded\n");
- free_session(session);
- return -1;
- }
+ if (session->p.iv.length > MAX_IV_LEN) {
+ ODP_DBG("Maximum IV length exceeded\n");
+ free_session(session);
+ return -1;
+ }
+ /* Copy IV data */
+ if (session->p.iv.data)
memcpy(session->cipher.iv_data, session->p.iv.data,
session->p.iv.length);
- }
/* Derive order */
if (ODP_CRYPTO_OP_ENCODE == param->op)
@@ -757,15 +754,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
int odp_crypto_session_destroy(odp_crypto_session_t session)
{
odp_crypto_generic_session_t *generic;
- int aes_gcm = 0;
generic = (odp_crypto_generic_session_t *)(intptr_t)session;
-#if ODP_DEPRECATED_API
- if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES128_GCM)
- aes_gcm = 1;
-#endif
- if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES_GCM || aes_gcm)
- EVP_CIPHER_CTX_free(generic->cipher.data.aes_gcm.ctx);
memset(generic, 0, sizeof(*generic));
free_session(generic);
return 0;
commit 2239b759ad0cb09e3a2ec3d132580123ed92ab03
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:24 2017 +0300
linux-generic: crypto: remote extra memcpy in AES-GCM
There is no need to memcpy IV if it gets passed to EVP functions.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 352cfa53..3f298485 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -269,7 +269,6 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
uint32_t plain_len = param->cipher_range.length;
const uint8_t *aad_head = param->aad.ptr;
uint32_t aad_len = param->aad.length;
- unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
uint8_t *tag = data + param->hash_result_offset;
@@ -280,13 +279,6 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /*
- * Create a copy of the IV. The DES library modifies IV
- * and if we are processing packets on parallel threads
- * we could get corruption.
- */
- memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
-
/* Adjust pointer for beginning of area to cipher/auth */
uint8_t *plaindata = data + param->cipher_range.offset;
@@ -294,7 +286,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
int cipher_len = 0;
- EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_enc);
+ EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
/* Authenticate header data (if any) without encrypting them */
if (aad_len > 0)
@@ -319,7 +311,6 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
uint32_t cipher_len = param->cipher_range.length;
const uint8_t *aad_head = param->aad.ptr;
uint32_t aad_len = param->aad.length;
- unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
uint8_t *tag = data + param->hash_result_offset;
@@ -330,20 +321,13 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /*
- * Create a copy of the IV. The DES library modifies IV
- * and if we are processing packets on parallel threads
- * we could get corruption.
- */
- memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
-
/* Adjust pointer for beginning of area to cipher/auth */
uint8_t *cipherdata = data + param->cipher_range.offset;
/* Encrypt it */
EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
int plain_len = 0;
- EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_enc);
+ EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
session->p.auth_digest_len, tag);
commit a28dab7edeeee74db65349231ec400d92d491a22
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:23 2017 +0300
linux-generic: crypto: update AES-GCM support to reflect aad and auth_digest_len
Make AES-GCM use recently introduced aad and auth_digest_len fields.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 91ef05ae..352cfa53 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -267,10 +267,8 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
{
uint8_t *data = odp_packet_data(param->out_pkt);
uint32_t plain_len = param->cipher_range.length;
- uint8_t *aad_head = data + param->auth_range.offset;
- uint8_t *aad_tail = data + param->cipher_range.offset +
- param->cipher_range.length;
- uint32_t auth_len = param->auth_range.length;
+ const uint8_t *aad_head = param->aad.ptr;
+ uint32_t aad_len = param->aad.length;
unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
uint8_t *tag = data + param->hash_result_offset;
@@ -282,12 +280,6 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* All cipher data must be part of the authentication */
- if (param->auth_range.offset > param->cipher_range.offset ||
- param->auth_range.offset + auth_len <
- param->cipher_range.offset + plain_len)
- return ODP_CRYPTO_ALG_ERR_DATA_SIZE;
-
/*
* Create a copy of the IV. The DES library modifies IV
* and if we are processing packets on parallel threads
@@ -305,23 +297,16 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_enc);
/* Authenticate header data (if any) without encrypting them */
- if (aad_head < plaindata) {
+ if (aad_len > 0)
EVP_EncryptUpdate(ctx, NULL, &cipher_len,
- aad_head, plaindata - aad_head);
- }
+ aad_head, aad_len);
EVP_EncryptUpdate(ctx, plaindata, &cipher_len,
plaindata, plain_len);
- cipher_len = plain_len;
-
- /* Authenticate footer data (if any) without encrypting them */
- if (aad_head + auth_len > plaindata + plain_len) {
- EVP_EncryptUpdate(ctx, NULL, NULL, aad_tail,
- auth_len - (aad_tail - aad_head));
- }
EVP_EncryptFinal_ex(ctx, plaindata + cipher_len, &cipher_len);
- EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, 16, tag);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG,
+ session->p.auth_digest_len, tag);
return ODP_CRYPTO_ALG_ERR_NONE;
}
@@ -332,10 +317,8 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
{
uint8_t *data = odp_packet_data(param->out_pkt);
uint32_t cipher_len = param->cipher_range.length;
- uint8_t *aad_head = data + param->auth_range.offset;
- uint8_t *aad_tail = data + param->cipher_range.offset +
- param->cipher_range.length;
- uint32_t auth_len = param->auth_range.length;
+ const uint8_t *aad_head = param->aad.ptr;
+ uint32_t aad_len = param->aad.length;
unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
uint8_t *tag = data + param->hash_result_offset;
@@ -347,12 +330,6 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
- /* All cipher data must be part of the authentication */
- if (param->auth_range.offset > param->cipher_range.offset ||
- param->auth_range.offset + auth_len <
- param->cipher_range.offset + cipher_len)
- return ODP_CRYPTO_ALG_ERR_DATA_SIZE;
-
/*
* Create a copy of the IV. The DES library modifies IV
* and if we are processing packets on parallel threads
@@ -368,25 +345,18 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_enc);
- EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, 16, tag);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
+ session->p.auth_digest_len, tag);
/* Authenticate header data (if any) without encrypting them */
- if (aad_head < cipherdata) {
+ if (aad_len > 0)
EVP_DecryptUpdate(ctx, NULL, &plain_len,
- aad_head, cipherdata - aad_head);
- }
+ aad_head, aad_len);
EVP_DecryptUpdate(ctx, cipherdata, &plain_len,
cipherdata, cipher_len);
- plain_len = cipher_len;
-
- /* Authenticate footer data (if any) without encrypting them */
- if (aad_head + auth_len > cipherdata + cipher_len) {
- EVP_DecryptUpdate(ctx, NULL, NULL, aad_tail,
- auth_len - (aad_tail - aad_head));
- }
- if (EVP_DecryptFinal_ex(ctx, cipherdata + cipher_len, &plain_len) <= 0)
+ if (EVP_DecryptFinal_ex(ctx, cipherdata + plain_len, &plain_len) <= 0)
return ODP_CRYPTO_ALG_ERR_ICV_CHECK;
return ODP_CRYPTO_ALG_ERR_NONE;
@@ -770,6 +740,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
case ODP_AUTH_ALG_AES128_GCM:
if (param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM)
aes_gcm = 1;
+ /* Fixed digest tag length with deprecated algo */
+ session->p.auth_digest_len = 16;
/* Fallthrough */
#endif
case ODP_AUTH_ALG_AES_GCM:
commit e3a92c5bf48f2279cd4ef5c8d22eafc523445626
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:22 2017 +0300
linux-generic: crypto: add SHA* capabilities for full length digests
In addition to truncated digests (used by IPsec) add full-length
capabilities to SHA* algos.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 472ee310..91ef05ae 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -52,10 +52,12 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = {
* Keep sorted: first by digest length, then by key length
*/
static const odp_crypto_auth_capability_t auth_capa_md5_hmac[] = {
-{.digest_len = 12, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+{.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} } };
static const odp_crypto_auth_capability_t auth_capa_sha256_hmac[] = {
-{.digest_len = 16, .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} },
+{.digest_len = 32, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
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} } };
commit 93e9e20c17426d3262aa96a589106e635b755090
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:21 2017 +0300
linux-generic: crypto: use auth_digest_len when calculating HMACs
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index a993542f..472ee310 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -522,7 +522,6 @@ static int process_des_param(odp_crypto_generic_session_t *session)
}
static int process_auth_param(odp_crypto_generic_session_t *session,
- uint32_t bits,
uint32_t key_length,
const EVP_MD *evp_md)
{
@@ -535,7 +534,9 @@ static int process_auth_param(odp_crypto_generic_session_t *session,
session->auth.evp_md = evp_md;
/* Number of valid bytes */
- session->auth.bytes = bits / 8;
+ session->auth.bytes = session->p.auth_digest_len;
+ if (session->auth.bytes < (unsigned)EVP_MD_size(evp_md) / 2)
+ return -1;
/* Convert keys */
session->auth.key_length = key_length;
@@ -745,17 +746,23 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
session->auth.func = null_crypto_routine;
rc = 0;
break;
- case ODP_AUTH_ALG_MD5_HMAC:
#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_MD5_96:
+ /* Fixed digest tag length with deprecated algo */
+ session->p.auth_digest_len = 96 / 8;
+ /* Fallthrough */
#endif
- rc = process_auth_param(session, 96, 16, EVP_md5());
+ case ODP_AUTH_ALG_MD5_HMAC:
+ rc = process_auth_param(session, 16, EVP_md5());
break;
- case ODP_AUTH_ALG_SHA256_HMAC:
#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_SHA256_128:
+ /* Fixed digest tag length with deprecated algo */
+ session->p.auth_digest_len = 128 / 8;
+ /* Fallthrough */
#endif
- rc = process_auth_param(session, 128, 32, EVP_sha256());
+ case ODP_AUTH_ALG_SHA256_HMAC:
+ rc = process_auth_param(session, 32, EVP_sha256());
break;
#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_AES128_GCM:
commit ab3003c87e4cc25e3b26c7bddbfbce61525a94ad
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:20 2017 +0300
example: ipsec: set auth_digest_len
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c
index b2a91c24..dba0ea0a 100644
--- a/example/ipsec/odp_ipsec_cache.c
+++ b/example/ipsec/odp_ipsec_cache.c
@@ -100,6 +100,7 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
params.auth_alg = auth_sa->alg.u.auth;
params.auth_key.data = auth_sa->key.data;
params.auth_key.length = auth_sa->key.length;
+ params.auth_digest_len = auth_sa->icv_len;
mode = auth_sa->mode;
} else {
params.auth_alg = ODP_AUTH_ALG_NULL;
commit 93ee286c21a576c265463ca5dcd17b39ef80962b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:19 2017 +0300
test: odp_crypto: update performance test to set auth_digest_length
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c
index b3857973..6a58294a 100644
--- a/test/common_plat/performance/odp_crypto.c
+++ b/test/common_plat/performance/odp_crypto.c
@@ -50,7 +50,6 @@ static uint8_t test_key24[24] = { 0x01, 0x02, 0x03, 0x04, 0x05,
typedef struct {
const char *name; /**< Algorithm name */
odp_crypto_session_param_t session; /**< Prefilled crypto session params */
- unsigned int hash_adjust; /**< Size of hash */
} crypto_alg_config_t;
/**
@@ -209,9 +208,9 @@ static crypto_alg_config_t algs_config[] = {
.auth_key = {
.data = test_key16,
.length = sizeof(test_key16)
- }
+ },
+ .auth_digest_len = 12,
},
- .hash_adjust = 12
},
{
.name = "null-hmac-md5-96",
@@ -221,9 +220,9 @@ static crypto_alg_config_t algs_config[] = {
.auth_key = {
.data = test_key16,
.length = sizeof(test_key16)
- }
+ },
+ .auth_digest_len = 12,
},
- .hash_adjust = 12
},
};
@@ -578,7 +577,7 @@ run_measure_one(crypto_args_t *cargs,
mem = odp_packet_data(params.out_pkt);
print_mem("Immediately encrypted packet", mem,
payload_length +
- config->hash_adjust);
+ config->session.auth_digest_len);
}
if (!cargs->in_place) {
if (cargs->reuse_packet) {
@@ -611,7 +610,8 @@ run_measure_one(crypto_args_t *cargs,
print_mem("Receieved encrypted packet",
mem,
payload_length +
- config->hash_adjust);
+ config->
+ session.auth_digest_len);
}
if (cargs->reuse_packet) {
params.pkt = out_pkt;
commit 1ebbb8f882ae6506fc9fa2cb02dadae3d35eaf58
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:18 2017 +0300
validation: crypto: explicitly pass AAD to crypto subsystem
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 3d09e374..c89d04f9 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -74,6 +74,8 @@ static void alg_test(odp_crypto_op_t op,
odp_crypto_key_t auth_key,
odp_packet_data_range_t *cipher_range,
odp_packet_data_range_t *auth_range,
+ uint8_t *aad,
+ uint32_t aad_len,
const uint8_t *plaintext,
unsigned int plaintext_len,
const uint8_t *ciphertext,
@@ -240,6 +242,9 @@ static void alg_test(odp_crypto_op_t op,
if (op_iv_ptr)
op_params.override_iv_ptr = op_iv_ptr;
+ op_params.aad.ptr = aad;
+ op_params.aad.length = aad_len;
+
op_params.hash_result_offset = plaintext_len;
if (0 != digest_len) {
memcpy(data_addr + op_params.hash_result_offset,
@@ -472,6 +477,7 @@ void crypto_test_enc_alg_3des_cbc(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
tdes_cbc_reference_plaintext[i],
tdes_cbc_reference_length[i],
tdes_cbc_reference_ciphertext[i],
@@ -508,6 +514,7 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
tdes_cbc_reference_plaintext[i],
tdes_cbc_reference_length[i],
tdes_cbc_reference_ciphertext[i],
@@ -548,6 +555,7 @@ void crypto_test_dec_alg_3des_cbc(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
tdes_cbc_reference_ciphertext[i],
tdes_cbc_reference_length[i],
tdes_cbc_reference_plaintext[i],
@@ -586,6 +594,7 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
tdes_cbc_reference_ciphertext[i],
tdes_cbc_reference_length[i],
tdes_cbc_reference_plaintext[i],
@@ -634,7 +643,9 @@ void crypto_test_enc_alg_aes128_gcm(void)
ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
- &aes128_gcm_auth_range[i],
+ &aes128_gcm_cipher_range[i],
+ aes128_gcm_reference_aad[i],
+ aes128_gcm_reference_aad_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i],
@@ -679,7 +690,9 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void)
ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
- &aes128_gcm_auth_range[i],
+ &aes128_gcm_cipher_range[i],
+ aes128_gcm_reference_aad[i],
+ aes128_gcm_reference_aad_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i],
@@ -730,10 +743,11 @@ void crypto_test_dec_alg_aes128_gcm(void)
ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
- &aes128_gcm_auth_range[i],
+ &aes128_gcm_cipher_range[i],
+ aes128_gcm_reference_aad[i],
+ aes128_gcm_reference_aad_length[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] +
- aes128_gcm_reference_tag_length[i],
+ aes128_gcm_reference_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i] +
@@ -749,10 +763,11 @@ void crypto_test_dec_alg_aes128_gcm(void)
ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
- &aes128_gcm_auth_range[i],
+ &aes128_gcm_cipher_range[i],
+ aes128_gcm_reference_aad[i],
+ aes128_gcm_reference_aad_length[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] +
- aes128_gcm_reference_tag_length[i],
+ aes128_gcm_reference_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
wrong_digest,
@@ -798,10 +813,11 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
- &aes128_gcm_auth_range[i],
+ &aes128_gcm_cipher_range[i],
+ aes128_gcm_reference_aad[i],
+ aes128_gcm_reference_aad_length[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] +
- aes128_gcm_reference_tag_length[i],
+ aes128_gcm_reference_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i] +
@@ -817,10 +833,11 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
- &aes128_gcm_auth_range[i],
+ &aes128_gcm_cipher_range[i],
+ aes128_gcm_reference_aad[i],
+ aes128_gcm_reference_aad_length[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] +
- aes128_gcm_reference_tag_length[i],
+ aes128_gcm_reference_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
wrong_digest,
@@ -865,6 +882,7 @@ void crypto_test_enc_alg_aes128_cbc(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
aes128_cbc_reference_plaintext[i],
aes128_cbc_reference_length[i],
aes128_cbc_reference_ciphertext[i],
@@ -901,6 +919,7 @@ void crypto_test_enc_alg_aes128_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
aes128_cbc_reference_plaintext[i],
aes128_cbc_reference_length[i],
aes128_cbc_reference_ciphertext[i],
@@ -941,6 +960,7 @@ void crypto_test_dec_alg_aes128_cbc(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
aes128_cbc_reference_ciphertext[i],
aes128_cbc_reference_length[i],
aes128_cbc_reference_plaintext[i],
@@ -979,6 +999,7 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
auth_key,
NULL, NULL,
+ NULL, 0,
aes128_cbc_reference_ciphertext[i],
aes128_cbc_reference_length[i],
aes128_cbc_reference_plaintext[i],
@@ -1025,6 +1046,7 @@ void crypto_test_gen_alg_hmac_md5(void)
ODP_AUTH_ALG_MD5_HMAC,
auth_key,
NULL, NULL,
+ NULL, 0,
hmac_md5_reference_plaintext[i],
hmac_md5_reference_length[i],
NULL, 0,
@@ -1063,6 +1085,7 @@ void crypto_test_check_alg_hmac_md5(void)
ODP_AUTH_ALG_MD5_HMAC,
auth_key,
NULL, NULL,
+ NULL, 0,
hmac_md5_reference_plaintext[i],
hmac_md5_reference_length[i],
NULL, 0,
@@ -1078,6 +1101,7 @@ void crypto_test_check_alg_hmac_md5(void)
ODP_AUTH_ALG_MD5_HMAC,
auth_key,
NULL, NULL,
+ NULL, 0,
hmac_md5_reference_plaintext[i],
hmac_md5_reference_length[i],
NULL, 0,
@@ -1127,6 +1151,7 @@ void crypto_test_gen_alg_hmac_sha256(void)
ODP_AUTH_ALG_SHA256_HMAC,
auth_key,
NULL, NULL,
+ NULL, 0,
hmac_sha256_reference_plaintext[i],
hmac_sha256_reference_length[i],
NULL, 0,
@@ -1167,6 +1192,7 @@ void crypto_test_check_alg_hmac_sha256(void)
ODP_AUTH_ALG_SHA256_HMAC,
auth_key,
NULL, NULL,
+ NULL, 0,
hmac_sha256_reference_plaintext[i],
hmac_sha256_reference_length[i],
NULL, 0,
@@ -1182,6 +1208,7 @@ void crypto_test_check_alg_hmac_sha256(void)
ODP_AUTH_ALG_SHA256_HMAC,
auth_key,
NULL, NULL,
+ NULL, 0,
hmac_sha256_reference_plaintext[i],
hmac_sha256_reference_length[i],
NULL, 0,
diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h
index defbda45..0d36c249 100644
--- a/test/common_plat/validation/api/crypto/test_vectors.h
+++ b/test/common_plat/validation/api/crypto/test_vectors.h
@@ -137,31 +137,31 @@ static uint8_t aes128_gcm_reference_iv[][AES128_GCM_IV_LEN] = {
0xa2, 0xfc, 0xa1, 0xa3 }
};
-static uint32_t aes128_gcm_reference_length[] = { 84, 72, 72, 40};
+static uint32_t aes128_gcm_reference_length[] = { 72, 64, 64, 28};
static uint32_t aes128_gcm_reference_tag_length[] = { 16, 16, 16, 16};
+static uint32_t aes128_gcm_reference_aad_length[] = { 12, 8, 8, 12};
+
static odp_packet_data_range_t aes128_gcm_cipher_range[] = {
- { .offset = 12, .length = 72 },
- { .offset = 8, .length = 64 },
- { .offset = 8, .length = 64 },
- { .offset = 12, .length = 28 },
+ { .offset = 0, .length = 72 },
+ { .offset = 0, .length = 64 },
+ { .offset = 0, .length = 64 },
+ { .offset = 0, .length = 28 },
};
-static odp_packet_data_range_t aes128_gcm_auth_range[] = {
- { .offset = 0, .length = 84 },
- { .offset = 0, .length = 72 },
- { .offset = 0, .length = 72 },
- { .offset = 0, .length = 40 },
+static uint8_t aes128_gcm_reference_aad[][AES128_GCM_MAX_DATA_LEN] = {
+ { 0x00, 0x00, 0x43, 0x21, 0x87, 0x65, 0x43, 0x21,
+ 0x00, 0x00, 0x00, 0x00, },
+ { 0x00, 0x00, 0xa5, 0xf8, 0x00, 0x00, 0x00, 0x0a, },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, },
+ { 0x42, 0xf6, 0x7e, 0x3f, 0x10, 0x10, 0x10, 0x10,
+ 0x10, 0x10, 0x10, 0x10, },
};
static uint8_t
aes128_gcm_reference_plaintext[][AES128_GCM_MAX_DATA_LEN] = {
- { /* Aad */
- 0x00, 0x00, 0x43, 0x21, 0x87, 0x65, 0x43, 0x21,
- 0x00, 0x00, 0x00, 0x00,
- /* Plain */
- 0x45, 0x00, 0x00, 0x48, 0x69, 0x9a, 0x00, 0x00,
+ { 0x45, 0x00, 0x00, 0x48, 0x69, 0x9a, 0x00, 0x00,
0x80, 0x11, 0x4d, 0xb7, 0xc0, 0xa8, 0x01, 0x02,
0xc0, 0xa8, 0x01, 0x01, 0x0a, 0x9b, 0xf1, 0x56,
0x38, 0xd3, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
@@ -171,10 +171,7 @@ aes128_gcm_reference_plaintext[][AES128_GCM_MAX_DATA_LEN] = {
0x63, 0x69, 0x74, 0x79, 0x02, 0x64, 0x6b, 0x00,
0x00, 0x21, 0x00, 0x01, 0x01, 0x02, 0x02, 0x01 },
- { /* Aad */
- 0x00, 0x00, 0xa5, 0xf8, 0x00, 0x00, 0x00, 0x0a,
- /* Plain */
- 0x45, 0x00, 0x00, 0x3e, 0x69, 0x8f, 0x00, 0x00,
+ { 0x45, 0x00, 0x00, 0x3e, 0x69, 0x8f, 0x00, 0x00,
0x80, 0x11, 0x4d, 0xcc, 0xc0, 0xa8, 0x01, 0x02,
0xc0, 0xa8, 0x01, 0x01, 0x0a, 0x98, 0x00, 0x35,
0x00, 0x2a, 0x23, 0x43, 0xb2, 0xd0, 0x01, 0x00,
@@ -183,10 +180,7 @@ aes128_gcm_reference_plaintext[][AES128_GCM_MAX_DATA_LEN] = {
0x65, 0x72, 0x63, 0x69, 0x74, 0x79, 0x02, 0x64,
0x6b, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01 },
- { /* Aad */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
- /* Plain */
- 0x45, 0x00, 0x00, 0x3c, 0x99, 0xc5, 0x00, 0x00,
+ { 0x45, 0x00, 0x00, 0x3c, 0x99, 0xc5, 0x00, 0x00,
0x80, 0x01, 0xcb, 0x7a, 0x40, 0x67, 0x93, 0x18,
0x01, 0x01, 0x01, 0x01, 0x08, 0x00, 0x07, 0x5c,
0x02, 0x00, 0x44, 0x00, 0x61, 0x62, 0x63, 0x64,
@@ -195,11 +189,7 @@ aes128_gcm_reference_plaintext[][AES128_GCM_MAX_DATA_LEN] = {
0x75, 0x76, 0x77, 0x61, 0x62, 0x63, 0x64, 0x65,
0x66, 0x67, 0x68, 0x69, 0x01, 0x02, 0x02, 0x01 },
- { /* Aad */
- 0x42, 0xf6, 0x7e, 0x3f, 0x10, 0x10, 0x10, 0x10,
- 0x10, 0x10, 0x10, 0x10,
- /* Plain */
- 0x45, 0x00, 0x00, 0x1c, 0x42, 0xa2, 0x00, 0x00,
+ { 0x45, 0x00, 0x00, 0x1c, 0x42, 0xa2, 0x00, 0x00,
0x80, 0x01, 0x44, 0x1f, 0x40, 0x67, 0x93, 0xb6,
0xe0, 0x00, 0x00, 0x02, 0x0a, 0x00, 0xf5, 0xff,
0x01, 0x02, 0x02, 0x01 }
@@ -207,10 +197,7 @@ aes128_gcm_reference_plaintext[][AES128_GCM_MAX_DATA_LEN] = {
static uint8_t
aes128_gcm_reference_ciphertext[][AES128_GCM_MAX_DATA_LEN] = {
- { /* Aad */
- 0x00, 0x00, 0x43, 0x21, 0x87, 0x65, 0x43, 0x21,
- 0x00, 0x00, 0x00, 0x00,
- /* Plain */
+ { /* Plain */
0xfe, 0xcf, 0x53, 0x7e, 0x72, 0x9d, 0x5b, 0x07,
0xdc, 0x30, 0xdf, 0x52, 0x8d, 0xd2, 0x2b, 0x76,
0x8d, 0x1b, 0x98, 0x73, 0x66, 0x96, 0xa6, 0xfd,
@@ -224,9 +211,7 @@ aes128_gcm_reference_ciphertext[][AES128_GCM_MAX_DATA_LEN] = {
0x45, 0x90, 0x18, 0x14, 0x8f, 0x6c, 0xbe, 0x72,
0x2f, 0xd0, 0x47, 0x96, 0x56, 0x2d, 0xfd, 0xb4 },
- { /* Aad */
- 0x00, 0x00, 0xa5, 0xf8, 0x00, 0x00, 0x00, 0x0a,
- /* Plain */
+ { /* Plain */
0xde, 0xb2, 0x2c, 0xd9, 0xb0, 0x7c, 0x72, 0xc1,
0x6e, 0x3a, 0x65, 0xbe, 0xeb, 0x8d, 0xf3, 0x04,
0xa5, 0xa5, 0x89, 0x7d, 0x33, 0xae, 0x53, 0x0f,
@@ -238,9 +223,8 @@ aes128_gcm_reference_ciphertext[][AES128_GCM_MAX_DATA_LEN] = {
/* Digest */
0x83, 0xb7, 0x0d, 0x3a, 0xa8, 0xbc, 0x6e, 0xe4,
0xc3, 0x09, 0xe9, 0xd8, 0x5a, 0x41, 0xad, 0x4a },
- { /* Aad */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
- /* Plain */
+
+ { /* Plain */
0x46, 0x88, 0xda, 0xf2, 0xf9, 0x73, 0xa3, 0x92,
0x73, 0x29, 0x09, 0xc3, 0x31, 0xd5, 0x6d, 0x60,
0xf6, 0x94, 0xab, 0xaa, 0x41, 0x4b, 0x5e, 0x7f,
@@ -253,10 +237,7 @@ aes128_gcm_reference_ciphertext[][AES128_GCM_MAX_DATA_LEN] = {
0xf8, 0x21, 0xd4, 0x96, 0xee, 0xb0, 0x96, 0xe9,
0x8a, 0xd2, 0xb6, 0x9e, 0x47, 0x99, 0xc7, 0x1d },
- { /* Aad */
- 0x42, 0xf6, 0x7e, 0x3f, 0x10, 0x10, 0x10, 0x10,
- 0x10, 0x10, 0x10, 0x10,
- /* Plain */
+ { /* Plain */
0xfb, 0xa2, 0xca, 0x84, 0x5e, 0x5d, 0xf9, 0xf0,
0xf2, 0x2c, 0x3e, 0x6e, 0x86, 0xdd, 0x83, 0x1e,
0x1f, 0xc6, 0x57, 0x92, 0xcd, 0x1a, 0xf9, 0x13,
commit 1adf94727a92a260f3145c3c777cc8cf3ecb419b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Jun 1 12:03:17 2017 +0300
validation: crypto: explicitly pass auth_digest_len to crypto subsystem
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index bfc9da3c..3d09e374 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -201,6 +201,7 @@ static void alg_test(odp_crypto_op_t op,
ses_params.cipher_key = cipher_key;
ses_params.iv = ses_iv;
ses_params.auth_key = auth_key;
+ ses_params.auth_digest_len = digest_len;
rc = odp_crypto_session_create(&ses_params, &session, &status);
CU_ASSERT_FATAL(!rc);
@@ -620,7 +621,8 @@ void crypto_test_enc_alg_aes128_gcm(void)
cipher_key.length, iv.length))
continue;
if (!check_auth_options(ODP_AUTH_ALG_AES_GCM,
- auth_key.length, AES128_GCM_CHECK_LEN))
+ auth_key.length,
+ aes128_gcm_reference_tag_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_ENCODE,
@@ -639,7 +641,7 @@ void crypto_test_enc_alg_aes128_gcm(void)
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i] +
aes128_gcm_reference_length[i],
- AES128_GCM_CHECK_LEN);
+ aes128_gcm_reference_tag_length[i]);
}
}
@@ -664,7 +666,8 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void)
cipher_key.length, iv.length))
continue;
if (!check_auth_options(ODP_AUTH_ALG_AES_GCM,
- auth_key.length, AES128_GCM_CHECK_LEN))
+ auth_key.length,
+ aes128_gcm_reference_tag_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_ENCODE,
@@ -683,7 +686,7 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void)
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i] +
aes128_gcm_reference_length[i],
- AES128_GCM_CHECK_LEN);
+ aes128_gcm_reference_tag_length[i]);
}
}
@@ -714,7 +717,8 @@ void crypto_test_dec_alg_aes128_gcm(void)
cipher_key.length, iv.length))
continue;
if (!check_auth_options(ODP_AUTH_ALG_AES_GCM,
- auth_key.length, AES128_GCM_CHECK_LEN))
+ auth_key.length,
+ aes128_gcm_reference_tag_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_DECODE,
@@ -728,12 +732,13 @@ void crypto_test_dec_alg_aes128_gcm(void)
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] + AES128_GCM_CHECK_LEN,
+ aes128_gcm_reference_length[i] +
+ aes128_gcm_reference_tag_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i] +
aes128_gcm_reference_length[i],
- AES128_GCM_CHECK_LEN);
+ aes128_gcm_reference_tag_length[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
1,
@@ -746,11 +751,12 @@ void crypto_test_dec_alg_aes128_gcm(void)
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] + AES128_GCM_CHECK_LEN,
+ aes128_gcm_reference_length[i] +
+ aes128_gcm_reference_tag_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
wrong_digest,
- AES128_GCM_CHECK_LEN);
+ aes128_gcm_reference_tag_length[i]);
}
}
@@ -779,7 +785,8 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
cipher_key.length, iv.length))
continue;
if (!check_auth_options(ODP_AUTH_ALG_AES_GCM,
- auth_key.length, AES128_GCM_CHECK_LEN))
+ auth_key.length,
+ aes128_gcm_reference_tag_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_DECODE,
@@ -793,12 +800,13 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] + AES128_GCM_CHECK_LEN,
+ aes128_gcm_reference_length[i] +
+ aes128_gcm_reference_tag_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
aes128_gcm_reference_ciphertext[i] +
aes128_gcm_reference_length[i],
- AES128_GCM_CHECK_LEN);
+ aes128_gcm_reference_tag_length[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
1,
@@ -811,11 +819,12 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
aes128_gcm_reference_ciphertext[i],
- aes128_gcm_reference_length[i] + AES128_GCM_CHECK_LEN,
+ aes128_gcm_reference_length[i] +
+ aes128_gcm_reference_tag_length[i],
aes128_gcm_reference_plaintext[i],
aes128_gcm_reference_length[i],
wrong_digest,
- AES128_GCM_CHECK_LEN);
+ aes128_gcm_reference_tag_length[i]);
}
}
@@ -1004,7 +1013,7 @@ void crypto_test_gen_alg_hmac_md5(void)
auth_key.length = sizeof(hmac_md5_reference_key[i]);
if (!check_auth_options(ODP_AUTH_ALG_MD5_HMAC, auth_key.length,
- HMAC_MD5_96_CHECK_LEN))
+ hmac_md5_reference_digest_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_ENCODE,
@@ -1020,7 +1029,7 @@ void crypto_test_gen_alg_hmac_md5(void)
hmac_md5_reference_length[i],
NULL, 0,
hmac_md5_reference_digest[i],
- HMAC_MD5_96_CHECK_LEN);
+ hmac_md5_reference_digest_length[i]);
}
}
@@ -1042,7 +1051,7 @@ void crypto_test_check_alg_hmac_md5(void)
auth_key.length = sizeof(hmac_md5_reference_key[i]);
if (!check_auth_options(ODP_AUTH_ALG_MD5_HMAC, auth_key.length,
- HMAC_MD5_96_CHECK_LEN))
+ hmac_md5_reference_digest_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_DECODE,
@@ -1058,7 +1067,7 @@ void crypto_test_check_alg_hmac_md5(void)
hmac_md5_reference_length[i],
NULL, 0,
hmac_md5_reference_digest[i],
- HMAC_MD5_96_CHECK_LEN);
+ hmac_md5_reference_digest_length[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
1,
@@ -1073,7 +1082,7 @@ void crypto_test_check_alg_hmac_md5(void)
hmac_md5_reference_length[i],
NULL, 0,
wrong_digest,
- HMAC_MD5_96_CHECK_LEN);
+ hmac_md5_reference_digest_length[i]);
}
}
@@ -1106,7 +1115,7 @@ void crypto_test_gen_alg_hmac_sha256(void)
if (!check_auth_options(ODP_AUTH_ALG_SHA256_HMAC,
auth_key.length,
- HMAC_SHA256_128_CHECK_LEN))
+ hmac_sha256_reference_digest_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_ENCODE,
@@ -1122,7 +1131,7 @@ void crypto_test_gen_alg_hmac_sha256(void)
hmac_sha256_reference_length[i],
NULL, 0,
hmac_sha256_reference_digest[i],
- HMAC_SHA256_128_CHECK_LEN);
+ hmac_sha256_reference_digest_length[i]);
}
}
@@ -1146,7 +1155,7 @@ void crypto_test_check_alg_hmac_sha256(void)
if (!check_auth_options(ODP_AUTH_ALG_SHA256_HMAC,
auth_key.length,
- HMAC_SHA256_128_CHECK_LEN))
+ hmac_sha256_reference_digest_length[i]))
continue;
alg_test(ODP_CRYPTO_OP_DECODE,
@@ -1162,7 +1171,7 @@ void crypto_test_check_alg_hmac_sha256(void)
hmac_sha256_reference_length[i],
NULL, 0,
hmac_sha256_reference_digest[i],
- HMAC_SHA256_128_CHECK_LEN);
+ hmac_sha256_reference_digest_length[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
1,
@@ -1177,7 +1186,7 @@ void crypto_test_check_alg_hmac_sha256(void)
hmac_sha256_reference_length[i],
NULL, 0,
wrong_digest,
- HMAC_SHA256_128_CHECK_LEN);
+ hmac_sha256_reference_digest_length[i]);
}
}
diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h
index a1cf4faf..defbda45 100644
--- a/test/common_plat/validation/api/crypto/test_vectors.h
+++ b/test/common_plat/validation/api/crypto/test_vectors.h
@@ -139,6 +139,8 @@ static uint8_t aes128_gcm_reference_iv[][AES128_GCM_IV_LEN] = {
static uint32_t aes128_gcm_reference_length[] = { 84, 72, 72, 40};
+static uint32_t aes128_gcm_reference_tag_length[] = { 16, 16, 16, 16};
+
static odp_packet_data_range_t aes128_gcm_cipher_range[] = {
{ .offset = 12, .length = 72 },
{ .offset = 8, .length = 64 },
@@ -306,6 +308,10 @@ static uint8_t hmac_md5_reference_digest[][HMAC_MD5_DIGEST_LEN] = {
0xdb, 0xb8, 0xc7, 0x33, 0xf0, 0xe8, 0xb3, 0xf6 }
};
+static uint32_t hmac_md5_reference_digest_length[] = {
+ 12, 12, 12
+};
+
static uint8_t hmac_sha256_reference_key[][HMAC_SHA256_KEY_LEN] = {
{ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
@@ -350,4 +356,8 @@ static uint8_t hmac_sha256_reference_digest[][HMAC_SHA256_DIGEST_LEN] = {
0x85, 0x4d, 0xb8, 0xeb, 0xd0, 0x91, 0x81, 0xa7 }
};
+static uint32_t hmac_sha256_reference_digest_length[] = {
+ 16, 16, 16
+};
+
#endif
diff --git a/test/common_plat/validation/api/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h
index 4fbb5cd7..80fd927b 100644
--- a/test/common_plat/validation/api/crypto/test_vectors_len.h
+++ b/test/common_plat/validation/api/crypto/test_vectors_len.h
@@ -21,18 +21,15 @@
#define AES128_GCM_IV_LEN 12
#define AES128_GCM_MAX_DATA_LEN 106
#define AES128_GCM_DIGEST_LEN 16
-#define AES128_GCM_CHECK_LEN 16
/* HMAC-MD5 */
#define HMAC_MD5_KEY_LEN 16
#define HMAC_MD5_MAX_DATA_LEN 128
#define HMAC_MD5_DIGEST_LEN 16
-#define HMAC_MD5_96_CHECK_LEN 12
/* HMAC-SHA256 */
#define HMAC_SHA256_KEY_LEN 32
#define HMAC_SHA256_MAX_DATA_LEN 128
#define HMAC_SHA256_DIGEST_LEN 32
-#define HMAC_SHA256_128_CHECK_LEN 16
#endif
commit ad5d48fe658927a7b946533d50fd907e306ec184
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Feb 22 17:08:25 2017 +0200
validation: crypto: add stubs for sha-1 and sha-512 tests
API enumerations are tested but functional tests are missing still.
Signed-off-by: Petri Savolainen <petri.savolainen(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/common_plat/validation/api/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h
index 661fe5df..4d810f62 100644
--- a/test/common_plat/validation/api/crypto/crypto.h
+++ b/test/common_plat/validation/api/crypto/crypto.h
@@ -24,8 +24,10 @@ void crypto_test_dec_alg_aes128_gcm(void);
void crypto_test_dec_alg_aes128_gcm_ovr_iv(void);
void crypto_test_gen_alg_hmac_md5(void);
void crypto_test_check_alg_hmac_md5(void);
+void crypto_test_alg_hmac_sha1(void);
void crypto_test_gen_alg_hmac_sha256(void);
void crypto_test_check_alg_hmac_sha256(void);
+void crypto_test_alg_hmac_sha512(void);
/* test arrays: */
extern odp_testinfo_t crypto_suite[];
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 9defdbfa..bfc9da3c 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -340,10 +340,18 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
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;
@@ -1173,6 +1181,26 @@ void crypto_test_check_alg_hmac_sha256(void)
}
}
+static int check_alg_hmac_sha1(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA1_HMAC);
+}
+
+void crypto_test_alg_hmac_sha1(void)
+{
+ printf(" TEST NOT IMPLEMENTED YET ");
+}
+
+static int check_alg_hmac_sha512(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA512_HMAC);
+}
+
+void crypto_test_alg_hmac_sha512(void)
+{
+ printf(" TEST NOT IMPLEMENTED YET ");
+}
+
int crypto_suite_sync_init(void)
{
suite_context.pool = odp_pool_lookup("packet_pool");
@@ -1226,10 +1254,14 @@ odp_testinfo_t crypto_suite[] = {
check_alg_hmac_md5),
ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_md5,
check_alg_hmac_md5),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_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_alg_hmac_sha512,
+ check_alg_hmac_sha512),
ODP_TEST_INFO_NULL,
};
commit ce8bebad45c590ad5b06d31d8be9fae8182f944a
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Apr 4 09:28:19 2017 +0300
linux-gen: packet: remove lazy parsing
Replace old lazy parsing code with a new packet parsing implementation
which follows the latest API (parsing level is selected using
odp_pktio_config()).
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h
index 95cba5eb..a209c759 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_types.h
@@ -107,7 +107,6 @@ typedef union {
/** Individual input flags */
struct {
- uint64_t parsed_l2:1; /**< L2 parsed */
uint64_t dst_queue:1; /**< Dst queue present */
uint64_t flow_hash:1; /**< Flow hash present */
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 4c8d7515..a480a748 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -80,18 +80,6 @@ ODP_STATIC_ASSERT(sizeof(output_flags_t) == sizeof(uint32_t),
"OUTPUT_FLAGS_SIZE_ERROR");
/**
- * Protocol stack layers
- */
-typedef enum {
- LAYER_NONE = 0,
- LAYER_L1,
- LAYER_L2,
- LAYER_L3,
- LAYER_L4,
- LAYER_ALL
-} layer_t;
-
-/**
* Packet parser metadata
*/
typedef struct {
@@ -102,14 +90,6 @@ typedef struct {
uint32_t l2_offset; /**< offset to L2 hdr, e.g. Eth */
uint32_t l3_offset; /**< offset to L3 hdr, e.g. IPv4, IPv6 */
uint32_t l4_offset; /**< offset to L4 hdr (TCP, UDP, SCTP, also ICMP) */
-
- uint32_t l3_len; /**< Layer 3 length */
- uint32_t l4_len; /**< Layer 4 length */
-
- uint16_t ethtype; /**< EtherType */
- uint8_t ip_proto; /**< IP protocol */
- uint8_t parsed_layers; /**< Highest parsed protocol stack layer */
-
} packet_parser_t;
/**
@@ -203,16 +183,6 @@ static inline void packet_set_len(odp_packet_hdr_t *pkt_hdr, uint32_t len)
pkt_hdr->frame_len = len;
}
-static inline int packet_parse_l2_not_done(packet_parser_t *prs)
-{
- return !prs->input_flags.parsed_l2;
-}
-
-static inline int packet_parse_not_complete(odp_packet_hdr_t *pkt_hdr)
-{
- return pkt_hdr->p.parsed_layers != LAYER_ALL;
-}
-
/* Forward declarations */
int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt);
@@ -220,11 +190,9 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt);
int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len,
odp_packet_t pkt[], int max_num);
-/* Fill in parser metadata for L2 */
-void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len);
-
/* Perform packet parse up to a given protocol layer */
-int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, layer_t layer);
+int packet_parse_layer(odp_packet_hdr_t *pkt_hdr,
+ odp_pktio_parser_layer_t layer);
/* Reset parser metadata for a new parse */
void packet_parse_reset(odp_packet_hdr_t *pkt_hdr);
@@ -264,7 +232,8 @@ static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts)
}
int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr,
- uint32_t pkt_len, uint32_t seg_len, layer_t layer);
+ uint32_t pkt_len, uint32_t seg_len,
+ odp_pktio_parser_layer_t layer);
int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr);
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index 5d96b00b..7ebc47d7 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -790,10 +790,6 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry,
cls = &entry->s.cls;
default_cos = cls->default_cos;
- /* Check for lazy parse needed */
- if (packet_parse_not_complete(pkt_hdr))
- packet_parse_layer(pkt_hdr, LAYER_ALL);
-
/* Return error cos for error packet */
if (pkt_hdr->p.error_flags.all)
return cls->error_cos;
@@ -838,7 +834,8 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base,
packet_parse_reset(pkt_hdr);
packet_set_len(pkt_hdr, pkt_len);
- packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, LAYER_ALL);
+ packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len,
+ ODP_PKTIO_PARSER_LAYER_ALL);
cos = cls_select_cos(entry, base, pkt_hdr);
if (cos == NULL)
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 69098624..eb66af2d 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -220,16 +220,9 @@ static inline void *packet_map(odp_packet_hdr_t *pkt_hdr,
return addr;
}
-static inline void packet_parse_disable(odp_packet_hdr_t *pkt_hdr)
-{
- pkt_hdr->p.input_flags.parsed_l2 = 1;
- pkt_hdr->p.parsed_layers = LAYER_ALL;
-}
-
void packet_parse_reset(odp_packet_hdr_t *pkt_hdr)
{
/* Reset parser metadata before new parse */
- pkt_hdr->p.parsed_layers = LAYER_NONE;
pkt_hdr->p.error_flags.all = 0;
pkt_hdr->p.input_flags.all = 0;
pkt_hdr->p.output_flags.all = 0;
@@ -241,8 +234,7 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr)
/**
* Initialize packet
*/
-static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len,
- int parse)
+static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len)
{
uint32_t seg_len;
int num = pkt_hdr->buf_hdr.segcount;
@@ -257,7 +249,6 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len,
pkt_hdr->buf_hdr.seg[num - 1].len = seg_len;
}
- pkt_hdr->p.parsed_layers = LAYER_NONE;
pkt_hdr->p.input_flags.all = 0;
pkt_hdr->p.output_flags.all = 0;
pkt_hdr->p.error_flags.all = 0;
@@ -266,10 +257,6 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len,
pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID;
pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID;
- /* Disable lazy parsing on user allocated packets */
- if (!parse)
- packet_parse_disable(pkt_hdr);
-
/*
* Packet headroom is set from the pool's headroom
* Packet tailroom is rounded up to fill the last
@@ -485,7 +472,7 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr,
}
static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt,
- int num_seg, odp_packet_t *pkt, int parse)
+ int num_seg, odp_packet_t *pkt)
{
int num_buf, i;
int num = max_pkt;
@@ -518,7 +505,7 @@ static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt,
pkt[i] = packet_handle(hdr);
init_segments(&pkt_hdr[i * num_seg], num_seg);
- packet_init(hdr, len, parse);
+ packet_init(hdr, len);
}
return num;
@@ -531,7 +518,7 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len,
int num, num_seg;
num_seg = num_segments(len);
- num = packet_alloc(pool, len, max_num, num_seg, pkt, 1);
+ num = packet_alloc(pool, len, max_num, num_seg, pkt);
return num;
}
@@ -551,7 +538,7 @@ odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len)
return ODP_PACKET_INVALID;
num_seg = num_segments(len);
- num = packet_alloc(pool, len, 1, num_seg, &pkt, 0);
+ num = packet_alloc(pool, len, 1, num_seg, &pkt);
if (odp_unlikely(num == 0))
return ODP_PACKET_INVALID;
@@ -574,7 +561,7 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len,
return -1;
num_seg = num_segments(len);
- num = packet_alloc(pool, len, max_num, num_seg, pkt, 0);
+ num = packet_alloc(pool, len, max_num, num_seg, pkt);
return num;
}
@@ -635,7 +622,7 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len)
if (len > pool->headroom + pool->data_size + pool->tailroom)
return -1;
- packet_init(pkt_hdr, len, 0);
+ packet_init(pkt_hdr, len);
return 0;
}
@@ -1247,8 +1234,6 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- if (pkt_hdr->p.parsed_layers < LAYER_L3)
- packet_parse_layer(pkt_hdr, LAYER_L3);
return packet_map(pkt_hdr, pkt_hdr->p.l3_offset, len, NULL);
}
@@ -1256,8 +1241,6 @@ uint32_t odp_packet_l3_offset(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- if (pkt_hdr->p.parsed_layers < LAYER_L3)
- packet_parse_layer(pkt_hdr, LAYER_L3);
return pkt_hdr->p.l3_offset;
}
@@ -1268,8 +1251,6 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset)
if (offset >= pkt_hdr->frame_len)
return -1;
- if (pkt_hdr->p.parsed_layers < LAYER_L3)
- packet_parse_layer(pkt_hdr, LAYER_L3);
pkt_hdr->p.l3_offset = offset;
return 0;
}
@@ -1278,8 +1259,6 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- if (pkt_hdr->p.parsed_layers < LAYER_L4)
- packet_parse_layer(pkt_hdr, LAYER_L4);
return packet_map(pkt_hdr, pkt_hdr->p.l4_offset, len, NULL);
}
@@ -1287,8 +1266,6 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
- if (pkt_hdr->p.parsed_layers < LAYER_L4)
- packet_parse_layer(pkt_hdr, LAYER_L4);
return pkt_hdr->p.l4_offset;
}
@@ -1299,8 +1276,6 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset)
if (offset >= pkt_hdr->frame_len)
return -1;
- if (pkt_hdr->p.parsed_layers < LAYER_L4)
- packet_parse_layer(pkt_hdr, LAYER_L4);
pkt_hdr->p.l4_offset = offset;
return 0;
}
@@ -1829,12 +1804,11 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr,
uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl);
uint16_t frag_offset;
uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr);
-
- prs->l3_len = odp_be_to_cpu_16(ipv4->tot_len);
+ uint32_t l3_len = odp_be_to_cpu_16(ipv4->tot_len);
if (odp_unlikely(ihl < _ODP_IPV4HDR_IHL_MIN) ||
odp_unlikely(ver != 4) ||
- (prs->l3_len > frame_len - *offset)) {
+ (l3_len > frame_len - *offset)) {
prs->error_flags.ip_err = 1;
return 0;
}
@@ -1871,13 +1845,12 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr,
const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr;
const _odp_ipv6hdr_ext_t *ipv6ext;
uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr.u8[0]);
-
- prs->l3_len = odp_be_to_cpu_16(ipv6->payload_len) +
- _ODP_IPV6HDR_LEN;
+ uint32_t l3_len = odp_be_to_cpu_16(ipv6->payload_len) +
+ _ODP_IPV6HDR_LEN;
/* Basic sanity checks on IPv6 header */
if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 ||
- prs->l3_len > frame_len - *offset) {
+ l3_len > frame_len - *offset) {
prs->error_flags.ip_err = 1;
return 0;
}
@@ -1938,9 +1911,6 @@ static inline void parse_tcp(packet_parser_t *prs,
else if ((uint32_t)tcp->hl * 4 > sizeof(_odp_tcphdr_t))
prs->input_flags.tcpopt = 1;
- prs->l4_len = prs->l3_len +
- prs->l3_offset - prs->l4_offset;
-
if (offset)
*offset += (uint32_t)tcp->hl * 4;
*parseptr += (uint32_t)tcp->hl * 4;
@@ -1955,13 +1925,8 @@ static inline void parse_udp(packet_parser_t *prs,
const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr;
uint32_t udplen = odp_be_to_cpu_16(udp->length);
- if (udplen < sizeof(_odp_udphdr_t) ||
- udplen > (prs->l3_len +
- prs->l4_offset - prs->l3_offset)) {
+ if (odp_unlikely(udplen < sizeof(_odp_udphdr_t)))
prs->error_flags.udp_err = 1;
- }
-
- prs->l4_len = udplen;
if (offset)
*offset += sizeof(_odp_udphdr_t);
@@ -1969,218 +1934,170 @@ static inline void parse_udp(packet_parser_t *prs,
}
/**
- * Initialize L2 related parser flags and metadata
- */
-void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len)
-{
- /* Packet alloc or reset have already init other offsets and flags */
-
- /* We only support Ethernet for now */
- prs->input_flags.eth = 1;
-
- /* Detect jumbo frames */
- if (frame_len > _ODP_ETH_LEN_MAX)
- prs->input_flags.jumbo = 1;
-
- /* Assume valid L2 header, no CRC/FCS check in SW */
- prs->input_flags.l2 = 1;
-
- prs->input_flags.parsed_l2 = 1;
-}
-
-/**
* Parse common packet headers up to given layer
*
* The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be
* available from the ptr.
*/
int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
- uint32_t frame_len, uint32_t seg_len, layer_t layer)
+ uint32_t frame_len, uint32_t seg_len,
+ odp_pktio_parser_layer_t layer)
{
uint32_t offset;
+ uint16_t ethtype;
const uint8_t *parseptr;
+ uint8_t ip_proto;
+ const _odp_ethhdr_t *eth;
+ uint16_t macaddr0, macaddr2, macaddr4;
+ const _odp_vlanhdr_t *vlan;
- switch (prs->parsed_layers) {
- case LAYER_NONE:
- /* Fall through */
-
- case LAYER_L2:
- {
- const _odp_ethhdr_t *eth;
- uint16_t macaddr0, macaddr2, macaddr4;
- const _odp_vlanhdr_t *vlan;
-
- offset = sizeof(_odp_ethhdr_t);
- if (packet_parse_l2_not_done(prs))
- packet_parse_l2(prs, frame_len);
-
- eth = (const _odp_ethhdr_t *)ptr;
-
- /* Handle Ethernet broadcast/multicast addresses */
- macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)
- (const void *)eth));
- prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100;
-
- if (macaddr0 == 0xffff) {
- macaddr2 =
- odp_be_to_cpu_16(*((const uint16_t *)
- (const void *)eth + 1));
- macaddr4 =
- odp_be_to_cpu_16(*((const uint16_t *)
- (const void *)eth + 2));
- prs->input_flags.eth_bcast =
- (macaddr2 == 0xffff) && (macaddr4 == 0xffff);
- } else {
- prs->input_flags.eth_bcast = 0;
- }
+ if (layer == ODP_PKTIO_PARSER_LAYER_NONE)
+ return 0;
- /* Get Ethertype */
- prs->ethtype = odp_be_to_cpu_16(eth->type);
- parseptr = (const uint8_t *)(eth + 1);
+ /* We only support Ethernet for now */
+ prs->input_flags.eth = 1;
+ /* Assume valid L2 header, no CRC/FCS check in SW */
+ prs->input_flags.l2 = 1;
+ /* Detect jumbo frames */
+ if (frame_len > _ODP_ETH_LEN_MAX)
+ prs->input_flags.jumbo = 1;
- /* Check for SNAP vs. DIX */
- if (prs->ethtype < _ODP_ETH_LEN_MAX) {
- prs->input_flags.snap = 1;
- if (prs->ethtype > frame_len - offset) {
- prs->error_flags.snap_len = 1;
- goto parse_exit;
- }
- prs->ethtype = odp_be_to_cpu_16(*((const uint16_t *)
- (uintptr_t)
- (parseptr + 6)));
- offset += 8;
- parseptr += 8;
- }
+ offset = sizeof(_odp_ethhdr_t);
+ eth = (const _odp_ethhdr_t *)ptr;
+
+ /* Handle Ethernet broadcast/multicast addresses */
+ macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth));
+ prs->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100;
+
+ if (macaddr0 == 0xffff) {
+ macaddr2 =
+ odp_be_to_cpu_16(*((const uint16_t *)
+ (const void *)eth + 1));
+ macaddr4 =
+ odp_be_to_cpu_16(*((const uint16_t *)
+ (const void *)eth + 2));
+ prs->input_flags.eth_bcast =
+ (macaddr2 == 0xffff) && (macaddr4 == 0xffff);
+ } else {
+ prs->input_flags.eth_bcast = 0;
+ }
- /* Parse the VLAN header(s), if present */
- if (prs->ethtype == _ODP_ETHTYPE_VLAN_OUTER) {
- prs->input_flags.vlan_qinq = 1;
- prs->input_flags.vlan = 1;
+ /* Get Ethertype */
+ ethtype = odp_be_to_cpu_16(eth->type);
+ parseptr = (const uint8_t *)(eth + 1);
- vlan = (const _odp_vlanhdr_t *)parseptr;
- prs->ethtype = odp_be_to_cpu_16(vlan->type);
- offset += sizeof(_odp_vlanhdr_t);
- parseptr += sizeof(_odp_vlanhdr_t);
+ /* Check for SNAP vs. DIX */
+ if (ethtype < _ODP_ETH_LEN_MAX) {
+ prs->input_flags.snap = 1;
+ if (ethtype > frame_len - offset) {
+ prs->error_flags.snap_len = 1;
+ goto parse_exit;
}
+ ethtype = odp_be_to_cpu_16(*((const uint16_t *)(uintptr_t)
+ (parseptr + 6)));
+ offset += 8;
+ parseptr += 8;
+ }
- if (prs->ethtype == _ODP_ETHTYPE_VLAN) {
- prs->input_flags.vlan = 1;
- vlan = (const _odp_vlanhdr_t *)parseptr;
- prs->ethtype = odp_be_to_cpu_16(vlan->type);
- offset += sizeof(_odp_vlanhdr_t);
- parseptr += sizeof(_odp_vlanhdr_t);
- }
+ /* Parse the VLAN header(s), if present */
+ if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) {
+ prs->input_flags.vlan_qinq = 1;
+ prs->input_flags.vlan = 1;
- prs->l3_offset = offset;
- prs->parsed_layers = LAYER_L2;
- if (layer == LAYER_L2)
- return prs->error_flags.all != 0;
+ vlan = (const _odp_vlanhdr_t *)parseptr;
+ ethtype = odp_be_to_cpu_16(vlan->type);
+ offset += sizeof(_odp_vlanhdr_t);
+ parseptr += sizeof(_odp_vlanhdr_t);
}
- /* Fall through */
- case LAYER_L3:
- {
- offset = prs->l3_offset;
- parseptr = (const uint8_t *)(ptr + offset);
- /* Set l3_offset+flag only for known ethtypes */
- prs->input_flags.l3 = 1;
-
- /* Parse Layer 3 headers */
- switch (prs->ethtype) {
- case _ODP_ETHTYPE_IPV4:
- prs->input_flags.ipv4 = 1;
- prs->ip_proto = parse_ipv4(prs, &parseptr, &offset,
- frame_len);
- break;
+ if (ethtype == _ODP_ETHTYPE_VLAN) {
+ prs->input_flags.vlan = 1;
+ vlan = (const _odp_vlanhdr_t *)parseptr;
+ ethtype = odp_be_to_cpu_16(vlan->type);
+ offset += sizeof(_odp_vlanhdr_t);
+ parseptr += sizeof(_odp_vlanhdr_t);
+ }
- case _ODP_ETHTYPE_IPV6:
- prs->input_flags.ipv6 = 1;
- prs->ip_proto = parse_ipv6(prs, &parseptr, &offset,
- frame_len, seg_len);
- break;
+ if (layer == ODP_PKTIO_PARSER_LAYER_L2)
+ return prs->error_flags.all != 0;
- case _ODP_ETHTYPE_ARP:
- prs->input_flags.arp = 1;
- prs->ip_proto = 255; /* Reserved invalid by IANA */
- break;
+ /* Set l3_offset+flag only for known ethtypes */
+ prs->l3_offset = offset;
+ prs->input_flags.l3 = 1;
- default:
- prs->input_flags.l3 = 0;
- prs->l3_offset = ODP_PACKET_OFFSET_INVALID;
- prs->ip_proto = 255; /* Reserved invalid by IANA */
- }
+ /* Parse Layer 3 headers */
+ switch (ethtype) {
+ case _ODP_ETHTYPE_IPV4:
+ prs->input_flags.ipv4 = 1;
+ ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len);
+ break;
- /* Set l4_offset+flag only for known ip_proto */
- prs->l4_offset = offset;
- prs->parsed_layers = LAYER_L3;
- if (layer == LAYER_L3)
- return prs->error_flags.all != 0;
- }
- /* Fall through */
+ case _ODP_ETHTYPE_IPV6:
+ prs->input_flags.ipv6 = 1;
+ ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len,
+ seg_len);
+ break;
- case LAYER_L4:
- {
- offset = prs->l4_offset;
- parseptr = (const uint8_t *)(ptr + offset);
- prs->input_flags.l4 = 1;
+ case _ODP_ETHTYPE_ARP:
+ prs->input_flags.arp = 1;
+ ip_proto = 255; /* Reserved invalid by IANA */
+ break;
- /* Parse Layer 4 headers */
- switch (prs->ip_proto) {
- case _ODP_IPPROTO_ICMPv4:
- /* Fall through */
+ default:
+ prs->input_flags.l3 = 0;
+ prs->l3_offset = ODP_PACKET_OFFSET_INVALID;
+ ip_proto = 255; /* Reserved invalid by IANA */
+ }
- case _ODP_IPPROTO_ICMPv6:
- prs->input_flags.icmp = 1;
- break;
+ if (layer == ODP_PKTIO_PARSER_LAYER_L3)
+ return prs->error_flags.all != 0;
- case _ODP_IPPROTO_TCP:
- if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len))
- return -1;
- prs->input_flags.tcp = 1;
- parse_tcp(prs, &parseptr, NULL);
- break;
+ /* Set l4_offset+flag only for known ip_proto */
+ prs->l4_offset = offset;
+ prs->input_flags.l4 = 1;
- case _ODP_IPPROTO_UDP:
- if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len))
- return -1;
- prs->input_flags.udp = 1;
- parse_udp(prs, &parseptr, NULL);
- break;
+ /* Parse Layer 4 headers */
+ switch (ip_proto) {
+ case _ODP_IPPROTO_ICMPv4:
+ /* Fall through */
- case _ODP_IPPROTO_AH:
- prs->input_flags.ipsec = 1;
- prs->input_flags.ipsec_ah = 1;
- break;
+ case _ODP_IPPROTO_ICMPv6:
+ prs->input_flags.icmp = 1;
+ break;
- case _ODP_IPPROTO_ESP:
- prs->input_flags.ipsec = 1;
- prs->input_flags.ipsec_esp = 1;
- break;
+ case _ODP_IPPROTO_TCP:
+ if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len))
+ return -1;
+ prs->input_flags.tcp = 1;
+ parse_tcp(prs, &parseptr, NULL);
+ break;
- case _ODP_IPPROTO_SCTP:
- prs->input_flags.sctp = 1;
- break;
+ case _ODP_IPPROTO_UDP:
+ if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len))
+ return -1;
+ prs->input_flags.udp = 1;
+ parse_udp(prs, &parseptr, NULL);
+ break;
- default:
- prs->input_flags.l4 = 0;
- prs->l4_offset = ODP_PACKET_OFFSET_INVALID;
- break;
- }
+ case _ODP_IPPROTO_AH:
+ prs->input_flags.ipsec = 1;
+ prs->input_flags.ipsec_ah = 1;
+ break;
- prs->parsed_layers = LAYER_L4;
+ case _ODP_IPPROTO_ESP:
+ prs->input_flags.ipsec = 1;
+ prs->input_flags.ipsec_esp = 1;
break;
- }
- case LAYER_ALL:
+ case _ODP_IPPROTO_SCTP:
+ prs->input_flags.sctp = 1;
break;
default:
- ODP_ERR("Invalid parse layer: %d\n", (int)layer);
- return -1;
+ prs->input_flags.l4 = 0;
+ prs->l4_offset = ODP_PACKET_OFFSET_INVALID;
+ break;
}
-
- prs->parsed_layers = LAYER_ALL;
-
parse_exit:
return prs->error_flags.all != 0;
}
@@ -2188,7 +2105,8 @@ parse_exit:
/**
* Simple packet parser
*/
-int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, layer_t layer)
+int packet_parse_layer(odp_packet_hdr_t *pkt_hdr,
+ odp_pktio_parser_layer_t layer)
{
uint32_t seg_len = packet_first_seg_len(pkt_hdr);
void *base = packet_data(pkt_hdr);
diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c
index c2e8b9cf..72df1ecf 100644
--- a/platform/linux-generic/odp_packet_flags.c
+++ b/platform/linux-generic/odp_packet_flags.c
@@ -8,17 +8,13 @@
#include <odp/api/packet_flags.h>
#include <odp_packet_internal.h>
-#define retflag(pkt, x, layer) do { \
+#define retflag(pkt, x) do { \
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \
- if (pkt_hdr->p.parsed_layers < layer) \
- packet_parse_layer(pkt_hdr, layer); \
return pkt_hdr->p.x; \
} while (0)
-#define setflag(pkt, x, v, layer) do { \
+#define setflag(pkt, x, v) do { \
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); \
- if (pkt_hdr->p.parsed_layers < layer) \
- packet_parse_layer(pkt_hdr, layer); \
pkt_hdr->p.x = (v) & 1; \
} while (0)
@@ -26,9 +22,7 @@ int odp_packet_has_error(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
- if (packet_parse_not_complete(pkt_hdr))
- packet_parse_layer(pkt_hdr, LAYER_ALL);
- return odp_packet_hdr(pkt)->p.error_flags.all != 0;
+ return pkt_hdr->p.error_flags.all != 0;
}
/* Get Input Flags */
@@ -45,126 +39,117 @@ int odp_packet_has_l2_error(odp_packet_t pkt)
int odp_packet_has_l3(odp_packet_t pkt)
{
- retflag(pkt, input_flags.l3, LAYER_L3);
+ retflag(pkt, input_flags.l3);
}
int odp_packet_has_l3_error(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
- if (pkt_hdr->p.parsed_layers < LAYER_L3)
- packet_parse_layer(pkt_hdr, LAYER_L3);
-
return pkt_hdr->p.error_flags.ip_err;
}
int odp_packet_has_l4(odp_packet_t pkt)
{
- retflag(pkt, input_flags.l4, LAYER_L4);
+ retflag(pkt, input_flags.l4);
}
int odp_packet_has_l4_error(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
- if (pkt_hdr->p.parsed_layers < LAYER_L4)
- packet_parse_layer(pkt_hdr, LAYER_L4);
-
return pkt_hdr->p.error_flags.tcp_err | pkt_hdr->p.error_flags.udp_err;
}
int odp_packet_has_eth_bcast(odp_packet_t pkt)
{
- retflag(pkt, input_flags.eth_bcast, LAYER_L2);
+ retflag(pkt, input_flags.eth_bcast);
}
int odp_packet_has_eth_mcast(odp_packet_t pkt)
{
- retflag(pkt, input_flags.eth_mcast, LAYER_L2);
+ retflag(pkt, input_flags.eth_mcast);
}
int odp_packet_has_vlan(odp_packet_t pkt)
{
- retflag(pkt, input_flags.vlan, LAYER_L2);
+ retflag(pkt, input_flags.vlan);
}
int odp_packet_has_vlan_qinq(odp_packet_t pkt)
{
- retflag(pkt, input_flags.vlan_qinq, LAYER_L2);
+ retflag(pkt, input_flags.vlan_qinq);
}
int odp_packet_has_arp(odp_packet_t pkt)
{
- retflag(pkt, input_flags.arp, LAYER_L3);
+ retflag(pkt, input_flags.arp);
}
int odp_packet_has_ipv4(odp_packet_t pkt)
{
- retflag(pkt, input_flags.ipv4, LAYER_L3);
+ retflag(pkt, input_flags.ipv4);
}
int odp_packet_has_ipv6(odp_packet_t pkt)
{
- retflag(pkt, input_flags.ipv6, LAYER_L3);
+ retflag(pkt, input_flags.ipv6);
}
int odp_packet_has_ip_bcast(odp_packet_t pkt)
{
- retflag(pkt, input_flags.ip_bcast, LAYER_L3);
+ retflag(pkt, input_flags.ip_bcast);
}
int odp_packet_has_ip_mcast(odp_packet_t pkt)
{
- retflag(pkt, input_flags.ip_mcast, LAYER_L3);
+ retflag(pkt, input_flags.ip_mcast);
}
int odp_packet_has_ipfrag(odp_packet_t pkt)
{
- retflag(pkt, input_flags.ipfrag, LAYER_L3);
+ retflag(pkt, input_flags.ipfrag);
}
int odp_packet_has_ipopt(odp_packet_t pkt)
{
- retflag(pkt, input_flags.ipopt, LAYER_L3);
+ retflag(pkt, input_flags.ipopt);
}
int odp_packet_has_ipsec(odp_packet_t pkt)
{
- retflag(pkt, input_flags.ipsec, LAYER_L4);
+ retflag(pkt, input_flags.ipsec);
}
int odp_packet_has_udp(odp_packet_t pkt)
{
- retflag(pkt, input_flags.udp, LAYER_L4);
+ retflag(pkt, input_flags.udp);
}
int odp_packet_has_tcp(odp_packet_t pkt)
{
- retflag(pkt, input_flags.tcp, LAYER_L4);
+ retflag(pkt, input_flags.tcp);
}
int odp_packet_has_sctp(odp_packet_t pkt)
{
- retflag(pkt, input_flags.sctp, LAYER_L4);
+ retflag(pkt, input_flags.sctp);
}
int odp_packet_has_icmp(odp_packet_t pkt)
{
- retflag(pkt, input_flags.icmp, LAYER_L4);
+ retflag(pkt, input_flags.icmp);
}
odp_packet_color_t odp_packet_color(odp_packet_t pkt)
{
- retflag(pkt, input_flags.color, LAYER_ALL);
+ retflag(pkt, input_flags.color);
}
void odp_packet_color_set(odp_packet_t pkt, odp_packet_color_t color)
{
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
- if (packet_parse_not_complete(pkt_hdr))
- packet_parse_layer(pkt_hdr, LAYER_ALL);
-
pkt_hdr->p.input_flags.color = color;
}
@@ -172,29 +157,23 @@ odp_bool_t odp_packet_drop_eligible(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
- if (packet_parse_not_complete(pkt_hdr))
- packet_parse_layer(pkt_hdr, LAYER_ALL);
-
return !pkt_hdr->p.input_flags.nodrop;
}
void odp_packet_drop_eligible_set(odp_packet_t pkt, odp_bool_t drop)
{
- setflag(pkt, input_flags.nodrop, !drop, LAYER_ALL);
+ setflag(pkt, input_flags.nodrop, !drop);
}
int8_t odp_packet_shaper_len_adjust(odp_packet_t pkt)
{
- retflag(pkt, output_flags.shaper_len_adj, LAYER_ALL);
+ retflag(pkt, output_flags.shaper_len_adj);
}
void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj)
{
odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
- if (packet_parse_not_complete(pkt_hdr))
- packet_parse_layer(pkt_hdr, LAYER_ALL);
-
pkt_hdr->p.output_flags.shaper_len_adj = adj;
}
@@ -202,107 +181,107 @@ void odp_packet_shaper_len_adjust_set(odp_packet_t pkt, int8_t adj)
void odp_packet_has_l2_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.l2, val, LAYER_L2);
+ setflag(pkt, input_flags.l2, val);
}
void odp_packet_has_l3_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.l3, val, LAYER_L3);
+ setflag(pkt, input_flags.l3, val);
}
void odp_packet_has_l4_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.l4, val, LAYER_L4);
+ setflag(pkt, input_flags.l4, val);
}
void odp_packet_has_eth_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.eth, val, LAYER_L2);
+ setflag(pkt, input_flags.eth, val);
}
void odp_packet_has_eth_bcast_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.eth_bcast, val, LAYER_L2);
+ setflag(pkt, input_flags.eth_bcast, val);
}
void odp_packet_has_eth_mcast_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.eth_mcast, val, LAYER_L2);
+ setflag(pkt, input_flags.eth_mcast, val);
}
void odp_packet_has_jumbo_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.jumbo, val, LAYER_L2);
+ setflag(pkt, input_flags.jumbo, val);
}
void odp_packet_has_vlan_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.vlan, val, LAYER_L2);
+ setflag(pkt, input_flags.vlan, val);
}
void odp_packet_has_vlan_qinq_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.vlan_qinq, val, LAYER_L2);
+ setflag(pkt, input_flags.vlan_qinq, val);
}
void odp_packet_has_arp_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.arp, val, LAYER_L3);
+ setflag(pkt, input_flags.arp, val);
}
void odp_packet_has_ipv4_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.ipv4, val, LAYER_L3);
+ setflag(pkt, input_flags.ipv4, val);
}
void odp_packet_has_ipv6_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.ipv6, val, LAYER_L3);
+ setflag(pkt, input_flags.ipv6, val);
}
void odp_packet_has_ip_bcast_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.ip_bcast, val, LAYER_L3);
+ setflag(pkt, input_flags.ip_bcast, val);
}
void odp_packet_has_ip_mcast_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.ip_mcast, val, LAYER_L3);
+ setflag(pkt, input_flags.ip_mcast, val);
}
void odp_packet_has_ipfrag_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.ipfrag, val, LAYER_L3);
+ setflag(pkt, input_flags.ipfrag, val);
}
void odp_packet_has_ipopt_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.ipopt, val, LAYER_L3);
+ setflag(pkt, input_flags.ipopt, val);
}
void odp_packet_has_ipsec_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.ipsec, val, LAYER_L4);
+ setflag(pkt, input_flags.ipsec, val);
}
void odp_packet_has_udp_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.udp, val, LAYER_L4);
+ setflag(pkt, input_flags.udp, val);
}
void odp_packet_has_tcp_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.tcp, val, LAYER_L4);
+ setflag(pkt, input_flags.tcp, val);
}
void odp_packet_has_sctp_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.sctp, val, LAYER_L4);
+ setflag(pkt, input_flags.sctp, val);
}
void odp_packet_has_icmp_set(odp_packet_t pkt, int val)
{
- setflag(pkt, input_flags.icmp, val, LAYER_L4);
+ setflag(pkt, input_flags.icmp, val);
}
void odp_packet_has_flow_hash_clr(odp_packet_t pkt)
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index ea9f2a75..877978ba 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -206,6 +206,8 @@ static odp_pktio_t setup_pktio_entry(const char *name, odp_pool_t pool,
memcpy(&pktio_entry->s.param, param, sizeof(odp_pktio_param_t));
pktio_entry->s.handle = hdl;
+ odp_pktio_config_init(&pktio_entry->s.config);
+
for (pktio_if = 0; pktio_if_ops[pktio_if]; ++pktio_if) {
ret = pktio_if_ops[pktio_if]->open(hdl, pktio_entry, name,
pool);
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 6ac89bd5..c52cd09d 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -653,7 +653,8 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
else
- packet_parse_l2(&pkt_hdr->p, pkt_len);
+ packet_parse_layer(pkt_hdr,
+ pktio_entry->s.config.parser.layer);
if (mbuf->ol_flags & PKT_RX_RSS_HASH)
odp_packet_flow_hash_set(pkt, mbuf->hash.rss);
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index 61e98ad8..e9ad22ba 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -132,7 +132,8 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
else
- packet_parse_l2(&pkt_hdr->p, pkt_len);
+ packet_parse_layer(pkt_hdr,
+ pktio_entry->s.config.parser.layer);
packet_set_ts(pkt_hdr, ts);
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index ae3db34d..928bb00a 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -663,7 +663,8 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
else
- packet_parse_l2(&pkt_hdr->p, len);
+ packet_parse_layer(pkt_hdr,
+ pktio_entry->s.config.parser.layer);
packet_set_ts(pkt_hdr, ts);
}
diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
index e54a56f5..a467b640 100644
--- a/platform/linux-generic/pktio/pcap.c
+++ b/platform/linux-generic/pktio/pcap.c
@@ -252,7 +252,8 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
break;
}
- packet_parse_l2(&pkt_hdr->p, pkt_len);
+ packet_parse_layer(pkt_hdr,
+ pktio_entry->s.config.parser.layer);
pktio_entry->s.stats.in_octets += pkt_hdr->frame_len;
packet_set_ts(pkt_hdr, ts);
diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
index 2e94a388..a383adc6 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -673,8 +673,10 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
pkt_hdr->input = pktio_entry->s.handle;
if (!pktio_cls_enabled(pktio_entry))
- packet_parse_l2(&pkt_hdr->p, pkt_len);
+ packet_parse_layer(pkt_hdr,
+ pktio_entry->s.config.parser.layer);
+ pkt_hdr->input = pktio_entry->s.handle;
packet_set_ts(pkt_hdr, ts);
pkt_table[nb_rx++] = pkt;
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index fdf8cca5..2dba7b08 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -231,7 +231,8 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, hdr);
else
- packet_parse_l2(&hdr->p, pkt_len);
+ packet_parse_layer(hdr,
+ pktio_entry->s.config.parser.layer);
packet_set_ts(hdr, ts);
diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c
index ac204560..650c12a7 100644
--- a/platform/linux-generic/pktio/tap.c
+++ b/platform/linux-generic/pktio/tap.c
@@ -213,7 +213,8 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
else
- packet_parse_l2(&pkt_hdr->p, len);
+ packet_parse_layer(pkt_hdr,
+ pktio_entry->s.config.parser.layer);
packet_set_ts(pkt_hdr, ts);
pkt_hdr->input = pktio_entry->s.handle;
commit 8e9242391f79ed54430b5fdc37e992addf9a26b8
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue May 30 16:14:57 2017 +0300
mergefix: remove duplicate declaration
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 157a4152..a993542f 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -656,83 +656,6 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
return num;
}
-int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
- odp_crypto_cipher_capability_t dst[],
- int num_copy)
-{
- const odp_crypto_cipher_capability_t *src;
- int num;
- int size = sizeof(odp_crypto_cipher_capability_t);
-
- switch (cipher) {
- case ODP_CIPHER_ALG_NULL:
- src = NULL;
- num = 0;
- break;
- case ODP_CIPHER_ALG_DES:
- src = cipher_capa_des;
- num = sizeof(cipher_capa_des) / size;
- break;
- case ODP_CIPHER_ALG_3DES_CBC:
- src = cipher_capa_trides_cbc;
- num = sizeof(cipher_capa_trides_cbc) / size;
- break;
- case ODP_CIPHER_ALG_AES_CBC:
- src = cipher_capa_aes_cbc;
- num = sizeof(cipher_capa_aes_cbc) / size;
- break;
- case ODP_CIPHER_ALG_AES_GCM:
- src = cipher_capa_aes_gcm;
- num = sizeof(cipher_capa_aes_gcm) / size;
- break;
- default:
- return -1;
- }
-
- if (num < num_copy)
- num_copy = num;
-
- memcpy(dst, src, num_copy * size);
-
- return num;
-}
-
-int odp_crypto_auth_capability(odp_auth_alg_t auth,
- odp_crypto_auth_capability_t dst[], int num_copy)
-{
- const odp_crypto_auth_capability_t *src;
- int num;
- int size = sizeof(odp_crypto_auth_capability_t);
-
- switch (auth) {
- case ODP_AUTH_ALG_NULL:
- src = NULL;
- num = 0;
- break;
- case ODP_AUTH_ALG_MD5_HMAC:
- src = auth_capa_md5_hmac;
- num = sizeof(auth_capa_md5_hmac) / size;
- break;
- case ODP_AUTH_ALG_SHA256_HMAC:
- src = auth_capa_sha256_hmac;
- num = sizeof(auth_capa_sha256_hmac) / size;
- break;
- case ODP_AUTH_ALG_AES_GCM:
- src = auth_capa_aes_gcm;
- num = sizeof(auth_capa_aes_gcm) / size;
- break;
- default:
- return -1;
- }
-
- if (num < num_copy)
- num_copy = num;
-
- memcpy(dst, src, num_copy * size);
-
- return num;
-}
-
int
odp_crypto_session_create(odp_crypto_session_param_t *param,
odp_crypto_session_t *session_out,
commit 0344270a085f78d9f6d4fbef3c497750bbcee071
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon May 15 23:24:38 2017 +0300
linux-generic: packet: add functions to optimize memset and memcmp paths
Add function implementing memset and memcmp on packet object.
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/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 0a9f1779..4c8d7515 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -268,6 +268,12 @@ int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr,
int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr);
+int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset,
+ uint8_t c, uint32_t len);
+
+int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset,
+ const void *s, uint32_t len);
+
#ifdef __cplusplus
}
#endif
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index c6962ce9..69098624 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -1665,6 +1665,54 @@ int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset,
pkt, src_offset, len);
}
+int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset,
+ uint8_t c, uint32_t len)
+{
+ void *mapaddr;
+ uint32_t seglen = 0; /* GCC */
+ uint32_t setlen;
+ 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);
+ setlen = len > seglen ? seglen : len;
+ memset(mapaddr, c, setlen);
+ offset += setlen;
+ len -= setlen;
+ }
+
+ return 0;
+}
+
+int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset,
+ const void *s, uint32_t len)
+{
+ const uint8_t *ptr = s;
+ void *mapaddr;
+ uint32_t seglen = 0; /* GCC */
+ uint32_t cmplen;
+ int ret;
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+
+ ODP_ASSERT(offset + len <= pkt_hdr->frame_len);
+
+ while (len > 0) {
+ mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL);
+ cmplen = len > seglen ? seglen : len;
+ ret = memcmp(mapaddr, ptr, cmplen);
+ if (ret != 0)
+ return ret;
+ offset += cmplen;
+ len -= cmplen;
+ ptr += cmplen;
+ }
+
+ return 0;
+}
+
/*
*
* Debugging
commit 697c3be9b2155379dee458d66335442375a9354d
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri May 5 04:14:34 2017 +0300
linux: crypto: fix checking of GCM tags
Currently odp_crypto code will happily accept wrong tags, because the
check for EVP_DecryptFinal_ex return code is incorrect. This function
returns 0 if tag is incorrect, not < 0.
https://bugs.linaro.org/show_bug.cgi?id=3003
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 6963ee62..157a4152 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -384,7 +384,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
auth_len - (aad_tail - aad_head));
}
- if (EVP_DecryptFinal_ex(ctx, cipherdata + cipher_len, &plain_len) < 0)
+ if (EVP_DecryptFinal_ex(ctx, cipherdata + cipher_len, &plain_len) <= 0)
return ODP_CRYPTO_ALG_ERR_ICV_CHECK;
return ODP_CRYPTO_ALG_ERR_NONE;
commit 2ffff0bc3e07678214a413b5eb89da13e7624055
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri May 5 04:13:15 2017 +0300
test: crypto: add AES-GCM tests with wrong tag value
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 57e7c0e0..9defdbfa 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -689,10 +689,13 @@ void crypto_test_dec_alg_aes128_gcm(void)
odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
auth_key = { .data = NULL, .length = 0 };
odp_crypto_iv_t iv = { .data = NULL, .length = AES128_GCM_IV_LEN };
+ uint8_t wrong_digest[AES128_GCM_DIGEST_LEN];
unsigned int test_vec_num = (sizeof(aes128_gcm_reference_length) /
sizeof(aes128_gcm_reference_length[0]));
unsigned int i;
+ memset(wrong_digest, 0xa5, sizeof(wrong_digest));
+
for (i = 0; i < test_vec_num; i++) {
cipher_key.data = aes128_gcm_reference_key[i];
cipher_key.length = sizeof(aes128_gcm_reference_key[i]);
@@ -723,6 +726,23 @@ void crypto_test_dec_alg_aes128_gcm(void)
aes128_gcm_reference_ciphertext[i] +
aes128_gcm_reference_length[i],
AES128_GCM_CHECK_LEN);
+
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ 1,
+ ODP_CIPHER_ALG_AES_GCM,
+ iv,
+ NULL,
+ cipher_key,
+ ODP_AUTH_ALG_AES_GCM,
+ auth_key,
+ &aes128_gcm_cipher_range[i],
+ &aes128_gcm_auth_range[i],
+ aes128_gcm_reference_ciphertext[i],
+ aes128_gcm_reference_length[i] + AES128_GCM_CHECK_LEN,
+ aes128_gcm_reference_plaintext[i],
+ aes128_gcm_reference_length[i],
+ wrong_digest,
+ AES128_GCM_CHECK_LEN);
}
}
@@ -736,10 +756,13 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 },
auth_key = { .data = NULL, .length = 0 };
odp_crypto_iv_t iv = { .data = NULL, .length = AES128_GCM_IV_LEN };
+ uint8_t wrong_digest[AES128_GCM_DIGEST_LEN];
unsigned int test_vec_num = (sizeof(aes128_gcm_reference_length) /
sizeof(aes128_gcm_reference_length[0]));
unsigned int i;
+ memset(wrong_digest, 0xa5, sizeof(wrong_digest));
+
for (i = 0; i < test_vec_num; i++) {
cipher_key.data = aes128_gcm_reference_key[i];
cipher_key.length = sizeof(aes128_gcm_reference_key[i]);
@@ -768,6 +791,23 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
aes128_gcm_reference_ciphertext[i] +
aes128_gcm_reference_length[i],
AES128_GCM_CHECK_LEN);
+
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ 1,
+ ODP_CIPHER_ALG_AES_GCM,
+ iv,
+ aes128_gcm_reference_iv[i],
+ cipher_key,
+ ODP_AUTH_ALG_AES_GCM,
+ auth_key,
+ &aes128_gcm_cipher_range[i],
+ &aes128_gcm_auth_range[i],
+ aes128_gcm_reference_ciphertext[i],
+ aes128_gcm_reference_length[i] + AES128_GCM_CHECK_LEN,
+ aes128_gcm_reference_plaintext[i],
+ aes128_gcm_reference_length[i],
+ wrong_digest,
+ AES128_GCM_CHECK_LEN);
}
}
commit dfbab7438c8404d5f4af20086e2100d40a5ffc0c
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:58 2017 +0300
linux-gen: time: store timespec as nsec
Use single 64 bit nanosecond value to store time when using
posix time. Posix time stamp is converted directly from
timespec (sec + nsec) to nsec time. Storage space for odp_time_t
is halved as both posix and HW time use single u64. Some
functions (sum, diff, cmp) are generic for both time sources.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/time_types.h b/platform/linux-generic/include/odp/api/plat/time_types.h
index 1cafb1f7..71e354e6 100644
--- a/platform/linux-generic/include/odp/api/plat/time_types.h
+++ b/platform/linux-generic/include/odp/api/plat/time_types.h
@@ -22,32 +22,24 @@ extern "C" {
**/
/**
- * @internal Time structure used to isolate odp-linux implementation from
- * the linux timespec structure, which is dependent on POSIX extension level.
+ * @internal Time structure used for both POSIX timespec and HW counter
+ * implementations.
*/
typedef struct odp_time_t {
union {
- /** @internal Posix timespec */
- struct {
- /** @internal Seconds */
- int64_t tv_sec;
-
- /** @internal Nanoseconds */
- int64_t tv_nsec;
- } spec;
-
- /** @internal HW time counter */
- struct {
- /** @internal Counter value */
- uint64_t count;
-
- /** @internal Reserved */
- uint64_t reserved;
- } hw;
+ /** @internal Used with generic 64 bit operations */
+ uint64_t u64;
+
+ /** @internal Nanoseconds */
+ uint64_t nsec;
+
+ /** @internal HW timer counter value */
+ uint64_t count;
+
};
} odp_time_t;
-#define ODP_TIME_NULL ((odp_time_t){.spec = {0, 0} })
+#define ODP_TIME_NULL ((odp_time_t){.u64 = 0})
/**
* @}
diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c
index ac82175d..2bbe5666 100644
--- a/platform/linux-generic/odp_time.c
+++ b/platform/linux-generic/odp_time.c
@@ -15,10 +15,10 @@
#include <inttypes.h>
typedef struct time_global_t {
- odp_time_t start_time;
- int use_hw;
- uint64_t hw_start;
- uint64_t hw_freq_hz;
+ struct timespec spec_start;
+ int use_hw;
+ uint64_t hw_start;
+ uint64_t hw_freq_hz;
} time_global_t;
static time_global_t global;
@@ -27,19 +27,23 @@ static time_global_t global;
* Posix timespec based functions
*/
-static inline odp_time_t time_spec_diff(odp_time_t t2, odp_time_t t1)
+static inline uint64_t time_spec_diff_nsec(struct timespec *t2,
+ struct timespec *t1)
{
- odp_time_t time;
+ struct timespec diff;
+ uint64_t nsec;
- time.spec.tv_sec = t2.spec.tv_sec - t1.spec.tv_sec;
- time.spec.tv_nsec = t2.spec.tv_nsec - t1.spec.tv_nsec;
+ diff.tv_sec = t2->tv_sec - t1->tv_sec;
+ diff.tv_nsec = t2->tv_nsec - t1->tv_nsec;
- if (time.spec.tv_nsec < 0) {
- time.spec.tv_nsec += ODP_TIME_SEC_IN_NS;
- --time.spec.tv_sec;
+ if (diff.tv_nsec < 0) {
+ diff.tv_nsec += ODP_TIME_SEC_IN_NS;
+ diff.tv_sec -= 1;
}
- return time;
+ nsec = (diff.tv_sec * ODP_TIME_SEC_IN_NS) + diff.tv_nsec;
+
+ return nsec;
}
static inline odp_time_t time_spec_cur(void)
@@ -52,10 +56,9 @@ static inline odp_time_t time_spec_cur(void)
if (odp_unlikely(ret != 0))
ODP_ABORT("clock_gettime failed\n");
- time.spec.tv_sec = sys_time.tv_sec;
- time.spec.tv_nsec = sys_time.tv_nsec;
+ time.nsec = time_spec_diff_nsec(&sys_time, &global.spec_start);
- return time_spec_diff(time, global.start_time);
+ return time;
}
static inline uint64_t time_spec_res(void)
@@ -70,48 +73,16 @@ static inline uint64_t time_spec_res(void)
return ODP_TIME_SEC_IN_NS / (uint64_t)tres.tv_nsec;
}
-static inline int time_spec_cmp(odp_time_t t2, odp_time_t t1)
-{
- if (t2.spec.tv_sec < t1.spec.tv_sec)
- return -1;
-
- if (t2.spec.tv_sec > t1.spec.tv_sec)
- return 1;
-
- return t2.spec.tv_nsec - t1.spec.tv_nsec;
-}
-
-static inline odp_time_t time_spec_sum(odp_time_t t1, odp_time_t t2)
-{
- odp_time_t time;
-
- time.spec.tv_sec = t2.spec.tv_sec + t1.spec.tv_sec;
- time.spec.tv_nsec = t2.spec.tv_nsec + t1.spec.tv_nsec;
-
- if (time.spec.tv_nsec >= (long)ODP_TIME_SEC_IN_NS) {
- time.spec.tv_nsec -= ODP_TIME_SEC_IN_NS;
- ++time.spec.tv_sec;
- }
-
- return time;
-}
-
static inline uint64_t time_spec_to_ns(odp_time_t time)
{
- uint64_t ns;
-
- ns = time.spec.tv_sec * ODP_TIME_SEC_IN_NS;
- ns += time.spec.tv_nsec;
-
- return ns;
+ return time.nsec;
}
static inline odp_time_t time_spec_from_ns(uint64_t ns)
{
odp_time_t time;
- time.spec.tv_sec = ns / ODP_TIME_SEC_IN_NS;
- time.spec.tv_nsec = ns - time.spec.tv_sec * ODP_TIME_SEC_IN_NS;
+ time.nsec = ns;
return time;
}
@@ -124,7 +95,7 @@ static inline odp_time_t time_hw_cur(void)
{
odp_time_t time;
- time.hw.count = cpu_global_time() - global.hw_start;
+ time.count = cpu_global_time() - global.hw_start;
return time;
}
@@ -136,40 +107,11 @@ static inline uint64_t time_hw_res(void)
return global.hw_freq_hz / 10;
}
-static inline int time_hw_cmp(odp_time_t t2, odp_time_t t1)
-{
- if (odp_likely(t2.hw.count > t1.hw.count))
- return 1;
-
- if (t2.hw.count < t1.hw.count)
- return -1;
-
- return 0;
-}
-
-static inline odp_time_t time_hw_diff(odp_time_t t2, odp_time_t t1)
-{
- odp_time_t time;
-
- time.hw.count = t2.hw.count - t1.hw.count;
-
- return time;
-}
-
-static inline odp_time_t time_hw_sum(odp_time_t t1, odp_time_t t2)
-{
- odp_time_t time;
-
- time.hw.count = t1.hw.count + t2.hw.count;
-
- return time;
-}
-
static inline uint64_t time_hw_to_ns(odp_time_t time)
{
uint64_t nsec;
uint64_t freq_hz = global.hw_freq_hz;
- uint64_t count = time.hw.count;
+ uint64_t count = time.count;
uint64_t sec = 0;
if (count >= freq_hz) {
@@ -197,8 +139,7 @@ static inline odp_time_t time_hw_from_ns(uint64_t ns)
count = sec * freq_hz;
count += (ns * freq_hz) / ODP_TIME_SEC_IN_NS;
- time.hw.reserved = 0;
- time.hw.count = count;
+ time.count = count;
return time;
}
@@ -225,26 +166,22 @@ static inline uint64_t time_res(void)
static inline int time_cmp(odp_time_t t2, odp_time_t t1)
{
- if (global.use_hw)
- return time_hw_cmp(t2, t1);
-
- return time_spec_cmp(t2, t1);
-}
+ if (odp_likely(t2.u64 > t1.u64))
+ return 1;
-static inline odp_time_t time_diff(odp_time_t t2, odp_time_t t1)
-{
- if (global.use_hw)
- return time_hw_diff(t2, t1);
+ if (t2.u64 < t1.u64)
+ return -1;
- return time_spec_diff(t2, t1);
+ return 0;
}
static inline odp_time_t time_sum(odp_time_t t1, odp_time_t t2)
{
- if (global.use_hw)
- return time_hw_sum(t1, t2);
+ odp_time_t time;
+
+ time.u64 = t1.u64 + t2.u64;
- return time_spec_sum(t1, t2);
+ return time;
}
static inline uint64_t time_to_ns(odp_time_t time)
@@ -284,7 +221,11 @@ odp_time_t odp_time_global(void)
odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1)
{
- return time_diff(t2, t1);
+ odp_time_t time;
+
+ time.u64 = t2.u64 - t1.u64;
+
+ return time;
}
uint64_t odp_time_to_ns(odp_time_t time)
@@ -338,7 +279,6 @@ void odp_time_wait_until(odp_time_t time)
int odp_time_init_global(void)
{
- struct timespec sys_time;
int ret = 0;
memset(&global, 0, sizeof(time_global_t));
@@ -357,13 +297,10 @@ int odp_time_init_global(void)
return 0;
}
- global.start_time = ODP_TIME_NULL;
+ global.spec_start.tv_sec = 0;
+ global.spec_start.tv_nsec = 0;
- ret = clock_gettime(CLOCK_MONOTONIC_RAW, &sys_time);
- if (ret == 0) {
- global.start_time.spec.tv_sec = sys_time.tv_sec;
- global.start_time.spec.tv_nsec = sys_time.tv_nsec;
- }
+ ret = clock_gettime(CLOCK_MONOTONIC_RAW, &global.spec_start);
return ret;
}
commit 60150bba495711e6fdfc948ffb4ad405878fbcbc
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:57 2017 +0300
linux-gen: time: improve x86 TSC freq measurement accuracy
Add short warm up round and measure over a longer period of
time (250ms vs 100ms).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_arch.c
index 9ba601a3..b1da428b 100644
--- a/platform/linux-generic/arch/x86/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/x86/odp_cpu_arch.c
@@ -54,11 +54,16 @@ uint64_t cpu_global_time_freq(void)
uint64_t t1, t2, ts_nsec, cycles, hz;
int i;
uint64_t avg = 0;
- int rounds = 4;
+ int rounds = 3;
+ int warm_up = 1;
for (i = 0; i < rounds; i++) {
- sleep.tv_sec = 0;
- sleep.tv_nsec = SEC_IN_NS / 10;
+ sleep.tv_sec = 0;
+
+ if (warm_up)
+ sleep.tv_nsec = SEC_IN_NS / 1000;
+ else
+ sleep.tv_nsec = SEC_IN_NS / 4;
if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts1)) {
ODP_DBG("clock_gettime failed\n");
@@ -85,8 +90,12 @@ uint64_t cpu_global_time_freq(void)
cycles = t2 - t1;
hz = (cycles * SEC_IN_NS) / ts_nsec;
- avg += hz;
+
+ if (warm_up)
+ warm_up = 0;
+ else
+ avg += hz;
}
- return avg / rounds;
+ return avg / (rounds - 1);
}
commit fbe34c754b7abe15100779ce9833a7f200517d9f
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:56 2017 +0300
linux-gen: time: use hw time counter when available
Use 64 bit HW time counter when available. It is used on
x86 when invariant TSC CPU flag indicates that TSC frequency
is constant. Otherwise, the system time is used as before. Direct
HW time counter usage avoids system call, and related latency
and performance issues.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 15b8894d..8dcdebd2 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -147,6 +147,7 @@ noinst_HEADERS = \
${srcdir}/include/odp_schedule_if.h \
${srcdir}/include/odp_sorted_list_internal.h \
${srcdir}/include/odp_shm_internal.h \
+ ${srcdir}/include/odp_time_internal.h \
${srcdir}/include/odp_timer_internal.h \
${srcdir}/include/odp_timer_wheel_internal.h \
${srcdir}/include/odp_traffic_mngr_internal.h \
diff --git a/platform/linux-generic/arch/arm/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c
index 2ac223e0..c31f9084 100644
--- a/platform/linux-generic/arch/arm/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/arm/odp_cpu_arch.c
@@ -13,6 +13,7 @@
#include <odp/api/hints.h>
#include <odp/api/system_info.h>
#include <odp_debug_internal.h>
+#include <odp_time_internal.h>
#define GIGA 1000000000
@@ -46,3 +47,18 @@ uint64_t odp_cpu_cycles_resolution(void)
{
return 1;
}
+
+int cpu_has_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time_freq(void)
+{
+ return 0;
+}
diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/default/odp_cpu_arch.c
index 2ac223e0..c31f9084 100644
--- a/platform/linux-generic/arch/default/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/default/odp_cpu_arch.c
@@ -13,6 +13,7 @@
#include <odp/api/hints.h>
#include <odp/api/system_info.h>
#include <odp_debug_internal.h>
+#include <odp_time_internal.h>
#define GIGA 1000000000
@@ -46,3 +47,18 @@ uint64_t odp_cpu_cycles_resolution(void)
{
return 1;
}
+
+int cpu_has_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time_freq(void)
+{
+ return 0;
+}
diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_arch.c
index 646acf9c..f7eafa0f 100644
--- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/mips64/odp_cpu_arch.c
@@ -7,6 +7,7 @@
#include <odp/api/cpu.h>
#include <odp/api/hints.h>
#include <odp/api/system_info.h>
+#include <odp_time_internal.h>
uint64_t odp_cpu_cycles(void)
{
@@ -29,3 +30,18 @@ uint64_t odp_cpu_cycles_resolution(void)
{
return 1;
}
+
+int cpu_has_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time_freq(void)
+{
+ return 0;
+}
diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c
index 2ac223e0..c31f9084 100644
--- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c
@@ -13,6 +13,7 @@
#include <odp/api/hints.h>
#include <odp/api/system_info.h>
#include <odp_debug_internal.h>
+#include <odp_time_internal.h>
#define GIGA 1000000000
@@ -46,3 +47,18 @@ uint64_t odp_cpu_cycles_resolution(void)
{
return 1;
}
+
+int cpu_has_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time(void)
+{
+ return 0;
+}
+
+uint64_t cpu_global_time_freq(void)
+{
+ return 0;
+}
diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c
index 954dac27..a492a35b 100644
--- a/platform/linux-generic/arch/x86/cpu_flags.c
+++ b/platform/linux-generic/arch/x86/cpu_flags.c
@@ -39,6 +39,7 @@
#include <arch/x86/cpu_flags.h>
#include <odp_debug_internal.h>
+#include <odp_time_internal.h>
#include <stdio.h>
#include <stdint.h>
@@ -357,3 +358,11 @@ void cpu_flags_print_all(void)
str[len] = '\0';
ODP_PRINT("%s", str);
}
+
+int cpu_has_global_time(void)
+{
+ if (cpu_get_flag_enabled(RTE_CPUFLAG_INVTSC) > 0)
+ return 1;
+
+ return 0;
+}
diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_arch.c
index c8cf27b6..9ba601a3 100644
--- a/platform/linux-generic/arch/x86/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/x86/odp_cpu_arch.c
@@ -3,7 +3,14 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
+
+#include <odp_posix_extensions.h>
+
#include <odp/api/cpu.h>
+#include <odp_time_internal.h>
+#include <odp_debug_internal.h>
+
+#include <time.h>
uint64_t odp_cpu_cycles(void)
{
@@ -31,3 +38,55 @@ uint64_t odp_cpu_cycles_resolution(void)
{
return 1;
}
+
+uint64_t cpu_global_time(void)
+{
+ return odp_cpu_cycles();
+}
+
+#define SEC_IN_NS 1000000000ULL
+
+/* Measure TSC frequency. Frequency information registers are defined for x86,
+ * but those are often not enumerated. */
+uint64_t cpu_global_time_freq(void)
+{
+ struct timespec sleep, ts1, ts2;
+ uint64_t t1, t2, ts_nsec, cycles, hz;
+ int i;
+ uint64_t avg = 0;
+ int rounds = 4;
+
+ for (i = 0; i < rounds; i++) {
+ sleep.tv_sec = 0;
+ sleep.tv_nsec = SEC_IN_NS / 10;
+
+ if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts1)) {
+ ODP_DBG("clock_gettime failed\n");
+ return 0;
+ }
+
+ t1 = cpu_global_time();
+
+ if (nanosleep(&sleep, NULL) < 0) {
+ ODP_DBG("nanosleep failed\n");
+ return 0;
+ }
+
+ if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts2)) {
+ ODP_DBG("clock_gettime failed\n");
+ return 0;
+ }
+
+ t2 = cpu_global_time();
+
+ ts_nsec = (ts2.tv_sec - ts1.tv_sec) * SEC_IN_NS;
+ ts_nsec += ts2.tv_nsec - ts1.tv_nsec;
+
+ cycles = t2 - t1;
+
+ hz = (cycles * SEC_IN_NS) / ts_nsec;
+ avg += hz;
+ }
+
+ return avg / rounds;
+}
diff --git a/platform/linux-generic/include/odp/api/plat/time_types.h b/platform/linux-generic/include/odp/api/plat/time_types.h
index 4847f3b1..1cafb1f7 100644
--- a/platform/linux-generic/include/odp/api/plat/time_types.h
+++ b/platform/linux-generic/include/odp/api/plat/time_types.h
@@ -26,11 +26,28 @@ extern "C" {
* the linux timespec structure, which is dependent on POSIX extension level.
*/
typedef struct odp_time_t {
- int64_t tv_sec; /**< @internal Seconds */
- int64_t tv_nsec; /**< @internal Nanoseconds */
+ union {
+ /** @internal Posix timespec */
+ struct {
+ /** @internal Seconds */
+ int64_t tv_sec;
+
+ /** @internal Nanoseconds */
+ int64_t tv_nsec;
+ } spec;
+
+ /** @internal HW time counter */
+ struct {
+ /** @internal Counter value */
+ uint64_t count;
+
+ /** @internal Reserved */
+ uint64_t reserved;
+ } hw;
+ };
} odp_time_t;
-#define ODP_TIME_NULL ((odp_time_t){0, 0})
+#define ODP_TIME_NULL ((odp_time_t){.spec = {0, 0} })
/**
* @}
diff --git a/platform/linux-generic/include/odp_time_internal.h b/platform/linux-generic/include/odp_time_internal.h
new file mode 100644
index 00000000..99ac7977
--- /dev/null
+++ b/platform/linux-generic/include/odp_time_internal.h
@@ -0,0 +1,24 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_TIME_INTERNAL_H_
+#define ODP_TIME_INTERNAL_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+int cpu_has_global_time(void);
+uint64_t cpu_global_time(void);
+uint64_t cpu_global_time_freq(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c
index 0e5966c0..ac82175d 100644
--- a/platform/linux-generic/odp_time.c
+++ b/platform/linux-generic/odp_time.c
@@ -10,36 +10,39 @@
#include <odp/api/time.h>
#include <odp/api/hints.h>
#include <odp_debug_internal.h>
+#include <odp_time_internal.h>
+#include <string.h>
+#include <inttypes.h>
-static odp_time_t start_time;
+typedef struct time_global_t {
+ odp_time_t start_time;
+ int use_hw;
+ uint64_t hw_start;
+ uint64_t hw_freq_hz;
+} time_global_t;
-static inline
-uint64_t time_to_ns(odp_time_t time)
-{
- uint64_t ns;
-
- ns = time.tv_sec * ODP_TIME_SEC_IN_NS;
- ns += time.tv_nsec;
+static time_global_t global;
- return ns;
-}
+/*
+ * Posix timespec based functions
+ */
-static inline odp_time_t time_diff(odp_time_t t2, odp_time_t t1)
+static inline odp_time_t time_spec_diff(odp_time_t t2, odp_time_t t1)
{
odp_time_t time;
- time.tv_sec = t2.tv_sec - t1.tv_sec;
- time.tv_nsec = t2.tv_nsec - t1.tv_nsec;
+ time.spec.tv_sec = t2.spec.tv_sec - t1.spec.tv_sec;
+ time.spec.tv_nsec = t2.spec.tv_nsec - t1.spec.tv_nsec;
- if (time.tv_nsec < 0) {
- time.tv_nsec += ODP_TIME_SEC_IN_NS;
- --time.tv_sec;
+ if (time.spec.tv_nsec < 0) {
+ time.spec.tv_nsec += ODP_TIME_SEC_IN_NS;
+ --time.spec.tv_sec;
}
return time;
}
-static inline odp_time_t time_local(void)
+static inline odp_time_t time_spec_cur(void)
{
int ret;
odp_time_t time;
@@ -49,77 +52,234 @@ static inline odp_time_t time_local(void)
if (odp_unlikely(ret != 0))
ODP_ABORT("clock_gettime failed\n");
- time.tv_sec = sys_time.tv_sec;
- time.tv_nsec = sys_time.tv_nsec;
+ time.spec.tv_sec = sys_time.tv_sec;
+ time.spec.tv_nsec = sys_time.tv_nsec;
- return time_diff(time, start_time);
+ return time_spec_diff(time, global.start_time);
}
-static inline int time_cmp(odp_time_t t2, odp_time_t t1)
+static inline uint64_t time_spec_res(void)
{
- if (t2.tv_sec < t1.tv_sec)
+ int ret;
+ struct timespec tres;
+
+ ret = clock_getres(CLOCK_MONOTONIC_RAW, &tres);
+ if (odp_unlikely(ret != 0))
+ ODP_ABORT("clock_getres failed\n");
+
+ return ODP_TIME_SEC_IN_NS / (uint64_t)tres.tv_nsec;
+}
+
+static inline int time_spec_cmp(odp_time_t t2, odp_time_t t1)
+{
+ if (t2.spec.tv_sec < t1.spec.tv_sec)
return -1;
- if (t2.tv_sec > t1.tv_sec)
+ if (t2.spec.tv_sec > t1.spec.tv_sec)
return 1;
- return t2.tv_nsec - t1.tv_nsec;
+ return t2.spec.tv_nsec - t1.spec.tv_nsec;
}
-static inline odp_time_t time_sum(odp_time_t t1, odp_time_t t2)
+static inline odp_time_t time_spec_sum(odp_time_t t1, odp_time_t t2)
{
odp_time_t time;
- time.tv_sec = t2.tv_sec + t1.tv_sec;
- time.tv_nsec = t2.tv_nsec + t1.tv_nsec;
+ time.spec.tv_sec = t2.spec.tv_sec + t1.spec.tv_sec;
+ time.spec.tv_nsec = t2.spec.tv_nsec + t1.spec.tv_nsec;
- if (time.tv_nsec >= (long)ODP_TIME_SEC_IN_NS) {
- time.tv_nsec -= ODP_TIME_SEC_IN_NS;
- ++time.tv_sec;
+ if (time.spec.tv_nsec >= (long)ODP_TIME_SEC_IN_NS) {
+ time.spec.tv_nsec -= ODP_TIME_SEC_IN_NS;
+ ++time.spec.tv_sec;
}
return time;
}
-static inline odp_time_t time_local_from_ns(uint64_t ns)
+static inline uint64_t time_spec_to_ns(odp_time_t time)
+{
+ uint64_t ns;
+
+ ns = time.spec.tv_sec * ODP_TIME_SEC_IN_NS;
+ ns += time.spec.tv_nsec;
+
+ return ns;
+}
+
+static inline odp_time_t time_spec_from_ns(uint64_t ns)
{
odp_time_t time;
- time.tv_sec = ns / ODP_TIME_SEC_IN_NS;
- time.tv_nsec = ns - time.tv_sec * ODP_TIME_SEC_IN_NS;
+ time.spec.tv_sec = ns / ODP_TIME_SEC_IN_NS;
+ time.spec.tv_nsec = ns - time.spec.tv_sec * ODP_TIME_SEC_IN_NS;
return time;
}
-static inline void time_wait_until(odp_time_t time)
+/*
+ * HW time counter based functions
+ */
+
+static inline odp_time_t time_hw_cur(void)
{
- odp_time_t cur;
+ odp_time_t time;
- do {
- cur = time_local();
- } while (time_cmp(time, cur) > 0);
+ time.hw.count = cpu_global_time() - global.hw_start;
+
+ return time;
}
-static inline uint64_t time_local_res(void)
+static inline uint64_t time_hw_res(void)
{
- int ret;
- struct timespec tres;
+ /* Promise a bit lower resolution than average cycle counter
+ * frequency */
+ return global.hw_freq_hz / 10;
+}
- ret = clock_getres(CLOCK_MONOTONIC_RAW, &tres);
- if (odp_unlikely(ret != 0))
- ODP_ABORT("clock_getres failed\n");
+static inline int time_hw_cmp(odp_time_t t2, odp_time_t t1)
+{
+ if (odp_likely(t2.hw.count > t1.hw.count))
+ return 1;
- return ODP_TIME_SEC_IN_NS / (uint64_t)tres.tv_nsec;
+ if (t2.hw.count < t1.hw.count)
+ return -1;
+
+ return 0;
+}
+
+static inline odp_time_t time_hw_diff(odp_time_t t2, odp_time_t t1)
+{
+ odp_time_t time;
+
+ time.hw.count = t2.hw.count - t1.hw.count;
+
+ return time;
+}
+
+static inline odp_time_t time_hw_sum(odp_time_t t1, odp_time_t t2)
+{
+ odp_time_t time;
+
+ time.hw.count = t1.hw.count + t2.hw.count;
+
+ return time;
+}
+
+static inline uint64_t time_hw_to_ns(odp_time_t time)
+{
+ uint64_t nsec;
+ uint64_t freq_hz = global.hw_freq_hz;
+ uint64_t count = time.hw.count;
+ uint64_t sec = 0;
+
+ if (count >= freq_hz) {
+ sec = count / freq_hz;
+ count = count - sec * freq_hz;
+ }
+
+ nsec = (ODP_TIME_SEC_IN_NS * count) / freq_hz;
+
+ return (sec * ODP_TIME_SEC_IN_NS) + nsec;
+}
+
+static inline odp_time_t time_hw_from_ns(uint64_t ns)
+{
+ odp_time_t time;
+ uint64_t count;
+ uint64_t freq_hz = global.hw_freq_hz;
+ uint64_t sec = 0;
+
+ if (ns >= ODP_TIME_SEC_IN_NS) {
+ sec = ns / ODP_TIME_SEC_IN_NS;
+ ns = ns - sec * ODP_TIME_SEC_IN_NS;
+ }
+
+ count = sec * freq_hz;
+ count += (ns * freq_hz) / ODP_TIME_SEC_IN_NS;
+
+ time.hw.reserved = 0;
+ time.hw.count = count;
+
+ return time;
+}
+
+/*
+ * Common functions
+ */
+
+static inline odp_time_t time_cur(void)
+{
+ if (global.use_hw)
+ return time_hw_cur();
+
+ return time_spec_cur();
+}
+
+static inline uint64_t time_res(void)
+{
+ if (global.use_hw)
+ return time_hw_res();
+
+ return time_spec_res();
+}
+
+static inline int time_cmp(odp_time_t t2, odp_time_t t1)
+{
+ if (global.use_hw)
+ return time_hw_cmp(t2, t1);
+
+ return time_spec_cmp(t2, t1);
+}
+
+static inline odp_time_t time_diff(odp_time_t t2, odp_time_t t1)
+{
+ if (global.use_hw)
+ return time_hw_diff(t2, t1);
+
+ return time_spec_diff(t2, t1);
+}
+
+static inline odp_time_t time_sum(odp_time_t t1, odp_time_t t2)
+{
+ if (global.use_hw)
+ return time_hw_sum(t1, t2);
+
+ return time_spec_sum(t1, t2);
+}
+
+static inline uint64_t time_to_ns(odp_time_t time)
+{
+ if (global.use_hw)
+ return time_hw_to_ns(time);
+
+ return time_spec_to_ns(time);
+}
+
+static inline odp_time_t time_from_ns(uint64_t ns)
+{
+ if (global.use_hw)
+ return time_hw_from_ns(ns);
+
+ return time_spec_from_ns(ns);
+}
+
+static inline void time_wait_until(odp_time_t time)
+{
+ odp_time_t cur;
+
+ do {
+ cur = time_cur();
+ } while (time_cmp(time, cur) > 0);
}
odp_time_t odp_time_local(void)
{
- return time_local();
+ return time_cur();
}
odp_time_t odp_time_global(void)
{
- return time_local();
+ return time_cur();
}
odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1)
@@ -134,12 +294,12 @@ uint64_t odp_time_to_ns(odp_time_t time)
odp_time_t odp_time_local_from_ns(uint64_t ns)
{
- return time_local_from_ns(ns);
+ return time_from_ns(ns);
}
odp_time_t odp_time_global_from_ns(uint64_t ns)
{
- return time_local_from_ns(ns);
+ return time_from_ns(ns);
}
int odp_time_cmp(odp_time_t t2, odp_time_t t1)
@@ -154,18 +314,18 @@ odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2)
uint64_t odp_time_local_res(void)
{
- return time_local_res();
+ return time_res();
}
uint64_t odp_time_global_res(void)
{
- return time_local_res();
+ return time_res();
}
void odp_time_wait_ns(uint64_t ns)
{
- odp_time_t cur = time_local();
- odp_time_t wait = time_local_from_ns(ns);
+ odp_time_t cur = time_cur();
+ odp_time_t wait = time_from_ns(ns);
odp_time_t end_time = time_sum(cur, wait);
time_wait_until(end_time);
@@ -178,15 +338,31 @@ void odp_time_wait_until(odp_time_t time)
int odp_time_init_global(void)
{
- int ret;
- struct timespec time;
-
- ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time);
- if (ret) {
- start_time = ODP_TIME_NULL;
- } else {
- start_time.tv_sec = time.tv_sec;
- start_time.tv_nsec = time.tv_nsec;
+ struct timespec sys_time;
+ int ret = 0;
+
+ memset(&global, 0, sizeof(time_global_t));
+
+ if (cpu_has_global_time()) {
+ global.use_hw = 1;
+ global.hw_freq_hz = cpu_global_time_freq();
+
+ if (global.hw_freq_hz == 0)
+ return -1;
+
+ printf("HW time counter freq: %" PRIu64 " hz\n\n",
+ global.hw_freq_hz);
+
+ global.hw_start = cpu_global_time();
+ return 0;
+ }
+
+ global.start_time = ODP_TIME_NULL;
+
+ ret = clock_gettime(CLOCK_MONOTONIC_RAW, &sys_time);
+ if (ret == 0) {
+ global.start_time.spec.tv_sec = sys_time.tv_sec;
+ global.start_time.spec.tv_nsec = sys_time.tv_nsec;
}
return ret;
commit 62f95a564b7b3e08a32e6e72d234eb86292021d0
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:55 2017 +0300
test: validation: add time accuracy test
Test ODP time keeping accuracy against system time.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/time/time.c b/test/common_plat/validation/api/time/time.c
index 36c419cb..e2ca2e17 100644
--- a/test/common_plat/validation/api/time/time.c
+++ b/test/common_plat/validation/api/time/time.c
@@ -7,6 +7,7 @@
#include <odp_api.h>
#include "odp_cunit_common.h"
#include "time_test.h"
+#include <time.h>
#define BUSY_LOOP_CNT 30000000 /* used for t > min resolution */
#define BUSY_LOOP_CNT_LONG 6000000000 /* used for t > 4 sec */
@@ -140,25 +141,25 @@ void time_test_monotony(void)
CU_ASSERT(ns3 > ns2);
}
-static void time_test_cmp(time_cb time, time_from_ns_cb time_from_ns)
+static void time_test_cmp(time_cb time_cur, time_from_ns_cb time_from_ns)
{
/* volatile to stop optimization of busy loop */
volatile int count = 0;
odp_time_t t1, t2, t3;
- t1 = time();
+ t1 = time_cur();
while (count < BUSY_LOOP_CNT) {
count++;
};
- t2 = time();
+ t2 = time_cur();
while (count < BUSY_LOOP_CNT * 2) {
count++;
};
- t3 = time();
+ t3 = time_cur();
CU_ASSERT(odp_time_cmp(t2, t1) > 0);
CU_ASSERT(odp_time_cmp(t3, t2) > 0);
@@ -191,7 +192,7 @@ void time_test_global_cmp(void)
}
/* check that a time difference gives a reasonable result */
-static void time_test_diff(time_cb time,
+static void time_test_diff(time_cb time_cur,
time_from_ns_cb time_from_ns,
uint64_t res)
{
@@ -202,13 +203,13 @@ static void time_test_diff(time_cb time,
uint64_t upper_limit, lower_limit;
/* test timestamp diff */
- t1 = time();
+ t1 = time_cur();
while (count < BUSY_LOOP_CNT) {
count++;
};
- t2 = time();
+ t2 = time_cur();
CU_ASSERT(odp_time_cmp(t2, t1) > 0);
diff = odp_time_diff(t2, t1);
@@ -268,7 +269,7 @@ void time_test_global_diff(void)
}
/* check that a time sum gives a reasonable result */
-static void time_test_sum(time_cb time,
+static void time_test_sum(time_cb time_cur,
time_from_ns_cb time_from_ns,
uint64_t res)
{
@@ -277,7 +278,7 @@ static void time_test_sum(time_cb time,
uint64_t upper_limit, lower_limit;
/* sum timestamp and interval */
- t1 = time();
+ t1 = time_cur();
ns2 = 103;
t2 = time_from_ns(ns2);
ns1 = odp_time_to_ns(t1);
@@ -319,20 +320,20 @@ void time_test_global_sum(void)
time_test_sum(odp_time_global, odp_time_global_from_ns, global_res);
}
-static void time_test_wait_until(time_cb time, time_from_ns_cb time_from_ns)
+static void time_test_wait_until(time_cb time_cur, time_from_ns_cb time_from_ns)
{
int i;
odp_time_t lower_limit, upper_limit;
odp_time_t start_time, end_time, wait;
odp_time_t second = time_from_ns(ODP_TIME_SEC_IN_NS);
- start_time = time();
+ start_time = time_cur();
wait = start_time;
for (i = 0; i < WAIT_SECONDS; i++) {
wait = odp_time_sum(wait, second);
odp_time_wait_until(wait);
}
- end_time = time();
+ end_time = time_cur();
wait = odp_time_diff(end_time, start_time);
lower_limit = time_from_ns(WAIT_SECONDS * ODP_TIME_SEC_IN_NS -
@@ -398,6 +399,45 @@ void time_test_wait_ns(void)
}
}
+static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns)
+{
+ int i;
+ odp_time_t t1, t2, wait, diff;
+ clock_t c1, c2;
+ double sec_t, sec_c;
+ odp_time_t sec = time_from_ns(ODP_TIME_SEC_IN_NS);
+
+ c1 = clock();
+ t1 = time_cur();
+
+ wait = odp_time_sum(t1, sec);
+ for (i = 0; i < 5; i++) {
+ odp_time_wait_until(wait);
+ wait = odp_time_sum(wait, sec);
+ }
+
+ t2 = time_cur();
+ c2 = clock();
+
+ diff = odp_time_diff(t2, t1);
+ sec_t = ((double)odp_time_to_ns(diff)) / ODP_TIME_SEC_IN_NS;
+ sec_c = ((double)(c2 - c1)) / CLOCKS_PER_SEC;
+
+ /* Check that ODP time is within +-5% of system time */
+ CU_ASSERT(sec_t < sec_c * 1.05);
+ CU_ASSERT(sec_t > sec_c * 0.95);
+}
+
+static void time_test_local_accuracy(void)
+{
+ time_test_accuracy(odp_time_local, odp_time_local_from_ns);
+}
+
+static void time_test_global_accuracy(void)
+{
+ time_test_accuracy(odp_time_global, odp_time_global_from_ns);
+}
+
odp_testinfo_t time_suite_time[] = {
ODP_TEST_INFO(time_test_constants),
ODP_TEST_INFO(time_test_local_res),
@@ -408,12 +448,14 @@ odp_testinfo_t time_suite_time[] = {
ODP_TEST_INFO(time_test_local_sum),
ODP_TEST_INFO(time_test_local_wait_until),
ODP_TEST_INFO(time_test_wait_ns),
+ ODP_TEST_INFO(time_test_local_accuracy),
ODP_TEST_INFO(time_test_global_res),
ODP_TEST_INFO(time_test_global_conversion),
ODP_TEST_INFO(time_test_global_cmp),
ODP_TEST_INFO(time_test_global_diff),
ODP_TEST_INFO(time_test_global_sum),
ODP_TEST_INFO(time_test_global_wait_until),
+ ODP_TEST_INFO(time_test_global_accuracy),
ODP_TEST_INFO_NULL
};
commit 17f4cddfcbf47f73761cb869ace264cc8444dc08
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:54 2017 +0300
test: validation: rename time test header file
Header file name time.h is ambiguos since C has a library header
file with the same name.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/time/Makefile.am b/test/common_plat/validation/api/time/Makefile.am
index 72e6b7b2..82682dfc 100644
--- a/test/common_plat/validation/api/time/Makefile.am
+++ b/test/common_plat/validation/api/time/Makefile.am
@@ -14,5 +14,5 @@ test_PROGRAMS = time_main$(EXEEXT)
dist_time_main_SOURCES = time_main.c
time_main_LDADD = libtesttime.la $(LIBCUNIT_COMMON) $(LIBODP)
-EXTRA_DIST = time.h $(TESTSCRIPTS)
+EXTRA_DIST = time_test.h $(TESTSCRIPTS)
dist_check_SCRIPTS = $(TESTSCRIPTS)
diff --git a/test/common_plat/validation/api/time/time.c b/test/common_plat/validation/api/time/time.c
index df65c719..36c419cb 100644
--- a/test/common_plat/validation/api/time/time.c
+++ b/test/common_plat/validation/api/time/time.c
@@ -6,7 +6,7 @@
#include <odp_api.h>
#include "odp_cunit_common.h"
-#include "time.h"
+#include "time_test.h"
#define BUSY_LOOP_CNT 30000000 /* used for t > min resolution */
#define BUSY_LOOP_CNT_LONG 6000000000 /* used for t > 4 sec */
diff --git a/test/common_plat/validation/api/time/time_main.c b/test/common_plat/validation/api/time/time_main.c
index f86d638a..bf1cfe7b 100644
--- a/test/common_plat/validation/api/time/time_main.c
+++ b/test/common_plat/validation/api/time/time_main.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include "time.h"
+#include "time_test.h"
int main(int argc, char *argv[])
{
diff --git a/test/common_plat/validation/api/time/time.h b/test/common_plat/validation/api/time/time_test.h
similarity index 100%
rename from test/common_plat/validation/api/time/time.h
rename to test/common_plat/validation/api/time/time_test.h
commit f54860c628c16c4f76d555b9d20c28e04af13751
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:53 2017 +0300
test: sched_latency: use sys_info_print
Use the new system info print function.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/common_plat/performance/odp_sched_latency.c
index b4018687..026f2f6c 100644
--- a/test/common_plat/performance/odp_sched_latency.c
+++ b/test/common_plat/performance/odp_sched_latency.c
@@ -667,16 +667,7 @@ int main(int argc, char *argv[])
return -1;
}
- printf("\n");
- printf("ODP system info\n");
- printf("---------------\n");
- printf("ODP API version: %s\n", odp_version_api_str());
- printf("ODP impl name: %s\n", odp_version_impl_name());
- printf("ODP impl details: %s\n", odp_version_impl_str());
- printf("CPU model: %s\n", odp_cpu_model_str());
- printf("CPU freq (hz): %" PRIu64 "\n", odp_cpu_hz_max());
- printf("Cache line size: %i\n", odp_sys_cache_line_size());
- printf("Max CPU count: %i\n", odp_cpu_count());
+ odp_sys_info_print();
/* Get default worker cpumask */
if (args.cpu_count)
@@ -687,9 +678,10 @@ int main(int argc, char *argv[])
(void)odp_cpumask_to_str(&cpumask, cpumaskstr, sizeof(cpumaskstr));
- printf("Worker threads: %i\n", num_workers);
- printf("First CPU: %i\n", odp_cpumask_first(&cpumask));
- printf("CPU mask: %s\n\n", cpumaskstr);
+ printf("CPU mask info:\n");
+ printf(" Worker threads: %i\n", num_workers);
+ printf(" First CPU: %i\n", odp_cpumask_first(&cpumask));
+ printf(" CPU mask: %s\n", cpumaskstr);
thread_tbl = calloc(sizeof(odph_odpthread_t), num_workers);
if (!thread_tbl) {
commit a5116e42abf0452f5ad9fd1920d5377aa0ef36b6
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:52 2017 +0300
test: validation: add odp_sys_info_print test
Added validation test for the new system info print call.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/system/system.c b/test/common_plat/validation/api/system/system.c
index 57ff34eb..5b7ca01a 100644
--- a/test/common_plat/validation/api/system/system.c
+++ b/test/common_plat/validation/api/system/system.c
@@ -301,6 +301,13 @@ void system_test_odp_cpu_hz_max_id(void)
}
}
+void system_test_info_print(void)
+{
+ printf("\n\nCalling system info print...\n");
+ odp_sys_info_print();
+ printf("...done. ");
+}
+
odp_testinfo_t system_suite[] = {
ODP_TEST_INFO(system_test_odp_version_numbers),
ODP_TEST_INFO(system_test_odp_cpu_count),
@@ -319,6 +326,7 @@ odp_testinfo_t system_suite[] = {
ODP_TEST_INFO(system_test_odp_cpu_cycles_max),
ODP_TEST_INFO(system_test_odp_cpu_cycles_resolution),
ODP_TEST_INFO(system_test_odp_cpu_cycles_diff),
+ ODP_TEST_INFO(system_test_info_print),
ODP_TEST_INFO_NULL,
};
diff --git a/test/common_plat/validation/api/system/system.h b/test/common_plat/validation/api/system/system.h
index cbb994eb..c33729b9 100644
--- a/test/common_plat/validation/api/system/system.h
+++ b/test/common_plat/validation/api/system/system.h
@@ -30,6 +30,7 @@ void system_test_odp_cpu_cycles_max(void);
void system_test_odp_cpu_cycles(void);
void system_test_odp_cpu_cycles_diff(void);
void system_test_odp_cpu_cycles_resolution(void);
+void system_test_info_print(void);
/* test arrays: */
extern odp_testinfo_t system_suite[];
commit 73954b9142d1ddc2dde7c0f9b6596e2d8bac3caf
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:51 2017 +0300
linux-gen: system: implement system info print
Print API, impl name, CPU model/freq, cache line size and
CPU count by default. Print CPU flags in case of x86.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c
index 53e2aaea..8ae2022a 100644
--- a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c
@@ -25,3 +25,7 @@ uint64_t odp_cpu_hz_current(int id ODP_UNUSED)
{
return 0;
}
+
+void sys_info_print_arch(void)
+{
+}
diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
index 53e2aaea..8ae2022a 100644
--- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
@@ -25,3 +25,7 @@ uint64_t odp_cpu_hz_current(int id ODP_UNUSED)
{
return 0;
}
+
+void sys_info_print_arch(void)
+{
+}
diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c
index 407264b7..d6f75f28 100644
--- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c
@@ -62,3 +62,7 @@ uint64_t odp_cpu_hz_current(int id ODP_UNUSED)
{
return 0;
}
+
+void sys_info_print_arch(void)
+{
+}
diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c
index 3b88d55b..bd4b9b42 100644
--- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c
@@ -61,3 +61,7 @@ uint64_t odp_cpu_hz_current(int id ODP_UNUSED)
{
return 0;
}
+
+void sys_info_print_arch(void)
+{
+}
diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
index 96127ec6..d77165a4 100644
--- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
@@ -5,6 +5,7 @@
*/
#include <odp_internal.h>
+#include <arch/x86/cpu_flags.h>
#include <string.h>
int cpuinfo_parser(FILE *file, system_info_t *sysinfo)
@@ -73,3 +74,8 @@ uint64_t odp_cpu_hz_current(int id)
return 0;
}
+
+void sys_info_print_arch(void)
+{
+ cpu_flags_print_all();
+}
diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index e1267cff..8bae028d 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -128,6 +128,7 @@ int _odp_ishm_term_local(void);
int cpuinfo_parser(FILE *file, system_info_t *sysinfo);
uint64_t odp_cpu_hz_current(int id);
+void sys_info_print_arch(void);
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index 18c61dbe..40ffca07 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -14,6 +14,7 @@
#include <odp_posix_extensions.h>
#include <odp/api/system_info.h>
+#include <odp/api/version.h>
#include <odp_internal.h>
#include <odp_debug_internal.h>
#include <odp/api/align.h>
@@ -405,3 +406,32 @@ int odp_cpu_count(void)
{
return odp_global_data.system_info.cpu_count;
}
+
+void odp_sys_info_print(void)
+{
+ int len;
+ int max_len = 512;
+ char str[max_len];
+
+ len = snprintf(str, max_len, "\n"
+ "ODP system info\n"
+ "---------------\n"
+ "ODP API version: %s\n"
+ "ODP impl name: %s\n"
+ "CPU model: %s\n"
+ "CPU freq (hz): %" PRIu64 "\n"
+ "Cache line size: %i\n"
+ "CPU count: %i\n"
+ "\n",
+ odp_version_api_str(),
+ odp_version_impl_name(),
+ odp_cpu_model_str(),
+ odp_cpu_hz_max(),
+ odp_sys_cache_line_size(),
+ odp_cpu_count());
+
+ str[len] = '\0';
+ ODP_PRINT("%s", str);
+
+ sys_info_print_arch();
+}
commit 89a00a2ed43a99e0d2d78a5baeff1292e41ecd34
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:50 2017 +0300
linux-gen: cpu_flags: added x86 cpu flag read functions
When building on x86 CPU flags can be used to determine which
CPU features are supported. CPU flag definitions and the code
to read the flags is from DPDK.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index f6b20cb2..4f44f8f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,6 +225,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"])
AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ])
AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"])
AM_CONDITIONAL([helper_linux], [test x$helper_linux = xyes ])
+AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"])
##########################################################################
# Setup doxygen documentation
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 59a57724..9844a58a 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -98,4 +98,6 @@ EXTRA_DIST = \
arch/powerpc/odp_sysinfo_parse.c \
arch/x86/odp/api/cpu_arch.h \
arch/x86/odp_cpu_arch.c \
- arch/x86/odp_sysinfo_parse.c
+ arch/x86/odp_sysinfo_parse.c \
+ arch/x86/cpu_flags.c \
+ arch/x86/cpu_flags.h
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index eb7bea8f..15b8894d 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -222,6 +222,10 @@ __LIB__libodp_linux_la_SOURCES = \
__LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS)
+if ARCH_IS_X86
+__LIB__libodp_linux_la_SOURCES += arch/@ARCH_DIR@/cpu_flags.c
+endif
+
if HAVE_PCAP
__LIB__libodp_linux_la_SOURCES += pktio/pcap.c
endif
diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c
new file mode 100644
index 00000000..954dac27
--- /dev/null
+++ b/platform/linux-generic/arch/x86/cpu_flags.c
@@ -0,0 +1,359 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <arch/x86/cpu_flags.h>
+#include <odp_debug_internal.h>
+#include <stdio.h>
+#include <stdint.h>
+
+enum rte_cpu_flag_t {
+ /* (EAX 01h) ECX features*/
+ RTE_CPUFLAG_SSE3 = 0, /**< SSE3 */
+ RTE_CPUFLAG_PCLMULQDQ, /**< PCLMULQDQ */
+ RTE_CPUFLAG_DTES64, /**< DTES64 */
+ RTE_CPUFLAG_MONITOR, /**< MONITOR */
+ RTE_CPUFLAG_DS_CPL, /**< DS_CPL */
+ RTE_CPUFLAG_VMX, /**< VMX */
+ RTE_CPUFLAG_SMX, /**< SMX */
+ RTE_CPUFLAG_EIST, /**< EIST */
+ RTE_CPUFLAG_TM2, /**< TM2 */
+ RTE_CPUFLAG_SSSE3, /**< SSSE3 */
+ RTE_CPUFLAG_CNXT_ID, /**< CNXT_ID */
+ RTE_CPUFLAG_FMA, /**< FMA */
+ RTE_CPUFLAG_CMPXCHG16B, /**< CMPXCHG16B */
+ RTE_CPUFLAG_XTPR, /**< XTPR */
+ RTE_CPUFLAG_PDCM, /**< PDCM */
+ RTE_CPUFLAG_PCID, /**< PCID */
+ RTE_CPUFLAG_DCA, /**< DCA */
+ RTE_CPUFLAG_SSE4_1, /**< SSE4_1 */
+ RTE_CPUFLAG_SSE4_2, /**< SSE4_2 */
+ RTE_CPUFLAG_X2APIC, /**< X2APIC */
+ RTE_CPUFLAG_MOVBE, /**< MOVBE */
+ RTE_CPUFLAG_POPCNT, /**< POPCNT */
+ RTE_CPUFLAG_TSC_DEADLINE, /**< TSC_DEADLINE */
+ RTE_CPUFLAG_AES, /**< AES */
+ RTE_CPUFLAG_XSAVE, /**< XSAVE */
+ RTE_CPUFLAG_OSXSAVE, /**< OSXSAVE */
+ RTE_CPUFLAG_AVX, /**< AVX */
+ RTE_CPUFLAG_F16C, /**< F16C */
+ RTE_CPUFLAG_RDRAND, /**< RDRAND */
+
+ /* (EAX 01h) EDX features */
+ RTE_CPUFLAG_FPU, /**< FPU */
+ RTE_CPUFLAG_VME, /**< VME */
+ RTE_CPUFLAG_DE, /**< DE */
+ RTE_CPUFLAG_PSE, /**< PSE */
+ RTE_CPUFLAG_TSC, /**< TSC */
+ RTE_CPUFLAG_MSR, /**< MSR */
+ RTE_CPUFLAG_PAE, /**< PAE */
+ RTE_CPUFLAG_MCE, /**< MCE */
+ RTE_CPUFLAG_CX8, /**< CX8 */
+ RTE_CPUFLAG_APIC, /**< APIC */
+ RTE_CPUFLAG_SEP, /**< SEP */
+ RTE_CPUFLAG_MTRR, /**< MTRR */
+ RTE_CPUFLAG_PGE, /**< PGE */
+ RTE_CPUFLAG_MCA, /**< MCA */
+ RTE_CPUFLAG_CMOV, /**< CMOV */
+ RTE_CPUFLAG_PAT, /**< PAT */
+ RTE_CPUFLAG_PSE36, /**< PSE36 */
+ RTE_CPUFLAG_PSN, /**< PSN */
+ RTE_CPUFLAG_CLFSH, /**< CLFSH */
+ RTE_CPUFLAG_DS, /**< DS */
+ RTE_CPUFLAG_ACPI, /**< ACPI */
+ RTE_CPUFLAG_MMX, /**< MMX */
+ RTE_CPUFLAG_FXSR, /**< FXSR */
+ RTE_CPUFLAG_SSE, /**< SSE */
+ RTE_CPUFLAG_SSE2, /**< SSE2 */
+ RTE_CPUFLAG_SS, /**< SS */
+ RTE_CPUFLAG_HTT, /**< HTT */
+ RTE_CPUFLAG_TM, /**< TM */
+ RTE_CPUFLAG_PBE, /**< PBE */
+
+ /* (EAX 06h) EAX features */
+ RTE_CPUFLAG_DIGTEMP, /**< DIGTEMP */
+ RTE_CPUFLAG_TRBOBST, /**< TRBOBST */
+ RTE_CPUFLAG_ARAT, /**< ARAT */
+ RTE_CPUFLAG_PLN, /**< PLN */
+ RTE_CPUFLAG_ECMD, /**< ECMD */
+ RTE_CPUFLAG_PTM, /**< PTM */
+
+ /* (EAX 06h) ECX features */
+ RTE_CPUFLAG_MPERF_APERF_MSR, /**< MPERF_APERF_MSR */
+ RTE_CPUFLAG_ACNT2, /**< ACNT2 */
+ RTE_CPUFLAG_ENERGY_EFF, /**< ENERGY_EFF */
+
+ /* (EAX 07h, ECX 0h) EBX features */
+ RTE_CPUFLAG_FSGSBASE, /**< FSGSBASE */
+ RTE_CPUFLAG_BMI1, /**< BMI1 */
+ RTE_CPUFLAG_HLE, /**< Hardware Lock elision */
+ RTE_CPUFLAG_AVX2, /**< AVX2 */
+ RTE_CPUFLAG_SMEP, /**< SMEP */
+ RTE_CPUFLAG_BMI2, /**< BMI2 */
+ RTE_CPUFLAG_ERMS, /**< ERMS */
+ RTE_CPUFLAG_INVPCID, /**< INVPCID */
+ RTE_CPUFLAG_RTM, /**< Transactional memory */
+ RTE_CPUFLAG_AVX512F, /**< AVX512F */
+
+ /* (EAX 80000001h) ECX features */
+ RTE_CPUFLAG_LAHF_SAHF, /**< LAHF_SAHF */
+ RTE_CPUFLAG_LZCNT, /**< LZCNT */
+
+ /* (EAX 80000001h) EDX features */
+ RTE_CPUFLAG_SYSCALL, /**< SYSCALL */
+ RTE_CPUFLAG_XD, /**< XD */
+ RTE_CPUFLAG_1GB_PG, /**< 1GB_PG */
+ RTE_CPUFLAG_RDTSCP, /**< RDTSCP */
+ RTE_CPUFLAG_EM64T, /**< EM64T */
+
+ /* (EAX 80000007h) EDX features */
+ RTE_CPUFLAG_INVTSC, /**< INVTSC */
+
+ /* The last item */
+ RTE_CPUFLAG_NUMFLAGS, /**< This should always be the last! */
+};
+
+enum cpu_register_t {
+ RTE_REG_EAX = 0,
+ RTE_REG_EBX,
+ RTE_REG_ECX,
+ RTE_REG_EDX,
+};
+
+typedef uint32_t cpuid_registers_t[4];
+
+/**
+ * Struct to hold a processor feature entry
+ */
+struct feature_entry {
+ uint32_t leaf; /**< cpuid leaf */
+ uint32_t subleaf; /**< cpuid subleaf */
+ uint32_t reg; /**< cpuid register */
+ uint32_t bit; /**< cpuid register bit */
+#define CPU_FLAG_NAME_MAX_LEN 64
+ char name[CPU_FLAG_NAME_MAX_LEN]; /**< String for printing */
+};
+
+#define FEAT_DEF(name, leaf, subleaf, reg, bit) \
+ [RTE_CPUFLAG_##name] = {leaf, subleaf, reg, bit, #name },
+
+static const struct feature_entry cpu_feature_table[] = {
+ FEAT_DEF(SSE3, 0x00000001, 0, RTE_REG_ECX, 0)
+ FEAT_DEF(PCLMULQDQ, 0x00000001, 0, RTE_REG_ECX, 1)
+ FEAT_DEF(DTES64, 0x00000001, 0, RTE_REG_ECX, 2)
+ FEAT_DEF(MONITOR, 0x00000001, 0, RTE_REG_ECX, 3)
+ FEAT_DEF(DS_CPL, 0x00000001, 0, RTE_REG_ECX, 4)
+ FEAT_DEF(VMX, 0x00000001, 0, RTE_REG_ECX, 5)
+ FEAT_DEF(SMX, 0x00000001, 0, RTE_REG_ECX, 6)
+ FEAT_DEF(EIST, 0x00000001, 0, RTE_REG_ECX, 7)
+ FEAT_DEF(TM2, 0x00000001, 0, RTE_REG_ECX, 8)
+ FEAT_DEF(SSSE3, 0x00000001, 0, RTE_REG_ECX, 9)
+ FEAT_DEF(CNXT_ID, 0x00000001, 0, RTE_REG_ECX, 10)
+ FEAT_DEF(FMA, 0x00000001, 0, RTE_REG_ECX, 12)
+ FEAT_DEF(CMPXCHG16B, 0x00000001, 0, RTE_REG_ECX, 13)
+ FEAT_DEF(XTPR, 0x00000001, 0, RTE_REG_ECX, 14)
+ FEAT_DEF(PDCM, 0x00000001, 0, RTE_REG_ECX, 15)
+ FEAT_DEF(PCID, 0x00000001, 0, RTE_REG_ECX, 17)
+ FEAT_DEF(DCA, 0x00000001, 0, RTE_REG_ECX, 18)
+ FEAT_DEF(SSE4_1, 0x00000001, 0, RTE_REG_ECX, 19)
+ FEAT_DEF(SSE4_2, 0x00000001, 0, RTE_REG_ECX, 20)
+ FEAT_DEF(X2APIC, 0x00000001, 0, RTE_REG_ECX, 21)
+ FEAT_DEF(MOVBE, 0x00000001, 0, RTE_REG_ECX, 22)
+ FEAT_DEF(POPCNT, 0x00000001, 0, RTE_REG_ECX, 23)
+ FEAT_DEF(TSC_DEADLINE, 0x00000001, 0, RTE_REG_ECX, 24)
+ FEAT_DEF(AES, 0x00000001, 0, RTE_REG_ECX, 25)
+ FEAT_DEF(XSAVE, 0x00000001, 0, RTE_REG_ECX, 26)
+ FEAT_DEF(OSXSAVE, 0x00000001, 0, RTE_REG_ECX, 27)
+ FEAT_DEF(AVX, 0x00000001, 0, RTE_REG_ECX, 28)
+ FEAT_DEF(F16C, 0x00000001, 0, RTE_REG_ECX, 29)
+ FEAT_DEF(RDRAND, 0x00000001, 0, RTE_REG_ECX, 30)
+
+ FEAT_DEF(FPU, 0x00000001, 0, RTE_REG_EDX, 0)
+ FEAT_DEF(VME, 0x00000001, 0, RTE_REG_EDX, 1)
+ FEAT_DEF(DE, 0x00000001, 0, RTE_REG_EDX, 2)
+ FEAT_DEF(PSE, 0x00000001, 0, RTE_REG_EDX, 3)
+ FEAT_DEF(TSC, 0x00000001, 0, RTE_REG_EDX, 4)
+ FEAT_DEF(MSR, 0x00000001, 0, RTE_REG_EDX, 5)
+ FEAT_DEF(PAE, 0x00000001, 0, RTE_REG_EDX, 6)
+ FEAT_DEF(MCE, 0x00000001, 0, RTE_REG_EDX, 7)
+ FEAT_DEF(CX8, 0x00000001, 0, RTE_REG_EDX, 8)
+ FEAT_DEF(APIC, 0x00000001, 0, RTE_REG_EDX, 9)
+ FEAT_DEF(SEP, 0x00000001, 0, RTE_REG_EDX, 11)
+ FEAT_DEF(MTRR, 0x00000001, 0, RTE_REG_EDX, 12)
+ FEAT_DEF(PGE, 0x00000001, 0, RTE_REG_EDX, 13)
+ FEAT_DEF(MCA, 0x00000001, 0, RTE_REG_EDX, 14)
+ FEAT_DEF(CMOV, 0x00000001, 0, RTE_REG_EDX, 15)
+ FEAT_DEF(PAT, 0x00000001, 0, RTE_REG_EDX, 16)
+ FEAT_DEF(PSE36, 0x00000001, 0, RTE_REG_EDX, 17)
+ FEAT_DEF(PSN, 0x00000001, 0, RTE_REG_EDX, 18)
+ FEAT_DEF(CLFSH, 0x00000001, 0, RTE_REG_EDX, 19)
+ FEAT_DEF(DS, 0x00000001, 0, RTE_REG_EDX, 21)
+ FEAT_DEF(ACPI, 0x00000001, 0, RTE_REG_EDX, 22)
+ FEAT_DEF(MMX, 0x00000001, 0, RTE_REG_EDX, 23)
+ FEAT_DEF(FXSR, 0x00000001, 0, RTE_REG_EDX, 24)
+ FEAT_DEF(SSE, 0x00000001, 0, RTE_REG_EDX, 25)
+ FEAT_DEF(SSE2, 0x00000001, 0, RTE_REG_EDX, 26)
+ FEAT_DEF(SS, 0x00000001, 0, RTE_REG_EDX, 27)
+ FEAT_DEF(HTT, 0x00000001, 0, RTE_REG_EDX, 28)
+ FEAT_DEF(TM, 0x00000001, 0, RTE_REG_EDX, 29)
+ FEAT_DEF(PBE, 0x00000001, 0, RTE_REG_EDX, 31)
+
+ FEAT_DEF(DIGTEMP, 0x00000006, 0, RTE_REG_EAX, 0)
+ FEAT_DEF(TRBOBST, 0x00000006, 0, RTE_REG_EAX, 1)
+ FEAT_DEF(ARAT, 0x00000006, 0, RTE_REG_EAX, 2)
+ FEAT_DEF(PLN, 0x00000006, 0, RTE_REG_EAX, 4)
+ FEAT_DEF(ECMD, 0x00000006, 0, RTE_REG_EAX, 5)
+ FEAT_DEF(PTM, 0x00000006, 0, RTE_REG_EAX, 6)
+
+ FEAT_DEF(MPERF_APERF_MSR, 0x00000006, 0, RTE_REG_ECX, 0)
+ FEAT_DEF(ACNT2, 0x00000006, 0, RTE_REG_ECX, 1)
+ FEAT_DEF(ENERGY_EFF, 0x00000006, 0, RTE_REG_ECX, 3)
+
+ FEAT_DEF(FSGSBASE, 0x00000007, 0, RTE_REG_EBX, 0)
+ FEAT_DEF(BMI1, 0x00000007, 0, RTE_REG_EBX, 2)
+ FEAT_DEF(HLE, 0x00000007, 0, RTE_REG_EBX, 4)
+ FEAT_DEF(AVX2, 0x00000007, 0, RTE_REG_EBX, 5)
+ FEAT_DEF(SMEP, 0x00000007, 0, RTE_REG_EBX, 6)
+ FEAT_DEF(BMI2, 0x00000007, 0, RTE_REG_EBX, 7)
+ FEAT_DEF(ERMS, 0x00000007, 0, RTE_REG_EBX, 8)
+ FEAT_DEF(INVPCID, 0x00000007, 0, RTE_REG_EBX, 10)
+ FEAT_DEF(RTM, 0x00000007, 0, RTE_REG_EBX, 11)
+ FEAT_DEF(AVX512F, 0x00000007, 0, RTE_REG_EBX, 16)
+
+ FEAT_DEF(LAHF_SAHF, 0x80000001, 0, RTE_REG_ECX, 0)
+ FEAT_DEF(LZCNT, 0x80000001, 0, RTE_REG_ECX, 4)
+
+ FEAT_DEF(SYSCALL, 0x80000001, 0, RTE_REG_EDX, 11)
+ FEAT_DEF(XD, 0x80000001, 0, RTE_REG_EDX, 20)
+ FEAT_DEF(1GB_PG, 0x80000001, 0, RTE_REG_EDX, 26)
+ FEAT_DEF(RDTSCP, 0x80000001, 0, RTE_REG_EDX, 27)
+ FEAT_DEF(EM64T, 0x80000001, 0, RTE_REG_EDX, 29)
+
+ FEAT_DEF(INVTSC, 0x80000007, 0, RTE_REG_EDX, 8)
+};
+
+/*
+ * Execute CPUID instruction and get contents of a specific register
+ *
+ * This function, when compiled with GCC, will generate architecture-neutral
+ * code, as per GCC manual.
+ */
+static void cpu_get_features(uint32_t leaf, uint32_t subleaf,
+ cpuid_registers_t out)
+{
+#if defined(__i386__) && defined(__PIC__)
+ /* %ebx is a forbidden register if we compile with -fPIC or -fPIE */
+ __asm__ __volatile__("movl %%ebx,%0 ; cpuid ; xchgl %%ebx,%0"
+ : "=r" (out[RTE_REG_EBX]),
+ "=a" (out[RTE_REG_EAX]),
+ "=c" (out[RTE_REG_ECX]),
+ "=d" (out[RTE_REG_EDX])
+ : "a" (leaf), "c" (subleaf));
+#else
+ __asm__ __volatile__("cpuid"
+ : "=a" (out[RTE_REG_EAX]),
+ "=b" (out[RTE_REG_EBX]),
+ "=c" (out[RTE_REG_ECX]),
+ "=d" (out[RTE_REG_EDX])
+ : "a" (leaf), "c" (subleaf));
+#endif
+}
+
+static int cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
+{
+ const struct feature_entry *feat;
+ cpuid_registers_t regs;
+
+ if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ /* Flag does not match anything in the feature tables */
+ return -1;
+
+ feat = &cpu_feature_table[feature];
+
+ if (!feat->leaf)
+ /* This entry in the table wasn't filled out! */
+ return -1;
+
+ cpu_get_features(feat->leaf & 0xffff0000, 0, regs);
+ if (((regs[RTE_REG_EAX] ^ feat->leaf) & 0xffff0000) ||
+ regs[RTE_REG_EAX] < feat->leaf)
+ return 0;
+
+ /* get the cpuid leaf containing the desired feature */
+ cpu_get_features(feat->leaf, feat->subleaf, regs);
+
+ /* check if the feature is enabled */
+ return (regs[feat->reg] >> feat->bit) & 1;
+}
+
+static const char *cpu_get_flag_name(enum rte_cpu_flag_t feature)
+{
+ if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ return NULL;
+ return cpu_feature_table[feature].name;
+}
+
+void cpu_flags_print_all(void)
+{
+ int len, i;
+ int max_str = 1024;
+ int max_len = max_str - 1;
+ char str[max_str];
+
+ len = snprintf(str, max_len, "\nCPU features supported:\n");
+
+ for (i = 0; i < RTE_CPUFLAG_NUMFLAGS; i++) {
+ if (cpu_get_flag_enabled(i) > 0)
+ len += snprintf(&str[len], max_len - len, "%s ",
+ cpu_get_flag_name(i));
+ }
+
+ len += snprintf(&str[len], max_len - len,
+ "\n\nCPU features NOT supported:\n");
+
+ for (i = 0; i < RTE_CPUFLAG_NUMFLAGS; i++) {
+ if (cpu_get_flag_enabled(i) <= 0)
+ len += snprintf(&str[len], max_len - len, "%s ",
+ cpu_get_flag_name(i));
+ }
+
+ len += snprintf(&str[len], max_len - len, "\n\n");
+
+ str[len] = '\0';
+ ODP_PRINT("%s", str);
+}
diff --git a/platform/linux-generic/arch/x86/cpu_flags.h b/platform/linux-generic/arch/x86/cpu_flags.h
new file mode 100644
index 00000000..f709ca08
--- /dev/null
+++ b/platform/linux-generic/arch/x86/cpu_flags.h
@@ -0,0 +1,20 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_PLAT_CPU_FLAGS_H_
+#define ODP_PLAT_CPU_FLAGS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void cpu_flags_print_all(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
commit 8f07f3de3da7961cd29046d2107f27a0f7391703
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:49 2017 +0300
api: system: added system info print
This information specifies the system where ODP application
is running for debugging purposes.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h
index 0bb4f1f1..ca4dcdc7 100644
--- a/include/odp/api/spec/system_info.h
+++ b/include/odp/api/spec/system_info.h
@@ -45,6 +45,15 @@ uint64_t odp_sys_page_size(void);
int odp_sys_cache_line_size(void);
/**
+ * Print system info
+ *
+ * Print out implementation defined information about the system. This
+ * information is intended for debugging purposes and may contain e.g.
+ * information about CPUs, memory and other HW configuration.
+ */
+void odp_sys_info_print(void);
+
+/**
* @}
*/
commit 4bb3025e76a81130e8e80cd582ae2433d3450e2b
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Apr 28 15:09:48 2017 +0300
api: time: remove odp_time_to_u64 from API
Debug function that converts odp_time_t to u64 is unnecessary
since odp_time_to_ns() returns time as a u64 (nsec) value.
Application can always use that as the 64 bit representation
of an odp_time_t value. Also validation tests for odp_time_to_u64()
were erroneous since those compared returned u64 values and
expected greater/lesser than relation.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/time.h b/include/odp/api/spec/time.h
index fcc94c98..29175eb5 100644
--- a/include/odp/api/spec/time.h
+++ b/include/odp/api/spec/time.h
@@ -158,19 +158,6 @@ void odp_time_wait_until(odp_time_t time);
void odp_time_wait_ns(uint64_t ns);
/**
- * Get printable value for an odp_time_t
- *
- * @param time time to be printed
- *
- * @return uint64_t value that can be used to print/display this time
- *
- * @note This routine is intended to be used for diagnostic purposes
- * to enable applications to generate a printable value that represents
- * an odp_time_t time.
- */
-uint64_t odp_time_to_u64(odp_time_t time);
-
-/**
* @}
*/
diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c
index 81e05224..0e5966c0 100644
--- a/platform/linux-generic/odp_time.c
+++ b/platform/linux-generic/odp_time.c
@@ -176,21 +176,6 @@ void odp_time_wait_until(odp_time_t time)
return time_wait_until(time);
}
-uint64_t odp_time_to_u64(odp_time_t time)
-{
- int ret;
- struct timespec tres;
- uint64_t resolution;
-
- ret = clock_getres(CLOCK_MONOTONIC_RAW, &tres);
- if (odp_unlikely(ret != 0))
- ODP_ABORT("clock_getres failed\n");
-
- resolution = (uint64_t)tres.tv_nsec;
-
- return time_to_ns(time) / resolution;
-}
-
int odp_time_init_global(void)
{
int ret;
diff --git a/test/common_plat/validation/api/time/time.c b/test/common_plat/validation/api/time/time.c
index 530d5c07..df65c719 100644
--- a/test/common_plat/validation/api/time/time.c
+++ b/test/common_plat/validation/api/time/time.c
@@ -398,41 +398,6 @@ void time_test_wait_ns(void)
}
}
-static void time_test_to_u64(time_cb time)
-{
- volatile int count = 0;
- uint64_t val1, val2;
- odp_time_t t1, t2;
-
- t1 = time();
-
- val1 = odp_time_to_u64(t1);
- CU_ASSERT(val1 > 0);
-
- while (count < BUSY_LOOP_CNT) {
- count++;
- };
-
- t2 = time();
- val2 = odp_time_to_u64(t2);
- CU_ASSERT(val2 > 0);
-
- CU_ASSERT(val2 > val1);
-
- val1 = odp_time_to_u64(ODP_TIME_NULL);
- CU_ASSERT(val1 == 0);
-}
-
-void time_test_local_to_u64(void)
-{
- time_test_to_u64(odp_time_local);
-}
-
-void time_test_global_to_u64(void)
-{
- time_test_to_u64(odp_time_global);
-}
-
odp_testinfo_t time_suite_time[] = {
ODP_TEST_INFO(time_test_constants),
ODP_TEST_INFO(time_test_local_res),
@@ -443,14 +408,12 @@ odp_testinfo_t time_suite_time[] = {
ODP_TEST_INFO(time_test_local_sum),
ODP_TEST_INFO(time_test_local_wait_until),
ODP_TEST_INFO(time_test_wait_ns),
- ODP_TEST_INFO(time_test_local_to_u64),
ODP_TEST_INFO(time_test_global_res),
ODP_TEST_INFO(time_test_global_conversion),
ODP_TEST_INFO(time_test_global_cmp),
ODP_TEST_INFO(time_test_global_diff),
ODP_TEST_INFO(time_test_global_sum),
ODP_TEST_INFO(time_test_global_wait_until),
- ODP_TEST_INFO(time_test_global_to_u64),
ODP_TEST_INFO_NULL
};
diff --git a/test/common_plat/validation/api/time/time.h b/test/common_plat/validation/api/time/time.h
index e5132a49..10956294 100644
--- a/test/common_plat/validation/api/time/time.h
+++ b/test/common_plat/validation/api/time/time.h
@@ -24,8 +24,6 @@ void time_test_global_sum(void);
void time_test_local_wait_until(void);
void time_test_global_wait_until(void);
void time_test_wait_ns(void);
-void time_test_local_to_u64(void);
-void time_test_global_to_u64(void);
void time_test_monotony(void);
/* test arrays: */
commit 629be2dd2d166ed1246b8c1982af3a55a7035657
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Fri Apr 21 09:25:25 2017 -0500
helper: add additional doxygen documentation
Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2952 by adding
additional field documentation to avoid problems with doxygen 1.8.13
and higher.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/include/odp/helper/icmp.h b/helper/include/odp/helper/icmp.h
index e25646ad..bef96784 100644
--- a/helper/include/odp/helper/icmp.h
+++ b/helper/include/odp/helper/icmp.h
@@ -32,15 +32,18 @@ typedef struct ODP_PACKED {
uint8_t type; /**< message type */
uint8_t code; /**< type sub-code */
odp_u16sum_t chksum; /**< checksum of icmp header */
+ /** Variant mappings of ICMP fields */
union {
+ /** Fields used for ICMP echo msgs */
struct {
- odp_u16be_t id;
- odp_u16be_t sequence;
+ odp_u16be_t id; /**< id */
+ odp_u16be_t sequence; /**< sequence */
} echo; /**< echo datagram */
odp_u32be_t gateway; /**< gateway address */
+ /** Fields used for ICMP frag msgs */
struct {
- odp_u16be_t __unused;
- odp_u16be_t mtu;
+ odp_u16be_t __unused; /**< @internal */
+ odp_u16be_t mtu; /**< mtu */
} frag; /**< path mtu discovery */
} un; /**< icmp sub header */
} odph_icmphdr_t;
diff --git a/helper/include/odp/helper/strong_types.h b/helper/include/odp/helper/strong_types.h
index 13e35a43..501d0f28 100644
--- a/helper/include/odp/helper/strong_types.h
+++ b/helper/include/odp/helper/strong_types.h
@@ -20,10 +20,11 @@
/** Use strong typing for ODP types */
#ifdef __cplusplus
+/** @internal C++ helper macro for strong typing @param type @return */
#define ODPH_HANDLE_T(type) struct _##type { uint8_t unused_dummy_var; } *type
#else
#define odph_handle_t struct { uint8_t unused_dummy_var; } *
-/** C/C++ helper macro for strong typing */
+/** @internal C helper macro for strong typing @param type @return */
#define ODPH_HANDLE_T(type) odph_handle_t type
#endif
diff --git a/helper/include/odp/helper/table.h b/helper/include/odp/helper/table.h
index b3440ef5..96c9c5fe 100644
--- a/helper/include/odp/helper/table.h
+++ b/helper/include/odp/helper/table.h
@@ -94,7 +94,7 @@ extern "C" {
#define ODPH_TABLE_NAME_LEN 32
#include <odp/helper/strong_types.h>
-/** ODP table handle */
+/** @internal ODPH table handle @return */
typedef ODPH_HANDLE_T(odph_table_t);
/**
diff --git a/helper/include/odp/helper/tcp.h b/helper/include/odp/helper/tcp.h
index fd234e58..e91b52e2 100644
--- a/helper/include/odp/helper/tcp.h
+++ b/helper/include/odp/helper/tcp.h
@@ -32,8 +32,9 @@ typedef struct ODP_PACKED {
odp_u16be_t dst_port; /**< Destination port */
odp_u32be_t seq_no; /**< Sequence number */
odp_u32be_t ack_no; /**< Acknowledgment number */
+ /** Variant maps for TCP header fields */
union {
- odp_u16be_t doffset_flags;
+ odp_u16be_t doffset_flags; /**< TCP Flags aggregate */
#if ODP_BIG_ENDIAN_BITFIELD
struct {
odp_u16be_t rsvd1:8;
@@ -42,14 +43,14 @@ typedef struct ODP_PACKED {
struct {
odp_u16be_t hl:4; /**< Hdr len, in words */
odp_u16be_t rsvd3:4; /**< Reserved */
- odp_u16be_t cwr:1;
- odp_u16be_t ece:1;
- odp_u16be_t urg:1;
- odp_u16be_t ack:1;
- odp_u16be_t psh:1;
- odp_u16be_t rst:1;
- odp_u16be_t syn:1;
- odp_u16be_t fin:1;
+ odp_u16be_t cwr:1; /**< cwr bit */
+ odp_u16be_t ece:1; /**< ece bit */
+ odp_u16be_t urg:1; /**< urg bit */
+ odp_u16be_t ack:1; /**< ack bit */
+ odp_u16be_t psh:1; /**< psh bit */
+ odp_u16be_t rst:1; /**< rst bit */
+ odp_u16be_t syn:1; /**< syn bit */
+ odp_u16be_t fin:1; /**< fin bit */
};
#elif ODP_LITTLE_ENDIAN_BITFIELD
struct {
@@ -59,14 +60,14 @@ typedef struct ODP_PACKED {
struct {
odp_u16be_t rsvd3:4; /**< Reserved */
odp_u16be_t hl:4; /**< Hdr len, in words */
- odp_u16be_t fin:1;
- odp_u16be_t syn:1;
- odp_u16be_t rst:1;
- odp_u16be_t psh:1;
- odp_u16be_t ack:1;
- odp_u16be_t urg:1;
- odp_u16be_t ece:1;
- odp_u16be_t cwr:1;
+ odp_u16be_t fin:1; /**< fin bit */
+ odp_u16be_t syn:1; /**< syn bit */
+ odp_u16be_t rst:1; /**< rst bit */
+ odp_u16be_t psh:1; /**< psh bit */
+ odp_u16be_t ack:1; /**< ack bit */
+ odp_u16be_t urg:1; /**< urg bit */
+ odp_u16be_t ece:1; /**< ece bit */
+ odp_u16be_t cwr:1; /**< cwr bit */
};
#else
diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h
index 5682bab9..526f0d48 100644
--- a/helper/include/odp/helper/threads.h
+++ b/helper/include/odp/helper/threads.h
@@ -80,12 +80,15 @@ typedef struct {
odph_odpthread_start_args_t start_args; /**< start arguments */
int cpu; /**< CPU ID */
int last; /**< true if last table entry */
+ /** Variant field mappings for thread/process modes */
union {
- struct { /* for thread implementation */
+ /** For thread implementation */
+ struct {
pthread_t thread_id; /**< Pthread ID */
pthread_attr_t attr; /**< Pthread attributes */
} thread;
- struct { /* for process implementation */
+ /** For process implementation */
+ struct {
pid_t pid; /**< Process ID */
int status; /**< Process state chge status*/
} proc;
commit af05215e26c99693c000981fddfaf3cdd2225e3f
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Fri Apr 21 09:25:24 2017 -0500
linux-generic: types: add additional doxygen documentation
Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2952 by adding
additional field documentation to avoid problems with doxygen 1.8.13
and higher.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/debug.h b/platform/linux-generic/include/odp/api/debug.h
index b0f91b1c..bef2fd0e 100644
--- a/platform/linux-generic/include/odp/api/debug.h
+++ b/platform/linux-generic/include/odp/api/debug.h
@@ -25,17 +25,23 @@ extern "C" {
* versions.
*/
#define _odp_merge(a, b) a##b
+/** @internal */
#define _odp_label(a) _odp_merge(_ODP_SASSERT_, a)
+/** @internal */
#define _ODP_SASSERT _odp_label(__COUNTER__)
+/** @internal */
#define _ODP_SASSERT_ENUM(e) { _ODP_SASSERT = 1 / !!(e) }
+/** @internal */
#define _odp_static_assert(e, s) enum _ODP_SASSERT_ENUM(e)
#if defined(__clang__)
#if defined(__cplusplus)
#if !__has_feature(cxx_static_assert) && !defined(static_assert)
+/** @internal */
#define static_assert(e, s) _odp_static_assert(e, s)
#endif
#elif !__has_feature(c_static_assert) && !defined(_Static_assert)
+/** @internal */
#define _Static_assert(e, s) _odp_static_assert(e, s)
#endif
@@ -44,9 +50,11 @@ extern "C" {
(__GNUC__ < 6 && defined(__cplusplus))
#if defined(__cplusplus)
#if !defined(static_assert)
+/** @intenral */
#define static_assert(e, s) _odp_static_assert(e, s)
#endif
#elif !defined(_Static_assert)
+/** @internal */
#define _Static_assert(e, s) _odp_static_assert(e, s)
#endif
#endif
diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h
index 7e3c51e6..95cba5eb 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_types.h
@@ -105,6 +105,7 @@ typedef union {
/** All input flags */
uint64_t all;
+ /** Individual input flags */
struct {
uint64_t parsed_l2:1; /**< L2 parsed */
uint64_t dst_queue:1; /**< Dst queue present */
diff --git a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h
index b766afec..f47a13f6 100644
--- a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h
+++ b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h
@@ -168,7 +168,7 @@ typedef odp_tm_handle_t odp_tm_wred_t;
*/
#define ODP_TM_ROOT ((odp_tm_handle_t)-1)
-/** Get printable format of odp_queue_t */
+/** @internal Get printable format of odp_tm_handle_t @param hdl @return */
static inline uint64_t odp_tm_handle_to_u64(odp_tm_handle_t hdl)
{
return hdl;
commit b9676fc5ba51d0f26a9c8c40f0b65a003113f1b5
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Fri Apr 21 09:25:23 2017 -0500
api: tm: add additional doxygen documentation
Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2952 by adding
additional field documentation to avoid problems with doxygen 1.8.13
and higher.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h
index 71198bbd..3a748cef 100644
--- a/include/odp/api/spec/traffic_mngr.h
+++ b/include/odp/api/spec/traffic_mngr.h
@@ -471,9 +471,10 @@ typedef enum {
typedef struct {
odp_tm_egress_kind_t egress_kind; /**< Union discriminator */
+ /** Variant parameters for different TM outputs */
union {
- odp_pktio_t pktio;
- odp_tm_egress_fcn_t egress_fcn;
+ odp_pktio_t pktio; /**< Output to PktIO */
+ odp_tm_egress_fcn_t egress_fcn; /**< Output to user func */
};
} odp_tm_egress_t;
commit 583dbc9adab460c926339353cc882095594b5b60
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Fri Apr 21 09:25:22 2017 -0500
api: pool: add additional doxygen documentation
Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2952 by adding
additional field documentation to avoid problems with doxygen 1.8.13
and higher.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h
index c0de195a..6fc5b6b4 100644
--- a/include/odp/api/spec/pool.h
+++ b/include/odp/api/spec/pool.h
@@ -166,7 +166,9 @@ typedef struct odp_pool_param_t {
/** Pool type */
int type;
+ /** Variant parameters for different pool types */
union {
+ /** Parameters for buffer pools */
struct {
/** Number of buffers in the pool */
uint32_t num;
@@ -180,6 +182,8 @@ typedef struct odp_pool_param_t {
Default will always be a multiple of 8. */
uint32_t align;
} buf;
+
+ /** Parameters for packet pools */
struct {
/** The number of packets that the pool must provide
that are packet length 'len' bytes or smaller.
@@ -211,6 +215,8 @@ typedef struct odp_pool_param_t {
Specify as 0 if no user area is needed. */
uint32_t uarea_size;
} pkt;
+
+ /** Parameters for timeout pools */
struct {
/** Number of timeouts in the pool */
uint32_t num;
commit 867d8fc93d074005b52375995b9beed4a896c1ed
Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)linaro.org>
Date: Thu Apr 6 23:07:04 2017 -0500
helper: cuckoo: add queue size config to cuckoo table
Some queue implementations in ODP take queue size input. Cuckoo table is
modified to provide the queue size input while creating the queue.
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(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/helper/cuckootable.c b/helper/cuckootable.c
index 80ff4989..0d46300e 100644
--- a/helper/cuckootable.c
+++ b/helper/cuckootable.c
@@ -256,6 +256,7 @@ odph_cuckoo_table_create(
/* initialize free_slots queue */
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_PLAIN;
+ qparam.size = capacity;
snprintf(queue_name, sizeof(queue_name), "fs_%s", name);
queue = odp_queue_create(queue_name, &qparam);
commit 87b108d54a697b0c3704342ec7b4d484d04dfdbb
Author: Kevin Wang <kevin.wang(a)arm.com>
Date: Fri Apr 14 10:57:21 2017 +0800
validation: scheduler: release context according to scheduler sync type
For different scheduler sync type, need to call different release
function.
Signed-off-by: Kevin Wang <kevin.wang(a)arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c
index f46d3910..4f99435c 100644
--- a/test/common_plat/validation/api/scheduler/scheduler.c
+++ b/test/common_plat/validation/api/scheduler/scheduler.c
@@ -129,6 +129,14 @@ static int exit_schedule_loop(void)
return ret;
}
+static void release_context(odp_schedule_sync_t sync)
+{
+ if (sync == ODP_SCHED_SYNC_ATOMIC)
+ odp_schedule_release_atomic();
+ else if (sync == ODP_SCHED_SYNC_ORDERED)
+ odp_schedule_release_ordered();
+}
+
void scheduler_test_wait_time(void)
{
int i;
@@ -251,8 +259,7 @@ void scheduler_test_queue_destroy(void)
CU_ASSERT_FATAL(u32[0] == MAGIC);
odp_buffer_free(buf);
- odp_schedule_release_ordered();
-
+ release_context(qp.sched.sync);
CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0);
}
@@ -820,12 +827,7 @@ static int schedule_common_(void *arg)
}
}
- if (sync == ODP_SCHED_SYNC_ATOMIC)
- odp_schedule_release_atomic();
-
- if (sync == ODP_SCHED_SYNC_ORDERED)
- odp_schedule_release_ordered();
-
+ release_context(sync);
odp_ticketlock_lock(&globals->lock);
globals->buf_count -= num;
commit 20d0d4d1a34725dec053ecd7cd46979345f7d625
Author: Kevin Wang <kevin.wang(a)arm.com>
Date: Tue Apr 11 10:38:06 2017 +0800
validation: scheduler: modify the queue size for atomic queue
Signed-off-by: Kevin Wang <kevin.wang(a)arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c
index 952561cd..f46d3910 100644
--- a/test/common_plat/validation/api/scheduler/scheduler.c
+++ b/test/common_plat/validation/api/scheduler/scheduler.c
@@ -1388,6 +1388,7 @@ static int create_queues(void)
snprintf(name, sizeof(name), "sched_%d_%d_a", i, j);
p.sched.sync = ODP_SCHED_SYNC_ATOMIC;
+ p.size = BUFS_PER_QUEUE_EXCL;
q = odp_queue_create(name, &p);
if (q == ODP_QUEUE_INVALID) {
@@ -1423,6 +1424,7 @@ static int create_queues(void)
snprintf(name, sizeof(name), "sched_%d_%d_o", i, j);
p.sched.sync = ODP_SCHED_SYNC_ORDERED;
p.sched.lock_count = capa.max_ordered_locks;
+ p.size = 0;
q = odp_queue_create(name, &p);
if (q == ODP_QUEUE_INVALID) {
commit 8367530231e7cd4c33c63b789a5ed8322b51e58f
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Apr 13 17:40:51 2017 +0300
validation: queue: test queue max_num per type
Updated implementation and test with type specific number of
queues.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
index a96f9225..dd430cd1 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -176,6 +176,8 @@ int odp_queue_capability(odp_queue_capability_t *capa)
capa->max_ordered_locks = sched_fn->max_ordered_locks();
capa->max_sched_groups = sched_fn->num_grps();
capa->sched_prios = odp_schedule_num_prio();
+ capa->plain.max_num = capa->max_queues;
+ capa->sched.max_num = capa->max_queues;
return 0;
}
diff --git a/test/common_plat/validation/api/queue/queue.c b/test/common_plat/validation/api/queue/queue.c
index 1f7913a1..6a13c006 100644
--- a/test/common_plat/validation/api/queue/queue.c
+++ b/test/common_plat/validation/api/queue/queue.c
@@ -56,7 +56,7 @@ void queue_test_capa(void)
odp_queue_param_t qparams;
char name[ODP_QUEUE_NAME_LEN];
odp_queue_t queue[MAX_QUEUES];
- uint32_t num_queues, i;
+ uint32_t num_queues, min, i, j;
memset(&capa, 0, sizeof(odp_queue_capability_t));
CU_ASSERT(odp_queue_capability(&capa) == 0);
@@ -65,34 +65,49 @@ void queue_test_capa(void)
CU_ASSERT(capa.max_ordered_locks != 0);
CU_ASSERT(capa.max_sched_groups != 0);
CU_ASSERT(capa.sched_prios != 0);
+ CU_ASSERT(capa.plain.max_num != 0);
+ CU_ASSERT(capa.sched.max_num != 0);
+
+ min = capa.plain.max_num;
+ if (min > capa.sched.max_num)
+ min = capa.sched.max_num;
+
+ CU_ASSERT(capa.max_queues >= min);
for (i = 0; i < ODP_QUEUE_NAME_LEN; i++)
name[i] = 'A' + (i % 26);
name[ODP_QUEUE_NAME_LEN - 1] = 0;
- if (capa.max_queues > MAX_QUEUES)
- num_queues = MAX_QUEUES;
- else
- num_queues = capa.max_queues;
-
odp_queue_param_init(&qparams);
- for (i = 0; i < num_queues; i++) {
- generate_name(name, i);
- queue[i] = odp_queue_create(name, &qparams);
+ for (j = 0; j < 2; j++) {
+ if (j == 0) {
+ num_queues = capa.plain.max_num;
+ } else {
+ num_queues = capa.sched.max_num;
+ qparams.type = ODP_QUEUE_TYPE_SCHED;
+ }
+
+ if (num_queues > MAX_QUEUES)
+ num_queues = MAX_QUEUES;
- if (queue[i] == ODP_QUEUE_INVALID) {
- CU_FAIL("Queue create failed");
- num_queues = i;
- break;
+ for (i = 0; i < num_queues; i++) {
+ generate_name(name, i);
+ queue[i] = odp_queue_create(name, &qparams);
+
+ if (queue[i] == ODP_QUEUE_INVALID) {
+ CU_FAIL("Queue create failed");
+ num_queues = i;
+ break;
+ }
+
+ CU_ASSERT(odp_queue_lookup(name) != ODP_QUEUE_INVALID);
}
- CU_ASSERT(odp_queue_lookup(name) != ODP_QUEUE_INVALID);
+ for (i = 0; i < num_queues; i++)
+ CU_ASSERT(odp_queue_destroy(queue[i]) == 0);
}
-
- for (i = 0; i < num_queues; i++)
- CU_ASSERT(odp_queue_destroy(queue[i]) == 0);
}
void queue_test_mode(void)
commit 48ad38ac169c48ac67e0758d3d45eb146255ed09
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Apr 13 17:40:50 2017 +0300
api: queue: added queue size param
Added capability information about maximum number of queues
and queue sizes. Both are defined per queue type, since
plain and scheduled queues may have different implementations
(e.g. one uses HW while the other is SW).
Added queue size parameter, which specifies how large
storage size application requires in minimum.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h
index 7972feac..9dd0a561 100644
--- a/include/odp/api/spec/queue.h
+++ b/include/odp/api/spec/queue.h
@@ -100,7 +100,9 @@ typedef enum odp_queue_op_mode_t {
* Queue capabilities
*/
typedef struct odp_queue_capability_t {
- /** Maximum number of event queues */
+ /** Maximum number of event queues of any type (default size). Use
+ * this in addition to queue type specific 'max_num', if both queue
+ * types are used simultaneously. */
uint32_t max_queues;
/** Maximum number of ordered locks per queue */
@@ -112,6 +114,32 @@ typedef struct odp_queue_capability_t {
/** Number of scheduling priorities */
unsigned sched_prios;
+ /** Plain queue capabilities */
+ struct {
+ /** Maximum number of plain queues of the default size. */
+ uint32_t max_num;
+
+ /** Maximum number of events a plain queue can store
+ * simultaneously. The value of zero means that plain
+ * queues do not have a size limit, but a single queue can
+ * store all available events. */
+ uint32_t max_size;
+
+ } plain;
+
+ /** Scheduled queue capabilities */
+ struct {
+ /** Maximum number of scheduled queues of the default size. */
+ uint32_t max_num;
+
+ /** Maximum number of events a scheduled queue can store
+ * simultaneously. The value of zero means that scheduled
+ * queues do not have a size limit, but a single queue can
+ * store all available events. */
+ uint32_t max_size;
+
+ } sched;
+
} odp_queue_capability_t;
/**
@@ -165,6 +193,15 @@ typedef struct odp_queue_param_t {
* The implementation may use this value as a hint for the number of
* context data bytes to prefetch. Default value is zero (no hint). */
uint32_t context_len;
+
+ /** Queue size
+ *
+ * The queue must be able to store at minimum this many events
+ * simultaneously. The value must not exceed 'max_size' queue
+ * capability. The value of zero means implementation specific
+ * default size. */
+ uint32_t size;
+
} odp_queue_param_t;
/**
commit a074bc12f6a960c195daf3ceb28e3f717cfc3aa2
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Apr 6 17:41:17 2017 +0300
validation: pktio: remove CRCs from parser test packets
Remove precalculated CRCs from test packets. Some pktio devices may drop
CRCs causing the tests to fail.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/common_plat/validation/api/pktio/parser.h
index 57c62388..5cc2b988 100644
--- a/test/common_plat/validation/api/pktio/parser.h
+++ b/test/common_plat/validation/api/pktio/parser.h
@@ -28,6 +28,8 @@ int parser_suite_init(void);
/* test arrays: */
extern odp_testinfo_t parser_suite[];
+/* Test packets without CRC */
+
/**
* ARP request
*/
@@ -39,7 +41,7 @@ static const uint8_t test_packet_arp[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA8,
0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11, 0xA1, 0xA8, 0x27, 0x43,
+ 0x0E, 0x0F, 0x10, 0x11
};
/**
@@ -53,7 +55,7 @@ static const uint8_t test_packet_ipv4_icmp[] = {
0x01, 0x02, 0x00, 0x00, 0xB7, 0xAB, 0x00, 0x01,
0x00, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11, 0xD9, 0x7F, 0xE8, 0x02,
+ 0x0E, 0x0F, 0x10, 0x11
};
/**
@@ -67,7 +69,7 @@ static const uint8_t test_packet_ipv4_tcp[] = {
0x01, 0x01, 0x04, 0xD2, 0x10, 0xE1, 0x00, 0x00,
0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x50, 0x00,
0x00, 0x00, 0x0C, 0xCC, 0x00, 0x00, 0x00, 0x01,
- 0x02, 0x03, 0x04, 0x05, 0x2E, 0xDE, 0x5E, 0x48,
+ 0x02, 0x03, 0x04, 0x05
};
/**
@@ -81,7 +83,7 @@ static const uint8_t test_packet_ipv4_udp[] = {
0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A,
0x2F, 0x97, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11, 0x64, 0xF4, 0xE4, 0xB6,
+ 0x0E, 0x0F, 0x10, 0x11
};
/**
@@ -96,7 +98,7 @@ static const uint8_t test_packet_vlan_ipv4_udp[] = {
0x01, 0x02, 0xC4, 0xA8, 0x01, 0x01, 0x00, 0x3F,
0x00, 0x3F, 0x00, 0x16, 0x4D, 0xBF, 0x00, 0x01,
0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
- 0x0A, 0x0B, 0x0C, 0x0D, 0xCB, 0xBF, 0xD0, 0x29,
+ 0x0A, 0x0B, 0x0C, 0x0D
};
/**
@@ -112,7 +114,7 @@ static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = {
0xF3, 0x73, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x12,
0x63, 0xDF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x80, 0x98, 0xB8, 0x18,
+ 0x06, 0x07, 0x08, 0x09
};
/**
@@ -126,8 +128,7 @@ static const uint8_t test_packet_ipv6_icmp[] = {
0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x80, 0x00,
- 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02, 0xE0, 0x68,
- 0x0E, 0xBA,
+ 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02
};
/**
@@ -143,7 +144,7 @@ static const uint8_t test_packet_ipv6_tcp[] = {
0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x04, 0xD2,
0x10, 0xE1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x36, 0x37,
- 0x00, 0x00, 0x28, 0x67, 0xD2, 0xAF,
+ 0x00, 0x00
};
/**
@@ -157,8 +158,7 @@ static const uint8_t test_packet_ipv6_udp[] = {
0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x00, 0x3F,
- 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68, 0x35, 0xD3,
- 0x64, 0x49,
+ 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68
};
/**
@@ -174,7 +174,7 @@ static const uint8_t test_packet_vlan_ipv6_udp[] = {
0x04, 0x00, 0x35, 0x55, 0x55, 0x55, 0x66, 0x66,
0x66, 0x66, 0x77, 0x77, 0x77, 0x77, 0x88, 0x88,
0x88, 0x88, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x08,
- 0x9B, 0x68, 0xC5, 0xD8, 0x2F, 0x5C,
+ 0x9B, 0x68
};
#endif
commit 4418eef8a7b7f621047101f284ce5e5df44f0239
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Apr 4 09:28:21 2017 +0300
validation: pktio: add tests for packet parsing
Test packet parsing using predefined test packets (byte arrays). Test
packets are looped through tested pktio interfaces to force packet parsing.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am
index 466d690d..c6368fba 100644
--- a/test/common_plat/validation/api/pktio/Makefile.am
+++ b/test/common_plat/validation/api/pktio/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libtestpktio.la
libtestpktio_la_SOURCES = pktio.c
test_PROGRAMS = pktio_main$(EXEEXT)
-dist_pktio_main_SOURCES = pktio_main.c
+dist_pktio_main_SOURCES = pktio_main.c parser.c
pktio_main_LDADD = libtestpktio.la $(LIBCUNIT_COMMON) $(LIBODP)
-EXTRA_DIST = pktio.h
+EXTRA_DIST = pktio.h parser.h
diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/common_plat/validation/api/pktio/parser.c
new file mode 100644
index 00000000..ad7101d0
--- /dev/null
+++ b/test/common_plat/validation/api/pktio/parser.c
@@ -0,0 +1,545 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include <odp_api.h>
+#include <odp_cunit_common.h>
+
+#include <odp/helper/odph_api.h>
+
+#include <stdlib.h>
+#include "parser.h"
+#include "pktio.h"
+
+#define MAX_NUM_IFACES 2
+#define PKT_POOL_NUM 256
+#define PKT_POOL_BUF_LEN (2 * 1024)
+
+/**
+ * local container for pktio attributes
+ */
+typedef struct {
+ const char *name;
+ odp_pktio_t hdl;
+ odp_pktout_queue_t pktout;
+ odp_pktin_queue_t pktin;
+} pktio_info_t;
+
+/** Interface names used for testing */
+static const char *iface_name[MAX_NUM_IFACES];
+
+/** Test interfaces */
+pktio_info_t pktios[MAX_NUM_IFACES];
+pktio_info_t *pktio_a;
+pktio_info_t *pktio_b;
+
+/** Number of interfaces being used (1=loopback, 2=pair) */
+static int num_ifaces;
+
+/** While testing real-world interfaces additional time may be needed for
+ * external network to enable link to pktio interface that just become up.
+ */
+static bool wait_for_network;
+
+/** Parser packet pool */
+odp_pool_t parser_pool = ODP_POOL_INVALID;
+
+static inline void wait_linkup(odp_pktio_t pktio)
+{
+ /* wait 1 second for link up */
+ uint64_t wait_ns = (10 * ODP_TIME_MSEC_IN_NS);
+ int wait_num = 100;
+ int i;
+ int ret = -1;
+
+ for (i = 0; i < wait_num; i++) {
+ ret = odp_pktio_link_status(pktio);
+ if (ret < 0 || ret == 1)
+ break;
+ /* link is down, call status again after delay */
+ odp_time_wait_ns(wait_ns);
+ }
+}
+
+static int pkt_pool_create(void)
+{
+ odp_pool_capability_t capa;
+ odp_pool_param_t params;
+
+ if (odp_pool_capability(&capa) != 0) {
+ printf("Error: unable to query pool capability.\n");
+ return -1;
+ }
+
+ if (capa.pkt.max_num && capa.pkt.max_num < PKT_POOL_NUM) {
+ printf("Error: packet pool size not supported.\n");
+ printf("MAX: %" PRIu32 "\n", capa.pkt.max_num);
+ return -1;
+ } else if (capa.pkt.max_len && capa.pkt.max_len < PKT_POOL_BUF_LEN) {
+ printf("Error: packet length not supported.\n");
+ return -1;
+ } else if (capa.pkt.max_seg_len &&
+ capa.pkt.max_seg_len < PKT_POOL_BUF_LEN) {
+ printf("Error: segment length not supported.\n");
+ return -1;
+ }
+
+ odp_pool_param_init(¶ms);
+ params.pkt.seg_len = PKT_POOL_BUF_LEN;
+ params.pkt.len = PKT_POOL_BUF_LEN;
+ params.pkt.num = PKT_POOL_NUM;
+ params.type = ODP_POOL_PACKET;
+
+ parser_pool = odp_pool_create("pkt_pool_default", ¶ms);
+ if (parser_pool == ODP_POOL_INVALID) {
+ printf("Error: packet pool create failed.\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+static odp_pktio_t create_pktio(int iface_idx, odp_pool_t pool)
+{
+ odp_pktio_t pktio;
+ odp_pktio_config_t config;
+ odp_pktio_param_t pktio_param;
+ const char *iface = iface_name[iface_idx];
+
+ odp_pktio_param_init(&pktio_param);
+ pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT;
+ pktio_param.out_mode = ODP_PKTOUT_MODE_DIRECT;
+
+ pktio = odp_pktio_open(iface, pool, &pktio_param);
+ if (pktio == ODP_PKTIO_INVALID) {
+ printf("Error: failed to open %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+
+ odp_pktio_config_init(&config);
+ config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL;
+ if (odp_pktio_config(pktio, &config)) {
+ printf("Error: failed to configure %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+
+ /* By default, single input and output queue is used */
+ if (odp_pktin_queue_config(pktio, NULL)) {
+ printf("Error: failed to config input queue for %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+ if (odp_pktout_queue_config(pktio, NULL)) {
+ printf("Error: failed to config output queue for %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+
+ if (wait_for_network)
+ odp_time_wait_ns(ODP_TIME_SEC_IN_NS / 4);
+
+ return pktio;
+}
+
+static odp_packet_t create_packet(const uint8_t *data, uint32_t len)
+{
+ odp_packet_t pkt;
+
+ pkt = odp_packet_alloc(parser_pool, len);
+ if (pkt == ODP_PACKET_INVALID)
+ return ODP_PACKET_INVALID;
+
+ if (odp_packet_copy_from_mem(pkt, 0, len, data)) {
+ printf("Error: failed to copy test packet data\n");
+ odp_packet_free(pkt);
+ return ODP_PACKET_INVALID;
+ }
+
+ odp_packet_l2_offset_set(pkt, 0);
+
+ return pkt;
+}
+
+/**
+ * Receive incoming packets and compare them to the original. Function returns
+ * a valid packet handle only when the received packet matches to the original
+ * packet.
+ */
+static odp_packet_t recv_and_cmp_packet(odp_pktin_queue_t pktin,
+ odp_packet_t orig_pkt, uint64_t ns)
+{
+ odp_packet_t pkt = ODP_PACKET_INVALID;
+ odp_time_t wait_time, end;
+ uint32_t orig_len;
+ uint8_t *orig_data;
+
+ orig_len = odp_packet_len(orig_pkt);
+ orig_data = odp_packet_data(orig_pkt);
+ wait_time = odp_time_local_from_ns(ns);
+ end = odp_time_sum(odp_time_local(), wait_time);
+
+ do {
+ int ret;
+ odp_packet_t tmp_pkt;
+
+ ret = odp_pktin_recv(pktin, &tmp_pkt, 1);
+ if (ret < 0)
+ break;
+
+ if (ret == 1) {
+ uint32_t len;
+ uint8_t *data;
+
+ len = odp_packet_len(tmp_pkt);
+ data = odp_packet_data(tmp_pkt);
+
+ if (len == orig_len &&
+ memcmp(data, orig_data, len) == 0) {
+ pkt = tmp_pkt;
+ break;
+ }
+ odp_packet_free(tmp_pkt);
+ }
+ } while (odp_time_cmp(end, odp_time_local()) > 0);
+
+ return pkt;
+}
+
+/**
+ * Creates a test packet from data array and loops it through the test pktio
+ * interfaces forcing packet parsing.
+ */
+static odp_packet_t loopback_packet(pktio_info_t *pktio_a,
+ pktio_info_t *pktio_b, const uint8_t *data,
+ uint32_t len)
+{
+ odp_packet_t pkt;
+ odp_packet_t sent_pkt;
+
+ pkt = create_packet(data, len);
+ if (pkt == ODP_PACKET_INVALID) {
+ CU_FAIL("failed to generate test packet");
+ return ODP_PACKET_INVALID;
+ }
+
+ pktio_pkt_set_macs(pkt, pktio_a->hdl, pktio_b->hdl);
+
+ sent_pkt = odp_packet_copy(pkt, parser_pool);
+ if (sent_pkt == ODP_PACKET_INVALID) {
+ CU_FAIL_FATAL("failed to copy test packet");
+ odp_packet_free(pkt);
+ return ODP_PACKET_INVALID;
+ }
+
+ while (1) {
+ int ret = odp_pktout_send(pktio_a->pktout, &pkt, 1);
+
+ if (ret < 0) {
+ CU_FAIL_FATAL("failed to send test packet");
+ odp_packet_free(pkt);
+ odp_packet_free(sent_pkt);
+ return ODP_PACKET_INVALID;
+ }
+ if (ret == 1)
+ break;
+ }
+
+ /* and wait for them to arrive back */
+ pkt = recv_and_cmp_packet(pktio_b->pktin, sent_pkt, ODP_TIME_SEC_IN_NS);
+ odp_packet_free(sent_pkt);
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_input(pkt) == pktio_b->hdl);
+ CU_ASSERT(odp_packet_has_error(pkt) == 0);
+
+ return pkt;
+}
+
+void parser_test_arp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_arp,
+ sizeof(test_packet_arp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_arp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv4_icmp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_icmp,
+ sizeof(test_packet_ipv4_icmp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_icmp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv4_tcp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_tcp,
+ sizeof(test_packet_ipv4_tcp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_tcp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv4_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_udp,
+ sizeof(test_packet_ipv4_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_vlan_ipv4_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_ipv4_udp,
+ sizeof(test_packet_vlan_ipv4_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_vlan(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_vlan_qinq_ipv4_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_qinq_ipv4_udp,
+ sizeof(test_packet_vlan_qinq_ipv4_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_vlan(pkt));
+ CU_ASSERT(odp_packet_has_vlan_qinq(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv6_icmp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_icmp,
+ sizeof(test_packet_ipv6_icmp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_icmp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv6_tcp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_tcp,
+ sizeof(test_packet_ipv6_tcp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_tcp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv6_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_udp,
+ sizeof(test_packet_ipv6_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_vlan_ipv6_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_ipv6_udp,
+ sizeof(test_packet_vlan_ipv6_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_vlan(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+int parser_suite_init(void)
+{
+ int i;
+
+ if (getenv("ODP_WAIT_FOR_NETWORK"))
+ wait_for_network = true;
+
+ iface_name[0] = getenv("ODP_PKTIO_IF0");
+ iface_name[1] = getenv("ODP_PKTIO_IF1");
+ num_ifaces = 1;
+
+ if (!iface_name[0]) {
+ printf("No interfaces specified, using default \"loop\".\n");
+ iface_name[0] = "loop";
+ } else if (!iface_name[1]) {
+ printf("Using loopback interface: %s\n", iface_name[0]);
+ } else {
+ num_ifaces = 2;
+ printf("Using paired interfaces: %s %s\n",
+ iface_name[0], iface_name[1]);
+ }
+
+ if (pkt_pool_create() != 0) {
+ printf("Error: failed to create parser pool\n");
+ return -1;
+ }
+
+ /* Create pktios and associate input/output queues */
+ for (i = 0; i < num_ifaces; ++i) {
+ pktio_info_t *io;
+
+ io = &pktios[i];
+ io->name = iface_name[i];
+ io->hdl = create_pktio(i, parser_pool);
+ if (io->hdl == ODP_PKTIO_INVALID) {
+ printf("Error: failed to open iface");
+ return -1;
+ }
+
+ if (odp_pktout_queue(io->hdl, &io->pktout, 1) != 1) {
+ printf("Error: failed to start iface: %s\n", io->name);
+ return -1;
+ }
+
+ if (odp_pktin_queue(io->hdl, &io->pktin, 1) != 1) {
+ printf("Error: failed to start iface: %s\n", io->name);
+ return -1;
+ }
+
+ if (odp_pktio_start(io->hdl)) {
+ printf("Error: failed to start iface: %s\n", io->name);
+ return -1;
+ }
+
+ wait_linkup(io->hdl);
+ }
+
+ pktio_a = &pktios[0];
+ pktio_b = &pktios[1];
+ if (num_ifaces == 1)
+ pktio_b = pktio_a;
+
+ return 0;
+}
+
+int parser_suite_term(void)
+{
+ int i;
+ int ret = 0;
+
+ for (i = 0; i < num_ifaces; ++i) {
+ if (odp_pktio_stop(pktios[i].hdl)) {
+ printf("Error: failed to stop pktio: %s\n",
+ pktios[i].name);
+ ret = -1;
+ }
+ if (odp_pktio_close(pktios[i].hdl)) {
+ printf("Error: failed to close pktio: %s\n",
+ pktios[i].name);
+ ret = -1;
+ }
+ }
+
+ if (odp_pool_destroy(parser_pool) != 0) {
+ printf("Error: failed to destroy packet pool\n");
+ ret = -1;
+ }
+
+ return ret;
+}
+
+/**
+ * Certain tests can only be run with 'loop' pktio.
+ */
+static int loop_pktio(void)
+{
+ if (strcmp(iface_name[0], "loop") == 0)
+ return ODP_TEST_ACTIVE;
+ else
+ return ODP_TEST_INACTIVE;
+}
+
+odp_testinfo_t parser_suite[] = {
+ ODP_TEST_INFO(parser_test_arp),
+ ODP_TEST_INFO(parser_test_ipv4_icmp),
+ ODP_TEST_INFO(parser_test_ipv4_tcp),
+ ODP_TEST_INFO(parser_test_ipv4_udp),
+ ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_ipv4_udp, loop_pktio),
+ ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_qinq_ipv4_udp, loop_pktio),
+ ODP_TEST_INFO(parser_test_ipv6_icmp),
+ ODP_TEST_INFO(parser_test_ipv6_tcp),
+ ODP_TEST_INFO(parser_test_ipv6_udp),
+ ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_ipv6_udp, loop_pktio),
+ ODP_TEST_INFO_NULL
+};
diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/common_plat/validation/api/pktio/parser.h
new file mode 100644
index 00000000..57c62388
--- /dev/null
+++ b/test/common_plat/validation/api/pktio/parser.h
@@ -0,0 +1,180 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _ODP_TEST_PARSER_H_
+#define _ODP_TEST_PARSER_H_
+
+#include <odp_cunit_common.h>
+
+/* test functions: */
+void parser_test_arp(void);
+void parser_test_ipv4_icmp(void);
+void parser_test_ipv4_tcp(void);
+void parser_test_ipv4_udp(void);
+void parser_test_vlan_ipv4_udp(void);
+void parser_test_vlan_qinq_ipv4_udp(void);
+void parser_test_ipv6_icmp(void);
+void parser_test_ipv6_tcp(void);
+void parser_test_ipv6_udp(void);
+void parser_test_vlan_ipv6_udp(void);
+
+/* test array init/term functions: */
+int parser_suite_term(void);
+int parser_suite_init(void);
+
+/* test arrays: */
+extern odp_testinfo_t parser_suite[];
+
+/**
+ * ARP request
+ */
+static const uint8_t test_packet_arp[] = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x06, 0x00, 0x01,
+ 0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0xC0, 0xA8, 0x01, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA8,
+ 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+ 0x0E, 0x0F, 0x10, 0x11, 0xA1, 0xA8, 0x27, 0x43,
+};
+
+/**
+ * ICMPv4 echo reply
+ */
+static const uint8_t test_packet_ipv4_icmp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01,
+ 0xF3, 0x7B, 0xC0, 0xA8, 0x01, 0x01, 0xC4, 0xA8,
+ 0x01, 0x02, 0x00, 0x00, 0xB7, 0xAB, 0x00, 0x01,
+ 0x00, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+ 0x0E, 0x0F, 0x10, 0x11, 0xD9, 0x7F, 0xE8, 0x02,
+};
+
+/**
+ * IPv4 TCP
+ */
+static const uint8_t test_packet_ipv4_tcp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x06,
+ 0xF3, 0x76, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
+ 0x01, 0x01, 0x04, 0xD2, 0x10, 0xE1, 0x00, 0x00,
+ 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x50, 0x00,
+ 0x00, 0x00, 0x0C, 0xCC, 0x00, 0x00, 0x00, 0x01,
+ 0x02, 0x03, 0x04, 0x05, 0x2E, 0xDE, 0x5E, 0x48,
+};
+
+/**
+ * IPv4 UDP
+ */
+static const uint8_t test_packet_ipv4_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
+ 0xF3, 0x6B, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
+ 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A,
+ 0x2F, 0x97, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+ 0x0E, 0x0F, 0x10, 0x11, 0x64, 0xF4, 0xE4, 0xB6,
+};
+
+/**
+ * VLAN IPv4 UDP
+ * - ID: 23
+ */
+static const uint8_t test_packet_vlan_ipv4_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
+ 0x08, 0x00, 0x45, 0x00, 0x00, 0x2A, 0x00, 0x00,
+ 0x00, 0x00, 0x40, 0x11, 0xF3, 0x6F, 0xC0, 0xA8,
+ 0x01, 0x02, 0xC4, 0xA8, 0x01, 0x01, 0x00, 0x3F,
+ 0x00, 0x3F, 0x00, 0x16, 0x4D, 0xBF, 0x00, 0x01,
+ 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+ 0x0A, 0x0B, 0x0C, 0x0D, 0xCB, 0xBF, 0xD0, 0x29,
+};
+
+/**
+ * VLAN Q-in-Q IPv4 UDP
+ * - Outer: Tag Protocol ID 0x88a8, VLAN ID 1
+ * - Inner: Tag Protocol ID 0x8100, VLAN ID 2
+ */
+static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x88, 0xA8, 0x00, 0x01,
+ 0x81, 0x00, 0x00, 0x02, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
+ 0xF3, 0x73, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
+ 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x12,
+ 0x63, 0xDF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x80, 0x98, 0xB8, 0x18,
+};
+
+/**
+ * ICMPv6 echo request
+ */
+static const uint8_t test_packet_ipv6_icmp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
+ 0x00, 0x00, 0x00, 0x08, 0x3A, 0xFF, 0xFE, 0x80,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+ 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
+ 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
+ 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x80, 0x00,
+ 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02, 0xE0, 0x68,
+ 0x0E, 0xBA,
+};
+
+/**
+ * IPv6 TCP
+ */
+static const uint8_t test_packet_ipv6_tcp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
+ 0x00, 0x00, 0x00, 0x14, 0x06, 0xFF, 0xFE, 0x80,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+ 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
+ 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
+ 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x04, 0xD2,
+ 0x10, 0xE1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+ 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x36, 0x37,
+ 0x00, 0x00, 0x28, 0x67, 0xD2, 0xAF,
+};
+
+/**
+ * IPv6 UDP
+ */
+static const uint8_t test_packet_ipv6_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
+ 0x00, 0x00, 0x00, 0x08, 0x11, 0xFF, 0xFE, 0x80,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+ 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
+ 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
+ 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x00, 0x3F,
+ 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68, 0x35, 0xD3,
+ 0x64, 0x49,
+};
+
+/**
+ * VLAN IPv6
+ * - ID: 23
+ */
+static const uint8_t test_packet_vlan_ipv6_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
+ 0x86, 0xDD, 0x60, 0x30, 0x00, 0x00, 0x00, 0x08,
+ 0x11, 0xFF, 0xFE, 0x80, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x02, 0x00, 0x09, 0xFF, 0xFE, 0x00,
+ 0x04, 0x00, 0x35, 0x55, 0x55, 0x55, 0x66, 0x66,
+ 0x66, 0x66, 0x77, 0x77, 0x77, 0x77, 0x88, 0x88,
+ 0x88, 0x88, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x08,
+ 0x9B, 0x68, 0xC5, 0xD8, 0x2F, 0x5C,
+};
+
+#endif
diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c
index 0e2a9f39..c476a712 100644
--- a/test/common_plat/validation/api/pktio/pktio.c
+++ b/test/common_plat/validation/api/pktio/pktio.c
@@ -10,6 +10,7 @@
#include <stdlib.h>
#include "pktio.h"
+#include "parser.h"
#define PKT_BUF_NUM 32
#define PKT_BUF_SIZE (9 * 1024)
@@ -143,8 +144,7 @@ static void set_pool_len(odp_pool_param_t *params, odp_pool_capability_t *capa)
}
}
-static void pktio_pkt_set_macs(odp_packet_t pkt,
- odp_pktio_t src, odp_pktio_t dst)
+void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst)
{
uint32_t len;
odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len);
@@ -2192,6 +2192,7 @@ odp_suiteinfo_t pktio_suites[] = {
pktio_suite_term, pktio_suite_unsegmented},
{"Packet I/O Segmented", pktio_suite_init_segmented,
pktio_suite_term, pktio_suite_segmented},
+ {"Packet parser", parser_suite_init, parser_suite_term, parser_suite},
ODP_SUITE_INFO_NULL
};
diff --git a/test/common_plat/validation/api/pktio/pktio.h b/test/common_plat/validation/api/pktio/pktio.h
index 8131d05f..b8799d9e 100644
--- a/test/common_plat/validation/api/pktio/pktio.h
+++ b/test/common_plat/validation/api/pktio/pktio.h
@@ -61,4 +61,7 @@ extern odp_suiteinfo_t pktio_suites[];
/* main test program: */
int pktio_main(int argc, char *argv[]);
+/* functions shared by parser test suite */
+void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst);
+
#endif
commit 464fdc4efb4148dd8d1ec1aeaa2a7ffcb58d7faf
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue Apr 11 16:31:14 2017 +0300
Revert "validation: pktio: add tests for packet parsing"
This reverts commit
5a770508ecf (validation: pktio: add tests for packet parsing)
This commit breaks tap pktio test on Travis CI and some over
envs. That needs to be fixed before restoring it back.
Suite: Packet parser
Test: parser_test_arp ...passed
Test: parser_test_ipv4_icmp ...received
pkt 0x7fec7ea00000, len == 60, orig_len = 64
FAILED
1. parser.c:251 - pkt != ODP_PACKET_INVALID
Test: parser_test_ipv4_tcp ...received
pkt 0x7fec7ea425c0, len == 60, orig_len = 64
FAILED
1. parser.c:251 - pkt != ODP_PACKET_INVALID
Test: parser_test_ipv4_udp ...received
pkt 0x7fec7ea00000, len == 60, orig_len = 64
FAILED
1. parser.c:251 - pkt != ODP_PACKET_INVALID
Test: parser_test_ipv6_icmp ...received
pkt 0x7fec7ea425c0, len == 62, orig_len = 66
FAILED
1. parser.c:251 - pkt != ODP_PACKET_INVALID
Test: parser_test_ipv6_tcp ...received
pkt 0x7fec7ea00000, len == 74, orig_len = 78
FAILED
1. parser.c:251 - pkt != ODP_PACKET_INVALID
Test: parser_test_ipv6_udp ...received
pkt 0x7fec7ea425c0, len == 62, orig_len = 66
FAILED
1. parser.c:251 - pkt != ODP_PACKET_INVALID
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am
index c6368fba..466d690d 100644
--- a/test/common_plat/validation/api/pktio/Makefile.am
+++ b/test/common_plat/validation/api/pktio/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libtestpktio.la
libtestpktio_la_SOURCES = pktio.c
test_PROGRAMS = pktio_main$(EXEEXT)
-dist_pktio_main_SOURCES = pktio_main.c parser.c
+dist_pktio_main_SOURCES = pktio_main.c
pktio_main_LDADD = libtestpktio.la $(LIBCUNIT_COMMON) $(LIBODP)
-EXTRA_DIST = pktio.h parser.h
+EXTRA_DIST = pktio.h
diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/common_plat/validation/api/pktio/parser.c
deleted file mode 100644
index ad7101d0..00000000
--- a/test/common_plat/validation/api/pktio/parser.c
+++ /dev/null
@@ -1,545 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#include <odp_api.h>
-#include <odp_cunit_common.h>
-
-#include <odp/helper/odph_api.h>
-
-#include <stdlib.h>
-#include "parser.h"
-#include "pktio.h"
-
-#define MAX_NUM_IFACES 2
-#define PKT_POOL_NUM 256
-#define PKT_POOL_BUF_LEN (2 * 1024)
-
-/**
- * local container for pktio attributes
- */
-typedef struct {
- const char *name;
- odp_pktio_t hdl;
- odp_pktout_queue_t pktout;
- odp_pktin_queue_t pktin;
-} pktio_info_t;
-
-/** Interface names used for testing */
-static const char *iface_name[MAX_NUM_IFACES];
-
-/** Test interfaces */
-pktio_info_t pktios[MAX_NUM_IFACES];
-pktio_info_t *pktio_a;
-pktio_info_t *pktio_b;
-
-/** Number of interfaces being used (1=loopback, 2=pair) */
-static int num_ifaces;
-
-/** While testing real-world interfaces additional time may be needed for
- * external network to enable link to pktio interface that just become up.
- */
-static bool wait_for_network;
-
-/** Parser packet pool */
-odp_pool_t parser_pool = ODP_POOL_INVALID;
-
-static inline void wait_linkup(odp_pktio_t pktio)
-{
- /* wait 1 second for link up */
- uint64_t wait_ns = (10 * ODP_TIME_MSEC_IN_NS);
- int wait_num = 100;
- int i;
- int ret = -1;
-
- for (i = 0; i < wait_num; i++) {
- ret = odp_pktio_link_status(pktio);
- if (ret < 0 || ret == 1)
- break;
- /* link is down, call status again after delay */
- odp_time_wait_ns(wait_ns);
- }
-}
-
-static int pkt_pool_create(void)
-{
- odp_pool_capability_t capa;
- odp_pool_param_t params;
-
- if (odp_pool_capability(&capa) != 0) {
- printf("Error: unable to query pool capability.\n");
- return -1;
- }
-
- if (capa.pkt.max_num && capa.pkt.max_num < PKT_POOL_NUM) {
- printf("Error: packet pool size not supported.\n");
- printf("MAX: %" PRIu32 "\n", capa.pkt.max_num);
- return -1;
- } else if (capa.pkt.max_len && capa.pkt.max_len < PKT_POOL_BUF_LEN) {
- printf("Error: packet length not supported.\n");
- return -1;
- } else if (capa.pkt.max_seg_len &&
- capa.pkt.max_seg_len < PKT_POOL_BUF_LEN) {
- printf("Error: segment length not supported.\n");
- return -1;
- }
-
- odp_pool_param_init(¶ms);
- params.pkt.seg_len = PKT_POOL_BUF_LEN;
- params.pkt.len = PKT_POOL_BUF_LEN;
- params.pkt.num = PKT_POOL_NUM;
- params.type = ODP_POOL_PACKET;
-
- parser_pool = odp_pool_create("pkt_pool_default", ¶ms);
- if (parser_pool == ODP_POOL_INVALID) {
- printf("Error: packet pool create failed.\n");
- return -1;
- }
-
- return 0;
-}
-
-static odp_pktio_t create_pktio(int iface_idx, odp_pool_t pool)
-{
- odp_pktio_t pktio;
- odp_pktio_config_t config;
- odp_pktio_param_t pktio_param;
- const char *iface = iface_name[iface_idx];
-
- odp_pktio_param_init(&pktio_param);
- pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT;
- pktio_param.out_mode = ODP_PKTOUT_MODE_DIRECT;
-
- pktio = odp_pktio_open(iface, pool, &pktio_param);
- if (pktio == ODP_PKTIO_INVALID) {
- printf("Error: failed to open %s\n", iface);
- return ODP_PKTIO_INVALID;
- }
-
- odp_pktio_config_init(&config);
- config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL;
- if (odp_pktio_config(pktio, &config)) {
- printf("Error: failed to configure %s\n", iface);
- return ODP_PKTIO_INVALID;
- }
-
- /* By default, single input and output queue is used */
- if (odp_pktin_queue_config(pktio, NULL)) {
- printf("Error: failed to config input queue for %s\n", iface);
- return ODP_PKTIO_INVALID;
- }
- if (odp_pktout_queue_config(pktio, NULL)) {
- printf("Error: failed to config output queue for %s\n", iface);
- return ODP_PKTIO_INVALID;
- }
-
- if (wait_for_network)
- odp_time_wait_ns(ODP_TIME_SEC_IN_NS / 4);
-
- return pktio;
-}
-
-static odp_packet_t create_packet(const uint8_t *data, uint32_t len)
-{
- odp_packet_t pkt;
-
- pkt = odp_packet_alloc(parser_pool, len);
- if (pkt == ODP_PACKET_INVALID)
- return ODP_PACKET_INVALID;
-
- if (odp_packet_copy_from_mem(pkt, 0, len, data)) {
- printf("Error: failed to copy test packet data\n");
- odp_packet_free(pkt);
- return ODP_PACKET_INVALID;
- }
-
- odp_packet_l2_offset_set(pkt, 0);
-
- return pkt;
-}
-
-/**
- * Receive incoming packets and compare them to the original. Function returns
- * a valid packet handle only when the received packet matches to the original
- * packet.
- */
-static odp_packet_t recv_and_cmp_packet(odp_pktin_queue_t pktin,
- odp_packet_t orig_pkt, uint64_t ns)
-{
- odp_packet_t pkt = ODP_PACKET_INVALID;
- odp_time_t wait_time, end;
- uint32_t orig_len;
- uint8_t *orig_data;
-
- orig_len = odp_packet_len(orig_pkt);
- orig_data = odp_packet_data(orig_pkt);
- wait_time = odp_time_local_from_ns(ns);
- end = odp_time_sum(odp_time_local(), wait_time);
-
- do {
- int ret;
- odp_packet_t tmp_pkt;
-
- ret = odp_pktin_recv(pktin, &tmp_pkt, 1);
- if (ret < 0)
- break;
-
- if (ret == 1) {
- uint32_t len;
- uint8_t *data;
-
- len = odp_packet_len(tmp_pkt);
- data = odp_packet_data(tmp_pkt);
-
- if (len == orig_len &&
- memcmp(data, orig_data, len) == 0) {
- pkt = tmp_pkt;
- break;
- }
- odp_packet_free(tmp_pkt);
- }
- } while (odp_time_cmp(end, odp_time_local()) > 0);
-
- return pkt;
-}
-
-/**
- * Creates a test packet from data array and loops it through the test pktio
- * interfaces forcing packet parsing.
- */
-static odp_packet_t loopback_packet(pktio_info_t *pktio_a,
- pktio_info_t *pktio_b, const uint8_t *data,
- uint32_t len)
-{
- odp_packet_t pkt;
- odp_packet_t sent_pkt;
-
- pkt = create_packet(data, len);
- if (pkt == ODP_PACKET_INVALID) {
- CU_FAIL("failed to generate test packet");
- return ODP_PACKET_INVALID;
- }
-
- pktio_pkt_set_macs(pkt, pktio_a->hdl, pktio_b->hdl);
-
- sent_pkt = odp_packet_copy(pkt, parser_pool);
- if (sent_pkt == ODP_PACKET_INVALID) {
- CU_FAIL_FATAL("failed to copy test packet");
- odp_packet_free(pkt);
- return ODP_PACKET_INVALID;
- }
-
- while (1) {
- int ret = odp_pktout_send(pktio_a->pktout, &pkt, 1);
-
- if (ret < 0) {
- CU_FAIL_FATAL("failed to send test packet");
- odp_packet_free(pkt);
- odp_packet_free(sent_pkt);
- return ODP_PACKET_INVALID;
- }
- if (ret == 1)
- break;
- }
-
- /* and wait for them to arrive back */
- pkt = recv_and_cmp_packet(pktio_b->pktin, sent_pkt, ODP_TIME_SEC_IN_NS);
- odp_packet_free(sent_pkt);
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_input(pkt) == pktio_b->hdl);
- CU_ASSERT(odp_packet_has_error(pkt) == 0);
-
- return pkt;
-}
-
-void parser_test_arp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_arp,
- sizeof(test_packet_arp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_arp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv4(pkt));
- CU_ASSERT(!odp_packet_has_ipv6(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_ipv4_icmp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_icmp,
- sizeof(test_packet_ipv4_icmp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_ipv4(pkt));
- CU_ASSERT(odp_packet_has_icmp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv6(pkt));
- CU_ASSERT(!odp_packet_has_tcp(pkt));
- CU_ASSERT(!odp_packet_has_udp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_ipv4_tcp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_tcp,
- sizeof(test_packet_ipv4_tcp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_ipv4(pkt));
- CU_ASSERT(odp_packet_has_tcp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv6(pkt));
- CU_ASSERT(!odp_packet_has_udp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_ipv4_udp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_udp,
- sizeof(test_packet_ipv4_udp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_ipv4(pkt));
- CU_ASSERT(odp_packet_has_udp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv6(pkt));
- CU_ASSERT(!odp_packet_has_tcp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_vlan_ipv4_udp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_ipv4_udp,
- sizeof(test_packet_vlan_ipv4_udp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_vlan(pkt));
- CU_ASSERT(odp_packet_has_ipv4(pkt));
- CU_ASSERT(odp_packet_has_udp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv6(pkt));
- CU_ASSERT(!odp_packet_has_tcp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_vlan_qinq_ipv4_udp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_qinq_ipv4_udp,
- sizeof(test_packet_vlan_qinq_ipv4_udp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_vlan(pkt));
- CU_ASSERT(odp_packet_has_vlan_qinq(pkt));
- CU_ASSERT(odp_packet_has_ipv4(pkt));
- CU_ASSERT(odp_packet_has_udp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv6(pkt));
- CU_ASSERT(!odp_packet_has_tcp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_ipv6_icmp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_icmp,
- sizeof(test_packet_ipv6_icmp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_ipv6(pkt));
- CU_ASSERT(odp_packet_has_icmp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv4(pkt));
- CU_ASSERT(!odp_packet_has_tcp(pkt));
- CU_ASSERT(!odp_packet_has_udp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_ipv6_tcp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_tcp,
- sizeof(test_packet_ipv6_tcp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_ipv6(pkt));
- CU_ASSERT(odp_packet_has_tcp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv4(pkt));
- CU_ASSERT(!odp_packet_has_udp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_ipv6_udp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_udp,
- sizeof(test_packet_ipv6_udp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_ipv6(pkt));
- CU_ASSERT(odp_packet_has_udp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv4(pkt));
- CU_ASSERT(!odp_packet_has_tcp(pkt));
-
- odp_packet_free(pkt);
-}
-
-void parser_test_vlan_ipv6_udp(void)
-{
- odp_packet_t pkt;
-
- pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_ipv6_udp,
- sizeof(test_packet_vlan_ipv6_udp));
- CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_has_eth(pkt));
- CU_ASSERT(odp_packet_has_vlan(pkt));
- CU_ASSERT(odp_packet_has_ipv6(pkt));
- CU_ASSERT(odp_packet_has_udp(pkt));
-
- CU_ASSERT(!odp_packet_has_ipv4(pkt));
- CU_ASSERT(!odp_packet_has_tcp(pkt));
-
- odp_packet_free(pkt);
-}
-
-int parser_suite_init(void)
-{
- int i;
-
- if (getenv("ODP_WAIT_FOR_NETWORK"))
- wait_for_network = true;
-
- iface_name[0] = getenv("ODP_PKTIO_IF0");
- iface_name[1] = getenv("ODP_PKTIO_IF1");
- num_ifaces = 1;
-
- if (!iface_name[0]) {
- printf("No interfaces specified, using default \"loop\".\n");
- iface_name[0] = "loop";
- } else if (!iface_name[1]) {
- printf("Using loopback interface: %s\n", iface_name[0]);
- } else {
- num_ifaces = 2;
- printf("Using paired interfaces: %s %s\n",
- iface_name[0], iface_name[1]);
- }
-
- if (pkt_pool_create() != 0) {
- printf("Error: failed to create parser pool\n");
- return -1;
- }
-
- /* Create pktios and associate input/output queues */
- for (i = 0; i < num_ifaces; ++i) {
- pktio_info_t *io;
-
- io = &pktios[i];
- io->name = iface_name[i];
- io->hdl = create_pktio(i, parser_pool);
- if (io->hdl == ODP_PKTIO_INVALID) {
- printf("Error: failed to open iface");
- return -1;
- }
-
- if (odp_pktout_queue(io->hdl, &io->pktout, 1) != 1) {
- printf("Error: failed to start iface: %s\n", io->name);
- return -1;
- }
-
- if (odp_pktin_queue(io->hdl, &io->pktin, 1) != 1) {
- printf("Error: failed to start iface: %s\n", io->name);
- return -1;
- }
-
- if (odp_pktio_start(io->hdl)) {
- printf("Error: failed to start iface: %s\n", io->name);
- return -1;
- }
-
- wait_linkup(io->hdl);
- }
-
- pktio_a = &pktios[0];
- pktio_b = &pktios[1];
- if (num_ifaces == 1)
- pktio_b = pktio_a;
-
- return 0;
-}
-
-int parser_suite_term(void)
-{
- int i;
- int ret = 0;
-
- for (i = 0; i < num_ifaces; ++i) {
- if (odp_pktio_stop(pktios[i].hdl)) {
- printf("Error: failed to stop pktio: %s\n",
- pktios[i].name);
- ret = -1;
- }
- if (odp_pktio_close(pktios[i].hdl)) {
- printf("Error: failed to close pktio: %s\n",
- pktios[i].name);
- ret = -1;
- }
- }
-
- if (odp_pool_destroy(parser_pool) != 0) {
- printf("Error: failed to destroy packet pool\n");
- ret = -1;
- }
-
- return ret;
-}
-
-/**
- * Certain tests can only be run with 'loop' pktio.
- */
-static int loop_pktio(void)
-{
- if (strcmp(iface_name[0], "loop") == 0)
- return ODP_TEST_ACTIVE;
- else
- return ODP_TEST_INACTIVE;
-}
-
-odp_testinfo_t parser_suite[] = {
- ODP_TEST_INFO(parser_test_arp),
- ODP_TEST_INFO(parser_test_ipv4_icmp),
- ODP_TEST_INFO(parser_test_ipv4_tcp),
- ODP_TEST_INFO(parser_test_ipv4_udp),
- ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_ipv4_udp, loop_pktio),
- ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_qinq_ipv4_udp, loop_pktio),
- ODP_TEST_INFO(parser_test_ipv6_icmp),
- ODP_TEST_INFO(parser_test_ipv6_tcp),
- ODP_TEST_INFO(parser_test_ipv6_udp),
- ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_ipv6_udp, loop_pktio),
- ODP_TEST_INFO_NULL
-};
diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/common_plat/validation/api/pktio/parser.h
deleted file mode 100644
index 57c62388..00000000
--- a/test/common_plat/validation/api/pktio/parser.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef _ODP_TEST_PARSER_H_
-#define _ODP_TEST_PARSER_H_
-
-#include <odp_cunit_common.h>
-
-/* test functions: */
-void parser_test_arp(void);
-void parser_test_ipv4_icmp(void);
-void parser_test_ipv4_tcp(void);
-void parser_test_ipv4_udp(void);
-void parser_test_vlan_ipv4_udp(void);
-void parser_test_vlan_qinq_ipv4_udp(void);
-void parser_test_ipv6_icmp(void);
-void parser_test_ipv6_tcp(void);
-void parser_test_ipv6_udp(void);
-void parser_test_vlan_ipv6_udp(void);
-
-/* test array init/term functions: */
-int parser_suite_term(void);
-int parser_suite_init(void);
-
-/* test arrays: */
-extern odp_testinfo_t parser_suite[];
-
-/**
- * ARP request
- */
-static const uint8_t test_packet_arp[] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x06, 0x00, 0x01,
- 0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0xC0, 0xA8, 0x01, 0x01,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA8,
- 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11, 0xA1, 0xA8, 0x27, 0x43,
-};
-
-/**
- * ICMPv4 echo reply
- */
-static const uint8_t test_packet_ipv4_icmp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01,
- 0xF3, 0x7B, 0xC0, 0xA8, 0x01, 0x01, 0xC4, 0xA8,
- 0x01, 0x02, 0x00, 0x00, 0xB7, 0xAB, 0x00, 0x01,
- 0x00, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11, 0xD9, 0x7F, 0xE8, 0x02,
-};
-
-/**
- * IPv4 TCP
- */
-static const uint8_t test_packet_ipv4_tcp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x06,
- 0xF3, 0x76, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
- 0x01, 0x01, 0x04, 0xD2, 0x10, 0xE1, 0x00, 0x00,
- 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x50, 0x00,
- 0x00, 0x00, 0x0C, 0xCC, 0x00, 0x00, 0x00, 0x01,
- 0x02, 0x03, 0x04, 0x05, 0x2E, 0xDE, 0x5E, 0x48,
-};
-
-/**
- * IPv4 UDP
- */
-static const uint8_t test_packet_ipv4_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
- 0xF3, 0x6B, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
- 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A,
- 0x2F, 0x97, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11, 0x64, 0xF4, 0xE4, 0xB6,
-};
-
-/**
- * VLAN IPv4 UDP
- * - ID: 23
- */
-static const uint8_t test_packet_vlan_ipv4_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
- 0x08, 0x00, 0x45, 0x00, 0x00, 0x2A, 0x00, 0x00,
- 0x00, 0x00, 0x40, 0x11, 0xF3, 0x6F, 0xC0, 0xA8,
- 0x01, 0x02, 0xC4, 0xA8, 0x01, 0x01, 0x00, 0x3F,
- 0x00, 0x3F, 0x00, 0x16, 0x4D, 0xBF, 0x00, 0x01,
- 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
- 0x0A, 0x0B, 0x0C, 0x0D, 0xCB, 0xBF, 0xD0, 0x29,
-};
-
-/**
- * VLAN Q-in-Q IPv4 UDP
- * - Outer: Tag Protocol ID 0x88a8, VLAN ID 1
- * - Inner: Tag Protocol ID 0x8100, VLAN ID 2
- */
-static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x88, 0xA8, 0x00, 0x01,
- 0x81, 0x00, 0x00, 0x02, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
- 0xF3, 0x73, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
- 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x12,
- 0x63, 0xDF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x80, 0x98, 0xB8, 0x18,
-};
-
-/**
- * ICMPv6 echo request
- */
-static const uint8_t test_packet_ipv6_icmp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
- 0x00, 0x00, 0x00, 0x08, 0x3A, 0xFF, 0xFE, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
- 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
- 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
- 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x80, 0x00,
- 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02, 0xE0, 0x68,
- 0x0E, 0xBA,
-};
-
-/**
- * IPv6 TCP
- */
-static const uint8_t test_packet_ipv6_tcp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
- 0x00, 0x00, 0x00, 0x14, 0x06, 0xFF, 0xFE, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
- 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
- 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
- 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x04, 0xD2,
- 0x10, 0xE1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
- 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x36, 0x37,
- 0x00, 0x00, 0x28, 0x67, 0xD2, 0xAF,
-};
-
-/**
- * IPv6 UDP
- */
-static const uint8_t test_packet_ipv6_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
- 0x00, 0x00, 0x00, 0x08, 0x11, 0xFF, 0xFE, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
- 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
- 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
- 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x00, 0x3F,
- 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68, 0x35, 0xD3,
- 0x64, 0x49,
-};
-
-/**
- * VLAN IPv6
- * - ID: 23
- */
-static const uint8_t test_packet_vlan_ipv6_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
- 0x86, 0xDD, 0x60, 0x30, 0x00, 0x00, 0x00, 0x08,
- 0x11, 0xFF, 0xFE, 0x80, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x02, 0x00, 0x09, 0xFF, 0xFE, 0x00,
- 0x04, 0x00, 0x35, 0x55, 0x55, 0x55, 0x66, 0x66,
- 0x66, 0x66, 0x77, 0x77, 0x77, 0x77, 0x88, 0x88,
- 0x88, 0x88, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x08,
- 0x9B, 0x68, 0xC5, 0xD8, 0x2F, 0x5C,
-};
-
-#endif
diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c
index c476a712..0e2a9f39 100644
--- a/test/common_plat/validation/api/pktio/pktio.c
+++ b/test/common_plat/validation/api/pktio/pktio.c
@@ -10,7 +10,6 @@
#include <stdlib.h>
#include "pktio.h"
-#include "parser.h"
#define PKT_BUF_NUM 32
#define PKT_BUF_SIZE (9 * 1024)
@@ -144,7 +143,8 @@ static void set_pool_len(odp_pool_param_t *params, odp_pool_capability_t *capa)
}
}
-void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst)
+static void pktio_pkt_set_macs(odp_packet_t pkt,
+ odp_pktio_t src, odp_pktio_t dst)
{
uint32_t len;
odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len);
@@ -2192,7 +2192,6 @@ odp_suiteinfo_t pktio_suites[] = {
pktio_suite_term, pktio_suite_unsegmented},
{"Packet I/O Segmented", pktio_suite_init_segmented,
pktio_suite_term, pktio_suite_segmented},
- {"Packet parser", parser_suite_init, parser_suite_term, parser_suite},
ODP_SUITE_INFO_NULL
};
diff --git a/test/common_plat/validation/api/pktio/pktio.h b/test/common_plat/validation/api/pktio/pktio.h
index b8799d9e..8131d05f 100644
--- a/test/common_plat/validation/api/pktio/pktio.h
+++ b/test/common_plat/validation/api/pktio/pktio.h
@@ -61,7 +61,4 @@ extern odp_suiteinfo_t pktio_suites[];
/* main test program: */
int pktio_main(int argc, char *argv[]);
-/* functions shared by parser test suite */
-void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst);
-
#endif
commit 7394a5c8dead5edcfa5bda571aceba5945c91d16
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Apr 4 09:28:21 2017 +0300
validation: pktio: add tests for packet parsing
Test packet parsing using predefined test packets (byte arrays). Test
packets are looped through tested pktio interfaces to force packet parsing.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am
index 466d690d..c6368fba 100644
--- a/test/common_plat/validation/api/pktio/Makefile.am
+++ b/test/common_plat/validation/api/pktio/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libtestpktio.la
libtestpktio_la_SOURCES = pktio.c
test_PROGRAMS = pktio_main$(EXEEXT)
-dist_pktio_main_SOURCES = pktio_main.c
+dist_pktio_main_SOURCES = pktio_main.c parser.c
pktio_main_LDADD = libtestpktio.la $(LIBCUNIT_COMMON) $(LIBODP)
-EXTRA_DIST = pktio.h
+EXTRA_DIST = pktio.h parser.h
diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/common_plat/validation/api/pktio/parser.c
new file mode 100644
index 00000000..ad7101d0
--- /dev/null
+++ b/test/common_plat/validation/api/pktio/parser.c
@@ -0,0 +1,545 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include <odp_api.h>
+#include <odp_cunit_common.h>
+
+#include <odp/helper/odph_api.h>
+
+#include <stdlib.h>
+#include "parser.h"
+#include "pktio.h"
+
+#define MAX_NUM_IFACES 2
+#define PKT_POOL_NUM 256
+#define PKT_POOL_BUF_LEN (2 * 1024)
+
+/**
+ * local container for pktio attributes
+ */
+typedef struct {
+ const char *name;
+ odp_pktio_t hdl;
+ odp_pktout_queue_t pktout;
+ odp_pktin_queue_t pktin;
+} pktio_info_t;
+
+/** Interface names used for testing */
+static const char *iface_name[MAX_NUM_IFACES];
+
+/** Test interfaces */
+pktio_info_t pktios[MAX_NUM_IFACES];
+pktio_info_t *pktio_a;
+pktio_info_t *pktio_b;
+
+/** Number of interfaces being used (1=loopback, 2=pair) */
+static int num_ifaces;
+
+/** While testing real-world interfaces additional time may be needed for
+ * external network to enable link to pktio interface that just become up.
+ */
+static bool wait_for_network;
+
+/** Parser packet pool */
+odp_pool_t parser_pool = ODP_POOL_INVALID;
+
+static inline void wait_linkup(odp_pktio_t pktio)
+{
+ /* wait 1 second for link up */
+ uint64_t wait_ns = (10 * ODP_TIME_MSEC_IN_NS);
+ int wait_num = 100;
+ int i;
+ int ret = -1;
+
+ for (i = 0; i < wait_num; i++) {
+ ret = odp_pktio_link_status(pktio);
+ if (ret < 0 || ret == 1)
+ break;
+ /* link is down, call status again after delay */
+ odp_time_wait_ns(wait_ns);
+ }
+}
+
+static int pkt_pool_create(void)
+{
+ odp_pool_capability_t capa;
+ odp_pool_param_t params;
+
+ if (odp_pool_capability(&capa) != 0) {
+ printf("Error: unable to query pool capability.\n");
+ return -1;
+ }
+
+ if (capa.pkt.max_num && capa.pkt.max_num < PKT_POOL_NUM) {
+ printf("Error: packet pool size not supported.\n");
+ printf("MAX: %" PRIu32 "\n", capa.pkt.max_num);
+ return -1;
+ } else if (capa.pkt.max_len && capa.pkt.max_len < PKT_POOL_BUF_LEN) {
+ printf("Error: packet length not supported.\n");
+ return -1;
+ } else if (capa.pkt.max_seg_len &&
+ capa.pkt.max_seg_len < PKT_POOL_BUF_LEN) {
+ printf("Error: segment length not supported.\n");
+ return -1;
+ }
+
+ odp_pool_param_init(¶ms);
+ params.pkt.seg_len = PKT_POOL_BUF_LEN;
+ params.pkt.len = PKT_POOL_BUF_LEN;
+ params.pkt.num = PKT_POOL_NUM;
+ params.type = ODP_POOL_PACKET;
+
+ parser_pool = odp_pool_create("pkt_pool_default", ¶ms);
+ if (parser_pool == ODP_POOL_INVALID) {
+ printf("Error: packet pool create failed.\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+static odp_pktio_t create_pktio(int iface_idx, odp_pool_t pool)
+{
+ odp_pktio_t pktio;
+ odp_pktio_config_t config;
+ odp_pktio_param_t pktio_param;
+ const char *iface = iface_name[iface_idx];
+
+ odp_pktio_param_init(&pktio_param);
+ pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT;
+ pktio_param.out_mode = ODP_PKTOUT_MODE_DIRECT;
+
+ pktio = odp_pktio_open(iface, pool, &pktio_param);
+ if (pktio == ODP_PKTIO_INVALID) {
+ printf("Error: failed to open %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+
+ odp_pktio_config_init(&config);
+ config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL;
+ if (odp_pktio_config(pktio, &config)) {
+ printf("Error: failed to configure %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+
+ /* By default, single input and output queue is used */
+ if (odp_pktin_queue_config(pktio, NULL)) {
+ printf("Error: failed to config input queue for %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+ if (odp_pktout_queue_config(pktio, NULL)) {
+ printf("Error: failed to config output queue for %s\n", iface);
+ return ODP_PKTIO_INVALID;
+ }
+
+ if (wait_for_network)
+ odp_time_wait_ns(ODP_TIME_SEC_IN_NS / 4);
+
+ return pktio;
+}
+
+static odp_packet_t create_packet(const uint8_t *data, uint32_t len)
+{
+ odp_packet_t pkt;
+
+ pkt = odp_packet_alloc(parser_pool, len);
+ if (pkt == ODP_PACKET_INVALID)
+ return ODP_PACKET_INVALID;
+
+ if (odp_packet_copy_from_mem(pkt, 0, len, data)) {
+ printf("Error: failed to copy test packet data\n");
+ odp_packet_free(pkt);
+ return ODP_PACKET_INVALID;
+ }
+
+ odp_packet_l2_offset_set(pkt, 0);
+
+ return pkt;
+}
+
+/**
+ * Receive incoming packets and compare them to the original. Function returns
+ * a valid packet handle only when the received packet matches to the original
+ * packet.
+ */
+static odp_packet_t recv_and_cmp_packet(odp_pktin_queue_t pktin,
+ odp_packet_t orig_pkt, uint64_t ns)
+{
+ odp_packet_t pkt = ODP_PACKET_INVALID;
+ odp_time_t wait_time, end;
+ uint32_t orig_len;
+ uint8_t *orig_data;
+
+ orig_len = odp_packet_len(orig_pkt);
+ orig_data = odp_packet_data(orig_pkt);
+ wait_time = odp_time_local_from_ns(ns);
+ end = odp_time_sum(odp_time_local(), wait_time);
+
+ do {
+ int ret;
+ odp_packet_t tmp_pkt;
+
+ ret = odp_pktin_recv(pktin, &tmp_pkt, 1);
+ if (ret < 0)
+ break;
+
+ if (ret == 1) {
+ uint32_t len;
+ uint8_t *data;
+
+ len = odp_packet_len(tmp_pkt);
+ data = odp_packet_data(tmp_pkt);
+
+ if (len == orig_len &&
+ memcmp(data, orig_data, len) == 0) {
+ pkt = tmp_pkt;
+ break;
+ }
+ odp_packet_free(tmp_pkt);
+ }
+ } while (odp_time_cmp(end, odp_time_local()) > 0);
+
+ return pkt;
+}
+
+/**
+ * Creates a test packet from data array and loops it through the test pktio
+ * interfaces forcing packet parsing.
+ */
+static odp_packet_t loopback_packet(pktio_info_t *pktio_a,
+ pktio_info_t *pktio_b, const uint8_t *data,
+ uint32_t len)
+{
+ odp_packet_t pkt;
+ odp_packet_t sent_pkt;
+
+ pkt = create_packet(data, len);
+ if (pkt == ODP_PACKET_INVALID) {
+ CU_FAIL("failed to generate test packet");
+ return ODP_PACKET_INVALID;
+ }
+
+ pktio_pkt_set_macs(pkt, pktio_a->hdl, pktio_b->hdl);
+
+ sent_pkt = odp_packet_copy(pkt, parser_pool);
+ if (sent_pkt == ODP_PACKET_INVALID) {
+ CU_FAIL_FATAL("failed to copy test packet");
+ odp_packet_free(pkt);
+ return ODP_PACKET_INVALID;
+ }
+
+ while (1) {
+ int ret = odp_pktout_send(pktio_a->pktout, &pkt, 1);
+
+ if (ret < 0) {
+ CU_FAIL_FATAL("failed to send test packet");
+ odp_packet_free(pkt);
+ odp_packet_free(sent_pkt);
+ return ODP_PACKET_INVALID;
+ }
+ if (ret == 1)
+ break;
+ }
+
+ /* and wait for them to arrive back */
+ pkt = recv_and_cmp_packet(pktio_b->pktin, sent_pkt, ODP_TIME_SEC_IN_NS);
+ odp_packet_free(sent_pkt);
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_input(pkt) == pktio_b->hdl);
+ CU_ASSERT(odp_packet_has_error(pkt) == 0);
+
+ return pkt;
+}
+
+void parser_test_arp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_arp,
+ sizeof(test_packet_arp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_arp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv4_icmp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_icmp,
+ sizeof(test_packet_ipv4_icmp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_icmp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv4_tcp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_tcp,
+ sizeof(test_packet_ipv4_tcp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_tcp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv4_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv4_udp,
+ sizeof(test_packet_ipv4_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_vlan_ipv4_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_ipv4_udp,
+ sizeof(test_packet_vlan_ipv4_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_vlan(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_vlan_qinq_ipv4_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_qinq_ipv4_udp,
+ sizeof(test_packet_vlan_qinq_ipv4_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_vlan(pkt));
+ CU_ASSERT(odp_packet_has_vlan_qinq(pkt));
+ CU_ASSERT(odp_packet_has_ipv4(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv6(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv6_icmp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_icmp,
+ sizeof(test_packet_ipv6_icmp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_icmp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv6_tcp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_tcp,
+ sizeof(test_packet_ipv6_tcp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_tcp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_udp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_ipv6_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_ipv6_udp,
+ sizeof(test_packet_ipv6_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+void parser_test_vlan_ipv6_udp(void)
+{
+ odp_packet_t pkt;
+
+ pkt = loopback_packet(pktio_a, pktio_b, test_packet_vlan_ipv6_udp,
+ sizeof(test_packet_vlan_ipv6_udp));
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_has_eth(pkt));
+ CU_ASSERT(odp_packet_has_vlan(pkt));
+ CU_ASSERT(odp_packet_has_ipv6(pkt));
+ CU_ASSERT(odp_packet_has_udp(pkt));
+
+ CU_ASSERT(!odp_packet_has_ipv4(pkt));
+ CU_ASSERT(!odp_packet_has_tcp(pkt));
+
+ odp_packet_free(pkt);
+}
+
+int parser_suite_init(void)
+{
+ int i;
+
+ if (getenv("ODP_WAIT_FOR_NETWORK"))
+ wait_for_network = true;
+
+ iface_name[0] = getenv("ODP_PKTIO_IF0");
+ iface_name[1] = getenv("ODP_PKTIO_IF1");
+ num_ifaces = 1;
+
+ if (!iface_name[0]) {
+ printf("No interfaces specified, using default \"loop\".\n");
+ iface_name[0] = "loop";
+ } else if (!iface_name[1]) {
+ printf("Using loopback interface: %s\n", iface_name[0]);
+ } else {
+ num_ifaces = 2;
+ printf("Using paired interfaces: %s %s\n",
+ iface_name[0], iface_name[1]);
+ }
+
+ if (pkt_pool_create() != 0) {
+ printf("Error: failed to create parser pool\n");
+ return -1;
+ }
+
+ /* Create pktios and associate input/output queues */
+ for (i = 0; i < num_ifaces; ++i) {
+ pktio_info_t *io;
+
+ io = &pktios[i];
+ io->name = iface_name[i];
+ io->hdl = create_pktio(i, parser_pool);
+ if (io->hdl == ODP_PKTIO_INVALID) {
+ printf("Error: failed to open iface");
+ return -1;
+ }
+
+ if (odp_pktout_queue(io->hdl, &io->pktout, 1) != 1) {
+ printf("Error: failed to start iface: %s\n", io->name);
+ return -1;
+ }
+
+ if (odp_pktin_queue(io->hdl, &io->pktin, 1) != 1) {
+ printf("Error: failed to start iface: %s\n", io->name);
+ return -1;
+ }
+
+ if (odp_pktio_start(io->hdl)) {
+ printf("Error: failed to start iface: %s\n", io->name);
+ return -1;
+ }
+
+ wait_linkup(io->hdl);
+ }
+
+ pktio_a = &pktios[0];
+ pktio_b = &pktios[1];
+ if (num_ifaces == 1)
+ pktio_b = pktio_a;
+
+ return 0;
+}
+
+int parser_suite_term(void)
+{
+ int i;
+ int ret = 0;
+
+ for (i = 0; i < num_ifaces; ++i) {
+ if (odp_pktio_stop(pktios[i].hdl)) {
+ printf("Error: failed to stop pktio: %s\n",
+ pktios[i].name);
+ ret = -1;
+ }
+ if (odp_pktio_close(pktios[i].hdl)) {
+ printf("Error: failed to close pktio: %s\n",
+ pktios[i].name);
+ ret = -1;
+ }
+ }
+
+ if (odp_pool_destroy(parser_pool) != 0) {
+ printf("Error: failed to destroy packet pool\n");
+ ret = -1;
+ }
+
+ return ret;
+}
+
+/**
+ * Certain tests can only be run with 'loop' pktio.
+ */
+static int loop_pktio(void)
+{
+ if (strcmp(iface_name[0], "loop") == 0)
+ return ODP_TEST_ACTIVE;
+ else
+ return ODP_TEST_INACTIVE;
+}
+
+odp_testinfo_t parser_suite[] = {
+ ODP_TEST_INFO(parser_test_arp),
+ ODP_TEST_INFO(parser_test_ipv4_icmp),
+ ODP_TEST_INFO(parser_test_ipv4_tcp),
+ ODP_TEST_INFO(parser_test_ipv4_udp),
+ ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_ipv4_udp, loop_pktio),
+ ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_qinq_ipv4_udp, loop_pktio),
+ ODP_TEST_INFO(parser_test_ipv6_icmp),
+ ODP_TEST_INFO(parser_test_ipv6_tcp),
+ ODP_TEST_INFO(parser_test_ipv6_udp),
+ ODP_TEST_INFO_CONDITIONAL(parser_test_vlan_ipv6_udp, loop_pktio),
+ ODP_TEST_INFO_NULL
+};
diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/common_plat/validation/api/pktio/parser.h
new file mode 100644
index 00000000..57c62388
--- /dev/null
+++ b/test/common_plat/validation/api/pktio/parser.h
@@ -0,0 +1,180 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _ODP_TEST_PARSER_H_
+#define _ODP_TEST_PARSER_H_
+
+#include <odp_cunit_common.h>
+
+/* test functions: */
+void parser_test_arp(void);
+void parser_test_ipv4_icmp(void);
+void parser_test_ipv4_tcp(void);
+void parser_test_ipv4_udp(void);
+void parser_test_vlan_ipv4_udp(void);
+void parser_test_vlan_qinq_ipv4_udp(void);
+void parser_test_ipv6_icmp(void);
+void parser_test_ipv6_tcp(void);
+void parser_test_ipv6_udp(void);
+void parser_test_vlan_ipv6_udp(void);
+
+/* test array init/term functions: */
+int parser_suite_term(void);
+int parser_suite_init(void);
+
+/* test arrays: */
+extern odp_testinfo_t parser_suite[];
+
+/**
+ * ARP request
+ */
+static const uint8_t test_packet_arp[] = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x06, 0x00, 0x01,
+ 0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0xC0, 0xA8, 0x01, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA8,
+ 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+ 0x0E, 0x0F, 0x10, 0x11, 0xA1, 0xA8, 0x27, 0x43,
+};
+
+/**
+ * ICMPv4 echo reply
+ */
+static const uint8_t test_packet_ipv4_icmp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01,
+ 0xF3, 0x7B, 0xC0, 0xA8, 0x01, 0x01, 0xC4, 0xA8,
+ 0x01, 0x02, 0x00, 0x00, 0xB7, 0xAB, 0x00, 0x01,
+ 0x00, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+ 0x0E, 0x0F, 0x10, 0x11, 0xD9, 0x7F, 0xE8, 0x02,
+};
+
+/**
+ * IPv4 TCP
+ */
+static const uint8_t test_packet_ipv4_tcp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x06,
+ 0xF3, 0x76, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
+ 0x01, 0x01, 0x04, 0xD2, 0x10, 0xE1, 0x00, 0x00,
+ 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x50, 0x00,
+ 0x00, 0x00, 0x0C, 0xCC, 0x00, 0x00, 0x00, 0x01,
+ 0x02, 0x03, 0x04, 0x05, 0x2E, 0xDE, 0x5E, 0x48,
+};
+
+/**
+ * IPv4 UDP
+ */
+static const uint8_t test_packet_ipv4_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
+ 0xF3, 0x6B, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
+ 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A,
+ 0x2F, 0x97, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+ 0x0E, 0x0F, 0x10, 0x11, 0x64, 0xF4, 0xE4, 0xB6,
+};
+
+/**
+ * VLAN IPv4 UDP
+ * - ID: 23
+ */
+static const uint8_t test_packet_vlan_ipv4_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
+ 0x08, 0x00, 0x45, 0x00, 0x00, 0x2A, 0x00, 0x00,
+ 0x00, 0x00, 0x40, 0x11, 0xF3, 0x6F, 0xC0, 0xA8,
+ 0x01, 0x02, 0xC4, 0xA8, 0x01, 0x01, 0x00, 0x3F,
+ 0x00, 0x3F, 0x00, 0x16, 0x4D, 0xBF, 0x00, 0x01,
+ 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+ 0x0A, 0x0B, 0x0C, 0x0D, 0xCB, 0xBF, 0xD0, 0x29,
+};
+
+/**
+ * VLAN Q-in-Q IPv4 UDP
+ * - Outer: Tag Protocol ID 0x88a8, VLAN ID 1
+ * - Inner: Tag Protocol ID 0x8100, VLAN ID 2
+ */
+static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x88, 0xA8, 0x00, 0x01,
+ 0x81, 0x00, 0x00, 0x02, 0x08, 0x00, 0x45, 0x00,
+ 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
+ 0xF3, 0x73, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
+ 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x12,
+ 0x63, 0xDF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x06, 0x07, 0x08, 0x09, 0x80, 0x98, 0xB8, 0x18,
+};
+
+/**
+ * ICMPv6 echo request
+ */
+static const uint8_t test_packet_ipv6_icmp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
+ 0x00, 0x00, 0x00, 0x08, 0x3A, 0xFF, 0xFE, 0x80,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+ 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
+ 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
+ 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x80, 0x00,
+ 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02, 0xE0, 0x68,
+ 0x0E, 0xBA,
+};
+
+/**
+ * IPv6 TCP
+ */
+static const uint8_t test_packet_ipv6_tcp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
+ 0x00, 0x00, 0x00, 0x14, 0x06, 0xFF, 0xFE, 0x80,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+ 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
+ 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
+ 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x04, 0xD2,
+ 0x10, 0xE1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+ 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x36, 0x37,
+ 0x00, 0x00, 0x28, 0x67, 0xD2, 0xAF,
+};
+
+/**
+ * IPv6 UDP
+ */
+static const uint8_t test_packet_ipv6_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
+ 0x00, 0x00, 0x00, 0x08, 0x11, 0xFF, 0xFE, 0x80,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+ 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
+ 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
+ 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x00, 0x3F,
+ 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68, 0x35, 0xD3,
+ 0x64, 0x49,
+};
+
+/**
+ * VLAN IPv6
+ * - ID: 23
+ */
+static const uint8_t test_packet_vlan_ipv6_udp[] = {
+ 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
+ 0x86, 0xDD, 0x60, 0x30, 0x00, 0x00, 0x00, 0x08,
+ 0x11, 0xFF, 0xFE, 0x80, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x02, 0x00, 0x09, 0xFF, 0xFE, 0x00,
+ 0x04, 0x00, 0x35, 0x55, 0x55, 0x55, 0x66, 0x66,
+ 0x66, 0x66, 0x77, 0x77, 0x77, 0x77, 0x88, 0x88,
+ 0x88, 0x88, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x08,
+ 0x9B, 0x68, 0xC5, 0xD8, 0x2F, 0x5C,
+};
+
+#endif
diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c
index 0e2a9f39..c476a712 100644
--- a/test/common_plat/validation/api/pktio/pktio.c
+++ b/test/common_plat/validation/api/pktio/pktio.c
@@ -10,6 +10,7 @@
#include <stdlib.h>
#include "pktio.h"
+#include "parser.h"
#define PKT_BUF_NUM 32
#define PKT_BUF_SIZE (9 * 1024)
@@ -143,8 +144,7 @@ static void set_pool_len(odp_pool_param_t *params, odp_pool_capability_t *capa)
}
}
-static void pktio_pkt_set_macs(odp_packet_t pkt,
- odp_pktio_t src, odp_pktio_t dst)
+void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst)
{
uint32_t len;
odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len);
@@ -2192,6 +2192,7 @@ odp_suiteinfo_t pktio_suites[] = {
pktio_suite_term, pktio_suite_unsegmented},
{"Packet I/O Segmented", pktio_suite_init_segmented,
pktio_suite_term, pktio_suite_segmented},
+ {"Packet parser", parser_suite_init, parser_suite_term, parser_suite},
ODP_SUITE_INFO_NULL
};
diff --git a/test/common_plat/validation/api/pktio/pktio.h b/test/common_plat/validation/api/pktio/pktio.h
index 8131d05f..b8799d9e 100644
--- a/test/common_plat/validation/api/pktio/pktio.h
+++ b/test/common_plat/validation/api/pktio/pktio.h
@@ -61,4 +61,7 @@ extern odp_suiteinfo_t pktio_suites[];
/* main test program: */
int pktio_main(int argc, char *argv[]);
+/* functions shared by parser test suite */
+void pktio_pkt_set_macs(odp_packet_t pkt, odp_pktio_t src, odp_pktio_t dst);
+
#endif
commit 93afeeaf4e3dee3099830fccbb53bb32e64e3090
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Apr 4 09:28:20 2017 +0300
examples: use odp_pktio_config() to select required packet parsing level
Select required packet parsing level when full packet parsing is not
required.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c
index b97808f4..e6381455 100644
--- a/example/l2fwd_simple/odp_l2fwd_simple.c
+++ b/example/l2fwd_simple/odp_l2fwd_simple.c
@@ -41,6 +41,7 @@ static odp_pktio_t create_pktio(const char *name, odp_pool_t pool,
odp_pktin_queue_param_t in_queue_param;
odp_pktout_queue_param_t out_queue_param;
odp_pktio_t pktio;
+ odp_pktio_config_t config;
odp_pktio_param_init(&pktio_param);
@@ -50,6 +51,10 @@ static odp_pktio_t create_pktio(const char *name, odp_pool_t pool,
exit(1);
}
+ odp_pktio_config_init(&config);
+ config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2;
+ odp_pktio_config(pktio, &config);
+
odp_pktin_queue_param_init(&in_queue_param);
odp_pktout_queue_param_init(&out_queue_param);
diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c
index ba069720..f579d36d 100644
--- a/example/l3fwd/odp_l3fwd.c
+++ b/example/l3fwd/odp_l3fwd.c
@@ -101,6 +101,7 @@ static int create_pktio(const char *name, odp_pool_t pool,
odp_pktio_param_t pktio_param;
odp_pktio_t pktio;
odp_pktio_capability_t capa;
+ odp_pktio_config_t config;
int rc;
odp_pktio_param_init(&pktio_param);
@@ -120,6 +121,12 @@ static int create_pktio(const char *name, odp_pool_t pool,
return -1;
}
+ odp_pktio_config_init(&config);
+ config.parser.layer = global.cmd_args.error_check ?
+ ODP_PKTIO_PARSER_LAYER_ALL :
+ ODP_PKTIO_PARSER_LAYER_L4;
+ odp_pktio_config(pktio, &config);
+
fwd_pktio->nb_rxq = (int)capa.max_input_queues;
fwd_pktio->nb_txq = (int)capa.max_output_queues;
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c
index 561c2934..5bec6a04 100644
--- a/example/switch/odp_switch.c
+++ b/example/switch/odp_switch.c
@@ -217,6 +217,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx,
odp_pktio_t pktio;
odp_pktio_param_t pktio_param;
odp_pktio_capability_t capa;
+ odp_pktio_config_t config;
odp_pktin_queue_param_t pktin_param;
odp_pktout_queue_param_t pktout_param;
odp_pktio_op_mode_t mode_rx;
@@ -238,6 +239,10 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx,
return -1;
}
+ odp_pktio_config_init(&config);
+ config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2;
+ odp_pktio_config(pktio, &config);
+
odp_pktin_queue_param_init(&pktin_param);
odp_pktout_queue_param_init(&pktout_param);
diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c
index 33efc022..78b3633b 100644
--- a/test/common_plat/performance/odp_l2fwd.c
+++ b/test/common_plat/performance/odp_l2fwd.c
@@ -619,6 +619,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx,
odp_pktio_param_t pktio_param;
odp_schedule_sync_t sync_mode;
odp_pktio_capability_t capa;
+ odp_pktio_config_t config;
odp_pktin_queue_param_t pktin_param;
odp_pktout_queue_param_t pktout_param;
odp_pktio_op_mode_t mode_rx;
@@ -655,6 +656,12 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx,
return -1;
}
+ odp_pktio_config_init(&config);
+ config.parser.layer = gbl_args->appl.error_check ?
+ ODP_PKTIO_PARSER_LAYER_ALL :
+ ODP_PKTIO_PARSER_LAYER_NONE;
+ odp_pktio_config(pktio, &config);
+
odp_pktin_queue_param_init(&pktin_param);
odp_pktout_queue_param_init(&pktout_param);
diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/common_plat/performance/odp_pktio_ordered.c
index bff4586e..4bb0bef9 100644
--- a/test/common_plat/performance/odp_pktio_ordered.c
+++ b/test/common_plat/performance/odp_pktio_ordered.c
@@ -586,6 +586,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx,
odp_pktio_t pktio;
odp_pktio_param_t pktio_param;
odp_pktio_capability_t capa;
+ odp_pktio_config_t config;
odp_pktin_queue_param_t pktin_param;
odp_pktout_queue_param_t pktout_param;
odp_pktio_op_mode_t mode_rx;
@@ -611,6 +612,10 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx,
return -1;
}
+ odp_pktio_config_init(&config);
+ config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2;
+ odp_pktio_config(pktio, &config);
+
odp_pktin_queue_param_init(&pktin_param);
odp_pktout_queue_param_init(&pktout_param);
commit fdddf685fcad06f05f3788705968622b23a569ac
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Apr 4 09:28:18 2017 +0300
linux-gen: packet: recognize ICMPv6 packets
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 3ec7d8d1..9336cec1 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -319,7 +319,7 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool)
ip->ttl = 64;
ip->tot_len = odp_cpu_to_be_16(args->appl.payload + ODPH_ICMPHDR_LEN +
ODPH_IPV4HDR_LEN);
- ip->proto = ODPH_IPPROTO_ICMP;
+ ip->proto = ODPH_IPPROTO_ICMPv4;
ip->id = 0;
ip->chksum = 0;
@@ -664,7 +664,7 @@ static void print_pkts(int thr, odp_packet_t pkt_tbl[], unsigned len)
}
/* icmp */
- if (ip->proto == ODPH_IPPROTO_ICMP) {
+ if (ip->proto == ODPH_IPPROTO_ICMPv4) {
icmp = (odph_icmphdr_t *)(buf + offset);
process_icmp_pkt(icmp, msg);
diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c
index 15087cbe..e37fbee2 100644
--- a/example/ipsec/odp_ipsec_stream.c
+++ b/example/ipsec/odp_ipsec_stream.c
@@ -219,7 +219,7 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream,
ip->src_addr = odp_cpu_to_be_32(entry->tun_src_ip);
ip->dst_addr = odp_cpu_to_be_32(entry->tun_dst_ip);
} else {
- ip->proto = ODPH_IPPROTO_ICMP;
+ ip->proto = ODPH_IPPROTO_ICMPv4;
ip->src_addr = odp_cpu_to_be_32(stream->src_ip);
ip->dst_addr = odp_cpu_to_be_32(stream->dst_ip);
}
@@ -262,7 +262,7 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream,
inner_ip = (odph_ipv4hdr_t *)data;
memset((char *)inner_ip, 0, sizeof(*inner_ip));
inner_ip->ver_ihl = 0x45;
- inner_ip->proto = ODPH_IPPROTO_ICMP;
+ inner_ip->proto = ODPH_IPPROTO_ICMPv4;
inner_ip->id = odp_cpu_to_be_16(stream->id);
inner_ip->ttl = 64;
inner_ip->tos = 0;
@@ -519,7 +519,7 @@ clear_packet:
icmp = (odph_icmphdr_t *)(inner_ip + 1);
data = (uint8_t *)icmp;
} else {
- if (ODPH_IPPROTO_ICMP != ip->proto)
+ if (ODPH_IPPROTO_ICMPv4 != ip->proto)
return FALSE;
icmp = (odph_icmphdr_t *)data;
}
diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h
index ba6e675f..91776fad 100644
--- a/helper/include/odp/helper/ip.h
+++ b/helper/include/odp/helper/ip.h
@@ -205,13 +205,14 @@ typedef struct ODP_PACKED {
* IP protocol values (IPv4:'proto' or IPv6:'next_hdr')
* @{*/
#define ODPH_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */
-#define ODPH_IPPROTO_ICMP 0x01 /**< Internet Control Message Protocol (1) */
+#define ODPH_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */
#define ODPH_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */
#define ODPH_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */
#define ODPH_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */
#define ODPH_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */
#define ODPH_IPPROTO_AH 0x33 /**< Authentication Header (51) */
#define ODPH_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */
+#define ODPH_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */
#define ODPH_IPPROTO_INVALID 0xFF /**< Reserved invalid by IANA */
/**@}*/
diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h
index 20041f1c..2b34a753 100644
--- a/platform/linux-generic/include/protocols/ip.h
+++ b/platform/linux-generic/include/protocols/ip.h
@@ -157,13 +157,14 @@ typedef struct ODP_PACKED {
* IP protocol values (IPv4:'proto' or IPv6:'next_hdr')
* @{*/
#define _ODP_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */
-#define _ODP_IPPROTO_ICMP 0x01 /**< Internet Control Message Protocol (1) */
+#define _ODP_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */
#define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */
#define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */
#define _ODP_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */
#define _ODP_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */
#define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */
#define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */
+#define _ODP_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */
#define _ODP_IPPROTO_SCTP 0x84 /**< Stream Control Transmission protocol
(132) */
#define _ODP_IPPROTO_INVALID 0xFF /**< Reserved invalid by IANA */
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index e2bb8426..c6962ce9 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -2078,7 +2078,10 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
/* Parse Layer 4 headers */
switch (prs->ip_proto) {
- case _ODP_IPPROTO_ICMP:
+ case _ODP_IPPROTO_ICMPv4:
+ /* Fall through */
+
+ case _ODP_IPPROTO_ICMPv6:
prs->input_flags.icmp = 1;
break;
commit 29b29677ed7d5d396f4aec1d0f3197efbf119113
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Feb 17 16:20:07 2017 +0200
linux-gen: pktio: parser default config
Fill default parser configuration and capability. All pktios
use same parser code, so the capability is the same (all layers).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 50a000e5..ea9f2a75 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -931,6 +931,8 @@ void odp_pktout_queue_param_init(odp_pktout_queue_param_t *param)
void odp_pktio_config_init(odp_pktio_config_t *config)
{
memset(config, 0, sizeof(odp_pktio_config_t));
+
+ config->parser.layer = ODP_PKTIO_PARSER_LAYER_ALL;
}
int odp_pktio_info(odp_pktio_t hdl, odp_pktio_info_t *info)
@@ -1106,6 +1108,7 @@ int odp_pktio_term_global(void)
int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa)
{
pktio_entry_t *entry;
+ int ret;
entry = get_pktio_entry(pktio);
if (entry == NULL) {
@@ -1114,9 +1117,15 @@ int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa)
}
if (entry->s.ops->capability)
- return entry->s.ops->capability(entry, capa);
+ ret = entry->s.ops->capability(entry, capa);
+ else
+ ret = single_capability(capa);
- return single_capability(capa);
+ /* The same parser is used for all pktios */
+ if (ret == 0)
+ capa->config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL;
+
+ return ret;
}
unsigned odp_pktio_max_index(void)
diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c
index 4d8d2cc7..0e2a9f39 100644
--- a/test/common_plat/validation/api/pktio/pktio.c
+++ b/test/common_plat/validation/api/pktio/pktio.c
@@ -1182,6 +1182,8 @@ void pktio_test_pktio_config(void)
odp_pktio_config_init(&config);
+ CU_ASSERT(config.parser.layer == ODP_PKTIO_PARSER_LAYER_ALL);
+
CU_ASSERT(odp_pktio_config(pktio, NULL) == 0);
CU_ASSERT(odp_pktio_config(pktio, &config) == 0);
commit 8c6ca3886ae4ffb111d3a81d09d21b68e0e11349
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Feb 17 16:20:06 2017 +0200
api: pktio: add parser configuration
Packet input parsing level configuration is added. An application
may express the maximum layer it is interested about.
Implementations may optimize packet input performance as parsing
can be stopped on the application required level. Implementations
are free to parse more layers than application requests.
Lazy parsing (e.g. in current odp-linux) does not work in practice.
The implementation cannot continue parsing after the application
has got access to packet data, since application may overwrite
some packet headers. Parse results must reflect the format of the
received packet.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h
index 85cd6d18..cec1f22a 100644
--- a/include/odp/api/spec/packet_io.h
+++ b/include/odp/api/spec/packet_io.h
@@ -346,6 +346,39 @@ typedef union odp_pktout_config_opt_t {
} odp_pktout_config_opt_t;
/**
+ * Parser layers
+ */
+typedef enum odp_pktio_parser_layer_t {
+ /** No layers */
+ ODP_PKTIO_PARSER_LAYER_NONE = 0,
+
+ /** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */
+ ODP_PKTIO_PARSER_LAYER_L2,
+
+ /** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */
+ ODP_PKTIO_PARSER_LAYER_L3,
+
+ /** Layer L4 protocols (UDP, TCP, SCTP) */
+ ODP_PKTIO_PARSER_LAYER_L4,
+
+ /** All layers */
+ ODP_PKTIO_PARSER_LAYER_ALL
+
+} odp_pktio_parser_layer_t;
+
+/**
+ * Parser configuration
+ */
+typedef struct odp_pktio_parser_config_t {
+ /** Protocol parsing level in packet input
+ *
+ * Parse protocol layers in minimum up to this level during packet
+ * input. The default value is ODP_PKTIO_PARSER_LAYER_ALL. */
+ odp_pktio_parser_layer_t layer;
+
+} odp_pktio_parser_config_t;
+
+/**
* Packet IO configuration options
*
* Packet IO interface level configuration options. Use odp_pktio_capability()
@@ -363,6 +396,9 @@ typedef struct odp_pktio_config_t {
* Default value for all bits is zero. */
odp_pktout_config_opt_t pktout;
+ /** Packet input parser configuration */
+ odp_pktio_parser_config_t parser;
+
/** Interface loopback mode
*
* In this mode the packets sent out through the interface is
commit 19c488fdd9f9868cbe60f1ff8558f48c7bba6f04
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:25:58 2016 +0200
linux-gen: crypto: add algo capability functions
Implemented cipher and authentication algorithm capability
functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 dfeb9f3f..6963ee62 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -656,6 +656,83 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
return num;
}
+int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
+ odp_crypto_cipher_capability_t dst[],
+ int num_copy)
+{
+ const odp_crypto_cipher_capability_t *src;
+ int num;
+ int size = sizeof(odp_crypto_cipher_capability_t);
+
+ switch (cipher) {
+ case ODP_CIPHER_ALG_NULL:
+ src = NULL;
+ num = 0;
+ break;
+ case ODP_CIPHER_ALG_DES:
+ src = cipher_capa_des;
+ num = sizeof(cipher_capa_des) / size;
+ break;
+ case ODP_CIPHER_ALG_3DES_CBC:
+ src = cipher_capa_trides_cbc;
+ num = sizeof(cipher_capa_trides_cbc) / size;
+ break;
+ case ODP_CIPHER_ALG_AES_CBC:
+ src = cipher_capa_aes_cbc;
+ num = sizeof(cipher_capa_aes_cbc) / size;
+ break;
+ case ODP_CIPHER_ALG_AES_GCM:
+ src = cipher_capa_aes_gcm;
+ num = sizeof(cipher_capa_aes_gcm) / size;
+ break;
+ default:
+ return -1;
+ }
+
+ if (num < num_copy)
+ num_copy = num;
+
+ memcpy(dst, src, num_copy * size);
+
+ return num;
+}
+
+int odp_crypto_auth_capability(odp_auth_alg_t auth,
+ odp_crypto_auth_capability_t dst[], int num_copy)
+{
+ const odp_crypto_auth_capability_t *src;
+ int num;
+ int size = sizeof(odp_crypto_auth_capability_t);
+
+ switch (auth) {
+ case ODP_AUTH_ALG_NULL:
+ src = NULL;
+ num = 0;
+ break;
+ case ODP_AUTH_ALG_MD5_HMAC:
+ src = auth_capa_md5_hmac;
+ num = sizeof(auth_capa_md5_hmac) / size;
+ break;
+ case ODP_AUTH_ALG_SHA256_HMAC:
+ src = auth_capa_sha256_hmac;
+ num = sizeof(auth_capa_sha256_hmac) / size;
+ break;
+ case ODP_AUTH_ALG_AES_GCM:
+ src = auth_capa_aes_gcm;
+ num = sizeof(auth_capa_aes_gcm) / size;
+ break;
+ default:
+ return -1;
+ }
+
+ if (num < num_copy)
+ num_copy = num;
+
+ memcpy(dst, src, num_copy * size);
+
+ return num;
+}
+
int
odp_crypto_session_create(odp_crypto_session_param_t *param,
odp_crypto_session_t *session_out,
commit 966c1c956a21f4e70c873a3c3546e65299837457
Author: Christophe Milard <christophe.milard(a)linaro.org>
Date: Fri Aug 19 17:10:12 2016 +0200
doc: application-api-guide: excluding drv interface
The input files parsed to generate the ODP platform specific API doc
included (wrongly) part of the drv interface specification.
This led to warning on undefined symbols.
Fixed by restricting imput files to API only.
Signed-off-by: Christophe Milard <christophe.milard(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/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile
index 12d356e3..1f2d49a4 100644
--- a/doc/platform-api-guide/Doxyfile
+++ b/doc/platform-api-guide/Doxyfile
@@ -5,9 +5,9 @@ PROJECT_NUMBER = $(VERSION)
PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg
INPUT = $(SRCDIR)/doc/application-api-guide \
$(SRCDIR)/doc/platform-api-guide \
- $(SRCDIR)/include \
+ $(SRCDIR)/include/odp/api \
$(SRCDIR)/platform/$(WITH_PLATFORM)/doc \
- $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp \
+ $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/api \
$(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH)
EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR)
PREDEFINED = __GNUC__ \
commit 99478ee923dfd8279a7a5149769aee49df315dde
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Mar 30 16:58:53 2017 +0300
api: hints: remove ODP_DEPRECATED from API
Remove ODP_DEPRECATED macro as it depends on (GCC) compiler type
attribute, which may not be supported (the same way) by all
compilers. Also the attribute works only for types, but not e.g.
for fields of structure.
A new configuration option will be added to control deprecated
definitions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/hints.h b/include/odp/api/spec/hints.h
index 82400f07..7434c6a5 100644
--- a/include/odp/api/spec/hints.h
+++ b/include/odp/api/spec/hints.h
@@ -52,11 +52,6 @@ extern "C" {
#define ODP_PRINTF_FORMAT(x, y) __attribute__((format(printf, (x), (y))))
/**
- * Indicate deprecated variables, functions or types
- */
-#define ODP_DEPRECATED __attribute__((__deprecated__))
-
-/**
* Intentionally unused variables of functions
*/
#define ODP_UNUSED __attribute__((__unused__))
@@ -96,7 +91,6 @@ extern "C" {
#define ODP_WEAK_SYMBOL
#define ODP_HOT_CODE
#define ODP_COLD_CODE
-#define ODP_DEPRECATED
#define ODP_UNUSED
#define odp_likely(x)
#define odp_unlikely(x)
commit be9ca86f431d5eaab0702f7d76db60cd75982e15
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Mar 30 16:58:55 2017 +0300
test: crypto: remove references to deprecated crypto apis
Remove last remaining references to deprecated API definitions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h
index e0320eb4..45cb022e 100644
--- a/example/ipsec/odp_ipsec_misc.h
+++ b/example/ipsec/odp_ipsec_misc.h
@@ -98,10 +98,10 @@ int parse_key_string(char *keystring,
key->length = key_bits_in / 8;
} else {
- if ((alg->u.auth == ODP_AUTH_ALG_MD5_96) &&
+ if ((alg->u.auth == ODP_AUTH_ALG_MD5_HMAC) &&
(KEY_BITS_MD5_96 == key_bits_in))
key->length = key_bits_in / 8;
- else if ((alg->u.auth == ODP_AUTH_ALG_SHA256_128) &&
+ else if ((alg->u.auth == ODP_AUTH_ALG_SHA256_HMAC) &&
(KEY_BITS_SHA256_128 == key_bits_in))
key->length = key_bits_in / 8;
}
diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c
index 28215b5b..10bbcb8f 100644
--- a/example/ipsec/odp_ipsec_sa_db.c
+++ b/example/ipsec/odp_ipsec_sa_db.c
@@ -111,11 +111,11 @@ int create_sa_db_entry(char *input, odp_bool_t cipher)
} else {
if (0 == strcmp(token, "md5")) {
entry->alg.u.auth =
- ODP_AUTH_ALG_MD5_96;
+ ODP_AUTH_ALG_MD5_HMAC;
entry->icv_len = 12;
} else if (!strcmp(token, "sha256")) {
entry->alg.u.auth =
- ODP_AUTH_ALG_SHA256_128;
+ ODP_AUTH_ALG_SHA256_HMAC;
entry->icv_len = 16;
} else {
entry->alg.u.auth = ODP_AUTH_ALG_NULL;
diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c
index 428ec04d..15087cbe 100644
--- a/example/ipsec/odp_ipsec_stream.c
+++ b/example/ipsec/odp_ipsec_stream.c
@@ -227,8 +227,8 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream,
/* AH (if specified) */
if (entry && (entry == stream->input.entry) &&
(ODP_AUTH_ALG_NULL != entry->ah.alg)) {
- if (entry->ah.alg != ODP_AUTH_ALG_MD5_96 &&
- entry->ah.alg != ODP_AUTH_ALG_SHA256_128)
+ if (entry->ah.alg != ODP_AUTH_ALG_MD5_HMAC &&
+ entry->ah.alg != ODP_AUTH_ALG_SHA256_HMAC)
abort();
ah = (odph_ahhdr_t *)data;
@@ -424,7 +424,7 @@ odp_bool_t verify_ipv4_packet(stream_db_entry_t *stream,
return FALSE;
if (odp_be_to_cpu_32(ah->spi) != entry->ah.spi)
return FALSE;
- if (ODP_AUTH_ALG_MD5_96 != entry->ah.alg)
+ if (ODP_AUTH_ALG_MD5_HMAC != entry->ah.alg)
abort();
} else {
if (entry && (ODP_AUTH_ALG_NULL != entry->ah.alg))
diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c
index 954bdb79..b3857973 100644
--- a/test/common_plat/performance/odp_crypto.c
+++ b/test/common_plat/performance/odp_crypto.c
@@ -205,7 +205,7 @@ static crypto_alg_config_t algs_config[] = {
.data = test_iv,
.length = 8,
},
- .auth_alg = ODP_AUTH_ALG_MD5_96,
+ .auth_alg = ODP_AUTH_ALG_MD5_HMAC,
.auth_key = {
.data = test_key16,
.length = sizeof(test_key16)
@@ -217,7 +217,7 @@ static crypto_alg_config_t algs_config[] = {
.name = "null-hmac-md5-96",
.session = {
.cipher_alg = ODP_CIPHER_ALG_NULL,
- .auth_alg = ODP_AUTH_ALG_MD5_96,
+ .auth_alg = ODP_AUTH_ALG_MD5_HMAC,
.auth_key = {
.data = test_key16,
.length = sizeof(test_key16)
commit 2b34cda253fd28f3b373dc3ee66753d47a0c9b33
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Mar 30 16:58:54 2017 +0300
api: deprecated: add configure option and macros
Added configuration option --enable-deprecated to control if
deprecated APIs are enabled or disabled.
Added ODP_DEPRECATED_API macro into the API. Its value can be
used to check if deprecated API definitions are enabled or
disabled. Deprecated APIs are disabled by default. Deprecated
APIs are meant to be removed completely in a later API version.
Added ODP_DEPRECATE() macro to enforce deprecation of API
definitions. When deprecated APIs are disabled, the macro renames
API definitions so that application cannot use those any more,
but a single implementation library can serve applications built
with both options.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 6351878a..f6b20cb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,8 @@ ODP_VERSION_API_MAJOR=odpapi_major_version
AC_SUBST(ODP_VERSION_API_MAJOR)
ODP_VERSION_API_MINOR=odpapi_minor_version
AC_SUBST(ODP_VERSION_API_MINOR)
-AC_CONFIG_FILES([include/odp/api/spec/version.h])
+AC_CONFIG_FILES([include/odp/api/spec/version.h
+ include/odp/api/spec/deprecated.h])
AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects])
AC_CONFIG_SRCDIR([helper/config.h.in])
@@ -283,7 +284,7 @@ ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG"
ODP_ABI_COMPAT=1
abi_compat=yes
AC_ARG_ENABLE([abi-compat],
- [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files],
+ [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files],
[if test "x$enableval" = "xno"; then
ODP_ABI_COMPAT=0
abi_compat=no
@@ -293,6 +294,19 @@ AC_ARG_ENABLE([abi-compat],
AC_SUBST(ODP_ABI_COMPAT)
##########################################################################
+# Enable/disable deprecated API definitions
+##########################################################################
+ODP_DEPRECATED_API=0
+deprecated=no
+AC_ARG_ENABLE([deprecated],
+ [ --enable-deprecated enable deprecated API definitions],
+ [if test "x$enableval" = "xyes"; then
+ ODP_DEPRECATED_API=1
+ deprecated=yes
+ fi])
+AC_SUBST(ODP_DEPRECATED_API)
+
+##########################################################################
# Default warning setup
##########################################################################
ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes"
@@ -395,6 +409,7 @@ AC_MSG_RESULT([
static libraries: ${enable_static}
shared libraries: ${enable_shared}
ABI compatible: ${abi_compat}
+ Deprecated APIs: ${deprecated}
cunit: ${cunit_support}
test_vald: ${test_vald}
test_perf: ${test_perf}
diff --git a/doc/application-api-guide/api_guide_lines.dox b/doc/application-api-guide/api_guide_lines.dox
index 394e9582..a6488c32 100644
--- a/doc/application-api-guide/api_guide_lines.dox
+++ b/doc/application-api-guide/api_guide_lines.dox
@@ -75,7 +75,7 @@ The former is a compile-time assertion and hence adds no additional path length.
The latter is controlled by the ODP_NO_DEBUG compile-time switch and so is suitable for use in development/debug builds that can be compiled out for production use.
Other mechanisms available to the implementer are:
- ODP_ABORT() is provided for situations where further execution of the code must not occur and a level of tracing information should be left in the log.
- - ODP_DEPRECATED() is used to signify that a call is planned for obsolescence.
+ - ODP_DEPRECATE() is used to signify that a call is planned for obsolescence.
- ODP_LOG() is used to direct implementation messages to the application.
@@ -197,8 +197,8 @@ This is one of the reasons why some features MAY be defined as OPTIONAL.
While allowed, the proliferation of OPTIONAL features SHOULD be avoided to enable broad application portability across many implementations.
At the same time, a "least common denominator" approach MUST NOT be taken as that defeats the purpose of providing higher-level abstractions in APIs.
-@subsection odp_deprecated ODP DEPRECATED
-A deprecated API will remain marked as such in the public API using #ODP_DEPRECATED for two release cycles for the #ODP_VERSION_API_MAJOR number.
+@subsection odp_deprecate ODP DEPRECATE
+A deprecated API will remain marked as such in the public API using #ODP_DEPRECATE() for two release cycles for the #ODP_VERSION_API_MAJOR number.
For example an API marked as deprecated in 1.1.0 will still be present in 1.2.0 and removed in 1.3.0.
A deprecated API will contain the doxygen tag \@deprecated with a description of the reason for the change.
diff --git a/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile
index 93f6edfe..12d356e3 100644
--- a/doc/platform-api-guide/Doxyfile
+++ b/doc/platform-api-guide/Doxyfile
@@ -17,4 +17,5 @@ PREDEFINED = __GNUC__ \
__LITTLE_ENDIAN_BITFIELD \
__x86_64__ \
ODP_PACKED \
+ ODP_DEPRECATE(x)=x \
"ODP_HANDLE_T(type)=odp_handle_t type"
diff --git a/doc/process-guide/release-guide.adoc b/doc/process-guide/release-guide.adoc
index 8ea147af..595af91a 100644
--- a/doc/process-guide/release-guide.adoc
+++ b/doc/process-guide/release-guide.adoc
@@ -251,7 +251,7 @@ Deleting or changing the published API follows the normal <<anchor-1,process>>,
* A deprecated indication is applied to the old API using the @deprecated
doxygen syntax.
* For a function change the old API it is additionally marked using the
-ODP_DEPRECATED preprocessor macro.
+ODP_DEPRECATE() preprocessor macro.
* The CHANGELOG will have an entry in the API change section.
* The Release Manager will resolve the duration for which the deprecated API.
will be supported, and determine which future release it will be applied to. +
@@ -275,7 +275,7 @@ The new API must have comparable coverage to the old API.
*
* @param name ...
*/
-odp_foo_t odp_foo_create(const char *name) ODP_DEPRECATED;
+odp_foo_t ODP_DEPRECATE(odp_foo_create)(const char *name);
/**
* Create a bar
@@ -298,7 +298,7 @@ compiler warning.
*
* @param name ...
*/
-odp_foo_t odp_foo_create(const char *name) ODP_DEPRECATED;
+odp_foo_t ODP_DEPRECATE(odp_foo_create)(const char *name);
----
=== Changing a struct member
diff --git a/include/odp/api/spec/.gitignore b/include/odp/api/spec/.gitignore
index 67020331..df9c87d9 100644
--- a/include/odp/api/spec/.gitignore
+++ b/include/odp/api/spec/.gitignore
@@ -1 +1,2 @@
+deprecated.h
version.h
diff --git a/include/odp/api/spec/deprecated.h.in b/include/odp/api/spec/deprecated.h.in
new file mode 100644
index 00000000..224f60ff
--- /dev/null
+++ b/include/odp/api/spec/deprecated.h.in
@@ -0,0 +1,50 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * Macro for deprecated API definitions
+ */
+
+#ifndef ODP_API_DEPRECATED_H_
+#define ODP_API_DEPRECATED_H_
+#include <odp/visibility_begin.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Deprecated API definitions
+ *
+ * Some API definitions may be deprecated by this or a previous API version.
+ * This macro controls if those are enabled (and visible to the application)
+ * or disabled.
+ *
+ * * 0: Deprecated API definitions are disabled (default)
+ * * 1: Deprecated API definitions are enabled
+ */
+#define ODP_DEPRECATED_API @ODP_DEPRECATED_API@
+
+/**
+ * @def ODP_DEPRECATE
+ *
+ * Macro to deprecate API definitions
+ */
+
+#if ODP_DEPRECATED_API
+#define ODP_DEPRECATE(x) x
+#else
+#define ODP_DEPRECATE(x) _deprecated_ ## x
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <odp/visibility_end.h>
+#endif
diff --git a/include/odp_api.h b/include/odp_api.h
index ec7fcd2e..060ec888 100644
--- a/include/odp_api.h
+++ b/include/odp_api.h
@@ -18,6 +18,7 @@
extern "C" {
#endif
+#include <odp/api/deprecated.h>
#include <odp/api/version.h>
#include <odp/api/std_types.h>
#include <odp/api/compiler.h>
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 7059d910..59a57724 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -29,6 +29,7 @@ odpapispecinclude_HEADERS = \
$(top_srcdir)/include/odp/api/spec/cpumask.h \
$(top_srcdir)/include/odp/api/spec/crypto.h \
$(top_srcdir)/include/odp/api/spec/debug.h \
+ $(top_srcdir)/include/odp/api/spec/deprecated.h \
$(top_srcdir)/include/odp/api/spec/errno.h \
$(top_srcdir)/include/odp/api/spec/event.h \
$(top_srcdir)/include/odp/api/spec/hash.h \
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 00ce80d7..eb7bea8f 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -33,6 +33,7 @@ odpapiinclude_HEADERS = \
$(srcdir)/include/odp/api/cpumask.h \
$(srcdir)/include/odp/api/crypto.h \
$(srcdir)/include/odp/api/debug.h \
+ $(srcdir)/include/odp/api/deprecated.h \
$(srcdir)/include/odp/api/errno.h \
$(srcdir)/include/odp/api/event.h \
$(srcdir)/include/odp/api/hash.h \
diff --git a/platform/linux-generic/include/odp/api/deprecated.h b/platform/linux-generic/include/odp/api/deprecated.h
new file mode 100644
index 00000000..82797ebc
--- /dev/null
+++ b/platform/linux-generic/include/odp/api/deprecated.h
@@ -0,0 +1,26 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * Control deprecated API definitions
+ */
+
+#ifndef ODP_PLAT_DEPRECATED_H_
+#define ODP_PLAT_DEPRECATED_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <odp/api/spec/deprecated.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
commit 166e4e6a7f2e289f305203e75c68cea56d015c08
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu May 4 14:30:50 2017 +0300
api: packet: introduce odp_packet_data_range_t
Rename odp_crypto_data_range_t to odp_packet_data_range_t, as it is
relevant not only to the crypto interface.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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 1f83e819..c47d3149 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -21,6 +21,8 @@
extern "C" {
#endif
+#include <odp/api/packet.h>
+
/** @defgroup odp_crypto ODP CRYPTO
* Macros, enums, types and operations to utilise crypto.
* @{
@@ -243,15 +245,10 @@ typedef struct odp_crypto_iv {
/**
* Crypto API data range specifier
+ *
+ * @deprecated Use odp_packet_data_range_t instead
*/
-typedef struct odp_crypto_data_range {
- /** Offset from beginning of packet */
- uint32_t offset;
-
- /** Length of data to operate on */
- uint32_t length;
-
-} odp_crypto_data_range_t;
+typedef odp_packet_data_range_t ODP_DEPRECATE(odp_crypto_data_range_t);
/**
* Crypto API session creation parameters
@@ -386,10 +383,10 @@ typedef struct odp_crypto_op_param_t {
} aad;
/** Data range to apply cipher */
- odp_crypto_data_range_t cipher_range;
+ odp_packet_data_range_t cipher_range;
/** Data range to authenticate */
- odp_crypto_data_range_t auth_range;
+ odp_packet_data_range_t auth_range;
} odp_crypto_op_param_t;
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index 92c35ae6..79d8773e 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -71,6 +71,18 @@ extern "C" {
* Packet is red
*/
+/**
+ * Packet API data range specifier
+ */
+typedef struct odp_packet_data_range {
+ /** Offset from beginning of packet */
+ uint32_t offset;
+
+ /** Length of data to operate on */
+ uint32_t length;
+
+} odp_packet_data_range_t;
+
/*
*
* Alloc and free
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index a415f5c1..57e7c0e0 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -72,8 +72,8 @@ static void alg_test(odp_crypto_op_t op,
odp_crypto_key_t cipher_key,
odp_auth_alg_t auth_alg,
odp_crypto_key_t auth_key,
- odp_crypto_data_range_t *cipher_range,
- odp_crypto_data_range_t *auth_range,
+ odp_packet_data_range_t *cipher_range,
+ odp_packet_data_range_t *auth_range,
const uint8_t *plaintext,
unsigned int plaintext_len,
const uint8_t *ciphertext,
diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h
index da4610f3..a1cf4faf 100644
--- a/test/common_plat/validation/api/crypto/test_vectors.h
+++ b/test/common_plat/validation/api/crypto/test_vectors.h
@@ -139,14 +139,14 @@ static uint8_t aes128_gcm_reference_iv[][AES128_GCM_IV_LEN] = {
static uint32_t aes128_gcm_reference_length[] = { 84, 72, 72, 40};
-static odp_crypto_data_range_t aes128_gcm_cipher_range[] = {
+static odp_packet_data_range_t aes128_gcm_cipher_range[] = {
{ .offset = 12, .length = 72 },
{ .offset = 8, .length = 64 },
{ .offset = 8, .length = 64 },
{ .offset = 12, .length = 28 },
};
-static odp_crypto_data_range_t aes128_gcm_auth_range[] = {
+static odp_packet_data_range_t aes128_gcm_auth_range[] = {
{ .offset = 0, .length = 84 },
{ .offset = 0, .length = 72 },
{ .offset = 0, .length = 72 },
commit e149fb058c6ea718e22c77c6fc930141004dcba2
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu May 4 15:55:57 2017 +0300
api: crypto: add AAD operation parameters
Authentication capabilities list supported AAD lengths
per algorithm, but application did not have means to select which
length is used. Also pointer to AAD is added, since it may be
constructed also outside of packet data.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 76977204..1f83e819 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -375,6 +375,16 @@ typedef struct odp_crypto_op_param_t {
*/
uint32_t hash_result_offset;
+ /** Additional Authenticated Data (AAD) */
+ struct {
+ /** Pointer to ADD */
+ uint8_t *ptr;
+
+ /** AAD length in bytes. Use odp_crypto_auth_capa() for
+ * supported AAD lengths. */
+ uint32_t length;
+ } aad;
+
/** Data range to apply cipher */
odp_crypto_data_range_t cipher_range;
commit e6e666d533615de703993836b958514208de942a
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu May 4 15:55:56 2017 +0300
api: crypto: add digest length session parameter
Authentication capabilities list supported digest lengths
per algorithm, but application did not have means to select which
length is used.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 181c0cc4..76977204 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -299,10 +299,16 @@ typedef struct odp_crypto_session_param_t {
/** Authentication key
*
- * Use odp_crypto_auth_capa() for supported digest and key lengths.
+ * Use odp_crypto_auth_capa() for supported key lengths.
*/
odp_crypto_key_t auth_key;
+ /** Authentication digest length in bytes
+ *
+ * Use odp_crypto_auth_capa() for supported digest lengths.
+ */
+ uint32_t auth_digest_len;
+
/** Async mode completion event queue
*
* When odp_crypto_operation() is asynchronous, the completion queue is
commit 8184de8ef8492a739d30c354628aada2e2bab366
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Mar 30 16:58:56 2017 +0300
api: crypto: enforce deprecated API status
Used ODP_DEPRECATE() to control if deprecated API
definitions are visible in the API or not.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index d30f050f..181c0cc4 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -15,6 +15,8 @@
#define ODP_API_CRYPTO_H_
#include <odp/visibility_begin.h>
+#include <odp/api/deprecated.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -82,10 +84,10 @@ typedef enum {
ODP_CIPHER_ALG_AES_GCM,
/** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */
- ODP_CIPHER_ALG_AES128_CBC,
+ ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC),
/** @deprecated Use ODP_CIPHER_ALG_AES_GCM instead */
- ODP_CIPHER_ALG_AES128_GCM
+ ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_GCM)
} odp_cipher_alg_t;
@@ -127,13 +129,14 @@ typedef enum {
ODP_AUTH_ALG_AES_GCM,
/** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */
- ODP_AUTH_ALG_MD5_96,
+ ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96),
/** @deprecated Use ODP_AUTH_ALG_SHA256_HMAC instead */
- ODP_AUTH_ALG_SHA256_128,
+ ODP_DEPRECATE(ODP_AUTH_ALG_SHA256_128),
/** @deprecated Use ODP_AUTH_ALG_AES_GCM instead */
- ODP_AUTH_ALG_AES128_GCM
+ ODP_DEPRECATE(ODP_AUTH_ALG_AES128_GCM)
+
} odp_auth_alg_t;
/**
@@ -158,10 +161,11 @@ typedef union odp_crypto_cipher_algos_t {
uint32_t aes_gcm : 1;
/** @deprecated Use aes_cbc instead */
- uint32_t aes128_cbc : 1;
+ uint32_t ODP_DEPRECATE(aes128_cbc) : 1;
/** @deprecated Use aes_gcm instead */
- uint32_t aes128_gcm : 1;
+ uint32_t ODP_DEPRECATE(aes128_gcm) : 1;
+
} bit;
/** All bits of the bit field structure
@@ -196,13 +200,14 @@ typedef union odp_crypto_auth_algos_t {
uint32_t aes_gcm : 1;
/** @deprecated Use md5_hmac instead */
- uint32_t md5_96 : 1;
+ uint32_t ODP_DEPRECATE(md5_96) : 1;
/** @deprecated Use sha256_hmac instead */
- uint32_t sha256_128 : 1;
+ uint32_t ODP_DEPRECATE(sha256_128) : 1;
/** @deprecated Use aes_gcm instead */
- uint32_t aes128_gcm : 1;
+ uint32_t ODP_DEPRECATE(aes128_gcm) : 1;
+
} bit;
/** All bits of the bit field structure
@@ -317,7 +322,7 @@ typedef struct odp_crypto_session_param_t {
} odp_crypto_session_param_t;
/** @deprecated Use odp_crypto_session_param_t instead */
-typedef odp_crypto_session_param_t odp_crypto_session_params_t;
+typedef odp_crypto_session_param_t ODP_DEPRECATE(odp_crypto_session_params_t);
/**
* Crypto API per packet operation parameters
@@ -373,7 +378,7 @@ typedef struct odp_crypto_op_param_t {
} odp_crypto_op_param_t;
/** @deprecated Use odp_crypto_op_param_t instead */
-typedef odp_crypto_op_param_t odp_crypto_op_params_t;
+typedef odp_crypto_op_param_t ODP_DEPRECATE(odp_crypto_op_params_t);
/**
* Crypto API session creation return code
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index de67ad36..dfeb9f3f 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -566,12 +566,13 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.sha512_hmac = 0;
capa->auths.bit.aes_gcm = 1;
- /* Deprecated */
+#if ODP_DEPRECATED_API
capa->ciphers.bit.aes128_cbc = 1;
capa->ciphers.bit.aes128_gcm = 1;
capa->auths.bit.md5_96 = 1;
capa->auths.bit.sha256_128 = 1;
capa->auths.bit.aes128_gcm = 1;
+#endif
capa->max_sessions = MAX_SESSIONS;
@@ -662,6 +663,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
{
int rc;
odp_crypto_generic_session_t *session;
+ int aes_gcm = 0;
/* Default to successful result */
*status = ODP_CRYPTO_SES_CREATE_ERR_NONE;
@@ -705,17 +707,21 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
rc = process_des_param(session);
break;
case ODP_CIPHER_ALG_AES_CBC:
- /* deprecated */
+#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_CBC:
+#endif
rc = process_aes_param(session);
break;
- case ODP_CIPHER_ALG_AES_GCM:
- /* deprecated */
+#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_GCM:
+ if (param->auth_alg == ODP_AUTH_ALG_AES128_GCM)
+ aes_gcm = 1;
+ /* Fallthrough */
+#endif
+ case ODP_CIPHER_ALG_AES_GCM:
/* AES-GCM requires to do both auth and
* cipher at the same time */
- if (param->auth_alg == ODP_AUTH_ALG_AES_GCM ||
- param->auth_alg == ODP_AUTH_ALG_AES128_GCM)
+ if (param->auth_alg == ODP_AUTH_ALG_AES_GCM || aes_gcm)
rc = process_aes_gcm_param(session);
else
rc = -1;
@@ -731,6 +737,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
return -1;
}
+ aes_gcm = 0;
+
/* Process based on auth */
switch (param->auth_alg) {
case ODP_AUTH_ALG_NULL:
@@ -738,22 +746,27 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
rc = 0;
break;
case ODP_AUTH_ALG_MD5_HMAC:
- /* deprecated */
+#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_MD5_96:
+#endif
rc = process_auth_param(session, 96, 16, EVP_md5());
break;
case ODP_AUTH_ALG_SHA256_HMAC:
- /* deprecated */
+#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_SHA256_128:
+#endif
rc = process_auth_param(session, 128, 32, EVP_sha256());
break;
- case ODP_AUTH_ALG_AES_GCM:
- /* deprecated */
+#if ODP_DEPRECATED_API
case ODP_AUTH_ALG_AES128_GCM:
+ if (param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM)
+ aes_gcm = 1;
+ /* Fallthrough */
+#endif
+ case ODP_AUTH_ALG_AES_GCM:
/* AES-GCM requires to do both auth and
* cipher at the same time */
- if (param->cipher_alg == ODP_CIPHER_ALG_AES_GCM ||
- param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM) {
+ if (param->cipher_alg == ODP_CIPHER_ALG_AES_GCM || aes_gcm) {
session->auth.func = null_crypto_routine;
rc = 0;
} else {
@@ -779,10 +792,14 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
int odp_crypto_session_destroy(odp_crypto_session_t session)
{
odp_crypto_generic_session_t *generic;
+ int aes_gcm = 0;
generic = (odp_crypto_generic_session_t *)(intptr_t)session;
- if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES128_GCM ||
- generic->p.cipher_alg == ODP_CIPHER_ALG_AES_GCM)
+#if ODP_DEPRECATED_API
+ if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES128_GCM)
+ aes_gcm = 1;
+#endif
+ if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES_GCM || aes_gcm)
EVP_CIPHER_CTX_free(generic->cipher.data.aes_gcm.ctx);
memset(generic, 0, sizeof(*generic));
free_session(generic);
commit 0ee227d51cdb1cc29853dac0376e6e02b6e585de
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Feb 22 17:08:24 2017 +0200
linux-gen: crypto: sha-1 and sha-512 not implemented yet
Explicitly set capabilities to zero.
Signed-off-by: Petri Savolainen <petri.savolainen(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_crypto.c b/platform/linux-generic/odp_crypto.c
index c5473d95..de67ad36 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -561,7 +561,9 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.null = 1;
capa->auths.bit.md5_hmac = 1;
+ capa->auths.bit.sha1_hmac = 0;
capa->auths.bit.sha256_hmac = 1;
+ capa->auths.bit.sha512_hmac = 0;
capa->auths.bit.aes_gcm = 1;
/* Deprecated */
commit 658f6f27ed62c651d8555a4de0ef103191c491b1
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Feb 22 17:08:23 2017 +0200
api: crypto: add sha-1 and sha-512 enumerations
Added enumerations for HMAC-SHA-1 and HMAC-SHA-256 authentication
algorithms.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 9855bf98..d30f050f 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -102,12 +102,24 @@ typedef enum {
*/
ODP_AUTH_ALG_MD5_HMAC,
+ /** HMAC-SHA-1
+ *
+ * SHA-1 algorithm in HMAC mode
+ */
+ ODP_AUTH_ALG_SHA1_HMAC,
+
/** HMAC-SHA-256
*
* SHA-256 algorithm in HMAC mode
*/
ODP_AUTH_ALG_SHA256_HMAC,
+ /** HMAC-SHA-512
+ *
+ * SHA-512 algorithm in HMAC mode
+ */
+ ODP_AUTH_ALG_SHA512_HMAC,
+
/** AES in Galois/Counter Mode
*
* @note Must be paired with cipher ODP_CIPHER_ALG_AES_GCM
@@ -171,9 +183,15 @@ typedef union odp_crypto_auth_algos_t {
/** ODP_AUTH_ALG_MD5_HMAC */
uint32_t md5_hmac : 1;
+ /** ODP_AUTH_ALG_SHA1_HMAC */
+ uint32_t sha1_hmac : 1;
+
/** ODP_AUTH_ALG_SHA256_HMAC */
uint32_t sha256_hmac : 1;
+ /** ODP_AUTH_ALG_SHA512_HMAC */
+ uint32_t sha512_hmac : 1;
+
/** ODP_AUTH_ALG_AES_GCM */
uint32_t aes_gcm : 1;
commit b8de7dfbadb10da65a0a675db5f588cc3998508a
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Fri Apr 21 09:25:20 2017 -0500
api: classification: add additional doxygen documentation
Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2952 by adding
additional field documentation to avoid problems with doxygen 1.8.13
and higher.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h
index 0e1addd6..39831b24 100644
--- a/include/odp/api/spec/classification.h
+++ b/include/odp/api/spec/classification.h
@@ -366,7 +366,9 @@ typedef struct odp_pmr_param_t {
/** True if the value is range and false if match */
odp_bool_t range_term;
+ /** Variant mappings for types of matches */
union {
+ /** Parameters for single-valued matches */
struct {
/** Value to be matched */
const void *value;
@@ -374,6 +376,8 @@ typedef struct odp_pmr_param_t {
/** Masked set of bits to be matched */
const void *mask;
} match;
+
+ /** Parameter for range value matches */
struct {
/** Start and End values are included in the range */
/** start value of range */
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/include/odp_packet_socket.h | 7 -
platform/linux-generic/m4/configure.m4 | 2 +-
platform/linux-generic/pktio/socket.c | 183 ++++++---------------
3 files changed, 52 insertions(+), 140 deletions(-)
hooks/post-receive
--
8 years, 7 months
- 1
- 0