cryptodev: change queue pair configure structure
[dpdk.git] / drivers / crypto / openssl / rte_openssl_pmd_ops.c
index cc12b58..40217cf 100644 (file)
@@ -1,33 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   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
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2016-2017 Intel Corporation
  */
 
 #include <string.h>
@@ -37,6 +9,7 @@
 #include <rte_cryptodev_pmd.h>
 
 #include "rte_openssl_pmd_private.h"
+#include "compat.h"
 
 
 static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
@@ -48,16 +21,15 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                .algo = RTE_CRYPTO_AUTH_MD5_HMAC,
                                .block_size = 64,
                                .key_size = {
-                                       .min = 64,
+                                       .min = 1,
                                        .max = 64,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .digest_size = {
-                                       .min = 16,
+                                       .min = 1,
                                        .max = 16,
-                                       .increment = 0
+                                       .increment = 1
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -79,7 +51,6 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 16,
                                        .increment = 0
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -92,16 +63,15 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                .algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
                                .block_size = 64,
                                .key_size = {
-                                       .min = 64,
+                                       .min = 1,
                                        .max = 64,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .digest_size = {
-                                       .min = 20,
+                                       .min = 1,
                                        .max = 20,
-                                       .increment = 0
+                                       .increment = 1
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -123,7 +93,6 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 20,
                                        .increment = 0
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -136,16 +105,15 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                .algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
                                .block_size = 64,
                                .key_size = {
-                                       .min = 64,
+                                       .min = 1,
                                        .max = 64,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .digest_size = {
-                                       .min = 28,
+                                       .min = 1,
                                        .max = 28,
-                                       .increment = 0
+                                       .increment = 1
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -163,11 +131,10 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 0
                                },
                                .digest_size = {
-                                       .min = 28,
+                                       .min = 1,
                                        .max = 28,
-                                       .increment = 0
+                                       .increment = 1
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -180,16 +147,15 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                .algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
                                .block_size = 64,
                                .key_size = {
-                                       .min = 64,
+                                       .min = 1,
                                        .max = 64,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .digest_size = {
-                                       .min = 32,
+                                       .min = 1,
                                        .max = 32,
-                                       .increment = 0
+                                       .increment = 1
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -211,7 +177,6 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 32,
                                        .increment = 0
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -224,16 +189,15 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                .algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
                                .block_size = 128,
                                .key_size = {
-                                       .min = 128,
+                                       .min = 1,
                                        .max = 128,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .digest_size = {
-                                       .min = 48,
+                                       .min = 1,
                                        .max = 48,
-                                       .increment = 0
+                                       .increment = 1
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -255,7 +219,6 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 48,
                                        .increment = 0
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -268,16 +231,15 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                .algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
                                .block_size = 128,
                                .key_size = {
-                                       .min = 128,
+                                       .min = 1,
                                        .max = 128,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .digest_size = {
-                                       .min = 64,
+                                       .min = 1,
                                        .max = 64,
-                                       .increment = 0
+                                       .increment = 1
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -299,7 +261,6 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 64,
                                        .increment = 0
                                },
-                               .aad_size = { 0 },
                                .iv_size = { 0 }
                        }, }
                }, }
@@ -344,12 +305,12 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                        }, }
                }, }
        },
-       {       /* AES GCM (AUTH) */
+       {       /* AES GCM */
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
                {.sym = {
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-                       {.auth = {
-                               .algo = RTE_CRYPTO_AUTH_AES_GCM,
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
+                       {.aead = {
+                               .algo = RTE_CRYPTO_AEAD_AES_GCM,
                                .block_size = 16,
                                .key_size = {
                                        .min = 16,
@@ -366,27 +327,41 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .max = 65535,
                                        .increment = 1
                                },
-                               .iv_size = { 0 }
+                               .iv_size = {
+                                       .min = 12,
+                                       .max = 16,
+                                       .increment = 4
+                               },
                        }, }
                }, }
        },
-       {       /* AES GCM (CIPHER) */
+       {       /* AES CCM */
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
                {.sym = {
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-                       {.cipher = {
-                               .algo = RTE_CRYPTO_CIPHER_AES_GCM,
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
+                       {.aead = {
+                               .algo = RTE_CRYPTO_AEAD_AES_CCM,
                                .block_size = 16,
                                .key_size = {
                                        .min = 16,
                                        .max = 32,
                                        .increment = 8
                                },
-                               .iv_size = {
-                                       .min = 12,
+                               .digest_size = {
+                                       .min = 4,
                                        .max = 16,
-                                       .increment = 4
-                               }
+                                       .increment = 2
+                               },
+                               .aad_size = {
+                                       .min = 0,
+                                       .max = 65535,
+                                       .increment = 1
+                               },
+                               .iv_size = {
+                                       .min = 7,
+                                       .max = 13,
+                                       .increment = 1
+                               },
                        }, }
                }, }
        },
@@ -423,7 +398,7 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                .algo = RTE_CRYPTO_CIPHER_3DES_CBC,
                                .block_size = 8,
                                .key_size = {
-                                       .min = 16,
+                                       .min = 8,
                                        .max = 24,
                                        .increment = 8
                                },
@@ -455,6 +430,26 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                        }, }
                }, }
        },
+       {       /* DES CBC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_DES_CBC,
+                               .block_size = 8,
+                               .key_size = {
+                                       .min = 8,
+                                       .max = 8,
+                                       .increment = 0
+                               },
+                               .iv_size = {
+                                       .min = 8,
+                                       .max = 8,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
        {       /* DES DOCSIS BPI */
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
                {.sym = {
@@ -475,6 +470,105 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                        }, }
                }, }
        },
+       {       /* RSA */
+               .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
+               {.asym = {
+                       .xform_capa = {
+                               .xform_type = RTE_CRYPTO_ASYM_XFORM_RSA,
+                               .op_types = ((1 << RTE_CRYPTO_ASYM_OP_SIGN) |
+                                       (1 << RTE_CRYPTO_ASYM_OP_VERIFY) |
+                                       (1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) |
+                                       (1 << RTE_CRYPTO_ASYM_OP_DECRYPT)),
+                               {
+                               .modlen = {
+                               /* min length is based on openssl rsa keygen */
+                               .min = 30,
+                               /* value 0 symbolizes no limit on max length */
+                               .max = 0,
+                               .increment = 1
+                               }, }
+                       }
+               },
+               }
+       },
+       {       /* modexp */
+               .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
+               {.asym = {
+                       .xform_capa = {
+                               .xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,
+                               .op_types = 0,
+                               {
+                               .modlen = {
+                               /* value 0 symbolizes no limit on min length */
+                               .min = 0,
+                               /* value 0 symbolizes no limit on max length */
+                               .max = 0,
+                               .increment = 1
+                               }, }
+                       }
+               },
+               }
+       },
+       {       /* modinv */
+               .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
+               {.asym = {
+                       .xform_capa = {
+                               .xform_type = RTE_CRYPTO_ASYM_XFORM_MODINV,
+                               .op_types = 0,
+                               {
+                               .modlen = {
+                               /* value 0 symbolizes no limit on min length */
+                               .min = 0,
+                               /* value 0 symbolizes no limit on max length */
+                               .max = 0,
+                               .increment = 1
+                               }, }
+                       }
+               },
+               }
+       },
+       {       /* dh */
+               .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
+               {.asym = {
+                       .xform_capa = {
+                               .xform_type = RTE_CRYPTO_ASYM_XFORM_DH,
+                               .op_types =
+                               ((1<<RTE_CRYPTO_ASYM_OP_PRIVATE_KEY_GENERATE) |
+                               (1 << RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE |
+                               (1 <<
+                               RTE_CRYPTO_ASYM_OP_SHARED_SECRET_COMPUTE))),
+                               {
+                               .modlen = {
+                               /* value 0 symbolizes no limit on min length */
+                               .min = 0,
+                               /* value 0 symbolizes no limit on max length */
+                               .max = 0,
+                               .increment = 1
+                               }, }
+                       }
+               },
+               }
+       },
+       {       /* dsa */
+               .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
+               {.asym = {
+                       .xform_capa = {
+                               .xform_type = RTE_CRYPTO_ASYM_XFORM_DSA,
+                               .op_types =
+                               ((1<<RTE_CRYPTO_ASYM_OP_SIGN) |
+                               (1 << RTE_CRYPTO_ASYM_OP_VERIFY)),
+                               {
+                               .modlen = {
+                               /* value 0 symbolizes no limit on min length */
+                               .min = 0,
+                               /* value 0 symbolizes no limit on max length */
+                               .max = 0,
+                               .increment = 1
+                               }, }
+                       }
+               },
+               }
+       },
 
        RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
 };
