- Acc - mailweb.openeuler.org

[PATCH] hisi-hpre: modify the return value of function
by Zhiqi Song 12 Mar '22

12 Mar '22

From: Weili Qian <qianweili(a)huawei.com> When the function executes successfully, the returned size is not used, so "WD_SUCCESS" is returned directly. Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- drv/hisi_hpre.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drv/hisi_hpre.c b/drv/hisi_hpre.c index b6c80203..d0a579e6 100644 --- a/drv/hisi_hpre.c +++ b/drv/hisi_hpre.c @@ -221,8 +221,7 @@ static int fill_rsa_crt_prikey2(struct wd_rsa_prikey *prikey, *data = wd_dq->data; - return (int)(wd_dq->bsize + wd_qinv->bsize + wd_p->bsize + - wd_q->bsize + wd_dp->bsize); + return WD_SUCCESS; } static int fill_rsa_prikey1(struct wd_rsa_prikey *prikey, void **data) @@ -243,7 +242,7 @@ static int fill_rsa_prikey1(struct wd_rsa_prikey *prikey, void **data) *data = wd_d->data; - return (int)(wd_n->bsize + wd_d->bsize); + return WD_SUCCESS; } static int fill_rsa_pubkey(struct wd_rsa_pubkey *pubkey, void **data) @@ -264,7 +263,7 @@ static int fill_rsa_pubkey(struct wd_rsa_pubkey *pubkey, void **data) return ret; *data = wd_e->data; - return (int)(wd_n->bsize + wd_e->bsize); + return WD_SUCCESS; } static int fill_rsa_genkey_in(struct wd_rsa_kg_in *genkey) @@ -383,17 +382,17 @@ static int rsa_prepare_key(struct wd_rsa_msg *msg, if (req->op_type == WD_RSA_SIGN) { if (hw_msg->alg == HPRE_ALG_NC_CRT) { ret = fill_rsa_crt_prikey2((void *)msg->key, &data); - if (ret <= 0) + if (ret) return ret; } else { ret = fill_rsa_prikey1((void *)msg->key, &data); - if (ret < 0) + if (ret) return ret; hw_msg->alg = HPRE_ALG_NC_NCRT; } } else if (req->op_type == WD_RSA_VERIFY) { ret = fill_rsa_pubkey((void *)msg->key, &data); - if (ret < 0) + if (ret) return ret; hw_msg->alg = HPRE_ALG_NC_NCRT; } else if (req->op_type == WD_RSA_GENKEY) { -- 2.33.0

1 0

[PATCH 1/9] sec: unify print format
by Yang Shen 10 Mar '22

10 Mar '22

From: Kai Ye <yekai13(a)huawei.com> Unify print format with following rules: 1. failed to do sth. 2. invalid: sth is NULL. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- drv/hisi_sec.c | 20 ++++++++++---------- wd_aead.c | 12 ++++++------ wd_cipher.c | 20 ++++++++++---------- wd_digest.c | 10 +++++----- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index 16fcb5f..aa86a6b 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -703,7 +703,7 @@ static void parse_cipher_bd2(struct hisi_sec_sqe *sqe, done = sqe->type2.done_flag & SEC_DONE_MASK; if (done != SEC_HW_TASK_DONE || sqe->type2.error_type) { - WD_ERR("SEC BD %s fail! done=0x%x, etype=0x%x\n", "cipher", + WD_ERR("failed to parse cipher BD2! done=0x%x, etype=0x%x\n", done, sqe->type2.error_type); recv_msg->result = WD_IN_EPARA; } else { @@ -927,7 +927,7 @@ int hisi_sec_cipher_send(handle_t ctx, struct wd_cipher_msg *msg) int ret; if (!msg) { - WD_ERR("input cipher msg is NULL!\n"); + WD_ERR("invalid: input cipher msg is NULL!\n"); return -WD_EINVAL; } @@ -1130,7 +1130,7 @@ int hisi_sec_cipher_send_v3(handle_t ctx, struct wd_cipher_msg *msg) int ret; if (!msg) { - WD_ERR("input cipher msg is NULL!\n"); + WD_ERR("invalid: input cipher msg is NULL!\n"); return -WD_EINVAL; } @@ -1175,7 +1175,7 @@ static void parse_cipher_bd3(struct hisi_sec_sqe3 *sqe, done = sqe->done_flag & SEC_DONE_MASK; if (done != SEC_HW_TASK_DONE || sqe->error_type) { - WD_ERR("SEC BD3 %s fail! done=0x%x, etype=0x%x\n", "cipher", + WD_ERR("failed to parse cipher BD3! done=0x%x, etype=0x%x\n", done, sqe->error_type); recv_msg->result = WD_IN_EPARA; } else { @@ -1278,7 +1278,7 @@ static void parse_digest_bd2(struct hisi_sec_sqe *sqe, done = sqe->type2.done_flag & SEC_DONE_MASK; if (done != SEC_HW_TASK_DONE || sqe->type2.error_type) { - WD_ERR("SEC BD %s fail! done=0x%x, etype=0x%x\n", "digest", + WD_ERR("failed to parse digest BD2! done=0x%x, etype=0x%x\n", done, sqe->type2.error_type); recv_msg->result = WD_IN_EPARA; } else { @@ -1354,7 +1354,7 @@ int hisi_sec_digest_send(handle_t ctx, struct wd_digest_msg *msg) int ret; if (!msg) { - WD_ERR("input digest msg is NULL!\n"); + WD_ERR("invalid: input digest msg is NULL!\n"); return -WD_EINVAL; } @@ -1510,7 +1510,7 @@ int hisi_sec_digest_send_v3(handle_t ctx, struct wd_digest_msg *msg) int ret; if (!msg) { - WD_ERR("input digest msg is NULL!\n"); + WD_ERR("invalid: input digest msg is NULL!\n"); return -WD_EINVAL; } @@ -1578,7 +1578,7 @@ static void parse_digest_bd3(struct hisi_sec_sqe3 *sqe, done = sqe->done_flag & SEC_DONE_MASK; if (done != SEC_HW_TASK_DONE || sqe->error_type) { - WD_ERR("SEC BD3 %s fail! done=0x%x, etype=0x%x\n", "digest", + WD_ERR("failed to parse digest BD3! done=0x%x, etype=0x%x\n", done, sqe->error_type); recv_msg->result = WD_IN_EPARA; } else { @@ -1927,7 +1927,7 @@ static void parse_aead_bd2(struct hisi_sec_sqe *sqe, icv = (sqe->type2.done_flag & SEC_ICV_MASK) >> 1; if (done != SEC_HW_TASK_DONE || sqe->type2.error_type || icv == SEC_HW_ICV_ERR) { - WD_ERR("SEC BD aead fail! done=0x%x, etype=0x%x, icv=0x%x\n", + WD_ERR("failed to parse aead BD2! done=0x%x, etype=0x%x, icv=0x%x\n", done, sqe->type2.error_type, icv); recv_msg->result = WD_IN_EPARA; } else { @@ -2195,7 +2195,7 @@ static void parse_aead_bd3(struct hisi_sec_sqe3 *sqe, icv = (sqe->done_flag & SEC_ICV_MASK) >> 1; if (done != SEC_HW_TASK_DONE || sqe->error_type || icv == SEC_HW_ICV_ERR) { - WD_ERR("SEC BD3 aead fail! done=0x%x, etype=0x%x, icv=0x%x\n", + WD_ERR("failed to parse aead BD3! done=0x%x, etype=0x%x, icv=0x%x\n", done, sqe->error_type, icv); recv_msg->result = WD_IN_EPARA; } else { diff --git a/wd_aead.c b/wd_aead.c index 7df8e80..74047b5 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -63,14 +63,14 @@ static void wd_aead_set_static_drv(void) { wd_aead_setting.driver = wd_aead_get_driver(); if (!wd_aead_setting.driver) - WD_ERR("fail to get driver\n"); + WD_ERR("failed to get driver!\n"); } #else static void __attribute__((constructor)) wd_aead_open_driver(void) { wd_aead_setting.dlhandle = dlopen("libhisi_sec.so", RTLD_NOW); if (!wd_aead_setting.dlhandle) - WD_ERR("failed to open libhisi_sec.so\n"); + WD_ERR("failed to open libhisi_sec.so!\n"); } static void __attribute__((destructor)) wd_aead_close_driver(void) @@ -344,7 +344,7 @@ static int aead_param_check(struct wd_aead_sess *sess, int ret; if (unlikely(!sess || !req)) { - WD_ERR("aead input sess or req is NULL.\n"); + WD_ERR("invalid: aead input sess or req is NULL!\n"); return -WD_EINVAL; } @@ -393,7 +393,7 @@ static int aead_param_check(struct wd_aead_sess *sess, static int aead_init_check(struct wd_ctx_config *config, struct wd_sched *sched) { if (!config || !config->ctxs || !config->ctxs[0].ctx || !sched) { - WD_ERR("wd aead config or sched is NULL!\n"); + WD_ERR("invalid: wd aead config or sched is NULL!\n"); return -WD_EINVAL; } @@ -594,7 +594,7 @@ int wd_do_aead_async(handle_t h_sess, struct wd_aead_req *req) return -WD_EINVAL; if (unlikely(!req->cb)) { - WD_ERR("aead input req cb is NULL.\n"); + WD_ERR("invalid: aead input req cb is NULL!\n"); return -WD_EINVAL; } @@ -647,7 +647,7 @@ int wd_aead_poll_ctx(__u32 idx, __u32 expt, __u32 *count) int ret; if (!count) { - WD_ERR("aead poll ctx input param is NULL!\n"); + WD_ERR("invalid: aead poll ctx input param is NULL!\n"); return -WD_EINVAL; } diff --git a/wd_cipher.c b/wd_cipher.c index afd8c4d..3a9b323 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -75,14 +75,14 @@ static void wd_cipher_set_static_drv(void) { wd_cipher_setting.driver = wd_cipher_get_driver(); if (!wd_cipher_setting.driver) - WD_ERR("fail to get driver\n"); + WD_ERR("failed to get driver!\n"); } #else static void __attribute__((constructor)) wd_cipher_open_driver(void) { wd_cipher_setting.dlhandle = dlopen("libhisi_sec.so", RTLD_NOW); if (!wd_cipher_setting.dlhandle) - WD_ERR("fail to open libhisi_sec.so\n"); + WD_ERR("failed to open libhisi_sec.so!\n"); } static void __attribute__((destructor)) wd_cipher_close_driver(void) @@ -158,7 +158,7 @@ static int cipher_init_check(struct wd_ctx_config *config, struct wd_sched *sched) { if (!config || !config->ctxs || !config->ctxs[0].ctx || !sched) { - WD_ERR("wd cipher config or sched is NULL!\n"); + WD_ERR("invalid: wd cipher config or sched is NULL!\n"); return -WD_EINVAL; } @@ -177,7 +177,7 @@ int wd_cipher_set_key(handle_t h_sess, const __u8 *key, __u32 key_len) int ret; if (!key || !sess) { - WD_ERR("cipher set key input param err!\n"); + WD_ERR("invalid: cipher set key input param err!\n"); return -WD_EINVAL; } @@ -205,13 +205,13 @@ handle_t wd_cipher_alloc_sess(struct wd_cipher_sess_setup *setup) struct wd_cipher_sess *sess = NULL; if (unlikely(!setup)) { - WD_ERR("cipher input setup is NULL!\n"); + WD_ERR("invalid: cipher input setup is NULL!\n"); return (handle_t)0; } sess = malloc(sizeof(struct wd_cipher_sess)); if (!sess) { - WD_ERR("fail to alloc session memory!\n"); + WD_ERR("failed to alloc session memory!\n"); return (handle_t)0; } memset(sess, 0, sizeof(struct wd_cipher_sess)); @@ -235,7 +235,7 @@ void wd_cipher_free_sess(handle_t h_sess) struct wd_cipher_sess *sess = (struct wd_cipher_sess *)h_sess; if (unlikely(!sess)) { - WD_ERR("cipher input h_sess is NULL!\n"); + WD_ERR("invalid: cipher input h_sess is NULL!\n"); return; } @@ -387,12 +387,12 @@ static int wd_cipher_check_params(handle_t h_sess, int ret = 0; if (unlikely(!h_sess || !req)) { - WD_ERR("cipher input sess or req is NULL!\n"); + WD_ERR("invalid: cipher input sess or req is NULL!\n"); return -WD_EINVAL; } if (unlikely(mode == CTX_MODE_ASYNC && !req->cb)) { - WD_ERR("cipher req cb is NULL!\n"); + WD_ERR("invalid: cipher req cb is NULL!\n"); return -WD_EINVAL; } @@ -561,7 +561,7 @@ int wd_cipher_poll_ctx(__u32 idx, __u32 expt, __u32 *count) int ret; if (unlikely(!count)) { - WD_ERR("wd cipher poll ctx input param is NULL!\n"); + WD_ERR("invalid: cipher poll ctx input param is NULL!\n"); return -WD_EINVAL; } diff --git a/wd_digest.c b/wd_digest.c index fb29746..0ddc074 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -62,7 +62,7 @@ static void wd_digest_set_static_drv(void) { wd_digest_setting.driver = wd_digest_get_driver(); if (!wd_digest_setting.driver) - WD_ERR("fail to get driver\n"); + WD_ERR("failed to get driver!\n"); } #else static void __attribute__((constructor)) wd_digest_open_driver(void) @@ -70,7 +70,7 @@ static void __attribute__((constructor)) wd_digest_open_driver(void) /* Fix me: vendor driver should be put in /usr/lib/wd/ */ wd_digest_setting.dlhandle = dlopen("libhisi_sec.so", RTLD_NOW); if (!wd_digest_setting.dlhandle) - WD_ERR("fail to open libhisi_sec.so\n"); + WD_ERR("failed to open libhisi_sec.so!\n"); } static void __attribute__((destructor)) wd_digest_close_driver(void) @@ -252,7 +252,7 @@ static int digest_param_check(struct wd_digest_sess *sess, int ret; if (unlikely(!sess || !req)) { - WD_ERR("digest input sess or req is NULL.\n"); + WD_ERR("invalid: digest input sess or req is NULL!\n"); return -WD_EINVAL; } @@ -398,7 +398,7 @@ int wd_do_digest_async(handle_t h_sess, struct wd_digest_req *req) return -WD_EINVAL; if (unlikely(!req->cb)) { - WD_ERR("digest input req cb is NULL.\n"); + WD_ERR("invalid: digest input req cb is NULL!\n"); return -WD_EINVAL; } @@ -451,7 +451,7 @@ int wd_digest_poll_ctx(__u32 idx, __u32 expt, __u32 *count) int ret; if (unlikely(!count)) { - WD_ERR("digest count is NULL.\n"); + WD_ERR("invalid: digest poll ctx input param is NULL!\n"); return -WD_EINVAL; } -- 2.24.0

1 8

[PATCH] uadk: bugfix segment fault when uninitializing
by Zhiqi Song 08 Mar '22

08 Mar '22

When the initialization of each alg driver failed, the wd_<alg>_setting.priv should be set to NULL. Otherwise there will be segment fault when uninitializing the alg driver. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- wd_aead.c | 1 + wd_cipher.c | 1 + wd_comp.c | 1 + wd_dh.c | 1 + wd_digest.c | 1 + wd_ecc.c | 1 + wd_rsa.c | 1 + 7 files changed, 7 insertions(+) diff --git a/wd_aead.c b/wd_aead.c index 7a33d4e7..74047b56 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -458,6 +458,7 @@ int wd_aead_init(struct wd_ctx_config *config, struct wd_sched *sched) out_init: free(priv); + wd_aead_setting.priv = NULL; out_priv: wd_uninit_async_request_pool(&wd_aead_setting.pool); out_sched: diff --git a/wd_cipher.c b/wd_cipher.c index 374b05e3..3a9b3234 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -299,6 +299,7 @@ int wd_cipher_init(struct wd_ctx_config *config, struct wd_sched *sched) out_init: free(priv); + wd_cipher_setting.priv = NULL; out_priv: wd_uninit_async_request_pool(&wd_cipher_setting.pool); out_sched: diff --git a/wd_comp.c b/wd_comp.c index eb4fa8e5..9a71dfcd 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -145,6 +145,7 @@ int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) out_init: free(priv); + wd_comp_setting.priv = NULL; out_priv: wd_uninit_async_request_pool(&wd_comp_setting.pool); out_sched: diff --git a/wd_dh.c b/wd_dh.c index 193a3f1b..c0d3e007 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -145,6 +145,7 @@ int wd_dh_init(struct wd_ctx_config *config, struct wd_sched *sched) out_init: free(priv); + wd_dh_setting.priv = NULL; out_priv: wd_uninit_async_request_pool(&wd_dh_setting.pool); out_sched: diff --git a/wd_digest.c b/wd_digest.c index 008ab301..17b2923e 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -216,6 +216,7 @@ int wd_digest_init(struct wd_ctx_config *config, struct wd_sched *sched) out_init: free(priv); + wd_digest_setting.priv = NULL; out_priv: wd_uninit_async_request_pool(&wd_digest_setting.pool); out_sched: diff --git a/wd_ecc.c b/wd_ecc.c index 335e953b..af62b9a9 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -199,6 +199,7 @@ int wd_ecc_init(struct wd_ctx_config *config, struct wd_sched *sched) out_init: free(priv); + wd_ecc_setting.priv = NULL; out_priv: wd_uninit_async_request_pool(&wd_ecc_setting.pool); out_sched: diff --git a/wd_rsa.c b/wd_rsa.c index 44de4998..83714757 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -185,6 +185,7 @@ int wd_rsa_init(struct wd_ctx_config *config, struct wd_sched *sched) out_init: free(priv); + wd_rsa_setting.priv = NULL; out_priv: wd_uninit_async_request_pool(&wd_rsa_setting.pool); out_sched: -- 2.33.0

1 0

[PATCH] digest: simplify the process of represent BD state
by Kai Ye 08 Mar '22

08 Mar '22

The value of 'out_bytes' can descripe the BD state. So not need to use the marco variable. The BD state is non-zero value when the msg recived successfully. Otherwise the BD state is zero. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- wd_digest.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/wd_digest.c b/wd_digest.c index 0d79817..2a65540 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -21,7 +21,6 @@ #define POLL_SIZE 100000 #define POLL_TIME 1000 -#define STREAM_MODE_STATE 1 static int g_digest_mac_len[WD_DIGEST_TYPE_MAX] = { WD_DIGEST_SM3_LEN, WD_DIGEST_MD5_LEN, WD_DIGEST_SHA1_LEN, @@ -47,11 +46,8 @@ struct wd_digest_sess { unsigned char key[MAX_HMAC_KEY_SIZE]; __u32 key_bytes; void *sched_key; - /* - * Notify the BD state, 1 is final BD or middle BD, - * 0 is normal mode or first BD, one session only supports one stream. - */ - int state; + /* Notify the BD state */ + int state; /* Total of data for stream mode */ __u64 long_data_len; }; @@ -338,8 +334,8 @@ static int send_recv_sync(struct wd_ctx_internal *ctx, struct wd_digest_sess *ds goto out; } } - if (msg->has_next && msg->result == WD_SUCCESS) - dsess->state = STREAM_MODE_STATE; + if (msg->has_next) + dsess->state = msg->out_bytes; } while (ret < 0); out: -- 2.33.0

1 0

UADK周例会
by openEuler conference 04 Mar '22

04 Mar '22

您好！ sig-AccLib SIG 邀请您参加 2022-03-09 11:00 召开的ZOOM会议(自动录制) 会议主题：UADK周例会会议内容：每周三上午11点-12点，会议链接https://linaro-org.zoom.us/j/91879279131 1、社区计划 2、进展问题讨论 3、其他议题讨论会议链接：https://us06web.zoom.us/j/85336432385?pwd=Rm1TRlYrOWJKd3hiVXRRcFNpRjg1QT09 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the ZOOM conference(auto recording) will be held at 2022-03-09 11:00, The subject of the conference is UADK周例会, Summary: 每周三上午11点-12点，会议链接https://linaro-org.zoom.us/j/91879279131 1、社区计划 2、进展问题讨论 3、其他议题讨论 You can join the meeting at https://us06web.zoom.us/j/85336432385?pwd=Rm1TRlYrOWJKd3hiVXRRcFNpRjg1QT09. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

subscribe
by shenyang (M) 24 Feb '22

24 Feb '22

subscribe

1 0