crypto/cnxk: fix KASUMI input length

[dpdk.git] / drivers / crypto / cnxk / cnxk_se.h

diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h
index bbad289..37237de 100644 (file)
--- a/drivers/crypto/cnxk/cnxk_se.h
+++ b/drivers/crypto/cnxk/cnxk_se.h
@@ -37,7 +37,24 @@ struct cnxk_se_sess {
 } __rte_cache_aligned;
 
 static inline void
-pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type)
+cpt_pack_iv(uint8_t *iv_src, uint8_t *iv_dst)
+{
+       iv_dst[16] = iv_src[16];
+       /* pack the last 8 bytes of IV to 6 bytes.
+        * discard the 2 MSB bits of each byte
+        */
+       iv_dst[17] = (((iv_src[17] & 0x3f) << 2) | ((iv_src[18] >> 4) & 0x3));
+       iv_dst[18] = (((iv_src[18] & 0xf) << 4) | ((iv_src[19] >> 2) & 0xf));
+       iv_dst[19] = (((iv_src[19] & 0x3) << 6) | (iv_src[20] & 0x3f));
+
+       iv_dst[20] = (((iv_src[21] & 0x3f) << 2) | ((iv_src[22] >> 4) & 0x3));
+       iv_dst[21] = (((iv_src[22] & 0xf) << 4) | ((iv_src[23] >> 2) & 0xf));
+       iv_dst[22] = (((iv_src[23] & 0x3) << 6) | (iv_src[24] & 0x3f));
+}
+
+static inline void
+pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type,
+            uint8_t pack_iv)
 {
        uint32_t *iv_s_temp, iv_temp[4];
        int j;
@@ -56,6 +73,8 @@ pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type)
        } else {
                /* ZUC doesn't need a swap */
                memcpy(iv_d, iv_s, 16);
+               if (pack_iv)
+                       cpt_pack_iv(iv_s, iv_d);
        }
 }
 
@@ -980,10 +999,11 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
        uint8_t pdcp_alg_type;
        uint32_t encr_offset, auth_offset;
        uint32_t encr_data_len, auth_data_len;
-       int flags, iv_len = 16;
+       int flags, iv_len;
        uint64_t offset_ctrl;
        uint64_t *offset_vaddr;
        uint8_t *iv_s;
+       uint8_t pack_iv = 0;
        union cpt_inst_w4 cpt_inst_w4;
 
        se_ctx = params->ctx_buf.vaddr;
@@ -993,12 +1013,17 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
 
        cpt_inst_w4.s.opcode_major = ROC_SE_MAJOR_OP_ZUC_SNOW3G;
 
-       /* indicates CPTR ctx, operation type, KEY & IV mode from DPTR */
-
-       cpt_inst_w4.s.opcode_minor = ((1 << 7) | (pdcp_alg_type << 5) |
-                                     (0 << 4) | (0 << 3) | (flags & 0x7));
+       cpt_inst_w4.s.opcode_minor = se_ctx->template_w4.s.opcode_minor;
 
        if (flags == 0x1) {
+               iv_s = params->auth_iv_buf;
+               iv_len = params->auth_iv_len;
+
+               if (iv_len == 25) {
+                       iv_len -= 2;
+                       pack_iv = 1;
+               }
+
                /*
                 * Microcode expects offsets in bytes
                 * TODO: Rounding off
@@ -1019,9 +1044,15 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
 
                encr_data_len = 0;
                encr_offset = 0;
-
-               iv_s = params->auth_iv_buf;
        } else {
+               iv_s = params->iv_buf;
+               iv_len = params->cipher_iv_len;
+
+               if (iv_len == 25) {
+                       iv_len -= 2;
+                       pack_iv = 1;
+               }
+
                /* EEA3 or UEA2 */
                /*
                 * Microcode expects offsets in bytes
@@ -1042,8 +1073,6 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
 
                auth_data_len = 0;
                auth_offset = 0;
-
-               iv_s = params->iv_buf;
        }
 
        if (unlikely((encr_offset >> 16) || (auth_offset >> 8))) {
@@ -1082,7 +1111,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
                cpt_inst_w4.s.dlen = inputlen + ROC_SE_OFF_CTRL_LEN;
 
                uint8_t *iv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN);
-               pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type);
+               pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type, pack_iv);
 
                *offset_vaddr = offset_ctrl;
        } else {
@@ -1096,7 +1125,8 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
                /* save space for iv */
                offset_vaddr = m_vaddr;
 
-               m_vaddr = (uint8_t *)m_vaddr + ROC_SE_OFF_CTRL_LEN + iv_len;
+               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;
 
@@ -1124,7 +1154,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
                *offset_vaddr = offset_ctrl;
 
                iv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN);
-               pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type);
+               pdcp_iv_copy(iv_d, iv_s, pdcp_alg_type, pack_iv);
 
                /* input data */
                size = inputlen - iv_len;
@@ -1452,7 +1482,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs, uint64_t d_lens,
        /* consider iv len */
        encr_offset += iv_len;
 
-       inputlen = iv_len + (RTE_ALIGN(encr_data_len, 8) / 8);
+       inputlen = encr_offset + (RTE_ALIGN(encr_data_len, 8) / 8);
        outputlen = inputlen;
 
        /* save space for offset ctrl & iv */
@@ -1722,7 +1752,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)
                break;
        case RTE_CRYPTO_CIPHER_ZUC_EEA3:
                enc_type = ROC_SE_ZUC_EEA3;
-               cipher_key_len = 16;
+               cipher_key_len = c_form->key.length;
                zsk_flag = ROC_SE_ZS_EA;
                break;
        case RTE_CRYPTO_CIPHER_AES_XTS:
@@ -1766,6 +1796,8 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)
                                         NULL)))
                return -1;
 
+       if ((enc_type >= ROC_SE_ZUC_EEA3) && (enc_type <= ROC_SE_AES_CTR_EEA2))
+               roc_se_ctx_swap(&sess->roc_se_ctx);
        return 0;
 }
 
@@ -1869,6 +1901,10 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)
                                         a_form->digest_length)))
                return -1;
 
+       if ((auth_type >= ROC_SE_ZUC_EIA3) &&
+           (auth_type <= ROC_SE_AES_CMAC_EIA2))
+               roc_se_ctx_swap(&sess->roc_se_ctx);
+
        return 0;
 }
 
@@ -2066,6 +2102,9 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,
        uint32_t iv_buf[4];
        int ret;
 
+       fc_params.cipher_iv_len = sess->iv_length;
+       fc_params.auth_iv_len = sess->auth_iv_length;
+
        if (likely(sess->iv_length)) {
                flags |= ROC_SE_VALID_IV_BUF;
                fc_params.iv_buf = rte_crypto_op_ctod_offset(cop, uint8_t *,
@@ -2376,6 +2415,7 @@ fill_digest_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,
                 */
                d_offs = auth_range_off;
                auth_range_off = 0;
+               params.auth_iv_len = sess->auth_iv_length;
                params.auth_iv_buf = rte_crypto_op_ctod_offset(
                        cop, uint8_t *, sess->auth_iv_offset);
                if (sess->zsk_flag == ROC_SE_K_F9) {