- Acc - mailweb.openeuler.org

[PATCH opwnEuler-22.03-LTS-SP2 0/1] uacce: remove uacce device refcnt
by Wenkai Lin 21 Jun '23

21 Jun '23

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Delete the reference counting so that the isolation policy can be dynamically configured. Wenkai Lin (1): uacce: remove uacce device refcnt drivers/misc/uacce/uacce.c | 5 ----- include/linux/uacce.h | 2 -- 2 files changed, 7 deletions(-) -- 2.30.0

1 1

[PATCH 1/3] cipher: fix double free error
by taoqi 20 Jun '23

20 Jun '23

When wd_cipher_set_key() failed, after the handle is released, the handle should be set to 0 to avoid reusing. Signed-off-by: taoqi <taoqi10(a)huawei.com> --- src/uadk_cipher.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index 1f8d8cb..2c1d87b 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -888,6 +888,7 @@ static void uadk_e_ctx_init(EVP_CIPHER_CTX *ctx, struct cipher_priv_ctx *priv) ret = wd_cipher_set_key(priv->sess, priv->key, EVP_CIPHER_CTX_key_length(ctx)); if (ret) { wd_cipher_free_sess(priv->sess); + priv->sess = 0; fprintf(stderr, "uadk failed to set key!\n"); return; } -- 2.33.0

1 2

[PATCH 00/15] Some cleanup and bugfix of uadk_engine
by Zhiqi Song 15 Jun '23

15 Jun '23

This series patch include bugfix about: 1. Source release problems. 2. Null pointer judgement. 3. Error handling. Hao Fang (1): uadk_engine/v1: clean the empty body in an if statement Zhiqi Song (14): uadk_engine: fixup signed-unsigned mix with relational uadk_engine: fixup variable naming conflicts digest: fixup free source method ecc: fixup free source method inconsistent cipher: fixup error handling in ctx init uadk_engine: modify setting async poll state process dh: fixup release source of private key ecc: Add pkey method null pointer judgment rsa: release source when new kg out failed rsa: bugfix repeated source release sm2: fixup unreleased source in data conversion ecc: add openssl method null pointer judgement async: add null pointer judgment uadk_engine: cleanup call form of callback func src/uadk_async.c | 13 ++- src/uadk_cipher.c | 127 ++++++++++++++------------ src/uadk_dh.c | 104 +++++++++++----------- src/uadk_digest.c | 89 ++++++++++--------- src/uadk_ec.c | 28 +++++- src/uadk_ecx.c | 28 ++++-- src/uadk_pkey.c | 19 ++-- src/uadk_pkey.h | 2 +- src/uadk_rsa.c | 13 ++- src/uadk_sm2.c | 181 ++++++++++++++++++++++---------------- src/uadk_utils.h | 1 - src/v1/utils/engine_log.c | 3 +- 12 files changed, 359 insertions(+), 249 deletions(-) -- 2.33.0

1 15

[PATCH 00/10] Somen bugfix and cleanup of uadk_engine
by Zhiqi Song 10 Jun '23

10 Jun '23

This seires patch include: 1. Cleanup of v1 code. 2. Bugfix about some variable type and memory release issues. Hao Fang (1): uadk_engine/v1: clean the empty body in an if statement Zhiqi Song (9): uadk_engine: fixup signed-unsigned mix with relational uadk_engine: fixup variable naming conflicts digest: fixup free source method ecc: fixup free source method inconsistent cipher: fixup error handling in ctx init uadk_engine: modify setting async poll state process dh: fixup release source of private key ecc: add pkey method null pointer judgment rsa: release source when new kg out failed src/uadk_async.c | 5 +- src/uadk_cipher.c | 121 +++++++++++++++++++++----------------- src/uadk_dh.c | 102 +++++++++++++++++--------------- src/uadk_digest.c | 77 ++++++++++++------------ src/uadk_ec.c | 7 ++- src/uadk_ecx.c | 26 +++++--- src/uadk_pkey.c | 15 +++-- src/uadk_rsa.c | 7 ++- src/uadk_sm2.c | 25 ++++++++ src/uadk_utils.h | 1 - src/v1/utils/engine_log.c | 3 +- 11 files changed, 225 insertions(+), 164 deletions(-) -- 2.33.0

1 10

[PATCH] uadk/comp - some misc fixes
by Yang Shen 08 Jun '23

08 Jun '23

Some misc fixes: 1. Add parameters check. 2. Fix some static check. 3. Some typo. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- wd_comp.c | 146 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 92 insertions(+), 54 deletions(-) diff --git a/wd_comp.c b/wd_comp.c index 6be6b72..671baba 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -27,6 +27,10 @@ #define cpu_to_be32(x) swap_byte(x) +static char *wd_comp_alg_name[WD_COMP_ALG_MAX] = { + "zlib", "gzip", "deflate", "lz77_zstd" +}; + struct wd_comp_sess { enum wd_comp_alg_type alg_type; enum wd_comp_level comp_lv; @@ -68,13 +72,6 @@ static int wd_comp_open_driver(void) const char *alg_name = "zlib"; int ret; - /* - * Compatible with the normal acquisition of device - * drivers in the init interface - */ - if (wd_comp_setting.dlh_list) - return 0; - ret = wd_get_lib_file_path("libhisi_zip.so", lib_path, false); if (ret) return ret; @@ -102,6 +99,21 @@ static void wd_comp_clear_status(void) wd_alg_clear_init(&wd_comp_setting.status); } +static bool wd_comp_alg_check(const char *alg_name) +{ + int i; + + for (i = 0; i < WD_COMP_ALG_MAX; i++) { + /* Some algorithms do not support all modes */ + if (!wd_comp_alg_name[i] || !strlen(wd_comp_alg_name[i])) + continue; + if (!strcmp(alg_name, wd_comp_alg_name[i])) + return true; + } + + return false; +} + static int wd_comp_init_nolock(struct wd_ctx_config *config, struct wd_sched *sched) { int ret; @@ -143,21 +155,23 @@ out_clear_ctx_config: return ret; } -static void wd_comp_uninit_nolock(void) +static int wd_comp_uninit_nolock(void) { void *priv = wd_comp_setting.priv; if (!priv) - return; + return -WD_EINVAL; - /* uninit async request pool */ + /* Uninit async request pool */ wd_uninit_async_request_pool(&wd_comp_setting.pool); - /* unset config, sched, driver */ + /* Unset config, sched, driver */ wd_clear_sched(&wd_comp_setting.sched); wd_alg_uninit_driver(&wd_comp_setting.config, wd_comp_setting.driver, &priv); + + return 0; } int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) @@ -196,7 +210,11 @@ out_clear_init: void wd_comp_uninit(void) { - wd_comp_uninit_nolock(); + int ret; + + ret = wd_comp_uninit_nolock(); + if (ret) + return; wd_comp_close_driver(); wd_alg_clear_init(&wd_comp_setting.status); @@ -206,7 +224,7 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par { struct wd_ctx_nums comp_ctx_num[WD_DIR_MAX] = {0}; struct wd_ctx_params comp_ctx_params; - int ret = 0; + int ret = -WD_EINVAL; bool flag; pthread_atfork(NULL, NULL, wd_comp_clear_status); @@ -215,16 +233,21 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par if (!flag) return -WD_EEXIST; - if (!alg || sched_type > SCHED_POLICY_BUTT || - task_type < 0 || task_type > TASK_MAX_TYPE) { + if (!alg || sched_type >= SCHED_POLICY_BUTT || + task_type < 0 || task_type >= TASK_MAX_TYPE) { WD_ERR("invalid: input param is wrong!\n"); - ret = -WD_EINVAL; + goto out_uninit; + } + + flag = wd_comp_alg_check(alg); + if (!flag) { + WD_ERR("invalid: comp:%s unsupported!\n", alg); goto out_uninit; } /* * Driver lib file path could set by env param. - * than open tham by wd_dlopen_drv() + * then open tham by wd_dlopen_drv() * use NULL means dynamic query path */ wd_comp_setting.dlh_list = wd_dlopen_drv(NULL); @@ -233,44 +256,45 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par goto out_uninit; } -res_retry: - memset(&wd_comp_setting.config, 0, sizeof(struct wd_ctx_config_internal)); + while (ret != 0) { + memset(&wd_comp_setting.config, 0, sizeof(struct wd_ctx_config_internal)); - /* Get alg driver and dev name */ - wd_comp_setting.driver = wd_alg_drv_bind(task_type, alg); - if (!wd_comp_setting.driver) { - WD_ERR("fail to bind a valid driver.\n"); - goto out_dlopen; - } + /* Get alg driver and dev name */ + wd_comp_setting.driver = wd_alg_drv_bind(task_type, alg); + if (!wd_comp_setting.driver) { + WD_ERR("failed to bind %s driver.\n", alg); + goto out_dlclose; + } - comp_ctx_params.ctx_set_num = comp_ctx_num; - ret = wd_ctx_param_init(&comp_ctx_params, ctx_params, - wd_comp_setting.driver, WD_COMP_TYPE, WD_DIR_MAX); - if (ret) { - if (ret == -WD_EAGAIN) { - wd_disable_drv(wd_comp_setting.driver); - wd_alg_drv_unbind(wd_comp_setting.driver); - goto res_retry; + comp_ctx_params.ctx_set_num = comp_ctx_num; + ret = wd_ctx_param_init(&comp_ctx_params, ctx_params, + wd_comp_setting.driver, WD_COMP_TYPE, WD_DIR_MAX); + if (ret) { + if (ret == -WD_EAGAIN) { + wd_disable_drv(wd_comp_setting.driver); + wd_alg_drv_unbind(wd_comp_setting.driver); + continue; + } + goto out_unbind_drv; } - goto out_driver; - } - - wd_comp_init_attrs.alg = alg; - wd_comp_init_attrs.sched_type = sched_type; - wd_comp_init_attrs.driver = wd_comp_setting.driver; - wd_comp_init_attrs.ctx_params = &comp_ctx_params; - wd_comp_init_attrs.alg_init = wd_comp_init_nolock; - wd_comp_init_attrs.alg_poll_ctx = wd_comp_poll_ctx; - ret = wd_alg_attrs_init(&wd_comp_init_attrs); - if (ret) { - if (ret == -WD_ENODEV) { - wd_disable_drv(wd_comp_setting.driver); - wd_alg_drv_unbind(wd_comp_setting.driver); - wd_ctx_param_uninit(&comp_ctx_params); - goto res_retry; + + wd_comp_init_attrs.alg = alg; + wd_comp_init_attrs.sched_type = sched_type; + wd_comp_init_attrs.driver = wd_comp_setting.driver; + wd_comp_init_attrs.ctx_params = &comp_ctx_params; + wd_comp_init_attrs.alg_init = wd_comp_init_nolock; + wd_comp_init_attrs.alg_poll_ctx = wd_comp_poll_ctx; + ret = wd_alg_attrs_init(&wd_comp_init_attrs); + if (ret) { + if (ret == -WD_ENODEV) { + wd_disable_drv(wd_comp_setting.driver); + wd_alg_drv_unbind(wd_comp_setting.driver); + wd_ctx_param_uninit(&comp_ctx_params); + continue; + } + WD_ERR("fail to init alg attrs.\n"); + goto out_params_uninit; } - WD_ERR("fail to init alg attrs.\n"); - goto out_params_uninit; } wd_alg_set_init(&wd_comp_setting.status); @@ -280,9 +304,9 @@ res_retry: out_params_uninit: wd_ctx_param_uninit(&comp_ctx_params); -out_driver: +out_unbind_drv: wd_alg_drv_unbind(wd_comp_setting.driver); -out_dlopen: +out_dlclose: wd_dlclose_drv(wd_comp_setting.dlh_list); out_uninit: wd_alg_clear_init(&wd_comp_setting.status); @@ -291,7 +315,11 @@ out_uninit: void wd_comp_uninit2(void) { - wd_comp_uninit_nolock(); + int ret; + + ret = wd_comp_uninit_nolock(); + if (ret) + return; wd_alg_attrs_uninit(&wd_comp_init_attrs); wd_alg_drv_unbind(wd_comp_setting.driver); @@ -844,6 +872,11 @@ int wd_comp_poll(__u32 expt, __u32 *count) handle_t h_sched_ctx; struct wd_sched *sched; + if (unlikely(!count)) { + WD_ERR("invalid: comp poll count is NULL!\n"); + return -WD_EINVAL; + } + h_sched_ctx = wd_comp_setting.sched.h_sched_ctx; sched = &wd_comp_setting.sched; @@ -915,6 +948,11 @@ int wd_comp_get_env_param(__u32 node, __u32 type, __u32 mode, struct wd_ctx_attr ctx_attr; int ret; + if (!num || !is_enable) { + WD_ERR("invalid: num or is_enable is NULL!\n"); + return -WD_EINVAL; + } + if (type >= WD_DIR_MAX) { WD_ERR("invalid: op_type is %u!\n", type); return -WD_EINVAL; -- 2.24.0

