net/sfc: check mbufs allocated using mempool API for Rx

[dpdk.git] / drivers / crypto / aesni_mb / rte_aesni_mb_pmd_ops.c

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
index fa3e963..4f0139b 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@ -25,9 +25,15 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                                        .increment = 1
                                },
                                .digest_size = {
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .min = 1,
+                                       .max = 16,
+                                       .increment = 1
+#else
                                        .min = 12,
                                        .max = 12,
                                        .increment = 0
+#endif
                                },
                                .iv_size = { 0 }
                        }, }
@@ -42,13 +48,23 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                                .block_size = 64,
                                .key_size = {
                                        .min = 1,
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .max = 65535,
+#else
                                        .max = 64,
+#endif
                                        .increment = 1
                                },
                                .digest_size = {
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .min = 1,
+                                       .max = 20,
+                                       .increment = 1
+#else
                                        .min = 12,
                                        .max = 12,
                                        .increment = 0
+#endif
                                },
                                .iv_size = { 0 }
                        }, }
@@ -63,13 +79,23 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                                .block_size = 64,
                                .key_size = {
                                        .min = 1,
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .max = 65535,
+#else
                                        .max = 64,
+#endif
                                        .increment = 1
                                },
                                .digest_size = {
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .min = 1,
+                                       .max = 28,
+                                       .increment = 1
+#else
                                        .min = 14,
                                        .max = 14,
                                        .increment = 0
+#endif
                                },
                                .iv_size = { 0 }
                        }, }
@@ -84,13 +110,23 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                                .block_size = 64,
                                .key_size = {
                                        .min = 1,
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .max = 65535,
+#else
                                        .max = 64,
+#endif
                                        .increment = 1
                                },
                                .digest_size = {
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .min = 1,
+                                       .max = 32,
+                                       .increment = 1
+#else
                                        .min = 16,
                                        .max = 16,
                                        .increment = 0
+#endif
                                },
                                .iv_size = { 0 }
                        }, }
@@ -105,13 +141,23 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                                .block_size = 128,
                                .key_size = {
                                        .min = 1,
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .max = 65535,
+#else
                                        .max = 128,
+#endif
                                        .increment = 1
                                },
                                .digest_size = {
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .min = 1,
+                                       .max = 48,
+                                       .increment = 1
+#else
                                        .min = 24,
                                        .max = 24,
                                        .increment = 0
+#endif
                                },
                                .iv_size = { 0 }
                        }, }
@@ -126,13 +172,23 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                                .block_size = 128,
                                .key_size = {
                                        .min = 1,
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .max = 65535,
+#else
                                        .max = 128,
+#endif
                                        .increment = 1
                                },
                                .digest_size = {
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 50, 0)
+                                       .min = 1,
+                                       .max = 64,
+                                       .increment = 1
+#else
                                        .min = 32,
                                        .max = 32,
                                        .increment = 0
+#endif
                                },
                                .iv_size = { 0 }
                        }, }
@@ -239,6 +295,26 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                        }, }
                }, }
        },
+       {       /*  3DES CBC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_3DES_CBC,
+                               .block_size = 8,
+                               .key_size = {
+                                       .min = 8,
+                                       .max = 24,
+                                       .increment = 8
+                               },
+                               .iv_size = {
+                                       .min = 8,
+                                       .max = 8,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
        {       /* DES DOCSIS BPI */
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
                {.sym = {
@@ -302,9 +378,9 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
                                        .increment = 0
                                },
                                .digest_size = {
-                                       .min = 12,
+                                       .min = 1,
                                        .max = 16,
-                                       .increment = 4
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -403,6 +479,8 @@ aesni_mb_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
                r = rte_ring_lookup(qp->name);
                if (r)
                        rte_ring_free(r);
+               if (qp->mb_mgr)
+                       free_mb_mgr(qp->mb_mgr);
                rte_free(qp);
                dev->data->queue_pairs[qp_id] = NULL;
        }
@@ -464,6 +542,7 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 {
        struct aesni_mb_qp *qp = NULL;
        struct aesni_mb_private *internals = dev->data->dev_private;
+       int ret = -1;
 
        /* Free memory prior to re-allocation if needed. */
        if (dev->data->queue_pairs[qp_id] != NULL)
@@ -482,12 +561,20 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
                goto qp_setup_cleanup;
 
 
+       qp->mb_mgr = alloc_mb_mgr(0);
+       if (qp->mb_mgr == NULL) {
+               ret = -ENOMEM;
+               goto qp_setup_cleanup;
+       }
+
        qp->op_fns = &job_ops[internals->vector_mode];
 
        qp->ingress_queue = aesni_mb_pmd_qp_create_processed_ops_ring(qp,
                        "ingress", qp_conf->nb_descriptors, socket_id);
-       if (qp->ingress_queue == NULL)
+       if (qp->ingress_queue == NULL) {
+               ret = -1;
                goto qp_setup_cleanup;
+       }
 
        qp->sess_mp = session_pool;
 
@@ -499,14 +586,17 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
                                "digest_mp_%u_%u", dev->data->dev_id, qp_id);
 
        /* Initialise multi-buffer manager */
-       (*qp->op_fns->job.init_mgr)(&qp->mb_mgr);
+       (*qp->op_fns->job.init_mgr)(qp->mb_mgr);
        return 0;
 
 qp_setup_cleanup:
-       if (qp)
+       if (qp) {
+               if (qp->mb_mgr == NULL)
+                       free_mb_mgr(qp->mb_mgr);
                rte_free(qp);
+       }
 
-       return -1;
+       return ret;
 }
 
 /** Return the number of allocated queue pairs */