git-lng-odp July 2018

git-lng-odp@lists.linaro.org

1 participants
21 discussions

[COMMIT] branch master updated. v1.19.0.2_tigermoth-30-gd7c097e4

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 d7c097e4a1168efa7393f8028179a2ff2f96505d (commit) from 6d91fe717d2e62e048fb8837a67cc1118a3113d1 (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 d7c097e4a1168efa7393f8028179a2ff2f96505d Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jul 27 11:01:26 2018 +0300 linux-gen: netmap: fix incorrect debug message Move debug message to the correct code branch and add more debug info. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reported-by: Gyanesh Patra <pgyanesh.patra(a)gmail.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 0da2b7af..53d3e58c 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -836,8 +836,10 @@ static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, if (odp_likely(ring->slot[slot_id].len <= mtu)) { slot_tbl[num_rx].buf = buf; slot_tbl[num_rx].len = ring->slot[slot_id].len; - ODP_DBG("dropped oversized packet\n"); num_rx++; + } else { + ODP_DBG("Dropped oversized packet: %" PRIu16 " " + "B\n", ring->slot[slot_id].len); } ring->cur = nm_ring_next(ring, slot_id); } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/netmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive --

6 years, 6 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-29-g6d91fe71

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 6d91fe717d2e62e048fb8837a67cc1118a3113d1 (commit) from 9b7d0f9116a6e040f151c994ed10e958b9399295 (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 6d91fe717d2e62e048fb8837a67cc1118a3113d1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Jul 6 09:39:55 2018 +0300 thread: increase ODP_THREAD_COUNT_MAX to 256 Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/thread.h b/include/odp/api/abi-default/thread.h index 0420e245..e31651a2 100644 --- a/include/odp/api/abi-default/thread.h +++ b/include/odp/api/abi-default/thread.h @@ -21,7 +21,7 @@ extern "C" { * @{ */ -#define ODP_THREAD_COUNT_MAX 128 +#define ODP_THREAD_COUNT_MAX 256 /** * @} ----------------------------------------------------------------------- Summary of changes: include/odp/api/abi-default/thread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

6 years, 6 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-28-g9b7d0f91

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 9b7d0f9116a6e040f151c994ed10e958b9399295 (commit) via b3a8f10e0d4c1d323e682025b1189018d5d01cbf (commit) via 2b6cccd3541f053140b1765913a9ca5af67d374d (commit) from 24201040f2a8e66f11359f29b283831db8550c84 (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 9b7d0f9116a6e040f151c994ed10e958b9399295 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jul 17 19:27:30 2018 +0300 linux-gen: crypto: properly sort AES-CMAC capabilities According to the specs, digest capabilities should be sorted first by digest length, then by key length. Sort AES-CMAC caps accordingly. 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/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 8473bf5a..ecab6bd0 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -124,10 +124,10 @@ static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = { static const odp_crypto_auth_capability_t auth_capa_aes_cmac[] = { {.digest_len = 12, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} }, -{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} }, {.digest_len = 12, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0} }, -{.digest_len = 16, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0} }, {.digest_len = 12, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} }, +{.digest_len = 16, .key_len = 24, .aad_len = {.min = 0, .max = 0, .inc = 0} }, {.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } }; #if _ODP_HAVE_CHACHA20_POLY1305 commit b3a8f10e0d4c1d323e682025b1189018d5d01cbf Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Jul 17 17:08:02 2018 +0300 example: sysinfo: print more information about crypto capabilities 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/example/sysinfo/odp_sysinfo.c b/example/sysinfo/odp_sysinfo.c index e177319b..120910b6 100644 --- a/example/sysinfo/odp_sysinfo.c +++ b/example/sysinfo/odp_sysinfo.c @@ -25,52 +25,206 @@ static const char *support_level(odp_support_t support) } } +static const char *cipher_alg_name(odp_cipher_alg_t cipher) +{ + switch (cipher) { + case ODP_CIPHER_ALG_NULL: + return "null"; + case ODP_CIPHER_ALG_DES: + return "des"; + case ODP_CIPHER_ALG_3DES_CBC: + return "3des_cbc"; + case ODP_CIPHER_ALG_AES_CBC: + return "aes_cbc"; + case ODP_CIPHER_ALG_AES_CTR: + return "aes_ctr"; + case ODP_CIPHER_ALG_AES_GCM: + return "aes_gcm"; + case ODP_CIPHER_ALG_AES_CCM: + return "aes_ccm"; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + return "chacha20_poly1305"; + default: + return "Unknown"; + } +} + +static const char *auth_alg_name(odp_auth_alg_t auth) +{ + switch (auth) { + case ODP_AUTH_ALG_NULL: + return "null"; + case ODP_AUTH_ALG_MD5_HMAC: + return "md5_hmac"; + case ODP_AUTH_ALG_SHA1_HMAC: + return "sha1_hmac"; + case ODP_AUTH_ALG_SHA256_HMAC: + return "sha256_hmac"; + case ODP_AUTH_ALG_SHA384_HMAC: + return "sha384_hmac"; + case ODP_AUTH_ALG_SHA512_HMAC: + return "sha512_hmac"; + case ODP_AUTH_ALG_AES_XCBC_MAC: + return "aes_xcbc_mac"; + case ODP_AUTH_ALG_AES_GCM: + return "aes_gcm"; + case ODP_AUTH_ALG_AES_GMAC: + return "aes_gmac"; + case ODP_AUTH_ALG_AES_CCM: + return "aes_ccm"; + case ODP_AUTH_ALG_AES_CMAC: + return "aes_cmac"; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + return "chacha20_poly1305"; + default: + return "Unknown"; + } +} + static void print_cipher_algos(odp_crypto_cipher_algos_t ciphers) { if (ciphers.bit.null) - printf("null "); + printf("%s ", cipher_alg_name(ODP_CIPHER_ALG_NULL)); if (ciphers.bit.des) - printf("des "); + printf("%s ", cipher_alg_name(ODP_CIPHER_ALG_DES)); if (ciphers.bit.trides_cbc) - printf("trides_cbc "); + printf("%s ", cipher_alg_name(ODP_CIPHER_ALG_3DES_CBC)); if (ciphers.bit.aes_cbc) - printf("aes_cbc "); + printf("%s ", cipher_alg_name(ODP_CIPHER_ALG_AES_CBC)); if (ciphers.bit.aes_ctr) - printf("aes_ctr "); + printf("%s ", cipher_alg_name(ODP_CIPHER_ALG_AES_CTR)); if (ciphers.bit.aes_gcm) - printf("aes_gcm "); + printf("%s ", cipher_alg_name(ODP_CIPHER_ALG_AES_GCM)); if (ciphers.bit.aes_ccm) - printf("aes_ccm "); + printf("%s ", cipher_alg_name(ODP_CIPHER_ALG_AES_CCM)); if (ciphers.bit.chacha20_poly1305) - printf("chacha20_poly1305 "); + printf("%s ", + cipher_alg_name(ODP_CIPHER_ALG_CHACHA20_POLY1305)); } static void print_auth_algos(odp_crypto_auth_algos_t auths) { if (auths.bit.null) - printf("null "); + printf("%s ", auth_alg_name(ODP_AUTH_ALG_NULL)); + if (auths.bit.md5_hmac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_MD5_HMAC)); + if (auths.bit.sha1_hmac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_SHA1_HMAC)); + if (auths.bit.sha256_hmac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_SHA256_HMAC)); + if (auths.bit.sha384_hmac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_SHA384_HMAC)); + if (auths.bit.sha512_hmac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_SHA512_HMAC)); + if (auths.bit.aes_gcm) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_AES_GCM)); + if (auths.bit.aes_gmac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_AES_GMAC)); + if (auths.bit.aes_ccm) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_AES_CCM)); + if (auths.bit.aes_cmac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_AES_CMAC)); + if (auths.bit.aes_xcbc_mac) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_AES_XCBC_MAC)); + if (auths.bit.chacha20_poly1305) + printf("%s ", auth_alg_name(ODP_AUTH_ALG_CHACHA20_POLY1305)); +} + +static void print_cipher_capa(odp_cipher_alg_t cipher) +{ + int caps = odp_crypto_cipher_capability(cipher, NULL, 0); + int rc, i; + + if (caps <= 0) + return; + + odp_crypto_cipher_capability_t capa[caps]; + + rc = odp_crypto_cipher_capability(cipher, capa, caps); + if (rc < 0) + return; + + printf(" %s:\n", cipher_alg_name(cipher)); + for (i = 0; i < rc; i++) + printf(" key %d iv %d\n", + capa[i].key_len, capa[i].iv_len); +} + +static void print_auth_capa(odp_auth_alg_t auth) +{ + int caps = odp_crypto_auth_capability(auth, NULL, 0); + int rc, i; + + if (caps <= 0) + return; + + odp_crypto_auth_capability_t capa[caps]; + + rc = odp_crypto_auth_capability(auth, capa, caps); + if (rc < 0) + return; + + printf(" %s:\n", auth_alg_name(auth)); + for (i = 0; i < rc; i++) { + printf(" digest %d", capa[i].digest_len); + if (capa[i].key_len != 0) + printf(" key %d", capa[i].key_len); + if (capa[i].iv_len != 0) + printf(" iv %d", capa[i].iv_len); + if (capa[i].aad_len.max != 0) + printf(" aad %d, %d, %d", + capa[i].aad_len.min, capa[i].aad_len.max, + capa[i].aad_len.inc); + printf("\n"); + } +} + +static void print_cipher_caps(odp_crypto_cipher_algos_t ciphers) +{ + if (ciphers.bit.null) + print_cipher_capa(ODP_CIPHER_ALG_NULL); + if (ciphers.bit.des) + print_cipher_capa(ODP_CIPHER_ALG_DES); + if (ciphers.bit.trides_cbc) + print_cipher_capa(ODP_CIPHER_ALG_3DES_CBC); + if (ciphers.bit.aes_cbc) + print_cipher_capa(ODP_CIPHER_ALG_AES_CBC); + if (ciphers.bit.aes_ctr) + print_cipher_capa(ODP_CIPHER_ALG_AES_CTR); + if (ciphers.bit.aes_gcm) + print_cipher_capa(ODP_CIPHER_ALG_AES_GCM); + if (ciphers.bit.aes_ccm) + print_cipher_capa(ODP_CIPHER_ALG_AES_CCM); + if (ciphers.bit.chacha20_poly1305) + print_cipher_capa(ODP_CIPHER_ALG_CHACHA20_POLY1305); +} + +static void print_auth_caps(odp_crypto_auth_algos_t auths) +{ + if (auths.bit.null) + print_auth_capa(ODP_AUTH_ALG_NULL); if (auths.bit.md5_hmac) - printf("md5_hmac "); + print_auth_capa(ODP_AUTH_ALG_MD5_HMAC); if (auths.bit.sha1_hmac) - printf("sha1_hmac "); + print_auth_capa(ODP_AUTH_ALG_SHA1_HMAC); if (auths.bit.sha256_hmac) - printf("sha256_hmac "); + print_auth_capa(ODP_AUTH_ALG_SHA256_HMAC); if (auths.bit.sha384_hmac) - printf("sha384_hmac "); + print_auth_capa(ODP_AUTH_ALG_SHA384_HMAC); if (auths.bit.sha512_hmac) - printf("sha512_hmac "); + print_auth_capa(ODP_AUTH_ALG_SHA512_HMAC); if (auths.bit.aes_gcm) - printf("aes_gcm "); + print_auth_capa(ODP_AUTH_ALG_AES_GCM); if (auths.bit.aes_gmac) - printf("aes_gmac "); + print_auth_capa(ODP_AUTH_ALG_AES_GMAC); if (auths.bit.aes_ccm) - printf("aes_ccm "); + print_auth_capa(ODP_AUTH_ALG_AES_CCM); if (auths.bit.aes_cmac) - printf("aes_cmac "); + print_auth_capa(ODP_AUTH_ALG_AES_CMAC); if (auths.bit.aes_xcbc_mac) - printf("aes_xcbc_mac "); + print_auth_capa(ODP_AUTH_ALG_AES_XCBC_MAC); if (auths.bit.chacha20_poly1305) - printf("chacha20_poly1305 "); + print_auth_capa(ODP_AUTH_ALG_CHACHA20_POLY1305); } int main(void) @@ -271,9 +425,11 @@ int main(void) printf(" cipher algorithms: "); print_cipher_algos(crypto_capa.ciphers); printf("\n"); + print_cipher_caps(crypto_capa.ciphers); printf(" auth algorithms: "); print_auth_algos(crypto_capa.auths); printf("\n"); + print_auth_caps(crypto_capa.auths); printf("\n"); printf("***********************************************************\n"); commit 2b6cccd3541f053140b1765913a9ca5af67d374d Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Jul 19 19:45:58 2018 +0300 configure.ac print linker Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/configure.ac b/configure.ac index c07b2c9b..a187fba7 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,7 @@ AC_MSG_RESULT([ cc version: ${CC_VERSION} cppflags: ${CPPFLAGS} cflags: ${CFLAGS} + ld: ${LD} ldflags: ${LDFLAGS} libs: ${LIBS} defs: ${DEFS} ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + example/sysinfo/odp_sysinfo.c | 196 +++++++++++++++++++++++++--- platform/linux-generic/odp_crypto_openssl.c | 4 +- 3 files changed, 179 insertions(+), 22 deletions(-) hooks/post-receive --

