app/crypto-perf: move IV to crypto op private data

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

diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index 0387354..0f45a3c 100644 (file)
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -40,7 +40,8 @@ cperf_set_ops_null_cipher(struct rte_crypto_op **ops,
                struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
                uint16_t nb_ops, struct rte_cryptodev_sym_session *sess,
                const struct cperf_options *options,
-               const struct cperf_test_vector *test_vector __rte_unused)
+               const struct cperf_test_vector *test_vector __rte_unused,
+               uint16_t iv_offset __rte_unused)
 {
        uint16_t i;
 
@@ -65,7 +66,8 @@ cperf_set_ops_null_auth(struct rte_crypto_op **ops,
                struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
                uint16_t nb_ops, struct rte_cryptodev_sym_session *sess,
                const struct cperf_options *options,
-               const struct cperf_test_vector *test_vector __rte_unused)
+               const struct cperf_test_vector *test_vector __rte_unused,
+               uint16_t iv_offset __rte_unused)
 {
        uint16_t i;
 
@@ -90,7 +92,8 @@ cperf_set_ops_cipher(struct rte_crypto_op **ops,
                struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
                uint16_t nb_ops, struct rte_cryptodev_sym_session *sess,
                const struct cperf_options *options,
-               const struct cperf_test_vector *test_vector)
+               const struct cperf_test_vector *test_vector,
+               uint16_t iv_offset)
 {
        uint16_t i;
 
@@ -103,14 +106,29 @@ cperf_set_ops_cipher(struct rte_crypto_op **ops,
                sym_op->m_dst = bufs_out[i];
 
                /* cipher parameters */
-               sym_op->cipher.iv.data = test_vector->iv.data;
-               sym_op->cipher.iv.phys_addr = test_vector->iv.phys_addr;
+               sym_op->cipher.iv.data = rte_crypto_op_ctod_offset(ops[i],
+                                                       uint8_t *, iv_offset);
+               sym_op->cipher.iv.phys_addr = rte_crypto_op_ctophys_offset(ops[i],
+                                                       iv_offset);
                sym_op->cipher.iv.length = test_vector->iv.length;
 
-               sym_op->cipher.data.length = options->test_buffer_size;
+               if (options->cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+                               options->cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+                               options->cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3)
+                       sym_op->cipher.data.length = options->test_buffer_size << 3;
+               else
+                       sym_op->cipher.data.length = options->test_buffer_size;
+
                sym_op->cipher.data.offset = 0;
        }
 
+       if (options->test == CPERF_TEST_TYPE_VERIFY) {
+               for (i = 0; i < nb_ops; i++)
+                       memcpy(ops[i]->sym->cipher.iv.data,
+                               test_vector->iv.data,
+                               test_vector->iv.length);
+       }
+
        return 0;
 }
 
@@ -119,7 +137,8 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
                struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
                uint16_t nb_ops, struct rte_cryptodev_sym_session *sess,
                const struct cperf_options *options,
-               const struct cperf_test_vector *test_vector)
+               const struct cperf_test_vector *test_vector,
+               uint16_t iv_offset __rte_unused)
 {
        uint16_t i;
 
@@ -145,14 +164,13 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
                        if (options->out_of_place) {
                                buf =  bufs_out[i];
                        } else {
-                               buf =  bufs_in[i];
-
-                               tbuf = buf;
+                               tbuf =  bufs_in[i];
                                while ((tbuf->next != NULL) &&
                                                (offset >= tbuf->data_len)) {
                                        offset -= tbuf->data_len;
                                        tbuf = tbuf->next;
                                }
+                               buf = tbuf;
                        }
 
                        sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(buf,
@@ -166,7 +184,13 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
 
                }
 
-               sym_op->auth.data.length = options->test_buffer_size;
+               if (options->auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+                               options->auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+                               options->auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3)
+                       sym_op->auth.data.length = options->test_buffer_size << 3;
+               else
+                       sym_op->auth.data.length = options->test_buffer_size;
+
                sym_op->auth.data.offset = 0;
        }
 
@@ -178,7 +202,8 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
                struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
                uint16_t nb_ops, struct rte_cryptodev_sym_session *sess,
                const struct cperf_options *options,
