cryptodev: allocate driver structure statically

[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 f28b8d6..b2f6222 100644 (file)
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -111,13 +111,13 @@ snow3g_set_session_parameters(struct snow3g_session *sess,
        case SNOW3G_OP_NOT_SUPPORTED:
        default:
                SNOW3G_LOG_ERR("Unsupported operation chain order parameter");
-               return -EINVAL;
+               return -ENOTSUP;
        }
 
        if (cipher_xform) {
                /* Only SNOW 3G UEA2 supported */
                if (cipher_xform->cipher.algo != RTE_CRYPTO_CIPHER_SNOW3G_UEA2)
-                       return -EINVAL;
+                       return -ENOTSUP;
 
                if (cipher_xform->cipher.iv.length != SNOW3G_IV_LENGTH) {
                        SNOW3G_LOG_ERR("Wrong IV length");
@@ -133,7 +133,7 @@ snow3g_set_session_parameters(struct snow3g_session *sess,
        if (auth_xform) {
                /* Only SNOW 3G UIA2 supported */
                if (auth_xform->auth.algo != RTE_CRYPTO_AUTH_SNOW3G_UIA2)
-                       return -EINVAL;
+                       return -ENOTSUP;
 
                if (auth_xform->auth.digest_length != SNOW3G_DIGEST_LENGTH) {
                        SNOW3G_LOG_ERR("Wrong digest length");
@@ -163,23 +163,41 @@ snow3g_set_session_parameters(struct snow3g_session *sess,
 static struct snow3g_session *
 snow3g_get_session(struct snow3g_qp *qp, struct rte_crypto_op *op)
 {
-       struct snow3g_session *sess;
+       struct snow3g_session *sess = NULL;
 
        if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
-               sess = (struct snow3g_session *)op->sym->session->_private;
-       } else  {
-               struct rte_cryptodev_sym_session *c_sess = NULL;
+               if (likely(op->sym->session != NULL))
+                       sess = (struct snow3g_session *)
+                                       get_session_private_data(
+                                       op->sym->session,
+                                       cryptodev_driver_id);
+       } else {
+               void *_sess = NULL;
+               void *_sess_private_data = NULL;
+
+               if (rte_mempool_get(qp->sess_mp, (void **)&_sess))
+                       return NULL;
 
-               if (rte_mempool_get(qp->sess_mp, (void **)&c_sess))
+               if (rte_mempool_get(qp->sess_mp, (void **)&_sess_private_data))
                        return NULL;
 
-               sess = (struct snow3g_session *)c_sess->_private;
+               sess = (struct snow3g_session *)_sess_private_data;
 
                if (unlikely(snow3g_set_session_parameters(sess,
-                               op->sym->xform) != 0))
-                       return NULL;
+                               op->sym->xform) != 0)) {
+                       rte_mempool_put(qp->sess_mp, _sess);
+                       rte_mempool_put(qp->sess_mp, _sess_private_data);
+                       sess = NULL;
+               }
+               op->sym->session = (struct rte_cryptodev_sym_session *)_sess;
+               set_session_private_data(op->sym->session, cryptodev_driver_id,
+                       _sess_private_data);
        }
 
+       if (unlikely(sess == NULL))
+               op->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
+
+
        return sess;
 }
 
@@ -355,6 +373,10 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,
                        ops[i]->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
                /* Free session if a session-less crypto op. */
                if (ops[i]->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {
+                       memset(session, 0, sizeof(struct snow3g_session));
+                       memset(ops[i]->sym->session, 0,
+                                       rte_cryptodev_get_header_session_size());
+                       rte_mempool_put(qp->sess_mp, session);
                        rte_mempool_put(qp->sess_mp, ops[i]->sym->session);
                        ops[i]->sym->session = NULL;
                }
@@ -407,7 +429,8 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session,
 
        /* Free session if a session-less crypto op. */
        if (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {
-               rte_mempool_put(qp->sess_mp, op->sym->session);
+               memset(op->sym->session, 0, sizeof(struct snow3g_session));
+               rte_cryptodev_sym_session_free(op->sym->session);
                op->sym->session = NULL;
        }
 
@@ -638,10 +661,13 @@ static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = {
        .remove = cryptodev_snow3g_remove
 };
 
+static struct cryptodev_driver snow3g_crypto_drv;
+
 RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv);
 RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd);
 RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD,
        "max_nb_queue_pairs=<int> "
        "max_nb_sessions=<int> "
        "socket_id=<int>");
-RTE_PMD_REGISTER_CRYPTO_DRIVER(cryptodev_snow3g_pmd_drv, cryptodev_driver_id);
+RTE_PMD_REGISTER_CRYPTO_DRIVER(snow3g_crypto_drv, cryptodev_snow3g_pmd_drv,
+               cryptodev_driver_id);