git-lng-odp

git-lng-odp@lists.linaro.org

1 participants
1239 discussions

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-159-gabc7b3bb

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via abc7b3bb0babe8efa0fde52752bcd514f2f0d422 (commit) via c3c110cb114012c22796eb96f17facb3c1f021b8 (commit) via fdae7a0f9b597289579463c5464877c307d9c318 (commit) via e98c15a9d2ee9d1dd21e3d6c3d9829581d8328c0 (commit) via 1f4a5f79557186df79c2091dcc73b6e783c95f74 (commit) via 6c4ecdb73aa869e4733b9b323d9dc4c625a63e58 (commit) via 6be7adab1a16a62e871bc4ed4f3c926645b2ecd0 (commit) via f7e4949e65f29f043115df1a171e0e49a4830ef6 (commit) via 984686b0763495c6dd97d2094f292fc7e01937d0 (commit) via e678e44fe99ada59b80097f97e22b0546bcdadc8 (commit) via 27480d82bd93a881ae683a3c314c11042a68ce29 (commit) via fbcf3e60c699c5f450fd6a4e7a5c78980b3512c5 (commit) via 4a6bae575eb67aa5a484d70d765f6283ea76c183 (commit) via b63e52ee345ae1d69435deded1391167d311bff3 (commit) via 9cb360c18f3948c14bb902351a0ace971479c336 (commit) via 99300f9db4c368e7519c52af93c93d702790b2b4 (commit) via 9ea61da809269644ac6332a1b0f53be68a7e26d7 (commit) via 91b127d61530bcf0e8c5399b3d4117ef2389ca12 (commit) from 0bdad6d2562166eec4abeb957b6bb5067de9fe94 (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 abc7b3bb0babe8efa0fde52752bcd514f2f0d422 Merge: 0bdad6d2 c3c110cb Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jan 30 03:56:37 2018 +0300 Merge remote-tracking branch 'origin/master' into HEAD Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc platform/linux-generic/odp_crypto.c index e1d1c84b,8ae484fd..93736a2c --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@@ -515,6 -562,18 +563,18 @@@ static int process_cipher_param(odp_cry return 0; } + static void + aes_gcm_encrypt_init(odp_crypto_generic_session_t *session) + { + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); ++ session->p.cipher_iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); + } + static odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@@ -562,6 -612,18 +613,18 @@@ ODP_CRYPTO_ALG_ERR_NONE; } + static void + aes_gcm_decrypt_init(odp_crypto_generic_session_t *session) + { + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); ++ session->p.cipher_iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); + } + static odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@@ -631,6 -687,18 +688,18 @@@ static int process_aes_gcm_param(odp_cr return 0; } + static void + aes_gmac_gen_init(odp_crypto_generic_session_t *session) + { + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, + session->auth.key, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); ++ session->p.auth_iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); + } + static odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@@ -670,6 -729,18 +730,18 @@@ ODP_CRYPTO_ALG_ERR_NONE; } + static void + aes_gmac_check_init(odp_crypto_generic_session_t *session) + { + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, + session->auth.key, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); ++ session->p.auth_iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); + } + static odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, diff --cc platform/linux-generic/pktio/null.c index 00000000,5a11076c..9261357a mode 000000,100644..100644 --- a/platform/linux-generic/pktio/null.c +++ b/platform/linux-generic/pktio/null.c @@@ -1,0 -1,175 +1,173 @@@ + /* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + #include "config.h" + + #include <odp_api.h> + #include <odp_packet_io_internal.h> + #include <odp_packet_null.h> + + static int null_close(pktio_entry_t *pktio_entry ODP_UNUSED) + { + return 0; + } + + static int null_open(odp_pktio_t id ODP_UNUSED, + pktio_entry_t *pktio_entry, + const char *devname, odp_pool_t pool ODP_UNUSED) + { + if (strncmp(devname, "null:", 5) != 0) + return -1; + pktio_entry->s.pkt_null.promisc = 0; + return 0; + } + + static int null_recv(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, odp_packet_t pkt_table[] ODP_UNUSED, + int len ODP_UNUSED) + { + return 0; + } + + static int null_fd_set(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, fd_set *readfds ODP_UNUSED) + { + return 0; + } + + static int null_recv_tmo(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, + odp_packet_t pkt_table[] ODP_UNUSED, + int num ODP_UNUSED, uint64_t usecs) + { + struct timeval timeout; + int maxfd = -1; + fd_set readfds; + + timeout.tv_sec = usecs / (1000 * 1000); + timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); + FD_ZERO(&readfds); + - select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout); ++ select(maxfd + 1, &readfds, NULL, NULL, &timeout); + + return 0; + } + + static int null_recv_mq_tmo(pktio_entry_t *pktio_entry[] ODP_UNUSED, + int index[] ODP_UNUSED, int num_q ODP_UNUSED, + odp_packet_t pkt_table[] ODP_UNUSED, + int num ODP_UNUSED, unsigned *from ODP_UNUSED, + uint64_t usecs) + { + struct timeval timeout; + int maxfd = -1; + fd_set readfds; + + timeout.tv_sec = usecs / (1000 * 1000); + timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); + + FD_ZERO(&readfds); + - select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout); ++ select(maxfd + 1, &readfds, NULL, NULL, &timeout); + + return 0; + } + + static int null_send(pktio_entry_t *pktio_entry ODP_UNUSED, + int index ODP_UNUSED, const odp_packet_t pkt_table[], + int num) + { + odp_packet_free_multi(pkt_table, num); + + return num; + } + + #define PKTIO_NULL_MTU (64 * 1024) + + static uint32_t null_mtu_get(pktio_entry_t *pktio_entry ODP_UNUSED) + { + return PKTIO_NULL_MTU; + } + + static const char null_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x05}; + + static int null_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, + void *mac_addr) + { + memcpy(mac_addr, null_mac, ETH_ALEN); + return ETH_ALEN; + } + + static int null_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) + { + pktio_entry->s.pkt_null.promisc = !!enable; + return 0; + } + + static int null_promisc_mode_get(pktio_entry_t *pktio_entry) + { + return pktio_entry->s.pkt_null.promisc; + } + + static int null_capability(pktio_entry_t *pktio_entry ODP_UNUSED, + odp_pktio_capability_t *capa) + { + memset(capa, 0, sizeof(odp_pktio_capability_t)); + + capa->max_input_queues = PKTIO_MAX_QUEUES; + capa->max_output_queues = PKTIO_MAX_QUEUES; + capa->set_op.op.promisc_mode = 1; + + odp_pktio_config_init(&capa->config); + capa->config.pktin.bit.ts_all = 1; + capa->config.pktin.bit.ts_ptp = 1; + return 0; + } + + static int null_inqueues_config(pktio_entry_t *pktio_entry ODP_UNUSED, + const odp_pktin_queue_param_t *p ODP_UNUSED) + { + return 0; + } + + static int null_outqueues_config(pktio_entry_t *pktio_entry ODP_UNUSED, + const odp_pktout_queue_param_t *p ODP_UNUSED) + { + return 0; + } + + static int null_init_global(void) + { + ODP_PRINT("PKTIO: initialized null interface.\n"); + return 0; + } + + const pktio_if_ops_t null_pktio_ops = { + .name = "null", + .print = NULL, + .init_global = null_init_global, + .init_local = NULL, + .term = NULL, + .open = null_open, + .close = null_close, + .start = NULL, + .stop = NULL, + .recv = null_recv, + .recv_tmo = null_recv_tmo, + .recv_mq_tmo = null_recv_mq_tmo, + .fd_set = null_fd_set, + .send = null_send, + .mtu_get = null_mtu_get, + .promisc_mode_set = null_promisc_mode_set, + .promisc_mode_get = null_promisc_mode_get, + .mac_get = null_mac_addr_get, + .capability = null_capability, + .pktin_ts_res = NULL, + .pktin_ts_from_ns = NULL, + .config = NULL, + .input_queues_config = null_inqueues_config, + .output_queues_config = null_outqueues_config, + }; diff --cc test/performance/odp_crypto.c index 82f29625,f6524bc6..e4f49fb7 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@@ -226,6 -232,69 +232,69 @@@ static crypto_alg_config_t algs_config[ .auth_digest_len = 12, }, }, + { + .name = "aes-cbc-null", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_CBC, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, - .iv = { ++ .cipher_iv = { + .data = test_iv, + .length = 16, + }, + .auth_alg = ODP_AUTH_ALG_NULL + }, + }, + { + .name = "aes-cbc-hmac-sha1-96", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_CBC, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, - .iv = { ++ .cipher_iv = { + .data = test_iv, + .length = 16, + }, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + .auth_digest_len = 12, + }, + }, + { + .name = "null-hmac-sha1-96", + .session = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + .auth_digest_len = 12, + }, + }, + { + .name = "aes-gcm", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_GCM, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, - .iv = { ++ .cipher_iv = { + .data = test_iv, + .length = 12, + }, + .auth_alg = ODP_AUTH_ALG_AES_GCM, + .auth_digest_len = 16, + }, + }, }; /** ----------------------------------------------------------------------- Summary of changes: .travis.yml | 158 ++++++---- configure.ac | 6 + doc/implementers-guide/implementers-guide.adoc | 2 +- doc/process-guide/release-guide.adoc | 2 +- example/generator/Makefile.am | 5 + example/generator/generator_run.sh | 17 ++ example/l2fwd_simple/l2fwd_simple_run.sh | 13 + example/l2fwd_simple/odp_l2fwd_simple.c | 19 ++ include/Makefile.am | 1 + include/odp/api/cpu.h | 2 + include/odp/api/spec/thread.h | 28 -- include/odp/api/spec/thread_types.h | 59 ++++ include/odp/api/thread.h | 2 + m4/odp_dpdk.m4 | 24 +- platform/linux-generic/Makefile.am | 7 +- .../linux-generic/include-abi/odp/api/abi/thread.h | 4 + .../include/odp/api/plat/thread_inlines.h | 46 +++ .../include/odp/api/plat/thread_inlines_api.h | 41 +++ platform/linux-generic/include/odp_internal.h | 2 + .../linux-generic/include/odp_packet_io_internal.h | 3 + platform/linux-generic/include/odp_packet_null.h | 16 ++ platform/linux-generic/odp_classification.c | 37 +-- platform/linux-generic/odp_crypto.c | 319 ++++++++++++++------- platform/linux-generic/odp_init.c | 13 + platform/linux-generic/odp_rwlock_recursive.c | 11 +- platform/linux-generic/odp_spinlock_recursive.c | 7 +- platform/linux-generic/odp_thread.c | 36 +-- platform/linux-generic/odp_thread_api.c | 15 + platform/linux-generic/pktio/io_ops.c | 1 + platform/linux-generic/pktio/null.c | 173 +++++++++++ platform/linux-generic/test/.gitignore | 3 +- test/performance/odp_crypto.c | 71 ++++- 32 files changed, 889 insertions(+), 254 deletions(-) create mode 100755 example/generator/generator_run.sh create mode 100644 include/odp/api/spec/thread_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines_api.h create mode 100644 platform/linux-generic/include/odp_packet_null.h create mode 100644 platform/linux-generic/odp_thread_api.c create mode 100644 platform/linux-generic/pktio/null.c hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-132-gc3c110cb

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 c3c110cb114012c22796eb96f17facb3c1f021b8 (commit) via fdae7a0f9b597289579463c5464877c307d9c318 (commit) from e98c15a9d2ee9d1dd21e3d6c3d9829581d8328c0 (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 c3c110cb114012c22796eb96f17facb3c1f021b8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 26 17:10:28 2018 +0200 linux-gen: locks: use inlined thread id Use internally always the inlined version of thread id function. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c index 1f93df35..d484ba5a 100644 --- a/platform/linux-generic/odp_rwlock_recursive.c +++ b/platform/linux-generic/odp_rwlock_recursive.c @@ -8,6 +8,7 @@ #include <odp/api/rwlock_recursive.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #include <string.h> #define NO_OWNER (-1) @@ -22,7 +23,7 @@ void odp_rwlock_recursive_init(odp_rwlock_recursive_t *rlock) /* Multiple readers can recurse the lock concurrently */ void odp_rwlock_recursive_read_lock(odp_rwlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); if (rlock->rd_cnt[thr]) { rlock->rd_cnt[thr]++; @@ -36,7 +37,7 @@ void odp_rwlock_recursive_read_lock(odp_rwlock_recursive_t *rlock) /* Multiple readers can recurse the lock concurrently */ int odp_rwlock_recursive_read_trylock(odp_rwlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); if (rlock->rd_cnt[thr]) { rlock->rd_cnt[thr]++; @@ -53,7 +54,7 @@ int odp_rwlock_recursive_read_trylock(odp_rwlock_recursive_t *rlock) void odp_rwlock_recursive_read_unlock(odp_rwlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); rlock->rd_cnt[thr]--; @@ -66,7 +67,7 @@ void odp_rwlock_recursive_read_unlock(odp_rwlock_recursive_t *rlock) /* Only one writer can recurse the lock */ void odp_rwlock_recursive_write_lock(odp_rwlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); if (rlock->wr_owner == thr) { rlock->wr_cnt++; @@ -81,7 +82,7 @@ void odp_rwlock_recursive_write_lock(odp_rwlock_recursive_t *rlock) /* Only one writer can recurse the lock */ int odp_rwlock_recursive_write_trylock(odp_rwlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); if (rlock->wr_owner == thr) { rlock->wr_cnt++; diff --git a/platform/linux-generic/odp_spinlock_recursive.c b/platform/linux-generic/odp_spinlock_recursive.c index 5293c04b..d6d91420 100644 --- a/platform/linux-generic/odp_spinlock_recursive.c +++ b/platform/linux-generic/odp_spinlock_recursive.c @@ -8,6 +8,7 @@ #include <odp/api/spinlock_recursive.h> #include <odp/api/thread.h> +#include <odp/api/plat/thread_inlines.h> #define NO_OWNER (-1) @@ -20,7 +21,7 @@ void odp_spinlock_recursive_init(odp_spinlock_recursive_t *rlock) void odp_spinlock_recursive_lock(odp_spinlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); if (rlock->owner == thr) { rlock->cnt++; @@ -34,7 +35,7 @@ void odp_spinlock_recursive_lock(odp_spinlock_recursive_t *rlock) int odp_spinlock_recursive_trylock(odp_spinlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); if (rlock->owner == thr) { rlock->cnt++; @@ -63,7 +64,7 @@ void odp_spinlock_recursive_unlock(odp_spinlock_recursive_t *rlock) int odp_spinlock_recursive_is_locked(odp_spinlock_recursive_t *rlock) { - int thr = odp_thread_id(); + int thr = _odp_thread_id(); if (rlock->owner == thr) return 1; commit fdae7a0f9b597289579463c5464877c307d9c318 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jan 26 16:57:56 2018 +0200 linux-gen: thread: inline thread and cpu id Inline thread and cpu id functions as application may use those often. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/Makefile.am b/include/Makefile.am index c3452ef3..aa330b8d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -96,6 +96,7 @@ odpapispecinclude_HEADERS = \ odp/api/spec/sync.h \ odp/api/spec/system_info.h \ odp/api/spec/thread.h \ + odp/api/spec/thread_types.h \ odp/api/spec/threshold.h \ odp/api/spec/thrmask.h \ odp/api/spec/ticketlock.h \ diff --git a/include/odp/api/cpu.h b/include/odp/api/cpu.h index 7229857a..41c21b8a 100644 --- a/include/odp/api/cpu.h +++ b/include/odp/api/cpu.h @@ -19,6 +19,8 @@ extern "C" { #include <odp/api/abi/cpu.h> +/* Thread inline file implements cpu API function */ +#include <odp/api/thread.h> #include <odp/api/spec/cpu.h> #ifdef __cplusplus diff --git a/include/odp/api/spec/thread.h b/include/odp/api/spec/thread.h index 5fe74c69..125e7a11 100644 --- a/include/odp/api/spec/thread.h +++ b/include/odp/api/spec/thread.h @@ -30,34 +30,6 @@ extern "C" { * which depend on system configuration and may be lower than this number. */ -/** - * Thread type - */ -typedef enum odp_thread_type_e { - /** - * Worker thread - * - * Worker threads do most part of ODP application packet processing. - * These threads provide high packet and data rates, with low and - * predictable latency. Typically, worker threads are pinned to isolated - * CPUs and packets are processed in a run-to-completion loop with very - * low interference from the operating system. - */ - ODP_THREAD_WORKER = 0, - - /** - * Control thread - * - * Control threads do not participate the main packet flow through the - * system, but e.g. control or monitor the worker threads, or handle - * exceptions. These threads may perform general purpose processing, - * use system calls, share the CPU with other threads and be interrupt - * driven. - */ - ODP_THREAD_CONTROL -} odp_thread_type_t; - - /** * Get thread identifier * diff --git a/include/odp/api/spec/thread_types.h b/include/odp/api/spec/thread_types.h new file mode 100644 index 00000000..a5ddb78e --- /dev/null +++ b/include/odp/api/spec/thread_types.h @@ -0,0 +1,59 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP thread API types + */ + +#ifndef ODP_API_SPEC_THREAD_TYPES_H_ +#define ODP_API_SPEC_THREAD_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @ingroup odp_thread ODP THREAD + * @{ + */ + +/** + * Thread type + */ +typedef enum odp_thread_type_e { + /** + * Worker thread + * + * Worker threads do most part of ODP application packet processing. + * These threads provide high packet and data rates, with low and + * predictable latency. Typically, worker threads are pinned to isolated + * CPUs and packets are processed in a run-to-completion loop with very + * low interference from the operating system. + */ + ODP_THREAD_WORKER = 0, + + /** + * Control thread + * + * Control threads do not participate the main packet flow through the + * system, but e.g. control or monitor the worker threads, or handle + * exceptions. These threads may perform general purpose processing, + * use system calls, share the CPU with other threads and be interrupt + * driven. + */ + ODP_THREAD_CONTROL +} odp_thread_type_t; + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/api/thread.h b/include/odp/api/thread.h index 85af314b..d11c1671 100644 --- a/include/odp/api/thread.h +++ b/include/odp/api/thread.h @@ -17,6 +17,8 @@ extern "C" { #endif +#include <odp/api/spec/thread_types.h> + #include <odp/api/abi/thread.h> #include <odp/api/spec/thread.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 14b73f95..10e38ac3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -34,6 +34,8 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ + include/odp/api/plat/thread_inlines.h \ + include/odp/api/plat/thread_inlines_api.h \ include/odp/api/plat/ticketlock_inlines.h \ include/odp/api/plat/ticketlock_inlines_api.h @@ -205,6 +207,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_packet_flags_api.c \ odp_std_clib.c \ odp_sync.c \ + odp_thread_api.c \ odp_ticketlock.c endif diff --git a/platform/linux-generic/include-abi/odp/api/abi/thread.h b/platform/linux-generic/include-abi/odp/api/abi/thread.h index dc29a7da..eb92d43c 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/thread.h +++ b/platform/linux-generic/include-abi/odp/api/abi/thread.h @@ -5,3 +5,7 @@ */ #include <odp/api/abi-default/thread.h> + +#define _ODP_INLINE static inline +#include <odp/api/plat/thread_inlines.h> +#include <odp/api/plat/thread_inlines_api.h> diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines.h b/platform/linux-generic/include/odp/api/plat/thread_inlines.h new file mode 100644 index 00000000..048df50b --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/thread_inlines.h @@ -0,0 +1,46 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_THREAD_INLINES_H_ +#define ODP_PLAT_THREAD_INLINES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +typedef struct { + int thr; + int cpu; + odp_thread_type_t type; + +} _odp_thread_state_t; + +extern __thread _odp_thread_state_t *_odp_this_thread; + +static inline int _odp_thread_id(void) +{ + return _odp_this_thread->thr; +} + +static inline odp_thread_type_t _odp_thread_type(void) +{ + return _odp_this_thread->type; +} + +static inline int _odp_cpu_id(void) +{ + return _odp_this_thread->cpu; +} + +/** @endcond */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h b/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h new file mode 100644 index 00000000..1c282a5c --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/thread_inlines_api.h @@ -0,0 +1,41 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + */ + +#ifndef ODP_PLAT_THREAD_INLINES_API_H_ +#define ODP_PLAT_THREAD_INLINES_API_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +_ODP_INLINE int odp_thread_id(void) +{ + return _odp_thread_id(); +} + +_ODP_INLINE odp_thread_type_t odp_thread_type(void) +{ + return _odp_thread_type(); +} + +_ODP_INLINE int odp_cpu_id(void) +{ + return _odp_cpu_id(); +} + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index ffc247a4..971837b0 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -19,20 +19,14 @@ #include <odp/api/align.h> #include <odp/api/cpu.h> #include <odp_schedule_if.h> +#include <odp/api/plat/thread_inlines.h> #include <string.h> #include <stdio.h> #include <stdlib.h> typedef struct { - int thr; - int cpu; - odp_thread_type_t type; -} thread_state_t; - - -typedef struct { - thread_state_t thr[ODP_THREAD_COUNT_MAX]; + _odp_thread_state_t thr[ODP_THREAD_COUNT_MAX]; struct { odp_thrmask_t all; @@ -46,14 +40,15 @@ typedef struct { odp_spinlock_t lock; } thread_globals_t; - /* Globals */ static thread_globals_t *thread_globals; +#include <odp/visibility_begin.h> /* Thread local */ -static __thread thread_state_t *this_thread; +__thread _odp_thread_state_t *_odp_this_thread; +#include <odp/visibility_end.h> int odp_thread_init_global(void) { @@ -162,7 +157,7 @@ int odp_thread_init_local(odp_thread_type_t type) thread_globals->thr[id].cpu = cpu; thread_globals->thr[id].type = type; - this_thread = &thread_globals->thr[id]; + _odp_this_thread = &thread_globals->thr[id]; sched_fn->thr_add(ODP_SCHED_GROUP_ALL, id); @@ -177,8 +172,8 @@ int odp_thread_init_local(odp_thread_type_t type) int odp_thread_term_local(void) { int num; - int id = this_thread->thr; - odp_thread_type_t type = this_thread->type; + int id = _odp_this_thread->thr; + odp_thread_type_t type = _odp_this_thread->type; sched_fn->thr_rem(ODP_SCHED_GROUP_ALL, id); @@ -199,11 +194,6 @@ int odp_thread_term_local(void) return num; /* return a number of threads left */ } -int odp_thread_id(void) -{ - return this_thread->thr; -} - int odp_thread_count(void) { return thread_globals->num; @@ -214,16 +204,6 @@ int odp_thread_count_max(void) return ODP_THREAD_COUNT_MAX; } -odp_thread_type_t odp_thread_type(void) -{ - return this_thread->type; -} - -int odp_cpu_id(void) -{ - return this_thread->cpu; -} - int odp_thrmask_worker(odp_thrmask_t *mask) { odp_thrmask_copy(mask, &thread_globals->worker); diff --git a/platform/linux-generic/odp_thread_api.c b/platform/linux-generic/odp_thread_api.c new file mode 100644 index 00000000..ee5beb16 --- /dev/null +++ b/platform/linux-generic/odp_thread_api.c @@ -0,0 +1,15 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/thread.h> +#include <odp/api/cpu.h> +#include <odp/api/plat/thread_inlines.h> + +/* Include non-inlined versions of API functions */ +#define _ODP_INLINE +#include <odp/api/plat/thread_inlines_api.h> ----------------------------------------------------------------------- Summary of changes: include/Makefile.am | 1 + include/odp/api/cpu.h | 2 + include/odp/api/spec/thread.h | 28 ---------- include/odp/api/spec/thread_types.h | 59 ++++++++++++++++++++++ include/odp/api/thread.h | 2 + platform/linux-generic/Makefile.am | 3 ++ .../linux-generic/include-abi/odp/api/abi/thread.h | 4 ++ .../include/odp/api/plat/thread_inlines.h | 46 +++++++++++++++++ .../include/odp/api/plat/thread_inlines_api.h | 41 +++++++++++++++ platform/linux-generic/odp_rwlock_recursive.c | 11 ++-- platform/linux-generic/odp_spinlock_recursive.c | 7 +-- platform/linux-generic/odp_thread.c | 36 +++---------- platform/linux-generic/odp_thread_api.c | 15 ++++++ 13 files changed, 191 insertions(+), 64 deletions(-) create mode 100644 include/odp/api/spec/thread_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines_api.h create mode 100644 platform/linux-generic/odp_thread_api.c hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-130-ge98c15a9

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 e98c15a9d2ee9d1dd21e3d6c3d9829581d8328c0 (commit) via 1f4a5f79557186df79c2091dcc73b6e783c95f74 (commit) via 6c4ecdb73aa869e4733b9b323d9dc4c625a63e58 (commit) from 6be7adab1a16a62e871bc4ed4f3c926645b2ecd0 (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 e98c15a9d2ee9d1dd21e3d6c3d9829581d8328c0 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Dec 14 04:22:12 2017 +0300 linux-gen: crypto: significant speedup of all operations Per idea of Janne Peltonen, do not allocate/free crypto contexts for each operation, providing significant speed increase. Each thread on startup allocates hmac+cipher contexts pair for each crypto session. Then they are initialized on demand, when session is first executed using this thread. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Janne Peltonen <janne.peltonen(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 54f95b8b..4fd72144 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -110,6 +110,8 @@ int odp_queue_term_global(void); int odp_crypto_init_global(void); int odp_crypto_term_global(void); +int _odp_crypto_init_local(void); +int _odp_crypto_term_local(void); int odp_timer_init_global(const odp_init_t *params); int odp_timer_term_global(void); diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 3b110c19..8ae484fd 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -9,7 +9,6 @@ #include <odp_posix_extensions.h> #include <odp/api/crypto.h> #include <odp_internal.h> -#include <odp/api/atomic.h> #include <odp/api/spinlock.h> #include <odp/api/sync.h> #include <odp/api/debug.h> @@ -98,6 +97,7 @@ typedef odp_crypto_alg_err_t (*crypto_func_t)(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session); +typedef void (*crypto_init_func_t)(odp_crypto_generic_session_t *session); /** * Per crypto session data structure @@ -117,6 +117,7 @@ struct odp_crypto_generic_session_t { const EVP_CIPHER *evp_cipher; crypto_func_t func; + crypto_init_func_t init; } cipher; struct { @@ -128,7 +129,10 @@ struct odp_crypto_generic_session_t { const EVP_CIPHER *evp_cipher; }; crypto_func_t func; + crypto_init_func_t init; } auth; + + unsigned idx; }; typedef struct odp_crypto_global_s odp_crypto_global_t; @@ -137,15 +141,42 @@ struct odp_crypto_global_s { odp_spinlock_t lock; odp_crypto_generic_session_t *free; odp_crypto_generic_session_t sessions[MAX_SESSIONS]; + + /* These flags are cleared at alloc_session() */ + uint8_t ctx_valid[ODP_THREAD_COUNT_MAX][MAX_SESSIONS]; + odp_ticketlock_t openssl_lock[0]; }; static odp_crypto_global_t *global; +typedef struct crypto_local_t { + HMAC_CTX *hmac_ctx[MAX_SESSIONS]; + EVP_CIPHER_CTX *cipher_ctx[MAX_SESSIONS]; + EVP_CIPHER_CTX *mac_cipher_ctx[MAX_SESSIONS]; + uint8_t *ctx_valid; +} crypto_local_t; + +static __thread crypto_local_t local; + +typedef enum { KIND_HMAC, KIND_CIPHER, KIND_MAC_CIPHER } crypto_kind_t; + +static inline void crypto_init(odp_crypto_generic_session_t *session) +{ + if (local.ctx_valid[session->idx]) + return; + + session->cipher.init(session); + session->auth.init(session); + + local.ctx_valid[session->idx] = 1; +} + static odp_crypto_generic_session_t *alloc_session(void) { odp_crypto_generic_session_t *session = NULL; + unsigned i; odp_spinlock_lock(&global->lock); session = global->free; @@ -155,6 +186,11 @@ odp_crypto_generic_session_t *alloc_session(void) } odp_spinlock_unlock(&global->lock); + session->idx = session - global->sessions; + + for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) + global->ctx_valid[i][session->idx] = 0; + return session; } @@ -175,24 +211,57 @@ null_crypto_routine(odp_packet_t pkt ODP_UNUSED, return ODP_CRYPTO_ALG_ERR_NONE; } -static -void packet_hmac_calculate(HMAC_CTX *ctx, - odp_packet_t pkt, - const odp_crypto_packet_op_param_t *param, - odp_crypto_generic_session_t *session, - uint8_t *hash) +static void +null_crypto_init_routine(odp_crypto_generic_session_t *session ODP_UNUSED) { - uint32_t offset = param->auth_range.offset; - uint32_t len = param->auth_range.length; + return; +} - ODP_ASSERT(offset + len <= odp_packet_len(pkt)); +/* Mimic new OpenSSL 1.1.y API */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L +static HMAC_CTX *HMAC_CTX_new(void) +{ + HMAC_CTX *ctx = malloc(sizeof(*ctx)); + + HMAC_CTX_init(ctx); + return ctx; +} + +static void HMAC_CTX_free(HMAC_CTX *ctx) +{ + HMAC_CTX_cleanup(ctx); + free(ctx); +} +#endif + +static void +auth_init(odp_crypto_generic_session_t *session) +{ + HMAC_CTX *ctx = local.hmac_ctx[session->idx]; HMAC_Init_ex(ctx, session->auth.key, session->auth.key_length, session->auth.evp_md, NULL); +} + +static +void packet_hmac(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session, + uint8_t *hash) +{ + HMAC_CTX *ctx = local.hmac_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)); + + /* Reinitialize HMAC calculation without resetting the key */ + HMAC_Init_ex(ctx, NULL, 0, NULL, NULL); + + /* Hash it */ while (len > 0) { uint32_t seglen = 0; /* GCC */ void *mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL); @@ -206,36 +275,6 @@ void packet_hmac_calculate(HMAC_CTX *ctx, HMAC_Final(ctx, hash, NULL); } -#if OPENSSL_VERSION_NUMBER < 0x10100000L -static -void packet_hmac(odp_packet_t pkt, - const odp_crypto_packet_op_param_t *param, - odp_crypto_generic_session_t *session, - uint8_t *hash) -{ - HMAC_CTX ctx; - - /* Hash it */ - HMAC_CTX_init(&ctx); - packet_hmac_calculate(&ctx, pkt, param, session, hash); - HMAC_CTX_cleanup(&ctx); -} -#else -static -void packet_hmac(odp_packet_t pkt, - const odp_crypto_packet_op_param_t *param, - odp_crypto_generic_session_t *session, - uint8_t *hash) -{ - HMAC_CTX *ctx; - - /* Hash it */ - ctx = HMAC_CTX_new(); - packet_hmac_calculate(ctx, pkt, param, session, hash); - HMAC_CTX_free(ctx); -} -#endif - static odp_crypto_alg_err_t auth_gen(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -425,12 +464,22 @@ int internal_decrypt(EVP_CIPHER_CTX *ctx, return ret; } +static void +cipher_encrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; void *iv_ptr; int ret; @@ -441,27 +490,30 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Encrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); ret = internal_encrypt(ctx, pkt, param); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : ODP_CRYPTO_ALG_ERR_NONE; } +static void +cipher_decrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; void *iv_ptr; int ret; @@ -472,17 +524,10 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Decrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); ret = internal_decrypt(ctx, pkt, param); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : ODP_CRYPTO_ALG_ERR_NONE; } @@ -506,20 +551,35 @@ static int process_cipher_param(odp_crypto_generic_session_t *session, session->p.cipher_key.length); /* Set function */ - if (ODP_CRYPTO_OP_ENCODE == session->p.op) + if (ODP_CRYPTO_OP_ENCODE == session->p.op) { session->cipher.func = cipher_encrypt; - else + session->cipher.init = cipher_encrypt_init; + } else { session->cipher.func = cipher_decrypt; + session->cipher.init = cipher_decrypt_init; + } return 0; } +static void +aes_gcm_encrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; const uint8_t *aad_head = param->aad_ptr; uint32_t aad_len = session->p.auth_aad_len; void *iv_ptr; @@ -534,14 +594,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Encrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); /* Authenticate header data (if any) without encrypting them */ if (aad_len > 0) @@ -555,18 +608,28 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, odp_packet_copy_from_mem(pkt, param->hash_result_offset, session->p.auth_digest_len, block); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : ODP_CRYPTO_ALG_ERR_NONE; } +static void +aes_gcm_decrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; const uint8_t *aad_head = param->aad_ptr; uint32_t aad_len = session->p.auth_aad_len; int dummy_len = 0; @@ -581,14 +644,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Decrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); odp_packet_copy_to_mem(pkt, param->hash_result_offset, session->p.auth_digest_len, block); @@ -602,8 +658,6 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, ret = internal_decrypt(ctx, pkt, param); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK : ODP_CRYPTO_ALG_ERR_NONE; } @@ -622,20 +676,35 @@ static int process_aes_gcm_param(odp_crypto_generic_session_t *session, session->cipher.evp_cipher = cipher; /* Set function */ - if (ODP_CRYPTO_OP_ENCODE == session->p.op) + if (ODP_CRYPTO_OP_ENCODE == session->p.op) { session->cipher.func = aes_gcm_encrypt; - else + session->cipher.init = aes_gcm_encrypt_init; + } else { session->cipher.func = aes_gcm_decrypt; + session->cipher.init = aes_gcm_decrypt_init; + } return 0; } +static void +aes_gmac_gen_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, + session->auth.key, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; void *iv_ptr; uint8_t block[EVP_MAX_MD_SIZE]; int ret; @@ -647,14 +716,7 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Encrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, - session->auth.key, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); ret = internal_aad(ctx, pkt, param); @@ -663,18 +725,28 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, odp_packet_copy_from_mem(pkt, param->hash_result_offset, session->p.auth_digest_len, block); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE : ODP_CRYPTO_ALG_ERR_NONE; } +static void +aes_gmac_check_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, + session->auth.key, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; void *iv_ptr; uint8_t block[EVP_MAX_MD_SIZE]; int ret; @@ -686,14 +758,7 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Decrypt it */ - ctx = EVP_CIPHER_CTX_new(); - EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, - session->auth.key, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); - EVP_CIPHER_CTX_set_padding(ctx, 0); odp_packet_copy_to_mem(pkt, param->hash_result_offset, session->p.auth_digest_len, block); @@ -704,8 +769,6 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, ret = internal_aad(ctx, pkt, param); - EVP_CIPHER_CTX_free(ctx); - return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK : ODP_CRYPTO_ALG_ERR_NONE; } @@ -724,10 +787,13 @@ static int process_aes_gmac_param(odp_crypto_generic_session_t *session, session->auth.evp_cipher = cipher; /* Set function */ - if (ODP_CRYPTO_OP_ENCODE == session->p.op) + if (ODP_CRYPTO_OP_ENCODE == session->p.op) { session->auth.func = aes_gmac_gen; - else + session->auth.init = aes_gmac_gen_init; + } else { session->auth.func = aes_gmac_check; + session->auth.init = aes_gmac_check_init; + } return 0; } @@ -741,6 +807,7 @@ static int process_auth_param(odp_crypto_generic_session_t *session, session->auth.func = auth_gen; else session->auth.func = auth_check; + session->auth.init = auth_init; session->auth.evp_md = evp_md; @@ -923,6 +990,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, switch (param->cipher_alg) { case ODP_CIPHER_ALG_NULL: session->cipher.func = null_crypto_routine; + session->cipher.init = null_crypto_init_routine; rc = 0; break; case ODP_CIPHER_ALG_3DES_CBC: @@ -998,6 +1066,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, switch (param->auth_alg) { case ODP_AUTH_ALG_NULL: session->auth.func = null_crypto_routine; + session->auth.init = null_crypto_init_routine; rc = 0; break; #if ODP_DEPRECATED_API @@ -1037,6 +1106,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, * cipher at the same time */ if (param->cipher_alg == ODP_CIPHER_ALG_AES_GCM || aes_gcm) { session->auth.func = null_crypto_routine; + session->auth.init = null_crypto_init_routine; rc = 0; } else { rc = -1; @@ -1216,6 +1286,49 @@ int odp_crypto_term_global(void) return rc; } +int _odp_crypto_init_local(void) +{ + unsigned i; + int id; + + memset(&local, 0, sizeof(local)); + + for (i = 0; i < MAX_SESSIONS; i++) { + local.hmac_ctx[i] = HMAC_CTX_new(); + local.cipher_ctx[i] = EVP_CIPHER_CTX_new(); + local.mac_cipher_ctx[i] = EVP_CIPHER_CTX_new(); + + if (local.hmac_ctx[i] == NULL || + local.cipher_ctx[i] == NULL || + local.mac_cipher_ctx[i] == NULL) { + _odp_crypto_term_local(); + return -1; + } + } + + id = odp_thread_id(); + local.ctx_valid = global->ctx_valid[id]; + /* No need to clear flags here, alloc_session did the job for us */ + + return 0; +} + +int _odp_crypto_term_local(void) +{ + unsigned i; + + for (i = 0; i < MAX_SESSIONS; i++) { + if (local.hmac_ctx[i] != NULL) + HMAC_CTX_free(local.hmac_ctx[i]); + if (local.cipher_ctx[i] != NULL) + EVP_CIPHER_CTX_free(local.cipher_ctx[i]); + if (local.mac_cipher_ctx[i] != NULL) + EVP_CIPHER_CTX_free(local.mac_cipher_ctx[i]); + } + + return 0; +} + odp_random_kind_t odp_random_max_kind(void) { return ODP_RANDOM_CRYPTO; @@ -1385,6 +1498,8 @@ int odp_crypto_int(odp_packet_t pkt_in, pkt_in = ODP_PACKET_INVALID; } + crypto_init(session); + /* Invoke the functions */ if (session->do_cipher_first) { rc_cipher = session->cipher.func(out_pkt, param, session); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index bff8303e..bbcbd8dd 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -327,6 +327,12 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = PKTIO_INIT; + if (_odp_crypto_init_local()) { + ODP_ERR("ODP crypto local init failed.\n"); + goto init_fail; + } + stage = CRYPTO_INIT; + if (odp_pool_init_local()) { ODP_ERR("ODP pool local init failed.\n"); goto init_fail; @@ -379,6 +385,13 @@ int _odp_term_local(enum init_stage stage) } /* Fall through */ + case CRYPTO_INIT: + if (_odp_crypto_term_local()) { + ODP_ERR("ODP crypto local term failed.\n"); + rc = -1; + } + /* Fall through */ + case POOL_INIT: if (odp_pool_term_local()) { ODP_ERR("ODP buffer pool local term failed.\n"); commit 1f4a5f79557186df79c2091dcc73b6e783c95f74 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Dec 14 12:26:21 2017 +0300 linux-gen: crypto: move session type to odp_crypto module There is no point in having odp_crypto_generic_session_t definition in global include file. Move it to odp_crypto module. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Janne Peltonen <janne.peltonen(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index da5540fe..14b73f95 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -91,7 +91,6 @@ noinst_HEADERS = \ include/odp_classification_inlines.h \ include/odp_classification_internal.h \ include/odp_config_internal.h \ - include/odp_crypto_internal.h \ include/odp_debug_internal.h \ include/odp_errno_define.h \ include/odp_forward_typedefs_internal.h \ diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h deleted file mode 100644 index 32178d9d..00000000 --- a/platform/linux-generic/include/odp_crypto_internal.h +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_CRYPTO_INTERNAL_H_ -#define ODP_CRYPTO_INTERNAL_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <openssl/evp.h> - -#define MAX_IV_LEN 64 -#define OP_RESULT_MAGIC 0x91919191 - -/** Forward declaration of session structure */ -typedef struct odp_crypto_generic_session odp_crypto_generic_session_t; - -/** - * Algorithm handler function prototype - */ -typedef -odp_crypto_alg_err_t (*crypto_func_t)(odp_packet_t pkt, - const odp_crypto_packet_op_param_t *param, - odp_crypto_generic_session_t *session); - -/** - * Per crypto session data structure - */ -struct odp_crypto_generic_session { - struct odp_crypto_generic_session *next; - - /* Session creation parameters */ - odp_crypto_session_param_t p; - - odp_bool_t do_cipher_first; - - struct { - /* Copy of session IV data */ - uint8_t iv_data[MAX_IV_LEN]; - uint8_t key_data[EVP_MAX_KEY_LENGTH]; - - const EVP_CIPHER *evp_cipher; - crypto_func_t func; - } cipher; - - struct { - uint8_t key[EVP_MAX_KEY_LENGTH]; - uint32_t key_length; - union { - const EVP_MD *evp_md; - const EVP_CIPHER *evp_cipher; - }; - crypto_func_t func; - } auth; -}; - -/** - * Per session creation operation result - */ -typedef struct odp_crypto_generic_session_result { - odp_crypto_ses_create_err_t rc; - odp_crypto_session_t session; -} odp_crypto_generic_session_result_t; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 2038aa46..3b110c19 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -15,7 +15,6 @@ #include <odp/api/debug.h> #include <odp/api/align.h> #include <odp/api/shared_memory.h> -#include <odp_crypto_internal.h> #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp/api/random.h> @@ -89,6 +88,49 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { 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} } }; +/** Forward declaration of session structure */ +typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; + +/** + * Algorithm handler function prototype + */ +typedef +odp_crypto_alg_err_t (*crypto_func_t)(odp_packet_t pkt, + const odp_crypto_packet_op_param_t *param, + odp_crypto_generic_session_t *session); + +/** + * Per crypto session data structure + */ +struct odp_crypto_generic_session_t { + odp_crypto_generic_session_t *next; + + /* Session creation parameters */ + odp_crypto_session_param_t p; + + odp_bool_t do_cipher_first; + + struct { + /* Copy of session IV data */ + uint8_t iv_data[EVP_MAX_IV_LENGTH]; + uint8_t key_data[EVP_MAX_KEY_LENGTH]; + + const EVP_CIPHER *evp_cipher; + crypto_func_t func; + } cipher; + + struct { + uint8_t key[EVP_MAX_KEY_LENGTH]; + uint32_t key_length; + uint32_t bytes; + union { + const EVP_MD *evp_md; + const EVP_CIPHER *evp_cipher; + }; + crypto_func_t func; + } auth; +}; + typedef struct odp_crypto_global_s odp_crypto_global_t; struct odp_crypto_global_s { @@ -860,7 +902,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, /* Copy parameters */ session->p = *param; - if (session->p.iv.length > MAX_IV_LEN) { + if (session->p.iv.length > EVP_MAX_IV_LENGTH) { ODP_DBG("Maximum IV length exceeded\n"); *status = ODP_CRYPTO_SES_CREATE_ERR_INV_CIPHER; goto err; commit 6c4ecdb73aa869e4733b9b323d9dc4c625a63e58 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Dec 14 04:28:47 2017 +0300 test: performance: add AES tests to crypto performance tests Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Janne Peltonen <janne.peltonen(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 761cc8cf..f6524bc6 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -30,7 +30,7 @@ */ #define POOL_NUM_PKT 64 -static uint8_t test_iv[8] = "01234567"; +static uint8_t test_iv[16] = "0123456789abcdef"; static uint8_t test_key16[16] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, @@ -38,6 +38,12 @@ static uint8_t test_key16[16] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x10, }; +static uint8_t test_key20[20] = { 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, +}; + static uint8_t test_key24[24] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, @@ -226,6 +232,69 @@ static crypto_alg_config_t algs_config[] = { .auth_digest_len = 12, }, }, + { + .name = "aes-cbc-null", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_CBC, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .iv = { + .data = test_iv, + .length = 16, + }, + .auth_alg = ODP_AUTH_ALG_NULL + }, + }, + { + .name = "aes-cbc-hmac-sha1-96", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_CBC, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .iv = { + .data = test_iv, + .length = 16, + }, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + .auth_digest_len = 12, + }, + }, + { + .name = "null-hmac-sha1-96", + .session = { + .cipher_alg = ODP_CIPHER_ALG_NULL, + .auth_alg = ODP_AUTH_ALG_SHA1_HMAC, + .auth_key = { + .data = test_key20, + .length = sizeof(test_key20) + }, + .auth_digest_len = 12, + }, + }, + { + .name = "aes-gcm", + .session = { + .cipher_alg = ODP_CIPHER_ALG_AES_GCM, + .cipher_key = { + .data = test_key16, + .length = sizeof(test_key16) + }, + .iv = { + .data = test_iv, + .length = 12, + }, + .auth_alg = ODP_AUTH_ALG_AES_GCM, + .auth_digest_len = 16, + }, + }, }; /** ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 1 - .../linux-generic/include/odp_crypto_internal.h | 73 ----- platform/linux-generic/include/odp_internal.h | 2 + platform/linux-generic/odp_crypto.c | 365 +++++++++++++++------ platform/linux-generic/odp_init.c | 13 + test/performance/odp_crypto.c | 71 +++- 6 files changed, 346 insertions(+), 179 deletions(-) delete mode 100644 platform/linux-generic/include/odp_crypto_internal.h hooks/post-receive --

8 years, 7 months

[COMMIT] branch caterpillar updated. v1.15.0.0-963-g5251bda5

by git＠git-us.linaro.org

8 years, 7 months

[COMMIT] branch api-next updated. v1.17.0.0_tigermoth_rc1-141-g0bdad6d2

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 0bdad6d2562166eec4abeb957b6bb5067de9fe94 (commit) via 69d9c1cf33ae704ccf950747efd16bd52c37ad5e (commit) via 6511183e02141ec2fb697c3cc31336c4edb54f9c (commit) from 44974a09b01c79adb9637a5dff38539598a76737 (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 0bdad6d2562166eec4abeb957b6bb5067de9fe94 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Fri Jan 19 09:24:32 2018 -0600 api: pktio: drop support for indefinite waits on recv_tmo calls The ODP_PKTIN_WAIT option on odp_pktin_recv_tmo() and odp_pktin_recv_mq_tmo() is deprecated and removed. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index ad9b29fd..a55c2678 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -72,11 +72,6 @@ extern "C" { * Do not wait on packet input */ -/** - * @def ODP_PKTIN_WAIT - * Wait infinitely on packet input - */ - /** * Packet input mode */ @@ -884,7 +879,6 @@ int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num); * @param num Maximum number of packets to receive * @param wait Wait time specified as as follows: * * ODP_PKTIN_NO_WAIT: Do not wait - * * ODP_PKTIN_WAIT: Wait infinitely * * Other values specify the minimum time to wait. * Use odp_pktin_wait_time() to convert nanoseconds * to a valid parameter value. Wait time may be @@ -923,7 +917,6 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], * @param num Maximum number of packets to receive * @param wait Wait time specified as as follows: * * ODP_PKTIN_NO_WAIT: Do not wait - * * ODP_PKTIN_WAIT: Wait infinitely * * Other values specify the minimum time to wait. * Use odp_pktin_wait_time() to convert nanoseconds * to a valid parameter value. Wait time may be commit 69d9c1cf33ae704ccf950747efd16bd52c37ad5e Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Fri Jan 19 09:23:30 2018 -0600 linux-generic: pktio: drop support for indefinite waits in recv_tmo Drop support for the deprecated ODP_PKTIN_WAIT option on odp_pktin_recv_tmo() and odp_pktin_recv_mq_tmo() Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/packet_io.h b/include/odp/api/abi-default/packet_io.h index 4795f8fc..7cd3edd7 100644 --- a/include/odp/api/abi-default/packet_io.h +++ b/include/odp/api/abi-default/packet_io.h @@ -46,7 +46,6 @@ typedef struct odp_pktout_queue_t { #define ODP_PKTIO_MACADDR_MAXSIZE 16 #define ODP_PKTIN_NO_WAIT 0 -#define ODP_PKTIN_WAIT UINT64_MAX /** * @} diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 095f6be1..21236f79 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -40,6 +40,9 @@ * Must be power of two. */ #define SLEEP_CHECK 32 +/* Max wait time supported to avoid potential overflow */ +#define MAX_WAIT_TIME (UINT64_MAX / 1024) + static pktio_table_t *pktio_tbl; /* pktio pointer entries ( for inlines) */ @@ -1699,33 +1702,31 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, while (1) { ret = entry->s.ops->recv(entry, queue.index, packets, num); - if (ret != 0) + if (ret != 0 || wait == 0) return ret; - if (wait == 0) - return 0; - - if (wait != ODP_PKTIN_WAIT) { - /* Avoid unnecessary system calls. Record the start time - * only when needed and after the first call to recv. */ - if (odp_unlikely(!started)) { - odp_time_t t; - - t = odp_time_local_from_ns(wait * 1000); - started = 1; - t1 = odp_time_sum(odp_time_local(), t); - } + /* Avoid unnecessary system calls. Record the start time + * only when needed and after the first call to recv. */ + if (odp_unlikely(!started)) { + odp_time_t t; + + /* Avoid overflow issues for large wait times */ + if (wait > MAX_WAIT_TIME) + wait = MAX_WAIT_TIME; + t = odp_time_local_from_ns(wait * 1000); + started = 1; + t1 = odp_time_sum(odp_time_local(), t); + } - /* Check every SLEEP_CHECK rounds if total wait time - * has been exceeded. */ - if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { - t2 = odp_time_local(); + /* Check every SLEEP_CHECK rounds if total wait time + * has been exceeded. */ + if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { + t2 = odp_time_local(); - if (odp_time_cmp(t2, t1) > 0) - return 0; - } - wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; + if (odp_time_cmp(t2, t1) > 0) + return 0; } + wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; nanosleep(&ts, NULL); } @@ -1779,25 +1780,26 @@ int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, if (wait == 0) return 0; - if (wait != ODP_PKTIN_WAIT) { - if (odp_unlikely(!started)) { - odp_time_t t; + if (odp_unlikely(!started)) { + odp_time_t t; - t = odp_time_local_from_ns(wait * 1000); - started = 1; - t1 = odp_time_sum(odp_time_local(), t); - } + /* Avoid overflow issues for large wait times */ + if (wait > MAX_WAIT_TIME) + wait = MAX_WAIT_TIME; + t = odp_time_local_from_ns(wait * 1000); + started = 1; + t1 = odp_time_sum(odp_time_local(), t); + } - /* Check every SLEEP_CHECK rounds if total wait time - * has been exceeded. */ - if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { - t2 = odp_time_local(); + /* Check every SLEEP_CHECK rounds if total wait time + * has been exceeded. */ + if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { + t2 = odp_time_local(); - if (odp_time_cmp(t2, t1) > 0) - return 0; - } - wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; + if (odp_time_cmp(t2, t1) > 0) + return 0; } + wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; nanosleep(&ts, NULL); } diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 7200ceea..bbd0d6cd 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -834,8 +834,7 @@ static int netmap_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = netmap_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return netmap_recv(pktio_entry, index, pkt_table, num); @@ -872,8 +871,7 @@ static int netmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index f6fb4a73..c7a1c3ab 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -107,8 +107,7 @@ static int sock_recv_mq_tmo_select(pktio_entry_t * const *entry, timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 2d0296b8..5abf05e3 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -726,8 +726,7 @@ static int sock_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return sock_mmsg_recv(pktio_entry, index, pkt_table, num); @@ -764,8 +763,7 @@ static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], maxfd = maxfd2; } - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index f1667096..04c44bc8 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -692,8 +692,7 @@ static int sock_mmap_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_mmap_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return sock_mmap_recv(pktio_entry, index, pkt_table, num); @@ -730,8 +729,7 @@ static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { commit 6511183e02141ec2fb697c3cc31336c4edb54f9c Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Fri Jan 19 09:21:22 2018 -0600 test: validation: drop use of indefinite wait in pktio test Drop use of deprecated ODP_PKTIN_WAIT timeout option in pktio tests. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index c144294b..6592b260 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -554,10 +554,8 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[], CU_ASSERT(from_val < (unsigned)num_q); } while (num_rx < num); - if (tmo == ODP_PKTIN_WAIT) - CU_ASSERT(num_rx == num); if (num_rx < num) - CU_ASSERT(odp_time_to_ns(odp_time_diff(ts2, ts1)) >= ns); + CU_ASSERT(odp_time_diff_ns(ts2, ts1) >= ns); return num_rx; } @@ -981,7 +979,7 @@ static void test_recv_tmo(recv_tmo_mode_e mode) CU_ASSERT_FATAL(ret == test_pkt_count); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode, - ODP_PKTIN_WAIT, 0); + odp_pktin_wait_time(UINT64_MAX), 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode, ----------------------------------------------------------------------- Summary of changes: include/odp/api/abi-default/packet_io.h | 1 - include/odp/api/spec/packet_io.h | 7 --- platform/linux-generic/odp_packet_io.c | 76 +++++++++++++++-------------- platform/linux-generic/pktio/netmap.c | 6 +-- platform/linux-generic/pktio/pktio_common.c | 3 +- platform/linux-generic/pktio/socket.c | 6 +-- platform/linux-generic/pktio/socket_mmap.c | 6 +-- test/validation/api/pktio/pktio.c | 6 +-- 8 files changed, 48 insertions(+), 63 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch caterpillar updated. v1.15.0.0-962-g993e0cf7

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, caterpillar has been updated via 993e0cf7d033d25eac5113462b66c66a5bb6b737 (commit) from f87bb5146fb25f7cd62246500cb4f7e625375654 (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 993e0cf7d033d25eac5113462b66c66a5bb6b737 Author: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Date: Tue Jan 23 13:10:42 2018 +0200 pktio: mdev: coalesce tx descriptors for cxgb4 Increases tx performance from ~7Mpps -> 47Mpps Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reviewed-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-generic/pktio/mdev/cxgb4.c b/platform/linux-generic/pktio/mdev/cxgb4.c index f09835d9..acfd3bcf 100644 --- a/platform/linux-generic/pktio/mdev/cxgb4.c +++ b/platform/linux-generic/pktio/mdev/cxgb4.c @@ -33,11 +33,6 @@ #define MODULE_NAME "cxgb4" -#define CXGB4_TX_BUF_SIZE 2048U - -#define CXGB4_TX_INLINE_MAX (256 - sizeof(cxgb4_fw_eth_tx_pkt_wr_t) \ - - sizeof(cxgb4_cpl_tx_pkt_core_t)) - /* RX queue definitions */ #define CXGB4_RX_QUEUE_NUM_MAX 32 @@ -98,20 +93,52 @@ typedef struct ODP_ALIGNED_CACHE { /* TX queue definitions */ #define CXGB4_TX_QUEUE_NUM_MAX 32 +#define CXGB4_TX_BUF_SIZE 2048U typedef struct { odp_u64be_t data[8]; } cxgb4_tx_desc_t; +/* coalesced WR */ +typedef struct { + uint8_t pkt_count; + uint32_t pkt_acc_len; + uint32_t wr_len; + void *ptr; +} cxgb4_coalesce_t; + +#define COALESCE_WR_LEN 512 +#define CXGB4_DESCS_PER_BLOCK_SHIFT \ + __builtin_ctz(COALESCE_WR_LEN / sizeof(cxgb4_tx_desc_t)) +#define BLOCKS_TO_DESCS(__tmp) (__tmp << CXGB4_DESCS_PER_BLOCK_SHIFT) +#define DESCS_TO_BLOCKS(__tmp) (__tmp >> CXGB4_DESCS_PER_BLOCK_SHIFT) +/* + * Currently there are two types of coalesce WR. + * Type 0 needs 48 bytes per packet (if one sgl is present) + * and type 1 needs 32 bytes. + * type 0 can fit a maximum of 10 packets per WR and type 1 + * 15 packets. + * We only support type 1 +*/ +#define CXGB4_COALESCE_WR_TYPE1 1 + typedef struct { -#define CXGB4_FW_ETH_TX_PKT_WR 0x08000000UL - odp_u32be_t op_immdlen; +/* + * Chelsio's DPDK is using 0x09000000 Intel's 0x78000000 + * there seems to be no performance difference between these + */ +#define CXGB4_FW_ETH_TX_PKTS_WR (0x78UL << 24) +#define CXGB4_FW_WR_EQUEQ (1UL << 30) + odp_u32be_t op_pkd; odp_u32be_t equiq_to_len16; - odp_u64be_t r3; -} cxgb4_fw_eth_tx_pkt_wr_t; + odp_u32be_t r3; + odp_u16be_t pkt_acc_len; + uint8_t pkt_count; + uint8_t type; +} cxgb4_fw_eth_tx_pkts_wr_t; typedef struct { -#define CPL_TX_PKT_XT 0xEE000000UL +#define CPL_TX_PKT_XT (0xEEUL << 24) #define TXPKT_PF_S 8 #define TXPKT_PF_V(x) ((x) << TXPKT_PF_S) #define TXPKT_INTF_S 16 @@ -147,14 +174,16 @@ typedef struct { typedef struct ODP_ALIGNED_CACHE { cxgb4_tx_desc_t *tx_descs; /**< TX queue base */ cxgb4_tx_queue_stats *stats; /**< TX queue stats */ + cxgb4_coalesce_t coalesce; /**< coalesce information */ odp_u32le_t *doorbell_desc; /**< TX queue doorbell */ uint32_t doorbell_desc_key; /**< 'Key' to the doorbell */ uint16_t tx_queue_len; /**< Number of TX desc entries */ - uint16_t tx_next; /**< Next TX desc to insert */ + uint16_t pidx; /**< Next TX desc to insert */ mdev_dma_area_t tx_data; /**< TX packet payload area */ + uint64_t offset; /**< Payload offset */ odp_ticketlock_t lock; /**< TX queue lock */ } cxgb4_tx_queue_t; @@ -329,6 +358,14 @@ static int cxgb4_tx_queue_register(pktio_ops_cxgb4_data_t *pkt_cxgb4, return -1; } txq->tx_queue_len = ering.tx_pending; + /* + * We only support type1 coalescing on tx + */ + if (txq->tx_queue_len & 7) { + ODP_ERR("tx queue len needs to be a multiple of 8\n"); + return -1; + } + ret = sysfs_attr_u64_get(&val, "/sys/class/net/%s/queues/tx-%u/cxgb4/" "doorbell_desc_offset", @@ -361,8 +398,11 @@ static int cxgb4_tx_queue_register(pktio_ops_cxgb4_data_t *pkt_cxgb4, txq->stats = (cxgb4_tx_queue_stats *)(txq->tx_descs + txq->tx_queue_len); - - txq->tx_data.size = txq->tx_queue_len * CXGB4_TX_BUF_SIZE; + /* + * 1 descriptor holds 2 packets on type 1 coalescing + * we can fit 15 packets in 512 bytes(each descriptor is 64bytes long) + */ + txq->tx_data.size = 2 * txq->tx_queue_len * CXGB4_TX_BUF_SIZE; ret = mdev_dma_area_alloc(&pkt_cxgb4->mdev, &txq->tx_data); if (ret) { ODP_ERR("Cannot allocate TX queue DMA area\n"); @@ -667,118 +707,142 @@ static int cxgb4_recv(pktio_entry_t *pktio_entry, return rx_pkts; } +/* + * Fills in WR header for coalesced packets and submits it + * to the hardware + */ +static void submit_coalesced_wr(cxgb4_tx_queue_t *txq, cxgb4_tx_desc_t *txd) + +{ + uint32_t wr_mid; + cxgb4_fw_eth_tx_pkts_wr_t *wr; + + ODP_ASSERT(txq->coalesce.wr_len <= COALESCE_WR_LEN); + + /* fill the pkts WR header */ + wr = (cxgb4_fw_eth_tx_pkts_wr_t *)txd; + wr->op_pkd = odp_cpu_to_be_32(CXGB4_FW_ETH_TX_PKTS_WR); + + wr_mid = DIV_ROUND_UP(txq->coalesce.wr_len, 16); + /* Request CIDX update from firmware from time to time */ + if (!(txq->pidx & ((DESCS_TO_BLOCKS(txq->tx_queue_len) >> 2) - 1))) + wr_mid |= CXGB4_FW_WR_EQUEQ; + + wr->equiq_to_len16 = odp_cpu_to_be_32(wr_mid); + wr->pkt_acc_len = odp_cpu_to_be_16(txq->coalesce.pkt_acc_len); + wr->pkt_count = txq->coalesce.pkt_count; + wr->r3 = odp_cpu_to_be_32(0); + wr->type = CXGB4_COALESCE_WR_TYPE1; + + txq->pidx++; + if (odp_unlikely(txq->pidx >= DESCS_TO_BLOCKS(txq->tx_queue_len))) + txq->pidx = 0; + + /* zero out coalesce structure members */ + txq->coalesce.pkt_count = 0; + txq->coalesce.wr_len = 0; + txq->coalesce.pkt_acc_len = 0; + + /* + * Aggregate some coalesced wr's before ringing the doorbell + * This is going to have some impact on latency + * Chelsio default config is 1024 tx-descriptors + * We treat 512 bytes of descriptors as a single "block" which gives us + * 128 blocks in the default config. Every "block" can send up to 15 + * packets + * Instead of ringing the doorbell every block we do it every 4 blocks + * TODO implement a timer to send leftovers if a user tries to send + * less packets + */ + if (!(txq->pidx & ((DESCS_TO_BLOCKS(txq->tx_queue_len) >> 5) - 1))) + odpdrv_mmio_u32le_write(txq->doorbell_desc_key | + txq->tx_queue_len >> 5, + txq->doorbell_desc); +} + static int cxgb4_send(pktio_entry_t *pktio_entry, int txq_idx, const odp_packet_t pkt_table[], int num) { pktio_ops_cxgb4_data_t *pkt_cxgb4 = pktio_entry->s.ops_data; cxgb4_tx_queue_t *txq = &pkt_cxgb4->tx_queues[txq_idx]; - uint16_t budget, tx_txds = 0; + uint16_t budget, tx_blocks = 0; int tx_pkts = 0; if (!pkt_cxgb4->lockless_tx) odp_ticketlock_lock(&txq->lock); - /* Determine how many packets will fit in TX queue */ + /* Determine how many blocks will fit in TX queue */ budget = txq->tx_queue_len - 1; - budget -= txq->tx_next; + budget -= BLOCKS_TO_DESCS(txq->pidx); budget += odp_be_to_cpu_16(txq->stats->cidx); budget &= txq->tx_queue_len - 1; + budget = DESCS_TO_BLOCKS(budget); - while (tx_txds < budget && tx_pkts < num) { + while (tx_blocks < budget && tx_pkts < num) { uint16_t pkt_len = _odp_packet_len(pkt_table[tx_pkts]); - - cxgb4_tx_desc_t *txd = &txq->tx_descs[txq->tx_next]; - uint32_t txd_len; - - cxgb4_fw_eth_tx_pkt_wr_t *wr; + unsigned int wr_len = 0; + cxgb4_sg_list_t *sgl; + cxgb4_tx_desc_t *txd = + &txq->tx_descs[BLOCKS_TO_DESCS(txq->pidx)]; cxgb4_cpl_tx_pkt_core_t *cpl; - uint32_t op_immdlen; - - /* Skip oversized packets silently */ - if (odp_unlikely(pkt_len > CXGB4_TX_BUF_SIZE)) { - tx_pkts++; - continue; - } - - wr = (cxgb4_fw_eth_tx_pkt_wr_t *)txd; - cpl = (cxgb4_cpl_tx_pkt_core_t *)(wr + 1); - - txd_len = sizeof(*wr) + sizeof(*cpl); - op_immdlen = CXGB4_FW_ETH_TX_PKT_WR | sizeof(*cpl); - - if (pkt_len <= CXGB4_TX_INLINE_MAX) { - uint8_t *pos; - uint32_t left; - - txd_len += pkt_len; - - /* Try next time */ - if (tx_txds + DIV_ROUND_UP(txd_len, sizeof(*txd)) > - budget) - break; - - op_immdlen += pkt_len; - - /* Packet copying shall take care of wrapping */ - pos = (uint8_t *)(cpl + 1); - left = (uint8_t *)(txq->tx_descs + txq->tx_queue_len) - - pos; - - if (odp_likely(left >= pkt_len)) { - odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, - pkt_len, pos); - } else { - odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, - left, pos); - odp_packet_copy_to_mem(pkt_table[tx_pkts], left, - pkt_len - left, - &txq->tx_descs[0]); + /* Mandatory CPL header for each packet */ + wr_len = sizeof(cxgb4_cpl_tx_pkt_core_t); + + /* Mandatory SGL header with packet head addr & length */ + wr_len += sizeof(cxgb4_sg_list_t); + + if (txq->coalesce.pkt_count) { + /* + * add and check if we need to send packets when we + * reach sgl list limit + */ + if (txq->coalesce.wr_len + wr_len > COALESCE_WR_LEN) { + submit_coalesced_wr(txq, txd); + tx_blocks++; + continue; } } else { - uint32_t offset = txq->tx_next * CXGB4_TX_BUF_SIZE; - cxgb4_sg_list_t *sgl; - - txd_len += sizeof(*sgl); - - odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, pkt_len, - (uint8_t *)txq->tx_data.vaddr + - offset); - - sgl = (cxgb4_sg_list_t *)(cpl + 1); - - sgl->sg_pairs_num = - odp_cpu_to_be_32(CXGB4_ULP_TX_SC_DSGL | 1); - sgl->addr0 = - odp_cpu_to_be_64(txq->tx_data.iova + offset); - sgl->len0 = odp_cpu_to_be_32(pkt_len); + /* new WR */ + txq->coalesce.wr_len = + sizeof(cxgb4_fw_eth_tx_pkts_wr_t); + txq->coalesce.ptr = + (uint8_t *)txd + txq->coalesce.wr_len; } - wr->op_immdlen = odp_cpu_to_be_32(op_immdlen); - wr->equiq_to_len16 = - odp_cpu_to_be_32(DIV_ROUND_UP(txd_len, 16)); - wr->r3 = odp_cpu_to_be_64(0); + cpl = (cxgb4_cpl_tx_pkt_core_t *)txq->coalesce.ptr; + /* update coalesce structure for this txq */ + txq->coalesce.wr_len += wr_len; + txq->coalesce.pkt_acc_len += pkt_len; + txq->coalesce.ptr = (uint8_t *)txq->coalesce.ptr + wr_len; - cpl->ctrl0 = - odp_cpu_to_be_32(CPL_TX_PKT_XT | - TXPKT_INTF_V(pkt_cxgb4->tx_channel) | - TXPKT_PF_V(pkt_cxgb4->phys_function)); + cpl->ctrl0 = odp_cpu_to_be_32(CPL_TX_PKT_XT | + TXPKT_INTF_V(pkt_cxgb4->tx_channel) | + TXPKT_PF_V(pkt_cxgb4->phys_function)); cpl->pack = odp_cpu_to_be_16(0); cpl->len = odp_cpu_to_be_16(pkt_len); - cpl->ctrl1 = - odp_cpu_to_be_64(TXPKT_L4CSUM_DIS_F | TXPKT_IPCSUM_DIS_F); - - txq->tx_next += DIV_ROUND_UP(txd_len, sizeof(*txd)); - if (odp_unlikely(txq->tx_next >= txq->tx_queue_len)) - txq->tx_next -= txq->tx_queue_len; - - tx_txds += DIV_ROUND_UP(txd_len, sizeof(*txd)); + cpl->ctrl1 = odp_cpu_to_be_64(TXPKT_L4CSUM_DIS_F | + TXPKT_IPCSUM_DIS_F); + + odp_packet_copy_to_mem(pkt_table[tx_pkts], 0, pkt_len, + (uint8_t *)txq->tx_data.vaddr + + txq->offset); + + sgl = (cxgb4_sg_list_t *)(cpl + 1); + /* TODO add support for pairs/fragments */ + sgl->sg_pairs_num = + odp_cpu_to_be_32(CXGB4_ULP_TX_SC_DSGL | 1); + sgl->addr0 = + odp_cpu_to_be_64(txq->tx_data.iova + txq->offset); + sgl->len0 = odp_cpu_to_be_32(pkt_len); + + txq->offset += CXGB4_TX_BUF_SIZE; + if (odp_unlikely(txq->offset >= txq->tx_data.size)) + txq->offset = 0; + + txq->coalesce.pkt_count++; tx_pkts++; } - /* Ring the doorbell */ - odpdrv_mmio_u32le_write(txq->doorbell_desc_key | tx_txds, - txq->doorbell_desc); - if (!pkt_cxgb4->lockless_tx) odp_ticketlock_unlock(&txq->lock); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/mdev/cxgb4.c | 262 +++++++++++++++++++----------- 1 file changed, 163 insertions(+), 99 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-127-g6be7adab

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 6be7adab1a16a62e871bc4ed4f3c926645b2ecd0 (commit) from f7e4949e65f29f043115df1a171e0e49a4830ef6 (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 6be7adab1a16a62e871bc4ed4f3c926645b2ecd0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Jan 23 12:53:10 2018 +0200 linux-gen: test: update gitignore Add all .env files into gitignore. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/test/.gitignore b/platform/linux-generic/test/.gitignore index 2ff19897..88eb4dce 100644 --- a/platform/linux-generic/test/.gitignore +++ b/platform/linux-generic/test/.gitignore @@ -1,4 +1,3 @@ *.log *.trs -tests-linux-generic.env -tests-validation.env +*.env ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/test/.gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-126-gf7e4949e

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 f7e4949e65f29f043115df1a171e0e49a4830ef6 (commit) from 984686b0763495c6dd97d2094f292fc7e01937d0 (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 f7e4949e65f29f043115df1a171e0e49a4830ef6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jan 24 19:40:29 2018 +0300 travis: schedule long builds (distcheck) before short CROSS-tests long builds at the end of build schedule tend to prolongue build times. Move crosscompilation tests to be scheduled after coverage/distcheck tests. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 7dd7522d..b7d6cd41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,14 +58,6 @@ env: - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" - DPDK_SHARED="y" CONF="--disable-static-applications" - - CROSS_ARCH="arm64" - - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - - CROSS_ARCH="powerpc" - - CROSS_ARCH="i386" - - CROSS_ARCH="arm64" CONF="--disable-abi-compat" - - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" - - CROSS_ARCH="powerpc" CONF="--disable-abi-compat" - - CROSS_ARCH="i386" CONF="--disable-abi-compat" compiler: - gcc @@ -331,15 +323,6 @@ jobs: else true fi - - stage: test - env: TEST=checkpatch - compiler: gcc - install: - - true - script: - - echo ${TRAVIS_COMMIT_RANGE}; - - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; - - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; - stage: "build only" env: CONF="" compiler: gcc @@ -372,6 +355,63 @@ jobs: - ./bootstrap - ./configure --enable-helper-linux $CROSS - make -j $(nproc) + - stage: test + compiler: gcc + env: CROSS_ARCH="arm64" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="arm64" + - stage: test + compiler: gcc + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + - stage: test + compiler: gcc + env: CROSS_ARCH="powerpc" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="powerpc" + - stage: test + compiler: gcc + env: CROSS_ARCH="i386" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="i386" + - stage: test + compiler: gcc + env: CROSS_ARCH="arm64" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="arm64" CONF="--disable-abi-compat" + - stage: test + compiler: gcc + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" CONF="--disable-abi-compat" + - stage: test + compiler: gcc + env: CROSS_ARCH="powerpc" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="powerpc" CONF="--disable-abi-compat" + - stage: test + compiler: gcc + env: CROSS_ARCH="i386" CONF="--disable-abi-compat" + - stage: test + compiler: clang-3.8 + env: CROSS_ARCH="i386" CONF="--disable-abi-compat" + - stage: test + env: TEST=checkpatch + compiler: gcc + install: + - true + script: + - echo ${TRAVIS_COMMIT_RANGE}; + - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; + - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; after_failure: - cat config.log ----------------------------------------------------------------------- Summary of changes: .travis.yml | 74 +++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 17 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-125-g984686b0

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 984686b0763495c6dd97d2094f292fc7e01937d0 (commit) from e678e44fe99ada59b80097f97e22b0546bcdadc8 (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 984686b0763495c6dd97d2094f292fc7e01937d0 Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Jan 23 15:15:55 2018 +0530 linux-gen: cls: fix: incorrect rss hash calculation updates incorrect operator precedence updates v4 to v6 tuple in ipv6 hash generation Fixes: https://bugs.linaro.org/show_bug.cgi?id=3582 Fixes: https://bugs.linaro.org/show_bug.cgi?id=3581 Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index df49d0e4..668b41eb 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1026,8 +1026,8 @@ static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, if (pkt_hdr->p.input_flags.ipv4) { if (hash_proto.ipv4) { /* add ipv4 */ - ipv4 = (const _odp_ipv4hdr_t *)base + - pkt_hdr->p.l3_offset; + ipv4 = (const _odp_ipv4hdr_t *)(base + + pkt_hdr->p.l3_offset); tuple.v4.src_addr = ipv4->src_addr; tuple.v4.dst_addr = ipv4->dst_addr; tuple_len += 2; @@ -1035,15 +1035,15 @@ static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, if (pkt_hdr->p.input_flags.tcp && hash_proto.tcp) { /* add tcp */ - tcp = (const _odp_tcphdr_t *)base + - pkt_hdr->p.l4_offset; + tcp = (const _odp_tcphdr_t *)(base + + pkt_hdr->p.l4_offset); tuple.v4.sport = tcp->src_port; tuple.v4.dport = tcp->dst_port; tuple_len += 1; } else if (pkt_hdr->p.input_flags.udp && hash_proto.udp) { /* add udp */ - udp = (const _odp_udphdr_t *)base + - pkt_hdr->p.l4_offset; + udp = (const _odp_udphdr_t *)(base + + pkt_hdr->p.l4_offset); tuple.v4.sport = udp->src_port; tuple.v4.dport = udp->dst_port; tuple_len += 1; @@ -1051,23 +1051,23 @@ static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, } else if (pkt_hdr->p.input_flags.ipv6) { if (hash_proto.ipv6) { /* add ipv6 */ - ipv6 = (const _odp_ipv6hdr_t *)base + - pkt_hdr->p.l3_offset; + ipv6 = (const _odp_ipv6hdr_t *)(base + + pkt_hdr->p.l3_offset); thash_load_ipv6_addr(ipv6, &tuple); tuple_len += 8; } if (pkt_hdr->p.input_flags.tcp && hash_proto.tcp) { - tcp = (const _odp_tcphdr_t *)base + - pkt_hdr->p.l4_offset; - tuple.v4.sport = tcp->src_port; - tuple.v4.dport = tcp->dst_port; + tcp = (const _odp_tcphdr_t *)(base + + pkt_hdr->p.l4_offset); + tuple.v6.sport = tcp->src_port; + tuple.v6.dport = tcp->dst_port; tuple_len += 1; } else if (pkt_hdr->p.input_flags.udp && hash_proto.udp) { /* add udp */ - udp = (const _odp_udphdr_t *)base + - pkt_hdr->p.l4_offset; - tuple.v4.sport = udp->src_port; - tuple.v4.dport = udp->dst_port; + udp = (const _odp_udphdr_t *)(base + + pkt_hdr->p.l4_offset); + tuple.v6.sport = udp->src_port; + tuple.v6.dport = udp->dst_port; tuple_len += 1; } } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_classification.c | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) hooks/post-receive --

8 years, 7 months

[COMMIT] branch master updated. v1.17.0.0_tigermoth_rc1-124-ge678e44f

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 e678e44fe99ada59b80097f97e22b0546bcdadc8 (commit) from 27480d82bd93a881ae683a3c314c11042a68ce29 (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 e678e44fe99ada59b80097f97e22b0546bcdadc8 Author: Philip Colmer <philip.colmer(a)linaro.org> Date: Wed Jan 24 13:08:06 2018 +0000 docs: fixing broken links Signed-off-by: Philip Colmer <philip.colmer(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc index 794beb00..f0ba0336 100644 --- a/doc/implementers-guide/implementers-guide.adoc +++ b/doc/implementers-guide/implementers-guide.adoc @@ -203,7 +203,7 @@ Examples of modules for the application interface includes "classification" (functions dealing with time, excluding timers which have their own module), timer, ... The complete module list can be seen at: -http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html[ODP Modules] + +https://www.opendataplane.org/api-documentation/master/api/modules.html[ODP Modules] + Within the platform agnostic area, the validation tests for a given interface are also grouped by modules, matching the ODP interface modules: for instance, `test/common_plat/validation/api` mainly contains a list of diff --git a/doc/process-guide/release-guide.adoc b/doc/process-guide/release-guide.adoc index 595af91a..e5d72cb0 100644 --- a/doc/process-guide/release-guide.adoc +++ b/doc/process-guide/release-guide.adoc @@ -23,7 +23,7 @@ potentially backwards incompatible happening at lower frequency. Generation releases are significantly less frequent. The specific digits used for the generation and version numbering are described in the ODP API Documentation. The roles referenced in this document are defined in the -http://www.opendataplane.org/api-documentation/by-laws/[By-laws]. +https://www.opendataplane.org/developers/bylaws/index.html[By-laws]. === Patch to release flow === Changes to the API are staged in api-next until they have been sufficiently ----------------------------------------------------------------------- Summary of changes: doc/implementers-guide/implementers-guide.adoc | 2 +- doc/process-guide/release-guide.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

8 years, 7 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp