From: Longfang Liu <liulongfang@huawei.com> After adapting to uadk's heterogeneous scheduling framework, all uadk algorithms have completed functional adaptation. After the adaptation is completed, the old functions need to be deleted. Signed-off-by: Longfang Liu <liulongfang@huawei.com> --- include/wd_util.h | 15 ++------ wd_aead.c | 8 ++--- wd_agg.c | 6 ++-- wd_cipher.c | 8 ++--- wd_comp.c | 8 ++--- wd_dh.c | 8 ++--- wd_digest.c | 8 ++--- wd_ecc.c | 8 ++--- wd_join_gather.c | 6 ++-- wd_rsa.c | 8 ++--- wd_udma.c | 6 ++-- wd_util.c | 91 ++++------------------------------------------- 12 files changed, 47 insertions(+), 133 deletions(-) diff --git a/include/wd_util.h b/include/wd_util.h index f226122..42270d9 100644 --- a/include/wd_util.h +++ b/include/wd_util.h @@ -133,7 +133,6 @@ struct wd_init_attrs { struct wd_ctx_config *ctx_config; wd_alg_init alg_init; wd_alg_poll_ctx alg_poll_ctx; - struct wd_alg_driver *driver; //stub for old code }; /* @@ -456,14 +455,10 @@ static inline void wd_alg_clear_init(enum wd_status *status) * * Return 0 if succeed and other error number if fail. */ -int wd_ctx_param_init_nw(struct wd_ctx_params *ctx_params, +int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_ctx_params *user_ctx_params, char *alg, int task_type, enum wd_type type, 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, - enum wd_type type, int max_op_type); void wd_ctx_param_uninit(struct wd_ctx_params *ctx_params); @@ -497,12 +492,8 @@ void wd_alg_drv_unbind(struct wd_alg_driver *drv); * * Return 0 if succeed and other error number if fail. */ -int wd_alg_init_driver_nw(struct wd_ctx_config_internal *config); -void wd_alg_uninit_driver_nw(struct wd_ctx_config_internal *config); -int wd_alg_init_driver(struct wd_ctx_config_internal *config, - struct wd_alg_driver *driver, void **drv_priv); -void wd_alg_uninit_driver(struct wd_ctx_config_internal *config, - struct wd_alg_driver *driver, void **drv_priv); +int wd_alg_init_driver(struct wd_ctx_config_internal *config); +void wd_alg_uninit_driver(struct wd_ctx_config_internal *config); /** * wd_dlopen_drv() - Open the dynamic library file of the device driver. diff --git a/wd_aead.c b/wd_aead.c index 7ef7dca..fcf23bb 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -649,7 +649,7 @@ int wd_aead_init(struct wd_ctx_config *config, struct wd_sched *sched) if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_aead_setting.config); + ret = wd_alg_init_driver(&wd_aead_setting.config); if (ret) goto out_drv_deconfig; wd_alg_set_init(&wd_aead_setting.status); @@ -672,7 +672,7 @@ void wd_aead_uninit(void) if (!wd_aead_setting.priv) return; - wd_alg_uninit_driver_nw(&wd_aead_setting.config); + wd_alg_uninit_driver(&wd_aead_setting.config); wd_ctx_drv_deconfig(&wd_aead_setting.config); wd_aead_uninit_nolock(); @@ -726,7 +726,7 @@ int wd_aead_init2_(char *alg, __u32 sched_type, int task_type, memset(&wd_aead_setting.config, 0, sizeof(struct wd_ctx_config_internal)); /* Init ctx param and prepare for ctx request */ aead_ctx_params.ctx_set_num = aead_ctx_num; - ret = wd_ctx_param_init_nw(&aead_ctx_params, ctx_params, + ret = wd_ctx_param_init(&aead_ctx_params, ctx_params, alg, task_type, WD_AEAD_TYPE, WD_DIGEST_CIPHER_DECRYPTION + 1); if (ret) { if (ret == -WD_EAGAIN) { @@ -755,7 +755,7 @@ int wd_aead_init2_(char *alg, __u32 sched_type, int task_type, if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_aead_setting.config); + ret = wd_alg_init_driver(&wd_aead_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_agg.c b/wd_agg.c index ebc6e31..f07642d 100644 --- a/wd_agg.c +++ b/wd_agg.c @@ -697,7 +697,7 @@ int wd_agg_init(char *alg, __u32 sched_type, int task_type, struct wd_ctx_params /* Init ctx param and prepare for ctx request */ agg_ctx_params.ctx_set_num = &agg_ctx_num; - ret = wd_ctx_param_init_nw(&agg_ctx_params, ctx_params, alg, task_type, + ret = wd_ctx_param_init(&agg_ctx_params, ctx_params, alg, task_type, WD_AGG_TYPE, 1); if (ret) { if (ret == -WD_EAGAIN) { @@ -726,7 +726,7 @@ int wd_agg_init(char *alg, __u32 sched_type, int task_type, struct wd_ctx_params if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_agg_setting.config); + ret = wd_alg_init_driver(&wd_agg_setting.config); if (ret) goto out_drv_deconfig; @@ -757,7 +757,7 @@ void wd_agg_uninit(void) if (ret) return; - wd_alg_uninit_driver_nw(&wd_agg_setting.config); + wd_alg_uninit_driver(&wd_agg_setting.config); wd_ctx_drv_deconfig(&wd_agg_setting.config); wd_alg_attrs_uninit(&wd_agg_init_attrs); diff --git a/wd_cipher.c b/wd_cipher.c index af0173a..96bb21c 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -419,7 +419,7 @@ int wd_cipher_init(struct wd_ctx_config *config, struct wd_sched *sched) if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_cipher_setting.config); + ret = wd_alg_init_driver(&wd_cipher_setting.config); if (ret) goto out_drv_deconfig; @@ -442,7 +442,7 @@ void wd_cipher_uninit(void) { int ret; - wd_alg_uninit_driver_nw(&wd_cipher_setting.config); + wd_alg_uninit_driver(&wd_cipher_setting.config); wd_ctx_drv_deconfig(&wd_cipher_setting.config); ret = wd_cipher_common_uninit(); @@ -487,7 +487,7 @@ int wd_cipher_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_p /* Init ctx param and prepare for ctx request */ cipher_ctx_params.ctx_set_num = cipher_ctx_num; - ret = wd_ctx_param_init_nw(&cipher_ctx_params, ctx_params, + ret = wd_ctx_param_init(&cipher_ctx_params, ctx_params, alg, task_type, WD_CIPHER_TYPE, WD_CIPHER_DECRYPTION + 1); if (ret) { if (ret == -WD_EAGAIN) { @@ -518,7 +518,7 @@ int wd_cipher_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_p if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_cipher_setting.config); + ret = wd_alg_init_driver(&wd_cipher_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_comp.c b/wd_comp.c index 596979b..b4cba28 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -213,7 +213,7 @@ int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_comp_setting.config); + ret = wd_alg_init_driver(&wd_comp_setting.config); if (ret) goto out_drv_deconfig; @@ -236,7 +236,7 @@ void wd_comp_uninit(void) { int ret; - wd_alg_uninit_driver_nw(&wd_comp_setting.config); + wd_alg_uninit_driver(&wd_comp_setting.config); wd_ctx_drv_deconfig(&wd_comp_setting.config); ret = wd_comp_uninit_nolock(); @@ -282,7 +282,7 @@ int wd_comp_init2_(const char *alg, __u32 sched_type, int task_type, /* Init ctx param and prepare for ctx request */ comp_ctx_params.ctx_set_num = comp_ctx_num; - ret = wd_ctx_param_init_nw(&comp_ctx_params, ctx_params, + ret = wd_ctx_param_init(&comp_ctx_params, ctx_params, alg, task_type, WD_COMP_TYPE, WD_DIR_MAX); if (ret) { if (ret == -WD_EAGAIN) { @@ -312,7 +312,7 @@ int wd_comp_init2_(const char *alg, __u32 sched_type, int task_type, if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_comp_setting.config); + ret = wd_alg_init_driver(&wd_comp_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_dh.c b/wd_dh.c index 48edc16..e7322d1 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -185,7 +185,7 @@ int wd_dh_init(struct wd_ctx_config *config, struct wd_sched *sched) if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_dh_setting.config); + ret = wd_alg_init_driver(&wd_dh_setting.config); if (ret) goto out_drv_deconfig; @@ -212,7 +212,7 @@ void wd_dh_uninit(void) if (ret) return; - wd_alg_uninit_driver_nw(&wd_dh_setting.config); + wd_alg_uninit_driver(&wd_dh_setting.config); wd_ctx_drv_deconfig(&wd_dh_setting.config); wd_dh_close_driver(WD_TYPE_V1); @@ -251,7 +251,7 @@ int wd_dh_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_param /* Init ctx param and prepare for ctx request */ dh_ctx_params.ctx_set_num = dh_ctx_num; - ret = wd_ctx_param_init_nw(&dh_ctx_params, ctx_params, + ret = wd_ctx_param_init(&dh_ctx_params, ctx_params, alg, task_type, WD_DH_TYPE, WD_DH_PHASE2); if (ret) { if (ret == -WD_EAGAIN) @@ -280,7 +280,7 @@ int wd_dh_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_param if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_dh_setting.config); + ret = wd_alg_init_driver(&wd_dh_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_digest.c b/wd_digest.c index fc42796..4d46cc5 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -344,7 +344,7 @@ int wd_digest_init(struct wd_ctx_config *config, struct wd_sched *sched) if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_digest_setting.config); + ret = wd_alg_init_driver(&wd_digest_setting.config); if (ret) goto out_drv_deconfig; @@ -368,7 +368,7 @@ void wd_digest_uninit(void) if (!wd_digest_setting.priv) return; - wd_alg_uninit_driver_nw(&wd_digest_setting.config); + wd_alg_uninit_driver(&wd_digest_setting.config); wd_ctx_drv_deconfig(&wd_digest_setting.config); wd_digest_uninit_nolock(); @@ -420,7 +420,7 @@ int wd_digest_init2_(char *alg, __u32 sched_type, int task_type, /* Init ctx param and prepare for ctx request */ digest_ctx_params.ctx_set_num = &digest_ctx_num; - ret = wd_ctx_param_init_nw(&digest_ctx_params, ctx_params, + ret = wd_ctx_param_init(&digest_ctx_params, ctx_params, alg, task_type, WD_DIGEST_TYPE, 1); if (ret) { if (ret == -WD_EAGAIN) { @@ -449,7 +449,7 @@ int wd_digest_init2_(char *alg, __u32 sched_type, int task_type, if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_digest_setting.config); + ret = wd_alg_init_driver(&wd_digest_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_ecc.c b/wd_ecc.c index 75507e8..3c4088b 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -250,7 +250,7 @@ int wd_ecc_init(struct wd_ctx_config *config, struct wd_sched *sched) if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_ecc_setting.config); + ret = wd_alg_init_driver(&wd_ecc_setting.config); if (ret) goto out_drv_deconfig; @@ -273,7 +273,7 @@ void wd_ecc_uninit(void) { int ret; - wd_alg_uninit_driver_nw(&wd_ecc_setting.config); + wd_alg_uninit_driver(&wd_ecc_setting.config); wd_ctx_drv_deconfig(&wd_ecc_setting.config); ret = wd_ecc_common_uninit(); if (ret) @@ -317,7 +317,7 @@ int wd_ecc_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para /* Init ctx param and prepare for ctx request */ ecc_ctx_params.ctx_set_num = ecc_ctx_num; - ret = wd_ctx_param_init_nw(&ecc_ctx_params, ctx_params, + ret = wd_ctx_param_init(&ecc_ctx_params, ctx_params, alg, task_type, WD_ECC_TYPE, WD_EC_OP_MAX); if (ret) { if (ret == -WD_EAGAIN) @@ -347,7 +347,7 @@ int wd_ecc_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_ecc_setting.config); + ret = wd_alg_init_driver(&wd_ecc_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_join_gather.c b/wd_join_gather.c index 52cd5f9..0199f35 100644 --- a/wd_join_gather.c +++ b/wd_join_gather.c @@ -784,7 +784,7 @@ int wd_join_gather_init(char *alg, __u32 sched_type, int task_type, /* Init ctx param and prepare for ctx request */ join_gather_ctx_params.ctx_set_num = &join_gather_ctx_num; - ret = wd_ctx_param_init_nw(&join_gather_ctx_params, ctx_params, + ret = wd_ctx_param_init(&join_gather_ctx_params, ctx_params, alg, task_type, WD_JOIN_GATHER_TYPE, 1); if (ret) { if (ret == -WD_EAGAIN) { @@ -813,7 +813,7 @@ int wd_join_gather_init(char *alg, __u32 sched_type, int task_type, if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_join_gather_setting.config); + ret = wd_alg_init_driver(&wd_join_gather_setting.config); if (ret) goto out_drv_deconfig; @@ -844,7 +844,7 @@ void wd_join_gather_uninit(void) if (ret) return; - wd_alg_uninit_driver_nw(&wd_join_gather_setting.config); + wd_alg_uninit_driver(&wd_join_gather_setting.config); wd_ctx_drv_deconfig(&wd_join_gather_setting.config); wd_alg_attrs_uninit(&wd_join_gather_init_attrs); diff --git a/wd_rsa.c b/wd_rsa.c index 1104c2a..8606efb 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -225,7 +225,7 @@ int wd_rsa_init(struct wd_ctx_config *config, struct wd_sched *sched) if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_rsa_setting.config); + ret = wd_alg_init_driver(&wd_rsa_setting.config); if (ret) goto out_drv_deconfig; @@ -248,7 +248,7 @@ void wd_rsa_uninit(void) { int ret; - wd_alg_uninit_driver_nw(&wd_rsa_setting.config); + wd_alg_uninit_driver(&wd_rsa_setting.config); wd_ctx_drv_deconfig(&wd_rsa_setting.config); ret = wd_rsa_common_uninit(); if (ret) @@ -290,7 +290,7 @@ int wd_rsa_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para /* Init ctx param and prepare for ctx request */ rsa_ctx_params.ctx_set_num = rsa_ctx_num; - ret = wd_ctx_param_init_nw(&rsa_ctx_params, ctx_params, + ret = wd_ctx_param_init(&rsa_ctx_params, ctx_params, alg, task_type, WD_RSA_TYPE, WD_RSA_GENKEY); if (ret) { if (ret == -WD_EAGAIN) @@ -320,7 +320,7 @@ int wd_rsa_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_rsa_setting.config); + ret = wd_alg_init_driver(&wd_rsa_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_udma.c b/wd_udma.c index d30f870..9db6d87 100644 --- a/wd_udma.c +++ b/wd_udma.c @@ -374,7 +374,7 @@ void wd_udma_uninit(void) if (status == WD_UNINIT) return; - wd_alg_uninit_driver_nw(&wd_udma_setting.config); + wd_alg_uninit_driver(&wd_udma_setting.config); wd_ctx_drv_deconfig(&wd_udma_setting.config); wd_udma_alg_uninit(); @@ -452,7 +452,7 @@ int wd_udma_init(const char *alg, __u32 sched_type, int task_type, /* Init ctx param and prepare for ctx request */ udma_ctx_params.ctx_set_num = udma_ctx_num; - ret = wd_ctx_param_init_nw(&udma_ctx_params, ctx_params, + ret = wd_ctx_param_init(&udma_ctx_params, ctx_params, alg, task_type, WD_UDMA_TYPE, WD_UDMA_OP_MAX); if (ret) { if (ret == -WD_EAGAIN) { @@ -482,7 +482,7 @@ int wd_udma_init(const char *alg, __u32 sched_type, int task_type, if (ret) goto out_uninit_nolock; - ret = wd_alg_init_driver_nw(&wd_udma_setting.config); + ret = wd_alg_init_driver(&wd_udma_setting.config); if (ret) goto out_drv_deconfig; diff --git a/wd_util.c b/wd_util.c index 09c8f9a..c76f39b 100644 --- a/wd_util.c +++ b/wd_util.c @@ -2084,13 +2084,7 @@ static void wd_ctx_uninit_driver(struct wd_ctx_config_internal *config, } } -int wd_alg_init_driver(struct wd_ctx_config_internal *config, - struct wd_alg_driver *driver, void **drv_priv) -{ - return 0; -} - -int wd_alg_init_driver_nw(struct wd_ctx_config_internal *config) +int wd_alg_init_driver(struct wd_ctx_config_internal *config) { __u32 i, j; int ret; @@ -2113,12 +2107,7 @@ init_err: return ret; } -void wd_alg_uninit_driver(struct wd_ctx_config_internal *config, - struct wd_alg_driver *driver, void **drv_priv) -{ -} - -void wd_alg_uninit_driver_nw(struct wd_ctx_config_internal *config) +void wd_alg_uninit_driver(struct wd_ctx_config_internal *config) { __u32 i; @@ -2253,8 +2242,8 @@ void wd_ctx_param_uninit(struct wd_ctx_params *ctx_params) int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_ctx_params *user_ctx_params, - struct wd_alg_driver *driver, - enum wd_type type, int max_op_type) + char *alg, int task_type, enum wd_type type, + int max_op_type) { const char *env_name = wd_env_name[type]; const char *var_s; @@ -2268,9 +2257,9 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, /* Only hw driver support environment variable */ var_s = secure_getenv(env_name); - if (var_s && strlen(var_s) && driver->calc_type == UADK_ALG_HW) { + if (var_s && strlen(var_s) && task_type <= TASK_HW) { /* environment variable has the highest priority */ - ret = wd_env_set_ctx_nums(driver->alg_name, env_name, var_s, + ret = wd_env_set_ctx_nums(alg, env_name, var_s, ctx_params, max_op_type); if (ret) { WD_ERR("fail to init ctx nums from %s!\n", env_name); @@ -2294,83 +2283,17 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, } } - /* user_ctx_params is also not set, use defalut queue_num max_op_type */ + /* user_ctx_params is also not set, use driver's defalut queue_num */ numa_bitmask_setall(ctx_params->bmp); for (i = 0; i < max_op_type; i++) { ctx_params->ctx_set_num[i].sync_ctx_num = max_op_type; ctx_params->ctx_set_num[i].async_ctx_num = max_op_type; } - ctx_params->op_type_num = max_op_type; return 0; } -int wd_ctx_param_init_nw(struct wd_ctx_params *ctx_params, - struct wd_ctx_params *user_ctx_params, - char *alg, int task_type, enum wd_type type, - int max_op_type) -{ - const char *env_name = wd_env_name[type]; - const char *var_s; - int i, ret; - - ctx_params->bmp = numa_allocate_nodemask(); - if (!ctx_params->bmp) { - WD_ERR("fail to allocate nodemask.\n"); - return -WD_ENOMEM; - } - - /* Only hw driver support environment variable */ - var_s = secure_getenv(env_name); - if (var_s && strlen(var_s) && task_type <= TASK_HW) { - /* environment variable has the highest priority */ - ret = wd_env_set_ctx_nums(alg, env_name, var_s, - ctx_params, max_op_type); - if (ret) { - WD_ERR("fail to init ctx nums from %s!\n", env_name); - numa_free_nodemask(ctx_params->bmp); - return ret; - } - } else { - /* environment variable is not set, try to use user_ctx_params first */ - if (user_ctx_params) { - if (user_ctx_params->bmp) { - copy_bitmask_to_bitmask(user_ctx_params->bmp, ctx_params->bmp); - } else { - /* default value */ - numa_bitmask_setall(ctx_params->bmp); - } - ctx_params->cap = user_ctx_params->cap; - 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 > (__u32)max_op_type) { - WD_ERR("fail to check user op type numbers.\n"); - numa_free_nodemask(ctx_params->bmp); - return -WD_EINVAL; - } - - return 0; - } - - /* user_ctx_params is also not set, use driver's defalut queue_num */ - numa_bitmask_setall(ctx_params->bmp); - 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->op_type_num = driver->op_type_num; - if (ctx_params->op_type_num > (__u32)max_op_type) { - WD_ERR("fail to check driver op type numbers.\n"); - numa_free_nodemask(ctx_params->bmp); - return -WD_EAGAIN; - } - - return 0; -} - static void dladdr_empty(void) { } -- 2.43.0