git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch api-next updated. v1.19.0.0_tigermoth-10-g29cb8605

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 discards 1c11eb2f0e612eb9b7a6cbe91a3e4ac3e61c7b80 (commit) via 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit) via acc05760d5060d1782aa597e44c72ccb9a71b63b (commit) via c440dfceff97526d2763383afd8da064faef3d0d (commit) via 93591a6134fbc5655c0cf6a25e0b4e0668357971 (commit) via fec701841dbe2e963cf3adc7c74c98b41e059b9d (commit) via 0e24607e3075a573ebe4ac408703c76daac7236c (commit) via 5d4be5077adeec54d1956c86dcb87b186c39a7cb (commit) via 3aa3f4352083d159260cebc23b87607e73aa6f2b (commit) via 0d4271e31fe685a8a82381d21d5166f0398080c1 (commit) via d324b9de12c510ccf9fa1c1b6ece327c578ee53d (commit) via e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (commit) via 1e0ac11c75eee10959d1fa674a05e746476271b3 (commit) via 8caae505c35444706cff8815c41821d80e791403 (commit) via 4b6787c84e020c350a03ec47d12e1ef68ddb6300 (commit) via 4142652b8eb397963bec48610bdb9ab6599e65fb (commit) via 60777ba4309911df0780bd8de6d96524bc2ca03c (commit) via b2632ac253a3b9f5ba7a4174acf6abe295ec3550 (commit) via 79f5c103310c36dc213a552b9534f68ce8df1132 (commit) via 2c99a9dc1978c9178e711d264aaaca2bc4702352 (commit) via 88ba35773c76c871a222fe48a0dac05765c39936 (commit) via 2e96afe0b7c4e7e41fb03bcda605ab704f538ca1 (commit) via 52ea8d51d522d7013f746748bf84bfc2e9bc042c (commit) via b7ee13d765e5d8da1ef68f0c0777cb5e40fffbf7 (commit) via a2cad95118b79f204bc13914acf43a8fc1dd2682 (commit) via a5340c53957b3174c89d03ecf2c61e9ba98ac57c (commit) via 813cd2df67ae0591b0f792eff82854c5c9c642ca (commit) via 48f8503baf847315dda6609abc01f5befe6e0284 (commit) via b1100fdba29d8f514236dbcfd6f17e7941c0256a (commit) via f96a21992e13cf401a3494f2caeec9d42f56f0d9 (commit) via 1e925d0ccc7340575ddcfa07ab7bd372d751e006 (commit) via c9d31f30ba4fd7818b4ba2ffd7bbaea74761a2d9 (commit) via cabee48a54a68f333569ee1904bc04d53da7c9c6 (commit) via 183ce9babe20e161caef6b55eccfd043b334f748 (commit) via 0fa9977e21010f963892f59a75f03e3ba800bc74 (commit) via b0b07f403ffc22349ac8dd75f47238bea40891be (commit) via bd0377ae95427e80f04b0dd5f3a8dcb0b1ab89e3 (commit) via 5555878edbda765134fbe50f3181f409963037ea (commit) via 009dab38672eaf8ab6eddc551da41a84e86915a5 (commit) via 290decaf3259b036c3a402be428b04ba100f0f81 (commit) via 61d16e162788ac0923c544b4d31bb847fa3d9189 (commit) via 83fda5a447335b95bdd991187d4efb0a15a5709a (commit) via 654507c6eeed83dd84210f7e481ded34f5d4cdca (commit) via 84f8013995d4b96ac9471cc92285c76b50464415 (commit) via 92ebb26bae583ff864bc4bef6a2776329527a069 (commit) via ed4e1bfea15d8502e50b6c210f38dd3f13683d2f (commit) via ef5998dfd0ba1405fef6dd1a7f0e9adf686fca89 (commit) via a430caf661d4a0ad8d69c67dc7a20911e3169a25 (commit) via fbe07de54f3768f32bd39a0ea9aa2a79188b1186 (commit) via 57df98eca15fe64a716f9f555714ef5fb9cd25e9 (commit) via 674ea087fba016e55f03e3966fe64fc908141f8f (commit) via a9584da4284c04e45a9584a58c6dbeb404871119 (commit) via 63123149319eb0e379dc52a3f4691993d026f3bf (commit) via 9a5a18af733c07109224e328ca0ac640ff49f845 (commit) via 06321dc028b83ea78b39eb9673859a40f9da37f7 (commit) via d6de4dfcf1a3a6c861c87d47990f793c71328eda (commit) via fc0a57306aa68a782e8611a9bd08ae10aaa5274a (commit) via 2eaf47b69ea5f2095e26e0ea597d3e8702b0da06 (commit) via 9f3311f92d28ef9fdf6ef3d8ec8b90efe7a832d6 (commit) via 68b1a52611e6ac9be306e5a17d009a6fd46c455e (commit) via 59d636481fd1771107f3eb4632c2a9fc868afc11 (commit) via 0225a8a396ddc7168be096f28b0a711184a48ef9 (commit) via 72febbae5ea55a5fd051978fbfa0f669cf0e99fc (commit) via f80f28c4046b650c180bcb9b41c859c0c8e2564e (commit) via b08aa94548163ae4d4bac2724e68ca9102667f6a (commit) via 4aacfd4d72b80a22d449d865a6c4f063afa823ab (commit) via 71ca38c00c11ebb6b4dede6d09ebdd28eb45d890 (commit) via 7e0c523ad6f209f238277e4116c21ba696edb7f4 (commit) via 12d238d96318cc9d46dd5a2893894824a633805b (commit) via bcd246e3a9948a631eb8eb77886ac1b369b13dba (commit) via c57da8ddc80e0e314957c6d11db288ef11fc1805 (commit) via 535ad269bfc6581a048d3e844576063be5d19501 (commit) via d8dd54f2325cf859703721e7a17b6cbe734d857a (commit) via edc9616a1bbc0fbc2d7f84ddafeb119d689f3f70 (commit) via 31d3492b50b057df853ad51c909ac21d6e95a4ca (commit) via 74f7b6d1a003175f1cddf979212631a0d7832399 (commit) via 3c5cc8070d3bc8b7429f0410de6ef3009ff6a28f (commit) via 4665f6d2987fb26ad006cb56b02b3ef4c170f371 (commit) via d3690d4115441dc69d9571cb5261dd005a112d39 (commit) via 364887331875180c498abb8b7681a228ca21181e (commit) via eca5df13cf7987d6e3cd3cc930851671b071e4b3 (commit) via c8dc27d1fb5c890143338439f1cdbe3b2719174c (commit) via 62ef9d5c92e0f56f45767f4c73df214d4393e158 (commit) via 41fd242a0685e79cb6f1b1e1826e6734bea2f359 (commit) via 35a90a547466db90c00d6375d8d9a3573e84e99b (commit) via 9a1d48b1262d88e55922c4e1ed9f91ed2e3376d7 (commit) via 1e70adc3ae54b0c4518bdb51d94301f1dafe4ebf (commit) via 91282a4c578716f157aa8a5e0a9bf9bd25b19a17 (commit) via e009051a0166fa25e601190354e0333aa30ad58d (commit) via 36f589b5a84804ce246bcd9a3eb9352801aaf41d (commit) via 2bbd7ace9e236d27dcfb52acfef991bd5ce39354 (commit) via 196d8f518071cc8c37dde0835cb7559d6cdd55da (commit) via 42fc5ebdcd5a1e5fbb7a19a2756a310f23a0cdd5 (commit) via bb8015d15ca4b0e2033eeca09906032a88e74bff (commit) via 3e61be54a77ed8ccc2030e88b9a26372d3f76e2c (commit) via c0da87688187c81039cf81790fed3d6ed00a956e (commit) via c2a1c48f5fc17cf4dd870057d17059ad668d29ad (commit) via c67dcec1c034a0c75c093b49e2a172bbd3d50def (commit) via 80b9a1e4d6a297ac916cbaf360e7b2114ef86a7a (commit) via 7135eda6854ba60d6379ca5799b4b58959e998b5 (commit) via 017969502cd0247c9b25e80e002ac563860f5a5d (commit) via 3a4f369fb2019761af5d4d7ad09d48f1e5d44f82 (commit) via 962600ecdbe44d386f95a57ac5a91365af0b6c39 (commit) via 6ea708c0f9f36b9a90f463dd1f7e0332f82e079b (commit) via 534667daec58ce8b2e417709e788934bea6f8f09 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (1c11eb2f0e612eb9b7a6cbe91a3e4ac3e61c7b80) \ N -- N -- N (29cb860583cb906bc16eddf9a4c98d6bb37333e5) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .checkpatch.conf | 5 + .shippable.yml | 21 +- .travis.yml | 20 +- CHANGELOG | 154 ++ DEPENDENCIES | 6 +- Makefile.am | 8 +- config/README | 10 + config/odp-linux-generic.conf | 58 + configure.ac | 21 +- doc/users-guide/users-guide-cls.adoc | 2 +- doc/users-guide/users-guide-crypto.adoc | 2 +- doc/users-guide/users-guide-ipsec.adoc | 4 +- doc/users-guide/users-guide-packet.adoc | 35 + doc/users-guide/users-guide-pktio.adoc | 374 ++++- doc/users-guide/users-guide-tm.adoc | 8 +- doc/users-guide/users-guide.adoc | 68 +- example/Makefile.inc | 2 + example/l2fwd/README | 7 + m4/odp_dpdk.m4 | 11 +- m4/odp_libconfig.m4 | 29 + .../m4/odp_schedule.m4 => m4/odp_scheduler.m4 | 5 + platform/Makefile.inc | 5 +- platform/linux-generic/.gitignore | 1 + platform/linux-generic/Makefile.am | 76 +- .../linux-generic/include/odp_buffer_inlines.h | 5 + ...fdserver_internal.h => odp_fdserver_internal.h} | 0 platform/linux-generic/include/odp_internal.h | 5 + .../{_ishm_internal.h => odp_ishm_internal.h} | 0 ...{_ishmphy_internal.h => odp_ishmphy_internal.h} | 0 ...ishmpool_internal.h => odp_ishmpool_internal.h} | 0 .../linux-generic/include/odp_libconfig_internal.h | 34 + platform/linux-generic/include/odp_packet_dpdk.h | 10 +- .../linux-generic/include/odp_packet_internal.h | 4 + platform/linux-generic/include/odp_packet_netmap.h | 7 + .../linux-generic/include/odp_queue_internal.h | 24 + platform/linux-generic/include/odp_queue_lf.h | 1 - platform/linux-generic/include/odp_schedule_if.h | 8 +- .../include/odp_schedule_scalable_ordered.h | 2 +- platform/linux-generic/libodp-linux.pc.in | 1 + platform/linux-generic/m4/configure.m4 | 5 +- platform/linux-generic/odp_crypto.c | 256 +++- .../linux-generic/{_fdserver.c => odp_fdserver.c} | 77 +- platform/linux-generic/odp_impl.c | 30 +- platform/linux-generic/odp_init.c | 14 + platform/linux-generic/odp_ipsec.c | 214 +-- platform/linux-generic/odp_ipsec_sad.c | 9 + platform/linux-generic/{_ishm.c => odp_ishm.c} | 131 +- .../linux-generic/{_ishmphy.c => odp_ishmphy.c} | 6 +- .../linux-generic/{_ishmpool.c => odp_ishmpool.c} | 4 +- platform/linux-generic/odp_libconfig.c | 135 ++ platform/linux-generic/odp_packet.c | 239 +++ platform/linux-generic/odp_packet_io.c | 145 +- platform/linux-generic/odp_pool.c | 9 +- platform/linux-generic/odp_queue_basic.c | 213 ++- platform/linux-generic/odp_queue_lf.c | 2 +- platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_random.c | 54 + platform/linux-generic/odp_schedule_basic.c | 633 ++++---- platform/linux-generic/odp_schedule_iquery.c | 23 +- platform/linux-generic/odp_schedule_scalable.c | 4 +- platform/linux-generic/odp_schedule_sp.c | 7 +- platform/linux-generic/odp_shared_memory.c | 2 +- platform/linux-generic/odp_system_info.c | 26 +- platform/linux-generic/pktio/dpdk.c | 111 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/loop.c | 110 +- platform/linux-generic/pktio/netmap.c | 63 + .../test/mmap_vlan_ins/mmap_vlan_ins.sh | 3 + platform/linux-generic/test/ring/Makefile.am | 2 + scripts/build-pktio-dpdk | 7 +- scripts/checkpatch.pl | 1552 ++++++++++++++++---- scripts/ci-checkpatches.sh | 4 +- test/Makefile.inc | 2 + test/miscellaneous/odp_api_from_cpp.cpp | 6 +- test/performance/.gitignore | 2 + test/performance/Makefile.am | 11 + test/performance/odp_crypto.c | 271 +++- test/performance/{odp_crypto.c => odp_ipsec.c} | 1035 +++++++------ test/performance/odp_sched_latency.c | 9 +- test/performance/odp_sched_pktio.c | 800 ++++++++++ .../{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} | 69 +- .../api/classification/odp_classification_tests.c | 59 +- .../classification/odp_classification_testsuites.h | 12 + test/validation/api/crypto/odp_crypto_test_inp.c | 95 +- test/validation/api/crypto/test_vectors.h | 209 +++ test/validation/api/crypto/test_vectors_len.h | 10 + test/validation/api/ipsec/ipsec.c | 17 +- test/validation/api/ipsec/ipsec_test_out.c | 194 +++ test/validation/api/ipsec/test_vectors.h | 89 +- test/validation/api/pktio/pktio.c | 669 ++++++--- test/validation/api/scheduler/scheduler.c | 4 +- test/validation/api/timer/timer.c | 336 ++++- 92 files changed, 7070 insertions(+), 1958 deletions(-) create mode 100644 config/odp-linux-generic.conf create mode 100644 m4/odp_libconfig.m4 rename platform/linux-generic/m4/odp_schedule.m4 => m4/odp_scheduler.m4 (73%) rename platform/linux-generic/include/{_fdserver_internal.h => odp_fdserver_internal.h} (100%) rename platform/linux-generic/include/{_ishm_internal.h => odp_ishm_internal.h} (100%) rename platform/linux-generic/include/{_ishmphy_internal.h => odp_ishmphy_internal.h} (100%) rename platform/linux-generic/include/{_ishmpool_internal.h => odp_ishmpool_internal.h} (100%) create mode 100644 platform/linux-generic/include/odp_libconfig_internal.h rename platform/linux-generic/{_fdserver.c => odp_fdserver.c} (91%) rename platform/linux-generic/{_ishm.c => odp_ishm.c} (98%) rename platform/linux-generic/{_ishmphy.c => odp_ishmphy.c} (98%) rename platform/linux-generic/{_ishmpool.c => odp_ishmpool.c} (99%) create mode 100644 platform/linux-generic/odp_libconfig.c create mode 100644 platform/linux-generic/odp_random.c copy test/performance/{odp_crypto.c => odp_ipsec.c} (56%) create mode 100644 test/performance/odp_sched_pktio.c copy test/performance/{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} (50%) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-10-g29cb8605

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 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit) from acc05760d5060d1782aa597e44c72ccb9a71b63b (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 29cb860583cb906bc16eddf9a4c98d6bb37333e5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Apr 23 13:52:31 2018 +0300 test: crypto perf: check algorithm capabilities Test only those algorithms that implementation supports. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 8841c127..8a5f2c5b 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -187,6 +187,14 @@ typedef struct { struct rusage ru_thread; /**< Rusage value for current thread */ } time_record_t; +/* Arguments for one test run */ +typedef struct test_run_arg_t { + crypto_args_t crypto_args; + crypto_alg_config_t *crypto_alg_config; + odp_crypto_capability_t crypto_capa; + +} test_run_arg_t; + static void parse_args(int argc, char *argv[], crypto_args_t *cargs); static void usage(char *progname); @@ -856,18 +864,106 @@ run_measure_one(crypto_args_t *cargs, return rc < 0 ? rc : 0; } +static int check_cipher_alg(odp_crypto_capability_t *capa, + odp_cipher_alg_t alg) +{ + switch (alg) { + case ODP_CIPHER_ALG_NULL: + if (capa->ciphers.bit.null) + return 0; + case ODP_CIPHER_ALG_DES: + if (capa->ciphers.bit.des) + return 0; + case ODP_CIPHER_ALG_3DES_CBC: + if (capa->ciphers.bit.trides_cbc) + return 0; + case ODP_CIPHER_ALG_AES_CBC: + if (capa->ciphers.bit.aes_cbc) + return 0; + case ODP_CIPHER_ALG_AES_CTR: + if (capa->ciphers.bit.aes_ctr) + return 0; + case ODP_CIPHER_ALG_AES_GCM: + if (capa->ciphers.bit.aes_gcm) + return 0; + case ODP_CIPHER_ALG_AES_CCM: + if (capa->ciphers.bit.aes_ccm) + return 0; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + if (capa->ciphers.bit.chacha20_poly1305) + return 0; + default: + return -1; + } +} + +static int check_auth_alg(odp_crypto_capability_t *capa, + odp_auth_alg_t alg) +{ + switch (alg) { + case ODP_AUTH_ALG_NULL: + if (capa->auths.bit.null) + return 0; + case ODP_AUTH_ALG_MD5_HMAC: + if (capa->auths.bit.md5_hmac) + return 0; + case ODP_AUTH_ALG_SHA1_HMAC: + if (capa->auths.bit.sha1_hmac) + return 0; + case ODP_AUTH_ALG_SHA256_HMAC: + if (capa->auths.bit.sha256_hmac) + return 0; + case ODP_AUTH_ALG_SHA384_HMAC: + if (capa->auths.bit.sha384_hmac) + return 0; + case ODP_AUTH_ALG_SHA512_HMAC: + if (capa->auths.bit.sha512_hmac) + return 0; + case ODP_AUTH_ALG_AES_GCM: + if (capa->auths.bit.aes_gcm) + return 0; + case ODP_AUTH_ALG_AES_GMAC: + if (capa->auths.bit.aes_gmac) + return 0; + case ODP_AUTH_ALG_AES_CCM: + if (capa->auths.bit.aes_ccm) + return 0; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + if (capa->auths.bit.chacha20_poly1305) + return 0; + default: + return -1; + } +} + /** * Process one algorithm. Note if paload size is specicified it is * only one run. Or iterate over set of predefined payloads. */ -static int -run_measure_one_config(crypto_args_t *cargs, - crypto_alg_config_t *config) +static int run_measure_one_config(test_run_arg_t *arg) { crypto_run_result_t result; odp_crypto_session_t session; + crypto_args_t *cargs = &arg->crypto_args; + crypto_alg_config_t *config = arg->crypto_alg_config; + odp_crypto_capability_t crypto_capa = arg->crypto_capa; int rc = 0; + if (check_cipher_alg(&crypto_capa, config->session.cipher_alg)) { + printf(" Cipher algorithm not supported\n"); + rc = 1; + } + + if (check_auth_alg(&crypto_capa, config->session.auth_alg)) { + printf(" Auth algorithm not supported\n"); + rc = 1; + } + + if (rc) { + printf(" => %s skipped\n\n", config->name); + return 0; + } + if (create_session_from_config(&session, config, cargs)) return -1; @@ -898,17 +994,9 @@ run_measure_one_config(crypto_args_t *cargs, return rc; } -typedef struct thr_arg { - crypto_args_t crypto_args; - crypto_alg_config_t *crypto_alg_config; -} thr_arg_t; - static int run_thr_func(void *arg) { - thr_arg_t *thr_args = (thr_arg_t *)arg; - - run_measure_one_config(&thr_args->crypto_args, - thr_args->crypto_alg_config); + run_measure_one_config((test_run_arg_t *)arg); return 0; } @@ -919,13 +1007,14 @@ int main(int argc, char *argv[]) odp_queue_param_t qparam; odp_pool_param_t params; odp_queue_t out_queue = ODP_QUEUE_INVALID; - thr_arg_t thr_arg; + test_run_arg_t test_run_arg; odp_cpumask_t cpumask; char cpumaskstr[ODP_CPUMASK_STR_SIZE]; int num_workers = 1; odph_odpthread_t thr[num_workers]; odp_instance_t instance; - odp_pool_capability_t capa; + odp_pool_capability_t pool_capa; + odp_crypto_capability_t crypto_capa; uint32_t max_seg_len; unsigned i; @@ -943,12 +1032,17 @@ int main(int argc, char *argv[]) /* Init this thread */ odp_init_local(instance, ODP_THREAD_WORKER); - if (odp_pool_capability(&capa)) { + if (odp_crypto_capability(&crypto_capa)) { + app_err("Crypto capability request failed.\n"); + exit(EXIT_FAILURE); + } + + if (odp_pool_capability(&pool_capa)) { app_err("Pool capability request failed.\n"); exit(EXIT_FAILURE); } - max_seg_len = capa.pkt.max_seg_len; + max_seg_len = pool_capa.pkt.max_seg_len; for (i = 0; i < sizeof(payloads) / sizeof(unsigned int); i++) { if (payloads[i] > max_seg_len) @@ -991,9 +1085,6 @@ int main(int argc, char *argv[]) if (cargs.schedule) { printf("Run in async scheduled mode\n"); - - thr_arg.crypto_args = cargs; - thr_arg.crypto_alg_config = cargs.alg_config; num_workers = odp_cpumask_default_worker(&cpumask, num_workers); (void)odp_cpumask_to_str(&cpumask, cpumaskstr, @@ -1012,12 +1103,16 @@ int main(int argc, char *argv[]) memset(thr, 0, sizeof(thr)); + test_run_arg.crypto_args = cargs; + test_run_arg.crypto_alg_config = cargs.alg_config; + test_run_arg.crypto_capa = crypto_capa; + if (cargs.alg_config) { odph_odpthread_params_t thr_params; memset(&thr_params, 0, sizeof(thr_params)); thr_params.start = run_thr_func; - thr_params.arg = &thr_arg; + thr_params.arg = &test_run_arg; thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; @@ -1025,7 +1120,7 @@ int main(int argc, char *argv[]) odph_odpthreads_create(&thr[0], &cpumask, &thr_params); odph_odpthreads_join(&thr[0]); } else { - run_measure_one_config(&cargs, cargs.alg_config); + run_measure_one_config(&test_run_arg); } } else { unsigned int i; @@ -1033,7 +1128,8 @@ int main(int argc, char *argv[]) for (i = 0; i < (sizeof(algs_config) / sizeof(crypto_alg_config_t)); i++) { - run_measure_one_config(&cargs, algs_config + i); + test_run_arg.crypto_alg_config = algs_config + i; + run_measure_one_config(&test_run_arg); } } ----------------------------------------------------------------------- Summary of changes: test/performance/odp_crypto.c | 140 +++++++++++++++++++++++++++++++++++------- 1 file changed, 118 insertions(+), 22 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-9-gacc05760

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 acc05760d5060d1782aa597e44c72ccb9a71b63b (commit) from c440dfceff97526d2763383afd8da064faef3d0d (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 acc05760d5060d1782aa597e44c72ccb9a71b63b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Apr 3 15:48:12 2018 +0300 validation: crypto: zero return code of odp_crypto_op/odp_crypto_op_enq crypto_main test will accept odp_crypto_op/odp_crypto_op_enq returning 0 meaning 0 packets were processed. Instead it should mark test as failedin this case. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3763 Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index aa053dd5..676b9b12 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -200,7 +200,7 @@ static int alg_packet_op(odp_packet_t pkt, op_params.hash_result_offset = plaintext_len; rc = odp_crypto_op(&pkt, &out_pkt, &op_params, 1); - if (rc < 0) { + if (rc <= 0) { CU_FAIL("Failed odp_crypto_packet_op()"); return rc; } @@ -261,7 +261,7 @@ static int alg_packet_op_enq(odp_packet_t pkt, op_params.hash_result_offset = plaintext_len; rc = odp_crypto_op_enq(&pkt, &pkt, &op_params, 1); - if (rc < 0) { + if (rc <= 0) { CU_FAIL("Failed odp_crypto_op_enq()"); return rc; } ----------------------------------------------------------------------- Summary of changes: test/validation/api/crypto/odp_crypto_test_inp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.19.0.0_tigermoth-8-gc440dfce

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 c440dfceff97526d2763383afd8da064faef3d0d (commit) via 93591a6134fbc5655c0cf6a25e0b4e0668357971 (commit) via fec701841dbe2e963cf3adc7c74c98b41e059b9d (commit) via 0e24607e3075a573ebe4ac408703c76daac7236c (commit) via 5d4be5077adeec54d1956c86dcb87b186c39a7cb (commit) via 3aa3f4352083d159260cebc23b87607e73aa6f2b (commit) via 0d4271e31fe685a8a82381d21d5166f0398080c1 (commit) via d324b9de12c510ccf9fa1c1b6ece327c578ee53d (commit) from e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (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 c440dfceff97526d2763383afd8da064faef3d0d Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sun Apr 22 10:18:17 2018 +0300 linux-generic: random: split from crypto module While random and crypto might share some implementation details, in case of linux-generic and linux-DPDK it might be easier to split them to two different files. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4f03eab1..7d1d5554 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -175,6 +175,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_queue_if.c \ odp_queue_lf.c \ odp_queue_scalable.c \ + odp_random.c \ odp_rwlock.c \ odp_rwlock_recursive.c \ odp_schedule_basic.c \ diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 852f0212..aca822d8 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -23,7 +23,6 @@ #include <string.h> #include <stdlib.h> -#include <openssl/rand.h> #include <openssl/hmac.h> #include <openssl/cmac.h> #include <openssl/evp.h> @@ -1954,47 +1953,6 @@ int _odp_crypto_term_local(void) return 0; } -odp_random_kind_t odp_random_max_kind(void) -{ - return ODP_RANDOM_CRYPTO; -} - -int32_t odp_random_data(uint8_t *buf, uint32_t len, odp_random_kind_t kind) -{ - int rc; - - switch (kind) { - case ODP_RANDOM_BASIC: - case ODP_RANDOM_CRYPTO: - rc = RAND_bytes(buf, len); - return (1 == rc) ? (int)len /*success*/: -1 /*failure*/; - - case ODP_RANDOM_TRUE: - default: - return -1; - } -} - -int32_t odp_random_test_data(uint8_t *buf, uint32_t len, uint64_t *seed) -{ - union { - uint32_t rand_word; - uint8_t rand_byte[4]; - } u; - uint32_t i = 0, j; - uint32_t seed32 = (*seed) & 0xffffffff; - - while (i < len) { - u.rand_word = rand_r(&seed32); - - for (j = 0; j < 4 && i < len; j++, i++) - *buf++ = u.rand_byte[j]; - } - - *seed = seed32; - return len; -} - odp_crypto_compl_t odp_crypto_compl_from_event(odp_event_t ev) { /* This check not mandated by the API specification */ diff --git a/platform/linux-generic/odp_random.c b/platform/linux-generic/odp_random.c new file mode 100644 index 00000000..22894c47 --- /dev/null +++ b/platform/linux-generic/odp_random.c @@ -0,0 +1,54 @@ +/* Copyright (c) 2014-2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp_posix_extensions.h> +#include <odp_internal.h> +#include <odp/api/random.h> + +#include <openssl/rand.h> + +odp_random_kind_t odp_random_max_kind(void) +{ + return ODP_RANDOM_CRYPTO; +} + +int32_t odp_random_data(uint8_t *buf, uint32_t len, odp_random_kind_t kind) +{ + int rc; + + switch (kind) { + case ODP_RANDOM_BASIC: + case ODP_RANDOM_CRYPTO: + rc = RAND_bytes(buf, len); + return (1 == rc) ? (int)len /*success*/: -1 /*failure*/; + + case ODP_RANDOM_TRUE: + default: + return -1; + } +} + +int32_t odp_random_test_data(uint8_t *buf, uint32_t len, uint64_t *seed) +{ + union { + uint32_t rand_word; + uint8_t rand_byte[4]; + } u; + uint32_t i = 0, j; + uint32_t seed32 = (*seed) & 0xffffffff; + + while (i < len) { + u.rand_word = rand_r(&seed32); + + for (j = 0; j < 4 && i < len; j++, i++) + *buf++ = u.rand_byte[j]; + } + + *seed = seed32; + return len; +} commit 93591a6134fbc5655c0cf6a25e0b4e0668357971 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Apr 20 14:25:30 2018 +0300 validation: timer: honor min timeout param value Timeout requests should be between min_tmo and max_tmo timer pool parameters, if too early/too late return codes are reported as test failures. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index f81a3d09..a34885c0 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -497,7 +497,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) uint32_t ncancel; uint32_t ntoolate; uint32_t ms; - uint64_t prev_tick; + uint64_t prev_tick, nsec; odp_event_t ev; struct timespec ts; uint32_t nstale; @@ -539,9 +539,9 @@ static int worker_entrypoint(void *arg TEST_UNUSED) /* Initial set all timers with a random expiration time */ nset = 0; for (i = 0; i < allocated; i++) { - tck = odp_timer_current_tick(tp) + 1 + - odp_timer_ns_to_tick(tp, (rand_r(&seed) % RANGE_MS) - * 1000000ULL); + nsec = MIN_TMO + (rand_r(&seed) % RANGE_MS) * 1000000ULL; + tck = odp_timer_current_tick(tp) + + odp_timer_ns_to_tick(tp, nsec); timer_rc = odp_timer_set_abs(tt[i].tim, tck, &tt[i].ev); if (timer_rc == ODP_TIMER_TOOEARLY) { LOG_ERR("Missed tick, setting timer\n"); @@ -585,7 +585,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) } else { odp_timer_set_t rc; uint64_t cur_tick; - uint64_t tck, nsec; + uint64_t tck; if (tt[i].ev != ODP_EVENT_INVALID) /* Timer inactive => set */ @@ -594,16 +594,18 @@ static int worker_entrypoint(void *arg TEST_UNUSED) /* Timer active => reset */ nreset++; - nsec = (rand_r(&seed) % RANGE_MS) * 1000000ULL; - tck = 1 + odp_timer_ns_to_tick(tp, nsec); + nsec = MIN_TMO + + (rand_r(&seed) % RANGE_MS) * 1000000ULL; + tck = odp_timer_ns_to_tick(tp, nsec); cur_tick = odp_timer_current_tick(tp); rc = odp_timer_set_rel(tt[i].tim, tck, &tt[i].ev); - if (rc == ODP_TIMER_TOOEARLY || - rc == ODP_TIMER_TOOLATE) { - CU_FAIL("Failed to set timer (tooearly/toolate)"); - } else if (rc != ODP_TIMER_SUCCESS) { + if (rc == ODP_TIMER_TOOEARLY) { + CU_FAIL("Failed to set timer: TOO EARLY"); + } else if (rc == ODP_TIMER_TOOLATE) { + CU_FAIL("Failed to set timer: TOO LATE"); + } else if (rc == ODP_TIMER_NOEVENT) { /* Set/reset failed, timer already expired */ ntoolate++; } else if (rc == ODP_TIMER_SUCCESS) { @@ -611,6 +613,8 @@ static int worker_entrypoint(void *arg TEST_UNUSED) tt[i].tick = cur_tick + tck; /* ODP timer owns the event now */ tt[i].ev = ODP_EVENT_INVALID; + } else { + CU_FAIL("Failed to set timer: bad return code"); } } ts.tv_sec = 0; @@ -743,7 +747,10 @@ static void timer_test_odp_timer_all(void) CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); LOG_DBG("Timer pool handle: %" PRIu64 "\n", odp_timer_pool_to_u64(tp)); - LOG_DBG("#timers..: %u\n", NTIMERS); + LOG_DBG("Resolution: %" PRIu64 "\n", tparam.res_ns); + LOG_DBG("Min timeout: %" PRIu64 "\n", tparam.min_tmo); + LOG_DBG("Max timeout: %" PRIu64 "\n", tparam.max_tmo); + LOG_DBG("Num timers..: %u\n", tparam.num_timers); LOG_DBG("Tmo range: %u ms (%" PRIu64 " ticks)\n", RANGE_MS, odp_timer_ns_to_tick(tp, 1000000ULL * RANGE_MS)); commit fec701841dbe2e963cf3adc7c74c98b41e059b9d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 19 17:54:36 2018 +0300 validation: timer: fix timer_all test sync issue When timer is reset, odp_timer_set_rel() outputs the previous event handle (not ODP_EVENT_INVALID as in case of set). Test case 'timer_all' maintain test status in the event handle variable. Set the variable always to EVENT_INVALID so that both set and reset cases work the same way. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 8ab58137..f81a3d09 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -609,6 +609,8 @@ static int worker_entrypoint(void *arg TEST_UNUSED) } else if (rc == ODP_TIMER_SUCCESS) { /* Save expected expiration tick on success */ tt[i].tick = cur_tick + tck; + /* ODP timer owns the event now */ + tt[i].ev = ODP_EVENT_INVALID; } } ts.tv_sec = 0; commit 0e24607e3075a573ebe4ac408703c76daac7236c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 19 14:40:21 2018 +0300 validation: timer: add plain and sched queue tests Added simple timeout delivery tests for plain and scheduled queues. Current "timer_all" test is complex and tests only plain queues. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index bd4f1b99..8ab58137 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -144,6 +144,170 @@ static void timer_test_timeout_pool_free(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } +static void timer_test_queue_type(odp_queue_type_t queue_type) +{ + odp_pool_t pool; + const int num = 10; + odp_timeout_t tmo; + odp_event_t ev; + odp_queue_param_t queue_param; + odp_timer_pool_param_t tparam; + odp_timer_pool_t tp; + odp_queue_t queue; + odp_timer_t tim; + int i, ret, num_tmo; + uint64_t tick_base, tick; + uint64_t res_ns, period_ns, period_tick, test_period; + uint64_t diff_period, diff_test; + odp_pool_param_t params; + odp_timer_capability_t timer_capa; + odp_time_t t0, t1, t2; + + odp_pool_param_init(&params); + params.type = ODP_POOL_TIMEOUT; + params.tmo.num = num; + + pool = odp_pool_create("timeout_pool", &params); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) + CU_FAIL_FATAL("Timer capability failed") + + res_ns = 20 * ODP_TIME_MSEC_IN_NS; + + if (timer_capa.highest_res_ns > res_ns) + res_ns = timer_capa.highest_res_ns; + + tparam.res_ns = res_ns; + tparam.min_tmo = 5 * res_ns; + tparam.max_tmo = 10000 * tparam.min_tmo; + tparam.num_timers = num + 1; + tparam.priv = 0; + tparam.clk_src = ODP_CLOCK_CPU; + + LOG_DBG("\nTimer pool parameters:\n"); + LOG_DBG(" res_ns %" PRIu64 "\n", tparam.res_ns); + LOG_DBG(" min_tmo %" PRIu64 "\n", tparam.min_tmo); + LOG_DBG(" max_tmo %" PRIu64 "\n", tparam.max_tmo); + + tp = odp_timer_pool_create("timer_pool", &tparam); + if (tp == ODP_TIMER_POOL_INVALID) + CU_FAIL_FATAL("Timer pool create failed"); + + odp_timer_pool_start(); + + odp_queue_param_init(&queue_param); + if (queue_type == ODP_QUEUE_TYPE_SCHED) { + queue_param.type = ODP_QUEUE_TYPE_SCHED; + queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT; + queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + queue_param.sched.group = ODP_SCHED_GROUP_ALL; + } + + queue = odp_queue_create("timer_queue", &queue_param); + if (queue == ODP_QUEUE_INVALID) + CU_FAIL_FATAL("Queue create failed"); + + period_ns = 4 * tparam.min_tmo; + period_tick = odp_timer_ns_to_tick(tp, period_ns); + test_period = num * period_ns; + + LOG_DBG(" period_ns %" PRIu64 "\n", period_ns); + LOG_DBG(" period_tick %" PRIu64 "\n\n", period_tick); + + tick_base = odp_timer_current_tick(tp); + t0 = odp_time_local(); + t1 = t0; + t2 = t0; + + for (i = 0; i < num; i++) { + tmo = odp_timeout_alloc(pool); + CU_ASSERT_FATAL(tmo != ODP_TIMEOUT_INVALID); + ev = odp_timeout_to_event(tmo); + CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID); + + tim = odp_timer_alloc(tp, queue, USER_PTR); + CU_ASSERT_FATAL(tim != ODP_TIMER_INVALID); + + tick = tick_base + ((i + 1) * period_tick); + ret = odp_timer_set_abs(tim, tick, &ev); + + LOG_DBG("abs timer tick %" PRIu64 "\n", tick); + if (ret == ODP_TIMER_TOOEARLY) + LOG_DBG("Too early %" PRIu64 "\n", tick); + else if (ret == ODP_TIMER_TOOLATE) + LOG_DBG("Too late %" PRIu64 "\n", tick); + else if (ret == ODP_TIMER_NOEVENT) + LOG_DBG("No event %" PRIu64 "\n", tick); + + CU_ASSERT(ret == ODP_TIMER_SUCCESS); + } + + num_tmo = 0; + + do { + if (queue_type == ODP_QUEUE_TYPE_SCHED) + ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT); + else + ev = odp_queue_deq(queue); + + t2 = odp_time_local(); + diff_test = odp_time_diff_ns(t2, t0); + + if (ev != ODP_EVENT_INVALID) { + diff_period = odp_time_diff_ns(t2, t1); + t1 = odp_time_local(); + tmo = odp_timeout_from_event(ev); + tim = odp_timeout_timer(tmo); + tick = odp_timeout_tick(tmo); + + CU_ASSERT(diff_period > (period_ns - (2 * res_ns))); + CU_ASSERT(diff_period < (period_ns + (2 * res_ns))); + + LOG_DBG("timeout tick %" PRIu64 "\n", tick); + + odp_timeout_free(tmo); + CU_ASSERT(odp_timer_free(tim) == ODP_EVENT_INVALID); + + num_tmo++; + } + + } while (diff_test < (2 * test_period) && num_tmo < num); + + CU_ASSERT(num_tmo == num); + CU_ASSERT(diff_test > (test_period - tparam.min_tmo)); + CU_ASSERT(diff_test < (test_period + tparam.min_tmo)); + + /* Scalable scheduler needs this pause sequence. Otherwise, it gets + * stuck on terminate. */ + if (queue_type == ODP_QUEUE_TYPE_SCHED) { + odp_schedule_pause(); + while (1) { + ev = odp_schedule(NULL, ODP_SCHED_NO_WAIT); + if (ev == ODP_EVENT_INVALID) + break; + + CU_FAIL("Drop extra event\n"); + odp_event_free(ev); + } + } + + odp_timer_pool_destroy(tp); + + CU_ASSERT(odp_queue_destroy(queue) == 0); + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +static void timer_test_plain_queue(void) +{ + timer_test_queue_type(ODP_QUEUE_TYPE_PLAIN); +} + +static void timer_test_sched_queue(void) +{ + timer_test_queue_type(ODP_QUEUE_TYPE_SCHED); +} + static void timer_test_odp_timer_cancel(void) { odp_pool_t pool; @@ -642,6 +806,8 @@ static void timer_test_odp_timer_all(void) odp_testinfo_t timer_suite[] = { ODP_TEST_INFO(timer_test_timeout_pool_alloc), ODP_TEST_INFO(timer_test_timeout_pool_free), + ODP_TEST_INFO(timer_test_plain_queue), + ODP_TEST_INFO(timer_test_sched_queue), ODP_TEST_INFO(timer_test_odp_timer_cancel), ODP_TEST_INFO(timer_test_odp_timer_all), ODP_TEST_INFO_NULL, commit 5d4be5077adeec54d1956c86dcb87b186c39a7cb Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 19 13:03:29 2018 +0300 validation: timer: don't assume low timer tick frequency Timer tick can be the same as CPU frequency. So, test cannot loop until two current_tick calls return the same tick value. Similarly, test cannot assume that expiration tick of a relative timeout call can be exactly calculated from a current_tick value. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 9cbb08bb..bd4f1b99 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -291,19 +291,17 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) CU_FAIL("Wrong status (stale) for fresh timeout"); if (!stale) { - /* Fresh timeout => local timer must have matching tick */ - if (ttp->tick != tick) { - LOG_DBG("Wrong tick: expected %" PRIu64 - " actual %" PRIu64 "\n", + /* tmo tick cannot be smaller than pre-calculated tick */ + if (tick < ttp->tick) { + LOG_DBG("Too small tick: pre-calculated %" PRIu64 + " timeout %" PRIu64 "\n", ttp->tick, tick); - CU_FAIL("odp_timeout_tick() wrong tick"); + CU_FAIL("odp_timeout_tick() too small tick"); } - if (ttp->ev != ODP_EVENT_INVALID) - CU_FAIL("Wrong state for fresh timer (event)"); - /* Check that timeout was delivered 'timely' */ if (tick > odp_timer_current_tick(tp)) CU_FAIL("Timeout delivered early"); + if (tick < prev_tick) { LOG_DBG("Too late tick: %" PRIu64 " prev_tick %" PRIu64"\n", @@ -421,23 +419,23 @@ static int worker_entrypoint(void *arg TEST_UNUSED) ncancel++; } } else { + odp_timer_set_t rc; + uint64_t cur_tick; + uint64_t tck, nsec; + if (tt[i].ev != ODP_EVENT_INVALID) /* Timer inactive => set */ nset++; else /* Timer active => reset */ nreset++; - uint64_t tck = 1 + odp_timer_ns_to_tick(tp, - (rand_r(&seed) % RANGE_MS) * 1000000ULL); - odp_timer_set_t rc; - uint64_t cur_tick; - /* Loop until we manage to read cur_tick and set a - * relative timer in the same tick */ - do { - cur_tick = odp_timer_current_tick(tp); - rc = odp_timer_set_rel(tt[i].tim, - tck, &tt[i].ev); - } while (cur_tick != odp_timer_current_tick(tp)); + + nsec = (rand_r(&seed) % RANGE_MS) * 1000000ULL; + tck = 1 + odp_timer_ns_to_tick(tp, nsec); + + cur_tick = odp_timer_current_tick(tp); + rc = odp_timer_set_rel(tt[i].tim, tck, &tt[i].ev); + if (rc == ODP_TIMER_TOOEARLY || rc == ODP_TIMER_TOOLATE) { CU_FAIL("Failed to set timer (tooearly/toolate)"); commit 3aa3f4352083d159260cebc23b87607e73aa6f2b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 19 11:08:14 2018 +0300 validation: timer: tick conversion may lose precision Tick <-> nsec conversion may include rounding and thus loss of precision. For example, when tick frequency is higher than 1GHz conversion to nsec lose precision by definition. Modified test to convert nsec -> tick -> nsec and allow resolution level diffrence between nsec values. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 6d4d3ecd..9cbb08bb 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -25,6 +25,13 @@ /* Number of timers per thread */ #define NTIMERS 2000 +#define NAME "timer_pool" +#define RES (10 * ODP_TIME_MSEC_IN_NS / 3) +#define MIN_TMO (10 * ODP_TIME_MSEC_IN_NS / 3) +#define MAX_TMO (1000000 * ODP_TIME_MSEC_IN_NS) +#define USER_PTR ((void *)0xdead) +#define TICK_INVALID (~(uint64_t)0) + /* Barrier for thread synchronisation */ static odp_barrier_t test_barrier; @@ -41,6 +48,9 @@ static odp_atomic_u32_t ndelivtoolate; * caches may make this number lower than the capacity of the pool */ static odp_atomic_u32_t timers_allocated; +/* Timer resolution in nsec */ +static uint64_t resolution_ns; + /* Timer helper structure */ struct test_timer { odp_timer_t tim; /* Timer handle */ @@ -49,8 +59,6 @@ struct test_timer { uint64_t tick; /* Expiration tick or TICK_INVALID */ }; -#define TICK_INVALID (~(uint64_t)0) - static void timer_test_timeout_pool_alloc(void) { odp_pool_t pool; @@ -180,7 +188,6 @@ static void timer_test_odp_timer_cancel(void) if (queue == ODP_QUEUE_INVALID) CU_FAIL_FATAL("Queue create failed"); - #define USER_PTR ((void *)0xdead) tim = odp_timer_alloc(tp, queue, USER_PTR); if (tim == ODP_TIMER_INVALID) CU_FAIL_FATAL("Failed to allocate timer"); @@ -518,9 +525,7 @@ static void timer_test_odp_timer_all(void) odp_timer_pool_param_t tparam; odp_cpumask_t unused; odp_timer_pool_info_t tpinfo; - uint64_t tick; - uint64_t ns; - uint64_t t2; + uint64_t ns, tick, ns2; pthrd_arg thrdarg; odp_timer_capability_t timer_capa; @@ -546,15 +551,12 @@ static void timer_test_odp_timer_all(void) if (tbp == ODP_POOL_INVALID) CU_FAIL_FATAL("Timeout pool create failed"); -#define NAME "timer_pool" -#define RES (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MIN_TMO (10 * ODP_TIME_MSEC_IN_NS / 3) -#define MAX_TMO (1000000 * ODP_TIME_MSEC_IN_NS) /* Create a timer pool */ if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) CU_FAIL("Error: get timer capacity failed.\n"); - tparam.res_ns = MAX(RES, timer_capa.highest_res_ns); + resolution_ns = MAX(RES, timer_capa.highest_res_ns); + tparam.res_ns = resolution_ns; tparam.min_tmo = MIN_TMO; tparam.max_tmo = MAX_TMO; tparam.num_timers = num_workers * NTIMERS; @@ -581,11 +583,26 @@ static void timer_test_odp_timer_all(void) LOG_DBG("Tmo range: %u ms (%" PRIu64 " ticks)\n", RANGE_MS, odp_timer_ns_to_tick(tp, 1000000ULL * RANGE_MS)); - for (tick = 0; tick < 1000000000000ULL; tick += 1000000ULL) { - ns = odp_timer_tick_to_ns(tp, tick); - t2 = odp_timer_ns_to_tick(tp, ns); - if (tick != t2) - CU_FAIL("Invalid conversion tick->ns->tick"); + tick = odp_timer_ns_to_tick(tp, 0); + CU_ASSERT(tick == 0); + ns2 = odp_timer_tick_to_ns(tp, tick); + CU_ASSERT(ns2 == 0); + + for (ns = resolution_ns; ns < MAX_TMO; ns += resolution_ns) { + tick = odp_timer_ns_to_tick(tp, ns); + ns2 = odp_timer_tick_to_ns(tp, tick); + + if (ns2 < ns - resolution_ns) { + LOG_DBG("FAIL ns:%" PRIu64 " tick:%" PRIu64 " ns2:%" + PRIu64 "\n", ns, tick, ns2); + CU_FAIL("tick conversion: nsec too small\n"); + } + + if (ns2 > ns + resolution_ns) { + LOG_DBG("FAIL ns:%" PRIu64 " tick:%" PRIu64 " ns2:%" + PRIu64 "\n", ns, tick, ns2); + CU_FAIL("tick conversion: nsec too large\n"); + } } /* Initialize barrier used by worker threads for synchronization */ commit 0d4271e31fe685a8a82381d21d5166f0398080c1 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 19 10:17:39 2018 +0300 validation: timer: check user pointer once Code clean up: check only once that user pointer is not NULL. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 06148de8..6d4d3ecd 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -233,6 +233,10 @@ static void timer_test_odp_timer_cancel(void) static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) { odp_event_subtype_t subtype; + odp_timeout_t tmo; + odp_timer_t tim; + uint64_t tick; + struct test_timer *ttp; CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID); /* Internal error */ if (odp_event_type(ev) != ODP_EVENT_TIMEOUT) { @@ -255,33 +259,39 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) CU_FAIL("Unexpected event subtype received"); return; } + /* Read the metadata from the timeout */ - odp_timeout_t tmo = odp_timeout_from_event(ev); - odp_timer_t tim = odp_timeout_timer(tmo); - uint64_t tick = odp_timeout_tick(tmo); - struct test_timer *ttp = odp_timeout_user_ptr(tmo); + tmo = odp_timeout_from_event(ev); + tim = odp_timeout_timer(tmo); + tick = odp_timeout_tick(tmo); + ttp = odp_timeout_user_ptr(tmo); if (tim == ODP_TIMER_INVALID) CU_FAIL("odp_timeout_timer() invalid timer"); - if (!ttp) + + if (ttp == NULL) { CU_FAIL("odp_timeout_user_ptr() null user ptr"); + return; + } - if (ttp && ttp->ev2 != ev) + if (ttp->ev2 != ev) CU_FAIL("odp_timeout_user_ptr() wrong user ptr"); - if (ttp && ttp->tim != tim) + + if (ttp->tim != tim) CU_FAIL("odp_timeout_timer() wrong timer"); if (!odp_timeout_fresh(tmo)) CU_FAIL("Wrong status (stale) for fresh timeout"); + if (!stale) { /* Fresh timeout => local timer must have matching tick */ - if (ttp && ttp->tick != tick) { + if (ttp->tick != tick) { LOG_DBG("Wrong tick: expected %" PRIu64 " actual %" PRIu64 "\n", ttp->tick, tick); CU_FAIL("odp_timeout_tick() wrong tick"); } - if (ttp && ttp->ev != ODP_EVENT_INVALID) + if (ttp->ev != ODP_EVENT_INVALID) CU_FAIL("Wrong state for fresh timer (event)"); /* Check that timeout was delivered 'timely' */ @@ -296,11 +306,9 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) } } - if (ttp) { - /* Internal error */ - CU_ASSERT_FATAL(ttp->ev == ODP_EVENT_INVALID); - ttp->ev = ev; - } + /* Internal error */ + CU_ASSERT_FATAL(ttp->ev == ODP_EVENT_INVALID); + ttp->ev = ev; } /* Worker thread entrypoint which performs timer alloc/set/cancel/free commit d324b9de12c510ccf9fa1c1b6ece327c578ee53d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Apr 19 09:57:42 2018 +0300 validation: timer: remove doxygen tags Doxygen documentation is not generated from validation test files. Remove partial and unnecessary doxygen tags. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 1cd32cb1..06148de8 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -6,10 +6,6 @@ #include "config.h" -/** - * @file - */ - /* For rand_r and nanosleep */ #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -23,29 +19,29 @@ #define MAX(a, b) (((a) > (b)) ? (a) : (b)) -/** @private Timeout range in milliseconds (ms) */ +/* Timeout range in milliseconds (ms) */ #define RANGE_MS 2000 -/** @private Number of timers per thread */ +/* Number of timers per thread */ #define NTIMERS 2000 -/** @private Barrier for thread synchronisation */ +/* Barrier for thread synchronisation */ static odp_barrier_t test_barrier; -/** @private Timeout pool handle used by all threads */ +/* Timeout pool handle used by all threads */ static odp_pool_t tbp; -/** @private Timer pool handle used by all threads */ +/* Timer pool handle used by all threads */ static odp_timer_pool_t tp; -/** @private Count of timeouts delivered too late */ +/* Count of timeouts delivered too late */ static odp_atomic_u32_t ndelivtoolate; -/** @private Sum of all allocated timers from all threads. Thread-local +/* Sum of all allocated timers from all threads. Thread-local * caches may make this number lower than the capacity of the pool */ static odp_atomic_u32_t timers_allocated; -/* @private Timer helper structure */ +/* Timer helper structure */ struct test_timer { odp_timer_t tim; /* Timer handle */ odp_event_t ev; /* Timeout event */ @@ -233,7 +229,7 @@ static void timer_test_odp_timer_cancel(void) CU_FAIL_FATAL("Failed to destroy pool"); } -/* @private Handle a received (timeout) event */ +/* Handle a received (timeout) event */ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) { odp_event_subtype_t subtype; @@ -307,7 +303,7 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) } } -/* @private Worker thread entrypoint which performs timer alloc/set/cancel/free +/* Worker thread entrypoint which performs timer alloc/set/cancel/free * tests */ static int worker_entrypoint(void *arg TEST_UNUSED) { @@ -506,7 +502,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) return CU_get_number_of_failures(); } -/* @private Timer test case entrypoint */ +/* Timer test case entrypoint */ static void timer_test_odp_timer_all(void) { int rc; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 1 + platform/linux-generic/odp_crypto.c | 42 ----- platform/linux-generic/odp_random.c | 54 ++++++ test/validation/api/timer/timer.c | 336 ++++++++++++++++++++++++++++-------- 4 files changed, 320 insertions(+), 113 deletions(-) create mode 100644 platform/linux-generic/odp_random.c hooks/post-receive --

7 years, 9 months

[COMMIT] annotated tag v1.19.0.0_tigermoth created. v1.19.0.0_tigermoth

by git＠git-us.linaro.org

7 years, 9 months

[COMMIT] branch tigermoth_lts created. v1.19.0.0_tigermoth

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, tigermoth_lts has been created at e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive --

7 years, 9 months

[COMMIT] annotated tag v1.19.0.0 created. v1.19.0.0

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The annotated tag, v1.19.0.0 has been created at 200122ffa31e4cf5367edb528138d277a1f5da1e (tag) tagging e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (commit) replaces v1.18.0.1_tigermoth_rc3 tagged by Maxim Uvarov on Thu Apr 19 17:56:01 2018 +0300 - Log ----------------------------------------------------------------- == OpenDataPlane (1.19.0.0) === Summary of Changes ODP v1.19.0.0 is the official Tiger Moth final release. It incorporates final implementation changes and bug fixes and completes the Tiger Moth ODP development cycle. ==== APIs No functional changes for this release. The Tiger Moth API was frozen in ODP v1.18.0.0. ===== API Documentation Update The specification for the `odp_packet_l4_chksum_status()` API has been clarified to reflect that in IPv4 UDP checksums are optional. As a result, a zero (nonexistent) checksum will be reported as `ODP_PACKET_CHKSUM_OK`. ==== C++ Test Improvements The {cpp} test included in the ODP validation suite now uses `cout` instead of `printf()` to ensure that {cpp} is being used to compile it. ==== Queue and Scheduler Configuration For the ODP Reference Implementation, The `config/odp-linux-generic.conf` file is extended with sections to control the default and maximum sizes for basic queues, and the priority spread used by the scheduler for scheduled queues. The configuration file is a template named `platform/odp-$platform.conf` so this can be easily inherited by other ODP implementations. ==== Runtime Default `config` File Read Order Improvements For the ODP Reference Implementation, the default values of the application-provided `config` file (if used) override the values provided by the built-in `config/odp-linux-generic.conf` file. === Implementation Improvements The `odp-linux` reference implementation is improved in a number of areas: ==== Netmap Ring Configuration for VALE PktIO netmap support now uses the ODP config file to allow rings used for VALE processing to be specified. The supplied defaults provide optimal performance in typical settings. ==== AES-XCBC-MAC and SHA384-HMAC These crypto/authentication algorithms are now implemented. ==== Packet Checksum Validation and Insertion Proper packet checksum validation and insertion, in conformance with the relevant ODP APIs, is now provided. === Dependency Changes ==== DPDK 17.11 Support The Tiger Moth LTS release is synchronized with the most recent DPDK LTS release for DPDK pktio support. ==== Removal of dependency on `xxd` package. This dependency is removed. The Reference Implementation build tools now use the standard `od` tool rather than the optional `xxd` package. === Performance Tests ==== `odp_sched_pktio` A new test has been added to test the performance of PktIO operations in scheduled mode. Scheduled PktIO is inherently more scalable and simpler from an application standpoint than direct (polled) I/O, but depending on the efficiency of the scheduler implementation can incur additional levels of overhead. This test can give insight into a given platform's scheduler efficiency. For the `odp-linux` reference implementation, this test has shown scheduled I/O to be within 10% of rates achievable via direct I/O, meaning that for many applications the simplicity and scalability of the event model is preferable. ==== `odp_ipsec` A new test has been added that measures outbound (TX) IPsec performance with a variety of cipher and authentication algorithms. === Example Changes ==== `l2fwd` Example The `README` file associated with this example has been clarified to explain that this example is a throughput test and as a result does not preserve packet order under all conditions. === Bug Fixes ==== https://bugs.linaro.org/show_bug.cgi?id=3611[Bug 3611] ODP linux-generic fails on AArch64 in non-ABI-compat mode. ==== https://bugs.linaro.org/show_bug.cgi?id=3657[Bug 3657] PktIO does not work with Mellanox Interfaces ==== https://bugs.linaro.org/show_bug.cgi?id=3685[Bug 3685] RX UDP checksum offload drops valid UDP packets with Niantic ==== https://bugs.linaro.org/show_bug.cgi?id=3686[Bug 3686] IP header checksum not inserted if L4 offset not set ==== https://bugs.linaro.org/show_bug.cgi?id=3690[Bug 3690] fdserver process interferes with signal handling ==== https://bugs.linaro.org/show_bug.cgi?id=3736[Bug 3736] return value not checked for some fdserver interface functions === Known Issues ==== https://bugs.linaro.org/show_bug.cgi?id=2988[Bug 2988] ODP exposes symbols outside of odp*/_odp* namespace Bill Fischofer (9): doc: userguide: typo corrections doc: userguide: change pool queue to plain queue doc: userguide: shm corrections doc: userguide: change sched type none to parallel doc: userguide: refresh pktio code examples doc: userguide: add packet checksum and parsing info doc: userguide: add pktio capability and config info example: l2fwd: update readme regarding ordered queue usage changelog: updates for odp v1.19.0.0 Bogdan Pricope (3): linux-gen: pktio: dpdk: accept UDPv4 packets with all-zero csum linux-gen: pktio: dpdk: fix IPv4 csum calculation when l4 offset is not set linux-gen: dpdk: fix runtime/default config read order Dmitry Eremin-Solenikov (20): performance: fix sched_latency test with huge cpu count shippable: reenable non-ABI-compat build for GCC test: misc: use C++ I/O instead of C tests: add IPsec performance test performance: ipsec: add AH measurements performance: ipsec: add more algorithms performance: crypto: add more algorithms linux-gen: crypto: add IV length checks linux-gen: ipsec: add proper support for AES-CCM build: move odp scheduler setting to common m4 file build: another DPDK-linking fix build: don't use xxd to hexdump config file build: fix autoconf error caused by double-registering config item linux-gen: packet: IPv4 checksum insertion linux-gen: packet: l4 checksum insertion support linux-gen: pktio: loop: support IPv4/TCP/UDP checksum generation validation: verify IPv4 and UDP checksum validation and generation validation: ipsec: fix packet checksums linux-gen: ipsec: implement outbound checksumming support validation: ipsec: validate outbound checksumming support Josep Puigdemont (8): fdserver: handle interruption by signal in accept linux-gen: shm: fill data used in do_map before the call linux-gen: shm: do not close provided file descriptors linux-gen: shm: be consistent with rest of the code fdserver: change session ID after fork linux-gen: fdserver: mask signals we don't need linux-gen: shm: check return value when registering fds fdserver: handle signal interruption in connect() Juha-Matti Tilli (1): linux-gen: netmap: ring configuration for VALE Matias Elo (2): linux-gen: dpdk: bump supported dpdk version to v17.11 linux-gen: dpdk: allocate huge page memory for all numa nodes Maxim Uvarov (9): shippable: simplify test execution add odp_ipsec to .gitignore linux-gen: clean up ishm file naming linux-gen: hide debug prints from fd server linux-gen: ishm: remove useless debug print travis: use -M option for generated patches linux-gen: fix clang on aarch64 build shippable: reenable clang with disable abi compat options configure.ac: update version to v1.19.0.0 Petri Savolainen (11): linux-gen: queue: configurable default size linux-gen: queue: configurable max size linux-gen: sched: configurable priority spread linux-gen: sched: decouple spread and group table sizes linux-gen: sched: increase max spread linux-gen: pktio: add error prints linux-gen: pktio: add index to pktio print test: sched_pktio: new scheduler performance test with pktio test: sched_pktio: add option to collect statistics test: sched_pktio: run in validation test suite api: packet: UDP checksum value of zero yhe (2): linux-gen:crypto:implement AES-XCBC-MAC and SHA384-HMAC validation:crypto:implement AES-XCBC-MAC and SHA384-HMAC ----------------------------------------------------------------------- hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.19.0.0

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (commit) from 1e0ac11c75eee10959d1fa674a05e746476271b3 (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 e828b4d6f503ff94c40e30b1d8babf0dcbecde91 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed Apr 18 17:50:47 2018 +0300 configure.ac: update version to v1.19.0.0 Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 904e8197..d3f02665 100644 --- a/configure.ac +++ b/configure.ac @@ -3,9 +3,9 @@ AC_PREREQ([2.5]) # Set correct API version ########################################################################## m4_define([odpapi_generation_version], [1]) -m4_define([odpapi_major_version], [18]) +m4_define([odpapi_major_version], [19]) m4_define([odpapi_minor_version], [0]) -m4_define([odpapi_point_version], [1]) +m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version]) AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp(a)lists.linaro.org]) ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-64-g1e0ac11c

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 1e0ac11c75eee10959d1fa674a05e746476271b3 (commit) from 8caae505c35444706cff8815c41821d80e791403 (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 1e0ac11c75eee10959d1fa674a05e746476271b3 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Sun Apr 8 20:30:18 2018 -0500 changelog: updates for odp v1.19.0.0 Add updates for ODP v1.19.0.0 (Tiger Moth Final Release) Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/CHANGELOG b/CHANGELOG index 1dfdd0e7..5af1777c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,108 @@ +== OpenDataPlane (1.19.0.0) +=== Summary of Changes +ODP v1.19.0.0 is the official Tiger Moth final release. It incorporates final +implementation changes and bug fixes and completes the Tiger Moth ODP +development cycle. + +==== APIs +No functional changes for this release. The Tiger Moth API was frozen in ODP +v1.18.0.0. + +===== API Documentation Update +The specification for the `odp_packet_l4_chksum_status()` API has been +clarified to reflect that in IPv4 UDP checksums are optional. As a result, a +zero (nonexistent) checksum will be reported as `ODP_PACKET_CHKSUM_OK`. + +==== C++ Test Improvements +The {cpp} test included in the ODP validation suite now uses `cout` instead +of `printf()` to ensure that {cpp} is being used to compile it. + +==== Queue and Scheduler Configuration +For the ODP Reference Implementation, The `config/odp-linux-generic.conf` file +is extended with sections to control the default and maximum sizes for basic +queues, and the priority spread used by the scheduler for scheduled queues. + +The configuration file is a template named `platform/odp-$platform.conf` so +this can be easily inherited by other ODP implementations. + +==== Runtime Default `config` File Read Order Improvements +For the ODP Reference Implementation, the default values of the +application-provided `config` file (if used) override the values provided by +the built-in `config/odp-linux-generic.conf` file. + +=== Implementation Improvements +The `odp-linux` reference implementation is improved in a number of areas: + +==== Netmap Ring Configuration for VALE +PktIO netmap support now uses the ODP config file to allow rings used for VALE +processing to be specified. The supplied defaults provide optimal performance +in typical settings. + +==== AES-XCBC-MAC and SHA384-HMAC +These crypto/authentication algorithms are now implemented. + +==== Packet Checksum Validation and Insertion +Proper packet checksum validation and insertion, in conformance with the +relevant ODP APIs, is now provided. + +=== Dependency Changes + +==== DPDK 17.11 Support +The Tiger Moth LTS release is synchronized with the most recent DPDK LTS +release for DPDK pktio support. + +==== Removal of dependency on `xxd` package. +This dependency is removed. The Reference Implementation build tools now use +the standard `od` tool rather than the optional `xxd` package. + +=== Performance Tests + +==== `odp_sched_pktio` +A new test has been added to test the performance of PktIO operations in +scheduled mode. Scheduled PktIO is inherently more scalable and simpler from +an application standpoint than direct (polled) I/O, but depending on the +efficiency of the scheduler implementation can incur additional levels of +overhead. This test can give insight into a given platform's scheduler +efficiency. For the `odp-linux` reference implementation, this test has shown +scheduled I/O to be within 10% of rates achievable via direct I/O, meaning +that for many applications the simplicity and scalability of the event model +is preferable. + +==== `odp_ipsec` +A new test has been added that measures outbound (TX) IPsec performance with +a variety of cipher and authentication algorithms. + +=== Example Changes + +==== `l2fwd` Example +The `README` file associated with this example has been clarified to explain +that this example is a throughput test and as a result does not preserve +packet order under all conditions. + +=== Bug Fixes +==== https://bugs.linaro.org/show_bug.cgi?id=3611[Bug 3611] +ODP linux-generic fails on AArch64 in non-ABI-compat mode. + +==== https://bugs.linaro.org/show_bug.cgi?id=3657[Bug 3657] +PktIO does not work with Mellanox Interfaces + +==== https://bugs.linaro.org/show_bug.cgi?id=3685[Bug 3685] +RX UDP checksum offload drops valid UDP packets with Niantic + +==== https://bugs.linaro.org/show_bug.cgi?id=3686[Bug 3686] +IP header checksum not inserted if L4 offset not set + +==== https://bugs.linaro.org/show_bug.cgi?id=3690[Bug 3690] +fdserver process interferes with signal handling + +==== https://bugs.linaro.org/show_bug.cgi?id=3736[Bug 3736] +return value not checked for some fdserver interface functions + +=== Known Issues + +==== https://bugs.linaro.org/show_bug.cgi?id=2988[Bug 2988] +ODP exposes symbols outside of odp*/_odp* namespace + == OpenDataPlane (1.18.0.1) === Summary of Changes ODP v1.18.0.1 is a fix level for Tiger Moth Release Candidate 2 (RC 2). ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) hooks/post-receive --

7 years, 9 months

[COMMIT] branch master updated. v1.18.0.1_tigermoth_rc3-63-g8caae505

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 8caae505c35444706cff8815c41821d80e791403 (commit) via 4b6787c84e020c350a03ec47d12e1ef68ddb6300 (commit) via 4142652b8eb397963bec48610bdb9ab6599e65fb (commit) via 60777ba4309911df0780bd8de6d96524bc2ca03c (commit) via b2632ac253a3b9f5ba7a4174acf6abe295ec3550 (commit) via 79f5c103310c36dc213a552b9534f68ce8df1132 (commit) via 2c99a9dc1978c9178e711d264aaaca2bc4702352 (commit) from 88ba35773c76c871a222fe48a0dac05765c39936 (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 8caae505c35444706cff8815c41821d80e791403 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Apr 11 17:29:19 2018 +0300 validation: ipsec: validate outbound checksumming support Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 91a66d0b..31a6f9b5 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -938,6 +938,7 @@ int ipsec_config(odp_instance_t ODP_UNUSED inst) odp_ipsec_config_init(&ipsec_config); ipsec_config.inbound_mode = suite_context.inbound_op_mode; ipsec_config.outbound_mode = suite_context.outbound_op_mode; + ipsec_config.outbound.all_chksum = ~0; ipsec_config.inbound.default_queue = suite_context.queue; ipsec_config.inbound.parse_level = ODP_PROTO_LAYER_ALL; ipsec_config.inbound.chksums.all_chksum = ~0; diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c index 5089dfa7..59c631b5 100644 --- a/test/validation/api/ipsec/ipsec_test_out.c +++ b/test/validation/api/ipsec/ipsec_test_out.c @@ -1155,6 +1155,36 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void) ipsec_sa_destroy(sa); } +static void test_out_ipv4_udp_esp_null_sha256(void) +{ + odp_ipsec_sa_param_t param; + odp_ipsec_sa_t sa; + + ipsec_sa_param_fill(&param, + false, false, 123, NULL, + ODP_CIPHER_ALG_NULL, NULL, + ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256, + NULL); + + sa = odp_ipsec_sa_create(&param); + + CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa); + + ipsec_test_part test = { + .pkt_in = &pkt_ipv4_udp, + .out_pkt = 1, + .out = { + { .status.warn.all = 0, + .status.error.all = 0, + .pkt_out = &pkt_ipv4_udp_esp_null_sha256 }, + }, + }; + + ipsec_check_out_one(&test, sa); + + ipsec_sa_destroy(sa); +} + static void ipsec_test_capability(void) { odp_ipsec_capability_t capa; @@ -1218,5 +1248,7 @@ odp_testinfo_t ipsec_out_suite[] = { ipsec_check_esp_null_sha256), ODP_TEST_INFO_CONDITIONAL(test_out_dummy_esp_null_sha256_tun_ipv6, ipsec_check_esp_null_sha256), + ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_udp_esp_null_sha256, + ipsec_check_esp_null_sha256), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h index 0f133f01..289b8008 100644 --- a/test/validation/api/ipsec/test_vectors.h +++ b/test/validation/api/ipsec/test_vectors.h @@ -1883,4 +1883,63 @@ static const ipsec_test_packet pkt_test_nodata = { 0x0a, 0x0b, 0x0c, 0x0d, }, }; + +static const ipsec_test_packet pkt_ipv4_udp = { + .len = 76, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x3e, 0x69, 0x8f, 0x00, 0x00, + 0x80, 0x11, 0x00, 0x00, 0xc0, 0xa8, 0x01, 0x02, + 0xc0, 0xa8, 0x01, 0x01, + + /* UDP */ + 0x0a, 0x98, 0x00, 0x35, 0x00, 0x2a, 0x00, 0x00, + 0xb2, 0xd0, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x73, 0x69, 0x70, + 0x09, 0x63, 0x79, 0x62, 0x65, 0x72, 0x63, 0x69, + 0x74, 0x79, 0x02, 0x64, 0x6b, 0x00, 0x00, 0x01, + 0x00, 0x01, + }, +}; + +static const ipsec_test_packet pkt_ipv4_udp_esp_null_sha256 = { + .len = 102, + .l2_offset = 0, + .l3_offset = 14, + .l4_offset = 34, + .data = { + /* ETH - not a part of RFC, added for simplicity */ + 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, + 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00, + + /* IP */ + 0x45, 0x00, 0x00, 0x58, 0x69, 0x8f, 0x00, 0x00, + 0x80, 0x32, 0x4d, 0x91, 0xc0, 0xa8, 0x01, 0x02, + 0xc0, 0xa8, 0x01, 0x01, + + /* ESP */ + 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01, + + /* UDP */ + 0x0a, 0x98, 0x00, 0x35, 0x00, 0x2a, 0x23, 0x43, + 0xb2, 0xd0, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x73, 0x69, 0x70, + 0x09, 0x63, 0x79, 0x62, 0x65, 0x72, 0x63, 0x69, + 0x74, 0x79, 0x02, 0x64, 0x6b, 0x00, 0x00, 0x01, + 0x00, 0x01, + + /* ESP TRL */ + 0x00, 0x11, 0x2d, 0x4a, 0x06, 0x9f, 0x97, 0xcf, + 0xa3, 0x05, 0xea, 0x90, 0x7a, 0xf6, 0x6b, 0x0a, + 0x3f, 0xc7, + }, +}; + #endif commit 4b6787c84e020c350a03ec47d12e1ef68ddb6300 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Apr 11 17:28:46 2018 +0300 linux-gen: ipsec: implement outbound checksumming support Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 65f7361b..782cbf45 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -826,6 +826,7 @@ static int ipsec_out_tunnel_parse_ipv4(ipsec_state_t *state, state->out_tunnel.ip_tos = ipv4hdr->tos; state->out_tunnel.ip_df = _ODP_IPV4HDR_FLAGS_DONT_FRAG(flags); state->out_tunnel.ip_flabel = 0; + state->ip_next_hdr = ipv4hdr->proto; return 0; } @@ -1295,6 +1296,41 @@ static void ipsec_out_ah_post(ipsec_state_t *state, odp_packet_t pkt) } } +#define OL_TX_CHKSUM_PKT(_cfg, _proto, _ovr_set, _ovr) \ + (_proto && (_ovr_set ? _ovr : _cfg)) + +static void ipsec_out_checksums(odp_packet_t pkt, + ipsec_state_t *state) +{ + odp_bool_t ipv4_chksum_pkt, udp_chksum_pkt, tcp_chksum_pkt; + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + odp_ipsec_outbound_config_t outbound = ipsec_config.outbound; + + ipv4_chksum_pkt = OL_TX_CHKSUM_PKT(outbound.chksum.inner_ipv4, + state->is_ipv4, + pkt_hdr->p.flags.l3_chksum_set, + pkt_hdr->p.flags.l3_chksum); + udp_chksum_pkt = OL_TX_CHKSUM_PKT(outbound.chksum.inner_udp, + state->ip_next_hdr == + _ODP_IPPROTO_UDP, + pkt_hdr->p.flags.l4_chksum_set, + pkt_hdr->p.flags.l4_chksum); + tcp_chksum_pkt = OL_TX_CHKSUM_PKT(outbound.chksum.inner_tcp, + state->ip_next_hdr == + _ODP_IPPROTO_TCP, + pkt_hdr->p.flags.l4_chksum_set, + pkt_hdr->p.flags.l4_chksum); + + if (ipv4_chksum_pkt) + _odp_packet_ipv4_chksum_insert(pkt); + + if (tcp_chksum_pkt) + _odp_packet_tcp_chksum_insert(pkt); + + if (udp_chksum_pkt) + _odp_packet_udp_chksum_insert(pkt); +} + static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, odp_ipsec_sa_t sa, odp_packet_t *pkt_out, @@ -1354,6 +1390,9 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, if (state.ip_tot_len + state.ip_offset != odp_packet_len(pkt)) rc = -1; + + if (rc == 0) + ipsec_out_checksums(pkt, &state); } else { if (state.is_ipv4) rc = ipsec_out_tunnel_parse_ipv4(&state, ipsec_sa); @@ -1371,6 +1410,8 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, goto err; } + ipsec_out_checksums(pkt, &state); + if (ipsec_sa->tun_ipv4) rc = ipsec_out_tunnel_ipv4(&pkt, &state, ipsec_sa, opt->flag.ip_param ? commit 4142652b8eb397963bec48610bdb9ab6599e65fb Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Jan 13 05:13:03 2018 +0300 validation: ipsec: fix packet checksums Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 7c82d85a..91a66d0b 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -940,6 +940,7 @@ int ipsec_config(odp_instance_t ODP_UNUSED inst) ipsec_config.outbound_mode = suite_context.outbound_op_mode; ipsec_config.inbound.default_queue = suite_context.queue; ipsec_config.inbound.parse_level = ODP_PROTO_LAYER_ALL; + ipsec_config.inbound.chksums.all_chksum = ~0; if (ODP_IPSEC_OK != odp_ipsec_config(&ipsec_config)) return -1; diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h index 5b357a16..0f133f01 100644 --- a/test/validation/api/ipsec/test_vectors.h +++ b/test/validation/api/ipsec/test_vectors.h @@ -269,7 +269,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_sha256_1_bad1 = { /* IP */ 0x45, 0x00, 0x00, 0x9a, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x33, 0xab, 0xd9, 0xc0, 0xa8, 0x6f, 0x02, + 0x40, 0x33, 0xab, 0xdb, 0xc0, 0xa8, 0x6f, 0x02, 0xc0, 0xa8, 0xde, 0x02, /* AH */ @@ -669,7 +669,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_esp_aes_cbc_null_1 = { /* IP */ 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x32, 0xab, 0xca, 0xc0, 0xa8, 0x6f, 0x02, + 0x40, 0x32, 0xab, 0xda, 0xc0, 0xa8, 0x6f, 0x02, 0xc0, 0xa8, 0xde, 0x02, /* ESP */ @@ -1499,7 +1499,7 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_2_esp = { /* IP - not a part of RFC, added for simplicity */ 0x45, 0x00, 0x00, 0x74, 0x69, 0x8f, 0x00, 0x00, - 0x80, 0x32, 0x4d, 0x76, 0xc0, 0xa8, 0x01, 0x02, + 0x80, 0x32, 0x4d, 0x75, 0xc0, 0xa8, 0x01, 0x02, 0xc0, 0xa8, 0x01, 0x01, /* ESP */ @@ -1557,7 +1557,7 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_3_esp = { /* IP - not a part of RFC, added for simplicity */ 0x45, 0x00, 0x00, 0x68, 0x69, 0x8f, 0x00, 0x00, - 0x80, 0x32, 0x4d, 0x82, 0xc0, 0xa8, 0x01, 0x02, + 0x80, 0x32, 0x4d, 0x81, 0xc0, 0xa8, 0x01, 0x02, 0xc0, 0xa8, 0x01, 0x01, /* ESP */ @@ -1615,7 +1615,7 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_4_esp = { /* IP - not a part of RFC, added for simplicity */ 0x45, 0x00, 0x00, 0x74, 0x69, 0x8f, 0x00, 0x00, - 0x80, 0x32, 0x4d, 0x76, 0xc0, 0xa8, 0x01, 0x02, + 0x80, 0x32, 0x4d, 0x75, 0xc0, 0xa8, 0x01, 0x02, 0xc0, 0xa8, 0x01, 0x01, /* ESP */ @@ -1730,7 +1730,7 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_15_esp = { /* IP - not a part of RFC, added for simplicity */ 0x45, 0x00, 0x00, 0x68, 0x69, 0x8f, 0x00, 0x00, - 0x80, 0x32, 0x4d, 0xb2, 0xc0, 0xa8, 0x01, 0x02, + 0x80, 0x32, 0x4d, 0x81, 0xc0, 0xa8, 0x01, 0x02, 0xc0, 0xa8, 0x01, 0x01, /* ESP */ commit 60777ba4309911df0780bd8de6d96524bc2ca03c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Apr 6 15:24:46 2018 +0300 validation: verify IPv4 and UDP checksum validation and generation Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index e82a9683..09367d4e 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -296,7 +296,7 @@ static uint32_t pktio_init_packet(odp_packet_t pkt) return pktio_pkt_set_seq(pkt); } -static int pktio_fixup_checksums(odp_packet_t pkt) +static int pktio_zero_checksums(odp_packet_t pkt) { odph_ipv4hdr_t *ip; odph_udphdr_t *udp; @@ -312,8 +312,20 @@ static int pktio_fixup_checksums(odp_packet_t pkt) udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, &len); ip->chksum = 0; - odph_ipv4_csum_update(pkt); udp->chksum = 0; + + return 0; +} + +static int pktio_fixup_checksums(odp_packet_t pkt) +{ + odph_udphdr_t *udp; + + pktio_zero_checksums(pkt); + + udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); + + odph_ipv4_csum_update(pkt); udp->chksum = odph_ipv4_udp_chksum(pkt); return 0; @@ -407,10 +419,14 @@ static int flush_input_queue(odp_pktio_t pktio, odp_pktin_mode_t imode) return 0; } -static int create_packets(odp_packet_t pkt_tbl[], uint32_t pkt_seq[], int num, - odp_pktio_t pktio_src, odp_pktio_t pktio_dst) +static int create_packets_cs(odp_packet_t pkt_tbl[], + uint32_t pkt_seq[], + int num, + odp_pktio_t pktio_src, + odp_pktio_t pktio_dst, + odp_bool_t fix_cs) { - int i; + int i, ret; for (i = 0; i < num; i++) { pkt_tbl[i] = odp_packet_alloc(default_pkt_pool, packet_len); @@ -425,7 +441,11 @@ static int create_packets(odp_packet_t pkt_tbl[], uint32_t pkt_seq[], int num, pktio_pkt_set_macs(pkt_tbl[i], pktio_src, pktio_dst); - if (pktio_fixup_checksums(pkt_tbl[i]) != 0) { + if (fix_cs) + ret = pktio_fixup_checksums(pkt_tbl[i]); + else + ret = pktio_zero_checksums(pkt_tbl[i]); + if (ret != 0) { odp_packet_free(pkt_tbl[i]); break; } @@ -434,6 +454,13 @@ static int create_packets(odp_packet_t pkt_tbl[], uint32_t pkt_seq[], int num, return i; } +static int create_packets(odp_packet_t pkt_tbl[], uint32_t pkt_seq[], int num, + odp_pktio_t pktio_src, odp_pktio_t pktio_dst) +{ + return create_packets_cs(pkt_tbl, pkt_seq, num, pktio_src, pktio_dst, + true); +} + static int get_packets(pktio_info_t *pktio_rx, odp_packet_t pkt_tbl[], int num, txrx_mode_e mode) { @@ -1894,6 +1921,416 @@ static void pktio_test_pktin_ts(void) } } +static void pktio_test_chksum(void (*config_fn)(odp_pktio_t, odp_pktio_t), + void (*prep_fn)(odp_packet_t pkt), + void (*test_fn)(odp_packet_t pkt)) +{ + odp_pktio_t pktio_tx, pktio_rx; + odp_pktio_t pktio[MAX_NUM_IFACES] = {ODP_PKTIO_INVALID}; + pktio_info_t pktio_rx_info; + odp_pktout_queue_t pktout_queue; + odp_packet_t pkt_tbl[TX_BATCH_LEN]; + uint32_t pkt_seq[TX_BATCH_LEN]; + int ret; + int i, num_rx; + + CU_ASSERT_FATAL(num_ifaces >= 1); + + /* Open and configure interfaces */ + for (i = 0; i < num_ifaces; ++i) { + pktio[i] = create_pktio(i, ODP_PKTIN_MODE_DIRECT, + ODP_PKTOUT_MODE_DIRECT); + CU_ASSERT_FATAL(pktio[i] != ODP_PKTIO_INVALID); + } + + pktio_tx = pktio[0]; + pktio_rx = (num_ifaces > 1) ? pktio[1] : pktio_tx; + pktio_rx_info.id = pktio_rx; + pktio_rx_info.inq = ODP_QUEUE_INVALID; + pktio_rx_info.in_mode = ODP_PKTIN_MODE_DIRECT; + + config_fn(pktio_tx, pktio_rx); + + for (i = 0; i < num_ifaces; ++i) { + CU_ASSERT_FATAL(odp_pktio_start(pktio[i]) == 0); + _pktio_wait_linkup(pktio[i]); + } + + ret = create_packets_cs(pkt_tbl, pkt_seq, TX_BATCH_LEN, pktio_tx, + pktio_rx, false); + CU_ASSERT_FATAL(ret == TX_BATCH_LEN); + + ret = odp_pktout_queue(pktio_tx, &pktout_queue, 1); + CU_ASSERT_FATAL(ret > 0); + + for (i = 0; i < TX_BATCH_LEN; i++) + if (prep_fn) + prep_fn(pkt_tbl[i]); + + send_packets(pktout_queue, pkt_tbl, TX_BATCH_LEN); + num_rx = wait_for_packets(&pktio_rx_info, pkt_tbl, pkt_seq, + TX_BATCH_LEN, TXRX_MODE_MULTI, + ODP_TIME_SEC_IN_NS); + CU_ASSERT(num_rx == TX_BATCH_LEN); + for (i = 0; i < num_rx; i++) { + test_fn(pkt_tbl[i]); + odp_packet_free(pkt_tbl[i]); + } + + for (i = 0; i < num_ifaces; i++) { + CU_ASSERT_FATAL(odp_pktio_stop(pktio[i]) == 0); + CU_ASSERT_FATAL(odp_pktio_close(pktio[i]) == 0); + } +} + +static int pktio_check_chksum_in_ipv4(void) +{ + odp_pktio_t pktio; + odp_pktio_capability_t capa; + odp_pktio_param_t pktio_param; + int idx = (num_ifaces == 1) ? 0 : 1; + int ret; + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT; + + pktio = odp_pktio_open(iface_name[idx], pool[idx], &pktio_param); + if (pktio == ODP_PKTIO_INVALID) + return ODP_TEST_INACTIVE; + + ret = odp_pktio_capability(pktio, &capa); + (void)odp_pktio_close(pktio); + + if (ret < 0 || + !capa.config.pktin.bit.ipv4_chksum) + return ODP_TEST_INACTIVE; + + return ODP_TEST_ACTIVE; +} + +static void pktio_test_chksum_in_ipv4_config(odp_pktio_t pktio_tx ODP_UNUSED, + odp_pktio_t pktio_rx) +{ + odp_pktio_capability_t capa; + odp_pktio_config_t config; + + CU_ASSERT_FATAL(odp_pktio_capability(pktio_rx, &capa) == 0); + CU_ASSERT_FATAL(capa.config.pktin.bit.ipv4_chksum); + + odp_pktio_config_init(&config); + config.pktin.bit.ipv4_chksum = 1; + CU_ASSERT_FATAL(odp_pktio_config(pktio_rx, &config) == 0); +} + +static void pktio_test_chksum_in_ipv4_prep(odp_packet_t pkt) +{ + odph_ipv4_csum_update(pkt); +} + +static void pktio_test_chksum_in_ipv4_test(odp_packet_t pkt) +{ + CU_ASSERT(odp_packet_l3_chksum_status(pkt) == ODP_PACKET_CHKSUM_OK); +} + +static void pktio_test_chksum_in_ipv4(void) +{ + pktio_test_chksum(pktio_test_chksum_in_ipv4_config, + pktio_test_chksum_in_ipv4_prep, + pktio_test_chksum_in_ipv4_test); +} + +static int pktio_check_chksum_in_udp(void) +{ + odp_pktio_t pktio; + odp_pktio_capability_t capa; + odp_pktio_param_t pktio_param; + int idx = (num_ifaces == 1) ? 0 : 1; + int ret; + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT; + + pktio = odp_pktio_open(iface_name[idx], pool[idx], &pktio_param); + if (pktio == ODP_PKTIO_INVALID) + return ODP_TEST_INACTIVE; + + ret = odp_pktio_capability(pktio, &capa); + (void)odp_pktio_close(pktio); + + if (ret < 0 || + !capa.config.pktin.bit.udp_chksum) + return ODP_TEST_INACTIVE; + + return ODP_TEST_ACTIVE; +} + +static void pktio_test_chksum_in_udp_config(odp_pktio_t pktio_tx ODP_UNUSED, + odp_pktio_t pktio_rx) +{ + odp_pktio_capability_t capa; + odp_pktio_config_t config; + + CU_ASSERT_FATAL(odp_pktio_capability(pktio_rx, &capa) == 0); + CU_ASSERT_FATAL(capa.config.pktin.bit.udp_chksum); + + odp_pktio_config_init(&config); + config.pktin.bit.udp_chksum = 1; + CU_ASSERT_FATAL(odp_pktio_config(pktio_rx, &config) == 0); +} + +static void pktio_test_chksum_in_udp_prep(odp_packet_t pkt) +{ + odp_packet_has_ipv4_set(pkt, 1); + odp_packet_has_udp_set(pkt, 1); + odph_ipv4_csum_update(pkt); + odph_udp_chksum_set(pkt); +} + +static void pktio_test_chksum_in_udp_test(odp_packet_t pkt) +{ + CU_ASSERT(odp_packet_l4_chksum_status(pkt) == ODP_PACKET_CHKSUM_OK); +} + +static void pktio_test_chksum_in_udp(void) +{ + pktio_test_chksum(pktio_test_chksum_in_udp_config, + pktio_test_chksum_in_udp_prep, + pktio_test_chksum_in_udp_test); +} + +static int pktio_check_chksum_out_ipv4(void) +{ + odp_pktio_t pktio; + odp_pktio_capability_t capa; + odp_pktio_param_t pktio_param; + int ret; + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT; + + pktio = odp_pktio_open(iface_name[0], pool[0], &pktio_param); + if (pktio == ODP_PKTIO_INVALID) + return ODP_TEST_INACTIVE; + + ret = odp_pktio_capability(pktio, &capa); + (void)odp_pktio_close(pktio); + + if (ret < 0 || + !capa.config.pktout.bit.ipv4_chksum_ena || + !capa.config.pktout.bit.ipv4_chksum) + return ODP_TEST_INACTIVE; + + return ODP_TEST_ACTIVE; +} + +static void pktio_test_chksum_out_ipv4_config(odp_pktio_t pktio_tx, + odp_pktio_t pktio_rx ODP_UNUSED) +{ + odp_pktio_capability_t capa; + odp_pktio_config_t config; + + CU_ASSERT_FATAL(odp_pktio_capability(pktio_tx, &capa) == 0); + CU_ASSERT_FATAL(capa.config.pktout.bit.ipv4_chksum_ena); + CU_ASSERT_FATAL(capa.config.pktout.bit.ipv4_chksum); + + odp_pktio_config_init(&config); + config.pktout.bit.ipv4_chksum_ena = 1; + CU_ASSERT_FATAL(odp_pktio_config(pktio_tx, &config) == 0); +} + +static void pktio_test_chksum_out_ipv4_test(odp_packet_t pkt) +{ + odph_ipv4hdr_t *ip = odp_packet_l3_ptr(pkt, NULL); + + CU_ASSERT(ip != NULL); + if (ip != NULL) + CU_ASSERT(ip->chksum != 0); +} + +static void pktio_test_chksum_out_ipv4_no_ovr_prep(odp_packet_t pkt) +{ + odp_packet_l3_chksum_insert(pkt, false); +} + +static void pktio_test_chksum_out_ipv4_no_ovr_test(odp_packet_t pkt) +{ + odph_ipv4hdr_t *ip = odp_packet_l3_ptr(pkt, NULL); + + CU_ASSERT(ip != NULL); + if (ip != NULL) + CU_ASSERT(ip->chksum == 0); +} + +static void pktio_test_chksum_out_ipv4_no_ovr(void) +{ + pktio_test_chksum(pktio_test_chksum_out_ipv4_config, + pktio_test_chksum_out_ipv4_no_ovr_prep, + pktio_test_chksum_out_ipv4_no_ovr_test); +} + +static void pktio_test_chksum_out_ipv4_ovr_prep(odp_packet_t pkt) +{ + odp_packet_l3_chksum_insert(pkt, true); +} + +static void pktio_test_chksum_out_ipv4_ovr_test(odp_packet_t pkt) +{ + odph_ipv4hdr_t *ip = odp_packet_l3_ptr(pkt, NULL); + + CU_ASSERT(ip != NULL); + if (ip != NULL) + CU_ASSERT(ip->chksum != 0); +} + +static void pktio_test_chksum_out_ipv4_ovr(void) +{ + pktio_test_chksum(pktio_test_chksum_out_ipv4_config, + pktio_test_chksum_out_ipv4_ovr_prep, + pktio_test_chksum_out_ipv4_ovr_test); +} + +static void pktio_test_chksum_out_ipv4_pktio_config(odp_pktio_t pktio_tx, + odp_pktio_t pktio_rx + ODP_UNUSED) +{ + odp_pktio_capability_t capa; + odp_pktio_config_t config; + + CU_ASSERT_FATAL(odp_pktio_capability(pktio_tx, &capa) == 0); + CU_ASSERT_FATAL(capa.config.pktout.bit.ipv4_chksum_ena); + CU_ASSERT_FATAL(capa.config.pktout.bit.ipv4_chksum); + + odp_pktio_config_init(&config); + config.pktout.bit.ipv4_chksum_ena = 1; + config.pktout.bit.ipv4_chksum = 1; + CU_ASSERT_FATAL(odp_pktio_config(pktio_tx, &config) == 0); +} + +static void pktio_test_chksum_out_ipv4_pktio(void) +{ + pktio_test_chksum(pktio_test_chksum_out_ipv4_pktio_config, + NULL, + pktio_test_chksum_out_ipv4_test); +} + +static int pktio_check_chksum_out_udp(void) +{ + odp_pktio_t pktio; + odp_pktio_capability_t capa; + odp_pktio_param_t pktio_param; + int ret; + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_DIRECT; + + pktio = odp_pktio_open(iface_name[0], pool[0], &pktio_param); + if (pktio == ODP_PKTIO_INVALID) + return ODP_TEST_INACTIVE; + + ret = odp_pktio_capability(pktio, &capa); + (void)odp_pktio_close(pktio); + + if (ret < 0 || + !capa.config.pktout.bit.udp_chksum_ena || + !capa.config.pktout.bit.udp_chksum) + return ODP_TEST_INACTIVE; + + return ODP_TEST_ACTIVE; +} + +static void pktio_test_chksum_out_udp_config(odp_pktio_t pktio_tx, + odp_pktio_t pktio_rx ODP_UNUSED) +{ + odp_pktio_capability_t capa; + odp_pktio_config_t config; + + CU_ASSERT_FATAL(odp_pktio_capability(pktio_tx, &capa) == 0); + CU_ASSERT_FATAL(capa.config.pktout.bit.udp_chksum_ena); + CU_ASSERT_FATAL(capa.config.pktout.bit.udp_chksum); + + odp_pktio_config_init(&config); + config.pktout.bit.udp_chksum_ena = 1; + CU_ASSERT_FATAL(odp_pktio_config(pktio_tx, &config) == 0); +} + +static void pktio_test_chksum_out_udp_test(odp_packet_t pkt) +{ + odph_udphdr_t *udp = odp_packet_l4_ptr(pkt, NULL); + + CU_ASSERT(udp != NULL); + if (udp != NULL) { + CU_ASSERT(udp->chksum != 0); + CU_ASSERT(!odph_udp_chksum_verify(pkt)); + } +} + +static void pktio_test_chksum_out_udp_no_ovr_prep(odp_packet_t pkt) +{ + odph_ipv4_csum_update(pkt); + odp_packet_l4_chksum_insert(pkt, false); +} + +static void pktio_test_chksum_out_udp_no_ovr_test(odp_packet_t pkt) +{ + odph_udphdr_t *udp = odp_packet_l4_ptr(pkt, NULL); + + CU_ASSERT(udp != NULL); + if (udp != NULL) + CU_ASSERT(udp->chksum == 0); +} + +static void pktio_test_chksum_out_udp_no_ovr(void) +{ + pktio_test_chksum(pktio_test_chksum_out_udp_config, + pktio_test_chksum_out_udp_no_ovr_prep, + pktio_test_chksum_out_udp_no_ovr_test); +} + +static void pktio_test_chksum_out_udp_ovr_prep(odp_packet_t pkt) +{ + odp_packet_l4_chksum_insert(pkt, true); +} + +static void pktio_test_chksum_out_udp_ovr_test(odp_packet_t pkt) +{ + odph_udphdr_t *udp = odp_packet_l4_ptr(pkt, NULL); + + CU_ASSERT(udp != NULL); + if (udp != NULL) + CU_ASSERT(udp->chksum != 0); +} + +static void pktio_test_chksum_out_udp_ovr(void) +{ + pktio_test_chksum(pktio_test_chksum_out_udp_config, + pktio_test_chksum_out_udp_ovr_prep, + pktio_test_chksum_out_udp_ovr_test); +} + +static void pktio_test_chksum_out_udp_pktio_config(odp_pktio_t pktio_tx, + odp_pktio_t pktio_rx + ODP_UNUSED) +{ + odp_pktio_capability_t capa; + odp_pktio_config_t config; + + CU_ASSERT_FATAL(odp_pktio_capability(pktio_tx, &capa) == 0); + CU_ASSERT_FATAL(capa.config.pktout.bit.udp_chksum_ena); + CU_ASSERT_FATAL(capa.config.pktout.bit.udp_chksum); + + odp_pktio_config_init(&config); + config.pktout.bit.udp_chksum_ena = 1; + config.pktout.bit.udp_chksum = 1; + CU_ASSERT_FATAL(odp_pktio_config(pktio_tx, &config) == 0); +} + +static void pktio_test_chksum_out_udp_pktio(void) +{ + pktio_test_chksum(pktio_test_chksum_out_udp_pktio_config, + NULL, + pktio_test_chksum_out_udp_test); +} + static int create_pool(const char *iface, int num) { char pool_name[ODP_POOL_NAME_LEN]; @@ -2034,6 +2471,22 @@ odp_testinfo_t pktio_suite_unsegmented[] = { pktio_check_statistics_counters), ODP_TEST_INFO_CONDITIONAL(pktio_test_pktin_ts, pktio_check_pktin_ts), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_in_ipv4, + pktio_check_chksum_in_ipv4), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_in_udp, + pktio_check_chksum_in_udp), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_out_ipv4_no_ovr, + pktio_check_chksum_out_ipv4), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_out_ipv4_pktio, + pktio_check_chksum_out_ipv4), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_out_ipv4_ovr, + pktio_check_chksum_out_ipv4), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_out_udp_no_ovr, + pktio_check_chksum_out_udp), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_out_udp_pktio, + pktio_check_chksum_out_udp), + ODP_TEST_INFO_CONDITIONAL(pktio_test_chksum_out_udp_ovr, + pktio_check_chksum_out_udp), ODP_TEST_INFO_NULL }; commit b2632ac253a3b9f5ba7a4174acf6abe295ec3550 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Fri Apr 6 15:23:37 2018 +0300 linux-gen: pktio: loop: support IPv4/TCP/UDP checksum generation Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 7fc0fd61..fc80e801 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -15,6 +15,7 @@ #include <odp_debug_internal.h> #include <odp/api/plat/packet_flag_inlines.h> #include <odp/api/hints.h> +#include <odp/api/plat/byteorder_inlines.h> #include <odp_queue_if.h> #include <protocols/eth.h> @@ -32,6 +33,7 @@ static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01}; static int loopback_stats_reset(pktio_entry_t *pktio_entry); +static int loopback_init_capability(pktio_entry_t *pktio_entry); static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool ODP_UNUSED) @@ -61,6 +63,7 @@ static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, return -1; loopback_stats_reset(pktio_entry); + loopback_init_capability(pktio_entry); return 0; } @@ -172,6 +175,85 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, return num_rx; } +#define OL_TX_CHKSUM_PKT(_cfg, _capa, _proto, _ovr_set, _ovr) \ + (_capa && _proto && (_ovr_set ? _ovr : _cfg)) + +static inline int check_proto(void *l3_hdr, + uint32_t l3_len, + odp_bool_t *l3_proto_v4, + uint8_t *l4_proto) +{ + uint8_t l3_proto_ver = _ODP_IPV4HDR_VER(*(uint8_t *)l3_hdr); + + if (l3_proto_ver == _ODP_IPV4 && l3_len >= _ODP_IPV4HDR_LEN) { + _odp_ipv4hdr_t *ip = l3_hdr; + uint16_t frag_offset = _odp_be_to_cpu_16(ip->frag_offset); + + *l3_proto_v4 = 1; + if (!_ODP_IPV4HDR_IS_FRAGMENT(frag_offset)) + *l4_proto = ip->proto; + else + *l4_proto = 255; + + return 0; + } else if (l3_proto_ver == _ODP_IPV6 && l3_len >= _ODP_IPV6HDR_LEN) { + _odp_ipv6hdr_t *ipv6 = l3_hdr; + + *l3_proto_v4 = 0; + *l4_proto = ipv6->next_hdr; + + /* FIXME: check that packet is not a fragment !!! + * Might require parsing headers spanning several segments, so + * not implemented yet. */ + return 0; + } + + return -1; +} + +static inline void loopback_fix_checksums(odp_packet_t pkt, + odp_pktout_config_opt_t *pktout_cfg, + odp_pktout_config_opt_t *pktout_capa) +{ + odp_bool_t l3_proto_v4 = false; + uint8_t l4_proto; + void *l3_hdr; + uint32_t l3_len; + odp_bool_t ipv4_chksum_pkt, udp_chksum_pkt, tcp_chksum_pkt; + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + l3_hdr = odp_packet_l3_ptr(pkt, &l3_len); + + if (l3_hdr == NULL || + check_proto(l3_hdr, l3_len, &l3_proto_v4, &l4_proto)) + return; + + ipv4_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.ipv4_chksum, + pktout_capa->bit.ipv4_chksum, + l3_proto_v4, + pkt_hdr->p.flags.l3_chksum_set, + pkt_hdr->p.flags.l3_chksum); + udp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.udp_chksum, + pktout_capa->bit.udp_chksum, + l4_proto == _ODP_IPPROTO_UDP, + pkt_hdr->p.flags.l4_chksum_set, + pkt_hdr->p.flags.l4_chksum); + tcp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.tcp_chksum, + pktout_capa->bit.tcp_chksum, + l4_proto == _ODP_IPPROTO_TCP, + pkt_hdr->p.flags.l4_chksum_set, + pkt_hdr->p.flags.l4_chksum); + + if (ipv4_chksum_pkt) + _odp_packet_ipv4_chksum_insert(pkt); + + if (tcp_chksum_pkt) + _odp_packet_tcp_chksum_insert(pkt); + + if (udp_chksum_pkt) + _odp_packet_udp_chksum_insert(pkt); +} + static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_tbl[], int num) { @@ -182,6 +264,9 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int nb_tx = 0; uint32_t bytes = 0; uint32_t out_octets_tbl[num]; + odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; + odp_pktout_config_opt_t *pktout_capa = + &pktio_entry->s.capa.config.pktout; if (odp_unlikely(num > QUEUE_MULTI_MAX)) num = QUEUE_MULTI_MAX; @@ -218,6 +303,9 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, packet_subtype_set(pkt_tbl[i], ODP_EVENT_PACKET_BASIC); } + for (i = 0; i < nb_tx; ++i) + loopback_fix_checksums(pkt_tbl[i], pktout_cfg, pktout_capa); + odp_ticketlock_lock(&pktio_entry->s.txl); queue = queue_fn->from_ext(pktio_entry->s.pkt_loop.loopq); @@ -255,9 +343,10 @@ static int loopback_link_status(pktio_entry_t *pktio_entry ODP_UNUSED) return 1; } -static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, - odp_pktio_capability_t *capa) +static int loopback_init_capability(pktio_entry_t *pktio_entry) { + odp_pktio_capability_t *capa = &pktio_entry->s.capa; + memset(capa, 0, sizeof(odp_pktio_capability_t)); capa->max_input_queues = 1; @@ -267,9 +356,26 @@ static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, odp_pktio_config_init(&capa->config); capa->config.pktin.bit.ts_all = 1; capa->config.pktin.bit.ts_ptp = 1; + capa->config.pktout.bit.ipv4_chksum = 1; + capa->config.pktout.bit.tcp_chksum = 1; + capa->config.pktout.bit.udp_chksum = 1; capa->config.inbound_ipsec = 1; capa->config.outbound_ipsec = 1; + capa->config.pktout.bit.ipv4_chksum_ena = + capa->config.pktout.bit.ipv4_chksum; + capa->config.pktout.bit.udp_chksum_ena = + capa->config.pktout.bit.udp_chksum; + capa->config.pktout.bit.tcp_chksum_ena = + capa->config.pktout.bit.tcp_chksum; + + return 0; +} + +static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, + odp_pktio_capability_t *capa) +{ + *capa = pktio_entry->s.capa; return 0; } commit 79f5c103310c36dc213a552b9534f68ce8df1132 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Apr 9 15:45:55 2018 +0300 linux-gen: packet: l4 checksum insertion support Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index cb1c3849..be17cac8 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -304,6 +304,8 @@ int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, const void *s, uint32_t len); int _odp_packet_ipv4_chksum_insert(odp_packet_t pkt); +int _odp_packet_tcp_chksum_insert(odp_packet_t pkt); +int _odp_packet_udp_chksum_insert(odp_packet_t pkt); #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 8170c812..d4b19fee 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1910,6 +1910,92 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) return dst_uarea_size < src_uarea_size; } +/* Simple implementation of ones complement sum. + * Based on RFC1071 and its errata. + */ +typedef union { + uint16_t w; + uint8_t b[2]; +} swap_buf_t; + +static uint32_t segment_sum16_32(const uint8_t *p, + uint32_t len, + uint32_t offset) + +{ + uint32_t sum = 0; + + /* Include second part of 16-bit short word split between segments */ + if (len > 0 && (offset % 2)) { + swap_buf_t sw; + + sw.b[0] = 0; + sw.b[1] = *p++; + sum = sw.w; + len--; + } + + /* + * If pointer is 16-bit aligned, we can do fast path calculation. + * If it is not, we sum hi and lo bytes separately and then sum them. + */ + if ((uintptr_t)p % 2) { + uint32_t sum1 = 0, sum2 = 0; + + while (len > 1) { + sum1 += *p++; + sum2 += *p++; + len -= 2; + } +#if (ODP_BYTE_ORDER == ODP_BIG_ENDIAN) + sum += sum2 + (sum1 << 8); +#else + sum += sum1 + (sum2 << 8); +#endif + } else { + while (len > 1) { + sum += *(const uint16_t *)(uintptr_t)p; + p += 2; + len -= 2; + } + } + + /* Add left-over byte, if any */ + if (len > 0) { + swap_buf_t sw; + + sw.b[0] = *p; + sw.b[1] = 0; + sum += sw.w; + } + + return sum; +} + +static uint32_t packet_sum16_32(odp_packet_hdr_t *pkt_hdr, + uint32_t offset, + uint32_t len) +{ + uint32_t sum = 0; + + if (offset + len > pkt_hdr->frame_len) + return 0; + + while (len > 0) { + uint32_t seglen = 0; /* GCC */ + void *mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL); + + if (seglen > len) + seglen = len; + + sum += segment_sum16_32(mapaddr, seglen, offset); + len -= seglen; + offset += seglen; + } + + return sum; +} + /** Parser helper function for Ethernet packets */ static inline uint16_t parse_eth(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len) @@ -2291,6 +2377,11 @@ static inline int packet_ipv4_chksum(odp_packet_t pkt, } #define _ODP_IPV4HDR_CSUM_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, chksum) +#define _ODP_IPV4ADDR_OFFSSET ODP_OFFSETOF(_odp_ipv4hdr_t, src_addr) +#define _ODP_IPV6ADDR_OFFSSET ODP_OFFSETOF(_odp_ipv6hdr_t, src_addr) +#define _ODP_IPV4HDR_CSUM_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, chksum) +#define _ODP_UDP_LEN_OFFSET ODP_OFFSETOF(_odp_udphdr_t, length) +#define _ODP_UDP_CSUM_OFFSET ODP_OFFSETOF(_odp_udphdr_t, chksum) /** * Calculate and fill in IPv4 checksum @@ -2324,6 +2415,96 @@ int _odp_packet_ipv4_chksum_insert(odp_packet_t pkt) 2, &chksum); } +static int _odp_packet_tcp_udp_chksum_insert(odp_packet_t pkt, uint16_t proto) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + uint32_t zero = 0; + uint32_t sum; + uint16_t l3_ver; + uint16_t chksum; + uint32_t chksum_offset; + + if (pkt_hdr->p.l3_offset == ODP_PACKET_OFFSET_INVALID) + return -1; + if (pkt_hdr->p.l4_offset == ODP_PACKET_OFFSET_INVALID) + return -1; + + odp_packet_copy_to_mem(pkt, pkt_hdr->p.l3_offset, 2, &l3_ver); + + if (_ODP_IPV4HDR_VER(l3_ver) == _ODP_IPV4) + sum = packet_sum16_32(pkt_hdr, + pkt_hdr->p.l3_offset + + _ODP_IPV4ADDR_OFFSSET, + 2 * _ODP_IPV4ADDR_LEN); + else + sum = packet_sum16_32(pkt_hdr, + pkt_hdr->p.l3_offset + + _ODP_IPV6ADDR_OFFSSET, + 2 * _ODP_IPV6ADDR_LEN); +#if ODP_BYTE_ORDER == ODP_BIG_ENDIAN + sum += proto; +#else + sum += proto << 8; +#endif + + if (proto == _ODP_IPPROTO_TCP) { + sum += _odp_cpu_to_be_16(pkt_hdr->frame_len - + pkt_hdr->p.l4_offset); + chksum_offset = pkt_hdr->p.l4_offset + _ODP_UDP_CSUM_OFFSET; + } else { + sum += packet_sum16_32(pkt_hdr, + pkt_hdr->p.l4_offset + + _ODP_UDP_LEN_OFFSET, + 2); + chksum_offset = pkt_hdr->p.l4_offset + _ODP_UDP_CSUM_OFFSET; + } + odp_packet_copy_from_mem(pkt, chksum_offset, 2, &zero); + + sum += packet_sum16_32(pkt_hdr, + pkt_hdr->p.l4_offset, + pkt_hdr->frame_len - + pkt_hdr->p.l4_offset); + + /* Not more than two additions */ + sum = (sum & 0xffff) + (sum >> 16); + sum = (sum & 0xffff) + (sum >> 16); + + chksum = ~sum; + + if (proto == _ODP_IPPROTO_UDP && chksum == 0) + chksum = 0xffff; + + return odp_packet_copy_from_mem(pkt, + chksum_offset, + 2, &chksum); +} + +/** + * Calculate and fill in TCP checksum + * + * @param pkt ODP packet + * + * @retval 0 on success + * @retval <0 on failure + */ +int _odp_packet_tcp_chksum_insert(odp_packet_t pkt) +{ + return _odp_packet_tcp_udp_chksum_insert(pkt, _ODP_IPPROTO_TCP); +} + +/** + * Calculate and fill in UDP checksum + * + * @param pkt ODP packet + * + * @retval 0 on success + * @retval <0 on failure + */ +int _odp_packet_udp_chksum_insert(odp_packet_t pkt) +{ + return _odp_packet_tcp_udp_chksum_insert(pkt, _ODP_IPPROTO_UDP); +} + /** * Simple packet parser */ commit 2c99a9dc1978c9178e711d264aaaca2bc4702352 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Apr 2 22:52:11 2018 +0300 linux-gen: packet: IPv4 checksum insertion Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 75b4ce9e..cb1c3849 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -303,6 +303,8 @@ int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, int _odp_packet_cmp_data(odp_packet_t pkt, uint32_t offset, const void *s, uint32_t len); +int _odp_packet_ipv4_chksum_insert(odp_packet_t pkt); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 1e90cea0..65f7361b 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -162,67 +162,10 @@ static odp_ipsec_packet_result_t *ipsec_pkt_result(odp_packet_t packet) return &packet_hdr(packet)->ipsec_ctx; } -static inline int _odp_ipv4_csum(odp_packet_t pkt, - uint32_t offset, - _odp_ipv4hdr_t *ip, - odp_u16sum_t *chksum) -{ - unsigned nleft = _ODP_IPV4HDR_IHL(ip->ver_ihl) * 4; - uint16_t buf[nleft / 2]; - int res; - - if (odp_unlikely(nleft < sizeof(*ip))) - return -1; - ip->chksum = 0; - memcpy(buf, ip, sizeof(*ip)); - res = odp_packet_copy_to_mem(pkt, offset + sizeof(*ip), - nleft - sizeof(*ip), - buf + sizeof(*ip) / 2); - if (odp_unlikely(res < 0)) - return res; - - *chksum = ~odp_chksum_ones_comp16(buf, nleft); - - return 0; -} - -#define _ODP_IPV4HDR_CSUM_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, chksum) #define _ODP_IPV4HDR_PROTO_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, proto) #define _ODP_IPV6HDR_NHDR_OFFSET ODP_OFFSETOF(_odp_ipv6hdr_t, next_hdr) #define _ODP_IPV6HDREXT_NHDR_OFFSET ODP_OFFSETOF(_odp_ipv6hdr_ext_t, next_hdr) -/** - * Calculate and fill in IPv4 checksum - * - * @param pkt ODP packet - * - * @retval 0 on success - * @retval <0 on failure - */ -static inline int _odp_ipv4_csum_update(odp_packet_t pkt) -{ - uint32_t offset; - _odp_ipv4hdr_t ip; - odp_u16sum_t chksum; - int res; - - offset = odp_packet_l3_offset(pkt); - if (offset == ODP_PACKET_OFFSET_INVALID) - return -1; - - res = odp_packet_copy_to_mem(pkt, offset, sizeof(ip), &ip); - if (odp_unlikely(res < 0)) - return res; - - res = _odp_ipv4_csum(pkt, offset, &ip, &chksum); - if (odp_unlikely(res < 0)) - return res; - - return odp_packet_copy_from_mem(pkt, - offset + _ODP_IPV4HDR_CSUM_OFFSET, - 2, &chksum); -} - #define ipv4_hdr_len(ip) (_ODP_IPV4HDR_IHL((ip)->ver_ihl) * 4) static const uint8_t ipsec_padding[255] = { @@ -815,7 +758,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, ipv4hdr->tot_len = _odp_cpu_to_be_16(state.ip_tot_len); else ipv4hdr->ttl -= ipsec_sa->dec_ttl; - _odp_ipv4_csum_update(pkt); + _odp_packet_ipv4_chksum_insert(pkt); } else if (state.is_ipv6 && odp_packet_len(pkt) > _ODP_IPV6HDR_LEN) { _odp_ipv6hdr_t *ipv6hdr = odp_packet_l3_ptr(pkt, NULL); @@ -1238,7 +1181,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, static void ipsec_out_esp_post(ipsec_state_t *state, odp_packet_t pkt) { if (state->is_ipv4) - _odp_ipv4_csum_update(pkt); + _odp_packet_ipv4_chksum_insert(pkt); } static int ipsec_out_ah(odp_packet_t *pkt, @@ -1343,7 +1286,7 @@ static void ipsec_out_ah_post(ipsec_state_t *state, odp_packet_t pkt) ipv4hdr->tos = state->ah_ipv4.tos; ipv4hdr->frag_offset = state->ah_ipv4.frag_offset; - _odp_ipv4_csum_update(pkt); + _odp_packet_ipv4_chksum_insert(pkt); } else { _odp_ipv6hdr_t *ipv6hdr = odp_packet_l3_ptr(pkt, NULL); @@ -1500,7 +1443,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, else if (ODP_IPSEC_AH == ipsec_sa->proto) ipsec_out_ah_post(&state, pkt); - _odp_ipv4_csum_update(pkt); + _odp_packet_ipv4_chksum_insert(pkt); *pkt_out = pkt; return ipsec_sa; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 462c8a4c..8170c812 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2266,6 +2266,64 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, seg_len, layer, ethtype); } +static inline int packet_ipv4_chksum(odp_packet_t pkt, + uint32_t offset, + _odp_ipv4hdr_t *ip, + odp_u16sum_t *chksum) +{ + unsigned int nleft = _ODP_IPV4HDR_IHL(ip->ver_ihl) * 4; + uint16_t buf[nleft / 2]; + int res; + + if (odp_unlikely(nleft < sizeof(*ip))) + return -1; + ip->chksum = 0; + memcpy(buf, ip, sizeof(*ip)); + res = odp_packet_copy_to_mem(pkt, offset + sizeof(*ip), + nleft - sizeof(*ip), + buf + sizeof(*ip) / 2); + if (odp_unlikely(res < 0)) + return res; + + *chksum = ~odp_chksum_ones_comp16(buf, nleft); + + return 0; +} + +#define _ODP_IPV4HDR_CSUM_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, chksum) + +/** + * Calculate and fill in IPv4 checksum + * + * @param pkt ODP packet + * + * @retval 0 on success + * @retval <0 on failure + */ +int _odp_packet_ipv4_chksum_insert(odp_packet_t pkt) +{ + uint32_t offset; + _odp_ipv4hdr_t ip; + odp_u16sum_t chksum; + int res; + + offset = odp_packet_l3_offset(pkt); + if (offset == ODP_PACKET_OFFSET_INVALID) + return -1; + + res = odp_packet_copy_to_mem(pkt, offset, sizeof(ip), &ip); + if (odp_unlikely(res < 0)) + return res; + + res = packet_ipv4_chksum(pkt, offset, &ip, &chksum); + if (odp_unlikely(res < 0)) + return res; + + return odp_packet_copy_from_mem(pkt, + offset + _ODP_IPV4HDR_CSUM_OFFSET, + 2, &chksum); +} + /** * Simple packet parser */ ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_packet_internal.h | 4 + platform/linux-generic/odp_ipsec.c | 106 ++--- platform/linux-generic/odp_packet.c | 239 +++++++++++ platform/linux-generic/pktio/loop.c | 110 ++++- test/validation/api/ipsec/ipsec.c | 2 + test/validation/api/ipsec/ipsec_test_out.c | 32 ++ test/validation/api/ipsec/test_vectors.h | 71 +++- test/validation/api/pktio/pktio.c | 465 ++++++++++++++++++++- 8 files changed, 954 insertions(+), 75 deletions(-) hooks/post-receive --

7 years, 9 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp