app/crypto-perf: fix mbuf lengths for DOCSIS
[dpdk.git] / app / test-crypto-perf / cperf_ops.c
index b8c0398..3da835a 100644 (file)
-/*-
- *   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.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2016-2017 Intel Corporation
  */
 
 #include <rte_cryptodev.h>
+#include <rte_ether.h>
 
 #include "cperf_ops.h"
 #include "cperf_test_vectors.h"
 
+#ifdef RTE_LIBRTE_SECURITY
+static int
+cperf_set_ops_security(struct rte_crypto_op **ops,
+               uint32_t src_buf_offset __rte_unused,
+               uint32_t dst_buf_offset __rte_unused,
+               uint16_t nb_ops, struct rte_cryptodev_sym_session *sess,
+               const struct cperf_options *options __rte_unused,
+               const struct cperf_test_vector *test_vector __rte_unused,
+               uint16_t iv_offset __rte_unused, uint32_t *imix_idx)
+{
+       uint16_t i;
+
+       for (i = 0; i < nb_ops; i++) {
+               struct rte_crypto_sym_op *sym_op = ops[i]->sym;
+               struct rte_security_session *sec_sess =
+                       (struct rte_security_session *)sess;
+               uint32_t buf_sz;
+
+               uint32_t *per_pkt_hfn = rte_crypto_op_ctod_offset(ops[i],
+                                       uint32_t *, iv_offset);
+               *per_pkt_hfn = options->pdcp_ses_hfn_en ? 0 : PDCP_DEFAULT_HFN;
+
+               ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+               rte_security_attach_session(ops[i], sec_sess);
+               sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       src_buf_offset);
+
+               if (options->op_type == CPERF_PDCP) {
+                       sym_op->m_src->buf_len = options->segment_sz;
+                       sym_op->m_src->data_len = options->test_buffer_size;
+                       sym_op->m_src->pkt_len = sym_op->m_src->data_len;
+               }
+
+               if (options->op_type == CPERF_DOCSIS) {
+                       if (options->imix_distribution_count) {
+                               buf_sz = options->imix_buffer_sizes[*imix_idx];
+                               *imix_idx = (*imix_idx + 1) % options->pool_sz;
+                       } else
+                               buf_sz = options->test_buffer_size;
+
+                       sym_op->m_src->buf_len = options->segment_sz;
+                       sym_op->m_src->data_len = buf_sz;
+                       sym_op->m_src->pkt_len = buf_sz;
+
+                       /* DOCSIS header is not CRC'ed */
+                       sym_op->auth.data.offset = options->docsis_hdr_sz;
+                       sym_op->auth.data.length = buf_sz -
+                               sym_op->auth.data.offset - RTE_ETHER_CRC_LEN;
+                       /*
+                        * DOCSIS header and SRC and DST MAC addresses are not
+                        * ciphered
+                        */
+                       sym_op->cipher.data.offset = sym_op->auth.data.offset +
+                               RTE_ETHER_HDR_LEN - RTE_ETHER_TYPE_LEN;
+                       sym_op->cipher.data.length = buf_sz -
+                               sym_op->cipher.data.offset;
+               }
+
+               /* Set dest mbuf to NULL if out-of-place (dst_buf_offset = 0) */
+               if (dst_buf_offset == 0)
+                       sym_op->m_dst = NULL;
+               else
+                       sym_op->m_dst = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       dst_buf_offset);
+       }
+
+       return 0;
+}
+#endif
+
 static int
 cperf_set_ops_null_cipher(struct rte_crypto_op **ops,
-               struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
+               uint32_t src_buf_offset, uint32_t dst_buf_offset,
                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, uint32_t *imix_idx)
 {
        uint16_t i;
 
        for (i = 0; i < nb_ops; i++) {
                struct rte_crypto_sym_op *sym_op = ops[i]->sym;
 
+               ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
                rte_crypto_op_attach_sym_session(ops[i], sess);
 
-               sym_op->m_src = bufs_in[i];
-               sym_op->m_dst = bufs_out[i];
+               sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       src_buf_offset);
+
+               /* Set dest mbuf to NULL if out-of-place (dst_buf_offset = 0) */
+               if (dst_buf_offset == 0)
+                       sym_op->m_dst = NULL;
+               else
+                       sym_op->m_dst = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       dst_buf_offset);
 
                /* cipher parameters */