6 years, 6 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-25-g24201040

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 24201040f2a8e66f11359f29b283831db8550c84 (commit) via 55b8ccb80bee2eaf7932a5bbb7963544d8fc906b (commit) from 6add70a4ff916acb331b961bc230cf946fbe835a (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 24201040f2a8e66f11359f29b283831db8550c84 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Mon Jul 16 17:55:24 2018 -0500 configure: add warning about --without-openssl implications ODP now supports the --without-openssl configure option to not use OpenSSL as part of building odp-linux. However, omitting OpenSSL will make strong cryptographic support unavailable. Display the OpenSSL inclusion status as part of configure output and include a warning to be sure the user understands this implication of omitting this support. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/configure.ac b/configure.ac index 0eacac32..c07b2c9b 100644 --- a/configure.ac +++ b/configure.ac @@ -381,6 +381,7 @@ AC_MSG_RESULT([ includedir: ${includedir} testdir: ${testdir} WITH_ARCH: ${WITH_ARCH} + with_openssl: ${with_openssl} cc: ${CC} cc version: ${CC_VERSION} @@ -405,3 +406,7 @@ AC_MSG_RESULT([ user_guides: ${user_guides} pcapng: ${have_pcapng} ]) + +AS_IF([test "${with_openssl}" = "no"], + [AC_MSG_WARN([Strong cryptography is not available without OpenSSL])] + ) commit 55b8ccb80bee2eaf7932a5bbb7963544d8fc906b Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jul 17 16:31:06 2018 +0300 fix code check warning using CC in code Fix error when code check finds CC inside patch itself and wants to validate it as description note. ERROR: Unrecognized email address: '${CC}' 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/scripts/checkpatch.pl b/scripts/checkpatch.pl index d5ffd1dd..a0d18972 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2487,7 +2487,7 @@ sub process { # Check the patch for a signoff: if ($line =~ /^\s*signed-off-by:/i) { $signoff++; - $in_commit_log = 0; + #$in_commit_log = 0; } # Check if MAINTAINERS is being updated. If so, there's probably no need to @@ -2497,7 +2497,7 @@ sub process { } # Check signature styles - if (!$in_header_lines && + if (!$in_header_lines && $in_commit_log && $line =~ /^(\s*)([a-z0-9_-]+by:|$signature_tags)(\s*)(.*)/i) { my $space_before = $1; my $sign_off = $2; ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 +++++ scripts/checkpatch.pl | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive --

6 years, 7 months

[COMMIT] branch api-next updated. v1.19.0.2_tigermoth-27-g9b2b5a96

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 9b2b5a9695ad66977c964c83691cd2fef4c45b85 (commit) via 067a7054ba44a2c754f1382daf6469c495085639 (commit) via f5b1a18c53cec7203b4f94541af4b112c459ab74 (commit) via 09da8929a55e31b5005a3bb1c2c1184c435612cf (commit) from 7c629241f07aa7509d996c0560a20c5b0c7b371d (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 9b2b5a9695ad66977c964c83691cd2fef4c45b85 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 26 01:27:07 2017 +0300 validation: crypto: 3GPP crypto algorightms support Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index a551be55..07f1d1fa 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -61,6 +61,12 @@ static const char *auth_alg_name(odp_auth_alg_t auth) return "ODP_AUTH_ALG_AES_CMAC"; case ODP_AUTH_ALG_CHACHA20_POLY1305: return "ODP_AUTH_ALG_CHACHA20_POLY1305"; + case ODP_AUTH_ALG_KASUMI_F9: + return "ODP_AUTH_ALG_KASUMI_F9"; + case ODP_AUTH_ALG_SNOW3G_UIA2: + return "ODP_AUTH_ALG_SNOW3G_UIA2"; + case ODP_AUTH_ALG_ZUC_EIA3: + return "ODP_AUTH_ALG_ZUC_EIA3"; default: return "Unknown"; } @@ -85,6 +91,12 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher) return "ODP_CIPHER_ALG_AES_CCM"; case ODP_CIPHER_ALG_CHACHA20_POLY1305: return "ODP_CIPHER_ALG_CHACHA20_POLY1305"; + case ODP_CIPHER_ALG_KASUMI_F8: + return "ODP_CIPHER_ALG_KASUMI_F8"; + case ODP_CIPHER_ALG_SNOW3G_UEA2: + return "ODP_CIPHER_ALG_SNOW3G_UEA2"; + case ODP_CIPHER_ALG_ZUC_EEA3: + return "ODP_CIPHER_ALG_ZUC_EEA3"; default: return "Unknown"; } @@ -507,6 +519,15 @@ static void check_alg(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305 && !(capa.ciphers.bit.chacha20_poly1305)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_KASUMI_F8 && + !(capa.ciphers.bit.kasumi_f8)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_SNOW3G_UEA2 && + !(capa.ciphers.bit.snow3g_uea2)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_ZUC_EEA3 && + !(capa.ciphers.bit.zuc_eea3)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_DES && !(capa.ciphers.bit.des)) rc = -1; @@ -532,6 +553,15 @@ static void check_alg(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_CHACHA20_POLY1305 && !(capa.auths.bit.chacha20_poly1305)) rc = -1; + if (auth_alg == ODP_AUTH_ALG_KASUMI_F9 && + !(capa.auths.bit.kasumi_f9)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SNOW3G_UIA2 && + !(capa.auths.bit.snow3g_uia2)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_ZUC_EIA3 && + !(capa.auths.bit.zuc_eia3)) + rc = -1; if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && !(capa.auths.bit.md5_hmac)) rc = -1; @@ -709,6 +739,18 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.chacha20_poly1305) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_KASUMI_F8: + if (!capability.ciphers.bit.kasumi_f8) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_SNOW3G_UEA2: + if (!capability.ciphers.bit.snow3g_uea2) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_ZUC_EEA3: + if (!capability.ciphers.bit.zuc_eea3) + return ODP_TEST_INACTIVE; + break; default: fprintf(stderr, "Unsupported cipher algorithm\n"); return ODP_TEST_INACTIVE; @@ -764,6 +806,18 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.auths.bit.chacha20_poly1305) return ODP_TEST_INACTIVE; break; + case ODP_AUTH_ALG_KASUMI_F9: + if (!capability.auths.bit.kasumi_f9) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SNOW3G_UIA2: + if (!capability.auths.bit.snow3g_uia2) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_ZUC_EIA3: + if (!capability.auths.bit.zuc_eia3) + return ODP_TEST_INACTIVE; + break; default: fprintf(stderr, "Unsupported authentication algorithm\n"); return ODP_TEST_INACTIVE; @@ -1164,6 +1218,153 @@ static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) false); } +static int check_alg_kasumi_f8(void) +{ + return check_alg_support(ODP_CIPHER_ALG_KASUMI_F8, ODP_AUTH_ALG_NULL); +} + +static void crypto_test_enc_alg_kasumi_f8(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_KASUMI_F8, + ODP_AUTH_ALG_NULL, + kasumi_f8_reference, + ARRAY_SIZE(kasumi_f8_reference), + false, + true); +} + +static void crypto_test_enc_alg_kasumi_f8_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_KASUMI_F8, + ODP_AUTH_ALG_NULL, + kasumi_f8_reference, + ARRAY_SIZE(kasumi_f8_reference), + true, + true); +} + +static void crypto_test_dec_alg_kasumi_f8(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_KASUMI_F8, + ODP_AUTH_ALG_NULL, + kasumi_f8_reference, + ARRAY_SIZE(kasumi_f8_reference), + false, + true); +} + +static void crypto_test_dec_alg_kasumi_f8_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_KASUMI_F8, + ODP_AUTH_ALG_NULL, + kasumi_f8_reference, + ARRAY_SIZE(kasumi_f8_reference), + true, + true); +} + +static int check_alg_snow3g_uea2(void) +{ + return check_alg_support(ODP_CIPHER_ALG_SNOW3G_UEA2, ODP_AUTH_ALG_NULL); +} + +static void crypto_test_enc_alg_snow3g_uea2(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_SNOW3G_UEA2, + ODP_AUTH_ALG_NULL, + snow3g_uea2_reference, + ARRAY_SIZE(snow3g_uea2_reference), + false, + true); +} + +static void crypto_test_enc_alg_snow3g_uea2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_SNOW3G_UEA2, + ODP_AUTH_ALG_NULL, + snow3g_uea2_reference, + ARRAY_SIZE(snow3g_uea2_reference), + true, + true); +} + +static void crypto_test_dec_alg_snow3g_uea2(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_SNOW3G_UEA2, + ODP_AUTH_ALG_NULL, + snow3g_uea2_reference, + ARRAY_SIZE(snow3g_uea2_reference), + false, + true); +} + +static void crypto_test_dec_alg_snow3g_uea2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_SNOW3G_UEA2, + ODP_AUTH_ALG_NULL, + snow3g_uea2_reference, + ARRAY_SIZE(snow3g_uea2_reference), + true, + true); +} + +static int check_alg_zuc_eea3(void) +{ + return check_alg_support(ODP_CIPHER_ALG_ZUC_EEA3, ODP_AUTH_ALG_NULL); +} + +static void crypto_test_enc_alg_zuc_eea3(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_ZUC_EEA3, + ODP_AUTH_ALG_NULL, + zuc_eea3_reference, + ARRAY_SIZE(zuc_eea3_reference), + false, + true); +} + +static void crypto_test_enc_alg_zuc_eea3_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_ZUC_EEA3, + ODP_AUTH_ALG_NULL, + zuc_eea3_reference, + ARRAY_SIZE(zuc_eea3_reference), + true, + true); +} + +static void crypto_test_dec_alg_zuc_eea3(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_ZUC_EEA3, + ODP_AUTH_ALG_NULL, + zuc_eea3_reference, + ARRAY_SIZE(zuc_eea3_reference), + false, + true); +} + +static void crypto_test_dec_alg_zuc_eea3_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_ZUC_EEA3, + ODP_AUTH_ALG_NULL, + zuc_eea3_reference, + ARRAY_SIZE(zuc_eea3_reference), + true, + true); +} + static int check_alg_hmac_md5(void) { return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC); @@ -1445,6 +1646,153 @@ static void crypto_test_check_alg_aes_cmac(void) false); } +static int check_alg_kasumi_f9(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_KASUMI_F9); +} + +static void crypto_test_gen_alg_kasumi_f9(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_KASUMI_F9, + kasumi_f9_reference, + ARRAY_SIZE(kasumi_f9_reference), + false, + true); +} + +static void crypto_test_gen_alg_kasumi_f9_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_KASUMI_F9, + kasumi_f9_reference, + ARRAY_SIZE(kasumi_f9_reference), + true, + true); +} + +static void crypto_test_check_alg_kasumi_f9(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_KASUMI_F9, + kasumi_f9_reference, + ARRAY_SIZE(kasumi_f9_reference), + false, + true); +} + +static void crypto_test_check_alg_kasumi_f9_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_KASUMI_F9, + kasumi_f9_reference, + ARRAY_SIZE(kasumi_f9_reference), + true, + true); +} + +static int check_alg_snow3g_uia2(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SNOW3G_UIA2); +} + +static void crypto_test_gen_alg_snow3g_uia2(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SNOW3G_UIA2, + snow3g_uia2_reference, + ARRAY_SIZE(snow3g_uia2_reference), + false, + true); +} + +static void crypto_test_gen_alg_snow3g_uia2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SNOW3G_UIA2, + snow3g_uia2_reference, + ARRAY_SIZE(snow3g_uia2_reference), + true, + true); +} + +static void crypto_test_check_alg_snow3g_uia2(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SNOW3G_UIA2, + snow3g_uia2_reference, + ARRAY_SIZE(snow3g_uia2_reference), + false, + true); +} + +static void crypto_test_check_alg_snow3g_uia2_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_SNOW3G_UIA2, + snow3g_uia2_reference, + ARRAY_SIZE(snow3g_uia2_reference), + true, + true); +} + +static int check_alg_zuc_eia3(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_ZUC_EIA3); +} + +static void crypto_test_gen_alg_zuc_eia3(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_ZUC_EIA3, + zuc_eia3_reference, + ARRAY_SIZE(zuc_eia3_reference), + false, + true); +} + +static void crypto_test_gen_alg_zuc_eia3_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_ZUC_EIA3, + zuc_eia3_reference, + ARRAY_SIZE(zuc_eia3_reference), + true, + true); +} + +static void crypto_test_check_alg_zuc_eia3(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_ZUC_EIA3, + zuc_eia3_reference, + ARRAY_SIZE(zuc_eia3_reference), + false, + true); +} + +static void crypto_test_check_alg_zuc_eia3_ovr_iv(void) +{ + check_alg(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_NULL, + ODP_AUTH_ALG_ZUC_EIA3, + zuc_eia3_reference, + ARRAY_SIZE(zuc_eia3_reference), + true, + true); +} + static int crypto_suite_sync_init(void) { suite_context.pool = odp_pool_lookup("packet_pool"); @@ -1526,6 +1874,30 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_ctr), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr_ovr_iv, check_alg_aes_ctr), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_kasumi_f8, + check_alg_kasumi_f8), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_kasumi_f8, + check_alg_kasumi_f8), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_kasumi_f8_ovr_iv, + check_alg_kasumi_f8), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_kasumi_f8_ovr_iv, + check_alg_kasumi_f8), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_snow3g_uea2, + check_alg_snow3g_uea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_snow3g_uea2, + check_alg_snow3g_uea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_snow3g_uea2_ovr_iv, + check_alg_snow3g_uea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_snow3g_uea2_ovr_iv, + check_alg_snow3g_uea2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_zuc_eea3, + check_alg_zuc_eea3), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_zuc_eea3, + check_alg_zuc_eea3), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_zuc_eea3_ovr_iv, + check_alg_zuc_eea3), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_zuc_eea3_ovr_iv, + check_alg_zuc_eea3), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm, check_alg_aes_gcm), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm_ovr_iv, @@ -1586,6 +1958,30 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_cmac), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_cmac, check_alg_aes_cmac), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_kasumi_f9, + check_alg_kasumi_f9), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_kasumi_f9, + check_alg_kasumi_f9), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_kasumi_f9_ovr_iv, + check_alg_kasumi_f9), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_kasumi_f9_ovr_iv, + check_alg_kasumi_f9), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_snow3g_uia2, + check_alg_snow3g_uia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_snow3g_uia2, + check_alg_snow3g_uia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_snow3g_uia2_ovr_iv, + check_alg_snow3g_uia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_snow3g_uia2_ovr_iv, + check_alg_snow3g_uia2), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_zuc_eia3, + check_alg_zuc_eia3), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_zuc_eia3, + check_alg_zuc_eia3), + ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_zuc_eia3_ovr_iv, + check_alg_zuc_eia3), + ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_zuc_eia3_ovr_iv, + check_alg_zuc_eia3), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 9adb4332..3e40d708 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -1534,4 +1534,186 @@ static crypto_test_reference_t aes_xcbc_reference[] = { } }; +/* + * Kasumi F8 and F9 test vectors are taken from + * 3GPP TS 35.203 V9.0.0 (2009-12) + * 3rd Generation Partnership Project; + * Technical Specification Group Services and System Aspects; + * 3G Security; + * Specification of the 3GPP Confidentiality + * and Integrity Algorithms; + * Document 3: Implementors' Test Data + * (Release 9) + */ +static crypto_test_reference_t kasumi_f8_reference[] = { + { + .cipher_key_length = KASUMI_F8_KEY_LEN, + .cipher_key = { 0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, + 0x4e, 0xa5, 0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52}, + .cipher_iv_length = KASUMI_F8_IV_LEN, + .cipher_iv = { 0xfa, 0x55, 0x6b, 0x26, 0x1c, 0x00, 0x00, 0x00}, + .length = 120, /* 15 bytes */ + .plaintext = { 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, + 0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8 }, + .ciphertext = { 0x9b, 0xc9, 0x2c, 0xa8, 0x03, 0xc6, 0x7b, 0x28, + 0xa1, 0x1a, 0x4b, 0xee, 0x5a, 0x0c, 0x25 } + } +}; + +static crypto_test_reference_t kasumi_f9_reference[] = { + { + .auth_key_length = KASUMI_F9_KEY_LEN, + .auth_key = { 0xc7, 0x36, 0xc6, 0xaa, 0xb2, 0x2b, 0xff, 0xf9, + 0x1e, 0x26, 0x98, 0xd2, 0xe2, 0x2a, 0xd5, 0x7e }, + .auth_iv_length = KASUMI_F9_IV_LEN, + .auth_iv = { 0x14, 0x79, 0x3e, 0x41, 0x03, 0x97, 0xe8, 0xfd, + 0x01, }, + .length = 384, /* 48 bytes */ + .plaintext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2, + 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1, + 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29, + 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0, + 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20, + 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09}, + .ciphertext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2, + 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1, + 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29, + 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0, + 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20, + 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09}, + .digest_length = KASUMI_F9_DIGEST_LEN, + .digest = { 0xdd, 0x7d, 0xfa, 0xdd }, + } +}; + +/* + * Snow3G UEA2 & UIA2 test vectors are taken from + * Specification of the 3GPP Confidentiality and + * Integrity Algorithms UEA2 & UIA2 + * Document 3: Implementors’ Test Data + * Version: 1.1 + * Date: 25 th October 2012 + */ +static crypto_test_reference_t snow3g_uea2_reference[] = { + { + .cipher_key_length = SNOW3G_UEA2_KEY_LEN, + .cipher_key = { 0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, + 0x4e, 0xa5, 0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52}, + .cipher_iv_length = SNOW3G_UEA2_IV_LEN, + .cipher_iv = { 0xfa, 0x55, 0x6b, 0x26, 0x1c, 0x00, 0x00, 0x00, + 0xfa, 0x55, 0x6b, 0x26, 0x1c, 0x00, 0x00, 0x00}, + .length = 120, /* 15 bytes */ + .plaintext = { 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, + 0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8 }, + .ciphertext = { 0xba, 0x0f, 0x31, 0x30, 0x03, 0x34, 0xc5, 0x6b, + 0x52, 0xa7, 0x49, 0x7c, 0xba, 0xc0, 0x46 } + } +}; + +static crypto_test_reference_t snow3g_uia2_reference[] = { + { + .auth_key_length = SNOW3G_UIA2_KEY_LEN, + .auth_key = { 0xc7, 0x36, 0xc6, 0xaa, 0xb2, 0x2b, 0xff, 0xf9, + 0x1e, 0x26, 0x98, 0xd2, 0xe2, 0x2a, 0xd5, 0x7e}, + .auth_iv_length = SNOW3G_UIA2_IV_LEN, + .auth_iv = { 0x14, 0x79, 0x3e, 0x41, 0x03, 0x97, 0xe8, 0xfd, + 0x94, 0x79, 0x3e, 0x41, 0x03, 0x97, 0x68, 0xfd }, + .length = 384, /* 48 bytes */ + .plaintext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2, + 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1, + 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29, + 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0, + 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20, + 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09}, + .ciphertext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2, + 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1, + 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29, + 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0, + 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20, + 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09}, + .digest_length = SNOW3G_UIA2_DIGEST_LEN, + .digest = { 0x38, 0xb5, 0x54, 0xc0 } + } +}; + +/* + * ZUC EEA3 and EIA3 test vectors from + * Specification of the 3GPP Confidentiality and Integrity + * Algorithms 128-EEA3 & 128-EIA3 + * Document 3: Implementor’s Test Data + * Version: 1.1 + * Date: 4 th Jan. 2011 + */ +static crypto_test_reference_t zuc_eea3_reference[] = { + { + .cipher_key_length = ZUC_EIA3_KEY_LEN, + .cipher_key = { 0xe5, 0xbd, 0x3e, 0xa0, 0xeb, 0x55, 0xad, 0xe8, + 0x66, 0xc6, 0xac, 0x58, 0xbd, 0x54, 0x30, 0x2a}, + .cipher_iv_length = ZUC_EEA3_IV_LEN, + .cipher_iv = { 0x00, 0x05, 0x68, 0x23, 0xc4, 0x00, 0x00, 0x00, + 0x00, 0x05, 0x68, 0x23, 0xc4, 0x00, 0x00, 0x00 }, + .length = 800, /* 100 bytes */ + .plaintext = { 0x14, 0xa8, 0xef, 0x69, 0x3d, 0x67, 0x85, 0x07, + 0xbb, 0xe7, 0x27, 0x0a, 0x7f, 0x67, 0xff, 0x50, + 0x06, 0xc3, 0x52, 0x5b, 0x98, 0x07, 0xe4, 0x67, + 0xc4, 0xe5, 0x60, 0x00, 0xba, 0x33, 0x8f, 0x5d, + 0x42, 0x95, 0x59, 0x03, 0x67, 0x51, 0x82, 0x22, + 0x46, 0xc8, 0x0d, 0x3b, 0x38, 0xf0, 0x7f, 0x4b, + 0xe2, 0xd8, 0xff, 0x58, 0x05, 0xf5, 0x13, 0x22, + 0x29, 0xbd, 0xe9, 0x3b, 0xbb, 0xdc, 0xaf, 0x38, + 0x2b, 0xf1, 0xee, 0x97, 0x2f, 0xbf, 0x99, 0x77, + 0xba, 0xda, 0x89, 0x45, 0x84, 0x7a, 0x2a, 0x6c, + 0x9a, 0xd3, 0x4a, 0x66, 0x75, 0x54, 0xe0, 0x4d, + 0x1f, 0x7f, 0xa2, 0xc3, 0x32, 0x41, 0xbd, 0x8f, + 0x01, 0xba, 0x22, 0x0d }, + .ciphertext = { 0x13, 0x1d, 0x43, 0xe0, 0xde, 0xa1, 0xbe, 0x5c, + 0x5a, 0x1b, 0xfd, 0x97, 0x1d, 0x85, 0x2c, 0xbf, + 0x71, 0x2d, 0x7b, 0x4f, 0x57, 0x96, 0x1f, 0xea, + 0x32, 0x08, 0xaf, 0xa8, 0xbc, 0xa4, 0x33, 0xf4, + 0x56, 0xad, 0x09, 0xc7, 0x41, 0x7e, 0x58, 0xbc, + 0x69, 0xcf, 0x88, 0x66, 0xd1, 0x35, 0x3f, 0x74, + 0x86, 0x5e, 0x80, 0x78, 0x1d, 0x20, 0x2d, 0xfb, + 0x3e, 0xcf, 0xf7, 0xfc, 0xbc, 0x3b, 0x19, 0x0f, + 0xe8, 0x2a, 0x20, 0x4e, 0xd0, 0xe3, 0x50, 0xfc, + 0x0f, 0x6f, 0x26, 0x13, 0xb2, 0xf2, 0xbc, 0xa6, + 0xdf, 0x5a, 0x47, 0x3a, 0x57, 0xa4, 0xa0, 0x0d, + 0x98, 0x5e, 0xba, 0xd8, 0x80, 0xd6, 0xf2, 0x38, + 0x64, 0xa0, 0x7b, 0x01 } + } +}; + +static crypto_test_reference_t zuc_eia3_reference[] = { + { + .auth_key_length = ZUC_EIA3_KEY_LEN, + .auth_key = { 0xc9, 0xe6, 0xce, 0xc4, 0x60, 0x7c, 0x72, 0xdb, + 0x00, 0x0a, 0xef, 0xa8, 0x83, 0x85, 0xab, 0x0a }, + .auth_iv_length = ZUC_EIA3_IV_LEN, + .auth_iv = { 0xa9, 0x40, 0x59, 0xda, 0x50, 0x00, 0x00, 0x00, + 0x29, 0x40, 0x59, 0xda, 0x50, 0x00, 0x80, 0x00 }, + .length = 584, /* 73 bytes */ + .plaintext = { 0x98, 0x3b, 0x41, 0xd4, 0x7d, 0x78, 0x0c, 0x9e, + 0x1a, 0xd1, 0x1d, 0x7e, 0xb7, 0x03, 0x91, 0xb1, + 0xde, 0x0b, 0x35, 0xda, 0x2d, 0xc6, 0x2f, 0x83, + 0xe7, 0xb7, 0x8d, 0x63, 0x06, 0xca, 0x0e, 0xa0, + 0x7e, 0x94, 0x1b, 0x7b, 0xe9, 0x13, 0x48, 0xf9, + 0xfc, 0xb1, 0x70, 0xe2, 0x21, 0x7f, 0xec, 0xd9, + 0x7f, 0x9f, 0x68, 0xad, 0xb1, 0x6e, 0x5d, 0x7d, + 0x21, 0xe5, 0x69, 0xd2, 0x80, 0xed, 0x77, 0x5c, + 0xeb, 0xde, 0x3f, 0x40, 0x93, 0xc5, 0x38, 0x81, + 0x00, 0x00, 0x00, 0x00 }, + .ciphertext = { 0x98, 0x3b, 0x41, 0xd4, 0x7d, 0x78, 0x0c, 0x9e, + 0x1a, 0xd1, 0x1d, 0x7e, 0xb7, 0x03, 0x91, 0xb1, + 0xde, 0x0b, 0x35, 0xda, 0x2d, 0xc6, 0x2f, 0x83, + 0xe7, 0xb7, 0x8d, 0x63, 0x06, 0xca, 0x0e, 0xa0, + 0x7e, 0x94, 0x1b, 0x7b, 0xe9, 0x13, 0x48, 0xf9, + 0xfc, 0xb1, 0x70, 0xe2, 0x21, 0x7f, 0xec, 0xd9, + 0x7f, 0x9f, 0x68, 0xad, 0xb1, 0x6e, 0x5d, 0x7d, + 0x21, 0xe5, 0x69, 0xd2, 0x80, 0xed, 0x77, 0x5c, + 0xeb, 0xde, 0x3f, 0x40, 0x93, 0xc5, 0x38, 0x81, + 0x00, 0x00, 0x00, 0x00 }, + .digest_length = ZUC_EIA3_DIGEST_LEN, + .digest = { 0x24, 0xa8, 0x42, 0xb3 } + } +}; + #endif diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index 95d202b6..3418ef27 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -70,4 +70,31 @@ #define AES_XCBC_MAC_96_CHECK_LEN 12 #define AES_XCBC_MAC_CHECK_LEN 16 +/* KASUMI_F8 */ +#define KASUMI_F8_KEY_LEN 16 +#define KASUMI_F8_IV_LEN 8 + +/* SNOW3G_UEA2 */ +#define SNOW3G_UEA2_KEY_LEN 16 +#define SNOW3G_UEA2_IV_LEN 16 + +/* ZUC_EEA3 */ +#define ZUC_EEA3_KEY_LEN 16 +#define ZUC_EEA3_IV_LEN 16 + +/* KASUMI_F9 */ +#define KASUMI_F9_KEY_LEN 16 +#define KASUMI_F9_IV_LEN 9 +#define KASUMI_F9_DIGEST_LEN 4 + +/* SNOW3G_UIA2 */ +#define SNOW3G_UIA2_KEY_LEN 16 +#define SNOW3G_UIA2_IV_LEN 16 +#define SNOW3G_UIA2_DIGEST_LEN 4 + +/* ZUC_EIA3 */ +#define ZUC_EIA3_KEY_LEN 16 +#define ZUC_EIA3_IV_LEN 16 +#define ZUC_EIA3_DIGEST_LEN 4 + #endif commit 067a7054ba44a2c754f1382daf6469c495085639 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 16 15:34:54 2018 +0300 validation: crypto: add support for bit mode algorithm testing Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index 1e06761c..a551be55 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -320,13 +320,15 @@ static void alg_test(odp_crypto_op_t op, odp_cipher_alg_t cipher_alg, odp_auth_alg_t auth_alg, crypto_test_reference_t *ref, - odp_bool_t ovr_iv) + odp_bool_t ovr_iv, + odp_bool_t bit_mode) { odp_crypto_session_t session; int rc; odp_crypto_ses_create_err_t status; odp_bool_t ok = false; int iteration; + uint32_t reflength; odp_crypto_session_param_t ses_params; odp_packet_data_range_t cipher_range; odp_packet_data_range_t auth_range; @@ -375,9 +377,14 @@ static void alg_test(odp_crypto_op_t op, auth_range.offset = 0; auth_range.length = ref->length; + if (bit_mode) + reflength = (ref->length + 7) / 8; + else + reflength = ref->length; + /* Prepare input data */ odp_packet_t pkt = odp_packet_alloc(suite_context.pool, - ref->length + ref->digest_length); + reflength + ref->digest_length); CU_ASSERT(pkt != ODP_PACKET_INVALID); if (pkt == ODP_PACKET_INVALID) goto cleanup; @@ -391,18 +398,18 @@ static void alg_test(odp_crypto_op_t op, continue; if (op == ODP_CRYPTO_OP_ENCODE) { - odp_packet_copy_from_mem(pkt, 0, ref->length, + odp_packet_copy_from_mem(pkt, 0, reflength, ref->plaintext); } else { - odp_packet_copy_from_mem(pkt, 0, ref->length, + odp_packet_copy_from_mem(pkt, 0, reflength, ref->ciphertext); - odp_packet_copy_from_mem(pkt, ref->length, + odp_packet_copy_from_mem(pkt, reflength, ref->digest_length, ref->digest); if (iteration == WRONG_DIGEST_TEST) { uint8_t byte = ~ref->digest[0]; - odp_packet_copy_from_mem(pkt, ref->length, + odp_packet_copy_from_mem(pkt, reflength, 1, &byte); } } @@ -412,19 +419,19 @@ static void alg_test(odp_crypto_op_t op, ovr_iv ? ref->cipher_iv : NULL, ovr_iv ? ref->auth_iv : NULL, &cipher_range, &auth_range, - ref->aad, ref->length); + ref->aad, reflength); else if (ODP_CRYPTO_ASYNC == suite_context.op_mode) rc = alg_packet_op_enq(pkt, &ok, session, ovr_iv ? ref->cipher_iv : NULL, ovr_iv ? ref->auth_iv : NULL, &cipher_range, &auth_range, - ref->aad, ref->length); + ref->aad, reflength); else rc = alg_packet_op(pkt, &ok, session, ovr_iv ? ref->cipher_iv : NULL, ovr_iv ? ref->auth_iv : NULL, &cipher_range, &auth_range, - ref->aad, ref->length); + ref->aad, reflength); if (rc < 0) break; @@ -438,14 +445,14 @@ static void alg_test(odp_crypto_op_t op, if (op == ODP_CRYPTO_OP_ENCODE) { CU_ASSERT(!packet_cmp_mem(pkt, 0, ref->ciphertext, - ref->length)); - CU_ASSERT(!packet_cmp_mem(pkt, ref->length, + reflength)); + CU_ASSERT(!packet_cmp_mem(pkt, reflength, ref->digest, ref->digest_length)); } else { CU_ASSERT(!packet_cmp_mem(pkt, 0, ref->plaintext, - ref->length)); + reflength)); } } @@ -461,7 +468,8 @@ static void check_alg(odp_crypto_op_t op, odp_auth_alg_t auth_alg, crypto_test_reference_t *ref, size_t count, - odp_bool_t ovr_iv) + odp_bool_t ovr_iv, + odp_bool_t bit_mode) { odp_crypto_capability_t capa; int rc, i; @@ -565,7 +573,9 @@ static void check_alg(odp_crypto_op_t op, if (cipher_capa[i].key_len == ref[idx].cipher_key_length && cipher_capa[i].iv_len == - ref[idx].cipher_iv_length) { + ref[idx].cipher_iv_length && + cipher_capa[i].bit_mode == + bit_mode) { cipher_idx = i; break; } @@ -573,10 +583,11 @@ static void check_alg(odp_crypto_op_t op, if (cipher_idx < 0) { printf("\n Unsupported: alg=%s, key_len=%" PRIu32 - ", iv_len=%" PRIu32 "\n", + ", iv_len=%" PRIu32 "%s\n", cipher_alg_name(cipher_alg), ref[idx].cipher_key_length, - ref[idx].cipher_iv_length); + ref[idx].cipher_iv_length, + bit_mode ? " using bits" : ""); continue; } @@ -586,7 +597,9 @@ static void check_alg(odp_crypto_op_t op, auth_capa[i].iv_len == ref[idx].auth_iv_length && auth_capa[i].key_len == - ref[idx].auth_key_length) { + ref[idx].auth_key_length && + auth_capa[i].bit_mode == + bit_mode) { auth_idx = i; break; } @@ -594,15 +607,17 @@ static void check_alg(odp_crypto_op_t op, if (auth_idx < 0) { printf("\n Unsupported: alg=%s, key_len=%" PRIu32 - ", iv_len=%" PRIu32 ", digest_len=%" PRIu32 "\n", + ", iv_len=%" PRIu32 ", digest_len=%" PRIu32 + "%s\n", auth_alg_name(auth_alg), ref[idx].auth_key_length, ref[idx].auth_iv_length, - ref[idx].digest_length); + ref[idx].digest_length, + bit_mode ? " using bits" : ""); continue; } - alg_test(op, cipher_alg, auth_alg, &ref[idx], ovr_iv); + alg_test(op, cipher_alg, auth_alg, &ref[idx], ovr_iv, bit_mode); cipher_tested[cipher_idx] = true; auth_tested[auth_idx] = true; @@ -610,23 +625,24 @@ static void check_alg(odp_crypto_op_t op, for (i = 0; i < cipher_num; i++) { cipher_ok |= cipher_tested[i]; - if (!cipher_tested[i]) { + if (!cipher_tested[i] && cipher_capa[i].bit_mode == bit_mode) printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " - "iv_len=%" PRIu32 "\n", + "iv_len=%" PRIu32 "%s\n", cipher_alg_name(cipher_alg), cipher_capa[i].key_len, - cipher_capa[i].iv_len); - } + cipher_capa[i].iv_len, + cipher_capa[i].bit_mode ? " using bits" : ""); } for (i = 0; i < auth_num; i++) { auth_ok |= auth_tested[i]; - if (!auth_tested[i]) + if (!auth_tested[i] && auth_capa[i].bit_mode == bit_mode) printf("\n Untested: alg=%s, key_len=%" PRIu32 ", " - "digest_len=%" PRIu32 "\n", + "digest_len=%" PRIu32 "%s\n", auth_alg_name(auth_alg), auth_capa[i].key_len, - auth_capa[i].digest_len); + auth_capa[i].digest_len, + auth_capa[i].bit_mode ? " using bits" : ""); } /* Verify that we were able to run at least several tests */ @@ -769,6 +785,7 @@ static void crypto_test_enc_alg_null(void) ODP_AUTH_ALG_NULL, null_reference, ARRAY_SIZE(null_reference), + false, false); } @@ -779,6 +796,7 @@ static void crypto_test_dec_alg_null(void) ODP_AUTH_ALG_NULL, null_reference, ARRAY_SIZE(null_reference), + false, false); } @@ -798,6 +816,7 @@ static void crypto_test_enc_alg_3des_cbc(void) ODP_AUTH_ALG_NULL, tdes_cbc_reference, ARRAY_SIZE(tdes_cbc_reference), + false, false); } @@ -811,7 +830,8 @@ static void crypto_test_enc_alg_3des_cbc_ovr_iv(void) ODP_AUTH_ALG_NULL, tdes_cbc_reference, ARRAY_SIZE(tdes_cbc_reference), - true); + true, + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -826,6 +846,7 @@ static void crypto_test_dec_alg_3des_cbc(void) ODP_AUTH_ALG_NULL, tdes_cbc_reference, ARRAY_SIZE(tdes_cbc_reference), + false, false); } @@ -841,7 +862,8 @@ static void crypto_test_dec_alg_3des_cbc_ovr_iv(void) ODP_AUTH_ALG_NULL, tdes_cbc_reference, ARRAY_SIZE(tdes_cbc_reference), - true); + true, + false); } static int check_alg_chacha20_poly1305(void) @@ -857,6 +879,7 @@ static void crypto_test_enc_alg_chacha20_poly1305(void) ODP_AUTH_ALG_CHACHA20_POLY1305, chacha20_poly1305_reference, ARRAY_SIZE(chacha20_poly1305_reference), + false, false); } @@ -867,7 +890,8 @@ static void crypto_test_enc_alg_chacha20_poly1305_ovr_iv(void) ODP_AUTH_ALG_CHACHA20_POLY1305, chacha20_poly1305_reference, ARRAY_SIZE(chacha20_poly1305_reference), - true); + true, + false); } static void crypto_test_dec_alg_chacha20_poly1305(void) @@ -877,6 +901,7 @@ static void crypto_test_dec_alg_chacha20_poly1305(void) ODP_AUTH_ALG_CHACHA20_POLY1305, chacha20_poly1305_reference, ARRAY_SIZE(chacha20_poly1305_reference), + false, false); } @@ -887,7 +912,8 @@ static void crypto_test_dec_alg_chacha20_poly1305_ovr_iv(void) ODP_AUTH_ALG_CHACHA20_POLY1305, chacha20_poly1305_reference, ARRAY_SIZE(chacha20_poly1305_reference), - true); + true, + false); } static int check_alg_aes_gcm(void) @@ -906,6 +932,7 @@ static void crypto_test_enc_alg_aes_gcm(void) ODP_AUTH_ALG_AES_GCM, aes_gcm_reference, ARRAY_SIZE(aes_gcm_reference), + false, false); } @@ -920,7 +947,8 @@ static void crypto_test_enc_alg_aes_gcm_ovr_iv(void) ODP_AUTH_ALG_AES_GCM, aes_gcm_reference, ARRAY_SIZE(aes_gcm_reference), - true); + true, + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -935,6 +963,7 @@ static void crypto_test_dec_alg_aes_gcm(void) ODP_AUTH_ALG_AES_GCM, aes_gcm_reference, ARRAY_SIZE(aes_gcm_reference), + false, false); } @@ -950,7 +979,8 @@ static void crypto_test_dec_alg_aes_gcm_ovr_iv(void) ODP_AUTH_ALG_AES_GCM, aes_gcm_reference, ARRAY_SIZE(aes_gcm_reference), - true); + true, + false); } static int check_alg_aes_ccm(void) @@ -965,6 +995,7 @@ static void crypto_test_enc_alg_aes_ccm(void) ODP_AUTH_ALG_AES_CCM, aes_ccm_reference, ARRAY_SIZE(aes_ccm_reference), + false, false); } @@ -975,7 +1006,8 @@ static void crypto_test_enc_alg_aes_ccm_ovr_iv(void) ODP_AUTH_ALG_AES_CCM, aes_ccm_reference, ARRAY_SIZE(aes_ccm_reference), - true); + true, + false); } static void crypto_test_dec_alg_aes_ccm(void) @@ -985,6 +1017,7 @@ static void crypto_test_dec_alg_aes_ccm(void) ODP_AUTH_ALG_AES_CCM, aes_ccm_reference, ARRAY_SIZE(aes_ccm_reference), + false, false); } @@ -995,7 +1028,8 @@ static void crypto_test_dec_alg_aes_ccm_ovr_iv(void) ODP_AUTH_ALG_AES_CCM, aes_ccm_reference, ARRAY_SIZE(aes_ccm_reference), - true); + true, + false); } static int check_alg_aes_cbc(void) @@ -1014,6 +1048,7 @@ static void crypto_test_enc_alg_aes_cbc(void) ODP_AUTH_ALG_NULL, aes_cbc_reference, ARRAY_SIZE(aes_cbc_reference), + false, false); } @@ -1027,7 +1062,8 @@ static void crypto_test_enc_alg_aes_cbc_ovr_iv(void) ODP_AUTH_ALG_NULL, aes_cbc_reference, ARRAY_SIZE(aes_cbc_reference), - true); + true, + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -1042,6 +1078,7 @@ static void crypto_test_dec_alg_aes_cbc(void) ODP_AUTH_ALG_NULL, aes_cbc_reference, ARRAY_SIZE(aes_cbc_reference), + false, false); } @@ -1057,7 +1094,8 @@ static void crypto_test_dec_alg_aes_cbc_ovr_iv(void) ODP_AUTH_ALG_NULL, aes_cbc_reference, ARRAY_SIZE(aes_cbc_reference), - true); + true, + false); } static int check_alg_aes_ctr(void) @@ -1076,6 +1114,7 @@ static void crypto_test_enc_alg_aes_ctr(void) ODP_AUTH_ALG_NULL, aes_ctr_reference, ARRAY_SIZE(aes_ctr_reference), + false, false); } @@ -1089,7 +1128,8 @@ static void crypto_test_enc_alg_aes_ctr_ovr_iv(void) ODP_AUTH_ALG_NULL, aes_ctr_reference, ARRAY_SIZE(aes_ctr_reference), - true); + true, + false); } /* This test verifies the correctness of decode (ciphertext -> plaintext) @@ -1104,6 +1144,7 @@ static void crypto_test_dec_alg_aes_ctr(void) ODP_AUTH_ALG_NULL, aes_ctr_reference, ARRAY_SIZE(aes_ctr_reference), + false, false); } @@ -1119,7 +1160,8 @@ static void crypto_test_dec_alg_aes_ctr_ovr_iv(void) ODP_AUTH_ALG_NULL, aes_ctr_reference, ARRAY_SIZE(aes_ctr_reference), - true); + true, + false); } static int check_alg_hmac_md5(void) @@ -1141,6 +1183,7 @@ static void crypto_test_gen_alg_hmac_md5(void) ODP_AUTH_ALG_MD5_HMAC, hmac_md5_reference, ARRAY_SIZE(hmac_md5_reference), + false, false); } @@ -1151,6 +1194,7 @@ static void crypto_test_check_alg_hmac_md5(void) ODP_AUTH_ALG_MD5_HMAC, hmac_md5_reference, ARRAY_SIZE(hmac_md5_reference), + false, false); } @@ -1173,6 +1217,7 @@ static void crypto_test_gen_alg_hmac_sha1(void) ODP_AUTH_ALG_SHA1_HMAC, hmac_sha1_reference, ARRAY_SIZE(hmac_sha1_reference), + false, false); } @@ -1183,6 +1228,7 @@ static void crypto_test_check_alg_hmac_sha1(void) ODP_AUTH_ALG_SHA1_HMAC, hmac_sha1_reference, ARRAY_SIZE(hmac_sha1_reference), + false, false); } @@ -1205,6 +1251,7 @@ static void crypto_test_gen_alg_hmac_sha256(void) ODP_AUTH_ALG_SHA256_HMAC, hmac_sha256_reference, ARRAY_SIZE(hmac_sha256_reference), + false, false); } @@ -1215,6 +1262,7 @@ static void crypto_test_check_alg_hmac_sha256(void) ODP_AUTH_ALG_SHA256_HMAC, hmac_sha256_reference, ARRAY_SIZE(hmac_sha256_reference), + false, false); } @@ -1237,6 +1285,7 @@ static void crypto_test_gen_alg_hmac_sha384(void) ODP_AUTH_ALG_SHA384_HMAC, hmac_sha384_reference, ARRAY_SIZE(hmac_sha384_reference), + false, false); } @@ -1247,6 +1296,7 @@ static void crypto_test_check_alg_hmac_sha384(void) ODP_AUTH_ALG_SHA384_HMAC, hmac_sha384_reference, ARRAY_SIZE(hmac_sha384_reference), + false, false); } @@ -1269,6 +1319,7 @@ static void crypto_test_gen_alg_hmac_sha512(void) ODP_AUTH_ALG_SHA512_HMAC, hmac_sha512_reference, ARRAY_SIZE(hmac_sha512_reference), + false, false); } @@ -1279,6 +1330,7 @@ static void crypto_test_check_alg_hmac_sha512(void) ODP_AUTH_ALG_SHA512_HMAC, hmac_sha512_reference, ARRAY_SIZE(hmac_sha512_reference), + false, false); } @@ -1302,6 +1354,7 @@ static void crypto_test_gen_alg_aes_xcbc(void) ODP_AUTH_ALG_AES_XCBC_MAC, aes_xcbc_reference, ARRAY_SIZE(aes_xcbc_reference), + false, false); } @@ -1312,6 +1365,7 @@ static void crypto_test_check_alg_aes_xcbc(void) ODP_AUTH_ALG_AES_XCBC_MAC, aes_xcbc_reference, ARRAY_SIZE(aes_xcbc_reference), + false, false); } @@ -1327,6 +1381,7 @@ static void crypto_test_gen_alg_aes_gmac(void) ODP_AUTH_ALG_AES_GMAC, aes_gmac_reference, ARRAY_SIZE(aes_gmac_reference), + false, false); } @@ -1337,7 +1392,8 @@ static void crypto_test_gen_alg_aes_gmac_ovr_iv(void) ODP_AUTH_ALG_AES_GMAC, aes_gmac_reference, ARRAY_SIZE(aes_gmac_reference), - true); + true, + false); } static void crypto_test_check_alg_aes_gmac(void) @@ -1347,6 +1403,7 @@ static void crypto_test_check_alg_aes_gmac(void) ODP_AUTH_ALG_AES_GMAC, aes_gmac_reference, ARRAY_SIZE(aes_gmac_reference), + false, false); } @@ -1357,6 +1414,7 @@ static void crypto_test_check_alg_aes_gmac_ovr_iv(void) ODP_AUTH_ALG_AES_GMAC, aes_gmac_reference, ARRAY_SIZE(aes_gmac_reference), + false, false); } @@ -1372,6 +1430,7 @@ static void crypto_test_gen_alg_aes_cmac(void) ODP_AUTH_ALG_AES_CMAC, aes_cmac_reference, ARRAY_SIZE(aes_cmac_reference), + false, false); } @@ -1382,6 +1441,7 @@ static void crypto_test_check_alg_aes_cmac(void) ODP_AUTH_ALG_AES_CMAC, aes_cmac_reference, ARRAY_SIZE(aes_cmac_reference), + false, false); } commit f5b1a18c53cec7203b4f94541af4b112c459ab74 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Feb 3 05:27:10 2018 +0300 api: crypto: add bitstring operation capability For several wireless communication algorithms it is expected that they operate on bit strings, which are not byte-aligned. Add cipher and auth flags, denoting that this cipher/auth can be enabled to work in bit-string mode. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 654ae7bb..843fdefe 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -755,6 +755,22 @@ typedef struct odp_crypto_cipher_capability_t { /** IV length in bytes */ uint32_t iv_len; + /** Cipher is operating in bitwise mode + * + * This cipher works on series of bits, rather than sequences of bytes: + * cipher_range in odp_crypto_op_param_t and + * odp_crypto_packet_op_param_t will use bits, rather than bytes. + * + * Note: data buffer MUST start on the byte boundary, using offset + * which is not divisible by 8 is unsupported and will result in + * unspecified behaviour. + * + * Note2: currently data length MUST be divisible by 8. Specifying data + * which does not consist of full bytes will result in unspecified + * behaviour. + */ + odp_bool_t bit_mode; + } odp_crypto_cipher_capability_t; /** @@ -783,6 +799,18 @@ typedef struct odp_crypto_auth_capability_t { uint32_t inc; } aad_len; + /** Auth is operating in bitstring mode + * + * This auth works on series of bits, rather than sequences of bytes: + * auth_range in odp_crypto_op_param_t and + * odp_crypto_packet_op_param_t will use bits, rather than bytes. + * + * Note: data buffer MUST start on the byte boundary, using offset + * which is not divisible by 8 is unsupported and will result in + * unpredictable behaviour. + */ + odp_bool_t bit_mode; + } odp_crypto_auth_capability_t; /** commit 09da8929a55e31b5005a3bb1c2c1184c435612cf Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 26 01:26:25 2017 +0300 api: crypto: provide definitions for 3GPP crypto algorithms Add enumeration definitions for KASUMI F8/F9, SNOW 3G UEA2/UIA2 and ZUC 128-EEA3/128-EIA3 algorithms. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index c59f6602..654ae7bb 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -110,6 +110,24 @@ typedef enum { */ ODP_CIPHER_ALG_CHACHA20_POLY1305, + /** Confidentiality F8 algorithm (UEA1) + * + * KASUMI-based F8 algorithm (also known as UEA1). + */ + ODP_CIPHER_ALG_KASUMI_F8, + + /** Confidentiality UEA2 algorithm (128-EEA1) + * + * SNOW 3G-based UEA2 algorithm (also known as 128-EEA1). + */ + ODP_CIPHER_ALG_SNOW3G_UEA2, + + /** Confidentiality 128-EEA3 algorithm + * + * ZUC-based 128-EEA3 algorithm. + */ + ODP_CIPHER_ALG_ZUC_EEA3, + /** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */ ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC), @@ -214,6 +232,27 @@ typedef enum { */ ODP_AUTH_ALG_CHACHA20_POLY1305, + /** Integrity F9 algorithm (UIA1) + * + * KASUMI-based F9 algorithm (also known as UIA1). + * + * IV (9 bytes) is a concatenation of COUNT (32b), FRESH (32b) and + * DIRECTION (LSB-aligned, 1b). + */ + ODP_AUTH_ALG_KASUMI_F9, + + /** Integrity UIA2 algorithm (128-EEA1) + * + * SNOW 3G-based UIA2 algorithm (also known as 128-EIA1). + */ + ODP_AUTH_ALG_SNOW3G_UIA2, + + /** Integrity 128-EIA3 algorithm + * + * ZUC-based 128-EIA3 algorithm. + */ + ODP_AUTH_ALG_ZUC_EIA3, + /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */ ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96), @@ -255,6 +294,15 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_CHACHA20_POLY1305 */ uint32_t chacha20_poly1305 : 1; + /** ODP_CIPHER_ALG_KASUMI_F8 */ + uint32_t kasumi_f8 : 1; + + /** ODP_CIPHER_ALG_SNOW3G_UEA2 */ + uint32_t snow3g_uea2 : 1; + + /** ODP_CIPHER_ALG_ZUC_EEA3 */ + uint32_t zuc_eea3 : 1; + /** @deprecated Use aes_cbc instead */ uint32_t ODP_DEPRECATE(aes128_cbc) : 1; @@ -312,6 +360,15 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_CHACHA20_POLY1305 */ uint32_t chacha20_poly1305 : 1; + /** ODP_AUTH_ALG_KASUMI_F9 */ + uint32_t kasumi_f9 : 1; + + /** ODP_AUTH_ALG_SNOW3G_UIA2 */ + uint32_t snow3g_uia2 : 1; + + /** ODP_AUTH_ALG_ZUC_EIA3 */ + uint32_t zuc_eia3 : 1; + /** @deprecated Use md5_hmac instead */ uint32_t ODP_DEPRECATE(md5_96) : 1; ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/crypto.h | 85 ++++ test/validation/api/crypto/odp_crypto_test_inp.c | 534 +++++++++++++++++++++-- test/validation/api/crypto/test_vectors.h | 182 ++++++++ test/validation/api/crypto/test_vectors_len.h | 27 ++ 4 files changed, 789 insertions(+), 39 deletions(-) hooks/post-receive --

