- Acc - mailweb.openeuler.org

AccLib SIG例会
by openEuler conference 18 Apr '23

18 Apr '23

您好！ sig-AccLib SIG 邀请您参加 2023-04-19 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议内容： https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/81046238791?pwd=QUtOUkdBN2JVUkRiaGdITDJlYzhIUT09 会议纪要：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 2023-04-19 11:00, The subject of the conference is AccLib SIG例会, Summary: https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/81046238791?pwd=QUtOUkdBN2JVUkRiaGdITDJlYzhIUT09. 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/

1 0

快看，内核&编译器领域 SIG组来啦！诚邀您参加 openEuler Developer Day 2023
by openEuler 14 Apr '23

14 Apr '23

1 0

[PATCH 0/4] uadk adapter proposal
by Zhangfei Gao 14 Apr '23

14 Apr '23

This is only for demo of the adapter proposal Goals 1. support cpu instruction accelerator 2. support switch between hardware accelerator and cpu instruction Status 1. Existing hardware accelerator are supported. 2. Add a hisi_zlib driver to simulate cpu instruction, supported by uadk_comp Todo: 1. how to better coexist with existing wd_xxx_init. wd_xxx_init is not a must, only required for hardware resources. On platform only support cpu, wd_xxx_init can be used, but the failure should not be treated as error. 2. how to parse workers from config, or environment. 3. how to switch between hardware and cpu, ie, add policy. Now only simply add round-robin policy: adapter_roundrobin.c The plan will add at least adapter_threshold.c, ... https://github.com/gaozhangfei/uadk/commits/adapter https://github.com/Linaro/uadk/pull/548 the pr is only for demo, not for merge. Zhangfei Gao (4): add adapter Adding zlib drv to simulate cpu instruction driver uadk_comp: support hisi_zlib to simulate cpu instruction wd_comp: decompress complete when length are consumed Makefile.am | 13 +- adapter/adapter.c | 245 +++++++++++++++++++++++++++++++++++ adapter/adapter_private.h | 51 ++++++++ adapter/adapter_roundrobin.c | 90 +++++++++++++ drv/hisi_comp.c | 25 ++-- drv/hisi_hpre.c | 47 ++++--- drv/hisi_sec.c | 74 ++++++----- drv/hisi_zlib.c | 167 ++++++++++++++++++++++++ include/adapter.h | 27 ++++ include/drv/wd_aead_drv.h | 16 +-- include/drv/wd_digest_drv.h | 16 +-- include/wd_alg.h | 31 ++++- include/wd_comp.h | 3 + include/wd_util.h | 8 +- libwd.map | 7 + libwd_comp.map | 2 + sample/uadk_comp.c | 58 +++++++-- wd_aead.c | 66 +++++----- wd_alg.c | 26 ++++ wd_cipher.c | 40 ++++-- wd_comp.c | 131 ++++++++++++++----- wd_dh.c | 8 +- wd_digest.c | 66 +++++++--- wd_ecc.c | 8 +- wd_rsa.c | 8 +- wd_util.c | 17 ++- 26 files changed, 1041 insertions(+), 209 deletions(-) create mode 100644 adapter/adapter.c create mode 100644 adapter/adapter_private.h create mode 100644 adapter/adapter_roundrobin.c create mode 100644 drv/hisi_zlib.c create mode 100644 include/adapter.h -- 2.25.1

1 5

AccLib SIG 例会
by openEuler conference 11 Apr '23

11 Apr '23

您好！ sig-AccLib SIG 邀请您参加 2023-04-12 11:00 召开的Zoom会议会议主题：AccLib SIG 例会会议内容：会议链接 https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/82243426609?pwd=elVBbUlIQUhYaWtxUmpnSGlYZzlZZz09 会议纪要：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 2023-04-12 11:00, The subject of the conference is AccLib SIG 例会, Summary: 会议链接 https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/82243426609?pwd=elVBbUlIQUhYaWtxUmpnSGlYZzlZZz09. 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/

1 0

[PATCH] uadk: fix env numa config for init2
by Wenkai Lin 08 Apr '23

08 Apr '23

Three policies are customized for numa configuration: 1.If a node is enabled, all nodes share the same configuration. user input: sync-comp:5@0,sync-decomp:3@2 real set: sync-comp:5@0,sync-comp:5@2,sync-decomp:0@2,sync-decomp:3@2 2.If there are same type configurations, use the maximum ctx number. user input: sync-comp:5@0,sync-comp:3@2 real set: sync-comp:5@0,sync-comp:5@2 3.If the number of queues is 0, ignore this configuration. user input: sync-comp:0@0,sync-comp:3@2 real set: sync-comp:3@2 Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- wd_cipher.c | 13 +++++++++++-- wd_comp.c | 14 +++++++++++++- wd_dh.c | 12 +++++++++++- wd_ecc.c | 12 +++++++++++- wd_rsa.c | 12 +++++++++++- wd_util.c | 25 ++++++++++++++++--------- 6 files changed, 73 insertions(+), 15 deletions(-) diff --git a/wd_cipher.c b/wd_cipher.c index e7c2007..77d81ea 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -384,6 +384,7 @@ int wd_cipher_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_p { struct wd_ctx_nums cipher_ctx_num[WD_CIPHER_DECRYPTION + 1] = {0}; struct wd_ctx_params cipher_ctx_params = {0}; + struct bitmask *inner_bmp; int ret = 0; bool flag; @@ -411,6 +412,13 @@ int wd_cipher_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_p goto out_uninit; } + cipher_ctx_params.bmp = inner_bmp = numa_allocate_nodemask(); + if (!inner_bmp) { + WD_ERR("fail to allocate nodemask.\n"); + ret = -WD_ENOMEM; + goto out_dlopen; + } + res_retry: memset(&wd_cipher_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -419,10 +427,9 @@ res_retry: if (!wd_cipher_setting.driver) { WD_ERR("fail to bind a valid driver.\n"); ret = -WD_EINVAL; - goto out_dlopen; + goto out_bmp; } - cipher_ctx_params.ctx_set_num = cipher_ctx_num; ret = wd_ctx_param_init(&cipher_ctx_params, ctx_params, wd_cipher_setting.driver, @@ -459,6 +466,8 @@ res_retry: out_driver: wd_alg_drv_unbind(wd_cipher_setting.driver); +out_bmp: + numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_cipher_setting.dlh_list); out_uninit: diff --git a/wd_comp.c b/wd_comp.c index ed1d128..4d6fbb3 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -206,6 +206,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; + struct bitmask *inner_bmp; int ret = 0; bool flag; @@ -233,6 +234,13 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par goto out_uninit; } + comp_ctx_params.bmp = inner_bmp = numa_allocate_nodemask(); + if (!inner_bmp) { + WD_ERR("fail to allocate nodemask.\n"); + ret = -WD_ENOMEM; + goto out_dlopen; + } + res_retry: memset(&wd_comp_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -240,7 +248,7 @@ res_retry: 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; + goto out_bmp; } comp_ctx_params.ctx_set_num = comp_ctx_num; @@ -274,10 +282,14 @@ res_retry: wd_alg_set_init(&wd_comp_setting.status); + numa_free_nodemask(inner_bmp); + return 0; out_driver: wd_alg_drv_unbind(wd_comp_setting.driver); +out_bmp: + numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_comp_setting.dlh_list); out_uninit: diff --git a/wd_dh.c b/wd_dh.c index 7c57449..be0346b 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -197,6 +197,7 @@ int wd_dh_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_param { struct wd_ctx_nums dh_ctx_num[WD_DH_PHASE2] = {0}; struct wd_ctx_params dh_ctx_params = {0}; + struct bitmask *inner_bmp; bool flag; int ret; @@ -224,6 +225,13 @@ int wd_dh_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_param goto out_clear_init; } + dh_ctx_params.bmp = inner_bmp = numa_allocate_nodemask(); + if (!inner_bmp) { + ret = -WD_ENOMEM; + WD_ERR("fail to allocate nodemask.\n"); + goto out_dlopen; + } + res_retry: memset(&wd_dh_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -232,7 +240,7 @@ res_retry: if (!wd_dh_setting.driver) { WD_ERR("fail to bind a valid driver.\n"); ret = -WD_EINVAL; - goto out_dlopen; + goto out_bmp; } dh_ctx_params.ctx_set_num = dh_ctx_num; @@ -270,6 +278,8 @@ res_retry: out_driver: wd_alg_drv_unbind(wd_dh_setting.driver); +out_bmp: + numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_dh_setting.dlh_list); out_clear_init: diff --git a/wd_ecc.c b/wd_ecc.c index fbe2d16..f1a3f0d 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -253,6 +253,7 @@ int wd_ecc_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para { struct wd_ctx_nums ecc_ctx_num[WD_EC_OP_MAX] = {0}; struct wd_ctx_params ecc_ctx_params = {0}; + struct bitmask *inner_bmp; bool flag; int ret; @@ -280,6 +281,13 @@ int wd_ecc_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para goto out_clear_init; } + ecc_ctx_params.bmp = inner_bmp = numa_allocate_nodemask(); + if (!inner_bmp) { + WD_ERR("fail to allocate nodemask.\n"); + ret = -WD_ENOMEM; + goto out_dlopen; + } + res_retry: memset(&wd_ecc_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -288,7 +296,7 @@ res_retry: if (!wd_ecc_setting.driver) { WD_ERR("failed to bind a valid driver!\n"); ret = -WD_EINVAL; - goto out_dlopen; + goto out_bmp; } ecc_ctx_params.ctx_set_num = ecc_ctx_num; @@ -326,6 +334,8 @@ res_retry: out_driver: wd_alg_drv_unbind(wd_ecc_setting.driver); +out_bmp: + numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_ecc_setting.dlh_list); out_clear_init: diff --git a/wd_rsa.c b/wd_rsa.c index 64c833b..7b62017 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -238,6 +238,7 @@ int wd_rsa_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para { struct wd_ctx_nums rsa_ctx_num[WD_RSA_GENKEY] = {0}; struct wd_ctx_params rsa_ctx_params = {0}; + struct bitmask *inner_bmp; bool flag; int ret; @@ -265,6 +266,13 @@ int wd_rsa_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para goto out_clear_init; } + rsa_ctx_params.bmp = inner_bmp = numa_allocate_nodemask(); + if (!inner_bmp) { + WD_ERR("fail to allocate nodemask.\n"); + ret = -WD_ENOMEM; + goto out_dlopen; + } + res_retry: memset(&wd_rsa_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -273,7 +281,7 @@ res_retry: if (!wd_rsa_setting.driver) { WD_ERR("failed to bind a valid driver!\n"); ret = -WD_EINVAL; - goto out_dlopen; + goto out_bmp; } rsa_ctx_params.ctx_set_num = rsa_ctx_num; @@ -311,6 +319,8 @@ res_retry: out_driver: wd_alg_drv_unbind(wd_rsa_setting.driver); +out_bmp: + numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_rsa_setting.dlh_list); out_clear_init: diff --git a/wd_util.c b/wd_util.c index fe5ece2..9b5486b 100644 --- a/wd_util.c +++ b/wd_util.c @@ -21,6 +21,7 @@ #define WD_RECV_MAX_CNT_NOSLEEP 200000000 #define PRIVILEGE_FLAG 600 #define MIN(a, b) ((a) > (b) ? (b) : (a)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define WD_INIT_SLEEP_UTIME 1000 #define WD_INIT_RETRY_TIMES 10000 @@ -2010,9 +2011,10 @@ static void add_lib_to_list(struct drv_lib_list *head, tmp->next = node; } -static int wd_set_ctx_nums(struct wd_ctx_nums *ctx_nums, const char *section, +static int wd_set_ctx_nums(struct wd_ctx_params *ctx_params, const char *section, __u32 op_type_num, int is_comp) { + struct wd_ctx_nums *ctxs = ctx_params->ctx_set_num; int i, j, ctx_num, node, ret; char *ctx_section; const char *type; @@ -2031,18 +2033,24 @@ static int wd_set_ctx_nums(struct wd_ctx_nums *ctx_nums, const char *section, if (ret) return ret; - /* Allocate queues evenly on each numa */ + /* If the number of ctxs is set to 0, skip the configuration */ + if (!ctx_num) + return 0; + for (i = 0; i < CTX_MODE_MAX; i++) { for (j = 0; j < op_type_num; j++) { type = is_comp ? comp_ctx_type[i][j] : ctx_type[i][0]; if (strncmp(section, type, strlen(type))) continue; + /* If there're multiple configurations, use the maximum ctx number */ if (!i) - ctx_nums[j].sync_ctx_num = ctx_num; + ctxs[j].sync_ctx_num = MAX(ctxs[j].sync_ctx_num, ctx_num); else - ctx_nums[j].async_ctx_num = ctx_num; + ctxs[j].async_ctx_num = MAX(ctxs[j].async_ctx_num, ctx_num); + /* enable a node here, all enabled nodes share the same configuration */ + numa_bitmask_setbit(ctx_params->bmp, node); return 0; } } @@ -2050,9 +2058,8 @@ static int wd_set_ctx_nums(struct wd_ctx_nums *ctx_nums, const char *section, return -WD_EINVAL; } -/* return 0 for success, others failed */ static int wd_env_set_ctx_nums(const char *name, const char *var_s, - struct wd_ctx_nums *ctx_nums, __u32 size) + struct wd_ctx_params *ctx_params, __u32 size) { char *left, *section, *start; int is_comp; @@ -2067,7 +2074,7 @@ static int wd_env_set_ctx_nums(const char *name, const char *var_s, left = start; while ((section = strsep(&left, ","))) { - ret = wd_set_ctx_nums(ctx_nums, section, size, is_comp); + ret = wd_set_ctx_nums(ctx_params, section, size, is_comp); if (ret < 0) goto out_free_str; } @@ -2089,7 +2096,7 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, var_s = secure_getenv(env_name); if (var_s && strlen(var_s)) { /* environment variable has the highest priority */ - ret = wd_env_set_ctx_nums(env_name, var_s, ctx_params->ctx_set_num, max_op_type); + ret = wd_env_set_ctx_nums(env_name, var_s, ctx_params, max_op_type); if (ret) { WD_ERR("fail to init ctx nums from %s!\n", env_name); return -WD_EINVAL; @@ -2109,13 +2116,13 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, } /* user_ctx_params is also not set, use driver's defalut queue_num */ + ctx_params->bmp = NULL; for (i = 0; i < driver->op_type_num; i++) { ctx_params->ctx_set_num[i].sync_ctx_num = driver->queue_num; ctx_params->ctx_set_num[i].async_ctx_num = driver->queue_num; } } - ctx_params->bmp = NULL; ctx_params->op_type_num = driver->op_type_num; if (ctx_params->op_type_num > max_op_type) { WD_ERR("fail to check driver op type numbers.\n"); -- 2.30.0

