cryptodev: add auth IV

[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 b8c0398..60d55a0 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;
 
@@ -53,7 +54,7 @@ cperf_set_ops_null_cipher(struct rte_crypto_op **ops,
                sym_op->m_dst = bufs_out[i];
 
                /* cipher parameters */
-               sym_op->cipher.data.length = options->buffer_sz;
+               sym_op->cipher.data.length = options->test_buffer_size;
                sym_op->cipher.data.offset = 0;
        }
 
@@ -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;
 
@@ -78,7 +80,7 @@ cperf_set_ops_null_auth(struct rte_crypto_op **ops,
                sym_op->m_dst = bufs_out[i];
 
                /* auth parameters */
-               sym_op->auth.data.length = options->buffer_sz;
+               sym_op->auth.data.length = options->test_buffer_size;
                sym_op->auth.data.offset = 0;
        }
 
@@ -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,27 @@ 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.length = test_vector->iv.length;
+               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.length = options->buffer_sz;
                sym_op->cipher.data.offset = 0;
        }
 
+       if (options->test == CPERF_TEST_TYPE_VERIFY) {
+               for (i = 0; i < nb_ops; i++) {
+                       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ops[i],
+                                       uint8_t *, iv_offset);
+
+                       memcpy(iv_ptr, test_vector->cipher_iv.data,
+                                       test_vector->cipher_iv.length);
+
+               }
+       }
+
        return 0;
 }
 
@@ -119,7 +135,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)
 {
        uint16_t i;
 
@@ -131,6 +148,14 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
                sym_op->m_src = bufs_in[i];
                sym_op->m_dst = bufs_out[i];
 
+               if (test_vector->auth_iv.length) {
+                       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ops[i],
+                                                               uint8_t *,
+                                                               iv_offset);
+                       memcpy(iv_ptr, test_vector->auth_iv.data,
+                                       test_vector->auth_iv.length);
+               }
+
                /* authentication parameters */
                if (options->auth_op == RTE_CRYPTO_AUTH_OP_VERIFY) {
                        sym_op->auth.digest.data = test_vector->digest.data;
@@ -139,20 +164,19 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
                        sym_op->auth.digest.length = options->auth_digest_sz;
                } else {
 
-                       uint32_t offset = options->buffer_sz;
+                       uint32_t offset = options->test_buffer_size;
                        struct rte_mbuf *buf, *tbuf;
 
                        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,10 +190,27 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
 
                }
 
-               sym_op->auth.data.length = options->buffer_sz;
+               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) {
+               if (test_vector->auth_iv.length) {
+                       for (i = 0; i < nb_ops; i++) {
+                               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ops[i],
+                                               uint8_t *, iv_offset);
+
+                               memcpy(iv_ptr, test_vector->auth_iv.data,
+                                               test_vector->auth_iv.length);
+                       }
+               }
+       }
        return 0;
 }
 
@@ -178,7 +219,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 +233,13 @@ 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.length = test_vector->iv.length;
+               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.length = options->buffer_sz;
                sym_op->cipher.data.offset = 0;
 
                /* authentication parameters */
@@ -206,20 +250,19 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
                        sym_op->auth.digest.length = options->auth_digest_sz;
                } else {
 
-                       uint32_t offset = options->buffer_sz;
+                       uint32_t offset = options->test_buffer_size;
                        struct rte_mbuf *buf, *tbuf;
 
                        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 +275,36 @@ 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->buffer_sz;
+               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++) {
+                       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ops[i],
+                                       uint8_t *, iv_offset);
+
+                       memcpy(iv_ptr, test_vector->cipher_iv.data,
+                                       test_vector->cipher_iv.length);
+                       if (test_vector->auth_iv.length) {
+                               /*
+                                * Copy IV after the crypto operation and
+                                * the cipher IV
+                                */
+                               iv_ptr += test_vector->cipher_iv.length;
+                               memcpy(iv_ptr, test_vector->auth_iv.data,
+                                               test_vector->auth_iv.length);
+                       }
+               }
+
+       }
+
        return 0;
 }
 
@@ -244,7 +313,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,11 +327,7 @@ 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.length = test_vector->iv.length;
-
-               sym_op->cipher.data.length = options->buffer_sz;
+               sym_op->cipher.data.length = options->test_buffer_size;
                sym_op->cipher.data.offset =
                                RTE_ALIGN_CEIL(options->auth_aad_sz, 16);
 
@@ -284,14 +350,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,
@@ -302,17 +367,28 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
                        sym_op->auth.digest.length = options->auth_digest_sz;
                }
 