@@ -549,11 +643,12 @@ openssl_pmd_info_get(struct rte_cryptodev *dev,
        struct openssl_private *internals = dev->data->dev_private;
 
        if (dev_info != NULL) {
-               dev_info->dev_type = dev->dev_type;
+               dev_info->driver_id = dev->driver_id;
                dev_info->feature_flags = dev->feature_flags;
                dev_info->capabilities = openssl_pmd_capabilities;
                dev_info->max_nb_queue_pairs = internals->max_nb_qpairs;
-               dev_info->sym.max_nb_sessions = internals->max_nb_sessions;
+               /* No limit of number of sessions */
+               dev_info->sym.max_nb_sessions = 0;
        }
 }
 
@@ -562,6 +657,11 @@ static int
 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_free(dev->data->queue_pairs[qp_id]);
                dev->data->queue_pairs[qp_id] = NULL;
        }
@@ -577,7 +677,7 @@ openssl_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
                        "openssl_pmd_%u_qp_%u",
                        dev->data->dev_id, qp->id);
 
-       if (n > sizeof(qp->name))
+       if (n >= sizeof(qp->name))
                return -1;
 
        return 0;
@@ -594,14 +694,14 @@ openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp,
        r = rte_ring_lookup(qp->name);
        if (r) {
                if (rte_ring_get_size(r) >= ring_size) {
-                       OPENSSL_LOG_INFO(
-                               "Reusing existing ring %s for processed ops",
+                       OPENSSL_LOG(INFO,
+                                       "Reusing existing ring %s for processed ops",
                                 qp->name);
                        return r;
                }
 
-               OPENSSL_LOG_ERR(
-                       "Unable to reuse existing ring %s for processed ops",
+               OPENSSL_LOG(ERR,
+                               "Unable to reuse existing ring %s for processed ops",
                         qp->name);
                return NULL;
        }
@@ -615,7 +715,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)
+               int socket_id)
 {
        struct openssl_qp *qp = NULL;
 
@@ -640,7 +740,8 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        if (qp->processed_ops == NULL)
                goto qp_setup_cleanup;
 
-       qp->sess_mp = dev->data->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));
 
