From: Rupesh Chiluka <rchil...@marvell.com> Add support for sessionless asymmetric operations in cnxk CPT PMD.
Signed-off-by: Rupesh Chiluka <rchil...@marvell.com> Signed-off-by: Tejasree Kondoj <ktejas...@marvell.com> Signed-off-by: Vidya Sagar Velumuri <vvelum...@marvell.com> --- doc/guides/cryptodevs/features/cn10k.ini | 1 + doc/guides/cryptodevs/features/cn9k.ini | 1 + doc/guides/rel_notes/release_25_07.rst | 1 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 91 +++++++++++++++++++++-- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 77 ++++++++++++++++++- drivers/crypto/cnxk/cnxk_cryptodev.c | 3 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 5 +- 7 files changed, 168 insertions(+), 11 deletions(-) diff --git a/doc/guides/cryptodevs/features/cn10k.ini b/doc/guides/cryptodevs/features/cn10k.ini index bfd35489a0..31e8061df9 100644 --- a/doc/guides/cryptodevs/features/cn10k.ini +++ b/doc/guides/cryptodevs/features/cn10k.ini @@ -17,6 +17,7 @@ Symmetric sessionless = Y RSA PRIV OP KEY EXP = Y RSA PRIV OP KEY QT = Y Digest encrypted = Y +Asymmetric sessionless = Y Sym raw data path API = Y Inner checksum = Y Rx inject = Y diff --git a/doc/guides/cryptodevs/features/cn9k.ini b/doc/guides/cryptodevs/features/cn9k.ini index d70771d9bd..1f0f48bfce 100644 --- a/doc/guides/cryptodevs/features/cn9k.ini +++ b/doc/guides/cryptodevs/features/cn9k.ini @@ -17,6 +17,7 @@ Symmetric sessionless = Y RSA PRIV OP KEY EXP = Y RSA PRIV OP KEY QT = Y Digest encrypted = Y +Asymmetric sessionless = Y ; ; Supported crypto algorithms of 'cn9k' crypto driver. diff --git a/doc/guides/rel_notes/release_25_07.rst b/doc/guides/rel_notes/release_25_07.rst index 9673bb3c62..8f02fe8023 100644 --- a/doc/guides/rel_notes/release_25_07.rst +++ b/doc/guides/rel_notes/release_25_07.rst @@ -95,6 +95,7 @@ New Features * **Updated Marvell cnxk crypto driver.** * Added support for CN20K SoC in cnxk CPT driver. + * Added support for sessionless asymmetric operations. * **Added eventdev vector adapter.** diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c index 6777b0b377..31ec88c7d6 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c @@ -76,6 +76,55 @@ cn10k_cpt_sym_temp_sess_create(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op) return NULL; } +static inline struct cnxk_ae_sess * +cn10k_cpt_asym_temp_sess_create(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op) +{ + struct rte_crypto_asym_op *asym_op = op->asym; + struct roc_cpt *roc_cpt = qp->lf.roc_cpt; + struct rte_cryptodev_asym_session *sess; + struct cnxk_ae_sess *priv; + struct cnxk_cpt_vf *vf; + union cpt_inst_w7 w7; + struct hw_ctx_s *hwc; + + /* Create temporary session */ + if (rte_mempool_get(qp->sess_mp, (void **)&sess) < 0) + return NULL; + + priv = (struct cnxk_ae_sess *)sess; + if (cnxk_ae_fill_session_parameters(priv, asym_op->xform)) + goto sess_put; + + priv->lf = &qp->lf; + + if (roc_errata_cpt_hang_on_mixed_ctx_val()) { + hwc = &priv->hw_ctx; + hwc->w0.s.aop_valid = 1; + hwc->w0.s.ctx_hdr_size = 0; + hwc->w0.s.ctx_size = 1; + hwc->w0.s.ctx_push_size = 1; + + w7.s.ctx_val = 1; + w7.s.cptr = (uint64_t)hwc; + } + + w7.u64 = 0; + w7.s.egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_AE]; + + vf = container_of(roc_cpt, struct cnxk_cpt_vf, cpt); + priv->cpt_inst_w7 = w7.u64; + priv->cnxk_fpm_iova = vf->cnxk_fpm_iova; + priv->ec_grp = vf->ec_grp; + + asym_op->session = sess; + + return priv; + +sess_put: + rte_mempool_put(qp->sess_mp, sess); + return NULL; +} + static __rte_always_inline int __rte_hot cpt_sec_ipsec_inst_fill(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op, struct cn10k_sec_session *sess, struct cpt_inst_s *inst, @@ -177,7 +226,6 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[], struct w7 = sess->cpt_inst_w7; } } else if (op->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) { - if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { asym_op = op->asym; ae_sess = (struct cnxk_ae_sess *)asym_op->session; @@ -186,9 +234,22 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[], struct return 0; w7 = ae_sess->cpt_inst_w7; } else { - plt_dp_err("Not supported Asym op without session"); - return 0; + ae_sess = cn10k_cpt_asym_temp_sess_create(qp, op); + if (unlikely(ae_sess == NULL)) { + plt_dp_err("Could not create temp session"); + return 0; + } + + ret = cnxk_ae_enqueue(qp, op, infl_req, &inst[0], ae_sess); + if (unlikely(ret)) { + cnxk_ae_session_clear(NULL, + (struct rte_cryptodev_asym_session *)ae_sess); + rte_mempool_put(qp->sess_mp, ae_sess); + return 0; + } + w7 = ae_sess->cpt_inst_w7; } + } else { plt_dp_err("Unsupported op type"); return 0; @@ -418,8 +479,23 @@ cn10k_ca_meta_info_extract(struct rte_crypto_op *op, struct cnxk_cpt_qp **qp, ui priv = (struct cnxk_ae_sess *)op->asym->session; *qp = priv->qp; *w2 = priv->cpt_inst_w2; - } else - return -EINVAL; + } else { + union rte_event_crypto_metadata *ec_mdata; + struct rte_event *rsp_info; + uint8_t cdev_id; + uint16_t qp_id; + + if (unlikely(op->private_data_offset == 0)) + return -EINVAL; + ec_mdata = (union rte_event_crypto_metadata *)((uint8_t *)op + + op->private_data_offset); + rsp_info = &ec_mdata->response_info; + cdev_id = ec_mdata->request_info.cdev_id; + qp_id = ec_mdata->request_info.queue_pair_id; + *qp = rte_cryptodevs[cdev_id].data->queue_pairs[qp_id]; + *w2 = CNXK_CPT_INST_W2((RTE_EVENT_TYPE_CRYPTODEV << 28) | rsp_info->flow_id, + rsp_info->sched_type, rsp_info->queue_id, 0); + } } else return -EINVAL; @@ -1132,6 +1208,11 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, struct rte_crypto_op *cop rte_mempool_put(qp->sess_mp, cop->sym->session); cop->sym->session = NULL; } + if (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) { + cnxk_ae_session_clear(NULL, cop->asym->session); + rte_mempool_put(qp->sess_mp, cop->asym->session); + cop->asym->session = NULL; + } } } diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index 69e15a862f..c94e9e0f92 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -67,6 +67,43 @@ cn9k_cpt_sym_temp_sess_create(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op) return NULL; } +static inline struct cnxk_ae_sess * +cn9k_cpt_asym_temp_sess_create(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op) +{ + struct rte_crypto_asym_op *asym_op = op->asym; + struct roc_cpt *roc_cpt = qp->lf.roc_cpt; + struct rte_cryptodev_asym_session *sess; + struct cnxk_ae_sess *priv; + struct cnxk_cpt_vf *vf; + union cpt_inst_w7 w7; + + /* Create temporary session */ + if (rte_mempool_get(qp->sess_mp, (void **)&sess) < 0) + return NULL; + + priv = (struct cnxk_ae_sess *)sess; + if (cnxk_ae_fill_session_parameters(priv, asym_op->xform)) + goto sess_put; + + priv->lf = &qp->lf; + + w7.u64 = 0; + w7.s.egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_AE]; + + vf = container_of(roc_cpt, struct cnxk_cpt_vf, cpt); + priv->cpt_inst_w7 = w7.u64; + priv->cnxk_fpm_iova = vf->cnxk_fpm_iova; + priv->ec_grp = vf->ec_grp; + + asym_op->session = sess; + + return priv; + +sess_put: + rte_mempool_put(qp->sess_mp, sess); + return NULL; +} + static inline int cn9k_cpt_inst_prep(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op, struct cpt_inflight_req *infl_req, struct cpt_inst_s *inst) @@ -106,7 +143,20 @@ cn9k_cpt_inst_prep(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op, ret = cnxk_ae_enqueue(qp, op, infl_req, inst, sess); inst->w7.u64 = sess->cpt_inst_w7; } else { - ret = -EINVAL; + sess = cn9k_cpt_asym_temp_sess_create(qp, op); + if (unlikely(sess == NULL)) { + plt_dp_err("Could not create temp session"); + return 0; + } + + ret = cnxk_ae_enqueue(qp, op, infl_req, inst, sess); + if (unlikely(ret)) { + cnxk_ae_session_clear(NULL, + (struct rte_cryptodev_asym_session *)sess); + rte_mempool_put(qp->sess_mp, sess); + return 0; + } + inst->w7.u64 = sess->cpt_inst_w7; } } else { ret = -EINVAL; @@ -333,8 +383,24 @@ cn9k_ca_meta_info_extract(struct rte_crypto_op *op, priv = (struct cnxk_ae_sess *)op->asym->session; *qp = priv->qp; inst->w2.u64 = priv->cpt_inst_w2; - } else - return -EINVAL; + } else { + union rte_event_crypto_metadata *ec_mdata; + struct rte_event *rsp_info; + uint8_t cdev_id; + uint16_t qp_id; + + if (unlikely(op->private_data_offset == 0)) + return -EINVAL; + ec_mdata = (union rte_event_crypto_metadata *)((uint8_t *)op + + op->private_data_offset); + rsp_info = &ec_mdata->response_info; + cdev_id = ec_mdata->request_info.cdev_id; + qp_id = ec_mdata->request_info.queue_pair_id; + *qp = rte_cryptodevs[cdev_id].data->queue_pairs[qp_id]; + inst->w2.u64 = CNXK_CPT_INST_W2( + (RTE_EVENT_TYPE_CRYPTODEV << 28) | rsp_info->flow_id, + rsp_info->sched_type, rsp_info->queue_id, 0); + } } else return -EINVAL; @@ -591,6 +657,11 @@ cn9k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, struct rte_crypto_op *cop, rte_mempool_put(qp->sess_mp, cop->sym->session); cop->sym->session = NULL; } + if (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) { + cnxk_ae_session_clear(NULL, cop->asym->session); + rte_mempool_put(qp->sess_mp, cop->asym->session); + cop->asym->session = NULL; + } } } diff --git a/drivers/crypto/cnxk/cnxk_cryptodev.c b/drivers/crypto/cnxk/cnxk_cryptodev.c index 96b5121097..5828a502e4 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev.c @@ -19,7 +19,8 @@ cnxk_cpt_default_ff_get(void) RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | RTE_CRYPTODEV_FF_IN_PLACE_SGL | RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT | RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT | RTE_CRYPTODEV_FF_SYM_SESSIONLESS | - RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED | RTE_CRYPTODEV_FF_SECURITY; + RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED | RTE_CRYPTODEV_FF_SECURITY | + RTE_CRYPTODEV_FF_ASYM_SESSIONLESS; if (roc_model_is_cn10k() || roc_model_is_cn20k()) ff |= RTE_CRYPTODEV_FF_SECURITY_INNER_CSUM | RTE_CRYPTODEV_FF_SYM_RAW_DP; diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index e5ca082e10..261e14b418 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -866,7 +866,8 @@ cnxk_ae_session_size_get(struct rte_cryptodev *dev __rte_unused) } void -cnxk_ae_session_clear(struct rte_cryptodev *dev, struct rte_cryptodev_asym_session *sess) +cnxk_ae_session_clear(struct rte_cryptodev *dev __rte_unused, + struct rte_cryptodev_asym_session *sess) { struct cnxk_ae_sess *priv = (struct cnxk_ae_sess *)sess; @@ -878,7 +879,7 @@ cnxk_ae_session_clear(struct rte_cryptodev *dev, struct rte_cryptodev_asym_sessi cnxk_ae_free_session_parameters(priv); /* Reset and free object back to pool */ - memset(priv, 0, cnxk_ae_session_size_get(dev)); + memset(priv, 0, sizeof(struct cnxk_ae_sess)); } int -- 2.25.1