mempool: introduce helpers for populate and required size

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

diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c
index 6945c8b..bbdf37d 100644 (file)
--- a/app/test-crypto-perf/cperf_test_verify.c
+++ b/app/test-crypto-perf/cperf_test_verify.c
@@ -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>
@@ -79,6 +51,7 @@ cperf_verify_test_free(struct cperf_verify_ctx *ctx)
 
 void *
 cperf_verify_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,
@@ -101,8 +74,8 @@ cperf_verify_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;
 
@@ -260,10 +233,11 @@ cperf_verify_test_runner(void *test_ctx)
        uint64_t ops_deqd = 0, ops_deqd_total = 0, ops_deqd_failed = 0;
        uint64_t ops_failed = 0;
 
-       static int only_once;
+       static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
 
        uint64_t i;
        uint16_t ops_unused = 0;
+       uint32_t imix_idx = 0;
 
        struct rte_crypto_op *ops[ctx->options->max_burst_size];
        struct rte_crypto_op *ops_processed[ctx->options->max_burst_size];
@@ -307,7 +281,7 @@ cperf_verify_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;
@@ -317,7 +291,7 @@ cperf_verify_test_runner(void *test_ctx)
                (ctx->populate_ops)(ops, ctx->src_buf_offset,
                                ctx->dst_buf_offset,
                                ops_needed, ctx->sess, ctx->options,
-                               ctx->test_vector, iv_offset);
+                               ctx->test_vector, iv_offset, &imix_idx);
 
 
                /* Populate the mbuf with the test vector, for verification */
@@ -402,12 +376,11 @@ cperf_verify_test_runner(void *test_ctx)
        }
 
        if (!ctx->options->csv) {
-               if (!only_once)
+               if (rte_atomic16_test_and_set(&display_once))
                        printf("%12s%12s%12s%12s%12s%12s%12s%12s\n\n",
                                "lcore id", "Buf Size", "Burst size",
                                "Enqueued", "Dequeued", "Failed Enq",
                                "Failed Deq", "Failed Ops");
-               only_once = 1;
 
                printf("%12u%12u%12u%12"PRIu64"%12"PRIu64"%12"PRIu64
                                "%12"PRIu64"%12"PRIu64"\n",
@@ -420,11 +393,10 @@ cperf_verify_test_runner(void *test_ctx)
                                ops_deqd_failed,
                                ops_failed);
        } else {
-               if (!only_once)
+               if (rte_atomic16_test_and_set(&display_once))
                        printf("\n# lcore id, Buffer Size(B), "
                                "Burst Size,Enqueued,Dequeued,Failed Enq,"
                                "Failed Deq,Failed Ops\n");
-               only_once = 1;
 
                printf("%10u;%10u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
                                "%"PRIu64"\n",