- Acc - mailweb.openeuler.org

[PATCH] rsa: modify the default algorithm of keygen soft algorithm
by Zhiqi Song 26 Jul '22

26 Jul '22

From: Weili Qian <qianweili(a)huawei.com> When the hardware algorithm execution fails, the engine needs to switch to the soft algorithm execution, and the callback needs to be modified to the soft algorithm to prevent it from being re-transferred to the hardware interface. Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- src/uadk_rsa.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/uadk_rsa.c b/src/uadk_rsa.c index 821cb78..2f78a37 100644 --- a/src/uadk_rsa.c +++ b/src/uadk_rsa.c @@ -141,6 +141,8 @@ enum { MAX_CODE, }; +static int uadk_e_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); + static int rsa_check_bit_useful(const int bits, int flen) { if (flen > bits) @@ -1111,10 +1113,19 @@ err: static int uadk_e_soft_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) { + const RSA_METHOD *default_meth = RSA_PKCS1_OpenSSL(); int ret; + if (!default_meth) { + fprintf(stderr, "failed to get soft method.\n"); + return UADK_E_FAIL; + } + UNUSED(cb); + (void)RSA_meth_set_keygen(rsa_hw_meth, + RSA_meth_get_keygen(default_meth)); ret = RSA_generate_key_ex(rsa, bits, e, NULL); + (void)RSA_meth_set_keygen(rsa_hw_meth, uadk_e_rsa_keygen); return ret; } -- 2.30.0

1 0

[PATCH] engine: fix function type
by Zhiqi Song 26 Jul '22

26 Jul '22

From: Weili Qian <qianweili(a)huawei.com> If return type of the function 'async_module_init' is void, when function executes failed, the app continues to execute tasks. The process will be abnormal. Change 'async_module_init' type to int. If function executes failed, 0 is returned. Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- src/e_uadk.c | 16 +++++++++++++--- src/uadk_async.c | 9 +++++---- src/uadk_async.h | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/e_uadk.c b/src/e_uadk.c index 74dab39..ac4d738 100644 --- a/src/e_uadk.c +++ b/src/e_uadk.c @@ -238,8 +238,14 @@ static int uadk_init(ENGINE *e) return 1; } - if (uadk_cipher || uadk_digest || uadk_rsa || uadk_dh || uadk_ecc) - async_module_init(); + if (uadk_cipher || uadk_digest || uadk_rsa || uadk_dh || uadk_ecc) { + ret = async_module_init(); + if (!ret) { + pthread_mutex_unlock(&uadk_engine_mutex); + fprintf(stderr, "failed to init async module!\n"); + return 0; + } + } if (uadk_digest) uadk_e_digest_lock_init(); @@ -265,7 +271,11 @@ static int uadk_finish(ENGINE *e) static void engine_init_child_at_fork_handler(void) { - async_module_init(); + int ret; + + ret = async_module_init(); + if (!ret) + fprintf(stderr, "failed to init child async module!\n"); } #ifdef KAE diff --git a/src/uadk_async.c b/src/uadk_async.c index c98153b..e4eff43 100644 --- a/src/uadk_async.c +++ b/src/uadk_async.c @@ -335,7 +335,7 @@ static void *async_poll_process_func(void *args) return NULL; } -void async_module_init(void) +int async_module_init(void) { pthread_t thread_id; pthread_attr_t thread_attr; @@ -343,11 +343,11 @@ void async_module_init(void) memset(&poll_queue, 0, sizeof(struct async_poll_queue)); if (pthread_mutex_init(&(poll_queue.async_task_mutex), NULL) < 0) - return; + return 0; poll_queue.head = malloc(sizeof(struct async_poll_task) * ASYNC_QUEUE_TASK_NUM); if (poll_queue.head == NULL) - return; + return 0; memset(poll_queue.head, 0, sizeof(struct async_poll_task) * ASYNC_QUEUE_TASK_NUM); @@ -367,8 +367,9 @@ void async_module_init(void) poll_queue.thread_id = thread_id; OPENSSL_atexit(async_poll_task_free); - return; + return 1; err: async_poll_task_free(); + return 0; } diff --git a/src/uadk_async.h b/src/uadk_async.h index 9836dbb..97b7d15 100644 --- a/src/uadk_async.h +++ b/src/uadk_async.h @@ -68,7 +68,7 @@ extern int async_setup_async_event_notification(struct async_op *op); extern int async_clear_async_event_notification(void); extern int async_pause_job(void *ctx, struct async_op *op, enum task_type type, int id); extern void async_register_poll_fn(int type, async_recv_t func); -extern void async_module_init(void); +extern int async_module_init(void); extern int async_wake_job(ASYNC_JOB *job); extern void async_free_poll_task(int id, bool is_cb); extern int async_get_free_task(int *id); -- 2.30.0

1 0

[PATCH] engine: initialize resources only once
by Zhiqi Song 26 Jul '22

26 Jul '22

From: Weili Qian <qianweili(a)huawei.com> If multiple threads load the engine repeatedly, the poll_queue and global locks in the algorithm API are repeatedly initialized. As a result, tasks of other threads are abnormal. Therefore, this patch moves resource initialization to the function 'uadk_init' and only initialize once. Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- src/e_uadk.c | 37 +++++++++++++++++++++++++++++++++---- src/uadk.h | 5 +++++ src/uadk_cipher.c | 7 +++++-- src/uadk_dh.c | 7 +++++-- src/uadk_digest.c | 7 +++++-- src/uadk_pkey.c | 7 +++++-- src/uadk_rsa.c | 6 ++++-- 7 files changed, 62 insertions(+), 14 deletions(-) diff --git a/src/e_uadk.c b/src/e_uadk.c index e02b563..74dab39 100644 --- a/src/e_uadk.c +++ b/src/e_uadk.c @@ -42,6 +42,8 @@ static int uadk_digest; static int uadk_rsa; static int uadk_dh; static int uadk_ecc; +static int uadk_inited; +static pthread_mutex_t uadk_engine_mutex = PTHREAD_MUTEX_INITIALIZER; #ifdef KAE static int uadk_cipher_nosva; @@ -218,12 +220,41 @@ static int uadk_destroy(ENGINE *e) uadk_e_destroy_ecc(); if (uadk_dh) uadk_e_destroy_dh(); + + pthread_mutex_lock(&uadk_engine_mutex); + uadk_inited = 0; + pthread_mutex_unlock(&uadk_engine_mutex); + return 1; } - static int uadk_init(ENGINE *e) { + int ret; + + pthread_mutex_lock(&uadk_engine_mutex); + if (uadk_inited) { + pthread_mutex_unlock(&uadk_engine_mutex); + return 1; + } + + if (uadk_cipher || uadk_digest || uadk_rsa || uadk_dh || uadk_ecc) + async_module_init(); + + if (uadk_digest) + uadk_e_digest_lock_init(); + if (uadk_cipher) + uadk_e_cipher_lock_init(); + if (uadk_rsa) + uadk_e_rsa_lock_init(); + if (uadk_dh) + uadk_e_dh_lock_init(); + if (uadk_ecc) + uadk_e_ecc_lock_init(); + + uadk_inited = 1; + pthread_mutex_unlock(&uadk_engine_mutex); + return 1; } @@ -360,10 +391,8 @@ static int bind_fn(ENGINE *e, const char *id) #endif bind_fn_uadk_alg(e); - if (uadk_cipher || uadk_digest || uadk_rsa || uadk_dh || uadk_ecc) { - async_module_init(); + if (uadk_cipher || uadk_digest || uadk_rsa || uadk_dh || uadk_ecc) pthread_atfork(NULL, NULL, engine_init_child_at_fork_handler); - } ret = ENGINE_set_ctrl_function(e, uadk_engine_ctrl); if (ret != 1) { diff --git a/src/uadk.h b/src/uadk.h index 384e035..d210c3d 100644 --- a/src/uadk.h +++ b/src/uadk.h @@ -42,4 +42,9 @@ extern int uadk_e_bind_ecc(ENGINE *e); extern void uadk_e_destroy_ecc(void); extern int uadk_e_is_env_enabled(const char *alg_name); extern int uadk_e_set_env(const char *var_name, int numa_id); +extern void uadk_e_ecc_lock_init(void); +extern void uadk_e_rsa_lock_init(void); +extern void uadk_e_dh_lock_init(void); +extern void uadk_e_cipher_lock_init(void); +extern void uadk_e_digest_lock_init(void); #endif diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index 569ee6e..0b99753 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -1066,8 +1066,6 @@ int uadk_e_bind_cipher(ENGINE *e) if (platform > KUNPENG920) bind_v3_cipher(); - pthread_spin_init(&engine.lock, PTHREAD_PROCESS_PRIVATE); - return ENGINE_set_ciphers(e, uadk_e_engine_ciphers); } @@ -1150,3 +1148,8 @@ void uadk_e_destroy_cipher(void) if (platform > KUNPENG920) destroy_v3_cipher(); } + +void uadk_e_cipher_lock_init(void) +{ + pthread_spin_init(&engine.lock, PTHREAD_PROCESS_PRIVATE); +} diff --git a/src/uadk_dh.c b/src/uadk_dh.c index 40fb583..75c9e5a 100644 --- a/src/uadk_dh.c +++ b/src/uadk_dh.c @@ -896,8 +896,6 @@ static void uadk_e_delete_dh_meth(void) int uadk_e_bind_dh(ENGINE *e) { - pthread_spin_init(&g_dh_res.lock, PTHREAD_PROCESS_PRIVATE); - return ENGINE_set_DH(e, uadk_e_get_dh_methods()); } @@ -907,3 +905,8 @@ void uadk_e_destroy_dh(void) uadk_e_delete_dh_meth(); uadk_e_wd_dh_uninit(); } + +void uadk_e_dh_lock_init(void) +{ + pthread_spin_init(&g_dh_res.lock, PTHREAD_PROCESS_PRIVATE); +} diff --git a/src/uadk_digest.c b/src/uadk_digest.c index 330a1c2..70f51d3 100644 --- a/src/uadk_digest.c +++ b/src/uadk_digest.c @@ -793,6 +793,11 @@ do { \ return 0; \ } while (0) +void uadk_e_digest_lock_init(void) +{ + pthread_spin_init(&engine.lock, PTHREAD_PROCESS_PRIVATE); +} + int uadk_e_bind_digest(ENGINE *e) { UADK_DIGEST_DESCR(md5, md5WithRSAEncryption, MD5_DIGEST_LENGTH, @@ -838,8 +843,6 @@ int uadk_e_bind_digest(ENGINE *e) uadk_e_digest_final, uadk_e_digest_cleanup, uadk_e_digest_copy); - pthread_spin_init(&engine.lock, PTHREAD_PROCESS_PRIVATE); - return ENGINE_set_digests(e, uadk_engine_digests); } diff --git a/src/uadk_pkey.c b/src/uadk_pkey.c index f27e2f5..5300327 100644 --- a/src/uadk_pkey.c +++ b/src/uadk_pkey.c @@ -618,6 +618,11 @@ static int uadk_ecc_bind_pmeth(ENGINE *e) return ENGINE_set_pkey_meths(e, get_pkey_meths); } +void uadk_e_ecc_lock_init(void) +{ + pthread_spin_init(&ecc_res.lock, PTHREAD_PROCESS_PRIVATE); +} + int uadk_e_bind_ecc(ENGINE *e) { int ret; @@ -634,8 +639,6 @@ int uadk_e_bind_ecc(ENGINE *e) return ret; } - pthread_spin_init(&ecc_res.lock, PTHREAD_PROCESS_PRIVATE); - return ret; } diff --git a/src/uadk_rsa.c b/src/uadk_rsa.c index 2f78a37..1579539 100644 --- a/src/uadk_rsa.c +++ b/src/uadk_rsa.c @@ -1832,8 +1832,6 @@ static void uadk_e_delete_rsa_meth(void) */ int uadk_e_bind_rsa(ENGINE *e) { - pthread_spin_init(&g_rsa_res.lock, PTHREAD_PROCESS_PRIVATE); - return ENGINE_set_RSA(e, uadk_e_get_rsa_methods()); } @@ -1844,3 +1842,7 @@ void uadk_e_destroy_rsa(void) uadk_e_rsa_uninit(); } +void uadk_e_rsa_lock_init(void) +{ + pthread_spin_init(&g_rsa_res.lock, PTHREAD_PROCESS_PRIVATE); +} -- 2.30.0

1 0

openEuler 22.09 Alpha版本release公告
by chenyaqiang 25 Jul '22

25 Jul '22

Dear all， openEuler 22.09创新版本Alpha版本在经过社区各SIG组协作开发，CI/CD SIG规模构建，及QA SIG Alpha版本质量评估，满足alpha版本发布质量标准，现正式发布该alpha版本，社区各SIG组及所有爱好者均可以下载并试用alpha ，Alpha 版本包含 openEuler 22.09 版本的几乎全量组件（少量持续编译/构建失败包清单详见邮件正文编译构建章节），版本测试能力/策略由 openEuler QA SIG团队指导，社区各个SIG组自主开展组件自验证，社区一起协作支撑openEuler 22.09创新版本issue发现和定位修复，您发现和定位修复每一个issue不仅可以解决您使用openEuler创新版本的问题点，更可以支撑社区一起持续优化提升百万级openEuler用户的体验！ Alpha版本作为beta版本的前置自验证版本，经过社区联合协作自验证和issue修复后，下一个版本里程碑点（预计在2022/08/01）将会提供 Beta 版本。 openEuler 22.09版本release plan公示链接： https://gitee.com/openeuler/release-management/blob/master/openEuler-22.09/… openEuler 22.09 Alpha版本下载链接： http://121.36.84.172/dailybuild/openEuler-22.09/openeuler-2022-07-25-10-43-… openEuler 22.09 Alpha版本发布质量评估规范公示链接： https://gitee.com/openeuler/QA/blob/master/Test_Checklist/%E7%A4%BE%E5%8C%B… openEuler 22.09 Alpha版本自验证进展与质量结果同步方式：建议各sig组及社区用户均可以在QA-sig下以ISSUE方式同步自验证进展和自验证结果，您的自验证结果将是Alpha版本质量评估的充分信息依据；社区QA 版本测试提单规范 https://gitee.com/openeuler/QA/blob/839f952696f271f83c018ccf3218cf493b92d65… 社区QA 测试平台 radiates https://radiatest.openeuler.org<https://radiatest.openeuler.org/> openEuler 22.09 Alpha版本已知待修复单包构建失败问题清单：里程碑地址：https://e.gitee.com/open_euler/milestones/170898/issues/table 里程碑任务ID 任务标题任务状态关联仓库 Sig openEuler-22.09-Dailybuild I5HVUZ ima-evm-utils build problem in openEuler:22.09 待办的 ima-evm-utils Base-service openEuler-22.09-Dailybuild I5HVVF mysql5 build problem in openEuler:22.09 待办的 mysql5 DB openEuler-22.09-Dailybuild I5HZVX folks build problem in openEuler:22.09 待办的 folks GNOME openEuler-22.09-Dailybuild I5HZW3 subunit build problem in openEuler:22.09 待办的 subunit Programming-language openEuler-22.09-Dailybuild I5I1ZZ ceph build problem in openEuler:22.09 待办的 ceph sig-SDS openEuler-22.09-Dailybuild I5I6MO libgit2 build problem in openEuler:22.09 待办的 libgit2 Base-service openEuler-22.09-Dailybuild I5IH5G gpgme build problem in openEuler:22.09 待办的 gpgme Base-service openEuler-22.09-Dailybuild I5IH69 iotop build problem in openEuler:22.09 待办的 iotop Storage openEuler-22.09-Dailybuild I5IH6M libpwquality build problem in openEuler:22.09 待办的 libpwquality sig-security-facility openEuler-22.09-Dailybuild I5IH6T nftables build problem in openEuler:22.09 待办的 nftables Networking openEuler-22.09-Dailybuild I5ILK7 bamf build problem in openEuler:22.09:Epol 待办的 bamf sig-UKUI openEuler-22.09-Dailybuild I5ILK8 vdsm-jsonrpc-java build problem in openEuler:22.09:Epol 待办的 vdsm-jsonrpc-java oVirt openEuler-22.09-Dailybuild I5ILKA python-crypto build problem in openEuler:22.09 待办的 python-crypto Base-service openEuler-22.09-Dailybuild I5ILKE sssd build problem in openEuler:22.09 待办的 sssd Base-service openEuler-22.09-Dailybuild I5IQZF highlight build problem in openEuler:22.09:Epol 待办的 highlight oVirt openEuler 22.09 Alpha版本已知待修复单包安装失败软件包清单：安装校验项架构 jenkins任务地址 ISO二进制范围 x86_64 https://openeulerjenkins.osinfra.cn/job/openEuler-OS-build/job/check_rpm_in… Epol二进制范围 x86_64 https://openeulerjenkins.osinfra.cn/job/openEuler-OS-build/job/check_rpm_in… ISO二进制范围 aarch64 https://openeulerjenkins.osinfra.cn/job/openEuler-OS-build/job/check_rpm_in… Epol二进制范围 aarch64 https://openeulerjenkins.osinfra.cn/job/openEuler-OS-build/job/check_rpm_in… 二进制包名源码包名 Sig python3-jupyter python-jupyter #N/A python3-nni python-nni A-Tune setroubleshoot-plugins setroubleshoot-plugins Base-service backupninja backupninja Application blueman blueman sig-UKUI cinnamon cinnamon sig-cinnamon cinnamon-devel-doc cinnamon sig-cinnamon claws-mail-plugins claws-mail sig-UKUI claws-mail-plugins-bsfilter claws-mail sig-UKUI claws-mail-plugins-bogofilter claws-mail sig-UKUI cockpit-ovirt-dashboard cockpit-ovirt oVirt ovirt-hosted-engine-setup ovirt-hosted-engine-setup oVirt ovirt-host ovirt-host oVirt dde dde sig-DDE dde-control-center dde-control-center sig-DDE startdde startdde sig-DDE dde-daemon dde-daemon sig-DDE dde-session-ui dde-session-ui sig-DDE dde-desktop dde-file-manager sig-DDE dde-launcher dde-launcher sig-DDE dde-file-manager dde-file-manager sig-DDE libdde-file-manager dde-file-manager sig-DDE dde-disk-mount-plugin dde-file-manager sig-DDE dde-file-manager-devel dde-file-manager sig-DDE dde-launcher-devel dde-launcher sig-DDE deepin-compressor deepin-compressor sig-DDE deepin-font-manager deepin-font-manager sig-DDE libdeepin-font-manager deepin-font-manager sig-DDE deepin-screen-recorder deepin-screen-recorder sig-DDE kwin kwin sig-KDE kwin-common kwin sig-KDE kwin-devel kwin sig-KDE kwin-doc kwin sig-KDE kwin-wayland kwin sig-KDE kwin-x11 kwin sig-KDE lastpass-cli lastpass-cli Application openstack-dashboard openstack-dashboard #N/A python3-horizon openstack-dashboard #N/A ovirt-engine ovirt-engine oVirt ovirt-engine-setup-plugin-ovirt-engine ovirt-engine oVirt ovirt-provider-ovn ovirt-provider-ovn oVirt ovirt-engine-backend ovirt-engine oVirt ovirt-engine-dbscripts ovirt-engine oVirt ovirt-engine-dwh ovirt-engine-dwh oVirt ovirt-engine-dwh-grafana-integration-setup ovirt-engine-dwh oVirt ovirt-engine-dwh-setup ovirt-engine-dwh oVirt ovirt-engine-restapi ovirt-engine oVirt ovirt-engine-setup ovirt-engine oVirt ovirt-engine-setup-plugin-cinderlib ovirt-engine oVirt ovirt-engine-setup-plugin-imageio ovirt-engine oVirt ovirt-engine-setup-plugin-vmconsole-proxy-helper ovirt-engine oVirt ovirt-engine-tools ovirt-engine oVirt ovirt-engine-webadmin-portal ovirt-engine oVirt ovirt-engine-ui-extensions ovirt-engine-ui-extensions oVirt ovirt-engine-vmconsole-proxy-helper ovirt-engine oVirt ovirt-provider-ovn-driver ovirt-provider-ovn oVirt python3-graphviz python-graphviz sig-python-modules python3-ironic-ui python-ironic-ui sig-openstack python3-mitmproxy python-mitmproxy sig-python-modules python3-muranoclient python-muranoclient sig-openstack python3-neutron-tempest-plugin python-neutron-tempest-plugin sig-openstack python3-os-xenapi-tests python-os-xenapi sig-openstack python3-pep517 python-pep517 sig-python-modules python3-pip-api python-pip-api sig-openstack python3-requirementslib python-requirementslib sig-openstack python3-senlinclient python-senlinclient sig-openstack python3-trove-tempest-plugin python-trove-tempest-plugin sig-openstack ukui ukui-desktop-environment sig-UKUI ukui-desktop-environment ukui-desktop-environment sig-UKUI ukui-desktop-environment-core ukui-desktop-environment sig-UKUI kylin-music kylin-music sig-UKUI ------ BR 陈亚强（openEuler release management sig）

