cryptodev: move IV parameters to session

[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 6307f25..e29d7da 100644 (file)
--- a/app/test-crypto-perf/cperf_test_vectors.c
+++ b/app/test-crypto-perf/cperf_test_vectors.c
@@ -1,3 +1,35 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2016-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
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include <rte_crypto.h>
 #include <rte_malloc.h>
 
@@ -399,14 +431,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,11 +454,19 @@ 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->iv.phys_addr = rte_malloc_virt2phy(t_vec->iv.data);
+               t_vec->ciphertext.length = options->max_buffer_size;
+               /* Set IV parameters */
+               t_vec->iv.data = rte_malloc(NULL, options->cipher_iv_sz,
+                                       16);
+               if (options->cipher_iv_sz && t_vec->iv.data == NULL) {
+                       rte_free(t_vec);
+                       return NULL;
+               }
+               memcpy(t_vec->iv.data, iv, options->cipher_iv_sz);
                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 ||
@@ -463,7 +503,7 @@ cperf_test_vector_get_dummy(struct cperf_options *options)
                        break;
                }
 
-               if (aad_alloc) {
+               if (aad_alloc && options->auth_aad_sz) {
                        t_vec->aad.data = rte_malloc(NULL,
                                        options->auth_aad_sz, 16);
                        if (t_vec->aad.data == NULL) {
@@ -493,7 +533,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;