November 2022 - Acc - mailweb.openeuler.org

[PATCH v4 0/3] uadk: adjust header file
by liulongfang 12 Nov '22

12 Nov '22

1 3

[PATCH v3 0/3] uadk: adjust header file
by liulongfang 10 Nov '22

10 Nov '22

1 3

[PATCH v3 0/3] uadk: adjust header file
by liulongfang 10 Nov '22

10 Nov '22

1 3

[PATCH] uadk/v1: check dh and rsa key bits
by Weili Qian 09 Nov '22

09 Nov '22

Before creating ctx, the key bits must be checked. If the key bits is incorrect, return failed. Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- v1/wd_dh.c | 20 +++++++++++++++++++- v1/wd_rsa.c | 17 +++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/v1/wd_dh.c b/v1/wd_dh.c index 25483c1..dff8a02 100644 --- a/v1/wd_dh.c +++ b/v1/wd_dh.c @@ -30,6 +30,12 @@ #define DH_BALANCE_THRHD 1280 #define DH_RESEND_CNT 8 #define DH_RECV_MAX_CNT 60000000 // 1 min +#define DH_KEYSIZE_768 768 +#define DH_KEYSIZE_1024 1024 +#define DH_KEYSIZE_1536 1536 +#define DH_KEYSIZE_2048 2048 +#define DH_KEYSIZE_3072 3072 +#define DH_KEYSIZE_4096 4096 static __thread int balance; @@ -65,7 +71,19 @@ static int create_ctx_param_check(struct wd_queue *q, return -WD_EINVAL; } - return 0; + /* Key width check */ + switch (setup->key_bits) { + case DH_KEYSIZE_768: + case DH_KEYSIZE_1024: + case DH_KEYSIZE_1536: + case DH_KEYSIZE_2048: + case DH_KEYSIZE_3072: + case DH_KEYSIZE_4096: + return WD_SUCCESS; + default: + WD_ERR("invalid: dh key_bits %u is error!\n", setup->key_bits); + return -WD_EINVAL; + } } static int wcrypto_init_dh_cookie(struct wcrypto_dh_ctx *ctx) diff --git a/v1/wd_rsa.c b/v1/wd_rsa.c index f0cdda7..250f479 100644 --- a/v1/wd_rsa.c +++ b/v1/wd_rsa.c @@ -30,7 +30,10 @@ #define RSA_RESEND_CNT 8 #define RSA_MAX_KEY_SIZE 512 #define RSA_RECV_MAX_CNT 60000000 // 1 min - +#define RSA_KEYSIZE_1024 1024 +#define RSA_KEYSIZE_2048 2048 +#define RSA_KEYSIZE_3072 3072 +#define RSA_KEYSIZE_4096 4096 static __thread int balance; @@ -558,7 +561,17 @@ static int check_q_setup(struct wd_queue *q, struct wcrypto_rsa_ctx_setup *setup return -WD_EINVAL; } - return 0; + /* Key width check */ + switch (setup->key_bits) { + case RSA_KEYSIZE_1024: + case RSA_KEYSIZE_2048: + case RSA_KEYSIZE_3072: + case RSA_KEYSIZE_4096: + return WD_SUCCESS; + default: + WD_ERR("invalid: rsa key_bits %u is error!\n", setup->key_bits); + return -WD_EINVAL; + } } /* Before initiate this context, we should get a queue from WD */ -- 2.30.0

1 0

AccLib sig 双周例会
by openEuler conference 09 Nov '22

09 Nov '22

您好！ sig-AccLib SIG 邀请您参加 2022-11-09 11:00 召开的Zoom会议会议主题：AccLib sig 双周例会会议内容： zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论会议链接：https://us06web.zoom.us/j/88249285062?pwd=Y2JnVW9GUkNzMWp2cW1QNHFGbE1RZz09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2022-11-09 11:00, The subject of the conference is AccLib sig 双周例会, Summary: zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论 You can join the meeting at https://us06web.zoom.us/j/88249285062?pwd=Y2JnVW9GUkNzMWp2cW1QNHFGbE1RZz09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. 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/

2 1

[PATCH v2 1/3] uadk: Remove duplicate header files
by liulongfang 08 Nov '22

08 Nov '22

