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
crypto/aesni_mb: do not append digest
[dpdk.git]
/
drivers
/
crypto
/
aesni_mb
/
rte_aesni_mb_pmd_ops.c
diff --git
a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
index
d033408
..
4be9b80
100644
(file)
--- a/
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@
-48,9
+48,9
@@
static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
.block_size = 64,
.key_size = {
.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
.block_size = 64,
.key_size = {
- .min =
64
,
+ .min =
1
,
.max = 64,
.max = 64,
- .increment =
0
+ .increment =
1
},
.digest_size = {
.min = 12,
},
.digest_size = {
.min = 12,
@@
-69,9
+69,9
@@
static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
.block_size = 64,
.key_size = {
.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
.block_size = 64,
.key_size = {
- .min =
64
,
+ .min =
1
,
.max = 64,
.max = 64,
- .increment =
0
+ .increment =
1
},
.digest_size = {
.min = 12,
},
.digest_size = {
.min = 12,
@@
-90,9
+90,9
@@
static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
.block_size = 64,
.key_size = {
.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
.block_size = 64,
.key_size = {
- .min =
64
,
+ .min =
1
,
.max = 64,
.max = 64,
- .increment =
0
+ .increment =
1
},
.digest_size = {
.min = 14,
},
.digest_size = {
.min = 14,
@@
-111,9
+111,9
@@
static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
.block_size = 64,
.key_size = {
.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
.block_size = 64,
.key_size = {
- .min =
64
,
+ .min =
1
,
.max = 64,
.max = 64,
- .increment =
0
+ .increment =
1
},
.digest_size = {
.min = 16,
},
.digest_size = {
.min = 16,
@@
-132,9
+132,9
@@
static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
.block_size = 128,
.key_size = {
.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
.block_size = 128,
.key_size = {
- .min = 1
28
,
+ .min = 1,
.max = 128,
.max = 128,
- .increment =
0
+ .increment =
1
},
.digest_size = {
.min = 24,
},
.digest_size = {
.min = 24,
@@
-153,9
+153,9
@@
static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
.block_size = 128,
.key_size = {
.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
.block_size = 128,
.key_size = {
- .min = 1
28
,
+ .min = 1,
.max = 128,
.max = 128,
- .increment =
0
+ .increment =
1
},
.digest_size = {
.min = 32,
},
.digest_size = {
.min = 32,
@@
-430,6
+430,11
@@
aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
memset(&qp->stats, 0, sizeof(qp->stats));
memset(&qp->stats, 0, sizeof(qp->stats));
+ char mp_name[RTE_MEMPOOL_NAMESIZE];
+
+ snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
+ "digest_mp_%u_%u", dev->data->dev_id, qp_id);
+
/* Initialise multi-buffer manager */
(*qp->op_fns->job.init_mgr)(&qp->mb_mgr);
return 0;
/* Initialise multi-buffer manager */
(*qp->op_fns->job.init_mgr)(&qp->mb_mgr);
return 0;
@@
-480,25
+485,27
@@
aesni_mb_pmd_session_configure(struct rte_cryptodev *dev,
{
void *sess_private_data;
struct aesni_mb_private *internals = dev->data->dev_private;
{
void *sess_private_data;
struct aesni_mb_private *internals = dev->data->dev_private;
+ int ret;
if (unlikely(sess == NULL)) {
MB_LOG_ERR("invalid session struct");
if (unlikely(sess == NULL)) {
MB_LOG_ERR("invalid session struct");
- return -
1
;
+ return -
EINVAL
;
}
if (rte_mempool_get(mempool, &sess_private_data)) {
CDEV_LOG_ERR(
"Couldn't get object from session mempool");
}
if (rte_mempool_get(mempool, &sess_private_data)) {
CDEV_LOG_ERR(
"Couldn't get object from session mempool");
- return -
1
;
+ return -
ENOMEM
;
}
}
- if (aesni_mb_set_session_parameters(&job_ops[internals->vector_mode],
- sess_private_data, xform) != 0) {
+ ret = aesni_mb_set_session_parameters(&job_ops[internals->vector_mode],
+ sess_private_data, xform);
+ if (ret != 0) {
MB_LOG_ERR("failed configure session parameters");
/* Return session to mempool */
rte_mempool_put(mempool, sess_private_data);
MB_LOG_ERR("failed configure session parameters");
/* Return session to mempool */
rte_mempool_put(mempool, sess_private_data);
- return
-1
;
+ return
ret
;
}
set_session_private_data(sess, dev->driver_id,
}
set_session_private_data(sess, dev->driver_id,