net/dpaa2: enable Rx and Tx operations

[dpdk.git] / app / test-crypto-perf / cperf_test_vectors.c

diff --git a/app/test-crypto-perf/cperf_test_vectors.c b/app/test-crypto-perf/cperf_test_vectors.c
index e47a581..f87bb8e 100644 (file)
--- a/app/test-crypto-perf/cperf_test_vectors.c
+++ b/app/test-crypto-perf/cperf_test_vectors.c
@@ -399,14 +399,14 @@ cperf_test_vector_get_dummy(struct cperf_options *options)
                return t_vec;
 
        t_vec->plaintext.data = plaintext;
-       t_vec->plaintext.length = options->buffer_sz;
+       t_vec->plaintext.length = options->max_buffer_size;
 
        if (options->op_type == CPERF_CIPHER_ONLY ||
                        options->op_type == CPERF_CIPHER_THEN_AUTH ||
                        options->op_type == CPERF_AUTH_THEN_CIPHER ||
                        options->op_type == CPERF_AEAD) {
                if (options->cipher_algo == RTE_CRYPTO_CIPHER_NULL) {
-                       t_vec->cipher_key.length = -1;
+                       t_vec->cipher_key.length = 0;
                        t_vec->ciphertext.data = plaintext;
                        t_vec->cipher_key.data = NULL;
                        t_vec->iv.data = NULL;
@@ -422,33 +422,50 @@ cperf_test_vector_get_dummy(struct cperf_options *options)
                        }
                        memcpy(t_vec->iv.data, iv, options->cipher_iv_sz);
                }
-               t_vec->ciphertext.length = options->buffer_sz;
+               t_vec->ciphertext.length = options->max_buffer_size;
                t_vec->iv.phys_addr = rte_malloc_virt2phy(t_vec->iv.data);
                t_vec->iv.length = options->cipher_iv_sz;
                t_vec->data.cipher_offset = 0;
-               t_vec->data.cipher_length = options->buffer_sz;
+               t_vec->data.cipher_length = options->max_buffer_size;
        }
 
        if (options->op_type == CPERF_AUTH_ONLY ||
                        options->op_type == CPERF_CIPHER_THEN_AUTH ||
                        options->op_type == CPERF_AUTH_THEN_CIPHER ||
                        options->op_type == CPERF_AEAD) {
+               uint8_t aad_alloc = 0;
+
                t_vec->auth_key.length = options->auth_key_sz;
-               if (options->auth_algo == RTE_CRYPTO_AUTH_NULL) {
+
+               switch (options->auth_algo) {
+               case RTE_CRYPTO_AUTH_NULL:
                        t_vec->auth_key.data = NULL;
-                       t_vec->aad.data = NULL;
-               } else if (options->auth_algo == RTE_CRYPTO_AUTH_AES_GCM ||
-                               options->auth_algo ==
-                                               RTE_CRYPTO_AUTH_AES_GMAC ||
-                               options->auth_algo ==
-                                               RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
-                               options->auth_algo ==
-                                               RTE_CRYPTO_AUTH_KASUMI_F9 ||
-                               options->auth_algo ==
-                                               RTE_CRYPTO_AUTH_ZUC_EIA3) {
+                       aad_alloc = 0;
+                       break;
+               case RTE_CRYPTO_AUTH_AES_GCM:
                        t_vec->auth_key.data = NULL;
-                       t_vec->aad.data = rte_malloc(NULL, options->auth_aad_sz,
-                                       16);
+                       aad_alloc = 1;
+                       break;
+               case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
+               case RTE_CRYPTO_AUTH_KASUMI_F9:
+               case RTE_CRYPTO_AUTH_ZUC_EIA3:
+                       t_vec->auth_key.data = auth_key;
+                       aad_alloc = 1;
+                       break;
+               case RTE_CRYPTO_AUTH_AES_GMAC:
+                       /* auth key should be the same as cipher key */
+                       t_vec->auth_key.data = cipher_key;
+                       aad_alloc = 1;
+                       break;
+               default:
+                       t_vec->auth_key.data = auth_key;
+                       aad_alloc = 0;
+                       break;
+               }
+
+               if (aad_alloc) {
+                       t_vec->aad.data = rte_malloc(NULL,
+                                       options->auth_aad_sz, 16);
                        if (t_vec->aad.data == NULL) {
                                if (options->op_type != CPERF_AUTH_ONLY)
                                        rte_free(t_vec->iv.data);
@@ -457,7 +474,6 @@ cperf_test_vector_get_dummy(struct cperf_options *options)
                        }
                        memcpy(t_vec->aad.data, aad, options->auth_aad_sz);
                } else {
-                       t_vec->auth_key.data = auth_key;
                        t_vec->aad.data = NULL;
                }
 
@@ -477,7 +493,7 @@ cperf_test_vector_get_dummy(struct cperf_options *options)
                t_vec->digest.length = options->auth_digest_sz;
                memcpy(t_vec->digest.data, digest, options->auth_digest_sz);
                t_vec->data.auth_offset = 0;
-               t_vec->data.auth_length = options->buffer_sz;
+               t_vec->data.auth_length = options->max_buffer_size;
        }
 
        return t_vec;