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
net/iavf: replace license text with SPDX tag
[dpdk.git]
/
drivers
/
crypto
/
dpaa_sec
/
dpaa_sec.c
diff --git
a/drivers/crypto/dpaa_sec/dpaa_sec.c
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index
39533a9
..
122c80a
100644
(file)
--- a/
drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/
drivers/crypto/dpaa_sec/dpaa_sec.c
@@
-1,7
+1,7
@@
/* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
/* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- * Copyright 2017-201
8
NXP
+ * Copyright 2017-201
9
NXP
*
*/
*
*/
@@
-61,7
+61,7
@@
dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx)
ctx->op->status = RTE_CRYPTO_OP_STATUS_ERROR;
}
ctx->op->status = RTE_CRYPTO_OP_STATUS_ERROR;
}
- /* report op status to sym->op and then free the ctx mem
e
ory */
+ /* report op status to sym->op and then free the ctx memory */
rte_mempool_put(ctx->ctx_pool, (void *)ctx);
}
rte_mempool_put(ctx->ctx_pool, (void *)ctx);
}
@@
-643,7
+643,7
@@
dpaa_sec_prep_cdb(dpaa_sec_session *ses)
shared_desc_len = cnstr_shdsc_blkcipher(
cdb->sh_desc, true,
shared_desc_len = cnstr_shdsc_blkcipher(
cdb->sh_desc, true,
- swap, &alginfo_c,
+ swap,
SHR_NEVER,
&alginfo_c,
NULL,
ses->iv.length,
ses->dir);
NULL,
ses->iv.length,
ses->dir);
@@
-660,7
+660,7
@@
dpaa_sec_prep_cdb(dpaa_sec_session *ses)
alginfo_a.key_type = RTA_DATA_IMM;
shared_desc_len = cnstr_shdsc_hmac(cdb->sh_desc, true,
alginfo_a.key_type = RTA_DATA_IMM;
shared_desc_len = cnstr_shdsc_hmac(cdb->sh_desc, true,
- swap, &alginfo_a,
+ swap,
SHR_NEVER,
&alginfo_a,
!ses->dir,
ses->digest_length);
} else if (is_aead(ses)) {
!ses->dir,
ses->digest_length);
} else if (is_aead(ses)) {
@@
-676,13
+676,13
@@
dpaa_sec_prep_cdb(dpaa_sec_session *ses)
if (ses->dir == DIR_ENC)
shared_desc_len = cnstr_shdsc_gcm_encap(
if (ses->dir == DIR_ENC)
shared_desc_len = cnstr_shdsc_gcm_encap(
- cdb->sh_desc, true, swap,
+ cdb->sh_desc, true, swap,
SHR_NEVER,
&alginfo,
ses->iv.length,
ses->digest_length);
else
shared_desc_len = cnstr_shdsc_gcm_decap(
&alginfo,
ses->iv.length,
ses->digest_length);
else
shared_desc_len = cnstr_shdsc_gcm_decap(
- cdb->sh_desc, true, swap,
+ cdb->sh_desc, true, swap,
SHR_NEVER,
&alginfo,
ses->iv.length,
ses->digest_length);
&alginfo,
ses->iv.length,
ses->digest_length);
@@
-741,7
+741,7
@@
dpaa_sec_prep_cdb(dpaa_sec_session *ses)
* overwritten in fd for each packet.
*/
shared_desc_len = cnstr_shdsc_authenc(cdb->sh_desc,
* overwritten in fd for each packet.
*/
shared_desc_len = cnstr_shdsc_authenc(cdb->sh_desc,
- true, swap, &alginfo_c, &alginfo_a,
+ true, swap,
SHR_SERIAL,
&alginfo_c, &alginfo_a,
ses->iv.length, 0,
ses->digest_length, ses->dir);
}
ses->iv.length, 0,
ses->digest_length, ses->dir);
}
@@
-1940,13
+1940,13
@@
dpaa_sec_attach_rxq(struct dpaa_sec_dev_private *qi)
{
unsigned int i;
{
unsigned int i;
- for (i = 0; i < qi->max_nb_sessions; i++) {
+ for (i = 0; i < qi->max_nb_sessions
* MAX_DPAA_CORES
; i++) {
if (qi->inq_attach[i] == 0) {
qi->inq_attach[i] = 1;
return &qi->inq[i];
}
}
if (qi->inq_attach[i] == 0) {
qi->inq_attach[i] = 1;
return &qi->inq[i];
}
}
- DPAA_SEC_WARN("All ses
session in use %x
", qi->max_nb_sessions);
+ DPAA_SEC_WARN("All ses
sion in use %u
", qi->max_nb_sessions);
return NULL;
}
return NULL;
}
@@
-2115,7
+2115,7
@@
dpaa_sec_sym_session_clear(struct rte_cryptodev *dev,
struct rte_cryptodev_sym_session *sess)
{
struct dpaa_sec_dev_private *qi = dev->data->dev_private;
struct rte_cryptodev_sym_session *sess)
{
struct dpaa_sec_dev_private *qi = dev->data->dev_private;
- uint8_t index = dev->driver_id;
+ uint8_t index = dev->driver_id
, i
;
void *sess_priv = get_sym_session_private_data(sess, index);
PMD_INIT_FUNC_TRACE();
void *sess_priv = get_sym_session_private_data(sess, index);
PMD_INIT_FUNC_TRACE();
@@
-2125,9
+2125,12
@@
dpaa_sec_sym_session_clear(struct rte_cryptodev *dev,
if (sess_priv) {
struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
if (sess_priv) {
struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
- if (s->inq[rte_lcore_id() % MAX_DPAA_CORES])
- dpaa_sec_detach_rxq(qi,
- s->inq[rte_lcore_id() % MAX_DPAA_CORES]);
+ for (i = 0; i < MAX_DPAA_CORES; i++) {
+ if (s->inq[i])
+ dpaa_sec_detach_rxq(qi, s->inq[i]);
+ s->inq[i] = NULL;
+ s->qp[i] = NULL;
+ }
rte_free(s->cipher_key.data);
rte_free(s->auth_key.data);
memset(s, 0, sizeof(dpaa_sec_session));
rte_free(s->cipher_key.data);
rte_free(s->auth_key.data);
memset(s, 0, sizeof(dpaa_sec_session));
@@
-2450,7
+2453,7
@@
dpaa_sec_security_session_destroy(void *dev __rte_unused,
rte_free(s->cipher_key.data);
rte_free(s->auth_key.data);
rte_free(s->cipher_key.data);
rte_free(s->auth_key.data);
- memset(s
ess
, 0, sizeof(dpaa_sec_session));
+ memset(s, 0, sizeof(dpaa_sec_session));
set_sec_session_private_data(sess, NULL);
rte_mempool_put(sess_mp, sess_priv);
}
set_sec_session_private_data(sess, NULL);
rte_mempool_put(sess_mp, sess_priv);
}