In the current UADK software framework, because each module owner processes the code separately when editing the code, the header file inclusion processing during editing is not perfect, and there are repeatedly included header files, which need to be deleted. Signed-off-by: liulongfang <liulongfang(a)huawei.com> --- drv/hisi_comp.c | 1 - drv/hisi_sec.c | 4 ---- include/drv/wd_aead_drv.h | 3 +-- include/drv/wd_cipher_drv.h | 4 ++-- include/drv/wd_comp_drv.h | 4 ++-- include/drv/wd_dh_drv.h | 3 ++- include/drv/wd_digest_drv.h | 3 +-- include/drv/wd_ecc_drv.h | 2 +- include/drv/wd_rsa_drv.h | 1 + include/wd_aead.h | 1 - include/wd_cipher.h | 1 - include/wd_comp.h | 1 - include/wd_dh.h | 1 - include/wd_digest.h | 1 - include/wd_ecc.h | 1 - include/wd_rsa.h | 1 - include/wd_util.h | 1 - wd_aead.c | 1 - wd_cipher.c | 1 - wd_comp.c | 2 -- wd_dh.c | 2 -- wd_digest.c | 1 - wd_ecc.c | 1 - wd_rsa.c | 3 +-- wd_util.c | 1 - 25 files changed, 11 insertions(+), 34 deletions(-) diff --git a/drv/hisi_comp.c b/drv/hisi_comp.c index c940c3f..2eede39 100644 --- a/drv/hisi_comp.c +++ b/drv/hisi_comp.c @@ -4,7 +4,6 @@ #include <asm/types.h> #include "drv/wd_comp_drv.h" #include "hisi_qm_udrv.h" -#include "wd.h" #define ZLIB 0 #define GZIP 1 diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index 5b676e9..c30b653 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -8,10 +8,6 @@ #include "../include/drv/wd_digest_drv.h" #include "../include/drv/wd_aead_drv.h" #include "hisi_qm_udrv.h" -#include "wd_cipher.h" -#include "wd_digest.h" -#include "wd_aead.h" -#include "wd.h" #define SEC_DIGEST_ALG_OFFSET 11 #define WORD_ALIGNMENT_MASK 0x3 diff --git a/include/drv/wd_aead_drv.h b/include/drv/wd_aead_drv.h index de4a7d7..7c657f6 100644 --- a/include/drv/wd_aead_drv.h +++ b/include/drv/wd_aead_drv.h @@ -4,9 +4,8 @@ #ifndef __WD_AEAD_DRV_H #define __WD_AEAD_DRV_H -#include "../wd_common.h" -#include "../wd_alg_common.h" #include "../wd_aead.h" +#include "../wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_cipher_drv.h b/include/drv/wd_cipher_drv.h index f2417a8..82fb89a 100644 --- a/include/drv/wd_cipher_drv.h +++ b/include/drv/wd_cipher_drv.h @@ -5,9 +5,9 @@ #define __WD_CIPHER_DRV_H #include <asm/types.h> -#include "../wd_common.h" -#include "../wd_alg_common.h" + #include "../wd_cipher.h" +#include "../wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_comp_drv.h b/include/drv/wd_comp_drv.h index 4c37116..4aeaee4 100644 --- a/include/drv/wd_comp_drv.h +++ b/include/drv/wd_comp_drv.h @@ -6,9 +6,9 @@ #include <pthread.h> #include <asm/types.h> -#include "../wd_common.h" -#include "../wd_alg_common.h" + #include "../wd_comp.h" +#include "../wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_dh_drv.h b/include/drv/wd_dh_drv.h index 57f774d..64144e1 100644 --- a/include/drv/wd_dh_drv.h +++ b/include/drv/wd_dh_drv.h @@ -5,8 +5,9 @@ #define __WD_DH_DRV_H #include <asm/types.h> -#include "../wd_alg_common.h" + #include "../wd_dh.h" +#include "../wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_digest_drv.h b/include/drv/wd_digest_drv.h index 7ba1c30..586588b 100644 --- a/include/drv/wd_digest_drv.h +++ b/include/drv/wd_digest_drv.h @@ -3,9 +3,8 @@ #ifndef __WD_DIGEST_DRV_H #define __WD_DIGEST_DRV_H -#include "../wd_common.h" -#include "../wd_alg_common.h" #include "../wd_digest.h" +#include "../wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_ecc_drv.h b/include/drv/wd_ecc_drv.h index ddf5e5b..4d27ccb 100644 --- a/include/drv/wd_ecc_drv.h +++ b/include/drv/wd_ecc_drv.h @@ -7,8 +7,8 @@ #include <stdint.h> #include <asm/types.h> -#include "../wd.h" #include "../wd_ecc.h" +#include "../wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_rsa_drv.h b/include/drv/wd_rsa_drv.h index 108c2a3..baf112f 100644 --- a/include/drv/wd_rsa_drv.h +++ b/include/drv/wd_rsa_drv.h @@ -6,6 +6,7 @@ #include <asm/types.h> #include "../wd_rsa.h" +#include "../wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/wd_aead.h b/include/wd_aead.h index 3be8e8a..47c496f 100644 --- a/include/wd_aead.h +++ b/include/wd_aead.h @@ -9,7 +9,6 @@ #include <dlfcn.h> #include "config.h" -#include "wd.h" #include "wd_alg_common.h" #include "wd_cipher.h" #include "wd_digest.h" diff --git a/include/wd_cipher.h b/include/wd_cipher.h index dfd6e60..8e69852 100644 --- a/include/wd_cipher.h +++ b/include/wd_cipher.h @@ -8,7 +8,6 @@ #define __WD_CIPHER_H #include <dlfcn.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_comp.h b/include/wd_comp.h index e043a83..0677e51 100644 --- a/include/wd_comp.h +++ b/include/wd_comp.h @@ -7,7 +7,6 @@ #ifndef __WD_COMP_H #define __WD_COMP_H -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_dh.h b/include/wd_dh.h index f342722..1c72228 100644 --- a/include/wd_dh.h +++ b/include/wd_dh.h @@ -9,7 +9,6 @@ #include <stdbool.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_digest.h b/include/wd_digest.h index eb764ce..a44328e 100644 --- a/include/wd_digest.h +++ b/include/wd_digest.h @@ -8,7 +8,6 @@ #define __WD_DIGEST_H #include <dlfcn.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_ecc.h b/include/wd_ecc.h index 05a776d..a92bb4b 100644 --- a/include/wd_ecc.h +++ b/include/wd_ecc.h @@ -10,7 +10,6 @@ #include <stdlib.h> #include <errno.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_rsa.h b/include/wd_rsa.h index ef7a12c..70e3b05 100644 --- a/include/wd_rsa.h +++ b/include/wd_rsa.h @@ -9,7 +9,6 @@ #include <stdbool.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_util.h b/include/wd_util.h index 83ac5f8..aea7a23 100644 --- a/include/wd_util.h +++ b/include/wd_util.h @@ -11,7 +11,6 @@ #include <sys/ipc.h> #include <sys/shm.h> #include <asm/types.h> -#include "wd_alg_common.h" #ifdef __cplusplus extern "C" { diff --git a/wd_aead.c b/wd_aead.c index b34149e..bac667b 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -6,7 +6,6 @@ #include <stdlib.h> #include <pthread.h> -#include "wd_util.h" #include "include/drv/wd_aead_drv.h" #include "wd_aead.h" diff --git a/wd_cipher.c b/wd_cipher.c index 143f628..ecb7efb 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -7,7 +7,6 @@ #include <stdlib.h> #include <pthread.h> #include <sched.h> -#include "wd_util.h" #include "include/drv/wd_cipher_drv.h" #include "wd_cipher.h" diff --git a/wd_comp.c b/wd_comp.c index 0fd87c2..9952c24 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -12,9 +12,7 @@ #include <string.h> #include <time.h> -#include "config.h" #include "drv/wd_comp_drv.h" -#include "wd_util.h" #include "wd_comp.h" #define WD_POOL_MAX_ENTRIES 1024 diff --git a/wd_dh.c b/wd_dh.c index 6a839cb..f2f4baa 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -12,10 +12,8 @@ #include <time.h> #include <dlfcn.h> -#include "config.h" #include "include/drv/wd_dh_drv.h" #include "wd_util.h" -#include "wd_dh.h" #define WD_POOL_MAX_ENTRIES 1024 #define DH_MAX_KEY_SIZE 512 diff --git a/wd_digest.c b/wd_digest.c index a30359f..cde586d 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -6,7 +6,6 @@ #include <stdlib.h> #include <pthread.h> -#include "wd_util.h" #include "include/drv/wd_digest_drv.h" #include "wd_digest.h" diff --git a/wd_ecc.c b/wd_ecc.c index f2bf8a5..02b5036 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -13,7 +13,6 @@ #include <time.h> #include <dlfcn.h> -#include "wd_util.h" #include "include/drv/wd_ecc_drv.h" #include "include/wd_ecc_curve.h" #include "wd_ecc.h" diff --git a/wd_rsa.c b/wd_rsa.c index 9ddca64..98946bc 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -12,9 +12,8 @@ #include <time.h> #include <dlfcn.h> -#include "config.h" #include "include/drv/wd_rsa_drv.h" -#include "wd_util.h" +#include "wd_rsa.h" #define WD_POOL_MAX_ENTRIES 1024 #define WD_HW_EACCESS 62 diff --git a/wd_util.c b/wd_util.c index bd82075..57c3a33 100644 --- a/wd_util.c +++ b/wd_util.c @@ -10,7 +10,6 @@ #include <semaphore.h> #include <string.h> #include <ctype.h> -#include "wd_alg_common.h" #include "wd_sched.h" #include "wd_util.h" -- 2.33.0

1 2

[PATCH 1/3] uadk: Remove duplicate header files
by liulongfang 08 Nov '22

08 Nov '22

In the current UADK software framework, because each module owner processes the code separately when editing the code, the header file inclusion processing during editing is not perfect, and there are repeatedly included header files, which need to be deleted. Signed-off-by: liulongfang <liulongfang(a)huawei.com> --- drv/hisi_comp.c | 1 - drv/hisi_sec.c | 4 ---- include/drv/wd_aead_drv.h | 3 +-- include/drv/wd_cipher_drv.h | 4 ++-- include/drv/wd_comp_drv.h | 4 ++-- include/drv/wd_dh_drv.h | 3 ++- include/drv/wd_digest_drv.h | 3 +-- include/drv/wd_ecc_drv.h | 2 +- include/drv/wd_rsa_drv.h | 1 + include/wd_aead.h | 1 - include/wd_cipher.h | 1 - include/wd_comp.h | 1 - include/wd_dh.h | 1 - include/wd_digest.h | 1 - include/wd_ecc.h | 1 - include/wd_rsa.h | 1 - include/wd_util.h | 1 - test/sanity_test.sh | 16 ++++++++++++++-- wd_aead.c | 1 - wd_cipher.c | 1 - wd_comp.c | 2 -- wd_dh.c | 2 -- wd_digest.c | 1 - wd_ecc.c | 1 - wd_rsa.c | 3 +-- wd_util.c | 1 - 26 files changed, 25 insertions(+), 36 deletions(-) diff --git a/drv/hisi_comp.c b/drv/hisi_comp.c index c940c3f..2eede39 100644 --- a/drv/hisi_comp.c +++ b/drv/hisi_comp.c @@ -4,7 +4,6 @@ #include <asm/types.h> #include "drv/wd_comp_drv.h" #include "hisi_qm_udrv.h" -#include "wd.h" #define ZLIB 0 #define GZIP 1 diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index 5b676e9..c30b653 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -8,10 +8,6 @@ #include "../include/drv/wd_digest_drv.h" #include "../include/drv/wd_aead_drv.h" #include "hisi_qm_udrv.h" -#include "wd_cipher.h" -#include "wd_digest.h" -#include "wd_aead.h" -#include "wd.h" #define SEC_DIGEST_ALG_OFFSET 11 #define WORD_ALIGNMENT_MASK 0x3 diff --git a/include/drv/wd_aead_drv.h b/include/drv/wd_aead_drv.h index de4a7d7..2aace3f 100644 --- a/include/drv/wd_aead_drv.h +++ b/include/drv/wd_aead_drv.h @@ -4,9 +4,8 @@ #ifndef __WD_AEAD_DRV_H #define __WD_AEAD_DRV_H -#include "../wd_common.h" -#include "../wd_alg_common.h" #include "../wd_aead.h" +#include "wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_cipher_drv.h b/include/drv/wd_cipher_drv.h index f2417a8..a85dd44 100644 --- a/include/drv/wd_cipher_drv.h +++ b/include/drv/wd_cipher_drv.h @@ -5,9 +5,9 @@ #define __WD_CIPHER_DRV_H #include <asm/types.h> -#include "../wd_common.h" -#include "../wd_alg_common.h" + #include "../wd_cipher.h" +#include "wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_comp_drv.h b/include/drv/wd_comp_drv.h index 4c37116..bef35ab 100644 --- a/include/drv/wd_comp_drv.h +++ b/include/drv/wd_comp_drv.h @@ -6,9 +6,9 @@ #include <pthread.h> #include <asm/types.h> -#include "../wd_common.h" -#include "../wd_alg_common.h" + #include "../wd_comp.h" +#include "wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_dh_drv.h b/include/drv/wd_dh_drv.h index 57f774d..30181d9 100644 --- a/include/drv/wd_dh_drv.h +++ b/include/drv/wd_dh_drv.h @@ -5,8 +5,9 @@ #define __WD_DH_DRV_H #include <asm/types.h> -#include "../wd_alg_common.h" + #include "../wd_dh.h" +#include "wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_digest_drv.h b/include/drv/wd_digest_drv.h index 7ba1c30..3ccd9ff 100644 --- a/include/drv/wd_digest_drv.h +++ b/include/drv/wd_digest_drv.h @@ -3,9 +3,8 @@ #ifndef __WD_DIGEST_DRV_H #define __WD_DIGEST_DRV_H -#include "../wd_common.h" -#include "../wd_alg_common.h" #include "../wd_digest.h" +#include "wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_ecc_drv.h b/include/drv/wd_ecc_drv.h index ddf5e5b..bfb665b 100644 --- a/include/drv/wd_ecc_drv.h +++ b/include/drv/wd_ecc_drv.h @@ -7,8 +7,8 @@ #include <stdint.h> #include <asm/types.h> -#include "../wd.h" #include "../wd_ecc.h" +#include "wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/drv/wd_rsa_drv.h b/include/drv/wd_rsa_drv.h index 108c2a3..c75570d 100644 --- a/include/drv/wd_rsa_drv.h +++ b/include/drv/wd_rsa_drv.h @@ -6,6 +6,7 @@ #include <asm/types.h> #include "../wd_rsa.h" +#include "wd_util.h" #ifdef __cplusplus extern "C" { diff --git a/include/wd_aead.h b/include/wd_aead.h index 3be8e8a..47c496f 100644 --- a/include/wd_aead.h +++ b/include/wd_aead.h @@ -9,7 +9,6 @@ #include <dlfcn.h> #include "config.h" -#include "wd.h" #include "wd_alg_common.h" #include "wd_cipher.h" #include "wd_digest.h" diff --git a/include/wd_cipher.h b/include/wd_cipher.h index dfd6e60..8e69852 100644 --- a/include/wd_cipher.h +++ b/include/wd_cipher.h @@ -8,7 +8,6 @@ #define __WD_CIPHER_H #include <dlfcn.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_comp.h b/include/wd_comp.h index e043a83..0677e51 100644 --- a/include/wd_comp.h +++ b/include/wd_comp.h @@ -7,7 +7,6 @@ #ifndef __WD_COMP_H #define __WD_COMP_H -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_dh.h b/include/wd_dh.h index f342722..1c72228 100644 --- a/include/wd_dh.h +++ b/include/wd_dh.h @@ -9,7 +9,6 @@ #include <stdbool.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_digest.h b/include/wd_digest.h index eb764ce..a44328e 100644 --- a/include/wd_digest.h +++ b/include/wd_digest.h @@ -8,7 +8,6 @@ #define __WD_DIGEST_H #include <dlfcn.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_ecc.h b/include/wd_ecc.h index 05a776d..a92bb4b 100644 --- a/include/wd_ecc.h +++ b/include/wd_ecc.h @@ -10,7 +10,6 @@ #include <stdlib.h> #include <errno.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_rsa.h b/include/wd_rsa.h index ef7a12c..70e3b05 100644 --- a/include/wd_rsa.h +++ b/include/wd_rsa.h @@ -9,7 +9,6 @@ #include <stdbool.h> -#include "wd.h" #include "wd_alg_common.h" #ifdef __cplusplus diff --git a/include/wd_util.h b/include/wd_util.h index 83ac5f8..aea7a23 100644 --- a/include/wd_util.h +++ b/include/wd_util.h @@ -11,7 +11,6 @@ #include <sys/ipc.h> #include <sys/shm.h> #include <asm/types.h> -#include "wd_alg_common.h" #ifdef __cplusplus extern "C" { diff --git a/test/sanity_test.sh b/test/sanity_test.sh index 207eee5..b876113 100755 --- a/test/sanity_test.sh +++ b/test/sanity_test.sh @@ -385,14 +385,26 @@ run_sec_test_v2() run_cmd test_hisi_sec --digest 0 --optype 0 --pktlen 16 --keylen 16 \ --times 1 --async --multi 1 $@ + + if [ "$exit_code" != 0 ]; then + echo "Fail to run SEC test ($exit_code)" + else + echo "Successful to run SEC test" + fi } # failed: return 1; success: return 0 run_hpre_test_v2() { - run_cmd test_hisi_hpre --trd_mode=sync + run_cmd test_hisi_hpre -gen1 1024 -g2 public private crt_private -check - run_cmd test_hisi_hpre --trd_mode=async + run_cmd test_hisi_hpre -system-vrf -t 2 -c 0x6 -log -check + + if [ "$exit_code" != 0 ]; then + echo "Fail to run HPRE test ($exit_code)" + else + echo "Successful to run HPRE test" + fi } # failed: return 1; success: return 0 diff --git a/wd_aead.c b/wd_aead.c index d6c2380..a6b6222 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -6,7 +6,6 @@ #include <stdlib.h> #include <pthread.h> -#include "wd_util.h" #include "include/drv/wd_aead_drv.h" #include "wd_aead.h" diff --git a/wd_cipher.c b/wd_cipher.c index 8ce975a..5472d2f 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -7,7 +7,6 @@ #include <stdlib.h> #include <pthread.h> #include <sched.h> -#include "wd_util.h" #include "include/drv/wd_cipher_drv.h" #include "wd_cipher.h" diff --git a/wd_comp.c b/wd_comp.c index eacebd3..6c6efec 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -12,9 +12,7 @@ #include <string.h> #include <time.h> -#include "config.h" #include "drv/wd_comp_drv.h" -#include "wd_util.h" #include "wd_comp.h" #define WD_POOL_MAX_ENTRIES 1024 diff --git a/wd_dh.c b/wd_dh.c index 0bf770d..70528f1 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -12,10 +12,8 @@ #include <time.h> #include <dlfcn.h> -#include "config.h" #include "include/drv/wd_dh_drv.h" #include "wd_util.h" -#include "wd_dh.h" #define WD_POOL_MAX_ENTRIES 1024 #define DH_MAX_KEY_SIZE 512 diff --git a/wd_digest.c b/wd_digest.c index f56be0c..70dd3ea 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -6,7 +6,6 @@ #include <stdlib.h> #include <pthread.h> -#include "wd_util.h" #include "include/drv/wd_digest_drv.h" #include "wd_digest.h" diff --git a/wd_ecc.c b/wd_ecc.c index 2266b1d..7a746f3 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -13,7 +13,6 @@ #include <time.h> #include <dlfcn.h> -#include "wd_util.h" #include "include/drv/wd_ecc_drv.h" #include "include/wd_ecc_curve.h" #include "wd_ecc.h" diff --git a/wd_rsa.c b/wd_rsa.c index 489833e..0d3ebff 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -12,9 +12,8 @@ #include <time.h> #include <dlfcn.h> -#include "config.h" #include "include/drv/wd_rsa_drv.h" -#include "wd_util.h" +#include "wd_rsa.h" #define WD_POOL_MAX_ENTRIES 1024 #define WD_HW_EACCESS 62 diff --git a/wd_util.c b/wd_util.c index bd82075..57c3a33 100644 --- a/wd_util.c +++ b/wd_util.c @@ -10,7 +10,6 @@ #include <semaphore.h> #include <string.h> #include <ctype.h> -#include "wd_alg_common.h" #include "wd_sched.h" #include "wd_util.h" -- 2.33.0