@@ -653,22 +754,6 @@ qp_setup_cleanup:
        return -1;
 }
 
-/** Start queue pair */
-static int
-openssl_pmd_qp_start(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint16_t queue_pair_id)
-{
-       return -ENOTSUP;
-}
-
-/** Stop queue pair */
-static int
-openssl_pmd_qp_stop(__rte_unused struct rte_cryptodev *dev,
-               __rte_unused uint16_t queue_pair_id)
-{
-       return -ENOTSUP;
-}
-
 /** Return the number of allocated queue pairs */
 static uint32_t
 openssl_pmd_qp_count(struct rte_cryptodev *dev)
@@ -676,44 +761,471 @@ openssl_pmd_qp_count(struct rte_cryptodev *dev)
        return dev->data->nb_queue_pairs;
 }
 
-/** Returns the size of the session structure */
+/** Returns the size of the symmetric session structure */
 static unsigned
-openssl_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused)
+openssl_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
 {
        return sizeof(struct openssl_session);
 }
 
+/** Returns the size of the asymmetric session structure */
+static unsigned
+openssl_pmd_asym_session_get_size(struct rte_cryptodev *dev __rte_unused)
+{
+       return sizeof(struct openssl_asym_session);
+}
+
 /** Configure the session from a crypto xform chain */
