Add asymmetric ops in crypto cnxk PMDs
cover Add asymmetric ops in crypto cnxk PMDs
Add support for asymmetric operations in crypto cnxk PMDs. Following operations are supported,
- RSA
- DSA
- ECDSA
- ECPM
- Modular Exponentation
Depends-on: series-17212 ("Add CPT in Marvell CNXK common driver")
Depends-on: series-17213 ("Add Marvell CNXK crypto PMDs")
Depends-on: series-17214 ("Add rte_security in crypto_cn10k PMD")
Kiran Kumar K (3):
crypto/cnxk: add asymmetric session ops
crypto/cnxk: add asymmetric datapath ops
app/test: adding cnxk asymmetric autotest
app/test/test_cryptodev_asym.c | 30 ++ drivers/crypto/cnxk/cn10k_cryptodev.c | 2 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 114 ++++- drivers/crypto/cnxk/cn9k_cryptodev.c | 4 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 118 ++++- drivers/crypto/cnxk/cnxk_ae.h | 825 ++++++++++++++++++++++++++++++ drivers/crypto/cnxk/cnxk_cpt_ops_helper.c | 14 + drivers/crypto/cnxk/cnxk_cpt_ops_helper.h | 4 + drivers/crypto/cnxk/cnxk_cryptodev.h | 3 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 75 +++ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 8 + 11 files changed, 1187 insertions(+), 10 deletions(-) create mode 100644 drivers/crypto/cnxk/cnxk_ae.h
Signature · 1 line
2.7.4
PATCH 1/3 crypto/cnxk: add asymmetric session ops
From: Kiran Kumar K <[email protected]>
Adding asymmetric crypto session ops.
--- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 6 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 4 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 6 +- drivers/crypto/cnxk/cnxk_ae.h | 210 ++++++++++++++++++++++++++++++ drivers/crypto/cnxk/cnxk_cpt_ops_helper.c | 14 ++ drivers/crypto/cnxk/cnxk_cpt_ops_helper.h | 4 + drivers/crypto/cnxk/cnxk_cryptodev.h | 3 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 75 +++++++++++ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 8 ++ 10 files changed, 324 insertions(+), 8 deletions(-) create mode 100644 drivers/crypto/cnxk/cnxk_ae.h
drivers/crypto/cnxk/cn10k_cryptodev.c +2 -0
@@ -87,7 +87,9 @@ cn10k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,cnxk_cpt_caps_populate (vf); dev->feature_flags =RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | +RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |RTE_CRYPTODEV_FF_HW_ACCELERATED | +RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT |RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |RTE_CRYPTODEV_FF_IN_PLACE_SGL | RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +3 -3
@@ -426,8 +426,8 @@ struct rte_cryptodev_ops cn10k_cpt_ops = { .sym_session_clear = cnxk_cpt_sym_session_clear, /* Asymmetric crypto ops */ - .asym_session_get_size = NULL, - .asym_session_configure = NULL, - .asym_session_clear = NULL, + .asym_session_get_size = cnxk_ae_session_size_get, + .asym_session_configure = cnxk_ae_session_cfg, + .asym_session_clear = cnxk_ae_session_clear, };
drivers/crypto/cnxk/cn9k_cryptodev.c +3 -1
@@ -78,6 +78,7 @@ cn9k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,cnxk_cpt_caps_populate (vf); dev->feature_flags =RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | +RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |RTE_CRYPTODEV_FF_HW_ACCELERATED |RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | RTE_CRYPTODEV_FF_IN_PLACE_SGL |
@@ -85,7 +86,8 @@ cn9k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,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_DIGEST_ENCRYPTED | +RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT ;cn9k_cpt_set_enqdeq_fns (dev);
drivers/crypto/cnxk/cn9k_cryptodev_ops.c +3 -3
@@ -312,8 +312,8 @@ struct rte_cryptodev_ops cn9k_cpt_ops = { .sym_session_clear = cnxk_cpt_sym_session_clear, /* Asymmetric crypto ops */ - .asym_session_get_size = NULL, - .asym_session_configure = NULL, - .asym_session_clear = NULL, + .asym_session_get_size = cnxk_ae_session_size_get, + .asym_session_configure = cnxk_ae_session_cfg, + .asym_session_clear = cnxk_ae_session_clear, };
drivers/crypto/cnxk/cnxk_ae.h new file +210 -0
210 lines not on this page · raw message
drivers/crypto/cnxk/cnxk_cpt_ops_helper.c +14 -0
@@ -26,3 +26,17 @@ cnxk_cpt_ops_helper_get_mlen(void)return len; } + +int +cnxk_cpt_ops_helper_asym_get_mlen (void ) +{ +uint32_t len; + +/* To hold RPTR */ + len =sizeof (uint64_t ); + +/* Get meta len for asymmetric operations */ + len +=CNXK_CPT_MAX_ASYM_OP_NUM_PARAMS *CNXK_CPT_MAX_ASYM_OP_MOD_LEN ; + +return len; +}
drivers/crypto/cnxk/cnxk_cpt_ops_helper.h +4 -0
@@ -9,6 +9,9 @@#define CPT_OFFSET_CONTROL_BYTES 8#define SG_ENTRY_SIZE sizeof(struct roc_se_sglist_comp) +#define CNXK_CPT_MAX_ASYM_OP_NUM_PARAMS 5 +#define CNXK_CPT_MAX_ASYM_OP_MOD_LEN 1024 +/* * Get size of contiguous meta buffer to be allocated *
@@ -17,4 +20,5 @@*/ int cnxk_cpt_ops_helper_get_mlen (void ); +int cnxk_cpt_ops_helper_asym_get_mlen (void );#endif /* _CNXK_CPT_OPS_HELPER_H_ */
drivers/crypto/cnxk/cnxk_cryptodev.h +2 -1
@@ -25,7 +25,7 @@#define CNXK_CPT_MAX_CAPS 34#define CNXK_SEC_CRYPTO_MAX_CAPS 4#define CNXK_SEC_MAX_CAPS 3 - +#define CNXK_AE_EC_ID_MAX 5/** * Device private data */
@@ -35,6 +35,7 @@ struct cnxk_cpt_vf {struct rte_cryptodev_capabilities sec_crypto_caps[CNXK_SEC_CRYPTO_MAX_CAPS ];struct rte_security_capability sec_caps[CNXK_SEC_MAX_CAPS ]; +uint64_t cnxk_fpm_iova[CNXK_AE_EC_ID_MAX ]; };int cnxk_cpt_eng_grp_add (struct roc_cpt *roc_cpt);
drivers/crypto/cnxk/cnxk_cryptodev_ops.c +75 -0
96 lines not on this page · raw message
drivers/crypto/cnxk/cnxk_cryptodev_ops.h +8 -0
@@ -106,4 +106,12 @@ void cnxk_cpt_sym_session_clear(struct rte_cryptodev *dev,void sym_session_clear (int driver_id,struct rte_cryptodev_sym_session *sess); +unsigned int 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); +int cnxk_ae_session_cfg (struct rte_cryptodev *dev, +struct rte_crypto_asym_xform *xform, +struct rte_cryptodev_asym_session *sess, +struct rte_mempool *pool);#endif /* _CNXK_CRYPTODEV_OPS_H_ */
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH 1/3] crypto/cnxk: add asymmetric session ops
Quoted 35 lines
From: Kiran Kumar K <[email protected]>
Adding asymmetric crypto session ops.
Signed-off-by Kiran Kumar K <[email protected]>--- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 6 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 4 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 6 +- drivers/crypto/cnxk/cnxk_ae.h | 210 ++++++++++++++++++++++++++++++ drivers/crypto/cnxk/cnxk_cpt_ops_helper.c | 14 ++ drivers/crypto/cnxk/cnxk_cpt_ops_helper.h | 4 + drivers/crypto/cnxk/cnxk_cryptodev.h | 3 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 75 +++++++++++ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 8 ++ 10 files changed, 324 insertions(+), 8 deletions(-) create mode 100644 drivers/crypto/cnxk/cnxk_ae.hdrivers/crypto/cnxk/cn10k_cryptodev.c +2
-0@@ -87,7 +87,9 @@ cn10k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,cnxk_cpt_caps_populate (vf); dev->feature_flags =RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | +RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |RTE_CRYPTODEV_FF_HW_ACCELERATED | +RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT |RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
drivers/crypto/cnxk/cn10k_cryptodev.c cn10k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, · line 95
Quoted 2 lines
drivers/crypto/cnxk/cn10k_cryptodev.c +0
-0RTE_CRYPTODEV_FF_IN_PLACE_SGL | RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
Same comment as in the ipsec series.
Documentation update
Move above change and .ini file update in patch 2/3 Release notes update.
PATCH 2/3 crypto/cnxk: add asymmetric datapath ops
In reply to Anoob JosephFrom: Kiran Kumar K <[email protected]>
Adding asymmetric crypto datapath ops.
--- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 108 ++++++ drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 112 +++++- drivers/crypto/cnxk/cnxk_ae.h | 615 ++++++++++++++++++++++++++++++ 3 files changed, 833 insertions(+), 2 deletions(-)
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +108 -0
@@ -10,6 +10,7 @@#include "cn10k_cryptodev_ops.h" #include "cn10k_ipsec_la_ops.h" #include "cn10k_ipsec.h" +#include "cnxk_ae.h" #include "cnxk_cryptodev.h" #include "cnxk_cryptodev_ops.h" #include "cnxk_se.h"
@@ -95,12 +96,71 @@ cpt_sym_inst_fill(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op,return ret; } +static __rte_always_inline int32_t __rte_hot +cn10k_ae_enqueue (struct cnxk_cpt_qp *qp,struct rte_crypto_op *op, +struct cpt_inflight_req *infl_req,struct cpt_inst_s *inst, +struct cnxk_ae_sess *sess) +{ +struct cpt_qp_meta_info *minfo = &qp->meta_info; +struct rte_crypto_asym_op *asym_op = op->asym; +struct cnxk_ae_buf_ptr meta_buf; +uint64_t *mop; +void *mdata; +int ret; + + mdata =cnxk_ae_alloc_meta (&meta_buf, minfo->pool, infl_req); +if (mdata ==NULL ) +return -ENOMEM ; + +/* Reserve 8B for RPTR */ + meta_buf.vaddr =PLT_PTR_ADD (mdata,sizeof (uint64_t )); + +switch (sess->xfrm_type) { +case RTE_CRYPTO_ASYM_XFORM_MODEX : + ret =cnxk_ae_modex_prep (op, &meta_buf, &sess->mod_ctx, inst); +if (unlikely (ret)) + goto req_fail; +break ; +case RTE_CRYPTO_ASYM_XFORM_RSA : + ret =cnxk_ae_enqueue_rsa_op (op, &meta_buf, sess, inst); +if (unlikely (ret)) + goto req_fail; +break ; +case RTE_CRYPTO_ASYM_XFORM_ECDSA : + ret =cnxk_ae_enqueue_ecdsa_op (op, &meta_buf, sess, + sess->cnxk_fpm_iova, inst); +if (unlikely (ret)) + goto req_fail; +break ; +case RTE_CRYPTO_ASYM_XFORM_ECPM : + ret =cnxk_ae_ecpm_prep (&asym_op->ecpm, &meta_buf, + sess->ec_ctx.curveid, inst); +if (unlikely (ret)) + goto req_fail; +break ; +default : + op->status =RTE_CRYPTO_OP_STATUS_INVALID_ARGS ; + ret = -EINVAL ; + goto req_fail; + } + + mop = mdata; + mop[0 ] = inst->rptr; +return 0 ; + +req_fail: +rte_mempool_put (minfo->pool, infl_req->mdata); +return ret; +} +static inline int cn10k_cpt_fill_inst (struct cnxk_cpt_qp *qp,struct rte_crypto_op *ops[],struct cpt_inst_s inst[],struct cpt_inflight_req *infl_req) {struct cn10k_sec_session *sec_sess; +struct rte_crypto_asym_op *asym_op;struct rte_crypto_sym_op *sym_op; +struct cnxk_ae_sess *ae_sess;struct cnxk_se_sess *sess;struct rte_crypto_op *op;uint64_t w7;
@@ -148,6 +208,21 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[], } 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 =get_asym_session_private_data ( + asym_op->session, cn10k_cryptodev_driver_id); + ret =cn10k_ae_enqueue (qp, op, infl_req, &inst[0 ], + ae_sess); +if (unlikely (ret)) +return 0 ; + w7 = ae_sess->cpt_inst_w7; + }else { +CPT_LOG_DP_ERR ("Not supported Asym op without session" ); +return 0 ; + } }else {CPT_LOG_DP_ERR ("Unsupported op type" );return 0 ;
@@ -239,6 +314,35 @@ cn10k_cpt_enqueue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)return count + i; } +static void +cnxk_ae_post_process (struct rte_crypto_op *cop,uint8_t *rptr) +{ +struct rte_crypto_asym_op *op = cop->asym; +struct cnxk_ae_sess *sess; + + sess =get_asym_session_private_data (op->session, + cn10k_cryptodev_driver_id); + +switch (sess->xfrm_type) { +case RTE_CRYPTO_ASYM_XFORM_RSA : +cnxk_ae_dequeue_rsa_op (cop, rptr, &sess->rsa_ctx); +break ; +case RTE_CRYPTO_ASYM_XFORM_MODEX : + op->modex.result.length = sess->mod_ctx.modulus.length; +memcpy (op->modex.result.data, rptr, op->modex.result.length); +break ; +case RTE_CRYPTO_ASYM_XFORM_ECDSA : +cnxk_ae_dequeue_ecdsa_op (&op->ecdsa, rptr, &sess->ec_ctx); +break ; +case RTE_CRYPTO_ASYM_XFORM_ECPM : +cnxk_ae_dequeue_ecpm_op (&op->ecpm, rptr, &sess->ec_ctx); +break ; +default : + cop->status =RTE_CRYPTO_OP_STATUS_INVALID_ARGS ; +break ; + } +} +static inline void cn10k_cpt_sec_post_process (struct rte_crypto_op *cop,struct cpt_inflight_req *infl_req)
@@ -303,6 +407,10 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp,compl_auth_verify (cop, (uint8_t *)rsp[0 ], rsp[1 ]); } + }else if (cop->type ==RTE_CRYPTO_OP_TYPE_ASYMMETRIC ) { +uintptr_t *mdata = infl_req->mdata; + +cnxk_ae_post_process (cop, (uint8_t *)mdata[0 ]); } }else { cop->status =RTE_CRYPTO_OP_STATUS_ERROR ;
drivers/crypto/cnxk/cn9k_cryptodev_ops.c +110 -2
156 lines not on this page · raw message
drivers/crypto/cnxk/cnxk_ae.h +615 -0
631 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 3/3 app/test: adding cnxk asymmetric autotest
In reply to Anoob JosephFrom: Kiran Kumar K <[email protected]>
Adding autotest for cn9k and cn10k.
--- app/test/test_cryptodev_asym.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
app/test/test_cryptodev_asym.c +30 -0
@@ -2390,6 +2390,34 @@ test_cryptodev_octeontx2_asym(void)return unit_test_suite_runner (&cryptodev_octeontx_asym_testsuite); } +static int +test_cryptodev_cn9k_asym (void ) +{ + gbl_driver_id =rte_cryptodev_driver_id_get ( +RTE_STR (CRYPTODEV_NAME_CN9K_PMD )); +if (gbl_driver_id ==-1 ) { +RTE_LOG (ERR ,USER1 ,"CN9K PMD must be loaded.\n" ); +return TEST_FAILED ; + } + +/* Use test suite registered for crypto_octeontx PMD */ +return unit_test_suite_runner (&cryptodev_octeontx_asym_testsuite); +} + +static int +test_cryptodev_cn10k_asym (void ) +{ + gbl_driver_id =rte_cryptodev_driver_id_get ( +RTE_STR (CRYPTODEV_NAME_CN10K_PMD )); +if (gbl_driver_id ==-1 ) { +RTE_LOG (ERR ,USER1 ,"CN10K PMD must be loaded.\n" ); +return TEST_FAILED ; + } + +/* Use test suite registered for crypto_octeontx PMD */ +return unit_test_suite_runner (&cryptodev_octeontx_asym_testsuite); +} +REGISTER_TEST_COMMAND (cryptodev_openssl_asym_autotest, test_cryptodev_openssl_asym);
@@ -2400,3 +2428,5 @@ REGISTER_TEST_COMMAND(cryptodev_octeontx_asym_autotest,REGISTER_TEST_COMMAND (cryptodev_octeontx2_asym_autotest, test_cryptodev_octeontx2_asym); +REGISTER_TEST_COMMAND (cryptodev_cn9k_asym_autotest, test_cryptodev_cn9k_asym); +REGISTER_TEST_COMMAND (cryptodev_cn10k_asym_autotest, test_cryptodev_cn10k_asym);
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH 3/3] app/test: adding cnxk asymmetric autotest
Quoted 2 lines
Subject: [PATCH 3/3] app/test: adding cnxk asymmetric autotest
Title should be
test/crypto: add cnxk for asymmetric cases
Quoted 5 lines
From: Kiran Kumar K <[email protected]>
Adding autotest for cn9k and cn10k.
Signed-off-by Kiran Kumar K <[email protected]>
v2 cover Add asymmetric ops in crypto cnxk PMDs
In reply to Anoob JosephAdd support for asymmetric operations in crypto cnxk PMDs. Following operations are supported,
- RSA
- DSA
- ECDSA
- ECPM
- Modular Exponentation
Depends-on: series-17482 ("Add CPT in Marvell CNXK common driver")
Depends-on: series-17483 ("Add Marvell CNXK crypto PMDs")
Depends-on: series-17484 ("Add rte_security in crypto_cn10k PMD")
Changes in v2:
- Added documentation
- Added asymmetric capabilities as separate patch
Anoob Joseph (1):
crypto/cnxk: add asymmetric capabilities
Kiran Kumar K (3):
crypto/cnxk: add asymmetric session ops
crypto/cnxk: add asymmetric datapath ops
test/crypto: add cnxk for asymmetric cases
app/test/test_cryptodev_asym.c | 30 + doc/guides/cryptodevs/cnxk.rst | 23 + doc/guides/cryptodevs/features/cn10k.ini | 13 + doc/guides/cryptodevs/features/cn9k.ini | 13 + drivers/crypto/cnxk/cn10k_cryptodev.c | 2 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 33 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 4 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 35 +- drivers/crypto/cnxk/cnxk_ae.h | 836 ++++++++++++++++++++++ drivers/crypto/cnxk/cnxk_cryptodev.h | 4 +- drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c | 56 ++ drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 106 +++ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 8 + 13 files changed, 1153 insertions(+), 10 deletions(-) create mode 100644 drivers/crypto/cnxk/cnxk_ae.h
Signature · 1 line
2.7.4
PATCH v2 1/4 crypto/cnxk: add asymmetric session ops
From: Kiran Kumar K <[email protected]>
Add asymmetric crypto session ops.
--- doc/guides/cryptodevs/features/cn10k.ini | 13 ++ doc/guides/cryptodevs/features/cn9k.ini | 13 ++ drivers/crypto/cnxk/cn10k_cryptodev.c | 2 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 6 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 4 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 6 +- drivers/crypto/cnxk/cnxk_ae.h | 211 ++++++++++++++++++++++++++++++ drivers/crypto/cnxk/cnxk_cryptodev.h | 4 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 106 +++++++++++++++ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 8 ++ 10 files changed, 365 insertions(+), 8 deletions(-) create mode 100644 drivers/crypto/cnxk/cnxk_ae.h
doc/guides/cryptodevs/features/cn10k.ini +13 -0
@@ -5,6 +5,7 @@ ; [Features] Symmetric crypto = Y +Asymmetric crypto = Y Sym operation chaining = Y HW Accelerated = Y Protocol offload = Y
@@ -65,3 +66,15 @@ AES GCM (128) = Y AES GCM (192) = Y AES GCM (256) = Y CHACHA20-POLY1305 = Y + +; +; Supported Asymmetric algorithms of the 'cn10k' crypto driver. +; +[Asymmetric] +RSA = Y +DSA = +Modular Exponentiation = Y +Modular Inversion = +Diffie-hellman = +ECDSA = Y +ECPM = Y
doc/guides/cryptodevs/features/cn9k.ini +13 -0
@@ -5,6 +5,7 @@ ; [Features] Symmetric crypto = Y +Asymmetric crypto = Y Sym operation chaining = Y HW Accelerated = Y In Place SGL = Y
@@ -64,3 +65,15 @@ AES GCM (128) = Y AES GCM (192) = Y AES GCM (256) = Y CHACHA20-POLY1305 = Y + +; +; Supported Asymmetric algorithms of the 'cn9k' crypto driver. +; +[Asymmetric] +RSA = Y +DSA = +Modular Exponentiation = Y +Modular Inversion = +Diffie-hellman = +ECDSA = Y +ECPM = Y
drivers/crypto/cnxk/cn10k_cryptodev.c +2 -0
@@ -92,7 +92,9 @@ cn10k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, dev->driver_id = cn10k_cryptodev_driver_id; dev->feature_flags =RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | +RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |RTE_CRYPTODEV_FF_HW_ACCELERATED | +RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT |RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |RTE_CRYPTODEV_FF_IN_PLACE_SGL | RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +3 -3
@@ -426,8 +426,8 @@ struct rte_cryptodev_ops cn10k_cpt_ops = { .sym_session_clear = cnxk_cpt_sym_session_clear, /* Asymmetric crypto ops */ - .asym_session_get_size = NULL, - .asym_session_configure = NULL, - .asym_session_clear = NULL, + .asym_session_get_size = cnxk_ae_session_size_get, + .asym_session_configure = cnxk_ae_session_cfg, + .asym_session_clear = cnxk_ae_session_clear, };
drivers/crypto/cnxk/cn9k_cryptodev.c +3 -1
@@ -83,6 +83,7 @@ cn9k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,cnxk_cpt_caps_populate (vf); dev->feature_flags =RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | +RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |RTE_CRYPTODEV_FF_HW_ACCELERATED |RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | RTE_CRYPTODEV_FF_IN_PLACE_SGL |
@@ -90,7 +91,8 @@ cn9k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,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_DIGEST_ENCRYPTED | +RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT ;cn9k_cpt_set_enqdeq_fns (dev);
drivers/crypto/cnxk/cn9k_cryptodev_ops.c +3 -3
@@ -312,8 +312,8 @@ struct rte_cryptodev_ops cn9k_cpt_ops = { .sym_session_clear = cnxk_cpt_sym_session_clear, /* Asymmetric crypto ops */ - .asym_session_get_size = NULL, - .asym_session_configure = NULL, - .asym_session_clear = NULL, + .asym_session_get_size = cnxk_ae_session_size_get, + .asym_session_configure = cnxk_ae_session_cfg, + .asym_session_clear = cnxk_ae_session_clear, };
drivers/crypto/cnxk/cnxk_ae.h new file +211 -0
211 lines not on this page · raw message
drivers/crypto/cnxk/cnxk_cryptodev.h +3 -1
@@ -13,7 +13,7 @@#define CNXK_CPT_MAX_CAPS 34#define CNXK_SEC_CRYPTO_MAX_CAPS 4#define CNXK_SEC_MAX_CAPS 3 - +#define CNXK_AE_EC_ID_MAX 5/** * Device private data */
@@ -23,6 +23,8 @@ struct cnxk_cpt_vf {struct rte_cryptodev_capabilities sec_crypto_caps[CNXK_SEC_CRYPTO_MAX_CAPS ];struct rte_security_capability sec_caps[CNXK_SEC_MAX_CAPS ]; +uint64_t cnxk_fpm_iova[CNXK_AE_EC_ID_MAX ]; +struct roc_ae_ec_group *ec_grp[CNXK_AE_EC_ID_MAX ]; };int cnxk_cpt_eng_grp_add (struct roc_cpt *roc_cpt);
drivers/crypto/cnxk/cnxk_cryptodev_ops.c +106 -0
144 lines not on this page · raw message
drivers/crypto/cnxk/cnxk_cryptodev_ops.h +8 -0
@@ -105,4 +105,12 @@ void cnxk_cpt_sym_session_clear(struct rte_cryptodev *dev,void sym_session_clear (int driver_id,struct rte_cryptodev_sym_session *sess); +unsigned int 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); +int cnxk_ae_session_cfg (struct rte_cryptodev *dev, +struct rte_crypto_asym_xform *xform, +struct rte_cryptodev_asym_session *sess, +struct rte_mempool *pool);#endif /* _CNXK_CRYPTODEV_OPS_H_ */
Signature · 1 line
2.7.4
PATCH v2 2/4 crypto/cnxk: add asymmetric datapath ops
In reply to Anoob JosephFrom: Kiran Kumar K <[email protected]>
Add asymmetric crypto datapath ops.
--- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 27 ++ drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 29 +- drivers/crypto/cnxk/cnxk_ae.h | 625 ++++++++++++++++++++++++++++++ 3 files changed, 679 insertions(+), 2 deletions(-)
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +27 -0
@@ -10,6 +10,7 @@#include "cn10k_cryptodev_ops.h" #include "cn10k_ipsec_la_ops.h" #include "cn10k_ipsec.h" +#include "cnxk_ae.h" #include "cnxk_cryptodev.h" #include "cnxk_cryptodev_ops.h" #include "cnxk_se.h"
@@ -100,7 +101,9 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[], struct cpt_inst_s inst[], struct cpt_inflight_req *infl_req) { struct cn10k_sec_session *sec_sess; +struct rte_crypto_asym_op *asym_op;struct rte_crypto_sym_op *sym_op; +struct cnxk_ae_sess *ae_sess;struct cnxk_se_sess *sess;struct rte_crypto_op *op;uint64_t w7;
@@ -148,6 +151,21 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[], } 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 =get_asym_session_private_data ( + asym_op->session, cn10k_cryptodev_driver_id); + ret =cnxk_ae_enqueue (qp, op, infl_req, &inst[0 ], + ae_sess); +if (unlikely (ret)) +return 0 ; + w7 = ae_sess->cpt_inst_w7; + }else { +plt_dp_err ("Not supported Asym op without session" ); +return 0 ; + } }else {plt_dp_err ("Unsupported op type" );return 0 ;
@@ -303,6 +321,15 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp,compl_auth_verify (cop, (uint8_t *)rsp[0 ], rsp[1 ]); } + }else if (cop->type ==RTE_CRYPTO_OP_TYPE_ASYMMETRIC ) { +struct rte_crypto_asym_op *op = cop->asym; +uintptr_t *mdata = infl_req->mdata; +struct cnxk_ae_sess *sess; + + sess =get_asym_session_private_data ( + op->session, cn10k_cryptodev_driver_id); + +cnxk_ae_post_process (cop, sess, (uint8_t *)mdata[0 ]); } }else { cop->status =RTE_CRYPTO_OP_STATUS_ERROR ;
drivers/crypto/cnxk/cn9k_cryptodev_ops.c +27 -2
@@ -7,6 +7,7 @@#include "cn9k_cryptodev.h" #include "cn9k_cryptodev_ops.h" +#include "cnxk_ae.h" #include "cnxk_cryptodev.h" #include "cnxk_cryptodev_ops.h" #include "cnxk_se.h"
@@ -65,11 +66,11 @@ static uint16_t cn9k_cpt_enqueue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops) {struct cpt_inflight_req *infl_req; +struct rte_crypto_asym_op *asym_op;struct rte_crypto_sym_op *sym_op;uint16_t nb_allowed, count =0 ;struct cnxk_cpt_qp *qp = qptr;struct pending_queue *pend_q; -struct cnxk_se_sess *sess;struct rte_crypto_op *op;struct cpt_inst_s inst;uint64_t lmt_status;
@@ -95,6 +96,8 @@ cn9k_cpt_enqueue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops) infl_req->op_flags =0 ;if (op->type ==RTE_CRYPTO_OP_TYPE_SYMMETRIC ) { +struct cnxk_se_sess *sess; +if (op->sess_type ==RTE_CRYPTO_OP_WITH_SESSION ) { sym_op = op->sym; sess = get_sym_session_private_data(
@@ -120,6 +123,20 @@ cn9k_cpt_enqueue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops) op->sym->session); } } + inst.w7.u64 = sess->cpt_inst_w7; + }else if (op->type ==RTE_CRYPTO_OP_TYPE_ASYMMETRIC ) { +struct cnxk_ae_sess *sess; + + ret = -EINVAL ; +if (op->sess_type ==RTE_CRYPTO_OP_WITH_SESSION ) { + asym_op = op->asym; + sess =get_asym_session_private_data ( + asym_op->session, + cn9k_cryptodev_driver_id); + ret =cnxk_ae_enqueue (qp, op, infl_req, &inst, + sess); + inst.w7.u64 = sess->cpt_inst_w7; + } }else {plt_dp_err ("Unsupported op type" );break ;
@@ -134,7 +151,6 @@ cn9k_cpt_enqueue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops) infl_req->res.cn9k.compcode =CPT_COMP_NOT_DONE ; inst.res_addr = (uint64_t )&infl_req->res; - inst.w7.u64 = sess->cpt_inst_w7; do { /* Copy CPT command to LMTLINE */
@@ -189,6 +205,15 @@ cn9k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp, struct rte_crypto_op *cop,compl_auth_verify (cop, (uint8_t *)rsp[0 ], rsp[1 ]); } + }else if (cop->type ==RTE_CRYPTO_OP_TYPE_ASYMMETRIC ) { +struct rte_crypto_asym_op *op = cop->asym; +uintptr_t *mdata = infl_req->mdata; +struct cnxk_ae_sess *sess; + + sess =get_asym_session_private_data ( + op->session, cn9k_cryptodev_driver_id); + +cnxk_ae_post_process (cop, sess, (uint8_t *)mdata[0 ]); } }else { cop->status =RTE_CRYPTO_OP_STATUS_ERROR ;
drivers/crypto/cnxk/cnxk_ae.h +625 -0
629 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 3/4 crypto/cnxk: add asymmetric capabilities
In reply to Anoob JosephAdd asymmetric capabilities supported.
--- doc/guides/cryptodevs/cnxk.rst | 6 +++ drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c | 56 +++++++++++++++++++++++ 2 files changed, 62 insertions(+)
doc/guides/cryptodevs/cnxk.rst +6 -0
@@ -67,6 +67,12 @@ AEAD algorithms: * ``RTE_CRYPTO_AEAD_AES_GCM`` * ``RTE_CRYPTO_AEAD_CHACHA20_POLY1305`` +Asymmetric Crypto Algorithms +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* ``RTE_CRYPTO_ASYM_XFORM_RSA`` +* ``RTE_CRYPTO_ASYM_XFORM_MODEX`` + Installation ------------
drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c +56 -0
68 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 4/4 test/crypto: add cnxk for asymmetric cases
In reply to Anoob JosephFrom: Kiran Kumar K <[email protected]>
Adding autotest for cn9k and cn10k.
--- app/test/test_cryptodev_asym.c | 30 ++++++++++++++++++++++++++++++ doc/guides/cryptodevs/cnxk.rst | 17 +++++++++++++++++ 2 files changed, 47 insertions(+)
app/test/test_cryptodev_asym.c +30 -0
@@ -2390,6 +2390,34 @@ test_cryptodev_octeontx2_asym(void)return unit_test_suite_runner (&cryptodev_octeontx_asym_testsuite); } +static int +test_cryptodev_cn9k_asym (void ) +{ + gbl_driver_id =rte_cryptodev_driver_id_get ( +RTE_STR (CRYPTODEV_NAME_CN9K_PMD )); +if (gbl_driver_id ==-1 ) { +RTE_LOG (ERR ,USER1 ,"CN9K PMD must be loaded.\n" ); +return TEST_FAILED ; + } + +/* Use test suite registered for crypto_octeontx PMD */ +return unit_test_suite_runner (&cryptodev_octeontx_asym_testsuite); +} + +static int +test_cryptodev_cn10k_asym (void ) +{ + gbl_driver_id =rte_cryptodev_driver_id_get ( +RTE_STR (CRYPTODEV_NAME_CN10K_PMD )); +if (gbl_driver_id ==-1 ) { +RTE_LOG (ERR ,USER1 ,"CN10K PMD must be loaded.\n" ); +return TEST_FAILED ; + } + +/* Use test suite registered for crypto_octeontx PMD */ +return unit_test_suite_runner (&cryptodev_octeontx_asym_testsuite); +} +REGISTER_TEST_COMMAND (cryptodev_openssl_asym_autotest, test_cryptodev_openssl_asym);
@@ -2400,3 +2428,5 @@ REGISTER_TEST_COMMAND(cryptodev_octeontx_asym_autotest,REGISTER_TEST_COMMAND (cryptodev_octeontx2_asym_autotest, test_cryptodev_octeontx2_asym); +REGISTER_TEST_COMMAND (cryptodev_cn9k_asym_autotest, test_cryptodev_cn9k_asym); +REGISTER_TEST_COMMAND (cryptodev_cn10k_asym_autotest, test_cryptodev_cn10k_asym);
doc/guides/cryptodevs/cnxk.rst +17 -0
@@ -191,6 +191,23 @@ running the test application: ./dpdk-test RTE>>cryptodev_cn10k_autotest +The asymmetric crypto operations on OCTEON cnxk crypto PMD may be verified by +running the test application: + +``CN9K`` + +.. code-block:: console + + ./dpdk-test + RTE>>cryptodev_cn9k_asym_autotest + +``CN10K`` + +.. code-block:: console + + ./dpdk-test + RTE>>cryptodev_cn10k_asym_autotest + Lookaside IPsec Support -----------------------
Signature · 1 line
2.7.4