1 0

[PATCH 00/10] uadk - support dump BD when BD checks fail
by Weili Qian 23 Jul '22

23 Jul '22

1. dump BD when BD checks fail. 2. some cleanups. Kai Ye (2): uadk: add wd_<alg>_get_msg() drv/hpre: support dump BD when BD checks fail Weili Qian (8): drv/hpre: remove repeatedly included header file drv/hpre: add hpre_result_check() drv/hpre: move format check to is_hpre_bin_fmt() drv/hpre: change the parameter type drv/hpre: remove redundant blank line drv/qm: add unlikely() for branch prefetch drv/qm: remove redundant add 1 drv/qm: remove useless parameter 'sq_head_index' drv/hisi_hpre.c | 187 +++++++++++++++++++++++++-------------- drv/hisi_qm_udrv.c | 17 ++-- include/drv/wd_dh_drv.h | 1 + include/drv/wd_ecc_drv.h | 1 + include/drv/wd_rsa_drv.h | 3 + include/hisi_qm_udrv.h | 1 - wd_dh.c | 5 ++ wd_ecc.c | 5 ++ wd_rsa.c | 5 ++ 9 files changed, 149 insertions(+), 76 deletions(-) -- 2.33.0

1 10

[PATCH 0/5] *** uadk_engine cleanup ***
by Zhiqi Song 22 Jul '22

22 Jul '22

Cleanup aboout uadk_engine. Zhiqi Song (5): uadk_engine: remove redundant extern uadk_engine: add timeout protection mechanism in poll rsa: cleanup redundant BN operation rsa: bugfix memory leak in genkey process rsa: remove unused software method src/e_uadk.c | 3 +- src/uadk.h | 34 ++++---- src/uadk_async.h | 16 ++-- src/uadk_cipher.c | 13 +-- src/uadk_dh.c | 11 ++- src/uadk_digest.c | 11 ++- src/uadk_pkey.c | 13 +-- src/uadk_rsa.c | 209 ++++++++++++++++++---------------------------- 8 files changed, 138 insertions(+), 172 deletions(-) -- 2.30.0

1 5

[PATCH 0/5] *** uadk_engine bugfix ***
by Zhiqi Song 22 Jul '22

22 Jul '22

Bugfix about ecc alg of uadk_engine. Zhiqi Song (5): ecc: bugfix about magic number ecc: bugfix about variable declaration scope ecc: bugfix about return value check ecc: cleanup unused structure ecc: bugfix multiple definition of ecx structure src/uadk_ec.c | 181 +++++++++++++++++++++++++++++++----------------- src/uadk_ecx.c | 43 ++++++------ src/uadk_pkey.c | 9 --- src/uadk_sm2.c | 21 ++---- 4 files changed, 148 insertions(+), 106 deletions(-) -- 2.30.0

1 5

UADK周例会
by openEuler conference 19 Jul '22

19 Jul '22

您好！ sig-AccLib SIG 邀请您参加 2022-07-20 11:00 召开的Zoom会议会议主题：UADK周例会会议内容： zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论会议链接：https://us06web.zoom.us/j/89055215704?pwd=NkR6SE1HVGpXMHI5MEZoUGJvbUlsQT09 会议纪要：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-07-20 11:00, The subject of the conference is UADK周例会, Summary: zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论 You can join the meeting at https://us06web.zoom.us/j/89055215704?pwd=NkR6SE1HVGpXMHI5MEZoUGJvbUlsQT09. 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 1/6] uadk_tool: Update some new test features
by Longfang Liu 18 Jul '22

18 Jul '22

