Identify the datapath thread to be used during session create. This can
be used to call right function early on to avoid multiple session
specific checks in datapath functions.
Signed-off-by: Anoob Joseph <ano...@marvell.com>
---
drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 29 +++++++++++++
drivers/crypto/cnxk/cnxk_se.h | 52 +++++++++++++++---------
2 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
index 85bb1d27a1..cf91b92c2c 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
@@ -625,6 +625,7 @@ sym_session_configure(struct roc_cpt *roc_cpt, int
driver_id,
struct rte_cryptodev_sym_session *sess,
struct rte_mempool *pool)
{
+ enum cpt_dp_thread_type thr_type;
struct cnxk_se_sess *sess_priv;
void *priv;
int ret;
@@ -642,6 +643,34 @@ sym_session_configure(struct roc_cpt *roc_cpt, int
driver_id,
if (ret)
goto priv_put;
+ if (sess_priv->cpt_op & ROC_SE_OP_CIPHER_MASK) {
+ switch (sess_priv->roc_se_ctx.fc_type) {
+ case ROC_SE_FC_GEN:
+ if (sess_priv->aes_gcm || sess_priv->chacha_poly)
+ thr_type = CPT_DP_THREAD_TYPE_FC_AEAD;
+ else
+ thr_type = CPT_DP_THREAD_TYPE_FC_CHAIN;
+ break;
+ case ROC_SE_PDCP:
+ thr_type = CPT_DP_THREAD_TYPE_PDCP;
+ break;
+ case ROC_SE_KASUMI:
+ thr_type = CPT_DP_THREAD_TYPE_KASUMI;
+ break;
+ case ROC_SE_PDCP_CHAIN:
+ thr_type = CPT_DP_THREAD_TYPE_PDCP_CHAIN;
+ break;
+ default:
+ plt_err("Invalid op type");
+ ret = -ENOTSUP;
+ goto priv_put;
+ }
+ } else {
+ thr_type = CPT_DP_THREAD_AUTH_ONLY;
+ }
+
+ sess_priv->dp_thr_type = thr_type;
+
if ((sess_priv->roc_se_ctx.fc_type == ROC_SE_HASH_HMAC) &&
cpt_mac_len_verify(&xform->auth)) {
plt_dp_err("MAC length is not supported");
diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h
index 3de9718f8b..dc9621fb84 100644
--- a/drivers/crypto/cnxk/cnxk_se.h
+++ b/drivers/crypto/cnxk/cnxk_se.h
@@ -16,6 +16,15 @@
(sizeof(struct roc_se_iov_ptr) + \
(sizeof(struct roc_se_buf_ptr) * ROC_SE_MAX_SG_CNT))
+enum cpt_dp_thread_type {
+ CPT_DP_THREAD_TYPE_FC_CHAIN = 0x1,
+ CPT_DP_THREAD_TYPE_FC_AEAD,
+ CPT_DP_THREAD_TYPE_PDCP,
+ CPT_DP_THREAD_TYPE_PDCP_CHAIN,
+ CPT_DP_THREAD_TYPE_KASUMI,
+ CPT_DP_THREAD_AUTH_ONLY,
+};
+
struct cnxk_se_sess {
uint16_t cpt_op : 4;
uint16_t zsk_flag : 4;
@@ -29,7 +38,7 @@ struct cnxk_se_sess {
uint16_t aes_ctr_eea2 : 1;
uint16_t zs_cipher : 4;
uint16_t zs_auth : 4;
- uint16_t rsvd2 : 8;
+ uint16_t dp_thr_type : 8;
uint16_t aad_length;
uint8_t mac_len;
uint8_t iv_length;
@@ -2370,7 +2379,7 @@ prepare_iov_from_pkt_inplace(struct rte_mbuf *pkt,
static __rte_always_inline int
fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,
struct cpt_qp_meta_info *m_info, struct cpt_inflight_req
*infl_req,
- struct cpt_inst_s *inst, const bool is_kasumi)
+ struct cpt_inst_s *inst, const bool is_kasumi, const bool
is_aead)
{
struct rte_crypto_sym_op *sym_op = cop->sym;
void *mdata = NULL;
@@ -2419,7 +2428,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct
cnxk_se_sess *sess,
m_src = sym_op->m_src;
m_dst = sym_op->m_dst;
- if (sess->aes_gcm || sess->chacha_poly) {
+ if (is_aead) {
struct rte_mbuf *m;
uint8_t *salt;
uint8_t *aad_data;
@@ -3060,26 +3069,29 @@ static __rte_always_inline int __rte_hot
cpt_sym_inst_fill(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op, struct
cnxk_se_sess *sess,
struct cpt_inflight_req *infl_req, struct cpt_inst_s *inst)
{
- uint64_t cpt_op = sess->cpt_op;
int ret;
- if (cpt_op & ROC_SE_OP_CIPHER_MASK) {
- switch (sess->roc_se_ctx.fc_type) {
- case ROC_SE_PDCP_CHAIN:
- ret = fill_pdcp_chain_params(op, sess, &qp->meta_info,
infl_req, inst);
- break;
- case ROC_SE_PDCP:
- ret = fill_pdcp_params(op, sess, &qp->meta_info,
infl_req, inst);
- break;
- case ROC_SE_KASUMI:
- ret = fill_fc_params(op, sess, &qp->meta_info,
infl_req, inst, true);
- break;
- default:
- ret = fill_fc_params(op, sess, &qp->meta_info,
infl_req, inst, false);
- break;
- }
- } else {
+ switch (sess->dp_thr_type) {
+ case CPT_DP_THREAD_TYPE_PDCP:
+ ret = fill_pdcp_params(op, sess, &qp->meta_info, infl_req,
inst);
+ break;
+ case CPT_DP_THREAD_TYPE_FC_CHAIN:
+ ret = fill_fc_params(op, sess, &qp->meta_info, infl_req, inst,
false, false);
+ break;
+ case CPT_DP_THREAD_TYPE_FC_AEAD:
+ ret = fill_fc_params(op, sess, &qp->meta_info, infl_req, inst,
false, true);
+ break;
+ case CPT_DP_THREAD_TYPE_PDCP_CHAIN:
+ ret = fill_pdcp_chain_params(op, sess, &qp->meta_info,
infl_req, inst);
+ break;
+ case CPT_DP_THREAD_TYPE_KASUMI:
+ ret = fill_fc_params(op, sess, &qp->meta_info, infl_req, inst,
true, false);
+ break;
+ case CPT_DP_THREAD_AUTH_ONLY:
ret = fill_digest_params(op, sess, &qp->meta_info, infl_req,
inst);
+ break;
+ default:
+ ret = -EINVAL;
}
return ret;
--
2.25.1
