app/flow-perf: fix parsing of invalid option
[dpdk.git] / app / test-crypto-perf / cperf_test_throughput.c
index b84dc63..739ed9e 100644 (file)
@@ -1,33 +1,5 @@
-/*-
- *   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_malloc.h>
@@ -60,21 +32,40 @@ struct cperf_throughput_ctx {
 static void
 cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)
 {
-       if (ctx) {
-               if (ctx->sess) {
+       if (!ctx)
+               return;
+       if (ctx->sess) {
+               if (ctx->options->op_type == CPERF_ASYM_MODEX) {
+                       rte_cryptodev_asym_session_clear(ctx->dev_id,
+                                                        (void *)ctx->sess);
+                       rte_cryptodev_asym_session_free((void *)ctx->sess);
+               }
+#ifdef RTE_LIB_SECURITY
+               else if (ctx->options->op_type == CPERF_PDCP ||
+                        ctx->options->op_type == CPERF_DOCSIS ||
+                        ctx->options->op_type == CPERF_IPSEC) {
+                       struct rte_security_ctx *sec_ctx =
+                               (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(ctx->dev_id);
+                       rte_security_session_destroy(
+                               sec_ctx,
+                               (struct rte_security_session *)ctx->sess);
+               }
+#endif
+               else {
                        rte_cryptodev_sym_session_clear(ctx->dev_id, ctx->sess);
                        rte_cryptodev_sym_session_free(ctx->sess);
                }
-
-               if (ctx->pool)
-                       rte_mempool_free(ctx->pool);
-
-               rte_free(ctx);
        }
+       if (ctx->pool)
+               rte_mempool_free(ctx->pool);
+
+       rte_free(ctx);
 }
 
 void *
 cperf_throughput_test_constructor(struct rte_mempool *sess_mp,
+               struct rte_mempool *sess_priv_mp,
                uint8_t dev_id, uint16_t qp_id,
                const struct cperf_options *options,
                const struct cperf_test_vector *test_vector,
@@ -97,8 +88,8 @@ cperf_throughput_test_constructor(struct rte_mempool *sess_mp,
        uint16_t iv_offset = sizeof(struct rte_crypto_op) +
                sizeof(struct rte_crypto_sym_op);
 
-       ctx->sess = op_fns->sess_create(sess_mp, dev_id, options, test_vector,
-                                       iv_offset);
+       ctx->sess = op_fns->sess_create(sess_mp, sess_priv_mp, dev_id, options,
+                       test_vector, iv_offset);
        if (ctx->sess == NULL)
                goto err;
 
@@ -120,8 +111,9 @@ cperf_throughput_test_runner(void *test_ctx)
        struct cperf_throughput_ctx *ctx = test_ctx;
        uint16_t test_burst_size;
        uint8_t burst_size_idx = 0;
+       uint32_t imix_idx = 0;
 
-       static int only_once;
+       static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
 
        struct rte_crypto_op *ops[ctx->options->max_burst_size];
        struct rte_crypto_op *ops_processed[ctx->options->max_burst_size];
@@ -134,7 +126,8 @@ cperf_throughput_test_runner(void *test_ctx)
        int linearize = 0;
 
        /* Check if source mbufs require coalescing */
-       if (ctx->options->segment_sz < ctx->options->max_buffer_size) {
+       if ((ctx->options->op_type != CPERF_ASYM_MODEX) &&
+           (ctx->options->segment_sz < ctx->options->max_buffer_size)) {
                rte_cryptodev_info_get(ctx->dev_id, &dev_info);
                if ((dev_info.feature_flags &
                                RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER) == 0)
@@ -182,7 +175,7 @@ cperf_throughput_test_runner(void *test_ctx)
                                                ops_needed) != 0) {
                                RTE_LOG(ERR, USER1,
                                        "Failed to allocate more crypto operations "
-                                       "from the the crypto operation pool.\n"
+                                       "from the crypto operation pool.\n"
                                        "Consider increasing the pool size "
                                        "with --pool-sz\n");
                                return -1;
@@ -193,7 +186,7 @@ cperf_throughput_test_runner(void *test_ctx)
                                        ctx->dst_buf_offset,
                                        ops_needed, ctx->sess,
                                        ctx->options, ctx->test_vector,
-                                       iv_offset);
+                                       iv_offset, &imix_idx, &tsc_start);
 
                        /**
                         * When ops_needed is smaller than ops_enqd, the
@@ -215,7 +208,8 @@ cperf_throughput_test_runner(void *test_ctx)
                                 * We need to linearize it before enqueuing.
                                 */
                                for (i = 0; i < burst_size; i++)
-                                       rte_pktmbuf_linearize(ops[i]->sym->m_src);
+                                       rte_pktmbuf_linearize(
+                                               ops[i]->sym->m_src);
                        }
 #endif /* CPERF_LINEARIZATION_ENABLE */
 
@@ -288,13 +282,12 @@ cperf_throughput_test_runner(void *test_ctx)
                                ctx->options->total_ops);
 
                if (!ctx->options->csv) {
-                       if (!only_once)
+                       if (rte_atomic16_test_and_set(&display_once))
                                printf("%12s%12s%12s%12s%12s%12s%12s%12s%12s%12s\n\n",
                                        "lcore id", "Buf Size", "Burst Size",
                                        "Enqueued", "Dequeued", "Failed Enq",
                                        "Failed Deq", "MOps", "Gbps",
                                        "Cycles/Buf");
-                       only_once = 1;
 
                        printf("%12u%12u%12u%12"PRIu64"%12"PRIu64"%12"PRIu64
                                        "%12"PRIu64"%12.4f%12.4f%12.2f\n",
@@ -309,15 +302,14 @@ cperf_throughput_test_runner(void *test_ctx)
                                        throughput_gbps,
                                        cycles_per_packet);
                } else {
-                       if (!only_once)
+                       if (rte_atomic16_test_and_set(&display_once))
                                printf("#lcore id,Buffer Size(B),"
                                        "Burst Size,Enqueued,Dequeued,Failed Enq,"
                                        "Failed Deq,Ops(Millions),Throughput(Gbps),"
                                        "Cycles/Buf\n\n");
-                       only_once = 1;
 
-                       printf("%u;%u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
-                                       "%.3f;%.3f;%.3f\n",
+                       printf("%u,%u,%u,%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64","
+                                       "%.3f,%.3f,%.3f\n",
                                        ctx->lcore_id,
                                        ctx->options->test_buffer_size,
                                        test_burst_size,