net/tap: set BPF syscall ID for RISC-V
[dpdk.git] / drivers / crypto / qat / qat_asym.c
index af96cc6..82a0450 100644 (file)
@@ -34,7 +34,7 @@ static const struct rte_driver cryptodev_qat_asym_driver = {
 /*
  * Macros with suffix _F are used with some of predefinded identifiers:
  * - cookie->input_buffer
- * - qat_alg_bytesize
+ * - qat_func_alignsize
  */
 #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
 #define HEXDUMP(name, where, size) QAT_DP_HEXDUMP_LOG(DEBUG, name, \
@@ -43,8 +43,8 @@ static const struct rte_driver cryptodev_qat_asym_driver = {
                        &where[idx * size], size)
 
 #define HEXDUMP_OFF_F(name, idx) QAT_DP_HEXDUMP_LOG(DEBUG, name, \
-                       &cookie->input_buffer[idx * qat_alg_bytesize], \
-                       qat_alg_bytesize)
+                       &cookie->input_buffer[idx * qat_func_alignsize], \
+                       qat_func_alignsize)
 #else
 #define HEXDUMP(name, where, size)
 #define HEXDUMP_OFF(name, where, size, idx)
@@ -69,36 +69,28 @@ static const struct rte_driver cryptodev_qat_asym_driver = {
                } \
        } while (0)
 
-#define SET_PKE_LN(where, what, how, idx) \
-       rte_memcpy(where[idx] + how - \
-               what.length, \
-               what.data, \
-               what.length)
-
-#define SET_PKE_LN_9A(where, what, how, idx) \
-               rte_memcpy(&where[idx * RTE_ALIGN_CEIL(how, 8)] + \
-                       RTE_ALIGN_CEIL(how, 8) - \
+#define SET_PKE_LN(what, how, idx) \
+               rte_memcpy(cookie->input_array[idx] + how - \
                        what.length, \
                        what.data, \
                        what.length)
 
-#define SET_PKE_LN_EC(where, what, how, idx) \
-               rte_memcpy(where[idx] + \
-                       RTE_ALIGN_CEIL(how, 8) - \
-                       how, \
-                       what.data, \
-                       how)
+#define SET_PKE_LN_EC(curve, p, idx) \
+               rte_memcpy(cookie->input_array[idx] + \
+                       qat_func_alignsize - curve.bytesize, \
+                       curve.p.data, curve.bytesize)
 
-#define SET_PKE_LN_9A_F(what, idx) \
-               rte_memcpy(&cookie->input_buffer[idx * qat_alg_bytesize] + \
-                       qat_alg_bytesize - what.length, \
+#define SET_PKE_9A_IN(what, idx) \
+               rte_memcpy(&cookie->input_buffer[idx * \
+                       qat_func_alignsize] + \
+                       qat_func_alignsize - what.length, \
                        what.data, what.length)
 
-#define SET_PKE_LN_EC_F(what, how, idx) \
+#define SET_PKE_9A_EC(curve, p, idx) \
                rte_memcpy(&cookie->input_buffer[idx * \
-                       RTE_ALIGN_CEIL(how, 8)] + \
-                       RTE_ALIGN_CEIL(how, 8) - how, \
-                       what.data, how)
+                       qat_func_alignsize] + \
+                       qat_func_alignsize - curve.bytesize, \
+                       curve.p.data, curve.bytesize)
 
 static void
 request_init(struct icp_qat_fw_pke_request *qat_req)