1. Modify part of the repeated code macro. 2. Add new random number generation method. 3. Add new test parameters, support test algorithm query and address pre-step function. Signed-off-by: Longfang Liu <liulongfang(a)huawei.com> --- uadk_tool/benchmark/sec_soft_benchmark.c | 7 +- uadk_tool/benchmark/sec_soft_benchmark.h | 1 - uadk_tool/benchmark/sec_uadk_benchmark.c | 65 ++++---- uadk_tool/benchmark/sec_wd_benchmark.c | 192 +++++++---------------- uadk_tool/benchmark/uadk_benchmark.c | 115 ++++++++------ uadk_tool/benchmark/uadk_benchmark.h | 20 ++- 6 files changed, 167 insertions(+), 233 deletions(-) diff --git a/uadk_tool/benchmark/sec_soft_benchmark.c b/uadk_tool/benchmark/sec_soft_benchmark.c index 2f6bccb..a622329 100644 --- a/uadk_tool/benchmark/sec_soft_benchmark.c +++ b/uadk_tool/benchmark/sec_soft_benchmark.c @@ -56,11 +56,8 @@ typedef struct soft_jobs_res { u32 use_engine; } jobs_data; -#define MAX_POOL_LENTH 4096 #define MAX_IVK_LENTH 64 #define DEF_IVK_DATA 0xAA -#define MAX_TRY_CNT 5000 -#define SEND_USLEEP 100 static unsigned int g_thread_num; static unsigned int g_ctxnum; @@ -613,7 +610,7 @@ static void *sec_soft_async_run(void *arg) exit_pause: ASYNC_WAIT_CTX_free(waitctx); - add_recv_data(count); + add_recv_data(count, g_pktlen); return NULL; } @@ -802,7 +799,7 @@ static void *sec_soft_sync_run(void *arg) break; } - add_recv_data(count); + add_recv_data(count, g_pktlen); return NULL; } diff --git a/uadk_tool/benchmark/sec_soft_benchmark.h b/uadk_tool/benchmark/sec_soft_benchmark.h index 8331eb5..c1374d6 100644 --- a/uadk_tool/benchmark/sec_soft_benchmark.h +++ b/uadk_tool/benchmark/sec_soft_benchmark.h @@ -4,6 +4,5 @@ #include "uadk_benchmark.h" - extern int sec_soft_benchmark(struct acc_option *options); #endif /* SEC_SOFT_BENCHMARK_H */ diff --git a/uadk_tool/benchmark/sec_uadk_benchmark.c b/uadk_tool/benchmark/sec_uadk_benchmark.c index 6eeee12..09cd8f4 100644 --- a/uadk_tool/benchmark/sec_uadk_benchmark.c +++ b/uadk_tool/benchmark/sec_uadk_benchmark.c @@ -10,6 +10,8 @@ #include "include/wd_sched.h" #define SEC_TST_PRT printf +#define MAX_IVK_LENTH 64 +#define DEF_IVK_DATA 0xAA struct uadk_bd { u8 *src; @@ -37,18 +39,12 @@ typedef struct uadk_thread_res { u32 td_id; } thread_data; -#define MAX_POOL_LENTH 4096 -#define MAX_IVK_LENTH 64 -#define DEF_IVK_DATA 0xAA -#define MAX_TRY_CNT 5000 -#define SEND_USLEEP 100 - static struct wd_ctx_config g_ctx_cfg; static struct wd_sched *g_sched; static unsigned int g_thread_num; static unsigned int g_ctxnum; +static unsigned int g_prefetch; static unsigned int g_pktlen; -static struct sched_params g_param; static void *cipher_async_cb(struct wd_cipher_req *req, void *data) { @@ -349,6 +345,7 @@ static int sec_uadk_param_parse(thread_data *tddata, struct acc_option *options) static int init_ctx_config(char *alg, int subtype, int mode) { struct uacce_dev_list *list; + struct sched_params param; int i, max_node; int ret = 0; @@ -385,7 +382,7 @@ static int init_ctx_config(char *alg, int subtype, int mode) break; default: SEC_TST_PRT("Fail to parse alg subtype!\n"); - return -EINVAL; + goto out; } if (!g_sched) { SEC_TST_PRT("Fail to alloc sched!\n"); @@ -397,12 +394,12 @@ static int init_ctx_config(char *alg, int subtype, int mode) list->dev->numa_id = 0; g_sched->name = SCHED_SINGLE; - g_param.numa_id = list->dev->numa_id; - g_param.type = 0; - g_param.mode = mode; - g_param.begin = 0; - g_param.end = g_ctxnum - 1; - ret = wd_sched_rr_instance(g_sched, &g_param); + param.numa_id = list->dev->numa_id; + param.type = 0; + param.mode = mode; + param.begin = 0; + param.end = g_ctxnum - 1; + ret = wd_sched_rr_instance(g_sched, &param); if (ret) { SEC_TST_PRT("Fail to fill sched data!\n"); goto out; @@ -419,6 +416,8 @@ static int init_ctx_config(char *alg, int subtype, int mode) case DIGEST_TYPE: ret = wd_digest_init(&g_ctx_cfg, g_sched); break; + default: + goto out; } if (ret) { SEC_TST_PRT("Fail to cipher ctx!\n"); @@ -461,18 +460,13 @@ static void uninit_ctx_config(int subtype) wd_sched_rr_release(g_sched); } -int init_uadk_bd_pool(void) +static int init_uadk_bd_pool(void) { unsigned long step; - int fill_size; int i, j; // make the block not align to 4K step = sizeof(char) * g_pktlen * 2; - if (g_pktlen > MAX_IVK_LENTH) - fill_size = MAX_IVK_LENTH; - else - fill_size = g_pktlen; g_uadk_pool.iv = malloc(g_thread_num * MAX_IVK_LENTH * sizeof(char)); g_uadk_pool.key = malloc(g_thread_num * MAX_IVK_LENTH * sizeof(char)); @@ -498,7 +492,9 @@ int init_uadk_bd_pool(void) if (!g_uadk_pool.pool[i].bds[j].dst) goto malloc_error3; - get_rand_data(g_uadk_pool.pool[i].bds[j].src, fill_size); + get_rand_data(g_uadk_pool.pool[i].bds[j].src, g_pktlen); + if (g_prefetch) + get_rand_data(g_uadk_pool.pool[i].bds[j].dst, g_pktlen); } } } @@ -526,12 +522,13 @@ malloc_error1: free(g_uadk_pool.iv); free(g_uadk_pool.key); + free(g_uadk_pool.mac); SEC_TST_PRT("init uadk bd pool alloc failed!\n"); return -ENOMEM; } -void free_uadk_bd_pool(void) +static void free_uadk_bd_pool(void) { int i, j; @@ -550,21 +547,22 @@ void free_uadk_bd_pool(void) free(g_uadk_pool.iv); free(g_uadk_pool.key); + free(g_uadk_pool.mac); } /*-------------------------------uadk benchmark main code-------------------------------------*/ -void *sec_uadk_poll(void *data) +static void *sec_uadk_poll(void *data) { typedef int (*poll_ctx)(__u32 idx, __u32 expt, __u32 *count); poll_ctx uadk_poll_ctx = NULL; thread_data *pdata = (thread_data *)data; u32 expt = ACC_QUEUE_SIZE * g_thread_num; u32 id = pdata->td_id; - u32 last_time = 2; /* poll need one more recv time */ + u32 last_time = 2; // poll need one more recv time u32 count = 0; u32 recv = 0; - int ret; + int ret; if (id > g_ctxnum) return NULL; @@ -586,7 +584,6 @@ void *sec_uadk_poll(void *data) while (last_time) { ret = uadk_poll_ctx(id, expt, &recv); - // SEC_TST_PRT("expt %u, poll %d recv: %u!\n", expt, i, recv); count += recv; recv = 0; if (unlikely(ret != -WD_EAGAIN && ret < 0)) { @@ -599,7 +596,7 @@ void *sec_uadk_poll(void *data) } recv_error: - add_recv_data(count); + add_recv_data(count, g_pktlen); return NULL; } @@ -636,7 +633,6 @@ static void *sec_uadk_async_run(void *arg) case CIPHER_TYPE: cipher_setup.alg = pdata->alg; cipher_setup.mode = pdata->mode; - cipher_setup.sched_param = (void *)&g_param; h_sess = wd_cipher_alloc_sess(&cipher_setup); if (!h_sess) return NULL; @@ -682,7 +678,6 @@ static void *sec_uadk_async_run(void *arg) case AEAD_TYPE: // just ccm and gcm aead_setup.calg = pdata->alg; aead_setup.cmode = pdata->mode; - aead_setup.sched_param = (void *)&g_param; h_sess = wd_aead_alloc_sess(&aead_setup); if (!h_sess) return NULL; @@ -740,7 +735,6 @@ static void *sec_uadk_async_run(void *arg) case DIGEST_TYPE: digest_setup.alg = pdata->alg; digest_setup.mode = pdata->mode; // digest mode is optype - digest_setup.sched_param = (void *)&g_param; h_sess = wd_digest_alloc_sess(&digest_setup); if (!h_sess) return NULL; @@ -820,7 +814,6 @@ static void *sec_uadk_sync_run(void *arg) case CIPHER_TYPE: cipher_setup.alg = pdata->alg; cipher_setup.mode = pdata->mode; - cipher_setup.sched_param = (void *)&g_param; h_sess = wd_cipher_alloc_sess(&cipher_setup); if (!h_sess) return NULL; @@ -845,7 +838,7 @@ static void *sec_uadk_sync_run(void *arg) creq.src = uadk_pool->bds[i].src; creq.dst = uadk_pool->bds[i].dst; ret = wd_do_cipher_sync(h_sess, &creq); - if (ret || creq.state) + if ((ret < 0 && ret != -WD_EBUSY) || creq.state) break; count++; if (get_run_state() == 0) @@ -856,7 +849,6 @@ static void *sec_uadk_sync_run(void *arg) case AEAD_TYPE: // just ccm and gcm aead_setup.calg = pdata->alg; aead_setup.cmode = pdata->mode; - aead_setup.sched_param = (void *)&g_param; h_sess = wd_aead_alloc_sess(&aead_setup); if (!h_sess) return NULL; @@ -905,7 +897,6 @@ static void *sec_uadk_sync_run(void *arg) case DIGEST_TYPE: digest_setup.alg = pdata->alg; digest_setup.mode = pdata->mode; // digest mode is optype - digest_setup.sched_param = (void *)&g_param; h_sess = wd_digest_alloc_sess(&digest_setup); if (!h_sess) return NULL; @@ -939,7 +930,7 @@ static void *sec_uadk_sync_run(void *arg) break; } - add_recv_data(count); + add_recv_data(count, g_pktlen); return NULL; } @@ -982,7 +973,6 @@ int sec_uadk_sync_threads(struct acc_option *options) sync_error: return ret; - } int sec_uadk_async_threads(struct acc_option *options) @@ -998,10 +988,10 @@ int sec_uadk_async_threads(struct acc_option *options) if (ret) return ret; - /* poll thread */ for (i = 0; i < g_ctxnum; i++) { threads_args[i].subtype = threads_option.subtype; threads_args[i].td_id = i; + /* poll thread */ ret = pthread_create(&pollid[i], NULL, sec_uadk_poll, &threads_args[i]); if (ret) { SEC_TST_PRT("Create poll thread fail!\n"); @@ -1053,6 +1043,7 @@ int sec_uadk_benchmark(struct acc_option *options) g_thread_num = options->threads; g_pktlen = options->pktlen; g_ctxnum = options->ctxnums; + g_prefetch = options->prefetch; if (options->optype > WD_CIPHER_DECRYPTION) { SEC_TST_PRT("SEC optype error: %u\n", options->optype); return -EINVAL; diff --git a/uadk_tool/benchmark/sec_wd_benchmark.c b/uadk_tool/benchmark/sec_wd_benchmark.c index 2e9c55d..d7cfe75 100644 --- a/uadk_tool/benchmark/sec_wd_benchmark.c +++ b/uadk_tool/benchmark/sec_wd_benchmark.c @@ -11,6 +11,9 @@ #include "v1/wd_util.h" #define SEC_TST_PRT printf +#define MAX_IVK_LENTH 64 +#define DEF_IVK_DATA 0xAA +#define SQE_SIZE 128 typedef struct wd_thread_res { u32 subtype; @@ -32,57 +35,31 @@ struct thread_bd_res { struct thread_queue_res { struct thread_bd_res *bd_res; -} g_thread_queue; +}; struct wcrypto_async_tag { void *ctx; - char *out_buf; int thread_id; int cnt; }; -#define MAX_IVK_LENTH 64 -#define DEF_IVK_DATA 0xAA -#define MAX_TRY_CNT 5000 -#define SEND_USLEEP 100 -#define TEST_MAX_THRD 128 -#define SQE_SIZE 128 -#define MAX_BLOCK_NM 4096 - +static struct thread_queue_res g_thread_queue; static unsigned int g_thread_num; -static unsigned int g_ctxnum; static unsigned int g_pktlen; static void *cipher_async_cb(void *message, void *cipher_tag) { - struct wcrypto_async_tag *async_tag = (struct wcrypto_async_tag *)cipher_tag; - struct wcrypto_cipher_msg *req = (struct wcrypto_cipher_msg *)message; - - // no-sva data copy from uadk to user - memcpy(async_tag->out_buf, req->out, g_pktlen); - return NULL; } -static void *aead_async_cb(void *message, void *aead_tag) +static void *aead_async_cb(void *message, void *cipher_tag) { - struct wcrypto_async_tag *async_tag = (struct wcrypto_async_tag *)aead_tag; - struct wcrypto_aead_msg *req = (struct wcrypto_aead_msg *)message; - - // no-sva data copy from uadk to user - memcpy(async_tag->out_buf, req->out, g_pktlen); - return NULL; } static void *digest_async_cb(void *message, void *digest_tag) { - struct wcrypto_async_tag *async_tag = (struct wcrypto_async_tag *)digest_tag; - struct wcrypto_digest_msg *req = (struct wcrypto_digest_msg *)message; - - // no-sva data copy from uadk to user - memcpy(async_tag->out_buf, req->out, 16); - + // struct WCRYPTO_req *req = (struct WCRYPTO_req *)data; return NULL; } @@ -396,9 +373,9 @@ static int init_wd_queue(struct acc_option *options) // use no-sva pbuffer memset(&blksetup, 0, sizeof(blksetup)); blksetup.block_size = g_pktlen + SQE_SIZE; //aead need mac and aad out - blksetup.block_num = MAX_BLOCK_NM * 4; //set pool inv + key + in + out + blksetup.block_num = MAX_BLOCK_NM; //set pool inv + key + in + out blksetup.align_size = SQE_SIZE; - SEC_TST_PRT("create pool memory: %d KB\n", (MAX_BLOCK_NM * blksetup.block_size) >> 10); + // SEC_TST_PRT("create pool memory: %d KB\n", (MAX_BLOCK_NM * blksetup.block_size) >> 10); for (j = 0; j < g_thread_num; j++) { g_thread_queue.bd_res[j].pool = wd_blkpool_create(g_thread_queue.bd_res[j].queue, &blksetup); @@ -411,8 +388,8 @@ static int init_wd_queue(struct acc_option *options) // alloc in pbuffer res for (m = 0; m < g_thread_num; m++) { - g_thread_queue.bd_res[m].in = malloc(MAX_BLOCK_NM * sizeof(void *)); - for (idx = 0; idx < MAX_BLOCK_NM; idx++) { + g_thread_queue.bd_res[m].in = malloc(MAX_POOL_LENTH * sizeof(void *)); + for (idx = 0; idx < MAX_POOL_LENTH; idx++) { g_thread_queue.bd_res[m].in[idx] = wd_alloc_blk(g_thread_queue.bd_res[m].pool); if (!g_thread_queue.bd_res[m].in[idx]) { SEC_TST_PRT("create pool %dth in memory fail!\n", m); @@ -427,8 +404,8 @@ static int init_wd_queue(struct acc_option *options) // alloc out pbuffer res for (n = 0; n < g_thread_num; n++) { - g_thread_queue.bd_res[n].out = malloc(MAX_BLOCK_NM * sizeof(void *)); - for (idx = 0; idx < MAX_BLOCK_NM; idx++) { + g_thread_queue.bd_res[n].out = malloc(MAX_POOL_LENTH * sizeof(void *)); + for (idx = 0; idx < MAX_POOL_LENTH; idx++) { g_thread_queue.bd_res[n].out[idx] = wd_alloc_blk(g_thread_queue.bd_res[n].pool); if (!g_thread_queue.bd_res[n].out[idx]) { SEC_TST_PRT("create pool %dth out memory fail!\n", n); @@ -443,8 +420,8 @@ static int init_wd_queue(struct acc_option *options) // alloc iv pbuffer res for (k = 0; k < g_thread_num; k++) { - g_thread_queue.bd_res[k].iv = malloc(MAX_BLOCK_NM * sizeof(void *)); - for (idx = 0; idx < MAX_BLOCK_NM; idx++) { + g_thread_queue.bd_res[k].iv = malloc(MAX_POOL_LENTH * sizeof(void *)); + for (idx = 0; idx < MAX_POOL_LENTH; idx++) { g_thread_queue.bd_res[k].iv[idx] = wd_alloc_blk(g_thread_queue.bd_res[k].pool); if (!g_thread_queue.bd_res[k].iv[idx]) { SEC_TST_PRT("create pool %dth iv memory fail!\n", k); @@ -462,21 +439,21 @@ static int init_wd_queue(struct acc_option *options) iv_err: for (k--; k >= 0; k--) { - for (idx = 0; idx < MAX_BLOCK_NM; idx++) + for (idx = 0; idx < MAX_POOL_LENTH; idx++) wd_free_blk(g_thread_queue.bd_res[k].pool, g_thread_queue.bd_res[k].iv[idx]); free(g_thread_queue.bd_res[k].iv); } out_err: for (n--; n >= 0; n--) { - for (idx = 0; idx < MAX_BLOCK_NM; idx++) + for (idx = 0; idx < MAX_POOL_LENTH; idx++) wd_free_blk(g_thread_queue.bd_res[n].pool, g_thread_queue.bd_res[n].out[idx]); free(g_thread_queue.bd_res[n].out); } in_err: for (m--; m >= 0; m--) { - for (idx = 0; idx < MAX_BLOCK_NM; idx++) + for (idx = 0; idx < MAX_POOL_LENTH; idx++) wd_free_blk(g_thread_queue.bd_res[m].pool, g_thread_queue.bd_res[m].in[idx]); free(g_thread_queue.bd_res[m].in); @@ -498,7 +475,7 @@ static void uninit_wd_queue(void) int i, j, idx; for (i = 0; i < g_thread_num; i++) { - for (idx = 0; idx < MAX_BLOCK_NM; idx++) { + for (idx = 0; idx < MAX_POOL_LENTH; idx++) { wd_free_blk(g_thread_queue.bd_res[i].pool, g_thread_queue.bd_res[i].iv[idx]); wd_free_blk(g_thread_queue.bd_res[i].pool, g_thread_queue.bd_res[i].in[idx]); wd_free_blk(g_thread_queue.bd_res[i].pool, g_thread_queue.bd_res[i].out[idx]); @@ -522,22 +499,22 @@ void *sec_wd_poll(void *data) { typedef int (*poll_ctx)(struct wd_queue *q, unsigned int num); thread_data *pdata = (thread_data *)data; - poll_ctx uadk_poll_ctx = NULL; + poll_ctx wd_poll_ctx = NULL; u32 expt = ACC_QUEUE_SIZE * g_thread_num; - u32 last_time = 2; /* poll need one more recv time */ + u32 last_time = 2; // poll need one more recv time u32 id = pdata->td_id; u32 count = 0; - u32 recv = 0; + int recv = 0; switch(pdata->subtype) { case CIPHER_TYPE: - uadk_poll_ctx = wcrypto_cipher_poll; + wd_poll_ctx = wcrypto_cipher_poll; break; case AEAD_TYPE: - uadk_poll_ctx = wcrypto_aead_poll; + wd_poll_ctx = wcrypto_aead_poll; break; case DIGEST_TYPE: - uadk_poll_ctx = wcrypto_digest_poll; + wd_poll_ctx = wcrypto_digest_poll; break; default: SEC_TST_PRT("<<<<<<async poll interface is NULL!\n"); @@ -548,7 +525,7 @@ void *sec_wd_poll(void *data) return NULL; while (last_time) { - recv = uadk_poll_ctx(g_thread_queue.bd_res[id].queue, expt); + recv = wd_poll_ctx(g_thread_queue.bd_res[id].queue, expt); /* * warpdrive async mode poll easy to 100% with small package. * SEC_TST_PRT("warpdrive poll %d recv: %u!\n", i, recv); @@ -565,7 +542,7 @@ void *sec_wd_poll(void *data) } recv_error: - add_recv_data(count); + add_recv_data(count, g_pktlen); return NULL; } @@ -582,8 +559,6 @@ static void *sec_wd_async_run(void *arg) struct wcrypto_async_tag *tag = NULL; char priv_key[MAX_IVK_LENTH]; struct thread_bd_res *bd_res; - char *src_data_buf = NULL; - char *out_data_buf = NULL; struct wd_queue *queue; void *ctx = NULL; void **res_in; @@ -605,27 +580,13 @@ static void *sec_wd_async_run(void *arg) res_out = bd_res->out; res_iv = bd_res->iv; - /* create user data buffer */ - src_data_buf = malloc(g_pktlen * sizeof(char)); - if (!src_data_buf) - return NULL; - - get_rand_data((u8 *)src_data_buf, g_pktlen); - out_data_buf = malloc(g_pktlen * sizeof(char)); - if (!out_data_buf) { - free(src_data_buf); - return NULL; - } - memset(priv_key, DEF_IVK_DATA, MAX_IVK_LENTH); tag = malloc(sizeof(struct wcrypto_async_tag)); // set the user tag if (!tag) { SEC_TST_PRT("wcrypto async alloc tag fail!\n"); - free(src_data_buf); - free(out_data_buf); return NULL; } - tag->out_buf = out_data_buf; + tag->thread_id = pdata->td_id; switch(pdata->subtype) { case CIPHER_TYPE: @@ -642,7 +603,7 @@ static void *sec_wd_async_run(void *arg) ctx = wcrypto_create_cipher_ctx(queue, &cipher_setup); if (!ctx) { SEC_TST_PRT("wd create cipher ctx fail!\n"); - goto async_err; + return NULL; } tag->ctx = ctx; @@ -650,7 +611,7 @@ static void *sec_wd_async_run(void *arg) if (ret) { SEC_TST_PRT("wd cipher set key fail!\n"); wcrypto_del_cipher_ctx(ctx); - goto async_err; + return NULL; } if (queue->capa.priv.direction == 0) @@ -672,9 +633,6 @@ static void *sec_wd_async_run(void *arg) if (get_run_state() == 0) break; - // no-sva data copy to uadk - memcpy(copdata.in, src_data_buf, g_pktlen); - ret = wcrypto_do_cipher(ctx, &copdata, (void *)tag); if (ret == -WD_EBUSY) { usleep(SEND_USLEEP * try_cnt); @@ -687,7 +645,7 @@ static void *sec_wd_async_run(void *arg) } count++; - i = count % MAX_BLOCK_NM; + i = count % MAX_POOL_LENTH; tag->cnt = i; try_cnt = 0; copdata.in = res_in[i]; @@ -710,7 +668,7 @@ static void *sec_wd_async_run(void *arg) ctx = wcrypto_create_aead_ctx(queue, &aead_setup); if (!ctx) { SEC_TST_PRT("wd create aead ctx fail!\n"); - goto async_err; + return NULL; } tag->ctx = ctx; @@ -718,7 +676,7 @@ static void *sec_wd_async_run(void *arg) if (ret) { SEC_TST_PRT("wd aead set key fail!\n"); wcrypto_del_aead_ctx(ctx); - goto async_err; + return NULL; } authsize = 16; //set defaut size @@ -726,7 +684,7 @@ static void *sec_wd_async_run(void *arg) if (ret) { SEC_TST_PRT("set authsize fail!\n"); wcrypto_del_aead_ctx(ctx); - goto async_err; + return NULL; } if (queue->capa.priv.direction == 0) { @@ -753,9 +711,6 @@ static void *sec_wd_async_run(void *arg) if (get_run_state() == 0) break; - // no-sva data copy to uadk - memcpy(aopdata.in, src_data_buf, g_pktlen); - ret = wcrypto_do_aead(ctx, &aopdata, (void *)tag); if (ret == -WD_EBUSY) { usleep(SEND_USLEEP * try_cnt); @@ -768,7 +723,7 @@ static void *sec_wd_async_run(void *arg) } count++; - i = count % MAX_BLOCK_NM; + i = count % MAX_POOL_LENTH; tag->cnt = i; try_cnt = 0; aopdata.in = res_in[i]; @@ -791,7 +746,7 @@ static void *sec_wd_async_run(void *arg) ctx = wcrypto_create_digest_ctx(queue, &digest_setup); if (!ctx) { SEC_TST_PRT("wd create digest ctx fail!\n"); - goto async_err; + return NULL; } tag->ctx = ctx; @@ -801,7 +756,7 @@ static void *sec_wd_async_run(void *arg) if (ret) { SEC_TST_PRT("wd digest set key fail!\n"); wcrypto_del_digest_ctx(ctx); - goto async_err; + return NULL; } } @@ -818,9 +773,6 @@ static void *sec_wd_async_run(void *arg) if (get_run_state() == 0) break; - // no-sva data copy to uadk - memcpy(dopdata.in, src_data_buf, g_pktlen); - ret = wcrypto_do_digest(ctx, &dopdata, (void *)tag); if (ret == -WD_EBUSY) { usleep(SEND_USLEEP * try_cnt); @@ -833,7 +785,7 @@ static void *sec_wd_async_run(void *arg) } count++; - i = count % MAX_BLOCK_NM; + i = count % MAX_POOL_LENTH; tag->cnt = i; try_cnt = 0; dopdata.in = res_in[i]; @@ -846,7 +798,7 @@ static void *sec_wd_async_run(void *arg) add_send_complete(); while (1) { - if (get_recv_time() == g_thread_num) // wait Async mode finish recv + if (get_recv_time() > 0) // wait Async mode finish recv break; usleep(SEND_USLEEP); } @@ -863,10 +815,6 @@ static void *sec_wd_async_run(void *arg) break; } -async_err: - free(tag); - free(src_data_buf); - free(out_data_buf); return NULL; } @@ -882,8 +830,6 @@ static void *sec_wd_sync_run(void *arg) char priv_key[MAX_IVK_LENTH]; struct thread_bd_res *bd_res; struct wd_queue *queue; - char *src_data_buf = NULL; - char *out_data_buf = NULL; void *ctx = NULL; void *tag = NULL; void **res_in; @@ -905,18 +851,6 @@ static void *sec_wd_sync_run(void *arg) res_out = bd_res->out; res_iv = bd_res->iv; - /* create user data buffer */ - src_data_buf = malloc(g_pktlen * sizeof(char)); - if (!src_data_buf) - return NULL; - - get_rand_data((u8 *)src_data_buf, g_pktlen); - out_data_buf = malloc(g_pktlen * sizeof(char)); - if (!out_data_buf) { - free(src_data_buf); - return NULL; - } - memset(priv_key, DEF_IVK_DATA, MAX_IVK_LENTH); switch(pdata->subtype) { @@ -933,14 +867,14 @@ static void *sec_wd_sync_run(void *arg) ctx = wcrypto_create_cipher_ctx(queue, &cipher_setup); if (!ctx) { SEC_TST_PRT("wd create cipher ctx fail!\n"); - goto sync_err; + return NULL; } ret = wcrypto_set_cipher_key(ctx, (__u8*)priv_key, (__u16)pdata->keysize); if (ret) { SEC_TST_PRT("wd cipher set key fail!\n"); wcrypto_del_cipher_ctx(ctx); - goto sync_err; + return NULL; } if (queue->capa.priv.direction == 0) @@ -961,9 +895,6 @@ static void *sec_wd_sync_run(void *arg) if (get_run_state() == 0) break; - // no-sva data copy to uadk - memcpy(copdata.in, src_data_buf, g_pktlen); - ret = wcrypto_do_cipher(ctx, &copdata, tag); if (ret == -WD_EBUSY) { usleep(SEND_USLEEP * try_cnt); @@ -977,13 +908,10 @@ static void *sec_wd_sync_run(void *arg) count++; try_cnt = 0; - i = count % MAX_BLOCK_NM; + i = count % MAX_POOL_LENTH; copdata.in = res_in[i]; copdata.out = res_out[i]; copdata.iv = res_iv[i]; - - // no-sva data copy from uadk to user - memcpy(out_data_buf, copdata.out, g_pktlen); } wcrypto_del_cipher_ctx(ctx); @@ -1001,14 +929,14 @@ static void *sec_wd_sync_run(void *arg) ctx = wcrypto_create_aead_ctx(queue, &aead_setup); if (!ctx) { SEC_TST_PRT("wd create aead ctx fail!\n"); - goto sync_err; + return NULL; } ret = wcrypto_set_aead_ckey(ctx, (__u8*)priv_key, (__u16)pdata->keysize); if (ret) { SEC_TST_PRT("wd aead set key fail!\n"); wcrypto_del_aead_ctx(ctx); - goto sync_err; + return NULL; } authsize = 16; //set defaut size @@ -1016,7 +944,7 @@ static void *sec_wd_sync_run(void *arg) if (ret) { SEC_TST_PRT("set authsize fail!\n"); wcrypto_del_aead_ctx(ctx); - goto sync_err; + return NULL; } if (queue->capa.priv.direction == 0) { @@ -1042,9 +970,6 @@ static void *sec_wd_sync_run(void *arg) if (get_run_state() == 0) break; - // no-sva data copy to uadk - memcpy(aopdata.in, src_data_buf, g_pktlen); - ret = wcrypto_do_aead(ctx, &aopdata, tag); if (ret == -WD_EBUSY) { usleep(SEND_USLEEP * try_cnt); @@ -1058,13 +983,10 @@ static void *sec_wd_sync_run(void *arg) count++; try_cnt = 0; - i = count % MAX_BLOCK_NM; + i = count % MAX_POOL_LENTH; aopdata.in = res_in[i]; aopdata.out = res_out[i]; aopdata.iv = res_iv[i]; - - // no-sva data copy from uadk to user - memcpy(out_data_buf, aopdata.out, g_pktlen); } wcrypto_del_aead_ctx(ctx); @@ -1082,7 +1004,7 @@ static void *sec_wd_sync_run(void *arg) ctx = wcrypto_create_digest_ctx(queue, &digest_setup); if (!ctx) { SEC_TST_PRT("wd create digest ctx fail!\n"); - goto sync_err; + return NULL; } if (digest_setup.mode == WCRYPTO_DIGEST_HMAC) { @@ -1091,7 +1013,7 @@ static void *sec_wd_sync_run(void *arg) if (ret) { SEC_TST_PRT("wd digest set key fail!\n"); wcrypto_del_digest_ctx(ctx); - goto sync_err; + return NULL; } } @@ -1107,9 +1029,6 @@ static void *sec_wd_sync_run(void *arg) if (get_run_state() == 0) break; - // no-sva data copy to uadk - memcpy(dopdata.in, src_data_buf, g_pktlen); - ret = wcrypto_do_digest(ctx, &dopdata, (void *)tag); if (ret == -WD_EBUSY) { usleep(SEND_USLEEP * try_cnt); @@ -1123,22 +1042,16 @@ static void *sec_wd_sync_run(void *arg) count++; try_cnt = 0; - i = count % MAX_BLOCK_NM; + i = count % MAX_POOL_LENTH; dopdata.in = res_in[i]; - dopdata.out = res_out[i]; - - // no-sva data copy from uadk to user - memcpy(out_data_buf, dopdata.out, 16); + dopdata.out = res_out[i]; } wcrypto_del_digest_ctx(ctx); break; } - add_recv_data(count); + add_recv_data(count, g_pktlen); -sync_err: - free(src_data_buf); - free(out_data_buf); return NULL; } @@ -1180,6 +1093,7 @@ int sec_wd_sync_threads(struct acc_option *options) sync_error: return ret; + } int sec_wd_async_threads(struct acc_option *options) @@ -1249,7 +1163,6 @@ int sec_wd_benchmark(struct acc_option *options) g_thread_num = options->threads; g_pktlen = options->pktlen; - g_ctxnum = options->ctxnums; if (options->optype > WCRYPTO_CIPHER_DECRYPTION) { SEC_TST_PRT("SEC optype error: %u\n", options->optype); return -EINVAL; @@ -1273,3 +1186,4 @@ int sec_wd_benchmark(struct acc_option *options) return 0; } + diff --git a/uadk_tool/benchmark/uadk_benchmark.c b/uadk_tool/benchmark/uadk_benchmark.c index 84941d5..2904cba 100644 --- a/uadk_tool/benchmark/uadk_benchmark.c +++ b/uadk_tool/benchmark/uadk_benchmark.c @@ -10,19 +10,19 @@ #define BYTES_TO_KB 10 #define TABLE_SPACE_SIZE 8 -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) /*----------------------------------------head struct--------------------------------------------------------*/ static unsigned int g_run_state = 1; static pthread_mutex_t acc_mutex = PTHREAD_MUTEX_INITIALIZER; static struct _recv_data { + double pkg_len; u64 send_cnt; u64 recv_cnt; u32 send_times; u32 recv_times; } g_recv_data; -/* SVA mode and NOSVA mode change need re_insmode driver ko */ +/* SVA mode and NOSVA mode change need re_insmod driver ko */ enum test_type { SVA_MODE = 0x1, NOSVA_MODE = 0x2, @@ -63,7 +63,7 @@ static struct acc_alg_item alg_options[] = { {"rsa-2048-crt", RSA_2048_CRT}, {"rsa-3072-crt", RSA_3072_CRT}, {"rsa-4096-crt", RSA_4096_CRT}, - {"dh-768 ", DH_768}, + {"dh-768", DH_768}, {"dh-1024", DH_1024}, {"dh-1536", DH_1536}, {"dh-2048", DH_2048}, @@ -131,10 +131,14 @@ void add_send_complete(void) __atomic_add_fetch(&g_recv_data.send_times, 1, __ATOMIC_RELAXED); } -void add_recv_data(u32 cnt) +void add_recv_data(u32 cnt, u32 pkglen) { pthread_mutex_lock(&acc_mutex); g_recv_data.recv_cnt += cnt; + if (g_recv_data.pkg_len == 0) + g_recv_data.pkg_len = pkglen; + else + g_recv_data.pkg_len = ((double)pkglen + g_recv_data.pkg_len) / 2; g_recv_data.recv_times++; pthread_mutex_unlock(&acc_mutex); } @@ -148,6 +152,7 @@ void init_recv_data(void) { g_recv_data.send_cnt = 0; g_recv_data.recv_cnt = 0; + g_recv_data.pkg_len = 0.0; g_recv_data.send_times = 0; g_recv_data.recv_times = 0; } @@ -263,28 +268,21 @@ void time_start(u32 seconds) alarm(seconds); } -int get_rand_int(int range) -{ - int randnum; - - if (range <= 0) { - ACC_TST_PRT("rand range error!\n"); - return 1; - } - srand((unsigned)time(NULL) * getpid()); - randnum = rand() % range; - - return randnum; -} - -void get_rand_data(u8 *addr, int size) +void get_rand_data(u8 *addr, u32 size) { + unsigned short rand_state[3] = { + (0xae >> 16) & 0xffff, 0xae & 0xffff, 0x330e}; int i; - srand((unsigned)time(NULL) * getpid()); - for (i = 0; i < size; i++) { - addr[i] = rand() % 0xFF; - } +#if 1 + // only 32bit valid, other 32bit is zero + for (i = 0; i < size >> 3; i++) + *((u64 *)addr + i) = nrand48(rand_state); +#else + // full 64bit valid + for (i = 0; i < size >> 2; i++) + *((u32 *)addr + i) = nrand48(rand_state); +#endif } /*-------------------------------------main code------------------------------------------------------*/ @@ -320,7 +318,7 @@ static void parse_alg_param(struct acc_option *option) case X25519_ALG: snprintf(option->algclass, MAX_ALG_NAME, "%s", "x25519"); option->acctype = HPRE_TYPE; - option->subtype = X22519_TYPE; + option->subtype = X25519_TYPE; break; case X448_ALG: snprintf(option->algclass, MAX_ALG_NAME, "%s", "x448"); @@ -366,8 +364,8 @@ void cal_perfermance_data(struct acc_option *option, u32 sttime) double perfermance; double cpu_rate; u32 ttime = 1000; - u32 perfdata; - u32 perfops; + double perfdata; + double perfops; double ops; u32 ptime; int i, len; @@ -397,13 +395,13 @@ void cal_perfermance_data(struct acc_option *option, u32 sttime) palgname[i] = '\0'; ptime = ptime - sttime; - perfdata = (g_recv_data.recv_cnt * option->pktlen) >> BYTES_TO_KB; - perfops = (g_recv_data.recv_cnt) >> BYTES_TO_KB; - perfermance = (double)perfdata / option->times; - ops = (double)perfops / option->times; + perfdata = g_recv_data.pkg_len * g_recv_data.recv_cnt / 1024.0; + perfops = (double)(g_recv_data.recv_cnt) / 1000.0; + perfermance = perfdata / option->times; + ops = perfops / option->times; cpu_rate = (double)ptime / option->times; ACC_TST_PRT("algname: length: perf: iops: CPU_rate:\n" - "%s %uBytes %.1fKB/s %.1fKops %.2f%%\n", + "%s %-2uBytes %.1fKB/s %.1fKops %.2f%%\n", palgname, option->pktlen, perfermance, ops, cpu_rate); } @@ -419,11 +417,11 @@ static int benchmark_run(struct acc_option *option) ret = sec_wd_benchmark(option); } usleep(20000); - #ifdef WITH_OPENSSL_DIR +#ifdef WITH_OPENSSL_DIR if (option->modetype & SOFT_MODE) { ret = sec_soft_benchmark(option); } - #endif +#endif break; case HPRE_TYPE: break; @@ -447,6 +445,7 @@ static void dump_param(struct acc_option *option) ACC_TST_PRT(" [--ctxnum]: %u\n", option->ctxnums); ACC_TST_PRT(" [--algclass]:%s\n", option->algclass); ACC_TST_PRT(" [--acctype]: %u\n", option->acctype); + ACC_TST_PRT(" [--prefetch]:%u\n", option->prefetch); ACC_TST_PRT(" [--engine]: %s\n", option->engine); } @@ -457,6 +456,7 @@ int acc_benchmark_run(struct acc_option *option) int i, ret = 0; int status; + ACC_TST_PRT("start UADK benchmark test.\n"); parse_alg_param(option); dump_param(option); @@ -558,13 +558,27 @@ static void print_help(void) ACC_TST_PRT(" set the number of threads\n"); ACC_TST_PRT(" [--ctxnum]:\n"); ACC_TST_PRT(" the number of QP queues used by the entire test task\n"); + ACC_TST_PRT(" [--prefetch]:\n"); + ACC_TST_PRT(" in SVA mode, Enable prefetch can reduce page faults and improve performance\n"); ACC_TST_PRT(" [--engine]:\n"); ACC_TST_PRT(" set the test openssl engine\n"); + ACC_TST_PRT(" [--alglist]:\n"); + ACC_TST_PRT(" list the all support alg\n"); ACC_TST_PRT(" [--help] = usage\n"); ACC_TST_PRT("Example\n"); ACC_TST_PRT(" ./uadk_tool benchmark --alg aes-128-cbc --mode sva --opt 0 --sync\n"); ACC_TST_PRT(" --pktlen 1024 --seconds 1 --multi 1 --thread 1 --ctxnum 4\n"); - ACC_TST_PRT("UPDATE:2021-7-28\n"); + ACC_TST_PRT("UPDATE:2022-7-18\n"); +} + +static void print_support_alg(void) +{ + int i; + + ACC_TST_PRT("UADK benchmark supported ALG:\n"); + for (i = 0; i < ALG_MAX; i++) { + ACC_TST_PRT("%s\n", alg_options[i].name); + } } int acc_cmd_parse(int argc, char *argv[], struct acc_option *option) @@ -583,8 +597,10 @@ int acc_cmd_parse(int argc, char *argv[], struct acc_option *option) {"thread", required_argument, 0, 9}, {"multi", required_argument, 0, 10}, {"ctxnum", required_argument, 0, 11}, - {"engine", required_argument, 0, 12}, - {"help", no_argument, 0, 13}, + {"prefetch", no_argument, 0, 12}, + {"engine", required_argument, 0, 13}, + {"alglist", no_argument, 0, 14}, + {"help", no_argument, 0, 15}, {0, 0, 0, 0} }; @@ -593,7 +609,6 @@ int acc_cmd_parse(int argc, char *argv[], struct acc_option *option) if (c == -1) break; - // ACC_TST_PRT("index:%d , optarg name:%s\n", c, optarg); switch (c) { case 2: option->algtype = get_alg_type(optarg); @@ -627,26 +642,36 @@ int acc_cmd_parse(int argc, char *argv[], struct acc_option *option) option->ctxnums = strtol(optarg, NULL, 0); break; case 12: - strcpy(option->engine, optarg); + option->prefetch = 1; break; case 13: - print_help(); + strcpy(option->engine, optarg); break; + case 14: + print_support_alg(); + goto to_exit; + case 15: + print_help(); + goto to_exit; default: ACC_TST_PRT("bad input test parameter!\n"); print_help(); - exit(-1); + goto to_exit; } } + return 0; + +to_exit: + return -EINVAL; } int acc_option_convert(struct acc_option *option) { - if (option->algtype >= ALG_MAX) + if (option->algtype >= ALG_MAX) { + ACC_TST_PRT("invalid: input algname is wrong!\n"); goto param_err; - else if (option->algtype < 0) - option->algtype = AES_128_CBC; + } if (option->modetype >= INVALID_MODE) goto param_err; @@ -657,8 +682,8 @@ int acc_option_convert(struct acc_option *option) /* Min test package size is 64Bytes */ if (option->pktlen > MAX_DATA_SIZE) goto param_err; - else if (option->pktlen < 64) - option->pktlen = 64; + else if (option->pktlen < 16) + option->pktlen = 16; if (option->times > MAX_TIME_SECONDS) { ACC_TST_PRT("uadk benchmark max test times to 128 seconds\n"); diff --git a/uadk_tool/benchmark/uadk_benchmark.h b/uadk_tool/benchmark/uadk_benchmark.h index 2cb3dc0..a344fac 100644 --- a/uadk_tool/benchmark/uadk_benchmark.h +++ b/uadk_tool/benchmark/uadk_benchmark.h @@ -15,7 +15,6 @@ #include <signal.h> #include <linux/random.h> #include <sys/syscall.h> -#include <sys/mman.h> #include <sys/time.h> #define ACC_TST_PRT printf @@ -24,21 +23,30 @@ #define MAX_CTX_NUM 64 #define MAX_TIME_SECONDS 128 #define BYTES_TO_MB 20 -#define MAX_OPT_TYPE 5 +#define MAX_OPT_TYPE 6 #define MAX_DATA_SIZE (15 * 1024 * 1024) #define MAX_ALG_NAME 64 #define ACC_QUEUE_SIZE 1024 +#define MAX_BLOCK_NM 16384 /* BLOCK_NUM must 4 times of POOL_LENTH */ +#define MAX_POOL_LENTH 4096 +#define MAX_TRY_CNT 5000 +#define SEND_USLEEP 100 + typedef unsigned char u8; typedef unsigned int u32; typedef unsigned long long u64; #define SCHED_SINGLE "sched_single" +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) /** * struct acc_option - Define the test acc app option list. * @algclass: 0:cipher 1:digest * @acctype: The sub alg type, reference func get_cipher_resource. * @syncmode: 0:sync mode 1:async mode + * @modetype: sva, no-sva, soft mode + * @optype: enc/dec, comp/decomp + * @prefetch: write allocated memory to prevent page faults */ struct acc_option { char algname[64]; @@ -56,6 +64,7 @@ struct acc_option { u32 subtype; char engine[64]; u32 engine_flag; + u32 prefetch; }; enum acc_type { @@ -74,7 +83,7 @@ enum alg_type { ECDH_TYPE, ECDSA_TYPE, SM2_TYPE, - X22519_TYPE, + X25519_TYPE, X448_TYPE, }; @@ -164,9 +173,8 @@ extern void cal_perfermance_data(struct acc_option *option, u32 sttime); extern void time_start(u32 seconds); extern int get_run_state(void); extern void set_run_state(int state); -extern int get_rand_int(int range); -extern void get_rand_data(u8 *addr, int size); -extern void add_recv_data(u32 cnt); +extern void get_rand_data(u8 *addr, u32 size); +extern void add_recv_data(u32 cnt, u32 pkglen); extern void add_send_complete(void); extern u32 get_recv_time(void); -- 2.33.0

