net/iavf: add GTPU in default hash

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

diff --git a/app/test-crypto-perf/cperf_test_throughput.c b/app/test-crypto-perf/cperf_test_throughput.c
index 8766d6e..12d9ea4 100644 (file)
--- a/app/test-crypto-perf/cperf_test_throughput.c
+++ b/app/test-crypto-perf/cperf_test_throughput.c
@@ -32,21 +32,33 @@ 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) {
+#ifdef RTE_LIBRTE_SECURITY
+               if (ctx->options->op_type == CPERF_PDCP ||
+                               ctx->options->op_type == CPERF_DOCSIS) {
+                       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);
+               } else
+#endif
+               {
                        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,
@@ -69,8 +81,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;
 
@@ -94,7 +106,7 @@ cperf_throughput_test_runner(void *test_ctx)
        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];
@@ -261,13 +273,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",
@@ -282,12 +293,11 @@ 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",