@@ -205,7 +197,7 @@ modexp_set_input(struct rte_crypto_asym_op *asym_op,
                struct rte_crypto_asym_xform *xform)
 {
        struct qat_asym_function qat_function;
-       uint32_t alg_bytesize, func_id;
+       uint32_t alg_bytesize, func_id, in_bytesize;
        int status = 0;
 
        CHECK_IF_NOT_EMPTY(xform->modex.modulus, "mod exp",
@@ -215,7 +207,15 @@ modexp_set_input(struct rte_crypto_asym_op *asym_op,
        if (status)
                return status;
 
-       qat_function = get_asym_function(xform);
+       if (asym_op->modex.base.length > xform->modex.exponent.length &&
+               asym_op->modex.base.length > xform->modex.modulus.length) {
+               in_bytesize = asym_op->modex.base.length;
+       } else if (xform->modex.exponent.length > xform->modex.modulus.length)
+               in_bytesize = xform->modex.exponent.length;
+       else
+               in_bytesize = xform->modex.modulus.length;
+
+       qat_function = get_modexp_function2(in_bytesize);
        func_id = qat_function.func_id;
        if (qat_function.func_id == 0) {
                QAT_LOG(ERR, "Cannot obtain functionality id");
@@ -223,12 +223,9 @@ modexp_set_input(struct rte_crypto_asym_op *asym_op,
        }
        alg_bytesize = qat_function.bytesize;
 
-       SET_PKE_LN(cookie->input_array, asym_op->modex.base,
-                       alg_bytesize, 0);
-       SET_PKE_LN(cookie->input_array, xform->modex.exponent,
-                       alg_bytesize, 1);
-       SET_PKE_LN(cookie->input_array, xform->modex.modulus,
-                       alg_bytesize, 2);
+       SET_PKE_LN(asym_op->modex.base, alg_bytesize, 0);
+       SET_PKE_LN(xform->modex.exponent, alg_bytesize, 1);
+       SET_PKE_LN(xform->modex.modulus, alg_bytesize, 2);
 
        cookie->alg_bytesize = alg_bytesize;
        qat_req->pke_hdr.cd_pars.func_id = func_id;
@@ -282,10 +279,8 @@ modinv_set_input(struct rte_crypto_asym_op *asym_op,
        }
        alg_bytesize = qat_function.bytesize;
 
-       SET_PKE_LN(cookie->input_array, asym_op->modinv.base,
-                       alg_bytesize, 0);
-       SET_PKE_LN(cookie->input_array, xform->modinv.modulus,
-                       alg_bytesize, 1);
+       SET_PKE_LN(asym_op->modinv.base, alg_bytesize, 0);
+       SET_PKE_LN(xform->modinv.modulus, alg_bytesize, 1);
 
        cookie->alg_bytesize = alg_bytesize;
        qat_req->pke_hdr.cd_pars.func_id = func_id;
@@ -337,10 +332,9 @@ rsa_set_pub_input(struct rte_crypto_asym_op *asym_op,
        alg_bytesize = qat_function.bytesize;
 
        if (asym_op->rsa.op_type == RTE_CRYPTO_ASYM_OP_ENCRYPT) {
-               switch (asym_op->rsa.pad) {
+               switch (asym_op->rsa.padding.type) {
                case RTE_CRYPTO_RSA_PADDING_NONE:
-                       SET_PKE_LN(cookie->input_array, asym_op->rsa.message,
-                                       alg_bytesize, 0);
+                       SET_PKE_LN(asym_op->rsa.message, alg_bytesize, 0);
                        break;
                default:
                        QAT_LOG(ERR,
@@ -350,10 +344,9 @@ rsa_set_pub_input(struct rte_crypto_asym_op *asym_op,
                }
                HEXDUMP("RSA Message", cookie->input_array[0], alg_bytesize);
        } else {
-               switch (asym_op->rsa.pad) {
+               switch (asym_op->rsa.padding.type) {
                case RTE_CRYPTO_RSA_PADDING_NONE:
-                       SET_PKE_LN(cookie->input_array, asym_op->rsa.sign,
-                                       alg_bytesize, 0);
+                       SET_PKE_LN(asym_op->rsa.sign, alg_bytesize, 0);
                        break;
                default:
                        QAT_LOG(ERR,
@@ -364,10 +357,8 @@ rsa_set_pub_input(struct rte_crypto_asym_op *asym_op,
                                alg_bytesize);
        }
 
-       SET_PKE_LN(cookie->input_array, xform->rsa.e,
-                       alg_bytesize, 1);
-       SET_PKE_LN(cookie->input_array, xform->rsa.n,
-                       alg_bytesize, 2);
+       SET_PKE_LN(xform->rsa.e, alg_bytesize, 1);
+       SET_PKE_LN(xform->rsa.n, alg_bytesize, 2);
 
        cookie->alg_bytesize = alg_bytesize;
        qat_req->pke_hdr.cd_pars.func_id = func_id;
@@ -399,16 +390,11 @@ rsa_set_priv_input(struct rte_crypto_asym_op *asym_op,
                qat_req->input_param_count =
                                QAT_ASYM_RSA_QT_NUM_IN_PARAMS;
 
-               SET_PKE_LN(cookie->input_array, xform->rsa.qt.p,
-                       (alg_bytesize >> 1), 1);
-               SET_PKE_LN(cookie->input_array, xform->rsa.qt.q,
-                       (alg_bytesize >> 1), 2);
-               SET_PKE_LN(cookie->input_array, xform->rsa.qt.dP,
-                       (alg_bytesize >> 1), 3);
-               SET_PKE_LN(cookie->input_array, xform->rsa.qt.dQ,
-                       (alg_bytesize >> 1), 4);
-               SET_PKE_LN(cookie->input_array, xform->rsa.qt.qInv,
-                       (alg_bytesize >> 1), 5);
+               SET_PKE_LN(xform->rsa.qt.p, (alg_bytesize >> 1), 1);
+               SET_PKE_LN(xform->rsa.qt.q, (alg_bytesize >> 1), 2);
+               SET_PKE_LN(xform->rsa.qt.dP, (alg_bytesize >> 1), 3);
+               SET_PKE_LN(xform->rsa.qt.dQ, (alg_bytesize >> 1), 4);
+               SET_PKE_LN(xform->rsa.qt.qInv, (alg_bytesize >> 1), 5);
 
                HEXDUMP("RSA p", cookie->input_array[1],
                                alg_bytesize);
@@ -430,10 +416,8 @@ rsa_set_priv_input(struct rte_crypto_asym_op *asym_op,
                }
                alg_bytesize = qat_function.bytesize;
 
-               SET_PKE_LN(cookie->input_array, xform->rsa.d,
-                       alg_bytesize, 1);
-               SET_PKE_LN(cookie->input_array, xform->rsa.n,
-                       alg_bytesize, 2);
+               SET_PKE_LN(xform->rsa.d, alg_bytesize, 1);
+               SET_PKE_LN(xform->rsa.n, alg_bytesize, 2);
 
                HEXDUMP("RSA d", cookie->input_array[1],
                                alg_bytesize);
@@ -446,10 +430,9 @@ rsa_set_priv_input(struct rte_crypto_asym_op *asym_op,
 
        if (asym_op->rsa.op_type ==
                        RTE_CRYPTO_ASYM_OP_DECRYPT) {
-               switch (asym_op->rsa.pad) {
+               switch (asym_op->rsa.padding.type) {
                case RTE_CRYPTO_RSA_PADDING_NONE:
-                       SET_PKE_LN(cookie->input_array, asym_op->rsa.cipher,
-                               alg_bytesize, 0);
+                       SET_PKE_LN(asym_op->rsa.cipher, alg_bytesize, 0);
                        HEXDUMP("RSA ciphertext", cookie->input_array[0],
                                alg_bytesize);
                        break;
@@ -461,10 +444,9 @@ rsa_set_priv_input(struct rte_crypto_asym_op *asym_op,
 
        } else if (asym_op->rsa.op_type ==
                        RTE_CRYPTO_ASYM_OP_SIGN) {
-               switch (asym_op->rsa.pad) {
+               switch (asym_op->rsa.padding.type) {
                case RTE_CRYPTO_RSA_PADDING_NONE:
-                       SET_PKE_LN(cookie->input_array, asym_op->rsa.message,
-                               alg_bytesize, 0);
+                       SET_PKE_LN(asym_op->rsa.message, alg_bytesize, 0);
                        HEXDUMP("RSA text to be signed", cookie->input_array[0],
                                alg_bytesize);
                        break;
@@ -521,7 +503,7 @@ rsa_collect(struct rte_crypto_asym_op *asym_op,
                } else {
                        uint8_t *rsa_result = asym_op->rsa.cipher.data;
 
-                       switch (asym_op->rsa.pad) {
+                       switch (asym_op->rsa.padding.type) {
                        case RTE_CRYPTO_RSA_PADDING_NONE:
                                rte_memcpy(rsa_result,
                                                cookie->output_array[0],
@@ -539,7 +521,7 @@ rsa_collect(struct rte_crypto_asym_op *asym_op,
                if (asym_op->rsa.op_type == RTE_CRYPTO_ASYM_OP_DECRYPT) {
                        uint8_t *rsa_result = asym_op->rsa.message.data;
 
-                       switch (asym_op->rsa.pad) {
+                       switch (asym_op->rsa.padding.type) {
                        case RTE_CRYPTO_RSA_PADDING_NONE:
                                rte_memcpy(rsa_result,
                                        cookie->output_array[0],
@@ -572,12 +554,12 @@ ecdsa_set_input(struct rte_crypto_asym_op *asym_op,
                struct rte_crypto_asym_xform *xform)
 {
        struct qat_asym_function qat_function;
-       uint32_t alg_bytesize, qat_alg_bytesize, func_id;
+       uint32_t qat_func_alignsize, func_id;
        int curve_id;
 
        curve_id = pick_curve(xform);
        if (curve_id < 0) {
-               QAT_LOG(ERR, "Incorrect elliptic curve");
+               QAT_LOG(DEBUG, "Incorrect elliptic curve");
                return -EINVAL;
        }
 
@@ -589,20 +571,21 @@ ecdsa_set_input(struct rte_crypto_asym_op *asym_op,
                        QAT_LOG(ERR, "Cannot obtain functionality id");
                        return -EINVAL;
                }
-               alg_bytesize = qat_function.bytesize;
-               qat_alg_bytesize = RTE_ALIGN_CEIL(alg_bytesize, 8);
-
-               SET_PKE_LN_9A_F(asym_op->ecdsa.pkey, 0);
-               SET_PKE_LN_9A_F(asym_op->ecdsa.message, 1);
-               SET_PKE_LN_9A_F(asym_op->ecdsa.k, 2);
-               SET_PKE_LN_EC_F(curve[curve_id].b, alg_bytesize, 3);
-               SET_PKE_LN_EC_F(curve[curve_id].a, alg_bytesize, 4);
-               SET_PKE_LN_EC_F(curve[curve_id].p, alg_bytesize, 5);
-               SET_PKE_LN_EC_F(curve[curve_id].n, alg_bytesize, 6);
-               SET_PKE_LN_EC_F(curve[curve_id].y, alg_bytesize, 7);
-               SET_PKE_LN_EC_F(curve[curve_id].x, alg_bytesize, 8);
-
-               cookie->alg_bytesize = alg_bytesize;
+               qat_func_alignsize =
+                       RTE_ALIGN_CEIL(qat_function.bytesize, 8);
+
+               SET_PKE_9A_IN(asym_op->ecdsa.pkey, 0);
+               SET_PKE_9A_IN(asym_op->ecdsa.message, 1);
+               SET_PKE_9A_IN(asym_op->ecdsa.k, 2);
+               SET_PKE_9A_EC(curve[curve_id], b, 3);
+               SET_PKE_9A_EC(curve[curve_id], a, 4);
+               SET_PKE_9A_EC(curve[curve_id], p, 5);
+               SET_PKE_9A_EC(curve[curve_id], n, 6);
+               SET_PKE_9A_EC(curve[curve_id], y, 7);
+               SET_PKE_9A_EC(curve[curve_id], x, 8);
+
+               cookie->alg_bytesize = curve[curve_id].bytesize;
+               cookie->qat_func_alignsize = qat_func_alignsize;
                qat_req->pke_hdr.cd_pars.func_id = func_id;
                qat_req->input_param_count =
                                QAT_ASYM_ECDSA_RS_SIGN_IN_PARAMS;
@@ -625,39 +608,39 @@ ecdsa_set_input(struct rte_crypto_asym_op *asym_op,
                        QAT_LOG(ERR, "Cannot obtain functionality id");
                        return -EINVAL;
                }
-               alg_bytesize = qat_function.bytesize;
-               qat_alg_bytesize = RTE_ALIGN_CEIL(alg_bytesize, 8);
-
-               SET_PKE_LN_9A_F(asym_op->ecdsa.message, 10);
-               SET_PKE_LN_9A_F(asym_op->ecdsa.s, 9);
-               SET_PKE_LN_9A_F(asym_op->ecdsa.r, 8);
-               SET_PKE_LN_EC_F(curve[curve_id].n, alg_bytesize, 7);
-               SET_PKE_LN_EC_F(curve[curve_id].x, alg_bytesize, 6);
-               SET_PKE_LN_EC_F(curve[curve_id].y, alg_bytesize, 5);
-               SET_PKE_LN_9A_F(asym_op->ecdsa.q.x, 4);
-               SET_PKE_LN_9A_F(asym_op->ecdsa.q.y, 3);
-               SET_PKE_LN_EC_F(curve[curve_id].a, alg_bytesize, 2);
-               SET_PKE_LN_EC_F(curve[curve_id].b, alg_bytesize, 1);
-               SET_PKE_LN_EC_F(curve[curve_id].p, alg_bytesize, 0);
-
-               cookie->alg_bytesize = alg_bytesize;
+               qat_func_alignsize = RTE_ALIGN_CEIL(qat_function.bytesize, 8);
+
+               SET_PKE_9A_IN(asym_op->ecdsa.message, 10);
+               SET_PKE_9A_IN(asym_op->ecdsa.s, 9);
+               SET_PKE_9A_IN(asym_op->ecdsa.r, 8);
+               SET_PKE_9A_EC(curve[curve_id], n, 7);
+               SET_PKE_9A_EC(curve[curve_id], x, 6);
+               SET_PKE_9A_EC(curve[curve_id], y, 5);
+               SET_PKE_9A_IN(asym_op->ecdsa.q.x, 4);
+               SET_PKE_9A_IN(asym_op->ecdsa.q.y, 3);
+               SET_PKE_9A_EC(curve[curve_id], a, 2);
+               SET_PKE_9A_EC(curve[curve_id], b, 1);
+               SET_PKE_9A_EC(curve[curve_id], p, 0);
+
+               cookie->alg_bytesize = curve[curve_id].bytesize;
+               cookie->qat_func_alignsize = qat_func_alignsize;
                qat_req->pke_hdr.cd_pars.func_id = func_id;
                qat_req->input_param_count =
                                QAT_ASYM_ECDSA_RS_VERIFY_IN_PARAMS;
                qat_req->output_param_count =
                                QAT_ASYM_ECDSA_RS_VERIFY_OUT_PARAMS;
 
-               HEXDUMP_OFF_F("e", 0);
-               HEXDUMP_OFF_F("s", 1);
-               HEXDUMP_OFF_F("r", 2);
-               HEXDUMP_OFF_F("n", 3);
-               HEXDUMP_OFF_F("xG", 4);
+               HEXDUMP_OFF_F("p", 0);
+               HEXDUMP_OFF_F("b", 1);
+               HEXDUMP_OFF_F("a", 2);
+               HEXDUMP_OFF_F("y", 3);
+               HEXDUMP_OFF_F("x", 4);
                HEXDUMP_OFF_F("yG", 5);
-               HEXDUMP_OFF_F("xQ", 6);
-               HEXDUMP_OFF_F("yQ", 7);
-               HEXDUMP_OFF_F("a", 8);
-               HEXDUMP_OFF_F("b", 9);
-               HEXDUMP_OFF_F("q", 10);
+               HEXDUMP_OFF_F("xG", 6);
+               HEXDUMP_OFF_F("n", 7);
+               HEXDUMP_OFF_F("r", 8);
+               HEXDUMP_OFF_F("s", 9);
+               HEXDUMP_OFF_F("e", 10);
                break;
        default:
                return -1;
@@ -670,7 +653,9 @@ static uint8_t
 ecdsa_collect(struct rte_crypto_asym_op *asym_op,
                struct qat_asym_op_cookie *cookie)
 {
-       uint32_t alg_bytesize = RTE_ALIGN_CEIL(cookie->alg_bytesize, 8);
+       uint32_t alg_bytesize = cookie->alg_bytesize;
+       uint32_t qat_func_alignsize = cookie->qat_func_alignsize;
+       uint32_t ltrim = qat_func_alignsize - alg_bytesize;
 
        if (asym_op->rsa.op_type == RTE_CRYPTO_ASYM_OP_SIGN) {
                uint8_t *r = asym_op->ecdsa.r.data;
@@ -678,12 +663,13 @@ ecdsa_collect(struct rte_crypto_asym_op *asym_op,
 
                asym_op->ecdsa.r.length = alg_bytesize;
                asym_op->ecdsa.s.length = alg_bytesize;
-               rte_memcpy(r, cookie->output_array[0], alg_bytesize);
-               rte_memcpy(s, cookie->output_array[1], alg_bytesize);
+               rte_memcpy(r, &cookie->output_array[0][ltrim], alg_bytesize);
+               rte_memcpy(s, &cookie->output_array[1][ltrim], alg_bytesize);
+
                HEXDUMP("R", cookie->output_array[0],
-                       alg_bytesize);
+                       qat_func_alignsize);
                HEXDUMP("S", cookie->output_array[1],
-                       alg_bytesize);
+                       qat_func_alignsize);
        }
        return RTE_CRYPTO_OP_STATUS_SUCCESS;
 }
@@ -695,12 +681,12 @@ ecpm_set_input(struct rte_crypto_asym_op *asym_op,
                struct rte_crypto_asym_xform *xform)
 {
        struct qat_asym_function qat_function;
-       uint32_t alg_bytesize, __rte_unused qat_alg_bytesize, func_id;
+       uint32_t qat_func_alignsize, func_id;
        int curve_id;
 
        curve_id = pick_curve(xform);
        if (curve_id < 0) {
-               QAT_LOG(ERR, "Incorrect elliptic curve");
+               QAT_LOG(DEBUG, "Incorrect elliptic curve");
                return -EINVAL;
        }
 
@@ -710,38 +696,31 @@ ecpm_set_input(struct rte_crypto_asym_op *asym_op,
                QAT_LOG(ERR, "Cannot obtain functionality id");
                return -EINVAL;
        }
-       alg_bytesize = qat_function.bytesize;
-       qat_alg_bytesize = RTE_ALIGN_CEIL(alg_bytesize, 8);
-
-       SET_PKE_LN(cookie->input_array, asym_op->ecpm.scalar,
-                       alg_bytesize, 0);
-       SET_PKE_LN(cookie->input_array, asym_op->ecpm.p.x,
-                       alg_bytesize, 1);
-       SET_PKE_LN(cookie->input_array, asym_op->ecpm.p.y,
-                       alg_bytesize, 2);
-       SET_PKE_LN_EC(cookie->input_array, curve[SECP256R1].a,
-                       alg_bytesize, 3);
-       SET_PKE_LN_EC(cookie->input_array, curve[SECP256R1].b,
-                       alg_bytesize, 4);
-       SET_PKE_LN_EC(cookie->input_array, curve[SECP256R1].p,
-                       alg_bytesize, 5);
-       SET_PKE_LN_EC(cookie->input_array, curve[SECP256R1].h,
-                       alg_bytesize, 6);
-
-       cookie->alg_bytesize = alg_bytesize;
+       qat_func_alignsize = RTE_ALIGN_CEIL(qat_function.bytesize, 8);
+
+       SET_PKE_LN(asym_op->ecpm.scalar, qat_func_alignsize, 0);
+       SET_PKE_LN(asym_op->ecpm.p.x, qat_func_alignsize, 1);
+       SET_PKE_LN(asym_op->ecpm.p.y, qat_func_alignsize, 2);
+       SET_PKE_LN_EC(curve[curve_id], a, 3);
+       SET_PKE_LN_EC(curve[curve_id], b, 4);
+       SET_PKE_LN_EC(curve[curve_id], p, 5);
+       SET_PKE_LN_EC(curve[curve_id], h, 6);
+
+       cookie->alg_bytesize = curve[curve_id].bytesize;
+       cookie->qat_func_alignsize = qat_func_alignsize;
        qat_req->pke_hdr.cd_pars.func_id = func_id;
        qat_req->input_param_count =
                        QAT_ASYM_ECPM_IN_PARAMS;
        qat_req->output_param_count =
                        QAT_ASYM_ECPM_OUT_PARAMS;
 
-       HEXDUMP("k", cookie->input_array[0], qat_alg_bytesize);
-       HEXDUMP("xG", cookie->input_array[1], qat_alg_bytesize);
-       HEXDUMP("yG", cookie->input_array[2], qat_alg_bytesize);
-       HEXDUMP("a", cookie->input_array[3], qat_alg_bytesize);
-       HEXDUMP("b", cookie->input_array[4], qat_alg_bytesize);
-       HEXDUMP("q", cookie->input_array[5], qat_alg_bytesize);
-       HEXDUMP("h", cookie->input_array[6], qat_alg_bytesize);
+       HEXDUMP("k", cookie->input_array[0], qat_func_alignsize);
+       HEXDUMP("xG", cookie->input_array[1], qat_func_alignsize);
+       HEXDUMP("yG", cookie->input_array[2], qat_func_alignsize);
+       HEXDUMP("a", cookie->input_array[3], qat_func_alignsize);
+       HEXDUMP("b", cookie->input_array[4], qat_func_alignsize);
+       HEXDUMP("q", cookie->input_array[5], qat_func_alignsize);
+       HEXDUMP("h", cookie->input_array[6], qat_func_alignsize);
 
        return 0;
 }
@@ -750,19 +729,21 @@ static uint8_t
 ecpm_collect(struct rte_crypto_asym_op *asym_op,
                struct qat_asym_op_cookie *cookie)
 {
-       uint8_t *r = asym_op->ecpm.r.x.data;
-       uint8_t *s = asym_op->ecpm.r.y.data;
+       uint8_t *x = asym_op->ecpm.r.x.data;
+       uint8_t *y = asym_op->ecpm.r.y.data;
        uint32_t alg_bytesize = cookie->alg_bytesize;
+       uint32_t qat_func_alignsize = cookie->qat_func_alignsize;
+       uint32_t ltrim = qat_func_alignsize - alg_bytesize;
 
        asym_op->ecpm.r.x.length = alg_bytesize;
        asym_op->ecpm.r.y.length = alg_bytesize;
-       rte_memcpy(r, cookie->output_array[0], alg_bytesize);
-       rte_memcpy(s, cookie->output_array[1], alg_bytesize);
+       rte_memcpy(x, &cookie->output_array[0][ltrim], alg_bytesize);
+       rte_memcpy(y, &cookie->output_array[1][ltrim], alg_bytesize);
 
        HEXDUMP("rX", cookie->output_array[0],
-               alg_bytesize);
+               qat_func_alignsize);
        HEXDUMP("rY", cookie->output_array[1],
-               alg_bytesize);
+               qat_func_alignsize);
        return RTE_CRYPTO_OP_STATUS_SUCCESS;
 }
 
@@ -806,29 +787,37 @@ qat_asym_build_request(void *in_op, uint8_t *out_msg, void *op_cookie,
                        (struct icp_qat_fw_pke_request *)out_msg;
        struct qat_asym_op_cookie *cookie =
                        (struct qat_asym_op_cookie *)op_cookie;
+       struct rte_crypto_asym_xform *xform;
+       struct qat_asym_session *qat_session = (struct qat_asym_session *)
+                       op->asym->session->sess_private_data;
        int err = 0;
 
+       if (unlikely(qat_session == NULL)) {
+               QAT_DP_LOG(ERR, "Session was not created for this device");
+               goto error;
+       }
+
        op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
        switch (op->sess_type) {
        case RTE_CRYPTO_OP_WITH_SESSION:
-               QAT_LOG(ERR,
-                       "QAT asymmetric crypto PMD does not support session"
-                       );
-               goto error;
+               request_init(qat_req);
+               xform = &qat_session->xform;
+               break;
        case RTE_CRYPTO_OP_SESSIONLESS:
                request_init(qat_req);
-               err = asym_set_input(asym_op, qat_req, cookie,
-                               op->asym->xform);
-               if (err) {
-                       op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-                       goto error;
-               }
+               xform = op->asym->xform;
                break;
        default:
                QAT_DP_LOG(ERR, "Invalid session/xform settings");
                op->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
                goto error;
        }
+       err = asym_set_input(asym_op, qat_req, cookie,
+                       xform);
+       if (err) {
+               op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+               goto error;
+       }
 
        qat_req->pke_mid.opaque = (uint64_t)(uintptr_t)op;
        qat_req->pke_mid.src_data_addr = cookie->input_addr;
@@ -849,11 +838,11 @@ error:
 }
 
 static uint8_t
-qat_asym_collect_response(struct rte_crypto_op *rx_op,
+qat_asym_collect_response(struct rte_crypto_op *op,
                struct qat_asym_op_cookie *cookie,
                struct rte_crypto_asym_xform *xform)
 {
-       struct rte_crypto_asym_op *asym_op = rx_op->asym;
+       struct rte_crypto_asym_op *asym_op = op->asym;
 
        switch (xform->xform_type) {
        case RTE_CRYPTO_ASYM_XFORM_MODEX:
@@ -873,69 +862,354 @@ qat_asym_collect_response(struct rte_crypto_op *rx_op,
 }
 
 static int
-qat_asym_process_response(void **op, uint8_t *resp,
+qat_asym_process_response(void **out_op, uint8_t *resp,
                void *op_cookie, __rte_unused uint64_t *dequeue_err_count)
 {
        struct icp_qat_fw_pke_resp *resp_msg =
                        (struct icp_qat_fw_pke_resp *)resp;
-       struct rte_crypto_op *rx_op = (struct rte_crypto_op *)(uintptr_t)
+       struct rte_crypto_op *op = (struct rte_crypto_op *)(uintptr_t)
                        (resp_msg->opaque);
        struct qat_asym_op_cookie *cookie = op_cookie;
+       struct rte_crypto_asym_xform *xform;
+       struct qat_asym_session *qat_session = (struct qat_asym_session *)
+                       op->asym->session->sess_private_data;
 
        if (cookie->error) {
                cookie->error = 0;
-               if (rx_op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
-                       rx_op->status = RTE_CRYPTO_OP_STATUS_ERROR;
-               QAT_DP_LOG(ERR, "Cookie status returned error");
+               if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
+                       op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               QAT_DP_LOG(DEBUG, "Cookie status returned error");
        } else {
                if (ICP_QAT_FW_PKE_RESP_PKE_STAT_GET(
                        resp_msg->pke_resp_hdr.resp_status.pke_resp_flags)) {
-                       if (rx_op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
-                               rx_op->status = RTE_CRYPTO_OP_STATUS_ERROR;
-                       QAT_DP_LOG(ERR, "Asymmetric response status"
+                       if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
+                               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+                       QAT_DP_LOG(DEBUG, "Asymmetric response status"
                                        " returned error");
                }
                if (resp_msg->pke_resp_hdr.resp_status.comn_err_code) {
-                       if (rx_op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
-                               rx_op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+                       if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
+                               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
                        QAT_DP_LOG(ERR, "Asymmetric common status"
                                        " returned error");
                }
        }
-       if (rx_op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED) {
-               rx_op->status = qat_asym_collect_response(rx_op,
-                                       cookie, rx_op->asym->xform);
-               cleanup(cookie, rx_op->asym->xform,
-                                       cookie->alg_bytesize);
+
+       switch (op->sess_type) {
+       case RTE_CRYPTO_OP_WITH_SESSION:
+               xform = &qat_session->xform;
+               break;
+       case RTE_CRYPTO_OP_SESSIONLESS:
+               xform = op->asym->xform;
+               break;
+       default:
+               QAT_DP_LOG(ERR,
+                       "Invalid session/xform settings in response ring!");
+               op->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
+       }
+
+       if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED) {
+               op->status = qat_asym_collect_response(op,
+                                       cookie, xform);
+               cleanup(cookie, xform, cookie->alg_bytesize);
        }
 
-       *op = rx_op;
+       *out_op = op;
        HEXDUMP("resp_msg:", resp_msg, sizeof(struct icp_qat_fw_pke_resp));
 
        return 1;
 }
 
+static int
+session_set_modexp(struct qat_asym_session *qat_session,
+                       struct rte_crypto_asym_xform *xform)
+{
+       uint8_t *modulus = xform->modex.modulus.data;
+       uint8_t *exponent = xform->modex.exponent.data;
+
+       qat_session->xform.modex.modulus.data =
+               rte_malloc(NULL, xform->modex.modulus.length, 0);
+       if (qat_session->xform.modex.modulus.data == NULL)
+               return -ENOMEM;
+       qat_session->xform.modex.modulus.length = xform->modex.modulus.length;
+       qat_session->xform.modex.exponent.data = rte_malloc(NULL,
+                               xform->modex.exponent.length, 0);
+       if (qat_session->xform.modex.exponent.data == NULL) {
+               rte_free(qat_session->xform.modex.exponent.data);
+               return -ENOMEM;
+       }
+       qat_session->xform.modex.exponent.length = xform->modex.exponent.length;
+
+       rte_memcpy(qat_session->xform.modex.modulus.data, modulus,
+                       xform->modex.modulus.length);
+       rte_memcpy(qat_session->xform.modex.exponent.data, exponent,
+                       xform->modex.exponent.length);
+
+       return 0;
+}
+
+static int
+session_set_modinv(struct qat_asym_session *qat_session,
+                       struct rte_crypto_asym_xform *xform)
+{
+       uint8_t *modulus = xform->modinv.modulus.data;
+
+       qat_session->xform.modinv.modulus.data =
+               rte_malloc(NULL, xform->modinv.modulus.length, 0);
+       if (qat_session->xform.modinv.modulus.data == NULL)
+               return -ENOMEM;
+       qat_session->xform.modinv.modulus.length = xform->modinv.modulus.length;
+
+       rte_memcpy(qat_session->xform.modinv.modulus.data, modulus,
+                       xform->modinv.modulus.length);
+
+       return 0;
+}
+
+static int
+session_set_rsa(struct qat_asym_session *qat_session,
+                       struct rte_crypto_asym_xform *xform)
+{
+       uint8_t *n = xform->rsa.n.data;
+       uint8_t *e = xform->rsa.e.data;
+       int ret = 0;
+
+       qat_session->xform.rsa.key_type = xform->rsa.key_type;
+
+       qat_session->xform.rsa.n.data =
+               rte_malloc(NULL, xform->rsa.n.length, 0);
+       if (qat_session->xform.rsa.n.data == NULL)
+               return -ENOMEM;
+       qat_session->xform.rsa.n.length =
+               xform->rsa.n.length;
+
+       qat_session->xform.rsa.e.data =
+               rte_malloc(NULL, xform->rsa.e.length, 0);
+       if (qat_session->xform.rsa.e.data == NULL) {
+               ret = -ENOMEM;
+               goto err;
+       }
+       qat_session->xform.rsa.e.length =
+               xform->rsa.e.length;
+
+       if (xform->rsa.key_type == RTE_RSA_KEY_TYPE_QT) {
+               uint8_t *p = xform->rsa.qt.p.data;
+               uint8_t *q = xform->rsa.qt.q.data;
+               uint8_t *dP = xform->rsa.qt.dP.data;
+               uint8_t *dQ = xform->rsa.qt.dQ.data;
+               uint8_t *qInv = xform->rsa.qt.qInv.data;
+
+               qat_session->xform.rsa.qt.p.data =
+                       rte_malloc(NULL, xform->rsa.qt.p.length, 0);
+               if (qat_session->xform.rsa.qt.p.data == NULL) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
+               qat_session->xform.rsa.qt.p.length =
+                       xform->rsa.qt.p.length;
+
+               qat_session->xform.rsa.qt.q.data =
+                       rte_malloc(NULL, xform->rsa.qt.q.length, 0);
+               if (qat_session->xform.rsa.qt.q.data == NULL) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
+               qat_session->xform.rsa.qt.q.length =
+                       xform->rsa.qt.q.length;
+
+               qat_session->xform.rsa.qt.dP.data =
+                       rte_malloc(NULL, xform->rsa.qt.dP.length, 0);
+               if (qat_session->xform.rsa.qt.dP.data == NULL) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
+               qat_session->xform.rsa.qt.dP.length =
+                       xform->rsa.qt.dP.length;
+
+               qat_session->xform.rsa.qt.dQ.data =
+                       rte_malloc(NULL, xform->rsa.qt.dQ.length, 0);
+               if (qat_session->xform.rsa.qt.dQ.data == NULL) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
+               qat_session->xform.rsa.qt.dQ.length =
+                       xform->rsa.qt.dQ.length;
+
+               qat_session->xform.rsa.qt.qInv.data =
+                       rte_malloc(NULL, xform->rsa.qt.qInv.length, 0);
+               if (qat_session->xform.rsa.qt.qInv.data == NULL) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
+               qat_session->xform.rsa.qt.qInv.length =
+                       xform->rsa.qt.qInv.length;
+
+               rte_memcpy(qat_session->xform.rsa.qt.p.data, p,
+                               xform->rsa.qt.p.length);
+               rte_memcpy(qat_session->xform.rsa.qt.q.data, q,
+                               xform->rsa.qt.q.length);
+               rte_memcpy(qat_session->xform.rsa.qt.dP.data, dP,
+                               xform->rsa.qt.dP.length);
+               rte_memcpy(qat_session->xform.rsa.qt.dQ.data, dQ,
+                               xform->rsa.qt.dQ.length);
+               rte_memcpy(qat_session->xform.rsa.qt.qInv.data, qInv,
+                               xform->rsa.qt.qInv.length);
+
+       } else {
+               uint8_t *d = xform->rsa.d.data;
+
+               qat_session->xform.rsa.d.data =
+                       rte_malloc(NULL, xform->rsa.d.length, 0);
+               if (qat_session->xform.rsa.d.data == NULL) {
+                       ret = -ENOMEM;
+                       goto err;
+               }
+               qat_session->xform.rsa.d.length =
+                       xform->rsa.d.length;
+               rte_memcpy(qat_session->xform.rsa.d.data, d,
+                       xform->rsa.d.length);
+       }
+
+       rte_memcpy(qat_session->xform.rsa.n.data, n,
+               xform->rsa.n.length);
+       rte_memcpy(qat_session->xform.rsa.e.data, e,
+               xform->rsa.e.length);
+
+       return 0;
+
+err:
+       rte_free(qat_session->xform.rsa.n.data);
+       rte_free(qat_session->xform.rsa.e.data);
+       rte_free(qat_session->xform.rsa.d.data);
+       rte_free(qat_session->xform.rsa.qt.p.data);
+       rte_free(qat_session->xform.rsa.qt.q.data);
+       rte_free(qat_session->xform.rsa.qt.dP.data);
+       rte_free(qat_session->xform.rsa.qt.dQ.data);
+       rte_free(qat_session->xform.rsa.qt.qInv.data);
+       return ret;
+}
+
+static void
+session_set_ecdsa(struct qat_asym_session *qat_session,
+                       struct rte_crypto_asym_xform *xform)
+{
+       qat_session->xform.ec.curve_id = xform->ec.curve_id;
+}
+
 int
 qat_asym_session_configure(struct rte_cryptodev *dev __rte_unused,
-               struct rte_crypto_asym_xform *xform __rte_unused,
-               struct rte_cryptodev_asym_session *sess __rte_unused)
+               struct rte_crypto_asym_xform *xform,
+               struct rte_cryptodev_asym_session *session)
 {
-       QAT_LOG(ERR, "QAT asymmetric PMD currently does not support session");
-       return -ENOTSUP;
+       struct qat_asym_session *qat_session;
+       int ret = 0;
+
+       qat_session = (struct qat_asym_session *) session->sess_private_data;
+       memset(qat_session, 0, sizeof(*qat_session));
+
+       qat_session->xform.xform_type = xform->xform_type;
+       switch (xform->xform_type) {
+       case RTE_CRYPTO_ASYM_XFORM_MODEX:
+               ret = session_set_modexp(qat_session, xform);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_MODINV:
+               ret = session_set_modinv(qat_session, xform);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_RSA:
+               ret = session_set_rsa(qat_session, xform);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_ECDSA:
+       case RTE_CRYPTO_ASYM_XFORM_ECPM:
+               session_set_ecdsa(qat_session, xform);
+               break;
+       default:
+               ret = -ENOTSUP;
+       }
+
+       if (ret) {
+               QAT_LOG(ERR, "Unsupported xform type");
+               return ret;
+       }
+
+       return 0;
 }
 
 unsigned int
 qat_asym_session_get_private_size(struct rte_cryptodev *dev __rte_unused)
 {
-       QAT_LOG(ERR, "QAT asymmetric PMD currently does not support session");
-       return 0;
+       return RTE_ALIGN_CEIL(sizeof(struct qat_asym_session), 8);
+}
+
+static void
+session_clear_modexp(struct rte_crypto_modex_xform *modex)
+{
+       memset(modex->modulus.data, 0, modex->modulus.length);
+       rte_free(modex->modulus.data);
+       memset(modex->exponent.data, 0, modex->exponent.length);
+       rte_free(modex->exponent.data);
+}
+
+static void
+session_clear_modinv(struct rte_crypto_modinv_xform *modinv)
+{
+       memset(modinv->modulus.data, 0, modinv->modulus.length);
+       rte_free(modinv->modulus.data);
+}
+
+static void
+session_clear_rsa(struct rte_crypto_rsa_xform *rsa)
+{
+       memset(rsa->n.data, 0, rsa->n.length);
+       rte_free(rsa->n.data);
+       memset(rsa->e.data, 0, rsa->e.length);
+       rte_free(rsa->e.data);
+       if (rsa->key_type == RTE_RSA_KEY_TYPE_EXP) {
+               memset(rsa->d.data, 0, rsa->d.length);
+               rte_free(rsa->d.data);
+       } else {
+               memset(rsa->qt.p.data, 0, rsa->qt.p.length);
+               rte_free(rsa->qt.p.data);
+               memset(rsa->qt.q.data, 0, rsa->qt.q.length);
+               rte_free(rsa->qt.q.data);
+               memset(rsa->qt.dP.data, 0, rsa->qt.dP.length);
+               rte_free(rsa->qt.dP.data);
+               memset(rsa->qt.dQ.data, 0, rsa->qt.dQ.length);
+               rte_free(rsa->qt.dQ.data);
+               memset(rsa->qt.qInv.data, 0, rsa->qt.qInv.length);
+               rte_free(rsa->qt.qInv.data);
+       }
+}
+
+static void
+session_clear_xform(struct qat_asym_session *qat_session)
+{
+       switch (qat_session->xform.xform_type) {
+       case RTE_CRYPTO_ASYM_XFORM_MODEX:
+               session_clear_modexp(&qat_session->xform.modex);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_MODINV:
+               session_clear_modinv(&qat_session->xform.modinv);
+               break;
+       case RTE_CRYPTO_ASYM_XFORM_RSA:
+               session_clear_rsa(&qat_session->xform.rsa);
+               break;
+       default:
+               break;
+       }
 }
 
 void
-qat_asym_session_clear(struct rte_cryptodev *dev __rte_unused,
-               struct rte_cryptodev_asym_session *sess __rte_unused)
+qat_asym_session_clear(struct rte_cryptodev *dev,
+               struct rte_cryptodev_asym_session *session)
 {
-       QAT_LOG(ERR, "QAT asymmetric PMD currently does not support session");
+       void *sess_priv = session->sess_private_data;
+       struct qat_asym_session *qat_session =
+               (struct qat_asym_session *)sess_priv;
+
+       if (sess_priv) {
+               session_clear_xform(qat_session);
+               memset(qat_session, 0, qat_asym_session_get_private_size(dev));
+       }
 }
 
 static uint16_t