common/mlx5: fix default devargs initialization

[dpdk.git] / drivers / crypto / openssl / rte_openssl_pmd_ops.c

diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index d382476..1cb0779 100644 (file)
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -6,9 +6,9 @@
 
 #include <rte_common.h>
 #include <rte_malloc.h>
-#include <rte_cryptodev_pmd.h>
+#include <cryptodev_pmd.h>
 
-#include "rte_openssl_pmd_private.h"
+#include "openssl_pmd_private.h"
 #include "compat.h"
 
 
@@ -659,8 +659,7 @@ openssl_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
        if (dev->data->queue_pairs[qp_id] != NULL) {
                struct openssl_qp *qp = dev->data->queue_pairs[qp_id];
 
-               if (qp->processed_ops)
-                       rte_ring_free(qp->processed_ops);
+               rte_ring_free(qp->processed_ops);
 
                rte_free(dev->data->queue_pairs[qp_id]);
                dev->data->queue_pairs[qp_id] = NULL;
@@ -715,7 +714,7 @@ openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp,
 static int
 openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
                const struct rte_cryptodev_qp_conf *qp_conf,
-               int socket_id, struct rte_mempool *session_pool)
+               int socket_id)
 {
        struct openssl_qp *qp = NULL;
 
@@ -740,26 +739,19 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        if (qp->processed_ops == NULL)
                goto qp_setup_cleanup;
 
-       qp->sess_mp = session_pool;
+       qp->sess_mp = qp_conf->mp_session;
+       qp->sess_mp_priv = qp_conf->mp_session_private;
 
        memset(&qp->stats, 0, sizeof(qp->stats));
 
        return 0;
 
 qp_setup_cleanup:
-       if (qp)
-               rte_free(qp);
+       rte_free(qp);
 
        return -1;
 }
 
-/** Return the number of allocated queue pairs */
-static uint32_t
-openssl_pmd_qp_count(struct rte_cryptodev *dev)
-{
-       return dev->data->nb_queue_pairs;
-}
-
 /** Returns the size of the symmetric session structure */
 static unsigned
 openssl_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
@@ -911,14 +903,14 @@ static int openssl_set_asym_session_parameters(
                asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_RSA;
                break;
 err_rsa:
-               BN_free(n);
-               BN_free(e);
-               BN_free(d);
-               BN_free(p);
-               BN_free(q);
-               BN_free(dmp1);
-               BN_free(dmq1);
-               BN_free(iqmp);
+               BN_clear_free(n);
+               BN_clear_free(e);
+               BN_clear_free(d);
+               BN_clear_free(p);
+               BN_clear_free(q);
+               BN_clear_free(dmp1);
+               BN_clear_free(dmq1);
+               BN_clear_free(iqmp);
 
                return -1;
        }
@@ -1125,8 +1117,7 @@ err_dsa:
 static int
 openssl_pmd_asym_session_configure(struct rte_cryptodev *dev __rte_unused,
                struct rte_crypto_asym_xform *xform,
-               struct rte_cryptodev_asym_session *sess,
-               struct rte_mempool *mempool)
+               struct rte_cryptodev_asym_session *sess)
 {
        void *asym_sess_private_data;
        int ret;
@@ -1136,25 +1127,14 @@ openssl_pmd_asym_session_configure(struct rte_cryptodev *dev __rte_unused,
                return -EINVAL;
        }
 
-       if (rte_mempool_get(mempool, &asym_sess_private_data)) {
-               CDEV_LOG_ERR(
-                       "Couldn't get object from session mempool");
-               return -ENOMEM;
-       }
-
+       asym_sess_private_data = sess->sess_private_data;
        ret = openssl_set_asym_session_parameters(asym_sess_private_data,
                        xform);
        if (ret != 0) {
                OPENSSL_LOG(ERR, "failed configure session parameters");
-
-               /* Return session to mempool */
-               rte_mempool_put(mempool, asym_sess_private_data);
                return ret;
        }
 
-       set_asym_session_private_data(sess, dev->driver_id,
-                       asym_sess_private_data);
-
        return 0;
 }
 
@@ -1212,19 +1192,15 @@ static void openssl_reset_asym_session(struct openssl_asym_session *sess)
  * so it doesn't leave key material behind
  */
 static void
-openssl_pmd_asym_session_clear(struct rte_cryptodev *dev,
+openssl_pmd_asym_session_clear(struct rte_cryptodev *dev __rte_unused,
                struct rte_cryptodev_asym_session *sess)
 {
-       uint8_t index = dev->driver_id;
-       void *sess_priv = get_asym_session_private_data(sess, index);
+       void *sess_priv = sess->sess_private_data;
 
        /* Zero out the whole structure */
        if (sess_priv) {
                openssl_reset_asym_session(sess_priv);
                memset(sess_priv, 0, sizeof(struct openssl_asym_session));
-               struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
-               set_asym_session_private_data(sess, index, NULL);
-               rte_mempool_put(sess_mp, sess_priv);
        }
 }
 
@@ -1241,7 +1217,6 @@ struct rte_cryptodev_ops openssl_pmd_ops = {
 
                .queue_pair_setup       = openssl_pmd_qp_setup,
                .queue_pair_release     = openssl_pmd_qp_release,
-               .queue_pair_count       = openssl_pmd_qp_count,
 
                .sym_session_get_size   = openssl_pmd_sym_session_get_size,
                .asym_session_get_size  = openssl_pmd_asym_session_get_size,