1 5

[PATCH] digest: fix the fault as using the nginx
by Kai Ye 18 Jul '22

18 Jul '22

Prevent double-free after the private ctx copy is used. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- src/uadk_digest.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/uadk_digest.c b/src/uadk_digest.c index 2e61e80..8127373 100644 --- a/src/uadk_digest.c +++ b/src/uadk_digest.c @@ -240,6 +240,10 @@ static void digest_soft_cleanup(struct digest_priv_ctx *md_ctx) { EVP_MD_CTX *ctx = md_ctx->soft_ctx; + /* Prevent double-free after the copy is used */ + if (md_ctx->copy) + return; + if (ctx != NULL) { if (ctx->md_data) { OPENSSL_free(ctx->md_data); @@ -641,7 +645,9 @@ static int do_digest_sync(struct digest_priv_ctx *priv) { int ret; - /* Fix me: not support switch the soft work as input is lower */ + if (priv->req.in_bytes <= priv->switch_threshold && + priv->state == SEC_DIGEST_INIT) + return 0; ret = wd_do_digest_sync(priv->sess, &priv->req); if (ret) { @@ -743,6 +749,7 @@ static int uadk_e_digest_cleanup(EVP_MD_CTX *ctx) struct digest_priv_ctx *priv = (struct digest_priv_ctx *)EVP_MD_CTX_md_data(ctx); + /* Prevent double-free after the copy is used */ if (!priv || priv->copy) return 1; -- 2.33.0

1 0

[PATCH 1/2] uadk: fix spin lock destroy
by Weili Qian 18 Jul '22

18 Jul '22

Fix missing destroyed lock when initialization fails. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- drv/hisi_qm_udrv.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drv/hisi_qm_udrv.c b/drv/hisi_qm_udrv.c index 9eaf60c..b4e763d 100644 --- a/drv/hisi_qm_udrv.c +++ b/drv/hisi_qm_udrv.c @@ -335,6 +335,14 @@ err_out: return ret; } +static void hisi_qm_clear_info(struct hisi_qp *qp) +{ + struct hisi_qm_queue_info *q_info = &qp->q_info; + + pthread_spin_destroy(&q_info->lock); + hisi_qm_unset_region(qp->h_ctx, q_info); +} + static int get_free_num(struct hisi_qm_queue_info *q_info) { /* The device should reserve one buffer. */ @@ -374,7 +382,7 @@ handle_t hisi_qm_alloc_qp(struct hisi_qm_priv *config, handle_t ctx) qp->h_sgl_pool = hisi_qm_create_sglpool(HISI_SGL_NUM_IN_BD, HISI_SGE_NUM_IN_SGL); if (!qp->h_sgl_pool) - goto out_qp; + goto free_info; ret = wd_ctx_start(qp->h_ctx); if (ret) @@ -390,6 +398,8 @@ handle_t hisi_qm_alloc_qp(struct hisi_qm_priv *config, handle_t ctx) free_pool: hisi_qm_destroy_sglpool(qp->h_sgl_pool); +free_info: + hisi_qm_clear_info(qp); out_qp: free(qp); out: -- 2.30.0

1 1

[PATCH] engine: add receiving timeout count
by Kai Ye 18 Jul '22

18 Jul '22

Increase the count of packet receiving timeout as doing async jobs. Prevents falling into an infinite loop. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- src/uadk.h | 5 +++-- src/uadk_cipher.c | 7 +++++-- src/uadk_dh.c | 7 +++++-- src/uadk_digest.c | 7 +++++-- src/uadk_pkey.c | 7 +++++-- src/uadk_rsa.c | 7 +++++-- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/uadk.h b/src/uadk.h index d210c3d..267da89 100644 --- a/src/uadk.h +++ b/src/uadk.h @@ -21,8 +21,9 @@ #include <uadk/wd_sched.h> #include "uadk_utils.h" -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -#define ENV_STRING_LEN 256 +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define ENV_STRING_LEN 256 +#define ENGINE_RECV_MAX_CNT 60000000 enum { KUNPENG920, diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index 0b99753..5993386 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -503,6 +503,7 @@ static int sched_single_poll_policy(handle_t h_sched_ctx, static int uadk_e_cipher_poll(void *ctx) { struct cipher_priv_ctx *priv = (struct cipher_priv_ctx *) ctx; + __u64 rx_cnt = 0; __u32 recv = 0; /* Poll one packet currently */ int expt = 1; @@ -519,9 +520,11 @@ static int uadk_e_cipher_poll(void *ctx) return 0; else if (ret < 0 && ret != -EAGAIN) return ret; - } while (ret == -EAGAIN); + } while (ret == -EAGAIN && (rx_cnt++ < ENGINE_RECV_MAX_CNT)); - return ret; + fprintf(stderr, "failed to recv msg: timeout!\n"); + + return -ETIMEDOUT; } static int uadk_e_cipher_env_poll(void *ctx) diff --git a/src/uadk_dh.c b/src/uadk_dh.c index 75c9e5a..018a3b6 100644 --- a/src/uadk_dh.c +++ b/src/uadk_dh.c @@ -204,6 +204,7 @@ static __u32 dh_pick_next_ctx(handle_t sched_ctx, static int uadk_e_dh_poll(void *ctx) { + __u64 rx_cnt = 0; __u32 recv = 0; int expect = 1; int idx = 1; @@ -215,9 +216,11 @@ static int uadk_e_dh_poll(void *ctx) return UADK_E_POLL_SUCCESS; else if (ret < 0 && ret != -EAGAIN) return ret; - } while (ret == -EAGAIN); + } while (ret == -EAGAIN && (rx_cnt++ < ENGINE_RECV_MAX_CNT)); - return ret; + fprintf(stderr, "failed to recv msg: timeout!\n"); + + return -ETIMEDOUT; } static void uadk_e_dh_cb(void *req_t) diff --git a/src/uadk_digest.c b/src/uadk_digest.c index 70f51d3..0fb2cfb 100644 --- a/src/uadk_digest.c +++ b/src/uadk_digest.c @@ -331,6 +331,7 @@ static int sched_single_poll_policy(handle_t h_sched_ctx, static int uadk_e_digest_poll(void *ctx) { + __u64 rx_cnt = 0; __u32 recv = 0; int expt = 1; int ret = 0; @@ -341,9 +342,11 @@ static int uadk_e_digest_poll(void *ctx) return 0; else if (ret < 0 && ret != -EAGAIN) return ret; - } while (ret == -EAGAIN); + } while (ret == -EAGAIN && (rx_cnt++ < ENGINE_RECV_MAX_CNT)); - return ret; + fprintf(stderr, "failed to recv msg: timeout!\n"); + + return -ETIMEDOUT; } static int uadk_e_digest_env_poll(void *ctx) diff --git a/src/uadk_pkey.c b/src/uadk_pkey.c index 5300327..019d4fd 100644 --- a/src/uadk_pkey.c +++ b/src/uadk_pkey.c @@ -113,6 +113,7 @@ void uadk_ecc_cb(void *req_t) static int uadk_ecc_poll(void *ctx) { unsigned int recv = 0; + __u64 rx_cnt = 0; int expt = 1; int ret; @@ -122,9 +123,11 @@ static int uadk_ecc_poll(void *ctx) return 0; else if (ret < 0 && ret != -EAGAIN) return ret; - } while (ret == -EAGAIN); + } while (ret == -EAGAIN && (rx_cnt++ < ENGINE_RECV_MAX_CNT)); - return ret; + fprintf(stderr, "failed to recv msg: timeout!\n"); + + return -ETIMEDOUT; } /* make resource configure static */ diff --git a/src/uadk_rsa.c b/src/uadk_rsa.c index 1579539..42c3506 100644 --- a/src/uadk_rsa.c +++ b/src/uadk_rsa.c @@ -658,6 +658,7 @@ static int rsa_poll_policy(handle_t h_sched_ctx, __u32 expect, __u32 *count) static int uadk_e_rsa_poll(void *ctx) { + __u64 rx_cnt = 0; __u32 recv = 0; int expt = 1; int ret; @@ -668,9 +669,11 @@ static int uadk_e_rsa_poll(void *ctx) return UADK_E_POLL_SUCCESS; else if (ret < 0 && ret != -EAGAIN) return ret; - } while (ret == -EAGAIN); + } while (ret == -EAGAIN && (rx_cnt++ < ENGINE_RECV_MAX_CNT)); - return ret; + fprintf(stderr, "failed to recv msg: timeout!\n"); + + return -ETIMEDOUT; } static struct rsa_res_config rsa_res_config = { -- 2.30.0

1 0

[PATCH 0/5] uadk - add wd_comp_init2
by Yang Shen 07 Jul '22

07 Jul '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. @device_list: The available uacce device list. Users can get it by wd_get_accel_list(). @numa_bitmask: The bitmask provided by libnuma. Users can use this parameter to control requesting ctxs devices in the bind NUMA scenario. @ctx_nums: 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. @sched_type: Scheduling type the user wants to use. What's more, some users want uadk to provide the default value about input parameters for some performance insensitive scenes. C code has no way to. Yang Shen (5): uadk - support algorithms initialization reentry protect 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 | 176 +++++++++++++++++++++++++++ include/wd.h | 54 ++++++++- include/wd_alg_common.h | 24 ++++ include/wd_comp.h | 28 +++++ include/wd_util.h | 57 +++++++++ wd.c | 97 ++++++++++++--- wd_aead.c | 33 +++-- wd_cipher.c | 35 ++++-- wd_comp.c | 259 ++++++++++++++++++++++++++++++++++++++-- wd_dh.c | 34 ++++-- wd_digest.c | 33 +++-- wd_ecc.c | 33 +++-- wd_rsa.c | 33 +++-- wd_util.c | 75 +++++++++++- 15 files changed, 870 insertions(+), 105 deletions(-) create mode 100644 docs/wd_alg_init2.md -- 2.24.0

2 7

帐户验证!
by openeuler.orgIT 06 Jul '22

06 Jul '22

1 0

通知acc@openeuler.org
by noreply 02 Jul '22

02 Jul '22

1 0

[PATCH 0/2] uadk/sched - make a numa node map
by Yang Shen 01 Jul '22

01 Jul '22

Now the uadk scheduler will search the nearest node when call session_sched_init(). But this is a repetitive work because session_sched_init() is called by wd_xxx_create_sess(). So we can build an cpu-device numa node map. Update the map when a new numa node has been enabled with a device. And then, session_sched_init() can quick get the right device id from a certain cpu. Yang Shen (2): uadk/sched - adjust some functions location and rename for tag uadk/sched - add mapping from cpus to devices wd_sched.c | 312 ++++++++++++++++++++++++++++------------------------- 1 file changed, 163 insertions(+), 149 deletions(-) -- 2.24.0

1 2

[PATCH v3] uacce: Handle parent device removal or parent driver module rmmod
by Zhangfei Gao 01 Jul '22

01 Jul '22

From: Jean-Philippe Brucker <jean-philippe(a)linaro.org> The uacce driver must deal with a possible removal of the parent device or parent driver module rmmod at any time. Although uacce_remove(), called on device removal and on driver unbind, prevents future use of the uacce fops by removing the cdev, fops that were called before that point may still be running. Serialize uacce_fops_open() and uacce_remove() with uacce->mutex. Serialize other fops against uacce_remove() with q->mutex. Since we need to protect uacce_fops_poll() which gets called on the fast path, replace uacce->queues_lock with q->mutex to improve scalability. The other fops are only used during setup. uacce_queue_is_valid(), checked under q->mutex or uacce->mutex, denotes whether uacce_remove() has disabled all queues. If that is the case, don't go any further since the parent device is being removed and uacce->ops should not be called anymore. Reported-by: Yang Shen <shenyang39(a)huawei.com> Signed-off-by: Zhangfei Gao <zhangfei.gao(a)linaro.org> Signed-off-by: Jean-Philippe Brucker <jean-philippe(a)linaro.org> --- v3: Drop patch 1, which set cdev owner with parent driver onwer, to block parent driver rmmod. Suggested from Greg, this behavior introduce layering violation. Only keep patch 2, which can cover both parent moduel rmmod and parent device removal. drivers/misc/uacce/uacce.c | 133 ++++++++++++++++++++++++------------- include/linux/uacce.h | 6 +- 2 files changed, 91 insertions(+), 48 deletions(-) diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c index 281c54003edc..b70a013139c7 100644 --- a/drivers/misc/uacce/uacce.c +++ b/drivers/misc/uacce/uacce.c @@ -9,43 +9,38 @@ static struct class *uacce_class; static dev_t uacce_devt; -static DEFINE_MUTEX(uacce_mutex); static DEFINE_XARRAY_ALLOC(uacce_xa); -static int uacce_start_queue(struct uacce_queue *q) +/* + * If the parent driver or the device disappears, the queue state is invalid and + * ops are not usable anymore. + */ +static bool uacce_queue_is_valid(struct uacce_queue *q) { - int ret = 0; + return q->state == UACCE_Q_INIT || q->state == UACCE_Q_STARTED; +} - mutex_lock(&uacce_mutex); +static int uacce_start_queue(struct uacce_queue *q) +{ + int ret; - if (q->state != UACCE_Q_INIT) { - ret = -EINVAL; - goto out_with_lock; - } + if (q->state != UACCE_Q_INIT) + return -EINVAL; if (q->uacce->ops->start_queue) { ret = q->uacce->ops->start_queue(q); if (ret < 0) - goto out_with_lock; + return ret; } q->state = UACCE_Q_STARTED; - -out_with_lock: - mutex_unlock(&uacce_mutex); - - return ret; + return 0; } static int uacce_put_queue(struct uacce_queue *q) { struct uacce_device *uacce = q->uacce; - mutex_lock(&uacce_mutex); - - if (q->state == UACCE_Q_ZOMBIE) - goto out; - if ((q->state == UACCE_Q_STARTED) && uacce->ops->stop_queue) uacce->ops->stop_queue(q); @@ -54,8 +49,6 @@ static int uacce_put_queue(struct uacce_queue *q) uacce->ops->put_queue(q); q->state = UACCE_Q_ZOMBIE; -out: - mutex_unlock(&uacce_mutex); return 0; } @@ -65,20 +58,36 @@ static long uacce_fops_unl_ioctl(struct file *filep, { struct uacce_queue *q = filep->private_data; struct uacce_device *uacce = q->uacce; + long ret = -ENXIO; + + /* + * uacce->ops->ioctl() may take the mmap_lock when copying arg to/from + * user. Avoid a circular lock dependency with uacce_fops_mmap(), which + * gets called with mmap_lock held, by taking uacce->mutex instead of + * q->mutex. Doing this in uacce_fops_mmap() is not possible because + * uacce_fops_open() calls iommu_sva_bind_device(), which takes + * mmap_lock, while holding uacce->mutex. + */ + mutex_lock(&uacce->mutex); + if (!uacce_queue_is_valid(q)) + goto out_unlock; switch (cmd) { case UACCE_CMD_START_Q: - return uacce_start_queue(q); - + ret = uacce_start_queue(q); + break; case UACCE_CMD_PUT_Q: - return uacce_put_queue(q); - + ret = uacce_put_queue(q); + break; default: - if (!uacce->ops->ioctl) - return -EINVAL; - - return uacce->ops->ioctl(q, cmd, arg); + if (uacce->ops->ioctl) + ret = uacce->ops->ioctl(q, cmd, arg); + else + ret = -EINVAL; } +out_unlock: + mutex_unlock(&uacce->mutex); + return ret; } #ifdef CONFIG_COMPAT @@ -136,6 +145,13 @@ static int uacce_fops_open(struct inode *inode, struct file *filep) if (!q) return -ENOMEM; + mutex_lock(&uacce->mutex); + + if (!uacce->parent) { + ret = -EINVAL; + goto out_with_mem; + } + ret = uacce_bind_queue(uacce, q); if (ret) goto out_with_mem; @@ -152,10 +168,9 @@ static int uacce_fops_open(struct inode *inode, struct file *filep) filep->private_data = q; uacce->inode = inode; q->state = UACCE_Q_INIT; - - mutex_lock(&uacce->queues_lock); + mutex_init(&q->mutex); list_add(&q->list, &uacce->queues); - mutex_unlock(&uacce->queues_lock); + mutex_unlock(&uacce->mutex); return 0; @@ -163,18 +178,20 @@ static int uacce_fops_open(struct inode *inode, struct file *filep) uacce_unbind_queue(q); out_with_mem: kfree(q); + mutex_unlock(&uacce->mutex); return ret; } static int uacce_fops_release(struct inode *inode, struct file *filep) { struct uacce_queue *q = filep->private_data; + struct uacce_device *uacce = q->uacce; - mutex_lock(&q->uacce->queues_lock); - list_del(&q->list); - mutex_unlock(&q->uacce->queues_lock); + mutex_lock(&uacce->mutex); uacce_put_queue(q); uacce_unbind_queue(q); + list_del(&q->list); + mutex_unlock(&uacce->mutex); kfree(q); return 0; @@ -217,10 +234,9 @@ static int uacce_fops_mmap(struct file *filep, struct vm_area_struct *vma) vma->vm_private_data = q; qfr->type = type; - mutex_lock(&uacce_mutex); - - if (q->state != UACCE_Q_INIT && q->state != UACCE_Q_STARTED) { - ret = -EINVAL; + mutex_lock(&q->mutex); + if (!uacce_queue_is_valid(q)) { + ret = -ENXIO; goto out_with_lock; } @@ -248,12 +264,12 @@ static int uacce_fops_mmap(struct file *filep, struct vm_area_struct *vma) } q->qfrs[type] = qfr; - mutex_unlock(&uacce_mutex); + mutex_unlock(&q->mutex); return ret; out_with_lock: - mutex_unlock(&uacce_mutex); + mutex_unlock(&q->mutex); kfree(qfr); return ret; } @@ -262,12 +278,20 @@ static __poll_t uacce_fops_poll(struct file *file, poll_table *wait) { struct uacce_queue *q = file->private_data; struct uacce_device *uacce = q->uacce; + __poll_t ret = 0; + + mutex_lock(&q->mutex); + if (!uacce_queue_is_valid(q)) + goto out_unlock; poll_wait(file, &q->wait, wait); + if (uacce->ops->is_q_updated && uacce->ops->is_q_updated(q)) - return EPOLLIN | EPOLLRDNORM; + ret = EPOLLIN | EPOLLRDNORM; - return 0; +out_unlock: + mutex_unlock(&q->mutex); + return ret; } static const struct file_operations uacce_fops = { @@ -450,7 +474,7 @@ struct uacce_device *uacce_alloc(struct device *parent, goto err_with_uacce; INIT_LIST_HEAD(&uacce->queues); - mutex_init(&uacce->queues_lock); + mutex_init(&uacce->mutex); device_initialize(&uacce->dev); uacce->dev.devt = MKDEV(MAJOR(uacce_devt), uacce->dev_id); uacce->dev.class = uacce_class; @@ -507,13 +531,23 @@ void uacce_remove(struct uacce_device *uacce) if (uacce->inode) unmap_mapping_range(uacce->inode->i_mapping, 0, 0, 1); + /* + * uacce_fops_open() may be running concurrently, even after we remove + * the cdev. Holding uacce->mutex ensures that open() does not obtain a + * removed uacce device. + */ + mutex_lock(&uacce->mutex); /* ensure no open queue remains */ - mutex_lock(&uacce->queues_lock); list_for_each_entry_safe(q, next_q, &uacce->queues, list) { + /* + * Taking q->mutex ensures that fops do not use the defunct + * uacce->ops after the queue is disabled. + */ + mutex_lock(&q->mutex); uacce_put_queue(q); + mutex_unlock(&q->mutex); uacce_unbind_queue(q); } - mutex_unlock(&uacce->queues_lock); /* disable sva now since no opened queues */ uacce_disable_sva(uacce); @@ -521,6 +555,13 @@ void uacce_remove(struct uacce_device *uacce) if (uacce->cdev) cdev_device_del(uacce->cdev, &uacce->dev); xa_erase(&uacce_xa, uacce->dev_id); + /* + * uacce exists as long as there are open fds, but ops will be freed + * now. Ensure that bugs cause NULL deref rather than use-after-free. + */ + uacce->ops = NULL; + uacce->parent = NULL; + mutex_unlock(&uacce->mutex); put_device(&uacce->dev); } EXPORT_SYMBOL_GPL(uacce_remove); diff --git a/include/linux/uacce.h b/include/linux/uacce.h index 48e319f40275..9ce88c28b0a8 100644 --- a/include/linux/uacce.h +++ b/include/linux/uacce.h @@ -70,6 +70,7 @@ enum uacce_q_state { * @wait: wait queue head * @list: index into uacce queues list * @qfrs: pointer of qfr regions + * @mutex: protects queue state * @state: queue state machine * @pasid: pasid associated to the mm * @handle: iommu_sva handle returned by iommu_sva_bind_device() @@ -80,6 +81,7 @@ struct uacce_queue { wait_queue_head_t wait; struct list_head list; struct uacce_qfile_region *qfrs[UACCE_MAX_REGION]; + struct mutex mutex; enum uacce_q_state state; u32 pasid; struct iommu_sva *handle; @@ -97,9 +99,9 @@ struct uacce_queue { * @dev_id: id of the uacce device * @cdev: cdev of the uacce * @dev: dev of the uacce + * @mutex: protects uacce operation * @priv: private pointer of the uacce * @queues: list of queues - * @queues_lock: lock for queues list * @inode: core vfs */ struct uacce_device { @@ -113,9 +115,9 @@ struct uacce_device { u32 dev_id; struct cdev *cdev; struct device dev; + struct mutex mutex; void *priv; struct list_head queues; - struct mutex queues_lock; struct inode *inode; }; -- 2.36.1

1 0

[PATCH 1/2] uadk/ecc - remove a redefined macro
by Yang Shen 01 Jul '22

01 Jul '22

Macro 'offsetof' has been defined in 'stddef.h'. So remove the redefined one in 'wd_ecc_drv.h'. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- include/drv/wd_ecc_drv.h | 2 -- wd_ecc.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/drv/wd_ecc_drv.h b/include/drv/wd_ecc_drv.h index ef98606..857da20 100644 --- a/include/drv/wd_ecc_drv.h +++ b/include/drv/wd_ecc_drv.h @@ -45,8 +45,6 @@ extern "C" { #define WD_X448 0x2 #define WD_SM2P256 0x3 -#define offsetof(t, m) ((size_t)(uintptr_t)&((t *)0)->m) - /* ECC message format */ struct wd_ecc_msg { struct wd_ecc_req req; diff --git a/wd_ecc.c b/wd_ecc.c index 1ff6ed3..4cf287b 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -8,6 +8,7 @@ #include <errno.h> #include <pthread.h> #include <stdlib.h> +#include <stddef.h> #include <string.h> #include <time.h> #include <dlfcn.h> -- 2.24.0

1 1

Fwd: [RFC v2 00/15] vfio: Adopt iommufd
by Zhangfei Gao 29 Jun '22

29 Jun '22

qemu: https://github.com/luxis1999/qemu/tree/qemu-for-5.17-rc6-vm-rfcv2. kernel: >> https://github.com/luxis1999/iommufd/tree/iommufd-v5.18-rc4-nesting -------- Forwarded Message -------- Subject: [RFC v2 00/15] vfio: Adopt iommufd Date: Wed, 8 Jun 2022 05:31:24 -0700 From: Yi Liu <yi.l.liu(a)intel.com> To: alex.williamson(a)redhat.com, cohuck(a)redhat.com, qemu-devel(a)nongnu.org CC: david(a)gibson.dropbear.id.au, thuth(a)redhat.com, farman(a)linux.ibm.com, mjrosato(a)linux.ibm.com, akrowiak(a)linux.ibm.com, pasic(a)linux.ibm.com, jjherne(a)linux.ibm.com, jasowang(a)redhat.com, kvm(a)vger.kernel.org, jgg(a)nvidia.com, nicolinc(a)nvidia.com, eric.auger(a)redhat.com, eric.auger.pro(a)gmail.com, kevin.tian(a)intel.com, yi.l.liu(a)intel.com, chao.p.peng(a)intel.com, yi.y.sun(a)intel.com, peterx(a)redhat.com, shameerali.kolothum.thodi(a)huawei.com, zhangfei.gao(a)linaro.org, berrange(a)redhat.com With the introduction of iommufd[1], the Linux kernel provides a generic interface for userspace drivers to propagate their DMA mappings to kernel for assigned devices. This series does the porting of the VFIO devices onto the /dev/iommu uapi and let it coexist with the legacy implementation. Other devices like vpda, vfio mdev and etc. are not considered yet. At QEMU level, interactions with the /dev/iommu are abstracted by a new iommufd object (compiled in with the CONFIG_IOMMUFD option). Any QEMU device (e.g. vfio device) wishing to use /dev/iommu must be linked with an iommufd object. In this series, the vfio-pci device is granted with such capability: It gets a new optional parameter named iommufd which allows to pass an iommufd object: -object iommufd,id=iommufd0 -device vfio-pci,host=0000:02:00.0,iommufd=iommufd0 Note the /dev/iommu can be externally opened by a management layer. In such a case the fd is passed along with the iommufd object: -object iommufd,id=iommufd0,fd=22 -device vfio-pci,host=0000:02:00.0,iommufd=iommufd0 If the fd parameter is not passed, the fd (/dev/iommu) is opened by QEMU. If no iommufd option is passed to the vfio-pci device, iommufd is not used and the end-user gets the behavior based on the legacy vfio iommu interfaces: -device vfio-pci,host=0000:02:00.0 While the legacy kernel interface is group-centric, the new iommufd interface is device-centric, relying on device fd and iommufd. To support both interfaces in the QEMU VFIO device we reworked the vfio container abstraction so that the generic VFIO code can use either backend. The VFIOContainer object becomes a base object derived into a) the legacy VFIO container and b) the new iommufd based container. The base object implements generic code such as code related to memory_listener and address space management whereas the derived objects implement callbacks specific to either BE, legacy and iommufd. Indeed each backend has its own way to setup secure context and dma management interface. The below diagram shows how it looks like with both BEs. VFIO AddressSpace/Memory +-------+ +----------+ +-----+ +-----+ | pci | | platform | | ap | | ccw | +---+---+ +----+-----+ +--+--+ +--+--+ +----------------------+ | | | | | AddressSpace | | | | | +------------+---------+ +---V-----------V-----------V--------V----+ / | VFIOAddressSpace | <------------+ | | | MemoryListener | VFIOContainer list | +-------+----------------------------+----+ | | | | +-------V------+ +--------V----------+ | iommufd | | vfio legacy | | container | | container | +-------+------+ +--------+----------+ | | | /dev/iommu | /dev/vfio/vfio | /dev/vfio/devices/vfioX | /dev/vfio/$group_id Userspace | | ===========+============================+================================ Kernel | device fd | +---------------+ | group/container fd | (BIND_IOMMUFD | | (SET_CONTAINER/SET_IOMMU) | ATTACH_IOAS) | | device fd | | | | +-------V------------V-----------------+ iommufd | | vfio | (map/unmap | +---------+--------------------+-------+ ioas_copy) | | | map/unmap | | | +------V------+ +-----V------+ +------V--------+ | iommfd core | | device | | vfio iommu | +-------------+ +------------+ +---------------+ [Secure Context setup] - iommufd BE: uses device fd and iommufd to setup secure context (bind_iommufd, attach_ioas) - vfio legacy BE: uses group fd and container fd to setup secure context (set_container, set_iommu) [Device access] - iommufd BE: device fd is opened through /dev/vfio/devices/vfioX - vfio legacy BE: device fd is retrieved from group fd ioctl [DMA Mapping flow] - VFIOAddressSpace receives MemoryRegion add/del via MemoryListener - VFIO populates DMA map/unmap via the container BEs *) iommufd BE: uses iommufd *) vfio legacy BE: uses container fd Test done: - PCI and Platform device were tested - ccw and ap were only compile-tested - limited device hotplug test - vIOMMU test run for both legacy and iommufd backends (limited tests) This series was co-developed by Eric Auger and me based on the iommufd exploration kernel (https://github.com/luxis1999/iommufd/tree/iommufd-v5.17-rc6) which encompasses: - Jason’s IOMMUFD Generic interface series <https://lore.kernel.org/kvm/0-v1-e79cd8d168e8+6-iommufd_jgg@nvidia.com/> - Jason's vfio ccw life circle cleanup (Eric Farman has renewed it recently) <https://lore.kernel.org/all/0-v3-57c1502c62fd+2190-ccw_mdev_jgg@nvidia.com/ https://lore.kernel.org/kvm/20220602171948.2790690-1-farman@linux.ibm.com/> - Yi's move vfio_device allo/free into vfio core (not pushed to upstream yet) - Yi's vfio device cdev (introduces device-centric interface, not pushed to upstream yet) - Nicolin's vfio iommufd compat code (not pushed to upstream yet) This QEMU series can be fount at https://github.com/luxis1999/qemu/tree/qemu-for-5.17-rc6-vm-rfcv2. As iommufd kernel is in the early step (only iommufd generic interface is in mailing list), so this series hasn't made the iommufd backend fully on par with legacy backend w.r.t. features like: - p2p mappings - coherency tracking - live migration - vfio pci device hot reset - and etc. Only vfio-pci device supports iommufd BE, other types of devices still uses legacy BE. TODOs: - Add DMA alias check for iommufd BE (group level) - Make pci.c to be BE agnostic. Needs kernel change as well to fix the VFIO_DEVICE_PCI_HOT_RESET gap - Cleanup the VFIODevice fields as it's used in both backends - Add device fd parameter to vfio-device in case the iommufd option is used - Add locks - Replace list with g_tree - More tests Change log: v2: - remove the first three patches of rfcv1 - add open cdev helper suggested by Jason - remove the QOMification of the VFIOContainer and simply use standard ops (David) - add "-object iommufd" suggested by Alex v1: https://lore.kernel.org/qemu-devel/20220414104710.28534-1-yi.l.liu@intel.co… Thanks, Yi & Eric Eric Auger (10): scripts/update-linux-headers: Add iommufd.h linux-headers: Import latest vfio.h and iommufd.h vfio/container: Introduce vfio_[attach/detach]_device vfio/platform: Use vfio_[attach/detach]_device vfio/ap: Use vfio_[attach/detach]_device vfio/ccw: Use vfio_[attach/detach]_device vfio/container-base: Introduce [attach/detach]_device container callbacks vfio/container-base: Introduce VFIOContainer reset callback backends/iommufd: Introduce the iommufd object vfio/as: Allow the selection of a given iommu backend Yi Liu (5): vfio/common: Split common.c into common.c, container.c and as.c vfio: Add base container util/char_dev: Add open_cdev() vfio/iommufd: Implement the iommufd backend vfio/iommufd: Add IOAS_COPY_DMA support MAINTAINERS | 13 + backends/Kconfig | 5 + backends/iommufd.c | 265 +++ backends/meson.build | 1 + backends/trace-events | 12 + hw/vfio/ap.c | 62 +- hw/vfio/as.c | 1035 +++++++++++ hw/vfio/ccw.c | 118 +- hw/vfio/common.c | 2365 ++----------------------- hw/vfio/container-base.c | 172 ++ hw/vfio/container.c | 1298 ++++++++++++++ hw/vfio/iommufd.c | 546 ++++++ hw/vfio/meson.build | 6 + hw/vfio/migration.c | 5 +- hw/vfio/pci.c | 83 +- hw/vfio/platform.c | 42 +- hw/vfio/spapr.c | 22 +- hw/vfio/trace-events | 11 + include/hw/vfio/vfio-common.h | 101 +- include/hw/vfio/vfio-container-base.h | 148 ++ include/qemu/char_dev.h | 16 + include/sysemu/iommufd.h | 47 + linux-headers/linux/iommufd.h | 223 +++ linux-headers/linux/vfio.h | 84 + qapi/qom.json | 16 +- qemu-options.hx | 12 + scripts/update-linux-headers.sh | 2 +- util/chardev_open.c | 58 + util/meson.build | 1 + 29 files changed, 4291 insertions(+), 2478 deletions(-) create mode 100644 backends/iommufd.c create mode 100644 hw/vfio/as.c create mode 100644 hw/vfio/container-base.c create mode 100644 hw/vfio/container.c create mode 100644 hw/vfio/iommufd.c create mode 100644 include/hw/vfio/vfio-container-base.h create mode 100644 include/qemu/char_dev.h create mode 100644 include/sysemu/iommufd.h create mode 100644 linux-headers/linux/iommufd.h create mode 100644 util/chardev_open.c Base commit: 9b1f58854959c5a9bdb347e3e04c252ab7fc9ef5 -- 2.27.0

1 0

Fwd: [RFC v2 00/15] vfio: Adopt iommufd
by zhangfei.gao＠foxmail.com 29 Jun '22

29 Jun '22

qemu: https://github.com/luxis1999/qemu/tree/qemu-for-5.17-rc6-vm-rfcv2. kernel: >> https://github.com/luxis1999/iommufd/tree/iommufd-v5.18-rc4-nesting -------- Forwarded Message -------- Subject: [RFC v2 00/15] vfio: Adopt iommufd Date: Wed, 8 Jun 2022 05:31:24 -0700 From: Yi Liu <yi.l.liu(a)intel.com> To: alex.williamson(a)redhat.com, cohuck(a)redhat.com, qemu-devel(a)nongnu.org CC: david(a)gibson.dropbear.id.au, thuth(a)redhat.com, farman(a)linux.ibm.com, mjrosato(a)linux.ibm.com, akrowiak(a)linux.ibm.com, pasic(a)linux.ibm.com, jjherne(a)linux.ibm.com, jasowang(a)redhat.com, kvm(a)vger.kernel.org, jgg(a)nvidia.com, nicolinc(a)nvidia.com, eric.auger(a)redhat.com, eric.auger.pro(a)gmail.com, kevin.tian(a)intel.com, yi.l.liu(a)intel.com, chao.p.peng(a)intel.com, yi.y.sun(a)intel.com, peterx(a)redhat.com, shameerali.kolothum.thodi(a)huawei.com, zhangfei.gao(a)linaro.org, berrange(a)redhat.com With the introduction of iommufd[1], the Linux kernel provides a generic interface for userspace drivers to propagate their DMA mappings to kernel for assigned devices. This series does the porting of the VFIO devices onto the /dev/iommu uapi and let it coexist with the legacy implementation. Other devices like vpda, vfio mdev and etc. are not considered yet. At QEMU level, interactions with the /dev/iommu are abstracted by a new iommufd object (compiled in with the CONFIG_IOMMUFD option). Any QEMU device (e.g. vfio device) wishing to use /dev/iommu must be linked with an iommufd object. In this series, the vfio-pci device is granted with such capability: It gets a new optional parameter named iommufd which allows to pass an iommufd object: -object iommufd,id=iommufd0 -device vfio-pci,host=0000:02:00.0,iommufd=iommufd0 Note the /dev/iommu can be externally opened by a management layer. In such a case the fd is passed along with the iommufd object: -object iommufd,id=iommufd0,fd=22 -device vfio-pci,host=0000:02:00.0,iommufd=iommufd0 If the fd parameter is not passed, the fd (/dev/iommu) is opened by QEMU. If no iommufd option is passed to the vfio-pci device, iommufd is not used and the end-user gets the behavior based on the legacy vfio iommu interfaces: -device vfio-pci,host=0000:02:00.0 While the legacy kernel interface is group-centric, the new iommufd interface is device-centric, relying on device fd and iommufd. To support both interfaces in the QEMU VFIO device we reworked the vfio container abstraction so that the generic VFIO code can use either backend. The VFIOContainer object becomes a base object derived into a) the legacy VFIO container and b) the new iommufd based container. The base object implements generic code such as code related to memory_listener and address space management whereas the derived objects implement callbacks specific to either BE, legacy and iommufd. Indeed each backend has its own way to setup secure context and dma management interface. The below diagram shows how it looks like with both BEs. VFIO AddressSpace/Memory +-------+ +----------+ +-----+ +-----+ | pci | | platform | | ap | | ccw | +---+---+ +----+-----+ +--+--+ +--+--+ +----------------------+ | | | | | AddressSpace | | | | | +------------+---------+ +---V-----------V-----------V--------V----+ / | VFIOAddressSpace | <------------+ | | | MemoryListener | VFIOContainer list | +-------+----------------------------+----+ | | | | +-------V------+ +--------V----------+ | iommufd | | vfio legacy | | container | | container | +-------+------+ +--------+----------+ | | | /dev/iommu | /dev/vfio/vfio | /dev/vfio/devices/vfioX | /dev/vfio/$group_id Userspace | | ===========+============================+================================ Kernel | device fd | +---------------+ | group/container fd | (BIND_IOMMUFD | | (SET_CONTAINER/SET_IOMMU) | ATTACH_IOAS) | | device fd | | | | +-------V------------V-----------------+ iommufd | | vfio | (map/unmap | +---------+--------------------+-------+ ioas_copy) | | | map/unmap | | | +------V------+ +-----V------+ +------V--------+ | iommfd core | | device | | vfio iommu | +-------------+ +------------+ +---------------+ [Secure Context setup] - iommufd BE: uses device fd and iommufd to setup secure context (bind_iommufd, attach_ioas) - vfio legacy BE: uses group fd and container fd to setup secure context (set_container, set_iommu) [Device access] - iommufd BE: device fd is opened through /dev/vfio/devices/vfioX - vfio legacy BE: device fd is retrieved from group fd ioctl [DMA Mapping flow] - VFIOAddressSpace receives MemoryRegion add/del via MemoryListener - VFIO populates DMA map/unmap via the container BEs *) iommufd BE: uses iommufd *) vfio legacy BE: uses container fd Test done: - PCI and Platform device were tested - ccw and ap were only compile-tested - limited device hotplug test - vIOMMU test run for both legacy and iommufd backends (limited tests) This series was co-developed by Eric Auger and me based on the iommufd exploration kernel (https://github.com/luxis1999/iommufd/tree/iommufd-v5.17-rc6) which encompasses: - Jason’s IOMMUFD Generic interface series <https://lore.kernel.org/kvm/0-v1-e79cd8d168e8+6-iommufd_jgg@nvidia.com/> - Jason's vfio ccw life circle cleanup (Eric Farman has renewed it recently) <https://lore.kernel.org/all/0-v3-57c1502c62fd+2190-ccw_mdev_jgg@nvidia.com/ https://lore.kernel.org/kvm/20220602171948.2790690-1-farman@linux.ibm.com/> - Yi's move vfio_device allo/free into vfio core (not pushed to upstream yet) - Yi's vfio device cdev (introduces device-centric interface, not pushed to upstream yet) - Nicolin's vfio iommufd compat code (not pushed to upstream yet) This QEMU series can be fount at https://github.com/luxis1999/qemu/tree/qemu-for-5.17-rc6-vm-rfcv2. As iommufd kernel is in the early step (only iommufd generic interface is in mailing list), so this series hasn't made the iommufd backend fully on par with legacy backend w.r.t. features like: - p2p mappings - coherency tracking - live migration - vfio pci device hot reset - and etc. Only vfio-pci device supports iommufd BE, other types of devices still uses legacy BE. TODOs: - Add DMA alias check for iommufd BE (group level) - Make pci.c to be BE agnostic. Needs kernel change as well to fix the VFIO_DEVICE_PCI_HOT_RESET gap - Cleanup the VFIODevice fields as it's used in both backends - Add device fd parameter to vfio-device in case the iommufd option is used - Add locks - Replace list with g_tree - More tests Change log: v2: - remove the first three patches of rfcv1 - add open cdev helper suggested by Jason - remove the QOMification of the VFIOContainer and simply use standard ops (David) - add "-object iommufd" suggested by Alex v1: https://lore.kernel.org/qemu-devel/20220414104710.28534-1-yi.l.liu@intel.co… Thanks, Yi & Eric Eric Auger (10): scripts/update-linux-headers: Add iommufd.h linux-headers: Import latest vfio.h and iommufd.h vfio/container: Introduce vfio_[attach/detach]_device vfio/platform: Use vfio_[attach/detach]_device vfio/ap: Use vfio_[attach/detach]_device vfio/ccw: Use vfio_[attach/detach]_device vfio/container-base: Introduce [attach/detach]_device container callbacks vfio/container-base: Introduce VFIOContainer reset callback backends/iommufd: Introduce the iommufd object vfio/as: Allow the selection of a given iommu backend Yi Liu (5): vfio/common: Split common.c into common.c, container.c and as.c vfio: Add base container util/char_dev: Add open_cdev() vfio/iommufd: Implement the iommufd backend vfio/iommufd: Add IOAS_COPY_DMA support MAINTAINERS | 13 + backends/Kconfig | 5 + backends/iommufd.c | 265 +++ backends/meson.build | 1 + backends/trace-events | 12 + hw/vfio/ap.c | 62 +- hw/vfio/as.c | 1035 +++++++++++ hw/vfio/ccw.c | 118 +- hw/vfio/common.c | 2365 ++----------------------- hw/vfio/container-base.c | 172 ++ hw/vfio/container.c | 1298 ++++++++++++++ hw/vfio/iommufd.c | 546 ++++++ hw/vfio/meson.build | 6 + hw/vfio/migration.c | 5 +- hw/vfio/pci.c | 83 +- hw/vfio/platform.c | 42 +- hw/vfio/spapr.c | 22 +- hw/vfio/trace-events | 11 + include/hw/vfio/vfio-common.h | 101 +- include/hw/vfio/vfio-container-base.h | 148 ++ include/qemu/char_dev.h | 16 + include/sysemu/iommufd.h | 47 + linux-headers/linux/iommufd.h | 223 +++ linux-headers/linux/vfio.h | 84 + qapi/qom.json | 16 +- qemu-options.hx | 12 + scripts/update-linux-headers.sh | 2 +- util/chardev_open.c | 58 + util/meson.build | 1 + 29 files changed, 4291 insertions(+), 2478 deletions(-) create mode 100644 backends/iommufd.c create mode 100644 hw/vfio/as.c create mode 100644 hw/vfio/container-base.c create mode 100644 hw/vfio/container.c create mode 100644 hw/vfio/iommufd.c create mode 100644 include/hw/vfio/vfio-container-base.h create mode 100644 include/qemu/char_dev.h create mode 100644 include/sysemu/iommufd.h create mode 100644 linux-headers/linux/iommufd.h create mode 100644 util/chardev_open.c Base commit: 9b1f58854959c5a9bdb347e3e04c252ab7fc9ef5 -- 2.27.0

1 0

[PATCH v2 0/2] fix uacce concurrency issue of uacce_remove
by Zhangfei Gao 27 Jun '22

27 Jun '22

When uacce is working, uacce parent module can be rmmod, parent device can also be removed anytime, which may cause concurrency issues. Here solve the concurrency issue. Jean-Philippe Brucker (1): uacce: Handle parent device removal Zhangfei Gao (1): uacce: Handle parent driver module removal drivers/misc/uacce/uacce.c | 135 ++++++++++++++++++++++++------------- include/linux/uacce.h | 6 +- 2 files changed, 92 insertions(+), 49 deletions(-) -- 2.36.1

2 5

[PATCH 1/5] uadk: support some uadk dfx stronger features
by Kai Ye 22 Jun '22

22 Jun '22

1. Add the function of setting the uadk log level, include error, info, debug by syslog. 2. The number of packets in a queue can be read through the 'uadk_tool'. 3. The 'uadk_tool' supports displaying the library build date. supports displaying the environment variables. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- 0 | 0 Makefile.am | 7 +- include/drv/wd_aead_drv.h | 1 + include/drv/wd_cipher_drv.h | 1 + include/drv/wd_dh_drv.h | 1 + include/drv/wd_digest_drv.h | 1 + include/drv/wd_ecc_drv.h | 1 + include/drv/wd_rsa_drv.h | 1 + include/wd.h | 69 +++-- include/wd_util.h | 25 +- test/hisi_zip_test/test_lib.c | 2 + uadk_tool/Makefile.am | 11 +- .../{ => benchmark}/sec_soft_benchmark.c | 0 .../{ => benchmark}/sec_soft_benchmark.h | 0 .../{ => benchmark}/sec_uadk_benchmark.c | 0 .../{ => benchmark}/sec_uadk_benchmark.h | 0 uadk_tool/{ => benchmark}/sec_wd_benchmark.c | 0 uadk_tool/{ => benchmark}/sec_wd_benchmark.h | 0 uadk_tool/{ => benchmark}/uadk_benchmark.c | 3 +- uadk_tool/{ => benchmark}/uadk_benchmark.h | 2 +- uadk_tool/dfx/uadk_dfx.c | 253 ++++++++++++++++++ uadk_tool/{ => dfx}/uadk_dfx.h | 3 - uadk_tool/uadk_dfx.c | 79 ------ uadk_tool/uadk_tool.c | 21 +- wd.c | 79 +++++- wd_aead.c | 9 +- wd_cipher.c | 8 + wd_comp.c | 2 + wd_dh.c | 7 + wd_digest.c | 7 + wd_ecc.c | 11 +- wd_rsa.c | 7 + wd_util.c | 91 ++++++- 33 files changed, 564 insertions(+), 138 deletions(-) create mode 100644 0 rename uadk_tool/{ => benchmark}/sec_soft_benchmark.c (100%) rename uadk_tool/{ => benchmark}/sec_soft_benchmark.h (100%) rename uadk_tool/{ => benchmark}/sec_uadk_benchmark.c (100%) rename uadk_tool/{ => benchmark}/sec_uadk_benchmark.h (100%) rename uadk_tool/{ => benchmark}/sec_wd_benchmark.c (100%) rename uadk_tool/{ => benchmark}/sec_wd_benchmark.h (100%) rename uadk_tool/{ => benchmark}/uadk_benchmark.c (99%) rename uadk_tool/{ => benchmark}/uadk_benchmark.h (97%) create mode 100644 uadk_tool/dfx/uadk_dfx.c rename uadk_tool/{ => dfx}/uadk_dfx.h (59%) delete mode 100644 uadk_tool/uadk_dfx.c diff --git a/0 b/0 new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.am b/Makefile.am index 0bda2f7..05d6bc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,11 @@ MINOR = 3 REVISION = 34 UADK_VERSION = -version-number ${MAJOR}:${MINOR}:${REVISION} -AM_CFLAGS+= -DUADK_VERSION_NUMBER="\"libwd version: ${MAJOR}.${MINOR}.${REVISION}\"" +DAY = 11 +MONTH = Jun +YEAR = 2022 +AM_CFLAGS+= -DUADK_VERSION_NUMBER="\"UADK version: ${MAJOR}.${MINOR}.${REVISION}\"" +AM_CFLAGS+= -DUADK_RELEASED_TIME="\"Released ${MONTH} ${DAY}, ${YEAR}\"" include_HEADERS = include/wd.h include/wd_cipher.h include/wd_aead.h \ include/wd_comp.h include/wd_dh.h include/wd_digest.h \ @@ -78,6 +82,7 @@ libhisi_hpre_la_SOURCES=drv/hisi_hpre.c drv/hisi_qm_udrv.c \ hisi_qm_udrv.h wd_hpre_drv.h if WD_STATIC_DRV AM_CFLAGS += -DWD_STATIC_DRV +AM_CFLAGS += -DWD_NO_LOG libwd_la_LIBADD = $(libwd_la_OBJECTS) -lnuma diff --git a/include/drv/wd_aead_drv.h b/include/drv/wd_aead_drv.h index cca28ba..de4a7d7 100644 --- a/include/drv/wd_aead_drv.h +++ b/include/drv/wd_aead_drv.h @@ -76,6 +76,7 @@ struct wd_aead_driver { void wd_aead_set_driver(struct wd_aead_driver *drv); struct wd_aead_driver *wd_aead_get_driver(void); +struct wd_aead_msg *wd_aead_get_msg(__u32 idx, __u32 tag); #ifdef WD_STATIC_DRV #define WD_AEAD_SET_DRIVER(drv) \ diff --git a/include/drv/wd_cipher_drv.h b/include/drv/wd_cipher_drv.h index 84c9844..a8da8cc 100644 --- a/include/drv/wd_cipher_drv.h +++ b/include/drv/wd_cipher_drv.h @@ -62,6 +62,7 @@ struct wd_cipher_driver { void wd_cipher_set_driver(struct wd_cipher_driver *drv); struct wd_cipher_driver *wd_cipher_get_driver(void); +struct wd_cipher_msg *wd_cipher_get_msg(__u32 idx, __u32 tag); #ifdef WD_STATIC_DRV #define WD_CIPHER_SET_DRIVER(drv) \ diff --git a/include/drv/wd_dh_drv.h b/include/drv/wd_dh_drv.h index f8e3065..57f774d 100644 --- a/include/drv/wd_dh_drv.h +++ b/include/drv/wd_dh_drv.h @@ -36,6 +36,7 @@ struct wd_dh_driver { void wd_dh_set_driver(struct wd_dh_driver *drv); struct wd_dh_driver *wd_dh_get_driver(void); +struct wd_dh_msg *wd_dh_get_msg(__u32 idx, __u32 tag); #ifdef WD_STATIC_DRV #define WD_DH_SET_DRIVER(drv) \ diff --git a/include/drv/wd_digest_drv.h b/include/drv/wd_digest_drv.h index 10ce6e1..39839f6 100644 --- a/include/drv/wd_digest_drv.h +++ b/include/drv/wd_digest_drv.h @@ -64,6 +64,7 @@ struct wd_digest_driver { void wd_digest_set_driver(struct wd_digest_driver *drv); struct wd_digest_driver *wd_digest_get_driver(void); +struct wd_digest_msg *wd_digest_get_msg(__u32 idx, __u32 tag); #ifdef WD_STATIC_DRV #define WD_DIGEST_SET_DRIVER(drv) \ diff --git a/include/drv/wd_ecc_drv.h b/include/drv/wd_ecc_drv.h index ef98606..c72cd8f 100644 --- a/include/drv/wd_ecc_drv.h +++ b/include/drv/wd_ecc_drv.h @@ -190,6 +190,7 @@ struct wd_ecc_driver { void wd_ecc_set_driver(struct wd_ecc_driver *drv); struct wd_ecc_driver *wd_ecc_get_driver(void); +struct wd_ecc_msg *wd_ecc_get_msg(__u32 idx, __u32 tag); #ifdef WD_STATIC_DRV #define WD_ECC_SET_DRIVER(drv) \ diff --git a/include/drv/wd_rsa_drv.h b/include/drv/wd_rsa_drv.h index 28c3337..22aa159 100644 --- a/include/drv/wd_rsa_drv.h +++ b/include/drv/wd_rsa_drv.h @@ -59,6 +59,7 @@ struct wd_rsa_driver { void wd_rsa_set_driver(struct wd_rsa_driver *drv); struct wd_rsa_driver *wd_rsa_get_driver(void); +struct wd_rsa_msg *wd_rsa_get_msg(__u32 idx, __u32 tag); #ifdef WD_STATIC_DRV #define WD_RSA_SET_DRIVER(drv) \ diff --git a/include/wd.h b/include/wd.h index 56c4109..8c45522 100644 --- a/include/wd.h +++ b/include/wd.h @@ -8,9 +8,11 @@ #define __WD_H #include <errno.h> #include <fcntl.h> +#include <stdbool.h> #include <stdint.h> #include <stdio.h> #include <string.h> +#include <syslog.h> #include <unistd.h> #include <asm/types.h> #include "uacce.h" @@ -25,39 +27,37 @@ extern "C" { #define MAX_DEV_NAME_LEN 256 #define LINUX_CRTDIR_SIZE 1 #define LINUX_PRTDIR_SIZE 2 +#define WD_CTX_CNT_NUM 1024 +#define WD_IPC_KEY 0x500011 typedef void (*wd_log)(const char *format, ...); -#ifndef WD_ERR -#ifndef WITH_LOG_FILE -extern wd_log log_out; - -#define __WD_FILENAME__ (strrchr(__FILE__, '/') ? \ - ((char *)((uintptr_t)strrchr(__FILE__, '/') + 1)) : __FILE__) - -#define WD_ERR(format, args...) \ - (log_out ? log_out("[%s, %d, %s]:"format, \ - __WD_FILENAME__, __LINE__, __func__, ##args) : \ - fprintf(stderr, format, ##args)) +#ifndef WD_NO_LOG +#define WD_DEBUG(fmt, args...) \ + do {\ + openlog("uadk-debug", LOG_CONS | LOG_PID, LOG_LOCAL5);\ + syslog(LOG_DEBUG, fmt, ##args);\ + } while (0) + +#define WD_INFO(fmt, args...) \ + do {\ + openlog("uadk-info", LOG_CONS | LOG_PID, LOG_LOCAL5);\ + syslog(LOG_INFO, fmt, ##args);\ + } while (0) + +#define WD_ERR(fmt, args...) \ + do {\ + openlog("uadk-err", LOG_CONS | LOG_PID, LOG_LOCAL5);\ + syslog(LOG_ERR, fmt, ##args);\ + } while (0) #else -extern FILE *flog_fd; -#define WD_ERR(format, args...) do { \ - if (!flog_fd) \ - flog_fd = fopen(WITH_LOG_FILE, "a+"); \ - if (flog_fd) \ - fprintf(flog_fd, format, ##args); \ - else \ - fprintf(stderr, "log %s not exists!", \ - WITH_LOG_FILE); \ -} while (0) -#endif +#define OPEN_LOG(s) +#define WD_DEBUG(fmt, args...) fprintf(stderr, fmt, ##args) +#define WD_INFO(fmt, args...) fprintf(stderr, fmt, ##args) +#define WD_ERR(fmt, args...) fprintf(stderr, fmt, ##args) #endif -#ifdef DEBUG_LOG -#define dbg(msg, ...) fprintf(stderr, msg, ##__VA_ARGS__) -#else -#define dbg(msg, ...) -#endif +#define WD_CONSOLE printf /* WD error code */ #define WD_SUCCESS 0 @@ -488,6 +488,21 @@ void wd_mempool_stats(handle_t mempool, struct wd_mempool_stats *stats); */ void wd_blockpool_stats(handle_t blkpool, struct wd_blockpool_stats *stats); +/** + * wd_get_version() - Get the libwd version number and released time. + */ +void wd_get_version(void); + +/** + * wd_need_debug() - Get the debug flag from rsyslog.cnf + */ +bool wd_need_debug(void); + +/** + * wd_need_info() - Get the info flag from rsyslog.cnf + */ +bool wd_need_info(void); + #ifdef __cplusplus } #endif diff --git a/include/wd_util.h b/include/wd_util.h index eb250f0..83a9684 100644 --- a/include/wd_util.h +++ b/include/wd_util.h @@ -8,6 +8,8 @@ #define __WD_UTIL_H #include <stdbool.h> +#include <sys/ipc.h> +#include <sys/shm.h> #include <asm/types.h> #include "wd_alg_common.h" @@ -292,7 +294,7 @@ int wd_add_task_to_async_queue(struct wd_env_config *config, __u32 idx); */ void dump_env_info(struct wd_env_config *config); -/* +/** * wd_alg_get_env_param() - get specific ctx number. * @config: Pointer of wd_env_config which is used to store environment * variable information. @@ -304,7 +306,7 @@ int wd_alg_get_env_param(struct wd_env_config *env_config, struct wd_ctx_attr attr, __u32 *num, __u8 *is_enable); -/* +/** * wd_set_ctx_attr() - set node type and mode for ctx * @ctx_attr: ctx attributes pointer. * @node: numa id. @@ -315,7 +317,7 @@ int wd_alg_get_env_param(struct wd_env_config *env_config, int wd_set_ctx_attr(struct wd_ctx_attr *ctx_attr, __u32 node, __u32 type, __u8 mode, __u32 num); -/* +/** * wd_check_ctx() - check ctx mode and index * @config: ctx config pointer. * @mode: synchronous or asynchronous mode. @@ -354,6 +356,23 @@ int wd_handle_msg_sync(struct wd_msg_handle *msg_handle, handle_t ctx, */ int wd_init_param_check(struct wd_ctx_config *config, struct wd_sched *sched); +/** + * wd_dfx_msg_cnt() - Message counter interface for ctx + * @msg: Shared memory addr. + * @numSize: Number of elements. + * @index: Indicates the CTX index. + */ +static inline void wd_dfx_msg_cnt(unsigned long *msg, __u32 numsize, __u32 idx) +{ + bool ret; + + ret = wd_need_info(); + if (idx > numsize || !ret) + return; + + msg[idx]++; +} + #ifdef __cplusplus } #endif diff --git a/test/hisi_zip_test/test_lib.c b/test/hisi_zip_test/test_lib.c index 374244a..5918699 100644 --- a/test/hisi_zip_test/test_lib.c +++ b/test/hisi_zip_test/test_lib.c @@ -22,6 +22,8 @@ struct check_rand_ctx { unsigned short state[3]; }; +#define dbg(msg, ...) fprintf(stderr, msg, ##__VA_ARGS__) + static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_spinlock_t lock; static int count = 0; diff --git a/uadk_tool/Makefile.am b/uadk_tool/Makefile.am index da5b229..f04b2f0 100644 --- a/uadk_tool/Makefile.am +++ b/uadk_tool/Makefile.am @@ -1,13 +1,16 @@ ACLOCAL_AMFLAGS = -I m4 -I./include -AM_CFLAGS=-Wall -fno-strict-aliasing -I$(top_srcdir) -I$(top_srcdir)/include \ +AUTOMAKE_OPTIONS = foreign subdir-objects +AM_CFLAGS=-Wall -fno-strict-aliasing -I$(top_srcdir) -I$(top_srcdir)/benchmark/include \ -pthread #AUTOMAKE_OPTIONS = subdir-objects bin_PROGRAMS=uadk_tool -uadk_tool_SOURCES=uadk_tool.c uadk_dfx.c uadk_benchmark.c \ - sec_uadk_benchmark.c sec_wd_benchmark.c +uadk_tool_SOURCES=uadk_tool.c dfx/uadk_dfx.c dfx/uadk_dfx.h \ + benchmark/uadk_benchmark.c benchmark/uadk_benchmark.h \ + benchmark/sec_uadk_benchmark.c benchmark/sec_uadk_benchmark.h \ + benchmark/sec_wd_benchmark.c benchmark/sec_wd_benchmark.h if WD_STATIC_DRV AM_CFLAGS+=-Bstatic @@ -27,7 +30,7 @@ uadk_tool_LDFLAGS=-Wl,-rpath,'/usr/local/lib' if WITH_OPENSSL_DIR AM_CFLAGS+= -DWITH_OPENSSL_DIR -I$(with_openssl_dir)/include -uadk_tool_SOURCES+=sec_soft_benchmark.c +uadk_tool_SOURCES+=benchmark/sec_soft_benchmark.c benchmark/sec_soft_benchmark.h if WD_STATIC_DRV uadk_tool_LDADD+= $(with_openssl_dir)/libcrypto.a diff --git a/uadk_tool/sec_soft_benchmark.c b/uadk_tool/benchmark/sec_soft_benchmark.c similarity index 100% rename from uadk_tool/sec_soft_benchmark.c rename to uadk_tool/benchmark/sec_soft_benchmark.c diff --git a/uadk_tool/sec_soft_benchmark.h b/uadk_tool/benchmark/sec_soft_benchmark.h similarity index 100% rename from uadk_tool/sec_soft_benchmark.h rename to uadk_tool/benchmark/sec_soft_benchmark.h diff --git a/uadk_tool/sec_uadk_benchmark.c b/uadk_tool/benchmark/sec_uadk_benchmark.c similarity index 100% rename from uadk_tool/sec_uadk_benchmark.c rename to uadk_tool/benchmark/sec_uadk_benchmark.c diff --git a/uadk_tool/sec_uadk_benchmark.h b/uadk_tool/benchmark/sec_uadk_benchmark.h similarity index 100% rename from uadk_tool/sec_uadk_benchmark.h rename to uadk_tool/benchmark/sec_uadk_benchmark.h diff --git a/uadk_tool/sec_wd_benchmark.c b/uadk_tool/benchmark/sec_wd_benchmark.c similarity index 100% rename from uadk_tool/sec_wd_benchmark.c rename to uadk_tool/benchmark/sec_wd_benchmark.c diff --git a/uadk_tool/sec_wd_benchmark.h b/uadk_tool/benchmark/sec_wd_benchmark.h similarity index 100% rename from uadk_tool/sec_wd_benchmark.h rename to uadk_tool/benchmark/sec_wd_benchmark.h diff --git a/uadk_tool/uadk_benchmark.c b/uadk_tool/benchmark/uadk_benchmark.c similarity index 99% rename from uadk_tool/uadk_benchmark.c rename to uadk_tool/benchmark/uadk_benchmark.c index 8c3c96f..84941d5 100644 --- a/uadk_tool/uadk_benchmark.c +++ b/uadk_tool/benchmark/uadk_benchmark.c @@ -567,7 +567,7 @@ static void print_help(void) ACC_TST_PRT("UPDATE:2021-7-28\n"); } -void benchmark_cmd_parse(int argc, char *argv[], struct acc_option *option) +int acc_cmd_parse(int argc, char *argv[], struct acc_option *option) { int option_index = 0; int c; @@ -638,6 +638,7 @@ void benchmark_cmd_parse(int argc, char *argv[], struct acc_option *option) exit(-1); } } + return 0; } int acc_option_convert(struct acc_option *option) diff --git a/uadk_tool/uadk_benchmark.h b/uadk_tool/benchmark/uadk_benchmark.h similarity index 97% rename from uadk_tool/uadk_benchmark.h rename to uadk_tool/benchmark/uadk_benchmark.h index 7ce0426..2cb3dc0 100644 --- a/uadk_tool/uadk_benchmark.h +++ b/uadk_tool/benchmark/uadk_benchmark.h @@ -170,7 +170,7 @@ extern void add_recv_data(u32 cnt); extern void add_send_complete(void); extern u32 get_recv_time(void); -void benchmark_cmd_parse(int argc, char *argv[], struct acc_option *option); +int acc_cmd_parse(int argc, char *argv[], struct acc_option *option); int acc_default_case(struct acc_option *option); int acc_option_convert(struct acc_option *option); int acc_benchmark_run(struct acc_option *option); diff --git a/uadk_tool/dfx/uadk_dfx.c b/uadk_tool/dfx/uadk_dfx.c new file mode 100644 index 0000000..796135a --- /dev/null +++ b/uadk_tool/dfx/uadk_dfx.c @@ -0,0 +1,253 @@ +/* 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 "include/wd.h" +#include "uadk_dfx.h" + +#define uadk_build_date() printf("built on: %s %s\n", __DATE__, __TIME__) +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define PRIVILEGE_FLAG 666 + +struct uadk_env_var { + const char *module; + const char *alg; + const char *ctx_num_var; + const char *epoll_en_var; +}; + +struct uadk_env_table { + int sync_ctx_num; + int sync_numa; + int async_ctx_num; + int async_numa; + int poll_en; +}; + +enum dfx_op_type { + DISPLAY_VERSION = 2, + DISPLAY_DATE, + DISPLAY_DIR, + DISPLAY_ENV, + DISPLAY_COUNT, + DISPLAY_HELP, +}; + +const char *uadk_modules[] = {"sec", "hpre", "zip"}; + +const struct uadk_env_var env_vars[] = { + {.module = "sec", .alg = "CIPHER", .ctx_num_var = "WD_CIPHER_CTX_NUM", + .epoll_en_var = "WD_CIPHER_EPOLL_EN"}, + {.module = "sec", .alg = "AEAD", .ctx_num_var = "WD_AEAD_CTX_NUM", + .epoll_en_var = "WD_AEAD_EPOLL_EN"}, + {.module = "sec", .alg = "DIGEST", .ctx_num_var = "WD_DIGEST_CTX_NUM", + .epoll_en_var = "WD_DIGEST_EPOLL_EN"}, + {.module = "hpre", .alg = "DH", .ctx_num_var = "WD_DH_CTX_NUM", + .epoll_en_var = "WD_DH_EPOLL_EN"}, + {.module = "hpre", .alg = "RSA", .ctx_num_var = "WD_RSA_CTX_NUM", + .epoll_en_var = "WD_RSA_EPOLL_EN"}, + {.module = "hpre", .alg = "ECC", .ctx_num_var = "WD_ECC_CTX_NUM", + .epoll_en_var = "WD_ECC_EPOLL_EN"}, + {.module = "zip", .alg = "COMP", .ctx_num_var = "WD_COMP_CTX_NUM", + .epoll_en_var = "WD_COMP_EPOLL_EN"}, +}; + +static void dump_ctx_count(unsigned long *count) +{ + __u32 idx = 0; + int i; + + if (!count) + return; + + printf("displays the ctx counter value...\n"); + for (i = 0; i < WD_CTX_CNT_NUM; i++) { + if (count[i]) { + printf("ctx-[%d]:%lu \t", i, count[i]); + idx++; + } else { + continue; + } + + if ((idx & 0x3) == 0) + printf("\n"); + } + printf("\n"); +} + +static int get_shared_id(void) +{ + int shm; + + shm = shmget(WD_IPC_KEY, sizeof(unsigned long) * WD_CTX_CNT_NUM, + IPC_CREAT | PRIVILEGE_FLAG); + if (shm < 0) { + printf("failed to get the shared memory id.\n"); + return -EINVAL; + } + + return shm; +} + +static int uadk_shared_read(void) +{ + unsigned long *shared; + void *ptr; + int shm; + + shm = get_shared_id(); + if (shm < 0) + return -EINVAL; + + ptr = (int *)shmat(shm, NULL, 0); + if (ptr < 0) { + printf("failed to get the shared memory addr.\n"); + return -EINVAL; + } + + shared = (unsigned long *)ptr; + + printf("get the shared memory addr successful.\n"); + dump_ctx_count(shared); + + shmdt(ptr); + + return 0; +} + +bool uadk_check_module(const char *module) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(uadk_modules); i++) { + if (!strncmp(module, uadk_modules[i], strlen(module))) + return true; + } + + return false; +} + +static void uadk_ctx_env_config(const char *s) +{ + char *env_setion; + + if (!s) { + printf("input ctx env config is NULL.\n"); + return; + } + + env_setion = getenv(s); + if (!env_setion) { + printf("not found the %s env config!\n", s); + return; + } + + printf("%s=%s\n", s, env_setion); +} + +static void uadk_parse_env_config(const char *module) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(env_vars); i++) { + if (!strncmp(module, env_vars[i].module, strlen(module))) { + uadk_ctx_env_config(env_vars[i].ctx_num_var); + uadk_ctx_env_config(env_vars[i].epoll_en_var); + } + } +} + +static void uadk_exe_path(void) +{ + char dir[PATH_MAX] = {0}; + int n; + + n = readlink("/proc/self/exe", dir, PATH_MAX); + if (n < 0 || n >= PATH_MAX) + printf("uadk tool failed to get the exe path.\n"); + + dir[PATH_MAX - 1] = '\0'; + printf("exe path: %s\n", dir); +} + +void print_dfx_help(void) +{ + printf("NAME\n"); + printf(" uadk_tool dfx : uadk library dfx function, etc\n"); + printf("USAGE\n"); + printf(" uadk_tool dfx [--version] = Show library version\n"); + printf(" uadk_tool dfx [--date] = Show build date\n"); + printf(" uadk_tool dfx [--dir] = Show library dir\n"); + printf(" uadk_tool dfx [--env] = Show environment variables\n"); + printf(" uadk_tool dfx [--count] = Show the ctx message count\n"); + printf(" uadk_tool dfx [--help] = usage\n"); + printf("Example\n"); + printf(" uadk_tool dfx --version\n"); + printf(" uadk_tool dfx --env sec\n"); + printf(" uadk_tool dfx --count\n"); +} + +void dfx_cmd_parse(int argc, char *argv[]) +{ + bool check_module = false; + char *input_module = NULL; + int option_index = 0; + int opt; + + static struct option long_options[] = { + {"version", no_argument, 0, 2}, + {"date", no_argument, 0, 3}, + {"dir", no_argument, 0, 4}, + {"env", required_argument, 0, 5}, + {"count", no_argument, 0, 6}, + {"help", no_argument, 0, 7}, + {0, 0, 0, 0} + }; + + while (1) { + opt = getopt_long(argc, argv, "", long_options, &option_index); + if (opt == -1) + break; + + switch (opt) { + case DISPLAY_VERSION: + wd_get_version(); + break; + case DISPLAY_DATE: + uadk_build_date(); + break; + case DISPLAY_DIR: + uadk_exe_path(); + break; + case DISPLAY_ENV: + input_module = optarg; + check_module = uadk_check_module(input_module); + if (check_module) { + uadk_parse_env_config(input_module); + } else { + print_dfx_help(); + printf("failed to parse module parameter!\n"); + } + break; + case DISPLAY_COUNT: + uadk_shared_read(); + break; + case DISPLAY_HELP: + print_dfx_help(); + break; + default: + printf("bad input parameter, exit!\n"); + print_dfx_help(); + break; + } + } +} diff --git a/uadk_tool/uadk_dfx.h b/uadk_tool/dfx/uadk_dfx.h similarity index 59% rename from uadk_tool/uadk_dfx.h rename to uadk_tool/dfx/uadk_dfx.h index 5f5d9e7..8dc1da1 100644 --- a/uadk_tool/uadk_dfx.h +++ b/uadk_tool/dfx/uadk_dfx.h @@ -2,9 +2,6 @@ #ifndef UADK_DFX_H #define UADK_DFX_H -#define UADK_VERSION_TEXT "UADK 2.3.22, Released Dec 20th, 2021" -#define UADK_VERSION_TAG "4b9c69d" - void print_dfx_help(void); void dfx_cmd_parse(int argc, char *argv[]); #endif diff --git a/uadk_tool/uadk_dfx.c b/uadk_tool/uadk_dfx.c deleted file mode 100644 index 96c4919..0000000 --- a/uadk_tool/uadk_dfx.c +++ /dev/null @@ -1,79 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include <getopt.h> -#include <unistd.h> -#include <limits.h> -#include "uadk_dfx.h" - -#define print_date() printf("built on: %s %s\n", __DATE__, __TIME__) - -static void print_version(void) -{ - printf("%s\n", UADK_VERSION_TEXT); - printf("%s\n", UADK_VERSION_TAG); -} - -static void print_exe_path(void) -{ - char dir[PATH_MAX] = {0}; - int n; - - n = readlink("/proc/self/exe", dir, PATH_MAX); - if (n < 0 || n >= PATH_MAX) - printf("uadk tool failed to get the exe path.\n"); - - printf("exe path: %s\n", dir); -} - -void print_dfx_help(void) -{ - printf("NAME\n"); - printf(" uadk_tool --dfx : uadk library dfx function, etc\n"); - printf("USAGE\n"); - printf(" uadk_tool --dfx [--version] = Show library version\n"); - printf(" uadk_tool --dfx [--date] = Show build date\n"); - printf(" uadk_tool --dfx [--dir] = Show library dir\n"); - printf(" uadk_tool --dfx [--help] = usage\n"); -} - -void dfx_cmd_parse(int argc, char *argv[]) -{ - int option_index = 0; - int c; - - static struct option long_options[] = { - {"version", no_argument, 0, 2}, - {"date", no_argument, 0, 3}, - {"dir", no_argument, 0, 4}, - {"help", no_argument, 0, 5}, - {0, 0, 0, 0} - }; - - while (1) { - c = getopt_long(argc, argv, "", long_options, &option_index); - if (c == -1) - break; - - switch (c) { - case 2: - print_version(); - break; - case 3: - print_date(); - break; - case 4: - print_exe_path(); - break; - case 5: - print_dfx_help(); - break; - default: - printf("bad input parameter, exit\n"); - exit(-1); - } - } -} diff --git a/uadk_tool/uadk_tool.c b/uadk_tool/uadk_tool.c index 88beeba..ce83d7a 100644 --- a/uadk_tool/uadk_tool.c +++ b/uadk_tool/uadk_tool.c @@ -1,12 +1,9 @@ /* SPDX-License-Identifier: Apache-2.0 */ #include <stdio.h> -#include <stdlib.h> #include <string.h> -#include <time.h> -#include <limits.h> -#include "uadk_dfx.h" -#include "uadk_benchmark.h" +#include "dfx/uadk_dfx.h" +#include "benchmark/uadk_benchmark.h" static void print_tool_help(void) { @@ -18,17 +15,21 @@ static void print_tool_help(void) int main(int argc, char **argv) { struct acc_option option = {0}; + int index = 1; int ret; - if (argc > 1) { - if (!strcmp("dfx", argv[1])) { + if (argc > index) { + if (!strcmp("dfx", argv[index])) { dfx_cmd_parse(argc, argv); - } else if (!strcmp("benchmark", argv[1])) { + } else if (!strcmp("benchmark", argv[index])) { printf("start UADK benchmark test.\n"); - if (!argv[2]) + if (!argv[++index]) acc_default_case(&option); - benchmark_cmd_parse(argc, argv, &option); + ret = acc_cmd_parse(argc, argv, &option); + if (ret) + return ret; + ret = acc_option_convert(&option); if (ret) return ret; diff --git a/wd.c b/wd.c index 3ce9c1e..2dbb2ab 100644 --- a/wd.c +++ b/wd.c @@ -14,6 +14,7 @@ #include <string.h> #include <sys/ioctl.h> #include <sys/mman.h> +#include <sys/stat.h> #include <numa.h> #include <sched.h> @@ -22,7 +23,14 @@ #define SYS_CLASS_DIR "/sys/class/uacce" -const char *WD_VERSION = UADK_VERSION_NUMBER; +enum UADK_LOG_LEVEL { + LOG_NONE = 0, + WD_LOG_ERROR, + WD_LOG_INFO, + WD_LOG_DEBUG, +}; + +static int uadk_log_level; struct wd_ctx_h { int fd; @@ -35,6 +43,54 @@ struct wd_ctx_h { void *priv; }; +static void wd_parse_log_level(void) +{ + const char *syslog_file = "/etc/rsyslog.conf"; + const char *log_dir = "/var/log/uadk.log"; + bool log_debug = false; + bool log_info = false; + struct stat file_info; + char *file_contents; + FILE *in_file; + + in_file = fopen(syslog_file, "r"); + if (!in_file) { + WD_ERR("failed to open the rsyslog.conf file.\n"); + return; + } + + if (stat(syslog_file, &file_info) == -1) { + WD_ERR("failed to get file information.\n"); + goto close_file; + } + + file_contents = malloc(file_info.st_size); + if (!file_contents) { + WD_ERR("failed to get file contents memory.\n"); + goto close_file; + } + + while (fscanf(in_file, "%[^\n ] ", file_contents) != EOF) { + if (!strcmp("local5.debug", file_contents)) + log_debug = true; + else if (!strcmp("local5.info", file_contents)) + log_info = true; + + if (log_debug && !strcmp(log_dir, file_contents)) { + uadk_log_level = WD_LOG_DEBUG; + break; + } else if (log_info && !strcmp(log_dir, file_contents)) { + uadk_log_level = WD_LOG_INFO; + break; + } + } + + free(file_contents); + +close_file: + fclose(in_file); +} + static int get_raw_attr(const char *dev_root, const char *attr, char *buf, size_t sz) { @@ -189,6 +245,8 @@ static struct uacce_dev *read_uacce_sysfs(const char *dev_name) if (!dev_name) return NULL; + wd_parse_log_level(); + dev = calloc(1, sizeof(struct uacce_dev)); if (!dev) return NULL; @@ -731,3 +789,22 @@ int wd_ctx_set_io_cmd(handle_t h_ctx, unsigned long cmd, void *arg) return ioctl(ctx->fd, cmd, arg); } + +void wd_get_version(void) +{ + const char *wd_released_time = UADK_RELEASED_TIME; + const char *wd_version = UADK_VERSION_NUMBER; + + WD_CONSOLE("%s\n", wd_version); + WD_CONSOLE("%s\n", wd_released_time); +} + +bool wd_need_debug(void) +{ + return uadk_log_level >= WD_LOG_DEBUG; +} + +bool wd_need_info(void) +{ + return uadk_log_level >= WD_LOG_INFO; +} diff --git a/wd_aead.c b/wd_aead.c index 7c07271..d43ace1 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -413,7 +413,7 @@ int wd_aead_init(struct wd_ctx_config *config, struct wd_sched *sched) wd_aead_set_static_drv(); #endif - /* init sync request pool */ + /* init async request pool */ ret = wd_init_async_request_pool(&wd_aead_setting.pool, config->ctx_num, WD_POOL_MAX_ENTRIES, sizeof(struct wd_aead_msg)); @@ -531,6 +531,7 @@ int wd_do_aead_sync(handle_t h_sess, struct wd_aead_req *req) if (unlikely(ret)) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; ret = send_recv_sync(ctx, &msg); req->state = msg.result; @@ -563,6 +564,7 @@ int wd_do_aead_async(handle_t h_sess, struct wd_aead_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; msg_id = wd_get_msg_from_pool(&wd_aead_setting.pool, @@ -594,6 +596,11 @@ fail_with_msg: return ret; } +struct wd_aead_msg *wd_aead_get_msg(__u32 idx, __u32 tag) +{ + return wd_find_msg_in_pool(&wd_aead_setting.pool, idx, tag); +} + int wd_aead_poll_ctx(__u32 idx, __u32 expt, __u32 *count) { struct wd_ctx_config_internal *config = &wd_aead_setting.config; diff --git a/wd_cipher.c b/wd_cipher.c index a7e393b..3d00598 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -442,7 +442,9 @@ int wd_do_cipher_sync(handle_t h_sess, struct wd_cipher_req *req) if (unlikely(ret)) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; + ret = send_recv_sync(ctx, &msg); req->state = msg.result; @@ -472,6 +474,7 @@ int wd_do_cipher_async(handle_t h_sess, struct wd_cipher_req *req) return ret; ctx = config->ctxs + idx; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); msg_id = wd_get_msg_from_pool(&wd_cipher_setting.pool, idx, (void **)&msg); @@ -502,6 +505,11 @@ fail_with_msg: return ret; } +struct wd_cipher_msg *wd_cipher_get_msg(__u32 idx, __u32 tag) +{ + return wd_find_msg_in_pool(&wd_cipher_setting.pool, idx, tag); +} + int wd_cipher_poll_ctx(__u32 idx, __u32 expt, __u32 *count) { struct wd_ctx_config_internal *config = &wd_cipher_setting.config; diff --git a/wd_comp.c b/wd_comp.c index 9107d60..eacebd3 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -406,6 +406,7 @@ static int wd_comp_sync_job(struct wd_comp_sess *sess, if (unlikely(ret)) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; msg_handle.send = wd_comp_setting.driver->comp_send; @@ -656,6 +657,7 @@ int wd_do_comp_async(handle_t h_sess, struct wd_comp_req *req) if (unlikely(ret)) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; tag = wd_get_msg_from_pool(&wd_comp_setting.pool, idx, (void **)&msg); diff --git a/wd_dh.c b/wd_dh.c index 9571ab6..cfe294d 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -212,6 +212,7 @@ int wd_do_dh_sync(handle_t sess, struct wd_dh_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; memset(&msg, 0, sizeof(struct wd_dh_msg)); @@ -257,6 +258,7 @@ int wd_do_dh_async(handle_t sess, struct wd_dh_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; mid = wd_get_msg_from_pool(&wd_dh_setting.pool, idx, (void **)&msg); @@ -288,6 +290,11 @@ fail_with_msg: return ret; } +struct wd_dh_msg *wd_dh_get_msg(__u32 idx, __u32 tag) +{ + return wd_find_msg_in_pool(&wd_dh_setting.pool, idx, tag); +} + int wd_dh_poll_ctx(__u32 idx, __u32 expt, __u32 *count) { struct wd_ctx_config_internal *config = &wd_dh_setting.config; diff --git a/wd_digest.c b/wd_digest.c index 0fff7c8..43b4bc5 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -340,6 +340,7 @@ int wd_do_digest_sync(handle_t h_sess, struct wd_digest_req *req) if (unlikely(ret)) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; ret = send_recv_sync(ctx, dsess, &msg); req->state = msg.result; @@ -372,6 +373,7 @@ int wd_do_digest_async(handle_t h_sess, struct wd_digest_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; msg_id = wd_get_msg_from_pool(&wd_digest_setting.pool, idx, @@ -403,6 +405,11 @@ fail_with_msg: return ret; } +struct wd_digest_msg *wd_digest_get_msg(__u32 idx, __u32 tag) +{ + return wd_find_msg_in_pool(&wd_digest_setting.pool, idx, tag); +} + int wd_digest_poll_ctx(__u32 idx, __u32 expt, __u32 *count) { struct wd_ctx_config_internal *config = &wd_digest_setting.config; diff --git a/wd_ecc.c b/wd_ecc.c index 76c9d5f..9d30607 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -853,14 +853,14 @@ static int fill_user_curve_cfg(struct wd_ecc_curve *param, if (setup->cv.type == WD_CV_CFG_ID) { curve_id = setup->cv.cfg.id; ret = fill_param_by_id(param, setup->key_bits, curve_id); - dbg("set curve id %u!\n", curve_id); + WD_DEBUG("set curve id %u!\n", curve_id); } else if (setup->cv.type == WD_CV_CFG_PARAM) { ret = set_key_cv(param, src_param); if (ret) { WD_ERR("failed to set key cv!\n"); return ret; } - dbg("set curve by user param!\n"); + WD_DEBUG("set curve by user param!\n"); } else { WD_ERR("invalid: fill curve cfg type %u is error!\n", setup->cv.type); return -WD_EINVAL; @@ -1407,6 +1407,7 @@ int wd_do_ecc_sync(handle_t h_sess, struct wd_ecc_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; memset(&msg, 0, sizeof(struct wd_ecc_msg)); @@ -2086,6 +2087,7 @@ int wd_do_ecc_async(handle_t sess, struct wd_ecc_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; mid = wd_get_msg_from_pool(&wd_ecc_setting.pool, idx, (void **)&msg); @@ -2116,6 +2118,11 @@ fail_with_msg: return ret; } +struct wd_ecc_msg *wd_ecc_get_msg(__u32 idx, __u32 tag) +{ + return wd_find_msg_in_pool(&wd_ecc_setting.pool, idx, tag); +} + int wd_ecc_poll_ctx(__u32 idx, __u32 expt, __u32 *count) { struct wd_ctx_config_internal *config = &wd_ecc_setting.config; diff --git a/wd_rsa.c b/wd_rsa.c index 868e78b..d65b01d 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -272,6 +272,7 @@ int wd_do_rsa_sync(handle_t h_sess, struct wd_rsa_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; memset(&msg, 0, sizeof(struct wd_rsa_msg)); @@ -317,6 +318,7 @@ int wd_do_rsa_async(handle_t sess, struct wd_rsa_req *req) if (ret) return ret; + wd_dfx_msg_cnt(config->msg_cnt, WD_CTX_CNT_NUM, idx); ctx = config->ctxs + idx; mid = wd_get_msg_from_pool(&wd_rsa_setting.pool, idx, (void **)&msg); @@ -347,6 +349,11 @@ fail_with_msg: return ret; } +struct wd_rsa_msg *wd_rsa_get_msg(__u32 idx, __u32 tag) +{ + return wd_find_msg_in_pool(&wd_rsa_setting.pool, idx, tag); +} + int wd_rsa_poll_ctx(__u32 idx, __u32 expt, __u32 *count) { struct wd_ctx_config_internal *config = &wd_rsa_setting.config; diff --git a/wd_util.c b/wd_util.c index de77d1e..04a2a5b 100644 --- a/wd_util.c +++ b/wd_util.c @@ -20,6 +20,7 @@ #define WD_BALANCE_THRHD 1280 #define WD_RECV_MAX_CNT_SLEEP 60000000 #define WD_RECV_MAX_CNT_NOSLEEP 200000000 +#define PRIVILEGE_FLAG 600 struct msg_pool { /* message array allocated dynamically */ @@ -70,11 +71,76 @@ static void clone_ctx_to_internal(struct wd_ctx *ctx, ctx_in->ctx_mode = ctx->ctx_mode; } +static int get_shared_memory_id(__u32 numsize) +{ + int shm; + + shm = shmget(WD_IPC_KEY, sizeof(unsigned long) * numsize, + IPC_CREAT | PRIVILEGE_FLAG); + if (shm < 0) { + WD_ERR("failed to get shared memory id.\n"); + return -WD_EINVAL; + } + + return shm; +} + +static unsigned long *wd_shared_create(__u32 numsize) +{ + bool need_info = wd_need_info(); + void *ptr; + int shm; + + if (!need_info) + return NULL; + + if (numsize > WD_CTX_CNT_NUM) { + WD_ERR("invalid: input parameter is err!\n"); + return NULL; + } + + shm = get_shared_memory_id(numsize); + if (shm < 0) + return NULL; + + ptr = shmat(shm, NULL, 0); + if (ptr == (void *)-1) { + WD_ERR("failed to get shared memory addr.\n"); + return NULL; + } + + memset(ptr, 0, sizeof(unsigned long) * numsize); + + return ptr; +} + +static void wd_shared_delete(__u32 numsize) +{ + bool need_info = wd_need_info(); + int shm; + + if (!need_info) + return; + + if (numsize > WD_CTX_CNT_NUM) { + WD_ERR("invalid: input parameter is err!\n"); + return; + } + + shm = get_shared_memory_id(numsize); + if (shm < 0) + return; + + /* deleted shared memory */ + shmctl(shm, IPC_RMID, NULL); +} + int wd_init_ctx_config(struct wd_ctx_config_internal *in, struct wd_ctx_config *cfg) { + bool need_info = wd_need_info(); struct wd_ctx_internal *ctxs; - int i, ret; + int i, j, ret; if (!cfg->ctx_num) { WD_ERR("invalid: ctx_num is 0!\n"); @@ -87,25 +153,29 @@ int wd_init_ctx_config(struct wd_ctx_config_internal *in, return -WD_EEXIST; } + in->msg_cnt = wd_shared_create(WD_CTX_CNT_NUM); + if (!in->msg_cnt && need_info) + return -WD_EINVAL; + ctxs = calloc(1, cfg->ctx_num * sizeof(struct wd_ctx_internal)); if (!ctxs) { WD_ERR("failed to alloc memory for internal ctxs!\n"); + wd_shared_delete(WD_CTX_CNT_NUM); return -WD_ENOMEM; } for (i = 0; i < cfg->ctx_num; i++) { if (!cfg->ctxs[i].ctx) { WD_ERR("invalid: ctx is NULL!\n"); - free(ctxs); - return -WD_EINVAL; + ret = -WD_EINVAL; + goto err_out; } clone_ctx_to_internal(cfg->ctxs + i, ctxs + i); ret = pthread_spin_init(&ctxs[i].lock, PTHREAD_PROCESS_SHARED); if (ret) { WD_ERR("failed to init ctxs lock!\n"); - free(ctxs); - return ret; + goto err_out; } } @@ -115,6 +185,14 @@ int wd_init_ctx_config(struct wd_ctx_config_internal *in, in->ctx_num = cfg->ctx_num; return 0; + +err_out: + for (j = 0; j < i; j++) + pthread_spin_destroy(&ctxs[j].lock); + + wd_shared_delete(WD_CTX_CNT_NUM); + free(ctxs); + return ret; } int wd_init_sched(struct wd_sched *in, struct wd_sched *from) @@ -161,6 +239,9 @@ void wd_clear_ctx_config(struct wd_ctx_config_internal *in) free(in->ctxs); in->ctxs = NULL; } + + wd_shared_delete(WD_CTX_CNT_NUM); + in->msg_cnt = NULL; } void wd_memset_zero(void *data, __u32 size) -- 2.33.0

1 4

[PATCH] drv/hpre: bugfix about sm2 async parsing error
by Zhiqi Song 21 Jun '22

21 Jun '22

After a series of modification, the 'hw_msg->low_tag' is used to represent the sequence of sync or async task element now. In async mode, the value of 'hw_msg->low_tag' comes from async task pool, refers to wd_get_msg_from_pool(). In sync mode, the value of 'hw_msg->low_tag' is a random number, refers to hisi_set_msg_id(). Therefore, whether 'hw_msg->low_tag' is zero cannot be used as the judgment condition for different modes, so 'hw_msg->low_tag' cannot be set to zero directly. This is the reason why the async task of sm2 failed. To fix this problem, we remove the operation of setting tag to zero, use 'qp_mode' to distinguish between sync and async modes. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- drv/hisi_hpre.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drv/hisi_hpre.c b/drv/hisi_hpre.c index 5d6e537..116097d 100644 --- a/drv/hisi_hpre.c +++ b/drv/hisi_hpre.c @@ -827,7 +827,6 @@ static int ecc_prepare_alg(struct wd_ecc_msg *msg, return 0; } - static int trans_cv_param_to_hpre_bin(struct wd_dtb *p, struct wd_dtb *a, struct wd_dtb *b, struct wd_dtb *n, struct wd_ecc_point *g) @@ -1942,13 +1941,12 @@ static int sm2_enc_out_transfer(struct wd_ecc_msg *msg, } static int ecc_out_transfer(struct wd_ecc_msg *msg, - struct hisi_hpre_sqe *hw_msg) + struct hisi_hpre_sqe *hw_msg, __u8 qp_mode) { int ret = -WD_EINVAL; void *va; - /* async */ - if (LW_U16(hw_msg->low_tag)) { + if (qp_mode == CTX_MODE_ASYNC) { va = VA_ADDR(hw_msg->hi_out, hw_msg->low_out); msg->req.dst = container_of(va, struct wd_ecc_out, data); } @@ -2240,7 +2238,8 @@ static int sm2_convert_dec_out(struct wd_ecc_msg *src, return ret; } -static int ecc_sqe_parse(struct hisi_qp *qp, struct wd_ecc_msg *msg, struct hisi_hpre_sqe *hw_msg) +static int ecc_sqe_parse(struct hisi_qp *qp, struct wd_ecc_msg *msg, + struct hisi_hpre_sqe *hw_msg) { struct wd_ecc_msg *temp_msg; __u64 tag; @@ -2262,7 +2261,7 @@ static int ecc_sqe_parse(struct hisi_qp *qp, struct wd_ecc_msg *msg, struct hisi hpre_result_check(hw_msg, &msg->result); if (!msg->result) { - ret = ecc_out_transfer(msg, hw_msg); + ret = ecc_out_transfer(msg, hw_msg, qp->q_info.qp_mode); if (ret) { msg->result = WD_OUT_EPARA; WD_ERR("failed to transfer out ecc BD, ret = %d!\n", ret); @@ -2306,7 +2305,7 @@ static int parse_second_sqe(handle_t h_qp, hsz = (hw_msg.task_len1 + 1) * BYTE_BITS; dst = *(struct wd_ecc_msg **)((uintptr_t)data + hsz * ECDH_OUT_PARAM_NUM); - hw_msg.low_tag = 0; /* use sync mode */ + ret = ecc_sqe_parse((struct hisi_qp *)h_qp, dst, &hw_msg); msg->result = dst->result; *second = dst; @@ -2325,6 +2324,7 @@ static int sm2_enc_parse(handle_t h_qp, __u32 hsz; int ret; + msg->tag = tag; data = VA_ADDR(hw_msg->hi_out, hw_msg->low_out); hsz = (hw_msg->task_len1 + 1) * BYTE_BITS; first = *(struct wd_ecc_msg **)((uintptr_t)data + @@ -2332,7 +2332,6 @@ static int sm2_enc_parse(handle_t h_qp, memcpy(&src, first + 1, sizeof(src)); /* parse first sqe */ - hw_msg->low_tag = 0; /* use sync mode */ ret = ecc_sqe_parse((struct hisi_qp *)h_qp, first, hw_msg); if (ret) { WD_ERR("failed to parse first BD, ret = %d!\n", ret); @@ -2351,11 +2350,12 @@ static int sm2_enc_parse(handle_t h_qp, WD_ERR("failed to convert sm2 std format, ret = %d!\n", ret); goto free_second; } + free_second: free_req(second); free_first: free_req(first); - msg->tag = tag; + return ret; } @@ -2376,21 +2376,21 @@ static int sm2_dec_parse(handle_t ctx, struct wd_ecc_msg *msg, memcpy(&src, dst + 1, sizeof(src)); /* parse first sqe */ - hw_msg->low_tag = 0; /* use sync mode */ ret = ecc_sqe_parse((struct hisi_qp *)ctx, dst, hw_msg); if (ret) { WD_ERR("failed to parse decode BD, ret = %d!\n", ret); goto fail; } msg->result = dst->result; + msg->tag = tag; ret = sm2_convert_dec_out(&src, dst); if (unlikely(ret)) { WD_ERR("failed to convert sm2 decode out, ret = %d!\n", ret); goto fail; } + fail: - msg->tag = tag; free(dst->req.dst); free(dst); -- 2.30.0

1 2

sig-AccLib UADK周例会
by openEuler conference 31 May '22

31 May '22

您好！ sig-AccLib SIG 邀请您参加 2022-06-01 11:00 召开的Zoom会议会议主题：sig-AccLib UADK周例会会议内容： zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论会议链接：https://us06web.zoom.us/j/82764528356?pwd=WWZ0eUEzdDQ4OUR6RURqOEJheTJyQT09 会议纪要：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-06-01 11:00, The subject of the conference is sig-AccLib UADK周例会, Summary: zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论 You can join the meeting at https://us06web.zoom.us/j/82764528356?pwd=WWZ0eUEzdDQ4OUR6RURqOEJheTJyQT09. 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 0/9] uadk: some misc fixes
by Weili Qian 31 May '22

31 May '22

These patches move some redundant codes to wd_utils from wd_<alg>.c, and remove the unnecessary locks in wd_<alg>.c. Weili Qian (9): uadk: move parameter check into wd_util.c comp: remove unused variable priv dh: remove the lock in async send ecc: remove the lock in async send funciton comp: remove the lock in async send dh: remove repeated send BD ecc: remove repeated send BD rsa: remove repeated send BD uadk: move send and recv code into wd_util.c drv/hisi_comp.c | 7 +-- drv/hisi_hpre.c | 18 ++++--- drv/hisi_sec.c | 44 +++++++++------ include/drv/wd_aead_drv.h | 4 +- include/drv/wd_cipher_drv.h | 4 +- include/drv/wd_comp_drv.h | 4 +- include/drv/wd_dh_drv.h | 4 +- include/drv/wd_digest_drv.h | 4 +- include/drv/wd_ecc_drv.h | 4 +- include/drv/wd_rsa_drv.h | 4 +- include/wd_util.h | 26 +++++++++ wd_aead.c | 52 +++--------------- wd_cipher.c | 53 +++--------------- wd_comp.c | 62 ++++----------------- wd_dh.c | 104 ++++++----------------------------- wd_digest.c | 62 +++++---------------- wd_ecc.c | 105 +++++++----------------------------- wd_rsa.c | 104 +++++++---------------------------- wd_util.c | 67 +++++++++++++++++++++++ 19 files changed, 244 insertions(+), 488 deletions(-) -- 2.33.0

1 9