-               sym_op->cipher.data.length = options->buffer_sz;
+               if (options->imix_distribution_count) {
+                       sym_op->cipher.data.length =
+                               options->imix_buffer_sizes[*imix_idx];
+                       *imix_idx = (*imix_idx + 1) % options->pool_sz;
+               } else
+                       sym_op->cipher.data.length = options->test_buffer_size;
                sym_op->cipher.data.offset = 0;
        }
 
@@ -62,23 +119,37 @@ cperf_set_ops_null_cipher(struct rte_crypto_op **ops,
 
 static int
 cperf_set_ops_null_auth(struct rte_crypto_op **ops,
-               struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
+               uint32_t src_buf_offset, uint32_t dst_buf_offset,
                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, uint32_t *imix_idx)
 {
        uint16_t i;
 
        for (i = 0; i < nb_ops; i++) {
                struct rte_crypto_sym_op *sym_op = ops[i]->sym;
 
+               ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
                rte_crypto_op_attach_sym_session(ops[i], sess);
 
-               sym_op->m_src = bufs_in[i];
-               sym_op->m_dst = bufs_out[i];
+               sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       src_buf_offset);
+
+               /* Set dest mbuf to NULL if out-of-place (dst_buf_offset = 0) */
+               if (dst_buf_offset == 0)
+                       sym_op->m_dst = NULL;
+               else
+                       sym_op->m_dst = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       dst_buf_offset);
 
                /* auth parameters */
-               sym_op->auth.data.length = options->buffer_sz;
+               if (options->imix_distribution_count) {
+                       sym_op->auth.data.length =
+                               options->imix_buffer_sizes[*imix_idx];
+                       *imix_idx = (*imix_idx + 1) % options->pool_sz;
+               } else
+                       sym_op->auth.data.length = options->test_buffer_size;
                sym_op->auth.data.offset = 0;
        }
 
@@ -87,115 +158,199 @@ cperf_set_ops_null_auth(struct rte_crypto_op **ops,
 
 static int
 cperf_set_ops_cipher(struct rte_crypto_op **ops,
-               struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
+               uint32_t src_buf_offset, uint32_t dst_buf_offset,
                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, uint32_t *imix_idx)
 {
        uint16_t i;
 
        for (i = 0; i < nb_ops; i++) {
                struct rte_crypto_sym_op *sym_op = ops[i]->sym;
 
+               ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
                rte_crypto_op_attach_sym_session(ops[i], sess);
 
-               sym_op->m_src = bufs_in[i];
-               sym_op->m_dst = bufs_out[i];
+               sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       src_buf_offset);
+
+               /* Set dest mbuf to NULL if out-of-place (dst_buf_offset = 0) */
+               if (dst_buf_offset == 0)
+                       sym_op->m_dst = NULL;
+               else
+                       sym_op->m_dst = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       dst_buf_offset);
 
                /* 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->imix_distribution_count) {
+                       sym_op->cipher.data.length =
+                               options->imix_buffer_sizes[*imix_idx];
+                       *imix_idx = (*imix_idx + 1) % options->pool_sz;
+               } else
+                       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 <<= 3;
 
-               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;
 }
 
 static int
 cperf_set_ops_auth(struct rte_crypto_op **ops,
-               struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
+               uint32_t src_buf_offset, uint32_t dst_buf_offset,
                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, uint32_t *imix_idx)
 {
        uint16_t i;
 
        for (i = 0; i < nb_ops; i++) {
                struct rte_crypto_sym_op *sym_op = ops[i]->sym;
 
+               ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
                rte_crypto_op_attach_sym_session(ops[i], sess);
 
-               sym_op->m_src = bufs_in[i];
-               sym_op->m_dst = bufs_out[i];
+               sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       src_buf_offset);
+
+               /* Set dest mbuf to NULL if out-of-place (dst_buf_offset = 0) */
+               if (dst_buf_offset == 0)
+                       sym_op->m_dst = NULL;
+               else
+                       sym_op->m_dst = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       dst_buf_offset);
+
+               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;
                        sym_op->auth.digest.phys_addr =
                                        test_vector->digest.phys_addr;