-               const struct cperf_test_vector *test_vector)
+               const struct cperf_test_vector *test_vector,
+               uint16_t iv_offset)
 {
        uint16_t i;
 
@@ -191,11 +216,19 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
                sym_op->m_dst = bufs_out[i];
 
                /* cipher parameters */
-               sym_op->cipher.iv.data = test_vector->iv.data;
-               sym_op->cipher.iv.phys_addr = test_vector->iv.phys_addr;
+               sym_op->cipher.iv.data = rte_crypto_op_ctod_offset(ops[i],
+                                                       uint8_t *, iv_offset);
+               sym_op->cipher.iv.phys_addr = rte_crypto_op_ctophys_offset(ops[i],
+                                                       iv_offset);
                sym_op->cipher.iv.length = test_vector->iv.length;
 
-               sym_op->cipher.data.length = options->test_buffer_size;
+               if (options->cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+                               options->cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+                               options->cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3)
+                       sym_op->cipher.data.length = options->test_buffer_size << 3;
+               else
+                       sym_op->cipher.data.length = options->test_buffer_size;
+
                sym_op->cipher.data.offset = 0;
 
                /* authentication parameters */
@@ -212,14 +245,13 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
                        if (options->out_of_place) {
                                buf =  bufs_out[i];
                        } else {
-                               buf =  bufs_in[i];
-
-                               tbuf = buf;
+                               tbuf =  bufs_in[i];
                                while ((tbuf->next != NULL) &&
                                                (offset >= tbuf->data_len)) {
                                        offset -= tbuf->data_len;
                                        tbuf = tbuf->next;
                                }
+                               buf = tbuf;
                        }
 
                        sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(buf,
@@ -232,10 +264,23 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
                        sym_op->auth.aad.length = options->auth_aad_sz;
                }
 
-               sym_op->auth.data.length = options->test_buffer_size;
+               if (options->auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+                               options->auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+                               options->auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3)
+                       sym_op->auth.data.length = options->test_buffer_size << 3;
+               else
+                       sym_op->auth.data.length = options->test_buffer_size;
+
                sym_op->auth.data.offset = 0;
        }
 
+       if (options->test == CPERF_TEST_TYPE_VERIFY) {
+               for (i = 0; i < nb_ops; i++)
+                       memcpy(ops[i]->sym->cipher.iv.data,
+                               test_vector->iv.data,
+                               test_vector->iv.length);
+       }
+
        return 0;
 }
 
@@ -244,7 +289,8 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
                struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
                uint16_t nb_ops, struct rte_cryptodev_sym_session *sess,
                const struct cperf_options *options,
-               const struct cperf_test_vector *test_vector)
+               const struct cperf_test_vector *test_vector,
+               uint16_t iv_offset)
 {
        uint16_t i;
 
@@ -257,8 +303,10 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
                sym_op->m_dst = bufs_out[i];
 
                /* cipher parameters */
-               sym_op->cipher.iv.data = test_vector->iv.data;
-               sym_op->cipher.iv.phys_addr = test_vector->iv.phys_addr;
+               sym_op->cipher.iv.data = rte_crypto_op_ctod_offset(ops[i],
+                                                       uint8_t *, iv_offset);
+               sym_op->cipher.iv.phys_addr = rte_crypto_op_ctophys_offset(ops[i],
+                                                       iv_offset);
                sym_op->cipher.iv.length = test_vector->iv.length;
 
                sym_op->cipher.data.length = options->test_buffer_size;
@@ -284,14 +332,13 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
                        if (options->out_of_place) {
                                buf =  bufs_out[i];
                        } else {
-                               buf =  bufs_in[i];
-
-                               tbuf = buf;
+                               tbuf =  bufs_in[i];
                                while ((tbuf->next != NULL) &&
                                                (offset >= tbuf->data_len)) {
                                        offset -= tbuf->data_len;
                                        tbuf = tbuf->next;
                                }
+                               buf = tbuf;
                        }
 
                        sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(buf,
@@ -306,6 +353,13 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
                sym_op->auth.data.offset = options->auth_aad_sz;
        }
 
+       if (options->test == CPERF_TEST_TYPE_VERIFY) {
+               for (i = 0; i < nb_ops; i++)
+                       memcpy(ops[i]->sym->cipher.iv.data,
+                               test_vector->iv.data,
+                               test_vector->iv.length);
+       }
+
        return 0;
 }