X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-crypto-perf%2Fcperf_test_throughput.c;h=51512af2ad81a1b40a6eabab57997449561385aa;hb=1835a22f342f23ae31e1fd778a997139ae4d2ca9;hp=8766d6e9b0a925a06a75e739cec13d12580f459a;hpb=27c2e74719614df32e5358b9adfbed013ac7991c;p=dpdk.git diff --git a/app/test-crypto-perf/cperf_test_throughput.c b/app/test-crypto-perf/cperf_test_throughput.c index 8766d6e9b0..51512af2ad 100644 --- a/app/test-crypto-perf/cperf_test_throughput.c +++ b/app/test-crypto-perf/cperf_test_throughput.c @@ -32,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, @@ -69,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; @@ -94,7 +113,7 @@ cperf_throughput_test_runner(void *test_ctx) uint8_t burst_size_idx = 0; uint32_t imix_idx = 0; - static int only_once; + static uint16_t display_once; struct rte_crypto_op *ops[ctx->options->max_burst_size]; struct rte_crypto_op *ops_processed[ctx->options->max_burst_size]; @@ -107,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) @@ -166,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, &imix_idx); + iv_offset, &imix_idx, &tsc_start); /** * When ops_needed is smaller than ops_enqd, the @@ -188,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 */ @@ -260,14 +281,15 @@ cperf_throughput_test_runner(void *test_ctx) double cycles_per_packet = ((double)tsc_duration / ctx->options->total_ops); + uint16_t exp = 0; if (!ctx->options->csv) { - if (!only_once) + if (__atomic_compare_exchange_n(&display_once, &exp, 1, 0, + __ATOMIC_RELAXED, __ATOMIC_RELAXED)) 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,15 +304,15 @@ cperf_throughput_test_runner(void *test_ctx) throughput_gbps, cycles_per_packet); } else { - if (!only_once) + if (__atomic_compare_exchange_n(&display_once, &exp, 1, 0, + __ATOMIC_RELAXED, __ATOMIC_RELAXED)) 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,