X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest_cryptodev_perf.c;h=cbf21c74cd3028ac26c983056d69e40fe3b6dd53;hb=5082f991f6def0ef06e9ff1cf9f39ef3b78657c5;hp=f4406dcc4a00b05e7a977ea5c6646e523bb641b0;hpb=8fec4832c95f82806f947389799f8ae54fb79421;p=dpdk.git diff --git a/test/test/test_cryptodev_perf.c b/test/test/test_cryptodev_perf.c index f4406dcc4a..cbf21c74cd 100644 --- a/test/test/test_cryptodev_perf.c +++ b/test/test/test_cryptodev_perf.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2015-2016 Intel Corporation. All rights reserved. + * Copyright(c) 2015-2017 Intel Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -110,7 +110,6 @@ struct symmetric_session_attrs { struct crypto_params { uint8_t *aad; - uint8_t *iv; uint8_t *digest; }; @@ -207,62 +206,13 @@ static const char *pmd_name(enum rte_cryptodev_type pmd) return RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD); case RTE_CRYPTODEV_SNOW3G_PMD: return RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD); + case RTE_CRYPTODEV_DPAA2_SEC_PMD: + return RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD); default: return ""; } } -static const char *cipher_algo_name(enum rte_crypto_cipher_algorithm cipher_algo) -{ - switch (cipher_algo) { - case RTE_CRYPTO_CIPHER_NULL: return "NULL"; - case RTE_CRYPTO_CIPHER_3DES_CBC: return "3DES_CBC"; - case RTE_CRYPTO_CIPHER_3DES_CTR: return "3DES_CTR"; - case RTE_CRYPTO_CIPHER_3DES_ECB: return "3DES_ECB"; - case RTE_CRYPTO_CIPHER_AES_CBC: return "AES_CBC"; - case RTE_CRYPTO_CIPHER_AES_CCM: return "AES_CCM"; - case RTE_CRYPTO_CIPHER_AES_CTR: return "AES_CTR"; - case RTE_CRYPTO_CIPHER_AES_ECB: return "AES_ECB"; - case RTE_CRYPTO_CIPHER_AES_F8: return "AES_F8"; - case RTE_CRYPTO_CIPHER_AES_GCM: return "AES_GCM"; - case RTE_CRYPTO_CIPHER_AES_XTS: return "AES_XTS"; - case RTE_CRYPTO_CIPHER_ARC4: return "ARC4"; - case RTE_CRYPTO_CIPHER_KASUMI_F8: return "KASUMI_F8"; - case RTE_CRYPTO_CIPHER_SNOW3G_UEA2: return "SNOW3G_UEA2"; - case RTE_CRYPTO_CIPHER_ZUC_EEA3: return "ZUC_EEA3"; - default: return "Another cipher algo"; - } -} - -static const char *auth_algo_name(enum rte_crypto_auth_algorithm auth_algo) -{ - switch (auth_algo) { - case RTE_CRYPTO_AUTH_NULL: return "NULL"; break; - case RTE_CRYPTO_AUTH_AES_CBC_MAC: return "AES_CBC_MAC"; break; - case RTE_CRYPTO_AUTH_AES_CCM: return "AES_CCM"; break; - case RTE_CRYPTO_AUTH_AES_CMAC: return "AES_CMAC,"; break; - case RTE_CRYPTO_AUTH_AES_GCM: return "AES_GCM"; break; - case RTE_CRYPTO_AUTH_AES_GMAC: return "AES_GMAC"; break; - case RTE_CRYPTO_AUTH_AES_XCBC_MAC: return "AES_XCBC_MAC"; break; - case RTE_CRYPTO_AUTH_KASUMI_F9: return "KASUMI_F9"; break; - case RTE_CRYPTO_AUTH_MD5: return "MD5"; break; - case RTE_CRYPTO_AUTH_MD5_HMAC: return "MD5_HMAC,"; break; - case RTE_CRYPTO_AUTH_SHA1: return "SHA1"; break; - case RTE_CRYPTO_AUTH_SHA1_HMAC: return "SHA1_HMAC"; break; - case RTE_CRYPTO_AUTH_SHA224: return "SHA224"; break; - case RTE_CRYPTO_AUTH_SHA224_HMAC: return "SHA224_HMAC"; break; - case RTE_CRYPTO_AUTH_SHA256: return "SHA256"; break; - case RTE_CRYPTO_AUTH_SHA256_HMAC: return "SHA256_HMAC"; break; - case RTE_CRYPTO_AUTH_SHA384: return "SHA384,"; break; - case RTE_CRYPTO_AUTH_SHA384_HMAC: return "SHA384_HMAC,"; break; - case RTE_CRYPTO_AUTH_SHA512: return "SHA512,"; break; - case RTE_CRYPTO_AUTH_SHA512_HMAC: return "SHA512_HMAC,"; break; - case RTE_CRYPTO_AUTH_SNOW3G_UIA2: return "SNOW3G_UIA2"; break; - case RTE_CRYPTO_AUTH_ZUC_EIA3: return "RTE_CRYPTO_AUTH_ZUC_EIA3"; break; - default: return "Another auth algo"; break; - }; -} - static struct rte_mbuf * setup_test_string(struct rte_mempool *mpool, const uint8_t *data, size_t len, uint8_t blocksize) @@ -314,7 +264,8 @@ testsuite_setup(void) RTE_CRYPTO_OP_TYPE_SYMMETRIC, NUM_MBUFS, MBUF_CACHE_SIZE, DEFAULT_NUM_XFORMS * - sizeof(struct rte_crypto_sym_xform), + sizeof(struct rte_crypto_sym_xform) + + MAXIMUM_IV_LENGTH, rte_socket_id()); if (ts_params->op_mpool == NULL) { RTE_LOG(ERR, USER1, "Can't create CRYPTO_OP_POOL\n"); @@ -330,7 +281,7 @@ testsuite_setup(void) #endif nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_AESNI_MB_PMD); if (nb_devs < 1) { - ret = rte_eal_vdev_init( + ret = rte_vdev_init( RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), NULL); TEST_ASSERT(ret == 0, @@ -348,7 +299,7 @@ testsuite_setup(void) #endif nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_AESNI_GCM_PMD); if (nb_devs < 1) { - ret = rte_eal_vdev_init( + ret = rte_vdev_init( RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD), NULL); TEST_ASSERT(ret == 0, @@ -366,7 +317,7 @@ testsuite_setup(void) #endif nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_SNOW3G_PMD); if (nb_devs < 1) { - ret = rte_eal_vdev_init( + ret = rte_vdev_init( RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), NULL); TEST_ASSERT(ret == 0, @@ -385,7 +336,7 @@ testsuite_setup(void) nb_devs = rte_cryptodev_count_devtype( RTE_CRYPTODEV_OPENSSL_PMD); if (nb_devs < 1) { - ret = rte_eal_vdev_init( + ret = rte_vdev_init( RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), NULL); @@ -405,7 +356,7 @@ testsuite_setup(void) nb_devs = rte_cryptodev_count_devtype( RTE_CRYPTODEV_ARMV8_PMD); if (nb_devs < 1) { - ret = rte_eal_vdev_init( + ret = rte_vdev_init( RTE_STR(CRYPTODEV_NAME_ARMV8_PMD), NULL); @@ -2027,19 +1978,16 @@ test_perf_crypto_qp_vary_burst_size(uint16_t dev_num) data_params[0].length); op->sym->auth.digest.length = DIGEST_BYTE_LENGTH_SHA256; - op->sym->auth.data.offset = CIPHER_IV_LENGTH_AES_CBC; + op->sym->auth.data.offset = 0; op->sym->auth.data.length = data_params[0].length; - - op->sym->cipher.iv.data = (uint8_t *)rte_pktmbuf_prepend(m, - CIPHER_IV_LENGTH_AES_CBC); - op->sym->cipher.iv.phys_addr = rte_pktmbuf_mtophys(m); + op->sym->cipher.iv.offset = IV_OFFSET; op->sym->cipher.iv.length = CIPHER_IV_LENGTH_AES_CBC; - rte_memcpy(op->sym->cipher.iv.data, aes_cbc_128_iv, - CIPHER_IV_LENGTH_AES_CBC); + rte_memcpy(rte_crypto_op_ctod_offset(op, uint8_t *, IV_OFFSET), + aes_cbc_128_iv, CIPHER_IV_LENGTH_AES_CBC); - op->sym->cipher.data.offset = CIPHER_IV_LENGTH_AES_CBC; + op->sym->cipher.data.offset = 0; op->sym->cipher.data.length = data_params[0].length; op->sym->m_src = m; @@ -2166,8 +2114,8 @@ test_perf_snow3G_optimise_cyclecount(struct perf_test_params *pparams) pmd_name(gbl_cryptodev_perftest_devtype), ts_params->dev_id, 0, chain_mode_name(pparams->chain), - cipher_algo_name(pparams->cipher_algo), - auth_algo_name(pparams->auth_algo), + rte_crypto_cipher_algorithm_strings[pparams->cipher_algo], + rte_crypto_auth_algorithm_strings[pparams->auth_algo], pparams->buf_size); printf("\nOps Tx\tOps Rx\tOps/burst "); printf("Retries EmptyPolls\tIACycles/CyOp\tIACycles/Burst\tIACycles/Byte"); @@ -2361,9 +2309,9 @@ test_perf_openssl_optimise_cyclecount(struct perf_test_params *pparams) pmd_name(gbl_cryptodev_perftest_devtype), ts_params->dev_id, 0, chain_mode_name(pparams->chain), - cipher_algo_name(pparams->cipher_algo), + rte_crypto_cipher_algorithm_strings[pparams->cipher_algo], pparams->cipher_key_length, - auth_algo_name(pparams->auth_algo), + rte_crypto_auth_algorithm_strings[pparams->auth_algo], pparams->buf_size); printf("\nOps Tx\tOps Rx\tOps/burst "); printf("Retries EmptyPolls\tIACycles/CyOp\tIACycles/Burst\t" @@ -2496,9 +2444,9 @@ test_perf_armv8_optimise_cyclecount(struct perf_test_params *pparams) pmd_name(gbl_cryptodev_perftest_devtype), ts_params->dev_id, 0, chain_mode_name(pparams->chain), - cipher_algo_name(pparams->cipher_algo), + rte_crypto_cipher_algorithm_strings[pparams->cipher_algo], pparams->cipher_key_length, - auth_algo_name(pparams->auth_algo), + rte_crypto_auth_algorithm_strings[pparams->auth_algo], pparams->buf_size); printf("\nOps Tx\tOps Rx\tOps/burst "); printf("Retries " @@ -2632,6 +2580,11 @@ static uint8_t aes_iv[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static uint8_t aes_gcm_aad[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + static uint8_t triple_des_key[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2891,10 +2844,8 @@ test_perf_create_armv8_session(uint8_t dev_id, enum chain_mode chain, } } -#define AES_BLOCK_SIZE 16 #define AES_CIPHER_IV_LENGTH 16 - -#define TRIPLE_DES_BLOCK_SIZE 8 +#define AES_GCM_AAD_LENGTH 16 #define TRIPLE_DES_CIPHER_IV_LENGTH 8 static struct rte_mbuf * @@ -2933,25 +2884,22 @@ test_perf_set_crypto_op_aes(struct rte_crypto_op *op, struct rte_mbuf *m, op->sym->auth.data.length = 0; } else { op->sym->auth.digest.data = rte_pktmbuf_mtod_offset(m, - uint8_t *, AES_CIPHER_IV_LENGTH + data_len); + uint8_t *, data_len); op->sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m, - AES_CIPHER_IV_LENGTH + data_len); + data_len); op->sym->auth.digest.length = digest_len; - op->sym->auth.aad.data = aes_iv; - op->sym->auth.aad.length = AES_CIPHER_IV_LENGTH; - op->sym->auth.data.offset = AES_CIPHER_IV_LENGTH; + op->sym->auth.data.offset = 0; op->sym->auth.data.length = data_len; } /* Cipher Parameters */ - op->sym->cipher.iv.data = rte_pktmbuf_mtod(m, uint8_t *); - op->sym->cipher.iv.phys_addr = rte_pktmbuf_mtophys(m); + op->sym->cipher.iv.offset = IV_OFFSET; op->sym->cipher.iv.length = AES_CIPHER_IV_LENGTH; + rte_memcpy(rte_crypto_op_ctod_offset(op, uint8_t *, IV_OFFSET), + aes_iv, AES_CIPHER_IV_LENGTH); - rte_memcpy(op->sym->cipher.iv.data, aes_iv, AES_CIPHER_IV_LENGTH); - - op->sym->cipher.data.offset = AES_CIPHER_IV_LENGTH; + op->sym->cipher.data.offset = 0; op->sym->cipher.data.length = data_len; op->sym->m_src = m; @@ -2975,19 +2923,21 @@ test_perf_set_crypto_op_aes_gcm(struct rte_crypto_op *op, struct rte_mbuf *m, op->sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m, data_len); op->sym->auth.digest.length = digest_len; - op->sym->auth.aad.data = aes_iv; - op->sym->auth.aad.length = AES_CIPHER_IV_LENGTH; + op->sym->auth.aad.data = aes_gcm_aad; + op->sym->auth.aad.length = AES_GCM_AAD_LENGTH; /* Cipher Parameters */ - op->sym->cipher.iv.data = aes_iv; + op->sym->cipher.iv.offset = IV_OFFSET; op->sym->cipher.iv.length = AES_CIPHER_IV_LENGTH; + rte_memcpy(rte_crypto_op_ctod_offset(op, uint8_t *, IV_OFFSET), + aes_iv, AES_CIPHER_IV_LENGTH); /* Data lengths/offsets Parameters */ - op->sym->auth.data.offset = AES_BLOCK_SIZE; - op->sym->auth.data.length = data_len - AES_BLOCK_SIZE; + op->sym->auth.data.offset = 0; + op->sym->auth.data.length = data_len; - op->sym->cipher.data.offset = AES_BLOCK_SIZE; - op->sym->cipher.data.length = data_len - AES_BLOCK_SIZE; + op->sym->cipher.data.offset = 0; + op->sym->cipher.data.length = data_len; op->sym->m_src = m; @@ -2999,22 +2949,29 @@ test_perf_set_crypto_op_snow3g(struct rte_crypto_op *op, struct rte_mbuf *m, struct rte_cryptodev_sym_session *sess, unsigned data_len, unsigned digest_len) { + uint8_t *iv_ptr = rte_crypto_op_ctod_offset(op, + uint8_t *, IV_OFFSET); + if (rte_crypto_op_attach_sym_session(op, sess) != 0) { rte_crypto_op_free(op); return NULL; } + rte_memcpy(iv_ptr, snow3g_iv, SNOW3G_CIPHER_IV_LENGTH); + /* Authentication Parameters */ op->sym->auth.digest.data = (uint8_t *)m->buf_addr + (m->data_off + data_len); op->sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m, data_len); op->sym->auth.digest.length = digest_len; - op->sym->auth.aad.data = snow3g_iv; + op->sym->auth.aad.data = iv_ptr; + op->sym->auth.aad.phys_addr = rte_crypto_op_ctophys_offset(op, + IV_OFFSET); op->sym->auth.aad.length = SNOW3G_CIPHER_IV_LENGTH; /* Cipher Parameters */ - op->sym->cipher.iv.data = snow3g_iv; + op->sym->cipher.iv.offset = IV_OFFSET; op->sym->cipher.iv.length = SNOW3G_CIPHER_IV_LENGTH; /* Data lengths/offsets Parameters */ @@ -3041,12 +2998,12 @@ test_perf_set_crypto_op_snow3g_cipher(struct rte_crypto_op *op, } /* Cipher Parameters */ - op->sym->cipher.iv.data = rte_pktmbuf_mtod(m, uint8_t *); + op->sym->cipher.iv.offset = IV_OFFSET; op->sym->cipher.iv.length = SNOW3G_CIPHER_IV_LENGTH; - rte_memcpy(op->sym->cipher.iv.data, snow3g_iv, SNOW3G_CIPHER_IV_LENGTH); - op->sym->cipher.iv.phys_addr = rte_pktmbuf_mtophys(m); + rte_memcpy(rte_crypto_op_ctod_offset(op, uint8_t *, IV_OFFSET), + snow3g_iv, SNOW3G_CIPHER_IV_LENGTH); - op->sym->cipher.data.offset = SNOW3G_CIPHER_IV_LENGTH; + op->sym->cipher.data.offset = 0; op->sym->cipher.data.length = data_len << 3; op->sym->m_src = m; @@ -3076,14 +3033,16 @@ test_perf_set_crypto_op_snow3g_hash(struct rte_crypto_op *op, rte_pktmbuf_mtophys_offset(m, data_len + SNOW3G_CIPHER_IV_LENGTH); op->sym->auth.digest.length = digest_len; - op->sym->auth.aad.data = rte_pktmbuf_mtod(m, uint8_t *); + op->sym->auth.aad.data = rte_crypto_op_ctod_offset(op, + uint8_t *, IV_OFFSET); + op->sym->auth.aad.phys_addr = rte_crypto_op_ctophys_offset(op, + IV_OFFSET); op->sym->auth.aad.length = SNOW3G_CIPHER_IV_LENGTH; rte_memcpy(op->sym->auth.aad.data, snow3g_iv, SNOW3G_CIPHER_IV_LENGTH); - op->sym->auth.aad.phys_addr = rte_pktmbuf_mtophys(m); /* Data lengths/offsets Parameters */ - op->sym->auth.data.offset = SNOW3G_CIPHER_IV_LENGTH; + op->sym->auth.data.offset = 0; op->sym->auth.data.length = data_len << 3; op->sym->m_src = m; @@ -3108,19 +3067,19 @@ test_perf_set_crypto_op_3des(struct rte_crypto_op *op, struct rte_mbuf *m, op->sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m, data_len); op->sym->auth.digest.length = digest_len; - op->sym->auth.aad.data = triple_des_iv; - op->sym->auth.aad.length = TRIPLE_DES_CIPHER_IV_LENGTH; /* Cipher Parameters */ - op->sym->cipher.iv.data = triple_des_iv; + op->sym->cipher.iv.offset = IV_OFFSET; op->sym->cipher.iv.length = TRIPLE_DES_CIPHER_IV_LENGTH; + rte_memcpy(rte_crypto_op_ctod_offset(op, uint8_t *, IV_OFFSET), + triple_des_iv, TRIPLE_DES_CIPHER_IV_LENGTH); /* Data lengths/offsets Parameters */ op->sym->auth.data.offset = 0; op->sym->auth.data.length = data_len; - op->sym->cipher.data.offset = TRIPLE_DES_BLOCK_SIZE; - op->sym->cipher.data.length = data_len - TRIPLE_DES_BLOCK_SIZE; + op->sym->cipher.data.offset = 0; + op->sym->cipher.data.length = data_len; op->sym->m_src = m; @@ -3179,10 +3138,9 @@ test_perf_aes_sha(uint8_t dev_id, uint16_t queue_id, return -1; } - /* Make room for Digest and IV in mbuf */ + /* Make room for Digest in mbuf */ if (pparams->chain != CIPHER_ONLY) rte_pktmbuf_append(mbufs[i], digest_length); - rte_pktmbuf_prepend(mbufs[i], AES_CIPHER_IV_LENGTH); } @@ -3303,12 +3261,12 @@ test_perf_snow3g(uint8_t dev_id, uint16_t queue_id, /* Generate a burst of crypto operations */ for (i = 0; i < (pparams->burst_size * NUM_MBUF_SETS); i++) { /* - * Buffer size + iv/aad len is allocated, for perf tests they + * Buffer size is allocated, for perf tests they * are equal + digest len. */ mbufs[i] = test_perf_create_pktmbuf( ts_params->mbuf_mp, - pparams->buf_size + SNOW3G_CIPHER_IV_LENGTH + + pparams->buf_size + digest_length); if (mbufs[i] == NULL) { @@ -3791,12 +3749,12 @@ test_perf_aes_cbc_encrypt_digest_vary_pkt_size(void) params_set[i].total_operations = total_operations; params_set[i].burst_size = burst_size; printf("\n%s. cipher algo: %s auth algo: %s cipher key size=%u." - " burst_size: %d ops\n", - chain_mode_name(params_set[i].chain), - cipher_algo_name(params_set[i].cipher_algo), - auth_algo_name(params_set[i].auth_algo), - params_set[i].cipher_key_length, - burst_size); + " burst_size: %d ops\n", + chain_mode_name(params_set[i].chain), + rte_crypto_cipher_algorithm_strings[params_set[i].cipher_algo], + rte_crypto_auth_algorithm_strings[params_set[i].auth_algo], + params_set[i].cipher_key_length, + burst_size); printf("\nBuffer Size(B)\tOPS(M)\tThroughput(Gbps)\t" "Retries\tEmptyPolls\n"); for (j = 0; j < RTE_DIM(buf_lengths); j++) { @@ -3841,13 +3799,17 @@ test_perf_snow3G_vary_pkt_size(void) printf("\n\n"); params_set[i].total_operations = total_operations; for (k = 0; k < RTE_DIM(burst_sizes); k++) { + enum rte_crypto_cipher_algorithm cipher_algo = + params_set[i].cipher_algo; + enum rte_crypto_auth_algorithm auth_algo = + params_set[i].auth_algo; printf("\nOn %s dev%u qp%u, %s, " "cipher algo:%s, auth algo:%s, burst_size: %d ops", pmd_name(gbl_cryptodev_perftest_devtype), testsuite_params.dev_id, 0, chain_mode_name(params_set[i].chain), - cipher_algo_name(params_set[i].cipher_algo), - auth_algo_name(params_set[i].auth_algo), + rte_crypto_cipher_algorithm_strings[cipher_algo], + rte_crypto_auth_algorithm_strings[auth_algo], burst_sizes[k]); params_set[i].burst_size = burst_sizes[k]; @@ -3930,12 +3892,12 @@ test_perf_openssl_vary_pkt_size(void) params_set[i].total_operations = total_operations; params_set[i].burst_size = burst_size; printf("\n%s. cipher algo: %s auth algo: %s cipher key size=%u." - " burst_size: %d ops\n", - chain_mode_name(params_set[i].chain), - cipher_algo_name(params_set[i].cipher_algo), - auth_algo_name(params_set[i].auth_algo), - params_set[i].cipher_key_length, - burst_size); + " burst_size: %d ops\n", + chain_mode_name(params_set[i].chain), + rte_crypto_cipher_algorithm_strings[params_set[i].cipher_algo], + rte_crypto_auth_algorithm_strings[params_set[i].auth_algo], + params_set[i].cipher_key_length, + burst_size); printf("\nBuffer Size(B)\tOPS(M)\tThroughput(Gbps)\tRetries\t" "EmptyPolls\n"); for (j = 0; j < RTE_DIM(buf_lengths); j++) { @@ -4070,12 +4032,12 @@ test_perf_armv8_vary_pkt_size(void) params_set[i].total_operations = total_operations; params_set[i].burst_size = burst_size; printf("\n%s. cipher algo: %s auth algo: %s cipher key size=%u." - " burst_size: %d ops\n", - chain_mode_name(params_set[i].chain), - cipher_algo_name(params_set[i].cipher_algo), - auth_algo_name(params_set[i].auth_algo), - params_set[i].cipher_key_length, - burst_size); + " burst_size: %d ops\n", + chain_mode_name(params_set[i].chain), + rte_crypto_cipher_algorithm_strings[params_set[i].cipher_algo], + rte_crypto_auth_algorithm_strings[params_set[i].auth_algo], + params_set[i].cipher_key_length, + burst_size); printf("\nBuffer Size(B)\tOPS(M)\tThroughput(Gbps)\tRetries\t" "EmptyPolls\n"); for (j = 0; j < RTE_DIM(buf_lengths); j++) { @@ -4205,46 +4167,43 @@ perf_gcm_set_crypto_op(struct rte_crypto_op *op, struct rte_mbuf *m, struct crypto_params *m_hlp, struct perf_test_params *params) { + uint8_t *iv_ptr = rte_crypto_op_ctod_offset(op, + uint8_t *, IV_OFFSET); + if (rte_crypto_op_attach_sym_session(op, sess) != 0) { rte_crypto_op_free(op); return NULL; } - uint16_t iv_pad_len = ALIGN_POW2_ROUNDUP(params->symmetric_op->iv_len, - 16); - op->sym->auth.digest.data = m_hlp->digest; op->sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset( m, params->symmetric_op->aad_len + - iv_pad_len + params->symmetric_op->p_len); op->sym->auth.digest.length = params->symmetric_op->t_len; op->sym->auth.aad.data = m_hlp->aad; op->sym->auth.aad.length = params->symmetric_op->aad_len; - op->sym->auth.aad.phys_addr = rte_pktmbuf_mtophys_offset( - m, - iv_pad_len); + op->sym->auth.aad.phys_addr = rte_pktmbuf_mtophys(m); rte_memcpy(op->sym->auth.aad.data, params->symmetric_op->aad_data, params->symmetric_op->aad_len); - op->sym->cipher.iv.data = m_hlp->iv; - rte_memcpy(op->sym->cipher.iv.data, params->symmetric_op->iv_data, + op->sym->cipher.iv.offset = IV_OFFSET; + rte_memcpy(iv_ptr, params->symmetric_op->iv_data, params->symmetric_op->iv_len); if (params->symmetric_op->iv_len == 12) - op->sym->cipher.iv.data[15] = 1; + iv_ptr[15] = 1; op->sym->cipher.iv.length = params->symmetric_op->iv_len; op->sym->auth.data.offset = - iv_pad_len + params->symmetric_op->aad_len; + params->symmetric_op->aad_len; op->sym->auth.data.length = params->symmetric_op->p_len; op->sym->cipher.data.offset = - iv_pad_len + params->symmetric_op->aad_len; + params->symmetric_op->aad_len; op->sym->cipher.data.length = params->symmetric_op->p_len; op->sym->m_src = m; @@ -4258,8 +4217,6 @@ test_perf_create_pktmbuf_fill(struct rte_mempool *mpool, unsigned buf_sz, struct crypto_params *m_hlp) { struct rte_mbuf *m = rte_pktmbuf_alloc(mpool); - uint16_t iv_pad_len = - ALIGN_POW2_ROUNDUP(params->symmetric_op->iv_len, 16); uint16_t aad_len = params->symmetric_op->aad_len; uint16_t digest_size = params->symmetric_op->t_len; char *p; @@ -4271,13 +4228,6 @@ test_perf_create_pktmbuf_fill(struct rte_mempool *mpool, } m_hlp->aad = (uint8_t *)p; - p = rte_pktmbuf_append(m, iv_pad_len); - if (p == NULL) { - rte_pktmbuf_free(m); - return NULL; - } - m_hlp->iv = (uint8_t *)p; - p = rte_pktmbuf_append(m, buf_sz); if (p == NULL) { rte_pktmbuf_free(m); @@ -4396,22 +4346,20 @@ perf_AES_GCM(uint8_t dev_id, uint16_t queue_id, for (m = 0; m < burst_dequeued; m++) { if (test_ops) { - uint16_t iv_pad_len = ALIGN_POW2_ROUNDUP - (pparams->symmetric_op->iv_len, 16); uint8_t *pkt = rte_pktmbuf_mtod( proc_ops[m]->sym->m_src, uint8_t *); TEST_ASSERT_BUFFERS_ARE_EQUAL( pparams->symmetric_op->c_data, - pkt + iv_pad_len + + pkt + pparams->symmetric_op->aad_len, pparams->symmetric_op->c_len, "GCM Ciphertext data not as expected"); TEST_ASSERT_BUFFERS_ARE_EQUAL( pparams->symmetric_op->t_data, - pkt + iv_pad_len + + pkt + pparams->symmetric_op->aad_len + pparams->symmetric_op->c_len, pparams->symmetric_op->t_len, @@ -4606,12 +4554,12 @@ test_perf_continual_performance_test(void) for (i = 1; i <= total_loops; ++i) { printf("\n%s. cipher algo: %s auth algo: %s cipher key size=%u." - " burst_size: %d ops\n", - chain_mode_name(params_set.chain), - cipher_algo_name(params_set.cipher_algo), - auth_algo_name(params_set.auth_algo), - params_set.cipher_key_length, - burst_size); + " burst_size: %d ops\n", + chain_mode_name(params_set.chain), + rte_crypto_cipher_algorithm_strings[params_set.cipher_algo], + rte_crypto_auth_algorithm_strings[params_set.auth_algo], + params_set.cipher_key_length, + burst_size); printf("\nBuffer Size(B)\tOPS(M)\tThroughput(Gbps)\t" "Retries\tEmptyPolls\n"); test_perf_aes_sha(testsuite_params.dev_id, 0, @@ -4649,6 +4597,17 @@ static struct unit_test_suite cryptodev_testsuite = { } }; +static struct unit_test_suite cryptodev_dpaa2_sec_testsuite = { + .suite_name = "Crypto Device DPAA2_SEC Unit Test Suite", + .setup = testsuite_setup, + .teardown = testsuite_teardown, + .unit_test_cases = { + TEST_CASE_ST(ut_setup, ut_teardown, + test_perf_aes_cbc_encrypt_digest_vary_pkt_size), + TEST_CASES_END() /**< NULL terminate unit test array */ + } +}; + static struct unit_test_suite cryptodev_gcm_testsuite = { .suite_name = "Crypto Device AESNI GCM Unit Test Suite", .setup = testsuite_setup, @@ -4774,6 +4733,14 @@ perftest_sw_armv8_cryptodev(void /*argv __rte_unused, int argc __rte_unused*/) return unit_test_suite_runner(&cryptodev_armv8_testsuite); } +static int +perftest_dpaa2_sec_cryptodev(void) +{ + gbl_cryptodev_perftest_devtype = RTE_CRYPTODEV_DPAA2_SEC_PMD; + + return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite); +} + REGISTER_TEST_COMMAND(cryptodev_aesni_mb_perftest, perftest_aesni_mb_cryptodev); REGISTER_TEST_COMMAND(cryptodev_qat_perftest, perftest_qat_cryptodev); REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_perftest, perftest_sw_snow3g_cryptodev); @@ -4785,3 +4752,5 @@ REGISTER_TEST_COMMAND(cryptodev_qat_continual_perftest, perftest_qat_continual_cryptodev); REGISTER_TEST_COMMAND(cryptodev_sw_armv8_perftest, perftest_sw_armv8_cryptodev); +REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_perftest, + perftest_dpaa2_sec_cryptodev);