cryptodev: move IV parameters to session

[dpdk.git] / drivers / crypto / snow3g / rte_snow3g_pmd.c

diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c
index 960956c..b21691f 100644 (file)
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2016 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2016-2017 Intel Corporation. All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -35,6 +35,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>
@@ -115,6 +116,13 @@ snow3g_set_session_parameters(struct snow3g_session *sess,
                /* Only SNOW 3G UEA2 supported */
                if (cipher_xform->cipher.algo != RTE_CRYPTO_CIPHER_SNOW3G_UEA2)
                        return -EINVAL;
+
+               if (cipher_xform->cipher.iv.length != SNOW3G_IV_LENGTH) {
+                       SNOW3G_LOG_ERR("Wrong IV length");
+                       return -EINVAL;
+               }
+               sess->iv_offset = cipher_xform->cipher.iv.offset;
+
                /* Initialize key */
                sso_snow3g_init_key_sched(cipher_xform->cipher.key.data,
                                &sess->pKeySched_cipher);
@@ -142,7 +150,7 @@ snow3g_get_session(struct snow3g_qp *qp, struct rte_crypto_op *op)
 {
        struct snow3g_session *sess;
 
-       if (op->sym->sess_type == RTE_CRYPTO_SYM_OP_WITH_SESSION) {
+       if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
                if (unlikely(op->sym->session->dev_type !=
                                RTE_CRYPTODEV_SNOW3G_PMD))
                        return NULL;
@@ -173,17 +181,10 @@ process_snow3g_cipher_op(struct rte_crypto_op **ops,
        unsigned i;
        uint8_t processed_ops = 0;
        uint8_t *src[SNOW3G_MAX_BURST], *dst[SNOW3G_MAX_BURST];
-       uint8_t *IV[SNOW3G_MAX_BURST];
+       uint8_t *iv[SNOW3G_MAX_BURST];
        uint32_t num_bytes[SNOW3G_MAX_BURST];
 
        for (i = 0; i < num_ops; i++) {
-               /* Sanity checks. */
-               if (unlikely(ops[i]->sym->cipher.iv.length != SNOW3G_IV_LENGTH)) {
-                       ops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-                       SNOW3G_LOG_ERR("iv");
-                       break;
-               }
-
                src[i] = rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) +
                                (ops[i]->sym->cipher.data.offset >> 3);
                dst[i] = ops[i]->sym->m_dst ?
@@ -191,13 +192,14 @@ process_snow3g_cipher_op(struct rte_crypto_op **ops,
                                (ops[i]->sym->cipher.data.offset >> 3) :
                        rte_pktmbuf_mtod(ops[i]->sym->m_src, uint8_t *) +
                                (ops[i]->sym->cipher.data.offset >> 3);
-               IV[i] = ops[i]->sym->cipher.iv.data;
+               iv[i] = rte_crypto_op_ctod_offset(ops[i], uint8_t *,
+                               session->iv_offset);
                num_bytes[i] = ops[i]->sym->cipher.data.length >> 3;
 
                processed_ops++;
        }
 
-       sso_snow3g_f8_n_buffer(&session->pKeySched_cipher, IV, src, dst,
+       sso_snow3g_f8_n_buffer(&session->pKeySched_cipher, iv, src, dst,
                        num_bytes, processed_ops);
 
        return processed_ops;
@@ -209,16 +211,9 @@ process_snow3g_cipher_op_bit(struct rte_crypto_op *op,
                struct snow3g_session *session)
 {
        uint8_t *src, *dst;
-       uint8_t *IV;
+       uint8_t *iv;
        uint32_t length_in_bits, offset_in_bits;
 
-       /* Sanity checks. */
-       if (unlikely(op->sym->cipher.iv.length != SNOW3G_IV_LENGTH)) {
-               op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-               SNOW3G_LOG_ERR("iv");
-               return 0;
-       }
-
        offset_in_bits = op->sym->cipher.data.offset;
        src = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);
        if (op->sym->m_dst == NULL) {
@@ -227,10 +222,11 @@ process_snow3g_cipher_op_bit(struct rte_crypto_op *op,
                return 0;
        }
        dst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *);
-       IV = op->sym->cipher.iv.data;
+       iv = rte_crypto_op_ctod_offset(op, uint8_t *,
+                               session->iv_offset);
        length_in_bits = op->sym->cipher.data.length;
 
-       sso_snow3g_f8_1_buffer_bit(&session->pKeySched_cipher, IV,
+       sso_snow3g_f8_1_buffer_bit(&session->pKeySched_cipher, iv,
                        src, dst, length_in_bits, offset_in_bits);
 
        return 1;
@@ -356,7 +352,7 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,
                if (ops[i]->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
                        ops[i]->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
                /* Free session if a session-less crypto op. */
-               if (ops[i]->sym->sess_type == RTE_CRYPTO_SYM_OP_SESSIONLESS) {
+               if (ops[i]->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {
                        rte_mempool_put(qp->sess_mp, ops[i]->sym->session);
                        ops[i]->sym->session = NULL;
                }
@@ -408,7 +404,7 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session,
                op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
 
        /* 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) {
                rte_mempool_put(qp->sess_mp, op->sym->session);
                op->sym->session = NULL;
        }
@@ -548,22 +544,15 @@ cryptodev_snow3g_create(const char *name,
 {
        struct rte_cryptodev *dev;
        struct snow3g_private *internals;
-       uint64_t cpu_flags = 0;
+       uint64_t cpu_flags = RTE_CRYPTODEV_FF_CPU_SSE;
 
        if (init_params->name[0] == '\0')
                snprintf(init_params->name, sizeof(init_params->name),
                                "%s", name);
 
-       /* Check CPU for supported vector instruction set */
-       if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_SSE4_1))
-               cpu_flags |= RTE_CRYPTODEV_FF_CPU_SSE;
-       else {
-               SNOW3G_LOG_ERR("Vector instructions are not supported by CPU");
-               return -EFAULT;
-       }
-
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
-                       sizeof(struct snow3g_private), init_params->socket_id);
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
+                       sizeof(struct snow3g_private), init_params->socket_id,
+                       vdev);
        if (dev == NULL) {
                SNOW3G_LOG_ERR("failed to create cryptodev vdev");
                goto init_error;
@@ -611,7 +600,7 @@ cryptodev_snow3g_probe(struct rte_vdev_device *vdev)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       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);