-                       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];
+                               buf = sym_op->m_dst;
                        } else {
-                               buf =  bufs_in[i];
-
-                               tbuf = buf;
+                               tbuf = sym_op->m_src;
                                while ((tbuf->next != NULL) &&
                                                (offset >= tbuf->data_len)) {
                                        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;
                        }
 
                        sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(buf,
                                        uint8_t *, offset);
                        sym_op->auth.digest.phys_addr =
-                                       rte_pktmbuf_mtophys_offset(buf, offset);
-                       sym_op->auth.digest.length = options->auth_digest_sz;
-                       sym_op->auth.aad.phys_addr = test_vector->aad.phys_addr;
-                       sym_op->auth.aad.data = test_vector->aad.data;
-                       sym_op->auth.aad.length = options->auth_aad_sz;
+                                       rte_pktmbuf_iova_offset(buf, offset);
 
                }
 
-               sym_op->auth.data.length = options->buffer_sz;
+               if (options->imix_distribution_count) {
+                       sym_op->auth.data.length =
+                               options->imix_buffer_sizes[*imix_idx];
+                       *imix_idx = (*imix_idx + 1) % options->pool_sz;
+               } else
+                       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 <<= 3;
+
                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;
 }
 
 static int
 cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
-               struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
+               uint32_t src_buf_offset, uint32_t dst_buf_offset,
                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, uint32_t *imix_idx)
 {
        uint16_t i;
 
        for (i = 0; i < nb_ops; i++) {
                struct rte_crypto_sym_op *sym_op = ops[i]->sym;
 
+               ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
                rte_crypto_op_attach_sym_session(ops[i], sess);
 
-               sym_op->m_src = bufs_in[i];
-               sym_op->m_dst = bufs_out[i];
+               sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       src_buf_offset);
+
+               /* Set dest mbuf to NULL if out-of-place (dst_buf_offset = 0) */
+               if (dst_buf_offset == 0)
+                       sym_op->m_dst = NULL;
+               else
+                       sym_op->m_dst = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       dst_buf_offset);
 
                /* 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->imix_distribution_count) {
+                       sym_op->cipher.data.length =
+                               options->imix_buffer_sizes[*imix_idx];
+                       *imix_idx = (*imix_idx + 1) % options->pool_sz;
+               } else
+                       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 <<= 3;
 
-               sym_op->cipher.data.length = options->buffer_sz;
                sym_op->cipher.data.offset = 0;
 
                /* authentication parameters */
@@ -203,121 +358,316 @@ cperf_set_ops_cipher_auth(struct rte_crypto_op **ops,
                        sym_op->auth.digest.data = test_vector->digest.data;
                        sym_op->auth.digest.phys_addr =
                                        test_vector->digest.phys_addr;
-                       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];
+                               buf = sym_op->m_dst;
                        } else {
-                               buf =  bufs_in[i];
-
-                               tbuf = buf;
+                               tbuf = sym_op->m_src;
                                while ((tbuf->next != NULL) &&
                                                (offset >= tbuf->data_len)) {
                                        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;
                        }
 
                        sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(buf,
                                        uint8_t *, offset);
                        sym_op->auth.digest.phys_addr =
-                                       rte_pktmbuf_mtophys_offset(buf, offset);
-                       sym_op->auth.digest.length = options->auth_digest_sz;
-                       sym_op->auth.aad.phys_addr = test_vector->aad.phys_addr;
-                       sym_op->auth.aad.data = test_vector->aad.data;
-                       sym_op->auth.aad.length = options->auth_aad_sz;
+                                       rte_pktmbuf_iova_offset(buf, offset);
                }
 