1 0

[PATCH] uadk: fix wd_env_set_ctx_num
by Wenkai Lin 03 Apr '23

03 Apr '23

1.use enum type wd_type 2.optimize judgement Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- include/wd_util.h | 16 ++++++++++--- wd_cipher.c | 4 ++-- wd_comp.c | 3 +-- wd_dh.c | 3 +-- wd_ecc.c | 3 +-- wd_rsa.c | 3 +-- wd_util.c | 57 ++++++++++++++++++++++++++--------------------- 7 files changed, 51 insertions(+), 38 deletions(-) diff --git a/include/wd_util.h b/include/wd_util.h index ebe6669..ce76852 100644 --- a/include/wd_util.h +++ b/include/wd_util.h @@ -23,6 +23,17 @@ extern "C" { for ((i) = 0, (config_numa) = (config)->config_per_numa; \ (i) < (config)->numa_num; (config_numa)++, (i)++) +enum wd_type { + WD_COMP_TYPE = 0, + WD_CIPHER_TYPE, + WD_DIGEST_TYPE, + WD_AEAD_TYPE, + WD_RSA_TYPE, + WD_DH_TYPE, + WD_ECC_TYPE, + WD_TYPE_MAX, +}; + enum wd_status { WD_UNINIT, WD_INITING, @@ -423,7 +434,7 @@ static inline void wd_alg_clear_init(enum wd_status *status) * @ctx_params: wd_ctx_params to be initialized. * @user_ctx_params: user input wd_ctx_params. * @driver: device driver for the current algorithm application. - * @env_name: algorithm environment variable. + * @type: algorithm type. * @max_op_type: algorithm max operation type. * * Return 0 if succeed and other error number if fail. @@ -431,8 +442,7 @@ static inline void wd_alg_clear_init(enum wd_status *status) int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_ctx_params *user_ctx_params, struct wd_alg_driver *driver, - const char *env_name, - int max_op_type); + enum wd_type type, int max_op_type); /** * wd_alg_attrs_init() - Request the ctxs and initialize the sched_domain diff --git a/wd_cipher.c b/wd_cipher.c index b24fcf9..e7c2007 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -425,8 +425,8 @@ res_retry: cipher_ctx_params.ctx_set_num = cipher_ctx_num; ret = wd_ctx_param_init(&cipher_ctx_params, ctx_params, - wd_cipher_setting.driver, "WD_CIPHER_CTX_NUM", - WD_CIPHER_DECRYPTION + 1); + wd_cipher_setting.driver, + WD_CIPHER_TYPE, WD_CIPHER_DECRYPTION + 1); if (ret) { if (ret == -WD_EAGAIN) { wd_disable_drv(wd_cipher_setting.driver); diff --git a/wd_comp.c b/wd_comp.c index f38a922..ed1d128 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -245,8 +245,7 @@ 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_CTX_NUM", - WD_DIR_MAX); + wd_comp_setting.driver, WD_COMP_TYPE, WD_DIR_MAX); if (ret) { if (ret == -WD_EAGAIN) { wd_disable_drv(wd_comp_setting.driver); diff --git a/wd_dh.c b/wd_dh.c index 7b32f8a..7c57449 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -237,8 +237,7 @@ res_retry: dh_ctx_params.ctx_set_num = dh_ctx_num; ret = wd_ctx_param_init(&dh_ctx_params, ctx_params, - wd_dh_setting.driver, "WD_DH_CTX_NUM", - WD_DH_PHASE2); + wd_dh_setting.driver, WD_DH_TYPE, WD_DH_PHASE2); if (ret) { if (ret == -WD_EAGAIN) { wd_disable_drv(wd_dh_setting.driver); diff --git a/wd_ecc.c b/wd_ecc.c index 0565aea..fbe2d16 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -293,8 +293,7 @@ res_retry: ecc_ctx_params.ctx_set_num = ecc_ctx_num; ret = wd_ctx_param_init(&ecc_ctx_params, ctx_params, - wd_ecc_setting.driver, "WD_ECC_CTX_NUM", - WD_EC_OP_MAX); + wd_ecc_setting.driver, WD_ECC_TYPE, WD_EC_OP_MAX); if (ret) { if (ret == -WD_EAGAIN) { wd_disable_drv(wd_ecc_setting.driver); diff --git a/wd_rsa.c b/wd_rsa.c index f062b78..64c833b 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -278,8 +278,7 @@ res_retry: rsa_ctx_params.ctx_set_num = rsa_ctx_num; ret = wd_ctx_param_init(&rsa_ctx_params, ctx_params, - wd_rsa_setting.driver, "WD_RSA_CTX_NUM", - WD_RSA_GENKEY); + wd_rsa_setting.driver, WD_RSA_TYPE, WD_RSA_GENKEY); if (ret) { if (ret == -WD_EAGAIN) { wd_disable_drv(wd_rsa_setting.driver); diff --git a/wd_util.c b/wd_util.c index 8286092..1dae154 100644 --- a/wd_util.c +++ b/wd_util.c @@ -47,6 +47,16 @@ static const char *comp_ctx_type[2][2] = { /* define two ctx mode here for cipher and other alg */ static const char *ctx_type[2][1] = { {"sync:"}, {"async:"} }; +static const char *wd_env_name[WD_TYPE_MAX] = { + "WD_COMP_CTX_NUM", + "WD_CIPHER_CTX_NUM", + "WD_DIGEST_CTX_NUM", + "WD_AEAD_CTX_NUM", + "WD_RSA_CTX_NUM", + "WD_DH_CTX_NUM", + "WD_ECC_CTX_NUM", +}; + struct async_task { __u32 idx; }; @@ -2070,48 +2080,45 @@ out_free_str: int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_ctx_params *user_ctx_params, struct wd_alg_driver *driver, - const char *env_name, - int max_op_type) + enum wd_type type, int max_op_type) { + const char *env_name = wd_env_name[type]; const char *var_s; - int use_env = 0; int i, ret; var_s = secure_getenv(env_name); if (var_s && strlen(var_s)) { ret = wd_env_set_ctx_nums(env_name, var_s, ctx_params->ctx_set_num, max_op_type); - if (ret < 0) { + if (ret) { WD_ERR("fail to init ctx nums from %s!\n", env_name); return -WD_EINVAL; } - use_env = 1; - } + } else { + if (user_ctx_params) { + ctx_params->bmp = user_ctx_params->bmp; + ctx_params->ctx_set_num = user_ctx_params->ctx_set_num; + ctx_params->op_type_num = user_ctx_params->op_type_num; + if (ctx_params->op_type_num > max_op_type) { + WD_ERR("fail to check user op type numbers.\n"); + return -WD_EINVAL; + } - if (use_env || !user_ctx_params) { - ctx_params->bmp = NULL; - ctx_params->op_type_num = driver->op_type_num; - if (ctx_params->op_type_num > max_op_type) { - WD_ERR("fail to check driver op type numbers.\n"); - return -WD_EAGAIN; + return 0; } for (i = 0; i < ctx_params->op_type_num; i++) { - if (!ctx_params->ctx_set_num[i].sync_ctx_num) - ctx_params->ctx_set_num[i].sync_ctx_num = driver->queue_num; - - if (!ctx_params->ctx_set_num[i].async_ctx_num) - ctx_params->ctx_set_num[i].async_ctx_num = driver->queue_num; - } - } else { - ctx_params->bmp = user_ctx_params->bmp; - ctx_params->ctx_set_num = user_ctx_params->ctx_set_num; - ctx_params->op_type_num = user_ctx_params->op_type_num; - if (ctx_params->op_type_num > max_op_type) { - WD_ERR("fail to check user op type numbers.\n"); - return -WD_EINVAL; + ctx_params->ctx_set_num[i].sync_ctx_num = driver->queue_num; + ctx_params->ctx_set_num[i].async_ctx_num = driver->queue_num; } } + ctx_params->bmp = NULL; + ctx_params->op_type_num = driver->op_type_num; + if (ctx_params->op_type_num > max_op_type) { + WD_ERR("fail to check driver op type numbers.\n"); + return -WD_EAGAIN; + } + return 0; } -- 2.30.0

1 0

[PATCH] uadk: fix wd_env_set_ctx_num
by Wenkai Lin 03 Apr '23

03 Apr '23

Use use_env to check whether environment variables are used. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- Makefile.am | 1 + wd_util.c | 37 ++++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index 601a20d..a4bb470 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,6 +120,7 @@ libwd_crypto_la_DEPENDENCIES= libwd.la libhisi_zip_la_LIBADD= -lwd -ldl libhisi_zip_la_LDFLAGS=$(UADK_VERSION) +libhisi_zip_la_DEPENDENCIES= libwd.la libhisi_sec_la_LIBADD= -lwd -lwd_crypto libhisi_sec_la_LDFLAGS=$(UADK_VERSION) diff --git a/wd_util.c b/wd_util.c index b6f65dd..8286092 100644 --- a/wd_util.c +++ b/wd_util.c @@ -2012,6 +2012,10 @@ static int wd_set_ctx_nums(struct wd_ctx_nums *ctx_nums, const char *section, return -WD_EINVAL; ctx_section = index(section, ':'); + if (!ctx_section) { + WD_ERR("invalid: ctx section got wrong format: %s!\n", section); + return -WD_EINVAL; + } ctx_section++; ret = parse_num_on_numa(ctx_section, &ctx_num, &node); if (ret) @@ -2036,20 +2040,17 @@ static int wd_set_ctx_nums(struct wd_ctx_nums *ctx_nums, const char *section, return -WD_EINVAL; } -/* return 0 for success, return 1 for env unset, others failed */ -static int wd_env_set_ctx_nums(const char *name, struct wd_ctx_nums *ctx_nums, __u32 size) +/* return 0 for success, others failed */ +static int wd_env_set_ctx_nums(const char *name, const char *var_s, + struct wd_ctx_nums *ctx_nums, __u32 size) { - char *left, *section, *start, *var_s; + char *left, *section, *start; int is_comp; - int ret = 1; + int ret = 0; /* COMP environment variable's format is different, mark it */ is_comp = strncmp(name, "WD_COMP_CTX_NUM", strlen(name)) ? 0 : 1; - var_s = secure_getenv(name); - if (!var_s || !strlen(var_s)) - return ret; - start = strdup(var_s); if (!start) return -WD_ENOMEM; @@ -2072,19 +2073,21 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, const char *env_name, int max_op_type) { + const char *var_s; + int use_env = 0; int i, ret; - ret = wd_env_set_ctx_nums(env_name, ctx_params->ctx_set_num, max_op_type); - if (ret < 0) { - WD_ERR("fail to init ctx nums from %s!\n", env_name); - return -WD_EINVAL; + var_s = secure_getenv(env_name); + if (var_s && strlen(var_s)) { + ret = wd_env_set_ctx_nums(env_name, var_s, ctx_params->ctx_set_num, max_op_type); + if (ret < 0) { + WD_ERR("fail to init ctx nums from %s!\n", env_name); + return -WD_EINVAL; + } + use_env = 1; } - /** - * Only if environment variable is not parsed and user's params are exist, - * set ctx_params from user's params, otherwise set it from env or driver. - */ - if (!ret || !user_ctx_params) { + if (use_env || !user_ctx_params) { ctx_params->bmp = NULL; ctx_params->op_type_num = driver->op_type_num; if (ctx_params->op_type_num > max_op_type) { -- 2.30.0

1 0

[PATCH] uadk: mix fix for init2
by Wenkai Lin 31 Mar '23

31 Mar '23

1. ldl should be last 2. simple code for env init Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- Makefile.am | 2 +- include/wd_util.h | 20 ++----- wd_cipher.c | 8 +-- wd_comp.c | 10 +--- wd_dh.c | 9 +-- wd_ecc.c | 9 +-- wd_rsa.c | 9 +-- wd_util.c | 149 ++++++++++++++++++++++++---------------------- 8 files changed, 94 insertions(+), 122 deletions(-) diff --git a/Makefile.am b/Makefile.am index c66bbfe..601a20d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,7 +118,7 @@ libwd_crypto_la_LIBADD= -lwd -ldl -lnuma libwd_crypto_la_LDFLAGS=$(UADK_VERSION) $(UADK_CRYPTO_SYMBOL) libwd_crypto_la_DEPENDENCIES= libwd.la -libhisi_zip_la_LIBADD= -ldl -lwd +libhisi_zip_la_LIBADD= -lwd -ldl libhisi_zip_la_LDFLAGS=$(UADK_VERSION) libhisi_sec_la_LIBADD= -lwd -lwd_crypto diff --git a/include/wd_util.h b/include/wd_util.h index 434f068..baac0e3 100644 --- a/include/wd_util.h +++ b/include/wd_util.h @@ -420,16 +420,16 @@ static inline void wd_alg_clear_init(enum wd_status *status) /** * wd_ctx_param_init() - Initialize the current device driver according * to the obtained queue resource and the applied driver. - * @config: device resources requested by the current algorithm. + * @ctx_params: wd_ctx_params to be initialized. + * @user_ctx_params: user input wd_ctx_params. * @driver: device driver for the current algorithm application. - * @drv_priv: the parameter pointer of the current device driver. + * @env_name: algorithm environment variable. + * @max_op_type: algorithm max operation type. * * Return 0 if succeed and other error number if fail. */ -int wd_ctx_param_init(struct wd_ctx_params *ctx_params, - struct wd_ctx_params *user_ctx_params, - struct wd_ctx_nums *ctx_set_num, - struct wd_alg_driver *driver, int max_op_type); +int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_ctx_params *user_ctx_params, + struct wd_alg_driver *driver, const char *env_name, int max_op_type); /** * wd_alg_attrs_init() - Request the ctxs and initialize the sched_domain @@ -482,14 +482,6 @@ void wd_dlclose_drv(void *dlh_list); */ int wd_get_lib_file_path(char *lib_file, char *lib_path, bool is_dir); -/** - * wd_env_set_ctx_ctx_nums() - Set the ctx_set_num by parsing the environment variable. - * @name: the name of the environment variable. - * @ctx_nums: array to be initialized. - * @size: array size. - */ -int wd_env_set_ctx_nums(const char *name, struct wd_ctx_nums *ctx_nums, __u32 size); - /** * wd_dfx_msg_cnt() - Message counter interface for ctx * @msg: Shared memory addr. diff --git a/wd_cipher.c b/wd_cipher.c index 80d4be2..b24fcf9 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -422,14 +422,10 @@ res_retry: goto out_dlopen; } - ret = wd_env_set_ctx_nums("WD_CIPHER_CTX_NUM", cipher_ctx_num, WD_CIPHER_DECRYPTION + 1); - if (ret) { - WD_ERR("fail to init cipher ctx nums from env!\n"); - goto out_driver; - } + cipher_ctx_params.ctx_set_num = cipher_ctx_num; ret = wd_ctx_param_init(&cipher_ctx_params, ctx_params, - cipher_ctx_num, wd_cipher_setting.driver, + wd_cipher_setting.driver, "WD_CIPHER_CTX_NUM", WD_CIPHER_DECRYPTION + 1); if (ret) { if (ret == -WD_EAGAIN) { diff --git a/wd_comp.c b/wd_comp.c index 99553c5..f38a922 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -243,15 +243,9 @@ res_retry: goto out_dlopen; } - - ret = wd_env_set_ctx_nums("WD_COMP_CTX_NUM", comp_ctx_num, WD_DIR_MAX); - if (ret) { - WD_ERR("fail to init comp ctx nums from env!\n"); - goto out_driver; - } - + comp_ctx_params.ctx_set_num = comp_ctx_num; ret = wd_ctx_param_init(&comp_ctx_params, ctx_params, - comp_ctx_num, wd_comp_setting.driver, + wd_comp_setting.driver, "WD_COMP_CTX_NUM", WD_DIR_MAX); if (ret) { if (ret == -WD_EAGAIN) { diff --git a/wd_dh.c b/wd_dh.c index bb8e76f..7b32f8a 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -235,14 +235,9 @@ res_retry: goto out_dlopen; } - ret = wd_env_set_ctx_nums("WD_DH_CTX_NUM", dh_ctx_num, WD_DH_PHASE2); - if (ret) { - WD_ERR("fail to init dh ctx nums from env!\n"); - goto out_driver; - } - + dh_ctx_params.ctx_set_num = dh_ctx_num; ret = wd_ctx_param_init(&dh_ctx_params, ctx_params, - dh_ctx_num, wd_dh_setting.driver, + wd_dh_setting.driver, "WD_DH_CTX_NUM", WD_DH_PHASE2); if (ret) { if (ret == -WD_EAGAIN) { diff --git a/wd_ecc.c b/wd_ecc.c index bef7982..0565aea 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -291,14 +291,9 @@ res_retry: goto out_dlopen; } - ret = wd_env_set_ctx_nums("WD_ECC_CTX_NUM", ecc_ctx_num, WD_EC_OP_MAX); - if (ret) { - WD_ERR("fail to init ecc ctx nums from env!\n"); - goto out_driver; - } - + ecc_ctx_params.ctx_set_num = ecc_ctx_num; ret = wd_ctx_param_init(&ecc_ctx_params, ctx_params, - ecc_ctx_num, wd_ecc_setting.driver, + wd_ecc_setting.driver, "WD_ECC_CTX_NUM", WD_EC_OP_MAX); if (ret) { if (ret == -WD_EAGAIN) { diff --git a/wd_rsa.c b/wd_rsa.c index 9f5fb57..f062b78 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -276,14 +276,9 @@ res_retry: goto out_dlopen; } - ret = wd_env_set_ctx_nums("WD_RSA_CTX_NUM", rsa_ctx_num, WD_RSA_GENKEY); - if (ret) { - WD_ERR("fail to init rsa ctx nums from env!\n"); - goto out_driver; - } - + rsa_ctx_params.ctx_set_num = rsa_ctx_num; ret = wd_ctx_param_init(&rsa_ctx_params, ctx_params, - rsa_ctx_num, wd_rsa_setting.driver, + wd_rsa_setting.driver, "WD_RSA_CTX_NUM", WD_RSA_GENKEY); if (ret) { if (ret == -WD_EAGAIN) { diff --git a/wd_util.c b/wd_util.c index b8a3355..41b390c 100644 --- a/wd_util.c +++ b/wd_util.c @@ -2000,16 +2000,81 @@ static void add_lib_to_list(struct drv_lib_list *head, tmp->next = node; } -int wd_ctx_param_init(struct wd_ctx_params *ctx_params, - struct wd_ctx_params *user_ctx_params, - struct wd_ctx_nums *ctx_set_num, - struct wd_alg_driver *driver, int max_op_type) +static int wd_set_ctx_nums(struct wd_ctx_nums *ctx_nums, const char *section, + __u32 op_type_num, int is_comp) { - int i; + int i, j, ctx_num, node, ret; + char *ctx_section; + const char *type; + + if (is_comp && op_type_num > ARRAY_SIZE(comp_ctx_type)) + return -WD_EINVAL; + + ctx_section = index(section, ':'); + ctx_section++; + ret = parse_num_on_numa(ctx_section, &ctx_num, &node); + if (ret) + return ret; + + for (i = 0; i < CTX_MODE_MAX; i++) { + for (j = 0; j < op_type_num; j++) { + type = is_comp ? comp_ctx_type[i][j] : ctx_type[i][0]; + if (strncmp(section, type, strlen(type))) + continue; + + if (!i) + ctx_nums[j].sync_ctx_num = ctx_num; + else + ctx_nums[j].async_ctx_num = ctx_num; + + return 0; + } + } + + return -WD_EINVAL; +} + +static int wd_env_set_ctx_nums(const char *name, struct wd_ctx_nums *ctx_nums, __u32 size) +{ + char *left, *section, *start, *var_s; + int is_comp; + int ret = 0; + + is_comp = strncmp(name, "WD_COMP_CTX_NUM", strlen(name)) ? 0 : 1; + + var_s = secure_getenv(name); + if (!var_s || !strlen(var_s)) + return 0; + + start = strdup(var_s); + if (!start) + return -WD_ENOMEM; + + left = start; + while ((section = strsep(&left, ","))) { + ret = wd_set_ctx_nums(ctx_nums, section, size, is_comp); + if (ret) + goto out_free_str; + } + +out_free_str: + free(start); + return ret; +} + +int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_ctx_params *user_ctx_params, + struct wd_alg_driver *driver, const char *env_name, int max_op_type) +{ + int i, ret; + + ret = wd_env_set_ctx_nums(env_name, ctx_params->ctx_set_num, max_op_type); + if (ret) { + WD_ERR("fail to init ctx nums from %s!\n", env_name); + return -WD_EINVAL; + } - if (!user_ctx_params) { + if (!ret || !user_ctx_params) { ctx_params->bmp = NULL; - ctx_params->ctx_set_num = ctx_set_num; ctx_params->op_type_num = driver->op_type_num; if (ctx_params->op_type_num > max_op_type) { WD_ERR("fail to check driver op type numbers.\n"); @@ -2017,10 +2082,11 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, } for (i = 0; i < ctx_params->op_type_num; i++) { - if (!ctx_set_num[i].sync_ctx_num || !ctx_set_num[i].async_ctx_num) { - ctx_set_num[i].sync_ctx_num = driver->queue_num; - ctx_set_num[i].async_ctx_num = driver->queue_num; - } + if (!ctx_params->ctx_set_num[i].sync_ctx_num) + ctx_params->ctx_set_num[i].sync_ctx_num = driver->queue_num; + + if (!ctx_params->ctx_set_num[i].async_ctx_num) + ctx_params->ctx_set_num[i].async_ctx_num = driver->queue_num; } } else { ctx_params->bmp = user_ctx_params->bmp; @@ -2582,64 +2648,3 @@ void wd_alg_attrs_uninit(struct wd_init_attrs *attrs) } wd_sched_rr_release(alg_sched); } - -static int wd_set_ctx_nums(struct wd_ctx_nums *ctx_nums, const char *section, - __u32 op_type_num, int is_comp) -{ - int i, j, ctx_num, node, ret; - char *ctx_section; - const char *type; - - if (is_comp && op_type_num > ARRAY_SIZE(comp_ctx_type)) - return -WD_EINVAL; - - ctx_section = index(section, ':'); - ctx_section++; - ret = parse_num_on_numa(ctx_section, &ctx_num, &node); - if (ret) - return ret; - - for (i = 0; i < CTX_MODE_MAX; i++) { - for (j = 0; j < op_type_num; j++) { - type = is_comp ? comp_ctx_type[i][j] : ctx_type[i][0]; - if (strncmp(section, type, strlen(type))) - continue; - - if (!i) - ctx_nums[j].sync_ctx_num = ctx_num; - else - ctx_nums[j].async_ctx_num = ctx_num; - - return 0; - } - } - - return -WD_EINVAL; -} - -int wd_env_set_ctx_nums(const char *name, struct wd_ctx_nums *ctx_nums, __u32 size) -{ - char *left, *section, *start, *var_s; - int ret, is_comp; - - is_comp = strncmp(name, "WD_COMP_CTX_NUM", strlen(name)) ? 0 : 1; - - var_s = secure_getenv(name); - if (!var_s || !strlen(var_s)) - return 0; - - start = strdup(var_s); - if (!start) - return -WD_ENOMEM; - - left = start; - while ((section = strsep(&left, ","))) { - ret = wd_set_ctx_nums(ctx_nums, section, size, is_comp); - if (ret) - goto out_free_str; - } - -out_free_str: - free(start); - return ret; -} -- 2.30.0

1 0

[PATCH 1/5] uadk: fix dlsym return null problem
by Wenkai Lin 28 Mar '23

28 Mar '23

If the -lwd link is not added, dlsym fails to search for wd_alg_driver_register symbol. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index bd7b36f..c66bbfe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,7 +118,7 @@ libwd_crypto_la_LIBADD= -lwd -ldl -lnuma libwd_crypto_la_LDFLAGS=$(UADK_VERSION) $(UADK_CRYPTO_SYMBOL) libwd_crypto_la_DEPENDENCIES= libwd.la -libhisi_zip_la_LIBADD= -ldl +libhisi_zip_la_LIBADD= -ldl -lwd libhisi_zip_la_LDFLAGS=$(UADK_VERSION) libhisi_sec_la_LIBADD= -lwd -lwd_crypto -- 2.30.0

1 3

AccLib SIG例会
by openEuler conference 21 Mar '23

21 Mar '23

您好！ sig-AccLib SIG 邀请您参加 2023-03-22 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议内容：会议链接：https://linaro-org.zoom.us/j/91879279131 议题：加解密库适配鲲鹏硬件加速项目仓库创建会议链接：https://us06web.zoom.us/j/83342732272?pwd=SS9pOFJzdzNRdmx2TFd0OExEeXkyUT09 会议纪要：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 2023-03-22 11:00, The subject of the conference is AccLib SIG例会, Summary: 会议链接：https://linaro-org.zoom.us/j/91879279131 议题：加解密库适配鲲鹏硬件加速项目仓库创建 You can join the meeting at https://us06web.zoom.us/j/83342732272?pwd=SS9pOFJzdzNRdmx2TFd0OExEeXkyUT09. 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/

1 0

[PATCH] uadk - the features of testing the correctness is added
by Kai Ye 16 Mar '23

16 Mar '23

Unified the acc test framework. This framework is used to run algorithm correctness. It can helps developers with feature self-testing. Only supports sec engine self-testing currently. Such as: test_sec_sva --cipher 0 --sync --optype 0 --pktlen 16 --keylen \ 16 --times 1 --multi 1 after: uadk_tool test --m sec --cipher 0 --sync --optype 0 --pktlen 16 \ --keylen 16 --times 1 --multi 1 Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- configure.ac | 1 - test/Makefile.am | 3 +- test/hisi_sec_test/Makefile.am | 15 ---- test/wd_mempool_test.c | 2 +- uadk_tool/Makefile.am | 4 +- .../test/sec_template_tv.h | 6 +- .../test/test_sec.c | 42 ++++----- uadk_tool/test/test_sec.h | 7 ++ uadk_tool/test/uadk_test.c | 85 +++++++++++++++++++ uadk_tool/test/uadk_test.h | 7 ++ uadk_tool/uadk_tool.c | 7 +- 11 files changed, 136 insertions(+), 43 deletions(-) delete mode 100644 test/hisi_sec_test/Makefile.am rename test/hisi_sec_test/test_hisi_sec.h => uadk_tool/test/sec_template_tv.h (99%) rename test/hisi_sec_test/test_hisi_sec.c => uadk_tool/test/test_sec.c (98%) mode change 100755 => 100644 create mode 100644 uadk_tool/test/test_sec.h create mode 100644 uadk_tool/test/uadk_test.c create mode 100644 uadk_tool/test/uadk_test.h diff --git a/configure.ac b/configure.ac index 3eb853f..7109d97 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,6 @@ AC_CONFIG_FILES([Makefile lib/libwd_crypto.pc lib/libwd_comp.pc lib/libwd.pc test/Makefile test/hisi_hpre_test/Makefile - test/hisi_sec_test/Makefile test/hisi_zip_test/Makefile uadk_tool/Makefile sample/Makefile diff --git a/test/Makefile.am b/test/Makefile.am index 860a103..8da1afb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -12,8 +12,7 @@ wd_mempool_test_LDADD=-L../.libs -lwd -lwd_crypto -lnuma -lpthread endif wd_mempool_test_LDFLAGS=-Wl,-rpath,'/usr/local/lib' -SUBDIRS=. hisi_sec_test - +SUBDIRS = . if HAVE_CRYPTO SUBDIRS += hisi_hpre_test diff --git a/test/hisi_sec_test/Makefile.am b/test/hisi_sec_test/Makefile.am deleted file mode 100644 index 9955ab1..0000000 --- a/test/hisi_sec_test/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -AM_CFLAGS=-Wall -Werror -fno-strict-aliasing -I$(top_srcdir)/include -pthread -AUTOMAKE_OPTIONS = subdir-objects - -bin_PROGRAMS=test_hisi_sec - -test_hisi_sec_SOURCES=test_hisi_sec.c - -if WD_STATIC_DRV -AM_CFLAGS+=-Bstatic -test_hisi_sec_LDADD=../../.libs/libwd.a ../../.libs/libwd_crypto.a \ - ../../.libs/libhisi_sec.a -lnuma -else -test_hisi_sec_LDADD=-L../../.libs -l:libwd.so.2 -l:libwd_crypto.so.2 -lnuma -endif -test_hisi_sec_LDFLAGS=-Wl,-rpath,'/usr/local/lib' diff --git a/test/wd_mempool_test.c b/test/wd_mempool_test.c index cf6be70..ad04636 100644 --- a/test/wd_mempool_test.c +++ b/test/wd_mempool_test.c @@ -20,7 +20,7 @@ #include <sys/mman.h> #include <sys/time.h> -#include "hisi_sec_test/test_hisi_sec.h" +#include "../uadk_tool/test/sec_template_tv.h" #include "wd.h" #include "wd_cipher.h" #include "wd_sched.h" diff --git a/uadk_tool/Makefile.am b/uadk_tool/Makefile.am index d5b125f..6d0450e 100644 --- a/uadk_tool/Makefile.am +++ b/uadk_tool/Makefile.am @@ -14,7 +14,9 @@ uadk_tool_SOURCES=uadk_tool.c dfx/uadk_dfx.c dfx/uadk_dfx.h \ benchmark/hpre_uadk_benchmark.c benchmark/hpre_uadk_benchmark.h \ benchmark/hpre_wd_benchmark.c hpre_wd_benchmark.h \ benchmark/zip_uadk_benchmark.c benchmark/zip_uadk_benchmark.h \ - benchmark/zip_wd_benchmark.c benchmark/zip_wd_benchmark.h + benchmark/zip_wd_benchmark.c benchmark/zip_wd_benchmark.h \ + test/uadk_test.c test/uadk_test.h \ + test/test_sec.c test/test_sec.h test/sec_template_tv.h if WD_STATIC_DRV AM_CFLAGS+=-Bstatic diff --git a/test/hisi_sec_test/test_hisi_sec.h b/uadk_tool/test/sec_template_tv.h similarity index 99% rename from test/hisi_sec_test/test_hisi_sec.h rename to uadk_tool/test/sec_template_tv.h index 8e21681..1a6f960 100644 --- a/test/hisi_sec_test/test_hisi_sec.h +++ b/uadk_tool/test/sec_template_tv.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright 2020-2021 Huawei Technologies Co.,Ltd. All rights reserved. */ -#ifndef TEST_HISI_SEC_H_ -#define TEST_HISI_SEC_H +#ifndef SEC_TEMPLATE_TV_H +#define SEC_TEMPLATE_TV_H enum alg_class { CIPHER_CLASS, @@ -1840,4 +1840,4 @@ struct aead_testvec sm4_gcm_tv_template_128[] = { } }; -#endif /* TEST_HISI_SEC_H_ */ +#endif /* SEC_TEMPLATE_TV_H */ diff --git a/test/hisi_sec_test/test_hisi_sec.c b/uadk_tool/test/test_sec.c old mode 100755 new mode 100644 similarity index 98% rename from test/hisi_sec_test/test_hisi_sec.c rename to uadk_tool/test/test_sec.c index 7d5da7c..9fe007e --- a/test/hisi_sec_test/test_hisi_sec.c +++ b/uadk_tool/test/test_sec.c @@ -12,11 +12,12 @@ #include <getopt.h> #include <numa.h> -#include "test_hisi_sec.h" -#include "wd_cipher.h" -#include "wd_digest.h" -#include "wd_aead.h" -#include "wd_sched.h" +#include "sec_template_tv.h" +#include "test_sec.h" +#include "include/wd_cipher.h" +#include "include/wd_digest.h" +#include "include/wd_aead.h" +#include "include/wd_sched.h" #define SEC_TST_PRT printf #define HW_CTX_SIZE (24 * 1024) @@ -26,6 +27,7 @@ #define SVA_THREADS 64 #define USE_CTX_NUM 64 #define BYTES_TO_MB 20 +#define SEC_ARGV_OFFSET 3 #define SCHED_SINGLE "sched_single" #define SCHED_NULL_CTX_SIZE 4 @@ -4013,13 +4015,13 @@ out_thr: static void print_help(void) { SEC_TST_PRT("NAME\n"); - SEC_TST_PRT(" test_hisi_sec: test wd sec function,etc\n"); + SEC_TST_PRT(" uadk_tool test --m sec: test wd sec function,etc\n"); SEC_TST_PRT("USAGE\n"); - SEC_TST_PRT(" test_hisi_sec [--cipher] [--digest] [--aead] [--perf]\n"); - SEC_TST_PRT(" test_hisi_sec [--optype] [--pktlen] [--keylen] [--times]\n"); - SEC_TST_PRT(" test_hisi_sec [--multi] [--sync] [--async] [--help]\n"); - SEC_TST_PRT(" test_hisi_sec [--block] [--blknum] [--ctxnum]\n"); - SEC_TST_PRT(" numactl --cpubind=0 --membind=0,1 ./test_hisi_sec xxxx\n"); + SEC_TST_PRT(" uadk_tool test --m sec [--cipher] [--digest] [--aead] [--perf]\n"); + SEC_TST_PRT(" uadk_tool test --m sec [--optype] [--pktlen] [--keylen] [--times]\n"); + SEC_TST_PRT(" uadk_tool test --m sec [--multi] [--sync] [--async] [--help]\n"); + SEC_TST_PRT(" uadk_tool test --m sec [--block] [--blknum] [--ctxnum]\n"); + SEC_TST_PRT(" numactl --cpubind=0 --membind=0,1 ./uadk_tool test --m sec xxxx\n"); SEC_TST_PRT(" specify numa nodes for cpu and memory\n"); SEC_TST_PRT("DESCRIPTION\n"); SEC_TST_PRT(" [--cipher ]:\n"); @@ -4060,17 +4062,19 @@ static void print_help(void) SEC_TST_PRT(" the number of QP queues used by the entire test task\n"); SEC_TST_PRT(" [--stream]:\n"); SEC_TST_PRT(" set the steam mode for digest\n"); + SEC_TST_PRT(" [--sglnum]:\n"); + SEC_TST_PRT(" the number of scatterlist number used by the entire test task\n"); SEC_TST_PRT(" [--help] = usage\n"); SEC_TST_PRT("Example\n"); - SEC_TST_PRT(" ./test_hisi_sec --cipher 0 --sync --optype 0\n"); + SEC_TST_PRT(" ./uadk_tool test --m sec --cipher 0 --sync --optype 0\n"); SEC_TST_PRT("--pktlen 16 --keylen 16 --times 1 --multi 1\n"); - SEC_TST_PRT(" ./test_hisi_sec --digest 0 --sync --optype 0\n"); + SEC_TST_PRT(" ./uadk_tool test --m sec --digest 0 --sync --optype 0\n"); SEC_TST_PRT("--pktlen 16 --keylen 16 --times 1 --multi 2 --stream\n"); - SEC_TST_PRT(" ./test_hisi_sec --digest 1 --sync --optype 0\n"); + SEC_TST_PRT(" ./uadk_tool test --m sec --digest 1 --sync --optype 0\n"); SEC_TST_PRT("--pktlen 16 --keylen 16 --times 1 --multi 2 --stream\n"); - SEC_TST_PRT(" ./test_hisi_sec --perf --sync --pktlen 1024 --block 1024\n"); + SEC_TST_PRT(" ./uadk_tool test --m sec --perf --sync --pktlen 1024 --block 1024\n"); SEC_TST_PRT("--blknum 100000 --times 10000 --multi 1 --ctxnum 1\n"); - SEC_TST_PRT("UPDATE:2022-06-29\n"); + SEC_TST_PRT("UPDATE:2022-12-16\n"); } static void test_sec_cmd_parse(int argc, char *argv[], struct test_sec_option *option) @@ -4335,7 +4339,7 @@ static int test_sec_run(__u32 sync_mode, __u32 alg_class) return ret; } -int main(int argc, char *argv[]) +int test_sec_entry(int argc, char *argv[]) { struct test_sec_option option = {0}; int ret = 0; @@ -4343,14 +4347,14 @@ int main(int argc, char *argv[]) SEC_TST_PRT("this is a hisi sec test.\n"); g_thread_num = 1; - if (!argv[1]) { + if (!argv[1 + SEC_ARGV_OFFSET]) return test_sec_default_case(); - } test_sec_cmd_parse(argc, argv, &option); ret = test_sec_option_convert(&option); if (ret) return ret; + if (option.algclass == PERF_CLASS) return sec_sva_test(); diff --git a/uadk_tool/test/test_sec.h b/uadk_tool/test/test_sec.h new file mode 100644 index 0000000..5ac23e6 --- /dev/null +++ b/uadk_tool/test/test_sec.h @@ -0,0 +1,7 @@ +#ifndef TEST_SEC_H +#define TEST_SEC_H + + +int test_sec_entry(int argc, char *argv[]); + +#endif /* TEST_SEC_H */ \ No newline at end of file diff --git a/uadk_tool/test/uadk_test.c b/uadk_tool/test/uadk_test.c new file mode 100644 index 0000000..61c637b --- /dev/null +++ b/uadk_tool/test/uadk_test.c @@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <getopt.h> +#include <unistd.h> +#include <limits.h> +#include <sys/ipc.h> +#include <sys/shm.h> + +#include "test_sec.h" + +enum uadk_test_op_type { + DISPLAY_MODULE = 22, + DISPLAY_HELP, +}; + +int test_hpre_entry(int argc, char *argv[]) +{ + return 0; +} + +int test_zip_entry(int argc, char *argv[]) +{ + return 0; +} + +void print_test_help(void) +{ + printf("NAME\n"); + printf(" uadk_tool test : Test the correctness of the acc algorithm, etc\n"); + printf("USAGE\n"); + printf(" uadk_tool test [--m] = module name\n"); + printf(" hpre, sec, zip\n"); + printf(" uadk_tool test [--help] = usage\n"); + printf("Example\n"); + printf(" uadk_tool test --m hpre --xx\n"); + printf(" uadk_tool test --m sec --xx\n"); + printf(" uadk_tool test --m zip --xx\n"); +} + +void acc_test_run(int argc, char *argv[]) +{ + char *input_module = NULL; + int option_index = 0; + int opt; + + static struct option long_options[] = { + {"m", required_argument, 0, 22}, + {"help", no_argument, 0, 23}, + {0, 0, 0, 0} + }; + + while (1) { + opt = getopt_long(argc, argv, "", long_options, &option_index); + if (opt == -1) + break; + + switch (opt) { + case DISPLAY_MODULE: + input_module = optarg; + if (!strcmp(input_module, "hpre")) { + (void)test_hpre_entry(argc, argv); + } else if (!strcmp(input_module, "sec")) { + (void)test_sec_entry(argc, argv); + } else if (!strcmp(input_module, "zip")) { + (void)test_zip_entry(argc, argv); + } else { + print_test_help(); + printf("failed to parse module parameter!\n"); + } + break; + case DISPLAY_HELP: + print_test_help(); + break; + default: + printf("bad input parameter, exit!\n"); + print_test_help(); + break; + } + } +} \ No newline at end of file diff --git a/uadk_tool/test/uadk_test.h b/uadk_tool/test/uadk_test.h new file mode 100644 index 0000000..f9fa5fa --- /dev/null +++ b/uadk_tool/test/uadk_test.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +#ifndef UADK_TEST_H +#define UADK_TEST_H + +void print_test_help(void); +void acc_test_run(int argc, char *argv[]); +#endif \ No newline at end of file diff --git a/uadk_tool/uadk_tool.c b/uadk_tool/uadk_tool.c index ce83d7a..63e6d0f 100644 --- a/uadk_tool/uadk_tool.c +++ b/uadk_tool/uadk_tool.c @@ -2,14 +2,16 @@ #include <stdio.h> #include <string.h> -#include "dfx/uadk_dfx.h" #include "benchmark/uadk_benchmark.h" +#include "dfx/uadk_dfx.h" +#include "test/uadk_test.h" static void print_tool_help(void) { printf("NAME\n"); printf("uadk_tool dfx : Show some information for library.\n"); printf("uadk_tool benchmark : Test UADK acc performance.\n"); + printf("uadk_tool test : Test the correctness of the acc algorithm.\n"); } int main(int argc, char **argv) @@ -34,6 +36,9 @@ int main(int argc, char **argv) if (ret) return ret; (void)acc_benchmark_run(&option); + } else if (!strcmp("test", argv[index])) { + printf("start UADK acc algorithm test.\n"); + acc_test_run(argc, argv); } else { print_tool_help(); } -- 2.17.1

1 0

[PATCH] uadk - the description document of the uadk log is added
by Kai Ye 15 Mar '23

15 Mar '23

The document file describes how to set up a uadk log. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- docs/log.rst | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 docs/log.rst diff --git a/docs/log.rst b/docs/log.rst new file mode 100644 index 0000000..a8e7027 --- /dev/null +++ b/docs/log.rst @@ -0,0 +1,32 @@ + +The rsyslog.conf file is the main configuration file for the rsyslogd which logs system +messages on systems. The uadk library can set up the log level and log file by use the rsyslogd. +the uadk log can be printed in message or syslog file default. You can set your own uadk.log +file in rsyslog.conf. + +1. If selected the static compilation, the syslog will not be used, The information will be printed + on the serial port. +2. If not edited the rsyslog.conf, the log files will be printed in /var/log/messages. +3. If you don't want to use the rsyslogd, you can edit the Makefile.am. The information will be + printed on the serial port. +4. If you want to use the rsyslogd, you can see the following information. + +The uadk supports four setting commands, the log level parameters: + local5.err # display the error conditions + local5.info # display the warning and error conditions + local5.debug # display the debug,warning,error conditions + local5.* # print levels are not differentiated. + +The following steps will help you set up the syslog file: + +step 1: + Add the following information to the last line of /etc/rsyslog.conf: + local5.err /var/log/uadk.log + +step 2: + Restart the rsyslog deamon service. The cmd is: + service rsyslog restart + +After you run the tasks. You can see the uadk.log in /var/log/uadk/log. If you want to clear the +log file, you can use the following cmd: echo 0 > /var/log/uadk.log. + -- 2.30.0

1 0

更新会议链接 //：AccLib SIG例会
by Young 08 Mar '23

08 Mar '23

Hi all, 抱歉，在订阅会议时忘了添加备注，本次会议链接还是固定链接： https://linaro-org.zoom.us/j/91879279131请各位用此链接参与。 ------------------ 原始邮件 ------------------ 发件人:"openEuler conference"<public(a)openeuler.org>gt;; 发送时间:2023年3月7日(星期二) 上午10:15 收件人:"acc"<acc(a)openeuler.org>gt;; 主题:[Acc] AccLib SIG例会您好！ sig-AccLib SIG 邀请您参加 2023-03-08 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议链接：https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09 会议纪要：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 2023-03-08 11:00, The subject of the conference is AccLib SIG例会, You can join the meeting at https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09. 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/ _______________________________________________ Acc mailing list -- acc(a)openeuler.org To unsubscribe send an email to acc-leave(a)openeuler.org

1 0

AccLib SIG例会
by openEuler conference 07 Mar '23

07 Mar '23

您好！ sig-AccLib SIG 邀请您参加 2023-03-08 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议链接：https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09 会议纪要：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 2023-03-08 11:00, The subject of the conference is AccLib SIG例会, You can join the meeting at https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09. 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/

1 0

[ACC] [PATCH 0/6] uadk: update ecc/rsa/dh function
by Weili Qian 25 Feb '23

25 Feb '23

To simplify the calling logic of uadk, a new init2 interface is added to the ecc/rsa/dh algorithm class, which includes hardware device resource initialization and scheduler initialization. Weili Qian (6): uadk/ecc: add the init2 interface for ecc uadk/rsa: add the init2 interface for rsa uadk/dh: add the init2 interface for dh uadk/ecc: adapt the ecc module to the dynamic loading framework uadk/rsa: adapt the rsa module to the dynamic loading framework uadk/dh: adapt the dh module to the dynamic loading framework drv/hisi_hpre.c | 180 +++++++++++++++++++-------- include/drv/wd_dh_drv.h | 27 ---- include/drv/wd_ecc_drv.h | 27 ---- include/drv/wd_rsa_drv.h | 27 ---- include/wd_dh.h | 30 +++++ include/wd_ecc.h | 28 +++++ include/wd_rsa.h | 28 +++++ libwd_crypto.map | 9 ++ wd_dh.c | 256 +++++++++++++++++++++++++++----------- wd_ecc.c | 262 ++++++++++++++++++++++++++++----------- wd_rsa.c | 256 +++++++++++++++++++++++++++----------- 11 files changed, 786 insertions(+), 344 deletions(-) -- 2.33.0

2 8

[PATCH v3 0/2] uadk: update cipher function
by Longfang Liu 25 Feb '23

25 Feb '23

In order to simplify the calling logic of uadk, a new init2 interface is added to the cipher algorithm class, which includes hardware device resource initialization and scheduler initialization. Changes v2 -> v3: Remove some redundant opcodes. Changes v1 -> v2: init2 interface and dynamic loading driver modification for splitting Longfang Liu (2): uadk/cipher: add the init2 interface for cipher uadk/sec: adapt the sec module to the dynamic loading framework drv/hisi_sec.c | 102 +++++++++++-- include/drv/wd_aead_drv.h | 2 +- include/drv/wd_cipher_drv.h | 26 ---- include/drv/wd_digest_drv.h | 2 +- include/wd_cipher.h | 29 ++++ libwd_crypto.map | 3 + wd_cipher.c | 297 +++++++++++++++++++++++++++--------- 7 files changed, 345 insertions(+), 116 deletions(-) -- 2.33.0

1 2

Fwd: S390 testing for IOMMUFD
by Zhangfei Gao 02 Feb '23

02 Feb '23

-------- Forwarded Message -------- Subject: S390 testing for IOMMUFD Date: Mon, 7 Nov 2022 21:09:02 -0400 From: Jason Gunthorpe <jgg(a)nvidia.com> To: Cornelia Huck <cohuck(a)redhat.com>, Eric Farman <farman(a)linux.ibm.com>, Matthew Rosato <mjrosato(a)linux.ibm.com>, Niklas Schnelle <schnelle(a)linux.ibm.com>, Tony Krowiak <akrowiak(a)linux.ibm.com>, Halil Pasic <pasic(a)linux.ibm.com>, Jason Herne <jjherne(a)linux.ibm.com>, linux-s390(a)vger.kernel.org CC: iommu(a)lists.linux.dev, Kevin Tian <kevin.tian(a)intel.com>, Alex Williamson <alex.williamson(a)redhat.com>, kvm(a)vger.kernel.org, Lu Baolu <baolu.lu(a)linux.intel.com>, Nicolin Chen <nicolinc(a)nvidia.com> On Mon, Nov 07, 2022 at 08:48:53PM -0400, Jason Gunthorpe wrote: > [ > This has been in linux-next for a little while now, and we've completed > the syzkaller run. 1300 hours of CPU time have been invested since the > last report with no improvement in coverage or new detections. syzkaller > coverage reached 69%(75%), and review of the misses show substantial > amounts are WARN_ON's and other debugging which are not expected to be > covered. > ] > > iommufd is the user API to control the IOMMU subsystem as it relates to > managing IO page tables that point at user space memory. [chop cc list] s390 mdev maintainers, Can I ask your help to test this with the two S390 mdev drivers? Now that gvt is passing and we've covered alot of the QA ground it is a good time to run it. Take the branch from here: https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git/log/?h=for-… And build the kernel with CONFIG_VFIO_CONTAINER=n CONFIG_IOMMUFD=y CONFIG_IOMMUFD_VFIO_CONTAINER=y And your existing stuff should work with iommufd providing the iommu support to vfio. There will be a dmesg confirming this. Let me know if there are any problems! If I recall there was some desire from the S390 platform team to start building on iommufd to create some vIOMMU acceleration for S390 guests, this is a necessary first step. Thanks, Jason

3 2

DOCUMENTS SENT VIA ONEDRIVE
by acc 30 Jan '23

30 Jan '23

1 0

[PATCH] dh: cleanup redundant macro definition
by Zhiqi Song 19 Jan '23

19 Jan '23

Remove duplicated definition of CTX_MODE_NUM. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- src/uadk_dh.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/uadk_dh.c b/src/uadk_dh.c index 6065160..a14d215 100644 --- a/src/uadk_dh.c +++ b/src/uadk_dh.c @@ -39,7 +39,6 @@ #define CHAR_BIT_SIZE 3 #define DH_PARAMS_CNT 3 #define CTX_MODE_NUM 2 -#define CTX_MODE_NUM 2 #define UN_SET 0 #define IS_SET 1 #define CTX_ASYNC 1 -- 2.30.0

1 2

加速库技术例会
by openEuler conference 18 Jan '23

18 Jan '23

您好！ sig-AccLib SIG 邀请您参加 2023-01-18 11:00 召开的Zoom会议会议主题：加速库技术例会会议内容： zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1、进展讨论 2、自由讨论会议链接：https://us06web.zoom.us/j/89073010256?pwd=TTJWM1l3RS95ZHVabVVVVzk3eENEQT09 会议纪要：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 2023-01-18 11:00, The subject of the conference is 加速库技术例会, Summary: zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1、进展讨论 2、自由讨论 You can join the meeting at https://us06web.zoom.us/j/89073010256?pwd=TTJWM1l3RS95ZHVabVVVVzk3eENEQT09. 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/

1 0

读书很重要！！！
by Servicentro 248 Tepatitan Express 18 Jan '23

18 Jan '23

这是我现在唯一可以联系你的方式，我希望你对此非常小心，并保守这个秘密，直到我腾出空间让我们看到。你不需要知道我是谁或我来自哪里。我知道这听起来可能会让您感到非常惊讶，但情况就是这样。我已经提前支付了一些赎金以解雇你，原因是我的雇主向我列出的一些原因。我相信这是一个你称之为朋友的人；我已经密切关注了您一段时间，发现您对他对您的指控是清白的。不要联系警察或试图将此副本发送给他们，因为如果你这样做，我会知道，我会被迫去做我得到报酬的事情。此外，这是我第一次在工作中背叛。我可怜你，所以我下定决心要帮助你，如果你愿意帮助自己。现在听着，我会安排我们面对面见面，但在那之前，我需要在明天结束前通过比特币地址支付 10,000 美元。这是为了让我在给你信息时离开城镇。比特币钱包：bc1qez55j3he8tvylca2e3su3eugxv2lpksxexzer4 我会去你家，或者你决定我们在哪里见面；我再说一遍，不要安排警察，如果你玩得很辛苦，它会延伸到你的家人。不设置任何摄像头遮挡我们或设置任何磁带记录我们的谈话；我的雇主现在在我的控制之下。付款细节将提供给你先支付 5,000 美元的部分付款，这将作为你准备好合作的保证，然后我将发送一份包含他要求我终止你的视频磁带的副本将有足够的证据让你在他雇用另一个人做这份工作之前对他采取任何法律行动。收到磁带后，您将支付 5,000 美元的余额。警告; 不要联系警察，确保在晚上 7.30 之后呆在室内，直到整件事得到解决，如果你忽视这些警告中的任何一个，你将受到责备。你没有太多时间，所以马上回我注意：我会建议你把这个留给自己，即使是朋友或家人也不应该知道，因为它可能是他们中的一员。 [cid:image41065f.GIF@9e62b825.4f8d80b1] Servicentro 248 Tepatitan Express Servicentro servicentro248(a)officedepot.com.mx [cid:image01cca7.JPG@be6c6496.4ea781cb] ________________________________ Este correo electrónico (incluyendo cualquier archivo adjunto) puede contener información privada, confidencial o protegida. Si recibió este correo electrónico por error, por favor elimínelo del sistema sin copiarlo y notifique por correo electrónico al remitente para que nuestros registros puedan ser corregidos. This e-mail (including any attachments) may contain information that is private, confidential or protected. If you received this e-mail in error, please delete it from your system without copying it and notifiy sender by reply e-mail, so that our records can be corrected.

1 0

读书很重要！！！
by Servicentro 248 Tepatitan Express 18 Jan '23

18 Jan '23

这是我现在唯一可以联系你的方式，我希望你对此非常小心，并保守这个秘密，直到我腾出空间让我们看到。你不需要知道我是谁或我来自哪里。我知道这听起来可能会让您感到非常惊讶，但情况就是这样。我已经提前支付了一些赎金以解雇你，原因是我的雇主向我列出的一些原因。我相信这是一个你称之为朋友的人；我已经密切关注了您一段时间，发现您对他对您的指控是清白的。不要联系警察或试图将此副本发送给他们，因为如果你这样做，我会知道，我会被迫去做我得到报酬的事情。此外，这是我第一次在工作中背叛。我可怜你，所以我下定决心要帮助你，如果你愿意帮助自己。现在听着，我会安排我们面对面见面，但在那之前，我需要在明天结束前通过比特币地址支付 10,000 美元。这是为了让我在给你信息时离开城镇。比特币钱包：bc1qez55j3he8tvylca2e3su3eugxv2lpksxexzer4 我会去你家，或者你决定我们在哪里见面；我再说一遍，不要安排警察，如果你玩得很辛苦，它会延伸到你的家人。不设置任何摄像头遮挡我们或设置任何磁带记录我们的谈话；我的雇主现在在我的控制之下。付款细节将提供给你先支付 5,000 美元的部分付款，这将作为你准备好合作的保证，然后我将发送一份包含他要求我终止你的视频磁带的副本将有足够的证据让你在他雇用另一个人做这份工作之前对他采取任何法律行动。收到磁带后，您将支付 5,000 美元的余额。警告; 不要联系警察，确保在晚上 7.30 之后呆在室内，直到整件事得到解决，如果你忽视这些警告中的任何一个，你将受到责备。你没有太多时间，所以马上回我注意：我会建议你把这个留给自己，即使是朋友或家人也不应该知道，因为它可能是他们中的一员。 [cid:imagef4b717.GIF@a439c5d5.4fb67f8b] Servicentro 248 Tepatitan Express Servicentro servicentro248(a)officedepot.com.mx [cid:imageb979d7.JPG@f137c011.4aa5ac27] ________________________________ Este correo electrónico (incluyendo cualquier archivo adjunto) puede contener información privada, confidencial o protegida. Si recibió este correo electrónico por error, por favor elimínelo del sistema sin copiarlo y notifique por correo electrónico al remitente para que nuestros registros puedan ser corregidos. This e-mail (including any attachments) may contain information that is private, confidential or protected. If you received this e-mail in error, please delete it from your system without copying it and notifiy sender by reply e-mail, so that our records can be corrected.

1 0

读书很重要！！！
by Servicentro 248 Tepatitan Express 18 Jan '23

18 Jan '23

这是我现在唯一可以联系你的方式，我希望你对此非常小心，并保守这个秘密，直到我腾出空间让我们看到。你不需要知道我是谁或我来自哪里。我知道这听起来可能会让您感到非常惊讶，但情况就是这样。我已经提前支付了一些赎金以解雇你，原因是我的雇主向我列出的一些原因。我相信这是一个你称之为朋友的人；我已经密切关注了您一段时间，发现您对他对您的指控是清白的。不要联系警察或试图将此副本发送给他们，因为如果你这样做，我会知道，我会被迫去做我得到报酬的事情。此外，这是我第一次在工作中背叛。我可怜你，所以我下定决心要帮助你，如果你愿意帮助自己。现在听着，我会安排我们面对面见面，但在那之前，我需要在明天结束前通过比特币地址支付 10,000 美元。这是为了让我在给你信息时离开城镇。比特币钱包：bc1qez55j3he8tvylca2e3su3eugxv2lpksxexzer4 我会去你家，或者你决定我们在哪里见面；我再说一遍，不要安排警察，如果你玩得很辛苦，它会延伸到你的家人。不设置任何摄像头遮挡我们或设置任何磁带记录我们的谈话；我的雇主现在在我的控制之下。付款细节将提供给你先支付 5,000 美元的部分付款，这将作为你准备好合作的保证，然后我将发送一份包含他要求我终止你的视频磁带的副本将有足够的证据让你在他雇用另一个人做这份工作之前对他采取任何法律行动。收到磁带后，您将支付 5,000 美元的余额。警告; 不要联系警察，确保在晚上 7.30 之后呆在室内，直到整件事得到解决，如果你忽视这些警告中的任何一个，你将受到责备。你没有太多时间，所以马上回我注意：我会建议你把这个留给自己，即使是朋友或家人也不应该知道，因为它可能是他们中的一员。 [cid:imagede8fbe.GIF@751ab1a8.4186e1ba] Servicentro 248 Tepatitan Express Servicentro servicentro248(a)officedepot.com.mx [cid:imagedde1dd.JPG@51810080.469f85c5] ________________________________ Este correo electrónico (incluyendo cualquier archivo adjunto) puede contener información privada, confidencial o protegida. Si recibió este correo electrónico por error, por favor elimínelo del sistema sin copiarlo y notifique por correo electrónico al remitente para que nuestros registros puedan ser corregidos. This e-mail (including any attachments) may contain information that is private, confidential or protected. If you received this e-mail in error, please delete it from your system without copying it and notifiy sender by reply e-mail, so that our records can be corrected.

1 0

读书很重要！！！
by Servicentro 248 Tepatitan Express 18 Jan '23

18 Jan '23

这是我现在唯一可以联系你的方式，我希望你对此非常小心，并保守这个秘密，直到我腾出空间让我们看到。你不需要知道我是谁或我来自哪里。我知道这听起来可能会让您感到非常惊讶，但情况就是这样。我已经提前支付了一些赎金以解雇你，原因是我的雇主向我列出的一些原因。我相信这是一个你称之为朋友的人；我已经密切关注了您一段时间，发现您对他对您的指控是清白的。不要联系警察或试图将此副本发送给他们，因为如果你这样做，我会知道，我会被迫去做我得到报酬的事情。此外，这是我第一次在工作中背叛。我可怜你，所以我下定决心要帮助你，如果你愿意帮助自己。现在听着，我会安排我们面对面见面，但在那之前，我需要在明天结束前通过比特币地址支付 10,000 美元。这是为了让我在给你信息时离开城镇。比特币钱包：bc1qez55j3he8tvylca2e3su3eugxv2lpksxexzer4 我会去你家，或者你决定我们在哪里见面；我再说一遍，不要安排警察，如果你玩得很辛苦，它会延伸到你的家人。不设置任何摄像头遮挡我们或设置任何磁带记录我们的谈话；我的雇主现在在我的控制之下。付款细节将提供给你先支付 5,000 美元的部分付款，这将作为你准备好合作的保证，然后我将发送一份包含他要求我终止你的视频磁带的副本将有足够的证据让你在他雇用另一个人做这份工作之前对他采取任何法律行动。收到磁带后，您将支付 5,000 美元的余额。警告; 不要联系警察，确保在晚上 7.30 之后呆在室内，直到整件事得到解决，如果你忽视这些警告中的任何一个，你将受到责备。你没有太多时间，所以马上回我注意：我会建议你把这个留给自己，即使是朋友或家人也不应该知道，因为它可能是他们中的一员。 [cid:image022dd9.GIF@58c0eb0c.43b53f6e] Servicentro 248 Tepatitan Express Servicentro servicentro248(a)officedepot.com.mx [cid:image189324.JPG@14c85146.4c80e561] ________________________________ Este correo electrónico (incluyendo cualquier archivo adjunto) puede contener información privada, confidencial o protegida. Si recibió este correo electrónico por error, por favor elimínelo del sistema sin copiarlo y notifique por correo electrónico al remitente para que nuestros registros puedan ser corregidos. This e-mail (including any attachments) may contain information that is private, confidential or protected. If you received this e-mail in error, please delete it from your system without copying it and notifiy sender by reply e-mail, so that our records can be corrected.

1 0

[PATCH 1/2] digest: add the 0 byte packet checking for long hash
by Kai Ye 17 Jan '23

17 Jan '23

Hardware v2 digest needs to check the zero byte packet in the frist and middle bd.Add a function that get the hash bd type. It can simplify the code of the process of hash bd type checking. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- drv/hisi_sec.c | 72 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 10 deletions(-) diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index c30b653..116424e 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -187,6 +187,13 @@ enum sec_c_width { C_WIDTH_CS3 = 0x3, }; +enum hash_bd_type { + HASH_SINGLE_BD, + HASH_FRIST_BD, + HASH_MIDDLE_BD, + HASH_END_BD, +}; + struct hisi_sec_ctx { struct wd_ctx_config_internal config; }; @@ -1379,9 +1386,29 @@ static int long_hash_param_check(handle_t h_qp, struct wd_digest_msg *msg) return 0; } +static enum hash_bd_type get_hash_bd_type(struct wd_digest_msg *msg) +{ + /* + * [has_next , iv_bytes] + * [ 1 , 0 ] = long hash(frist bd) + * [ 1 , 1 ] = long hash(middle bd) + * [ 0 , 1 ] = long hash(end bd) + * [ 0 , 0 ] = block hash(single bd) + */ + if (msg->has_next && !msg->iv_bytes) + return HASH_FRIST_BD; + else if (msg->has_next && msg->iv_bytes) + return HASH_MIDDLE_BD; + else if (!msg->has_next && msg->iv_bytes) + return HASH_END_BD; + else + return HASH_SINGLE_BD; +} + static int fill_digest_long_hash(handle_t h_qp, struct wd_digest_msg *msg, struct hisi_sec_sqe *sqe) { + enum hash_bd_type bd_type = get_hash_bd_type(msg); __u64 total_bits; int ret; @@ -1389,20 +1416,20 @@ static int fill_digest_long_hash(handle_t h_qp, struct wd_digest_msg *msg, if (ret) return ret; - if (msg->has_next && !msg->iv_bytes) { + if (bd_type == HASH_FRIST_BD) { /* Long hash first */ sqe->ai_apd_cs = AI_GEN_INNER; sqe->ai_apd_cs |= AUTHPAD_NOPAD << AUTHPAD_OFFSET; } - if (msg->has_next && msg->iv_bytes) { + if (bd_type == HASH_MIDDLE_BD) { /* Long hash middle */ sqe->ai_apd_cs = AI_GEN_IVIN_ADDR; sqe->ai_apd_cs |= AUTHPAD_NOPAD << AUTHPAD_OFFSET; sqe->type2.a_ivin_addr = sqe->type2.mac_addr; } - if (!msg->has_next && msg->iv_bytes) { + if (bd_type == HASH_END_BD) { /* Long hash end */ sqe->ai_apd_cs = AI_GEN_IVIN_ADDR; sqe->ai_apd_cs |= AUTHPAD_PAD << AUTHPAD_OFFSET; @@ -1478,14 +1505,38 @@ static int aes_auth_len_check(struct wd_digest_msg *msg) return 0; } +static int digest_bd2_zero_packet_check(struct wd_digest_msg *msg) +{ + enum hash_bd_type type = get_hash_bd_type(msg); + + /* Long hash first and middle bd */ + if (type == HASH_FRIST_BD || type == HASH_MIDDLE_BD) { + WD_ERR("hardware v2 not supports 0 size in long hash!\n"); + return -WD_EINVAL; + } + + /* Block mode hash bd */ + if (type == HASH_SINGLE_BD) { + WD_ERR("hardware v2 not supports 0 size in block hash!\n"); + return -WD_EINVAL; + } + + return 0; +} + static int digest_len_check(struct wd_digest_msg *msg, enum sec_bd_type type) { int ret; - /* End BD not need to check the input zero bytes */ - if (unlikely(type == BD_TYPE2 && !msg->has_next && !msg->in_bytes)) { - WD_ERR("kunpeng 920, digest mode not support 0 size!\n"); - return -WD_EINVAL; + /* + * Hardware v2 needs to check the zero byte packet in the block + * and long hash mode. Frist and Middle bd not supports 0 size, + * final bd not need to check it. Hardware v3 has fixed it. + */ + if (type == BD_TYPE2 && !msg->in_bytes) { + ret = digest_bd2_zero_packet_check(msg); + if (ret) + return ret; } if (type == BD_TYPE3) { @@ -1714,6 +1765,7 @@ static int aes_auth_long_hash_check(struct wd_digest_msg *msg) static int fill_digest_long_hash3(handle_t h_qp, struct wd_digest_msg *msg, struct hisi_sec_sqe3 *sqe) { + enum hash_bd_type bd_type = get_hash_bd_type(msg); __u64 total_bits; int ret; @@ -1725,20 +1777,20 @@ static int fill_digest_long_hash3(handle_t h_qp, struct wd_digest_msg *msg, if (ret) return ret; - if (msg->has_next && !msg->iv_bytes) { + if (bd_type == HASH_FRIST_BD) { /* Long hash first */ sqe->auth_mac_key |= AI_GEN_INNER << SEC_AI_GEN_OFFSET_V3; sqe->stream_scene.stream_auth_pad = AUTHPAD_NOPAD; } - if (msg->has_next && msg->iv_bytes) { + if (bd_type == HASH_MIDDLE_BD) { /* Long hash middle */ sqe->auth_mac_key |= AI_GEN_IVIN_ADDR << SEC_AI_GEN_OFFSET_V3; sqe->stream_scene.stream_auth_pad = AUTHPAD_NOPAD; sqe->auth_ivin.a_ivin_addr = sqe->mac_addr; } - if (!msg->has_next && msg->iv_bytes) { + if (bd_type == HASH_END_BD) { /* Long hash end */ sqe->auth_mac_key |= AI_GEN_IVIN_ADDR << SEC_AI_GEN_OFFSET_V3; sqe->stream_scene.stream_auth_pad = AUTHPAD_PAD; -- 2.17.1

1 1

2025

2024

2023

2022

Acc