git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1207 discussions

[COMMIT] branch master updated. v1.21.0.0-130-gd1df2b551

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 d1df2b5511707783c2be6eda6c0d64663538bdfa (commit) from feac45e3ed8fa871ae7f9826d0c045591f22ce42 (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 d1df2b5511707783c2be6eda6c0d64663538bdfa Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Jun 10 12:39:47 2019 +0300 linux-gen: queue: configure max number of plain/scheduled queues Add separate defines (CONFIG_MAX_PLAIN_QUEUES, CONFIG_MAX_SCHED_QUEUES) for configuring the maximum number of plain and scheduled queues. ODP_CONFIG_QUEUES define has been renamed to CONFIG_MAX_QUEUES to clearly separate it from API defines. Queue IDs are now allocated consecutively per queue type (scheduled queues [0, CONFIG_MAX_SCHED_QUEUES[ and plain queues[CONFIG_MAX_SCHED_QUEUES, CONFIG_MAX_QUEUES[). This makes scheduler load balancing more predictable since allocating plain queues won't affect to scheduler internal queue mappings. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 27f1db599..2e1d61d36 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -22,14 +22,28 @@ extern "C" { #define ODP_CONFIG_POOLS 64 /* - * Maximum number of queues + * Queues reserved for ODP internal use */ -#define ODP_CONFIG_QUEUES 1024 +#define CONFIG_INTERNAL_QUEUES 64 /* - * Queues reserved for ODP internal use + * Maximum number of plain ODP queues + */ +#define CONFIG_MAX_PLAIN_QUEUES 1024 + +/* + * Maximum number of scheduled ODP queues + * + * Must be a power of two. + */ +#define CONFIG_MAX_SCHED_QUEUES 1024 + +/* + * Maximum number of queues */ -#define NUM_INTERNAL_QUEUES 64 +#define CONFIG_MAX_QUEUES (CONFIG_INTERNAL_QUEUES + \ + CONFIG_MAX_PLAIN_QUEUES + \ + CONFIG_MAX_SCHED_QUEUES) /* * Maximum number of ordered locks per queue diff --git a/platform/linux-generic/include/odp_queue_basic_internal.h b/platform/linux-generic/include/odp_queue_basic_internal.h index c8ed978ce..06cb34a87 100644 --- a/platform/linux-generic/include/odp_queue_basic_internal.h +++ b/platform/linux-generic/include/odp_queue_basic_internal.h @@ -72,7 +72,7 @@ union queue_entry_u { }; typedef struct queue_global_t { - queue_entry_t queue[ODP_CONFIG_QUEUES]; + queue_entry_t queue[CONFIG_MAX_QUEUES]; uint32_t *ring_data; uint32_t queue_lf_num; uint32_t queue_lf_size; diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 74ed1faad..1a3f0a5bc 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -52,13 +52,13 @@ static int queue_capa(odp_queue_capability_t *capa, int sched ODP_UNUSED) memset(capa, 0, sizeof(odp_queue_capability_t)); /* Reserve some queues for internal use */ - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; - capa->plain.max_num = capa->max_queues; + capa->max_queues = CONFIG_MAX_QUEUES - CONFIG_INTERNAL_QUEUES; + capa->plain.max_num = CONFIG_MAX_PLAIN_QUEUES; capa->plain.max_size = queue_glb->config.max_queue_size; capa->plain.lockfree.max_num = queue_glb->queue_lf_num; capa->plain.lockfree.max_size = queue_glb->queue_lf_size; #if ODP_DEPRECATED_API - capa->sched.max_num = capa->max_queues; + capa->sched.max_num = CONFIG_MAX_SCHED_QUEUES; capa->sched.max_size = queue_glb->config.max_queue_size; if (sched) { @@ -145,7 +145,7 @@ static int queue_init_global(void) memset(queue_glb, 0, sizeof(queue_global_t)); - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { /* init locks */ queue_entry_t *queue = qentry_from_index(i); LOCK_INIT(queue); @@ -159,7 +159,7 @@ static int queue_init_global(void) } queue_glb->queue_gbl_shm = shm; - mem_size = sizeof(uint32_t) * ODP_CONFIG_QUEUES * + mem_size = sizeof(uint32_t) * CONFIG_MAX_QUEUES * (uint64_t)queue_glb->config.max_queue_size; shm = odp_shm_reserve("_odp_queue_rings", mem_size, @@ -206,7 +206,7 @@ static int queue_term_global(void) queue_entry_t *queue; int i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue = qentry_from_index(i); LOCK(queue); if (queue->s.status != QUEUE_STATUS_FREE) { @@ -268,6 +268,7 @@ static odp_queue_t queue_create(const char *name, const odp_queue_param_t *param) { uint32_t i; + uint32_t max_idx; queue_entry_t *queue; void *queue_lf; odp_queue_type_t type; @@ -303,7 +304,18 @@ static odp_queue_t queue_create(const char *name, return ODP_QUEUE_INVALID; } - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + if (type == ODP_QUEUE_TYPE_SCHED) { + /* Start scheduled queue indices from zero to enable direct + * mapping to scheduler implementation indices. */ + i = 0; + max_idx = CONFIG_MAX_SCHED_QUEUES; + } else { + i = CONFIG_MAX_SCHED_QUEUES; + /* All internal queues are of type plain */ + max_idx = CONFIG_MAX_QUEUES; + } + + for (; i < max_idx; i++) { queue = qentry_from_index(i); if (queue->s.status != QUEUE_STATUS_FREE) @@ -446,7 +458,7 @@ static odp_queue_t queue_lookup(const char *name) { uint32_t i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue_entry_t *queue = qentry_from_index(i); if (queue->s.status == QUEUE_STATUS_FREE || @@ -634,7 +646,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) queue_id = queue_to_index(handle); - if (odp_unlikely(queue_id >= ODP_CONFIG_QUEUES)) { + if (odp_unlikely(queue_id >= CONFIG_MAX_QUEUES)) { ODP_ERR("Invalid queue handle: 0x%" PRIx64 "\n", odp_queue_to_u64(handle)); return -1; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index b4e62b08c..862122123 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -48,7 +48,7 @@ extern __thread sched_scalable_thread_state_t *sched_ts; extern _odp_queue_inline_offset_t _odp_queue_inline_offset; typedef struct queue_table_t { - queue_entry_t queue[ODP_CONFIG_QUEUES]; + queue_entry_t queue[CONFIG_MAX_QUEUES]; } queue_table_t; static queue_table_t *queue_tbl; @@ -214,10 +214,10 @@ static int queue_init_global(void) pool_size = sizeof(queue_table_t); /* Add storage required for queues */ pool_size += (CONFIG_SCAL_QUEUE_SIZE * - sizeof(odp_buffer_hdr_t *)) * ODP_CONFIG_QUEUES; + sizeof(odp_buffer_hdr_t *)) * CONFIG_MAX_QUEUES; /* Add the reorder window size */ - pool_size += sizeof(reorder_window_t) * ODP_CONFIG_QUEUES; + pool_size += sizeof(reorder_window_t) * CONFIG_MAX_QUEUES; /* Choose min_alloc and max_alloc such that buddy allocator is * is selected. */ @@ -242,7 +242,7 @@ static int queue_init_global(void) memset(queue_tbl, 0, sizeof(queue_table_t)); - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { /* init locks */ queue_entry_t *queue; @@ -277,7 +277,7 @@ static int queue_term_global(void) queue_entry_t *queue; int i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue = &queue_tbl->queue[i]; if (__atomic_load_n(&queue->s.status, __ATOMIC_RELAXED) != QUEUE_STATUS_FREE) { @@ -312,15 +312,15 @@ static int queue_capability(odp_queue_capability_t *capa) memset(capa, 0, sizeof(odp_queue_capability_t)); /* Reserve some queues for internal use */ - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_QUEUES - CONFIG_INTERNAL_QUEUES; #if ODP_DEPRECATED_API 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->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->sched.max_num = CONFIG_MAX_SCHED_QUEUES; capa->sched.max_size = 0; #endif - capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->plain.max_num = CONFIG_MAX_PLAIN_QUEUES; capa->plain.max_size = 0; return 0; @@ -358,6 +358,7 @@ static odp_queue_t queue_create(const char *name, const odp_queue_param_t *param) { int queue_idx; + int max_idx; queue_entry_t *queue; odp_queue_type_t type; odp_queue_param_t default_param; @@ -378,7 +379,18 @@ static odp_queue_t queue_create(const char *name, } } - for (queue_idx = 0; queue_idx < ODP_CONFIG_QUEUES; queue_idx++) { + if (type == ODP_QUEUE_TYPE_SCHED) { + /* Start scheduled queue indices from zero to enable direct + * mapping to scheduler implementation indices. */ + queue_idx = 0; + max_idx = CONFIG_MAX_SCHED_QUEUES; + } else { + queue_idx = CONFIG_MAX_SCHED_QUEUES; + /* All internal queues are of type plain */ + max_idx = CONFIG_MAX_QUEUES; + } + + for (; queue_idx < max_idx; queue_idx++) { queue = &queue_tbl->queue[queue_idx]; if (queue->s.status != QUEUE_STATUS_FREE) @@ -490,7 +502,7 @@ static odp_queue_t queue_lookup(const char *name) { uint32_t i; - for (i = 0; i < ODP_CONFIG_QUEUES; i++) { + for (i = 0; i < CONFIG_MAX_QUEUES; i++) { queue_entry_t *queue = &queue_tbl->queue[i]; if (queue->s.status == QUEUE_STATUS_FREE || @@ -905,7 +917,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) queue_id = queue_to_id(handle); - if (odp_unlikely(queue_id >= ODP_CONFIG_QUEUES)) { + if (odp_unlikely(queue_id >= CONFIG_MAX_QUEUES)) { ODP_ERR("Invalid queue handle:%" PRIu64 "\n", odp_queue_to_u64(handle)); return -1; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 4b054b86c..d70258475 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -67,10 +67,10 @@ /* Maximum priority queue ring size. A ring must be large enough to store all * queues in the worst case (all queues are scheduled, have the same priority * and no spreading). */ -#define MAX_RING_SIZE ODP_CONFIG_QUEUES +#define MAX_RING_SIZE CONFIG_MAX_SCHED_QUEUES /* For best performance, the number of queues should be a power of two. */ -ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(CONFIG_MAX_SCHED_QUEUES), "Number_of_queues_is_not_power_of_two"); /* Ring size must be power of two, so that mask can be used. */ @@ -197,7 +197,7 @@ typedef struct { uint8_t poll_pktin; uint8_t pktio_index; uint8_t pktin_index; - } queue[ODP_CONFIG_QUEUES]; + } queue[CONFIG_MAX_SCHED_QUEUES]; /* Scheduler priority queues */ prio_queue_t prio_q[NUM_SCHED_GRPS][NUM_PRIO][MAX_SPREAD]; @@ -218,7 +218,7 @@ typedef struct { } pktio[NUM_PKTIO]; odp_spinlock_t pktio_lock; - order_context_t order[ODP_CONFIG_QUEUES]; + order_context_t order[CONFIG_MAX_SCHED_QUEUES]; /* Scheduler interface config options (not used in fast path) */ schedule_config_t config_if; @@ -807,7 +807,7 @@ static int schedule_term_local(void) static void schedule_config_init(odp_schedule_config_t *config) { - config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + config->num_queues = CONFIG_MAX_SCHED_QUEUES; config->queue_size = queue_glb->config.max_queue_size; } @@ -1585,7 +1585,7 @@ static int schedule_capability(odp_schedule_capability_t *capa) capa->max_ordered_locks = schedule_max_ordered_locks(); capa->max_groups = schedule_num_grps(); capa->max_prios = schedule_num_prio(); - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_SCHED_QUEUES; capa->max_queue_size = queue_glb->config.max_queue_size; capa->max_flow_id = BUF_HDR_MAX_FLOW_ID; diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 326c49e3f..d6d6d9ef6 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -46,7 +46,7 @@ #define FLAG_PKTIN 0x80 -ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), +ODP_STATIC_ASSERT(CHECK_IS_POWER2(CONFIG_MAX_SCHED_QUEUES), "Number_of_queues_is_not_power_of_two"); #define SCHED_GROUP_JOIN 0 @@ -1996,7 +1996,7 @@ static int schedule_term_local(void) static void schedule_config_init(odp_schedule_config_t *config) { - config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + config->num_queues = CONFIG_MAX_SCHED_QUEUES; config->queue_size = 0; /* FIXME ? */ } @@ -2128,7 +2128,7 @@ static int schedule_capability(odp_schedule_capability_t *capa) capa->max_ordered_locks = schedule_max_ordered_locks(); capa->max_groups = num_grps(); capa->max_prios = schedule_num_prio(); - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_SCHED_QUEUES; capa->max_queue_size = 0; return 0; diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 1c52cc18d..79e985c09 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -24,7 +24,7 @@ #include <odp_queue_basic_internal.h> #define NUM_THREAD ODP_THREAD_COUNT_MAX -#define NUM_QUEUE ODP_CONFIG_QUEUES +#define NUM_QUEUE CONFIG_MAX_SCHED_QUEUES #define NUM_PKTIO ODP_CONFIG_PKTIO_ENTRIES #define NUM_ORDERED_LOCKS 1 #define NUM_STATIC_GROUP 3 @@ -260,7 +260,7 @@ static int term_local(void) static void schedule_config_init(odp_schedule_config_t *config) { - config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + config->num_queues = CONFIG_MAX_SCHED_QUEUES; config->queue_size = queue_glb->config.max_queue_size; } @@ -951,7 +951,7 @@ static int schedule_capability(odp_schedule_capability_t *capa) capa->max_ordered_locks = max_ordered_locks(); capa->max_groups = num_grps(); capa->max_prios = schedule_num_prio(); - capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES; + capa->max_queues = CONFIG_MAX_SCHED_QUEUES; capa->max_queue_size = queue_glb->config.max_queue_size; return 0; ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_config_internal.h | 22 +++++++++++--- .../include/odp_queue_basic_internal.h | 2 +- platform/linux-generic/odp_queue_basic.c | 30 +++++++++++++------ platform/linux-generic/odp_queue_scalable.c | 34 +++++++++++++++------- platform/linux-generic/odp_schedule_basic.c | 12 ++++---- platform/linux-generic/odp_schedule_scalable.c | 6 ++-- platform/linux-generic/odp_schedule_sp.c | 6 ++-- 7 files changed, 75 insertions(+), 37 deletions(-) hooks/post-receive --

6 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-129-gfeac45e3e

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 feac45e3ed8fa871ae7f9826d0c045591f22ce42 (commit) via e4ef7a3b32d375e3e1872a43697d407413ae87aa (commit) via 762e4c51fc0d61bee8e740370fa6c64f86a5ee6c (commit) from 6a30a1beb7ec2182239ea3ba1ef71a6f9a944df9 (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 feac45e3ed8fa871ae7f9826d0c045591f22ce42 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 5 14:26:13 2019 +0300 example: time: include into make check Run time example as part of 'make check'. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/time/Makefile.am b/example/time/Makefile.am index bda908761..5621ef99e 100644 --- a/example/time/Makefile.am +++ b/example/time/Makefile.am @@ -2,4 +2,8 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_time_global +if test_example +TESTS = odp_time_global +endif + odp_time_global_SOURCES = time_global_test.c commit e4ef7a3b32d375e3e1872a43697d407413ae87aa Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Jun 6 10:32:23 2019 +0300 example: time: fix deadlock with single worker Random id calculation did get stuck when there's only single worker (as id is always one). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index efcd22984..1e5cb0bd4 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -84,20 +84,23 @@ static void print_log(test_globals_t *gbls) printf("Number of errors: %u\n", err_num); } -static void -generate_next_queue(test_globals_t *gbls, odp_queue_t *queue, unsigned int id) +static void generate_next_queue(test_globals_t *gbls, odp_queue_t *queue, + unsigned int id) { int thr; - unsigned int rand_id; + uint8_t rand_u8; char queue_name[sizeof(QUEUE_NAME_PREFIX) + 2]; + unsigned int rand_id = 1; thr = odp_thread_id(); /* generate next random id */ - do { - odp_random_data((uint8_t *)&rand_id, sizeof(rand_id), 1); - rand_id = rand_id % gbls->thread_num + 1; - } while (rand_id == id); + if (gbls->thread_num > 1) { + do { + odp_random_data(&rand_u8, 1, ODP_RANDOM_BASIC); + rand_id = rand_u8 % gbls->thread_num + 1; + } while (rand_id == id); + } sprintf(queue_name, QUEUE_NAME_PREFIX "%d", rand_id); *queue = odp_queue_lookup(queue_name); commit 762e4c51fc0d61bee8e740370fa6c64f86a5ee6c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Jun 5 14:15:19 2019 +0300 example: time: increase pool size Since pool implementation may stash buffers per thread, pool size of one buffer per thread is not enough to ensure that every thread can allocate a buffer. Use similar pool size than other multi-threaded test applications. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index 0c4b5286c..efcd22984 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -11,6 +11,7 @@ #include <odp/helper/odph_api.h> #define MAX_WORKERS 32 +#define MAX_NUM_BUF 8192 #define ITERATION_NUM 2048 #define LOG_BASE 8 #define LOG_ENTRY_SIZE 19 @@ -250,7 +251,8 @@ int main(int argc, char *argv[]) int num_workers; test_globals_t *gbls; odp_cpumask_t cpumask; - odp_pool_param_t params; + odp_pool_capability_t pool_capa; + odp_pool_param_t pool_param; odp_shm_t shm_glbls = ODP_SHM_INVALID; odp_shm_t shm_log = ODP_SHM_INVALID; int log_size, log_enries_num; @@ -319,12 +321,23 @@ int main(int argc, char *argv[]) odp_barrier_init(&gbls->end_barrier, num_workers); memset(gbls->log, 0, log_size); - params.buf.size = sizeof(timestamp_event_t); - params.buf.align = ODP_CACHE_LINE_SIZE; - params.buf.num = num_workers; - params.type = ODP_POOL_BUFFER; + if (odp_pool_capability(&pool_capa)) { + err = 1; + EXAMPLE_ERR("Error: pool capability failed.\n"); + goto err; + } + + odp_pool_param_init(&pool_param); + + pool_param.buf.size = sizeof(timestamp_event_t); + pool_param.buf.align = ODP_CACHE_LINE_SIZE; + pool_param.buf.num = MAX_NUM_BUF; + pool_param.type = ODP_POOL_BUFFER; + + if (pool_capa.buf.max_num && MAX_NUM_BUF > pool_capa.buf.max_num) + pool_param.buf.num = pool_capa.buf.max_num; - pool = odp_pool_create("time buffers pool", &params); + pool = odp_pool_create("time buffers pool", &pool_param); if (pool == ODP_POOL_INVALID) { err = 1; EXAMPLE_ERR("Pool create failed.\n"); ----------------------------------------------------------------------- Summary of changes: example/time/Makefile.am | 4 ++++ example/time/time_global_test.c | 42 ++++++++++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 13 deletions(-) hooks/post-receive --

6 years, 8 months

[COMMIT] branch master updated. v1.21.0.0-126-g6a30a1beb

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 6a30a1beb7ec2182239ea3ba1ef71a6f9a944df9 (commit) via a643bfe4210827d43dde0e6d69097decc2fa77d0 (commit) via 03490694085060aec7de6d21ef674f461adcf373 (commit) from e2786e3ed30405b16da8080e2b0ed11b0fd52fc7 (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 6a30a1beb7ec2182239ea3ba1ef71a6f9a944df9 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon May 27 10:19:17 2019 +0300 linux-gen: pcapng: limit internal symbol visibility to odp library Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_pcapng.h b/platform/linux-generic/include/odp_pcapng.h index 8e0e624e8..b88427238 100644 --- a/platform/linux-generic/include/odp_pcapng.h +++ b/platform/linux-generic/include/odp_pcapng.h @@ -1,56 +1,29 @@ /* Copyright (c) 2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ -#include <sys/types.h> +#ifndef ODP_PCAPNG_H_ +#define ODP_PCAPNG_H_ -#include <odp_packet_io_internal.h> - -#define PCAPNG_BLOCK_TYPE_EPB 0x00000006UL -#define PCAPNG_BLOCK_TYPE_SHB 0x0A0D0D0AUL -#define PCAPNG_BLOCK_TYPE_IDB 0x00000001UL -#define PCAPNG_ENDIAN_MAGIC 0x1A2B3C4DUL -#define PCAPNG_DATA_ALIGN 4 -#define PCAPNG_LINKTYPE_ETHERNET 0x1 +#ifdef __cplusplus +extern "C" { +#endif -/* inotify */ -#define INOTIFY_BUF_LEN (16 * (sizeof(struct inotify_event))) -#define PCAPNG_WATCH_DIR "/var/run/odp/" +#include <odp/api/packet.h> +#include <odp_packet_io_internal.h> -/* pcapng: enhanced packet block file encoding */ -typedef struct ODP_PACKED pcapng_section_hdr_block_s { - uint32_t block_type; - uint32_t block_total_length; - uint32_t magic; - uint16_t version_major; - uint16_t version_minor; - int64_t section_len; - uint32_t block_total_length2; -} pcapng_section_hdr_block_t; +#include <stdint.h> -typedef struct pcapng_interface_description_block { - uint32_t block_type; - uint32_t block_total_length; - uint16_t linktype; - uint16_t reserved; - uint32_t snaplen; - uint32_t block_total_length2; -} pcapng_interface_description_block_t; +int _odp_pcapng_start(pktio_entry_t *entry); +void _odp_pcapng_stop(pktio_entry_t *entry); +int _odp_pcapng_write_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num); -typedef struct pcapng_enhanced_packet_block_s { - uint32_t block_type; - uint32_t block_total_length; - uint32_t interface_idx; - uint32_t timestamp_high; - uint32_t timestamp_low; - uint32_t captured_len; - uint32_t packet_len; -} pcapng_enhanced_packet_block_t; +#ifdef __cplusplus +} +#endif -int pcapng_prepare(pktio_entry_t *entry); -void pcapng_destroy(pktio_entry_t *entry); -int write_pcapng_hdr(pktio_entry_t *entry, int qidx); -int write_pcapng_pkts(pktio_entry_t *entry, int qidx, - const odp_packet_t packets[], int num); +#endif /* ODP_PCAPNG_H_ */ diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 097618a3e..1bf0469e7 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -530,8 +530,8 @@ int odp_pktio_start(odp_pktio_t hdl) entry->s.name, entry->s.num_in_queue, entry->s.num_out_queue); if (_ODP_PCAPNG) { - if (pcapng_prepare(entry)) - ODP_ERR("pcap init failed, won't capture\n"); + if (_odp_pcapng_start(entry)) + ODP_ERR("pcapng start failed, won't capture\n"); } return res; @@ -559,7 +559,7 @@ static int _pktio_stop(pktio_entry_t *entry) entry->s.state = PKTIO_STATE_STOPPED; if (_ODP_PCAPNG) - pcapng_destroy(entry); + _odp_pcapng_stop(entry); return res; } @@ -1758,7 +1758,7 @@ static inline void _odp_dump_pcapng_pkts(pktio_entry_t *entry, int qidx, const odp_packet_t packets[], int num) { if (odp_unlikely(entry->s.pcapng.state[qidx] == PCAPNG_WR_PKT)) - write_pcapng_pkts(entry, qidx, packets, num); + _odp_pcapng_write_pkts(entry, qidx, packets, num); } int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num) diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c index cf7cd978e..b6d91fbc8 100644 --- a/platform/linux-generic/odp_pcapng.c +++ b/platform/linux-generic/odp_pcapng.c @@ -28,6 +28,47 @@ #include <sys/inotify.h> #include <sys/select.h> +#define PCAPNG_BLOCK_TYPE_EPB 0x00000006UL +#define PCAPNG_BLOCK_TYPE_SHB 0x0A0D0D0AUL +#define PCAPNG_BLOCK_TYPE_IDB 0x00000001UL +#define PCAPNG_ENDIAN_MAGIC 0x1A2B3C4DUL +#define PCAPNG_DATA_ALIGN 4 +#define PCAPNG_LINKTYPE_ETHERNET 0x1 + +/* inotify */ +#define INOTIFY_BUF_LEN (16 * (sizeof(struct inotify_event))) +#define PCAPNG_WATCH_DIR "/var/run/odp/" + +/* pcapng: enhanced packet block file encoding */ +typedef struct ODP_PACKED pcapng_section_hdr_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t magic; + uint16_t version_major; + uint16_t version_minor; + int64_t section_len; + uint32_t block_total_length2; +} pcapng_section_hdr_block_t; + +typedef struct pcapng_interface_description_block { + uint32_t block_type; + uint32_t block_total_length; + uint16_t linktype; + uint16_t reserved; + uint32_t snaplen; + uint32_t block_total_length2; +} pcapng_interface_description_block_t; + +typedef struct pcapng_enhanced_packet_block_s { + uint32_t block_type; + uint32_t block_total_length; + uint32_t interface_idx; + uint32_t timestamp_high; + uint32_t timestamp_low; + uint32_t captured_len; + uint32_t packet_len; +} pcapng_enhanced_packet_block_t; + typedef struct ODP_ALIGNED_CACHE { odp_shm_t shm; pktio_entry_t *entry[ODP_CONFIG_PKTIO_ENTRIES]; @@ -41,6 +82,8 @@ typedef struct ODP_ALIGNED_CACHE { static pcapng_global_t *pcapng_gbl; +int write_pcapng_hdr(pktio_entry_t *entry, int qidx); + int _odp_pcapng_init_global(void) { odp_shm_t shm; @@ -241,7 +284,7 @@ static int get_fifo_max_size(void) return ret; } -int pcapng_prepare(pktio_entry_t *entry) +int _odp_pcapng_start(pktio_entry_t *entry) { int ret = -1, fd; pthread_attr_t attr; @@ -342,12 +385,12 @@ int pcapng_prepare(pktio_entry_t *entry) out_destroy: odp_spinlock_unlock(&pcapng_gbl->lock); - pcapng_destroy(entry); + _odp_pcapng_stop(entry); return ret; } -void pcapng_destroy(pktio_entry_t *entry) +void _odp_pcapng_stop(pktio_entry_t *entry) { int ret; unsigned int i; @@ -465,8 +508,8 @@ static ssize_t write_fifo(int fd, struct iovec *iov, int iovcnt) return len; } -int write_pcapng_pkts(pktio_entry_t *entry, int qidx, - const odp_packet_t packets[], int num) +int _odp_pcapng_write_pkts(pktio_entry_t *entry, int qidx, + const odp_packet_t packets[], int num) { int i = 0; struct iovec packet_iov[3 * num]; commit a643bfe4210827d43dde0e6d69097decc2fa77d0 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 24 17:32:36 2019 +0300 linux-gen: pcapng: support simultaneous capture from multiple devices Previously, one could capture traffic only from the first started pktio device. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Jari Mustajärvi <jari.mustajarvi(a)nokia-bell-labs.com> diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h index a12d12973..fdb057b3e 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -65,10 +65,6 @@ struct odp_global_data_ro_t { /* Modifiable global data. Memory region is shared and synchronized amongst all * worker processes. */ struct odp_global_data_rw_t { - int inotify_pcapng_fd; - int inotify_watch_fd; - pthread_t inotify_thread; - int inotify_pcapng_is_running; odp_bool_t dpdk_initialized; odp_bool_t inline_timers; }; diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 57ea79f98..204f44838 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -25,6 +25,9 @@ int odp_thread_init_local(odp_thread_type_t type); int odp_thread_term_local(void); int odp_thread_term_global(void); +int _odp_pcapng_init_global(void); +int _odp_pcapng_term_global(void); + int odp_pool_init_global(void); int odp_pool_init_local(void); int odp_pool_term_global(void); diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4954d5f04..097618a3e 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -97,6 +98,13 @@ int odp_pktio_init_global(void) } } + if (_ODP_PCAPNG) { + if (_odp_pcapng_init_global()) { + ODP_ERR("Failed to initialize pcapng\n"); + return -1; + } + } + return 0; } @@ -1277,6 +1285,12 @@ int odp_pktio_term_global(void) pktio_if); } + if (_ODP_PCAPNG) { + ret = _odp_pcapng_term_global(); + if (ret) + ODP_ERR("Failed to terminate pcapng\n"); + } + ret = odp_shm_free(odp_shm_lookup("_odp_pktio_entries")); if (ret != 0) ODP_ERR("shm free failed for _odp_pktio_entries"); diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c index e1f7ac08f..cf7cd978e 100644 --- a/platform/linux-generic/odp_pcapng.c +++ b/platform/linux-generic/odp_pcapng.c @@ -1,4 +1,5 @@ /* Copyright (c) 2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -8,11 +9,14 @@ #if defined(_ODP_PCAPNG) && _ODP_PCAPNG == 1 +#include <odp_pcapng.h> +#include <odp/api/plat/packet_inlines.h> +#include <odp/api/shared_memory.h> +#include <odp_init_internal.h> #include <odp_macros_internal.h> #include <odp_packet_io_internal.h> -#include <odp/api/plat/packet_inlines.h> #include <odp_posix_extensions.h> -#include <odp_pcapng.h> +#include <odp/api/spinlock.h> #include <errno.h> #include <fcntl.h> @@ -24,6 +28,50 @@ #include <sys/inotify.h> #include <sys/select.h> +typedef struct ODP_ALIGNED_CACHE { + odp_shm_t shm; + pktio_entry_t *entry[ODP_CONFIG_PKTIO_ENTRIES]; + int num_entries; + pthread_t inotify_thread; + int inotify_fd; + int inotify_watch_fd; + int inotify_is_running; + odp_spinlock_t lock; +} pcapng_global_t; + +static pcapng_global_t *pcapng_gbl; + +int _odp_pcapng_init_global(void) +{ + odp_shm_t shm; + + shm = odp_shm_reserve("_odp_pcapng_gbl", sizeof(pcapng_global_t), + ODP_PAGE_SIZE, 0); + if (shm == ODP_SHM_INVALID) + return -1; + + pcapng_gbl = odp_shm_addr(shm); + + memset(pcapng_gbl, 0, sizeof(pcapng_global_t)); + pcapng_gbl->shm = shm; + + odp_spinlock_init(&pcapng_gbl->lock); + + return 0; +} + +int _odp_pcapng_term_global(void) +{ + int ret = 0; + + if (odp_shm_free(pcapng_gbl->shm)) { + ODP_ERR("shm free failed"); + ret = -1; + } + + return ret; +} + static void pcapng_drain_fifo(int fd) { char buffer[4096]; @@ -108,42 +156,66 @@ static int get_qidx_from_fifo(pktio_entry_t *entry, char *name) return -1; } +static pktio_entry_t *pktio_from_event(struct inotify_event *event) +{ + int i; + + odp_spinlock_lock(&pcapng_gbl->lock); + + for (i = 0; i < ODP_CONFIG_PKTIO_ENTRIES; i++) { + pktio_entry_t *entry = pcapng_gbl->entry[i]; + + if (entry == NULL) + continue; + + if (get_qidx_from_fifo(entry, event->name) != -1) { + odp_spinlock_unlock(&pcapng_gbl->lock); + return entry; + } + } + + odp_spinlock_unlock(&pcapng_gbl->lock); + + return NULL; +} + static void *inotify_update(void *arg) { - pktio_entry_t *entry = (pktio_entry_t *)arg; struct timeval time; ssize_t rdlen; int offset; char buffer[INOTIFY_BUF_LEN]; fd_set rfds; + int inotify_fd = *(int *)arg; while (1) { offset = 0; FD_ZERO(&rfds); - FD_SET(odp_global_rw->inotify_pcapng_fd, &rfds); + FD_SET(inotify_fd, &rfds); time.tv_sec = 2; time.tv_usec = 0; - select(odp_global_rw->inotify_pcapng_fd + 1, &rfds, NULL, - NULL, &time); - if (FD_ISSET(odp_global_rw->inotify_pcapng_fd, &rfds)) { - rdlen = read(odp_global_rw->inotify_pcapng_fd, - buffer, INOTIFY_BUF_LEN); + select(inotify_fd + 1, &rfds, NULL, NULL, &time); + if (FD_ISSET(inotify_fd, &rfds)) { + rdlen = read(inotify_fd, buffer, INOTIFY_BUF_LEN); while (offset < rdlen) { int qidx; struct inotify_event *event = (struct inotify_event *)(void *) &buffer[offset]; + pktio_entry_t *entry; - qidx = get_qidx_from_fifo(entry, event->name); - if (qidx == -1) { - offset += sizeof(struct inotify_event) + + offset += sizeof(struct inotify_event) + event->len; + + entry = pktio_from_event(event); + if (entry == NULL) + continue; + + qidx = get_qidx_from_fifo(entry, event->name); + if (qidx == -1) continue; - } inotify_event_handle(entry, qidx, event); - offset += sizeof(struct inotify_event) + - event->len; } } } @@ -222,24 +294,30 @@ int pcapng_prepare(pktio_entry_t *entry) entry->s.pcapng.fd[i] = fd; } + odp_spinlock_lock(&pcapng_gbl->lock); + /* already running from a previous pktio */ - if (odp_global_rw->inotify_pcapng_is_running == 1) + if (pcapng_gbl->inotify_is_running == 1) { + pcapng_gbl->entry[odp_pktio_index(entry->s.handle)] = entry; + pcapng_gbl->num_entries++; + odp_spinlock_unlock(&pcapng_gbl->lock); return 0; + } - odp_global_rw->inotify_pcapng_fd = -1; - odp_global_rw->inotify_watch_fd = -1; + pcapng_gbl->inotify_fd = -1; + pcapng_gbl->inotify_watch_fd = -1; - odp_global_rw->inotify_pcapng_fd = inotify_init(); - if (odp_global_rw->inotify_pcapng_fd == -1) { + pcapng_gbl->inotify_fd = inotify_init(); + if (pcapng_gbl->inotify_fd == -1) { ODP_ERR("can't init inotify. pcap disabled\n"); goto out_destroy; } - odp_global_rw->inotify_watch_fd = - inotify_add_watch(odp_global_rw->inotify_pcapng_fd, - PCAPNG_WATCH_DIR, IN_CLOSE | IN_OPEN); + pcapng_gbl->inotify_watch_fd = inotify_add_watch(pcapng_gbl->inotify_fd, + PCAPNG_WATCH_DIR, + IN_CLOSE | IN_OPEN); - if (odp_global_rw->inotify_watch_fd == -1) { + if (pcapng_gbl->inotify_watch_fd == -1) { ODP_ERR("can't register inotify for %s. pcap disabled\n", strerror(errno)); goto out_destroy; @@ -247,16 +325,23 @@ int pcapng_prepare(pktio_entry_t *entry) /* create a thread to poll inotify triggers */ pthread_attr_init(&attr); - ret = pthread_create(&odp_global_rw->inotify_thread, &attr, - inotify_update, entry); - if (ret) + ret = pthread_create(&pcapng_gbl->inotify_thread, &attr, inotify_update, + &pcapng_gbl->inotify_fd); + if (ret) { ODP_ERR("can't start inotify thread. pcap disabled\n"); - else - odp_global_rw->inotify_pcapng_is_running = 1; + } else { + pcapng_gbl->entry[odp_pktio_index(entry->s.handle)] = entry; + pcapng_gbl->num_entries++; + pcapng_gbl->inotify_is_running = 1; + } + + odp_spinlock_unlock(&pcapng_gbl->lock); return ret; out_destroy: + odp_spinlock_unlock(&pcapng_gbl->lock); + pcapng_destroy(entry); return ret; @@ -269,24 +354,36 @@ void pcapng_destroy(pktio_entry_t *entry) unsigned int max_queue = MAX(entry->s.num_in_queue, entry->s.num_out_queue); - if (odp_global_rw->inotify_pcapng_is_running == 1) { - ret = pthread_cancel(odp_global_rw->inotify_thread); + odp_spinlock_lock(&pcapng_gbl->lock); + + pcapng_gbl->entry[odp_pktio_index(entry->s.handle)] = NULL; + pcapng_gbl->num_entries--; + + if (pcapng_gbl->inotify_is_running == 1 && + pcapng_gbl->num_entries == 0) { + ret = pthread_cancel(pcapng_gbl->inotify_thread); if (ret) ODP_ERR("can't cancel inotify thread %s\n", strerror(errno)); + pcapng_gbl->inotify_is_running = 0; } - /* fd's will be -1 in case of any failure */ - ret = inotify_rm_watch(odp_global_rw->inotify_pcapng_fd, - odp_global_rw->inotify_watch_fd); - if (ret) - ODP_ERR("can't deregister inotify %s\n", strerror(errno)); + if (pcapng_gbl->num_entries == 0) { + /* fd's will be -1 in case of any failure */ + ret = inotify_rm_watch(pcapng_gbl->inotify_fd, + pcapng_gbl->inotify_watch_fd); + if (ret) + ODP_ERR("can't deregister inotify %s\n", + strerror(errno)); + + if (pcapng_gbl->inotify_fd != -1) + close(pcapng_gbl->inotify_fd); - if (odp_global_rw->inotify_pcapng_fd != -1) - close(odp_global_rw->inotify_pcapng_fd); + if (pcapng_gbl->inotify_watch_fd != -1) + close(pcapng_gbl->inotify_watch_fd); + } - if (odp_global_rw->inotify_watch_fd != -1) - close(odp_global_rw->inotify_watch_fd); + odp_spinlock_unlock(&pcapng_gbl->lock); for (i = 0; i < max_queue; i++) { char pcapng_name[128]; commit 03490694085060aec7de6d21ef674f461adcf373 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 24 12:57:06 2019 +0300 linux-gen: pcapng: set pipe read permissions Make pipe readable by other processes. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Jari Mustajärvi <jari.mustajarvi(a)nokia-bell-labs.com> diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c index 21fa7b2c5..e1f7ac08f 100644 --- a/platform/linux-generic/odp_pcapng.c +++ b/platform/linux-generic/odp_pcapng.c @@ -199,6 +199,10 @@ int pcapng_prepare(pktio_entry_t *entry) continue; } + if (chmod(pcapng_path, S_IRUSR | S_IRGRP)) + ODP_ERR("Failed to change file permission for %s %s\n", + pcapng_path, strerror(errno)); + fd = open(pcapng_path, O_RDWR | O_NONBLOCK); if (fd == -1) { ODP_ERR("Fail to open fifo\n"); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_global_data.h | 4 - platform/linux-generic/include/odp_init_internal.h | 3 + platform/linux-generic/include/odp_pcapng.h | 61 ++---- platform/linux-generic/odp_packet_io.c | 22 +- platform/linux-generic/odp_pcapng.c | 234 +++++++++++++++++---- 5 files changed, 227 insertions(+), 97 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-123-ge2786e3ed

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 e2786e3ed30405b16da8080e2b0ed11b0fd52fc7 (commit) via 6c34ea307f8d9ab91d4e3d752468996fbf3a9fc4 (commit) via ccd90637cf66ef20219719cf636be2e84a93b9ad (commit) via 22dcfae29a2dc7f0ee00c6d807db1f4424bf9c63 (commit) via 4f0e6037a7037c0879062f2b1ead0503f45ae623 (commit) via 47fae268aef777b8d523dca43d0b50f8139bc8cf (commit) via 2600af0ade3c254ba00a935a38647d6d15611586 (commit) via 6280e54ea0a69276f3e1cbadd981f28dd2fb253a (commit) via b78412a08ad0435ace4d2980a38fa44b1fddbf96 (commit) via 5422332ff596b8cef9d5518b7bff6ab9b4b38b09 (commit) via 9eeb94e6d03923a67779314c62e32e410e1272d8 (commit) via 064dbc1d3b0d284ae7ab4db5e20fa0f6f2ce8c56 (commit) from 78364dc1d53a1a4c4918ce0a82d02fe56f0abb54 (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 e2786e3ed30405b16da8080e2b0ed11b0fd52fc7 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 13 16:56:48 2019 +0300 api: update version number to 1.21.6 Increment version number to reflect timer API specification update and additional features. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/configure.ac b/configure.ac index 83765d9c9..8f9de1489 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.5]) ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [21]) -m4_define([odpapi_minor_version], [5]) +m4_define([odpapi_minor_version], [6]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) commit 6c34ea307f8d9ab91d4e3d752468996fbf3a9fc4 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 16 15:26:25 2019 +0300 validation: time: test min and hour constants Check that the new constants are defined. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index 38c0906ba..2113c5461 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -28,6 +28,17 @@ static void time_test_constants(void) { uint64_t ns; + CU_ASSERT(ODP_TIME_USEC_IN_NS == 1000); + + ns = ODP_TIME_HOUR_IN_NS; + CU_ASSERT(ns == 60 * ODP_TIME_MIN_IN_NS); + ns = ODP_TIME_MIN_IN_NS; + CU_ASSERT(ns == 60 * ODP_TIME_SEC_IN_NS); + ns = ODP_TIME_SEC_IN_NS; + CU_ASSERT(ns == 1000 * ODP_TIME_MSEC_IN_NS); + ns = ODP_TIME_MSEC_IN_NS; + CU_ASSERT(ns == 1000 * ODP_TIME_USEC_IN_NS); + ns = ODP_TIME_SEC_IN_NS / 1000; CU_ASSERT(ns == ODP_TIME_MSEC_IN_NS); ns /= 1000; commit ccd90637cf66ef20219719cf636be2e84a93b9ad Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 16 15:16:05 2019 +0300 api: time: add defines for minute and hour Defines for a minute and an hour are useful e.g. when setting timers for a bit longer (background, session lifetime, etc) timeouts. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/time.h b/include/odp/api/spec/time.h index f79f4a8ac..b96fc077e 100644 --- a/include/odp/api/spec/time.h +++ b/include/odp/api/spec/time.h @@ -22,10 +22,20 @@ extern "C" { * @{ */ -/* Time in nanoseconds */ -#define ODP_TIME_USEC_IN_NS 1000ULL /**< Microsecond in nsec */ -#define ODP_TIME_MSEC_IN_NS 1000000ULL /**< Millisecond in nsec */ -#define ODP_TIME_SEC_IN_NS 1000000000ULL /**< Second in nsec */ +/** A microsecond in nanoseconds */ +#define ODP_TIME_USEC_IN_NS 1000ULL + +/** A millisecond in nanoseconds */ +#define ODP_TIME_MSEC_IN_NS 1000000ULL + +/** A second in nanoseconds */ +#define ODP_TIME_SEC_IN_NS 1000000000ULL + +/** A minute in nanoseconds */ +#define ODP_TIME_MIN_IN_NS 60000000000ULL + +/** An hour in nanoseconds */ +#define ODP_TIME_HOUR_IN_NS 3600000000000ULL /** * @typedef odp_time_t commit 22dcfae29a2dc7f0ee00c6d807db1f4424bf9c63 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed May 15 17:21:19 2019 +0300 validation: timer: add timeout limit tests Test min/max timeouts with the highest resolution and longest timeout parameters. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 56702ae2d..c0527c2e1 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -699,7 +699,7 @@ static void timer_test_sched_queue(void) timer_test_queue_type(ODP_QUEUE_TYPE_SCHED); } -static void timer_test_odp_timer_cancel(void) +static void timer_test_cancel(void) { odp_pool_t pool; odp_pool_param_t params; @@ -786,6 +786,213 @@ static void timer_test_odp_timer_cancel(void) CU_FAIL_FATAL("Failed to destroy pool"); } +static void timer_test_tmo_limit(odp_queue_type_t queue_type, + int max_res, int min) +{ + odp_timer_capability_t timer_capa; + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_queue_param_t queue_param; + odp_timer_pool_param_t timer_param; + odp_timer_pool_t timer_pool; + odp_queue_t queue; + odp_timeout_t tmo; + odp_event_t ev; + odp_time_t t1, t2; + uint64_t res_ns, min_tmo, max_tmo; + uint64_t tmo_ns, tmo_tick, diff_ns, max_wait; + int i, ret, num_tmo; + int num = 5; + odp_timer_t timer[num]; + + memset(&timer_capa, 0, sizeof(timer_capa)); + ret = odp_timer_capability(ODP_CLOCK_CPU, &timer_capa); + CU_ASSERT_FATAL(ret == 0); + + if (max_res) { + /* Maximum resolution parameters */ + res_ns = timer_capa.max_res.res_ns; + min_tmo = timer_capa.max_res.min_tmo; + max_tmo = timer_capa.max_res.max_tmo; + } else { + /* Maximum timeout parameters */ + res_ns = timer_capa.max_tmo.res_ns; + min_tmo = timer_capa.max_tmo.min_tmo; + max_tmo = timer_capa.max_tmo.max_tmo; + } + + memset(&timer_param, 0, sizeof(timer_param)); + timer_param.res_ns = res_ns; + timer_param.min_tmo = min_tmo; + timer_param.max_tmo = max_tmo; + timer_param.num_timers = num; + timer_param.clk_src = ODP_CLOCK_CPU; + + timer_pool = odp_timer_pool_create("timer_pool", &timer_param); + if (timer_pool == ODP_TIMER_POOL_INVALID) + CU_FAIL_FATAL("Timer pool create failed"); + + odp_timer_pool_start(); + + odp_pool_param_init(&pool_param); + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num; + + pool = odp_pool_create("timeout_pool", &pool_param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + odp_queue_param_init(&queue_param); + if (queue_type == ODP_QUEUE_TYPE_SCHED) { + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + } + + queue = odp_queue_create("timeout_queue", &queue_param); + if (queue == ODP_QUEUE_INVALID) + CU_FAIL_FATAL("Queue create failed"); + + if (min) + tmo_ns = min_tmo; + else + tmo_ns = max_tmo; + + tmo_tick = odp_timer_ns_to_tick(timer_pool, tmo_ns); + /* Min_tmo maybe zero. Wait min timeouts at least 20ms + resolution */ + max_wait = (20 * ODP_TIME_MSEC_IN_NS + res_ns + 10 * tmo_ns); + + LOG_DBG("\nTimer pool parameters:\n"); + LOG_DBG(" res_ns %" PRIu64 "\n", timer_param.res_ns); + LOG_DBG(" min_tmo %" PRIu64 "\n", timer_param.min_tmo); + LOG_DBG(" max_tmo %" PRIu64 "\n", timer_param.max_tmo); + LOG_DBG(" tmo_ns %" PRIu64 "\n", tmo_ns); + LOG_DBG(" tmo_tick %" PRIu64 "\n\n", tmo_tick); + + for (i = 0; i < num; i++) { + timer[i] = odp_timer_alloc(timer_pool, queue, NULL); + CU_ASSERT_FATAL(timer[i] != ODP_TIMER_INVALID); + } + + num_tmo = 0; + + for (i = 0; i < num; i++) { + tmo = odp_timeout_alloc(pool); + ev = odp_timeout_to_event(tmo); + + CU_ASSERT(ev != ODP_EVENT_INVALID); + + t1 = odp_time_local(); + ret = odp_timer_set_rel(timer[i], tmo_tick, &ev); + + if (ret == ODP_TIMER_TOOEARLY) + LOG_DBG("Too early %i\n", i); + else if (ret == ODP_TIMER_TOOLATE) + LOG_DBG("Too late %i\n", i); + else if (ret == ODP_TIMER_NOEVENT) + LOG_DBG("No event %i\n", i); + + CU_ASSERT(ret == ODP_TIMER_SUCCESS); + + if (min) { + /* Min timeout - wait for events */ + int break_loop = 0; + + while (1) { + if (queue_type == ODP_QUEUE_TYPE_SCHED) + ev = odp_schedule(NULL, + ODP_SCHED_NO_WAIT); + else + ev = odp_queue_deq(queue); + + t2 = odp_time_local(); + diff_ns = odp_time_diff_ns(t2, t1); + + if (ev != ODP_EVENT_INVALID) { + odp_event_free(ev); + num_tmo++; + break_loop = 1; + LOG_DBG("Timeout [%i]: %" PRIu64 + " nsec\n", i, diff_ns); + continue; + } + + /* Ensure that schedule context is free */ + if (break_loop) + break; + + /* Give up after waiting max wait time */ + if (diff_ns > max_wait) + break; + } + } else { + /* Max timeout - cancel events */ + ev = ODP_EVENT_INVALID; + + ret = odp_timer_cancel(timer[i], &ev); + t2 = odp_time_local(); + diff_ns = odp_time_diff_ns(t2, t1); + + CU_ASSERT(ret == 0); + CU_ASSERT(ev != ODP_EVENT_INVALID); + + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + + LOG_DBG("Cancelled [%i]: %" PRIu64 + " nsec\n", i, diff_ns); + } + } + + if (min) + CU_ASSERT(num_tmo == num); + + for (i = 0; i < num; i++) + CU_ASSERT(odp_timer_free(timer[i]) == ODP_EVENT_INVALID); + + odp_timer_pool_destroy(timer_pool); + CU_ASSERT(odp_queue_destroy(queue) == 0); + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +static void timer_test_max_res_min_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 1, 1); +} + +static void timer_test_max_res_min_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 1, 1); +} + +static void timer_test_max_res_max_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 1, 0); +} + +static void timer_test_max_res_max_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 1, 0); +} + +static void timer_test_max_tmo_min_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 0, 1); +} + +static void timer_test_max_tmo_min_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 0, 1); +} + +static void timer_test_max_tmo_max_tmo_plain(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_PLAIN, 0, 0); +} + +static void timer_test_max_tmo_max_tmo_sched(void) +{ + timer_test_tmo_limit(ODP_QUEUE_TYPE_SCHED, 0, 0); +} + /* Handle a received (timeout) event */ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) { @@ -1076,8 +1283,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) return CU_get_number_of_failures(); } -/* Timer test case entrypoint */ -static void timer_test_odp_timer_all(void) +static void timer_test_all(void) { int rc; odp_pool_param_t params; @@ -1240,10 +1446,18 @@ odp_testinfo_t timer_suite[] = { ODP_TEST_INFO(timer_test_buf_event_sched), ODP_TEST_INFO(timer_test_pkt_event_plain), ODP_TEST_INFO(timer_test_pkt_event_sched), + ODP_TEST_INFO(timer_test_cancel), + ODP_TEST_INFO(timer_test_max_res_min_tmo_plain), + ODP_TEST_INFO(timer_test_max_res_min_tmo_sched), + ODP_TEST_INFO(timer_test_max_res_max_tmo_plain), + ODP_TEST_INFO(timer_test_max_res_max_tmo_sched), + ODP_TEST_INFO(timer_test_max_tmo_min_tmo_plain), + ODP_TEST_INFO(timer_test_max_tmo_min_tmo_sched), + ODP_TEST_INFO(timer_test_max_tmo_max_tmo_plain), + ODP_TEST_INFO(timer_test_max_tmo_max_tmo_sched), ODP_TEST_INFO(timer_test_plain_queue), ODP_TEST_INFO(timer_test_sched_queue), - ODP_TEST_INFO(timer_test_odp_timer_cancel), - ODP_TEST_INFO(timer_test_odp_timer_all), + ODP_TEST_INFO(timer_test_all), ODP_TEST_INFO_NULL, }; commit 4f0e6037a7037c0879062f2b1ead0503f45ae623 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed May 15 17:16:50 2019 +0300 linux-gen: timer: add warm up period Added warm up period into posix timer pool startup to avoid the first timeout to slip. Otherwise, timer pthread receives the first signal after about 15ms and first timeout of the pool slips. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6cb8c9b39..8e98d51ac 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -195,9 +195,11 @@ typedef struct timer_pool_s { odp_shm_t shm; timer_t timerid; int notify_overrun; - pthread_t timer_thread; /* pthread_t of timer thread */ - pid_t timer_thread_id; /* gettid() for timer thread */ - int timer_thread_exit; /* request to exit for timer thread */ + pthread_t thr_pthread; /* pthread_t of timer thread */ + pid_t thr_pid; /* gettid() for timer thread */ + int thr_warm_up; /* number of warm up rounds */ + odp_atomic_u32_t thr_ready; /* thread ready from warm up */ + int thr_exit; /* request to exit for timer thread */ } timer_pool_t; /* Timer pool index must fit into 8 bits with one index value reserved to @@ -381,8 +383,8 @@ static void stop_timer_thread(timer_pool_t *tp) int ret; ODP_DBG("stop\n"); - tp->timer_thread_exit = 1; - ret = pthread_join(tp->timer_thread, NULL); + tp->thr_exit = 1; + ret = pthread_join(tp->thr_pthread, NULL); if (ret != 0) ODP_ABORT("unable to join thread, err %d\n", ret); } @@ -954,26 +956,41 @@ static void *timer_thread(void *arg) int ret; struct timespec tmo; siginfo_t si; + int warm_up = tp->thr_warm_up; + int num = 0; - tp->timer_thread_id = (pid_t)syscall(SYS_gettid); - - tmo.tv_sec = 0; + tmo.tv_sec = 0; tmo.tv_nsec = ODP_TIME_MSEC_IN_NS * 100; + /* Unblock sigalarm in this thread */ sigemptyset(&sigset); - /* unblock sigalarm in this thread */ sigprocmask(SIG_BLOCK, &sigset, NULL); - sigaddset(&sigset, SIGALRM); + /* Signal that this thread has started */ + odp_mb_full(); + tp->thr_pid = (pid_t)syscall(SYS_gettid); + odp_mb_full(); + while (1) { ret = sigtimedwait(&sigset, &si, &tmo); - if (tp->timer_thread_exit) { - tp->timer_thread_id = 0; + + if (tp->thr_exit) { + tp->thr_pid = 0; return NULL; } - if (ret > 0) - timer_notify(tp); + + if (ret <= 0) + continue; + + timer_notify(tp); + + if (num < warm_up) { + num++; + + if (num == warm_up) + odp_atomic_store_rel_u32(&tp->thr_ready, 1); + } } return NULL; @@ -1067,30 +1084,36 @@ static void itimer_init(timer_pool_t *tp) ODP_DBG("Creating POSIX timer for timer pool %s, period %" PRIu64" ns\n", tp->name, tp->param.res_ns); - tp->timer_thread_id = 0; - ret = pthread_create(&tp->timer_thread, NULL, timer_thread, tp); + res = tp->param.res_ns; + sec = res / ODP_TIME_SEC_IN_NS; + nsec = res - sec * ODP_TIME_SEC_IN_NS; + + tp->thr_pid = 0; + tp->thr_warm_up = 1; + + /* 20ms warm up */ + if (res < (20 * ODP_TIME_MSEC_IN_NS)) + tp->thr_warm_up = (20 * ODP_TIME_MSEC_IN_NS) / res; + + odp_atomic_init_u32(&tp->thr_ready, 0); + ret = pthread_create(&tp->thr_pthread, NULL, timer_thread, tp); if (ret) ODP_ABORT("unable to create timer thread\n"); - /* wait thread set tp->timer_thread_id */ - do { + /* wait thread set tp->thr_pid */ + while (tp->thr_pid == 0) sched_yield(); - } while (tp->timer_thread_id == 0); memset(&sigev, 0, sizeof(sigev)); sigev.sigev_notify = SIGEV_THREAD_ID; sigev.sigev_value.sival_ptr = tp; - sigev._sigev_un._tid = tp->timer_thread_id; + sigev._sigev_un._tid = tp->thr_pid; sigev.sigev_signo = SIGALRM; if (timer_create(CLOCK_MONOTONIC, &sigev, &tp->timerid)) ODP_ABORT("timer_create() returned error %s\n", strerror(errno)); - res = tp->param.res_ns; - sec = res / ODP_TIME_SEC_IN_NS; - nsec = res - sec * ODP_TIME_SEC_IN_NS; - memset(&ispec, 0, sizeof(ispec)); ispec.it_interval.tv_sec = (time_t)sec; ispec.it_interval.tv_nsec = (long)nsec; @@ -1100,6 +1123,11 @@ static void itimer_init(timer_pool_t *tp) if (timer_settime(tp->timerid, 0, &ispec, NULL)) ODP_ABORT("timer_settime() returned error %s\n", strerror(errno)); + + /* Wait response from timer thread that warm up signals have been + * processed. Warm up helps avoiding overrun on the first timeout. */ + while (odp_atomic_load_acq_u32(&tp->thr_ready) == 0) + sched_yield(); } static void itimer_fini(timer_pool_t *tp) commit 47fae268aef777b8d523dca43d0b50f8139bc8cf Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 14 16:57:54 2019 +0300 validation: timer: add capability test Add new test case for timer and resolution capability. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 1faef4e64..56702ae2d 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -181,6 +181,43 @@ static int timer_global_term(odp_instance_t inst) return 0; } +static void timer_test_capa(void) +{ + odp_timer_capability_t capa; + odp_timer_res_capability_t res_capa; + int ret; + + memset(&capa, 0, sizeof(capa)); + ret = odp_timer_capability(ODP_CLOCK_CPU, &capa); + CU_ASSERT_FATAL(ret == 0); + + CU_ASSERT(capa.highest_res_ns == capa.max_res.res_ns); + CU_ASSERT(capa.max_res.res_ns < capa.max_res.max_tmo); + CU_ASSERT(capa.max_res.min_tmo < capa.max_res.max_tmo); + CU_ASSERT(capa.max_tmo.res_ns < capa.max_tmo.max_tmo); + CU_ASSERT(capa.max_tmo.min_tmo < capa.max_tmo.max_tmo); + + /* Set max resolution */ + memset(&res_capa, 0, sizeof(res_capa)); + res_capa.res_ns = capa.max_res.res_ns; + + ret = odp_timer_res_capability(ODP_CLOCK_CPU, &res_capa); + CU_ASSERT_FATAL(ret == 0); + CU_ASSERT(res_capa.res_ns == capa.max_res.res_ns); + CU_ASSERT(res_capa.min_tmo == capa.max_res.min_tmo); + CU_ASSERT(res_capa.max_tmo == capa.max_res.max_tmo); + + /* Set max timeout */ + memset(&res_capa, 0, sizeof(res_capa)); + res_capa.max_tmo = capa.max_tmo.max_tmo; + + ret = odp_timer_res_capability(ODP_CLOCK_CPU, &res_capa); + CU_ASSERT_FATAL(ret == 0); + CU_ASSERT(res_capa.max_tmo == capa.max_tmo.max_tmo); + CU_ASSERT(res_capa.min_tmo == capa.max_tmo.min_tmo); + CU_ASSERT(res_capa.res_ns == capa.max_tmo.res_ns); +} + static void timer_test_timeout_pool_alloc(void) { odp_pool_t pool; @@ -1193,6 +1230,7 @@ static void timer_test_odp_timer_all(void) } odp_testinfo_t timer_suite[] = { + ODP_TEST_INFO(timer_test_capa), ODP_TEST_INFO(timer_test_timeout_pool_alloc), ODP_TEST_INFO(timer_test_timeout_pool_free), ODP_TEST_INFO(timer_pool_create_destroy), commit 2600af0ade3c254ba00a935a38647d6d15611586 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 14 16:39:02 2019 +0300 validation: timer: use resolution capability Limit min/max timeout values according to the used resolution. Most tests use the same resolution and min/max timeout settings. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index ddccec2b1..1faef4e64 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -31,9 +31,7 @@ #define EXTRA_TIMERS 256 #define NAME "timer_pool" -#define RES (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MIN_TMO (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MAX_TMO (1000000 * ODP_TIME_MSEC_IN_NS) +#define THREE_POINT_THREE_MSEC (10 * ODP_TIME_MSEC_IN_NS / 3) #define USER_PTR ((void *)0xdead) #define TICK_INVALID (~(uint64_t)0) @@ -46,19 +44,32 @@ struct test_timer { }; typedef struct { + /* Default resolution / timeout parameters */ + struct { + uint64_t res_ns; + uint64_t min_tmo; + uint64_t max_tmo; + } param; + /* Timeout pool handle used by all threads */ odp_pool_t tbp; + /* Timer pool handle used by all threads */ odp_timer_pool_t tp; + /* Barrier for thread synchronization */ odp_barrier_t test_barrier; + /* Count of timeouts delivered too late */ odp_atomic_u32_t ndelivtoolate; + /* Sum of all allocated timers from all threads. Thread-local * caches may make this number lower than the capacity of the pool */ odp_atomic_u32_t timers_allocated; + /* Number of timers allocated per thread */ uint32_t timers_per_thread; + } global_shared_mem_t; static global_shared_mem_t *global_mem; @@ -68,6 +79,10 @@ static int timer_global_init(odp_instance_t *inst) odp_shm_t global_shm; odp_init_t init_param; odph_helper_options_t helper_options; + odp_timer_capability_t capa; + odp_timer_res_capability_t res_capa; + uint64_t res_ns, min_tmo, max_tmo; + unsigned int range; if (odph_options(&helper_options)) { fprintf(stderr, "error: odph_options() failed.\n"); @@ -100,6 +115,46 @@ static int timer_global_init(odp_instance_t *inst) /* Configure scheduler */ odp_schedule_config(NULL); + memset(&capa, 0, sizeof(capa)); + if (odp_timer_capability(ODP_CLOCK_CPU, &capa)) { + fprintf(stderr, "Timer capability failed\n"); + return -1; + } + + /* By default 20 msec resolution */ + res_ns = 20 * ODP_TIME_MSEC_IN_NS; + if (res_ns < capa.max_res.res_ns) + res_ns = capa.max_res.res_ns; + + memset(&res_capa, 0, sizeof(res_capa)); + res_capa.res_ns = res_ns; + + if (odp_timer_res_capability(ODP_CLOCK_CPU, &res_capa)) { + fprintf(stderr, "Timer resolution capability failed\n"); + return -1; + } + + /* Try to keep min timeout error margin within +-20% */ + min_tmo = 5 * res_ns; + if (min_tmo < res_capa.min_tmo) + min_tmo = res_capa.min_tmo; + + /* Max 1 hour */ + max_tmo = 3600 * ODP_TIME_SEC_IN_NS; + if (max_tmo > res_capa.max_tmo) + max_tmo = res_capa.max_tmo; + + range = (RANGE_MS * 1000) + THREE_POINT_THREE_MSEC; + if ((max_tmo - min_tmo) < range) { + fprintf(stderr, "Validation test needs %u msec range\n", range); + return -1; + } + + /* Default parameters for test cases */ + global_mem->param.res_ns = res_ns; + global_mem->param.min_tmo = min_tmo; + global_mem->param.max_tmo = max_tmo; + return 0; } @@ -213,25 +268,19 @@ static void timer_test_timeout_pool_free(void) static void timer_pool_create_destroy(void) { - odp_timer_capability_t timer_capa; odp_timer_pool_param_t tparam; odp_timer_pool_info_t info; odp_timer_pool_t tp[2]; odp_timer_t tim; odp_queue_t queue; - uint64_t res_ns; queue = odp_queue_create("timer_queue", NULL); CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); - CU_ASSERT_FATAL(odp_timer_capability(ODP_CLOCK_CPU, &timer_capa) == 0); - - res_ns = 10 * timer_capa.highest_res_ns; - memset(&tparam, 0, sizeof(odp_timer_pool_param_t)); - tparam.res_ns = res_ns; - tparam.min_tmo = 5 * res_ns; - tparam.max_tmo = 10000 * tparam.min_tmo; + tparam.res_ns = global_mem->param.res_ns; + tparam.min_tmo = global_mem->param.min_tmo; + tparam.max_tmo = global_mem->param.max_tmo; tparam.num_timers = 100; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -290,7 +339,6 @@ static void timer_test_event_type(odp_queue_type_t queue_type, odp_pool_t pool; odp_pool_param_t pool_param; odp_queue_param_t queue_param; - odp_timer_capability_t timer_capa; odp_timer_pool_param_t timer_param; odp_timer_pool_t timer_pool; odp_queue_t queue; @@ -299,24 +347,16 @@ static void timer_test_event_type(odp_queue_type_t queue_type, odp_packet_t pkt; odp_event_t ev; odp_time_t t1, t2; - uint64_t res_ns, period_ns, period_tick, duration_ns; + uint64_t period_ns, period_tick, duration_ns; int i, ret, num_tmo; int num = 5; odp_timer_t timer[num]; - if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) - CU_FAIL_FATAL("Timer capability failed") - - res_ns = 20 * ODP_TIME_MSEC_IN_NS; - - if (timer_capa.highest_res_ns > res_ns) - res_ns = timer_capa.highest_res_ns; - memset(&timer_param, 0, sizeof(timer_param)); - timer_param.res_ns = res_ns; - timer_param.min_tmo = 5 * res_ns; - period_ns = 2 * timer_param.min_tmo; - timer_param.max_tmo = 100 * period_ns; + timer_param.res_ns = global_mem->param.res_ns; + timer_param.min_tmo = global_mem->param.min_tmo; + period_ns = 2 * global_mem->param.min_tmo; + timer_param.max_tmo = global_mem->param.max_tmo; timer_param.num_timers = num; timer_param.clk_src = ODP_CLOCK_CPU; @@ -478,7 +518,6 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) uint64_t res_ns, period_ns, period_tick, test_period; uint64_t diff_period, diff_test; odp_pool_param_t params; - odp_timer_capability_t timer_capa; odp_time_t t0, t1, t2; odp_pool_param_init(&params); @@ -488,17 +527,11 @@ static void timer_test_queue_type(odp_queue_type_t queue_type) pool = odp_pool_create("timeout_pool", &params); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); - if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) - CU_FAIL_FATAL("Timer capability failed") - - res_ns = 20 * ODP_TIME_MSEC_IN_NS; + res_ns = global_mem->param.res_ns; - if (timer_capa.highest_res_ns > res_ns) - res_ns = timer_capa.highest_res_ns; - - tparam.res_ns = res_ns; - tparam.min_tmo = 5 * res_ns; - tparam.max_tmo = 10000 * tparam.min_tmo; + tparam.res_ns = global_mem->param.res_ns; + tparam.min_tmo = global_mem->param.min_tmo; + tparam.max_tmo = global_mem->param.max_tmo; tparam.num_timers = num + 1; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -641,7 +674,6 @@ static void timer_test_odp_timer_cancel(void) odp_timeout_t tmo; odp_timer_set_t rc; uint64_t tick; - odp_timer_capability_t timer_capa; odp_pool_param_init(&params); params.type = ODP_POOL_TIMEOUT; @@ -652,13 +684,9 @@ static void timer_test_odp_timer_cancel(void) if (pool == ODP_POOL_INVALID) CU_FAIL_FATAL("Timeout pool create failed"); - if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) - CU_FAIL_FATAL("Get timer capability failed") - - tparam.res_ns = MAX(100 * ODP_TIME_MSEC_IN_NS, - timer_capa.highest_res_ns); - tparam.min_tmo = 1 * ODP_TIME_SEC_IN_NS; - tparam.max_tmo = 10 * ODP_TIME_SEC_IN_NS; + tparam.res_ns = global_mem->param.res_ns; + tparam.min_tmo = global_mem->param.min_tmo; + tparam.max_tmo = global_mem->param.max_tmo; tparam.num_timers = 1; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -682,7 +710,7 @@ static void timer_test_odp_timer_cancel(void) if (ev == ODP_EVENT_INVALID) CU_FAIL_FATAL("Failed to allocate timeout"); - tick = odp_timer_ns_to_tick(tp, 2 * ODP_TIME_SEC_IN_NS); + tick = odp_timer_ns_to_tick(tp, tparam.max_tmo / 2); rc = odp_timer_set_rel(tim, tick, &ev); if (rc != ODP_TIMER_SUCCESS) @@ -826,6 +854,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) odp_timer_pool_t tp = global_mem->tp; odp_pool_t tbp = global_mem->tbp; uint32_t num_timers = global_mem->timers_per_thread; + uint64_t min_tmo = global_mem->param.min_tmo; queue = odp_queue_create("timer_queue", NULL); if (queue == ODP_QUEUE_INVALID) @@ -863,7 +892,8 @@ static int worker_entrypoint(void *arg TEST_UNUSED) /* Initial set all timers with a random expiration time */ nset = 0; for (i = 0; i < allocated; i++) { - nsec = MIN_TMO + (rand_r(&seed) % RANGE_MS) * 1000000ULL; + nsec = min_tmo + THREE_POINT_THREE_MSEC + + (rand_r(&seed) % RANGE_MS) * 1000000ULL; tck = odp_timer_current_tick(tp) + odp_timer_ns_to_tick(tp, nsec); timer_rc = odp_timer_set_abs(tt[i].tim, tck, &tt[i].ev); @@ -918,7 +948,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) /* Timer active => reset */ nreset++; - nsec = MIN_TMO + + nsec = min_tmo + THREE_POINT_THREE_MSEC + (rand_r(&seed) % RANGE_MS) * 1000000ULL; tck = odp_timer_ns_to_tick(tp, nsec); @@ -1018,7 +1048,7 @@ static void timer_test_odp_timer_all(void) odp_cpumask_t unused; odp_timer_pool_info_t tpinfo; uint64_t ns, tick, ns2; - uint64_t resolution_ns; + uint64_t res_ns, min_tmo, max_tmo; uint32_t timers_allocated; pthrd_arg thrdarg; odp_pool_capability_t pool_capa; @@ -1065,10 +1095,13 @@ static void timer_test_odp_timer_all(void) tbp = global_mem->tbp; /* Create a timer pool */ - resolution_ns = MAX(RES, timer_capa.highest_res_ns); - tparam.res_ns = resolution_ns; - tparam.min_tmo = MIN_TMO; - tparam.max_tmo = MAX_TMO; + res_ns = global_mem->param.res_ns; + max_tmo = global_mem->param.max_tmo; + min_tmo = global_mem->param.min_tmo; + + tparam.res_ns = res_ns; + tparam.min_tmo = min_tmo; + tparam.max_tmo = max_tmo; tparam.num_timers = num_timers; tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; @@ -1083,10 +1116,9 @@ static void timer_test_odp_timer_all(void) if (odp_timer_pool_info(tp, &tpinfo) != 0) CU_FAIL("odp_timer_pool_info"); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); - CU_ASSERT(tpinfo.param.res_ns == MAX(RES, - timer_capa.highest_res_ns)); - CU_ASSERT(tpinfo.param.min_tmo == MIN_TMO); - CU_ASSERT(tpinfo.param.max_tmo == MAX_TMO); + CU_ASSERT(tpinfo.param.res_ns == res_ns); + CU_ASSERT(tpinfo.param.min_tmo == min_tmo); + CU_ASSERT(tpinfo.param.max_tmo == max_tmo); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); LOG_DBG("Timer pool handle: %" PRIu64 "\n", odp_timer_pool_to_u64(tp)); @@ -1106,17 +1138,17 @@ static void timer_test_odp_timer_all(void) ns2 = odp_timer_tick_to_ns(tp, tick); CU_ASSERT(ns2 == 0); - for (ns = resolution_ns; ns < MAX_TMO; ns += resolution_ns) { + for (ns = res_ns; ns < max_tmo; ns += res_ns) { tick = odp_timer_ns_to_tick(tp, ns); ns2 = odp_timer_tick_to_ns(tp, tick); - if (ns2 < ns - resolution_ns) { + if (ns2 < ns - res_ns) { LOG_DBG("FAIL ns:%" PRIu64 " tick:%" PRIu64 " ns2:%" PRIu64 "\n", ns, tick, ns2); CU_FAIL("tick conversion: nsec too small\n"); } - if (ns2 > ns + resolution_ns) { + if (ns2 > ns + res_ns) { LOG_DBG("FAIL ns:%" PRIu64 " tick:%" PRIu64 " ns2:%" PRIu64 "\n", ns, tick, ns2); CU_FAIL("tick conversion: nsec too large\n"); commit 6280e54ea0a69276f3e1cbadd981f28dd2fb253a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 14 14:08:14 2019 +0300 linux-gen: timer: implement new capability features Timer implementation does not have limits to timeout values. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6446b1c91..6cb8c9b39 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -70,6 +70,9 @@ * for checking the freshness of received timeouts */ #define TMO_INACTIVE ((uint64_t)0x8000000000000000) +/* Max timeout in capability. One year in nsec (0x0070 09D3 2DA3 0000). */ +#define MAX_TMO_NSEC (365 * 24 * 3600 * ODP_TIME_SEC_IN_NS) + /****************************************************************************** * Mutual exclusion in the absence of CAS16 *****************************************************************************/ @@ -1114,18 +1117,49 @@ static void itimer_fini(timer_pool_t *tp) int odp_timer_capability(odp_timer_clk_src_t clk_src, odp_timer_capability_t *capa) { - int ret = 0; + if (clk_src != ODP_CLOCK_CPU) { + ODP_ERR("Only CPU clock source supported\n"); + return -1; + } - if (clk_src == ODP_CLOCK_CPU) { - capa->max_pools_combined = MAX_TIMER_POOLS; - capa->max_pools = MAX_TIMER_POOLS; - capa->max_timers = 0; - capa->highest_res_ns = timer_global->highest_res_ns; - } else { - ODP_ERR("ODP timer system doesn't support external clock source currently\n"); - ret = -1; + memset(capa, 0, sizeof(odp_timer_capability_t)); + + capa->max_pools_combined = MAX_TIMER_POOLS; + capa->max_pools = MAX_TIMER_POOLS; + capa->max_timers = 0; + capa->highest_res_ns = timer_global->highest_res_ns; + capa->max_res.res_ns = timer_global->highest_res_ns; + capa->max_res.min_tmo = 0; + capa->max_res.max_tmo = MAX_TMO_NSEC; + capa->max_tmo.res_ns = timer_global->highest_res_ns; + capa->max_tmo.min_tmo = 0; + capa->max_tmo.max_tmo = MAX_TMO_NSEC; + + return 0; +} + +int odp_timer_res_capability(odp_timer_clk_src_t clk_src, + odp_timer_res_capability_t *res_capa) +{ + if (clk_src != ODP_CLOCK_CPU) { + ODP_ERR("Only CPU clock source supported\n"); + return -1; + } + + if (res_capa->min_tmo) { + ODP_ERR("Only res_ns or max_tmo based quaries supported\n"); + return -1; } - return ret; + + if (res_capa->res_ns) { + res_capa->min_tmo = 0; + res_capa->max_tmo = MAX_TMO_NSEC; + } else { /* max_tmo */ + res_capa->min_tmo = 0; + res_capa->res_ns = timer_global->highest_res_ns; + } + + return 0; } odp_timer_pool_t odp_timer_pool_create(const char *name, commit b78412a08ad0435ace4d2980a38fa44b1fddbf96 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed May 8 17:15:56 2019 +0300 api: timer: add resolution capability Typically, timer implementation needs to trade-off between highest resolution and longest timeout. Add new capability information and function to check limits between resolution and maximum timeout length. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index c2bf942dc..0e06a9030 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -135,6 +135,21 @@ typedef struct { } odp_timer_pool_param_t; +/** + * Timer resolution capability + */ +typedef struct { + /** Timeout resolution in nanoseconds */ + uint64_t res_ns; + + /** Minimum relative timeout in nanoseconds */ + uint64_t min_tmo; + + /** Maximum relative timeout in nanoseconds */ + uint64_t max_tmo; + +} odp_timer_res_capability_t; + /** * Timer capability */ @@ -160,8 +175,35 @@ typedef struct { * This defines the highest resolution supported by a timer. * It's the minimum valid value for 'res_ns' timer pool * parameter. + * + * This value is equal to 'max_res.res_ns' capability. */ uint64_t highest_res_ns; + + /** + * Maximum resolution + * + * This defines the highest resolution supported by a timer, with + * limits to min/max timeout values. The highest resolution for a timer + * pool is defined by 'max_res.res_ns', therefore it's the minimum value + * for 'res_ns' timer pool parameter. When this resolution is used: + * - 'min_tmo' parameter value must be in minimum 'max_res.min_tmo' + * - 'max_tmo' parameter value must be in maximum 'max_res.max_tmo' + */ + odp_timer_res_capability_t max_res; + + /** + * Maximum timeout length + * + * This defines the maximum relative timeout value supported by a timer, + * with limits to min timeout and max resolution values. The maximum + * value for 'max_tmo' timer pool parameter is defined by + * 'max_tmo.max_tmo'. When this max timeout value is used: + * - 'min_tmo' parameter value must be in minimum 'max_tmo.min_tmo' + * - 'res_ns' parameter value must be in minimum 'max_tmo.res_ns' + */ + odp_timer_res_capability_t max_tmo; + } odp_timer_capability_t; /** @@ -178,6 +220,28 @@ typedef struct { int odp_timer_capability(odp_timer_clk_src_t clk_src, odp_timer_capability_t *capa); +/** + * Timer resolution capability + * + * This function fills in capability limits for timer pool resolution and + * min/max timeout values, based on either resolution or maximum timeout. + * Set the required value to 'res_ns' or 'max_tmo', and set other fields to + * zero. A successful call fills in the other two fields. The call returns + * a failure, if the user defined value ('res_ns' or 'max_tmo)' exceeds + * capability limits. Outputted values are minimums for 'res_ns' and 'min_tmo', + * and a maximum for 'max_tmo'. + * + * @param clk_src Clock source for timers + * @param[in,out] res_capa Resolution capability pointer for input/output. + * Set either 'res_ns' or 'max_tmo', a successful call + * fills in other fields. + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_timer_res_capability(odp_timer_clk_src_t clk_src, + odp_timer_res_capability_t *res_capa); + /** * Create a timer pool * commit 5422332ff596b8cef9d5518b7bff6ab9b4b38b09 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 13 16:52:22 2019 +0300 validation: timer: test pkt and buf event types Test that also buffer and packet type events can be used as timeout events. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 51caed7a5..ddccec2b1 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -284,6 +284,184 @@ static void timer_pool_create_destroy(void) CU_ASSERT(odp_queue_destroy(queue) == 0); } +static void timer_test_event_type(odp_queue_type_t queue_type, + odp_event_type_t event_type) +{ + odp_pool_t pool; + odp_pool_param_t pool_param; + odp_queue_param_t queue_param; + odp_timer_capability_t timer_capa; + odp_timer_pool_param_t timer_param; + odp_timer_pool_t timer_pool; + odp_queue_t queue; + odp_timeout_t tmo; + odp_buffer_t buf; + odp_packet_t pkt; + odp_event_t ev; + odp_time_t t1, t2; + uint64_t res_ns, period_ns, period_tick, duration_ns; + int i, ret, num_tmo; + int num = 5; + odp_timer_t timer[num]; + + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) + CU_FAIL_FATAL("Timer capability failed") + + res_ns = 20 * ODP_TIME_MSEC_IN_NS; + + if (timer_capa.highest_res_ns > res_ns) + res_ns = timer_capa.highest_res_ns; + + memset(&timer_param, 0, sizeof(timer_param)); + timer_param.res_ns = res_ns; + timer_param.min_tmo = 5 * res_ns; + period_ns = 2 * timer_param.min_tmo; + timer_param.max_tmo = 100 * period_ns; + timer_param.num_timers = num; + timer_param.clk_src = ODP_CLOCK_CPU; + + timer_pool = odp_timer_pool_create("timer_pool", &timer_param); + if (timer_pool == ODP_TIMER_POOL_INVALID) + CU_FAIL_FATAL("Timer pool create failed"); + + odp_timer_pool_start(); + + odp_pool_param_init(&pool_param); + + if (event_type == ODP_EVENT_BUFFER) { + pool_param.type = ODP_POOL_BUFFER; + pool_param.buf.num = num; + } else if (event_type == ODP_EVENT_PACKET) { + pool_param.type = ODP_POOL_PACKET; + pool_param.pkt.num = num; + } else if (event_type == ODP_EVENT_TIMEOUT) { + pool_param.type = ODP_POOL_TIMEOUT; + pool_param.tmo.num = num; + } else { + CU_FAIL("Bad event_type"); + return; + } + + pool = odp_pool_create("timeout_pool", &pool_param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + odp_queue_param_init(&queue_param); + if (queue_type == ODP_QUEUE_TYPE_SCHED) { + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + } + + queue = odp_queue_create("timeout_queue", &queue_param); + if (queue == ODP_QUEUE_INVALID) + CU_FAIL_FATAL("Queue create failed"); + + period_tick = odp_timer_ns_to_tick(timer_pool, period_ns); + duration_ns = num * period_ns; + + LOG_DBG("\nTimer pool parameters:\n"); + LOG_DBG(" res_ns %" PRIu64 "\n", timer_param.res_ns); + LOG_DBG(" min_tmo %" PRIu64 "\n", timer_param.min_tmo); + LOG_DBG(" max_tmo %" PRIu64 "\n", timer_param.max_tmo); + LOG_DBG(" period_ns %" PRIu64 "\n", period_ns); + LOG_DBG(" period_tick %" PRIu64 "\n", period_tick); + LOG_DBG(" duration_ns %" PRIu64 "\n\n", duration_ns); + + for (i = 0; i < num; i++) { + if (event_type == ODP_EVENT_BUFFER) { + buf = odp_buffer_alloc(pool); + ev = odp_buffer_to_event(buf); + } else if (event_type == ODP_EVENT_PACKET) { + pkt = odp_packet_alloc(pool, 10); + ev = odp_packet_to_event(pkt); + } else { + tmo = odp_timeout_alloc(pool); + ev = odp_timeout_to_event(tmo); + } + + CU_ASSERT(ev != ODP_EVENT_INVALID); + + timer[i] = odp_timer_alloc(timer_pool, queue, NULL); + CU_ASSERT_FATAL(timer[i] != ODP_TIMER_INVALID); + + ret = odp_timer_set_rel(timer[i], (i + 1) * period_tick, &ev); + + if (ret == ODP_TIMER_TOOEARLY) + LOG_DBG("Too early %i\n", i); + else if (ret == ODP_TIMER_TOOLATE) + LOG_DBG("Too late %i\n", i); + else if (ret == ODP_TIMER_NOEVENT) + LOG_DBG("No event %i\n", i); + + CU_ASSERT(ret == ODP_TIMER_SUCCESS); + } + + ev = ODP_EVENT_INVALID; + num_tmo = 0; + t1 = odp_time_local(); + + /* Wait for timers. Make sure that scheduler context is not hold when + * exiting the loop. */ + do { + if (queue_type == ODP_QUEUE_TYPE_SCHED) + ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT); + else + ev = odp_queue_deq(queue); + + if (ev == ODP_EVENT_INVALID) { + t2 = odp_time_local(); + if (odp_time_diff_ns(t2, t1) > (10 * duration_ns)) + break; + + continue; + } + + CU_ASSERT(odp_event_type(ev) == event_type); + + odp_event_free(ev); + num_tmo++; + + } while (num_tmo < num || ev != ODP_EVENT_INVALID); + + CU_ASSERT(num_tmo == num); + + for (i = 0; i < num; i++) + CU_ASSERT(odp_timer_free(timer[i]) == ODP_EVENT_INVALID); + + odp_timer_pool_destroy(timer_pool); + CU_ASSERT(odp_queue_destroy(queue) == 0); + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +static void timer_test_tmo_event_plain(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_PLAIN, ODP_EVENT_TIMEOUT); +} + +static void timer_test_tmo_event_sched(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_SCHED, ODP_EVENT_TIMEOUT); +} + +static void timer_test_buf_event_plain(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_PLAIN, ODP_EVENT_BUFFER); +} + +static void timer_test_buf_event_sched(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_SCHED, ODP_EVENT_BUFFER); +} + +static void timer_test_pkt_event_plain(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_PLAIN, ODP_EVENT_PACKET); +} + +static void timer_test_pkt_event_sched(void) +{ + timer_test_event_type(ODP_QUEUE_TYPE_SCHED, ODP_EVENT_PACKET); +} + static void timer_test_queue_type(odp_queue_type_t queue_type) { odp_pool_t pool; @@ -986,6 +1164,12 @@ odp_testinfo_t timer_suite[] = { ODP_TEST_INFO(timer_test_timeout_pool_alloc), ODP_TEST_INFO(timer_test_timeout_pool_free), ODP_TEST_INFO(timer_pool_create_destroy), + ODP_TEST_INFO(timer_test_tmo_event_plain), + ODP_TEST_INFO(timer_test_tmo_event_sched), + ODP_TEST_INFO(timer_test_buf_event_plain), + ODP_TEST_INFO(timer_test_buf_event_sched), + ODP_TEST_INFO(timer_test_pkt_event_plain), + ODP_TEST_INFO(timer_test_pkt_event_sched), ODP_TEST_INFO(timer_test_plain_queue), ODP_TEST_INFO(timer_test_sched_queue), ODP_TEST_INFO(timer_test_odp_timer_cancel), commit 9eeb94e6d03923a67779314c62e32e410e1272d8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 13 14:06:22 2019 +0300 api: timer: documentation style clean up Clean up stylistic issues in documentation: indentation, variable naming, new lines, etc. API functionality or wording not changed. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index 1ad7ae4f6..c2bf942dc 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -69,26 +69,29 @@ typedef enum { * Return values of timer set calls. */ typedef enum { -/** - * Timer set operation succeeded - */ + /** + * Timer set operation succeeded + */ ODP_TIMER_SUCCESS = 0, -/** - * Timer set operation failed, expiration too early. - * Either retry with a later expiration time or process the timeout - * immediately. */ + + /** + * Timer set operation failed, expiration too early. + * Either retry with a later expiration time or process the timeout + * immediately. */ ODP_TIMER_TOOEARLY = -1, -/** - * Timer set operation failed, expiration too late. - * Truncate the expiration time against the maximum timeout for the - * timer pool. */ + /** + * Timer set operation failed, expiration too late. + * Truncate the expiration time against the maximum timeout for the + * timer pool. */ ODP_TIMER_TOOLATE = -2, -/** - * Timer set operation failed because no event specified and no event present - * in the timer (timer inactive/expired). - */ + + /** + * Timer set operation failed because no event specified and no event + * present in the timer (timer inactive/expired). + */ ODP_TIMER_NOEVENT = -3 + } odp_timer_set_t; /** @@ -96,8 +99,8 @@ typedef enum { * Maximum timer pool name length in chars including null char */ -/** Timer pool parameters - * Timer pool parameters are used when creating and querying timer pools. +/** + * Timer pool parameters */ typedef struct { /** Timeout resolution in nanoseconds. Timer pool must serve timeouts @@ -187,9 +190,8 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src, * @return Timer pool handle on success * @retval ODP_TIMER_POOL_INVALID on failure and errno set */ -odp_timer_pool_t -odp_timer_pool_create(const char *name, - const odp_timer_pool_param_t *params); +odp_timer_pool_t odp_timer_pool_create(const char *name, + const odp_timer_pool_param_t *params); /** * Start a timer pool @@ -207,60 +209,67 @@ void odp_timer_pool_start(void); * Destroy a timer pool, freeing all resources. * All timers must have been freed. * - * @param tpid Timer pool identifier + * @param timer_pool Timer pool */ -void odp_timer_pool_destroy(odp_timer_pool_t tpid); +void odp_timer_pool_destroy(odp_timer_pool_t timer_pool); /** * Convert timer ticks to nanoseconds * - * @param tpid Timer pool identifier - * @param ticks Timer ticks + * @param timer_pool Timer pool + * @param ticks Timer ticks * * @return Nanoseconds */ -uint64_t odp_timer_tick_to_ns(odp_timer_pool_t tpid, uint64_t ticks); +uint64_t odp_timer_tick_to_ns(odp_timer_pool_t timer_pool, uint64_t ticks); /** * Convert nanoseconds to timer ticks * - * @param tpid Timer pool identifier - * @param ns Nanoseconds + * @param timer_pool Timer pool + * @param ns Nanoseconds * * @return Timer ticks */ -uint64_t odp_timer_ns_to_tick(odp_timer_pool_t tpid, uint64_t ns); +uint64_t odp_timer_ns_to_tick(odp_timer_pool_t timer_pool, uint64_t ns); /** * Current tick value * - * @param tpid Timer pool identifier + * @param timer_pool Timer pool * * @return Current time in timer ticks */ -uint64_t odp_timer_current_tick(odp_timer_pool_t tpid); +uint64_t odp_timer_current_tick(odp_timer_pool_t timer_pool); /** * ODP timer pool information and configuration */ - typedef struct { - odp_timer_pool_param_t param; /**< Parameters specified at creation */ - uint32_t cur_timers; /**< Number of currently allocated timers */ - uint32_t hwm_timers; /**< High watermark of allocated timers */ - const char *name; /**< Name of timer pool */ + /** Parameters specified at creation */ + odp_timer_pool_param_t param; + + /** Number of currently allocated timers */ + uint32_t cur_timers; + + /** High watermark of allocated timers */ + uint32_t hwm_timers; + + /** Name of timer pool */ + const char *name; + } odp_timer_pool_info_t; /** * Query timer pool configuration and current state * - * @param tpid Timer pool identifier - * @param[out] info Pointer to information buffer + * @param timer_pool Timer pool + * @param[out] info Pointer to information buffer * * @retval 0 on success * @retval <0 on failure. Info could not be retrieved. */ -int odp_timer_pool_info(odp_timer_pool_t tpid, +int odp_timer_pool_info(odp_timer_pool_t timer_pool, odp_timer_pool_info_t *info); /** @@ -270,15 +279,14 @@ int odp_timer_pool_info(odp_timer_pool_t tpid, * the timer pool. The user_ptr is copied to timeouts and can be retrieved * using the odp_timeout_user_ptr() call. * - * @param tpid Timer pool identifier - * @param queue Destination queue for timeout notifications - * @param user_ptr User defined pointer or NULL to be copied to timeouts + * @param timer_pool Timer pool + * @param queue Destination queue for timeout notifications + * @param user_ptr User defined pointer or NULL to be copied to timeouts * * @return Timer handle on success * @retval ODP_TIMER_INVALID on failure and errno set. */ -odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid, - odp_queue_t queue, +odp_timer_t odp_timer_alloc(odp_timer_pool_t timer_pool, odp_queue_t queue, void *user_ptr); /** @@ -289,11 +297,12 @@ odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid, * The timeout event for an expired timer will not be returned. It is the * responsibility of the application to handle this timeout when it is received. * - * @param tim Timer handle + * @param timer Timer + * * @return Event handle of timeout event * @retval ODP_EVENT_INVALID on failure */ -odp_event_t odp_timer_free(odp_timer_t tim); +odp_event_t odp_timer_free(odp_timer_t timer); /** * Set (or reset) a timer with absolute expiration time @@ -395,6 +404,7 @@ odp_event_t odp_timeout_to_event(odp_timeout_t tmo); /** * Check for fresh timeout + * * If the corresponding timer has been reset or cancelled since this timeout * was enqueued, the timeout is stale (not fresh). * @@ -424,6 +434,7 @@ uint64_t odp_timeout_tick(odp_timeout_t tmo); /** * Return user pointer for the timeout + * * The user pointer was specified when the timer was allocated. * * @param tmo Timeout handle @@ -456,41 +467,41 @@ void odp_timeout_free(odp_timeout_t tmo); /** * Get printable value for an odp_timer_pool_t * - * @param hdl odp_timer_pool_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param timer_pool odp_timer_pool_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents * an odp_timer_pool_t handle. */ -uint64_t odp_timer_pool_to_u64(odp_timer_pool_t hdl); +uint64_t odp_timer_pool_to_u64(odp_timer_pool_t timer_pool); /** * Get printable value for an odp_timer_t * - * @param hdl odp_timer_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param timer odp_timer_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents * an odp_timer_t handle. */ -uint64_t odp_timer_to_u64(odp_timer_t hdl); +uint64_t odp_timer_to_u64(odp_timer_t timer); /** * Get printable value for an odp_timeout_t * - * @param hdl odp_timeout_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param tmo odp_timeout_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents * an odp_timeout_t handle. */ -uint64_t odp_timeout_to_u64(odp_timeout_t hdl); +uint64_t odp_timeout_to_u64(odp_timeout_t tmo); /** * @} commit 064dbc1d3b0d284ae7ab4db5e20fa0f6f2ce8c56 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri May 10 16:48:08 2019 +0300 api: timer: clarify timer set specification Timer API intention has always been to allow any event type to be used as timeout events. Application should use ODP_EVENT_TIMEOUT type events (odp_timeout_t) by default, but also other event types may be used. Also, clarified timer set/reset functionality of odp_timer_set_abs() and _rel() functions. API functionality not changed, just wording updated. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h index ee314914f..1ad7ae4f6 100644 --- a/include/odp/api/spec/timer.h +++ b/include/odp/api/spec/timer.h @@ -1,4 +1,6 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia + * * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -83,8 +85,8 @@ typedef enum { * timer pool. */ ODP_TIMER_TOOLATE = -2, /** - * Timer set operation failed because no timeout event specified and no - * timeout event present in the timer (timer inactive/expired). + * Timer set operation failed because no event specified and no event present + * in the timer (timer inactive/expired). */ ODP_TIMER_NOEVENT = -3 } odp_timer_set_t; @@ -294,73 +296,87 @@ odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid, odp_event_t odp_timer_free(odp_timer_t tim); /** - * Set a timer (absolute time) with a user-provided timeout event + * Set (or reset) a timer with absolute expiration time + * + * This function sets a timer to expire at a specific time. If the timer is + * already running (set and not yet expired), the function updates (resets) it + * with a new expiration time and optionally with a new event. A successful + * reset operation with a new event outputs the old event. A failed reset + * operation does not modify the timer. + * + * The user provided event can be of any event type, but only ODP_EVENT_TIMEOUT + * type events (odp_timeout_t) carry timeout specific metadata. Furthermore, + * timer performance may have been optimized for that event type. When the timer + * expires, the event is enqueued to the destination queue of the timer. * - * Set (arm) the timer to expire at specific time. The timeout - * event will be enqueued when the timer expires. + * @param timer Timer + * @param abs_tick Absolute expiration time in timer ticks + * @param[in,out] tmo_ev Pointer to an event handle. The event is enqueued + * when the timer expires. Use NULL when resetting the + * timer without changing the event. When resetting the + * timer with a new event, a successful operation + * outputs the old event here. * - * @param tim Timer - * @param abs_tck Expiration time in absolute timer ticks - * @param[in,out] tmo_ev Reference to an event variable that points to - * timeout event or NULL to reuse the existing timeout event. Any existing - * timeout event that is replaced by a successful set operation will be - * returned here. + * @retval ODP_TIMER_SUCCESS Success + * @retval ODP_TIMER_TOOEARLY Failure. Expiration time is too near to + * the current time. + * @retval ODP_TIMER_TOOLATE Failure. Expiration time is too far from + * the current time. + * @retval ODP_TIMER_NOEVENT Failure. Set operation: No event provided. + * Reset operation: Too late to reset the timer. * - * @retval ODP_TIMER_SUCCESS Operation succeeded - * @retval ODP_TIMER_TOOEARLY Operation failed because expiration tick too - * early - * @retval ODP_TIMER_TOOLATE Operation failed because expiration tick too - * late - * @retval ODP_TIMER_NOEVENT Operation failed because timeout event not - * specified in odp_timer_set call and not present in timer + * @see odp_timer_set_rel(), odp_timer_alloc(), odp_timer_cancel() */ -int odp_timer_set_abs(odp_timer_t tim, - uint64_t abs_tck, +int odp_timer_set_abs(odp_timer_t timer, uint64_t abs_tick, odp_event_t *tmo_ev); /** - * Set a timer with a relative expiration time and user-provided event. + * Set (or reset) a timer with relative expiration time * - * Set (arm) the timer to expire at a relative future time. + * Like odp_timer_set_abs(), but the expiration time is relative to the current + * time: expiration tick = odp_timer_current_tick() + 'rel_tick'. * - * @param tim Timer - * @param rel_tck Expiration time in timer ticks relative to current time of - * the timer pool the timer belongs to - * @param[in,out] tmo_ev Reference to an event variable that points to - * timeout event or NULL to reuse the existing timeout event. Any existing - * timeout event that is replaced by a successful set operation will be - * returned here. + * @param timer Timer + * @param rel_tick Expiration time relative to current time of + * the timer pool in timer ticks + * @param[in,out] tmo_ev Pointer to an event handle. The event is enqueued + * when the timer expires. Use NULL when resetting the + * timer without changing the event. When resetting the + * timer with a new event, a successful operation + * outputs the old event here. * - * @retval ODP_TIMER_SUCCESS Operation succeeded - * @retval ODP_TIMER_TOOEARLY Operation failed because expiration tick too - * early - * @retval ODP_TIMER_TOOLATE Operation failed because expiration tick too - * late - * @retval ODP_TIMER_NOEVENT Operation failed because timeout event not - * specified in call and not present in timer + * @retval ODP_TIMER_SUCCESS Success + * @retval ODP_TIMER_TOOEARLY Failure. Expiration time is too near to + * the current time. + * @retval ODP_TIMER_TOOLATE Failure. Expiration time is too far from + * the current time. + * @retval ODP_TIMER_NOEVENT Failure. Set operation: No event provided. + * Reset operation: Too late to reset the timer. + * + * @see odp_timer_set_abs(), odp_timer_alloc(), odp_timer_cancel() */ -int odp_timer_set_rel(odp_timer_t tim, - uint64_t rel_tck, +int odp_timer_set_rel(odp_timer_t timer, uint64_t rel_tick, odp_event_t *tmo_ev); /** * Cancel a timer * - * Cancel a timer, preventing future expiration and delivery. Return any - * present timeout event. + * Cancel a timer, preventing future expiration and event delivery. Return any + * present event. * * A timer that has already expired may be impossible to cancel and the timeout * will instead be delivered to the destination queue. * - * @param tim Timer - * @param[out] tmo_ev Pointer to an event variable - * @retval 0 Success, active timer cancelled, timeout returned in '*tmo_ev' - * @retval <0 on failure (timer inactive or already expired) + * @param timer Timer + * @param[out] tmo_ev Pointer to an event handle for output + * + * @retval 0 Success. Active timer cancelled, timeout returned in 'tmo_ev' + * @retval <0 Failure. Timer inactive or already expired. */ -int odp_timer_cancel(odp_timer_t tim, odp_event_t *tmo_ev); +int odp_timer_cancel(odp_timer_t timer, odp_event_t *tmo_ev); /** - * Return timeout handle that is associated with timeout event + * Get timeout handle from a ODP_EVENT_TIMEOUT type event * * @param ev An event of type ODP_EVENT_TIMEOUT * ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- include/odp/api/spec/time.h | 18 +- include/odp/api/spec/timer.h | 293 ++++++++++++------- platform/linux-generic/odp_timer.c | 130 ++++++--- test/validation/api/time/time.c | 11 + test/validation/api/timer/timer.c | 570 +++++++++++++++++++++++++++++++++---- 6 files changed, 833 insertions(+), 191 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-111-g78364dc1d

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 78364dc1d53a1a4c4918ce0a82d02fe56f0abb54 (commit) from 9bdd6ed64a1603f15c869be637093abb88f196a8 (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 78364dc1d53a1a4c4918ce0a82d02fe56f0abb54 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu May 16 12:56:48 2019 +0300 configure: add option to disable pcap pktio support Add '--without-pcap' option to explicitly build ODP without PCAP pktio regardless of if the library is available on the build host. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Suggested-by: Risto Reittinen <risto.teittinen(a)nokia-bell-labs.com> diff --git a/.travis.yml b/.travis.yml index ea26ddedd..a32b48e0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ env: - CONF="--disable-host-optimization --disable-abi-compat" - CHECK=0 ARCH="x86_64" CONF="--enable-pcapng-support" - CHECK=0 ARCH="x86_64" OS="centos_7" - - CONF="--without-openssl" + - CONF="--without-openssl --without-pcap" - OS="ubuntu_18.04" matrix: diff --git a/platform/linux-generic/m4/odp_pcap.m4 b/m4/odp_pcap.m4 similarity index 65% rename from platform/linux-generic/m4/odp_pcap.m4 rename to m4/odp_pcap.m4 index 0a8f35186..239ce385f 100644 --- a/platform/linux-generic/m4/odp_pcap.m4 +++ b/m4/odp_pcap.m4 @@ -1,3 +1,7 @@ +# ODP_PCAP([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# -------------------------------------------------- +AC_DEFUN([ODP_PCAP], +[dnl ######################################################################### # Check for libpcap availability ######################################################################### @@ -11,10 +15,15 @@ AC_CHECK_HEADER(pcap/pcap.h, if test "$have_pcap" = "yes"; then AC_DEFINE([HAVE_PCAP], 1, [Define to 1 if you have pcap library]) PCAP_LIBS="-lpcap" +else + PCAP_LIBS="" fi AC_SUBST([PCAP_LIBS]) -AC_CONFIG_COMMANDS_PRE([dnl -AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes]) -]) +if test "x$have_pcap" = "xyes" ; then + m4_default([$1], [:]) +else + m4_default([$2], [:]) +fi +]) # ODP_PCAP diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 1dd14cd4d..3ab01f2b7 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -13,8 +13,17 @@ AC_ARG_WITH([openssl], AS_IF([test "$with_openssl" != "no"], [ODP_OPENSSL]) AM_CONDITIONAL([WITH_OPENSSL], [test x$with_openssl != xno]) + +AC_ARG_WITH([pcap], + [AS_HELP_STRING([--without-pcap], + [compile without PCAP])], + [], + [with_pcap=yes]) +AS_IF([test "x$with_pcap" != xno], + [ODP_PCAP([with_pcap=yes]‚[with_pcap=no])]) +AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes]) + ODP_LIBCONFIG([linux-generic]) -m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_pcapng.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- {platform/linux-generic/m4 => m4}/odp_pcap.m4 | 15 ++++++++++++--- platform/linux-generic/m4/configure.m4 | 11 ++++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) rename {platform/linux-generic/m4 => m4}/odp_pcap.m4 (65%) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-110-g9bdd6ed64

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 9bdd6ed64a1603f15c869be637093abb88f196a8 (commit) via 5ea522cca3ef536ad9075129215f1836af34ed73 (commit) via 0ca2df3d74f89b47a3cdcf3088eee831761dd9be (commit) via 500e4176107db9e9797c6decc249d34c9d906abe (commit) via 619499a4a0bd99989c90260678cc9dbe3948c870 (commit) via ff879d5fa8c3ed9ba52cb44d9a4501e66531672d (commit) via 9fc4a95a6c7807a24d1595bd2c8c7884e6ce12a2 (commit) via 373baab2f1c03f0ff3c47527c93bed713a0e403c (commit) via 141d0310e97c91be0802670730fd178d0b81152b (commit) via 20944653d0d8640cdc3a7beca6855bc0213b814a (commit) via 8dd36d8d001ae74dd4758b3abe45f49bf752a5f7 (commit) via fe8b4bcae94c5795885f5ded211d5ebf85abcab5 (commit) via 60268b670beb5ed89528f498caa932b8eb9d2564 (commit) via e7fac06c87efeef4dc9aaef67e20a25e1bc50af2 (commit) via f86fa1a7aa137814e023f2fd2783f6abc78e797c (commit) via a7492121cbf3a30cf5219744dc5774177f3d9496 (commit) via 72c3f81f56169ac6f1bd7d7f1c1f0b18ab2e1fdb (commit) via 8a662a3e7566994bac18113c2d4ea5ed3047bc62 (commit) via 27e79f97b32df3426f7bc13fd0b1b3bff2cbf835 (commit) via be29376373fe098955f4bb1d24f76157dae82065 (commit) via 7f6413db99c5e7172ae255116bdbdfd53c2171b7 (commit) via 181118b438f3abb6bc0b4f6df6b4656215e12158 (commit) via 44cde88d44b123d5726351599e8a043c38920762 (commit) via c0e82fab2c677480bf4774eb4c854e0ed31d893c (commit) via 21bf585ca33eea0073c41f4d5115dcc8765bd122 (commit) via 2cb1bd572c9cc17f39742a46884a147ebf6f2302 (commit) via 067f57be454ce360fedb7501c51e5f1ef2824b7e (commit) via 379bbf144141d41ee31df11d8a8d3a0758c1db06 (commit) from 7f79421ba6204559fc33d960f9c58ee4bd2ca064 (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 9bdd6ed64a1603f15c869be637093abb88f196a8 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue May 14 11:21:43 2019 +0300 configure.ac: bump ODP API version Bump ODP API minor version, as API changes are backwards compatible. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/configure.ac b/configure.ac index 4cd00cc5e..83765d9c9 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ([2.5]) ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [21]) -m4_define([odpapi_minor_version], [4]) +m4_define([odpapi_minor_version], [5]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) commit 5ea522cca3ef536ad9075129215f1836af34ed73 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue May 21 18:21:37 2019 +0300 api: crypto: clarify IV format for 3GPP algorithms Clarify IV data format and point to proper documents for 3GPP algorithms. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index e796ddbfb..8d8f24bbf 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -125,24 +125,42 @@ typedef enum { /** Confidentiality F8 algorithm (UEA1) * * KASUMI-based F8 algorithm (also known as UEA1). + * + * IV should be formatted according to the 3GPP TS 35.201: + * COUNT || BEARER || DIRECTION || 0...0 */ ODP_CIPHER_ALG_KASUMI_F8, /** Confidentiality UEA2 algorithm (128-EEA1) * * SNOW 3G-based UEA2 algorithm (also known as 128-EEA1). + * + * IV (128 bit) should be formatted according to the ETSI/SAGE + * UEA2 & UIA2 specification: + * COUNT || BEARER || DIRECTION || 0...0 || + * COUNT || BEARER || DIRECTION || 0...0 || */ ODP_CIPHER_ALG_SNOW3G_UEA2, /** Confidentiality 128-EEA2 algorithm * * AES-CTR-based 128-EEA2 algorithm. + * + * IV (128 bit) should be formatted according to the ETSI/SAGE + * 128-EA2 & 128-EIA2 specification: + * COUNT || BEARER || + * DIRECTION || 0....0 */ ODP_CIPHER_ALG_AES_EEA2, /** Confidentiality 128-EEA3 algorithm * * ZUC-based 128-EEA3 algorithm. + * + * IV (128 bit) should be formatted according to the ETSI/SAGE + * 128-EEA3 & 128-EIA3 specification: + * COUNT || BEARER || DIRECTION || 0...0 || + * COUNT || BEARER || DIRECTION || 0...0 || */ ODP_CIPHER_ALG_ZUC_EEA3, @@ -262,24 +280,42 @@ typedef enum { * * IV (9 bytes) is a concatenation of COUNT (32b), FRESH (32b) and * DIRECTION (LSB-aligned, 1b). + * IV (8 bytes) is a concatenation of COUNT (32b) and FRESH (32b) + * DIRECTION (1b) and padding should come at the end of message. */ ODP_AUTH_ALG_KASUMI_F9, /** Integrity UIA2 algorithm (128-EIA1) * * SNOW 3G-based UIA2 algorithm (also known as 128-EIA1). + * IV (128 bit) should be formatted according to the ETSI/SAGE + * UEA2 & UIA2 specification: + * COUNT || FRESH || + * DIRECTION XOR COUNT0 || COUNT1 .. COUNT31 || + * FRESH0 .. FRESH15 || FRESH16 XOR DIRECTION || FRESH17 .. FRESH31 */ ODP_AUTH_ALG_SNOW3G_UIA2, /** Integrity 128-EIA2 algorithm * * AES_CMAC-based 128-EIA2 algorithm. + * + * IV (128 bit) should be formatted according to the ETSI/SAGE + * 128-EA2 & 128-EIA2 specification: + * COUNT || BEARER || + * DIRECTION || 0....0 */ ODP_AUTH_ALG_AES_EIA2, /** Integrity 128-EIA3 algorithm * * ZUC-based 128-EIA3 algorithm. + * + * IV (128 bit) should be formatted according to the ETSI/SAGE + * 128-EA3 & 128-EIA2 specification: + * COUNT || BEARER || + * DIRECTION XOR COUNT0 || COUNT1 .. COUNT31 || + * BEARER || 0...0 || DIRECTION || 0...0 */ ODP_AUTH_ALG_ZUC_EIA3, commit 0ca2df3d74f89b47a3cdcf3088eee831761dd9be Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon May 13 16:12:11 2019 +0300 linux-gen: crypto: fix support for OpenSSL 1.0.x Provide implementation of new EVP_MD_CTX API which is missing in OpenSSL 1.0.x. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 08c8262c8..3f03b63fa 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -332,6 +332,20 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) HMAC_CTX_cleanup(ctx); free(ctx); } + +static EVP_MD_CTX *EVP_MD_CTX_new(void) +{ + EVP_MD_CTX *ctx = malloc(sizeof(*ctx)); + + EVP_MD_CTX_init(ctx); + return ctx; +} + +static void EVP_MD_CTX_free(EVP_MD_CTX *ctx) +{ + EVP_MD_CTX_cleanup(ctx); + free(ctx); +} #endif static void commit 500e4176107db9e9797c6decc249d34c9d906abe Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sat May 18 18:41:42 2019 +0300 api: crypto: correct documentation for ODP_AUTH_ALG_SNOW3G_UIA2 Correct it to reference 128-EIA1 instead of 128-EEA1. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 7b782868b..e796ddbfb 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -265,7 +265,7 @@ typedef enum { */ ODP_AUTH_ALG_KASUMI_F9, - /** Integrity UIA2 algorithm (128-EEA1) + /** Integrity UIA2 algorithm (128-EIA1) * * SNOW 3G-based UIA2 algorithm (also known as 128-EIA1). */ commit 619499a4a0bd99989c90260678cc9dbe3948c870 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sun Apr 21 02:41:49 2019 +0300 linux-gen: crypto: add support for 3GPP AES EEA2/EIA2 algorithms Add support for AES-CTR variant as 128-EEA2 and AES-CMAC variant as 128-EIA algorithms defined by 3GPP. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 1ff8d03cc..08c8262c8 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -48,7 +48,8 @@ * 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} }; +{.key_len = 0, .iv_len = 0}, +{.key_len = 0, .iv_len = 0, .bit_mode = 1} }; static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = { {.key_len = 24, .iv_len = 8} }; @@ -98,12 +99,17 @@ static const odp_crypto_cipher_capability_t cipher_capa_chacha20_poly1305[] = { {.key_len = 32, .iv_len = 12} }; #endif +static const odp_crypto_cipher_capability_t cipher_capa_aes_eea2[] = { +{.key_len = 16, .iv_len = 16, .bit_mode = 1} }; + /* * Authentication algorithm capabilities * * 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}, + .bit_mode = 1}, {.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[] = { @@ -160,6 +166,10 @@ static const odp_crypto_auth_capability_t auth_capa_chacha20_poly1305[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; #endif +static const odp_crypto_auth_capability_t auth_capa_aes_eia2[] = { +{.digest_len = 4, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, + .iv_len = 8, .bit_mode = 1 } }; + static const odp_crypto_auth_capability_t auth_capa_md5[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; @@ -661,6 +671,102 @@ odp_crypto_alg_err_t auth_cmac_check(odp_packet_t pkt, return ODP_CRYPTO_ALG_ERR_NONE; } +static +int packet_cmac_eia2(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session, + uint8_t *hash) +{ + CMAC_CTX *ctx = local.cmac_ctx[session->idx]; + void *iv_ptr; + uint32_t offset = param->auth_range.offset; + uint32_t len = (param->auth_range.length + 7) / 8; + size_t outlen; + + if (param->auth_iv_ptr) + iv_ptr = param->auth_iv_ptr; + else if (session->p.auth_iv.data) + iv_ptr = session->auth.iv_data; + else + return ODP_CRYPTO_ALG_ERR_IV_INVALID; + + ODP_ASSERT(offset + len <= odp_packet_len(pkt)); + + /* Reinitialize CMAC calculation without resetting the key */ + CMAC_Init(ctx, NULL, 0, NULL, NULL); + + CMAC_Update(ctx, iv_ptr, session->p.auth_iv.length); + + while (len > 0) { + uint32_t seglen = 0; /* GCC */ + void *mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); + uint32_t maclen = len > seglen ? seglen : len; + + CMAC_Update(ctx, mapaddr, maclen); + offset += maclen; + len -= maclen; + } + + if (1 != CMAC_Final(ctx, hash, &outlen)) + return ODP_CRYPTO_ALG_ERR_DATA_SIZE; + else + return ODP_CRYPTO_ALG_ERR_NONE; +} + +static +odp_crypto_alg_err_t auth_cmac_eia2_gen(odp_packet_t pkt, + const odp_crypto_packet_op_param_t + *param, + odp_crypto_generic_session_t *session) +{ + uint8_t hash[EVP_MAX_MD_SIZE]; + int ret; + + /* Hash it */ + ret = packet_cmac_eia2(pkt, param, session, hash); + if (ret != ODP_CRYPTO_ALG_ERR_NONE) + return ret; + + /* Copy to the output location */ + odp_packet_copy_from_mem(pkt, + param->hash_result_offset, + session->p.auth_digest_len, + hash); + + return ODP_CRYPTO_ALG_ERR_NONE; +} + +static +odp_crypto_alg_err_t auth_cmac_eia2_check(odp_packet_t pkt, + const odp_crypto_packet_op_param_t + *param, + odp_crypto_generic_session_t *session) +{ + uint32_t bytes = session->p.auth_digest_len; + uint8_t hash_in[EVP_MAX_MD_SIZE]; + uint8_t hash_out[EVP_MAX_MD_SIZE]; + int ret; + + /* Copy current value out and clear it before authentication */ + odp_packet_copy_to_mem(pkt, param->hash_result_offset, + bytes, hash_in); + + _odp_packet_set_data(pkt, param->hash_result_offset, + 0, bytes); + + /* Hash it */ + ret = packet_cmac_eia2(pkt, param, session, hash_out); + if (ret != ODP_CRYPTO_ALG_ERR_NONE) + return ret; + + /* Verify match */ + if (0 != memcmp(hash_in, hash_out, bytes)) + return ODP_CRYPTO_ALG_ERR_ICV_CHECK; + + /* Matched */ + return ODP_CRYPTO_ALG_ERR_NONE; +} + static void packet_digest(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -986,6 +1092,112 @@ static int process_cipher_param(odp_crypto_generic_session_t *session, return 0; } +static +odp_crypto_alg_err_t cipher_encrypt_bits(odp_packet_t pkt, + const odp_crypto_packet_op_param_t + *param, + odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + void *iv_ptr; + int dummy_len = 0; + int cipher_len; + uint32_t in_len = (param->cipher_range.length + 7) / 8; + uint8_t data[in_len]; + int ret; + + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; + else if (session->p.cipher_iv.data) + iv_ptr = session->cipher.iv_data; + else + return ODP_CRYPTO_ALG_ERR_IV_INVALID; + + EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); + + odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len, + data); + + EVP_EncryptUpdate(ctx, data, &cipher_len, data, in_len); + + ret = EVP_EncryptFinal_ex(ctx, data + cipher_len, &dummy_len); + cipher_len += dummy_len; + + odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len, + data); + + return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : + ODP_CRYPTO_ALG_ERR_NONE; +} + +static +odp_crypto_alg_err_t cipher_decrypt_bits(odp_packet_t pkt, + const odp_crypto_packet_op_param_t + *param, + odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + void *iv_ptr; + int dummy_len = 0; + int cipher_len; + uint32_t in_len = (param->cipher_range.length + 7) / 8; + uint8_t data[in_len]; + int ret; + + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; + else if (session->p.cipher_iv.data) + iv_ptr = session->cipher.iv_data; + else + return ODP_CRYPTO_ALG_ERR_IV_INVALID; + + EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); + + odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len, + data); + + EVP_DecryptUpdate(ctx, data, &cipher_len, data, in_len); + + ret = EVP_DecryptFinal_ex(ctx, data + cipher_len, &dummy_len); + cipher_len += dummy_len; + + odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len, + data); + + return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : + ODP_CRYPTO_ALG_ERR_NONE; +} + +static int process_cipher_param_bits(odp_crypto_generic_session_t *session, + const EVP_CIPHER *cipher) +{ + /* Verify Key len is valid */ + if ((uint32_t)EVP_CIPHER_key_length(cipher) != + session->p.cipher_key.length) + return -1; + + /* Verify IV len is correct */ + if ((uint32_t)EVP_CIPHER_iv_length(cipher) != + session->p.cipher_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 = cipher_encrypt_bits; + session->cipher.init = cipher_encrypt_init; + } else { + session->cipher.func = cipher_decrypt_bits; + session->cipher.init = cipher_decrypt_init; + } + + return 0; +} + static void aes_gcm_encrypt_init(odp_crypto_generic_session_t *session) { @@ -1554,6 +1766,38 @@ static int process_auth_cmac_param(odp_crypto_generic_session_t *session, return 0; } +static int process_auth_cmac_eia2_param(odp_crypto_generic_session_t *session, + const EVP_CIPHER *cipher) +{ + /* Verify Key len is valid */ + if ((uint32_t)EVP_CIPHER_key_length(cipher) != + session->p.auth_key.length) + return -1; + + /* Verify IV len is correct */ + if (8 != session->p.auth_iv.length) + return -1; + + /* Set function */ + if (ODP_CRYPTO_OP_ENCODE == session->p.op) + session->auth.func = auth_cmac_eia2_gen; + else + session->auth.func = auth_cmac_eia2_check; + session->auth.init = auth_cmac_init; + + session->auth.evp_cipher = cipher; + + /* Number of valid bytes */ + if (session->p.auth_digest_len != 4) + return -1; + + /* Convert keys */ + memcpy(session->auth.key, session->p.auth_key.data, + session->p.auth_key.length); + + return 0; +} + static int process_digest_param(odp_crypto_generic_session_t *session, const EVP_MD *md) { @@ -1598,6 +1842,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) #if _ODP_HAVE_CHACHA20_POLY1305 capa->ciphers.bit.chacha20_poly1305 = 1; #endif + capa->ciphers.bit.aes_eea2 = 1; capa->auths.bit.null = 1; capa->auths.bit.md5_hmac = 1; @@ -1614,6 +1859,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) #if _ODP_HAVE_CHACHA20_POLY1305 capa->auths.bit.chacha20_poly1305 = 1; #endif + capa->auths.bit.aes_eia2 = 1; capa->auths.bit.md5 = 1; capa->auths.bit.sha1 = 1; @@ -1690,6 +1936,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, num = sizeof(cipher_capa_chacha20_poly1305) / size; break; #endif + case ODP_CIPHER_ALG_AES_EEA2: + src = cipher_capa_aes_eea2; + num = sizeof(cipher_capa_aes_eea2) / size; + break; default: return -1; } @@ -1764,6 +2014,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth, num = sizeof(auth_capa_chacha20_poly1305) / size; break; #endif + case ODP_AUTH_ALG_AES_EIA2: + src = auth_capa_aes_eia2; + num = sizeof(auth_capa_aes_eia2) / size; + break; case ODP_AUTH_ALG_MD5: src = auth_capa_md5; num = sizeof(auth_capa_md5) / size; @@ -1969,6 +2223,13 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, EVP_chacha20_poly1305()); break; #endif + case ODP_CIPHER_ALG_AES_EEA2: + if (param->cipher_key.length == 16) + rc = process_cipher_param_bits(session, + EVP_aes_128_ctr()); + else + rc = -1; + break; default: rc = -1; } @@ -2087,6 +2348,13 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, } break; #endif + case ODP_AUTH_ALG_AES_EIA2: + if (param->auth_key.length == 16) + rc = process_auth_cmac_eia2_param(session, + EVP_aes_128_cbc()); + else + rc = -1; + break; case ODP_AUTH_ALG_MD5: rc = process_digest_param(session, EVP_md5()); break; commit ff879d5fa8c3ed9ba52cb44d9a4501e66531672d Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sun Apr 21 02:41:49 2019 +0300 validation: crypto: add support for 3GPP AES EEA2/EIA2 algorithms Add support for AES-CTR variant as 128-EEA2 and AES-CMAC variant as 128-EIA algorithms defined by 3GPP. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 2f5726033..faf4dba83 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -68,6 +68,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_KASUMI_F9"; case ODP_AUTH_ALG_SNOW3G_UIA2: return "ODP_AUTH_ALG_SNOW3G_UIA2"; + case ODP_AUTH_ALG_AES_EIA2: + return "ODP_AUTH_ALG_AES_EIA2"; case ODP_AUTH_ALG_ZUC_EIA3: return "ODP_AUTH_ALG_ZUC_EIA3"; case ODP_AUTH_ALG_MD5: @@ -118,6 +120,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_KASUMI_F8"; case ODP_CIPHER_ALG_SNOW3G_UEA2: return "ODP_CIPHER_ALG_SNOW3G_UEA2"; + case ODP_CIPHER_ALG_AES_EEA2: + return "ODP_CIPHER_ALG_AES_EEA2"; case ODP_CIPHER_ALG_ZUC_EEA3: return "ODP_CIPHER_ALG_ZUC_EEA3"; default: @@ -562,6 +566,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_SNOW3G_UEA2 && !(capa.ciphers.bit.snow3g_uea2)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_EEA2 && + !(capa.ciphers.bit.aes_eea2)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_ZUC_EEA3 && !(capa.ciphers.bit.zuc_eea3)) rc = -1; @@ -596,6 +603,9 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_SNOW3G_UIA2 && !(capa.auths.bit.snow3g_uia2)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_AES_EIA2 && + !(capa.auths.bit.aes_eia2)) + rc = -1; if (auth_alg == ODP_AUTH_ALG_ZUC_EIA3 && !(capa.auths.bit.zuc_eia3)) rc = -1; @@ -824,6 +834,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.snow3g_uea2) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_AES_EEA2: + if (!capability.ciphers.bit.aes_eea2) + return ODP_TEST_INACTIVE; + break; case ODP_CIPHER_ALG_ZUC_EEA3: if (!capability.ciphers.bit.zuc_eea3) return ODP_TEST_INACTIVE; @@ -895,6 +909,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.snow3g_uia2) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_AES_EIA2: + if (!capability.auths.bit.aes_eia2) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_ZUC_EIA3: if (!capability.auths.bit.zuc_eia3) return ODP_TEST_INACTIVE; @@ -1622,6 +1640,56 @@ static void crypto_test_dec_alg_snow3g_uea2_ovr_iv(void) true); } +static int check_alg_aes_eea2(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_EEA2, + ODP_AUTH_ALG_NULL); +} + +static void crypto_test_enc_alg_aes_eea2(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_EEA2, + ODP_AUTH_ALG_NULL, + aes_eea2_reference, + ARRAY_SIZE(aes_eea2_reference), + false, + true); +} + +static void crypto_test_enc_alg_aes_eea2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_EEA2, + ODP_AUTH_ALG_NULL, + aes_eea2_reference, + ARRAY_SIZE(aes_eea2_reference), + true, + true); +} + +static void crypto_test_dec_alg_aes_eea2(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_EEA2, + ODP_AUTH_ALG_NULL, + aes_eea2_reference, + ARRAY_SIZE(aes_eea2_reference), + false, + true); +} + +static void crypto_test_dec_alg_aes_eea2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_EEA2, + ODP_AUTH_ALG_NULL, + aes_eea2_reference, + ARRAY_SIZE(aes_eea2_reference), + true, + true); +} + static int check_alg_zuc_eea3(void) { return check_alg_support(ODP_CIPHER_ALG_ZUC_EEA3, ODP_AUTH_ALG_NULL); @@ -2077,6 +2145,56 @@ static void crypto_test_check_alg_snow3g_uia2_ovr_iv(void) true); } +static int check_alg_aes_eia2(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_EIA2); +} + +static void crypto_test_gen_alg_aes_eia2(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_EIA2, + aes_eia2_reference, + ARRAY_SIZE(aes_eia2_reference), + false, + true); +} + +static void crypto_test_gen_alg_aes_eia2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_EIA2, + aes_eia2_reference, + ARRAY_SIZE(aes_eia2_reference), + true, + true); +} + +static void crypto_test_check_alg_aes_eia2(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_EIA2, + aes_eia2_reference, + ARRAY_SIZE(aes_eia2_reference), + false, + true); +} + +static void crypto_test_check_alg_aes_eia2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_AES_EIA2, + aes_eia2_reference, + ARRAY_SIZE(aes_eia2_reference), + true, + true); +} + static int check_alg_zuc_eia3(void) { return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_ZUC_EIA3); @@ -2409,6 +2527,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_snow3g_uea2), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_snow3g_uea2_ovr_iv, check_alg_snow3g_uea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_eea2, + check_alg_aes_eea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_eea2, + check_alg_aes_eea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_eea2_ovr_iv, + check_alg_aes_eea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_eea2_ovr_iv, + check_alg_aes_eea2), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_zuc_eea3, check_alg_zuc_eea3), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_zuc_eea3, @@ -2497,6 +2623,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_snow3g_uia2), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_snow3g_uia2_ovr_iv, check_alg_snow3g_uia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_eia2, + check_alg_aes_eia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_eia2, + check_alg_aes_eia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_eia2_ovr_iv, + check_alg_aes_eia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_eia2_ovr_iv, + check_alg_aes_eia2), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_zuc_eia3, check_alg_zuc_eia3), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_zuc_eia3, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index e9d702eae..6c4fc5b59 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -2536,6 +2536,79 @@ static crypto_test_reference_t snow3g_uia2_reference[] = { } }; +/* + * AES EEA2 and AES EIA2 test vectors from + * Specification of the 3GPP Confidentiality and Integrity + * Algorithms 128-EEA2 & 128-EIA2 + */ +static crypto_test_reference_t aes_eea2_reference[] = { + { + .cipher_key_length = AES_EEA2_KEY_LEN, + .cipher_key = { 0xD3, 0xC5, 0xD5, 0x92, 0x32, 0x7F, 0xB1, 0x1C, + 0x40, 0x35, 0xC6, 0x68, 0x0A, 0xF8, 0xC6, 0xD1}, + .cipher_iv_length = AES_EEA2_IV_LEN, + .cipher_iv = { 0x39, 0x8a, 0x59, 0xb4, 0xac, }, + .length = 248 /* + 5 */, /* 253 bits originally = 31 + 1 bytes*/ + .plaintext = { 0x98, 0x1B, 0xA6, 0x82, 0x4C, 0x1B, 0xFB, 0x1A, + 0xB4, 0x85, 0x47, 0x20, 0x29, 0xB7, 0x1D, 0x80, + 0x8C, 0xE3, 0x3E, 0x2C, 0xC3, 0xC0, 0xB5, 0xFC, + 0x1F, 0x3D, 0xE8, 0xA6, 0xDC, 0x66, 0xB1, 0xF0 }, + .ciphertext = { 0xE9, 0xFE, 0xD8, 0xA6, 0x3D, 0x15, 0x53, 0x04, + 0xD7, 0x1D, 0xF2, 0x0B, 0xF3, 0xE8, 0x22, 0x14, + 0xB2, 0x0E, 0xD7, 0xDA, 0xD2, 0xF2, 0x33, 0xDC, + 0x3C, 0x22, 0xD7, 0xBD, 0xEE, 0xED, 0x8E, 0x78} + }, + { + .cipher_key_length = AES_EEA2_KEY_LEN, + .cipher_key = { 0x2B, 0xD6, 0x45, 0x9F, 0x82, 0xC4, 0x40, 0xE0, + 0x95, 0x2C, 0x49, 0x10, 0x48, 0x05, 0xFF, 0x48}, + .cipher_iv_length = AES_EEA2_IV_LEN, + .cipher_iv = { 0xc6, 0x75, 0xa6, 0x4b, 0x64, }, + .length = 99 /* + 6 */, /* 798 bits originally = 99 + 1 bytes */ + .plaintext = { 0x7E, 0xC6, 0x12, 0x72, 0x74, 0x3B, 0xF1, 0x61, + 0x47, 0x26, 0x44, 0x6A, 0x6C, 0x38, 0xCE, 0xD1, + 0x66, 0xF6, 0xCA, 0x76, 0xEB, 0x54, 0x30, 0x04, + 0x42, 0x86, 0x34, 0x6C, 0xEF, 0x13, 0x0F, 0x92, + 0x92, 0x2B, 0x03, 0x45, 0x0D, 0x3A, 0x99, 0x75, + 0xE5, 0xBD, 0x2E, 0xA0, 0xEB, 0x55, 0xAD, 0x8E, + 0x1B, 0x19, 0x9E, 0x3E, 0xC4, 0x31, 0x60, 0x20, + 0xE9, 0xA1, 0xB2, 0x85, 0xE7, 0x62, 0x79, 0x53, + 0x59, 0xB7, 0xBD, 0xFD, 0x39, 0xBE, 0xF4, 0xB2, + 0x48, 0x45, 0x83, 0xD5, 0xAF, 0xE0, 0x82, 0xAE, + 0xE6, 0x38, 0xBF, 0x5F, 0xD5, 0xA6, 0x06, 0x19, + 0x39, 0x01, 0xA0, 0x8F, 0x4A, 0xB4, 0x1A, 0xAB, + 0x9B, 0x13, 0x48, 0x80 }, + .ciphertext = { 0x59, 0x61, 0x60, 0x53, 0x53, 0xC6, 0x4B, 0xDC, + 0xA1, 0x5B, 0x19, 0x5E, 0x28, 0x85, 0x53, 0xA9, + 0x10, 0x63, 0x25, 0x06, 0xD6, 0x20, 0x0A, 0xA7, + 0x90, 0xC4, 0xC8, 0x06, 0xC9, 0x99, 0x04, 0xCF, + 0x24, 0x45, 0xCC, 0x50, 0xBB, 0x1C, 0xF1, 0x68, + 0xA4, 0x96, 0x73, 0x73, 0x4E, 0x08, 0x1B, 0x57, + 0xE3, 0x24, 0xCE, 0x52, 0x59, 0xC0, 0xE7, 0x8D, + 0x4C, 0xD9, 0x7B, 0x87, 0x09, 0x76, 0x50, 0x3C, + 0x09, 0x43, 0xF2, 0xCB, 0x5A, 0xE8, 0xF0, 0x52, + 0xC7, 0xB7, 0xD3, 0x92, 0x23, 0x95, 0x87, 0xB8, + 0x95, 0x60, 0x86, 0xBC, 0xAB, 0x18, 0x83, 0x60, + 0x42, 0xE2, 0xE6, 0xCE, 0x42, 0x43, 0x2A, 0x17, + 0x10, 0x5C, 0x53, 0xD0 } + }, +}; + +static crypto_test_reference_t aes_eia2_reference[] = { + { + .auth_key_length = AES_EIA2_KEY_LEN, + .auth_key = { 0xD3, 0xC5, 0xD5, 0x92, 0x32, 0x7F, 0xB1, 0x1C, + 0x40, 0x35, 0xC6, 0x68, 0x0A, 0xF8, 0xC6, 0xD1 }, + .auth_iv_length = AES_EIA2_IV_LEN, + .auth_iv = { 0x39, 0x8a, 0x59, 0xb4, 0xd4, }, + .length = 64, /* 8 bytes */ + .plaintext = { 0x48, 0x45, 0x83, 0xd5, 0xaf, 0xe0, 0x82, 0xae }, + .ciphertext = { 0x48, 0x45, 0x83, 0xd5, 0xaf, 0xe0, 0x82, 0xae}, + .digest_length = AES_EIA2_DIGEST_LEN, + .digest = { 0xb9, 0x37, 0x87, 0xe6 } + }, +}; + /* * ZUC EEA3 and EIA3 test vectors from * Specification of the 3GPP Confidentiality and Integrity diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index fd5bccfc9..17121e12e 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -93,6 +93,10 @@ #define SNOW3G_UEA2_KEY_LEN 16 #define SNOW3G_UEA2_IV_LEN 16 +/* AES_EEA2 */ +#define AES_EEA2_KEY_LEN 16 +#define AES_EEA2_IV_LEN 16 + /* ZUC_EEA3 */ #define ZUC_EEA3_KEY_LEN 16 #define ZUC_EEA3_IV_LEN 16 @@ -107,6 +111,11 @@ #define SNOW3G_UIA2_IV_LEN 16 #define SNOW3G_UIA2_DIGEST_LEN 4 +/* AES_EIA2 */ +#define AES_EIA2_KEY_LEN 16 +#define AES_EIA2_IV_LEN 8 +#define AES_EIA2_DIGEST_LEN 4 + /* ZUC_EIA3 */ #define ZUC_EIA3_KEY_LEN 16 #define ZUC_EIA3_IV_LEN 16 commit 9fc4a95a6c7807a24d1595bd2c8c7884e6ce12a2 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sun Apr 21 02:41:49 2019 +0300 api: crypto: add support for 3GPP AES EEA2/EIA2 algorithms Add support for AES-CTR variant as 128-EEA2 and AES-CMAC variant as 128-EIA algorithms defined by 3GPP. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index f7a1cae08..7b782868b 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -134,6 +134,12 @@ typedef enum { */ ODP_CIPHER_ALG_SNOW3G_UEA2, + /** Confidentiality 128-EEA2 algorithm + * + * AES-CTR-based 128-EEA2 algorithm. + */ + ODP_CIPHER_ALG_AES_EEA2, + /** Confidentiality 128-EEA3 algorithm * * ZUC-based 128-EEA3 algorithm. @@ -265,6 +271,12 @@ typedef enum { */ ODP_AUTH_ALG_SNOW3G_UIA2, + /** Integrity 128-EIA2 algorithm + * + * AES_CMAC-based 128-EIA2 algorithm. + */ + ODP_AUTH_ALG_AES_EIA2, + /** Integrity 128-EIA3 algorithm * * ZUC-based 128-EIA3 algorithm. @@ -348,6 +360,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_SNOW3G_UEA2 */ uint32_t snow3g_uea2 : 1; + /** ODP_CIPHER_ALG_AES_EEA2 */ + uint32_t aes_eea2 : 1; + /** ODP_CIPHER_ALG_ZUC_EEA3 */ uint32_t zuc_eea3 : 1; @@ -417,6 +432,9 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_SNOW3G_UIA2 */ uint32_t snow3g_uia2 : 1; + /** ODP_AUTH_ALG_AES_EIA2 */ + uint32_t aes_eia2 : 1; + /** ODP_AUTH_ALG_ZUC_EIA3 */ uint32_t zuc_eia3 : 1; commit 373baab2f1c03f0ff3c47527c93bed713a0e403c Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue Apr 16 00:14:18 2019 +0300 linux-gen: crypto: add AES-XTS support Add support for AES in XEX-based tweaked-codebook mode with ciphertext stealing mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index ae27a2034..1ff8d03cc 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -76,6 +76,10 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_cfb128[] = { {.key_len = 24, .iv_len = 16}, {.key_len = 32, .iv_len = 16} }; +static const odp_crypto_cipher_capability_t cipher_capa_aes_xts[] = { +{.key_len = 32, .iv_len = 16}, +{.key_len = 64, .iv_len = 16} }; + static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { {.key_len = 16, .iv_len = 12}, {.key_len = 24, .iv_len = 12}, @@ -1387,6 +1391,110 @@ static int process_aes_ccm_param(odp_crypto_generic_session_t *session, return 0; } +static +odp_crypto_alg_err_t xts_encrypt(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + void *iv_ptr; + int dummy_len = 0; + int cipher_len; + uint32_t in_len = param->cipher_range.length; + uint8_t data[in_len]; + int ret; + + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; + else if (session->p.cipher_iv.data) + iv_ptr = session->cipher.iv_data; + else + return ODP_CRYPTO_ALG_ERR_IV_INVALID; + + EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); + + odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len, + data); + + EVP_EncryptUpdate(ctx, data, &cipher_len, data, in_len); + + ret = EVP_EncryptFinal_ex(ctx, data + cipher_len, &dummy_len); + cipher_len += dummy_len; + + odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len, + data); + + return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : + ODP_CRYPTO_ALG_ERR_NONE; +} + +static +odp_crypto_alg_err_t xts_decrypt(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + void *iv_ptr; + int dummy_len = 0; + int cipher_len; + uint32_t in_len = param->cipher_range.length; + uint8_t data[in_len]; + int ret; + + if (param->cipher_iv_ptr) + iv_ptr = param->cipher_iv_ptr; + else if (session->p.cipher_iv.data) + iv_ptr = session->cipher.iv_data; + else + return ODP_CRYPTO_ALG_ERR_IV_INVALID; + + EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); + + odp_packet_copy_to_mem(pkt, param->cipher_range.offset, in_len, + data); + + EVP_DecryptUpdate(ctx, data, &cipher_len, data, in_len); + + ret = EVP_DecryptFinal_ex(ctx, data + cipher_len, &dummy_len); + cipher_len += dummy_len; + + odp_packet_copy_from_mem(pkt, param->cipher_range.offset, in_len, + data); + + return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : + ODP_CRYPTO_ALG_ERR_NONE; +} + +static int process_xts_param(odp_crypto_generic_session_t *session, + const EVP_CIPHER *cipher) +{ + /* Verify Key len is valid */ + if ((uint32_t)EVP_CIPHER_key_length(cipher) != + session->p.cipher_key.length) + return -1; + + /* Verify IV len is correct */ + if ((uint32_t)EVP_CIPHER_iv_length(cipher) != + session->p.cipher_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 = xts_encrypt; + session->cipher.init = cipher_encrypt_init; + } else { + session->cipher.func = xts_decrypt; + session->cipher.init = cipher_decrypt_init; + } + + return 0; +} + static int process_auth_hmac_param(odp_crypto_generic_session_t *session, const EVP_MD *evp_md) { @@ -1484,6 +1592,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.aes_ctr = 1; capa->ciphers.bit.aes_ecb = 1; capa->ciphers.bit.aes_cfb128 = 1; + capa->ciphers.bit.aes_xts = 1; capa->ciphers.bit.aes_gcm = 1; capa->ciphers.bit.aes_ccm = 1; #if _ODP_HAVE_CHACHA20_POLY1305 @@ -1563,6 +1672,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, src = cipher_capa_aes_cfb128; num = sizeof(cipher_capa_aes_cfb128) / size; break; + case ODP_CIPHER_ALG_AES_XTS: + src = cipher_capa_aes_xts; + num = sizeof(cipher_capa_aes_xts) / size; + break; case ODP_CIPHER_ALG_AES_GCM: src = cipher_capa_aes_gcm; num = sizeof(cipher_capa_aes_gcm) / size; @@ -1797,6 +1910,14 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; + case ODP_CIPHER_ALG_AES_XTS: + if (param->cipher_key.length == 32) + rc = process_xts_param(session, EVP_aes_128_xts()); + else if (param->cipher_key.length == 64) + rc = process_xts_param(session, EVP_aes_256_xts()); + else + rc = -1; + break; #if ODP_DEPRECATED_API case ODP_CIPHER_ALG_AES128_GCM: /* AES-GCM requires to do both auth and commit 141d0310e97c91be0802670730fd178d0b81152b Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue Apr 16 00:14:18 2019 +0300 validation: crypto: add AES-XTS support Add support for AES in XEX-based tweaked-codebook mode with ciphertext stealing mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 4f4d8c13f..2f5726033 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -106,6 +106,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_AES_ECB"; case ODP_CIPHER_ALG_AES_CFB128: return "ODP_CIPHER_ALG_AES_CFB128"; + case ODP_CIPHER_ALG_AES_XTS: + return "ODP_CIPHER_ALG_AES_XTS"; case ODP_CIPHER_ALG_AES_GCM: return "ODP_CIPHER_ALG_AES_GCM"; case ODP_CIPHER_ALG_AES_CCM: @@ -542,6 +544,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_AES_CFB128 && !(capa.ciphers.bit.aes_cfb128)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_XTS && + !(capa.ciphers.bit.aes_xts)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && !(capa.ciphers.bit.aes_gcm)) rc = -1; @@ -795,6 +800,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.aes_cfb128) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_AES_XTS: + if (!capability.ciphers.bit.aes_xts) + return ODP_TEST_INACTIVE; + break; case ODP_CIPHER_ALG_AES_GCM: if (!capability.ciphers.bit.aes_gcm) return ODP_TEST_INACTIVE; @@ -1449,6 +1458,72 @@ static void crypto_test_dec_alg_aes_cfb128_ovr_iv(void) false); } +static int check_alg_aes_xts(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_XTS, ODP_AUTH_ALG_NULL); +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for AES128_XTS algorithm. IV for the operation is the session IV. + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer.*/ +static void crypto_test_enc_alg_aes_xts(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_XTS, + ODP_AUTH_ALG_NULL, + aes_xts_reference, + ARRAY_SIZE(aes_xts_reference), + false, + false); +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for AES128_XTS algorithm. IV for the operation is the operation IV. + * */ +static void crypto_test_enc_alg_aes_xts_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_XTS, + ODP_AUTH_ALG_NULL, + aes_xts_reference, + ARRAY_SIZE(aes_xts_reference), + true, + false); +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for AES128_XTS algorithm. IV for the operation is the session IV + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +static void crypto_test_dec_alg_aes_xts(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_XTS, + ODP_AUTH_ALG_NULL, + aes_xts_reference, + ARRAY_SIZE(aes_xts_reference), + false, + false); +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for AES128_XTS algorithm. IV for the operation is the session IV + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +static void crypto_test_dec_alg_aes_xts_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_XTS, + ODP_AUTH_ALG_NULL, + aes_xts_reference, + ARRAY_SIZE(aes_xts_reference), + true, + false); +} + static int check_alg_kasumi_f8(void) { return check_alg_support(ODP_CIPHER_ALG_KASUMI_F8, ODP_AUTH_ALG_NULL); @@ -2310,6 +2385,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_cfb128), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cfb128_ovr_iv, check_alg_aes_cfb128), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_xts, + check_alg_aes_xts), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_xts, + check_alg_aes_xts), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_xts_ovr_iv, + check_alg_aes_xts), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_xts_ovr_iv, + check_alg_aes_xts), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_kasumi_f8, check_alg_kasumi_f8), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_kasumi_f8, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 8d5263098..e9d702eae 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -905,6 +905,137 @@ static crypto_test_reference_t aes_cfb128_reference[] = { } }; +static crypto_test_reference_t aes_xts_reference[] = { + /* CAVS 11.0 XTSGen information, #1 */ + { + .cipher_key_length = AES128_XTS_KEY_LEN, + .cipher_key = { 0xa1, 0xb9, 0x0c, 0xba, 0x3f, 0x06, 0xac, 0x35, + 0x3b, 0x2c, 0x34, 0x38, 0x76, 0x08, 0x17, 0x62, + 0x09, 0x09, 0x23, 0x02, 0x6e, 0x91, 0x77, 0x18, + 0x15, 0xf2, 0x9d, 0xab, 0x01, 0x93, 0x2f, 0x2f}, + .cipher_iv_length = AES_XTS_IV_LEN, + .cipher_iv = { 0x4f, 0xae, 0xf7, 0x11, 0x7c, 0xda, 0x59, 0xc6, + 0x6e, 0x4b, 0x92, 0x01, 0x3e, 0x76, 0x8a, 0xd5}, + .length = 16, + .plaintext = { 0xeb, 0xab, 0xce, 0x95, 0xb1, 0x4d, 0x3c, 0x8d, + 0x6f, 0xb3, 0x50, 0x39, 0x07, 0x90, 0x31, 0x1c}, + .ciphertext = { 0x77, 0x8a, 0xe8, 0xb4, 0x3c, 0xb9, 0x8d, 0x5a, + 0x82, 0x50, 0x81, 0xd5, 0xbe, 0x47, 0x1c, 0x63} + }, + /* CAVS 11.0 XTSGen information, #101 */ + { + .cipher_key_length = AES128_XTS_KEY_LEN, + .cipher_key = { 0xb7, 0xb9, 0x3f, 0x51, 0x6a, 0xef, 0x29, 0x5e, + 0xff, 0x3a, 0x29, 0xd8, 0x37, 0xcf, 0x1f, 0x13, + 0x53, 0x47, 0xe8, 0xa2, 0x1d, 0xae, 0x61, 0x6f, + 0xf5, 0x06, 0x2b, 0x2e, 0x8d, 0x78, 0xce, 0x5e}, + .cipher_iv_length = AES_XTS_IV_LEN, + .cipher_iv = { 0x87, 0x3e, 0xde, 0xa6, 0x53, 0xb6, 0x43, 0xbd, + 0x8b, 0xcf, 0x51, 0x40, 0x31, 0x97, 0xed, 0x14}, + .length = 32, + .plaintext = { 0x23, 0x6f, 0x8a, 0x5b, 0x58, 0xdd, 0x55, 0xf6, + 0x19, 0x4e, 0xd7, 0x0c, 0x4a, 0xc1, 0xa1, 0x7f, + 0x1f, 0xe6, 0x0e, 0xc9, 0xa6, 0xc4, 0x54, 0xd0, + 0x87, 0xcc, 0xb7, 0x7d, 0x6b, 0x63, 0x8c, 0x47}, + .ciphertext = { 0x22, 0xe6, 0xa3, 0xc6, 0x37, 0x9d, 0xcf, 0x75, + 0x99, 0xb0, 0x52, 0xb5, 0xa7, 0x49, 0xc7, 0xf7, + 0x8a, 0xd8, 0xa1, 0x1b, 0x9f, 0x1a, 0xa9, 0x43, + 0x0c, 0xf3, 0xae, 0xf4, 0x45, 0x68, 0x2e, 0x19} + }, + /* CAVS 11.0 XTSGen information, #227 TODO (Length 130 bits)*/ + /* { + .cipher_key_length = AES128_XTS_KEY_LEN, + .cipher_key = { 0xec, 0x14, 0xc0, 0xa3, 0xb7, 0x72, 0x58, 0x5c, + 0x15, 0xd4, 0xeb, 0x94, 0xe6, 0x9e, 0x2c, 0x55, + 0x80, 0xcf, 0x3a, 0x63, 0xc1, 0x7c, 0xe9, 0xda, + 0xd8, 0x2b, 0xb4, 0x54, 0xe3, 0x87, 0x90, 0x45}, + .cipher_iv_length = AES_XTS_IV_LEN, + .cipher_iv = { 0x4a, 0x02, 0x87, 0xc2, 0x6e, 0xd2, 0x41, 0x26, + 0x5b, 0x3a, 0x42, 0xcd, 0xd1, 0x9c, 0xea, 0xe2}, + .length = 17, + .plaintext = { 0x50, 0x82, 0x64, 0x75, 0x82, 0xc6, 0xe5, 0xa7, + 0x88, 0x73, 0x6f, 0xc5, 0x90, 0x5e, 0xa5, 0x65, + 0xc0 }, + .ciphertext = { 0x04, 0x3a, 0xb9, 0xc0, 0x3d, 0x5b, 0x44, 0x13, + 0x1d, 0x3e, 0x6e, 0xb2, 0x57, 0x61, 0x89, 0xde, + 0x80 }, + }, */ + /* CAVS 11.0 XTSGen information, #1 */ + { + .cipher_key_length = AES256_XTS_KEY_LEN, + .cipher_key = { 0x1e, 0xa6, 0x61, 0xc5, 0x8d, 0x94, 0x3a, 0x0e, + 0x48, 0x01, 0xe4, 0x2f, 0x4b, 0x09, 0x47, 0x14, + 0x9e, 0x7f, 0x9f, 0x8e, 0x3e, 0x68, 0xd0, 0xc7, + 0x50, 0x52, 0x10, 0xbd, 0x31, 0x1a, 0x0e, 0x7c, + 0xd6, 0xe1, 0x3f, 0xfd, 0xf2, 0x41, 0x8d, 0x8d, + 0x19, 0x11, 0xc0, 0x04, 0xcd, 0xa5, 0x8d, 0xa3, + 0xd6, 0x19, 0xb7, 0xe2, 0xb9, 0x14, 0x1e, 0x58, + 0x31, 0x8e, 0xea, 0x39, 0x2c, 0xf4, 0x1b, 0x08}, + .cipher_iv_length = AES_XTS_IV_LEN, + .cipher_iv = { 0xad, 0xf8, 0xd9, 0x26, 0x27, 0x46, 0x4a, 0xd2, + 0xf0, 0x42, 0x8e, 0x84, 0xa9, 0xf8, 0x75, 0x64}, + .length = 32, + .plaintext = { 0x2e, 0xed, 0xea, 0x52, 0xcd, 0x82, 0x15, 0xe1, + 0xac, 0xc6, 0x47, 0xe8, 0x10, 0xbb, 0xc3, 0x64, + 0x2e, 0x87, 0x28, 0x7f, 0x8d, 0x2e, 0x57, 0xe3, + 0x6c, 0x0a, 0x24, 0xfb, 0xc1, 0x2a, 0x20, 0x2e}, + .ciphertext = { 0xcb, 0xaa, 0xd0, 0xe2, 0xf6, 0xce, 0xa3, 0xf5, + 0x0b, 0x37, 0xf9, 0x34, 0xd4, 0x6a, 0x9b, 0x13, + 0x0b, 0x9d, 0x54, 0xf0, 0x7e, 0x34, 0xf3, 0x6a, + 0xf7, 0x93, 0xe8, 0x6f, 0x73, 0xc6, 0xd7, 0xdb}, + }, + /* CAVS 11.0 XTSGen information, #110 */ + { + .cipher_key_length = AES256_XTS_KEY_LEN, + .cipher_key = { 0x6b, 0x19, 0x84, 0xc2, 0x4e, 0x7e, 0xb6, 0x62, + 0x8e, 0x3a, 0x11, 0xc9, 0xcc, 0xd2, 0x59, 0x40, + 0x33, 0xa3, 0xa0, 0xd9, 0x01, 0x6e, 0xae, 0x65, + 0xc2, 0xf2, 0x4e, 0x09, 0xb9, 0xa6, 0x6e, 0x9f, + 0xe9, 0xd1, 0x63, 0xa5, 0x06, 0xdf, 0xbc, 0xcf, + 0x2d, 0x93, 0xe8, 0x99, 0x1e, 0x2f, 0xc5, 0x60, + 0xe1, 0x04, 0x35, 0xb8, 0x90, 0xb5, 0x88, 0x9a, + 0x50, 0x03, 0xe4, 0xbf, 0x81, 0x7d, 0xc3, 0xe0}, + .cipher_iv_length = AES_XTS_IV_LEN, + .cipher_iv = { 0x6b, 0xb0, 0xd3, 0xae, 0x4f, 0xa8, 0x6e, 0x43, + 0x16, 0x19, 0xe4, 0x07, 0xd5, 0x9a, 0xd4, 0xf4}, + .length = 48, + .plaintext = { 0x6a, 0x74, 0x1a, 0x94, 0x5b, 0xfb, 0xf0, 0xc6, + 0x7a, 0xfd, 0x43, 0xba, 0x1f, 0x84, 0x18, 0x16, + 0xc0, 0x99, 0x51, 0x58, 0x05, 0xd0, 0xfc, 0x1f, + 0x7d, 0xbf, 0x6d, 0xe9, 0x00, 0xe0, 0xaa, 0x7a, + 0x21, 0x9c, 0x88, 0x56, 0x32, 0x71, 0xb0, 0x09, + 0xd1, 0xac, 0x90, 0xeb, 0x7d, 0xc9, 0x97, 0x35}, + .ciphertext = { 0xe4, 0x7b, 0xce, 0x29, 0x2b, 0xaa, 0x63, 0xbe, + 0xf3, 0x16, 0xf6, 0x80, 0xa5, 0xf4, 0x80, 0xa7, + 0xb8, 0x83, 0xdf, 0xab, 0x6e, 0xd5, 0xa5, 0x7f, + 0x7e, 0x29, 0xec, 0xb8, 0x9e, 0x35, 0x4a, 0x31, + 0xc9, 0xb1, 0x74, 0xc4, 0xab, 0xad, 0x6c, 0xba, + 0xba, 0xba, 0x19, 0x14, 0x0c, 0x46, 0x20, 0xa3}, + }, + /* CAVS 11.0 XTSGen information, #211 TODO: length 140 bits */ + /* { + .cipher_key_length = AES256_XTS_KEY_LEN, + .cipher_key = { 0x62, 0xc2, 0xe4, 0xf8, 0x52, 0xa9, 0x3e, 0xea, + 0x4a, 0x2f, 0x61, 0xe8, 0x67, 0x68, 0x14, 0xf4, + 0xa8, 0x0d, 0xc4, 0x7e, 0xe1, 0x81, 0x32, 0xc8, + 0x38, 0xbf, 0x89, 0xa6, 0x18, 0xfd, 0xb8, 0xe2, + 0x91, 0x3e, 0x2e, 0x5c, 0x32, 0x1b, 0x19, 0xea, + 0x04, 0xbb, 0xa6, 0x34, 0x7d, 0x22, 0x6f, 0x41, + 0xdb, 0xee, 0x88, 0x0d, 0x61, 0x67, 0xb8, 0xe1, + 0xe9, 0x17, 0xfa, 0xf0, 0x46, 0xf0, 0x87, 0x5e}, + .cipher_iv_length = AES_XTS_IV_LEN, + .cipher_iv = { 0x53, 0x7e, 0xe3, 0xdc, 0x13, 0xce, 0x27, 0xa8, + 0xd3, 0x0e, 0x6e, 0x42, 0xb5, 0xb9, 0x96, 0xae}, + .length = 18, + .plaintext = { 0x00, 0xc9, 0xeb, 0x87, 0x78, 0xe0, 0x3d, 0xdd, + 0x5f, 0x3d, 0xe8, 0xc1, 0x8b, 0x34, 0x8f, 0xac, + 0x9c, 0x30}, + .ciphertext = { 0x9d, 0x4a, 0x08, 0xac, 0x0f, 0xb4, 0x4e, 0x90, + 0xd0, 0x5f, 0x62, 0x86, 0x19, 0x3f, 0x3a, 0xab, + 0xc2, 0x90}, + } */ +}; + /* AES-GCM test vectors extracted from * https://tools.ietf.org/html/draft-mcgrew-gcm-test-01#section-2 */ diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index a9ac6f6fb..fd5bccfc9 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -37,6 +37,11 @@ /* AES-CFB128 */ #define AES_CFB128_IV_LEN 16 +/* AES-XTS */ +#define AES128_XTS_KEY_LEN 32 +#define AES256_XTS_KEY_LEN 64 +#define AES_XTS_IV_LEN 16 + /* AES-GCM */ #define AES_GCM_IV_LEN 12 #define AES_GCM_DIGEST_LEN 16 commit 20944653d0d8640cdc3a7beca6855bc0213b814a Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue Apr 16 00:13:41 2019 +0300 api: crypto: add AES-XTS support Add support for AES in XEX-based tweaked-codebook mode with ciphertext stealing mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 295ad6bfb..f7a1cae08 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -91,6 +91,10 @@ typedef enum { /** AES with 128-bit cipher feedback */ ODP_CIPHER_ALG_AES_CFB128, + /** AES with XEX-based tweaked-codebook mode with ciphertext stealing + * (XTS) */ + ODP_CIPHER_ALG_AES_XTS, + /** AES-GCM * * AES in Galois/Counter Mode (GCM) algorithm. GCM provides both @@ -326,6 +330,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_AES_CFB128 */ uint32_t aes_cfb128 : 1; + /** ODP_CIPHER_ALG_AES_XTS */ + uint32_t aes_xts : 1; + /** ODP_CIPHER_ALG_AES_GCM */ uint32_t aes_gcm : 1; commit 8dd36d8d001ae74dd4758b3abe45f49bf752a5f7 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue Apr 16 00:11:30 2019 +0300 validation: crypto: add more aes-cbc and aes-ctr test vectors Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index c469784b4..8d5263098 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -192,6 +192,33 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0x8e, 0x0d, 0x7f, 0x02, 0xb6, 0x80, 0x9a, 0x2d, 0x53, 0x1c, 0xc6, 0x98, 0x85, 0xc3, 0x00, 0xe6}, }, + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES192_KEY_LEN, + .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, + 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, + 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0x4f, 0x02, 0x1d, 0xb2, 0x43, 0xbc, 0x63, 0x3d, + 0x71, 0x78, 0x18, 0x3a, 0x9f, 0xa0, 0x71, 0xe8, + 0xb4, 0xd9, 0xad, 0xa9, 0xad, 0x7d, 0xed, 0xf4, + 0xe5, 0xe7, 0x38, 0x76, 0x3f, 0x69, 0x14, 0x5a, + 0x57, 0x1b, 0x24, 0x20, 0x12, 0xfb, 0x7a, 0xe0, + 0x7f, 0xa9, 0xba, 0xac, 0x3d, 0xf1, 0x02, 0xe0, + 0x08, 0xb0, 0xe2, 0x79, 0x88, 0x59, 0x88, 0x81, + 0xd9, 0x20, 0xa9, 0xe6, 0x4f, 0x56, 0x15, 0xcd } + }, { .cipher_key_length = AES256_KEY_LEN, .cipher_key = { 0xab, 0xbc, 0xcd, 0xde, 0xf0, 0x01, 0x12, 0x23, @@ -214,10 +241,57 @@ static crypto_test_reference_t aes_cbc_reference[] = { 0xf1, 0x32, 0xc2, 0xf7, 0x23, 0xb8, 0x83, 0x09, 0xbc, 0x37, 0x1c, 0xeb, 0x95, 0x2c, 0x42, 0x7b, 0x39, 0x10, 0xa8, 0x76, 0xfa, 0xbe, 0x91, 0xe9}, + }, + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES256_KEY_LEN, + .cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, + 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, + 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, + 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4}, + .cipher_iv_length = AES_CBC_IV_LEN, + .cipher_iv = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0xf5, 0x8c, 0x4c, 0x04, 0xd6, 0xe5, 0xf1, 0xba, + 0x77, 0x9e, 0xab, 0xfb, 0x5f, 0x7b, 0xfb, 0xd6, + 0x9c, 0xfc, 0x4e, 0x96, 0x7e, 0xdb, 0x80, 0x8d, + 0x67, 0x9f, 0x77, 0x7b, 0xc6, 0x70, 0x2c, 0x7d, + 0x39, 0xf2, 0x33, 0x69, 0xa9, 0xd9, 0xba, 0xcf, + 0xa5, 0x30, 0xe2, 0x63, 0x04, 0x23, 0x14, 0x61, + 0xb2, 0xeb, 0x05, 0xe2, 0xc3, 0x9b, 0xe9, 0xfc, + 0xda, 0x6c, 0x19, 0x07, 0x8c, 0x6a, 0x9d, 0x1b } } }; static crypto_test_reference_t aes_ctr_reference[] = { + /* RFC3686 https://tools.ietf.org/html/rfc3686 */ + { + .cipher_key_length = AES128_KEY_LEN, + .cipher_key = { 0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7, + 0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63}, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0x00, 0x6C, 0xB6, 0xDB, 0xC0, 0x54, 0x3B, 0x59, + 0xDA, 0x48, 0xD9, 0x0B, 0x00, 0x00, 0x00, 0x01 }, + .length = 32, + .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F }, + .ciphertext = { 0x51, 0x04, 0xA1, 0x06, 0x16, 0x8A, 0x72, 0xD9, + 0x79, 0x0D, 0x41, 0xEE, 0x8E, 0xDA, 0xD3, 0x88, + 0xEB, 0x2E, 0x1E, 0xFC, 0x46, 0xDA, 0x57, 0xC8, + 0xFC, 0xE6, 0x30, 0xDF, 0x91, 0x41, 0xBE, 0x28} + }, + /* NIST Special Publication 800-38A */ { .cipher_key_length = AES128_KEY_LEN, .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, @@ -243,6 +317,218 @@ static crypto_test_reference_t aes_ctr_reference[] = { 0x1e, 0x03, 0x1d, 0xda, 0x2f, 0xbe, 0x03, 0xd1, 0x79, 0x21, 0x70, 0xa0, 0xf3, 0x00, 0x9c, 0xee } }, + /* Generated by Crypto++ 5.6.1 (715 bytes data)*/ + { + .cipher_key_length = AES128_KEY_LEN, + .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .length = 715, + .plaintext = { 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, + 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, + 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, + 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, + 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, + 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, + 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, + 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, + 0x10, 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, + 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, + 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, + 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, + 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, + 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, + 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, + 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, + 0x37, 0x10, 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, + 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, + 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, + 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, + 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, + 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, + 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, + 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, + 0x6c, 0x37, 0x10, 0x00, 0x6b, 0xc1, 0xbe, 0xe2, + 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, + 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, + 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, + 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, + 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, + 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, + 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, + 0xe6, 0x6c, 0x37, 0x10, 0x00, 0x6b, 0xc1, 0xbe, + 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, + 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, + 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, + 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, + 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, + 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, + 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, + 0x7b, 0xe6, 0x6c, 0x37, 0x10, 0x00, 0x6b, 0xc1, + 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, + 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, + 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, + 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, + 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, + 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, + 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, + 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10, 0x00, 0x6b, + 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, + 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, + 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, + 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, + 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, + 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, + 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, + 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10, 0x00, + 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10, + 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, + 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, + 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, + 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, + 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, + 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, + 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, + 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, + 0x10, 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, + 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, + 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, + 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, + 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, + 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, + 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, + 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, + 0x37, 0x10, 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, + 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, + 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, + 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, + 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, + 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, + 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, + 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, + 0x6c, 0x37, 0x10 }, + .ciphertext = { 0xEC, 0xE7, 0x1E, 0xCD, 0x7A, 0x4E, 0x3C, 0x2F, + 0x64, 0x3B, 0x2B, 0x0B, 0xFB, 0xED, 0x32, 0xF3, + 0x1C, 0x85, 0x51, 0xB6, 0x30, 0x6D, 0x52, 0xCF, + 0x84, 0x3E, 0xC0, 0xB8, 0x50, 0x15, 0xDC, 0x20, + 0x3B, 0x1C, 0x0B, 0x64, 0x3E, 0x2A, 0x6B, 0xAB, + 0xAF, 0x51, 0x33, 0xDA, 0x0E, 0xA0, 0x66, 0x16, + 0x07, 0x6A, 0xA6, 0xBB, 0xB5, 0x2E, 0xD7, 0x5D, + 0xC3, 0xA7, 0x1A, 0x9A, 0x6E, 0x8A, 0xC7, 0xC9, + 0xA0, 0x0D, 0x2C, 0x39, 0xAA, 0x68, 0xBF, 0x4E, + 0x6F, 0xFE, 0xD9, 0xAA, 0xEE, 0x5A, 0xD6, 0x91, + 0x4F, 0xB3, 0xEA, 0x77, 0xC7, 0xB6, 0x1F, 0xF6, + 0xBF, 0x56, 0x4F, 0x2F, 0x12, 0x25, 0xAC, 0xB4, + 0xB5, 0x88, 0x9C, 0xB1, 0x55, 0x98, 0x88, 0xA5, + 0x81, 0x78, 0x49, 0xC3, 0x82, 0xE1, 0x68, 0x48, + 0x2F, 0x75, 0x38, 0x1F, 0x63, 0x86, 0x8C, 0x46, + 0x8E, 0x4D, 0x15, 0x83, 0xB1, 0xFE, 0x71, 0xDD, + 0x80, 0x8C, 0xB9, 0x4D, 0x81, 0x50, 0xAA, 0xB9, + 0xD5, 0x30, 0xA0, 0xFC, 0x17, 0xCD, 0xE7, 0x48, + 0xE9, 0x55, 0x45, 0xD8, 0xA0, 0x33, 0xB2, 0xF6, + 0x1F, 0x19, 0x54, 0xD0, 0xC0, 0x22, 0x61, 0x68, + 0x02, 0x2E, 0x1C, 0xD7, 0xE0, 0x31, 0xC5, 0x7D, + 0x04, 0x8A, 0xC5, 0x60, 0xF1, 0x52, 0x96, 0x0F, + 0x47, 0x70, 0x5E, 0x17, 0x4D, 0x95, 0x6D, 0x4B, + 0xB5, 0x3A, 0xE8, 0x0B, 0xFF, 0xCD, 0x1B, 0xD5, + 0x69, 0xED, 0x8E, 0xFF, 0xA2, 0x23, 0xC0, 0x05, + 0x58, 0xB7, 0x02, 0x40, 0x5F, 0x33, 0xE6, 0xE0, + 0xED, 0xB2, 0xD9, 0xB0, 0xC1, 0x48, 0xA1, 0x44, + 0x1C, 0xC8, 0x0D, 0x6A, 0xBB, 0xCE, 0x78, 0x5A, + 0xA1, 0xB9, 0xDA, 0xB7, 0xCB, 0x88, 0x32, 0xF1, + 0xB1, 0x2D, 0x2E, 0xE6, 0x0E, 0xE2, 0xDF, 0xCA, + 0x37, 0x94, 0x2C, 0xA1, 0x72, 0x4E, 0x56, 0x02, + 0xB7, 0xB7, 0x05, 0x25, 0xAC, 0x96, 0x62, 0x02, + 0x8A, 0x22, 0xDB, 0x23, 0x46, 0x76, 0x61, 0x5D, + 0xB4, 0x74, 0x53, 0x8C, 0xBC, 0x8D, 0x19, 0x7F, + 0x38, 0xC8, 0x8B, 0xCC, 0x4F, 0x9E, 0x8D, 0x20, + 0x75, 0x38, 0xCA, 0x18, 0xDE, 0x5F, 0x09, 0x54, + 0x20, 0xA2, 0xE4, 0xD5, 0x86, 0x8C, 0xEB, 0xB8, + 0xB3, 0x4A, 0x93, 0x77, 0xDC, 0x52, 0xD1, 0x19, + 0x79, 0x0B, 0x65, 0x21, 0x0F, 0x1B, 0x34, 0x6F, + 0x5E, 0x00, 0xD9, 0xBD, 0x00, 0xA8, 0x84, 0x70, + 0x48, 0x91, 0x3D, 0x80, 0x72, 0x6B, 0x9B, 0x74, + 0x5D, 0x56, 0x5E, 0x62, 0x84, 0xB9, 0x86, 0xDB, + 0xAE, 0xA9, 0x97, 0xFF, 0xC5, 0xA0, 0xDE, 0x50, + 0x51, 0x52, 0x7D, 0x44, 0xB2, 0xC1, 0x26, 0x6D, + 0xBC, 0x91, 0x30, 0xA6, 0xEB, 0x15, 0xF3, 0x7A, + 0x0F, 0x00, 0xB6, 0x28, 0x6D, 0x66, 0x78, 0xCA, + 0x65, 0x1C, 0x07, 0x74, 0x3B, 0xD3, 0x7F, 0x2E, + 0x8F, 0x6A, 0x94, 0xF5, 0xED, 0x8C, 0x63, 0x42, + 0x8A, 0xE4, 0x88, 0x3A, 0x96, 0x95, 0x18, 0x38, + 0x07, 0xE1, 0x04, 0xBC, 0x33, 0x5C, 0x64, 0xFE, + 0xAA, 0xC4, 0x0A, 0x60, 0x59, 0x13, 0xDF, 0x98, + 0xFF, 0x44, 0xE0, 0x80, 0x1B, 0x31, 0xA9, 0x68, + 0xCC, 0xE5, 0xDC, 0xAF, 0xAD, 0xE1, 0xE0, 0x17, + 0xFA, 0x71, 0x1E, 0x05, 0xFF, 0x5A, 0x54, 0xBF, + 0xA1, 0x99, 0x9C, 0x2C, 0x46, 0x3F, 0x97, 0xA3, + 0xA6, 0x6B, 0x30, 0x21, 0x1B, 0xD3, 0x06, 0xC8, + 0x91, 0x1C, 0x98, 0xF8, 0xEE, 0x5E, 0xF4, 0x7A, + 0x54, 0x74, 0x6A, 0x4D, 0x16, 0xB7, 0xC7, 0x42, + 0x4A, 0x69, 0x54, 0xB4, 0xFC, 0x3B, 0xCF, 0x1A, + 0x41, 0xBD, 0xE8, 0xA1, 0x9C, 0xE1, 0x02, 0x7A, + 0xE8, 0x6A, 0x32, 0x0D, 0x0E, 0x5E, 0x7D, 0x3C, + 0x7E, 0x50, 0xCF, 0xD0, 0xC4, 0x66, 0x5B, 0x81, + 0x1D, 0x86, 0xC3, 0x13, 0xF0, 0x9A, 0xDE, 0x5B, + 0x4D, 0xBE, 0x01, 0x72, 0x31, 0x85, 0x98, 0x81, + 0xE5, 0x87, 0x3E, 0x9E, 0xDB, 0x20, 0x11, 0xCF, + 0x59, 0x20, 0xD2, 0xF7, 0x27, 0x7C, 0x4D, 0xE1, + 0xAC, 0x43, 0x0A, 0x18, 0x49, 0xF0, 0xB8, 0x70, + 0xA6, 0x9A, 0xBE, 0x70, 0x1B, 0x6D, 0x0B, 0x51, + 0x23, 0xE5, 0xFF, 0x53, 0x39, 0x54, 0x09, 0x17, + 0x7C, 0xF8, 0x4B, 0xF4, 0x1E, 0xC3, 0x3C, 0x5E, + 0x4B, 0xCC, 0x2C, 0xF2, 0x92, 0x58, 0xDC, 0x7C, + 0x26, 0x04, 0x71, 0xAA, 0xBD, 0xA4, 0x9F, 0xDE, + 0x62, 0x91, 0x57, 0x58, 0xEE, 0x4E, 0x57, 0x8D, + 0x0F, 0x76, 0x98, 0xE6, 0x45, 0x6B, 0xC1, 0x44, + 0x57, 0x37, 0x39, 0xD5, 0xD5, 0x08, 0xCC, 0x76, + 0xB3, 0x89, 0x35, 0x9D, 0x2A, 0x0E, 0xCB, 0x5B, + 0x7E, 0xE5, 0xFC, 0xB4, 0xC3, 0x15, 0x1D, 0x5A, + 0xF7, 0xC7, 0x18, 0x19, 0xEA, 0x3D, 0xD5, 0xF3, + 0x6C, 0x7B, 0x27, 0xE5, 0x51, 0xFD, 0x23, 0x73, + 0xD0, 0x7F, 0xFD, 0xC7, 0x6A, 0x13, 0xFC, 0x4B, + 0x10, 0xA6, 0xF2, 0x9A, 0x83, 0xD6, 0xF4, 0x65, + 0xAC, 0xB6, 0x96, 0x06, 0x71, 0xEA, 0xCF, 0x21, + 0xA3, 0xE1, 0xCB, 0x44, 0x11, 0xC4, 0xDA, 0xA0, + 0xC2, 0xA8, 0x7D, 0xAE, 0xD2, 0x8A, 0xEE, 0x60, + 0xB7, 0xEC, 0x02, 0x58, 0xA9, 0xAF, 0x12, 0x5F, + 0x2D, 0xDC, 0x80, 0xB9, 0x87, 0x7E, 0xFE, 0x0F, + 0x37, 0x2D, 0x9B, 0x83, 0x2C, 0x78, 0x67, 0x70, + 0xA8, 0x4E, 0xA1, 0xA0, 0x7C, 0xB6, 0xE1, 0xA9, + 0x90, 0x7D, 0x65, 0x1B, 0xBD, 0x0E, 0xFD, 0xEF, + 0x2A, 0xFF, 0xC3 } + }, + /* RFC3686 https://tools.ietf.org/html/rfc3686 */ + { + .cipher_key_length = AES192_KEY_LEN, + .cipher_key = { 0x02, 0xBF, 0x39, 0x1E, 0xE8, 0xEC, 0xB1, 0x59, + 0xB9, 0x59, 0x61, 0x7B, 0x09, 0x65, 0x27, 0x9B, + 0xF5, 0x9B, 0x60, 0xA7, 0x86, 0xD3, 0xE0, 0xFE}, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0x00, 0x07, 0xBD, 0xFD, 0x5C, 0xBD, 0x60, 0x27, + 0x8D, 0xCC, 0x09, 0x12, 0x00, 0x00, 0x00, 0x01 }, + .length = 36, + .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, + 0x20, 0x21, 0x22, 0x23 }, + .ciphertext = { 0x96, 0x89, 0x3F, 0xC5, 0x5E, 0x5C, 0x72, 0x2F, + 0x54, 0x0B, 0x7D, 0xD1, 0xDD, 0xF7, 0xE7, 0x58, + 0xD2, 0x88, 0xBC, 0x95, 0xC6, 0x91, 0x65, 0x88, + 0x45, 0x36, 0xC8, 0x11, 0x66, 0x2F, 0x21, 0x88, + 0xAB, 0xEE, 0x09, 0x35 } + }, + /* NIST Special Publication 800-38A */ { .cipher_key_length = AES192_KEY_LEN, .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, @@ -269,6 +555,29 @@ static crypto_test_reference_t aes_ctr_reference[] = { 0x4f, 0x78, 0xa7, 0xf6, 0xd2, 0x98, 0x09, 0x58, 0x5a, 0x97, 0xda, 0xec, 0x58, 0xc6, 0xb0, 0x50 } }, + /* RFC3686 https://tools.ietf.org/html/rfc3686 */ + { + .cipher_key_length = AES256_KEY_LEN, + .cipher_key = { 0xFF, 0x7A, 0x61, 0x7C, 0xE6, 0x91, 0x48, 0xE4, + 0xF1, 0x72, 0x6E, 0x2F, 0x43, 0x58, 0x1D, 0xE2, + 0xAA, 0x62, 0xD9, 0xF8, 0x05, 0x53, 0x2E, 0xDF, + 0xF1, 0xEE, 0xD6, 0x87, 0xFB, 0x54, 0x15, 0x3D}, + .cipher_iv_length = AES_CTR_IV_LEN, + .cipher_iv = { 0x00, 0x1C, 0xC5, 0xB7, 0x51, 0xA5, 0x1D, 0x70, + 0xA1, 0xC1, 0x11, 0x48, 0x00, 0x00, 0x00, 0x01 }, + .length = 36, + .plaintext = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, + 0x20, 0x21, 0x22, 0x23 }, + .ciphertext = { 0xEB, 0x6C, 0x52, 0x82, 0x1D, 0x0B, 0xBB, 0xF7, + 0xCE, 0x75, 0x94, 0x46, 0x2A, 0xCA, 0x4F, 0xAA, + 0xB4, 0x07, 0xDF, 0x86, 0x65, 0x69, 0xFD, 0x07, + 0xF4, 0x8C, 0xC0, 0xB5, 0x83, 0xD6, 0x07, 0x1F, + 0x1E, 0xC0, 0xE6, 0xB8 }, + }, + /* NIST Special Publication 800-38A */ { .cipher_key_length = AES256_KEY_LEN, .cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 8c9ffeaeb..a9ac6f6fb 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -9,7 +9,7 @@ /* Maximum */ #define MAX_KEY_LEN 64 #define MAX_IV_LEN 16 -#define MAX_DATA_LEN 528 +#define MAX_DATA_LEN 715 #define MAX_AAD_LEN 12 #define MAX_DIGEST_LEN 64 commit fe8b4bcae94c5795885f5ded211d5ebf85abcab5 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue Apr 16 00:08:22 2019 +0300 linux-gen: aes-gmac: extend capabilities Add support for AES-194-GMAC and AES-256-GMAC algorithms. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 239373bbd..ae27a2034 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -137,6 +137,10 @@ static const odp_crypto_auth_capability_t auth_capa_aes_ccm[] = { static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { {.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0}, + .iv_len = 12 }, +{.digest_len = 16, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0}, + .iv_len = 12 }, +{.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0}, .iv_len = 12 } }; static const odp_crypto_auth_capability_t auth_capa_aes_cmac[] = { commit 60268b670beb5ed89528f498caa932b8eb9d2564 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Tue Apr 16 00:14:49 2019 +0300 validation: aes-gmac: extend capabilities Add support for AES-194-GMAC and AES-256-GMAC algorithms. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 23e86243c..c469784b4 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -932,6 +932,73 @@ static crypto_test_reference_t aes_gmac_reference[] = { .digest = { 0xf2, 0xa9, 0xa8, 0x36, 0xe1, 0x55, 0x10, 0x6a, 0xa8, 0xdc, 0xd6, 0x18, 0xe4, 0x09, 0x9a, 0xaa } }, + /* AES192-GMAC from DPDK 17.02 */ + { + .auth_key_length = AES192_KEY_LEN, + .auth_key = { 0xaa, 0x74, 0x0a, 0xbf, 0xad, 0xcd, 0xa7, 0x79, + 0x22, 0x0d, 0x3b, 0x40, 0x6c, 0x5d, 0x7e, 0xc0, + 0x9a, 0x77, 0xfe, 0x9d, 0x94, 0x10, 0x45, 0x39}, + .auth_iv_length = AES_GCM_IV_LEN, + .auth_iv = { 0xab, 0x22, 0x65, 0xb4, 0xc1, 0x68, 0x95, 0x55, + 0x61, 0xf0, 0x43, 0x15 }, + .length = 80, + .plaintext = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}, + .ciphertext = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}, + .digest_length = AES_GCM_DIGEST_LEN, + .digest = { 0xCF, 0x82, 0x80, 0x64, 0x02, 0x46, 0xF4, 0xFB, + 0x33, 0xAE, 0x1D, 0x90, 0xEA, 0x48, 0x83, 0xDB }, + }, + /* AES256-GMAC from DPDK 17.02 */ + { + .auth_key_length = AES256_KEY_LEN, + .auth_key = { 0xb5, 0x48, 0xe4, 0x93, 0x4f, 0x5c, 0x64, 0xd3, + 0xc0, 0xf0, 0xb7, 0x8f, 0x7b, 0x4d, 0x88, 0x24, + 0xaa, 0xc4, 0x6b, 0x3c, 0x8d, 0x2c, 0xc3, 0x5e, + 0xe4, 0xbf, 0xb2, 0x54, 0xe4, 0xfc, 0xba, 0xf7}, + .auth_iv_length = AES_GCM_IV_LEN, + .auth_iv = { 0x2e, 0xed, 0xe1, 0xdc, 0x64, 0x47, 0xc7, 0xaf, + 0xc4, 0x41, 0x53, 0x58 }, + .length = 65, + .plaintext = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02 }, + .ciphertext = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, + 0x01, 0x02 }, + .digest_length = AES_GCM_DIGEST_LEN, + .digest = { 0x77, 0x46, 0x0D, 0x6F, 0xB1, 0x87, 0xDB, 0xA9, + 0x46, 0xAD, 0xCD, 0xFB, 0xB7, 0xF9, 0x13, 0xA1 }, + } }; /* commit e7fac06c87efeef4dc9aaef67e20a25e1bc50af2 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 21:41:06 2019 +0300 linux-gen: crypto: add AES-CFB128 support Add support for AES in 128-bit Cipher FeedBack mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index ac38a7139..239373bbd 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -71,6 +71,11 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_ecb[] = { {.key_len = 24}, {.key_len = 32} }; +static const odp_crypto_cipher_capability_t cipher_capa_aes_cfb128[] = { +{.key_len = 16, .iv_len = 16}, +{.key_len = 24, .iv_len = 16}, +{.key_len = 32, .iv_len = 16} }; + static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { {.key_len = 16, .iv_len = 12}, {.key_len = 24, .iv_len = 12}, @@ -1474,6 +1479,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.aes_cbc = 1; capa->ciphers.bit.aes_ctr = 1; capa->ciphers.bit.aes_ecb = 1; + capa->ciphers.bit.aes_cfb128 = 1; capa->ciphers.bit.aes_gcm = 1; capa->ciphers.bit.aes_ccm = 1; #if _ODP_HAVE_CHACHA20_POLY1305 @@ -1549,6 +1555,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, src = cipher_capa_aes_ecb; num = sizeof(cipher_capa_aes_ecb) / size; break; + case ODP_CIPHER_ALG_AES_CFB128: + src = cipher_capa_aes_cfb128; + num = sizeof(cipher_capa_aes_cfb128) / size; + break; case ODP_CIPHER_ALG_AES_GCM: src = cipher_capa_aes_gcm; num = sizeof(cipher_capa_aes_gcm) / size; @@ -1770,6 +1780,19 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; + case ODP_CIPHER_ALG_AES_CFB128: + if (param->cipher_key.length == 16) + rc = process_cipher_param(session, + EVP_aes_128_cfb128()); + else if (param->cipher_key.length == 24) + rc = process_cipher_param(session, + EVP_aes_192_cfb128()); + else if (param->cipher_key.length == 32) + rc = process_cipher_param(session, + EVP_aes_256_cfb128()); + else + rc = -1; + break; #if ODP_DEPRECATED_API case ODP_CIPHER_ALG_AES128_GCM: /* AES-GCM requires to do both auth and commit f86fa1a7aa137814e023f2fd2783f6abc78e797c Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 21:40:33 2019 +0300 validation: crypto: add AES-CFB128 support Add support for AES in 128-bit Cipher FeedBack mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index caebb4b6e..4f4d8c13f 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -104,6 +104,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_AES_CTR"; case ODP_CIPHER_ALG_AES_ECB: return "ODP_CIPHER_ALG_AES_ECB"; + case ODP_CIPHER_ALG_AES_CFB128: + return "ODP_CIPHER_ALG_AES_CFB128"; case ODP_CIPHER_ALG_AES_GCM: return "ODP_CIPHER_ALG_AES_GCM"; case ODP_CIPHER_ALG_AES_CCM: @@ -537,6 +539,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_AES_ECB && !(capa.ciphers.bit.aes_ecb)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CFB128 && + !(capa.ciphers.bit.aes_cfb128)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && !(capa.ciphers.bit.aes_gcm)) rc = -1; @@ -786,6 +791,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.aes_ecb) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_AES_CFB128: + if (!capability.ciphers.bit.aes_cfb128) + return ODP_TEST_INACTIVE; + break; case ODP_CIPHER_ALG_AES_GCM: if (!capability.ciphers.bit.aes_gcm) return ODP_TEST_INACTIVE; @@ -1372,6 +1381,74 @@ static void crypto_test_dec_alg_aes_ecb(void) false); } +static int check_alg_aes_cfb128(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_CFB128, ODP_AUTH_ALG_NULL); +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for AES128_CFB128 algorithm. IV for the operation is the session + * IV. + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer.*/ +static void crypto_test_enc_alg_aes_cfb128(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CFB128, + ODP_AUTH_ALG_NULL, + aes_cfb128_reference, + ARRAY_SIZE(aes_cfb128_reference), + false, + false); +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for AES128_CFB128 algorithm. IV for the operation is the operation + * IV. + * */ +static void crypto_test_enc_alg_aes_cfb128_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CFB128, + ODP_AUTH_ALG_NULL, + aes_cfb128_reference, + ARRAY_SIZE(aes_cfb128_reference), + true, + false); +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for AES128_CFB128 algorithm. IV for the operation is the session IV + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +static void crypto_test_dec_alg_aes_cfb128(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CFB128, + ODP_AUTH_ALG_NULL, + aes_cfb128_reference, + ARRAY_SIZE(aes_cfb128_reference), + false, + false); +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for AES128_CFB128 algorithm. IV for the operation is the session IV + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +static void crypto_test_dec_alg_aes_cfb128_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CFB128, + ODP_AUTH_ALG_NULL, + aes_cfb128_reference, + ARRAY_SIZE(aes_cfb128_reference), + true, + false); +} + static int check_alg_kasumi_f8(void) { return check_alg_support(ODP_CIPHER_ALG_KASUMI_F8, ODP_AUTH_ALG_NULL); @@ -2225,6 +2302,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_ecb), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ecb, check_alg_aes_ecb), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_cfb128, + check_alg_aes_cfb128), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cfb128, + check_alg_aes_cfb128), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_cfb128_ovr_iv, + check_alg_aes_cfb128), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cfb128_ovr_iv, + check_alg_aes_cfb128), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_kasumi_f8, check_alg_kasumi_f8), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_kasumi_f8, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index c5ca4aebc..23e86243c 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -512,6 +512,90 @@ static crypto_test_reference_t aes_ecb_reference[] = { } }; +static crypto_test_reference_t aes_cfb128_reference[] = { + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES128_KEY_LEN, + .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, + .cipher_iv_length = AES_CFB128_IV_LEN, + .cipher_iv = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10}, + .ciphertext = { 0x3b, 0x3f, 0xd9, 0x2e, 0xb7, 0x2d, 0xad, 0x20, + 0x33, 0x34, 0x49, 0xf8, 0xe8, 0x3c, 0xfb, 0x4a, + 0xc8, 0xa6, 0x45, 0x37, 0xa0, 0xb3, 0xa9, 0x3f, + 0xcd, 0xe3, 0xcd, 0xad, 0x9f, 0x1c, 0xe5, 0x8b, + 0x26, 0x75, 0x1f, 0x67, 0xa3, 0xcb, 0xb1, 0x40, + 0xb1, 0x80, 0x8c, 0xf1, 0x87, 0xa4, 0xf4, 0xdf, + 0xc0, 0x4b, 0x05, 0x35, 0x7c, 0x5d, 0x1c, 0x0e, + 0xea, 0xc4, 0xc6, 0x6f, 0x9f, 0xf7, 0xf2, 0xe6 } + }, + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES192_KEY_LEN, + .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, + 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, + 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, + .cipher_iv_length = AES_CFB128_IV_LEN, + .cipher_iv = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0xcd, 0xc8, 0x0d, 0x6f, 0xdd, 0xf1, 0x8c, 0xab, + 0x34, 0xc2, 0x59, 0x09, 0xc9, 0x9a, 0x41, 0x74, + 0x67, 0xce, 0x7f, 0x7f, 0x81, 0x17, 0x36, 0x21, + 0x96, 0x1a, 0x2b, 0x70, 0x17, 0x1d, 0x3d, 0x7a, + 0x2e, 0x1e, 0x8a, 0x1d, 0xd5, 0x9b, 0x88, 0xb1, + 0xc8, 0xe6, 0x0f, 0xed, 0x1e, 0xfa, 0xc4, 0xc9, + 0xc0, 0x5f, 0x9f, 0x9c, 0xa9, 0x83, 0x4f, 0xa0, + 0x42, 0xae, 0x8f, 0xba, 0x58, 0x4b, 0x09, 0xff } + }, + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES256_KEY_LEN, + .cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, + 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, + 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, + 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4}, + .cipher_iv_length = AES_CFB128_IV_LEN, + .cipher_iv = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0xdc, 0x7e, 0x84, 0xbf, 0xda, 0x79, 0x16, 0x4b, + 0x7e, 0xcd, 0x84, 0x86, 0x98, 0x5d, 0x38, 0x60, + 0x39, 0xff, 0xed, 0x14, 0x3b, 0x28, 0xb1, 0xc8, + 0x32, 0x11, 0x3c, 0x63, 0x31, 0xe5, 0x40, 0x7b, + 0xdf, 0x10, 0x13, 0x24, 0x15, 0xe5, 0x4b, 0x92, + 0xa1, 0x3e, 0xd0, 0xa8, 0x26, 0x7a, 0xe2, 0xf9, + 0x75, 0xa3, 0x85, 0x74, 0x1a, 0xb9, 0xce, 0xf8, + 0x20, 0x31, 0x62, 0x3d, 0x55, 0xb1, 0xe4, 0x71 } + } +}; + /* AES-GCM test vectors extracted from * https://tools.ietf.org/html/draft-mcgrew-gcm-test-01#section-2 */ diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 0b8ed9b64..8c9ffeaeb 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -34,6 +34,9 @@ /* AES-CTR */ #define AES_CTR_IV_LEN 16 +/* AES-CFB128 */ +#define AES_CFB128_IV_LEN 16 + /* AES-GCM */ #define AES_GCM_IV_LEN 12 #define AES_GCM_DIGEST_LEN 16 commit a7492121cbf3a30cf5219744dc5774177f3d9496 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 21:38:55 2019 +0300 api: crypto: add AES-CFB128 support Add support for AES in 128-bit Cipher FeedBack mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index a77295c6e..295ad6bfb 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -88,6 +88,9 @@ typedef enum { /** AES with electronic codebook */ ODP_CIPHER_ALG_AES_ECB, + /** AES with 128-bit cipher feedback */ + ODP_CIPHER_ALG_AES_CFB128, + /** AES-GCM * * AES in Galois/Counter Mode (GCM) algorithm. GCM provides both @@ -320,6 +323,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_AES_ECB */ uint32_t aes_ecb : 1; + /** ODP_CIPHER_ALG_AES_CFB128 */ + uint32_t aes_cfb128 : 1; + /** ODP_CIPHER_ALG_AES_GCM */ uint32_t aes_gcm : 1; commit 72c3f81f56169ac6f1bd7d7f1c1f0b18ab2e1fdb Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 21:35:11 2019 +0300 linux-gen: crypto: add AES-ECB support Add support for AES in Electronic CodeBook mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index b2543aa9e..ac38a7139 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -66,6 +66,11 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_ctr[] = { {.key_len = 24, .iv_len = 16}, {.key_len = 32, .iv_len = 16} }; +static const odp_crypto_cipher_capability_t cipher_capa_aes_ecb[] = { +{.key_len = 16}, +{.key_len = 24}, +{.key_len = 32} }; + static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { {.key_len = 16, .iv_len = 12}, {.key_len = 24, .iv_len = 12}, @@ -1468,6 +1473,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.trides_ecb = 1; capa->ciphers.bit.aes_cbc = 1; capa->ciphers.bit.aes_ctr = 1; + capa->ciphers.bit.aes_ecb = 1; capa->ciphers.bit.aes_gcm = 1; capa->ciphers.bit.aes_ccm = 1; #if _ODP_HAVE_CHACHA20_POLY1305 @@ -1539,6 +1545,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, src = cipher_capa_aes_ctr; num = sizeof(cipher_capa_aes_ctr) / size; break; + case ODP_CIPHER_ALG_AES_ECB: + src = cipher_capa_aes_ecb; + num = sizeof(cipher_capa_aes_ecb) / size; + break; case ODP_CIPHER_ALG_AES_GCM: src = cipher_capa_aes_gcm; num = sizeof(cipher_capa_aes_gcm) / size; @@ -1750,6 +1760,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; + case ODP_CIPHER_ALG_AES_ECB: + if (param->cipher_key.length == 16) + rc = process_cipher_param(session, EVP_aes_128_ecb()); + else if (param->cipher_key.length == 24) + rc = process_cipher_param(session, EVP_aes_192_ecb()); + else if (param->cipher_key.length == 32) + rc = process_cipher_param(session, EVP_aes_256_ecb()); + else + rc = -1; + break; #if ODP_DEPRECATED_API case ODP_CIPHER_ALG_AES128_GCM: /* AES-GCM requires to do both auth and commit 8a662a3e7566994bac18113c2d4ea5ed3047bc62 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 21:22:51 2019 +0300 validation: crypto: add AES-ECB support Add support for AES in Electronic CodeBook mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 5ad66b55f..caebb4b6e 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -102,6 +102,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_AES_CBC"; case ODP_CIPHER_ALG_AES_CTR: return "ODP_CIPHER_ALG_AES_CTR"; + case ODP_CIPHER_ALG_AES_ECB: + return "ODP_CIPHER_ALG_AES_ECB"; case ODP_CIPHER_ALG_AES_GCM: return "ODP_CIPHER_ALG_AES_GCM"; case ODP_CIPHER_ALG_AES_CCM: @@ -532,6 +534,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && !(capa.ciphers.bit.aes_ctr)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_ECB && + !(capa.ciphers.bit.aes_ecb)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && !(capa.ciphers.bit.aes_gcm)) rc = -1; @@ -777,6 +782,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.aes_ctr) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_AES_ECB: + if (!capability.ciphers.bit.aes_ecb) + return ODP_TEST_INACTIVE; + break; case ODP_CIPHER_ALG_AES_GCM: if (!capability.ciphers.bit.aes_gcm) return ODP_TEST_INACTIVE; @@ -1330,6 +1339,39 @@ static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) false); } +static int check_alg_aes_ecb(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_ECB, ODP_AUTH_ALG_NULL); +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for AES128_ECB algorithm. + */ +static void crypto_test_enc_alg_aes_ecb(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_ECB, + ODP_AUTH_ALG_NULL, + aes_ecb_reference, + ARRAY_SIZE(aes_ecb_reference), + false, + false); +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for AES128_ECB algorithm. + * */ +static void crypto_test_dec_alg_aes_ecb(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_ECB, + ODP_AUTH_ALG_NULL, + aes_ecb_reference, + ARRAY_SIZE(aes_ecb_reference), + false, + false); +} + static int check_alg_kasumi_f8(void) { return check_alg_support(ODP_CIPHER_ALG_KASUMI_F8, ODP_AUTH_ALG_NULL); @@ -2179,6 +2221,10 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_ctr), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr_ovr_iv, check_alg_aes_ctr), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ecb, + check_alg_aes_ecb), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ecb, + check_alg_aes_ecb), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_kasumi_f8, check_alg_kasumi_f8), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_kasumi_f8, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 03a2ac895..c5ca4aebc 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -298,6 +298,220 @@ static crypto_test_reference_t aes_ctr_reference[] = { }, }; +static crypto_test_reference_t aes_ecb_reference[] = { + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES128_KEY_LEN, + .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10}, + .ciphertext = { 0x3a, 0xd7, 0x7b, 0xb4, 0x0d, 0x7a, 0x36, 0x60, + 0xa8, 0x9e, 0xca, 0xf3, 0x24, 0x66, 0xef, 0x97, + 0xf5, 0xd3, 0xd5, 0x85, 0x03, 0xb9, 0x69, 0x9d, + 0xe7, 0x85, 0x89, 0x5a, 0x96, 0xfd, 0xba, 0xaf, + 0x43, 0xb1, 0xcd, 0x7f, 0x59, 0x8e, 0xce, 0x23, + 0x88, 0x1b, 0x00, 0xe3, 0xed, 0x03, 0x06, 0x88, + 0x7b, 0x0c, 0x78, 0x5e, 0x27, 0xe8, 0xad, 0x3f, + 0x82, 0x23, 0x20, 0x71, 0x04, 0x72, 0x5d, 0xd4 } + }, + /* Generated by Crypto++ 5.6.1 (528 bytes) */ + { + .cipher_key_length = AES128_KEY_LEN, + .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, + .length = 528, + .plaintext = { 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, + 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, + 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, + 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, + 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, + 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, + 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, + 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, + 0x10, 0x00, 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, + 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, + 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, + 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, + 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, + 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, + 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, + 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, + 0x6c, 0x37, 0x10, 0x00, 0x00, 0x6b, 0xc1, 0xbe, + 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, + 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, + 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, + 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, + 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, + 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, + 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, + 0x7b, 0xe6, 0x6c, 0x37, 0x10, 0x00, 0x00, 0x6b, + 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, + 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, + 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, + 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, + 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, + 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, + 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, + 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10, 0x00, + 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, + 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, + 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, + 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, + 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, + 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, + 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, + 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, + 0x10, 0x00, 0x00, 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, + 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, + 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, + 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, + 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, + 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, + 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, + 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, + 0x6c, 0x37, 0x10, 0x00, 0x00, 0x6b, 0xc1, 0xbe, + 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, + 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, + 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, + 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, + 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, + 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, + 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, + 0x7b, 0xe6, 0x6c, 0x37, 0x10, 0x00, 0x00, 0x6b, + 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, + 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, + 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, + 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, + 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, + 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, + 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, + 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10, 0x00}, + .ciphertext = { 0x84, 0xC6, 0xCB, 0xDC, 0x2B, 0x5A, 0x39, 0x98, + 0x57, 0x74, 0xB2, 0x3B, 0xAB, 0x06, 0x6A, 0x6A, + 0xF8, 0xCB, 0x66, 0xC0, 0x8E, 0x4F, 0x05, 0x8E, + 0x5D, 0x3E, 0x7C, 0x35, 0x1E, 0xA8, 0x45, 0xCE, + 0xC7, 0xB2, 0x09, 0x21, 0x0E, 0xE7, 0xEF, 0xD3, + 0x82, 0x69, 0x62, 0x86, 0x87, 0xF2, 0x1C, 0xB9, + 0xBC, 0xEA, 0x34, 0x9D, 0xC0, 0x41, 0x8A, 0xDB, + 0xA2, 0xBF, 0x23, 0x64, 0xDF, 0x4D, 0xB1, 0xA1, + 0x1A, 0xD8, 0x4C, 0xF6, 0xA4, 0x22, 0xCE, 0x95, + 0xC3, 0x7B, 0x2C, 0xF8, 0x11, 0x96, 0x24, 0x5C, + 0xD8, 0x57, 0xD0, 0xB9, 0x54, 0xB8, 0x39, 0x85, + 0xC1, 0x88, 0x82, 0x30, 0xF3, 0xC3, 0x01, 0x84, + 0x7A, 0xAF, 0x71, 0x42, 0x53, 0xEF, 0x76, 0x8C, + 0x17, 0xE8, 0x9E, 0x4F, 0x55, 0x13, 0xDB, 0xD5, + 0xBE, 0xE1, 0x26, 0x6A, 0x2B, 0x2D, 0x70, 0x63, + 0xCE, 0x3D, 0x0B, 0xA8, 0x71, 0x62, 0x52, 0xC5, + 0xBC, 0xBB, 0x99, 0x22, 0xCD, 0x46, 0xF3, 0x74, + 0xB5, 0x2F, 0xDF, 0xF1, 0xFE, 0xBF, 0x15, 0x5F, + 0xF4, 0xAF, 0xEE, 0x18, 0x78, 0x89, 0x99, 0xBC, + 0x74, 0x23, 0x4A, 0x3F, 0xFB, 0xA7, 0xB2, 0x85, + 0x8B, 0xB2, 0x55, 0x2F, 0x17, 0x2E, 0x56, 0xEC, + 0x47, 0x45, 0x68, 0x78, 0x44, 0x0A, 0xBB, 0x5A, + 0xDA, 0xE4, 0x99, 0x41, 0xC1, 0xE4, 0x36, 0x16, + 0xAC, 0x5D, 0x6E, 0x31, 0xA0, 0x11, 0x61, 0x1B, + 0x82, 0x9F, 0x6A, 0x77, 0xBE, 0x1F, 0x50, 0x75, + 0x4F, 0x81, 0xF3, 0x5D, 0x24, 0xED, 0x89, 0xFD, + 0xE8, 0x04, 0xB1, 0x73, 0x63, 0xF9, 0xA8, 0x1C, + 0x3F, 0x12, 0xAE, 0x06, 0x7F, 0xDD, 0x41, 0xA2, + 0x98, 0x49, 0x12, 0xCA, 0xE1, 0x92, 0x6C, 0x5F, + 0xB3, 0xAC, 0x18, 0xE5, 0x41, 0xFA, 0x4A, 0xD1, + 0xE1, 0x71, 0x88, 0x8E, 0x61, 0x42, 0x8F, 0x2A, + 0x8F, 0x2E, 0x98, 0x1A, 0xE1, 0x6D, 0x0D, 0x4E, + 0x41, 0xD3, 0x3E, 0x5E, 0x67, 0x5F, 0x44, 0x6D, + 0xAE, 0x0F, 0x45, 0x4F, 0xC4, 0xCA, 0x05, 0x6F, + 0x41, 0xF3, 0xCC, 0x47, 0x44, 0xA9, 0xE9, 0x48, + 0x42, 0x8B, 0x22, 0x80, 0xF9, 0x66, 0x63, 0xB7, + 0x23, 0x0C, 0x09, 0x69, 0x25, 0x03, 0xC9, 0x5B, + 0x3E, 0x34, 0xF8, 0xDE, 0x8D, 0xF2, 0x31, 0x57, + 0xF4, 0x5B, 0xDF, 0x68, 0x9B, 0x25, 0x8D, 0x99, + 0x4D, 0x9E, 0x6C, 0xE5, 0xD4, 0xDD, 0x6B, 0xDB, + 0x96, 0x76, 0x3C, 0xCC, 0x41, 0xDB, 0xBE, 0x57, + 0xA4, 0x77, 0x8D, 0x5A, 0x9E, 0x90, 0x22, 0x6D, + 0x61, 0x4C, 0x33, 0x5E, 0x44, 0xCA, 0x8A, 0xB4, + 0x1E, 0xFE, 0xA8, 0x98, 0xBC, 0x17, 0x0C, 0x65, + 0x41, 0x2F, 0x77, 0x19, 0x4A, 0x43, 0xA1, 0x30, + 0x5E, 0xF2, 0x3A, 0xC7, 0x0B, 0x05, 0x9E, 0x6E, + 0x04, 0x77, 0x96, 0xEF, 0x51, 0x8D, 0x76, 0x96, + 0xBC, 0x3D, 0xAD, 0x5E, 0x26, 0x34, 0xF9, 0x2D, + 0xD1, 0xC9, 0x0D, 0x20, 0x6A, 0x2B, 0x6D, 0x3A, + 0x7C, 0xE8, 0x86, 0x68, 0xBE, 0xAD, 0x64, 0x61, + 0x4E, 0x90, 0x00, 0xAC, 0xFB, 0xA7, 0x9E, 0xB3, + 0x60, 0x16, 0x06, 0x21, 0x4E, 0x21, 0xE0, 0x8F, + 0x14, 0xCE, 0x77, 0xE3, 0x6B, 0xB6, 0x6F, 0xE4, + 0xA0, 0xFC, 0xD2, 0xA2, 0x1B, 0xCA, 0xA2, 0x39, + 0x1A, 0x9C, 0x20, 0x16, 0xAC, 0x3B, 0xC7, 0xCD, + 0xF1, 0x43, 0x8E, 0xB6, 0xDD, 0x26, 0x69, 0x66, + 0x44, 0x58, 0x3E, 0x2B, 0x0A, 0x0C, 0x68, 0x62, + 0x9D, 0x73, 0x6F, 0x67, 0x23, 0xDF, 0x66, 0x85, + 0x9C, 0xF8, 0x0B, 0x4E, 0x5B, 0x5C, 0x5B, 0xF0, + 0x3F, 0x33, 0x4D, 0x65, 0xC4, 0x8D, 0xB3, 0xB2, + 0x66, 0x0E, 0x2C, 0xE3, 0x3B, 0x51, 0x0F, 0xD6, + 0x0C, 0x91, 0x2B, 0x85, 0xD1, 0x6A, 0xEE, 0x7C, + 0xDB, 0xFD, 0xF6, 0x28, 0x5B, 0x0A, 0x77, 0xBA, + 0xE0, 0x7D, 0x98, 0x7F, 0x9C, 0xE1, 0x72, 0xA5, + 0x48, 0xE6, 0xBF, 0x0A, 0x30, 0xCF, 0x09, 0x9A, + 0xA8, 0x2B, 0xE0, 0xA2, 0x5E, 0x0E, 0x89, 0x19 } + }, + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES192_KEY_LEN, + .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, + 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, + 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0xbd, 0x33, 0x4f, 0x1d, 0x6e, 0x45, 0xf2, 0x5f, + 0xf7, 0x12, 0xa2, 0x14, 0x57, 0x1f, 0xa5, 0xcc, + 0x97, 0x41, 0x04, 0x84, 0x6d, 0x0a, 0xd3, 0xad, + 0x77, 0x34, 0xec, 0xb3, 0xec, 0xee, 0x4e, 0xef, + 0xef, 0x7a, 0xfd, 0x22, 0x70, 0xe2, 0xe6, 0x0a, + 0xdc, 0xe0, 0xba, 0x2f, 0xac, 0xe6, 0x44, 0x4e, + 0x9a, 0x4b, 0x41, 0xba, 0x73, 0x8d, 0x6c, 0x72, + 0xfb, 0x16, 0x69, 0x16, 0x03, 0xc1, 0x8e, 0x0e } + }, + /* NIST Special Publication 800-38A */ + { + .cipher_key_length = AES256_KEY_LEN, + .cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, + 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, + 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, + 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4}, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0xf3, 0xee, 0xd1, 0xbd, 0xb5, 0xd2, 0xa0, 0x3c, + 0x06, 0x4b, 0x5a, 0x7e, 0x3d, 0xb1, 0x81, 0xf8, + 0x59, 0x1c, 0xcb, 0x10, 0xd4, 0x10, 0xed, 0x26, + 0xdc, 0x5b, 0xa7, 0x4a, 0x31, 0x36, 0x28, 0x70, + 0xb6, 0xed, 0x21, 0xb9, 0x9c, 0xa6, 0xf4, 0xf9, + 0xf1, 0x53, 0xe7, 0xb1, 0xbe, 0xaf, 0xed, 0x1d, + 0x23, 0x30, 0x4b, 0x7a, 0x39, 0xf9, 0xf3, 0xff, + 0x06, 0x7d, 0x8d, 0x8f, 0x9e, 0x24, 0xec, 0xc7} + } +}; + /* AES-GCM test vectors extracted from * https://tools.ietf.org/html/draft-mcgrew-gcm-test-01#section-2 */ diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 6263b8ec4..0b8ed9b64 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -9,7 +9,7 @@ /* Maximum */ #define MAX_KEY_LEN 64 #define MAX_IV_LEN 16 -#define MAX_DATA_LEN 270 +#define MAX_DATA_LEN 528 #define MAX_AAD_LEN 12 #define MAX_DIGEST_LEN 64 commit 27e79f97b32df3426f7bc13fd0b1b3bff2cbf835 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 21:22:01 2019 +0300 api: crypto: add AES-ECB support Add support for AES in Electronic CodeBook mode. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index efcc9c454..a77295c6e 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -85,6 +85,9 @@ typedef enum { /** AES with counter mode */ ODP_CIPHER_ALG_AES_CTR, + /** AES with electronic codebook */ + ODP_CIPHER_ALG_AES_ECB, + /** AES-GCM * * AES in Galois/Counter Mode (GCM) algorithm. GCM provides both @@ -314,6 +317,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_AES_CTR */ uint32_t aes_ctr : 1; + /** ODP_CIPHER_ALG_AES_ECB */ + uint32_t aes_ecb : 1; + /** ODP_CIPHER_ALG_AES_GCM */ uint32_t aes_gcm : 1; commit be29376373fe098955f4bb1d24f76157dae82065 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 19:59:54 2019 +0300 linux-gen: crypto: add digest algorithms support Add support for md5/sha1/sha* algorithms implemented as auth alg with zero key. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 766a0d0ee..b2543aa9e 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -142,6 +142,24 @@ static const odp_crypto_auth_capability_t auth_capa_chacha20_poly1305[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; #endif +static const odp_crypto_auth_capability_t auth_capa_md5[] = { +{.digest_len = 16, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + +static const odp_crypto_auth_capability_t auth_capa_sha1[] = { +{.digest_len = 20, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + +static const odp_crypto_auth_capability_t auth_capa_sha224[] = { +{.digest_len = 28, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + +static const odp_crypto_auth_capability_t auth_capa_sha256[] = { +{.digest_len = 32, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + +static const odp_crypto_auth_capability_t auth_capa_sha384[] = { +{.digest_len = 48, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + +static const odp_crypto_auth_capability_t auth_capa_sha512[] = { +{.digest_len = 64, .key_len = 0, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; + /** Forward declaration of session structure */ typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; @@ -205,6 +223,7 @@ struct odp_crypto_global_s { static odp_crypto_global_t *global; typedef struct crypto_local_t { + EVP_MD_CTX *md_ctx[MAX_SESSIONS]; HMAC_CTX *hmac_ctx[MAX_SESSIONS]; CMAC_CTX *cmac_ctx[MAX_SESSIONS]; EVP_CIPHER_CTX *cipher_ctx[MAX_SESSIONS]; @@ -624,6 +643,83 @@ odp_crypto_alg_err_t auth_cmac_check(odp_packet_t pkt, return ODP_CRYPTO_ALG_ERR_NONE; } +static +void packet_digest(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session, + uint8_t *hash) +{ + EVP_MD_CTX *ctx = local.md_ctx[session->idx]; + uint32_t offset = param->auth_range.offset; + uint32_t len = param->auth_range.length; + + ODP_ASSERT(offset + len <= odp_packet_len(pkt)); + + EVP_DigestInit_ex(ctx, + session->auth.evp_md, + NULL); + + /* Hash it */ + while (len > 0) { + uint32_t seglen = 0; /* GCC */ + void *mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); + uint32_t maclen = len > seglen ? seglen : len; + + EVP_DigestUpdate(ctx, mapaddr, maclen); + offset += maclen; + len -= maclen; + } + + EVP_DigestFinal_ex(ctx, hash, NULL); +} + +static +odp_crypto_alg_err_t auth_digest_gen(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session) +{ + uint8_t hash[EVP_MAX_MD_SIZE]; + + /* Hash it */ + packet_digest(pkt, param, session, hash); + + /* Copy to the output location */ + odp_packet_copy_from_mem(pkt, + param->hash_result_offset, + session->p.auth_digest_len, + hash); + + return ODP_CRYPTO_ALG_ERR_NONE; +} + +static +odp_crypto_alg_err_t auth_digest_check(odp_packet_t pkt, + const odp_crypto_packet_op_param_t + *param, + odp_crypto_generic_session_t *session) +{ + uint32_t bytes = session->p.auth_digest_len; + uint8_t hash_in[EVP_MAX_MD_SIZE]; + uint8_t hash_out[EVP_MAX_MD_SIZE]; + + /* Copy current value out and clear it before authentication */ + odp_packet_copy_to_mem(pkt, param->hash_result_offset, + bytes, hash_in); + + _odp_packet_set_data(pkt, param->hash_result_offset, + 0, bytes); + + /* Hash it */ + packet_digest(pkt, param, session, hash_out); + + /* Verify match */ + if (0 != memcmp(hash_in, hash_out, bytes)) + return ODP_CRYPTO_ALG_ERR_ICV_CHECK; + + /* Matched */ + return ODP_CRYPTO_ALG_ERR_NONE; +} + static int internal_aad(EVP_CIPHER_CTX *ctx, odp_packet_t pkt, @@ -1336,6 +1432,26 @@ static int process_auth_cmac_param(odp_crypto_generic_session_t *session, return 0; } +static int process_digest_param(odp_crypto_generic_session_t *session, + const EVP_MD *md) +{ + /* Verify Key len is valid */ + if ((uint32_t)EVP_MD_size(md) != + session->p.auth_digest_len) + return -1; + + /* Set function */ + if (ODP_CRYPTO_OP_ENCODE == session->p.op) + session->auth.func = auth_digest_gen; + else + session->auth.func = auth_digest_check; + session->auth.init = null_crypto_init_routine; + + session->auth.evp_md = md; + + return 0; +} + int odp_crypto_capability(odp_crypto_capability_t *capa) { if (NULL == capa) @@ -1374,6 +1490,13 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->auths.bit.chacha20_poly1305 = 1; #endif + capa->auths.bit.md5 = 1; + capa->auths.bit.sha1 = 1; + capa->auths.bit.sha224 = 1; + capa->auths.bit.sha256 = 1; + capa->auths.bit.sha384 = 1; + capa->auths.bit.sha512 = 1; + #if ODP_DEPRECATED_API capa->ciphers.bit.aes128_cbc = 1; capa->ciphers.bit.aes128_gcm = 1; @@ -1504,6 +1627,30 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth, num = sizeof(auth_capa_chacha20_poly1305) / size; break; #endif + case ODP_AUTH_ALG_MD5: + src = auth_capa_md5; + num = sizeof(auth_capa_md5) / size; + break; + case ODP_AUTH_ALG_SHA1: + src = auth_capa_sha1; + num = sizeof(auth_capa_sha1) / size; + break; + case ODP_AUTH_ALG_SHA224: + src = auth_capa_sha224; + num = sizeof(auth_capa_sha224) / size; + break; + case ODP_AUTH_ALG_SHA256: + src = auth_capa_sha256; + num = sizeof(auth_capa_sha256) / size; + break; + case ODP_AUTH_ALG_SHA384: + src = auth_capa_sha384; + num = sizeof(auth_capa_sha384) / size; + break; + case ODP_AUTH_ALG_SHA512: + src = auth_capa_sha512; + num = sizeof(auth_capa_sha512) / size; + break; default: return -1; } @@ -1772,6 +1919,24 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, } break; #endif + case ODP_AUTH_ALG_MD5: + rc = process_digest_param(session, EVP_md5()); + break; + case ODP_AUTH_ALG_SHA1: + rc = process_digest_param(session, EVP_sha1()); + break; + case ODP_AUTH_ALG_SHA224: + rc = process_digest_param(session, EVP_sha224()); + break; + case ODP_AUTH_ALG_SHA256: + rc = process_digest_param(session, EVP_sha256()); + break; + case ODP_AUTH_ALG_SHA384: + rc = process_digest_param(session, EVP_sha384()); + break; + case ODP_AUTH_ALG_SHA512: + rc = process_digest_param(session, EVP_sha512()); + break; default: rc = -1; } @@ -1960,8 +2125,11 @@ int _odp_crypto_init_local(void) local.cmac_ctx[i] = CMAC_CTX_new(); local.cipher_ctx[i] = EVP_CIPHER_CTX_new(); local.mac_cipher_ctx[i] = EVP_CIPHER_CTX_new(); + local.md_ctx[i] = EVP_MD_CTX_new(); if (local.hmac_ctx[i] == NULL || + local.cmac_ctx[i] == NULL || + local.md_ctx[i] == NULL || local.cipher_ctx[i] == NULL || local.mac_cipher_ctx[i] == NULL) { _odp_crypto_term_local(); @@ -1989,6 +2157,8 @@ int _odp_crypto_term_local(void) EVP_CIPHER_CTX_free(local.cipher_ctx[i]); if (local.mac_cipher_ctx[i] != NULL) EVP_CIPHER_CTX_free(local.mac_cipher_ctx[i]); + if (local.md_ctx[i] != NULL) + EVP_MD_CTX_free(local.md_ctx[i]); } return 0; commit 7f6413db99c5e7172ae255116bdbdfd53c2171b7 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 19:59:54 2019 +0300 validation: crypto: add digest tests Add tests for digest algorithms. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 6ed4df257..5ad66b55f 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -70,6 +70,18 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_SNOW3G_UIA2"; case ODP_AUTH_ALG_ZUC_EIA3: return "ODP_AUTH_ALG_ZUC_EIA3"; + case ODP_AUTH_ALG_MD5: + return "ODP_AUTH_ALG_MD5"; + case ODP_AUTH_ALG_SHA1: + return "ODP_AUTH_ALG_SHA1"; + case ODP_AUTH_ALG_SHA224: + return "ODP_AUTH_ALG_SHA224"; + case ODP_AUTH_ALG_SHA256: + return "ODP_AUTH_ALG_SHA256"; + case ODP_AUTH_ALG_SHA384: + return "ODP_AUTH_ALG_SHA384"; + case ODP_AUTH_ALG_SHA512: + return "ODP_AUTH_ALG_SHA512"; default: return "Unknown"; } @@ -596,6 +608,24 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_AES_XCBC_MAC && !(capa.auths.bit.aes_xcbc_mac)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_MD5 && + !(capa.auths.bit.md5)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA1 && + !(capa.auths.bit.sha1)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA224 && + !(capa.auths.bit.sha224)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA256 && + !(capa.auths.bit.sha256)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA384 && + !(capa.auths.bit.sha384)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA512 && + !(capa.auths.bit.sha512)) + rc = -1; CU_ASSERT(!rc); CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); @@ -842,6 +872,30 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.zuc_eia3) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_MD5: + if (!capability.auths.bit.md5) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA1: + if (!capability.auths.bit.sha1) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA224: + if (!capability.auths.bit.sha224) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA256: + if (!capability.auths.bit.sha256) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA384: + if (!capability.auths.bit.sha384) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA512: + if (!capability.auths.bit.sha512) + return ODP_TEST_INACTIVE; + break; default: fprintf(stderr, "Unsupported authentication algorithm\n"); return ODP_TEST_INACTIVE; @@ -1878,6 +1932,168 @@ static void crypto_test_check_alg_zuc_eia3_ovr_iv(void) true); } +static int check_alg_md5(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5); +} + +static void crypto_test_gen_alg_md5(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_MD5, + md5_reference, + ARRAY_SIZE(md5_reference), + false, + false); +} + +static void crypto_test_check_alg_md5(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_MD5, + md5_reference, + ARRAY_SIZE(md5_reference), + false, + false); +} + +static int check_alg_sha1(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA1); +} + +static void crypto_test_gen_alg_sha1(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA1, + sha1_reference, + ARRAY_SIZE(sha1_reference), + false, + false); +} + +static void crypto_test_check_alg_sha1(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA1, + sha1_reference, + ARRAY_SIZE(sha1_reference), + false, + false); +} + +static int check_alg_sha224(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA224); +} + +static void crypto_test_gen_alg_sha224(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA224, + sha224_reference, + ARRAY_SIZE(sha224_reference), + false, + false); +} + +static void crypto_test_check_alg_sha224(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA224, + sha224_reference, + ARRAY_SIZE(sha224_reference), + false, + false); +} + +static int check_alg_sha256(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA256); +} + +static void crypto_test_gen_alg_sha256(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA256, + sha256_reference, + ARRAY_SIZE(sha256_reference), + false, + false); +} + +static void crypto_test_check_alg_sha256(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA256, + sha256_reference, + ARRAY_SIZE(sha256_reference), + false, + false); +} + +static int check_alg_sha384(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA384); +} + +static void crypto_test_gen_alg_sha384(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA384, + sha384_reference, + ARRAY_SIZE(sha384_reference), + false, + false); +} + +static void crypto_test_check_alg_sha384(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA384, + sha384_reference, + ARRAY_SIZE(sha384_reference), + false, + false); +} + +static int check_alg_sha512(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA512); +} + +static void crypto_test_gen_alg_sha512(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA512, + sha512_reference, + ARRAY_SIZE(sha512_reference), + false, + false); +} + +static void crypto_test_check_alg_sha512(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA512, + sha512_reference, + ARRAY_SIZE(sha512_reference), + false, + false); +} + static int crypto_suite_sync_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); @@ -2075,6 +2291,30 @@ odp_testinfo_t crypto_suite[] = { check_alg_zuc_eia3), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_zuc_eia3_ovr_iv, check_alg_zuc_eia3), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_md5, + check_alg_md5), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_md5, + check_alg_md5), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_sha1, + check_alg_sha1), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_sha1, + check_alg_sha1), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_sha224, + check_alg_sha224), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_sha224, + check_alg_sha224), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_sha256, + check_alg_sha256), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_sha256, + check_alg_sha256), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_sha384, + check_alg_sha384), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_sha384, + check_alg_sha384), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_sha512, + check_alg_sha512), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_sha512, + check_alg_sha512), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index ff6ee8cc2..03a2ac895 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -1811,4 +1811,256 @@ static crypto_test_reference_t zuc_eia3_reference[] = { } }; +/* + * MD5 test vectors from RFC 1321 + */ +static crypto_test_reference_t md5_reference[] = { + { + .length = 3, + .plaintext = { 0x61, 0x62, 0x63 }, + .ciphertext = { 0x61, 0x62, 0x63 }, + .digest_length = MD5_DIGEST_LEN, + .digest = { 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, + 0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72} + }, + { + .length = 62, + .plaintext = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, + 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, + 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, + 0x59, 0x5a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, + 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, + 0x77, 0x78, 0x79, 0x7a, 0x30, 0x31, 0x32, 0x33, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39 }, + .ciphertext = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, + 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, + 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, + 0x59, 0x5a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, + 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, + 0x77, 0x78, 0x79, 0x7a, 0x30, 0x31, 0x32, 0x33, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39 }, + .digest_length = MD5_DIGEST_LEN, + .digest = { 0xd1, 0x74, 0xab, 0x98, 0xd2, 0x77, 0xd9, 0xf5, + 0xa5, 0x61, 0x1c, 0x2c, 0x9f, 0x41, 0x9d, 0x9f}, + } +}; + +/* + * SHA test vectors from Crypto++ + */ +static crypto_test_reference_t sha1_reference[] = { + { + .length = 3, + .plaintext = { 0x61, 0x62, 0x63 }, + .ciphertext = { 0x61, 0x62, 0x63 }, + .digest_length = SHA1_DIGEST_LEN, + .digest = { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, + 0xBA, 0x3E, 0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, + 0x9C, 0xD0, 0xD8, 0x9D}, + }, + { + .length = 56, + .plaintext = { 0x61, 0x62, 0x63, 0x64, 0x62, 0x63, 0x64, 0x65, + 0x63, 0x64, 0x65, 0x66, 0x64, 0x65, 0x66, 0x67, + 0x65, 0x66, 0x67, 0x68, 0x66, 0x67, 0x68, 0x69, + 0x67, 0x68, 0x69, 0x6a, 0x68, 0x69, 0x6a, 0x6b, + 0x69, 0x6a, 0x6b, 0x6c, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6c, 0x6d, 0x6e, 0x6f, + 0x6d, 0x6e, 0x6f, 0x70, 0x6e, 0x6f, 0x70, 0x71}, + .ciphertext = { 0x61, 0x62, 0x63, 0x64, 0x62, 0x63, 0x64, 0x65, + 0x63, 0x64, 0x65, 0x66, 0x64, 0x65, 0x66, 0x67, + 0x65, 0x66, 0x67, 0x68, 0x66, 0x67, 0x68, 0x69, + 0x67, 0x68, 0x69, 0x6a, 0x68, 0x69, 0x6a, 0x6b, + 0x69, 0x6a, 0x6b, 0x6c, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6c, 0x6d, 0x6e, 0x6f, + 0x6d, 0x6e, 0x6f, 0x70, 0x6e, 0x6f, 0x70, 0x71}, + .digest_length = SHA1_DIGEST_LEN, + .digest = { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, + 0xBA, 0xAE, 0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, + 0xE5, 0x46, 0x70, 0xF1}, + } +}; + +static crypto_test_reference_t sha224_reference[] = { + { + .length = 3, + .plaintext = { 0x61, 0x62, 0x63 }, + .ciphertext = { 0x61, 0x62, 0x63 }, + .digest_length = SHA224_DIGEST_LEN, + .digest = { 0x23, 0x09, 0x7d, 0x22, 0x34, 0x05, 0xd8, 0x22, + 0x86, 0x42, 0xa4, 0x77, 0xbd, 0xa2, 0x55, 0xb3, + 0x2a, 0xad, 0xbc, 0xe4, 0xbd, 0xa0, 0xb3, 0xf7, + 0xe3, 0x6c, 0x9d, 0xa7 }, + }, + { + .length = 56, + .plaintext = { 0x61, 0x62, 0x63, 0x64, 0x62, 0x63, 0x64, 0x65, + 0x63, 0x64, 0x65, 0x66, 0x64, 0x65, 0x66, 0x67, + 0x65, 0x66, 0x67, 0x68, 0x66, 0x67, 0x68, 0x69, + 0x67, 0x68, 0x69, 0x6a, 0x68, 0x69, 0x6a, 0x6b, + 0x69, 0x6a, 0x6b, 0x6c, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6c, 0x6d, 0x6e, 0x6f, + 0x6d, 0x6e, 0x6f, 0x70, 0x6e, 0x6f, 0x70, 0x71}, + .ciphertext = { 0x61, 0x62, 0x63, 0x64, 0x62, 0x63, 0x64, 0x65, + 0x63, 0x64, 0x65, 0x66, 0x64, 0x65, 0x66, 0x67, + 0x65, 0x66, 0x67, 0x68, 0x66, 0x67, 0x68, 0x69, + 0x67, 0x68, 0x69, 0x6a, 0x68, 0x69, 0x6a, 0x6b, + 0x69, 0x6a, 0x6b, 0x6c, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6c, 0x6d, 0x6e, 0x6f, + 0x6d, 0x6e, 0x6f, 0x70, 0x6e, 0x6f, 0x70, 0x71}, + .digest_length = SHA224_DIGEST_LEN, + .digest = { 0x75, 0x38, 0x8b, 0x16, 0x51, 0x27, 0x76, 0xcc, + 0x5d, 0xba, 0x5d, 0xa1, 0xfd, 0x89, 0x01, 0x50, + 0xb0, 0xc6, 0x45, 0x5c, 0xb4, 0xf5, 0x8b, 0x19, + 0x52, 0x52, 0x25, 0x25}, + } +}; + +static crypto_test_reference_t sha256_reference[] = { + { + .length = 3, + .plaintext = { 0x61, 0x62, 0x63 }, + .ciphertext = { 0x61, 0x62, 0x63 }, + .digest_length = SHA256_DIGEST_LEN, + .digest = { 0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, + 0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23, + 0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, + 0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad}, + }, + { + .length = 56, + .plaintext = { 0x61, 0x62, 0x63, 0x64, 0x62, 0x63, 0x64, 0x65, + 0x63, 0x64, 0x65, 0x66, 0x64, 0x65, 0x66, 0x67, + 0x65, 0x66, 0x67, 0x68, 0x66, 0x67, 0x68, 0x69, + 0x67, 0x68, 0x69, 0x6a, 0x68, 0x69, 0x6a, 0x6b, + 0x69, 0x6a, 0x6b, 0x6c, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6c, 0x6d, 0x6e, 0x6f, + 0x6d, 0x6e, 0x6f, 0x70, 0x6e, 0x6f, 0x70, 0x71}, + .ciphertext = { 0x61, 0x62, 0x63, 0x64, 0x62, 0x63, 0x64, 0x65, + 0x63, 0x64, 0x65, 0x66, 0x64, 0x65, 0x66, 0x67, + 0x65, 0x66, 0x67, 0x68, 0x66, 0x67, 0x68, 0x69, + 0x67, 0x68, 0x69, 0x6a, 0x68, 0x69, 0x6a, 0x6b, + 0x69, 0x6a, 0x6b, 0x6c, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6c, 0x6d, 0x6e, 0x6f, + 0x6d, 0x6e, 0x6f, 0x70, 0x6e, 0x6f, 0x70, 0x71}, + .digest_length = SHA256_DIGEST_LEN, + .digest = { 0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8, + 0xe5, 0xc0, 0x26, 0x93, 0x0c, 0x3e, 0x60, 0x39, + 0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67, + 0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1}, + } +}; + +static crypto_test_reference_t sha384_reference[] = { + { + .length = 3, + .plaintext = { 0x61, 0x62, 0x63 }, + .ciphertext = { 0x61, 0x62, 0x63 }, + .digest_length = SHA384_DIGEST_LEN, + .digest = { 0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b, + 0xb5, 0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07, + 0x27, 0x2c, 0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63, + 0x1a, 0x8b, 0x60, 0x5a, 0x43, 0xff, 0x5b, 0xed, + 0x80, 0x86, 0x07, 0x2b, 0xa1, 0xe7, 0xcc, 0x23, + 0x58, 0xba, 0xec, 0xa1, 0x34, 0xc8, 0x25, 0xa7}, + }, + { + .length = 112, + .plaintext = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75}, + .ciphertext = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75}, + .digest_length = SHA384_DIGEST_LEN, + .digest = { 0x09, 0x33, 0x0c, 0x33, 0xf7, 0x11, 0x47, 0xe8, + 0x3d, 0x19, 0x2f, 0xc7, 0x82, 0xcd, 0x1b, 0x47, + 0x53, 0x11, 0x1b, 0x17, 0x3b, 0x3b, 0x05, 0xd2, + 0x2f, 0xa0, 0x80, 0x86, 0xe3, 0xb0, 0xf7, 0x12, + 0xfc, 0xc7, 0xc7, 0x1a, 0x55, 0x7e, 0x2d, 0xb9, + 0x66, 0xc3, 0xe9, 0xfa, 0x91, 0x74, 0x60, 0x39}, + } +}; + +static crypto_test_reference_t sha512_reference[] = { + { + .length = 3, + .plaintext = { 0x61, 0x62, 0x63 }, + .ciphertext = { 0x61, 0x62, 0x63 }, + .digest_length = SHA512_DIGEST_LEN, + .digest = { 0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, + 0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31, + 0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, + 0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a, + 0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8, + 0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd, + 0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e, + 0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f}, + }, + { + .length = 112, + .plaintext = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75}, + .ciphertext = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75}, + .digest_length = SHA512_DIGEST_LEN, + .digest = { 0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda, + 0x8c, 0xf4, 0xf7, 0x28, 0x14, 0xfc, 0x14, 0x3f, + 0x8f, 0x77, 0x79, 0xc6, 0xeb, 0x9f, 0x7f, 0xa1, + 0x72, 0x99, 0xae, 0xad, 0xb6, 0x88, 0x90, 0x18, + 0x50, 0x1d, 0x28, 0x9e, 0x49, 0x00, 0xf7, 0xe4, + 0x33, 0x1b, 0x99, 0xde, 0xc4, 0xb5, 0x43, 0x3a, + 0xc7, 0xd3, 0x29, 0xee, 0xb6, 0xdd, 0x26, 0x54, + 0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09}, + } +}; + #endif diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index db6e5bc9f..6263b8ec4 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -104,4 +104,22 @@ #define ZUC_EIA3_IV_LEN 16 #define ZUC_EIA3_DIGEST_LEN 4 +/* MD5 */ +#define MD5_DIGEST_LEN 16 + +/* SHA1 */ +#define SHA1_DIGEST_LEN 20 + +/* SHA224 */ +#define SHA224_DIGEST_LEN 28 + +/* SHA256 */ +#define SHA256_DIGEST_LEN 32 + +/* SHA384 */ +#define SHA384_DIGEST_LEN 48 + +/* SHA512 */ +#define SHA512_DIGEST_LEN 64 + #endif commit 181118b438f3abb6bc0b4f6df6b4656215e12158 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 19:57:44 2019 +0300 api: crypto: add digests enumeration Add enumeration for digest (unkeyed) algorithms. They are added as auth algorithms with empty key required. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index ec4711c01..efcc9c454 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -261,6 +261,24 @@ typedef enum { */ ODP_AUTH_ALG_ZUC_EIA3, + /** MD5 algorithm */ + ODP_AUTH_ALG_MD5, + + /** SHA1 algorithm */ + ODP_AUTH_ALG_SHA1, + + /** 224 bit SHA2 algorithm */ + ODP_AUTH_ALG_SHA224, + + /** 256 bit SHA2 algorithm */ + ODP_AUTH_ALG_SHA256, + + /** 384 bit SHA2 algorithm */ + ODP_AUTH_ALG_SHA384, + + /** 512 bit SHA2 algorithm */ + ODP_AUTH_ALG_SHA512, + /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */ ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96), @@ -383,6 +401,24 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_ZUC_EIA3 */ uint32_t zuc_eia3 : 1; + /** ODP_AUTH_ALG_MD5 */ + uint32_t md5 : 1; + + /** ODP_AUTH_ALG_SHA1 */ + uint32_t sha1 : 1; + + /** ODP_AUTH_ALG_SHA224 */ + uint32_t sha224 : 1; + + /** ODP_AUTH_ALG_SHA256 */ + uint32_t sha256 : 1; + + /** ODP_AUTH_ALG_SHA384 */ + uint32_t sha384 : 1; + + /** ODP_AUTH_ALG_SHA512 */ + uint32_t sha512 : 1; + /** @deprecated Use md5_hmac instead */ uint32_t ODP_DEPRECATE(md5_96) : 1; commit 44cde88d44b123d5726351599e8a043c38920762 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sat Apr 6 14:55:04 2019 +0300 linux-gen: crypto: add HMAC-SHA224 algorithm support Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 25fa11a78..766a0d0ee 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -100,6 +100,9 @@ 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_sha224_hmac[] = { +{.digest_len = 28, .key_len = 28, .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} } }; @@ -1358,6 +1361,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 = 1; + capa->auths.bit.sha224_hmac = 1; capa->auths.bit.sha256_hmac = 1; capa->auths.bit.sha384_hmac = 1; capa->auths.bit.sha512_hmac = 1; @@ -1458,6 +1462,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth, src = auth_capa_sha1_hmac; num = sizeof(auth_capa_sha1_hmac) / size; break; + case ODP_AUTH_ALG_SHA224_HMAC: + src = auth_capa_sha224_hmac; + num = sizeof(auth_capa_sha224_hmac) / size; + break; case ODP_AUTH_ALG_SHA256_HMAC: src = auth_capa_sha256_hmac; num = sizeof(auth_capa_sha256_hmac) / size; @@ -1677,6 +1685,9 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, case ODP_AUTH_ALG_SHA1_HMAC: rc = process_auth_hmac_param(session, EVP_sha1()); break; + case ODP_AUTH_ALG_SHA224_HMAC: + rc = process_auth_hmac_param(session, EVP_sha224()); + break; #if ODP_DEPRECATED_API case ODP_AUTH_ALG_SHA256_128: /* Fixed digest tag length with deprecated algo */ commit c0e82fab2c677480bf4774eb4c854e0ed31d893c Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Mon Apr 15 21:16:03 2019 +0300 validation: crypto: add HMAC-SHA224 test vectors Add test vectors for HMAC-SHA224 algorithm. Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 12dcd4518..6ed4df257 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -44,6 +44,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_MD5_HMAC"; case ODP_AUTH_ALG_SHA1_HMAC: return "ODP_AUTH_ALG_SHA1_HMAC"; + case ODP_AUTH_ALG_SHA224_HMAC: + return "ODP_AUTH_ALG_SHA224_HMAC"; case ODP_AUTH_ALG_SHA256_HMAC: return "ODP_AUTH_ALG_SHA256_HMAC"; case ODP_AUTH_ALG_SHA384_HMAC: @@ -579,6 +581,9 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_SHA1_HMAC && !(capa.auths.bit.sha1_hmac)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA224_HMAC && + !(capa.auths.bit.sha224_hmac)) + rc = -1; if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && !(capa.auths.bit.sha256_hmac)) rc = -1; @@ -785,6 +790,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.sha1_hmac) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_SHA224_HMAC: + if (!capability.auths.bit.sha224_hmac) + return ODP_TEST_INACTIVE; + break; case ODP_AUTH_ALG_SHA256_HMAC: if (!capability.auths.bit.sha256_hmac) return ODP_TEST_INACTIVE; @@ -1482,6 +1491,33 @@ static void crypto_test_check_alg_hmac_sha1(void) false); } +static int check_alg_hmac_sha224(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA224_HMAC); +} + +static void crypto_test_gen_alg_hmac_sha224(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA224_HMAC, + hmac_sha224_reference, + ARRAY_SIZE(hmac_sha224_reference), + false, + false); +} + +static void crypto_test_check_alg_hmac_sha224(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SHA224_HMAC, + hmac_sha224_reference, + ARRAY_SIZE(hmac_sha224_reference), + false, + false); +} + static int check_alg_hmac_sha256(void) { return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA256_HMAC); @@ -1983,6 +2019,10 @@ odp_testinfo_t crypto_suite[] = { 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_sha224, + check_alg_hmac_sha224), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha224, + check_alg_hmac_sha224), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_sha256, check_alg_hmac_sha256), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha256, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index ed0036ca1..ff6ee8cc2 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -1100,6 +1100,70 @@ static crypto_test_reference_t hmac_sha1_reference[] = { } }; +static crypto_test_reference_t hmac_sha224_reference[] = { + { + .auth_key_length = HMAC_SHA224_KEY_LEN, + .auth_key = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b }, + .length = 8, + /* "Hi There" */ + .plaintext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .ciphertext = { 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65}, + .digest_length = HMAC_SHA224_CHECK_LEN, + .digest = { 0x89, 0x6f, 0xb1, 0x12, 0x8a, 0xbb, 0xdf, 0x19, + 0x68, 0x32, 0x10, 0x7c, 0xd4, 0x9d, 0xf3, 0x3f, + 0x47, 0xb4, 0xb1, 0x16, 0x99, 0x12, 0xba, 0x4f, + 0x53, 0x68, 0x4b, 0x22 } + }, + { + .auth_key_length = HMAC_SHA224_KEY_LEN, + /* "Jefe" */ + .auth_key = { 0x4a, 0x65, 0x66, 0x65 }, + .length = 28, + /* what do ya want for nothing?*/ + .plaintext = { 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 }, + .ciphertext = { 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 }, + .digest_length = HMAC_SHA224_CHECK_LEN, + .digest = { 0xa3, 0x0e, 0x01, 0x09, 0x8b, 0xc6, 0xdb, 0xbf, + 0x45, 0x69, 0x0f, 0x3a, 0x7e, 0x9e, 0x6d, 0x0f, + 0x8b, 0xbe, 0xa2, 0xa3, 0x9e, 0x61, 0x48, 0x00, + 0x8f, 0xd0, 0x5e, 0x44 } + }, + { + .auth_key_length = HMAC_SHA224_KEY_LEN, + .auth_key = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, + 0xaa, 0xaa, 0xaa, 0xaa }, + .length = 50, + .plaintext = { 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 }, + .ciphertext = { 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 }, + .digest_length = HMAC_SHA224_CHECK_LEN, + .digest = { 0x7f, 0xb3, 0xcb, 0x35, 0x88, 0xc6, 0xc1, 0xf6, + 0xff, 0xa9, 0x69, 0x4d, 0x7d, 0x6a, 0xd2, 0x64, + 0x93, 0x65, 0xb0, 0xc1, 0xf6, 0x5d, 0x69, 0xd1, + 0xec, 0x83, 0x33, 0xea } + } +}; + static crypto_test_reference_t hmac_sha256_reference[] = { { .auth_key_length = HMAC_SHA256_KEY_LEN, diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index d2e35b4d3..db6e5bc9f 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -43,16 +43,20 @@ #define HMAC_MD5_96_CHECK_LEN 12 #define HMAC_MD5_CHECK_LEN 16 -/* HMAC-SHA256 */ -#define HMAC_SHA256_KEY_LEN 32 -#define HMAC_SHA256_128_CHECK_LEN 16 -#define HMAC_SHA256_CHECK_LEN 32 - /* HMAC-SHA1 */ #define HMAC_SHA1_KEY_LEN 20 #define HMAC_SHA1_96_CHECK_LEN 12 #define HMAC_SHA1_CHECK_LEN 20 +/* HMAC-SHA224 */ +#define HMAC_SHA224_KEY_LEN 28 +#define HMAC_SHA224_CHECK_LEN 28 + +/* HMAC-SHA256 */ +#define HMAC_SHA256_KEY_LEN 32 +#define HMAC_SHA256_128_CHECK_LEN 16 +#define HMAC_SHA256_CHECK_LEN 32 + /* HMAC-SHA384 */ #define HMAC_SHA384_KEY_LEN 48 #define HMAC_SHA384_192_CHECK_LEN 24 commit 21bf585ca33eea0073c41f4d5115dcc8765bd122 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sat Apr 6 14:52:54 2019 +0300 api: crypto: add HMAC-SHA224 algorithm support Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 9e1191088..ec4711c01 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -157,6 +157,12 @@ typedef enum { */ ODP_AUTH_ALG_SHA1_HMAC, + /** HMAC-SHA-224 + * + * SHA-224 algorithm in HMAC mode + */ + ODP_AUTH_ALG_SHA224_HMAC, + /** HMAC-SHA-256 * * SHA-256 algorithm in HMAC mode @@ -338,6 +344,9 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_SHA1_HMAC */ uint32_t sha1_hmac : 1; + /** ODP_AUTH_ALG_SHA224_HMAC */ + uint32_t sha224_hmac : 1; + /** ODP_AUTH_ALG_SHA256_HMAC */ uint32_t sha256_hmac : 1; commit 2cb1bd572c9cc17f39742a46884a147ebf6f2302 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sat Apr 6 14:50:57 2019 +0300 linux-gen: add 3DES-ECB algorithm support Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index b7cce4a39..25fa11a78 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -53,6 +53,9 @@ static const odp_crypto_cipher_capability_t cipher_capa_null[] = { static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = { {.key_len = 24, .iv_len = 8} }; +static const odp_crypto_cipher_capability_t cipher_capa_trides_ecb[] = { +{.key_len = 24} }; + static const odp_crypto_cipher_capability_t cipher_capa_aes_cbc[] = { {.key_len = 16, .iv_len = 16}, {.key_len = 24, .iv_len = 16}, @@ -1343,6 +1346,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.null = 1; capa->ciphers.bit.trides_cbc = 1; + capa->ciphers.bit.trides_ecb = 1; capa->ciphers.bit.aes_cbc = 1; capa->ciphers.bit.aes_ctr = 1; capa->ciphers.bit.aes_gcm = 1; @@ -1396,6 +1400,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, src = cipher_capa_trides_cbc; num = sizeof(cipher_capa_trides_cbc) / size; break; + case ODP_CIPHER_ALG_3DES_ECB: + src = cipher_capa_trides_ecb; + num = sizeof(cipher_capa_trides_ecb) / size; + break; case ODP_CIPHER_ALG_AES_CBC: src = cipher_capa_aes_cbc; num = sizeof(cipher_capa_aes_cbc) / size; @@ -1556,6 +1564,9 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, case ODP_CIPHER_ALG_3DES_CBC: rc = process_cipher_param(session, EVP_des_ede3_cbc()); break; + case ODP_CIPHER_ALG_3DES_ECB: + rc = process_cipher_param(session, EVP_des_ede3_ecb()); + break; #if ODP_DEPRECATED_API case ODP_CIPHER_ALG_AES128_CBC: if (param->cipher_key.length == 16) commit 067f57be454ce360fedb7501c51e5f1ef2824b7e Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sat Apr 6 14:52:19 2019 +0300 validation: crypto: add 3DES-ECB algorithm support Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index b2f599ec2..12dcd4518 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -82,6 +82,8 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_DES"; case ODP_CIPHER_ALG_3DES_CBC: return "ODP_CIPHER_ALG_3DES_CBC"; + case ODP_CIPHER_ALG_3DES_ECB: + return "ODP_CIPHER_ALG_3DES_ECB"; case ODP_CIPHER_ALG_AES_CBC: return "ODP_CIPHER_ALG_AES_CBC"; case ODP_CIPHER_ALG_AES_CTR: @@ -507,6 +509,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && !(capa.ciphers.bit.trides_cbc)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_3DES_ECB && + !(capa.ciphers.bit.trides_ecb)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && !(capa.ciphers.bit.aes_cbc)) rc = -1; @@ -725,6 +730,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.trides_cbc) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_3DES_ECB: + if (!capability.ciphers.bit.trides_ecb) + return ODP_TEST_INACTIVE; + break; case ODP_CIPHER_ALG_AES_CBC: if (!capability.ciphers.bit.aes_cbc) return ODP_TEST_INACTIVE; @@ -926,6 +935,40 @@ static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) false); } +static int check_alg_3des_ecb(void) +{ + return check_alg_support(ODP_CIPHER_ALG_3DES_ECB, ODP_AUTH_ALG_NULL); +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for 3DES_ECB algorithm. */ +static void crypto_test_enc_alg_3des_ecb(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_3DES_ECB, + ODP_AUTH_ALG_NULL, + tdes_ecb_reference, + ARRAY_SIZE(tdes_ecb_reference), + false, + false); +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for 3DES_ECB algorithm. IV for the operation is the session IV + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +static void crypto_test_dec_alg_3des_ecb(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_3DES_ECB, + ODP_AUTH_ALG_NULL, + tdes_ecb_reference, + ARRAY_SIZE(tdes_ecb_reference), + false, + false); +} + static int check_alg_chacha20_poly1305(void) { return check_alg_support(ODP_CIPHER_ALG_CHACHA20_POLY1305, @@ -1864,6 +1907,10 @@ odp_testinfo_t crypto_suite[] = { check_alg_3des_cbc), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc_ovr_iv, check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_ecb, + check_alg_3des_ecb), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_ecb, + check_alg_3des_ecb), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_cbc, check_alg_aes_cbc), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cbc, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 3e40d708f..ed0036ca1 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -72,6 +72,37 @@ static crypto_test_reference_t tdes_cbc_reference[] = { } }; +/* + * TDES-ECB reference vectors, according to + * CAVS 18.0 TECBMMT + */ +static crypto_test_reference_t tdes_ecb_reference[] = { + /* CAVS 18.0 TECBMMT2.rsp #0 */ + { + .cipher_key_length = TDES_ECB_KEY_LEN, + .cipher_key = { 0x15, 0x1f, 0x10, 0x38, 0x3d, 0x6d, 0x19, 0x9b, + 0x4a, 0x76, 0x3b, 0xd5, 0x4a, 0x46, 0xa4, 0x45, + 0x15, 0x1f, 0x10, 0x38, 0x3d, 0x6d, 0x19, 0x9b}, + .length = 8, + .plaintext = { 0xd8, 0xda, 0x89, 0x29, 0x88, 0x78, 0xed, 0x7d }, + .ciphertext = { 0x89, 0x32, 0x1b, 0xa7, 0x5b, 0xa5, 0x45, 0xdb } + }, + /* CAVS 18.0 TECBMMT2.rsp #2 */ + { + .cipher_key_length = TDES_ECB_KEY_LEN, + .cipher_key = { 0xcd, 0x3d, 0x9b, 0xf7, 0x2f, 0x8c, 0x8a, 0xb5, + 0xfe, 0xe6, 0x73, 0x34, 0x31, 0x1c, 0xa4, 0x62, + 0xcd, 0x3d, 0x9b, 0xf7, 0x2f, 0x8c, 0x8a, 0xb5}, + .length = 24, + .plaintext = { 0x2f, 0x2a, 0x36, 0x1c, 0x8e, 0x14, 0x5d, 0xc0, + 0xa7, 0x4a, 0x1b, 0xdb, 0x7c, 0xa9, 0x29, 0xc3, + 0x38, 0x14, 0x4d, 0x89, 0x13, 0x5b, 0x50, 0xa7 }, + .ciphertext = { 0x7f, 0x1f, 0xd3, 0x2b, 0x36, 0x90, 0x05, 0x4b, + 0xfa, 0x1b, 0x17, 0x35, 0x15, 0x79, 0x33, 0x80, + 0x99, 0xff, 0xa8, 0x4f, 0xea, 0x16, 0x8c, 0x6b } + } +}; + static crypto_test_reference_t aes_cbc_reference[] = { { .cipher_key_length = AES128_KEY_LEN, diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 3418ef279..d2e35b4d3 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -17,6 +17,9 @@ #define TDES_CBC_KEY_LEN 24 #define TDES_CBC_IV_LEN 8 +/* TDES-ECB */ +#define TDES_ECB_KEY_LEN 24 + /* AES common */ #define AES128_KEY_LEN 16 commit 379bbf144141d41ee31df11d8a8d3a0758c1db06 Author: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Date: Sat Apr 6 14:50:15 2019 +0300 api: add 3DES-ECB algorithm support Signed-off-by: Dmitry Eremin-Solenikov <deremin-solenikov(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index c57873abe..9e1191088 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -76,6 +76,9 @@ typedef enum { /** Triple DES with cipher block chaining */ ODP_CIPHER_ALG_3DES_CBC, + /** Triple DES with Electronic Codebook */ + ODP_CIPHER_ALG_3DES_ECB, + /** AES with cipher block chaining */ ODP_CIPHER_ALG_AES_CBC, @@ -278,6 +281,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_3DES_CBC */ uint32_t trides_cbc : 1; + /** ODP_CIPHER_ALG_3DES_ECB */ + uint32_t trides_ecb : 1; + /** ODP_CIPHER_ALG_AES_CBC */ uint32_t aes_cbc : 1; ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- include/odp/api/spec/crypto.h | 126 ++- platform/linux-generic/odp_crypto_openssl.c | 644 +++++++++++- test/validation/api/crypto/odp_crypto_test_inp.c | 675 ++++++++++++ test/validation/api/crypto/test_vectors.h | 1225 ++++++++++++++++++++++ test/validation/api/crypto/test_vectors_len.h | 54 +- 6 files changed, 2717 insertions(+), 9 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-82-g7f79421ba

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 7f79421ba6204559fc33d960f9c58ee4bd2ca064 (commit) via d2a23dc8a06ec974cb0254440143b8dab432e3fc (commit) via ff1c6ceb92f014785ec4d90a4bd2ec6802a18bab (commit) via ebefa333864660b8cc8e971f1b963aa31f2dfb3b (commit) via 25c741e1ad3c2a859681e5617f2c7405967b09ef (commit) via da0a56727cc2bc33c7effd54244649c45fd68653 (commit) via 13ec06dcbfb7d26d6b197e8e6f1b058f387e609d (commit) via 7d8f6cc52cadb748ef315525edaad26c948b31fe (commit) via 13910403658b57e2d376d8f30e956223f91dfc1b (commit) from 7f0d32bbbbac6ecd321044cf2e9945bf0a3aba8e (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 7f79421ba6204559fc33d960f9c58ee4bd2ca064 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 10 10:14:04 2019 +0300 validation: scheduler: unify test clean-up Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 0215ecf1d..bcee0d193 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -122,24 +122,6 @@ static int drain_queues(void) return ret; } -static int exit_schedule_loop(void) -{ - odp_event_t ev; - int ret = 0; - - odp_schedule_pause(); - - while ((ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT)) - != ODP_EVENT_INVALID) { - odp_event_free(ev); - ret++; - } - - odp_schedule_resume(); - - return ret; -} - static void release_context(odp_schedule_sync_t sync) { if (sync == ODP_SCHED_SYNC_ATOMIC) @@ -410,16 +392,7 @@ static void scheduler_test_wait(void) } /* Make sure that scheduler is empty */ - retry = 0; - do { - ret = odp_schedule_multi_no_wait(NULL, &ev, 1); - CU_ASSERT(ret == 0 || ret == 1); - - if (ret) - odp_event_free(ev); - else - retry++; - } while (ret || retry < num_retry); + drain_queues(); CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); CU_ASSERT_FATAL(odp_pool_destroy(p) == 0); @@ -858,7 +831,7 @@ static void scheduler_test_groups(void) /* Release schduler context and leave groups */ odp_schedule_group_join(mygrp1, &mymask); odp_schedule_group_join(mygrp2, &mymask); - CU_ASSERT(exit_schedule_loop() == 0); + CU_ASSERT(drain_queues() == 0); odp_schedule_group_leave(mygrp1, &mymask); odp_schedule_group_leave(mygrp2, &mymask); @@ -1282,9 +1255,7 @@ static int schedule_common_(void *arg) odp_ticketlock_unlock(&globals->lock); /* Clear scheduler atomic / ordered context between tests */ - num = exit_schedule_loop(); - - CU_ASSERT(num == 0); + CU_ASSERT(drain_queues() == 0); if (num) printf("\nDROPPED %i events\n\n", num); @@ -1738,9 +1709,7 @@ static void scheduler_test_pause_resume(void) odp_buffer_free(buf); } - ret = exit_schedule_loop(); - - CU_ASSERT(ret == 0); + CU_ASSERT(drain_queues() == 0); } /* Basic, single threaded ordered lock API testing */ @@ -1810,9 +1779,7 @@ static void scheduler_test_ordered_lock(void) odp_buffer_free(buf); } - ret = exit_schedule_loop(); - - CU_ASSERT(ret == 0); + CU_ASSERT(drain_queues() == 0); } static int create_queues(test_globals_t *globals) commit d2a23dc8a06ec974cb0254440143b8dab432e3fc Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Apr 25 13:21:26 2019 +0300 validation: scheduler: run multithread tests also on core zero Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 848c683b3..0215ecf1d 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -979,7 +979,6 @@ static void chaos_run(unsigned int qtype) CU_ASSERT_PTR_NOT_NULL_FATAL(args); args->globals = globals; - args->cu_thr.numthrds = globals->num_workers; odp_queue_param_init(&qp); odp_pool_param_init(&params); @@ -1025,17 +1024,20 @@ static void chaos_run(unsigned int qtype) CU_ASSERT_FATAL(rc == 0); } - /* Run the test */ - odp_cunit_thread_create(chaos_thread, &args->cu_thr); - odp_cunit_thread_exit(&args->cu_thr); + /* Test runs also on the main thread */ + args->cu_thr.numthrds = globals->num_workers - 1; + if (args->cu_thr.numthrds > 0) + odp_cunit_thread_create(chaos_thread, &args->cu_thr); + + chaos_thread(args); + + if (args->cu_thr.numthrds > 0) + odp_cunit_thread_exit(&args->cu_thr); if (CHAOS_DEBUG) printf("Thread %d returning from chaos threads..cleaning up\n", odp_thread_id()); - drain_queues(); - exit_schedule_loop(); - for (i = 0; i < CHAOS_NUM_QUEUES; i++) { if (CHAOS_DEBUG) printf("Destroying queue %s\n", @@ -1457,11 +1459,17 @@ static void parallel_execute(odp_schedule_sync_t sync, int num_queues, fill_queues(args); /* Create and launch worker threads */ - args->cu_thr.numthrds = globals->num_workers; - odp_cunit_thread_create(schedule_common_, &args->cu_thr); + + /* Test runs also on the main thread */ + args->cu_thr.numthrds = globals->num_workers - 1; + if (args->cu_thr.numthrds > 0) + odp_cunit_thread_create(schedule_common_, &args->cu_thr); + + schedule_common_(args); /* Wait for worker threads to terminate */ - odp_cunit_thread_exit(&args->cu_thr); + if (args->cu_thr.numthrds > 0) + odp_cunit_thread_exit(&args->cu_thr); /* Cleanup ordered queues for next pass */ if (sync == ODP_SCHED_SYNC_ORDERED) commit ff1c6ceb92f014785ec4d90a4bd2ec6802a18bab Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Apr 24 10:46:48 2019 +0300 validation: scheduler: fix chaos test clean-up Wait until all threads have finished before doing clean-up. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index c64abbb83..848c683b3 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -928,14 +928,25 @@ static int chaos_thread(void *arg) printf("Thread %d completed %d rounds...terminating\n", odp_thread_id(), CHAOS_NUM_EVENTS); - exit_schedule_loop(); - end_time = odp_time_local(); diff = odp_time_diff(end_time, start_time); printf("Thread %d ends, elapsed time = %" PRIu64 "us\n", odp_thread_id(), odp_time_to_ns(diff) / 1000); + /* Make sure scheduling context is released */ + odp_schedule_pause(); + while ((ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT)) + != ODP_EVENT_INVALID) { + odp_event_free(ev); + } + + /* Don't resume scheduling until all threads have finished */ + odp_barrier_wait(&globals->barrier); + odp_schedule_resume(); + + drain_queues(); + return 0; } commit ebefa333864660b8cc8e971f1b963aa31f2dfb3b Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu May 9 10:22:05 2019 +0300 validation: scheduler: make sure scheduling context is released Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 84e0078e6..c64abbb83 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -507,6 +507,9 @@ static void scheduler_test_queue_size(void) } CU_ASSERT(num == queue_size); + + CU_ASSERT(drain_queues() == 0); + CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); } @@ -622,6 +625,7 @@ static void scheduler_test_order_ignore(void) CU_ASSERT(num == queue_size); + CU_ASSERT(drain_queues() == 0); CU_ASSERT_FATAL(odp_queue_destroy(ordered) == 0); CU_ASSERT_FATAL(odp_queue_destroy(plain) == 0); CU_ASSERT_FATAL(odp_pool_destroy(pool) == 0); commit 25c741e1ad3c2a859681e5617f2c7405967b09ef Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed May 8 17:45:20 2019 +0300 validation: scheduler: add missing clean-up to scheduler_test_ordered_lock Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 045e7ba9c..84e0078e6 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -1771,6 +1771,7 @@ static void scheduler_test_ordered_lock(void) if (lock_count < 2) { printf(" ONLY ONE ORDERED LOCK. Unlock_lock not tested.\n"); + CU_ASSERT(drain_queues() == BUFS_PER_QUEUE / 2); return; } commit da0a56727cc2bc33c7effd54244649c45fd68653 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Apr 24 09:52:47 2019 +0300 validation: scheduler: make sure scheduling context is released Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 446d03d38..045e7ba9c 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -307,6 +307,10 @@ static void scheduler_test_queue_destroy(void) odp_buffer_free(buf); release_context(qp.sched.sync); + + /* Make sure atomic/ordered context is released */ + CU_ASSERT(drain_queues() == 0); + CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); } commit 13ec06dcbfb7d26d6b197e8e6f1b058f387e609d Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Apr 26 14:15:22 2019 +0300 validation: scheduler: remove unused define Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index ec2baa8ff..446d03d38 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -11,7 +11,6 @@ #include "odp_cunit_common.h" #include <odp/helper/odph_api.h> -#define MAX_WORKERS_THREADS 32 #define MAX_ORDERED_LOCKS 2 #define MSG_POOL_SIZE (64 * 1024) #define QUEUES_PER_PRIO 16 commit 7d8f6cc52cadb748ef315525edaad26c948b31fe Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Apr 23 14:42:05 2019 +0300 validation: scheduler: fix groups test Scheduler implementation could pre-schedule events to mygrp2 causing the following check to fail. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 7ad6acf48..ec2baa8ff 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -1,4 +1,5 @@ /* Copyright (c) 2014-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -722,6 +723,10 @@ static void scheduler_test_groups(void) CU_ASSERT(rc == 0); CU_ASSERT(odp_thrmask_isset(&testmask, thr_id)); + /* Leave group 2 */ + rc = odp_schedule_group_leave(mygrp2, &mymask); + CU_ASSERT(rc == 0); + /* Now verify scheduler adherence to groups */ odp_pool_param_init(&params); params.buf.size = 100; commit 13910403658b57e2d376d8f30e956223f91dfc1b Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri May 10 15:58:31 2019 +0300 test: scheduling: resume scheduling only after sync barrier Prevents pre-scheduling events to finished threads. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index 9b9981a44..e44e196c3 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -396,12 +396,13 @@ static int test_schedule_single(const char *str, int thr, } } - odp_schedule_resume(); - c2 = odp_cpu_cycles(); cycles = odp_cpu_cycles_diff(c2, c1); odp_barrier_wait(&globals->barrier); + + odp_schedule_resume(); + clear_sched_queues(); cycles = cycles / tot; @@ -469,12 +470,13 @@ static int test_schedule_many(const char *str, int thr, } } - odp_schedule_resume(); - c2 = odp_cpu_cycles(); cycles = odp_cpu_cycles_diff(c2, c1); odp_barrier_wait(&globals->barrier); + + odp_schedule_resume(); + clear_sched_queues(); cycles = cycles / tot; @@ -557,12 +559,13 @@ static int test_schedule_multi(const char *str, int thr, } } - odp_schedule_resume(); - c2 = odp_cpu_cycles(); cycles = odp_cpu_cycles_diff(c2, c1); odp_barrier_wait(&globals->barrier); + + odp_schedule_resume(); + clear_sched_queues(); if (tot) ----------------------------------------------------------------------- Summary of changes: test/performance/odp_scheduling.c | 15 +++-- test/validation/api/scheduler/scheduler.c | 101 +++++++++++++++--------------- 2 files changed, 59 insertions(+), 57 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-73-g7f0d32bbb

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 7f0d32bbbbac6ecd321044cf2e9945bf0a3aba8e (commit) from c4fb7b94edc770c66fd46ba32df586f1a74a3a37 (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 7f0d32bbbbac6ecd321044cf2e9945bf0a3aba8e Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon May 6 16:32:10 2019 +0300 test: sched_latency: resume scheduling only on main thread Prevent pre-scheduling events to terminating threads. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c index b5be1a163..ee5d0f417 100644 --- a/test/performance/odp_sched_latency.c +++ b/test/performance/odp_sched_latency.c @@ -425,11 +425,10 @@ static int test_schedule(int thr, test_globals_t *globals) } } - odp_schedule_resume(); - odp_barrier_wait(&globals->barrier); if (thr == MAIN_THREAD) { + odp_schedule_resume(); clear_sched_queues(globals); print_results(globals); } ----------------------------------------------------------------------- Summary of changes: test/performance/odp_sched_latency.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.21.0.0-72-gc4fb7b94e

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 c4fb7b94edc770c66fd46ba32df586f1a74a3a37 (commit) via 9b88cb5e7f31a9377dcbebfba2e081e2e4f181cd (commit) from 55aa86ea0804385395b16f990956e11660c0d8ab (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 c4fb7b94edc770c66fd46ba32df586f1a74a3a37 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 9 13:22:20 2019 +0300 travis: add out of tree build test Test ODP build also out of tree. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/.travis.yml b/.travis.yml index dec6b25c8..ea26ddedd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -202,6 +202,16 @@ jobs: -e CC="${CC}" -e CONF="--enable-user-guides --disable-abi-compat" ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/distcheck.sh + - stage: test + env: TEST=out_of_tree + compiler: gcc + script: + - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi + - docker run --privileged -i -t + -v `pwd`:/odp --shm-size 8g + -e CC="${CC}" + -e CONF="" + ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/out_of_tree.sh - stage: "build only" env: TEST=documentation compiler: gcc diff --git a/scripts/ci/out_of_tree.sh b/scripts/ci/out_of_tree.sh new file mode 100755 index 000000000..d39f55438 --- /dev/null +++ b/scripts/ci/out_of_tree.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +if [ "${CC#clang}" != "${CC}" ] ; then + export CXX="clang++" +fi + +cd "$(dirname "$0")"/../.. +./bootstrap +mkdir tmp && cd tmp +../configure ${CONF} +make -j $(nproc) + commit 9b88cb5e7f31a9377dcbebfba2e081e2e4f181cd Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 9 12:57:06 2019 +0300 helper: fix out-of-tree build Fix out-of-tree build issue introduced by addition of the new version.h file. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/Makefile.inc b/Makefile.inc index f9c4cae4e..421e11361 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -14,6 +14,7 @@ ODP_INCLUDES += \ endif HELPER_INCLUDES = \ + -I$(top_builddir)/helper/include \ -I$(top_srcdir)/helper/include LIB = $(top_builddir)/lib diff --git a/configure.ac b/configure.ac index 9b20fcc28..4cd00cc5e 100644 --- a/configure.ac +++ b/configure.ac @@ -378,7 +378,8 @@ AC_CONFIG_FILES([include/Makefile include/odp/api/spec/version.h include/odp/api/spec/deprecated.h]) -AC_CONFIG_FILES([helper/include/odp/helper/version.h]) +AC_CONFIG_FILES([helper/Makefile + helper/include/odp/helper/version.h]) ########################################################################## # distribute the changed variables among the Makefiles diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 562bfc6ef..5f6ae0008 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -15,6 +15,5 @@ AC_ARG_ENABLE([helper-linux], [helper_linux=$enableval], [helper_linux=yes]) -AC_CONFIG_FILES([helper/Makefile - helper/libodphelper.pc +AC_CONFIG_FILES([helper/libodphelper.pc helper/test/Makefile]) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 10 ++++++++++ Makefile.inc | 1 + configure.ac | 3 ++- helper/m4/configure.m4 | 3 +-- scripts/ci/out_of_tree.sh | 13 +++++++++++++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100755 scripts/ci/out_of_tree.sh hooks/post-receive --

6 years, 10 months

[COMMIT] branch master updated. v1.21.0.0-70-g55aa86ea0

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 55aa86ea0804385395b16f990956e11660c0d8ab (commit) via d4633c8ab77e6c05ad71b6edb92e13c0b8d9ef16 (commit) via 293f76cb2582c4aef7d246c953c3a9ceb0607e87 (commit) via 069c761cc6bd07a05791b72f88bf94c4c7d2aa83 (commit) via 44962738f4d72ac8c969ed48775f869674f080cb (commit) via c4f4dbcb0c224e65244112c1d918c7e256b2d539 (commit) via bab44af796bbacb6945de590c8dbc1055d45bd5a (commit) via f22c4bf1bf192a2929b3eeae0de889e13feaaeba (commit) via e3f8c24f860f9edf8a5abb6703c3ab93e53a5fcc (commit) via 6a80556e88763be7dbbdf0eda195d68444cbe683 (commit) via a51eaeca2eac68d65ab89a1417b98d0225ebf86a (commit) via 0e1e2f891bd6d68e71a8ca6475dea6a2217a95a4 (commit) via 2e927d35cb368611d2684caee633dbff733cebe5 (commit) from 9dced3ede96b81f883172bad827054bd796c13b4 (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 55aa86ea0804385395b16f990956e11660c0d8ab Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Apr 30 15:18:22 2019 +0300 validation: ipsec: check pktio device level inline support The inline tests would fail if the test interface type didn't support inline IPsec processing. Check pktio level inline IPsec support before running tests. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index f82c561a0..31776bd29 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -1,4 +1,5 @@ /* Copyright (c) 2017-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -149,6 +150,13 @@ int ipsec_check(odp_bool_t ah, ODP_SUPPORT_NO == capa.op_mode_inline_out)) return ODP_TEST_INACTIVE; + /* suite_context.pktio is set to ODP_PKTIO_INVALID in ipsec_suite_init() + * if the pktio device doesn't support inline IPsec processing. */ + if (suite_context.pktio == ODP_PKTIO_INVALID && + (ODP_IPSEC_OP_MODE_INLINE == suite_context.inbound_op_mode || + ODP_IPSEC_OP_MODE_INLINE == suite_context.outbound_op_mode)) + return ODP_TEST_INACTIVE; + if (ah && (ODP_SUPPORT_NO == capa.proto_ah)) return ODP_TEST_INACTIVE; commit d4633c8ab77e6c05ad71b6edb92e13c0b8d9ef16 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 7 14:42:53 2019 +0300 test: scheduling: use new thread helpers Change to use the new thread create and join helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index afe5b73b1..9b9981a44 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -796,7 +796,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) int main(int argc, char *argv[]) { odph_helper_options_t helper_options; - odph_odpthread_t *thread_tbl; + odph_thread_t *thread_tbl; test_args_t args; int num_workers; odp_cpumask_t cpumask; @@ -810,7 +810,8 @@ int main(int argc, char *argv[]) int ret = 0; odp_instance_t instance; odp_init_t init_param; - odph_odpthread_params_t thr_params; + odph_thread_common_param_t thr_common; + odph_thread_param_t thr_param; odp_queue_capability_t capa; odp_pool_capability_t pool_capa; odp_schedule_config_t schedule_config; @@ -857,7 +858,7 @@ int main(int argc, char *argv[]) printf("first CPU: %i\n", odp_cpumask_first(&cpumask)); printf("cpu mask: %s\n", cpumaskstr); - thread_tbl = calloc(sizeof(odph_odpthread_t), num_workers); + thread_tbl = calloc(sizeof(odph_thread_t), num_workers); if (!thread_tbl) { LOG_ERR("no memory for thread_tbl\n"); return -1; @@ -997,15 +998,21 @@ int main(int argc, char *argv[]) globals->first_thr = -1; /* Create and launch worker threads */ - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; - thr_params.start = run_thread; - thr_params.arg = NULL; - odph_odpthreads_create(thread_tbl, &cpumask, &thr_params); + memset(&thr_common, 0, sizeof(thr_common)); + memset(&thr_param, 0, sizeof(thr_param)); + + thr_param.thr_type = ODP_THREAD_WORKER; + thr_param.start = run_thread; + thr_param.arg = NULL; + + thr_common.instance = instance; + thr_common.cpumask = &cpumask; + thr_common.share_param = 1; + + odph_thread_create(thread_tbl, &thr_common, &thr_param, num_workers); /* Wait for worker threads to terminate */ - odph_odpthreads_join(thread_tbl); + odph_thread_join(thread_tbl, num_workers); free(thread_tbl); printf("ODP example complete\n\n"); commit 293f76cb2582c4aef7d246c953c3a9ceb0607e87 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 7 14:36:09 2019 +0300 example: time: use new thread helpers Change to use the new thread create and join helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c index 6c56d6c6e..0c4b5286c 100644 --- a/example/time/time_global_test.c +++ b/example/time/time_global_test.c @@ -255,10 +255,11 @@ int main(int argc, char *argv[]) odp_shm_t shm_log = ODP_SHM_INVALID; int log_size, log_enries_num; odph_helper_options_t helper_options; - odph_odpthread_t thread_tbl[MAX_WORKERS]; + odph_thread_t thread_tbl[MAX_WORKERS]; odp_instance_t instance; odp_init_t init_param; - odph_odpthread_params_t thr_params; + odph_thread_common_param_t thr_common; + odph_thread_param_t thr_param; printf("\nODP global time test starts\n"); @@ -330,17 +331,22 @@ int main(int argc, char *argv[]) goto err; } - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.start = run_thread; - thr_params.arg = gbls; - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; + memset(&thr_common, 0, sizeof(thr_common)); + memset(&thr_param, 0, sizeof(thr_param)); + + thr_param.start = run_thread; + thr_param.arg = gbls; + thr_param.thr_type = ODP_THREAD_WORKER; + + thr_common.instance = instance; + thr_common.cpumask = &cpumask; + thr_common.share_param = 1; /* Create and launch worker threads */ - odph_odpthreads_create(thread_tbl, &cpumask, &thr_params); + odph_thread_create(thread_tbl, &thr_common, &thr_param, num_workers); /* Wait for worker threads to exit */ - odph_odpthreads_join(thread_tbl); + odph_thread_join(thread_tbl, num_workers); print_log(gbls); commit 069c761cc6bd07a05791b72f88bf94c4c7d2aa83 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 7 14:23:13 2019 +0300 example: generator: use new thread helpers Change to use the new thread create and join helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 482927024..313305f01 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -1100,7 +1100,7 @@ static void print_global_stats(int num_workers) int main(int argc, char *argv[]) { odph_helper_options_t helper_options; - odph_odpthread_t thread_tbl[MAX_WORKERS]; + odph_thread_t thread_tbl[MAX_WORKERS]; odp_pool_t pool; int num_workers; unsigned num_rx_queues, num_tx_queues; @@ -1112,7 +1112,8 @@ int main(int argc, char *argv[]) interface_t *ifs; odp_instance_t instance; odp_init_t init_param; - odph_odpthread_params_t thr_params; + odph_thread_common_param_t thr_common; + odph_thread_param_t thr_param; /* Signal handler has to be registered before global init in case ODP * implementation creates internal threads/processes. */ @@ -1253,9 +1254,11 @@ int main(int argc, char *argv[]) memset(thread_tbl, 0, sizeof(thread_tbl)); /* Init threads params */ - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; + memset(&thr_param, 0, sizeof(thr_param)); + thr_param.thr_type = ODP_THREAD_WORKER; + + memset(&thr_common, 0, sizeof(thr_common)); + thr_common.instance = instance; /* num workers + print thread */ odp_barrier_init(&args->barrier, num_workers + 1); @@ -1275,17 +1278,17 @@ int main(int argc, char *argv[]) thr_args->pool = pool; thr_args->mode = args->appl.mode; - memset(&thr_params, 0, sizeof(thr_params)); if (args->appl.sched) - thr_params.start = gen_recv_thread; + thr_param.start = gen_recv_thread; else - thr_params.start = gen_recv_direct_thread; - thr_params.arg = thr_args; - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; + thr_param.start = gen_recv_direct_thread; + + thr_param.arg = thr_args; - odph_odpthreads_create(&thread_tbl[PING_THR_RX], - &cpu_mask, &thr_params); + thr_common.cpumask = &cpu_mask; + + odph_thread_create(&thread_tbl[PING_THR_RX], &thr_common, + &thr_param, 1); thr_args = &args->thread[PING_THR_TX]; thr_args->tx.pktout = ifs[0].pktout[0]; @@ -1296,11 +1299,11 @@ int main(int argc, char *argv[]) odp_cpumask_zero(&cpu_mask); odp_cpumask_set(&cpu_mask, cpu_next); - thr_params.start = gen_send_thread; - thr_params.arg = thr_args; + thr_param.start = gen_send_thread; + thr_param.arg = thr_args; - odph_odpthreads_create(&thread_tbl[PING_THR_TX], - &cpu_mask, &thr_params); + odph_thread_create(&thread_tbl[PING_THR_TX], &thr_common, + &thr_param, 1); } else { int cpu = odp_cpumask_first(&cpumask); @@ -1381,11 +1384,13 @@ int main(int argc, char *argv[]) odp_cpumask_zero(&thd_mask); odp_cpumask_set(&thd_mask, cpu); - thr_params.start = thr_run_func; - thr_params.arg = &args->thread[i]; + thr_param.start = thr_run_func; + thr_param.arg = &args->thread[i]; + + thr_common.cpumask = &thd_mask; - odph_odpthreads_create(&thread_tbl[i], - &thd_mask, &thr_params); + odph_thread_create(&thread_tbl[i], &thr_common, + &thr_param, 1); cpu = odp_cpumask_next(&cpumask, cpu); } } @@ -1393,8 +1398,7 @@ int main(int argc, char *argv[]) print_global_stats(num_workers); /* Master thread waits for other threads to exit */ - for (i = 0; i < num_workers; ++i) - odph_odpthreads_join(&thread_tbl[i]); + odph_thread_join(thread_tbl, num_workers); for (i = 0; i < args->appl.if_count; ++i) odp_pktio_stop(ifs[i].pktio); commit 44962738f4d72ac8c969ed48775f869674f080cb Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Tue May 7 14:01:19 2019 +0300 example: classifier: use new thread helpers Change to use the new thread create and join helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 274ffaf41..a6c959a7f 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -469,7 +469,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) int main(int argc, char *argv[]) { odph_helper_options_t helper_options; - odph_odpthread_t thread_tbl[MAX_WORKERS]; + odph_thread_t thread_tbl[MAX_WORKERS]; odp_pool_t pool; int num_workers; int i; @@ -483,7 +483,8 @@ int main(int argc, char *argv[]) int ret; odp_instance_t instance; odp_init_t init_param; - odph_odpthread_params_t thr_params; + odph_thread_common_param_t thr_common; + odph_thread_param_t thr_param; /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); @@ -577,19 +578,24 @@ int main(int argc, char *argv[]) /* Create and init worker threads */ memset(thread_tbl, 0, sizeof(thread_tbl)); + memset(&thr_common, 0, sizeof(thr_common)); + memset(&thr_param, 0, sizeof(thr_param)); - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.start = pktio_receive_thread; - thr_params.arg = args; - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; - odph_odpthreads_create(thread_tbl, &cpumask, &thr_params); + thr_param.start = pktio_receive_thread; + thr_param.arg = args; + thr_param.thr_type = ODP_THREAD_WORKER; + + thr_common.instance = instance; + thr_common.cpumask = &cpumask; + thr_common.share_param = 1; + + odph_thread_create(thread_tbl, &thr_common, &thr_param, num_workers); print_cls_statistics(args); odp_pktio_stop(pktio); args->shutdown = 1; - odph_odpthreads_join(thread_tbl); + odph_thread_join(thread_tbl, num_workers); for (i = 0; i < args->policy_count; i++) { if ((i != args->policy_count - 1) && commit c4f4dbcb0c224e65244112c1d918c7e256b2d539 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 6 17:07:43 2019 +0300 example: simple_pipeline: use new thread helpers Change to use the new thread create and join helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/simple_pipeline/odp_simple_pipeline.c b/example/simple_pipeline/odp_simple_pipeline.c index a8a548e65..9beb8a78d 100644 --- a/example/simple_pipeline/odp_simple_pipeline.c +++ b/example/simple_pipeline/odp_simple_pipeline.c @@ -690,15 +690,14 @@ int main(int argc, char **argv) odp_queue_param_t queue_param; odp_shm_t shm; odph_helper_options_t helper_options; - odph_odpthread_t thr_tbl[ODP_THREAD_COUNT_MAX]; + odph_thread_t thr_tbl[ODP_THREAD_COUNT_MAX]; + odph_thread_param_t thr_param[ODP_THREAD_COUNT_MAX]; + odph_thread_common_param_t thr_common; odph_ethaddr_t new_addr; - odph_odpthread_params_t thr_params; stats_t *stats[ODP_THREAD_COUNT_MAX]; thread_args_t *thr_args; uint32_t pkt_len, seg_len, pkt_num; - int qid; - int cpu; - int num_threads; + int num_threads, num_workers; int i; int ret; @@ -746,6 +745,7 @@ int main(int argc, char **argv) num_threads = setup_thread_masks(&thr_mask_rx, &thr_mask_tx, &thr_mask_worker, global->appl.num_workers); + num_workers = num_threads - 2; /* Print both system and application information */ print_info(NO_PATH(argv[0]), &global->appl); @@ -852,43 +852,46 @@ int main(int argc, char **argv) stats[i] = &global->thread[i].stats; memset(thr_tbl, 0, sizeof(thr_tbl)); - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; + memset(thr_param, 0, sizeof(thr_param)); + memset(&thr_common, 0, sizeof(thr_common)); + + thr_common.instance = instance; /* RX thread */ thr_args = &global->thread[0]; thr_args->tx_queue = global->queue[0]; - thr_params.start = rx_thread; - thr_params.arg = thr_args; - odph_odpthreads_create(&thr_tbl[0], &thr_mask_rx, &thr_params); + thr_param[0].start = rx_thread; + thr_param[0].arg = thr_args; + thr_param[0].thr_type = ODP_THREAD_WORKER; + thr_common.cpumask = &thr_mask_rx; + odph_thread_create(thr_tbl, &thr_common, thr_param, 1); /* Worker threads */ - cpu = odp_cpumask_first(&thr_mask_worker); - for (i = 1, qid = 0; i < (num_threads - 1); i++, qid++) { - odp_cpumask_t thr_mask; - - thr_args = &global->thread[i]; - thr_args->rx_queue = global->queue[qid]; - thr_args->tx_queue = global->queue[qid + 1]; + for (i = 0; i < num_workers; i++) { + thr_args = &global->thread[i + 1]; + thr_args->rx_queue = global->queue[i]; + thr_args->tx_queue = global->queue[i + 1]; - thr_params.start = worker_thread; - thr_params.arg = &global->thread[i]; + thr_param[i].start = worker_thread; + thr_param[i].arg = thr_args; + thr_param[i].thr_type = ODP_THREAD_WORKER; + } - odp_cpumask_zero(&thr_mask); - odp_cpumask_set(&thr_mask, cpu); - odph_odpthreads_create(&thr_tbl[i], &thr_mask, - &thr_params); - cpu = odp_cpumask_next(&thr_mask_worker, cpu); + if (num_workers) { + thr_common.cpumask = &thr_mask_worker; + odph_thread_create(&thr_tbl[1], &thr_common, thr_param, + num_workers); } /* TX thread */ thr_args = &global->thread[num_threads - 1]; - thr_args->rx_queue = global->queue[global->appl.num_workers]; - thr_params.start = tx_thread; - thr_params.arg = thr_args; - odph_odpthreads_create(&thr_tbl[num_threads - 1], &thr_mask_tx, - &thr_params); + thr_args->rx_queue = global->queue[num_workers]; + thr_param[0].start = tx_thread; + thr_param[0].arg = thr_args; + thr_param[0].thr_type = ODP_THREAD_WORKER; + thr_common.cpumask = &thr_mask_tx; + odph_thread_create(&thr_tbl[num_threads - 1], &thr_common, thr_param, + 1); ret = print_speed_stats(num_threads, stats, global->appl.time, global->appl.accuracy); @@ -905,8 +908,7 @@ int main(int argc, char **argv) global->exit_threads = 1; odp_barrier_wait(&global->term_barrier); - for (i = 0; i < num_threads; i++) - odph_odpthreads_join(&thr_tbl[i]); + odph_thread_join(thr_tbl, num_threads); if (odp_pktio_close(global->if0)) { printf("Error: failed to close interface %s\n", argv[1]); commit bab44af796bbacb6945de590c8dbc1055d45bd5a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 6 16:34:00 2019 +0300 example: l2fwd_simple: use new thread helpers Change to use the new thread create and join helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index fab00e7e7..7bfa73b75 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -143,10 +143,11 @@ int main(int argc, char **argv) odp_pool_t pool; odp_pool_param_t params; odp_cpumask_t cpumask; - odph_odpthread_t thd[MAX_WORKERS]; + odph_thread_t thd[MAX_WORKERS]; odp_instance_t instance; odp_init_t init_param; - odph_odpthread_params_t thr_params; + odph_thread_common_param_t thr_common; + odph_thread_param_t thr_param; odph_ethaddr_t correct_src; uint32_t mtu1, mtu2; odp_shm_t shm; @@ -243,16 +244,28 @@ int main(int argc, char **argv) odp_cpumask_default_worker(&cpumask, MAX_WORKERS); - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.start = run_worker; - thr_params.arg = NULL; - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; + memset(&thr_common, 0, sizeof(thr_common)); + memset(&thr_param, 0, sizeof(thr_param)); + + thr_param.start = run_worker; + thr_param.thr_type = ODP_THREAD_WORKER; + + thr_common.instance = instance; + thr_common.cpumask = &cpumask; + thr_common.share_param = 1; signal(SIGINT, sig_handler); - odph_odpthreads_create(thd, &cpumask, &thr_params); - odph_odpthreads_join(thd); + if (odph_thread_create(thd, &thr_common, &thr_param, MAX_WORKERS) != + MAX_WORKERS) { + printf("Error: failed to create threads\n"); + exit(EXIT_FAILURE); + } + + if (odph_thread_join(thd, MAX_WORKERS) != MAX_WORKERS) { + printf("Error: failed to join threads\n"); + exit(EXIT_FAILURE); + } if (odp_pktio_stop(global->if0) || odp_pktio_close(global->if0)) { printf("Error: failed to close interface %s\n", argv[1]); commit f22c4bf1bf192a2929b3eeae0de889e13feaaeba Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 6 15:51:26 2019 +0300 validation: common: use new thread helpers Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index 7f345fba3..eceff6537 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -29,7 +29,7 @@ /* Globals */ static int allow_skip_result; -static odph_odpthread_t thread_tbl[MAX_WORKERS]; +static odph_thread_t thread_tbl[MAX_WORKERS]; static odp_instance_t instance; static char *progname; @@ -50,27 +50,41 @@ static odp_suiteinfo_t *global_testsuites; int odp_cunit_thread_create(int func_ptr(void *), pthrd_arg *arg) { odp_cpumask_t cpumask; - odph_odpthread_params_t thr_params; + odph_thread_common_param_t thr_common; + int ret; + int num = arg->numthrds; + odph_thread_param_t thr_param; + + memset(&thr_common, 0, sizeof(thr_common)); + memset(&thr_param, 0, sizeof(thr_param)); + + thr_param.start = func_ptr; + thr_param.arg = arg; + thr_param.thr_type = ODP_THREAD_WORKER; + + odp_cpumask_default_worker(&cpumask, num); - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.start = func_ptr; - thr_params.arg = arg; - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; + thr_common.instance = instance; + thr_common.cpumask = &cpumask; + thr_common.share_param = 1; - /* Create and init additional threads */ - odp_cpumask_default_worker(&cpumask, arg->numthrds); + /* Create and start additional threads */ + ret = odph_thread_create(thread_tbl, &thr_common, &thr_param, num); - return odph_odpthreads_create(thread_tbl, &cpumask, &thr_params); + if (ret != num) + fprintf(stderr, "error: odph_thread_create() failed.\n"); + + return ret; } /** exit from test thread */ int odp_cunit_thread_exit(pthrd_arg *arg) { + int num = arg->numthrds; + /* Wait for other threads to exit */ - if (odph_odpthreads_join(thread_tbl) != arg->numthrds) { - fprintf(stderr, - "error: odph_odpthreads_join() failed.\n"); + if (odph_thread_join(thread_tbl, num) != num) { + fprintf(stderr, "error: odph_thread_join() failed.\n"); return -1; } commit e3f8c24f860f9edf8a5abb6703c3ab93e53a5fcc Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri May 3 16:20:10 2019 +0300 test: l2fwd: use new thread helpers Change to use the new thread create and join helpers. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 15a0cb0e4..89c979324 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -1426,11 +1426,12 @@ static void create_groups(int num, odp_schedule_group_t *group) int main(int argc, char *argv[]) { odph_helper_options_t helper_options; - odph_odpthread_t thread_tbl[MAX_WORKERS]; + odph_thread_t thread_tbl[MAX_WORKERS]; + odph_thread_param_t thr_param[MAX_WORKERS]; + odph_thread_common_param_t thr_common; odp_pool_t pool; int i; - int cpu; - int num_workers; + int num_workers, num_thr; odp_shm_t shm; odp_cpumask_t cpumask; char cpumaskstr[ODP_CPUMASK_STR_SIZE]; @@ -1637,8 +1638,6 @@ int main(int argc, char *argv[]) if (!gbl_args->appl.sched_mode) print_port_mapping(); - memset(thread_tbl, 0, sizeof(thread_tbl)); - odp_barrier_init(&gbl_args->init_barrier, num_workers + 1); odp_barrier_init(&gbl_args->term_barrier, num_workers + 1); @@ -1650,28 +1649,34 @@ int main(int argc, char *argv[]) thr_run_func = run_worker_sched_mode; /* Create worker threads */ - cpu = odp_cpumask_first(&cpumask); - for (i = 0; i < num_workers; ++i) { - odp_cpumask_t thd_mask; - odph_odpthread_params_t thr_params; + memset(thread_tbl, 0, sizeof(thread_tbl)); + memset(thr_param, 0, sizeof(thr_param)); + memset(&thr_common, 0, sizeof(thr_common)); + + thr_common.instance = instance; + thr_common.cpumask = &cpumask; + /* Synchronize thread start up. Test runs are more repeatable when + * thread / thread ID / CPU ID mapping stays constant. */ + thr_common.sync = 1; - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.start = thr_run_func; - thr_params.arg = &gbl_args->thread[i]; - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; + for (i = 0; i < num_workers; ++i) { + thr_param[i].start = thr_run_func; + thr_param[i].arg = &gbl_args->thread[i]; + thr_param[i].thr_type = ODP_THREAD_WORKER; /* Round robin threads to groups */ gbl_args->thread[i].num_groups = 1; gbl_args->thread[i].group[0] = group[i % num_groups]; stats[i] = &gbl_args->thread[i].stats; + } + + num_thr = odph_thread_create(thread_tbl, &thr_common, thr_param, + num_workers); - odp_cpumask_zero(&thd_mask); - odp_cpumask_set(&thd_mask, cpu); - odph_odpthreads_create(&thread_tbl[i], &thd_mask, - &thr_params); - cpu = odp_cpumask_next(&cpumask, cpu); + if (num_thr != num_workers) { + LOG_ERR("Error: worker create failed %i\n", num_thr); + exit(EXIT_FAILURE); } /* Start packet receive and transmit */ @@ -1703,8 +1708,11 @@ int main(int argc, char *argv[]) odp_barrier_wait(&gbl_args->term_barrier); /* Master thread waits for other threads to exit */ - for (i = 0; i < num_workers; ++i) - odph_odpthreads_join(&thread_tbl[i]); + num_thr = odph_thread_join(thread_tbl, num_workers); + if (num_thr != num_workers) { + LOG_ERR("Error: worker join failed %i\n", num_thr); + exit(EXIT_FAILURE); + } for (i = 0; i < if_count; ++i) { if (odp_pktio_close(gbl_args->pktios[i].pktio)) { commit 6a80556e88763be7dbbdf0eda195d68444cbe683 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon May 6 15:53:32 2019 +0300 helper: increment library version to 1.0.1 Increment version number to reflect addition of the new thread create and join functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/configure.ac b/configure.ac index fa8dcce79..9b20fcc28 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_SUBST(ODP_VERSION_API_MINOR) ########################################################################## m4_define([odph_version_generation], [1]) m4_define([odph_version_major], [0]) -m4_define([odph_version_minor], [0]) +m4_define([odph_version_minor], [1]) m4_define([odph_version], [odph_version_generation.odph_version_major.odph_version_minor]) commit a51eaeca2eac68d65ab89a1417b98d0225ebf86a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri May 3 15:18:44 2019 +0300 helper: thread: implement new thread create and join Implemented new thread create and join functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h index 5a2a21157..34f539f1a 100644 --- a/helper/include/odp/helper/threads.h +++ b/helper/include/odp/helper/threads.h @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -70,17 +71,34 @@ typedef struct { } odph_thread_param_t; -/** The odpthread starting arguments, used both in process or thread mode */ +/** Helper internal thread start arguments. Used both in process and thread + * mode */ typedef struct { - odp_mem_model_t mem_model; /**< process or thread */ - odph_thread_param_t thr_params; /**< odpthread start parameters */ -} odph_odpthread_start_args_t; + /** Atomic variable to sync status */ + odp_atomic_u32_t status; -/** Linux odpthread state information, used both in process or thread mode */ + /** Process or thread */ + odp_mem_model_t mem_model; + + /** ODP instance handle */ + odp_instance_t instance; + + /** Thread parameters */ + odph_thread_param_t thr_params; + +} odph_thread_start_args_t; + +/** Thread state information. Used both in process and thread mode */ typedef struct { - odph_odpthread_start_args_t start_args; /**< start arguments */ - int cpu; /**< CPU ID */ - int last; /**< true if last table entry */ + /** Start arguments */ + odph_thread_start_args_t start_args; + + /** CPU ID */ + int cpu; + + /** 1: last table entry */ + uint8_t last; + /** Variant field mappings for thread/process modes */ union { /** For thread implementation */ @@ -88,12 +106,14 @@ typedef struct { pthread_t thread_id; /**< Pthread ID */ pthread_attr_t attr; /**< Pthread attributes */ } thread; + /** For process implementation */ struct { pid_t pid; /**< Process ID */ int status; /**< Process state chge status*/ } proc; }; + } odph_thread_t; /** Linux helper options */ diff --git a/helper/threads.c b/helper/threads.c index 01bc33eac..e30c9f29d 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -23,24 +24,32 @@ #define FAILED_CPU -1 +/* Thread status codes */ +#define NOT_STARTED 0 +#define SYNC_INIT 1 +#define INIT_DONE 2 +#define STARTED 3 + static odph_helper_options_t helper_options; /* - * wrapper for odpthreads, either implemented as linux threads or processes. - * (in process mode, if start_routine returns NULL, the process return FAILURE). + * Run a thread, either as Linux pthread or process. + * In process mode, if start_routine returns NULL, the process return FAILURE. */ -static void *_odph_thread_run_start_routine(void *arg) +static void *run_thread(void *arg) { int status; int ret; + odp_instance_t instance; odph_odpthread_params_t *thr_params; - odph_odpthread_start_args_t *start_args = arg; + odph_thread_start_args_t *start_args = arg; thr_params = &start_args->thr_params; + instance = start_args->instance; /* ODP thread local init */ - if (odp_init_local(thr_params->instance, thr_params->thr_type)) { + if (odp_init_local(instance, thr_params->thr_type)) { ODPH_ERR("Local init failed\n"); if (start_args->mem_model == ODP_MEM_MODEL_PROCESS) _exit(EXIT_FAILURE); @@ -54,6 +63,9 @@ static void *_odph_thread_run_start_routine(void *arg) "pthread" : "process", (int)getpid()); + if (odp_atomic_load_u32(&start_args->status) == SYNC_INIT) + odp_atomic_store_rel_u32(&start_args->status, INIT_DONE); + status = thr_params->start(thr_params->arg); ret = odp_term_local(); @@ -69,11 +81,9 @@ static void *_odph_thread_run_start_routine(void *arg) } /* - * Create a single ODPthread as a linux process + * Create a single linux process */ -static int _odph_linux_process_create(odph_odpthread_t *thread_tbl, - int cpu, - const odph_odpthread_params_t *thr_params) +static int create_process(odph_thread_t *thread, int cpu) { cpu_set_t cpu_set; pid_t pid; @@ -81,20 +91,19 @@ static int _odph_linux_process_create(odph_odpthread_t *thread_tbl, CPU_ZERO(&cpu_set); CPU_SET(cpu, &cpu_set); - thread_tbl->start_args.thr_params = *thr_params; /* copy */ - thread_tbl->start_args.mem_model = ODP_MEM_MODEL_PROCESS; - thread_tbl->cpu = cpu; + thread->start_args.mem_model = ODP_MEM_MODEL_PROCESS; + thread->cpu = cpu; pid = fork(); if (pid < 0) { ODPH_ERR("fork() failed\n"); - thread_tbl->cpu = FAILED_CPU; + thread->cpu = FAILED_CPU; return -1; } /* Parent continues to fork */ if (pid > 0) { - thread_tbl->proc.pid = pid; + thread->proc.pid = pid; return 0; } @@ -111,17 +120,49 @@ static int _odph_linux_process_create(odph_odpthread_t *thread_tbl, return -2; } - _odph_thread_run_start_routine(&thread_tbl->start_args); + run_thread(&thread->start_args); return 0; /* never reached */ } /* - * Create a single ODPthread as a linux thread + * Wait single process to exit */ -static int odph_linux_thread_create(odph_odpthread_t *thread_tbl, - int cpu, - const odph_odpthread_params_t *thr_params) +static int wait_process(odph_thread_t *thread) +{ + pid_t pid; + int status = 0; + + pid = waitpid(thread->proc.pid, &status, 0); + + if (pid < 0) { + ODPH_ERR("waitpid() failed\n"); + return -1; + } + + /* Examine the child process' termination status */ + if (WIFEXITED(status) && + WEXITSTATUS(status) != EXIT_SUCCESS) { + ODPH_ERR("Child exit status:%d (pid:%d)\n", + WEXITSTATUS(status), (int)pid); + return -1; + } + + if (WIFSIGNALED(status)) { + int signo = WTERMSIG(status); + + ODPH_ERR("Child term signo:%d - %s (pid:%d)\n", + signo, strsignal(signo), (int)pid); + return -1; + } + + return 0; +} + +/* + * Create a single linux pthread + */ +static int create_pthread(odph_thread_t *thread, int cpu) { int ret; cpu_set_t cpu_set; @@ -129,29 +170,177 @@ static int odph_linux_thread_create(odph_odpthread_t *thread_tbl, CPU_ZERO(&cpu_set); CPU_SET(cpu, &cpu_set); - pthread_attr_init(&thread_tbl->thread.attr); + pthread_attr_init(&thread->thread.attr); - thread_tbl->cpu = cpu; + thread->cpu = cpu; - pthread_attr_setaffinity_np(&thread_tbl->thread.attr, + pthread_attr_setaffinity_np(&thread->thread.attr, sizeof(cpu_set_t), &cpu_set); - thread_tbl->start_args.thr_params = *thr_params; /* copy */ - thread_tbl->start_args.mem_model = ODP_MEM_MODEL_THREAD; + thread->start_args.mem_model = ODP_MEM_MODEL_THREAD; - ret = pthread_create(&thread_tbl->thread.thread_id, - &thread_tbl->thread.attr, - _odph_thread_run_start_routine, - &thread_tbl->start_args); + ret = pthread_create(&thread->thread.thread_id, + &thread->thread.attr, + run_thread, + &thread->start_args); if (ret != 0) { ODPH_ERR("Failed to start thread on cpu #%d\n", cpu); - thread_tbl->cpu = FAILED_CPU; + thread->cpu = FAILED_CPU; return ret; } return 0; } +/* + * Wait single pthread to exit + */ +static int wait_pthread(odph_thread_t *thread) +{ + int ret; + void *thread_ret = NULL; + + /* Wait thread to exit */ + ret = pthread_join(thread->thread.thread_id, &thread_ret); + + if (ret) { + ODPH_ERR("pthread_join failed (%i) from cpu #%i\n", + ret, thread->cpu); + return -1; + } + + if (thread_ret) { + ODPH_ERR("Bad exit status cpu #%i %p\n", + thread->cpu, thread_ret); + return -1; + } + + ret = pthread_attr_destroy(&thread->thread.attr); + + if (ret) { + ODPH_ERR("pthread_attr_destroy failed (%i) from cpu #%i\n", + ret, thread->cpu); + return -1; + } + + return 0; +} + +int odph_thread_create(odph_thread_t thread[], + const odph_thread_common_param_t *param, + const odph_thread_param_t thr_param[], + int num) +{ + int i, num_cpu, cpu; + const odp_cpumask_t *cpumask = param->cpumask; + int use_pthread = 1; + + if (param->thread_model == 1) + use_pthread = 0; + + if (helper_options.mem_model == ODP_MEM_MODEL_PROCESS) + use_pthread = 0; + + if (num < 1) { + ODPH_ERR("Bad number of threads (%i)\n", num); + return -1; + } + + num_cpu = odp_cpumask_count(cpumask); + + if (num_cpu != num) { + ODPH_ERR("Number of threads (%i) and CPUs (%i) does not match" + "\n", num, num_cpu); + return -1; + } + + memset(thread, 0, num * sizeof(odph_thread_t)); + + cpu = odp_cpumask_first(cpumask); + for (i = 0; i < num; i++) { + odph_thread_start_args_t *start_args = &thread[i].start_args; + + /* Copy thread parameters */ + if (param->share_param) + start_args->thr_params = thr_param[0]; + else + start_args->thr_params = thr_param[i]; + + start_args->instance = param->instance; + + if (param->sync) + odp_atomic_init_u32(&start_args->status, SYNC_INIT); + else + odp_atomic_init_u32(&start_args->status, NOT_STARTED); + + if (use_pthread) { + if (create_pthread(&thread[i], cpu)) + break; + } else { + if (create_process(&thread[i], cpu)) + break; + } + + /* Wait newly created thread to update status */ + if (param->sync) { + odp_time_t t1, t2; + uint64_t diff_ns; + uint32_t status; + int timeout = 0; + odp_atomic_u32_t *atomic = &start_args->status; + + t1 = odp_time_local(); + + do { + odp_cpu_pause(); + t2 = odp_time_local(); + diff_ns = odp_time_diff_ns(t2, t1); + timeout = diff_ns > ODP_TIME_SEC_IN_NS; + status = odp_atomic_load_acq_u32(atomic); + + } while (status != INIT_DONE && timeout == 0); + + if (timeout) { + ODPH_ERR("Thread (i:%i) start up timeout\n", i); + break; + } + } + + odp_atomic_store_u32(&start_args->status, STARTED); + + cpu = odp_cpumask_next(cpumask, cpu); + } + + return i; +} + +int odph_thread_join(odph_thread_t thread[], int num) +{ + odph_thread_start_args_t *start_args; + int i; + + for (i = 0; i < num; i++) { + start_args = &thread[i].start_args; + + if (odp_atomic_load_u32(&start_args->status) != STARTED) { + ODPH_DBG("Thread (i:%i) not started.\n", i); + break; + } + + if (thread[i].start_args.mem_model == ODP_MEM_MODEL_THREAD) { + if (wait_pthread(&thread[i])) + break; + } else { + if (wait_process(&thread[i])) + break; + } + + odp_atomic_store_u32(&start_args->status, NOT_STARTED); + } + + return i; +} + /* * create an odpthread set (as linux processes or linux threads or both) */ @@ -179,15 +368,19 @@ int odph_odpthreads_create(odph_odpthread_t *thread_tbl, cpu = odp_cpumask_first(mask); for (i = 0; i < num; i++) { + odph_thread_start_args_t *start_args; + + start_args = &thread_tbl[i].start_args; + + /* Copy thread parameters */ + start_args->thr_params = *thr_params; + start_args->instance = thr_params->instance; + if (helper_options.mem_model == ODP_MEM_MODEL_THREAD) { - if (odph_linux_thread_create(&thread_tbl[i], - cpu, - thr_params)) + if (create_pthread(&thread_tbl[i], cpu)) break; } else { - if (_odph_linux_process_create(&thread_tbl[i], - cpu, - thr_params)) + if (create_process(&thread_tbl[i], cpu)) break; } commit 0e1e2f891bd6d68e71a8ca6475dea6a2217a95a4 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 2 15:47:38 2019 +0300 helper: thread: new thread create and join calls Defined new versions of thread create and join calls. New calls explicitly support thread create and join in multiple steps. Also per thread and common parameters are improved. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h index 6cee2522d..5a2a21157 100644 --- a/helper/include/odp/helper/threads.h +++ b/helper/include/odp/helper/threads.h @@ -54,18 +54,26 @@ typedef struct { int status; /**< Process state change status */ } odph_linux_process_t; -/** odpthread parameters for odp threads (pthreads and processes) */ +/** Thread parameters (pthreads and processes) */ typedef struct { - int (*start)(void *); /**< Thread entry point function */ - void *arg; /**< Argument for the function */ - odp_thread_type_t thr_type; /**< ODP thread type */ - odp_instance_t instance; /**< ODP instance handle */ -} odph_odpthread_params_t; + /** Thread entry point function */ + int (*start)(void *arg); + + /** Argument for the function */ + void *arg; + + /** ODP thread type */ + odp_thread_type_t thr_type; + + /** @deprecated ODP instance handle for odph_odpthreads_create(). */ + odp_instance_t instance; + +} odph_thread_param_t; /** The odpthread starting arguments, used both in process or thread mode */ typedef struct { odp_mem_model_t mem_model; /**< process or thread */ - odph_odpthread_params_t thr_params; /**< odpthread start parameters */ + odph_thread_param_t thr_params; /**< odpthread start parameters */ } odph_odpthread_start_args_t; /** Linux odpthread state information, used both in process or thread mode */ @@ -86,13 +94,130 @@ typedef struct { int status; /**< Process state chge status*/ } proc; }; -} odph_odpthread_t; +} odph_thread_t; /** Linux helper options */ typedef struct { odp_mem_model_t mem_model; /**< Process or thread */ } odph_helper_options_t; +/** Legacy thread table entry */ +typedef odph_thread_t odph_odpthread_t; + +/** Legacy thread parameters */ +typedef odph_thread_param_t odph_odpthread_params_t; + +/** Common parameters for odph_thread_create() call */ +typedef struct { + /** + * ODP instance handle + * + * This is used for all threads, instead of 'instance' field of per + * thread parameters (odph_thread_param_t). + */ + odp_instance_t instance; + + /** + * CPU mask for thread pinning + */ + const odp_cpumask_t *cpumask; + + /** + * Select between Linux pthreads and processes + * + * 0: Use pthreads + * 1: Use processes + * + * Default value is 0. + */ + int thread_model; + + /** + * Synchronized thread creation + * + * 0: Don't synchronize thread creation + * 1: Create threads in series so that the next thread is created + * only after the previous thread have signaled that it has passed + * ODP local initialization. + * + * Default value is 0. + */ + int sync; + + /** + * Thread parameter sharing + * + * 0: Thread parameters are not shared. The thread parameter table + * contains 'num' elements. + * 1: The thread parameter table contains a single element, which is + * used for creating all 'num' threads. + * + * Default value is 0. + */ + int share_param; + +} odph_thread_common_param_t; + +/** + * Create and pin threads (as Linux pthreads or processes) + * + * This is an updated version of odph_odpthreads_create() call. It may be called + * multiple times to create threads in steps. Each call launches 'num' threads + * and pins those to separate CPUs based on the cpumask. Use 'thread_model' + * parameter to select if Linux pthreads or processes are used. This selection + * may be overridden with ODP helper options. See e.g. --odph_proc under + * odph_options() documentation. + * + * Thread creation may be synchronized by setting 'sync' parameter. It + * serializes thread start up (odp_init_local() calls), which helps to + * stabilize application start up sequence. + * + * By default, the thread parameter table contains 'num' elements, one for + * each thread to be created. However, all threads may be created + * with a single thread parameter table element by setting 'share_param' + * parameter. + * + * Thread table must be large enough to hold 'num' elements. Also the cpumask + * must contain 'num' CPUs. Threads are pinned to CPUs in order - the first + * thread goes to the smallest CPU number of the mask, etc. + * + * Launched threads may be waited for exit with odph_thread_join(), or with + * direct Linux system calls. + * + * @param[out] thread Thread table for output + * @param param Common parameters for all threads to be created + * @param thr_param Table of thread parameters + * @param num Number of threads to create + * + * @return Number of threads created + * @retval -1 On failure + * + * @see odph_thread_join() + */ +int odph_thread_create(odph_thread_t thread[], + const odph_thread_common_param_t *param, + const odph_thread_param_t thr_param[], + int num); + +/** + * Wait previously launched threads to exit + * + * This is an updated version of odph_odpthreads_join() call. It waits for + * threads launched with odph_thread_create() to exit. Threads may be waited to + * exit in a different order than those were created. A function call may be + * used to wait any number of launched threads to exit. A particular thread + * may be waited only once. + * + * @param thread Table of threads to exit + * @param num Number of threads to exit + * + * @return Number of threads exited + * @retval -1 On failure + * + * @see odph_thread_create() + */ +int odph_thread_join(odph_thread_t thread[], int num); + /** * Creates and launches odpthreads (as linux threads or processes) * @@ -103,6 +228,8 @@ typedef struct { * @param thr_params ODP thread parameters * * @return Number of threads created + * + * @deprecated Use odph_thread_create() instead. */ int odph_odpthreads_create(odph_odpthread_t *thread_tbl, const odp_cpumask_t *mask, @@ -118,6 +245,7 @@ int odph_odpthreads_create(odph_odpthread_t *thread_tbl, * (error occurs if any of the start_routine return non-zero or if * the thread join/process wait itself failed -e.g. as the result of a kill) * + * @deprecated Use odph_thread_join() instead. */ int odph_odpthreads_join(odph_odpthread_t *thread_tbl); @@ -150,6 +278,14 @@ int odph_odpthread_getaffinity(void); * the helper itself. When helper options are found, those are removed from * argv[] and remaining options are packed to the beginning of the array. * + * <table> <caption> Currently supported options </caption> + * + * <tr><th>Command line <th>Environment variable <th>Description + * <tr><td>--odph_proc <td>ODPH_PROC_MODE <td>When defined, threads are + * Linux processes. Otherwise, + * pthreads are used instead. + * </table> + * * @param argc Argument count * @param argv Argument vector * commit 2e927d35cb368611d2684caee633dbff733cebe5 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu May 2 11:26:34 2019 +0300 helper: add helper version defines Added helper library version defines, so that application can track helper version independent of ODP API version. Added also function for easy print out of the versions number. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/configure.ac b/configure.ac index 29ffef29e..fa8dcce79 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.5]) ########################################################################## -# Set correct API version +# ODP API version ########################################################################## m4_define([odpapi_generation_version], [1]) m4_define([odpapi_major_version], [21]) @@ -16,6 +16,24 @@ 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) + +########################################################################## +# Helper library version +########################################################################## +m4_define([odph_version_generation], [1]) +m4_define([odph_version_major], [0]) +m4_define([odph_version_minor], [0]) + +m4_define([odph_version], + [odph_version_generation.odph_version_major.odph_version_minor]) + +ODPH_VERSION_GENERATION=odph_version_generation +AC_SUBST(ODPH_VERSION_GENERATION) +ODPH_VERSION_MAJOR=odph_version_major +AC_SUBST(ODPH_VERSION_MAJOR) +ODPH_VERSION_MINOR=odph_version_minor +AC_SUBST(ODPH_VERSION_MINOR) + AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc -Wall -Werror]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) AM_CONFIG_HEADER([include/config.h]) @@ -360,6 +378,7 @@ AC_CONFIG_FILES([include/Makefile include/odp/api/spec/version.h include/odp/api/spec/deprecated.h]) +AC_CONFIG_FILES([helper/include/odp/helper/version.h]) ########################################################################## # distribute the changed variables among the Makefiles diff --git a/helper/Makefile.am b/helper/Makefile.am index 518a6a944..a7d5132df 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -27,7 +27,8 @@ helperinclude_HEADERS = \ include/odp/helper/tcp.h\ include/odp/helper/table.h\ include/odp/helper/threads.h \ - include/odp/helper/udp.h + include/odp/helper/udp.h \ + include/odp/helper/version.h if helper_linux helperinclude_HEADERS += \ @@ -51,7 +52,8 @@ __LIB__libodphelper_la_SOURCES = \ lineartable.c \ cuckootable.c \ iplookuptable.c \ - threads.c + threads.c \ + version.c if helper_linux __LIB__libodphelper_la_SOURCES += \ diff --git a/helper/include/odp/helper/.gitignore b/helper/include/odp/helper/.gitignore new file mode 100644 index 000000000..67020331b --- /dev/null +++ b/helper/include/odp/helper/.gitignore @@ -0,0 +1 @@ +version.h diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index d46ab2ad2..4bd10bf46 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -33,6 +33,7 @@ extern "C" { #include <odp/helper/table.h> #include <odp/helper/threads.h> #include <odp/helper/udp.h> +#include <odp/helper/version.h> #ifdef __cplusplus } diff --git a/helper/include/odp/helper/version.h.in b/helper/include/odp/helper/version.h.in new file mode 100644 index 000000000..127b3ff9d --- /dev/null +++ b/helper/include/odp/helper/version.h.in @@ -0,0 +1,72 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP helper version + */ + +#ifndef ODPH_VERSION_H_ +#define ODPH_VERSION_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @defgroup odph_version VERSION + * @{ + */ + +/** + * ODP helper generation version + * + * Introduction of major new features or changes that make very significant + * changes to the helper library. + */ +#define ODPH_VERSION_GENERATION @ODPH_VERSION_GENERATION@ + +/** + * ODP helper major version + * + * Introduction of major new features or changes. Helper libraries with common + * generation, but with different major version numbers are likely not backward + * compatible. + */ +#define ODPH_VERSION_MAJOR @ODPH_VERSION_MAJOR@ + +/** + * ODP helper minor version + * + * Minor version is incremented when introducing backward compatible changes. + * Helper libraries with common generation and major version, but with + * different minor version numbers are backward compatible. + */ +#define ODPH_VERSION_MINOR @ODPH_VERSION_MINOR@ + +/** + * ODP helper version string + * + * The version string defines the helper library version in this format: + * @verbatim <generation>.<major>.<minor> @endverbatim + * + * The string is null terminated. + * + * @return Pointer to helper library version string + */ +const char *odph_version_str(void); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/helper/test/.gitignore b/helper/test/.gitignore index 1a81e0047..5a6c60bcc 100644 --- a/helper/test/.gitignore +++ b/helper/test/.gitignore @@ -9,3 +9,4 @@ process table thread pthread +version diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 662d6c758..bf3aa862c 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/test/Makefile.inc -EXECUTABLES = chksum \ +EXECUTABLES = version \ + chksum \ cuckootable \ parse\ table \ @@ -36,3 +37,4 @@ odpthreads_SOURCES = odpthreads.c parse_SOURCES = parse.c table_SOURCES = table.c iplookuptable_SOURCES = iplookuptable.c +version_SOURCES = version.c diff --git a/helper/test/version.c b/helper/test/version.c new file mode 100644 index 000000000..bd817bb47 --- /dev/null +++ b/helper/test/version.c @@ -0,0 +1,22 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odph_debug.h> + +#include <odp_api.h> +#include <odp/helper/odph_api.h> + +#include <stdio.h> +#include <string.h> + +int main(void) +{ + printf("\nHelper library versions is: %s\n\n", odph_version_str()); + + return 0; +} diff --git a/helper/version.c b/helper/version.c new file mode 100644 index 000000000..586abbe41 --- /dev/null +++ b/helper/version.c @@ -0,0 +1,20 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/helper/version.h> + +#define VERSION_STR_EXPAND(x) #x +#define VERSION_TO_STR(x) VERSION_STR_EXPAND(x) + +#define VERSION_STR \ +VERSION_TO_STR(ODPH_VERSION_GENERATION) "." \ +VERSION_TO_STR(ODPH_VERSION_MAJOR) "." \ +VERSION_TO_STR(ODPH_VERSION_MINOR) + +const char *odph_version_str(void) +{ + return VERSION_STR; +} ----------------------------------------------------------------------- Summary of changes: configure.ac | 21 +- example/classifier/odp_classifier.c | 24 ++- example/generator/odp_generator.c | 50 ++--- example/l2fwd_simple/odp_l2fwd_simple.c | 31 ++- example/simple_pipeline/odp_simple_pipeline.c | 66 +++---- example/time/time_global_test.c | 24 ++- helper/Makefile.am | 6 +- helper/include/odp/helper/.gitignore | 1 + helper/include/odp/helper/odph_api.h | 1 + helper/include/odp/helper/threads.h | 186 ++++++++++++++++-- helper/include/odp/helper/version.h.in | 72 +++++++ helper/test/.gitignore | 1 + helper/test/Makefile.am | 4 +- helper/test/version.c | 22 +++ helper/threads.c | 263 ++++++++++++++++++++++---- helper/version.c | 20 ++ test/common/odp_cunit_common.c | 40 ++-- test/performance/odp_l2fwd.c | 50 +++-- test/performance/odp_scheduling.c | 27 ++- test/validation/api/ipsec/ipsec.c | 8 + 20 files changed, 737 insertions(+), 180 deletions(-) create mode 100644 helper/include/odp/helper/.gitignore create mode 100644 helper/include/odp/helper/version.h.in create mode 100644 helper/test/version.c create mode 100644 helper/version.c hooks/post-receive --

6 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
121
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp