* [PATCH v2 1/2] crypto/qat: refactor asym algorithm macros and logs
2022-04-22 9:33 [PATCH v2 0/2] crypto/qat: add secp384r1 curve support Arek Kusztal
@ 2022-04-22 9:33 ` Arek Kusztal
2022-05-10 10:08 ` Zhang, Roy Fan
2022-04-22 9:33 ` [PATCH v2 2/2] crypto/qat: add secp384r1 curve Arek Kusztal
2022-05-10 10:10 ` [PATCH v2 0/2] crypto/qat: add secp384r1 curve support Zhang, Roy Fan
2 siblings, 1 reply; 7+ messages in thread
From: Arek Kusztal @ 2022-04-22 9:33 UTC (permalink / raw)
To: dev; +Cc: gakhil, roy.fan.zhang, Arek Kusztal
This commit unifies macros for asymmetric parameters,
therefore making code easier to maintain.
It additionally changes some of PMD output logs that
right now can only be seen in debug mode.
Signed-off-by: Arek Kusztal <arkadiuszx.kusztal@intel.com>
---
drivers/crypto/qat/qat_asym.c | 230 ++++++++++++++++++------------------------
drivers/crypto/qat/qat_asym.h | 3 +-
drivers/crypto/qat/qat_ec.h | 1 -
3 files changed, 101 insertions(+), 133 deletions(-)
diff --git a/drivers/crypto/qat/qat_asym.c b/drivers/crypto/qat/qat_asym.c
index 479d5308cf..d2041b2efa 100644
--- a/drivers/crypto/qat/qat_asym.c
+++ b/drivers/crypto/qat/qat_asym.c
@@ -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)
@@ -231,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;
@@ -290,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;
@@ -347,8 +334,7 @@ rsa_set_pub_input(struct rte_crypto_asym_op *asym_op,
if (asym_op->rsa.op_type == RTE_CRYPTO_ASYM_OP_ENCRYPT) {
switch (asym_op->rsa.pad) {
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,
@@ -360,8 +346,7 @@ rsa_set_pub_input(struct rte_crypto_asym_op *asym_op,
} else {
switch (asym_op->rsa.pad) {
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,
@@ -372,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;
@@ -407,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);
@@ -438,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);
@@ -456,8 +432,7 @@ rsa_set_priv_input(struct rte_crypto_asym_op *asym_op,
RTE_CRYPTO_ASYM_OP_DECRYPT) {
switch (asym_op->rsa.pad) {
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;
@@ -471,8 +446,7 @@ rsa_set_priv_input(struct rte_crypto_asym_op *asym_op,
RTE_CRYPTO_ASYM_OP_SIGN) {
switch (asym_op->rsa.pad) {
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;
@@ -580,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;
}
@@ -597,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;
@@ -633,22 +608,22 @@ 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;
@@ -679,8 +654,8 @@ ecdsa_collect(struct rte_crypto_asym_op *asym_op,
struct qat_asym_op_cookie *cookie)
{
uint32_t alg_bytesize = cookie->alg_bytesize;
- uint32_t qat_alg_bytesize = RTE_ALIGN_CEIL(cookie->alg_bytesize, 8);
- uint32_t ltrim = qat_alg_bytesize - 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;
@@ -692,9 +667,9 @@ ecdsa_collect(struct rte_crypto_asym_op *asym_op,
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;
}
@@ -706,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;
}
@@ -721,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_EC(cookie->input_array, asym_op->ecpm.scalar,
- asym_op->ecpm.scalar.length, 0);
- SET_PKE_LN_EC(cookie->input_array, asym_op->ecpm.p.x,
- asym_op->ecpm.p.x.length, 1);
- SET_PKE_LN_EC(cookie->input_array, asym_op->ecpm.p.y,
- asym_op->ecpm.p.y.length, 2);
- SET_PKE_LN_EC(cookie->input_array, curve[curve_id].a,
- alg_bytesize, 3);
- SET_PKE_LN_EC(cookie->input_array, curve[curve_id].b,
- alg_bytesize, 4);
- SET_PKE_LN_EC(cookie->input_array, curve[curve_id].p,
- alg_bytesize, 5);
- SET_PKE_LN_EC(cookie->input_array, curve[curve_id].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;
}
@@ -764,8 +732,8 @@ ecpm_collect(struct rte_crypto_asym_op *asym_op,
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_alg_bytesize = RTE_ALIGN_CEIL(cookie->alg_bytesize, 8);
- uint32_t ltrim = qat_alg_bytesize - 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;
@@ -773,9 +741,9 @@ ecpm_collect(struct rte_crypto_asym_op *asym_op,
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;
}
@@ -910,13 +878,13 @@ qat_asym_process_response(void **out_op, uint8_t *resp,
cookie->error = 0;
if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
op->status = RTE_CRYPTO_OP_STATUS_ERROR;
- QAT_DP_LOG(ERR, "Cookie status returned 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 (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
op->status = RTE_CRYPTO_OP_STATUS_ERROR;
- QAT_DP_LOG(ERR, "Asymmetric response status"
+ QAT_DP_LOG(DEBUG, "Asymmetric response status"
" returned error");
}
if (resp_msg->pke_resp_hdr.resp_status.comn_err_code) {
diff --git a/drivers/crypto/qat/qat_asym.h b/drivers/crypto/qat/qat_asym.h
index b1d403486f..6628656b42 100644
--- a/drivers/crypto/qat/qat_asym.h
+++ b/drivers/crypto/qat/qat_asym.h
@@ -58,8 +58,9 @@ typedef uint64_t large_int_ptr;
}
struct qat_asym_op_cookie {
- size_t alg_bytesize;
uint64_t error;
+ uint32_t alg_bytesize; /*< Bytesize of algorithm */
+ uint32_t qat_func_alignsize; /*< Aligned bytesize of qat function */
rte_iova_t input_addr;
rte_iova_t output_addr;
large_int_ptr input_params_ptrs[MAX_PKE_PARAMS] _PKE_ALIGN_;
diff --git a/drivers/crypto/qat/qat_ec.h b/drivers/crypto/qat/qat_ec.h
index a310e3f4d3..1bcd7d1408 100644
--- a/drivers/crypto/qat/qat_ec.h
+++ b/drivers/crypto/qat/qat_ec.h
@@ -92,7 +92,6 @@ static struct elliptic_curve curve[] = {
},
},
},
-
[SECP521R1] = {
.name = "secp521r1",
.bytesize = 66,
--
2.13.6
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v2 2/2] crypto/qat: add secp384r1 curve
2022-04-22 9:33 [PATCH v2 0/2] crypto/qat: add secp384r1 curve support Arek Kusztal
2022-04-22 9:33 ` [PATCH v2 1/2] crypto/qat: refactor asym algorithm macros and logs Arek Kusztal
@ 2022-04-22 9:33 ` Arek Kusztal
2022-05-10 10:10 ` Zhang, Roy Fan
2022-05-10 10:10 ` [PATCH v2 0/2] crypto/qat: add secp384r1 curve support Zhang, Roy Fan
2 siblings, 1 reply; 7+ messages in thread
From: Arek Kusztal @ 2022-04-22 9:33 UTC (permalink / raw)
To: dev; +Cc: gakhil, roy.fan.zhang, Arek Kusztal
This commit adds secp384r1 (P-384) elliptic
curve to Intel QuickAssist Technology crypto PMD.
Signed-off-by: Arek Kusztal <arkadiuszx.kusztal@intel.com>
---
doc/guides/rel_notes/release_22_07.rst | 4 ++
drivers/common/qat/qat_adf/qat_pke.h | 12 ++++++
drivers/crypto/qat/qat_ec.h | 76 ++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst
index 42a5f2d990..7f44d363b5 100644
--- a/doc/guides/rel_notes/release_22_07.rst
+++ b/doc/guides/rel_notes/release_22_07.rst
@@ -55,6 +55,10 @@ New Features
Also, make sure to start the actual text at the margin.
=======================================================
+* **Updated Intel QuickAssist Technology (QAT) crypto PMD.**
+
+ * Added support for secp384r1 elliptic curve.
+
Removed Items
-------------
diff --git a/drivers/common/qat/qat_adf/qat_pke.h b/drivers/common/qat/qat_adf/qat_pke.h
index b5fb2a020c..6c12bfd989 100644
--- a/drivers/common/qat/qat_adf/qat_pke.h
+++ b/drivers/common/qat/qat_adf/qat_pke.h
@@ -228,6 +228,10 @@ get_ecdsa_verify_function(struct rte_crypto_asym_xform *xform)
qat_function.func_id = PKE_ECDSA_VERIFY_GFP_L256;
qat_function.bytesize = 32;
break;
+ case RTE_CRYPTO_EC_GROUP_SECP384R1:
+ qat_function.func_id = PKE_ECDSA_VERIFY_GFP_L512;
+ qat_function.bytesize = 64;
+ break;
case RTE_CRYPTO_EC_GROUP_SECP521R1:
qat_function.func_id = PKE_ECDSA_VERIFY_GFP_521;
qat_function.bytesize = 66;
@@ -248,6 +252,10 @@ get_ecdsa_function(struct rte_crypto_asym_xform *xform)
qat_function.func_id = PKE_ECDSA_SIGN_RS_GFP_L256;
qat_function.bytesize = 32;
break;
+ case RTE_CRYPTO_EC_GROUP_SECP384R1:
+ qat_function.func_id = PKE_ECDSA_SIGN_RS_GFP_L512;
+ qat_function.bytesize = 64;
+ break;
case RTE_CRYPTO_EC_GROUP_SECP521R1:
qat_function.func_id = PKE_ECDSA_SIGN_RS_GFP_521;
qat_function.bytesize = 66;
@@ -268,6 +276,10 @@ get_ecpm_function(struct rte_crypto_asym_xform *xform)
qat_function.func_id = MATHS_POINT_MULTIPLICATION_GFP_L256;
qat_function.bytesize = 32;
break;
+ case RTE_CRYPTO_EC_GROUP_SECP384R1:
+ qat_function.func_id = MATHS_POINT_MULTIPLICATION_GFP_L512;
+ qat_function.bytesize = 64;
+ break;
case RTE_CRYPTO_EC_GROUP_SECP521R1:
qat_function.func_id = MATHS_POINT_MULTIPLICATION_GFP_521;
qat_function.bytesize = 66;
diff --git a/drivers/crypto/qat/qat_ec.h b/drivers/crypto/qat/qat_ec.h
index 1bcd7d1408..bbd0b31949 100644
--- a/drivers/crypto/qat/qat_ec.h
+++ b/drivers/crypto/qat/qat_ec.h
@@ -92,6 +92,80 @@ static struct elliptic_curve curve[] = {
},
},
},
+ [SECP384R1] = {
+ .name = "secp384r1",
+ .bytesize = 48,
+ .x = {
+ .data = {
+ 0xAA, 0x87, 0xCA, 0x22, 0xBE, 0x8B, 0x05, 0x37,
+ 0x8E, 0xB1, 0xC7, 0x1E, 0xF3, 0x20, 0xAD, 0x74,
+ 0x6E, 0x1D, 0x3B, 0x62, 0x8B, 0xA7, 0x9B, 0x98,
+ 0x59, 0xF7, 0x41, 0xE0, 0x82, 0x54, 0x2A, 0x38,
+ 0x55, 0x02, 0xF2, 0x5D, 0xBF, 0x55, 0x29, 0x6C,
+ 0x3A, 0x54, 0x5E, 0x38, 0x72, 0x76, 0x0A, 0xB7
+ },
+ },
+ .y = {
+ .data = {
+ 0x36, 0x17, 0xDE, 0x4A, 0x96, 0x26, 0x2C, 0x6F,
+ 0x5D, 0x9E, 0x98, 0xBF, 0x92, 0x92, 0xDC, 0x29,
+ 0xF8, 0xF4, 0x1D, 0xBD, 0x28, 0x9A, 0x14, 0x7C,
+ 0xE9, 0xDA, 0x31, 0x13, 0xB5, 0xF0, 0xB8, 0xC0,
+ 0x0A, 0x60, 0xB1, 0xCE, 0x1D, 0x7E, 0x81, 0x9D,
+ 0x7A, 0x43, 0x1D, 0x7C, 0x90, 0xEA, 0x0E, 0x5F
+ },
+ },
+ .n = {
+ .data = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xC7, 0x63, 0x4D, 0x81, 0xF4, 0x37, 0x2D, 0xDF,
+ 0x58, 0x1A, 0x0D, 0xB2, 0x48, 0xB0, 0xA7, 0x7A,
+ 0xEC, 0xEC, 0x19, 0x6A, 0xCC, 0xC5, 0x29, 0x73,
+ },
+ },
+ .p = {
+ .data = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+ },
+ },
+ .a = {
+ .data = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFC,
+ },
+ },
+ .b = {
+ .data = {
+ 0xB3, 0x31, 0x2F, 0xA7, 0xE2, 0x3E, 0xE7, 0xE4,
+ 0x98, 0x8E, 0x05, 0x6B, 0xE3, 0xF8, 0x2D, 0x19,
+ 0x18, 0x1D, 0x9C, 0x6E, 0xFE, 0x81, 0x41, 0x12,
+ 0x03, 0x14, 0x08, 0x8F, 0x50, 0x13, 0x87, 0x5A,
+ 0xC6, 0x56, 0x39, 0x8D, 0x8A, 0x2E, 0xD1, 0x9D,
+ 0x2A, 0x85, 0xC8, 0xED, 0xD3, 0xEC, 0x2A, 0xEF,
+ },
+ },
+ .h = {
+ .data = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+ },
+ },
+ },
[SECP521R1] = {
.name = "secp521r1",
.bytesize = 66,
@@ -195,6 +269,8 @@ pick_curve(struct rte_crypto_asym_xform *xform)
switch (xform->ec.curve_id) {
case RTE_CRYPTO_EC_GROUP_SECP256R1:
return SECP256R1;
+ case RTE_CRYPTO_EC_GROUP_SECP384R1:
+ return SECP384R1;
case RTE_CRYPTO_EC_GROUP_SECP521R1:
return SECP521R1;
default:
--
2.13.6
^ permalink raw reply [flat|nested] 7+ messages in thread