git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus/dpaa: add QMAN interface driver
[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
b58b86c
..
a314646
100644
(file)
--- a/
app/test-crypto-perf/cperf_test_verify.c
+++ b/
app/test-crypto-perf/cperf_test_verify.c
@@
-68,8
+68,10
@@
cperf_verify_test_free(struct cperf_verify_ctx *ctx, uint32_t mbuf_nb)
uint32_t i;
if (ctx) {
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++)
if (ctx->mbufs_in) {
for (i = 0; i < mbuf_nb; i++)
@@
-107,8
+109,8
@@
cperf_mbuf_create(struct rte_mempool *mempool,
const struct cperf_test_vector *test_vector)
{
struct rte_mbuf *mbuf;
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) ?
uint8_t *mbuf_data;
uint8_t *test_data =
(options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
@@
-155,14
+157,14
@@
cperf_mbuf_create(struct rte_mempool *mempool,
if (options->op_type != CPERF_CIPHER_ONLY) {
mbuf_data = (uint8_t *)rte_pktmbuf_append(mbuf,
if (options->op_type != CPERF_CIPHER_ONLY) {
mbuf_data = (uint8_t *)rte_pktmbuf_append(mbuf,
- options->
auth_
digest_sz);
+ options->digest_sz);
if (mbuf_data == NULL)
goto error;
}
if (options->op_type == CPERF_AEAD) {
uint8_t *aead = (uint8_t *)rte_pktmbuf_prepend(mbuf,
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->a
uth
_aad_sz, 16));
+ RTE_ALIGN_CEIL(options->a
ead
_aad_sz, 16));
if (aead == NULL)
goto error;
if (aead == NULL)
goto error;
@@
-179,7
+181,8
@@
error:
}
void *
}
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)
const struct cperf_options *options,
const struct cperf_test_vector *test_vector,
const struct cperf_op_fns *op_fns)
@@
-199,7
+202,12
@@
cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id,
ctx->options = options;
ctx->test_vector = test_vector;
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;
if (ctx->sess == NULL)
goto err;
@@
-210,9
+218,9
@@
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->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)
rte_socket_id());
if (ctx->pkt_mbuf_pool_in == NULL)
@@
-239,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(
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)
rte_socket_id());
if (ctx->pkt_mbuf_pool_out == NULL)
@@
-266,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);
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,
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;
if (ctx->crypto_op_pool == NULL)
goto err;
@@
-336,25
+346,25
@@
cperf_verify_op(struct rte_crypto_op *op,
cipher = 1;
cipher_offset = 0;
auth = 1;
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;
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;
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;
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;
}
break;
}
@@
-362,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,
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,
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,
}
if (auth == 1) {
if (options->auth_op == RTE_CRYPTO_AUTH_OP_GENERATE)
res += memcmp(data + auth_offset,
vector->digest.data,
- options->
auth_
digest_sz);
+ options->digest_sz);
}
return !!res;
}
return !!res;
@@
-393,8
+403,8
@@
cperf_verify_test_runner(void *test_ctx)
uint64_t i, m_idx = 0;
uint16_t ops_unused = 0;
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();
uint32_t lcore = rte_lcore_id();
@@
-417,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);
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) {
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->total_ops) ?
- ctx->options->
burst_sz
:
+ ctx->options->
max_burst_size
:
ctx->options->total_ops -
ops_enqd_total;
ctx->options->total_ops -
ops_enqd_total;
@@
-431,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,
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;
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,
/* 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) {
#ifdef CPERF_LINEARIZATION_ENABLE
if (linearize) {
@@
-467,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,
/* 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;
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) {
m_idx = 0;
if (ops_deqd == 0) {
@@
-505,7
+524,7
@@
cperf_verify_test_runner(void *test_ctx)
/* dequeue burst */
ops_deqd = rte_cryptodev_dequeue_burst(ctx->dev_id, ctx->qp_id,
/* 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;
if (ops_deqd == 0) {
ops_deqd_failed++;
continue;
@@
-536,8
+555,8
@@
cperf_verify_test_runner(void *test_ctx)
printf("%12u%12u%12u%12"PRIu64"%12"PRIu64"%12"PRIu64
"%12"PRIu64"%12"PRIu64"\n",
ctx->lcore_id,
printf("%12u%12u%12u%12"PRIu64"%12"PRIu64"%12"PRIu64
"%12"PRIu64"%12"PRIu64"\n",
ctx->lcore_id,
- ctx->options->
buffer_sz
,
- ctx->options->
burst_sz
,
+ ctx->options->
max_buffer_size
,
+ ctx->options->
max_burst_size
,
ops_enqd_total,
ops_deqd_total,
ops_enqd_failed,
ops_enqd_total,
ops_deqd_total,
ops_enqd_failed,
@@
-553,8
+572,8
@@
cperf_verify_test_runner(void *test_ctx)
printf("%10u;%10u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
"%"PRIu64"\n",
ctx->lcore_id,
printf("%10u;%10u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
"%"PRIu64"\n",
ctx->lcore_id,
- ctx->options->
buffer_sz
,
- ctx->options->
burst_sz
,
+ ctx->options->
max_buffer_size
,
+ ctx->options->
max_burst_size
,
ops_enqd_total,
ops_deqd_total,
ops_enqd_failed,
ops_enqd_total,
ops_deqd_total,
ops_enqd_failed,
@@
-575,5
+594,7
@@
cperf_verify_test_destructor(void *arg)
if (ctx == NULL)
return;
if (ctx == NULL)
return;
+ rte_cryptodev_stop(ctx->dev_id);
+
cperf_verify_test_free(ctx, ctx->options->pool_sz);
}
cperf_verify_test_free(ctx, ctx->options->pool_sz);
}