app/crypto-perf: parse segment size

[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 a5bf09b..ad32065 100644 (file)
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -175,6 +175,14 @@ cperf_set_ops_auth(struct rte_crypto_op **ops,
                                        offset -= tbuf->data_len;
                                        tbuf = tbuf->next;
                                }
+                               /*
+                                * If there is not enough room in segment,
+                                * place the digest in the next segment
+                                */
+                               if ((tbuf->data_len - offset) < options->digest_sz) {
+                                       tbuf = tbuf->next;
+                                       offset = 0;
+                               }
                                buf = tbuf;
                        }
 
@@ -256,6 +264,14 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
                                        offset -= tbuf->data_len;
                                        tbuf = tbuf->next;
                                }
+                               /*
+                                * If there is not enough room in segment,
+                                * place the digest in the next segment
+                                */
+                               if ((tbuf->data_len - offset) < options->digest_sz) {
+                                       tbuf = tbuf->next;
+                                       offset = 0;
+                               }
                                buf = tbuf;
                        }
 
@@ -307,6 +323,8 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
                uint16_t iv_offset)
 {
        uint16_t i;
+       uint16_t aad_offset = iv_offset +
+                       RTE_ALIGN_CEIL(test_vector->aead_iv.length, 16);
 
        for (i = 0; i < nb_ops; i++) {
                struct rte_crypto_sym_op *sym_op = ops[i]->sym;
@@ -318,11 +336,12 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
 
                /* AEAD parameters */
                sym_op->aead.data.length = options->test_buffer_size;
-               sym_op->aead.data.offset =
-                               RTE_ALIGN_CEIL(options->aead_aad_sz, 16);
+               sym_op->aead.data.offset = 0;
 
-               sym_op->aead.aad.data = rte_pktmbuf_mtod(bufs_in[i], uint8_t *);
-               sym_op->aead.aad.phys_addr = rte_pktmbuf_mtophys(bufs_in[i]);
+               sym_op->aead.aad.data = rte_crypto_op_ctod_offset(ops[i],
+                                       uint8_t *, aad_offset);
+               sym_op->aead.aad.phys_addr = rte_crypto_op_ctophys_offset(ops[i],
+                                       aad_offset);
 
                if (options->aead_op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
                        sym_op->aead.digest.data = test_vector->digest.data;
@@ -343,6 +362,14 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
                                        offset -= tbuf->data_len;
                                        tbuf = tbuf->next;
                                }
+                               /*
+                                * If there is not enough room in segment,
+                                * place the digest in the next segment
+                                */
+                               if ((tbuf->data_len - offset) < options->digest_sz) {
+                                       tbuf = tbuf->next;
+                                       offset = 0;
+                               }
                                buf = tbuf;
                        }
 
@@ -360,6 +387,11 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
 
                        memcpy(iv_ptr, test_vector->aead_iv.data,
                                        test_vector->aead_iv.length);
+
+                       /* Copy AAD after the IV */
+                       memcpy(ops[i]->sym->aead.aad.data,
+                               test_vector->aad.data,
+                               test_vector->aad.length);
                }
        }
 
@@ -509,7 +541,7 @@ cperf_create_session(struct rte_mempool *sess_mp,
                aead_xform.aead.iv.length = test_vector->aead_iv.length;
 
                aead_xform.aead.digest_length = options->digest_sz;
-               aead_xform.aead.add_auth_data_length =
+               aead_xform.aead.aad_length =
                                        options->aead_aad_sz;
 
                /* Create crypto session */