-static void *
-openssl_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
-               struct rte_crypto_sym_xform *xform,     void *sess)
+static int
+openssl_pmd_sym_session_configure(struct rte_cryptodev *dev __rte_unused,
+               struct rte_crypto_sym_xform *xform,
+               struct rte_cryptodev_sym_session *sess,
+               struct rte_mempool *mempool)
 {
+       void *sess_private_data;
+       int ret;
+
        if (unlikely(sess == NULL)) {
-               OPENSSL_LOG_ERR("invalid session struct");
-               return NULL;
+               OPENSSL_LOG(ERR, "invalid session struct");
+               return -EINVAL;
        }
 
-       if (openssl_set_session_parameters(
-                       sess, xform) != 0) {
-               OPENSSL_LOG_ERR("failed configure session parameters");
-               return NULL;
+       if (rte_mempool_get(mempool, &sess_private_data)) {
+               OPENSSL_LOG(ERR,
+                       "Couldn't get object from session mempool");
+               return -ENOMEM;
+       }
+
+       ret = openssl_set_session_parameters(sess_private_data, xform);
+       if (ret != 0) {
+               OPENSSL_LOG(ERR, "failed configure session parameters");
+
+               /* Return session to mempool */
+               rte_mempool_put(mempool, sess_private_data);
+               return ret;
        }
 
-       return sess;
+       set_sym_session_private_data(sess, dev->driver_id,
+                       sess_private_data);
+
+       return 0;
 }
 
+static int openssl_set_asym_session_parameters(
+               struct openssl_asym_session *asym_session,
+               struct rte_crypto_asym_xform *xform)
+{
+       int ret = 0;
+
+       if ((xform->xform_type != RTE_CRYPTO_ASYM_XFORM_DH) &&
+               (xform->next != NULL)) {
+               OPENSSL_LOG(ERR, "chained xfrms are not supported on %s",
+                       rte_crypto_asym_xform_strings[xform->xform_type]);
+               return -1;
+       }
+
+       switch (xform->xform_type) {
+       case RTE_CRYPTO_ASYM_XFORM_RSA:
+       {
+               BIGNUM *n = NULL;
+               BIGNUM *e = NULL;
+               BIGNUM *d = NULL;
+               BIGNUM *p = NULL, *q = NULL, *dmp1 = NULL;
+               BIGNUM *iqmp = NULL, *dmq1 = NULL;
+
+               /* copy xfrm data into rsa struct */
+               n = BN_bin2bn((const unsigned char *)xform->rsa.n.data,
+                               xform->rsa.n.length, n);
+               e = BN_bin2bn((const unsigned char *)xform->rsa.e.data,
+                               xform->rsa.e.length, e);
+
+               if (!n || !e)
+                       goto err_rsa;
+
+               RSA *rsa = RSA_new();
+               if (rsa == NULL)
+                       goto err_rsa;
+
+               if (xform->rsa.key_type == RTE_RSA_KEY_TYPE_EXP) {
+                       d = BN_bin2bn(
+                       (const unsigned char *)xform->rsa.d.data,
+                       xform->rsa.d.length,
+                       d);
+                       if (!d) {
+                               RSA_free(rsa);
+                               goto err_rsa;
+                       }
+               } else {
+                       p = BN_bin2bn((const unsigned char *)
+                                       xform->rsa.qt.p.data,
+                                       xform->rsa.qt.p.length,
+                                       p);
+                       q = BN_bin2bn((const unsigned char *)
+                                       xform->rsa.qt.q.data,
+                                       xform->rsa.qt.q.length,
+                                       q);
+                       dmp1 = BN_bin2bn((const unsigned char *)
+                                       xform->rsa.qt.dP.data,
+                                       xform->rsa.qt.dP.length,
+                                       dmp1);
+                       dmq1 = BN_bin2bn((const unsigned char *)
+                                       xform->rsa.qt.dQ.data,
+                                       xform->rsa.qt.dQ.length,
+                                       dmq1);
+                       iqmp = BN_bin2bn((const unsigned char *)
+                                       xform->rsa.qt.qInv.data,
+                                       xform->rsa.qt.qInv.length,
+                                       iqmp);
+
+                       if (!p || !q || !dmp1 || !dmq1 || !iqmp) {
+                               RSA_free(rsa);
+                               goto err_rsa;
+                       }
+                       ret = set_rsa_params(rsa, p, q);
+                       if (ret) {
+                               OPENSSL_LOG(ERR,
+                                       "failed to set rsa params\n");
+                               RSA_free(rsa);
+                               goto err_rsa;
+                       }
+                       ret = set_rsa_crt_params(rsa, dmp1, dmq1, iqmp);
+                       if (ret) {
+                               OPENSSL_LOG(ERR,
+                                       "failed to set crt params\n");
+                               RSA_free(rsa);
+                               /*
+                                * set already populated params to NULL
+                                * as its freed by call to RSA_free
+                                */
+                               p = q = NULL;
+                               goto err_rsa;
+                       }
+               }
+
+               ret = set_rsa_keys(rsa, n, e, d);
+               if (ret) {
+                       OPENSSL_LOG(ERR, "Failed to load rsa keys\n");
+                       RSA_free(rsa);
+                       return -1;
+               }
+               asym_session->u.r.rsa = rsa;
+               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);
+
+               return -1;
+       }
+       case RTE_CRYPTO_ASYM_XFORM_MODEX:
+       {
+               struct rte_crypto_modex_xform *xfrm = &(xform->modex);
+
+               BN_CTX *ctx = BN_CTX_new();
+               if (ctx == NULL) {
+                       OPENSSL_LOG(ERR,
+                               " failed to allocate resources\n");
+                       return -1;
+               }
+               BN_CTX_start(ctx);
+               BIGNUM *mod = BN_CTX_get(ctx);
+               BIGNUM *exp = BN_CTX_get(ctx);
+               if (mod == NULL || exp == NULL) {
+                       BN_CTX_end(ctx);
+                       BN_CTX_free(ctx);
+                       return -1;
+               }
+
+               mod = BN_bin2bn((const unsigned char *)
+                               xfrm->modulus.data,
+                               xfrm->modulus.length, mod);
+               exp = BN_bin2bn((const unsigned char *)
+                               xfrm->exponent.data,
+                               xfrm->exponent.length, exp);
+               asym_session->u.e.ctx = ctx;
+               asym_session->u.e.mod = mod;
+               asym_session->u.e.exp = exp;
+               asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_MODEX;
+               break;
+       }
+       case RTE_CRYPTO_ASYM_XFORM_MODINV:
+       {
+               struct rte_crypto_modinv_xform *xfrm = &(xform->modinv);
+
+               BN_CTX *ctx = BN_CTX_new();
+               if (ctx == NULL) {
+                       OPENSSL_LOG(ERR,
+                               " failed to allocate resources\n");
+                       return -1;
+               }
+               BN_CTX_start(ctx);
+               BIGNUM *mod = BN_CTX_get(ctx);
+               if (mod == NULL) {
+                       BN_CTX_end(ctx);
+                       BN_CTX_free(ctx);
+                       return -1;
+               }
+
+               mod = BN_bin2bn((const unsigned char *)
+                               xfrm->modulus.data,
+                               xfrm->modulus.length,
+                               mod);
+               asym_session->u.m.ctx = ctx;
+               asym_session->u.m.modulus = mod;
+               asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_MODINV;
+               break;
+       }
+       case RTE_CRYPTO_ASYM_XFORM_DH:
+       {
+               BIGNUM *p = NULL;
+               BIGNUM *g = NULL;
+
+               p = BN_bin2bn((const unsigned char *)
+                               xform->dh.p.data,
+                               xform->dh.p.length,
+                               p);
+               g = BN_bin2bn((const unsigned char *)
+                               xform->dh.g.data,
+                               xform->dh.g.length,
+                               g);
+               if (!p || !g)
+                       goto err_dh;
+
+               DH *dh = DH_new();
+               if (dh == NULL) {
+                       OPENSSL_LOG(ERR,
+                               "failed to allocate resources\n");
+                       goto err_dh;
+               }
+               ret = set_dh_params(dh, p, g);
+               if (ret) {
+                       DH_free(dh);
+                       goto err_dh;
+               }
+
+               /*
+                * setup xfrom for
+                * public key generate, or
+                * DH Priv key generate, or both
+                * public and private key generate
+                */
+               asym_session->u.dh.key_op = (1 << xform->dh.type);
+
+               if (xform->dh.type ==
+                       RTE_CRYPTO_ASYM_OP_PRIVATE_KEY_GENERATE) {
+                       /* check if next is pubkey */
+                       if ((xform->next != NULL) &&
+                               (xform->next->xform_type ==
+                               RTE_CRYPTO_ASYM_XFORM_DH) &&
+                               (xform->next->dh.type ==
+                               RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE)
+                               ) {
+                               /*
+                                * setup op as pub/priv key
+                                * pair generationi
+                                */
+                               asym_session->u.dh.key_op |=
+                               (1 <<
+                               RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE);
+                       }
+               }
+               asym_session->u.dh.dh_key = dh;
+               asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_DH;
+               break;
+
+err_dh:
+               OPENSSL_LOG(ERR, " failed to set dh params\n");
+               BN_free(p);
+               BN_free(g);
+               return -1;
+       }
+       case RTE_CRYPTO_ASYM_XFORM_DSA:
+       {
+               BIGNUM *p = NULL, *g = NULL;
+               BIGNUM *q = NULL, *priv_key = NULL;
+               BIGNUM *pub_key = BN_new();
+               BN_zero(pub_key);
+
+               p = BN_bin2bn((const unsigned char *)
+                               xform->dsa.p.data,
+                               xform->dsa.p.length,
+                               p);
+
+               g = BN_bin2bn((const unsigned char *)
+                               xform->dsa.g.data,
+                               xform->dsa.g.length,
+                               g);
+
+               q = BN_bin2bn((const unsigned char *)
+                               xform->dsa.q.data,
+                               xform->dsa.q.length,
+                               q);
+               if (!p || !q || !g)
+                       goto err_dsa;
+
+               priv_key = BN_bin2bn((const unsigned char *)
+                               xform->dsa.x.data,
+                               xform->dsa.x.length,
+                               priv_key);
+               if (priv_key == NULL)
+                       goto err_dsa;
+
+               DSA *dsa = DSA_new();
+               if (dsa == NULL) {
+                       OPENSSL_LOG(ERR,
+                               " failed to allocate resources\n");
+                       goto err_dsa;
+               }
+
+               ret = set_dsa_params(dsa, p, q, g);
+               if (ret) {
+                       DSA_free(dsa);
+                       OPENSSL_LOG(ERR, "Failed to dsa params\n");
+                       goto err_dsa;
+               }
+
+               /*
+                * openssl 1.1.0 mandate that public key can't be
+                * NULL in very first call. so set a dummy pub key.
+                * to keep consistency, lets follow same approach for
+                * both versions
+                */
+               /* just set dummy public for very 1st call */
+               ret = set_dsa_keys(dsa, pub_key, priv_key);
+               if (ret) {
+                       DSA_free(dsa);
+                       OPENSSL_LOG(ERR, "Failed to set keys\n");
+                       return -1;
+               }
+               asym_session->u.s.dsa = dsa;
+               asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_DSA;
+               break;
+
+err_dsa:
+               BN_free(p);
+               BN_free(q);
+               BN_free(g);
+               BN_free(priv_key);
+               BN_free(pub_key);
+               return -1;
+       }
+       default:
+               return -1;
+       }
+
+       return 0;
+}
+
+/** Configure the session from a crypto xform chain */
+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)
+{
+       void *asym_sess_private_data;
+       int ret;
+
+       if (unlikely(sess == NULL)) {
+               OPENSSL_LOG(ERR, "invalid asymmetric session struct");
+               return -EINVAL;
+       }
+
+       if (rte_mempool_get(mempool, &asym_sess_private_data)) {
+               CDEV_LOG_ERR(
+                       "Couldn't get object from session mempool");
+               return -ENOMEM;
+       }
+
+       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;
+}
 
 /** Clear the memory of session so it doesn't leave key material behind */
 static void
