cryptodev: pass IV as offset

[dpdk.git] / drivers / crypto / armv8 / rte_armv8_pmd.c

diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index 1bf0f9d..693eccd 100644 (file)
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -36,6 +36,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -44,7 +45,7 @@
 
 #include "rte_armv8_pmd_private.h"
 
-static int cryptodev_armv8_crypto_uninit(const char *name);
+static int cryptodev_armv8_crypto_uninit(struct rte_vdev_device *vdev);
 
 /**
  * Pointers to the supported combined mode crypto functions are stored
@@ -544,7 +545,7 @@ get_session(struct armv8_crypto_qp *qp, struct rte_crypto_op *op)
 {
        struct armv8_crypto_session *sess = NULL;
 
-       if (op->sym->sess_type == RTE_CRYPTO_SYM_OP_WITH_SESSION) {
+       if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
                /* get existing session */
                if (likely(op->sym->session != NULL &&
                                op->sym->session->dev_type ==
@@ -653,7 +654,8 @@ process_armv8_chained_op
                return;
        }
 
-       arg.cipher.iv = op->sym->cipher.iv.data;
+       arg.cipher.iv = rte_crypto_op_ctod_offset(op, uint8_t *,
+                                       op->sym->cipher.iv.offset);
        arg.cipher.key = sess->cipher.key.data;
        /* Acquire combined mode function */
        crypto_func = sess->crypto_func;
@@ -699,7 +701,7 @@ process_op(const struct armv8_crypto_qp *qp, struct rte_crypto_op *op,
        }
 
        /* Free session if a session-less crypto op */
-       if (op->sym->sess_type == RTE_CRYPTO_SYM_OP_SESSIONLESS) {
+       if (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {
                memset(sess, 0, sizeof(struct armv8_crypto_session));
                rte_mempool_put(qp->sess_mp, op->sym->session);
                op->sym->session = NULL;
@@ -739,13 +741,15 @@ armv8_crypto_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops,
                        goto enqueue_err;
        }
 
-       retval = rte_ring_enqueue_burst(qp->processed_ops, (void *)ops, i);
+       retval = rte_ring_enqueue_burst(qp->processed_ops, (void *)ops, i,
+                       NULL);
        qp->stats.enqueued_count += retval;
 
        return retval;
 
 enqueue_err:
-       retval = rte_ring_enqueue_burst(qp->processed_ops, (void *)ops, i);
+       retval = rte_ring_enqueue_burst(qp->processed_ops, (void *)ops, i,
+                       NULL);
        if (ops[i] != NULL)
                ops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
 
@@ -763,7 +767,7 @@ armv8_crypto_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,
        unsigned int nb_dequeued = 0;
 
        nb_dequeued = rte_ring_dequeue_burst(qp->processed_ops,
-                       (void **)ops, nb_ops);
+                       (void **)ops, nb_ops, NULL);
        qp->stats.dequeued_count += nb_dequeued;
 
        return nb_dequeued;
@@ -771,11 +775,12 @@ armv8_crypto_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,
 
 /** Create ARMv8 crypto device */
 static int
-cryptodev_armv8_crypto_create(struct rte_crypto_vdev_init_params *init_params)
+cryptodev_armv8_crypto_create(const char *name,
+                       struct rte_vdev_device *vdev,
+                       struct rte_crypto_vdev_init_params *init_params)
 {
        struct rte_cryptodev *dev;
        struct armv8_crypto_private *internals;
-       int ret;
 
        /* Check CPU for support for AES instruction set */
        if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_AES)) {
@@ -799,20 +804,14 @@ cryptodev_armv8_crypto_create(struct rte_crypto_vdev_init_params *init_params)
                return -EFAULT;
        }
 
-       if (init_params->name[0] == '\0') {
-               ret = rte_cryptodev_pmd_create_dev_name(
-                               init_params->name,
-                               RTE_STR(CRYPTODEV_NAME_ARMV8_PMD));
-
-               if (ret < 0) {
-                       ARMV8_CRYPTO_LOG_ERR("failed to create unique name");
-                       return ret;
-               }
-       }
+       if (init_params->name[0] == '\0')
+               snprintf(init_params->name, sizeof(init_params->name),
+                               "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                                sizeof(struct armv8_crypto_private),
-                               init_params->socket_id);
+                               init_params->socket_id,
+                               vdev);
        if (dev == NULL) {
                ARMV8_CRYPTO_LOG_ERR("failed to create cryptodev vdev");
                goto init_error;
@@ -826,7 +825,9 @@ cryptodev_armv8_crypto_create(struct rte_crypto_vdev_init_params *init_params)
        dev->enqueue_burst = armv8_crypto_pmd_enqueue_burst;
 
        dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
-                       RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING;
+                       RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
+                       RTE_CRYPTODEV_FF_CPU_NEON |
+                       RTE_CRYPTODEV_FF_CPU_ARM_CE;
 
        /* Set vector instructions mode supported */
        internals = dev->data->dev_private;
@@ -841,14 +842,13 @@ init_error:
                "driver %s: cryptodev_armv8_crypto_create failed",
                init_params->name);
 
-       cryptodev_armv8_crypto_uninit(init_params->name);
+       cryptodev_armv8_crypto_uninit(vdev);
        return -EFAULT;
 }
 
 /** Initialise ARMv8 crypto device */
 static int
-cryptodev_armv8_crypto_init(const char *name,
-               const char *input_args)
+cryptodev_armv8_crypto_init(struct rte_vdev_device *vdev)
 {
        struct rte_crypto_vdev_init_params init_params = {
                RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS,
@@ -856,8 +856,14 @@ cryptodev_armv8_crypto_init(const char *name,
                rte_socket_id(),
                {0}
        };
+       const char *name;
+       const char *input_args;
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       name = rte_vdev_device_name(vdev);
+       if (name == NULL)
+               return -EINVAL;
+       input_args = rte_vdev_device_args(vdev);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
@@ -870,13 +876,16 @@ cryptodev_armv8_crypto_init(const char *name,
        RTE_LOG(INFO, PMD, "  Max number of sessions = %d\n",
                        init_params.max_nb_sessions);
 
-       return cryptodev_armv8_crypto_create(&init_params);
+       return cryptodev_armv8_crypto_create(name, vdev, &init_params);
 }
 
 /** Uninitialise ARMv8 crypto device */
 static int
-cryptodev_armv8_crypto_uninit(const char *name)
+cryptodev_armv8_crypto_uninit(struct rte_vdev_device *vdev)
 {
+       const char *name;
+
+       name = rte_vdev_device_name(vdev);
        if (name == NULL)
                return -EINVAL;