May 2025 - Acc - mailweb.openeuler.org

[PATCH 1/2] uadk_engine/hpre: fix memory leaks in sm2
by Qi Tao 28 May '25

28 May '25

From: lizhi <lizhi206(a)huawei.com> fix memory leak and avoid possible double-free risk in sm2. Signed-off-by: lizhi <lizhi206(a)huawei.com> --- src/uadk_sm2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/uadk_sm2.c b/src/uadk_sm2.c index 170d320..7737292 100644 --- a/src/uadk_sm2.c +++ b/src/uadk_sm2.c @@ -407,9 +407,12 @@ static int sign_bin_to_ber(EC_KEY *ec, struct wd_dtb *r, struct wd_dtb *s, if (sltmp < 0) { fprintf(stderr, "failed to i2d_ECDSA_SIG\n"); ret = -EINVAL; - goto free_s; + /* bs and br set to e_sig, use unified interface to prevent double release. */ + goto free_sig; } + *siglen = (size_t)sltmp; + ECDSA_SIG_free(e_sig); return 0; free_s: @@ -417,7 +420,6 @@ free_s: free_r: BN_clear_free(br); free_sig: - ECDSA_SIG_set0(e_sig, NULL, NULL); ECDSA_SIG_free(e_sig); return ret; -- 2.33.0

1 1

[PATCH] uadk_prov: fix some cleancode issues
by Qi Tao 28 May '25

28 May '25

Fixed the following issues: 1. Remove redundant function return value check. 2. Modify inappropriate exception printing. 3. There is no need to check the return value of async_wake_job(). Only need to check req->state to determine if there is an exception in packet reception. Therefore, add "(void)" before the function call. 4. Free the allocated memory before returning an error. 5. The callback function's parameter list does not match the function pointer definition. Signed-off-by: Qi Tao <taoqi10(a)huawei.com> --- src/uadk_aead.c | 4 ++-- src/uadk_async.c | 2 +- src/uadk_cipher.c | 6 +----- src/uadk_dh.c | 2 +- src/uadk_digest.c | 2 +- src/uadk_pkey.c | 2 +- src/uadk_prov_aead.c | 4 ++-- src/uadk_prov_cipher.c | 4 ++-- src/uadk_prov_dh.c | 2 +- src/uadk_prov_digest.c | 6 +++--- src/uadk_prov_hmac.c | 6 +++--- src/uadk_prov_init.c | 4 +++- src/uadk_prov_pkey.c | 2 +- src/uadk_prov_rsa.c | 2 +- src/uadk_rsa.c | 2 +- 15 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/uadk_aead.c b/src/uadk_aead.c index 1da7753..69223f1 100644 --- a/src/uadk_aead.c +++ b/src/uadk_aead.c @@ -469,7 +469,7 @@ static int do_aead_sync_inner(struct aead_priv_ctx *priv, unsigned char *out, priv->req.state = 0; ret = wd_do_aead_sync(priv->sess, &priv->req); if (unlikely(ret < 0 || priv->req.state)) { - fprintf(stderr, "do aead task failed, msg state: %d, ret: %d, state: %u!\n", + fprintf(stderr, "do aead task failed, msg state: %u, ret: %d, state: %u!\n", state, ret, priv->req.state); return RET_FAIL; } @@ -547,7 +547,7 @@ static void *uadk_e_aead_cb(struct wd_aead_req *req, void *data) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } return NULL; diff --git a/src/uadk_async.c b/src/uadk_async.c index 7536bd5..0f92dde 100644 --- a/src/uadk_async.c +++ b/src/uadk_async.c @@ -329,7 +329,7 @@ static void *async_poll_process_func(void *args) if (!poll_queue.is_recv && op->job) { op->done = 1; op->ret = ret; - async_wake_job(op->job); + (void)async_wake_job(op->job); async_free_poll_task(idx, 0); } } diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index 457e90d..95af193 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -242,10 +242,6 @@ static int uadk_e_cipher_soft_work(EVP_CIPHER_CTX *ctx, unsigned char *out, */ if (!priv->update_iv) { iv = EVP_CIPHER_CTX_iv_noconst(ctx); - if (unlikely(iv == NULL)) { - fprintf(stderr, "get openssl software iv failed.\n"); - return 0; - } memcpy(iv, priv->iv, EVP_CIPHER_CTX_iv_length(ctx)); priv->update_iv = true; } @@ -567,7 +563,7 @@ static void *uadk_e_cipher_cb(struct wd_cipher_req *req, void *data) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } return NULL; diff --git a/src/uadk_dh.c b/src/uadk_dh.c index 2f2c1cf..011bf56 100644 --- a/src/uadk_dh.c +++ b/src/uadk_dh.c @@ -259,7 +259,7 @@ static void uadk_e_dh_cb(void *req_t) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } diff --git a/src/uadk_digest.c b/src/uadk_digest.c index 6827f98..0b4e8c5 100644 --- a/src/uadk_digest.c +++ b/src/uadk_digest.c @@ -802,7 +802,7 @@ static void *uadk_e_digest_cb(void *data) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } return NULL; diff --git a/src/uadk_pkey.c b/src/uadk_pkey.c index 1f8234b..e05c7d0 100644 --- a/src/uadk_pkey.c +++ b/src/uadk_pkey.c @@ -101,7 +101,7 @@ void uadk_e_ecc_cb(void *req_t) op->done = 1; op->ret = 0; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } diff --git a/src/uadk_prov_aead.c b/src/uadk_prov_aead.c index 54e0115..dbbd844 100644 --- a/src/uadk_prov_aead.c +++ b/src/uadk_prov_aead.c @@ -390,7 +390,7 @@ static void *uadk_prov_aead_cb(struct wd_aead_req *req, void *data) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } return NULL; @@ -800,7 +800,7 @@ static int uadk_get_aead_info(struct aead_priv_ctx *priv) } if (unlikely(i == aead_counts)) { - fprintf(stderr, "failed to setup the private ctx.\n"); + fprintf(stderr, "failed to get aead info.\n"); return UADK_AEAD_FAIL; } diff --git a/src/uadk_prov_cipher.c b/src/uadk_prov_cipher.c index db4a957..dfe6666 100644 --- a/src/uadk_prov_cipher.c +++ b/src/uadk_prov_cipher.c @@ -395,7 +395,7 @@ static int uadk_get_cipher_info(struct cipher_priv_ctx *priv) } } - fprintf(stderr, "failed to setup the private ctx.\n"); + fprintf(stderr, "failed to get cipher info.\n"); return UADK_P_FAIL; } @@ -455,7 +455,7 @@ static void async_cb(struct wd_cipher_req *req, void *data) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } diff --git a/src/uadk_prov_dh.c b/src/uadk_prov_dh.c index c75c386..1cb4b45 100644 --- a/src/uadk_prov_dh.c +++ b/src/uadk_prov_dh.c @@ -581,7 +581,7 @@ static void uadk_prov_dh_cb(void *req_t) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } diff --git a/src/uadk_prov_digest.c b/src/uadk_prov_digest.c index 7a5bfff..a13d075 100644 --- a/src/uadk_prov_digest.c +++ b/src/uadk_prov_digest.c @@ -303,7 +303,7 @@ static int uadk_get_digest_info(struct digest_priv_ctx *priv) } if (unlikely(i == digest_counts)) { - fprintf(stderr, "failed to setup the private ctx.\n"); + fprintf(stderr, "failed to digest info.\n"); return UADK_DIGEST_FAIL; } @@ -534,7 +534,7 @@ soft_update: return uadk_digest_soft_update(priv, data, data_len); } -static void uadk_async_cb(struct wd_digest_req *req, void *data) +static void uadk_async_cb(struct wd_digest_req *req) { struct uadk_e_cb_info *digest_cb_param; struct wd_digest_req *req_origin; @@ -550,7 +550,7 @@ static void uadk_async_cb(struct wd_digest_req *req, void *data) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } diff --git a/src/uadk_prov_hmac.c b/src/uadk_prov_hmac.c index db49612..6bf7947 100644 --- a/src/uadk_prov_hmac.c +++ b/src/uadk_prov_hmac.c @@ -361,7 +361,7 @@ static int uadk_get_hmac_info(struct hmac_priv_ctx *priv) } } - fprintf(stderr, "failed to setup the private ctx, algname = %s.\n", priv->alg_name); + fprintf(stderr, "failed to get hmac info, algname = %s.\n", priv->alg_name); return UADK_HMAC_FAIL; } @@ -529,7 +529,7 @@ soft_init: return uadk_hmac_soft_init(priv); } -static void uadk_hmac_async_cb(struct wd_digest_req *req, void *data) +static void uadk_hmac_async_cb(struct wd_digest_req *req) { struct uadk_e_cb_info *hmac_cb_param; struct wd_digest_req *req_origin; @@ -545,7 +545,7 @@ static void uadk_hmac_async_cb(struct wd_digest_req *req, void *data) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } diff --git a/src/uadk_prov_init.c b/src/uadk_prov_init.c index c29500b..20f7068 100644 --- a/src/uadk_prov_init.c +++ b/src/uadk_prov_init.c @@ -470,8 +470,10 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, ctx->libctx = (OSSL_LIB_CTX *)c_get_libctx(handle); ret = uadk_prov_ctx_set_core_bio_method(ctx); - if (!ret) + if (!ret) { + OPENSSL_free(ctx); return UADK_P_FAIL; + } ret = async_module_init(); if (!ret) diff --git a/src/uadk_prov_pkey.c b/src/uadk_prov_pkey.c index ca853ae..ac4541c 100644 --- a/src/uadk_prov_pkey.c +++ b/src/uadk_prov_pkey.c @@ -362,7 +362,7 @@ void uadk_prov_ecc_cb(void *req_t) ecc_async_op->done = 1; ecc_async_op->ret = 0; async_free_poll_task(ecc_async_op->idx, 1); - async_wake_job(ecc_async_op->job); + (void)async_wake_job(ecc_async_op->job); } } diff --git a/src/uadk_prov_rsa.c b/src/uadk_prov_rsa.c index b9713cc..4351514 100644 --- a/src/uadk_prov_rsa.c +++ b/src/uadk_prov_rsa.c @@ -1275,7 +1275,7 @@ static void uadk_e_rsa_cb(void *req_t) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } diff --git a/src/uadk_rsa.c b/src/uadk_rsa.c index 76678a4..1755374 100644 --- a/src/uadk_rsa.c +++ b/src/uadk_rsa.c @@ -1117,7 +1117,7 @@ static void uadk_e_rsa_cb(void *req_t) if (op && op->job && !op->done) { op->done = 1; async_free_poll_task(op->idx, 1); - async_wake_job(op->job); + (void)async_wake_job(op->job); } } -- 2.33.0

1 0

【2025/5/28 AccLIb SIG 双周例会 11:00 - 12:00】
by openEuler conference 27 May '25

27 May '25

您好！ sig-AccLib 邀请您参加 2025-05-28 11:00 召开的Zoom会议会议主题：【2025/5/28 AccLIb SIG 双周例会 11:00 - 12:00】会议内容：会议链接： linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet 会议链接：https://us06web.zoom.us/j/82863167501?pwd=tvnic0aWCxFSVFObmeHHXbN3gh2a8m.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 更多资讯尽在：https://www.openeuler.org/zh/ Hello! sig-AccLib invites you to attend the Zoom conference will be held at 2025-05-28 11:00, The subject of the conference is 【2025/5/28 AccLIb SIG 双周例会 11:00 - 12:00】 Summary: 会议链接： linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet You can join the meeting at https://us06web.zoom.us/j/82863167501?pwd=tvnic0aWCxFSVFObmeHHXbN3gh2a8m.1 Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings More information: https://www.openeuler.org/en/

1 0

[PATCH 00/22] uadk_engine: some bugfix and cleanup
by Qi Tao 27 May '25

27 May '25

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Chenghai Huang (5): uadk_provider: adjust the threshold for SHA384 to use Digest to Calculated key uadk_provider: fix dh memery leak issue in free params uadk_provider: fix rsa memery leak issue in bn_ctx_new uadk_provider: rectify the soft switch contidition of RAS uadk_provider: fix some compilation warning issues Qi Tao (6): uadk_prov: fix some cleancode issues uadk_prov: the query returns the v3 alg array to handle exception uadk_prov: modify the location of creating soft ctx uadk_prov: fix memory leak error uadk_engine: fix cleancode issues uadk_prov: default to turn on the soft switch Weili Qian (3): uadk_engine: fix possible double free issues uadk_engine/ecdh: remove unnecessary call uadk_ecc_set_public_key uadk_provider/sm2: free all applied memory when freectx Zhiqi Song (2): uadk_engine/cipher: fixup the method of obtaining IV in init uadk_engine/hpre: fixup some param release problem Zhushuai Yin (1): uadk_provider:fix dh insufficient performance lizhi (5): uadk_engine/ecdh: Pad the high bits of short shared keys with 0 uadk_provider/ecdh: Pad the high bits of short shared keys with 0 uadk_provider/ecx: fix memory leak of ecx_key uadk_provider/sm2: Fix the race conditions caused by atomic variables uadk_provider/sm2: fix a bug of switching soft compute src/uadk_aead.c | 4 +- src/uadk_async.c | 2 +- src/uadk_cipher.c | 8 +- src/uadk_dh.c | 4 +- src/uadk_digest.c | 5 +- src/uadk_ec.c | 52 +++--- src/uadk_pkey.c | 2 +- src/uadk_prov.h | 4 +- src/uadk_prov_aead.c | 43 +++-- src/uadk_prov_cipher.c | 38 +++-- src/uadk_prov_dh.c | 123 ++++++++------ src/uadk_prov_digest.c | 38 +++-- src/uadk_prov_ecdh_exch.c | 9 +- src/uadk_prov_ecx.c | 29 ++-- src/uadk_prov_ffc.c | 170 +++++++++++++++++--- src/uadk_prov_ffc.h | 38 ++++- src/uadk_prov_hmac.c | 8 +- src/uadk_prov_init.c | 36 +++-- src/uadk_prov_pkey.c | 2 +- src/uadk_prov_rsa.c | 138 ++++++++-------- src/uadk_prov_sm2.c | 331 ++++++++++++++++++++------------------ src/uadk_rsa.c | 2 +- src/uadk_sm2.c | 10 +- 23 files changed, 678 insertions(+), 418 deletions(-) -- 2.33.0

1 22

[PATCH] uadk_provider: fix the async issue when receive fail
by Qi Tao 26 May '25

26 May '25

From: Chenghai Huang <huangchenghai2(a)huawei.com> The corresponding sending thread can be precisely woken up only after the poll thread receiving succeeds. When a hardware error occurs, asynchronous receiving will reture an abnormal value. In this case, the corresponding sending thread cannot be sure to woken up. Therefore, the counting method is used to wake up the corresponding thread whose number of failures exceeds the threshold. Signed-off-by: Chenghai Huang <huangchenghai2(a)huawei.com> --- src/uadk_async.c | 10 ++++++++++ src/uadk_async.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/src/uadk_async.c b/src/uadk_async.c index 0f92dde..8adc964 100644 --- a/src/uadk_async.c +++ b/src/uadk_async.c @@ -327,6 +327,16 @@ static void *async_poll_process_func(void *args) idx = op->idx; ret = async_recv_func[task->type](task->ctx); if (!poll_queue.is_recv && op->job) { + /* + * Wake up the op->job whose number of polling + * failures exceeds the threshold. + */ + if (ret && ret != -ETIMEDOUT && op->retry++ < ASYNC_MAX_RETRY_CNT) { + (void)sem_post(&poll_queue.full_sem); + continue; + } + + op->retry = 0; op->done = 1; op->ret = ret; (void) async_wake_job(op->job); diff --git a/src/uadk_async.h b/src/uadk_async.h index 8de3c3c..23f017e 100644 --- a/src/uadk_async.h +++ b/src/uadk_async.h @@ -23,6 +23,7 @@ #include <openssl/async.h> #define ASYNC_QUEUE_TASK_NUM 1024 +#define ASYNC_MAX_RETRY_CNT 1000 #define UADK_E_SUCCESS 1 #define UADK_E_FAIL 0 #define DO_SYNC 1 @@ -32,6 +33,7 @@ struct async_op { int done; int idx; int ret; + int retry; }; struct uadk_e_cb_info { -- 2.33.0

1 0

[PATCH] sanity_test: fix blk hw test
by Qi Tao 22 May '25

22 May '25

From: Hao Fang <fanghao11(a)huawei.com> Signed-off-by: Hao Fang <fanghao11(a)huawei.com> --- test/sanity_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/sanity_test.sh b/test/sanity_test.sh index 1c4b631..acc44a9 100755 --- a/test/sanity_test.sh +++ b/test/sanity_test.sh @@ -87,10 +87,10 @@ hw_blk_deflate() case $3 in "gzip") ${RM} -f /tmp/gzip_list.bin - run_cmd uadk_tool test --m zip --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --in $1 --out $2 $@ ;; "zlib") - run_cmd uadk_tool test --m zip --alg 1 --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --alg 1 --in $1 --out $2 $@ ;; *) echo "Unsupported algorithm type: $3" @@ -104,10 +104,10 @@ hw_blk_inflate() { case $3 in "gzip") - run_cmd uadk_tool test --m zip --inf --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --inf --in $1 --out $2 $@ ;; "zlib") - run_cmd uadk_tool test --m zip --alg 1 --inf --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --alg 1 --inf --in $1 --out $2 $@ ;; *) echo "Unsupported algorithm type: $3" @@ -365,9 +365,9 @@ run_zip_test_v2() WD_COMP_EPOLL_EN=1 hw_dfl_hw_ifl /tmp/syslog WD_COMP_EPOLL_EN=0 hw_dfl_hw_ifl /tmp/syslog # test without environment variables - #run_cmd uadk_tool test --m zip --blksize 8192 --size 81920 --loop 1000 --self + #run_cmd uadk_tool test --m zip --stream --blksize 8192 --size 81920 --loop 1000 --self # test with environment variables - #run_cmd uadk_tool test --m zip --blksize 8192 --size 81920 --loop 1000 --self --env + #run_cmd uadk_tool test --m zip --stream --blksize 8192 --size 81920 --loop 1000 --self --env } # Accept more paraterms -- 2.33.0

