support stream cipher chained operations
v2 cover support stream cipher chained operations
This series adds support for zuc, snow3g and
aes-ctr-cmac chained operations in cn9k PMD.
v2:
* Split autotest patch into separate series
Tejasree Kondoj (3):
crypto/cnxk: fix CMAC IV
crypto/cnxk: support stream cipher chained operations crypto/cnxk: support scatter gather mode
drivers/common/cnxk/roc_se.c | 271 +++++++++++++----- drivers/common/cnxk/roc_se.h | 74 ++++- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 69 ++++- drivers/crypto/cnxk/cnxk_se.h | 344 +++++++++++++++++++++-- 4 files changed, 644 insertions(+), 114 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 crypto/cnxk: fix CMAC IV
Fixing CMAC IV length to 16 bytes.
--- drivers/crypto/cnxk/cnxk_se.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/cnxk/cnxk_se.h +1 -1
@@ -82,7 +82,7 @@ pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type,memcpy (iv_d, iv_s,16 ); }else {/* AES-CMAC EIA2, microcode expects 16B zeroized IV */ -for (j =0 ; j <4 ; j++) +for (j =0 ; j <16 ; j++) iv_d[j] =0 ; } }
Signature · 1 line
2.25.1
PATCH v2 2/3 crypto/cnxk: support stream cipher chained operations
In reply to Tejasree KondojAdding support for zuc, snow3g and aes-ctr-cmac chained operations on cn9k using key and IV scheme in microcode.
--- drivers/common/cnxk/roc_se.c | 271 +++++++++++++++++------ drivers/common/cnxk/roc_se.h | 74 +++++-- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 69 +++++- drivers/crypto/cnxk/cnxk_se.h | 235 +++++++++++++++++--- 4 files changed, 536 insertions(+), 113 deletions(-)
drivers/common/cnxk/roc_se.c +200 -71
@@ -88,21 +88,24 @@ cpt_ciph_type_set(roc_se_cipher_type type, struct roc_se_ctx *ctx, fc_type =ROC_SE_FC_GEN ;break ;case ROC_SE_ZUC_EEA3 : -/* No support for chained operations */ -if (unlikely (ctx->hash_type)) -return -1 ; - fc_type =ROC_SE_PDCP ; +if (ctx->hash_type) + fc_type =ROC_SE_PDCP_CHAIN ; +else + fc_type =ROC_SE_PDCP ;break ;case ROC_SE_SNOW3G_UEA2 :if (unlikely (key_len !=16 ))return -1 ; -/* No support for AEAD yet */ -if (unlikely (ctx->hash_type)) -return -1 ; - fc_type =ROC_SE_PDCP ; +if (ctx->hash_type) + fc_type =ROC_SE_PDCP_CHAIN ; +else + fc_type =ROC_SE_PDCP ;break ;case ROC_SE_AES_CTR_EEA2 : - fc_type =ROC_SE_PDCP ; +if (ctx->hash_type) + fc_type =ROC_SE_PDCP_CHAIN ; +else + fc_type =ROC_SE_PDCP ;break ;case ROC_SE_KASUMI_F8_CBC :case ROC_SE_KASUMI_F8_ECB :
@@ -171,6 +174,29 @@ cpt_pdcp_key_type_set(struct roc_se_zuc_snow3g_ctx *zs_ctx, uint16_t key_len)return 0 ; } +static int +cpt_pdcp_chain_key_type_get (uint16_t key_len) +{ +roc_se_aes_type key_type; + +switch (key_len) { +case 16 : + key_type =ROC_SE_AES_128_BIT ; +break ; +case 24 : + key_type =ROC_SE_AES_192_BIT ; +break ; +case 32 : + key_type =ROC_SE_AES_256_BIT ; +break ; +default : +plt_err ("Invalid key len" ); +return -ENOTSUP ; + } + +return key_type; +} +static int cpt_pdcp_mac_len_set (struct roc_se_zuc_snow3g_ctx *zs_ctx,uint16_t mac_len) {
@@ -202,7 +228,7 @@ cpt_pdcp_mac_len_set(struct roc_se_zuc_snow3g_ctx *zs_ctx, uint16_t mac_len) }static void -cpt_pdcp_update_zuc_const (uint8_t *zuc_const,int key_len,int mac_len) +cpt_zuc_const_update (uint8_t *zuc_const,int key_len,int mac_len) {if (key_len ==16 ) {memcpy (zuc_const, zuc_key128,32 );
@@ -227,15 +253,19 @@ int roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type, const uint8_t *key, uint16_t key_len, uint16_t mac_len) { + struct roc_se_zuc_snow3g_chain_ctx *zs_ch_ctx;struct roc_se_zuc_snow3g_ctx *zs_ctx;struct roc_se_kasumi_ctx *k_ctx;struct roc_se_context *fctx; +uint8_t opcode_minor; +uint8_t pdcp_alg;int ret;if (se_ctx ==NULL )return -1 ; zs_ctx = &se_ctx->se_ctx.zs_ctx; + zs_ch_ctx = &se_ctx->se_ctx.zs_ch_ctx; k_ctx = &se_ctx->se_ctx.k_ctx; fctx = &se_ctx->se_ctx.fctx;
@@ -243,14 +273,12 @@ roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type,uint8_t *zuc_const;uint32_t keyx[4 ];uint8_t *ci_key; +bool chained_op = + se_ctx->ciph_then_auth || se_ctx->auth_then_ciph;if (!key_len)return -1 ; -/* No support for chained operations yet */ -if (se_ctx->enc_cipher) -return -1 ; -if (roc_model_is_cn9k ()) { ci_key = zs_ctx->zuc.onk_ctx.ci_key; zuc_const = zs_ctx->zuc.onk_ctx.zuc_const;
@@ -262,41 +290,88 @@ roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type,/* For ZUC/SNOW3G/Kasumi */ switch (type) {case ROC_SE_SNOW3G_UIA2 : - zs_ctx->zuc.otk_ctx.w0.s.alg_type = -ROC_SE_PDCP_ALG_TYPE_SNOW3G ; - zs_ctx->zuc.otk_ctx.w0.s.mac_len = -ROC_SE_PDCP_MAC_LEN_32_BIT ; - se_ctx->pdcp_alg_type =ROC_SE_PDCP_ALG_TYPE_SNOW3G ; -cpt_snow3g_key_gen (key, keyx); -memcpy (ci_key, keyx, key_len); - se_ctx->fc_type =ROC_SE_PDCP ; +if (chained_op) { +struct roc_se_onk_zuc_chain_ctx *ctx = + &zs_ch_ctx->zuc.onk_ctx; + zs_ch_ctx->zuc.onk_ctx.w0.s.state_conf = +ROC_SE_PDCP_CHAIN_CTX_KEY_IV ; + ctx->w0.s.auth_type = +ROC_SE_PDCP_CHAIN_ALG_TYPE_SNOW3G ; + ctx->w0.s.mac_len = mac_len; + ctx->w0.s.auth_key_len = key_len; + se_ctx->fc_type =ROC_SE_PDCP_CHAIN ; +cpt_snow3g_key_gen (key, keyx); +memcpy (ctx->st.auth_key, keyx, key_len); + }else { + zs_ctx->zuc.otk_ctx.w0.s.alg_type = +ROC_SE_PDCP_ALG_TYPE_SNOW3G ; + zs_ctx->zuc.otk_ctx.w0.s.mac_len = +ROC_SE_PDCP_MAC_LEN_32_BIT ; +cpt_snow3g_key_gen (key, keyx); +memcpy (ci_key, keyx, key_len); + se_ctx->fc_type =ROC_SE_PDCP ; + } + se_ctx->pdcp_auth_alg =ROC_SE_PDCP_ALG_TYPE_SNOW3G ; se_ctx->zsk_flags =0x1 ;break ;case ROC_SE_ZUC_EIA3 : - zs_ctx->zuc.otk_ctx.w0.s.alg_type = -ROC_SE_PDCP_ALG_TYPE_ZUC ; - ret =cpt_pdcp_key_type_set (zs_ctx, key_len); -if (ret) -return ret; - ret =cpt_pdcp_mac_len_set (zs_ctx, mac_len); -if (ret) -return ret; - se_ctx->pdcp_alg_type =ROC_SE_PDCP_ALG_TYPE_ZUC ; -memcpy (ci_key, key, key_len); -if (key_len ==32 ) -roc_se_zuc_bytes_swap (ci_key, key_len); -cpt_pdcp_update_zuc_const (zuc_const, key_len, mac_len); - se_ctx->fc_type =ROC_SE_PDCP ; +if (chained_op) { +struct roc_se_onk_zuc_chain_ctx *ctx = + &zs_ch_ctx->zuc.onk_ctx; + ctx->w0.s.state_conf = +ROC_SE_PDCP_CHAIN_CTX_KEY_IV ; + ctx->w0.s.auth_type = +ROC_SE_PDCP_CHAIN_ALG_TYPE_ZUC ; + ctx->w0.s.mac_len = mac_len; + ctx->w0.s.auth_key_len = key_len; +memcpy (ctx->st.auth_key, key, key_len); +cpt_zuc_const_update (ctx->st.auth_zuc_const, + key_len, mac_len); + se_ctx->fc_type =ROC_SE_PDCP_CHAIN ; + }else { + zs_ctx->zuc.otk_ctx.w0.s.alg_type = +ROC_SE_PDCP_ALG_TYPE_ZUC ; + ret =cpt_pdcp_key_type_set (zs_ctx, key_len); +if (ret) +return ret; + ret =cpt_pdcp_mac_len_set (zs_ctx, mac_len); +if (ret) +return ret; +memcpy (ci_key, key, key_len); +if (key_len ==32 ) +roc_se_zuc_bytes_swap (ci_key, key_len); +cpt_zuc_const_update (zuc_const, key_len, + mac_len); + se_ctx->fc_type =ROC_SE_PDCP ; + } + se_ctx->pdcp_auth_alg =ROC_SE_PDCP_ALG_TYPE_ZUC ; se_ctx->zsk_flags =0x1 ;break ;case ROC_SE_AES_CMAC_EIA2 : - zs_ctx->zuc.otk_ctx.w0.s.alg_type = -ROC_SE_PDCP_ALG_TYPE_AES_CTR ; - zs_ctx->zuc.otk_ctx.w0.s.mac_len = -ROC_SE_PDCP_MAC_LEN_32_BIT ; - se_ctx->pdcp_alg_type =ROC_SE_PDCP_ALG_TYPE_AES_CTR ; -memcpy (ci_key, key, key_len); - se_ctx->fc_type =ROC_SE_PDCP ; +if (chained_op) { +struct roc_se_onk_zuc_chain_ctx *ctx = + &zs_ch_ctx->zuc.onk_ctx; +int key_type; + key_type =cpt_pdcp_chain_key_type_get (key_len); +if (key_type <0 ) +return key_type; + ctx->w0.s.auth_key_len = key_type; + ctx->w0.s.state_conf = +ROC_SE_PDCP_CHAIN_CTX_KEY_IV ; + ctx->w0.s.auth_type = +ROC_SE_PDCP_ALG_TYPE_AES_CTR ; + ctx->w0.s.mac_len = mac_len; +memcpy (ctx->st.auth_key, key, key_len); + se_ctx->fc_type =ROC_SE_PDCP_CHAIN ; + }else { + zs_ctx->zuc.otk_ctx.w0.s.alg_type = +ROC_SE_PDCP_ALG_TYPE_AES_CTR ; + zs_ctx->zuc.otk_ctx.w0.s.mac_len = +ROC_SE_PDCP_MAC_LEN_32_BIT ; +memcpy (ci_key, key, key_len); + se_ctx->fc_type =ROC_SE_PDCP ; + } + se_ctx->pdcp_auth_alg =ROC_SE_PDCP_ALG_TYPE_AES_CMAC ; se_ctx->zsk_flags =0x1 ;break ;case ROC_SE_KASUMI_F9_ECB :
@@ -316,11 +391,16 @@ roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type, } se_ctx->mac_len = mac_len; se_ctx->hash_type = type; + pdcp_alg = zs_ctx->zuc.otk_ctx.w0.s.alg_type;if (roc_model_is_cn9k ()) - se_ctx->template_w4.s.opcode_minor = - ((1 <<7 ) | (se_ctx->pdcp_alg_type <<5 ) |1 ); +if (chained_op == true) + opcode_minor = se_ctx->ciph_then_auth ?2 :3 ; +else + opcode_minor = ((1 <<7 ) | (pdcp_alg <<5 ) |1 );else - se_ctx->template_w4.s.opcode_minor = ((1 <<4 ) |1 ); + opcode_minor = ((1 <<4 ) |1 ); + + se_ctx->template_w4.s.opcode_minor = opcode_minor;return 0 ; }
@@ -363,13 +443,18 @@ int roc_se_ciph_key_set(struct roc_se_ctx *se_ctx, roc_se_cipher_type type, const uint8_t *key, uint16_t key_len, uint8_t *salt) { + bool chained_op = se_ctx->ciph_then_auth || se_ctx->auth_then_ciph;struct roc_se_zuc_snow3g_ctx *zs_ctx = &se_ctx->se_ctx.zs_ctx;struct roc_se_context *fctx = &se_ctx->se_ctx.fctx; +struct roc_se_zuc_snow3g_chain_ctx *zs_ch_ctx; +uint8_t opcode_minor;uint8_t *zuc_const;uint32_t keyx[4 ];uint8_t *ci_key;int ret; + zs_ch_ctx = &se_ctx->se_ctx.zs_ch_ctx; +if (roc_model_is_cn9k ()) { ci_key = zs_ctx->zuc.onk_ctx.ci_key; zuc_const = zs_ctx->zuc.onk_ctx.zuc_const;
@@ -447,34 +532,73 @@ roc_se_ciph_key_set(struct roc_se_ctx *se_ctx, roc_se_cipher_type type,memcpy (fctx->hmac.ipad, &key[key_len], key_len);break ;case ROC_SE_SNOW3G_UEA2 : - zs_ctx->zuc.otk_ctx.w0.s.key_len =ROC_SE_AES_128_BIT ; - zs_ctx->zuc.otk_ctx.w0.s.alg_type =ROC_SE_PDCP_ALG_TYPE_SNOW3G ; - se_ctx->pdcp_alg_type =ROC_SE_PDCP_ALG_TYPE_SNOW3G ; -cpt_snow3g_key_gen (key, keyx); -memcpy (ci_key, keyx, key_len); +if (chained_op == true) { +struct roc_se_onk_zuc_chain_ctx *ctx = + &zs_ch_ctx->zuc.onk_ctx; + zs_ch_ctx->zuc.onk_ctx.w0.s.state_conf = +ROC_SE_PDCP_CHAIN_CTX_KEY_IV ; + zs_ch_ctx->zuc.onk_ctx.w0.s.cipher_type = +ROC_SE_PDCP_CHAIN_ALG_TYPE_SNOW3G ; + zs_ch_ctx->zuc.onk_ctx.w0.s.ci_key_len = key_len; +cpt_snow3g_key_gen (key, keyx); +memcpy (ctx->st.ci_key, keyx, key_len); + }else { + zs_ctx->zuc.otk_ctx.w0.s.key_len =ROC_SE_AES_128_BIT ; + zs_ctx->zuc.otk_ctx.w0.s.alg_type = +ROC_SE_PDCP_ALG_TYPE_SNOW3G ; +cpt_snow3g_key_gen (key, keyx); +memcpy (ci_key, keyx, key_len); + } + se_ctx->pdcp_ci_alg =ROC_SE_PDCP_ALG_TYPE_SNOW3G ; se_ctx->zsk_flags =0 ; goto success;case ROC_SE_ZUC_EEA3 : - ret =cpt_pdcp_key_type_set (zs_ctx, key_len); -if (ret) -return ret; - zs_ctx->zuc.otk_ctx.w0.s.alg_type =ROC_SE_PDCP_ALG_TYPE_ZUC ; - se_ctx->pdcp_alg_type =ROC_SE_PDCP_ALG_TYPE_ZUC ; -memcpy (ci_key, key, key_len); -if (key_len ==32 ) { -roc_se_zuc_bytes_swap (ci_key, key_len); -memcpy (zuc_const, zuc_key256,16 ); - }else -memcpy (zuc_const, zuc_key128,32 ); +if (chained_op == true) { +struct roc_se_onk_zuc_chain_ctx *ctx = + &zs_ch_ctx->zuc.onk_ctx; + zs_ch_ctx->zuc.onk_ctx.w0.s.state_conf = +ROC_SE_PDCP_CHAIN_CTX_KEY_IV ; + zs_ch_ctx->zuc.onk_ctx.w0.s.cipher_type = +ROC_SE_PDCP_CHAIN_ALG_TYPE_ZUC ; +memcpy (ctx->st.ci_key, key, key_len); +memcpy (ctx->st.ci_zuc_const, zuc_key128,32 ); + zs_ch_ctx->zuc.onk_ctx.w0.s.ci_key_len = key_len; + }else { + ret =cpt_pdcp_key_type_set (zs_ctx, key_len); +if (ret) +return ret; + zs_ctx->zuc.otk_ctx.w0.s.alg_type = +ROC_SE_PDCP_ALG_TYPE_ZUC ; +memcpy (ci_key, key, key_len); +if (key_len ==32 ) { +roc_se_zuc_bytes_swap (ci_key, key_len); +memcpy (zuc_const, zuc_key256,16 ); + }else +memcpy (zuc_const, zuc_key128,32 ); + } + se_ctx->pdcp_ci_alg =ROC_SE_PDCP_ALG_TYPE_ZUC ; se_ctx->zsk_flags =0 ; goto success;case ROC_SE_AES_CTR_EEA2 : - zs_ctx->zuc.otk_ctx.w0.s.key_len =ROC_SE_AES_128_BIT ; - zs_ctx->zuc.otk_ctx.w0.s.alg_type = -ROC_SE_PDCP_ALG_TYPE_AES_CTR ; - se_ctx->pdcp_alg_type =ROC_SE_PDCP_ALG_TYPE_AES_CTR ; -memcpy (ci_key, key, key_len); +if (chained_op == true) { +struct roc_se_onk_zuc_chain_ctx *ctx = + &zs_ch_ctx->zuc.onk_ctx; +int key_type; + key_type =cpt_pdcp_chain_key_type_get (key_len); +if (key_type <0 ) +return key_type; + ctx->w0.s.ci_key_len = key_type; + ctx->w0.s.state_conf =ROC_SE_PDCP_CHAIN_CTX_KEY_IV ; + ctx->w0.s.cipher_type =ROC_SE_PDCP_ALG_TYPE_AES_CTR ; +memcpy (ctx->st.ci_key, key, key_len); + }else { + zs_ctx->zuc.otk_ctx.w0.s.key_len =ROC_SE_AES_128_BIT ; + zs_ctx->zuc.otk_ctx.w0.s.alg_type = +ROC_SE_PDCP_ALG_TYPE_AES_CTR ; +memcpy (ci_key, key, key_len); + } + se_ctx->pdcp_ci_alg =ROC_SE_PDCP_ALG_TYPE_AES_CTR ; se_ctx->zsk_flags =0 ; goto success;case ROC_SE_KASUMI_F8_ECB :
@@ -502,11 +626,16 @@ roc_se_ciph_key_set(struct roc_se_ctx *se_ctx, roc_se_cipher_type type, se_ctx->enc_cipher = type;if (se_ctx->fc_type ==ROC_SE_PDCP ) {if (roc_model_is_cn9k ()) - se_ctx->template_w4.s.opcode_minor = - ((1 <<7 ) | (se_ctx->pdcp_alg_type <<5 ) | - (se_ctx->zsk_flags &0x7 )); +if (chained_op == true) + opcode_minor = se_ctx->ciph_then_auth ?2 :3 ; +else + opcode_minor = + ((1 <<7 ) | (se_ctx->pdcp_ci_alg <<5 ) | + (se_ctx->zsk_flags &0x7 ));else - se_ctx->template_w4.s.opcode_minor = ((1 <<4 )); + opcode_minor = ((1 <<4 )); + + se_ctx->template_w4.s.opcode_minor = opcode_minor; }return 0 ; }
drivers/common/cnxk/roc_se.h +61 -13
109 lines not on this page · raw message
drivers/crypto/cnxk/cnxk_cryptodev_ops.c +66 -3
117 lines not on this page · raw message
drivers/crypto/cnxk/cnxk_se.h +209 -26
402 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 3/3 crypto/cnxk: support scatter gather mode
In reply to Tejasree KondojAdding scatter gather support for zuc, snow3g
and aes-ctr-cmac chained operations on cn9k.
--- drivers/crypto/cnxk/cnxk_se.h | 149 +++++++++++++++++++++++++++++----- 1 file changed, 128 insertions(+), 21 deletions(-)
drivers/crypto/cnxk/cnxk_se.h +128 -21
@@ -1027,12 +1027,6 @@ cpt_pdcp_chain_alg_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,void *dm_vaddr;uint8_t *iv_d; -if (unlikely ((!(req_flags &ROC_SE_SINGLE_BUF_INPLACE )) || - (!(req_flags &ROC_SE_SINGLE_BUF_HEADROOM )))) { -plt_dp_err ("Scatter gather mode is not supported" ); -return -1 ; - } - encr_offset =ROC_SE_ENCR_OFFSET (d_offs); auth_offset =ROC_SE_AUTH_OFFSET (d_offs);
@@ -1084,28 +1078,141 @@ cpt_pdcp_chain_alg_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,else inputlen = encr_offset + encr_data_len; - dm_vaddr = params->bufs[0 ].vaddr; +if (likely (((req_flags &ROC_SE_SINGLE_BUF_INPLACE )) && + ((req_flags &ROC_SE_SINGLE_BUF_HEADROOM )))) { + + dm_vaddr = params->bufs[0 ].vaddr; -/* Use Direct mode */ +/* Use Direct mode */ + + offset_vaddr = (uint64_t *)((uint8_t *)dm_vaddr - +ROC_SE_OFF_CTRL_LEN - iv_len); - offset_vaddr = (uint64_t *)((uint8_t *)dm_vaddr -ROC_SE_OFF_CTRL_LEN - - iv_len); +/* DPTR */ + inst->dptr = (uint64_t )offset_vaddr; +/* RPTR should just exclude offset control word */ + inst->rptr = (uint64_t )dm_vaddr - iv_len; -/* DPTR */ - inst->dptr = (uint64_t )offset_vaddr; -/* RPTR should just exclude offset control word */ - inst->rptr = (uint64_t )dm_vaddr - iv_len; + cpt_inst_w4.s.dlen = inputlen +ROC_SE_OFF_CTRL_LEN ; - cpt_inst_w4.s.dlen = inputlen +ROC_SE_OFF_CTRL_LEN ; + *(uint64_t *)offset_vaddr = +rte_cpu_to_be_64 (((uint64_t )(iv_offset) <<16 ) | + ((uint64_t )(encr_offset))); - *(uint64_t *)offset_vaddr =rte_cpu_to_be_64 ( - ((uint64_t )(iv_offset) <<16 ) | ((uint64_t )(encr_offset))); + iv_d = ((uint8_t *)offset_vaddr +ROC_SE_OFF_CTRL_LEN ); +pdcp_iv_copy (iv_d, cipher_iv, pdcp_ci_alg, pack_iv); + + iv_d = ((uint8_t *)offset_vaddr +ROC_SE_OFF_CTRL_LEN +16 ); +pdcp_iv_copy (iv_d, auth_iv, pdcp_auth_alg, pack_iv); + + }else { + +struct roc_se_sglist_comp *scatter_comp, *gather_comp; +void *m_vaddr = params->meta_buf.vaddr; +uint32_t i, g_size_bytes, s_size_bytes; +uint8_t *in_buffer; +uint32_t size; + +/* save space for IV */ + offset_vaddr = m_vaddr; + + m_vaddr = (uint8_t *)m_vaddr +ROC_SE_OFF_CTRL_LEN + +RTE_ALIGN_CEIL (iv_len,8 ); + + cpt_inst_w4.s.opcode_major |= (uint64_t )ROC_SE_DMA_MODE ; + +/* DPTR has SG list */ + in_buffer = m_vaddr; + + ((uint16_t *)in_buffer)[0 ] =0 ; + ((uint16_t *)in_buffer)[1 ] =0 ; + + gather_comp = + (struct roc_se_sglist_comp *)((uint8_t *)m_vaddr +8 ); + +/* Input Gather List */ + i =0 ; + +/* Offset control word followed by iv */ + + i =fill_sg_comp (gather_comp, i, (uint64_t )offset_vaddr, +ROC_SE_OFF_CTRL_LEN + iv_len); + + *(uint64_t *)offset_vaddr = +rte_cpu_to_be_64 (((uint64_t )(iv_offset) <<16 ) | + ((uint64_t )(encr_offset))); + + iv_d = ((uint8_t *)offset_vaddr +ROC_SE_OFF_CTRL_LEN ); +pdcp_iv_copy (iv_d, cipher_iv, pdcp_ci_alg, pack_iv); + + iv_d = ((uint8_t *)offset_vaddr +ROC_SE_OFF_CTRL_LEN +16 ); +pdcp_iv_copy (iv_d, auth_iv, pdcp_auth_alg, pack_iv); + +/* input data */ + size = inputlen - iv_len; +if (size) { + i =fill_sg_comp_from_iov (gather_comp, i, + params->src_iov,0 , &size, +NULL ,0 ); +if (unlikely (size)) { +plt_dp_err ("Insufficient buffer space," +" size %d needed" , + size); +return -1 ; + } + } + ((uint16_t *)in_buffer)[2 ] =rte_cpu_to_be_16 (i); + g_size_bytes = + ((i +3 ) /4 ) *sizeof (struct roc_se_sglist_comp ); + +/* +* Output Scatter List +*/ - iv_d = ((uint8_t *)offset_vaddr +ROC_SE_OFF_CTRL_LEN ); -pdcp_iv_copy (iv_d, cipher_iv, pdcp_ci_alg, pack_iv); + i =0 ; + scatter_comp = + (struct roc_se_sglist_comp *)((uint8_t *)gather_comp + + g_size_bytes); + +if (iv_len) { + i =fill_sg_comp (scatter_comp, i, + (uint64_t )offset_vaddr + +ROC_SE_OFF_CTRL_LEN , + iv_len); + } - iv_d = ((uint8_t *)offset_vaddr +ROC_SE_OFF_CTRL_LEN +16 ); -pdcp_iv_copy (iv_d, auth_iv, pdcp_auth_alg, pack_iv); +/* Add output data */ +if (se_ctx->ciph_then_auth && + (req_flags &ROC_SE_VALID_MAC_BUF )) + size = inputlen - iv_len; +else +/* Output including mac */ + size = inputlen - iv_len + mac_len; + +if (size) { + i =fill_sg_comp_from_iov (scatter_comp, i, + params->dst_iov,0 , &size, +NULL ,0 ); + +if (unlikely (size)) { +plt_dp_err ("Insufficient buffer space," +" size %d needed" , + size); +return -1 ; + } + } + + ((uint16_t *)in_buffer)[3 ] =rte_cpu_to_be_16 (i); + s_size_bytes = + ((i +3 ) /4 ) *sizeof (struct roc_se_sglist_comp ); + + size = g_size_bytes + s_size_bytes +ROC_SE_SG_LIST_HDR_SIZE ; + +/* This is DPTR len in case of SG mode */ + cpt_inst_w4.s.dlen = size; + + inst->dptr = (uint64_t )in_buffer; + } inst->w4.u64 = cpt_inst_w4.u64;
Signature · 1 line
2.25.1
Akhil Goyal
AppliedQuoted 11 lines
This series adds support for zuc, snow3g and
aes-ctr-cmac chained operations in cn9k PMD.v2:
* Split autotest patch into separate seriesTejasree Kondoj (3):
crypto/cnxk: fix CMAC IV
crypto/cnxk: support stream cipher chained operationscrypto/cnxk: support scatter gather mode
Quoted 5 lines
drivers/common/cnxk/roc_se.c | 271 +++++++++++++----- drivers/common/cnxk/roc_se.h | 74 ++++- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 69 ++++- drivers/crypto/cnxk/cnxk_se.h | 344 +++++++++++++++++++++-- 4 files changed, 644 insertions(+), 114 deletions(-)
Series Acked-by: Akhil Goyal <[email protected]>
Applied to dpdk-next-crypto
Thanks.