1 0

[PATCH 1/9] uadk: add null pointer check
by Wenkai Lin 07 Jun '23

07 Jun '23

From: taoqi 30043660 <taoqi10(a)huawei.com> The system does not check whether the pointer is NULL before releasing the pointer. Signed-off-by: taoqi 30043660 <taoqi10(a)huawei.com> --- wd_mempool.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/wd_mempool.c b/wd_mempool.c index ff9910a..ffb2f47 100644 --- a/wd_mempool.c +++ b/wd_mempool.c @@ -230,8 +230,12 @@ static struct bitmap *create_bitmap(int bits) static void destroy_bitmap(struct bitmap *bm) { - free(bm->map); - free(bm); + if (bm) { + if (bm->map) + free(bm->map); + + free(bm); + } } static unsigned long _find_next_bit(unsigned long *map, unsigned long bits, @@ -893,8 +897,10 @@ static int init_mempool(struct mempool *mp) static void uninit_mempool(struct mempool *mp) { - destroy_bitmap(mp->bitmap); - mp->bitmap = NULL; + if (mp->bitmap) { + destroy_bitmap(mp->bitmap); + mp->bitmap = NULL; + } } handle_t wd_mempool_create(size_t size, int node) -- 2.33.0

1 8

[PATCH OLK-5.10 0/8] Fixed the accelerator capability register issue.
by Wenkai Lin 06 Jun '23

06 Jun '23

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Misc fixes for Kunpeng accelerator drivers! Kai Ye (1): crypto: hisilicon/sec - misc cleanups Wenkai Lin (3): crypto: hisilicon/sec - remove unused parameter crypto: hisilicon/sec - fix for resource leak crypto: hisilicon/qm - add a function to set qm algs Zhiqi Song (4): crypto: hisilicon/qm - save capability registers in qm init process crypto: hisilicon/hpre - save capability registers in probe process crypto: hisilicon/sec2 - save capability registers in probe process crypto: hisilicon/zip - save capability registers in probe process drivers/crypto/hisilicon/hpre/hpre_main.c | 68 ++++++------- drivers/crypto/hisilicon/qm.c | 72 ++++++++++++-- drivers/crypto/hisilicon/sec2/sec.h | 7 ++ drivers/crypto/hisilicon/sec2/sec_crypto.c | 89 +++++++++-------- drivers/crypto/hisilicon/sec2/sec_main.c | 105 ++++++++++----------- drivers/crypto/hisilicon/zip/zip_main.c | 104 ++++++++++---------- include/linux/hisi_acc_qm.h | 12 +++ 7 files changed, 254 insertions(+), 203 deletions(-) -- 2.30.0

1 8

[PATCH 0/9] uadk: some fixes for hpre
by Weili Qian 06 Jun '23

06 Jun '23

Misc fixes for hpre driver and asymmetric algorithm API. Qi Tao (1): uadk/rsa: use %u to print u32 variables Weili Qian (8): drv/hpre: fix ECC operation type drv/hisi_sec: enable address prefetching drv/hpre: rename hpre_alg_driver to hpre_ecc_driver uadk: add algorithm check uadk: modify parameter check conditions uadk: fix repeat uninit error uadk: fix coding style uadk: remove duplicate checks drv/hisi_hpre.c | 26 +++++----- drv/hisi_sec.c | 6 +++ wd_dh.c | 108 ++++++++++++++++++++++------------------ wd_ecc.c | 130 ++++++++++++++++++++++++++---------------------- wd_rsa.c | 116 ++++++++++++++++++++++-------------------- 5 files changed, 212 insertions(+), 174 deletions(-) -- 2.30.0

1 9

[PATCH] cipher: code clean for update iv and check length
by Wenkai Lin 03 Jun '23

03 Jun '23

Reduces some counting and branching judgments. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- src/uadk_cipher.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index a880c1b..c7be21a 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -64,7 +64,7 @@ struct cipher_priv_ctx { void *sw_ctx_data; /* Crypto small packet offload threshold */ size_t switch_threshold; - int update_iv; + bool update_iv; }; struct cipher_info { @@ -317,12 +317,6 @@ static int uadk_e_cipher_soft_work(EVP_CIPHER_CTX *ctx, unsigned char *out, return 1; } -static int sec_ciphers_is_check_valid(struct cipher_priv_ctx *priv) -{ - return priv->req.in_bytes <= priv->switch_threshold ? - 0 : 1; -} - static void uadk_e_cipher_sw_cleanup(EVP_CIPHER_CTX *ctx) { struct cipher_priv_ctx *priv = @@ -771,13 +765,12 @@ static void uadk_cipher_update_priv_ctx(struct cipher_priv_ctx *priv) int i; switch (priv->setup.mode) { + case WD_CIPHER_CFB: case WD_CIPHER_CBC: if (priv->req.op_type == WD_CIPHER_ENCRYPTION) - memcpy(priv->iv, priv->req.dst + priv->req.in_bytes - iv_bytes, - iv_bytes); + memcpy(priv->iv, priv->req.dst + offset, iv_bytes); else - memcpy(priv->iv, priv->req.src + priv->req.in_bytes - iv_bytes, - iv_bytes); + memcpy(priv->iv, priv->req.src + offset, iv_bytes); break; case WD_CIPHER_OFB: @@ -786,15 +779,6 @@ static void uadk_cipher_update_priv_ctx(struct cipher_priv_ctx *priv) *((unsigned char *)priv->req.dst + offset + i); } memcpy(priv->iv, K, iv_bytes); - break; - case WD_CIPHER_CFB: - if (priv->req.op_type == WD_CIPHER_ENCRYPTION) - memcpy(priv->iv, priv->req.dst + priv->req.in_bytes - iv_bytes, - iv_bytes); - else - memcpy(priv->iv, priv->req.src + priv->req.in_bytes - iv_bytes, - iv_bytes); - break; case WD_CIPHER_CTR: ctr_iv_inc(priv->iv, priv->req.in_bytes >> CTR_MODE_LEN_SHIFT); @@ -811,8 +795,7 @@ static int do_cipher_sync(struct cipher_priv_ctx *priv) if (unlikely(priv->switch_flag == UADK_DO_SOFT)) return 0; - ret = sec_ciphers_is_check_valid(priv); - if (!ret) + if (priv->switch_threshold >= priv->req.in_bytes) return 0; ret = wd_do_cipher_sync(priv->sess, &priv->req); -- 2.33.0

1 0

[PATCH 01/20] uadk: fix alg driver uninit problem
by Wenkai Lin 03 Jun '23

03 Jun '23

UADK_ALG_HW is calc_type of driver property, fix it. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- wd_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wd_util.c b/wd_util.c index 633d957..6593dad 100644 --- a/wd_util.c +++ b/wd_util.c @@ -1968,7 +1968,7 @@ void wd_alg_uninit_driver(struct wd_ctx_config_internal *config, driver->exit(priv); /* Ctx config just need clear once */ - if (driver->priority == UADK_ALG_HW) + if (driver->calc_type == UADK_ALG_HW) wd_clear_ctx_config(config); if (driver->fallback) -- 2.33.0

1 19

2024

2023

2022

Acc