1 0

[PATCH] uadk_provider: fix the async issue when receive fail
by Qi Tao 21 May '25

21 May '25

From: Chenghai Huang <huangchenghai2(a)huawei.com> When a hardware error occurs, asynchronous receiving will reture an abnormal value. In this case, the corresponding sending thread cannot be sure to woken up. Therefore, the counting method is used to wake up the corresponding thread whose number of failures exceeds the threshold. Signed-off-by: Chenghai Huang <huangchenghai2(a)huawei.com> --- src/uadk_async.c | 8 ++++++++ src/uadk_async.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/uadk_async.c b/src/uadk_async.c index 0f92dde..947b4ee 100644 --- a/src/uadk_async.c +++ b/src/uadk_async.c @@ -326,6 +326,14 @@ static void *async_poll_process_func(void *args) op = task->op; idx = op->idx; ret = async_recv_func[task->type](task->ctx); + if (ret && !poll_queue.is_recv) { + if (op->retry++ < ASYNC_MAX_RETRY_CNT) { + (void)sem_post(&poll_queue.full_sem); + continue; + } + op->retry = 0; + } + if (!poll_queue.is_recv && op->job) { op->done = 1; op->ret = ret; diff --git a/src/uadk_async.h b/src/uadk_async.h index 8de3c3c..23f017e 100644 --- a/src/uadk_async.h +++ b/src/uadk_async.h @@ -23,6 +23,7 @@ #include <openssl/async.h> #define ASYNC_QUEUE_TASK_NUM 1024 +#define ASYNC_MAX_RETRY_CNT 1000 #define UADK_E_SUCCESS 1 #define UADK_E_FAIL 0 #define DO_SYNC 1 @@ -32,6 +33,7 @@ struct async_op { int done; int idx; int ret; + int retry; }; struct uadk_e_cb_info { -- 2.33.0

1 0

[PATCH] test: remove --ilist --olist commands for list_loader.py
by Qi Tao 15 May '25

15 May '25

From: Hao Fang <fanghao11(a)huawei.com> list_loader.py is for software comp test, but hw comp test had remove the --list commands, the loopback test will be failed, so list_loader.py also do the same thing. Signed-off-by: Hao Fang <fanghao11(a)huawei.com> --- test/list_loader.py | 71 ++++++++++++++------------------------------- test/sanity_test.sh | 4 +-- 2 files changed, 23 insertions(+), 52 deletions(-) diff --git a/test/list_loader.py b/test/list_loader.py index d5e1578..7373a88 100755 --- a/test/list_loader.py +++ b/test/list_loader.py @@ -13,22 +13,16 @@ class listcontent(object): self.ofile_nm = ofile self.ifile = open(ifile, "rb") self.ofile = open(ofile, "wb") - # addr: 8 bytes, size: 8 bytes, next: 8 bytes - #self.entry_sz = 0x18; - self.entry_addr = 0; - self.entry_size = 0; - self.entry_next = 0; def __del__(self): self.ifile.close() self.ofile.close() - def deflate(self, olist, blk_sz): + def deflate(self, blk_sz): ifile_sz = os.path.getsize(self.ifile_nm) count = (ifile_sz + int(blk_sz) - 1) / int(blk_sz) # Create array data = np.ndarray(count * 3, dtype=np.uint64) - entries = data.reshape(-1, 3) i = 0 while i < count: # Each block of data is stored in temporary file that is used @@ -44,33 +38,21 @@ class listcontent(object): os.system("cat %s > %s" % (of.name, self.ofile_nm)) else: os.system("cat %s >> %s" % (of.name, self.ofile_nm)) - # entries[i][0] should be the address of output buffer. - # But the output is file now, not buffer. So fill it with - # any non-zero value. - entries[i][0] = 1 - entries[i][1] = os.path.getsize(of.name) - if i == count - 1: - entries[i][2] = 0 - else: - entries[i][2] = 1 i += 1 os.remove(f.name) os.remove(of.name) - entries.tofile(olist) - # Read block data from ifile by ilist. And inflate each block data. - def inflate(self, ilist): - self.ilist_nm = ilist - data = np.fromfile(self.ilist_nm, dtype=np.uint64) - # Each entry contains addr, size and next fields - # Convert data array into the two dimensional array - entries = data.reshape(-1, 3) + # Read block data from ifile. And inflate each block data. + def inflate(self): + ifile_sz = os.path.getsize(self.ifile_nm) i = 0 - while i < entries.shape[0]: + while True: # Each block of data is stored in temporary file that is used # by gunzip. f = tempfile.NamedTemporaryFile(delete=False) - blk = self.ifile.read(entries[i][1]) + blk = self.ifile.read(ifile_sz) + if not blk: + break f.write(blk) f.close() if not i: @@ -78,42 +60,31 @@ class listcontent(object): else: os.system("gunzip < %s >> %s" % (f.name, self.ofile_nm)) os.remove(f.name) - if not entries[i][2]: - break i += 1 -def sw_deflate(ifile, ofile, olist, blk_sz): +def sw_deflate(ifile, ofile, blk_sz): dfl = listcontent(ifile, ofile) - dfl.deflate(olist, blk_sz) + dfl.deflate(blk_sz) -def sw_inflate(ifile, ofile, ilist): +def sw_inflate(ifile, ofile): ifl = listcontent(ifile, ofile) - ifl.inflate(ilist) + ifl.inflate() def main(argv): - ilist = '' - olist = '' ifile = '' ofile = '' blk_sz = 0 try: - opts, args = getopt.getopt(argv, "hb:", ["ilist=","olist=","in=","out="]) + opts, args = getopt.getopt(argv, "hb:", ["in=","out="]) for opt, arg in opts: if opt in ("-h"): print('Software deflate command:') - print(' list_loader -b <block size> --in <file> --out <file> --olist <file>') + print(' list_loader -b <block size> --in <file> --out <file>') print('Software inflate command:') - print(' list_loader --in <file> --out <file> --ilist <file>') + print(' list_loader --in <file> --out <file>') sys.exit() elif opt in ("-b"): blk_sz = arg - elif opt in ("--ilist"): - if not os.path.isfile(arg): - print("File does not exist:", arg) - sys.exit(1) - ilist = arg - elif opt in ("--olist"): - olist = arg elif opt in ("--in"): if not os.path.isfile(arg): print("File does not exist:", arg) @@ -122,18 +93,18 @@ def main(argv): elif opt in ("--out"): ofile = arg except getopt.GetoptError: - # Compress source to destination file and output list file + # Compress source to destination file print('Software deflate command:') - print(' list_loader -b <block size> --in <file> --out <file> --olist <file>') - # Decompress source to destination file with input list file + print(' list_loader -b <block size> --in <file> --out <file>') + # Decompress source to destination file print('Software inflate command:') - print(' list_loader --in <file> --out <file> --ilist <file>') + print(' list_loader --in <file> --out <file>') sys.exit(2) if blk_sz: - sw_deflate(ifile, ofile, olist, blk_sz) + sw_deflate(ifile, ofile, blk_sz) else: - sw_inflate(ifile, ofile, ilist) + sw_inflate(ifile, ofile) if __name__ == "__main__": main(sys.argv[1:]) diff --git a/test/sanity_test.sh b/test/sanity_test.sh index 9ffb137..1c4b631 100755 --- a/test/sanity_test.sh +++ b/test/sanity_test.sh @@ -157,7 +157,7 @@ sw_blk_deflate() case $3 in "gzip") ${RM} -f /tmp/gzip_list.bin - python test/list_loader.py --in $1 --out $2 --olist /tmp/gzip_list.bin -b $4 + python test/list_loader.py --in $1 --out $2 -b $4 ;; *) echo "Unsupported algorithm type: $3" @@ -171,7 +171,7 @@ sw_blk_inflate() { case $3 in "gzip") - python test/list_loader.py --in $1 --out $2 --ilist /tmp/gzip_list.bin + python test/list_loader.py --in $1 --out $2 ;; *) echo "Unsupported algorithm type: $3" -- 2.33.0

1 0

[PATCH] [acc/uadk_tool] Modify malloc for queue init
by Qi Tao 08 May '25

08 May '25

From: Junchong Pan <panjunchong(a)h-partners.com> Queue is malloc but not init, is_poll is set but poll interface is not invoked, may case eq overflow. Signed-off-by: Junchong Pan <panjunchong(a)h-partners.com> Signed-off-by: Qi Tao <taoqi10(a)huawei.com> --- uadk_tool/benchmark/hpre_wd_benchmark.c | 2 +- uadk_tool/benchmark/sec_wd_benchmark.c | 2 +- uadk_tool/benchmark/zip_wd_benchmark.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uadk_tool/benchmark/hpre_wd_benchmark.c b/uadk_tool/benchmark/hpre_wd_benchmark.c index 40f7f0b..60ed3bd 100644 --- a/uadk_tool/benchmark/hpre_wd_benchmark.c +++ b/uadk_tool/benchmark/hpre_wd_benchmark.c @@ -447,7 +447,7 @@ static int init_hpre_wd_queue(struct acc_option *options) } for (i = 0; i < g_thread_num; i++) { - g_thread_queue.bd_res[i].queue = malloc(sizeof(struct wd_queue)); + g_thread_queue.bd_res[i].queue = calloc(1, sizeof(struct wd_queue)); g_thread_queue.bd_res[i].queue->capa.alg = options->algclass; // 0 is ENC, 1 is DEC g_thread_queue.bd_res[i].queue->capa.priv.direction = options->optype; diff --git a/uadk_tool/benchmark/sec_wd_benchmark.c b/uadk_tool/benchmark/sec_wd_benchmark.c index e022dcb..f066a5b 100644 --- a/uadk_tool/benchmark/sec_wd_benchmark.c +++ b/uadk_tool/benchmark/sec_wd_benchmark.c @@ -610,7 +610,7 @@ static int init_wd_queue(struct acc_option *options) } for (i = 0; i < g_thread_num; i++) { - g_thread_queue.bd_res[i].queue = malloc(sizeof(struct wd_queue)); + g_thread_queue.bd_res[i].queue = calloc(1, sizeof(struct wd_queue)); memset(g_thread_queue.bd_res[i].queue, 0, sizeof(struct wd_queue)); g_thread_queue.bd_res[i].queue->capa.alg = options->algclass; // 0 is ENC, 1 is DEC diff --git a/uadk_tool/benchmark/zip_wd_benchmark.c b/uadk_tool/benchmark/zip_wd_benchmark.c index 8ad3e96..ab9a894 100644 --- a/uadk_tool/benchmark/zip_wd_benchmark.c +++ b/uadk_tool/benchmark/zip_wd_benchmark.c @@ -311,7 +311,7 @@ static int init_zip_wd_queue(struct acc_option *options) } for (i = 0; i < g_thread_num; i++) { - g_thread_queue.bd_res[i].queue = malloc(sizeof(struct wd_queue)); + g_thread_queue.bd_res[i].queue = calloc(1, sizeof(struct wd_queue)); g_thread_queue.bd_res[i].queue->capa.alg = options->algclass; // 0 is compress, 1 is decompress g_thread_queue.bd_res[i].queue->capa.priv.direction = op_type; -- 2.33.0

1 1