2 6

TO->acc@openeuler.org
by Mrs Karen Ngui 03 Nov '22

03 Nov '22

Hello acc(a)openeuler.org kindly confirm your email is still active, if Yes do check to see if you recieved my previous message. Looking forward to reading from you soon. Mrs Karen Ngui DBS Group (M.D)

1 0

[PATCH v6 0/6] uadk - add wd_comp_init2
by Yang Shen 02 Nov '22

02 Nov '22

The current uadk initialization process is: 1.Call wd_request_ctx() to request ctxs from devices. 2.Call wd_sched_rr_alloc() to create a sched(or some other scheduler alloc function if exits). 3.Initialize the sched. 4.Call wd_<alg>_init() with ctx_config and sched. Logic is reasonable. But in practice, the step of `wd_ request_ Ctx() ` and `wd_ sched_ rr_alloc() ` are very tedious. This makes it difficult for users to use the interface. One of the main reasons for this is that uadk has made a lot of configurations in the scheduler in order to provide users with better performance. Based on this consideration, the current uadk requires the user to arrange the division of hardware resources according to the device topology during initialization. Therefore, as a high-level interface, this scheme can provide customized scheme configuration for users with deep needs. All algorithm initialization interfaces have the same input parameters and behavioral logic. The pre-processing of the wd_<alg>_init is actually the configuration of `struct wd_ctx_config` and `struct wd_sched`. Therefore, the next thing to be done is to use limited and easy-to-use input parameters to describe users' requirements on the two input parameters, ensuring that the functions of the new interface init2 are the same as those of init. For ease of description, v1 is used to refer to the existing interface, and v2 is used to refer to the layer of encapsulation. At present, at least 4 parameters are required to meet the user configuration requirements with the V1 interface function remains unchanged. @alg: The algorithm users wanted. @sched_type: Scheduling type the user wants to use. @task_tp: Reserved. @wd_ctx_params: op_type_num and ctx_set_num means the requested ctx number for each numa node. Due to users may have different requirements for different types of ctx numbers, needs a two-dimensional array as input. The bitmask provided by libnuma. Users can use this parameter to control requesting ctxs devices in the bind NUMA scenario. This parameter is mainly convenient for users to use in the binding cpu scenario. It can avoid resource waste or initialization failure caused by insufficient resources. Libnuma provides a complete operation interface which can be found in numa.h. Changelog: v5->v6: - Update a limit between wd_comp_init() and wd_comp_init2_(). If the wd_comp_init2_() is called after wd_comp_init(), some ctx resources may be leak until called wd_comp_uninit2(). v4->v5: - Update wd_comp_init2() and wd_comp_init2_() parameters. v3->v4: - Resume the wd_comp_init2() parameters and rename it to wd_comp_init2_(). Then add a macro named wd_comp_init2() which has a simpler parameters. v2->v3: - Update the wd_comp_init2() parameters. v1->v2: - Update the desdescription about wd_<alg>_init in wd_design.md. Yang Shen (6): uadk - support algorithms initialization reentry protect uadk/doc - update wd_alg_init support reentrancy uadk - support return error number as pointer uadk - mv some function to header file uadk/comp - add wd_comp_init2 uadk/docs - support a simple interface for initialization Makefile.am | 4 +- docs/wd_alg_init2.md | 159 ++++++++++++++++++++++++ docs/wd_design.md | 5 +- include/wd.h | 54 ++++++++- include/wd_alg_common.h | 27 +++++ include/wd_comp.h | 30 +++++ include/wd_util.h | 66 ++++++++++ wd.c | 97 ++++++++++++--- wd_aead.c | 33 +++-- wd_cipher.c | 35 ++++-- wd_comp.c | 129 ++++++++++++++++++-- wd_dh.c | 34 ++++-- wd_digest.c | 33 +++-- wd_ecc.c | 33 +++-- wd_rsa.c | 33 +++-- wd_util.c | 260 +++++++++++++++++++++++++++++++++++++++- 16 files changed, 926 insertions(+), 106 deletions(-) create mode 100644 docs/wd_alg_init2.md -- 2.24.0

3 12

2024

2023

2022

Acc November 2022