-               sym_op->auth.data.length = options->buffer_sz;
+               if (options->imix_distribution_count) {
+                       sym_op->auth.data.length =
+                               options->imix_buffer_sizes[*imix_idx];
+                       *imix_idx = (*imix_idx + 1) % options->pool_sz;
+               } else
+                       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 <<= 3;
+
                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;
 }
 
 static int
 cperf_set_ops_aead(struct rte_crypto_op **ops,
-               struct rte_mbuf **bufs_in, struct rte_mbuf **bufs_out,
+               uint32_t src_buf_offset, uint32_t dst_buf_offset,
                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, uint32_t *imix_idx)
 {
        uint16_t i;
+       /* AAD is placed after the IV */
+       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;
 
+               ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
                rte_crypto_op_attach_sym_session(ops[i], sess);
 
-               sym_op->m_src = bufs_in[i];
-               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.offset =
-                               RTE_ALIGN_CEIL(options->auth_aad_sz, 16);
-
-               sym_op->auth.aad.data = rte_pktmbuf_mtod(bufs_in[i], uint8_t *);
-               sym_op->auth.aad.phys_addr = rte_pktmbuf_mtophys(bufs_in[i]);
-               sym_op->auth.aad.length = options->auth_aad_sz;
+               sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       src_buf_offset);
 
-               /* authentication parameters */
-               if (options->auth_op == RTE_CRYPTO_AUTH_OP_VERIFY) {
-                       sym_op->auth.digest.data = test_vector->digest.data;
-                       sym_op->auth.digest.phys_addr =
+               /* Set dest mbuf to NULL if out-of-place (dst_buf_offset = 0) */
+               if (dst_buf_offset == 0)
+                       sym_op->m_dst = NULL;
+               else
+                       sym_op->m_dst = (struct rte_mbuf *)((uint8_t *)ops[i] +
+                                                       dst_buf_offset);
+
+               /* AEAD parameters */
+               if (options->imix_distribution_count) {
+                       sym_op->aead.data.length =
+                               options->imix_buffer_sizes[*imix_idx];
+                       *imix_idx = (*imix_idx + 1) % options->pool_sz;
+               } else
+                       sym_op->aead.data.length = options->test_buffer_size;
+               sym_op->aead.data.offset = 0;
+
+               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;
+                       sym_op->aead.digest.phys_addr =
                                        test_vector->digest.phys_addr;
-                       sym_op->auth.digest.length = options->auth_digest_sz;
                } else {
 
-                       uint32_t offset = sym_op->cipher.data.length +
-                                               sym_op->cipher.data.offset;
+                       uint32_t offset = sym_op->aead.data.length +
+                                               sym_op->aead.data.offset;
                        struct rte_mbuf *buf, *tbuf;
 
                        if (options->out_of_place) {
-                               buf =  bufs_out[i];
+                               buf = sym_op->m_dst;
                        } else {
-                               buf =  bufs_in[i];
-
-                               tbuf = buf;
+                               tbuf = sym_op->m_src;
                                while ((tbuf->next != NULL) &&
                                                (offset >= tbuf->data_len)) {
                                        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;
                        }
 
-                       sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(buf,
+                       sym_op->aead.digest.data = rte_pktmbuf_mtod_offset(buf,
                                        uint8_t *, offset);
-                       sym_op->auth.digest.phys_addr =
-                                       rte_pktmbuf_mtophys_offset(buf, offset);
-
-                       sym_op->auth.digest.length = options->auth_digest_sz;
+                       sym_op->aead.digest.phys_addr =
+                                       rte_pktmbuf_iova_offset(buf, offset);
                }
+       }
 
-               sym_op->auth.data.length = options->buffer_sz;
-               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);
+
+                       /*
+                        * If doing AES-CCM, nonce is copied one byte
+                        * after the start of IV field, and AAD is copied
+                        * 18 bytes after the start of the AAD field.
+                        */
+                       if (options->aead_algo == RTE_CRYPTO_AEAD_AES_CCM) {
+                               memcpy(iv_ptr + 1, test_vector->aead_iv.data,
+                                       test_vector->aead_iv.length);
+
+                               memcpy(ops[i]->sym->aead.aad.data + 18,
+                                       test_vector->aad.data,
+                                       test_vector->aad.length);
+                       } else {
+                               memcpy(iv_ptr, test_vector->aead_iv.data,
+                                       test_vector->aead_iv.length);
+
+                               memcpy(ops[i]->sym->aead.aad.data,
+                                       test_vector->aad.data,
+                                       test_vector->aad.length);
+                       }
+               }
        }
 
        return 0;
 }
 
 static struct rte_cryptodev_sym_session *
