cryptodev: add mempool pointer in queue pair setup

[dpdk.git] / drivers / crypto / dpaa2_sec / dpaa2_sec_dpseci.c

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index b1eede9..7682cb8 100644 (file)
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -76,6 +76,8 @@
 
 enum rta_sec_era rta_sec_era = RTA_SEC_ERA_8;
 
+static uint8_t cryptodev_driver_id;
+
 static inline int
 build_authenc_gcm_fd(dpaa2_sec_session *sess,
                     struct rte_crypto_op *op,
@@ -617,7 +619,9 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                        /*Clear the unused FD fields before sending*/
                        memset(&fd_arr[loop], 0, sizeof(struct qbman_fd));
                        sess = (dpaa2_sec_session *)
-                               (*ops)->sym->session->_private;
+                                       get_session_private_data(
+                                       (*ops)->sym->session,
+                                       cryptodev_driver_id);
                        mb_pool = (*ops)->sym->m_src->pool;
                        bpid = mempool_to_bpid(mb_pool);
                        ret = build_sec_fd(sess, *ops, &fd_arr[loop], bpid);
@@ -812,7 +816,8 @@ dpaa2_sec_queue_pair_release(struct rte_cryptodev *dev, uint16_t queue_pair_id)
 static int
 dpaa2_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
                __rte_unused const struct rte_cryptodev_qp_conf *qp_conf,
-               __rte_unused int socket_id)
+               __rte_unused int socket_id,
+               __rte_unused struct rte_mempool *session_pool)
 {
        struct dpaa2_sec_dev_private *priv = dev->data->dev_private;
        struct dpaa2_sec_qp *qp;
@@ -1496,8 +1501,8 @@ error_out:
        return -1;
 }
 
-static void *
-dpaa2_sec_session_configure(struct rte_cryptodev *dev,
+static int
+dpaa2_sec_set_session_parameters(struct rte_cryptodev *dev,
                            struct rte_crypto_sym_xform *xform, void *sess)
 {
        dpaa2_sec_session *session = sess;
@@ -1506,7 +1511,7 @@ dpaa2_sec_session_configure(struct rte_cryptodev *dev,
 
        if (unlikely(sess == NULL)) {
                RTE_LOG(ERR, PMD, "invalid session struct");
-               return NULL;
+               return -1;
        }
 
        /* Default IV length = 0 */
@@ -1542,24 +1547,59 @@ dpaa2_sec_session_configure(struct rte_cryptodev *dev,
 
        } else {
                RTE_LOG(ERR, PMD, "Invalid crypto type");
-               return NULL;
+               return -1;
        }
 
-       return session;
+       return 0;
+}
+
+static int
+dpaa2_sec_session_configure(struct rte_cryptodev *dev,
+               struct rte_crypto_sym_xform *xform,
+               struct rte_cryptodev_sym_session *sess,
+               struct rte_mempool *mempool)
+{
+       void *sess_private_data;
+
+       if (rte_mempool_get(mempool, &sess_private_data)) {
+               CDEV_LOG_ERR(
+                       "Couldn't get object from session mempool");
+               return -1;
+       }
+
+       if (dpaa2_sec_set_session_parameters(dev, xform, sess_private_data) != 0) {
+               PMD_DRV_LOG(ERR, "DPAA2 PMD: failed to configure "
+                               "session parameters");
+
+               /* Return session to mempool */
+               rte_mempool_put(mempool, sess_private_data);
+               return -1;
+       }
+
+       set_session_private_data(sess, dev->driver_id,
+               sess_private_data);
+
+       return 0;
 }
 
 /** Clear the memory of session so it doesn't leave key material behind */
 static void
-dpaa2_sec_session_clear(struct rte_cryptodev *dev __rte_unused, void *sess)
+dpaa2_sec_session_clear(struct rte_cryptodev *dev,
+               struct rte_cryptodev_sym_session *sess)
 {
        PMD_INIT_FUNC_TRACE();
-       dpaa2_sec_session *s = (dpaa2_sec_session *)sess;
+       uint8_t index = dev->driver_id;
+       void *sess_priv = get_session_private_data(sess, index);
+       dpaa2_sec_session *s = (dpaa2_sec_session *)sess_priv;
 
-       if (s) {
+       if (sess_priv) {
                rte_free(s->ctxt);
                rte_free(s->cipher_key.data);
                rte_free(s->auth_key.data);
                memset(sess, 0, sizeof(dpaa2_sec_session));
+               struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
+               set_session_private_data(sess, index, NULL);
+               rte_mempool_put(sess_mp, sess_priv);
        }
 }
 
@@ -1689,7 +1729,7 @@ dpaa2_sec_dev_infos_get(struct rte_cryptodev *dev,
                info->feature_flags = dev->feature_flags;
                info->capabilities = dpaa2_sec_capabilities;
                info->sym.max_nb_sessions = internals->max_nb_sessions;
-               info->dev_type = RTE_CRYPTODEV_DPAA2_SEC_PMD;
+               info->driver_id = cryptodev_driver_id;
        }
 }
 
@@ -1819,7 +1859,7 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev)
        }
        hw_id = dpaa2_dev->object_id;
 
-       cryptodev->dev_type = RTE_CRYPTODEV_DPAA2_SEC_PMD;
+       cryptodev->driver_id = cryptodev_driver_id;
        cryptodev->dev_ops = &crypto_ops;
 
        cryptodev->enqueue_burst = dpaa2_sec_enqueue_burst;
@@ -1976,4 +2016,5 @@ static struct rte_dpaa2_driver rte_dpaa2_sec_driver = {
        .remove = cryptodev_dpaa2_sec_remove,
 };
 
-RTE_PMD_REGISTER_DPAA2(dpaa2_sec_pmd, rte_dpaa2_sec_driver);
+RTE_PMD_REGISTER_DPAA2(CRYPTODEV_NAME_DPAA2_SEC_PMD, rte_dpaa2_sec_driver);
+RTE_PMD_REGISTER_CRYPTO_DRIVER(rte_dpaa2_sec_driver, cryptodev_driver_id);