net/ice/base: fix flow director rule passthrough mode
[dpdk.git] / drivers / common / cpt / cpt_ucode.h
index 4ef87c2..34ccd08 100644 (file)
@@ -22,38 +22,6 @@ static uint8_t zuc_d[32] = {
        0x5E, 0x26, 0x3C, 0x4D, 0x78, 0x9A, 0x47, 0xAC
 };
 
-static __rte_always_inline int
-cpt_is_algo_supported(struct rte_crypto_sym_xform *xform)
-{
-       /*
-        * Microcode only supports the following combination.
-        * Encryption followed by authentication
-        * Authentication followed by decryption
-        */
-       if (xform->next) {
-               if ((xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) &&
-                   (xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) &&
-                   (xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT)) {
-                       /* Unsupported as of now by microcode */
-                       CPT_LOG_DP_ERR("Unsupported combination");
-                       return -1;
-               }
-               if ((xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) &&
-                   (xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) &&
-                   (xform->cipher.op == RTE_CRYPTO_CIPHER_OP_DECRYPT)) {
-                       /* For GMAC auth there is no cipher operation */
-                       if (xform->aead.algo != RTE_CRYPTO_AEAD_AES_GCM ||
-                           xform->next->auth.algo !=
-                           RTE_CRYPTO_AUTH_AES_GMAC) {
-                               /* Unsupported as of now by microcode */
-                               CPT_LOG_DP_ERR("Unsupported combination");
-                               return -1;
-                       }
-               }
-       }
-       return 0;
-}
-
 static __rte_always_inline void
 gen_key_snow3g(const uint8_t *ck, uint32_t *keyx)
 {
@@ -298,7 +266,7 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, const uint8_t *key,
                cpt_fc_ciph_set_key_kasumi_f8_cbc(cpt_ctx, key, key_len);
                goto success;
        default:
-               break;
+               return -1;
        }
 
        /* Only for FC_GEN case */
@@ -373,7 +341,7 @@ fill_sg_comp_from_iov(sg_comp_t *list,
 {
        int32_t j;
        uint32_t extra_len = extra_buf ? extra_buf->size : 0;
-       uint32_t size = *psize - extra_len;
+       uint32_t size = *psize;
        buf_ptr_t *bufs;
 
        bufs = from->bufs;
@@ -382,9 +350,6 @@ fill_sg_comp_from_iov(sg_comp_t *list,
                uint32_t e_len;
                sg_comp_t *to = &list[i >> 2];
 
-               if (!bufs[j].size)
-                       continue;
-
                if (unlikely(from_offset)) {
                        if (from_offset >= bufs[j].size) {
                                from_offset -= bufs[j].size;
@@ -416,18 +381,19 @@ fill_sg_comp_from_iov(sg_comp_t *list,
                                to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len);
                        }
 
+                       extra_len = RTE_MIN(extra_len, size);
                        /* Insert extra data ptr */
                        if (extra_len) {
                                i++;
                                to = &list[i >> 2];
                                to->u.s.len[i % 4] =
-                                       rte_cpu_to_be_16(extra_buf->size);
+                                       rte_cpu_to_be_16(extra_len);
                                to->ptr[i % 4] =
                                        rte_cpu_to_be_64(extra_buf->dma_addr);
-
-                               /* size already decremented by extra len */
+                               size -= extra_len;
                        }
 
+                       next_len = RTE_MIN(next_len, size);
                        /* insert the rest of the data */
                        if (next_len) {
                                i++;
@@ -2457,7 +2423,7 @@ cpt_fc_dec_hmac_prep(uint32_t flags,
        return prep_req;
 }
 
-static __rte_always_inline void *__hot
+static __rte_always_inline void *__rte_hot
 cpt_fc_enc_hmac_prep(uint32_t flags, uint64_t d_offs, uint64_t d_lens,
                     fc_params_t *fc_params, void *op)
 {
@@ -2616,10 +2582,13 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform,
        sess->iv_length = aead_form->iv.length;
        sess->aad_length = aead_form->aad_length;
 
-       cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data,
-                       aead_form->key.length, NULL);
+       if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data,
+                       aead_form->key.length, NULL)))
+               return -1;
 
-       cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, aead_form->digest_length);
+       if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0,
+                       aead_form->digest_length)))
+               return -1;
 
        return 0;
 }
@@ -2719,8 +2688,9 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform,
        sess->iv_length = c_form->iv.length;
        sess->is_null = is_null;
 
-       cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type, c_form->key.data,
-                           c_form->key.length, NULL);
+       if (unlikely(cpt_fc_ciph_set_key(SESS_PRIV(sess), enc_type,
+                       c_form->key.data, c_form->key.length, NULL)))
+               return -1;
 
        return 0;
 }
@@ -2814,8 +2784,10 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,
                sess->auth_iv_offset = a_form->iv.offset;
                sess->auth_iv_length = a_form->iv.length;
        }
-       cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type, a_form->key.data,
-                           a_form->key.length, a_form->digest_length);
+       if (unlikely(cpt_fc_auth_set_key(SESS_PRIV(sess), auth_type,
+                       a_form->key.data, a_form->key.length,
+                       a_form->digest_length)))
+               return -1;
 
        return 0;
 }
@@ -2858,9 +2830,13 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,
        sess->iv_length = a_form->iv.length;
        sess->mac_len = a_form->digest_length;
 
-       cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data,
-                       a_form->key.length, NULL);
-       cpt_fc_auth_set_key(ctx, auth_type, NULL, 0, a_form->digest_length);
+       if (unlikely(cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data,
+                       a_form->key.length, NULL)))
+               return -1;
+
+       if (unlikely(cpt_fc_auth_set_key(ctx, auth_type, NULL, 0,
+                       a_form->digest_length)))
+               return -1;
 
        return 0;
 }
@@ -3325,49 +3301,6 @@ compl_auth_verify(struct rte_crypto_op *op,
                op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
 }
 
-static __rte_always_inline int
-instance_session_cfg(struct rte_crypto_sym_xform *xform, void *sess)
-{
-       struct rte_crypto_sym_xform *chain;
-
-       CPT_PMD_INIT_FUNC_TRACE();
-
-       if (cpt_is_algo_supported(xform))
-               goto err;
-
-       chain = xform;
-       while (chain) {
-               switch (chain->type) {
-               case RTE_CRYPTO_SYM_XFORM_AEAD:
-                       if (fill_sess_aead(chain, sess))
-                               goto err;
-                       break;
-               case RTE_CRYPTO_SYM_XFORM_CIPHER:
-                       if (fill_sess_cipher(chain, sess))
-                               goto err;
-                       break;
-               case RTE_CRYPTO_SYM_XFORM_AUTH:
-                       if (chain->auth.algo == RTE_CRYPTO_AUTH_AES_GMAC) {
-                               if (fill_sess_gmac(chain, sess))
-                                       goto err;
-                       } else {
-                               if (fill_sess_auth(chain, sess))
-                                       goto err;
-                       }
-                       break;
-               default:
-                       CPT_LOG_DP_ERR("Invalid crypto xform type");
-                       break;
-               }
-               chain = chain->next;
-       }
-
-       return 0;
-
-err:
-       return -1;
-}
-
 static __rte_always_inline void
 find_kasumif9_direction_and_length(uint8_t *src,
                                   uint32_t counter_num_bytes,