X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-crypto-perf%2Fcperf_test_verify.c;h=a314646c2d6d20bfe912557039e11d538d84afe8;hb=f6fadc3e6310;hp=27fbd6cfa641b59eefc29a2936b0ceb847057493;hpb=df52cb3b6e132603b00e55cbaf8071811bd8b20e;p=dpdk.git diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c index 27fbd6cfa6..a314646c2d 100644 --- a/app/test-crypto-perf/cperf_test_verify.c +++ b/app/test-crypto-perf/cperf_test_verify.c @@ -38,16 +38,6 @@ #include "cperf_test_verify.h" #include "cperf_ops.h" -struct cperf_verify_results { - uint64_t ops_enqueued; - uint64_t ops_dequeued; - - uint64_t ops_enqueued_failed; - uint64_t ops_dequeued_failed; - - uint64_t ops_failed; -}; - struct cperf_verify_ctx { uint8_t dev_id; uint16_t qp_id; @@ -66,8 +56,6 @@ struct cperf_verify_ctx { const struct cperf_options *options; const struct cperf_test_vector *test_vector; - struct cperf_verify_results results; - }; struct cperf_op_result { @@ -80,8 +68,10 @@ cperf_verify_test_free(struct cperf_verify_ctx *ctx, uint32_t mbuf_nb) uint32_t i; if (ctx) { - if (ctx->sess) - rte_cryptodev_sym_session_free(ctx->dev_id, ctx->sess); + if (ctx->sess) { + rte_cryptodev_sym_session_clear(ctx->dev_id, ctx->sess); + rte_cryptodev_sym_session_free(ctx->sess); + } if (ctx->mbufs_in) { for (i = 0; i < mbuf_nb; i++) @@ -119,8 +109,8 @@ cperf_mbuf_create(struct rte_mempool *mempool, const struct cperf_test_vector *test_vector) { struct rte_mbuf *mbuf; - uint32_t segment_sz = options->buffer_sz / segments_nb; - uint32_t last_sz = options->buffer_sz % segments_nb; + uint32_t segment_sz = options->max_buffer_size / segments_nb; + uint32_t last_sz = options->max_buffer_size % segments_nb; uint8_t *mbuf_data; uint8_t *test_data = (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ? @@ -165,14 +155,16 @@ cperf_mbuf_create(struct rte_mempool *mempool, memcpy(mbuf_data, test_data, last_sz); } - mbuf_data = (uint8_t *)rte_pktmbuf_append(mbuf, - options->auth_digest_sz); - if (mbuf_data == NULL) - goto error; + if (options->op_type != CPERF_CIPHER_ONLY) { + mbuf_data = (uint8_t *)rte_pktmbuf_append(mbuf, + options->digest_sz); + if (mbuf_data == NULL) + goto error; + } if (options->op_type == CPERF_AEAD) { uint8_t *aead = (uint8_t *)rte_pktmbuf_prepend(mbuf, - RTE_ALIGN_CEIL(options->auth_aad_sz, 16)); + RTE_ALIGN_CEIL(options->aead_aad_sz, 16)); if (aead == NULL) goto error; @@ -189,7 +181,8 @@ error: } void * -cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id, +cperf_verify_test_constructor(struct rte_mempool *sess_mp, + uint8_t dev_id, uint16_t qp_id, const struct cperf_options *options, const struct cperf_test_vector *test_vector, const struct cperf_op_fns *op_fns) @@ -209,7 +202,12 @@ cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id, ctx->options = options; ctx->test_vector = test_vector; - ctx->sess = op_fns->sess_create(dev_id, options, test_vector); + /* IV goes at the end of the cryptop operation */ + 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); if (ctx->sess == NULL) goto err; @@ -220,18 +218,15 @@ cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id, options->pool_sz * options->segments_nb, 0, 0, RTE_PKTMBUF_HEADROOM + RTE_CACHE_LINE_ROUNDUP( - (options->buffer_sz / options->segments_nb) + - (options->buffer_sz % options->segments_nb) + - options->auth_digest_sz), + (options->max_buffer_size / options->segments_nb) + + (options->max_buffer_size % options->segments_nb) + + options->digest_sz), rte_socket_id()); if (ctx->pkt_mbuf_pool_in == NULL) goto err; /* Generate mbufs_in with plaintext populated for test */ - if (ctx->options->pool_sz % ctx->options->burst_sz) - goto err; - ctx->mbufs_in = rte_malloc(NULL, (sizeof(struct rte_mbuf *) * ctx->options->pool_sz), 0); @@ -252,8 +247,8 @@ cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id, pool_name, options->pool_sz, 0, 0, RTE_PKTMBUF_HEADROOM + RTE_CACHE_LINE_ROUNDUP( - options->buffer_sz + - options->auth_digest_sz), + options->max_buffer_size + + options->digest_sz), rte_socket_id()); if (ctx->pkt_mbuf_pool_out == NULL) @@ -279,9 +274,11 @@ cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id, snprintf(pool_name, sizeof(pool_name), "cperf_op_pool_cdev_%d", dev_id); + uint16_t priv_size = test_vector->cipher_iv.length + + test_vector->auth_iv.length + test_vector->aead_iv.length; ctx->crypto_op_pool = rte_crypto_op_pool_create(pool_name, - RTE_CRYPTO_OP_TYPE_SYMMETRIC, options->pool_sz, 0, 0, - rte_socket_id()); + RTE_CRYPTO_OP_TYPE_SYMMETRIC, options->pool_sz, + 512, priv_size, rte_socket_id()); if (ctx->crypto_op_pool == NULL) goto err; @@ -349,25 +346,25 @@ cperf_verify_op(struct rte_crypto_op *op, cipher = 1; cipher_offset = 0; auth = 1; - auth_offset = vector->plaintext.length; + auth_offset = options->test_buffer_size; break; case CPERF_AUTH_ONLY: cipher = 0; cipher_offset = 0; auth = 1; - auth_offset = vector->plaintext.length; + auth_offset = options->test_buffer_size; break; case CPERF_AUTH_THEN_CIPHER: cipher = 1; cipher_offset = 0; auth = 1; - auth_offset = vector->plaintext.length; + auth_offset = options->test_buffer_size; break; case CPERF_AEAD: cipher = 1; cipher_offset = vector->aad.length; auth = 1; - auth_offset = vector->aad.length + vector->plaintext.length; + auth_offset = vector->aad.length + options->test_buffer_size; break; } @@ -375,18 +372,18 @@ cperf_verify_op(struct rte_crypto_op *op, if (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) res += memcmp(data + cipher_offset, vector->ciphertext.data, - vector->ciphertext.length); + options->test_buffer_size); else res += memcmp(data + cipher_offset, vector->plaintext.data, - vector->plaintext.length); + options->test_buffer_size); } if (auth == 1) { if (options->auth_op == RTE_CRYPTO_AUTH_OP_GENERATE) res += memcmp(data + auth_offset, vector->digest.data, - vector->digest.length); + options->digest_sz); } return !!res; @@ -399,12 +396,15 @@ cperf_verify_test_runner(void *test_ctx) uint64_t ops_enqd = 0, ops_enqd_total = 0, ops_enqd_failed = 0; uint64_t ops_deqd = 0, ops_deqd_total = 0, ops_deqd_failed = 0; + uint64_t ops_failed = 0; + + static int only_once; uint64_t i, m_idx = 0; uint16_t ops_unused = 0; - struct rte_crypto_op *ops[ctx->options->burst_sz]; - struct rte_crypto_op *ops_processed[ctx->options->burst_sz]; + struct rte_crypto_op *ops[ctx->options->max_burst_size]; + struct rte_crypto_op *ops_processed[ctx->options->max_burst_size]; uint32_t lcore = rte_lcore_id(); @@ -427,11 +427,14 @@ cperf_verify_test_runner(void *test_ctx) printf("\n# Running verify test on device: %u, lcore: %u\n", ctx->dev_id, lcore); + uint16_t iv_offset = sizeof(struct rte_crypto_op) + + sizeof(struct rte_crypto_sym_op); + while (ops_enqd_total < ctx->options->total_ops) { - uint16_t burst_size = ((ops_enqd_total + ctx->options->burst_sz) + uint16_t burst_size = ((ops_enqd_total + ctx->options->max_burst_size) <= ctx->options->total_ops) ? - ctx->options->burst_sz : + ctx->options->max_burst_size : ctx->options->total_ops - ops_enqd_total; @@ -441,14 +444,20 @@ cperf_verify_test_runner(void *test_ctx) if (ops_needed != rte_crypto_op_bulk_alloc( ctx->crypto_op_pool, RTE_CRYPTO_OP_TYPE_SYMMETRIC, - ops, ops_needed)) + ops, ops_needed)) { + RTE_LOG(ERR, USER1, + "Failed to allocate more crypto operations " + "from the the crypto operation pool.\n" + "Consider increasing the pool size " + "with --pool-sz\n"); return -1; + } /* Setup crypto op, attach mbuf etc */ (ctx->populate_ops)(ops, &ctx->mbufs_in[m_idx], &ctx->mbufs_out[m_idx], ops_needed, ctx->sess, ctx->options, - ctx->test_vector); + ctx->test_vector, iv_offset); #ifdef CPERF_LINEARIZATION_ENABLE if (linearize) { @@ -477,10 +486,10 @@ cperf_verify_test_runner(void *test_ctx) /* Dequeue processed burst of ops from crypto device */ ops_deqd = rte_cryptodev_dequeue_burst(ctx->dev_id, ctx->qp_id, - ops_processed, ctx->options->burst_sz); + ops_processed, ctx->options->max_burst_size); m_idx += ops_needed; - if (m_idx + ctx->options->burst_sz > ctx->options->pool_sz) + if (m_idx + ctx->options->max_burst_size > ctx->options->pool_sz) m_idx = 0; if (ops_deqd == 0) { @@ -496,15 +505,15 @@ cperf_verify_test_runner(void *test_ctx) for (i = 0; i < ops_deqd; i++) { if (cperf_verify_op(ops_processed[i], ctx->options, ctx->test_vector)) - ctx->results.ops_failed++; + ops_failed++; /* free crypto ops so they can be reused. We don't free * the mbufs here as we don't want to reuse them as * the crypto operation will change the data and cause * failures. */ rte_crypto_op_free(ops_processed[i]); - ops_deqd_total += ops_deqd; } + ops_deqd_total += ops_deqd; } /* Dequeue any operations still in the crypto device */ @@ -515,7 +524,7 @@ cperf_verify_test_runner(void *test_ctx) /* dequeue burst */ ops_deqd = rte_cryptodev_dequeue_burst(ctx->dev_id, ctx->qp_id, - ops_processed, ctx->options->burst_sz); + ops_processed, ctx->options->max_burst_size); if (ops_deqd == 0) { ops_deqd_failed++; continue; @@ -524,22 +533,53 @@ cperf_verify_test_runner(void *test_ctx) for (i = 0; i < ops_deqd; i++) { if (cperf_verify_op(ops_processed[i], ctx->options, ctx->test_vector)) - ctx->results.ops_failed++; + ops_failed++; /* free crypto ops so they can be reused. We don't free * the mbufs here as we don't want to reuse them as * the crypto operation will change the data and cause * failures. */ rte_crypto_op_free(ops_processed[i]); - ops_deqd_total += ops_deqd; } + ops_deqd_total += ops_deqd; } - ctx->results.ops_enqueued = ops_enqd_total; - ctx->results.ops_dequeued = ops_deqd_total; + if (!ctx->options->csv) { + if (!only_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", + ctx->lcore_id, + ctx->options->max_buffer_size, + ctx->options->max_burst_size, + ops_enqd_total, + ops_deqd_total, + ops_enqd_failed, + ops_deqd_failed, + ops_failed); + } else { + if (!only_once) + printf("\n# lcore id, Buffer Size(B), " + "Burst Size,Enqueued,Dequeued,Failed Enq," + "Failed Deq,Failed Ops\n"); + only_once = 1; - ctx->results.ops_enqueued_failed = ops_enqd_failed; - ctx->results.ops_dequeued_failed = ops_deqd_failed; + printf("%10u;%10u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";" + "%"PRIu64"\n", + ctx->lcore_id, + ctx->options->max_buffer_size, + ctx->options->max_burst_size, + ops_enqd_total, + ops_deqd_total, + ops_enqd_failed, + ops_deqd_failed, + ops_failed); + } return 0; } @@ -550,44 +590,11 @@ void cperf_verify_test_destructor(void *arg) { struct cperf_verify_ctx *ctx = arg; - struct cperf_verify_results *results = &ctx->results; - static int only_once; if (ctx == NULL) return; - if (!ctx->options->csv) { - printf("\n# Device %d on lcore %u\n", - ctx->dev_id, ctx->lcore_id); - printf("# Buffer Size(B)\t Enqueued\t Dequeued\tFailed Enq" - "\tFailed Deq\tEmpty Polls\n"); - - printf("\n%16u\t%10"PRIu64"\t%10"PRIu64"\t%10"PRIu64"\t" - "%10"PRIu64"\t%10"PRIu64"\n", - ctx->options->buffer_sz, - results->ops_enqueued, - results->ops_dequeued, - results->ops_enqueued_failed, - results->ops_dequeued_failed, - results->ops_failed); - } else { - if (!only_once) - printf("\n# CPU lcore id, Burst Size(B), " - "Buffer Size(B),Enqueued,Dequeued,Failed Enq," - "Failed Deq,Empty Polls\n"); - only_once = 1; - - printf("%u;%u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";" - "%"PRIu64"\n", - ctx->lcore_id, - ctx->options->burst_sz, - ctx->options->buffer_sz, - results->ops_enqueued, - results->ops_dequeued, - results->ops_enqueued_failed, - results->ops_dequeued_failed, - results->ops_failed); - } + rte_cryptodev_stop(ctx->dev_id); cperf_verify_test_free(ctx, ctx->options->pool_sz); }