-cperf_create_session(uint8_t dev_id,
+cperf_create_session(struct rte_mempool *sess_mp,
+       struct rte_mempool *priv_mp,
+       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;
+       struct rte_crypto_sym_xform aead_xform;
        struct rte_cryptodev_sym_session *sess = NULL;
 
+#ifdef RTE_LIBRTE_SECURITY
+       /*
+        * security only
+        */
+       if (options->op_type == CPERF_PDCP) {
+               /* Setup Cipher Parameters */
+               cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+               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_xform.cipher.iv.length = 4;
+
+               /* cipher different than null */
+               if (options->cipher_algo != RTE_CRYPTO_CIPHER_NULL) {
+                       cipher_xform.cipher.key.data = test_vector->cipher_key.data;
+                       cipher_xform.cipher.key.length = test_vector->cipher_key.length;
+               } else {
+                       cipher_xform.cipher.key.data = NULL;
+                       cipher_xform.cipher.key.length = 0;
+               }
+
+               /* Setup Auth Parameters */
+               if (options->auth_algo != 0) {
+                       auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+                       auth_xform.next = NULL;
+                       auth_xform.auth.algo = options->auth_algo;
+                       auth_xform.auth.op = options->auth_op;
+                       auth_xform.auth.iv.offset = iv_offset +
+                               cipher_xform.cipher.iv.length;
+
+                       /* auth different than null */
+                       if (options->auth_algo != RTE_CRYPTO_AUTH_NULL) {
+                               auth_xform.auth.digest_length = options->digest_sz;
+                               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.key.length = 0;
+                               auth_xform.auth.key.data = NULL;
+                               auth_xform.auth.iv.length = 0;
+                       }
+
+                       cipher_xform.next = &auth_xform;
+               } else {
+                       cipher_xform.next = NULL;
+               }
+
+               struct rte_security_session_conf sess_conf = {
+                       .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+                       .protocol = RTE_SECURITY_PROTOCOL_PDCP,
+                       {.pdcp = {
+                               .bearer = 0x16,
+                               .domain = options->pdcp_domain,
+                               .pkt_dir = 0,
+                               .sn_size = options->pdcp_sn_sz,
+                               .hfn = options->pdcp_ses_hfn_en ?
+                                       PDCP_DEFAULT_HFN : 0,
+                               .hfn_threshold = 0x70C0A,
+                               .hfn_ovrd = !(options->pdcp_ses_hfn_en),
+                       } },
+                       .crypto_xform = &cipher_xform
+               };
+
+               struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(dev_id);
+
+               /* Create security session */
+               return (void *)rte_security_session_create(ctx,
+                                       &sess_conf, sess_mp);
+       }
+       if (options->op_type == CPERF_DOCSIS) {
+               enum rte_security_docsis_direction direction;
+
+               cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+               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;
+               if (options->cipher_algo != RTE_CRYPTO_CIPHER_NULL) {
+                       cipher_xform.cipher.key.data =
+                               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;
+               }
+               cipher_xform.next = NULL;
+
+               if (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT)
+                       direction = RTE_SECURITY_DOCSIS_DOWNLINK;
+               else
+                       direction = RTE_SECURITY_DOCSIS_UPLINK;
+
+               struct rte_security_session_conf sess_conf = {
+                       .action_type =
+                               RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+                       .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+                       {.docsis = {
+                               .direction = direction,
+                       } },
+                       .crypto_xform = &cipher_xform
+               };
+               struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(dev_id);
+
+               /* Create security session */
+               return (void *)rte_security_session_create(ctx,
+                                       &sess_conf, priv_mp);
+       }
+#endif
+       sess = rte_cryptodev_sym_session_create(sess_mp);
        /*
         * cipher only
         */
@@ -326,6 +676,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,9 +684,16 @@ 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);
+               rte_cryptodev_sym_session_init(dev_id, sess, &cipher_xform,
+                               priv_mp);
        /*
         *  auth only
         */
@@ -344,26 +702,31 @@ cperf_create_session(uint8_t dev_id,
                auth_xform.next = NULL;
                auth_xform.auth.algo = options->auth_algo;
                auth_xform.auth.op = options->auth_op;
+               auth_xform.auth.iv.offset = iv_offset;
 
                /* auth different than null */
                if (options->auth_algo != RTE_CRYPTO_AUTH_NULL) {
                        auth_xform.auth.digest_length =
-                                       options->auth_digest_sz;
-                       auth_xform.auth.add_auth_data_length =
-                                       options->auth_aad_sz;
+                                       options->digest_sz;
                        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.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);
+               rte_cryptodev_sym_session_init(dev_id, sess, &auth_xform,
+                               priv_mp);
        /*
         * cipher and auth
         */
        } else if (options->op_type == CPERF_CIPHER_THEN_AUTH
-                       || options->op_type == CPERF_AUTH_THEN_CIPHER
-                       || options->op_type == CPERF_AEAD) {
-
+                       || options->op_type == CPERF_AUTH_THEN_CIPHER) {
                /*
                 * cipher
                 */
@@ -371,6 +734,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 +742,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;
                }
 
                /*
@@ -387,54 +757,58 @@ cperf_create_session(uint8_t dev_id,
                auth_xform.next = NULL;
                auth_xform.auth.algo = options->auth_algo;
                auth_xform.auth.op = options->auth_op;
+               auth_xform.auth.iv.offset = iv_offset +
+                       cipher_xform.cipher.iv.length;
 
                /* auth different than null */
                if (options->auth_algo != RTE_CRYPTO_AUTH_NULL) {
-                       auth_xform.auth.digest_length = options->auth_digest_sz;
-                       auth_xform.auth.add_auth_data_length =
-                                       options->auth_aad_sz;
-                       /* auth options for aes gcm */
-                       if (options->cipher_algo == RTE_CRYPTO_CIPHER_AES_GCM &&
-                               options->auth_algo == RTE_CRYPTO_AUTH_AES_GCM) {
-                               auth_xform.auth.key.length = 0;
-                               auth_xform.auth.key.data = NULL;
-                       } else { /* auth options for others */
-                               auth_xform.auth.key.length =
+                       auth_xform.auth.digest_length = options->digest_sz;
+                       auth_xform.auth.iv.length = test_vector->auth_iv.length;
+                       auth_xform.auth.key.length =
                                        test_vector->auth_key.length;
-                               auth_xform.auth.key.data =
-                                               test_vector->auth_key.data;
-                       }
+                       auth_xform.auth.key.data =
+                                       test_vector->auth_key.data;
+               } else {
+                       auth_xform.auth.digest_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 */
-               if (options->cipher_algo == RTE_CRYPTO_CIPHER_AES_GCM) {
-                       if (options->cipher_op ==
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
-                               cipher_xform.next = &auth_xform;
-                               /* create crypto session */
-                               sess = rte_cryptodev_sym_session_create(dev_id,
-                                       &cipher_xform);
-                       } else { /* decrypt */
-                               auth_xform.next = &cipher_xform;
-                               /* create crypto session */
-                               sess = rte_cryptodev_sym_session_create(dev_id,
-                                       &auth_xform);
-                       }
-               } else { /* create crypto session for other */
-                       /* cipher then auth */
-                       if (options->op_type == CPERF_CIPHER_THEN_AUTH) {
-                               cipher_xform.next = &auth_xform;
-                               /* create crypto session */
-                               sess = rte_cryptodev_sym_session_create(dev_id,
-                                               &cipher_xform);
-                       } else { /* auth then cipher */
-                               auth_xform.next = &cipher_xform;
-                               /* create crypto session */
-                               sess = rte_cryptodev_sym_session_create(dev_id,
-                                               &auth_xform);
-                       }
+               /* cipher then auth */
+               if (options->op_type == CPERF_CIPHER_THEN_AUTH) {
+                       cipher_xform.next = &auth_xform;
+                       /* create crypto session */
+                       rte_cryptodev_sym_session_init(dev_id,
+                                       sess, &cipher_xform, priv_mp);
+               } else { /* auth then cipher */
+                       auth_xform.next = &cipher_xform;
+                       /* create crypto session */
+                       rte_cryptodev_sym_session_init(dev_id,
+                                       sess, &auth_xform, priv_mp);
                }
+       } else { /* options->op_type == CPERF_AEAD */
+               aead_xform.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+               aead_xform.next = NULL;
+               aead_xform.aead.algo = options->aead_algo;
+               aead_xform.aead.op = options->aead_op;
+               aead_xform.aead.iv.offset = iv_offset;
+
+               aead_xform.aead.key.data =
+                                       test_vector->aead_key.data;
+               aead_xform.aead.key.length =
+                                       test_vector->aead_key.length;
+               aead_xform.aead.iv.length = test_vector->aead_iv.length;
+
+               aead_xform.aead.digest_length = options->digest_sz;
+               aead_xform.aead.aad_length =
+                                       options->aead_aad_sz;
+
+               /* Create crypto session */
+               rte_cryptodev_sym_session_init(dev_id,
+                                       sess, &aead_xform, priv_mp);
        }
+
        return sess;
 }
 
@@ -446,14 +820,14 @@ cperf_get_op_functions(const struct cperf_options *options,
 
        op_fns->sess_create = cperf_create_session;
 
-       if (options->op_type == CPERF_AEAD
-                       || options->op_type == CPERF_AUTH_THEN_CIPHER
+       if (options->op_type == CPERF_AEAD) {
+               op_fns->populate_ops = cperf_set_ops_aead;
+               return 0;
+       }
+
+       if (options->op_type == CPERF_AUTH_THEN_CIPHER
                        || options->op_type == CPERF_CIPHER_THEN_AUTH) {
-               if (options->cipher_algo == RTE_CRYPTO_CIPHER_AES_GCM &&
-                               options->auth_algo == RTE_CRYPTO_AUTH_AES_GCM)
-                       op_fns->populate_ops = cperf_set_ops_aead;
-               else
-                       op_fns->populate_ops = cperf_set_ops_cipher_auth;
+               op_fns->populate_ops = cperf_set_ops_cipher_auth;
                return 0;
        }
        if (options->op_type == CPERF_AUTH_ONLY) {
@@ -470,6 +844,15 @@ cperf_get_op_functions(const struct cperf_options *options,
                        op_fns->populate_ops = cperf_set_ops_cipher;
                return 0;
        }
-
+#ifdef RTE_LIBRTE_SECURITY
+       if (options->op_type == CPERF_PDCP) {
+               op_fns->populate_ops = cperf_set_ops_security;
+               return 0;
+       }
+       if (options->op_type == CPERF_DOCSIS) {
+               op_fns->populate_ops = cperf_set_ops_security;
+               return 0;
+       }
+#endif
        return -1;
 }