-               sym_op->auth.data.length = options->buffer_sz;
+               sym_op->auth.data.length = options->test_buffer_size;
                sym_op->auth.data.offset = options->auth_aad_sz;
        }
 
+       if (options->test == CPERF_TEST_TYPE_VERIFY) {
+               for (i = 0; i < nb_ops; i++) {
+                       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ops[i],
+                                       uint8_t *, iv_offset);
+
+                       memcpy(iv_ptr, test_vector->cipher_iv.data,
+                                       test_vector->cipher_iv.length);
+               }
+       }
+
        return 0;
 }
 
 static struct rte_cryptodev_sym_session *
 cperf_create_session(uint8_t dev_id,
        const struct cperf_options *options,
-       const struct cperf_test_vector *test_vector)
+       const struct cperf_test_vector *test_vector,
+       uint16_t iv_offset)
 {
        struct rte_crypto_sym_xform cipher_xform;
        struct rte_crypto_sym_xform auth_xform;
@@ -326,6 +402,7 @@ cperf_create_session(uint8_t dev_id,
                cipher_xform.next = NULL;
                cipher_xform.cipher.algo = options->cipher_algo;
                cipher_xform.cipher.op = options->cipher_op;
+               cipher_xform.cipher.iv.offset = iv_offset;
 
                /* cipher different than null */
                if (options->cipher_algo != RTE_CRYPTO_CIPHER_NULL) {
@@ -333,6 +410,12 @@ cperf_create_session(uint8_t dev_id,
                                        test_vector->cipher_key.data;
                        cipher_xform.cipher.key.length =
                                        test_vector->cipher_key.length;
+                       cipher_xform.cipher.iv.length =
+                                       test_vector->cipher_iv.length;
+               } else {
+                       cipher_xform.cipher.key.data = NULL;
+                       cipher_xform.cipher.key.length = 0;
+                       cipher_xform.cipher.iv.length = 0;
                }
                /* create crypto session */
                sess = rte_cryptodev_sym_session_create(dev_id, &cipher_xform);
@@ -354,6 +437,14 @@ cperf_create_session(uint8_t dev_id,
                        auth_xform.auth.key.length =
                                        test_vector->auth_key.length;
                        auth_xform.auth.key.data = test_vector->auth_key.data;
+                       auth_xform.auth.iv.length =
+                                       test_vector->auth_iv.length;
+               } else {
+                       auth_xform.auth.digest_length = 0;
+                       auth_xform.auth.add_auth_data_length = 0;
+                       auth_xform.auth.key.length = 0;
+                       auth_xform.auth.key.data = NULL;
+                       auth_xform.auth.iv.length = 0;
                }
                /* create crypto session */
                sess =  rte_cryptodev_sym_session_create(dev_id, &auth_xform);
@@ -371,6 +462,7 @@ cperf_create_session(uint8_t dev_id,
                cipher_xform.next = NULL;
                cipher_xform.cipher.algo = options->cipher_algo;
                cipher_xform.cipher.op = options->cipher_op;
+               cipher_xform.cipher.iv.offset = iv_offset;
 
                /* cipher different than null */
                if (options->cipher_algo != RTE_CRYPTO_CIPHER_NULL) {
@@ -378,6 +470,12 @@ cperf_create_session(uint8_t dev_id,
                                        test_vector->cipher_key.data;
                        cipher_xform.cipher.key.length =
                                        test_vector->cipher_key.length;
+                       cipher_xform.cipher.iv.length =
+                                       test_vector->cipher_iv.length;
+               } else {
+                       cipher_xform.cipher.key.data = NULL;
+                       cipher_xform.cipher.key.length = 0;
+                       cipher_xform.cipher.iv.length = 0;
                }
 
                /*
@@ -398,12 +496,21 @@ cperf_create_session(uint8_t dev_id,
                                options->auth_algo == RTE_CRYPTO_AUTH_AES_GCM) {
                                auth_xform.auth.key.length = 0;
                                auth_xform.auth.key.data = NULL;
+                               auth_xform.auth.iv.length = 0;
                        } else { /* auth options for others */
                                auth_xform.auth.key.length =
                                        test_vector->auth_key.length;
                                auth_xform.auth.key.data =
                                                test_vector->auth_key.data;
+                               auth_xform.auth.iv.length =
+                                               test_vector->auth_iv.length;
                        }
+               } else {
+                       auth_xform.auth.digest_length = 0;
+                       auth_xform.auth.add_auth_data_length = 0;
+                       auth_xform.auth.key.length = 0;
+                       auth_xform.auth.key.data = NULL;
+                       auth_xform.auth.iv.length = 0;
                }
 
                /* create crypto session for aes gcm */