6 years, 7 months

[COMMIT] branch api-next updated. v1.19.0.2_tigermoth-23-g7c629241

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 7c629241f07aa7509d996c0560a20c5b0c7b371d (commit) from ee6fdca6b647d1c92ba6d07400c7d1e23c9e0ce3 (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 7c629241f07aa7509d996c0560a20c5b0c7b371d Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Date: Tue Apr 24 20:09:37 2018 +0530 api: comp: compression specification ODP Compression specification Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Shally Verma <shally.verma(a)cavium.com> Signed-off-by: Mahipal Challa <mahipal.challa(a)cavium.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/abi-default/comp.h b/include/odp/api/abi-default/comp.h new file mode 100644 index 00000000..8a1145af --- /dev/null +++ b/include/odp/api/abi-default/comp.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ABI_COMP_H_ +#define ODP_ABI_COMP_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_comp_session_t; + +/** @ingroup odp_compression + * @{ + */ + +typedef _odp_abi_comp_session_t *odp_comp_session_t; + +#define ODP_COMP_SESSION_INVALID ((odp_comp_session_t)0) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/api/spec/comp.h b/include/odp/api/spec/comp.h new file mode 100644 index 00000000..a5eb5a23 --- /dev/null +++ b/include/odp/api/spec/comp.h @@ -0,0 +1,613 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP Compression + */ + +#ifndef ODP_API_COMP_H_ +#define ODP_API_COMP_H_ + +#include <odp/visibility_begin.h> +#include <odp/api/support.h> +#include <odp/api/packet.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** @defgroup odp_compression ODP COMP + * Operations for Compression and Decompression API. + * Hash calculation may be combined with de-/compression operations + * + * @{ + */ + +/** + * @def ODP_COMP_SESSION_INVALID + * Invalid session handle + */ + +/** + * @typedef odp_comp_session_t + * Compression/Decompression session handle + */ + +/** + * Compression operation mode + */ +typedef enum { + /** Synchronous Compression operation + * + * Application uses synchronous operation, + * which outputs all results on function return. + * */ + ODP_COMP_OP_MODE_SYNC, + + /** Asynchronous Compression operation + * + * Application uses asynchronous operation, + * which return results via events. + * */ + ODP_COMP_OP_MODE_ASYNC +} odp_comp_op_mode_t; + +/** + * Compression operation type. + */ +typedef enum { + /** Operation type - Compress */ + ODP_COMP_OP_COMPRESS, + + /** Operation type - Decompress */ + ODP_COMP_OP_DECOMPRESS +} odp_comp_op_t; + +/** + * Compression hash algorithms + */ +typedef enum { + /** No hash algorithm selected. */ + ODP_COMP_HASH_ALG_NONE, + + /** SHA-1 hash algorithm. */ + ODP_COMP_HASH_ALG_SHA1, + + /** SHA-2 hash algorithm 256-bit digest length. */ + ODP_COMP_HASH_ALG_SHA256 +} odp_comp_hash_alg_t; + +/** + * Compression algorithms + * + */ +typedef enum { + /** No algorithm specified. Added for testing purpose. */ + ODP_COMP_ALG_NULL, + + /** DEFLATE - RFC1951 */ + ODP_COMP_ALG_DEFLATE, + + /** ZLIB - RFC1950 */ + ODP_COMP_ALG_ZLIB, + + /** LZS */ + ODP_COMP_ALG_LZS +} odp_comp_alg_t; + +/** + * Compression operation status codes + */ +typedef enum { + /** Operation completed successfully*/ + ODP_COMP_STATUS_SUCCESS, + + /** Operation terminated due to insufficient output buffer */ + ODP_COMP_STATUS_OUT_OF_SPACE_TERM, + + /** Operation failure */ + ODP_COMP_STATUS_FAILURE, +} odp_comp_status_t; + +/** + * Hash algorithms in a bit field structure + */ +typedef union odp_comp_hash_algos_t { + /** hash algorithms */ + struct { + /** ODP_COMP_HASH_ALG_NONE */ + uint32_t none : 1, + + /** ODP_COMP_HASH_ALG_SHA1 */ + uint32_t sha1 : 1; + + /** ODP_COMP_HASH_ALG_SHA256 */ + uint32_t sha256 : 1; + + } bit; + + /** All bits of the bit field structure + * + * This field can be used to set/clear all flags, or bitwise + * operations over the entire structure. + */ + uint32_t all_bits; +} odp_comp_hash_algos_t; + +/** + * Compression algorithms in a bit field structure + */ +typedef union odp_comp_algos_t { + /** Compression algorithms */ + struct { + /** ODP_COMP_ALG_NULL */ + uint32_t null : 1; + + /** ODP_COMP_ALG_DEFLATE */ + uint32_t deflate : 1; + + /** ODP_COMP_ALG_ZLIB */ + uint32_t zlib : 1; + + /** ODP_COMP_ALG_LZS */ + uint32_t lzs : 1; + } bit; + + /** All bits of the bit field structure + * This field can be used to set/clear all flags, or bitwise + * operations over the entire structure. + */ + uint32_t all_bits; +} odp_comp_algos_t; + +/** + * Compression Interface Capabilities + */ +typedef struct odp_comp_capability_t { + /** Maximum number of sessions */ + uint32_t max_sessions; + + /** Supported compression algorithms */ + odp_comp_algos_t comp_algos; + + /** Supported hash algorithms */ + odp_comp_hash_algos_t hash_algos; + + /** Synchronous compression mode support (ODP_COMP_OP_MODE_SYNC) */ + odp_support_t sync; + + /** Aynchronous compression mode support (ODP_COMP_OP_MODE_SSYNC) */ + odp_support_t async; +} odp_comp_capability_t; + +/** + * Hash algorithm capabilities + */ +typedef struct odp_comp_hash_alg_capability_t { + /** Digest length in bytes */ + uint32_t digest_len; +} odp_comp_hash_alg_capability_t; + +/** + * Compression algorithm capabilities + */ +typedef struct odp_comp_alg_capability_t { + + /** Maximum compression level supported by implementation of this + * algorithm. Indicates number of compression levels supported by + * implementation. Valid range from (1 ... max_level) + */ + uint32_t max_level; + + /** Supported hash algorithms */ + odp_comp_hash_algos_t hash_algo; + + /** Compression ratio + * Optimal compression operation ratio for this algorithm. + * This is an estimate of maximum compression operation output for this + * algorithm. It is expressed as a percentage of maximum expected + * output data size with respect to input data size. + * i.e a value of 200% denotes the output data is 2x times the input + * data size. This is an optimal/most case estimate and it is possible + * that the percentage of output data produced might be greater + * than this value. + * + * @see odp__percent_t + */ + odp_percent_t compression_ratio; +} odp_comp_alg_capability_t; + +/** + * Compression Huffman type. Used by DEFLATE algorithm + */ +typedef enum odp_comp_huffman_code { + /** Fixed Huffman code */ + ODP_COMP_HUFFMAN_FIXED, + + /** Dynamic Huffman code */ + ODP_COMP_HUFFMAN_DYNAMIC, + + /** Default huffman code selected by implementation */ + ODP_COMP_HUFFMAN_DEFAULT, +} odp_comp_huffman_code_t; + +/** + * Compression DEFLATEe algorithm parameters. + * Also initialized by other deflate based algorithms , ex. ZLIB + */ +typedef struct odp_comp_deflate_param { + /** + * Compression level + * + * Valid range is integer between (0 ... max_level) + * level supported by the implementation. + * + * where, + * 0 - implemention default + * + * 1 - fastest compression i.e. output produced at + * best possible speed at the expense of compression quality + * + * max_level - High quality compression + * + * @see 'max_level' in odp_comp_alg_capability_t + */ + uint32_t comp_level; + + /** huffman code to use */ + odp_comp_huffman_code_t huffman_code; +} odp_comp_deflate_param_t; + +/** + * Compression algorithm specific parameters + */ +typedef union odp_comp_alg_param_t { + /** deflate parameter */ + odp_comp_deflate_param_t deflate; + + /** Struct for defining zlib algorithm parameters */ + struct { + /** deflate algo params */ + odp_comp_deflate_param_t deflate; + } zlib; +} odp_comp_alg_param_t; + + /** + * Compression session creation parameters + */ +typedef struct odp_comp_session_param_t { + /** Compression operation type Compress vs Decompress */ + odp_comp_op_t op; + + /** Compression operation mode + * + * Operation mode Synchronous vs Asynchronous + * + * @see odp_comp_op(), odp_comp_op_enq() + */ + odp_comp_op_mode_t mode; + + /** Compression algorithm + * + * @see odp_comp_capability() + */ + odp_comp_alg_t comp_algo; + + /** Hash algorithm + * + * @see odp_comp_alg_capability() + */ + odp_comp_hash_alg_t hash_algo; + + /** parameters specific to compression */ + odp_comp_alg_param_t alg_param; + + /** Session packet enqueue ordering + * Boolean to indicate if packet enqueue ordering is required per + * session. Valid only for Asynchronous operation mode + * (ODP_COMP_OP_MODE_ASYNC). Packet order is always maintained for + * synchronous operation mode (ODP_COMP_OP_MODE_SYNC) + * + * true: packet session enqueue order maintained + * + * false: packet session enqueue order is not maintained + * + * @note: By disabling packet order requirement, performance oriented + * application can leverage HW offered parallelism to increase operation + * performance. + */ + odp_bool_t packet_order; + + /** Destination queue for compression operations result. + * Results are enqueued as ODP_EVENT_PACKET with subtype + * ODP_EVENT_PACKET_COMP + */ + odp_queue_t compl_queue; +} odp_comp_session_param_t; + +/** + * Compression packet operation result + */ +typedef struct odp_comp_packet_result_t { + /** Operation status code */ + odp_comp_status_t status; + + /** Input packet handle */ + odp_packet_t pkt_in; + + /** Output packet data range + * Specifies offset and length of data resulting from compression + * operation. When hashing is configured output_data_range.len equals + * length of output data + 'digest+len' + */ + odp_packet_data_range_t output_data_range; +} odp_comp_packet_result_t; + +/** + * Compression per packet operation parameters + */ +typedef struct odp_comp_packet_op_param_t { + /** Session handle */ + odp_comp_session_t session; + + /** Input data range to process. where, + * + * offset - starting offset + * length - length of data for compression operation + * */ + odp_packet_data_range_t in_data_range; + + /** Output packet data range. + * Indicates where processed packet will be written. where, + * + * offset - starting offset + * length - length of buffer available for output + * + * Output packet data is not modified outside of this provided data + * range. If output data length is not sufficient for compression + * operation ODP_COMP_STATUS_OUT_OF_SPACE_TERM error will occur + */ + odp_packet_data_range_t out_data_range; +} odp_comp_packet_op_param_t; + +/** + * Query compression capabilities + * + * Output compression capabilities on success. + * + * @param[out] capa Pointer to capability structure for output + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_comp_capability(odp_comp_capability_t *capa); + +/** + * Query supported compression algorithm capabilities + * + * Output algorithm capabilities. + * + * @param comp Compression algorithm + * @param[out] capa Compression algorithm capability + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_comp_alg_capability(odp_comp_alg_t comp, + odp_comp_alg_capability_t *capa); + +/** + * Query supported hash algorithm capabilities + * + * Outputs all supported configuration options for the algorithm. + * + * @param hash Hash algorithm + * @param capa Hash algorithm capability + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_comp_hash_alg_capability(odp_comp_hash_alg_t hash, + odp_comp_hash_alg_capability_t *capa); + +/** + * Initialize compression session parameters + * + * Initialize an odp_comp_session_param_t to its default values for + * all fields. + * + * @param param Pointer to odp_comp_session_param_t to be initialized + */ +void odp_comp_session_param_init(odp_comp_session_param_t *param); + +/** + * Compression session creation + * + * Create a comp session according to the session parameters. Use + * odp_comp_session_param_init() to initialize parameters into their + * default values. + * + * @param param Session parameters + * + * @retval Comp session handle + * @retval ODP_COMP_SESSION_INVALID on failure + */ +odp_comp_session_t +odp_comp_session_create(const odp_comp_session_param_t *param); + +/** + * Compression session destroy + * + * Destroy an unused session. Result is undefined if session is being used + * (i.e. asynchronous operation is in progress). + * + * @param session Session handle + * + * @retval 0 on success + * @retval <0 on failure + */ +int odp_comp_session_destroy(odp_comp_session_t session); + +/** + * Synchronous packet compression operation + * + * This operation does packet compression in synchronous mode. A successful operation + * returns the number of successfully processed input packets and updates the + * results in the corresponding output packets. Outputted packets contain + * compression results metadata (odp_comp_packet_result_t), which should be + * checked for operation status. Length of outputted data can be got from + * output_data_range.len. + * + * When hashing is configured along with compression operation the + * result is appended at the end of the output data, output_data_range.len + * equals length of output data + 'digest_len'. Processed data length + * can be computed by subtracting 'digest_len' from output_data_range.len where + * 'digest_len' can be queried from odp_comp_hash_alg_capability(). + * Hash is always performed on plain text. Hash validation in decompression is + * performed by the application. + * For every input packet entry in 'pkt_in' array, application should pass + * corresponding valid output packet handle. If any error occurs during + * processing of packets, the API returns with number of entries successfully + * processed. + * Output packet metadatas like length or data pointer will not be updated. + * + * @param pkt_in Packets to be processed + * @param pkt_out Packet handle array for resulting packets + * @param num_pkt Number of packets to be processed + * @param param Operation parameters + * + * @return Number of input packets consumed (0 ... num_pkt) + * @retval <0 on failure + * + * @note The 'pkt_in','pkt_out'and 'param' arrays should be of same length, + * Results are undefined if otherwise. + + * @note Same packet handle cannot be used as input and output parameter. + * In-place compression operation is not supported + */ +int odp_comp_op(const odp_packet_t pkt_in[], odp_packet_t pkt_out[], + int num_pkt, const odp_comp_packet_op_param_t param[]); + +/** + * Asynchronous packet compression operation + * + * This operation does packet compression in asynchronous mode. It processes + * packets otherwise identical to odp_comp_op(), but the resulting packets are + * enqueued to 'compl_queue' configured during session (odp_comp_session_t) + * creation. For every input packet entry in in_pkt array, user should pass + * corresponding valid output packet handle. On return, API returns with + * number of entries successfully submitted for operation. + * + * When hashing is configured along with compression operation the + * result is appended at the end of the output data, output_data_range.len + * equals length of output data + 'digest_len'. Processed data length + * can be computed by subtracting 'digest_len' from output_data_range.len where + * 'digest_len' can be queried from odp_comp_hash_alg_capability(). + * Hash is always performed on plain text. Hash validation in decompression is + * performed by the application. + * + * In case of partially accepted array i.e. + * when number of packets returned < num_pkt, application may attempt to + * resubmit subsequent entries via calling any of the operation API. + * + * All the packets successfully enqueued will be submitted to 'compl_queue' + * after compression operation, Application should check 'status' of the + * operation in odp_comp_packet_result_t. + * Output packet metadatas like length or data pointer will not be updated. + * + * Please note it is always recommended that application using async mode, + * provide sufficiently large buffer size to avoid + * ODP_COMP_STATUS_OUT_OF_SPACE_TERM. + * + * @param pkt_in Packets to be processed + * @param pkt_out Packet handle array for resulting packets + * @param num_pkt Number of packets to be processed + * @param param Operation parameters + * + * @return Number of input packets enqueued (0 ... num_pkt) + * @retval <0 on failure + * + * @note The 'pkt_in','pkt_out'and 'param' arrays should be of same length, + * Results are undefined if otherwise. + + * @note Same packet handle cannot be used as input and output parameter. + * In-place compression operation is not supported + + * @see odp_comp_op(), odp_comp_packet_result() + */ +int odp_comp_op_enq(const odp_packet_t pkt_in[], odp_packet_t pkt_out[], + int num_pkt, const odp_comp_packet_op_param_t param[]); + +/** + * Get compression operation results from processed packet. + * + * Successful compression operations of all modes (ODP_COMP_OP_MODE_SYNC and + * ODP_COMP_OP_MODE_ASYNC) produce packets which contain compression result + * metadata. This function copies operation results from compression processed + * packet. Event subtype of this packet is ODP_EVENT_PACKET_COMP. Results are + * undefined if non-compression processed packet is passed as input. + * + * @param[out] result pointer to operation result for output + * @param packet compression processed packet (ODP_EVENT_PACKET_COMP) + * + * @retval 0 On success + * @retval <0 On failure + */ +int odp_comp_result(odp_comp_packet_result_t *result, odp_packet_t packet); + + /** + * Convert compression processed packet event to packet handle + * + * Get packet handle corresponding to processed packet event. Event subtype + * must be ODP_EVENT_PACKET_COMP. Compression operation results can be + * examined with odp_comp_result(). + * + * @param event Event handle + * + * @return Valid Packet handle on success, + * @retval ODP_PACKET_INVALID on failure + * + * @see odp_event_subtype(), odp_comp_result() + * + */ +odp_packet_t odp_comp_packet_from_event(odp_event_t event); + + /** + * Convert processed packet handle to event + * + * The packet handle must be an output of a compression operation + * + * @param pkt Packet handle from compression operation + * @return Event handle + */ +odp_event_t odp_comp_packet_to_event(odp_packet_t pkt); + +/** + * Get printable value for an odp_comp_session_t + * + * @param hdl odp_comp_session_t handle to be printed + * @return uint64_t value that can be used to print/display this + * handle + * + * @note This routine is intended to be used for diagnostic purposes + * to enable applications to generate a printable value that represents + * an odp_comp_session_t handle. + */ +uint64_t odp_comp_session_to_u64(odp_comp_session_t hdl); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> +#endif + ----------------------------------------------------------------------- Summary of changes: include/odp/api/abi-default/{queue.h => comp.h} | 18 +- include/odp/api/spec/comp.h | 613 ++++++++++++++++++++++++ 2 files changed, 622 insertions(+), 9 deletions(-) copy include/odp/api/abi-default/{queue.h => comp.h} (52%) create mode 100644 include/odp/api/spec/comp.h hooks/post-receive --

6 years, 7 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-23-g6add70a4

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 6add70a4ff916acb331b961bc230cf946fbe835a (commit) from ee6fdca6b647d1c92ba6d07400c7d1e23c9e0ce3 (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 6add70a4ff916acb331b961bc230cf946fbe835a Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Jul 12 11:35:07 2018 +0300 linux-gen: ipsec: fall back to lower odp_random_kind_t if necessary Create IV with lower random kind if ODP_RANDOM_CRYPTO is not supported. This enables passing validation tests using odp_random_null. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h index 009862a8..1ddc49ea 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -13,6 +13,7 @@ extern "C" { #include <odp/api/init.h> #include <odp/api/cpumask.h> +#include <odp/api/random.h> #include <sys/types.h> #include <pthread.h> #include <stdint.h> @@ -58,6 +59,7 @@ struct odp_global_data_s { int inotify_watch_fd; pthread_t inotify_thread; int inotify_pcapng_is_running; + odp_random_kind_t ipsec_rand_kind; }; extern struct odp_global_data_s odp_global_data; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 71258fe9..5b739cc1 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -13,6 +13,7 @@ #include <odp/api/byteorder.h> #include <odp/api/plat/byteorder_inlines.h> +#include <odp_global_data.h> #include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> @@ -1003,7 +1004,7 @@ static int ipsec_out_iv(ipsec_state_t *state, uint32_t len; len = odp_random_data(state->iv, ipsec_sa->esp_iv_len, - ODP_RANDOM_CRYPTO); + odp_global_data.ipsec_rand_kind); if (len != ipsec_sa->esp_iv_len) return -1; @@ -1892,6 +1893,10 @@ int _odp_ipsec_init_global(void) memset(&default_out_opt, 0, sizeof(default_out_opt)); + odp_global_data.ipsec_rand_kind = ODP_RANDOM_CRYPTO; + if (odp_global_data.ipsec_rand_kind > odp_random_max_kind()) + odp_global_data.ipsec_rand_kind = odp_random_max_kind(); + return 0; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_global_data.h | 2 ++ platform/linux-generic/odp_ipsec.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) hooks/post-receive --

6 years, 7 months

[COMMIT] branch api-next updated. v1.19.0.2_tigermoth-22-gee6fdca6

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via ee6fdca6b647d1c92ba6d07400c7d1e23c9e0ce3 (commit) via 0070431f72dacef15d104bcf2baa9d70629d3d31 (commit) via 5a43e72ba90dc5b4ea4ae3e8875075440e709655 (commit) via 0ee7d42a7280e7ced1ea2f97e80dc752f28f76b2 (commit) via c7bbbb603fc4cf2e6590af962e2e255241d18276 (commit) via c0d530e01e91fbea195993293eed60f1677e6181 (commit) via 942bbe22b7147e2988aa0b82e094a53421f2c486 (commit) via d5690aa464880a258f653e1b4d68f150b4c660a8 (commit) via 8418efbab3fe38ed701d9294800ec85d467763df (commit) via 6ac9ea26a82c8f71b989d4dc6af22e3e5df62d48 (commit) via a061f94424cd9cb434a203a04aec4c437dabf251 (commit) via f7c03ade975b018be0766d5fea300d03642b4b12 (commit) via 60cc4b660bea6af9b37a14fbf1ad07589b15b34e (commit) via a9e3b02a54cd9a18baf8042e389ffbdb9266a9c7 (commit) via ce5951842845b519c7887479c8e4e128e1951add (commit) via 808acd63c4ec54af93eb5bbf717d4b591df1d904 (commit) via 6b947deb94b45660a5140472565886e9d5f1203f (commit) via 0330e7369aa682ac2c2feb2bcb197e52dc1810fb (commit) via 7c72d611d8d568358d4a7849057e42708cbb10c3 (commit) via 9ccda90b1788836848ecc5977d9cd8a807ee20c9 (commit) via 97b316f2342a317843b476094ed7323ca899504c (commit) via bd2775a49b137034294085b0fc5bf129accc1ea8 (commit) via 6e741deee25c81429112b82ba54f09205bb7c0ab (commit) via f48fce7b90cbd7f3efa05d5e7481999bf751e98c (commit) via a3dccfdd5ffa6d26e00898cb76d3aa25090f983b (commit) via 838c13654c639baa1c54d19056cd771380ab8a58 (commit) via abd50139e35c67ddbc1ec09550ea6b6d27861703 (commit) via 7f5cc90258fe11df6286d9ce562d904e8032c461 (commit) via 8dd98e227876fbe8f8a0dc0504906975e93c7cd0 (commit) via 4d9446e1fb4fbc54eee5295dfc9854b2f21bb841 (commit) via a716bb568dfe2cf4c856786b8fa9006a8a9c3841 (commit) via 3d591a7970918cee809927595ebf28e554460ca1 (commit) via bbb0829282ba766e26d334dd7afa05e723ec61e7 (commit) via 033ae0b58a72f828c608a557cafaf468f8d67b9a (commit) via eaf3b566293fa2bc10bb5b99b38ad75f4914b1ab (commit) via 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 (commit) via a7c60d702466bc0f9de64993446e8ec39a16de88 (commit) via 251fd5805122a257060a9de62a4c26bc1862a544 (commit) via 8813bda68dac4f6ff448cf783b43e6deafff75ae (commit) via 3d79b95543b6043a9df9f523f81416a30052a9ce (commit) via 3c335400833959b9a96674984c797e8ec4734566 (commit) via dd7bcc7dead9bceba895ad877ad3ac7642d4e717 (commit) via 7c33f29d51082d693c0653df84cb13f2b946eec8 (commit) via 9ab55a834226a8ae9faea3491f23aa065303cb41 (commit) via 4e99631dda78212103dc7d6bc9b165f89079e60e (commit) via 3565cdd101fae3d0ed5aacde80b7d49d8c4c4af8 (commit) via 719ac4509920bad7d5c8d563426d21f2a0c9e80e (commit) via b1eadcb681dbe7a3d7db4d3ddb18528ebd15211b (commit) via ac851856893867331ab9f692a135a40677daa351 (commit) from 492390a79f20c7aaaf16f232fbd5ecf0d9b700e7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 25 +- CHANGELOG | 132 ++++ DEPENDENCIES | 6 + config/odp-linux-generic.conf | 11 + configure.ac | 23 +- example/Makefile.am | 1 + example/classifier/odp_classifier.c | 12 +- example/generator/odp_generator.c | 22 +- example/ipsec/Makefile.am | 17 +- example/ipsec/odp_ipsec.c | 39 +- example/ipsec_api/Makefile.am | 17 +- example/ipsec_api/odp_ipsec.c | 46 +- example/ipsec_offload/odp_ipsec_offload.c | 11 +- example/l3fwd/odp_l3fwd.c | 23 +- example/m4/configure.m4 | 1 + example/packet/odp_pktio.c | 10 +- example/switch/odp_switch.c | 10 +- example/{hello => sysinfo}/.gitignore | 2 +- example/sysinfo/Makefile.am | 9 + example/sysinfo/odp_sysinfo.c | 293 ++++++++ example/timer/odp_timer_test.c | 13 +- m4/ax_check_compile_flag.m4 | 74 -- m4/ax_compiler_vendor.m4 | 87 --- m4/ax_compiler_version.m4 | 492 ------------- m4/ax_pthread.m4 | 332 --------- m4/odp_check_flag.m4 | 38 +- m4/odp_pthread.m4 | 23 +- platform/linux-generic/Makefile.am | 17 +- .../linux-generic/arch/aarch64/odp_sysinfo_parse.c | 212 ++++++ .../linux-generic/arch/default/odp_sysinfo_parse.c | 8 +- .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 4 +- .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 4 +- .../linux-generic/arch/x86/odp_sysinfo_parse.c | 30 +- .../linux-generic/include/odp_config_internal.h | 5 + platform/linux-generic/include/odp_global_data.h | 7 +- platform/linux-generic/include/odp_init_internal.h | 5 + .../include/odp_packet_io_ring_internal.h | 184 +---- ...queue_internal.h => odp_queue_basic_internal.h} | 11 +- platform/linux-generic/include/odp_ring_internal.h | 69 +- platform/linux-generic/include/odp_schedule_if.h | 6 - .../linux-generic/include/odp_sysinfo_internal.h | 1 - platform/linux-generic/m4/configure.m4 | 9 +- platform/linux-generic/odp_crypto_null.c | 573 +++++++++++++++ .../{odp_crypto.c => odp_crypto_openssl.c} | 0 platform/linux-generic/odp_hash_crc_gen.c | 222 ++++++ platform/linux-generic/odp_init.c | 29 + platform/linux-generic/odp_queue_basic.c | 93 ++- platform/linux-generic/odp_queue_lf.c | 135 ++-- platform/linux-generic/odp_queue_spsc.c | 2 +- .../{odp_random.c => odp_random_null.c} | 60 +- .../{odp_random.c => odp_random_openssl.c} | 11 + platform/linux-generic/odp_schedule_basic.c | 128 +++- platform/linux-generic/odp_schedule_iquery.c | 13 +- platform/linux-generic/odp_schedule_sp.c | 10 +- platform/linux-generic/odp_system_info.c | 24 +- platform/linux-generic/odp_traffic_mngr.c | 6 +- platform/linux-generic/pktio/ethtool_rss.c | 5 +- platform/linux-generic/pktio/ring.c | 189 +---- platform/linux-generic/pktio/socket_common.c | 5 +- platform/linux-generic/pktio/stats/ethtool_stats.c | 4 +- platform/linux-generic/pktio/tap.c | 2 +- platform/linux-generic/test/pktio_ipc/pktio_ipc1.c | 7 +- platform/linux-generic/test/ring/ring_basic.c | 111 +-- platform/linux-generic/test/ring/ring_suites.c | 1 - platform/linux-generic/test/ring/ring_suites.h | 1 - test/common/odp_cunit_common.c | 16 + test/common/odp_cunit_common.h | 2 + test/performance/.gitignore | 3 + test/performance/Makefile.am | 8 +- test/performance/odp_cpu_bench.c | 813 +++++++++++++++++++++ test/performance/odp_l2fwd.c | 10 +- test/performance/odp_pktio_ordered.c | 16 +- test/performance/odp_pktio_perf.c | 9 +- test/performance/odp_pool_perf.c | 401 ++++++++++ test/performance/odp_sched_latency.c | 7 +- test/performance/odp_sched_perf.c | 559 ++++++++++++++ test/performance/odp_scheduling.c | 6 +- test/validation/api/crypto/odp_crypto_test_inp.c | 35 +- test/validation/api/hash/hash.c | 475 +++++++++++- test/validation/api/queue/queue.c | 39 +- test/validation/api/traffic_mngr/traffic_mngr.c | 74 +- 81 files changed, 4496 insertions(+), 1949 deletions(-) copy example/{hello => sysinfo}/.gitignore (50%) create mode 100644 example/sysinfo/Makefile.am create mode 100644 example/sysinfo/odp_sysinfo.c delete mode 100644 m4/ax_check_compile_flag.m4 delete mode 100644 m4/ax_compiler_vendor.m4 delete mode 100644 m4/ax_compiler_version.m4 delete mode 100644 m4/ax_pthread.m4 create mode 100644 platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c rename platform/linux-generic/include/{odp_queue_internal.h => odp_queue_basic_internal.h} (86%) create mode 100644 platform/linux-generic/odp_crypto_null.c rename platform/linux-generic/{odp_crypto.c => odp_crypto_openssl.c} (100%) create mode 100644 platform/linux-generic/odp_hash_crc_gen.c copy platform/linux-generic/{odp_random.c => odp_random_null.c} (56%) rename platform/linux-generic/{odp_random.c => odp_random_openssl.c} (88%) create mode 100644 test/performance/odp_cpu_bench.c create mode 100644 test/performance/odp_pool_perf.c create mode 100644 test/performance/odp_sched_perf.c hooks/post-receive --

6 years, 7 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-22-gee6fdca6

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 ee6fdca6b647d1c92ba6d07400c7d1e23c9e0ce3 (commit) via 0070431f72dacef15d104bcf2baa9d70629d3d31 (commit) via 5a43e72ba90dc5b4ea4ae3e8875075440e709655 (commit) via 0ee7d42a7280e7ced1ea2f97e80dc752f28f76b2 (commit) via c7bbbb603fc4cf2e6590af962e2e255241d18276 (commit) via c0d530e01e91fbea195993293eed60f1677e6181 (commit) from 942bbe22b7147e2988aa0b82e094a53421f2c486 (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 ee6fdca6b647d1c92ba6d07400c7d1e23c9e0ce3 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jul 5 14:27:45 2018 +0300 linux-gen: sched: configurable default burst size Make default burst sizes configurable. User can set limits for burst size round up in high/low priority. When less than burst_size_xx events are requested, scheduler rounds up the number of events to these limit and stash extra events. Requests with more events are not round down. So, user can use small values in burst size configure for better real-time support, but still request large number of events for better throughput on non real-time threads. 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/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index f5f21b45..85d5414b 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -55,4 +55,15 @@ sched_basic: { # uneven service level for low thread counts. Typically, optimal # value is the number of threads using the scheduler. prio_spread = 4 + + # Default burst sizes for high and low priority queues. The default + # and higher priority levels are considered as high. Scheduler + # rounds up number of requested events up to these values. In general, + # larger requests are not round down. So, larger bursts than these may + # received when requested. A large burst size improves throughput, + # but decreases application responsiveness to high priority events + # due to head of line blocking cause by a burst of low priority + # events. + burst_size_hi = 32 + burst_size_low = 16 } diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 75434149..df63da72 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -94,7 +94,8 @@ ODP_STATIC_ASSERT((8 * sizeof(pri_mask_t)) >= MAX_SPREAD, /* Default burst size. Scheduler rounds up number of requested events up to * this value. */ -#define BURST_SIZE CONFIG_BURST_SIZE +#define BURST_SIZE_MAX CONFIG_BURST_SIZE +#define BURST_SIZE_MIN 1 /* Ordered stash size */ #define MAX_ORDERED_STASH 512 @@ -124,7 +125,7 @@ typedef struct { uint16_t spread_round; uint32_t stash_qi; odp_queue_t stash_queue; - odp_event_t stash_ev[BURST_SIZE]; + odp_event_t stash_ev[BURST_SIZE_MAX]; uint32_t grp_epoch; uint16_t num_grp; @@ -179,6 +180,8 @@ typedef struct { struct { uint8_t num_spread; + uint8_t burst_hi; + uint8_t burst_low; } config; uint32_t pri_count[NUM_PRIO][MAX_SPREAD]; @@ -252,6 +255,34 @@ static int read_config_file(sched_global_t *sched) } sched->config.num_spread = val; + ODP_PRINT(" %s: %i\n", str, val); + + str = "sched_basic.burst_size_hi"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + if (val > BURST_SIZE_MAX || val < BURST_SIZE_MIN) { + ODP_ERR("Bad value %s = %u\n", str, val); + return -1; + } + + sched->config.burst_hi = val; + ODP_PRINT(" %s: %i\n", str, val); + + str = "sched_basic.burst_size_low"; + if (!_odp_libconfig_lookup_int(str, &val)) { + ODP_ERR("Config option '%s' not found.\n", str); + return -1; + } + + if (val > BURST_SIZE_MAX || val < BURST_SIZE_MIN) { + ODP_ERR("Bad value %s = %u\n", str, val); + return -1; + } + + sched->config.burst_low = val; ODP_PRINT(" %s: %i\n\n", str, val); return 0; @@ -767,7 +798,7 @@ static inline int poll_pktin(uint32_t qi, int direct_recv, odp_buffer_hdr_t **hdr_tbl; int ret; void *q_int; - odp_buffer_hdr_t *b_hdr[BURST_SIZE]; + odp_buffer_hdr_t *b_hdr[BURST_SIZE_MAX]; hdr_tbl = (odp_buffer_hdr_t **)ev_tbl; @@ -775,8 +806,8 @@ static inline int poll_pktin(uint32_t qi, int direct_recv, hdr_tbl = b_hdr; /* Limit burst to max queue enqueue size */ - if (max_num > BURST_SIZE) - max_num = BURST_SIZE; + if (max_num > BURST_SIZE_MAX) + max_num = BURST_SIZE_MAX; } pktio_index = sched->queue[qi].pktio_index; @@ -831,6 +862,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], int ret; int id; uint32_t qi; + unsigned int max_burst; int num_spread = sched->config.num_spread; uint32_t ring_mask = sched->ring_mask; @@ -840,6 +872,10 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], if (sched->pri_mask[prio] == 0) continue; + max_burst = sched->config.burst_hi; + if (prio > ODP_SCHED_PRIO_DEFAULT) + max_burst = sched->config.burst_low; + /* Select the first ring based on weights */ id = first; @@ -849,7 +885,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], odp_queue_t handle; ring_t *ring; int pktin; - unsigned int max_deq = BURST_SIZE; + unsigned int max_deq = max_burst; int stashed = 1; odp_event_t *ev_tbl = sched_local.stash_ev; @@ -877,24 +913,17 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], ordered = queue_is_ordered(qi); - /* When application's array is larger than our burst + /* When application's array is larger than max burst * size, output all events directly there. Also, ordered * queues are not stashed locally to improve * parallelism. Ordered context can only be released * when the local cache is empty. */ - if (max_num > BURST_SIZE || ordered) { + if (max_num > max_burst || ordered) { stashed = 0; ev_tbl = out_ev; max_deq = max_num; } - /* Low priorities have smaller burst size to limit - * head of line blocking latency. */ - if (BURST_SIZE > 1 && - odp_unlikely(prio > ODP_SCHED_PRIO_DEFAULT) && - max_deq > BURST_SIZE / 2) - max_deq = BURST_SIZE / 2; - pktin = queue_is_pktin(qi); num = sched_queue_deq(qi, ev_tbl, max_deq, !pktin); commit 0070431f72dacef15d104bcf2baa9d70629d3d31 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jul 5 11:14:26 2018 +0300 linux-gen: sched: move basic queue scheduler functions Moved and renamed basic queue interface functions towards schedulers. Queue and scheduler implementations are tied together as queue enq/deq operations change queue scheduling state. Three schedulers are based on basic queue implementation and include basic queue internal header file already. Move this internal interface into proper internal header file. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_queue_basic_internal.h b/platform/linux-generic/include/odp_queue_basic_internal.h index 0a81f3c4..654b9e31 100644 --- a/platform/linux-generic/include/odp_queue_basic_internal.h +++ b/platform/linux-generic/include/odp_queue_basic_internal.h @@ -98,6 +98,13 @@ static inline odp_queue_t queue_from_index(uint32_t queue_id) void queue_spsc_init(queue_entry_t *queue, uint32_t queue_size); +/* Functions for schedulers */ +void sched_queue_destroy_finalize(uint32_t queue_index); +void sched_queue_set_status(uint32_t queue_index, int status); +int sched_queue_deq(uint32_t queue_index, odp_event_t ev[], int num, + int update_status); +int sched_queue_empty(uint32_t queue_index); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 0d095262..8f082aaa 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -82,12 +82,6 @@ int sched_cb_pktin_poll(int pktio_index, int pktin_index, int sched_cb_pktin_poll_old(int pktio_index, int num_queue, int index[]); int sched_cb_pktin_poll_one(int pktio_index, int rx_queue, odp_event_t evts[]); void sched_cb_pktio_stop_finalize(int pktio_index); -odp_queue_t sched_cb_queue_handle(uint32_t queue_index); -void sched_cb_queue_destroy_finalize(uint32_t queue_index); -void sched_cb_queue_set_status(uint32_t queue_index, int status); -int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num, - int update_status); -int sched_cb_queue_empty(uint32_t queue_index); /* API functions */ typedef struct { diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 3962f9f1..89eed3c0 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -357,7 +357,7 @@ static odp_queue_t queue_create(const char *name, return handle; } -void sched_cb_queue_destroy_finalize(uint32_t queue_index) +void sched_queue_destroy_finalize(uint32_t queue_index) { queue_entry_t *queue = qentry_from_index(queue_index); @@ -370,7 +370,7 @@ void sched_cb_queue_destroy_finalize(uint32_t queue_index) UNLOCK(queue); } -void sched_cb_queue_set_status(uint32_t queue_index, int status) +void sched_queue_set_status(uint32_t queue_index, int status) { queue_entry_t *queue = qentry_from_index(queue_index); @@ -761,8 +761,8 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) return 0; } -int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], - int max_num, int update_status) +int sched_queue_deq(uint32_t queue_index, odp_event_t ev[], int max_num, + int update_status) { int num_deq; ring_st_t *ring_st; @@ -807,7 +807,7 @@ int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], return num_deq; } -int sched_cb_queue_empty(uint32_t queue_index) +int sched_queue_empty(uint32_t queue_index) { queue_entry_t *queue = qentry_from_index(queue_index); int ret = 0; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index fbe5b26a..75434149 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -363,7 +363,7 @@ static int schedule_init_global(void) static inline void queue_destroy_finalize(uint32_t qi) { - sched_cb_queue_destroy_finalize(qi); + sched_queue_destroy_finalize(qi); } static int schedule_term_global(void) @@ -384,9 +384,7 @@ static int schedule_term_global(void) odp_event_t events[1]; int num; - num = sched_cb_queue_deq_multi(qi, - events, - 1, 1); + num = sched_queue_deq(qi, events, 1, 1); if (num < 0) queue_destroy_finalize(qi); @@ -581,7 +579,7 @@ static void schedule_pktio_start(int pktio_index, int num_pktin, ODP_ASSERT(pktin_idx[i] <= MAX_PKTIN_INDEX); /* Start polling */ - sched_cb_queue_set_status(qi, QUEUE_STATUS_SCHED); + sched_queue_set_status(qi, QUEUE_STATUS_SCHED); schedule_sched_queue(qi); } } @@ -797,7 +795,7 @@ static inline int poll_pktin(uint32_t qi, int direct_recv, num_pktin = sched->pktio[pktio_index].num_pktin; odp_spinlock_unlock(&sched->pktio_lock); - sched_cb_queue_set_status(qi, QUEUE_STATUS_NOTSCHED); + sched_queue_set_status(qi, QUEUE_STATUS_NOTSCHED); if (num_pktin == 0) sched_cb_pktio_stop_finalize(pktio_index); @@ -899,13 +897,12 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], pktin = queue_is_pktin(qi); - num = sched_cb_queue_deq_multi(qi, ev_tbl, max_deq, - !pktin); + num = sched_queue_deq(qi, ev_tbl, max_deq, !pktin); if (num < 0) { /* Destroyed queue. Continue scheduling the same * priority queue. */ - sched_cb_queue_destroy_finalize(qi); + sched_queue_destroy_finalize(qi); continue; } diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index e7e23aa5..2501a3f6 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -289,10 +289,10 @@ static int schedule_term_global(void) odp_event_t events[1]; if (sched->availables[i]) - count = sched_cb_queue_deq_multi(i, events, 1, 1); + count = sched_queue_deq(i, events, 1, 1); if (count < 0) - sched_cb_queue_destroy_finalize(i); + sched_queue_destroy_finalize(i); else if (count > 0) ODP_ERR("Queue (%d) not empty\n", i); } @@ -1532,12 +1532,11 @@ static inline int consume_queue(int prio, unsigned int queue_index) if (is_ordered_queue(queue_index)) max = 1; - count = sched_cb_queue_deq_multi( - queue_index, cache->stash, max, 1); + count = sched_queue_deq(queue_index, cache->stash, max, 1); if (count < 0) { DO_SCHED_UNLOCK(); - sched_cb_queue_destroy_finalize(queue_index); + sched_queue_destroy_finalize(queue_index); DO_SCHED_LOCK(); return 0; } diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index b6bb3b2b..ae292051 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -228,7 +228,7 @@ static int term_global(void) for (qi = 0; qi < NUM_QUEUE; qi++) { if (sched_global->queue_cmd[qi].s.init) { /* todo: dequeue until empty ? */ - sched_cb_queue_destroy_finalize(qi); + sched_queue_destroy_finalize(qi); } } @@ -507,7 +507,7 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait, if (sched_local.cmd) { /* Continue scheduling if queue is not empty */ - if (sched_cb_queue_empty(sched_local.cmd->s.index) == 0) + if (sched_queue_empty(sched_local.cmd->s.index) == 0) add_tail(sched_local.cmd); sched_local.cmd = NULL; @@ -562,7 +562,7 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait, } qi = cmd->s.index; - num = sched_cb_queue_deq_multi(qi, events, 1, 1); + num = sched_queue_deq(qi, events, 1, 1); if (num > 0) { sched_local.cmd = cmd; @@ -575,7 +575,7 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait, if (num < 0) { /* Destroyed queue */ - sched_cb_queue_destroy_finalize(qi); + sched_queue_destroy_finalize(qi); continue; } commit 5a43e72ba90dc5b4ea4ae3e8875075440e709655 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jul 5 10:54:16 2018 +0300 linux-gen: queue: rename queue basic internal header file This is internal interface towards queue basic. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a3399011..13101cfd 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -123,7 +123,7 @@ noinst_HEADERS = \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ include/odp_queue_if.h \ - include/odp_queue_internal.h \ + include/odp_queue_basic_internal.h \ include/odp_queue_lf.h \ include/odp_queue_scalable_internal.h \ include/odp_ring_internal.h \ diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_basic_internal.h similarity index 97% rename from platform/linux-generic/include/odp_queue_internal.h rename to platform/linux-generic/include/odp_queue_basic_internal.h index bb74f729..0a81f3c4 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_basic_internal.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODP_QUEUE_INTERNAL_H_ -#define ODP_QUEUE_INTERNAL_H_ +#ifndef ODP_QUEUE_BASIC_INTERNAL_H_ +#define ODP_QUEUE_BASIC_INTERNAL_H_ #ifdef __cplusplus extern "C" { diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 311fda69..3962f9f1 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp/api/queue.h> -#include <odp_queue_internal.h> +#include <odp_queue_basic_internal.h> #include <odp_queue_if.h> #include <odp/api/std_types.h> #include <odp/api/align.h> diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index 3ec32524..d12a994b 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -8,7 +8,7 @@ #include <odp/api/atomic.h> #include <odp/api/plat/atomic_inlines.h> #include <odp/api/shared_memory.h> -#include <odp_queue_internal.h> +#include <odp_queue_basic_internal.h> #include <string.h> #include <stdio.h> diff --git a/platform/linux-generic/odp_queue_spsc.c b/platform/linux-generic/odp_queue_spsc.c index f8b04ca2..3e42b038 100644 --- a/platform/linux-generic/odp_queue_spsc.c +++ b/platform/linux-generic/odp_queue_spsc.c @@ -6,7 +6,7 @@ #include <string.h> #include <stdio.h> -#include <odp_queue_internal.h> +#include <odp_queue_basic_internal.h> #include <odp_pool_internal.h> #include "config.h" diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index f45bc8f1..fbe5b26a 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -26,7 +26,7 @@ #include <odp/api/packet_io.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_queue_internal.h> +#include <odp_queue_basic_internal.h> #include <odp_libconfig_internal.h> /* Number of priority levels */ diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index c1e51bb5..e7e23aa5 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -25,9 +25,7 @@ #include <odp/api/packet_io.h> #include <odp_config_internal.h> #include <odp_timer_internal.h> - -/* Should remove this dependency */ -#include <odp_queue_internal.h> +#include <odp_queue_basic_internal.h> /* Number of priority levels */ #define NUM_SCHED_PRIO 8 diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index ac0b35fd..b6bb3b2b 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -20,7 +20,7 @@ #include <odp_config_internal.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_queue_internal.h> +#include <odp_queue_basic_internal.h> #define NUM_THREAD ODP_THREAD_COUNT_MAX #define NUM_QUEUE ODP_CONFIG_QUEUES commit 0ee7d42a7280e7ced1ea2f97e80dc752f28f76b2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Jul 5 10:33:34 2018 +0300 linux-gen: queue: separate plain and sched dequeues Separate dequeue functions for plain and scheduled queues. Plain queue dequeue function become simpler and scheduler dequeue function may be optimized later as it is a single consumer dequeue operation. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 39e2d59c..311fda69 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -576,10 +576,9 @@ static int queue_enq(odp_queue_t handle, odp_event_t ev) (odp_buffer_hdr_t *)(uintptr_t)ev); } -static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], - int num, int update_status) +static inline int plain_queue_deq(queue_entry_t *queue, + odp_buffer_hdr_t *buf_hdr[], int num) { - int status_sync = sched_fn->status_sync; int num_deq; ring_st_t *ring_st; uint32_t buf_idx[num]; @@ -589,32 +588,17 @@ static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], LOCK(queue); if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) { - /* Bad queue, or queue has been destroyed. - * Scheduler finalizes queue destroy after this. */ + /* Bad queue, or queue has been destroyed. */ UNLOCK(queue); return -1; } num_deq = ring_st_deq_multi(ring_st, buf_idx, num); - if (num_deq == 0) { - /* Already empty queue */ - if (update_status && queue->s.status == QUEUE_STATUS_SCHED) { - queue->s.status = QUEUE_STATUS_NOTSCHED; - - if (status_sync) - sched_fn->unsched_queue(queue->s.index); - } - - UNLOCK(queue); + UNLOCK(queue); + if (num_deq == 0) return 0; - } - - if (status_sync && queue->s.type == ODP_QUEUE_TYPE_SCHED) - sched_fn->save_context(queue->s.index); - - UNLOCK(queue); buffer_index_to_buf(buf_hdr, buf_idx, num_deq); @@ -626,7 +610,7 @@ static int queue_int_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], { queue_entry_t *queue = q_int; - return deq_multi(queue, buf_hdr, num, 0); + return plain_queue_deq(queue, buf_hdr, num); } static odp_buffer_hdr_t *queue_int_deq(void *q_int) @@ -635,7 +619,7 @@ static odp_buffer_hdr_t *queue_int_deq(void *q_int) odp_buffer_hdr_t *buf_hdr = NULL; int ret; - ret = deq_multi(queue, &buf_hdr, 1, 0); + ret = plain_queue_deq(queue, &buf_hdr, 1); if (ret == 1) return buf_hdr; @@ -777,12 +761,50 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) return 0; } -int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num, - int update_status) +int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], + int max_num, int update_status) { - queue_entry_t *qe = qentry_from_index(queue_index); + int num_deq; + ring_st_t *ring_st; + queue_entry_t *queue = qentry_from_index(queue_index); + int status_sync = sched_fn->status_sync; + uint32_t buf_idx[max_num]; + + ring_st = &queue->s.ring_st; + + LOCK(queue); - return deq_multi(qe, (odp_buffer_hdr_t **)ev, num, update_status); + if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) { + /* Bad queue, or queue has been destroyed. + * Scheduler finalizes queue destroy after this. */ + UNLOCK(queue); + return -1; + } + + num_deq = ring_st_deq_multi(ring_st, buf_idx, max_num); + + if (num_deq == 0) { + /* Already empty queue */ + if (update_status && queue->s.status == QUEUE_STATUS_SCHED) { + queue->s.status = QUEUE_STATUS_NOTSCHED; + + if (status_sync) + sched_fn->unsched_queue(queue->s.index); + } + + UNLOCK(queue); + + return 0; + } + + if (status_sync && queue->s.type == ODP_QUEUE_TYPE_SCHED) + sched_fn->save_context(queue->s.index); + + UNLOCK(queue); + + buffer_index_to_buf((odp_buffer_hdr_t **)ev, buf_idx, num_deq); + + return num_deq; } int sched_cb_queue_empty(uint32_t queue_index) commit c7bbbb603fc4cf2e6590af962e2e255241d18276 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 4 17:17:46 2018 +0300 linux-gen: sched: support large burst size from pktin When directly receiving from pktin (atomic or parallel queues), output event handles directly to destination array (scheduler stash or application's array). This avoids extra handle copy and enables supports for large burst sizes. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 78ab6135..f45bc8f1 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -762,17 +762,29 @@ static inline int queue_is_pktin(uint32_t queue_index) return sched->queue[queue_index].poll_pktin; } -static inline int poll_pktin(uint32_t qi, int stash) +static inline int poll_pktin(uint32_t qi, int direct_recv, + odp_event_t ev_tbl[], int max_num) { - odp_buffer_hdr_t *b_hdr[BURST_SIZE]; - int pktio_index, pktin_index, num, num_pktin, i; + int pktio_index, pktin_index, num, num_pktin; + odp_buffer_hdr_t **hdr_tbl; int ret; void *q_int; + odp_buffer_hdr_t *b_hdr[BURST_SIZE]; + + hdr_tbl = (odp_buffer_hdr_t **)ev_tbl; + + if (!direct_recv) { + hdr_tbl = b_hdr; + + /* Limit burst to max queue enqueue size */ + if (max_num > BURST_SIZE) + max_num = BURST_SIZE; + } pktio_index = sched->queue[qi].pktio_index; pktin_index = sched->queue[qi].pktin_index; - num = sched_cb_pktin_poll(pktio_index, pktin_index, b_hdr, BURST_SIZE); + num = sched_cb_pktin_poll(pktio_index, pktin_index, hdr_tbl, max_num); if (num == 0) return 0; @@ -793,12 +805,8 @@ static inline int poll_pktin(uint32_t qi, int stash) return num; } - if (stash) { - for (i = 0; i < num; i++) - sched_local.stash_ev[i] = event_from_buf_hdr(b_hdr[i]); - + if (direct_recv) return num; - } q_int = qentry_from_index(qi); @@ -908,13 +916,16 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], * priorities. Stop scheduling queue when pktio * has been stopped. */ if (pktin) { - int stash = !ordered; - int num_pkt = poll_pktin(qi, stash); + int direct_recv = !ordered; + int num_pkt; + + num_pkt = poll_pktin(qi, direct_recv, + ev_tbl, max_deq); if (odp_unlikely(num_pkt < 0)) continue; - if (num_pkt == 0 || !stash) { + if (num_pkt == 0 || !direct_recv) { ring_enq(ring, ring_mask, qi); break; } @@ -922,7 +933,6 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], /* Process packets from an atomic or * parallel queue right away. */ num = num_pkt; - stashed = 1; } else { /* Remove empty queue from scheduling. * Continue scheduling the same priority commit c0d530e01e91fbea195993293eed60f1677e6181 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Jul 4 14:11:59 2018 +0300 linux-gen: sched: support large burst sizes Small burst sizes are rounded up to CONFIG_BURST_SIZE and excess events are stashed. Larger (>CONFIG_BURST_SIZE) bursts are stored directly into application buffer and nothing is stashed. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index c81e417c..78ab6135 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -92,8 +92,9 @@ ODP_STATIC_ASSERT((8 * sizeof(pri_mask_t)) >= MAX_SPREAD, /* Start of named groups in group mask arrays */ #define SCHED_GROUP_NAMED (ODP_SCHED_GROUP_CONTROL + 1) -/* Maximum number of dequeues */ -#define MAX_DEQ CONFIG_BURST_SIZE +/* Default burst size. Scheduler rounds up number of requested events up to + * this value. */ +#define BURST_SIZE CONFIG_BURST_SIZE /* Ordered stash size */ #define MAX_ORDERED_STASH 512 @@ -123,7 +124,7 @@ typedef struct { uint16_t spread_round; uint32_t stash_qi; odp_queue_t stash_queue; - odp_event_t stash_ev[MAX_DEQ]; + odp_event_t stash_ev[BURST_SIZE]; uint32_t grp_epoch; uint16_t num_grp; @@ -763,7 +764,7 @@ static inline int queue_is_pktin(uint32_t queue_index) static inline int poll_pktin(uint32_t qi, int stash) { - odp_buffer_hdr_t *b_hdr[MAX_DEQ]; + odp_buffer_hdr_t *b_hdr[BURST_SIZE]; int pktio_index, pktin_index, num, num_pktin, i; int ret; void *q_int; @@ -771,7 +772,7 @@ static inline int poll_pktin(uint32_t qi, int stash) pktio_index = sched->queue[qi].pktio_index; pktin_index = sched->queue[qi].pktin_index; - num = sched_cb_pktin_poll(pktio_index, pktin_index, b_hdr, MAX_DEQ); + num = sched_cb_pktin_poll(pktio_index, pktin_index, b_hdr, BURST_SIZE); if (num == 0) return 0; @@ -824,7 +825,6 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], int ret; int id; uint32_t qi; - unsigned int max_deq = MAX_DEQ; int num_spread = sched->config.num_spread; uint32_t ring_mask = sched->ring_mask; @@ -843,6 +843,9 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], odp_queue_t handle; ring_t *ring; int pktin; + unsigned int max_deq = BURST_SIZE; + int stashed = 1; + odp_event_t *ev_tbl = sched_local.stash_ev; if (id >= num_spread) id = 0; @@ -866,24 +869,30 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], continue; } - /* Low priorities have smaller batch size to limit - * head of line blocking latency. */ - if (odp_unlikely(MAX_DEQ > 1 && - prio > ODP_SCHED_PRIO_DEFAULT)) - max_deq = MAX_DEQ / 2; - ordered = queue_is_ordered(qi); - /* Do not cache ordered events locally to improve + /* When application's array is larger than our burst + * size, output all events directly there. Also, ordered + * queues are not stashed locally to improve * parallelism. Ordered context can only be released * when the local cache is empty. */ - if (ordered && max_num < MAX_DEQ) + if (max_num > BURST_SIZE || ordered) { + stashed = 0; + ev_tbl = out_ev; max_deq = max_num; + } + + /* Low priorities have smaller burst size to limit + * head of line blocking latency. */ + if (BURST_SIZE > 1 && + odp_unlikely(prio > ODP_SCHED_PRIO_DEFAULT) && + max_deq > BURST_SIZE / 2) + max_deq = BURST_SIZE / 2; pktin = queue_is_pktin(qi); - num = sched_cb_queue_deq_multi(qi, sched_local.stash_ev, - max_deq, !pktin); + num = sched_cb_queue_deq_multi(qi, ev_tbl, max_deq, + !pktin); if (num < 0) { /* Destroyed queue. Continue scheduling the same @@ -913,6 +922,7 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], /* Process packets from an atomic or * parallel queue right away. */ num = num_pkt; + stashed = 1; } else { /* Remove empty queue from scheduling. * Continue scheduling the same priority @@ -943,10 +953,16 @@ static inline int do_schedule_grp(odp_queue_t *out_queue, odp_event_t out_ev[], } handle = queue_from_index(qi); - sched_local.stash_num = num; - sched_local.stash_index = 0; - sched_local.stash_queue = handle; - ret = copy_from_stash(out_ev, max_num); + + if (stashed) { + sched_local.stash_num = num; + sched_local.stash_index = 0; + sched_local.stash_queue = handle; + ret = copy_from_stash(out_ev, max_num); + } else { + sched_local.stash_num = 0; + ret = num; + } /* Output the source queue handle */ if (out_queue) ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 11 ++ platform/linux-generic/Makefile.am | 2 +- ...queue_internal.h => odp_queue_basic_internal.h} | 11 +- platform/linux-generic/include/odp_schedule_if.h | 6 - platform/linux-generic/odp_queue_basic.c | 84 +++++++++----- platform/linux-generic/odp_queue_lf.c | 2 +- platform/linux-generic/odp_queue_spsc.c | 2 +- platform/linux-generic/odp_schedule_basic.c | 128 +++++++++++++++------ platform/linux-generic/odp_schedule_iquery.c | 13 +-- platform/linux-generic/odp_schedule_sp.c | 10 +- 10 files changed, 176 insertions(+), 93 deletions(-) rename platform/linux-generic/include/{odp_queue_internal.h => odp_queue_basic_internal.h} (86%) hooks/post-receive --

6 years, 7 months

[COMMIT] branch master updated. v1.19.0.2_tigermoth-16-g942bbe22

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 942bbe22b7147e2988aa0b82e094a53421f2c486 (commit) via d5690aa464880a258f653e1b4d68f150b4c660a8 (commit) via 8418efbab3fe38ed701d9294800ec85d467763df (commit) from 6ac9ea26a82c8f71b989d4dc6af22e3e5df62d48 (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 942bbe22b7147e2988aa0b82e094a53421f2c486 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 9 21:54:34 2018 +0300 travis: switch iptables policy to let tap driver work Fix suggested by Maxim Uvarov. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 8d918775..26bbe1a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,6 +144,10 @@ before_install: - export PKG_CONFIG_PATH="$HOME/cunit-install/$CROSS_ARCH/lib/pkgconfig:${PKG_CONFIG_PATH}" - find $HOME/cunit-install + # workaround for tap driver issues on recent Travis images + # Allow forwaring on virtual interfaces used for testing + - sudo iptables --policy FORWARD ACCEPT + install: - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages commit d5690aa464880a258f653e1b4d68f150b4c660a8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 9 17:00:10 2018 +0300 travis: pin repositories to architectures Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 0130eb64..8d918775 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,20 +76,22 @@ before_install: CROSS_MULTIARCH=`dpkg-architecture -a"$CROSS_ARCH" -qDEB_HOST_MULTIARCH` ; CROSS="--host="$CROSS_GNU_TYPE" --build="$BUILD_GNU_TYPE"" ; sudo dpkg --add-architecture "$CROSS_ARCH" ; - sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ; - sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ; - sudo -E apt-get -y update || true ; PKGS="build-essential libc6-dev:$CROSS_ARCH libssl-dev:$CROSS_ARCH zlib1g-dev:$CROSS_ARCH libconfig-dev:$CROSS_ARCH libstdc++-4.8-dev:$CROSS_ARCH libpcap0.8-dev:$CROSS_ARCH" ; if [ "$CROSS_ARCH" = "i386" ] ; then PKGS="$PKGS g++-multilib" ; else PKGS="$PKGS g++-$CROSS_GNU_TYPE" ; + sudo sed -e 's/^deb http/deb [arch=amd64] http/g' /etc/apt/sources.list -i ; + sudo -E apt-add-repository -y "deb [arch=$CROSS_ARCH] http://ports.ubuntu.com trusty main" ; + sudo -E apt-add-repository -y "deb [arch=$CROSS_ARCH] http://ports.ubuntu.com trusty-updates main" ; fi ; if [ "$CROSS_ARCH" != "armhf" ] ; then PKGS="$PKGS libnuma-dev:$CROSS_ARCH" ; fi ; + sudo cat /etc/apt/sources.list ; + sudo -E apt-get -y update || true ; sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install $PKGS || exit 1 ; export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi commit 8418efbab3fe38ed701d9294800ec85d467763df Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 9 16:13:03 2018 +0300 travis: stop using deprecated image Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 3431f27e..0130eb64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ language: c sudo: required dist: trusty -group: deprecated-2017Q2 stages: - "build only" - test ----------------------------------------------------------------------- Summary of changes: .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) hooks/post-receive --

6 years, 7 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp July 2018