From: Rupesh Chiluka <[email protected]> Add a cq_ena devarg (0 or 1, default 0) to control whether the CPT completion queue is used on CN20K crypto queue pairs. When set to 0, completions are written to res_addr. When set to 1, completions are reported through the CPT CQ for all instructions.
Signed-off-by: Tejasree Kondoj <[email protected]> Signed-off-by: Rupesh Chiluka <[email protected]> --- doc/guides/cryptodevs/cnxk.rst | 16 +++++++++++ drivers/common/cnxk/roc_cpt.c | 10 ++++--- drivers/crypto/cnxk/cn20k_cryptodev_ops.c | 2 +- drivers/crypto/cnxk/cnxk_cryptodev.h | 1 + drivers/crypto/cnxk/cnxk_cryptodev_devargs.c | 28 +++++++++++++++++++- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 3 ++- drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 2 ++ 7 files changed, 55 insertions(+), 7 deletions(-) diff --git a/doc/guides/cryptodevs/cnxk.rst b/doc/guides/cryptodevs/cnxk.rst index c0392f4f9c..3c90a12dca 100644 --- a/doc/guides/cryptodevs/cnxk.rst +++ b/doc/guides/cryptodevs/cnxk.rst @@ -211,6 +211,22 @@ Runtime Config Options With the above configuration, CPT initial context fetch size will be set to ``4+1`` 128 bytes blocks. +- ``CPT completion queue enable`` (default ``0``) + + Controls whether the CPT completion queue (CQ) is used for all instructions + on CN20K. Can be configured during runtime by using ``cq_ena`` ``devargs`` + parameter. Accepted values are ``0`` and ``1``. + + When set to ``1``, completions of all instructions are reported through the + CQ. When set to ``0``, completions are written to the result address + (``res_addr``) of the instruction instead. + + For example:: + + -a 0002:20:00.1,cq_ena=1 + + With the above configuration, CPT completions are reported through the CPT CQ. + Debugging Options ----------------- diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c index eae3f134e9..645c205480 100644 --- a/drivers/common/cnxk/roc_cpt.c +++ b/drivers/common/cnxk/roc_cpt.c @@ -704,10 +704,12 @@ cpt_lf_cq_init(struct roc_cpt_lf *lf) /* Disable CPT completion queue */ roc_cpt_cq_disable(lf); - /* Set completion queue (CQ) base address */ - len = lf->cq_size; - if (roc_model_is_cn20k() && lf->cq_all) - len++; + /* Set completion queue (CQ) base address. + * On CN20K the pending-queue pointer (req_queue) is always positioned + * at cq_vaddr + 1 entry so that the hardware-managed reserved slot + * sits at cq_vaddr[0]. Allocate the extra entry unconditionally. + */ + len = lf->cq_size + 1; len = PLT_ALIGN(len * (ROC_CPT_CQ_ENTRY_SIZE_UNIT << lf->cq_entry_size), ROC_ALIGN); lf->cq_vaddr = plt_zmalloc(len, ROC_ALIGN); if (lf->cq_vaddr == NULL) diff --git a/drivers/crypto/cnxk/cn20k_cryptodev_ops.c b/drivers/crypto/cnxk/cn20k_cryptodev_ops.c index bb3384023f..c654dbf88d 100644 --- a/drivers/crypto/cnxk/cn20k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn20k_cryptodev_ops.c @@ -261,7 +261,7 @@ cn20k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[], struct } inst[0].res_addr = (uint64_t)&infl_req->res; - inst[0].cq_ena = 1; + inst[0].cq_ena = qp->inst_cq_ena; rte_atomic_store_explicit((RTE_ATOMIC(uint64_t) *)(&infl_req->res.u64[0]), res.u64[0], rte_memory_order_relaxed); infl_req->cop = op; diff --git a/drivers/crypto/cnxk/cnxk_cryptodev.h b/drivers/crypto/cnxk/cnxk_cryptodev.h index bdc5752905..4ce2cb255a 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev.h @@ -39,6 +39,7 @@ struct cnxk_cpt_vf { uint16_t max_qps_limit; uint16_t rx_inject_qp; uint8_t ctx_ilen; + bool cq_ena; }; uint64_t cnxk_cpt_default_ff_get(void); diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_devargs.c b/drivers/crypto/cnxk/cnxk_cryptodev_devargs.c index 3623e5aa76..ff0ddb6ed8 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_devargs.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_devargs.c @@ -14,6 +14,7 @@ #define CNXK_RX_INJECT_QP "rx_inject_qp" #define CNXK_CPT_CTX_ILEN "ctx_ilen" #define CNXK_MAX_CPT_CTX_ILEN 7 +#define CNXK_CPT_CQ_ENA "cq_ena" static int parse_rx_inject_qp(const char *key, const char *value, void *extra_args) @@ -82,6 +83,21 @@ parse_cpt_ctx_ilen(const char *key, const char *value, void *extra_args) return 0; } +static int +parse_cpt_cq_ena(const char *key, const char *value, void *extra_args) +{ + RTE_SET_USED(key); + uint32_t val; + + val = atoi(value); + if (val > 1) + return -EINVAL; + + *(bool *)extra_args = val ? true : false; + + return 0; +} + int cnxk_cpt_parse_devargs(struct rte_devargs *devargs, struct cnxk_cpt_vf *vf) { @@ -89,6 +105,7 @@ cnxk_cpt_parse_devargs(struct rte_devargs *devargs, struct cnxk_cpt_vf *vf) struct rte_kvargs *kvlist; uint16_t rx_inject_qp; uint16_t ctx_ilen = 0; + bool cq_ena = false; int rc; /* Set to max value as default so that the feature is disabled by default. */ @@ -126,16 +143,25 @@ cnxk_cpt_parse_devargs(struct rte_devargs *devargs, struct cnxk_cpt_vf *vf) goto exit; } + rc = rte_kvargs_process(kvlist, CNXK_CPT_CQ_ENA, parse_cpt_cq_ena, &cq_ena); + if (rc < 0) { + plt_err("cq_ena should be 0 or 1"); + rte_kvargs_free(kvlist); + goto exit; + } + rte_kvargs_free(kvlist); null_devargs: vf->max_qps_limit = max_qps_limit; vf->rx_inject_qp = rx_inject_qp; vf->cpt.ctx_ilen = ctx_ilen; + vf->cq_ena = cq_ena; return 0; exit: return -EINVAL; } -RTE_PMD_REGISTER_PARAM_STRING(crypto_cnxk, CNXK_MAX_QPS_LIMIT "=<1-63>"); +RTE_PMD_REGISTER_PARAM_STRING(crypto_cnxk, CNXK_MAX_QPS_LIMIT "=<1-63> " CNXK_CPT_CQ_ENA + "=<0-1> " CNXK_CPT_CTX_ILEN "=<0-7>"); diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index 95f64a79ae..a5b8aff146 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -535,7 +535,8 @@ cnxk_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, /* CQ entry size is 128B(32 << 2) */ qp->lf.cq_entry_size = 2; qp->lf.cq_size = nb_desc; - qp->lf.cq_all = true; + qp->lf.cq_all = vf->cq_ena; + qp->inst_cq_ena = vf->cq_ena; } ret = roc_cpt_lf_init(roc_cpt, &qp->lf); diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h index 7bf26d67dc..6c4265f339 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h @@ -108,6 +108,8 @@ struct crypto_adpter_info { struct cnxk_cpt_qp { struct roc_cpt_lf lf; /**< Crypto LF */ + bool inst_cq_ena; + /**< Set CQ enable bit on instructions */ struct pending_queue pend_q; /**< Pending queue */ struct roc_cpt_lmtline lmtline; -- 2.43.0