-openssl_pmd_session_clear(struct rte_cryptodev *dev __rte_unused, void *sess)
+openssl_pmd_sym_session_clear(struct rte_cryptodev *dev,
+               struct rte_cryptodev_sym_session *sess)
+{
+       uint8_t index = dev->driver_id;
+       void *sess_priv = get_sym_session_private_data(sess, index);
+
+       /* Zero out the whole structure */
+       if (sess_priv) {
+               openssl_reset_session(sess_priv);
+               memset(sess_priv, 0, sizeof(struct openssl_session));
+               struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
+               set_sym_session_private_data(sess, index, NULL);
+               rte_mempool_put(sess_mp, sess_priv);
+       }
+}
+
+static void openssl_reset_asym_session(struct openssl_asym_session *sess)
+{
+       switch (sess->xfrm_type) {
+       case RTE_CRYPTO_ASYM_XFORM_RSA:
+               if (sess->u.r.rsa)
+                       RSA_free(sess->u.r.rsa);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_MODEX:
+               if (sess->u.e.ctx) {
+                       BN_CTX_end(sess->u.e.ctx);
+                       BN_CTX_free(sess->u.e.ctx);
+               }
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_MODINV:
+               if (sess->u.m.ctx) {
+                       BN_CTX_end(sess->u.m.ctx);
+                       BN_CTX_free(sess->u.m.ctx);
+               }
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_DH:
+               if (sess->u.dh.dh_key)
+                       DH_free(sess->u.dh.dh_key);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_DSA:
+               if (sess->u.s.dsa)
+                       DSA_free(sess->u.s.dsa);
+               break;
+       default:
+               break;
+       }
+}
+
+/** Clear the memory of asymmetric session
+ * so it doesn't leave key material behind
+ */
+static void
+openssl_pmd_asym_session_clear(struct rte_cryptodev *dev,
+               struct rte_cryptodev_asym_session *sess)
 {
-       /*
-        * Current just resetting the whole data structure, need to investigate
-        * whether a more selective reset of key would be more performant
-        */
-       if (sess) {
-               openssl_reset_session(sess);
-               memset(sess, 0, sizeof(struct openssl_session));
+       uint8_t index = dev->driver_id;
+       void *sess_priv = get_asym_session_private_data(sess, index);
+
+       /* 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);
        }
 }
 
@@ -730,13 +1242,14 @@ struct rte_cryptodev_ops openssl_pmd_ops = {
 
                .queue_pair_setup       = openssl_pmd_qp_setup,
                .queue_pair_release     = openssl_pmd_qp_release,
-               .queue_pair_start       = openssl_pmd_qp_start,
-               .queue_pair_stop        = openssl_pmd_qp_stop,
                .queue_pair_count       = openssl_pmd_qp_count,
 
-               .session_get_size       = openssl_pmd_session_get_size,
-               .session_configure      = openssl_pmd_session_configure,
-               .session_clear          = openssl_pmd_session_clear
+               .sym_session_get_size   = openssl_pmd_sym_session_get_size,
+               .asym_session_get_size  = openssl_pmd_asym_session_get_size,
+               .sym_session_configure  = openssl_pmd_sym_session_configure,
+               .asym_session_configure = openssl_pmd_asym_session_configure,
+               .sym_session_clear      = openssl_pmd_sym_session_clear,
+               .asym_session_clear     = openssl_pmd_asym_session_clear
 };
 
 struct rte_cryptodev_ops *rte_openssl_pmd_ops = &openssl_pmd_ops;