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@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@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@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
-
git＠git-us.linaro.org