- Acc - mailweb.openeuler.org

[PATCH 00/17] uadk_engine: some bugfix and cleanup
by Zhiqi Song 25 Nov '23

25 Nov '23

This patchset contains some bugfix and cleanup. Hao Fang (6): uadk_engine: cipher/digest: fixes for priv address check uadk_engine: ec: add BN_new memory check uadk_engine: rsa: fix mem leak for from_buf uadk_engine: uadk_rsa: fix to free from_buffer uadk_engine: uask_async: fix thread_attr res leak uadk_engine: async: fix add async send timeout Qi Tao (3): cipher: uadk_e_bind_ciphers function is optimized cipher: UADK_CIPHER_DESCR is optimized uadk_engine/v1: fix g_sec_ciphers_info[] error Weili Qian (2): uadk_engine: add device initialization status sm2: fixup switching soft sm2 decrypt problem Zhiqi Song (6): ecc: optimize sm2 sign check function digest: fix the address of async op uadk_engine: fixup resource management issues ecc: add check of siglen v1/pkey: add check of qlist v1/pkey: fix uninitialized variable src/uadk.h | 5 + src/uadk_aead.c | 39 ++++-- src/uadk_async.c | 14 +- src/uadk_async.h | 1 + src/uadk_cipher.c | 170 ++++++++---------------- src/uadk_cipher_adapter.c | 38 +++--- src/uadk_dh.c | 150 +++++++++++++-------- src/uadk_digest.c | 59 +++++++-- src/uadk_ec.c | 69 ++++++---- src/uadk_ecx.c | 8 +- src/uadk_pkey.c | 113 ++++++++++------ src/uadk_rsa.c | 218 +++++++++++++++++++------------ src/uadk_sm2.c | 42 +++--- src/v1/alg/ciphers/sec_ciphers.c | 2 +- src/v1/alg/pkey/hpre_rsa.c | 13 +- src/v1/alg/pkey/hpre_wd.c | 9 +- 16 files changed, 553 insertions(+), 397 deletions(-) -- 2.33.0

2 18

[PATCH 0/3] Synchronizing the uadk to the linaro repository
by Qi Tao 24 Nov '23

24 Nov '23

*** BLURB HERE *** Qi Tao (2): check whether the data address pointer is not null. uadk/aead: fix dlopen() exception check error Yang Shen (1): uadk/v1/comp - add comp ctx parameters check v1/wd_aead.c | 22 ++++++++++---- v1/wd_cipher.c | 22 ++++++++++---- v1/wd_comp.c | 81 +++++++++++++++++++++++++++++++++++++------------- v1/wd_dh.c | 6 ++-- v1/wd_digest.c | 19 ++++++++---- v1/wd_ecc.c | 8 ++--- v1/wd_rng.c | 13 +++++--- v1/wd_rsa.c | 12 ++++++-- v1/wd_util.c | 7 +++++ v1/wd_util.h | 1 + wd_aead.c | 2 +- 11 files changed, 142 insertions(+), 51 deletions(-) -- 2.33.0

1 0

[PATCH 01/10] uadk/v1/drv: hisi_zip_udrv - fix unmap buffer for lz77_zstd stream mode
by Yang Shen 20 Nov '23

20 Nov '23

In uadk v1, the library will alloc a ctx_buffer used for storing stream information. On hisilicon platform, the hardware will output some data to this buffer. So the ctx_buffer should be map to PA/IOVA. But here the lz77_zstd forgot to unmap this buffer on error branch. What's more, if the user use the wd_bmm ops, the unmap is a void function. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- v1/drv/hisi_zip_udrv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/v1/drv/hisi_zip_udrv.c b/v1/drv/hisi_zip_udrv.c index f820b7f..470acb9 100644 --- a/v1/drv/hisi_zip_udrv.c +++ b/v1/drv/hisi_zip_udrv.c @@ -512,6 +512,9 @@ static int fill_zip_addr_lz77_zstd(void *ssqe, unmap_phy_seq: drv_iova_unmap(q, zstd_out->literal, (void *)phy_lit, zstd_out->lit_sz); unmap_phy_lit: + if (msg->stream_mode == WCRYPTO_COMP_STATEFUL) + drv_iova_unmap(q, msg->ctx_buf, (void *)addr.ctxbuf_addr - CTX_BUFFER_OFFSET, + MAX_CTX_RSV_SIZE); drv_iova_unmap(q, msg->src, (void *)addr.source_addr, msg->in_size); return -WD_ENOMEM; } -- 2.33.0

1 9

AccLib SIG双周例会
by openEuler conference 14 Nov '23

14 Nov '23

您好！ sig-AccLib SIG 邀请您参加 2023-11-15 11:00 召开的Zoom会议会议主题：AccLib SIG双周例会会议内容：固定会议链接：https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/85651976213?pwd=ZANR0TJXwbb2Vpj4mhh1pDm1mrkYsM.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-11-15 11:00, The subject of the conference is AccLib SIG双周例会, Summary: 固定会议链接：https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/85651976213?pwd=ZANR0TJXwbb2Vpj4mhh1pDm1mrkYsM.1. 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/8] uadk_engine: support aead aes-gcm and sm4-ecb algorithm
by Wenkai Lin 09 Nov '23

09 Nov '23

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Wenkai Lin (7): uadk_engine: support aead aes-gcm algorithm cipher: fix uadk_e_destroy_cipher memory leak aead: fix for engine lock is not initialized uadk: fix cipher switchover to software calculation fails aead: fix tag length check aead: fix for aes gcm update process cipher: add sm4 ecb mode Zhiqi Song (1): uadk_engine: remove redundant param of async src/Makefile.am | 3 +- src/uadk.h | 3 +- src/uadk_aead.c | 778 ++++++++++++++++++++++++++++++++++++++ src/uadk_async.c | 8 +- src/uadk_async.h | 3 +- src/uadk_cipher.c | 536 +++++++++----------------- src/uadk_cipher_adapter.c | 209 ++++++++++ src/uadk_cipher_adapter.h | 36 ++ src/uadk_dh.c | 4 +- src/uadk_digest.c | 2 +- src/uadk_engine_init.c | 28 +- src/uadk_pkey.c | 2 +- src/uadk_rsa.c | 2 +- 13 files changed, 1246 insertions(+), 368 deletions(-) create mode 100644 src/uadk_aead.c create mode 100644 src/uadk_cipher_adapter.c create mode 100644 src/uadk_cipher_adapter.h -- 2.33.0

1 8

[PATCH 0/4] uadk: add new mode for cipher and digest
by Weili Qian 26 Oct '23

26 Oct '23

Add new mode for cipher and digest Weili Qian (4): uadk/cipher: support sm4-xts GB standard. uadk/v1/cipher: support sm4-xts GB standard uadk/v1/digest: support new AES mode algs uadk/v1: fix long hash state issue drv/hisi_sec.c | 8 ++- include/wd_cipher.h | 3 + v1/drv/hisi_sec_udrv.c | 146 ++++++++++++++++++++++++++++++----------- v1/wd_cipher.c | 3 +- v1/wd_cipher.h | 5 ++ v1/wd_digest.c | 69 +++++++++++++++++-- v1/wd_digest.h | 24 +++++-- v1/wd_util.c | 2 +- wd_alg.c | 3 + wd_cipher.c | 9 +-- 10 files changed, 216 insertions(+), 56 deletions(-) -- 2.33.0

1 4

AccLib-SIG例会
by openEuler conference 17 Oct '23

17 Oct '23

您好！ sig-AccLib SIG 邀请您参加 2023-10-18 11:00 召开的Zoom会议会议主题：AccLib-SIG例会会议链接：https://us06web.zoom.us/j/83885335452?pwd=qa1ToTUPz125bAiKZoOGenGlMzBfAU.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-10-18 11:00, The subject of the conference is AccLib-SIG例会, You can join the meeting at https://us06web.zoom.us/j/83885335452?pwd=qa1ToTUPz125bAiKZoOGenGlMzBfAU.1. 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/3] digest: alloc session and data when copy evp context
by Qi Tao 13 Oct '23

13 Oct '23

*** BLURB HERE *** Wenkai Lin (3): digest: fix free sess when it is still used digest: fix copy segment fault digest: alloc session and data when copy evp context src/uadk_digest.c | 144 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 102 insertions(+), 42 deletions(-) -- 2.33.0

1 3

[PATCH 01/11 v2] uadk_engine: cleanup code style of async functions
by Zhiqi Song 08 Oct '23

08 Oct '23

Cleanup the return value and judgment code style of async mode functions. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- src/uadk_async.c | 132 +++++++++++++++++++++++------------------------ src/uadk_async.h | 3 ++ 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/src/uadk_async.c b/src/uadk_async.c index 9251238..3462d67 100644 --- a/src/uadk_async.c +++ b/src/uadk_async.c @@ -48,67 +48,65 @@ static void async_fd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, int async_setup_async_event_notification(struct async_op *op) { ASYNC_WAIT_CTX *waitctx; + void *custom = NULL; OSSL_ASYNC_FD efd; - void *custom; memset(op, 0, sizeof(struct async_op)); + op->job = ASYNC_get_current_job(); - if (op->job == NULL) - return 1; + if (!op->job) + return DO_SYNC; waitctx = ASYNC_get_wait_ctx(op->job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; - if (ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, - &efd, &custom) == 0) { + if (!ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom)) { efd = eventfd(0, EFD_NONBLOCK); if (efd == -1) - return 0; + return UADK_E_FAIL; - if (ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_uadk_id, efd, - custom, async_fd_cleanup) == 0) { + if (!ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_uadk_id, efd, + custom, async_fd_cleanup)) { async_fd_cleanup(waitctx, engine_uadk_id, efd, NULL); - return 0; + return UADK_E_FAIL; } } - return 1; + return UADK_E_SUCCESS; } int async_clear_async_event_notification(void) { - ASYNC_JOB *job; ASYNC_WAIT_CTX *waitctx; + void *custom = NULL; OSSL_ASYNC_FD efd; size_t num_add_fds; size_t num_del_fds; - void *custom = NULL; + ASYNC_JOB *job; job = ASYNC_get_current_job(); - if (job == NULL) - return 0; + if (!job) + return UADK_E_FAIL; waitctx = ASYNC_get_wait_ctx(job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; - if (ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &num_add_fds, - NULL, &num_del_fds) == 0) - return 0; + if (!ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &num_add_fds, NULL, &num_del_fds)) + return UADK_E_FAIL; if (num_add_fds > 0) { - if (ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, - &efd, &custom) == 0) - return 0; + if (!ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom)) + return UADK_E_FAIL; async_fd_cleanup(waitctx, engine_uadk_id, efd, NULL); - if (ASYNC_WAIT_CTX_clear_fd(waitctx, engine_uadk_id) == 0) - return 0; + if (!ASYNC_WAIT_CTX_clear_fd(waitctx, engine_uadk_id)) + return UADK_E_FAIL; } - return 1; + return UADK_E_SUCCESS; } static void async_poll_task_free(void) @@ -120,11 +118,11 @@ static void async_poll_task_free(void) uadk_e_set_async_poll_state(DISABLE_ASYNC_POLLING); error = pthread_mutex_lock(&poll_queue.async_task_mutex); - if (error != 0) + if (error) return; task = poll_queue.head; - if (task != NULL) + if (task) OPENSSL_free(task); poll_queue.head = NULL; @@ -143,13 +141,13 @@ static int async_get_poll_task(int *id) while (!poll_queue.status[idx]) { idx = (idx + 1) % ASYNC_QUEUE_TASK_NUM; if (cnt++ == ASYNC_QUEUE_TASK_NUM) - return 0; + return UADK_E_FAIL; } *id = idx; poll_queue.rid = (idx + 1) % ASYNC_QUEUE_TASK_NUM; - return 1; + return UADK_E_SUCCESS; } static struct async_poll_task *async_get_queue_task(void) @@ -158,11 +156,11 @@ static struct async_poll_task *async_get_queue_task(void) struct async_poll_task *task_queue; int idx, ret; - if (pthread_mutex_lock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_lock(&poll_queue.async_task_mutex)) return NULL; ret = async_get_poll_task(&idx); - if (!ret) + if (ret == UADK_E_FAIL) goto err; task_queue = poll_queue.head; @@ -170,10 +168,10 @@ static struct async_poll_task *async_get_queue_task(void) poll_queue.is_recv = 0; err: - if (pthread_mutex_unlock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_unlock(&poll_queue.async_task_mutex)) return NULL; - if (cur_task && cur_task->op == NULL) + if (cur_task && !cur_task->op) return NULL; return cur_task; @@ -181,7 +179,7 @@ err: void async_free_poll_task(int id, bool is_cb) { - if (pthread_mutex_lock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_lock(&poll_queue.async_task_mutex)) return; poll_queue.status[id] = 0; @@ -189,7 +187,7 @@ void async_free_poll_task(int id, bool is_cb) if (is_cb) poll_queue.is_recv = 1; - if (pthread_mutex_unlock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_unlock(&poll_queue.async_task_mutex)) return; (void)sem_post(&poll_queue.empty_sem); @@ -202,17 +200,17 @@ int async_get_free_task(int *id) int idx, ret; int cnt = 0; - if (sem_wait(&poll_queue.empty_sem) != 0) - return 0; + if (sem_wait(&poll_queue.empty_sem)) + return UADK_E_FAIL; - if (pthread_mutex_lock(&poll_queue.async_task_mutex) != 0) - return 0; + if (pthread_mutex_lock(&poll_queue.async_task_mutex)) + return UADK_E_FAIL; idx = poll_queue.sid; while (poll_queue.status[idx]) { idx = (idx + 1) % ASYNC_QUEUE_TASK_NUM; if (cnt++ == ASYNC_QUEUE_TASK_NUM) { - ret = 0; + ret = UADK_E_FAIL; goto out; } } @@ -223,16 +221,16 @@ int async_get_free_task(int *id) task_queue = poll_queue.head; task = &task_queue[idx]; if (!task) { - ret = 0; + ret = UADK_E_FAIL; goto out; } task->op = NULL; - ret = 1; + ret = UADK_E_SUCCESS; out: - if (pthread_mutex_unlock(&poll_queue.async_task_mutex) != 0) - return 0; + if (pthread_mutex_unlock(&poll_queue.async_task_mutex)) + return UADK_E_FAIL; return ret; } @@ -246,7 +244,7 @@ static int async_add_poll_task(void *ctx, struct async_op *op, enum task_type ty task_queue = poll_queue.head; task = &task_queue[id]; if (!task) - return 0; + return UADK_E_FAIL; task->ctx = ctx; task->type = type; @@ -254,9 +252,9 @@ static int async_add_poll_task(void *ctx, struct async_op *op, enum task_type ty ret = sem_post(&poll_queue.full_sem); if (ret) - return 0; + return UADK_E_FAIL; - return 1; + return UADK_E_SUCCESS; } int async_pause_job(void *ctx, struct async_op *op, enum task_type type, int id) @@ -268,19 +266,19 @@ int async_pause_job(void *ctx, struct async_op *op, enum task_type type, int id) int ret; ret = async_add_poll_task(ctx, op, type, id); - if (ret == 0) + if (ret == UADK_E_FAIL) return ret; waitctx = ASYNC_get_wait_ctx((ASYNC_JOB *)op->job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; do { - if (ASYNC_pause_job() == 0) - return 0; + if (!ASYNC_pause_job()) + return UADK_E_FAIL; ret = ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom); - if (ret <= 0) + if (ret == UADK_E_FAIL) continue; if (read(efd, &buf, sizeof(uint64_t)) == -1) { @@ -298,13 +296,13 @@ int async_wake_job(ASYNC_JOB *job) { ASYNC_WAIT_CTX *waitctx; OSSL_ASYNC_FD efd; - void *custom; uint64_t buf = 1; + void *custom; int ret; waitctx = ASYNC_get_wait_ctx(job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; ret = ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom); if (ret > 0) { @@ -332,7 +330,7 @@ static void *async_poll_process_func(void *args) int ret, idx; while (uadk_e_get_async_poll_state()) { - if (sem_wait(&poll_queue.full_sem) != 0) { + if (sem_wait(&poll_queue.full_sem)) { if (errno == EINTR) { /* sem_wait is interrupted by interrupt, continue */ continue; @@ -340,7 +338,7 @@ static void *async_poll_process_func(void *args) } task = async_get_queue_task(); - if (task == NULL) { + if (!task) { (void)sem_post(&poll_queue.full_sem); usleep(1); continue; @@ -368,19 +366,19 @@ int 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 0; + return UADK_E_FAIL; poll_queue.head = malloc(sizeof(struct async_poll_task) * ASYNC_QUEUE_TASK_NUM); - if (poll_queue.head == NULL) - return 0; + if (!poll_queue.head) + return UADK_E_FAIL; memset(poll_queue.head, 0, sizeof(struct async_poll_task) * ASYNC_QUEUE_TASK_NUM); - if (sem_init(&poll_queue.empty_sem, 0, ASYNC_QUEUE_TASK_NUM) != 0) + if (sem_init(&poll_queue.empty_sem, 0, ASYNC_QUEUE_TASK_NUM)) goto err; - if (sem_init(&poll_queue.full_sem, 0, 0) != 0) + if (sem_init(&poll_queue.full_sem, 0, 0)) goto err; uadk_e_set_async_poll_state(ENABLE_ASYNC_POLLING); @@ -393,9 +391,9 @@ int async_module_init(void) poll_queue.thread_id = thread_id; OPENSSL_atexit(async_poll_task_free); - return 1; + return UADK_E_SUCCESS; err: async_poll_task_free(); - return 0; + return UADK_E_FAIL; } diff --git a/src/uadk_async.h b/src/uadk_async.h index 7e75951..8c26777 100644 --- a/src/uadk_async.h +++ b/src/uadk_async.h @@ -22,6 +22,9 @@ #include <openssl/async.h> #define ASYNC_QUEUE_TASK_NUM 1024 +#define UADK_E_SUCCESS 1 +#define UADK_E_FAIL 0 +#define DO_SYNC 1 struct async_op { ASYNC_JOB *job; -- 2.30.0

1 0

[PATCH] uadk_engine: support aead aes-gcm
by Wenkai Lin 28 Sep '23

28 Sep '23

The uadk_engine supports the AES GCM algorithm. The cipher and aead algorithms use the same set of EVP interfaces. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- src/Makefile.am | 3 +- src/sec_cipher_adapter.c | 195 ++++++++++++ src/sec_cipher_adapter.h | 36 +++ src/uadk.h | 2 - src/uadk_aead.c | 592 ++++++++++++++++++++++++++++++++++++ src/uadk_cipher.c | 625 +++++++++++++-------------------------- src/uadk_engine_init.c | 26 +- 7 files changed, 1052 insertions(+), 427 deletions(-) create mode 100755 src/sec_cipher_adapter.c create mode 100755 src/sec_cipher_adapter.h create mode 100755 src/uadk_aead.c diff --git a/src/Makefile.am b/src/Makefile.am index af16d85..b84d87f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,8 @@ endif #HAVE_CRYPTO3 uadk_engine_la_SOURCES=uadk_utils.c uadk_engine_init.c uadk_cipher.c \ uadk_digest.c uadk_async.c uadk_rsa.c uadk_sm2.c \ - uadk_pkey.c uadk_dh.c uadk_ec.c uadk_ecx.c + uadk_pkey.c uadk_dh.c uadk_ec.c uadk_ecx.c \ + uadk_aead.c sec_cipher_adapter.c uadk_engine_la_LIBADD=-ldl $(WD_LIBS) -lpthread uadk_engine_la_LDFLAGS=-module -version-number $(VERSION) diff --git a/src/sec_cipher_adapter.c b/src/sec_cipher_adapter.c new file mode 100755 index 0000000..694fa55 --- /dev/null +++ b/src/sec_cipher_adapter.c @@ -0,0 +1,195 @@ +/* + * Copyright 2020-2021 Huawei Technologies Co.,Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#include "sec_cipher_adapter.h" + +#define HW_SEC_V2 0 +#define HW_SEC_V3 1 +#define OTHERS_HW 2 + +int cipher_hw_v2_nids[] = { + NID_aes_128_cbc, + NID_aes_192_cbc, + NID_aes_256_cbc, + NID_aes_128_ecb, + NID_aes_192_ecb, + NID_aes_256_ecb, + NID_aes_128_xts, + NID_aes_256_xts, + NID_sm4_cbc, + NID_des_ede3_cbc, + NID_des_ede3_ecb, + NID_aes_128_gcm, + NID_aes_192_gcm, + NID_aes_256_gcm +}; + +int cipher_hw_v3_nids[] = { + NID_aes_128_cbc, + NID_aes_192_cbc, + NID_aes_256_cbc, + NID_aes_128_ctr, + NID_aes_192_ctr, + NID_aes_256_ctr, + NID_aes_128_ecb, + NID_aes_192_ecb, + NID_aes_256_ecb, + NID_aes_128_xts, + NID_aes_256_xts, + NID_sm4_cbc, + NID_sm4_ecb, + NID_des_ede3_cbc, + NID_des_ede3_ecb, + NID_aes_128_cfb128, + NID_aes_192_cfb128, + NID_aes_256_cfb128, + NID_aes_128_ofb128, + NID_aes_192_ofb128, + NID_aes_256_ofb128, + NID_sm4_cfb128, + NID_sm4_ofb128, + NID_sm4_ctr, + NID_aes_128_gcm, + NID_aes_192_gcm, + NID_aes_256_gcm +}; + +struct engine_cipher_info c_info[] = { + {NID_aes_128_cbc, NULL}, + {NID_aes_192_cbc, NULL}, + {NID_aes_256_cbc, NULL}, + {NID_aes_128_ctr, NULL}, + {NID_aes_192_ctr, NULL}, + {NID_aes_256_ctr, NULL}, + {NID_aes_128_ecb, NULL}, + {NID_aes_192_ecb, NULL}, + {NID_aes_256_ecb, NULL}, + {NID_aes_128_xts, NULL}, + {NID_aes_256_xts, NULL}, + {NID_sm4_cbc, NULL}, + {NID_sm4_ecb, NULL}, + {NID_des_ede3_cbc, NULL}, + {NID_des_ede3_ecb, NULL}, + {NID_aes_128_cfb128, NULL}, + {NID_aes_192_cfb128, NULL}, + {NID_aes_256_cfb128, NULL}, + {NID_aes_128_ofb128, NULL}, + {NID_aes_192_ofb128, NULL}, + {NID_aes_256_ofb128, NULL}, + {NID_sm4_cfb128, NULL}, + {NID_sm4_ofb128, NULL}, + {NID_sm4_ctr, NULL}, + {NID_aes_128_gcm, NULL}, + {NID_aes_192_gcm, NULL}, + {NID_aes_256_gcm, NULL} +}; + +static const unsigned int num_cc = ARRAY_SIZE(c_info); + +static void uadk_e_create_ciphers(int index) +{ + switch (c_info[index].nid) { + case NID_aes_128_gcm: + case NID_aes_192_gcm: + case NID_aes_256_gcm: + c_info[index].cipher = uadk_create_gcm_cipher_meth(c_info[index].nid); + break; + case NID_aes_128_cbc: + case NID_aes_192_cbc: + case NID_aes_256_cbc: + case NID_aes_128_ctr: + case NID_aes_192_ctr: + case NID_aes_256_ctr: + case NID_aes_128_ecb: + case NID_aes_192_ecb: + case NID_aes_256_ecb: + case NID_aes_128_xts: + case NID_aes_256_xts: + case NID_sm4_cbc: + case NID_sm4_ecb: + case NID_des_ede3_cbc: + case NID_des_ede3_ecb: + case NID_aes_128_cfb128: + case NID_aes_192_cfb128: + case NID_aes_256_cfb128: + case NID_aes_128_ofb128: + case NID_aes_192_ofb128: + case NID_aes_256_ofb128: + case NID_sm4_cfb128: + case NID_sm4_ofb128: + case NID_sm4_ctr: + c_info[index].cipher = uadk_create_cipher_meth(c_info[index].nid); + break; + default: + break; + } +} + +int uadk_e_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid) +{ + int platform = OTHERS_HW; + struct uacce_dev *dev; + + (void)e; + + if ((nids == NULL) && ((cipher == NULL) || (nid < 0))) { + if (cipher != NULL) + *cipher = NULL; + return 0; + } + + dev = wd_get_accel_dev("cipher"); + + if (!strcmp(dev->api, "hisi_qm_v2")) + platform = HW_SEC_V2; + else if (!strcmp(dev->api, "hisi_qm_v3")) + platform = HW_SEC_V3; + + if (cipher == NULL) { + if (platform == HW_SEC_V2) { + *nids = cipher_hw_v2_nids; + return ARRAY_SIZE(cipher_hw_v2_nids); + } else if (platform == HW_SEC_V3) { + *nids = cipher_hw_v3_nids; + return ARRAY_SIZE(cipher_hw_v3_nids); + } + } + + for (int i = 0; i < num_cc; i++) { + if (nid == c_info[i].nid) { + if (c_info[i].cipher == NULL) + uadk_e_create_ciphers(i); + + *cipher = c_info[i].cipher; + return 1; + } + } + + *cipher = NULL; + return 0; +} + +int uadk_e_bind_crypto(ENGINE *e) +{ + return ENGINE_set_ciphers(e, uadk_e_ciphers); +} + +void uadk_e_destroy_crypto(void) +{ + uadk_e_destroy_cipher(c_info, num_cc); + uadk_e_destroy_aead(c_info, num_cc); +} + diff --git a/src/sec_cipher_adapter.h b/src/sec_cipher_adapter.h new file mode 100755 index 0000000..3f010f2 --- /dev/null +++ b/src/sec_cipher_adapter.h @@ -0,0 +1,36 @@ +/* + * Copyright 2020-2021 Huawei Technologies Co.,Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#ifndef UADK_ADAPT_H +#define UADK_ADAPT_H +#include <openssl/engine.h> +#include <uadk/wd.h> + +struct engine_cipher_info { + int nid; + EVP_CIPHER *cipher; +}; + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +EVP_CIPHER *uadk_create_gcm_cipher_meth(int nid); +EVP_CIPHER *uadk_create_cipher_meth(int nid); +void uadk_e_destroy_aead(struct engine_cipher_info *info, int num); +void uadk_e_destroy_cipher(struct engine_cipher_info *info, int num); + +int uadk_e_bind_crypto(ENGINE *e); +void uadk_e_destroy_crypto(void); +#endif diff --git a/src/uadk.h b/src/uadk.h index 30c099f..78c8682 100644 --- a/src/uadk.h +++ b/src/uadk.h @@ -29,8 +29,6 @@ enum { }; extern const char *engine_uadk_id; -int uadk_e_bind_cipher(ENGINE *e); -void uadk_e_destroy_cipher(void); int uadk_e_bind_digest(ENGINE *e); void uadk_e_destroy_digest(void); int uadk_e_bind_rsa(ENGINE *e); diff --git a/src/uadk_aead.c b/src/uadk_aead.c new file mode 100755 index 0000000..30e95e1 --- /dev/null +++ b/src/uadk_aead.c @@ -0,0 +1,592 @@ +/* + * Copyright 2020-2021 Huawei Technologies Co.,Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#include <stdio.h> +#include <stdbool.h> +#include <string.h> +#include <dlfcn.h> +#include <openssl/aes.h> +#include <openssl/engine.h> +#include <uadk/wd_aead.h> +#include <uadk/wd_sched.h> +#include "sec_cipher_adapter.h" +#include "uadk.h" + +#define CTX_SYNC_ENC 0 +#define CTX_SYNC_DEC 1 +#define CTX_ASYNC_ENC 2 +#define CTX_ASYNC_DEC 3 +#define CTX_NUM 4 +#define AES_GCM_CTR_LEN 4 +#define AES_GCM_BLOCK_SIZE 16 +#define AES_GCM_IV_LEN 12 +#define AES_GCM_TAG_LEN 16 +#define GCM_FLAG (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_GCM_MODE \ + | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_AEAD_CIPHER \ + | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_ALWAYS_CALL_INIT) +#define KEY_BYTES_OFFSET 0x3 +#define AEAD_DOING 1 +#define AEAD_END 0 +#define AEAD_BLOCK_SIZE 0xFFFE00 + +struct aead_priv_ctx { + handle_t sess; + struct wd_aead_sess_setup setup; + struct wd_aead_req req; + unsigned char *data; + unsigned char iv[AES_GCM_BLOCK_SIZE]; + unsigned char mac[AES_GCM_TAG_LEN]; + const unsigned char *ckey; + unsigned int mac_len; +}; + +struct aead_engine { + struct wd_ctx_config ctx_cfg; + struct wd_sched sched; + int numa_id; + int pid; + pthread_spinlock_t lock; +}; + +static struct aead_engine engine; + +static EVP_CIPHER *uadk_aes_128_gcm; +static EVP_CIPHER *uadk_aes_192_gcm; +static EVP_CIPHER *uadk_aes_256_gcm; + +static handle_t sched_single_aead_init(handle_t h_sched_ctx, void *sched_param) +{ + struct sched_params *param = (struct sched_params *)sched_param; + struct sched_params *skey; + + skey = malloc(sizeof(struct sched_params)); + if (!skey) { + fprintf(stderr, "fail to alloc aead sched key!\n"); + return (handle_t)0; + } + + skey->numa_id = param->numa_id; + skey->type = param->type; + + return (handle_t)skey; +} + +static __u32 sched_single_pick_next_ctx(handle_t sched_ctx, void *sched_key, const int sched_mode) +{ + struct sched_params *key = (struct sched_params *)sched_key; + + if (sched_mode) { + if (key->type == WD_CIPHER_ENCRYPTION_DIGEST) + return CTX_ASYNC_ENC; + else + return CTX_ASYNC_DEC; + } else { + if (key->type == WD_CIPHER_ENCRYPTION_DIGEST) + return CTX_SYNC_ENC; + else + return CTX_SYNC_DEC; + } +} + +static int sched_single_poll_policy(handle_t h_sched_ctx, __u32 expect, __u32 *count) +{ + return 0; +} + +static int uadk_e_wd_aead_cipher_env_init(struct uacce_dev *dev) +{ + int ret; + + ret = uadk_e_set_env("WD_AEAD_CIPHER_CTX_NUM", dev->numa_id); + if (ret) + return ret; + + ret = wd_aead_env_init(NULL); + + return ret; +} + +static int uadk_e_wd_aead_cipher_init(struct uacce_dev *dev) +{ + int ret, i, j; + + engine.numa_id = dev->numa_id; + + ret = uadk_e_is_env_enabled("aead"); + if (ret) + return uadk_e_wd_aead_cipher_env_init(dev); + + memset(&engine.ctx_cfg, 0, sizeof(struct wd_ctx_config)); + engine.ctx_cfg.ctx_num = CTX_NUM; + engine.ctx_cfg.ctxs = calloc(CTX_NUM, sizeof(struct wd_ctx)); + if (!engine.ctx_cfg.ctxs) + return -ENOMEM; + + for (i = 0; i < CTX_NUM; i++) { + engine.ctx_cfg.ctxs[i].ctx = wd_request_ctx(dev); + if (!engine.ctx_cfg.ctxs[i].ctx) { + ret = -ENOMEM; + goto err_freectx; + } + } + + engine.ctx_cfg.ctxs[CTX_SYNC_ENC].op_type = CTX_TYPE_ENCRYPT; + engine.ctx_cfg.ctxs[CTX_SYNC_DEC].op_type = CTX_TYPE_DECRYPT; + engine.ctx_cfg.ctxs[CTX_SYNC_ENC].ctx_mode = CTX_MODE_SYNC; + engine.ctx_cfg.ctxs[CTX_SYNC_DEC].ctx_mode = CTX_MODE_SYNC; + + engine.ctx_cfg.ctxs[CTX_ASYNC_ENC].op_type = CTX_TYPE_ENCRYPT; + engine.ctx_cfg.ctxs[CTX_ASYNC_DEC].op_type = CTX_TYPE_DECRYPT; + engine.ctx_cfg.ctxs[CTX_ASYNC_ENC].ctx_mode = CTX_MODE_ASYNC; + engine.ctx_cfg.ctxs[CTX_ASYNC_DEC].ctx_mode = CTX_MODE_ASYNC; + + engine.sched.name = "sched_single"; + engine.sched.pick_next_ctx = sched_single_pick_next_ctx; + engine.sched.poll_policy = sched_single_poll_policy; + engine.sched.sched_init = sched_single_aead_init; + + ret = wd_aead_init(&engine.ctx_cfg, &engine.sched); + if (ret) + goto err_freectx; + + return ret; + +err_freectx: + for (j = 0; j < i; j++) + wd_release_ctx(engine.ctx_cfg.ctxs[j].ctx); + + free(engine.ctx_cfg.ctxs); + + return ret; +} + +static int uadk_e_init_aead_cipher(void) +{ + struct uacce_dev *dev; + int ret; + + if (engine.pid != getpid()) { + pthread_spin_lock(&engine.lock); + if (engine.pid == getpid()) { + pthread_spin_unlock(&engine.lock); + return 1; + } + + dev = wd_get_accel_dev("aead"); + if (!dev) { + pthread_spin_unlock(&engine.lock); + fprintf(stderr, "failed to get device for aead.\n"); + return 0; + } + + ret = uadk_e_wd_aead_cipher_init(dev); + if (ret < 0) { + pthread_spin_unlock(&engine.lock); + fprintf(stderr, "failed to initiate aead cipher.\n"); + return 0; + } + + engine.pid = getpid(); + pthread_spin_unlock(&engine.lock); + free(dev); + } + + return 1; +} + +static int uadk_e_ctx_init(EVP_CIPHER_CTX *ctx, struct aead_priv_ctx *priv) +{ + struct sched_params params = {0}; + int ret; + + ret = uadk_e_init_aead_cipher(); + if (unlikely(!ret)) { + fprintf(stderr, "uadk failed to init aead HW!\n"); + return 0; + } + + params.type = priv->req.op_type; + ret = uadk_e_is_env_enabled("aead"); + if (ret) + params.type = 0; + + params.numa_id = engine.numa_id; + priv->setup.sched_param = &params; + if (!priv->sess) { + priv->sess = wd_aead_alloc_sess(&priv->setup); + if (!priv->sess) { + fprintf(stderr, "uadk engine failed to alloc aead session!\n"); + return 0; + } + priv->data = malloc(AEAD_BLOCK_SIZE); + if (unlikely(!priv->data)) { + wd_aead_free_sess(priv->sess); + priv->sess = 0; + return 0; + } + } + + ret = wd_aead_set_ckey(priv->sess, priv->ckey, EVP_CIPHER_CTX_key_length(ctx)); + if (ret) { + wd_aead_free_sess(priv->sess); + free(priv->data); + priv->sess = 0; + priv->data = NULL; + fprintf(stderr, "uadk engine failed to set ckey!\n"); + return 0; + } + + return 1; +} + +static int uadk_e_aead_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *ckey, + const unsigned char *iv, int enc) +{ + struct aead_priv_ctx *priv = + (struct aead_priv_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + int ret; + + if (unlikely(!ckey)) + return 1; + + priv->req.op_type = enc ? WD_CIPHER_ENCRYPTION_DIGEST : WD_CIPHER_DECRYPTION_DIGEST; + + if (iv) + memcpy(priv->iv, iv, AES_GCM_IV_LEN); + + priv->setup.calg = WD_CIPHER_AES; + priv->setup.cmode = WD_CIPHER_GCM; + priv->setup.dalg = 0; + priv->setup.dmode = 0; + + priv->req.assoc_bytes = 0; + priv->req.data_fmt = WD_FLAT_BUF; + priv->req.iv_bytes = AES_GCM_IV_LEN; + memset(priv->iv + AES_GCM_IV_LEN, 0, AES_GCM_CTR_LEN); + priv->req.iv = priv->iv; + priv->req.mac_bytes = AES_GCM_TAG_LEN; + + if (enc) { + priv->req.mac = priv->mac; + } else { + priv->req.mac = calloc(AES_GCM_TAG_LEN, sizeof(char)); + } + + priv->ckey = ckey; + + ret = uadk_e_ctx_init(ctx, priv); + if (!ret) + return 0; + //return -1; + + return 1; +} + +static int uadk_e_aead_cipher_cleanup(EVP_CIPHER_CTX *ctx) +{ + struct aead_priv_ctx *priv = + (struct aead_priv_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + + if (priv->req.op_type == WD_CIPHER_DECRYPTION_DIGEST) + free(priv->req.mac); + + if (priv->sess) { + wd_aead_free_sess(priv->sess); + priv->sess = 0; + } + + if (priv->data) { + free(priv->data); + priv->data = NULL; + } + + return 1; +} + +static int uadk_e_aead_cipher_set_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) +{ + struct aead_priv_ctx *priv = + (struct aead_priv_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + int enc = EVP_CIPHER_CTX_encrypting(ctx); + + switch (type) { + case EVP_CTRL_INIT: + priv->req.iv_bytes = 0; + return 1; + case EVP_CTRL_GET_IVLEN: + *(int *)ptr = priv->req.iv_bytes; + return 1; + case EVP_CTRL_GCM_SET_IVLEN: + if (arg != AES_GCM_IV_LEN) { + fprintf(stderr, "gcm only support 12 bytes.\n"); + return 0; + } + return 1; + case EVP_CTRL_GCM_GET_TAG: + if (arg <= 0 || arg > AES_GCM_TAG_LEN) { + fprintf(stderr, "TAG length invalid.\n"); + return 0; + } + + priv->mac_len = arg; + + if (EVP_CIPHER_CTX_buf_noconst(ctx) == NULL || ptr == NULL) { + fprintf(stderr, "ctx memory pointer is invalid.\n"); + return 0; + } + + memcpy(ptr, EVP_CIPHER_CTX_buf_noconst(ctx), arg); + return 1; + case EVP_CTRL_GCM_SET_TAG: + if (arg != AES_GCM_TAG_LEN || enc) { + fprintf(stderr, "cannot set tag when encrypt or arg is invalid.\n"); + return 0; + } + + if (EVP_CIPHER_CTX_buf_noconst(ctx) == NULL || ptr == NULL) { + fprintf(stderr, "ctx memory pointer is invalid.\n"); + return 0; + } + + memcpy(EVP_CIPHER_CTX_buf_noconst(ctx), ptr, AES_GCM_TAG_LEN); + return 1; + default: + fprintf(stderr, "unsupported ctrl type: %d\n", type); + return 0; + } +} + +//static void openssl_aes_cb_t(unsigned char *key, unsigned int key_len, +// unsigned char *src, unsigned char *dst) +//{ +// unsigned int local_key_len = key_len << KEY_BYTES_OFFSET; +// AES_KEY local_key; +// +// AES_set_encrypt_key(key, local_key_len, &local_key); +// AES_ecb_encrypt(src, dst, &local_key, AES_ENCRYPT); +//} + +void hexdump(char *s, char *buf, int num) +{ + int i; + + printf("%s\n", s); + for (i = 0; i < num; i++) { + printf("\\%02X", buf[i]); + if ((i + 1) % 8 == 0) + printf("\n"); + } + printf("\n"); + + return; +} + +static int uadk_e_do_first(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inlen) +{ + unsigned char *ctx_buf = EVP_CIPHER_CTX_buf_noconst(ctx); + struct aead_priv_ctx *priv = + (struct aead_priv_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + int ret; + + ret = wd_aead_set_authsize(priv->sess, AES_GCM_TAG_LEN); + if (ret < 0) { + fprintf(stderr, "uadk engine failed to set authsize!\n"); + return -1; + } + + /* Only inputs aad data as do first */ + priv->req.src = (unsigned char *)in; + priv->req.in_bytes = inlen; + priv->req.assoc_bytes = inlen; + priv->req.dst = out; + priv->req.out_bytes = inlen; + priv->req.msg_state = AEAD_MSG_FIRST; + memcpy(priv->req.mac, ctx_buf, AES_GCM_TAG_LEN); + + ret = wd_do_aead_sync(priv->sess, &priv->req); + if (ret < 0) { + fprintf(stderr, "do sec aead first operation failed, ret:%d!\n", ret); + return -1; + } + + return 1; +} + +static int uadk_e_do_update(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inlen) +{ + struct aead_priv_ctx *priv = + (struct aead_priv_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + int ret; + + priv->req.src = (unsigned char *)in; + priv->req.dst = out; + + priv->req.in_bytes = inlen; + priv->req.out_bytes = inlen; + priv->req.msg_state = AEAD_MSG_MIDDLE; + + ret = wd_do_aead_sync(priv->sess, &priv->req); + if (ret < 0) { + fprintf(stderr, "do sec aead update operation failed, ret:%d!\n", ret); + return -1; + } + + return inlen; +} + +static int uadk_e_do_final(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inlen) +{ + struct aead_priv_ctx *priv = + (struct aead_priv_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx); + unsigned char *ctx_buf = EVP_CIPHER_CTX_buf_noconst(ctx); + int ret, enc; + + enc = EVP_CIPHER_CTX_encrypting(ctx); + priv->req.in_bytes = 0; + priv->req.dst = out; + priv->req.msg_state = AEAD_MSG_END; + + if (!enc) + memcpy(priv->mac, ctx_buf, AES_GCM_TAG_LEN); + + ret = wd_do_aead_sync(priv->sess, &priv->req); + if (ret < 0) { + fprintf(stderr, "do sec aead final operation failed, ret:%d!\n", ret); + return -1; + } + + if (enc) { + memcpy(ctx_buf, priv->req.mac, AES_GCM_TAG_LEN); + } else { + if (priv->req.state != WD_SUCCESS) + return -1; + else + return 1; + } + + return inlen; +} + +static int uadk_e_do_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inlen) +{ + if (in) { + if (out == NULL) + return uadk_e_do_first(ctx, out, in, inlen); + else + return uadk_e_do_update(ctx, out, in, inlen); + } else { + /* first ->update ->final */ + return uadk_e_do_final(ctx, out, NULL, 0); + } +} + +#define UADK_AEAD_DESCR(name, block_size, key_size, iv_len, flags, ctx_size,\ + init, cipher, cleanup, set_params, get_params, ctrl)\ +do {\ + uadk_##name = EVP_CIPHER_meth_new(NID_##name, block_size, key_size);\ + if (uadk_##name == 0 ||\ + !EVP_CIPHER_meth_set_iv_length(uadk_##name, iv_len) ||\ + !EVP_CIPHER_meth_set_flags(uadk_##name, flags) ||\ + !EVP_CIPHER_meth_set_impl_ctx_size(uadk_##name, ctx_size) ||\ + !EVP_CIPHER_meth_set_init(uadk_##name, init) ||\ + !EVP_CIPHER_meth_set_do_cipher(uadk_##name, cipher) ||\ + !EVP_CIPHER_meth_set_cleanup(uadk_##name, cleanup) ||\ + !EVP_CIPHER_meth_set_set_asn1_params(uadk_##name, set_params) ||\ + !EVP_CIPHER_meth_set_get_asn1_params(uadk_##name, get_params) ||\ + !EVP_CIPHER_meth_set_ctrl(uadk_##name, ctrl))\ + return 0;\ +} while (0) + +EVP_CIPHER *uadk_create_gcm_cipher_meth(int nid) +{ + EVP_CIPHER *aead = NULL; + + switch (nid) { + case NID_aes_128_gcm: + UADK_AEAD_DESCR(aes_128_gcm, AES_GCM_BLOCK_SIZE, 16, AES_GCM_IV_LEN, + GCM_FLAG, sizeof(struct aead_priv_ctx), + uadk_e_aead_cipher_init, uadk_e_do_aead_cipher, + uadk_e_aead_cipher_cleanup, + (EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_set_asn1_iv), + (EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_get_asn1_iv), + uadk_e_aead_cipher_set_ctrl); + aead = uadk_aes_128_gcm; + break; + case NID_aes_192_gcm: + UADK_AEAD_DESCR(aes_192_gcm, AES_GCM_BLOCK_SIZE, 24, AES_GCM_IV_LEN, + GCM_FLAG, sizeof(struct aead_priv_ctx), + uadk_e_aead_cipher_init, uadk_e_do_aead_cipher, + uadk_e_aead_cipher_cleanup, + (EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_set_asn1_iv), + (EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_get_asn1_iv), + uadk_e_aead_cipher_set_ctrl); + aead = uadk_aes_192_gcm; + break; + case NID_aes_256_gcm: + UADK_AEAD_DESCR(aes_256_gcm, AES_GCM_BLOCK_SIZE, 32, AES_GCM_IV_LEN, + GCM_FLAG, sizeof(struct aead_priv_ctx), + uadk_e_aead_cipher_init, uadk_e_do_aead_cipher, + uadk_e_aead_cipher_cleanup, + (EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_set_asn1_iv), + (EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_get_asn1_iv), + uadk_e_aead_cipher_set_ctrl); + aead = uadk_aes_256_gcm; + break; + default: + aead = NULL; + break; + } + + return aead; +} + +static void destroy_aead(struct engine_cipher_info *info, int num) +{ + int i; + + for (i = 0; i < num; i++) { + if (info[i].cipher != NULL) { + EVP_CIPHER_meth_free(info[i].cipher); + info[i].cipher = NULL; + } + } +} + +void uadk_e_destroy_aead(struct engine_cipher_info *info, int num) +{ + int i, ret; + + if (engine.pid == getpid()) { + ret = uadk_e_is_env_enabled("aead"); + if (ret) { + wd_aead_env_uninit(); + } else { + wd_aead_uninit(); + for (i = 0; i < engine.ctx_cfg.ctx_num; i++) + wd_release_ctx(engine.ctx_cfg.ctxs[i].ctx); + + free(engine.ctx_cfg.ctxs); + } + engine.pid = 0; + } + + pthread_spin_destroy(&engine.lock); + destroy_aead(info, num); +} diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index c87c7ee..2782ad5 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -25,6 +25,7 @@ #include <uadk/wd_sched.h> #include "uadk.h" #include "uadk_async.h" +#include "sec_cipher_adapter.h" #define UADK_DO_SOFT (-0xE0) #define CTX_SYNC_ENC 0 @@ -74,54 +75,8 @@ struct cipher_info { __u32 out_bytes; }; -static int platform; - #define SMALL_PACKET_OFFLOAD_THRESHOLD_DEFAULT 192 -static int cipher_hw_v2_nids[] = { - NID_aes_128_cbc, - NID_aes_192_cbc, - NID_aes_256_cbc, - NID_aes_128_ecb, - NID_aes_192_ecb, - NID_aes_256_ecb, - NID_aes_128_xts, - NID_aes_256_xts, - NID_sm4_cbc, - NID_des_ede3_cbc, - NID_des_ede3_ecb, - NID_sm4_ecb, - 0, -}; - -static int cipher_hw_v3_nids[] = { - NID_aes_128_cbc, - NID_aes_192_cbc, - NID_aes_256_cbc, - NID_aes_128_ctr, - NID_aes_192_ctr, - NID_aes_256_ctr, - NID_aes_128_ecb, - NID_aes_192_ecb, - NID_aes_256_ecb, - NID_aes_128_xts, - NID_aes_256_xts, - NID_sm4_cbc, - NID_sm4_ecb, - NID_des_ede3_cbc, - NID_des_ede3_ecb, - NID_aes_128_cfb128, - NID_aes_192_cfb128, - NID_aes_256_cfb128, - NID_aes_128_ofb128, - NID_aes_192_ofb128, - NID_aes_256_ofb128, - NID_sm4_cfb128, - NID_sm4_ofb128, - NID_sm4_ctr, - 0, -}; - static EVP_CIPHER *uadk_aes_128_cbc; static EVP_CIPHER *uadk_aes_192_cbc; static EVP_CIPHER *uadk_aes_256_cbc; @@ -134,7 +89,7 @@ static EVP_CIPHER *uadk_aes_256_ecb; static EVP_CIPHER *uadk_aes_128_xts; static EVP_CIPHER *uadk_aes_256_xts; static EVP_CIPHER *uadk_sm4_cbc; -static EVP_CIPHER *uadk_sm4_ecb; +// static EVP_CIPHER *uadk_sm4_ecb; static EVP_CIPHER *uadk_des_ede3_cbc; static EVP_CIPHER *uadk_des_ede3_ecb; static EVP_CIPHER *uadk_aes_128_cfb128; @@ -317,6 +272,12 @@ static int uadk_e_cipher_soft_work(EVP_CIPHER_CTX *ctx, unsigned char *out, return 1; } +static int sec_ciphers_is_check_valid(struct cipher_priv_ctx *priv) +{ + return priv->req.in_bytes <= priv->switch_threshold ? + 0 : 1; +} + static void uadk_e_cipher_sw_cleanup(EVP_CIPHER_CTX *ctx) { struct cipher_priv_ctx *priv = @@ -328,130 +289,6 @@ static void uadk_e_cipher_sw_cleanup(EVP_CIPHER_CTX *ctx) } } -static int uadk_get_accel_platform(char *alg_name) -{ - struct uacce_dev *dev; - - dev = wd_get_accel_dev(alg_name); - if (dev == NULL) - return 0; - - if (!strcmp(dev->api, "hisi_qm_v2")) - platform = HW_V2; - else - platform = HW_V3; - free(dev); - - return 1; -} - -static int uadk_e_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, - const int **nids, int nid) -{ - int *cipher_nids; - __u32 size, i; - int ret = 1; - - if (platform == HW_V2) { - size = (sizeof(cipher_hw_v2_nids) - 1) / sizeof(int); - cipher_nids = cipher_hw_v2_nids; - } else { - size = (sizeof(cipher_hw_v3_nids) - 1) / sizeof(int); - cipher_nids = cipher_hw_v3_nids; - } - - if (!cipher) { - *nids = cipher_nids; - return size; - } - - for (i = 0; i < size; i++) { - if (nid == cipher_nids[i]) - break; - } - - switch (nid) { - case NID_aes_128_cbc: - *cipher = uadk_aes_128_cbc; - break; - case NID_aes_192_cbc: - *cipher = uadk_aes_192_cbc; - break; - case NID_aes_256_cbc: - *cipher = uadk_aes_256_cbc; - break; - case NID_aes_128_ctr: - *cipher = uadk_aes_128_ctr; - break; - case NID_aes_192_ctr: - *cipher = uadk_aes_192_ctr; - break; - case NID_aes_256_ctr: - *cipher = uadk_aes_256_ctr; - break; - case NID_aes_128_ecb: - *cipher = uadk_aes_128_ecb; - break; - case NID_aes_192_ecb: - *cipher = uadk_aes_192_ecb; - break; - case NID_aes_256_ecb: - *cipher = uadk_aes_256_ecb; - break; - case NID_aes_128_xts: - *cipher = uadk_aes_128_xts; - break; - case NID_aes_256_xts: - *cipher = uadk_aes_256_xts; - break; - case NID_sm4_cbc: - *cipher = uadk_sm4_cbc; - break; - case NID_sm4_ecb: - *cipher = uadk_sm4_ecb; - break; - case NID_des_ede3_cbc: - *cipher = uadk_des_ede3_cbc; - break; - case NID_des_ede3_ecb: - *cipher = uadk_des_ede3_ecb; - break; - case NID_aes_128_ofb128: - *cipher = uadk_aes_128_ofb128; - break; - case NID_aes_192_ofb128: - *cipher = uadk_aes_192_ofb128; - break; - case NID_aes_256_ofb128: - *cipher = uadk_aes_256_ofb128; - break; - case NID_aes_128_cfb128: - *cipher = uadk_aes_128_cfb128; - break; - case NID_aes_192_cfb128: - *cipher = uadk_aes_192_cfb128; - break; - case NID_aes_256_cfb128: - *cipher = uadk_aes_256_cfb128; - break; - case NID_sm4_ofb128: - *cipher = uadk_sm4_ofb128; - break; - case NID_sm4_cfb128: - *cipher = uadk_sm4_cfb128; - break; - case NID_sm4_ctr: - *cipher = uadk_sm4_ctr; - break; - default: - ret = 0; - *cipher = NULL; - break; - } - - return ret; -} - static handle_t sched_single_init(handle_t h_sched_ctx, void *sched_param) { struct sched_params *param = (struct sched_params *)sched_param; @@ -717,17 +554,17 @@ static int uadk_e_cipher_cleanup(EVP_CIPHER_CTX *ctx) return 1; } -static void *uadk_e_cipher_cb(struct wd_cipher_req *req, void *data) +static void async_cb(struct wd_cipher_req *req, void *data) { struct uadk_e_cb_info *cb_param; struct async_op *op; if (!req) - return NULL; + return; cb_param = req->cb_param; if (!cb_param) - return NULL; + return; op = cb_param->op; if (op && op->job && !op->done) { @@ -735,8 +572,6 @@ static void *uadk_e_cipher_cb(struct wd_cipher_req *req, void *data) async_free_poll_task(op->idx, 1); async_wake_job(op->job); } - - return NULL; } /* Increment counter (128-bit int) by c */ @@ -764,15 +599,16 @@ static void uadk_cipher_update_priv_ctx(struct cipher_priv_ctx *priv) __u16 iv_bytes = priv->req.iv_bytes; int offset = priv->req.in_bytes - iv_bytes; unsigned char K[IV_LEN] = {0}; - __u32 i; + int i; switch (priv->setup.mode) { - case WD_CIPHER_CFB: case WD_CIPHER_CBC: if (priv->req.op_type == WD_CIPHER_ENCRYPTION) - memcpy(priv->iv, priv->req.dst + offset, iv_bytes); + memcpy(priv->iv, priv->req.dst + priv->req.in_bytes - iv_bytes, + iv_bytes); else - memcpy(priv->iv, priv->req.src + offset, iv_bytes); + memcpy(priv->iv, priv->req.src + priv->req.in_bytes - iv_bytes, + iv_bytes); break; case WD_CIPHER_OFB: @@ -781,6 +617,15 @@ static void uadk_cipher_update_priv_ctx(struct cipher_priv_ctx *priv) *((unsigned char *)priv->req.dst + offset + i); } memcpy(priv->iv, K, iv_bytes); + break; + case WD_CIPHER_CFB: + if (priv->req.op_type == WD_CIPHER_ENCRYPTION) + memcpy(priv->iv, priv->req.dst + priv->req.in_bytes - iv_bytes, + iv_bytes); + else + memcpy(priv->iv, priv->req.src + priv->req.in_bytes - iv_bytes, + iv_bytes); + break; case WD_CIPHER_CTR: ctr_iv_inc(priv->iv, priv->req.in_bytes >> CTR_MODE_LEN_SHIFT); @@ -794,16 +639,11 @@ static int do_cipher_sync(struct cipher_priv_ctx *priv) { int ret; - if (unlikely(priv->switch_flag == UADK_DO_SOFT)) { - fprintf(stderr, "switch to soft cipher.\n"); + if (unlikely(priv->switch_flag == UADK_DO_SOFT)) return 0; - } - /* - * If the length of the input data does not reach to hardware computing threshold, - * directly switch to soft cipher. - */ - if (priv->req.in_bytes <= priv->switch_threshold) + ret = sec_ciphers_is_check_valid(priv); + if (!ret) return 0; ret = wd_do_cipher_sync(priv->sess, &priv->req); @@ -818,15 +658,14 @@ static int do_cipher_async(struct cipher_priv_ctx *priv, struct async_op *op) int idx, ret; if (unlikely(priv->switch_flag == UADK_DO_SOFT)) { - fprintf(stderr, "switch to soft cipher.\n"); + fprintf(stderr, "async cipher init failed.\n"); return 0; } cb_param.op = op; cb_param.priv = priv; - priv->req.cb = uadk_e_cipher_cb; + priv->req.cb = (void *)async_cb; priv->req.cb_param = &cb_param; - ret = async_get_free_task(&idx); if (!ret) return 0; @@ -849,10 +688,8 @@ static int do_cipher_async(struct cipher_priv_ctx *priv, struct async_op *op) static void uadk_e_ctx_init(EVP_CIPHER_CTX *ctx, struct cipher_priv_ctx *priv) { - __u32 cipher_counts = ARRAY_SIZE(cipher_info_table); struct sched_params params = {0}; - int nid, ret; - __u32 i; + int ret; priv->req.iv_bytes = EVP_CIPHER_CTX_iv_length(ctx); priv->req.iv = priv->iv; @@ -880,34 +717,15 @@ static void uadk_e_ctx_init(EVP_CIPHER_CTX *ctx, struct cipher_priv_ctx *priv) /* Use the default numa parameters */ params.numa_id = -1; priv->setup.sched_param = &params; - if (!priv->sess) { - nid = EVP_CIPHER_CTX_nid(ctx); - - for (i = 0; i < cipher_counts; i++) { - if (nid == cipher_info_table[i].nid) { - cipher_priv_ctx_setup(priv, cipher_info_table[i].alg, - cipher_info_table[i].mode, cipher_info_table[i].out_bytes); - break; - } - } - - if (i == cipher_counts) { - fprintf(stderr, "failed to setup the private ctx.\n"); - return; - } - priv->sess = wd_cipher_alloc_sess(&priv->setup); - if (!priv->sess) { + if (!priv->sess) fprintf(stderr, "uadk failed to alloc session!\n"); - return; - } } ret = wd_cipher_set_key(priv->sess, priv->key, EVP_CIPHER_CTX_key_length(ctx)); if (ret) { wd_cipher_free_sess(priv->sess); - priv->sess = 0; fprintf(stderr, "uadk failed to set key!\n"); } } @@ -938,14 +756,6 @@ static int uadk_e_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, if (!ret) goto sync_err; } else { - /* - * If the length of the input data - * does not reach to hardware computing threshold, - * directly switch to soft cipher. - */ - if (priv->req.in_bytes <= priv->switch_threshold) - goto sync_err; - ret = do_cipher_async(priv, &op); if (!ret) goto out_notify; @@ -978,210 +788,193 @@ do { \ return 0; \ } while (0) -static int bind_v2_cipher(void) -{ - UADK_CIPHER_DESCR(aes_128_cbc, 16, 16, 16, EVP_CIPH_CBC_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_192_cbc, 16, 24, 16, EVP_CIPH_CBC_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_256_cbc, 16, 32, 16, EVP_CIPH_CBC_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_128_ecb, 16, 16, 0, EVP_CIPH_ECB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_192_ecb, 16, 24, 0, EVP_CIPH_ECB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_256_ecb, 16, 32, 0, EVP_CIPH_ECB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_128_xts, 1, 32, 16, EVP_CIPH_XTS_MODE | EVP_CIPH_CUSTOM_IV, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_256_xts, 1, 64, 16, EVP_CIPH_XTS_MODE | EVP_CIPH_CUSTOM_IV, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(sm4_cbc, 16, 16, 16, EVP_CIPH_CBC_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(des_ede3_cbc, 8, 24, 8, EVP_CIPH_CBC_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(des_ede3_ecb, 8, 24, 0, EVP_CIPH_ECB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(sm4_ecb, 16, 16, 16, EVP_CIPH_ECB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - - return 0; -} - -static int bind_v3_cipher(void) -{ - UADK_CIPHER_DESCR(aes_128_ctr, 1, 16, 16, EVP_CIPH_CTR_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_192_ctr, 1, 24, 16, EVP_CIPH_CTR_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_256_ctr, 1, 32, 16, EVP_CIPH_CTR_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_128_ofb128, 1, 16, 16, EVP_CIPH_OFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_192_ofb128, 1, 24, 16, EVP_CIPH_OFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_256_ofb128, 1, 32, 16, EVP_CIPH_OFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_128_cfb128, 1, 16, 16, EVP_CIPH_CFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_192_cfb128, 1, 24, 16, EVP_CIPH_CFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(aes_256_cfb128, 1, 32, 16, EVP_CIPH_CFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(sm4_ofb128, 1, 16, 16, EVP_CIPH_OFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(sm4_cfb128, 1, 16, 16, EVP_CIPH_OFB_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - UADK_CIPHER_DESCR(sm4_ctr, 1, 16, 16, EVP_CIPH_CTR_MODE, - sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, - uadk_e_do_cipher, uadk_e_cipher_cleanup, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); - - return 0; -} - -int uadk_e_bind_cipher(ENGINE *e) +EVP_CIPHER *uadk_create_cipher_meth(int nid) { - int ret; + EVP_CIPHER *cipher; - ret = uadk_get_accel_platform("cipher"); - if (!ret) { - fprintf(stderr, "failed to get accel hardware version.\n"); - return 0; + switch (nid) { + case NID_aes_128_cbc: + UADK_CIPHER_DESCR(aes_128_cbc, 16, 16, 16, EVP_CIPH_CBC_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_128_cbc; + break; + case NID_aes_192_cbc: + UADK_CIPHER_DESCR(aes_192_cbc, 16, 24, 16, EVP_CIPH_CBC_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_192_cbc; + break; + case NID_aes_256_cbc: + UADK_CIPHER_DESCR(aes_256_cbc, 16, 32, 16, EVP_CIPH_CBC_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_256_cbc; + break; + case NID_aes_128_ecb: + UADK_CIPHER_DESCR(aes_128_ecb, 16, 16, 0, EVP_CIPH_ECB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_128_ecb; + break; + case NID_aes_192_ecb: + UADK_CIPHER_DESCR(aes_192_ecb, 16, 24, 0, EVP_CIPH_ECB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_192_ecb; + break; + case NID_aes_256_ecb: + UADK_CIPHER_DESCR(aes_256_ecb, 16, 32, 0, EVP_CIPH_ECB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_256_ecb; + break; + case NID_aes_128_xts: + UADK_CIPHER_DESCR(aes_128_xts, 1, 32, 16, EVP_CIPH_XTS_MODE | EVP_CIPH_CUSTOM_IV, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_128_xts; + break; + case NID_aes_256_xts: + UADK_CIPHER_DESCR(aes_256_xts, 1, 64, 16, EVP_CIPH_XTS_MODE | EVP_CIPH_CUSTOM_IV, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_256_xts; + break; + case NID_sm4_cbc: + UADK_CIPHER_DESCR(sm4_cbc, 16, 16, 16, EVP_CIPH_CBC_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_sm4_cbc; + break; + case NID_des_ede3_cbc: + UADK_CIPHER_DESCR(des_ede3_cbc, 8, 24, 8, EVP_CIPH_CBC_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_des_ede3_cbc; + break; + case NID_des_ede3_ecb: + UADK_CIPHER_DESCR(des_ede3_ecb, 8, 24, 0, EVP_CIPH_ECB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_des_ede3_ecb; + break; + case NID_aes_128_ctr: + UADK_CIPHER_DESCR(aes_128_ctr, 1, 16, 16, EVP_CIPH_CTR_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_128_ctr; + break; + case NID_aes_192_ctr: + UADK_CIPHER_DESCR(aes_192_ctr, 1, 24, 16, EVP_CIPH_CTR_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_192_ctr; + break; + case NID_aes_256_ctr: + UADK_CIPHER_DESCR(aes_256_ctr, 1, 32, 16, EVP_CIPH_CTR_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_256_ctr; + break; + case NID_aes_128_ofb128: + UADK_CIPHER_DESCR(aes_128_ofb128, 1, 16, 16, EVP_CIPH_OFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_128_ofb128; + break; + case NID_aes_192_ofb128: + UADK_CIPHER_DESCR(aes_192_ofb128, 1, 24, 16, EVP_CIPH_OFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_192_ofb128; + break; + case NID_aes_256_ofb128: + UADK_CIPHER_DESCR(aes_256_ofb128, 1, 32, 16, EVP_CIPH_OFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_256_ofb128; + break; + case NID_aes_128_cfb128: + UADK_CIPHER_DESCR(aes_128_cfb128, 1, 16, 16, EVP_CIPH_CFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_128_cfb128; + break; + case NID_aes_192_cfb128: + UADK_CIPHER_DESCR(aes_192_cfb128, 1, 24, 16, EVP_CIPH_CFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_192_cfb128; + break; + case NID_aes_256_cfb128: + UADK_CIPHER_DESCR(aes_256_cfb128, 1, 32, 16, EVP_CIPH_CFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_aes_256_cfb128; + break; + case NID_sm4_ofb128: + UADK_CIPHER_DESCR(sm4_ofb128, 1, 16, 16, EVP_CIPH_OFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_sm4_ofb128; + break; + case NID_sm4_cfb128: + UADK_CIPHER_DESCR(sm4_cfb128, 1, 16, 16, EVP_CIPH_OFB_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_sm4_cfb128; + break; + case NID_sm4_ctr: + UADK_CIPHER_DESCR(sm4_ctr, 1, 16, 16, EVP_CIPH_CTR_MODE, + sizeof(struct cipher_priv_ctx), uadk_e_cipher_init, + uadk_e_do_cipher, uadk_e_cipher_cleanup, + EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv); + cipher = uadk_sm4_ctr; + break; + default: + cipher = NULL; + break; } - bind_v2_cipher(); - if (platform > HW_V2) - bind_v3_cipher(); - - return ENGINE_set_ciphers(e, uadk_e_engine_ciphers); + return cipher; } -static void destroy_v2_cipher(void) +static void destroy_cipher(struct engine_cipher_info *info, int num) { - EVP_CIPHER_meth_free(uadk_aes_128_cbc); - uadk_aes_128_cbc = 0; - EVP_CIPHER_meth_free(uadk_aes_192_cbc); - uadk_aes_192_cbc = 0; - EVP_CIPHER_meth_free(uadk_aes_256_cbc); - uadk_aes_256_cbc = 0; - EVP_CIPHER_meth_free(uadk_aes_128_ecb); - uadk_aes_128_ecb = 0; - EVP_CIPHER_meth_free(uadk_aes_192_ecb); - uadk_aes_192_ecb = 0; - EVP_CIPHER_meth_free(uadk_aes_256_ecb); - uadk_aes_256_ecb = 0; - EVP_CIPHER_meth_free(uadk_aes_128_xts); - uadk_aes_128_xts = 0; - EVP_CIPHER_meth_free(uadk_aes_256_xts); - uadk_aes_256_xts = 0; - EVP_CIPHER_meth_free(uadk_sm4_cbc); - uadk_sm4_cbc = 0; - EVP_CIPHER_meth_free(uadk_des_ede3_cbc); - uadk_des_ede3_cbc = 0; - EVP_CIPHER_meth_free(uadk_des_ede3_ecb); - uadk_des_ede3_ecb = 0; - EVP_CIPHER_meth_free(uadk_sm4_ecb); - uadk_sm4_ecb = 0; -} - -static void destroy_v3_cipher(void) -{ - EVP_CIPHER_meth_free(uadk_aes_128_ctr); - uadk_aes_128_ctr = 0; - EVP_CIPHER_meth_free(uadk_aes_192_ctr); - uadk_aes_192_ctr = 0; - EVP_CIPHER_meth_free(uadk_aes_256_ctr); - uadk_aes_256_ctr = 0; - EVP_CIPHER_meth_free(uadk_aes_128_ofb128); - uadk_aes_128_ofb128 = 0; - EVP_CIPHER_meth_free(uadk_aes_192_ofb128); - uadk_aes_192_ofb128 = 0; - EVP_CIPHER_meth_free(uadk_aes_256_ofb128); - uadk_aes_256_ofb128 = 0; - EVP_CIPHER_meth_free(uadk_aes_128_cfb128); - uadk_aes_128_cfb128 = 0; - EVP_CIPHER_meth_free(uadk_aes_192_cfb128); - uadk_aes_192_cfb128 = 0; - EVP_CIPHER_meth_free(uadk_aes_256_cfb128); - uadk_aes_256_cfb128 = 0; - EVP_CIPHER_meth_free(uadk_sm4_cfb128); - uadk_sm4_cfb128 = 0; - EVP_CIPHER_meth_free(uadk_sm4_ofb128); - uadk_sm4_ofb128 = 0; - EVP_CIPHER_meth_free(uadk_sm4_ctr); - uadk_sm4_ctr = 0; -} - -void uadk_e_destroy_cipher(void) -{ - __u32 i; - int ret; - - if (g_cipher_engine.pid == getpid()) { - ret = uadk_e_is_env_enabled("cipher"); - if (ret == ENV_ENABLED) { - wd_cipher_env_uninit(); - } else { - wd_cipher_uninit(); - for (i = 0; i < g_cipher_engine.ctx_cfg.ctx_num; i++) - wd_release_ctx(g_cipher_engine.ctx_cfg.ctxs[i].ctx); - free(g_cipher_engine.ctx_cfg.ctxs); + for (int i = 0; i != num; ++i) { + if (info[i].cipher != NULL) { + EVP_CIPHER_meth_free(info[i].cipher); + info[i].cipher = NULL; } - g_cipher_engine.pid = 0; } +} - pthread_spin_destroy(&g_cipher_engine.lock); - - destroy_v2_cipher(); - if (platform > HW_V2) - destroy_v3_cipher(); +void uadk_e_destroy_cipher(struct engine_cipher_info *info, int num) +{ + destroy_cipher(info, num); } void uadk_e_cipher_lock_init(void) diff --git a/src/uadk_engine_init.c b/src/uadk_engine_init.c index 0a9e3e6..d6503f8 100644 --- a/src/uadk_engine_init.c +++ b/src/uadk_engine_init.c @@ -24,15 +24,17 @@ #include <uadk/wd.h> #include "uadk.h" #include "uadk_async.h" +#include "sec_cipher_adapter.h" #ifdef KAE #include "v1/uadk_v1.h" #endif #define UADK_CMD_ENABLE_CIPHER_ENV ENGINE_CMD_BASE -#define UADK_CMD_ENABLE_DIGEST_ENV (ENGINE_CMD_BASE + 1) -#define UADK_CMD_ENABLE_RSA_ENV (ENGINE_CMD_BASE + 2) -#define UADK_CMD_ENABLE_DH_ENV (ENGINE_CMD_BASE + 3) -#define UADK_CMD_ENABLE_ECC_ENV (ENGINE_CMD_BASE + 4) +#define UADK_CMD_ENABLE_AEAD_ENV (ENGINE_CMD_BASE + 1) +#define UADK_CMD_ENABLE_DIGEST_ENV (ENGINE_CMD_BASE + 2) +#define UADK_CMD_ENABLE_RSA_ENV (ENGINE_CMD_BASE + 3) +#define UADK_CMD_ENABLE_DH_ENV (ENGINE_CMD_BASE + 4) +#define UADK_CMD_ENABLE_ECC_ENV (ENGINE_CMD_BASE + 5) /* Constants used when creating the ENGINE */ const char *engine_uadk_id = "uadk_engine"; @@ -60,6 +62,12 @@ static const ENGINE_CMD_DEFN g_uadk_cmd_defns[] = { "Enable or Disable cipher engine environment variable.", ENGINE_CMD_FLAG_NUMERIC }, + { + UADK_CMD_ENABLE_AEAD_ENV, + "UADK_CMD_ENABLE_AEAD_ENV", + "Enable or Disable aead engine environment variable.", + ENGINE_CMD_FLAG_NUMERIC + }, { UADK_CMD_ENABLE_DIGEST_ENV, "UADK_CMD_ENABLE_DIGEST_ENV", @@ -104,6 +112,7 @@ struct uadk_alg_env_enabled { static struct uadk_alg_env_enabled uadk_env_enabled[] = { { "cipher", 0 }, + { "aead", 0 }, { "digest", 0 }, { "rsa", 0 }, { "dh", 0 }, @@ -210,7 +219,7 @@ static int uadk_destroy(ENGINE *e) #endif if (uadk_cipher) - uadk_e_destroy_cipher(); + uadk_e_destroy_crypto(); if (uadk_digest) uadk_e_destroy_digest(); if (uadk_rsa) @@ -322,11 +331,12 @@ static void bind_fn_kae_alg(ENGINE *e) static void bind_fn_uadk_alg(ENGINE *e) { - struct uacce_dev *dev; + struct uacce_dev *dev, *dev_aead; + dev_aead = wd_get_accel_dev("aead"); dev = wd_get_accel_dev("cipher"); - if (dev) { - if (!uadk_e_bind_cipher(e)) + if (dev && dev_aead) { + if (!uadk_e_bind_crypto(e)) fprintf(stderr, "uadk bind cipher failed\n"); else uadk_cipher = 1; -- 2.30.0

1 0

[PATCH 1/1] uadk/sec: optimize the function name and implement for digest
by Qi Tao 27 Sep '23

27 Sep '23

digest_bd2_zero_packet_check() and digest_bd3_zero_packet_check() do not check whether the packet length is 0. Therefor, the function name does not match the function semantics. Signed-off-by: Qi Tao <taoqi10(a)huawei.com> --- drv/hisi_sec.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index df6f56c..ebd9aaf 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -1578,7 +1578,7 @@ static int digest_long_bd_align_check(struct wd_digest_msg *msg) return 0; } -static int digest_bd2_zero_packet_check(struct wd_digest_msg *msg) +static int digest_bd2_type_check(struct wd_digest_msg *msg) { enum hash_bd_type type = get_hash_bd_type(msg); @@ -1597,7 +1597,7 @@ static int digest_bd2_zero_packet_check(struct wd_digest_msg *msg) return 0; } -static int digest_bd3_zero_packet_check(struct wd_digest_msg *msg) +static int digest_bd3_type_check(struct wd_digest_msg *msg) { enum hash_bd_type type = get_hash_bd_type(msg); /* Long hash first and middle bd */ @@ -1618,28 +1618,23 @@ static int digest_bd3_zero_packet_check(struct wd_digest_msg *msg) static int digest_len_check(struct wd_digest_msg *msg, enum sec_bd_type type) { - int ret; + int ret = 0; /* * Hardware needs to check the zero byte packet in the block * and long hash mode. First and middle bd not support 0 size, * final bd not need to check it. */ - if (type == BD_TYPE2 && !msg->in_bytes) { - ret = digest_bd2_zero_packet_check(msg); - if (ret) - return ret; - } + if (unlikely(!msg->in_bytes)) { + if (type == BD_TYPE2) + ret = digest_bd2_type_check(msg); + else if (type == BD_TYPE3) + ret = digest_bd3_type_check(msg); - if (type == BD_TYPE3 && !msg->in_bytes) { - ret = digest_bd3_zero_packet_check(msg); if (ret) return ret; - } - - if (unlikely(msg->in_bytes > MAX_INPUT_DATA_LEN)) { - WD_ERR("digest input length is too long, size = %u\n", - msg->in_bytes); + } else if (unlikely(msg->in_bytes > MAX_INPUT_DATA_LEN)) { + WD_ERR("digest input length is too long, size = %u\n", msg->in_bytes); return -WD_EINVAL; } -- 2.33.0

1 0

[PATCH 0/6] support digest message carrying long data information
by Qi Tao 22 Sep '23

22 Sep '23

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Wenkai Lin (6): uadk: fix for wd_memset_zero occupies high cpu usage uadk: optimize session update for long hash mode uadk: support digest message carrying long data information uadk: add out_bytes check for long hash scene uadk: bugfix for aead set decrypt mac for stream mode uadk: fix for digest mac full length check drv/hisi_sec.c | 4 +- include/drv/wd_aead_drv.h | 2 +- include/wd_digest.h | 22 +++++++++- v1/drv/hisi_sec_udrv.c | 4 ++ v1/wd_digest.c | 34 +++++++++++---- v1/wd_digest.h | 12 ++++++ wd_aead.c | 18 +++++--- wd_cipher.c | 2 +- wd_digest.c | 89 ++++++++++++++++++++++++--------------- 9 files changed, 131 insertions(+), 56 deletions(-) -- 2.30.0

1 6

[PATCH 1/2] uadk/v1: modify the alignment size of sha384.
by Qi Tao 20 Sep '23

20 Sep '23

sha384 alignment size is 128Byte instead of 64Byte. Signed-off-by: Qi Tao <taoqi10(a)huawei.com> --- v1/wd_digest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1/wd_digest.c b/v1/wd_digest.c index 84b84dd..0a80cba 100644 --- a/v1/wd_digest.c +++ b/v1/wd_digest.c @@ -199,7 +199,7 @@ void *wcrypto_create_digest_ctx(struct wd_queue *q, } } - if (setup->alg >= WCRYPTO_SHA512) + if (setup->alg >= WCRYPTO_SHA384) ctx->align_sz = SEC_SHA512_ALIGN_SZ; else ctx->align_sz = SEC_SHA1_ALIGN_SZ; -- 2.33.0

1 1

[PATCH] uadk/cipher: cleaup judgement sequence
by Zhiqi Song 19 Sep '23

19 Sep '23

Modify the jugement sequence in aes_sm4_len_check(), prioritize the conditions that must be met. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- drv/hisi_sec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index 5eaa1a1..f8e5cfa 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -892,18 +892,18 @@ static void parse_cipher_bd2(struct hisi_qp *qp, struct hisi_sec_sqe *sqe, static int aes_sm4_len_check(struct wd_cipher_msg *msg) { - if ((msg->mode == WD_CIPHER_CBC_CS1 || + if (msg->alg == WD_CIPHER_AES && + msg->in_bytes <= AES_BLOCK_SIZE && + (msg->mode == WD_CIPHER_CBC_CS1 || msg->mode == WD_CIPHER_CBC_CS2 || - msg->mode == WD_CIPHER_CBC_CS3) && - msg->alg == WD_CIPHER_AES && - msg->in_bytes <= AES_BLOCK_SIZE) { + msg->mode == WD_CIPHER_CBC_CS3)) { WD_ERR("failed to check input bytes of AES_CBC_CS_X, size = %u\n", msg->in_bytes); return -WD_EINVAL; } - if ((msg->mode == WD_CIPHER_CBC || msg->mode == WD_CIPHER_ECB) && - msg->in_bytes & (AES_BLOCK_SIZE - 1)) { + if ((msg->in_bytes & (AES_BLOCK_SIZE - 1)) && + (msg->mode == WD_CIPHER_CBC || msg->mode == WD_CIPHER_ECB)) { WD_ERR("failed to check input bytes of AES or SM4, size = %u\n", msg->in_bytes); return -WD_EINVAL; -- 2.30.0

1 0

[PATCH 0/8] Support cipher new features in uadk v1
by Zhiqi Song 19 Sep '23

19 Sep '23

Support AES-CBC CTS mode in uadk v1. Support user self-defined data in uadk v1. Sync and add test code for new features. Longfang Liu (5): uadk_tool: Optimize sec's sva benchmark code uadk_tool: Optimize sec's software benchmark code uadk_tool: Optimize sec's no-sva benchmark code uadk_tool: add latency test function for uadk_tools uadk_tool: Update test function for init2 Zhiqi Song (3): uadk/v1/cipher: support aes-cbc cts mode uadk_tool: support test case for aes cbc cts mode uadk/v1/cipher: support user self-defined data functions uadk_tool/benchmark/hpre_uadk_benchmark.c | 3 + uadk_tool/benchmark/hpre_wd_benchmark.c | 3 + uadk_tool/benchmark/sec_soft_benchmark.c | 794 +++++++++++------ uadk_tool/benchmark/sec_uadk_benchmark.c | 734 ++++++++++------ uadk_tool/benchmark/sec_wd_benchmark.c | 989 +++++++++++++--------- uadk_tool/benchmark/uadk_benchmark.c | 158 +++- uadk_tool/benchmark/uadk_benchmark.h | 35 +- uadk_tool/benchmark/zip_uadk_benchmark.c | 12 +- uadk_tool/benchmark/zip_wd_benchmark.c | 12 +- v1/drv/hisi_sec_udrv.c | 253 +++++- v1/drv/hisi_sec_udrv.h | 6 + v1/wd_cipher.c | 7 +- v1/wd_cipher.h | 4 + 13 files changed, 2037 insertions(+), 973 deletions(-) -- 2.33.0

1 8

[PATCH 00/10] Some bugfix and cleanup of uadk_engine
by Zhiqi Song 19 Sep '23

19 Sep '23

Fixup async mode bug and remove redundant code. Zhiqi Song (10): uadk_engine: cleanup code style of async functions digest: fix the definition of async cb param cipher: fix the definition of async cb param dh: fix the definition of async cb param ecc: fix the definition of async cb param rsa: fix the definition of async cb param uadk_engine: remove redundant param of async ecc: fixup switching soft sm2 decrypt problem ecc: optimize sm2 sign check function digest: fix the address of async op src/uadk_async.c | 140 ++++++++++++++++++++++++---------------------- src/uadk_async.h | 5 +- src/uadk_cipher.c | 39 ++++++++----- src/uadk_dh.c | 100 +++++++++++++++++++++------------ src/uadk_digest.c | 50 +++++++++++------ src/uadk_pkey.c | 99 ++++++++++++++++++++------------ src/uadk_rsa.c | 82 +++++++++++++++++---------- src/uadk_sm2.c | 42 +++++++++++--- 8 files changed, 349 insertions(+), 208 deletions(-) -- 2.33.0

1 10

AccLib SIG 双周例会
by openEuler conference 18 Sep '23

18 Sep '23

您好！ sig-AccLib SIG 邀请您参加 2023-09-20 11:00 召开的Zoom会议会议主题：AccLib SIG 双周例会会议内容：固定会议链接 https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/84246737826?pwd=03Yjmu0UoclIsc9vB04JDfPUWQhII1.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-09-20 11:00, The subject of the conference is AccLib SIG 双周例会, Summary: 固定会议链接 https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/84246737826?pwd=03Yjmu0UoclIsc9vB04JDfPUWQhII1.1. 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/v1:add sqe_fill_priv and sqe_parse_priv
by Yang Shen 15 Sep '23

15 Sep '23

From: wangyuan <wangyuan46(a)huawei.com> Description: This patch includes following changes: 1.in hisi_zip_udrv.c add sqe_fill/parse_priv for V3 api Signed-off-by: Yu'an Wang <wangyuan46(a)huawei.com> --- v1/drv/hisi_zip_udrv.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/v1/drv/hisi_zip_udrv.c b/v1/drv/hisi_zip_udrv.c index 1dec4d6..f820b7f 100644 --- a/v1/drv/hisi_zip_udrv.c +++ b/v1/drv/hisi_zip_udrv.c @@ -256,6 +256,7 @@ int qm_parse_zip_sqe(void *hw_msg, const struct qm_queue_info *info, __u16 i, __u16 usr) { struct wcrypto_comp_msg *recv_msg = info->req_cache[i]; + struct wcrypto_comp_tag *tag = (void *)(uintptr_t)recv_msg->udata; struct hisi_zip_sqe *sqe = hw_msg; __u16 ctx_st = sqe->ctx_dw0 & HZ_CTX_ST_MASK; __u16 lstblk = sqe->dw3 & HZ_LSTBLK_MASK; @@ -301,6 +302,9 @@ int qm_parse_zip_sqe(void *hw_msg, const struct qm_queue_info *info, MAX_CTX_RSV_SIZE); } + if (tag && info->sqe_parse_priv) + info->sqe_parse_priv(sqe, WCRYPTO_COMP, tag->priv); + qm_parse_zip_sqe_set_status(recv_msg, status, lstblk, ctx_st); return 1; @@ -580,6 +584,7 @@ int qm_fill_zip_sqe_v3(void *smsg, struct qm_queue_info *info, __u16 i) { struct hisi_zip_sqe_v3 *sqe = (struct hisi_zip_sqe_v3 *)info->sq_base + i; struct wcrypto_comp_msg *msg = smsg; + struct wcrypto_comp_tag *tag = (void *)(uintptr_t)msg->udata; struct wd_queue *q = info->q; __u8 flush_type; __u8 data_fmt; @@ -628,6 +633,9 @@ int qm_fill_zip_sqe_v3(void *smsg, struct qm_queue_info *info, __u16 i) ops[msg->alg_type].fill_sqe_hw_info(sqe, msg); sqe->tag_l = msg->tag; + if (tag && info->sqe_fill_priv) + info->sqe_fill_priv(sqe, WCRYPTO_COMP, tag->priv); + info->req_cache[i] = msg; return WD_SUCCESS; @@ -728,6 +736,9 @@ int qm_parse_zip_sqe_v3(void *hw_msg, const struct qm_queue_info *info, if (tag && tag->priv && !info->sqe_fill_priv) fill_priv_lz77_zstd(sqe, recv_msg); + if (tag && info->sqe_parse_priv) + info->sqe_parse_priv(sqe, WCRYPTO_COMP, tag->priv); + return 1; } -- 2.33.0

1 0

[PATCH] uadk: support loading alg lib from specified directories
by Weili Qian 07 Sep '23

07 Sep '23

From: Shangbin Liu <liushangbin(a)hisilicon.com> Solving the problem of traversing the entire library directory to load alg drv lib may result in unexpected results by specifying the loading directory 'uadk'. Signed-off-by: Shangbin Liu <liushangbin(a)hisilicon.com> --- Makefile.am | 7 +++++-- wd_util.c | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index f04164f..11aa2a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,8 +38,11 @@ pkginclude_HEADERS = include/wd.h include/wd_cipher.h include/wd_aead.h \ nobase_pkginclude_HEADERS = v1/wd.h v1/wd_cipher.h v1/wd_aead.h v1/uacce.h v1/wd_dh.h \ v1/wd_digest.h v1/wd_rsa.h v1/wd_bmm.h -lib_LTLIBRARIES=libwd.la libwd_comp.la libwd_crypto.la libhisi_zip.la \ - libhisi_hpre.la libhisi_sec.la +lib_LTLIBRARIES=libwd.la libwd_comp.la libwd_crypto.la + +uadk_driversdir=$(libdir)/uadk +uadk_drivers_LTLIBRARIES=libhisi_sec.la libhisi_hpre.la libhisi_zip.la + libwd_la_SOURCES=wd.c wd_mempool.c wd.h wd_alg.c wd_alg.h \ v1/wd.c v1/wd.h v1/wd_adapter.c v1/wd_adapter.h \ diff --git a/wd_util.c b/wd_util.c index cb89709..2f6fcf7 100644 --- a/wd_util.c +++ b/wd_util.c @@ -28,7 +28,7 @@ #define US2S(us) ((us) >> 20) #define WD_INIT_RETRY_TIMEOUT 3 -#define DEF_DRV_LIB_FILE "libwd.so" +#define WD_DRV_LIB_DIR "uadk" struct msg_pool { /* message array allocated dynamically */ @@ -2151,7 +2151,7 @@ static void dladdr_empty(void) int wd_get_lib_file_path(char *lib_file, char *lib_path, bool is_dir) { char file_path[PATH_MAX] = {0}; - char path[PATH_MAX]; + char path[PATH_MAX] = {0}; Dl_info file_info; int len, rc, i; @@ -2173,16 +2173,17 @@ int wd_get_lib_file_path(char *lib_file, char *lib_path, bool is_dir) } if (is_dir) { - (void)snprintf(lib_path, PATH_MAX, "%s", file_path); - return 0; + len = snprintf(lib_path, PATH_MAX, "%s/%s", file_path, WD_DRV_LIB_DIR); + if (len < 0) + return -WD_EINVAL; + } else { + len = snprintf(lib_path, PATH_MAX, "%s/%s/%s", file_path, WD_DRV_LIB_DIR, lib_file); + if (len < 0) + return -WD_EINVAL; } - len = snprintf(lib_path, PATH_MAX, "%s/%s", file_path, lib_file); - if (len < 0) - return -WD_EINVAL; - if (realpath(lib_path, path) == NULL) { - WD_ERR("%s: no such file or directory!\n", path); + WD_ERR("invalid: %s: no such file or directory!\n", path); return -WD_EINVAL; } @@ -2205,11 +2206,10 @@ void *wd_dlopen_drv(const char *cust_lib_dir) if (ret) return NULL; } else { - (void)snprintf(lib_path, PATH_MAX, "%s/%s", cust_lib_dir, DEF_DRV_LIB_FILE); - ret = access(lib_path, F_OK); - if (ret) + if (realpath(cust_lib_dir, lib_path) == NULL) { + WD_ERR("invalid: %s: no such file or directory!\n", lib_path); return NULL; - + } strncpy(lib_dir_path, cust_lib_dir, PATH_MAX - 1); } -- 2.33.0

1 0

AccLib SIG双周例会
by openEuler conference 06 Sep '23

06 Sep '23

您好！ sig-AccLib SIG 邀请您参加 2023-09-06 11:00 召开的Zoom会议会议主题：AccLib SIG双周例会会议内容： https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/87508543775?pwd=YXJlTVpuYzhjb3kxcWtCbEg4QzBpdz09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-09-06 11:00, The subject of the conference is AccLib SIG双周例会, Summary: https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/87508543775?pwd=YXJlTVpuYzhjb3kxcWtCbEg4QzBpdz09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

2 1

[PATCH 0/3] uadk:fix some issues
by Weili Qian 16 Aug '23

16 Aug '23

From: Shangbin Liu <liushangbin(a)hisilicon.com> This patchset fixes some issues of the uadk. The first patch adds init wait timeout judgment to prevent deadlocks when making loopback calls from the same thread. The second and third patches add a key length validity check before calculating the actual key length of the algorithm in xts mode. Because if the key length is odd, it will result in incorrect calculation results. Shangbin Liu (3): uadk: add init wait timeout uadk: fix key length check error in xts mode uadk/v1: fix key length check error in xts mode include/wd_util.h | 7 ++++--- v1/wd_cipher.c | 29 ++++++++++++++++------------- wd_aead.c | 16 +++++++--------- wd_cipher.c | 47 ++++++++++++++++++++++++++--------------------- wd_comp.c | 15 +++++++-------- wd_dh.c | 16 +++++++--------- wd_digest.c | 16 +++++++--------- wd_ecc.c | 15 +++++++-------- wd_rsa.c | 16 +++++++--------- wd_util.c | 18 +++++++++++------- 10 files changed, 99 insertions(+), 96 deletions(-) -- 2.22.0

1 3

[PATCH 1/3] uadk/v1/cipher: support aes-cbc cts mode
by Zhiqi Song 09 Aug '23

09 Aug '23

Support AES-CBC CTS(ciphertext stealing) mode in v1, including CBC-CS1, CBC-CS2, CBC-CS3. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- v1/drv/hisi_sec_udrv.c | 100 ++++++++++++++++++++++++++++++++++++++--- v1/drv/hisi_sec_udrv.h | 6 +++ v1/wd_cipher.c | 3 ++ v1/wd_cipher.h | 4 ++ 4 files changed, 106 insertions(+), 7 deletions(-) diff --git a/v1/drv/hisi_sec_udrv.c b/v1/drv/hisi_sec_udrv.c index 4d5ede5..f9cd8c0 100644 --- a/v1/drv/hisi_sec_udrv.c +++ b/v1/drv/hisi_sec_udrv.c @@ -174,6 +174,18 @@ static int fill_cipher_bd2_mode(struct wcrypto_cipher_msg *msg, case WCRYPTO_CIPHER_XTS: sqe->type2.c_mode = C_MODE_XTS; break; + case WCRYPTO_CIPHER_CBC_CS1: + sqe->type2.c_mode = C_MODE_CBC_CS; + sqe->type2.c_width = C_WIDTH_CS1; + break; + case WCRYPTO_CIPHER_CBC_CS2: + sqe->type2.c_mode = C_MODE_CBC_CS; + sqe->type2.c_width = C_WIDTH_CS2; + break; + case WCRYPTO_CIPHER_CBC_CS3: + sqe->type2.c_mode = C_MODE_CBC_CS; + sqe->type2.c_width = C_WIDTH_CS3; + break; default: WD_ERR("Invalid cipher alg type!\n"); ret = -WD_EINVAL; @@ -248,6 +260,9 @@ static void update_iv(struct wcrypto_cipher_msg *msg) { switch (msg->mode) { case WCRYPTO_CIPHER_CBC: + case WCRYPTO_CIPHER_CBC_CS1: + case WCRYPTO_CIPHER_CBC_CS2: + case WCRYPTO_CIPHER_CBC_CS3: if (msg->op_type == WCRYPTO_CIPHER_ENCRYPTION && msg->out_bytes >= msg->iv_bytes) update_iv_from_res(msg->iv, msg->out, @@ -355,6 +370,18 @@ static int fill_cipher_bd1_mode(struct wcrypto_cipher_msg *msg, case WCRYPTO_CIPHER_XTS: sqe->type1.c_mode = C_MODE_XTS; break; + case WCRYPTO_CIPHER_CBC_CS1: + sqe->type1.c_mode = C_MODE_CBC_CS; + sqe->type1.c_width = C_WIDTH_CS1; + break; + case WCRYPTO_CIPHER_CBC_CS2: + sqe->type1.c_mode = C_MODE_CBC_CS; + sqe->type1.c_width = C_WIDTH_CS2; + break; + case WCRYPTO_CIPHER_CBC_CS3: + sqe->type1.c_mode = C_MODE_CBC_CS; + sqe->type1.c_width = C_WIDTH_CS3; + break; default: WD_ERR("Invalid cipher alg type for bd1\n"); return -WD_EINVAL; @@ -582,8 +609,32 @@ map_in_error: return ret; } +static int aes_sm4_param_check(struct wcrypto_cipher_msg *msg) +{ + if (msg->alg == WCRYPTO_CIPHER_AES && + msg->in_bytes <= CBC_AES_BLOCK_SIZE && + (msg->mode == WCRYPTO_CIPHER_CBC_CS1 || + msg->mode == WCRYPTO_CIPHER_CBC_CS2 || + msg->mode == WCRYPTO_CIPHER_CBC_CS3)) { + WD_ERR("failed to check input bytes of AES CTS, size = %u\n", + msg->in_bytes); + return -WD_EINVAL; + } + + if ((msg->in_bytes & (CBC_AES_BLOCK_SIZE - 1)) && + (msg->mode == WCRYPTO_CIPHER_CBC || + msg->mode == WCRYPTO_CIPHER_ECB)) { + WD_ERR("input AES or SM4 cipher parameter is error!\n"); + return -WD_EINVAL; + } + + return WD_SUCCESS; +} + static int cipher_param_check(struct wcrypto_cipher_msg *msg) { + int ret; + if (unlikely(msg->in_bytes > MAX_CIPHER_LENGTH || !msg->in_bytes)) { WD_ERR("input cipher len is too large!\n"); @@ -611,10 +662,9 @@ static int cipher_param_check(struct wcrypto_cipher_msg *msg) } if (msg->alg == WCRYPTO_CIPHER_AES || msg->alg == WCRYPTO_CIPHER_SM4) { - if (unlikely(msg->in_bytes & (CBC_AES_BLOCK_SIZE - 1))) { - WD_ERR("input AES or SM4 cipher parameter is error!\n"); - return -WD_EINVAL; - } + ret = aes_sm4_param_check(msg); + if (ret) + return ret; } return WD_SUCCESS; @@ -788,6 +838,18 @@ static int fill_cipher_bd3_mode(struct wcrypto_cipher_msg *msg, case WCRYPTO_CIPHER_CFB: sqe->c_mode = C_MODE_CFB; break; + case WCRYPTO_CIPHER_CBC_CS1: + sqe->c_mode = C_MODE_CBC_CS; + sqe->c_width = C_WIDTH_CS1; + break; + case WCRYPTO_CIPHER_CBC_CS2: + sqe->c_mode = C_MODE_CBC_CS; + sqe->c_width = C_WIDTH_CS2; + break; + case WCRYPTO_CIPHER_CBC_CS3: + sqe->c_mode = C_MODE_CBC_CS; + sqe->c_width = C_WIDTH_CS3; + break; default: WD_ERR("Invalid cipher alg type!\n"); ret = -WD_EINVAL; @@ -838,7 +900,7 @@ static int fill_cipher_bd3(struct wd_queue *q, struct hisi_sec_bd3_sqe *sqe, return ret; } -static int sm4_aes_mode_check(int mode) +static int sm4_mode_check(int mode) { switch (mode) { case WCRYPTO_CIPHER_ECB: @@ -855,6 +917,26 @@ static int sm4_aes_mode_check(int mode) } } +static int aes_mode_check(int mode) +{ + switch (mode) { + case WCRYPTO_CIPHER_ECB: + case WCRYPTO_CIPHER_CBC: + case WCRYPTO_CIPHER_OFB: + case WCRYPTO_CIPHER_CFB: + case WCRYPTO_CIPHER_CTR: + case WCRYPTO_CIPHER_XTS: + case WCRYPTO_CIPHER_CCM: + case WCRYPTO_CIPHER_GCM: + case WCRYPTO_CIPHER_CBC_CS1: + case WCRYPTO_CIPHER_CBC_CS2: + case WCRYPTO_CIPHER_CBC_CS3: + return WD_SUCCESS; + default: + return -WD_EINVAL; + } +} + static int triple_des_mode_check(int mode) { switch (mode) { @@ -873,8 +955,10 @@ static int cipher_comb_param_check(struct wcrypto_cipher_msg *msg) switch (msg->alg) { case WCRYPTO_CIPHER_SM4: + ret = sm4_mode_check(msg->mode); + break; case WCRYPTO_CIPHER_AES: - ret = sm4_aes_mode_check(msg->mode); + ret = aes_mode_check(msg->mode); break; case WCRYPTO_CIPHER_DES: case WCRYPTO_CIPHER_3DES: @@ -2125,8 +2209,10 @@ static int aead_comb_param_check(struct wcrypto_aead_msg *msg) switch (msg->calg) { case WCRYPTO_CIPHER_SM4: + ret = sm4_mode_check(msg->cmode); + break; case WCRYPTO_CIPHER_AES: - ret = sm4_aes_mode_check(msg->cmode); + ret = aes_mode_check(msg->cmode); break; default: return -WD_EINVAL; diff --git a/v1/drv/hisi_sec_udrv.h b/v1/drv/hisi_sec_udrv.h index 9c0da47..054ab71 100644 --- a/v1/drv/hisi_sec_udrv.h +++ b/v1/drv/hisi_sec_udrv.h @@ -461,6 +461,12 @@ enum C_MODE { C_MODE_CBC_CS = 0x9 }; +enum SEC_C_WIDTH { + C_WIDTH_CS1 = 0x1, + C_WIDTH_CS2 = 0x2, + C_WIDTH_CS3 = 0x3, +}; + enum CKEY_LEN { CKEY_LEN_128_BIT = 0x0, CKEY_LEN_192_BIT = 0x1, diff --git a/v1/wd_cipher.c b/v1/wd_cipher.c index 3d7d140..a53cf8f 100644 --- a/v1/wd_cipher.c +++ b/v1/wd_cipher.c @@ -82,6 +82,9 @@ static __u32 get_iv_block_size(int alg, int mode) switch (mode) { case WCRYPTO_CIPHER_CBC: + case WCRYPTO_CIPHER_CBC_CS1: + case WCRYPTO_CIPHER_CBC_CS2: + case WCRYPTO_CIPHER_CBC_CS3: case WCRYPTO_CIPHER_OFB: if (alg == WCRYPTO_CIPHER_3DES || alg == WCRYPTO_CIPHER_DES) diff --git a/v1/wd_cipher.h b/v1/wd_cipher.h index 591a590..dafd8a4 100644 --- a/v1/wd_cipher.h +++ b/v1/wd_cipher.h @@ -47,6 +47,10 @@ enum wcrypto_cipher_mode { WCRYPTO_CIPHER_CFB, WCRYPTO_CIPHER_CCM, WCRYPTO_CIPHER_GCM, + WCRYPTO_CIPHER_CBC_CS1, + WCRYPTO_CIPHER_CBC_CS2, + WCRYPTO_CIPHER_CBC_CS3, + WCRYPTO_CIPHER_MODE_MAX, }; /** -- 2.33.0

1 1

[PATCH 1/4] uadk: fix for get_str_attr
by Wenkai Lin 08 Aug '23

08 Aug '23

If snprintf returns 0, (ret - 1) will be negative and used as an array index, fix it, also, the int type should be converted to unsigned int. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- v1/wd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v1/wd.c b/v1/wd.c index e0a86dc..3839304 100644 --- a/v1/wd.c +++ b/v1/wd.c @@ -81,7 +81,7 @@ static int get_raw_attr(const char *dev_root, const char *attr, dev_root, attr); if (size <= 0) { WD_ERR("get %s/%s path fail!\n", dev_root, attr); - return size; + return -WD_EINVAL; } ptrRet = realpath(attr_file, attr_path); @@ -140,7 +140,7 @@ static int get_str_attr(struct dev_info *dinfo, const char *attr, char *buf, return ret; } - if ((size_t)ret == buf_sz) + if ((__u32)ret == buf_sz) ret = ret - 1; buf[ret] = '\0'; -- 2.33.0

1 3

[PATCH 1/2] digest: fix free sess when it is still used
by Wenkai Lin 08 Aug '23

08 Aug '23

When EVP_MD_CTX_copy is used, the session is shared among ctxs. Ensure that the session is released when it is not used. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- src/uadk_digest.c | 184 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 163 insertions(+), 21 deletions(-) diff --git a/src/uadk_digest.c b/src/uadk_digest.c index b75c408..b7b9533 100644 --- a/src/uadk_digest.c +++ b/src/uadk_digest.c @@ -148,6 +148,78 @@ static EVP_MD *uadk_sha256; static EVP_MD *uadk_sha384; static EVP_MD *uadk_sha512; +struct ctx_info { + /* Use md_ctx as the key */ + EVP_MD_CTX *md_ctx; + /* Multiple ctxs may share the same session and data */ + handle_t sess; + unsigned char *data; + struct ctx_info *next; +}; + +/* Global table to record ctx and its session */ +static struct ctx_info *digest_ctx_info; +/* Lock for global ctx_info table */ +static pthread_mutex_t digest_ctx_mutex = PTHREAD_MUTEX_INITIALIZER; + +static void find_ctx_info(EVP_MD_CTX *ctx, struct ctx_info **node) +{ + struct ctx_info *pnext = digest_ctx_info; + + while (pnext) { + if (pnext->md_ctx == ctx) { + *node = pnext; + return; + } + pnext = pnext->next; + } +} + +static void del_ctx_info(struct ctx_info *node) +{ + struct ctx_info *pnext = digest_ctx_info; + + if (pnext == node) { + digest_ctx_info = pnext->next; + return; + } + + while (pnext) { + if (pnext->next == node) { + pnext->next = pnext->next->next; + return; + } + pnext = pnext->next; + } +} + +static void add_ctx_info(struct ctx_info *node) +{ + struct ctx_info *pnext = digest_ctx_info; + + if (!pnext) { + digest_ctx_info = node; + node->next = NULL; + } else { + node->next = digest_ctx_info; + digest_ctx_info = node; + } +} + +static bool is_ctx_sess_shared(struct ctx_info *node) +{ + struct ctx_info *pnext = digest_ctx_info; + + while (pnext) { + if ((pnext != node) && (pnext->sess == node->sess)) + return true; + + pnext = pnext->next; + } + + return false; +} + static const EVP_MD *uadk_e_digests_soft_md(uint32_t e_nid) { const EVP_MD *digest_md = NULL; @@ -491,6 +563,7 @@ static int uadk_e_init_digest(void) goto err_unlock; g_digest_engine.pid = getpid(); + digest_ctx_info = NULL; pthread_spin_unlock(&g_digest_engine.lock); free(dev); } @@ -515,7 +588,7 @@ static void digest_priv_ctx_setup(struct digest_priv_ctx *priv, priv->req.out_bytes = out_len; } -static void digest_priv_ctx_cleanup(struct digest_priv_ctx *priv) +static void digest_priv_ctx_reset(struct digest_priv_ctx *priv) { /* Ensure that private variable values are initialized */ priv->state = SEC_DIGEST_INIT; @@ -524,29 +597,52 @@ static void digest_priv_ctx_cleanup(struct digest_priv_ctx *priv) priv->switch_flag = 0; } +static int alloc_ctx_info(EVP_MD_CTX *ctx) +{ + struct digest_priv_ctx *priv = + (struct digest_priv_ctx *) EVP_MD_CTX_md_data(ctx); + struct ctx_info *node = NULL; + + pthread_mutex_lock(&digest_ctx_mutex); + find_ctx_info(ctx, &node); + if (node == NULL) { + node = malloc(sizeof(*node)); + if (node == NULL) { + pthread_mutex_unlock(&digest_ctx_mutex); + return 0; + } + node->md_ctx = ctx; + add_ctx_info(node); + } + node->sess = priv->sess; + node->data = priv->data; + pthread_mutex_unlock(&digest_ctx_mutex); + + return 1; +} + static int uadk_e_digest_init(EVP_MD_CTX *ctx) { struct digest_priv_ctx *priv = (struct digest_priv_ctx *) EVP_MD_CTX_md_data(ctx); __u32 digest_counts = ARRAY_SIZE(digest_info_table); - int nid = EVP_MD_nid(EVP_MD_CTX_md(ctx)); struct sched_params params = {0}; __u32 i; int ret; - priv->e_nid = nid; + priv->e_nid = EVP_MD_nid(EVP_MD_CTX_md(ctx)); - digest_priv_ctx_cleanup(priv); + digest_priv_ctx_reset(priv); ret = uadk_e_init_digest(); if (unlikely(!ret)) { priv->switch_flag = UADK_DO_SOFT; fprintf(stderr, "uadk failed to initialize digest.\n"); - goto soft_init; + return digest_soft_init(priv); } for (i = 0; i < digest_counts; i++) { - if (nid == digest_info_table[i].nid) { + if (priv->e_nid == digest_info_table[i].nid) { digest_priv_ctx_setup(priv, digest_info_table[i].alg, digest_info_table[i].mode, digest_info_table[i].out_len); break; @@ -561,22 +657,30 @@ static int uadk_e_digest_init(EVP_MD_CTX *ctx) /* Use the default numa parameters */ params.numa_id = -1; priv->setup.sched_param = &params; - priv->sess = wd_digest_alloc_sess(&priv->setup); - if (unlikely(!priv->sess)) - return 0; + if (!priv->sess) { + priv->sess = wd_digest_alloc_sess(&priv->setup); + if (unlikely(!priv->sess)) + return 0; - priv->data = malloc(DIGEST_BLOCK_SIZE); - if (unlikely(!priv->data)) { - wd_digest_free_sess(priv->sess); - return 0; + priv->data = malloc(DIGEST_BLOCK_SIZE); + if (unlikely(!priv->data)) + goto out; + + if (!alloc_ctx_info(ctx)) { + free(priv->data); + priv->data = NULL; + goto out; + } } - priv->switch_threshold = sec_digest_get_sw_threshold(nid); + priv->switch_threshold = sec_digest_get_sw_threshold(priv->e_nid); return 1; -soft_init: - return digest_soft_init(priv); +out: + wd_digest_free_sess(priv->sess); + priv->sess = 0; + return 0; } static void digest_update_out_length(EVP_MD_CTX *ctx) @@ -809,19 +913,36 @@ 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); + struct ctx_info *node = NULL; - /* Prevent double-free after the copy is used */ - if (!priv || priv->copy) + if (!priv) + return 1; + + pthread_mutex_lock(&digest_ctx_mutex); + find_ctx_info(ctx, &node); + if (node == NULL) { + pthread_mutex_unlock(&digest_ctx_mutex); return 1; + } + + /* If another ctx uses the same session, the session is not released */ + if (is_ctx_sess_shared(node)) + goto out; + + if (priv->data) { + free(priv->data); + priv->data = NULL; + } if (priv->sess) { wd_digest_free_sess(priv->sess); priv->sess = 0; } - if (priv && priv->data) - free(priv->data); - +out: + del_ctx_info(node); + free(node); + pthread_mutex_unlock(&digest_ctx_mutex); return 1; } @@ -831,6 +952,7 @@ static int uadk_e_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) (struct digest_priv_ctx *)EVP_MD_CTX_md_data(from); struct digest_priv_ctx *t = (struct digest_priv_ctx *)EVP_MD_CTX_md_data(to); + struct ctx_info *node = NULL; /* * EVP_MD_CTX_copy will copy from->priv to to->priv, @@ -838,6 +960,26 @@ static int uadk_e_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) * add a flag to prevent double-free. */ + pthread_mutex_lock(&digest_ctx_mutex); + find_ctx_info(to, &node); + if (node == NULL) { + node = malloc(sizeof(*node)); + if (node == NULL) { + pthread_mutex_unlock(&digest_ctx_mutex); + return 0; + } + node->md_ctx = to; + add_ctx_info(node); + } else { + if (!is_ctx_sess_shared(node)) { + wd_digest_free_sess(node->sess); + free(node->data); + } + } + node->sess = t->sess; + node->data = t->data; + pthread_mutex_unlock(&digest_ctx_mutex); + if (f && f->data) t->copy = true; -- 2.33.0

1 0

AccLib SIG 双周例会
by openEuler conference 08 Aug '23

08 Aug '23

您好！ sig-AccLib SIG 邀请您参加 2023-08-09 11:00 召开的Zoom会议会议主题：AccLib SIG 双周例会会议内容：固定会议链接: https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/81478853463?pwd=WU9kWHl1bEw1VEc0RUc3RW9Dd0lmUT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-08-09 11:00, The subject of the conference is AccLib SIG 双周例会, Summary: 固定会议链接: https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/81478853463?pwd=WU9kWHl1bEw1VEc0RUc3RW9Dd0lmUT09. 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/3] uadk: add msg pool depth set
by Weili Qian 31 Jul '23

31 Jul '23

1 3

AccLib SIG例会
by openEuler conference 26 Jul '23

26 Jul '23

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

AccLib SIG 双周例会
by openEuler conference 11 Jul '23

11 Jul '23

您好！ sig-AccLib SIG 邀请您参加 2023-07-12 11:00 召开的Zoom会议会议主题：AccLib SIG 双周例会会议内容：固定会议链接: https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/83004635503?pwd=RGN3NzBORnZnc09FZExPZ1M3cHpsUT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-07-12 11:00, The subject of the conference is AccLib SIG 双周例会, Summary: 固定会议链接: https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/83004635503?pwd=RGN3NzBORnZnc09FZExPZ1M3cHpsUT09. 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/3] uadk: fix some issues in uadk
by Weili Qian 10 Jul '23

10 Jul '23

1. Fix local variable type. 2. Fix memory leak in sgl-related interfaces. Weili Qian (3): uadk/v1 - fix local variable type drv/qm: fix memory leak in hisi_qm_create_sglpool() uadk/v1: fix memory leak in wd_sgl.c drv/hisi_qm_udrv.c | 7 ++--- v1/drv/hisi_rng_udrv.c | 2 +- v1/wd_sgl.c | 58 ++++++++++++++++++++++++++++-------------- 3 files changed, 44 insertions(+), 23 deletions(-) -- 2.30.0

1 3

[PATCH 0/2] Some bugfix for hisi-comp
by Yang Shen 07 Jul '23

07 Jul '23

1.Fix memory leak. 2.Add output size check. Yang Shen (2): uadk/hisi_comp - free sgl when send request error uadk/hisi_comp - add output length check for lz77_zstd sgl mode drv/hisi_comp.c | 92 +++++++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 38 deletions(-) -- 2.24.0

1 2

AccLib SIG 双周例会
by openEuler conference 27 Jun '23

27 Jun '23

您好！ sig-AccLib SIG 邀请您参加 2023-06-28 11:00 召开的Zoom会议会议主题：AccLib SIG 双周例会会议内容：固定会议链接 https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/82952828657?pwd=QXpsSUl0ajlGRXdqVW1RZ0hPVVVMdz09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-06-28 11:00, The subject of the conference is AccLib SIG 双周例会, Summary: 固定会议链接 https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/82952828657?pwd=QXpsSUl0ajlGRXdqVW1RZ0hPVVVMdz09. 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 opwnEuler-22.03-LTS-SP2 0/1] uacce: remove uacce device refcnt
by Wenkai Lin 21 Jun '23

21 Jun '23

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Delete the reference counting so that the isolation policy can be dynamically configured. Wenkai Lin (1): uacce: remove uacce device refcnt drivers/misc/uacce/uacce.c | 5 ----- include/linux/uacce.h | 2 -- 2 files changed, 7 deletions(-) -- 2.30.0

1 1

[PATCH 1/3] cipher: fix double free error
by taoqi 20 Jun '23

20 Jun '23

When wd_cipher_set_key() failed, after the handle is released, the handle should be set to 0 to avoid reusing. Signed-off-by: taoqi <taoqi10(a)huawei.com> --- src/uadk_cipher.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index 1f8d8cb..2c1d87b 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -888,6 +888,7 @@ static void uadk_e_ctx_init(EVP_CIPHER_CTX *ctx, struct cipher_priv_ctx *priv) ret = wd_cipher_set_key(priv->sess, priv->key, EVP_CIPHER_CTX_key_length(ctx)); if (ret) { wd_cipher_free_sess(priv->sess); + priv->sess = 0; fprintf(stderr, "uadk failed to set key!\n"); return; } -- 2.33.0

1 2

[PATCH 00/15] Some cleanup and bugfix of uadk_engine
by Zhiqi Song 15 Jun '23

15 Jun '23

This series patch include bugfix about: 1. Source release problems. 2. Null pointer judgement. 3. Error handling. Hao Fang (1): uadk_engine/v1: clean the empty body in an if statement Zhiqi Song (14): uadk_engine: fixup signed-unsigned mix with relational uadk_engine: fixup variable naming conflicts digest: fixup free source method ecc: fixup free source method inconsistent cipher: fixup error handling in ctx init uadk_engine: modify setting async poll state process dh: fixup release source of private key ecc: Add pkey method null pointer judgment rsa: release source when new kg out failed rsa: bugfix repeated source release sm2: fixup unreleased source in data conversion ecc: add openssl method null pointer judgement async: add null pointer judgment uadk_engine: cleanup call form of callback func src/uadk_async.c | 13 ++- src/uadk_cipher.c | 127 ++++++++++++++------------ src/uadk_dh.c | 104 +++++++++++----------- src/uadk_digest.c | 89 ++++++++++--------- src/uadk_ec.c | 28 +++++- src/uadk_ecx.c | 28 ++++-- src/uadk_pkey.c | 19 ++-- src/uadk_pkey.h | 2 +- src/uadk_rsa.c | 13 ++- src/uadk_sm2.c | 181 ++++++++++++++++++++++---------------- src/uadk_utils.h | 1 - src/v1/utils/engine_log.c | 3 +- 12 files changed, 359 insertions(+), 249 deletions(-) -- 2.33.0

1 15

[PATCH 00/10] Somen bugfix and cleanup of uadk_engine
by Zhiqi Song 10 Jun '23

10 Jun '23

This seires patch include: 1. Cleanup of v1 code. 2. Bugfix about some variable type and memory release issues. Hao Fang (1): uadk_engine/v1: clean the empty body in an if statement Zhiqi Song (9): uadk_engine: fixup signed-unsigned mix with relational uadk_engine: fixup variable naming conflicts digest: fixup free source method ecc: fixup free source method inconsistent cipher: fixup error handling in ctx init uadk_engine: modify setting async poll state process dh: fixup release source of private key ecc: add pkey method null pointer judgment rsa: release source when new kg out failed src/uadk_async.c | 5 +- src/uadk_cipher.c | 121 +++++++++++++++++++++----------------- src/uadk_dh.c | 102 +++++++++++++++++--------------- src/uadk_digest.c | 77 ++++++++++++------------ src/uadk_ec.c | 7 ++- src/uadk_ecx.c | 26 +++++--- src/uadk_pkey.c | 15 +++-- src/uadk_rsa.c | 7 ++- src/uadk_sm2.c | 25 ++++++++ src/uadk_utils.h | 1 - src/v1/utils/engine_log.c | 3 +- 11 files changed, 225 insertions(+), 164 deletions(-) -- 2.33.0

1 10

[PATCH] uadk/comp - some misc fixes
by Yang Shen 08 Jun '23

08 Jun '23

Some misc fixes: 1. Add parameters check. 2. Fix some static check. 3. Some typo. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- wd_comp.c | 146 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 92 insertions(+), 54 deletions(-) diff --git a/wd_comp.c b/wd_comp.c index 6be6b72..671baba 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -27,6 +27,10 @@ #define cpu_to_be32(x) swap_byte(x) +static char *wd_comp_alg_name[WD_COMP_ALG_MAX] = { + "zlib", "gzip", "deflate", "lz77_zstd" +}; + struct wd_comp_sess { enum wd_comp_alg_type alg_type; enum wd_comp_level comp_lv; @@ -68,13 +72,6 @@ static int wd_comp_open_driver(void) const char *alg_name = "zlib"; int ret; - /* - * Compatible with the normal acquisition of device - * drivers in the init interface - */ - if (wd_comp_setting.dlh_list) - return 0; - ret = wd_get_lib_file_path("libhisi_zip.so", lib_path, false); if (ret) return ret; @@ -102,6 +99,21 @@ static void wd_comp_clear_status(void) wd_alg_clear_init(&wd_comp_setting.status); } +static bool wd_comp_alg_check(const char *alg_name) +{ + int i; + + for (i = 0; i < WD_COMP_ALG_MAX; i++) { + /* Some algorithms do not support all modes */ + if (!wd_comp_alg_name[i] || !strlen(wd_comp_alg_name[i])) + continue; + if (!strcmp(alg_name, wd_comp_alg_name[i])) + return true; + } + + return false; +} + static int wd_comp_init_nolock(struct wd_ctx_config *config, struct wd_sched *sched) { int ret; @@ -143,21 +155,23 @@ out_clear_ctx_config: return ret; } -static void wd_comp_uninit_nolock(void) +static int wd_comp_uninit_nolock(void) { void *priv = wd_comp_setting.priv; if (!priv) - return; + return -WD_EINVAL; - /* uninit async request pool */ + /* Uninit async request pool */ wd_uninit_async_request_pool(&wd_comp_setting.pool); - /* unset config, sched, driver */ + /* Unset config, sched, driver */ wd_clear_sched(&wd_comp_setting.sched); wd_alg_uninit_driver(&wd_comp_setting.config, wd_comp_setting.driver, &priv); + + return 0; } int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) @@ -196,7 +210,11 @@ out_clear_init: void wd_comp_uninit(void) { - wd_comp_uninit_nolock(); + int ret; + + ret = wd_comp_uninit_nolock(); + if (ret) + return; wd_comp_close_driver(); wd_alg_clear_init(&wd_comp_setting.status); @@ -206,7 +224,7 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par { struct wd_ctx_nums comp_ctx_num[WD_DIR_MAX] = {0}; struct wd_ctx_params comp_ctx_params; - int ret = 0; + int ret = -WD_EINVAL; bool flag; pthread_atfork(NULL, NULL, wd_comp_clear_status); @@ -215,16 +233,21 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par if (!flag) return -WD_EEXIST; - if (!alg || sched_type > SCHED_POLICY_BUTT || - task_type < 0 || task_type > TASK_MAX_TYPE) { + if (!alg || sched_type >= SCHED_POLICY_BUTT || + task_type < 0 || task_type >= TASK_MAX_TYPE) { WD_ERR("invalid: input param is wrong!\n"); - ret = -WD_EINVAL; + goto out_uninit; + } + + flag = wd_comp_alg_check(alg); + if (!flag) { + WD_ERR("invalid: comp:%s unsupported!\n", alg); goto out_uninit; } /* * Driver lib file path could set by env param. - * than open tham by wd_dlopen_drv() + * then open tham by wd_dlopen_drv() * use NULL means dynamic query path */ wd_comp_setting.dlh_list = wd_dlopen_drv(NULL); @@ -233,44 +256,45 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par goto out_uninit; } -res_retry: - memset(&wd_comp_setting.config, 0, sizeof(struct wd_ctx_config_internal)); + while (ret != 0) { + memset(&wd_comp_setting.config, 0, sizeof(struct wd_ctx_config_internal)); - /* Get alg driver and dev name */ - wd_comp_setting.driver = wd_alg_drv_bind(task_type, alg); - if (!wd_comp_setting.driver) { - WD_ERR("fail to bind a valid driver.\n"); - goto out_dlopen; - } + /* Get alg driver and dev name */ + wd_comp_setting.driver = wd_alg_drv_bind(task_type, alg); + if (!wd_comp_setting.driver) { + WD_ERR("failed to bind %s driver.\n", alg); + goto out_dlclose; + } - comp_ctx_params.ctx_set_num = comp_ctx_num; - ret = wd_ctx_param_init(&comp_ctx_params, ctx_params, - wd_comp_setting.driver, WD_COMP_TYPE, WD_DIR_MAX); - if (ret) { - if (ret == -WD_EAGAIN) { - wd_disable_drv(wd_comp_setting.driver); - wd_alg_drv_unbind(wd_comp_setting.driver); - goto res_retry; + comp_ctx_params.ctx_set_num = comp_ctx_num; + ret = wd_ctx_param_init(&comp_ctx_params, ctx_params, + wd_comp_setting.driver, WD_COMP_TYPE, WD_DIR_MAX); + if (ret) { + if (ret == -WD_EAGAIN) { + wd_disable_drv(wd_comp_setting.driver); + wd_alg_drv_unbind(wd_comp_setting.driver); + continue; + } + goto out_unbind_drv; } - goto out_driver; - } - - wd_comp_init_attrs.alg = alg; - wd_comp_init_attrs.sched_type = sched_type; - wd_comp_init_attrs.driver = wd_comp_setting.driver; - wd_comp_init_attrs.ctx_params = &comp_ctx_params; - wd_comp_init_attrs.alg_init = wd_comp_init_nolock; - wd_comp_init_attrs.alg_poll_ctx = wd_comp_poll_ctx; - ret = wd_alg_attrs_init(&wd_comp_init_attrs); - if (ret) { - if (ret == -WD_ENODEV) { - wd_disable_drv(wd_comp_setting.driver); - wd_alg_drv_unbind(wd_comp_setting.driver); - wd_ctx_param_uninit(&comp_ctx_params); - goto res_retry; + + wd_comp_init_attrs.alg = alg; + wd_comp_init_attrs.sched_type = sched_type; + wd_comp_init_attrs.driver = wd_comp_setting.driver; + wd_comp_init_attrs.ctx_params = &comp_ctx_params; + wd_comp_init_attrs.alg_init = wd_comp_init_nolock; + wd_comp_init_attrs.alg_poll_ctx = wd_comp_poll_ctx; + ret = wd_alg_attrs_init(&wd_comp_init_attrs); + if (ret) { + if (ret == -WD_ENODEV) { + wd_disable_drv(wd_comp_setting.driver); + wd_alg_drv_unbind(wd_comp_setting.driver); + wd_ctx_param_uninit(&comp_ctx_params); + continue; + } + WD_ERR("fail to init alg attrs.\n"); + goto out_params_uninit; } - WD_ERR("fail to init alg attrs.\n"); - goto out_params_uninit; } wd_alg_set_init(&wd_comp_setting.status); @@ -280,9 +304,9 @@ res_retry: out_params_uninit: wd_ctx_param_uninit(&comp_ctx_params); -out_driver: +out_unbind_drv: wd_alg_drv_unbind(wd_comp_setting.driver); -out_dlopen: +out_dlclose: wd_dlclose_drv(wd_comp_setting.dlh_list); out_uninit: wd_alg_clear_init(&wd_comp_setting.status); @@ -291,7 +315,11 @@ out_uninit: void wd_comp_uninit2(void) { - wd_comp_uninit_nolock(); + int ret; + + ret = wd_comp_uninit_nolock(); + if (ret) + return; wd_alg_attrs_uninit(&wd_comp_init_attrs); wd_alg_drv_unbind(wd_comp_setting.driver); @@ -844,6 +872,11 @@ int wd_comp_poll(__u32 expt, __u32 *count) handle_t h_sched_ctx; struct wd_sched *sched; + if (unlikely(!count)) { + WD_ERR("invalid: comp poll count is NULL!\n"); + return -WD_EINVAL; + } + h_sched_ctx = wd_comp_setting.sched.h_sched_ctx; sched = &wd_comp_setting.sched; @@ -915,6 +948,11 @@ int wd_comp_get_env_param(__u32 node, __u32 type, __u32 mode, struct wd_ctx_attr ctx_attr; int ret; + if (!num || !is_enable) { + WD_ERR("invalid: num or is_enable is NULL!\n"); + return -WD_EINVAL; + } + if (type >= WD_DIR_MAX) { WD_ERR("invalid: op_type is %u!\n", type); return -WD_EINVAL; -- 2.24.0

1 0

[PATCH 1/9] uadk: add null pointer check
by Wenkai Lin 07 Jun '23

07 Jun '23

From: taoqi 30043660 <taoqi10(a)huawei.com> The system does not check whether the pointer is NULL before releasing the pointer. Signed-off-by: taoqi 30043660 <taoqi10(a)huawei.com> --- wd_mempool.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/wd_mempool.c b/wd_mempool.c index ff9910a..ffb2f47 100644 --- a/wd_mempool.c +++ b/wd_mempool.c @@ -230,8 +230,12 @@ static struct bitmap *create_bitmap(int bits) static void destroy_bitmap(struct bitmap *bm) { - free(bm->map); - free(bm); + if (bm) { + if (bm->map) + free(bm->map); + + free(bm); + } } static unsigned long _find_next_bit(unsigned long *map, unsigned long bits, @@ -893,8 +897,10 @@ static int init_mempool(struct mempool *mp) static void uninit_mempool(struct mempool *mp) { - destroy_bitmap(mp->bitmap); - mp->bitmap = NULL; + if (mp->bitmap) { + destroy_bitmap(mp->bitmap); + mp->bitmap = NULL; + } } handle_t wd_mempool_create(size_t size, int node) -- 2.33.0

1 8

[PATCH OLK-5.10 0/8] Fixed the accelerator capability register issue.
by Wenkai Lin 06 Jun '23

06 Jun '23

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Misc fixes for Kunpeng accelerator drivers! Kai Ye (1): crypto: hisilicon/sec - misc cleanups Wenkai Lin (3): crypto: hisilicon/sec - remove unused parameter crypto: hisilicon/sec - fix for resource leak crypto: hisilicon/qm - add a function to set qm algs Zhiqi Song (4): crypto: hisilicon/qm - save capability registers in qm init process crypto: hisilicon/hpre - save capability registers in probe process crypto: hisilicon/sec2 - save capability registers in probe process crypto: hisilicon/zip - save capability registers in probe process drivers/crypto/hisilicon/hpre/hpre_main.c | 68 ++++++------- drivers/crypto/hisilicon/qm.c | 72 ++++++++++++-- drivers/crypto/hisilicon/sec2/sec.h | 7 ++ drivers/crypto/hisilicon/sec2/sec_crypto.c | 89 +++++++++-------- drivers/crypto/hisilicon/sec2/sec_main.c | 105 ++++++++++----------- drivers/crypto/hisilicon/zip/zip_main.c | 104 ++++++++++---------- include/linux/hisi_acc_qm.h | 12 +++ 7 files changed, 254 insertions(+), 203 deletions(-) -- 2.30.0

1 8

[PATCH 0/9] uadk: some fixes for hpre
by Weili Qian 06 Jun '23

06 Jun '23

Misc fixes for hpre driver and asymmetric algorithm API. Qi Tao (1): uadk/rsa: use %u to print u32 variables Weili Qian (8): drv/hpre: fix ECC operation type drv/hisi_sec: enable address prefetching drv/hpre: rename hpre_alg_driver to hpre_ecc_driver uadk: add algorithm check uadk: modify parameter check conditions uadk: fix repeat uninit error uadk: fix coding style uadk: remove duplicate checks drv/hisi_hpre.c | 26 +++++----- drv/hisi_sec.c | 6 +++ wd_dh.c | 108 ++++++++++++++++++++++------------------ wd_ecc.c | 130 ++++++++++++++++++++++++++---------------------- wd_rsa.c | 116 ++++++++++++++++++++++-------------------- 5 files changed, 212 insertions(+), 174 deletions(-) -- 2.30.0

1 9

[PATCH] cipher: code clean for update iv and check length
by Wenkai Lin 03 Jun '23

03 Jun '23

Reduces some counting and branching judgments. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- src/uadk_cipher.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index a880c1b..c7be21a 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -64,7 +64,7 @@ struct cipher_priv_ctx { void *sw_ctx_data; /* Crypto small packet offload threshold */ size_t switch_threshold; - int update_iv; + bool update_iv; }; struct cipher_info { @@ -317,12 +317,6 @@ static int uadk_e_cipher_soft_work(EVP_CIPHER_CTX *ctx, unsigned char *out, return 1; } -static int sec_ciphers_is_check_valid(struct cipher_priv_ctx *priv) -{ - return priv->req.in_bytes <= priv->switch_threshold ? - 0 : 1; -} - static void uadk_e_cipher_sw_cleanup(EVP_CIPHER_CTX *ctx) { struct cipher_priv_ctx *priv = @@ -771,13 +765,12 @@ static void uadk_cipher_update_priv_ctx(struct cipher_priv_ctx *priv) int i; switch (priv->setup.mode) { + case WD_CIPHER_CFB: case WD_CIPHER_CBC: if (priv->req.op_type == WD_CIPHER_ENCRYPTION) - memcpy(priv->iv, priv->req.dst + priv->req.in_bytes - iv_bytes, - iv_bytes); + memcpy(priv->iv, priv->req.dst + offset, iv_bytes); else - memcpy(priv->iv, priv->req.src + priv->req.in_bytes - iv_bytes, - iv_bytes); + memcpy(priv->iv, priv->req.src + offset, iv_bytes); break; case WD_CIPHER_OFB: @@ -786,15 +779,6 @@ static void uadk_cipher_update_priv_ctx(struct cipher_priv_ctx *priv) *((unsigned char *)priv->req.dst + offset + i); } memcpy(priv->iv, K, iv_bytes); - break; - case WD_CIPHER_CFB: - if (priv->req.op_type == WD_CIPHER_ENCRYPTION) - memcpy(priv->iv, priv->req.dst + priv->req.in_bytes - iv_bytes, - iv_bytes); - else - memcpy(priv->iv, priv->req.src + priv->req.in_bytes - iv_bytes, - iv_bytes); - break; case WD_CIPHER_CTR: ctr_iv_inc(priv->iv, priv->req.in_bytes >> CTR_MODE_LEN_SHIFT); @@ -811,8 +795,7 @@ static int do_cipher_sync(struct cipher_priv_ctx *priv) if (unlikely(priv->switch_flag == UADK_DO_SOFT)) return 0; - ret = sec_ciphers_is_check_valid(priv); - if (!ret) + if (priv->switch_threshold >= priv->req.in_bytes) return 0; ret = wd_do_cipher_sync(priv->sess, &priv->req); -- 2.33.0

1 0

[PATCH 01/20] uadk: fix alg driver uninit problem
by Wenkai Lin 03 Jun '23

03 Jun '23

UADK_ALG_HW is calc_type of driver property, fix it. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- wd_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wd_util.c b/wd_util.c index 633d957..6593dad 100644 --- a/wd_util.c +++ b/wd_util.c @@ -1968,7 +1968,7 @@ void wd_alg_uninit_driver(struct wd_ctx_config_internal *config, driver->exit(priv); /* Ctx config just need clear once */ - if (driver->priority == UADK_ALG_HW) + if (driver->calc_type == UADK_ALG_HW) wd_clear_ctx_config(config); if (driver->fallback) -- 2.33.0

1 19

[PATCH 00/10] uadk_engine: bugfix and cleanup
by Zhiqi Song 02 Jun '23

02 Jun '23

This patch set including the following modify: 1. Some optimization of ECC and Digest algorithms to improve the performance of them. 2. Some bugfix and cleanup of the code. 3. Fixup the README.md info about enviroment variable. Zhiqi Song (10): uadk_engine: bugfix null dereference in abnormal conditions digest: cleanup magic number in digest dh: cleanup redundant macro definition ecc: bugfix about repeated alg and dev queries ecc: bugfix the conversion of sm2 pubkey point uadk_engine: modify static check problem ecc: optimize sm2 ctrl process to improve performance digest: remove soft ctx allocation in digest init process ecc: optimize sm2 update session process uadk_engine: fix openssl config info README.md | 16 ++++---- src/uadk_async.c | 22 +++++++++-- src/uadk_async.h | 7 +++- src/uadk_dh.c | 1 - src/uadk_digest.c | 98 +++++++++++++++++++++++++++-------------------- src/uadk_ec.c | 79 ++++++++++++++++++++++++++++---------- src/uadk_ecx.c | 23 +++++++++-- src/uadk_pkey.c | 66 +++++++++++++++++++------------ src/uadk_pkey.h | 13 ++++++- src/uadk_rsa.c | 18 +++++++++ src/uadk_sm2.c | 87 ++++++++++++++++++++++++++++++----------- 11 files changed, 303 insertions(+), 127 deletions(-) -- 2.30.0

1 10

[PATCH 00/10] uadk_engine: bugfix and cleanup
by Zhiqi Song 02 Jun '23

02 Jun '23

This patch set including the following modify: 1. Some optimization of ECC and Digest algorithms to improve the performance of them. 2. Some bugfix and cleanup of the code. 3. Fixup the README.md info about enviroment variable. Zhiqi Song (10): uadk_engine: bugfix null dereference in abnormal conditions digest: cleanup magic number in digest dh: cleanup redundant macro definition ecc: bugfix about repeated alg and dev queries ecc: bugfix the conversion of sm2 pubkey point uadk_engine: modify static check problem ecc: optimize sm2 ctrl process to improve performance digest: remove soft ctx allocation in digest init process ecc: optimize sm2 update session process uadk_engine: fix openssl config info README.md | 16 ++++---- src/uadk_async.c | 22 +++++++++-- src/uadk_async.h | 7 +++- src/uadk_dh.c | 1 - src/uadk_digest.c | 98 +++++++++++++++++++++++++++-------------------- src/uadk_ec.c | 79 ++++++++++++++++++++++++++++---------- src/uadk_ecx.c | 23 +++++++++-- src/uadk_pkey.c | 66 +++++++++++++++++++------------ src/uadk_pkey.h | 13 ++++++- src/uadk_rsa.c | 18 +++++++++ src/uadk_sm2.c | 87 ++++++++++++++++++++++++++++++----------- 11 files changed, 303 insertions(+), 127 deletions(-) -- 2.30.0

1 10

[PATCH 0/7] uadk/zlibwrapper - misc bugfixes
by Yang Shen 01 Jun '23

01 Jun '23

Some bugfixes and clean up for UADK. Yang Shen (7): uadk/zlibwrapper - some misc clean up uadk/zlibwrapper - fix the return value for deflate/inflate uadk/zlibwrapper - add parameters check for APIs uadk/zlibwrapper - remove duplication for deflate and inflate uadk/zlibwrapper - fix wrong windowsize uadk/zlibwrapper - rename zlibwrapper APIs uadk/wd - fix error shmid for multiprocess wd_zlibwrapper.h => include/wd_zlibwrapper.h | 30 +-- wd_util.c | 84 +++---- wd_zlibwrapper.c | 217 +++++++++---------- 3 files changed, 133 insertions(+), 198 deletions(-) rename wd_zlibwrapper.h => include/wd_zlibwrapper.h (68%) -- 2.24.0

1 7

AccLib SIG例会
by openEuler conference 31 May '23

31 May '23

您好！ sig-AccLib SIG 邀请您参加 2023-05-31 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议内容：固定会议链接: https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/82737022321?pwd=REFadTJnZDllZ3EzK0xWMTUzQ1ZnQT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-05-31 11:00, The subject of the conference is AccLib SIG例会, Summary: 固定会议链接: https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/82737022321?pwd=REFadTJnZDllZ3EzK0xWMTUzQ1ZnQT09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

[PATCH] uadk: fix error incorrect parameters
by Wenkai Lin 19 May '23

19 May '23

From: Weili Qian <qianweili(a)huawei.com> The dlclose() parameter must be 'dlhandle' instead of 'dlnode'. Modify the input parameter of the function. Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- wd_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wd_util.c b/wd_util.c index d8d6482..2b4a53c 100644 --- a/wd_util.c +++ b/wd_util.c @@ -2033,7 +2033,7 @@ void wd_dlclose_drv(void *dlh_list) while (dlhead) { dlnode = dlhead; dlhead = dlhead->next; - dlclose(dlnode); + dlclose(dlnode->dlhandle); free(dlnode); } } -- 2.30.0

1 0

[PATCH] uadk/aead: supports aes-gcm stream mode
by Wenkai Lin 18 May '23

18 May '23

In stream processing encryption mode, a long file needs to be encrypted. When the accelerator is invoked, the encryption result of each block is assembled. The assembled result is the same as the result of encrypting the entire file at a time. For hisi_sec, AAD data is completed by the first BD, plaintext data are done with middle BDs and end BD. In an encrypted stream, the first BD and end BD are unique and must be delivered to hardware. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- Makefile.am | 3 +- drv/hisi_sec.c | 392 ++++++++++++++++++++++++++++++++++-- include/crypto/aes.h | 32 +++ include/crypto/galois.h | 19 ++ include/drv/wd_aead_drv.h | 7 + include/wd.h | 1 + include/wd_aead.h | 15 ++ lib/crypto/aes.c | 405 ++++++++++++++++++++++++++++++++++++++ lib/crypto/galois.c | 94 +++++++++ wd_aead.c | 44 +++++ 10 files changed, 992 insertions(+), 20 deletions(-) create mode 100644 include/crypto/aes.h create mode 100644 include/crypto/galois.h create mode 100644 lib/crypto/aes.c create mode 100644 lib/crypto/galois.c diff --git a/Makefile.am b/Makefile.am index f6b73c1..37ac9b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,7 +75,8 @@ libwd_crypto_la_SOURCES=wd_cipher.c wd_cipher.h wd_cipher_drv.h \ wd_sched.c wd_sched.h libhisi_sec_la_SOURCES=drv/hisi_sec.c drv/hisi_qm_udrv.c \ - hisi_qm_udrv.h wd_cipher_drv.h wd_aead_drv.h + lib/crypto/aes.c lib/crypto/galois.c \ + hisi_qm_udrv.h wd_cipher_drv.h wd_aead_drv.h aes.h galois.h libhisi_hpre_la_SOURCES=drv/hisi_hpre.c drv/hisi_qm_udrv.c \ hisi_qm_udrv.h wd_hpre_drv.h diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index 41285ba..ff78419 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -1,14 +1,17 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright 2020-2021 Huawei Technologies Co.,Ltd. All rights reserved. */ -#include "../include/drv/wd_cipher_drv.h" -#include "../include/drv/wd_digest_drv.h" -#include "../include/drv/wd_aead_drv.h" +#include "drv/wd_cipher_drv.h" +#include "drv/wd_digest_drv.h" +#include "drv/wd_aead_drv.h" +#include "crypto/aes.h" +#include "crypto/galois.h" #include "hisi_qm_udrv.h" #include "wd_cipher.h" #include "wd_digest.h" #include "wd_aead.h" +#define BIT(nr) (1UL << (nr)) #define SEC_DIGEST_ALG_OFFSET 11 #define WORD_ALIGNMENT_MASK 0x3 #define CTR_MODE_LEN_SHIFT 4 @@ -68,6 +71,15 @@ #define DES3_BLOCK_SIZE 8 #define AES_BLOCK_SIZE 16 #define CTR_128BIT_COUNTER 16 +#define GCM_FINAL_COUNTER 0x1000000 +#define GCM_FINAL_COUNTER_LEN 4 +#define GCM_STREAM_MAC_OFFSET 32 +#define GCM_FULL_MAC_LEN 16 +#define GCM_AUTH_MAC_OFFSET 47 +#define GCM_BLOCK_SIZE AES_BLOCK_SIZE +#define AKEY_LEN(c_key_len) (2 * (c_key_len) + 0x4) +#define MAC_LEN 4 +#define LONG_AUTH_DATA_OFFSET 24 /* The max BD data length is 16M-512B */ #define MAX_INPUT_DATA_LEN 0xFFFE00 @@ -175,8 +187,10 @@ enum { }; enum sec_cipher_dir { + SEC_NO_CIPHER = 0x0, SEC_CIPHER_ENC = 0x1, SEC_CIPHER_DEC = 0x2, + SEC_CIPHER_COPY = 0x3, }; enum sec_bd_type { @@ -369,7 +383,8 @@ struct bd3_stream_scene { /* * auth_pad: 0~1 bits * stream_protocol: 2~4 bits - * reserved: 5~7 bits + * mac_sel: 5 bits + * reserved: 6~7 bits */ __u8 stream_auth_pad; __u8 plaintext_type; @@ -591,6 +606,7 @@ static void dump_sec_msg(void *msg, const char *alg) dmsg->key_bytes, dmsg->iv_bytes, dmsg->in_bytes, dmsg->out_bytes); } else if (!strcmp(alg, "aead")) { amsg = (struct wd_aead_msg *)msg; + WD_ERR("MSG_STATE:%u\n", amsg->msg_state); WD_ERR("type:%u calg:%u op_type:%u cmode:%u\n", amsg->alg_type, amsg->calg, amsg->op_type, amsg->cmode); WD_ERR("data_fmt:%u ckey_bytes:%u auth_bytes:%u\n", @@ -2095,6 +2111,10 @@ static int fill_aead_bd2_mode(struct wd_aead_msg *msg, case WD_CIPHER_GCM: c_mode = C_MODE_GCM; sqe->type_auth_cipher &= SEC_AUTH_MASK; + if ((msg->msg_state == AEAD_MSG_FIRST) && !msg->assoc_bytes) { + WD_ERR("invalid: first bd assoc bytes is 0!\n"); + return -WD_EINVAL; + } sqe->type2.alen_ivllen = msg->assoc_bytes; sqe->type2.icvw_kmode |= msg->auth_bytes; break; @@ -2170,8 +2190,22 @@ static void fill_aead_bd2_addr(struct wd_aead_msg *msg, sqe->type2.a_ivin_addr = (__u64)(uintptr_t)msg->aiv; } -static int aead_len_check(struct wd_aead_msg *msg) +static int aead_len_check(struct wd_aead_msg *msg, enum sec_bd_type type) { + if (msg->msg_state == AEAD_MSG_MIDDLE) { + if ((!msg->in_bytes || (msg->in_bytes & (AES_BLOCK_SIZE - 1)))) { + WD_ERR("invalid: middle bd input size is 0 or not 16 bytes aligned!\n"); + return -WD_EINVAL; + } + } + + if (msg->cmode == WD_CIPHER_GCM || msg->cmode == WD_CIPHER_CCM) { + if (msg->msg_state == AEAD_MSG_BLOCK && type == BD_TYPE2 && !msg->in_bytes) { + WD_ERR("invalid: ccm/gcm block mode input size is 0 for hw_v2!\n"); + return -WD_EINVAL; + } + } + if (unlikely(msg->in_bytes + msg->assoc_bytes > MAX_INPUT_DATA_LEN)) { WD_ERR("aead input data length is too long, size = %u\n", msg->in_bytes + msg->assoc_bytes); @@ -2188,16 +2222,184 @@ static int aead_len_check(struct wd_aead_msg *msg) return 0; } +static void fill_gcm_akey_len(struct wd_aead_msg *msg, void *sqe, enum sec_bd_type type) +{ + struct hisi_sec_sqe3 *sqe3; + struct hisi_sec_sqe *sqe2; + __u8 c_key_len = 0; + + aead_get_aes_key_len(msg, &c_key_len); + + if (type == BD_TYPE2) { + sqe2 = (struct hisi_sec_sqe *)sqe; + sqe2->type2.mac_key_alg |= (__u32)AKEY_LEN(c_key_len) << MAC_LEN_OFFSET; + } else if (type == BD_TYPE3) { + sqe3 = (struct hisi_sec_sqe3 *)sqe; + sqe3->auth_mac_key |= (__u32)AKEY_LEN(c_key_len) << SEC_AKEY_OFFSET_V3; + } +} + +static void gcm_auth_ivin(struct wd_aead_msg *msg) +{ + __u32 final_counter = GCM_FINAL_COUNTER; + + /* auth_ivin = {cipher_ivin(16B), null(16B), auth_mac(16B), null(16B)} */ + memset(msg->aiv_stream, 0, AIV_STREAM_LEN); + + memcpy(msg->aiv_stream, msg->iv, GCM_IV_SIZE); + /* The last 4 bytes of c_ivin are counters */ + memcpy(msg->aiv_stream + GCM_IV_SIZE, &final_counter, GCM_FINAL_COUNTER_LEN); + + /* Fill auth_ivin with the mac of last MIDDLE BD */ + memcpy(msg->aiv_stream + GCM_STREAM_MAC_OFFSET, msg->mac, GCM_FULL_MAC_LEN); + + /* Use the user's origin mac for decrypt icv check */ + if (msg->op_type == WD_CIPHER_DECRYPTION_DIGEST) + memcpy(msg->mac, msg->mac_bak, msg->auth_bytes); +} + +static void fill_gcm_first_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) +{ + sqe->ai_apd_cs = AI_GEN_INNER; + sqe->ai_apd_cs |= AUTHPAD_NOPAD << AUTHPAD_OFFSET; + sqe->type_auth_cipher &= ~(SEC_CIPHER_COPY << SEC_CIPHER_OFFSET); + sqe->type_auth_cipher |= AUTH_HMAC_CALCULATE << AUTHTYPE_OFFSET; + sqe->type2.mac_key_alg = MAC_LEN; + fill_gcm_akey_len(msg, sqe, BD_TYPE2); + sqe->type2.mac_key_alg |= A_ALG_AES_GMAC << AUTH_ALG_OFFSET; + sqe->type2.clen_ivhlen = 0; + sqe->type2.icvw_kmode = 0; + sqe->type2.a_ivin_addr = 0; + sqe->type2.c_key_addr = 0; + sqe->type2.c_alg = 0; + sqe->type2.auth_src_offset = 0; + sqe->type2.alen_ivllen = msg->assoc_bytes; + sqe->type2.c_ivin_addr = (__u64)(uintptr_t)msg->iv; + sqe->type2.a_key_addr = (__u64)(uintptr_t)msg->ckey; +} + +static void fill_gcm_middle_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) +{ + sqe->ai_apd_cs = AI_GEN_IVIN_ADDR; + sqe->ai_apd_cs |= AUTHPAD_NOPAD << AUTHPAD_OFFSET; + sqe->type_auth_cipher |= NO_AUTH << AUTHTYPE_OFFSET; + sqe->type2.cipher_src_offset = 0; + sqe->type2.auth_src_offset = 0; + fill_gcm_akey_len(msg, sqe, BD_TYPE2); + sqe->type2.alen_ivllen = 0; + sqe->type2.a_ivin_addr = sqe->type2.mac_addr; + sqe->type2.c_ivin_addr = (__u64)(uintptr_t)msg->iv; + sqe->type2.a_key_addr = (__u64)(uintptr_t)msg->ckey; +} + +static void fill_gcm_final_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) +{ + sqe->ai_apd_cs = AI_GEN_IVIN_ADDR; + sqe->ai_apd_cs |= AUTHPAD_PAD << AUTHPAD_OFFSET; + sqe->type_auth_cipher |= NO_AUTH << AUTHTYPE_OFFSET; + sqe->type2.cipher_src_offset = 0; + sqe->type2.auth_src_offset = 0; + fill_gcm_akey_len(msg, sqe, BD_TYPE2); + sqe->type2.alen_ivllen = 0; + sqe->type2.long_a_data_len = msg->assoc_bytes; + sqe->type2.long_a_data_len |= msg->long_data_len << LONG_AUTH_DATA_OFFSET; + sqe->type2.c_ivin_addr = (__u64)(uintptr_t)msg->iv; + sqe->type2.a_key_addr = (__u64)(uintptr_t)msg->ckey; + sqe->type2.a_ivin_addr = (__u64)(uintptr_t)msg->aiv_stream; +} + +static void get_galois_vector_s(struct wd_aead_msg *msg, __u8 *s) +{ + unsigned int aad_len, cipher_len; + __u8 a_c[GCM_BLOCK_SIZE] = {0}; + int i; + + aad_len = msg->assoc_bytes * BYTE_BITS; + memcpy(&a_c[BYTE_BITS], &aad_len, sizeof(unsigned int)); + + cipher_len = msg->long_data_len * BYTE_BITS; + memcpy(&a_c[0], &cipher_len, sizeof(unsigned int)); + + /* Based the little-endian operation */ + for (i = 0; i < GCM_BLOCK_SIZE; i++) + s[i] = a_c[i] ^ msg->aiv_stream[(__u8)(GCM_AUTH_MAC_OFFSET - i)]; +} + +static int gcm_do_soft_mac(struct wd_aead_msg *msg) +{ + __u8 ctr_r[GCM_BLOCK_SIZE] = {0}; + __u8 data[GCM_BLOCK_SIZE] = {0}; + __u8 H[GCM_BLOCK_SIZE] = {0}; + __u8 S[GCM_BLOCK_SIZE] = {0}; + __u8 g[GCM_BLOCK_SIZE] = {0}; + int i, ret; + + aes_encrypt(msg->ckey, msg->ckey_bytes, data, H); + + get_galois_vector_s(msg, S); + + galois_compute(S, H, g, GCM_BLOCK_SIZE); + + /* Encrypt ctr0 based on AES_ECB */ + aes_encrypt(msg->ckey, msg->ckey_bytes, msg->aiv_stream, ctr_r); + + /* Get the GMAC tag final */ + for (i = 0; i < GCM_BLOCK_SIZE; i++) + msg->mac[i] = g[i] ^ ctr_r[i]; + + if (msg->op_type == WD_CIPHER_DECRYPTION_DIGEST) { + ret = memcmp(msg->mac, msg->mac_bak, msg->auth_bytes); + if (ret) { + msg->result = WD_IN_EPARA; + WD_ERR("failed to do the gcm authentication!\n"); + return -WD_EINVAL; + } + } + + msg->result = WD_SUCCESS; + + return 0; +} + +static int fill_stream_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) +{ + int ret = 0; + + switch (msg->msg_state) { + case AEAD_MSG_FIRST: + fill_gcm_first_bd2(msg, sqe); + break; + case AEAD_MSG_MIDDLE: + fill_gcm_middle_bd2(msg, sqe); + break; + case AEAD_MSG_END: + gcm_auth_ivin(msg); + if (msg->in_bytes) { + fill_gcm_final_bd2(msg, sqe); + } else { + ret = gcm_do_soft_mac(msg); + if (!ret) + ret = WD_SOFT_COMPUTING; + } + break; + default: + break; + } + + return ret; +} + static int fill_aead_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) { __u8 scene, cipher, de; int ret; - /* config BD type */ sqe->type_auth_cipher = BD_TYPE2; - /* config scene */ - scene = SEC_IPSEC_SCENE << SEC_SCENE_OFFSET; - de = DATA_DST_ADDR_ENABLE << SEC_DE_OFFSET; + + if (msg->msg_state == AEAD_MSG_BLOCK) + scene = SEC_IPSEC_SCENE << SEC_SCENE_OFFSET; + else + scene = SEC_STREAM_SCENE << SEC_SCENE_OFFSET; if (msg->op_type == WD_CIPHER_ENCRYPTION_DIGEST) { cipher = SEC_CIPHER_ENC << SEC_CIPHER_OFFSET; @@ -2213,6 +2415,8 @@ static int fill_aead_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) WD_ERR("failed to check aead op type, op = %u\n", msg->op_type); return -WD_EINVAL; } + + de = DATA_DST_ADDR_ENABLE << SEC_DE_OFFSET; sqe->sds_sa_type |= (__u8)(de | scene); sqe->type_auth_cipher |= cipher; @@ -2235,6 +2439,23 @@ static int fill_aead_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) return 0; } +int aead_msg_state_check(struct wd_aead_msg *msg) +{ + if (msg->cmode == WD_CIPHER_GCM) { + if (unlikely(msg->msg_state >= AEAD_MSG_INVALID)) { + WD_ERR("invalid: GCM input msg state is wrong!\n"); + return -WD_EINVAL; + } + } else { + if (unlikely(msg->msg_state != AEAD_MSG_BLOCK)) { + WD_ERR("invalid: cmode not support stream msg state!\n"); + return -WD_EINVAL; + } + } + + return 0; +} + int hisi_sec_aead_send(handle_t ctx, void *aead_msg) { handle_t h_qp = (handle_t)wd_ctx_get_priv(ctx); @@ -2248,12 +2469,11 @@ int hisi_sec_aead_send(handle_t ctx, void *aead_msg) return -WD_EINVAL; } - if (unlikely(msg->cmode != WD_CIPHER_CBC && !msg->in_bytes)) { - WD_ERR("ccm or gcm not supports 0 packet size at hw_v2!\n"); - return -WD_EINVAL; - } + ret = aead_msg_state_check(msg); + if (unlikely(ret)) + return ret; - ret = aead_len_check(msg); + ret = aead_len_check(msg, BD_TYPE2); if (unlikely(ret)) return ret; @@ -2270,6 +2490,13 @@ int hisi_sec_aead_send(handle_t ctx, void *aead_msg) } fill_aead_bd2_addr(msg, &sqe); + + ret = fill_stream_bd2(msg, &sqe); + if (ret == WD_SOFT_COMPUTING) + return 0; + else if (unlikely(ret)) + return ret; + hisi_set_msg_id(h_qp, &msg->tag); sqe.type2.tag = (__u16)msg->tag; @@ -2288,6 +2515,20 @@ int hisi_sec_aead_send(handle_t ctx, void *aead_msg) return 0; } +static void update_stream_counter(struct wd_aead_msg *recv_msg) +{ + /* + * The counter of the first middle BD is set to 1. + * Other middle BDs and tail BD are set based on + * cipher_len and the counter of the previous BD. + */ + if (recv_msg->msg_state == AEAD_MSG_FIRST) { + recv_msg->iv[MAX_IV_SIZE - 1] = 0x1; + } else if (recv_msg->msg_state == AEAD_MSG_MIDDLE) { + ctr_iv_inc(recv_msg->iv, recv_msg->in_bytes >> CTR_MODE_LEN_SHIFT); + } +} + static void parse_aead_bd2(struct hisi_qp *qp, struct hisi_sec_sqe *sqe, struct wd_aead_msg *recv_msg) { @@ -2324,10 +2565,19 @@ static void parse_aead_bd2(struct hisi_qp *qp, struct hisi_sec_sqe *sqe, temp_msg = recv_msg; } + update_stream_counter(recv_msg); + if (unlikely(recv_msg->result != WD_SUCCESS)) dump_sec_msg(temp_msg, "aead"); } +static bool soft_compute_check(struct hisi_qp *qp, struct wd_aead_msg *msg) +{ + /* Asynchronous mode does not use the sent message, so ignores it */ + return (msg->msg_state == AEAD_MSG_END) && !msg->in_bytes && + qp->q_info.qp_mode == CTX_MODE_SYNC; +} + int hisi_sec_aead_recv(handle_t ctx, void *aead_msg) { handle_t h_qp = (handle_t)wd_ctx_get_priv(ctx); @@ -2336,6 +2586,9 @@ int hisi_sec_aead_recv(handle_t ctx, void *aead_msg) __u16 count = 0; int ret; + if (soft_compute_check((struct hisi_qp *)h_qp, recv_msg)) + return 0; + ret = hisi_qm_recv(h_qp, &sqe, 1, &count); if (ret < 0) return ret; @@ -2436,6 +2689,10 @@ static int fill_aead_bd3_mode(struct wd_aead_msg *msg, case WD_CIPHER_GCM: sqe->c_mode_alg |= C_MODE_GCM; sqe->auth_mac_key &= SEC_AUTH_MASK_V3; + if ((msg->msg_state == AEAD_MSG_FIRST) && !msg->assoc_bytes) { + WD_ERR("invalid: first bd assoc bytes is 0!\n"); + return -WD_EINVAL; + } sqe->a_len_key = msg->assoc_bytes; sqe->c_icv_key |= msg->auth_bytes << SEC_MAC_OFFSET_V3; break; @@ -2465,17 +2722,97 @@ static void fill_aead_bd3_addr(struct wd_aead_msg *msg, sqe->auth_ivin.a_ivin_addr = (__u64)(uintptr_t)msg->aiv; } +static void fill_gcm_first_bd3(struct wd_aead_msg *msg, struct hisi_sec_sqe3 *sqe) +{ + sqe->auth_mac_key |= AI_GEN_INNER << SEC_AI_GEN_OFFSET_V3; + sqe->stream_scene.stream_auth_pad = AUTHPAD_NOPAD; + sqe->stream_scene.stream_auth_pad |= BIT(5); + sqe->c_icv_key &= ~0x3; + sqe->auth_mac_key = AUTH_HMAC_CALCULATE; + sqe->auth_mac_key |= MAC_LEN << SEC_MAC_OFFSET_V3; + fill_gcm_akey_len(msg, sqe, BD_TYPE3); + sqe->auth_mac_key |= A_ALG_AES_GMAC << SEC_AUTH_ALG_OFFSET_V3; + sqe->c_len_ivin = 0; + sqe->auth_ivin.a_ivin_addr = 0; + sqe->c_key_addr = 0; + sqe->c_mode_alg &= ~(0x7 << SEC_CALG_OFFSET_V3); + sqe->auth_src_offset = 0; + sqe->a_len_key = msg->assoc_bytes; + sqe->stream_scene.c_ivin_addr = (__u64)(uintptr_t)msg->iv; + sqe->a_key_addr = (__u64)(uintptr_t)msg->ckey; +} + +static void fill_gcm_middle_bd3(struct wd_aead_msg *msg, struct hisi_sec_sqe3 *sqe) +{ + sqe->auth_mac_key |= AI_GEN_IVIN_ADDR << SEC_AI_GEN_OFFSET_V3; + sqe->stream_scene.stream_auth_pad = AUTHPAD_NOPAD; + sqe->stream_scene.stream_auth_pad |= BIT(5); + sqe->auth_mac_key |= NO_AUTH; + sqe->cipher_src_offset = 0; + sqe->auth_src_offset = 0; + fill_gcm_akey_len(msg, sqe, BD_TYPE3); + sqe->a_len_key = 0; + sqe->auth_ivin.a_ivin_addr = sqe->mac_addr; + sqe->stream_scene.c_ivin_addr = (__u64)(uintptr_t)msg->iv; + sqe->a_key_addr = (__u64)(uintptr_t)msg->ckey; +} + +static void fill_gcm_final_bd3(struct wd_aead_msg *msg, struct hisi_sec_sqe3 *sqe) +{ + sqe->auth_mac_key |= AI_GEN_IVIN_ADDR << SEC_AI_GEN_OFFSET_V3; + sqe->stream_scene.stream_auth_pad = AUTHPAD_PAD; + sqe->stream_scene.stream_auth_pad |= BIT(5); + sqe->auth_mac_key |= NO_AUTH; + sqe->cipher_src_offset = 0; + sqe->auth_src_offset = 0; + fill_gcm_akey_len(msg, sqe, BD_TYPE3); + sqe->a_len_key = 0; + sqe->stream_scene.long_a_data_len = msg->assoc_bytes; + sqe->stream_scene.long_a_data_len |= msg->long_data_len << LONG_AUTH_DATA_OFFSET; + sqe->stream_scene.c_ivin_addr = (__u64)(uintptr_t)msg->iv; + sqe->a_key_addr = (__u64)(uintptr_t)msg->ckey; + sqe->auth_ivin.a_ivin_addr = (__u64)(uintptr_t)msg->aiv_stream; +} + +static int fill_stream_bd3(struct wd_aead_msg *msg, struct hisi_sec_sqe3 *sqe) +{ + int ret = 0; + + switch (msg->msg_state) { + case AEAD_MSG_FIRST: + fill_gcm_first_bd3(msg, sqe); + break; + case AEAD_MSG_MIDDLE: + fill_gcm_middle_bd3(msg, sqe); + break; + case AEAD_MSG_END: + gcm_auth_ivin(msg); + if (msg->in_bytes) { + fill_gcm_final_bd3(msg, sqe); + } else { + ret = gcm_do_soft_mac(msg); + if (!ret) + ret = WD_SOFT_COMPUTING; + } + break; + default: + break; + } + + return ret; +} static int fill_aead_bd3(struct wd_aead_msg *msg, struct hisi_sec_sqe3 *sqe) { __u16 scene, de; int ret; - /* config BD type */ sqe->bd_param = BD_TYPE3; - /* config scene */ - scene = SEC_IPSEC_SCENE << SEC_SCENE_OFFSET_V3; - de = DATA_DST_ADDR_ENABLE << SEC_DE_OFFSET_V3; + + if (msg->msg_state == AEAD_MSG_BLOCK) + scene = SEC_IPSEC_SCENE << SEC_SCENE_OFFSET_V3; + else + scene = SEC_STREAM_SCENE << SEC_SCENE_OFFSET_V3; if (msg->op_type == WD_CIPHER_ENCRYPTION_DIGEST) { sqe->c_icv_key = SEC_CIPHER_ENC; @@ -2489,6 +2826,8 @@ static int fill_aead_bd3(struct wd_aead_msg *msg, struct hisi_sec_sqe3 *sqe) WD_ERR("failed to check aead op type, op = %u\n", msg->op_type); return -WD_EINVAL; } + + de = DATA_DST_ADDR_ENABLE << SEC_DE_OFFSET_V3; sqe->bd_param |= (__u16)(de | scene); sqe->c_len_ivin = msg->in_bytes; @@ -2526,7 +2865,11 @@ int hisi_sec_aead_send_v3(handle_t ctx, void *aead_msg) return -WD_EINVAL; } - ret = aead_len_check(msg); + ret = aead_msg_state_check(msg); + if (unlikely(ret)) + return ret; + + ret = aead_len_check(msg, BD_TYPE3); if (unlikely(ret)) return ret; @@ -2544,6 +2887,12 @@ int hisi_sec_aead_send_v3(handle_t ctx, void *aead_msg) fill_aead_bd3_addr(msg, &sqe); + ret = fill_stream_bd3(msg, &sqe); + if (ret == WD_SOFT_COMPUTING) + return 0; + else if (unlikely(ret)) + return ret; + hisi_set_msg_id(h_qp, &msg->tag); sqe.tag = msg->tag; ret = hisi_qm_send(h_qp, &sqe, 1, &count); @@ -2598,6 +2947,8 @@ static void parse_aead_bd3(struct hisi_qp *qp, struct hisi_sec_sqe3 *sqe, temp_msg = recv_msg; } + update_stream_counter(recv_msg); + if (unlikely(recv_msg->result != WD_SUCCESS)) dump_sec_msg(temp_msg, "aead"); } @@ -2610,6 +2961,9 @@ int hisi_sec_aead_recv_v3(handle_t ctx, void *aead_msg) __u16 count = 0; int ret; + if (soft_compute_check((struct hisi_qp *)h_qp, recv_msg)) + return 0; + ret = hisi_qm_recv(h_qp, &sqe, 1, &count); if (ret < 0) return ret; diff --git a/include/crypto/aes.h b/include/crypto/aes.h new file mode 100644 index 0000000..eca58ba --- /dev/null +++ b/include/crypto/aes.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright 2023 Huawei Technologies Co.,Ltd. All rights reserved. */ + +#ifndef __WD_AES_H__ +#define __WD_AES_H__ + +#include <linux/types.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define UINT_B_CNT 8 +#define AES_MAXNR 14 + +struct aes_key { + unsigned int rd_key[4 * (AES_MAXNR + 1)]; + __u8 rounds; +}; + +union uni { + unsigned char b[UINT_B_CNT]; + __u32 w[2]; + __u64 d; +}; + +void aes_encrypt(__u8 *key, __u32 key_len, __u8 *src, __u8 *dst); +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/crypto/galois.h b/include/crypto/galois.h new file mode 100644 index 0000000..07723be --- /dev/null +++ b/include/crypto/galois.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright 2023 Huawei Technologies Co.,Ltd. All rights reserved. */ + +#ifndef __WD_GALOIS_H__ +#define __WD_GALOIS_H__ + +#include <linux/types.h> + +#ifdef __cplusplus +extern "C" { +#endif + +void galois_compute(__u8 *S, __u8 *H, __u8 *g, __u32 len); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/drv/wd_aead_drv.h b/include/drv/wd_aead_drv.h index 195205c..b43bb36 100644 --- a/include/drv/wd_aead_drv.h +++ b/include/drv/wd_aead_drv.h @@ -57,12 +57,19 @@ struct wd_aead_msg { __u8 *iv; /* input auth iv pointer */ __u8 aiv[MAX_IV_SIZE]; + /* input auth iv pointer for stream mode */ + __u8 aiv_stream[AIV_STREAM_LEN]; /* input data pointer */ __u8 *in; /* output data pointer */ __u8 *out; /* mac */ __u8 *mac; + /* mac data pointer for decrypto as stream mode */ + __u8 mac_bak[AES_BLOCK_SIZE]; + /* total of data for stream mode */ + __u64 long_data_len; + enum wd_aead_msg_state msg_state; }; struct wd_aead_driver { diff --git a/include/wd.h b/include/wd.h index da3cfc6..97956e2 100644 --- a/include/wd.h +++ b/include/wd.h @@ -71,6 +71,7 @@ typedef void (*wd_log)(const char *format, ...); #define WD_SUCCESS 0 #define WD_STREAM_END 1 #define WD_STREAM_START 2 +#define WD_SOFT_COMPUTING 3 #define WD_EIO EIO #define WD_EAGAIN EAGAIN #define WD_ENOMEM ENOMEM diff --git a/include/wd_aead.h b/include/wd_aead.h index 9f6f4e8..eefbed3 100644 --- a/include/wd_aead.h +++ b/include/wd_aead.h @@ -17,6 +17,7 @@ extern "C" { #endif +#define AIV_STREAM_LEN 64 /** * wd_aead_op_type - Algorithm type of option */ @@ -43,6 +44,18 @@ struct wd_aead_sess_setup { void *sched_param; }; +/** + * wd_aead_msg_state - Notify the message state + * zero is message for block mode, non-zero is message for stream mode. + */ +enum wd_aead_msg_state { + AEAD_MSG_BLOCK = 0x0, + AEAD_MSG_FIRST, + AEAD_MSG_MIDDLE, + AEAD_MSG_END, + AEAD_MSG_INVALID, +}; + struct wd_aead_req; typedef void *wd_alg_aead_cb_t(struct wd_aead_req *req, void *cb_param); @@ -84,6 +97,8 @@ struct wd_aead_req { __u8 data_fmt; wd_alg_aead_cb_t *cb; void *cb_param; + + enum wd_aead_msg_state msg_state; }; /** diff --git a/lib/crypto/aes.c b/lib/crypto/aes.c new file mode 100644 index 0000000..2145d24 --- /dev/null +++ b/lib/crypto/aes.c @@ -0,0 +1,405 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2023 Huawei Technologies Co.,Ltd. All rights reserved. */ + +#include <string.h> +#include "crypto/aes.h" + +#define WORD(n) (0x##n##n##n##n) +#define LONG(n) (0x##n##n##n##n##n##n##n##n) + +#define STATE_CNT 2 + +static void xtimeword(__u32 *w) +{ + __u32 a, b; + + a = *w; + b = a & WORD(80); + a ^= b; + b -= b >> 0x7; + b &= WORD(1B); + b ^= a << 0x1; + *w = b; +} + +static void xtimelong(__u64 *w) +{ + __u64 a, b; + + a = *w; + b = a & LONG(80); + a ^= b; + b -= b >> 0x7; + b &= LONG(1B); + b ^= a << 0x1; + *w = b; +} + +static __u32 caculate_x_final(__u32 x_1) +{ + __u32 x, y; + + x = x_1; + y = ((x & WORD(FE)) >> 0x1) | ((x & WORD(01)) << 0x7); + x &= WORD(39); + x ^= y & WORD(3F); + y = ((y & WORD(FC)) >> 0x2) | ((y & WORD(03)) << 0x6); + x ^= y & WORD(97); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(9B); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(3C); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(DD); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(72); + x ^= WORD(63); + + return x; +} + +static __u32 caculate_x(__u32 *w) +{ + __u32 x, y; + + x = *w; + y = ((x & WORD(FE)) >> 0x1) | ((x & WORD(01)) << 0x7); + x &= WORD(DD); + x ^= y & WORD(57); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(1C); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(4A); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(42); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(64); + y = ((y & WORD(FE)) >> 0x1) | ((y & WORD(01)) << 0x7); + x ^= y & WORD(E0); + return x; +} + +static void subword(__u32 *w) +{ +#define SPECIAL_WORD 0x0A0A0A0A0Au + __u32 x, a1, a2, a3, a4, a5, a6; + + x = caculate_x(w); + a1 = x ^ (x & WORD(F0)) >> 0x4; + a2 = ((x & WORD(CC)) >> 0x2) | ((x & WORD(33)) << 0x2); + a3 = (x & a1) ^ ((x & a1) & WORD(AA)) >> 0x1; + a3 ^= (((x << 0x1) & a1) ^ ((a1 << 0x1) & x)) & WORD(AA); + a4 = (a2 & a1) ^ ((a2 & a1) & WORD(AA)) >> 0x1; + a4 ^= (((a2 << 0x1) & a1) ^ ((a1 << 0x1) & a2)) & WORD(AA); + a5 = (a3 & WORD(CC)) >> 0x2; + a3 ^= ((a4 << 0x2) ^ a4) & WORD(CC); + a4 = (a5 & WORD(22)) | (a5 & WORD(22)) >> 0x1; + a4 ^= (a5 << 0x1) & WORD(22); + a3 ^= a4; + a5 = (a3 & WORD(A0)) | (a3 & WORD(A0)) >> 0x1; + a5 ^= (a3 << 0x1) & WORD(A0); + a4 = a5 & WORD(C0); + a6 = a4 >> 0x2; + a4 ^= (a5 << 0x2) & WORD(C0); + a5 = (a6 & WORD(20)) | (a6 & WORD(20)) >> 0x1; + a5 ^= (a6 << 0x1) & WORD(20); + a4 |= a5; + a3 ^= a4 >> 0x4; + a3 &= WORD(0F); + a2 = a3 ^ (a3 & WORD(0C)) >> 0x2; + a4 = a3 & a2; + a4 ^= (a4 & SPECIAL_WORD) >> 0x1; + a4 ^= (((a3 << 0x1) & a2) ^ ((a2 << 0x1) & a3)) & WORD(0A); + a5 = (a4 & WORD(08)) | (a4 & WORD(08)) >> 0x1; + a5 ^= (a4 << 0x1) & WORD(08); + a4 ^= a5 >> 0x2; + a4 &= WORD(03); + a4 ^= (a4 & WORD(02)) >> 0x1; + a4 |= a4 << 0x2; + a3 = (a2 & a4) ^ ((a2 & a4) & WORD(0A)) >> 0x1; + a3 ^= (((a2 << 0x1) & a4) ^ ((a4 << 0x1) & a2)) & WORD(0A); + a3 |= a3 << 0x4; + a2 = ((a1 & WORD(CC)) >> 0x2) | ((a1 & WORD(33)) << 0x2); + x = (a1 & a3) ^ ((a1 & a3) & WORD(AA)) >> 0x1; + x ^= (((a1 << 0x1) & a3) ^ ((a3 << 0x1) & a1)) & WORD(AA); + a4 = (a2 & a3) ^ ((a2 & a3) & WORD(AA)) >> 0x1; + a4 ^= (((a2 << 0x1) & a3) ^ ((a3 << 0x1) & a2)) & WORD(AA); + a5 = (x & WORD(CC)) >> 0x2; + x ^= ((a4 << 0x2) ^ a4) & WORD(CC); + a4 = (a5 & WORD(22)) | (a5 & WORD(22)) >> 0x1; + a4 ^= (a5 << 0x1) & WORD(22); + *w = caculate_x_final(x ^ a4); +} + +static __u64 caculate_long_x_final(__u64 x_1) +{ + __u64 x, y; + + x = x_1; + y = ((x & LONG(FE)) >> 0x1) | ((x & LONG(01)) << 0x7); + x &= LONG(39); + x ^= y & LONG(3F); + y = ((y & LONG(FC)) >> 0x2) | ((y & LONG(03)) << 0x6); + x ^= y & LONG(97); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(9B); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(3C); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(DD); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(72); + x ^= LONG(63); + + return x; +} + +static __u64 caculate_long_x(__u64 *w) +{ + __u64 x, y; + + x = *w; + y = ((x & LONG(FE)) >> 0x1) | ((x & LONG(01)) << 0x7); + x &= LONG(DD); + x ^= y & LONG(57); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(1C); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(4A); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(42); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(64); + y = ((y & LONG(FE)) >> 0x1) | ((y & LONG(01)) << 0x7); + x ^= y & LONG(E0); + + return x; +} + +static void sublong(__u64 *w) +{ + __u64 x, a1, a2, a3, a4, a5, a6; + + x = caculate_long_x(w); + a1 = x ^ (x & LONG(F0)) >> 0x4; + a2 = ((x & LONG(CC)) >> 0x2) | ((x & LONG(33)) << 0x2); + a3 = (x & a1) ^ ((x & a1) & LONG(AA)) >> 0x1; + a3 ^= (((x << 0x1) & a1) ^ ((a1 << 0x1) & x)) & LONG(AA); + a4 = (a2 & a1) ^ ((a2 & a1) & LONG(AA)) >> 0x1; + a4 ^= (((a2 << 0x1) & a1) ^ ((a1 << 0x1) & a2)) & LONG(AA); + a5 = (a3 & LONG(CC)) >> 0x2; + a3 ^= ((a4 << 0x2) ^ a4) & LONG(CC); + a4 = (a5 & LONG(22)) | (a5 & LONG(22)) >> 0x1; + a4 ^= (a5 << 0x1) & LONG(22); + a3 ^= a4; + a5 = (a3 & LONG(A0)) | (a3 & LONG(A0)) >> 0x1; + a5 ^= (a3 << 0x1) & LONG(A0); + a4 = a5 & LONG(C0); + a6 = a4 >> 0x2; + a4 ^= (a5 << 0x2) & LONG(C0); + a5 = (a6 & LONG(20)) | (a6 & LONG(20)) >> 0x1; + a5 ^= (a6 << 0x1) & LONG(20); + a4 |= a5; + a3 ^= a4 >> 0x4; + a3 &= LONG(0F); + a2 = a3 ^ (a3 & LONG(0C)) >> 0x2; + a4 = a3 & a2; + a4 ^= (a4 & LONG(0A)) >> 0x1; + a4 ^= (((a3 << 0x1) & a2) ^ ((a2 << 0x1) & a3)) & LONG(0A); + a5 = (a4 & LONG(08)) | (a4 & LONG(08)) >> 0x1; + a5 ^= (a4 << 0x1) & LONG(08); + a4 ^= a5 >> 0x2; + a4 &= LONG(03); + a4 ^= (a4 & LONG(02)) >> 0x1; + a4 |= a4 << 0x2; + a3 = (a2 & a4) ^ ((a2 & a4) & LONG(0A)) >> 0x1; + a3 ^= (((a2 << 0x1) & a4) ^ ((a4 << 0x1) & a2)) & LONG(0A); + a3 |= a3 << 0x4; + a2 = ((a1 & LONG(CC)) >> 0x2) | ((a1 & LONG(33)) << 0x2); + x = (a1 & a3) ^ ((a1 & a3) & LONG(AA)) >> 0x1; + x ^= (((a1 << 0x1) & a3) ^ ((a3 << 0x1) & a1)) & LONG(AA); + a4 = (a2 & a3) ^ ((a2 & a3) & LONG(AA)) >> 0x1; + a4 ^= (((a2 << 0x1) & a3) ^ ((a3 << 0x1) & a2)) & LONG(AA); + a5 = (x & LONG(CC)) >> 0x2; + x ^= ((a4 << 0x2) ^ a4) & LONG(CC); + a4 = (a5 & LONG(22)) | (a5 & LONG(22)) >> 0x1; + a4 ^= (a5 << 0x1) & LONG(22); + *w = caculate_long_x_final(x ^ a4); +} + +static void shift_rows(__u64 *state) +{ +#define S_CNT 4 + unsigned char s[S_CNT]; + unsigned char *s0; + __u8 r, i; + + s0 = (unsigned char *)state; + for (r = 0; r < S_CNT; r++) { + for (i = 0; i < S_CNT; i++) + s[i] = s0[i * S_CNT + r]; + + for (i = 0; i < S_CNT; i++) + s0[i * S_CNT + r] = s[(r + i) % S_CNT]; + } +} + +static void mix_columns(__u64 *state) +{ +#define REVERT_OFFSET 0x3 +#define A 0xFFFF0000FFFF0000uLL +#define B 0xFF00FF00FF00FF00uLL + union uni s1; + union uni s; + __u8 c, i; + + for (c = 0; c < STATE_CNT; c++) { + s1.d = state[c]; + s.d = s1.d; + s.d ^= ((s.d & A) >> 0x10) + | ((s.d & ~A) << 0x10); + s.d ^= ((s.d & B) >> 0x8) + | ((s.d & ~B) << 0x8); + s.d ^= s1.d; + xtimelong(&s1.d); + s.d ^= s1.d; + for (i = 0; i < UINT_B_CNT; i++) { + if (i == UINT_B_CNT - 1 || i == (UINT_B_CNT >> 0x1) - 1) + s.b[i] ^= s1.b[i - REVERT_OFFSET]; + else + s.b[i] ^= s1.b[i + 1]; + } + state[c] = s.d; + } +} + +static void add_round_key(__u64 *state, const __u64 *w) +{ + state[0] ^= w[0]; + state[1] ^= w[1]; +} + +static void cipher(const unsigned char *in, unsigned char *out, + const __u64 *w, __u8 nr) +{ +#define STATE_BYTE 16 + __u64 state[STATE_CNT]; + __u8 i; + + memcpy(state, in, STATE_BYTE); + + add_round_key(state, w); + + for (i = 1; i < nr; i++) { + sublong(&state[0]); + sublong(&state[1]); + shift_rows(state); + mix_columns(state); + add_round_key(state, w + i * STATE_CNT); + } + + sublong(&state[0]); + sublong(&state[1]); + shift_rows(state); + add_round_key(state, w + nr * STATE_CNT); + + memcpy(out, state, STATE_BYTE); +} + +static void rotword(__u32 *x) +{ +#define WORDBYTE 4 + unsigned char *w0; + unsigned char tmp; + __u8 i; + + w0 = (unsigned char *)x; + tmp = w0[0]; + for (i = 0; i < WORDBYTE - 1; i++) + w0[i] = w0[i + 1]; + + w0[WORDBYTE - 1] = tmp; +} + +static void key_expansion(const unsigned char *key, __u64 *w, __u8 nr, __u8 nk) +{ +#define RCON_LEN 4 +#define N 2 +#define NK 6 + __u32 rcon; + union uni prev; + __u32 temp; + __u8 i, n, m; + + memcpy(w, key, nk * RCON_LEN); + memcpy(&rcon, "\1\0\0\0", RCON_LEN); + n = nk / N; + m = (nr + 1) * N; + prev.d = w[n - 1]; + for (i = n; i < m; i++) { + temp = prev.w[1]; + if (i % n == 0) { + rotword(&temp); + subword(&temp); + temp ^= rcon; + xtimeword(&rcon); + } else if (nk > NK && i % n == N) { + subword(&temp); + } + prev.d = w[i - n]; + prev.w[0] ^= temp; + prev.w[1] ^= prev.w[0]; + w[i] = prev.d; + } +} + +static int aes_set_encrypt_key(const unsigned char *userkey, const int bits, + struct aes_key *key) +{ +#define AES_128_BIT 128 +#define AES_192_BIT 192 +#define AES_256_BIT 256 +#define AES_128_ROUNDS 10 +#define AES_192_ROUNDS 12 +#define AES_256_ROUNDS 14 +#define KEY_NK 32 + __u64 *rk; + + if (!userkey || !key) + return -1; + if (bits != AES_128_BIT && bits != AES_192_BIT && bits != AES_256_BIT) + return -1; + + rk = (__u64 *)key->rd_key; + + if (bits == AES_128_BIT) + key->rounds = AES_128_ROUNDS; + else if (bits == AES_192_BIT) + key->rounds = AES_192_ROUNDS; + else + key->rounds = AES_256_ROUNDS; + + key_expansion(userkey, rk, key->rounds, bits / KEY_NK); + return 0; +} + +static void aes_encrypt_(const __u8 *in, __u8 *out, const struct aes_key *key) +{ + const __u64 *rk; + + rk = (__u64 *)key->rd_key; + + cipher(in, out, rk, key->rounds); +} + +void aes_encrypt(__u8 *key, __u32 key_len, __u8 *src, __u8 *dst) +{ + struct aes_key local_key; + int ret; + + ret = aes_set_encrypt_key(key, key_len << 0x3, &local_key); + if (ret) + return; + + aes_encrypt_(src, dst, &local_key); +} diff --git a/lib/crypto/galois.c b/lib/crypto/galois.c new file mode 100644 index 0000000..94f97fe --- /dev/null +++ b/lib/crypto/galois.c @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2023 Huawei Technologies Co.,Ltd. All rights reserved. */ + +#include <string.h> +#include "crypto/galois.h" + +#define GF_LSB1_MASK 0x1 +#define GF_R 0xe1000000 +#define GALOIS_BITS 128 +#define UINT_BITS (sizeof(unsigned int) * 8) + +#define GALOIS_UL_COUNT 4 +#define GALOIS_UL_COUNT_H 12 + +#define GALOIS_PARA_TRANS_S(S, i) (((unsigned int)(S)[(i) + 3] << 24) | \ + ((unsigned int)(S)[(i) + 2] << 16) | \ + ((unsigned int)(S)[(i) + 1] << 8) | \ + ((unsigned int)(S)[(i)])) +#define GALOIS_PARA_TRANS_H(H, i) (((unsigned int)(H)[(i)] << 24) | \ + ((unsigned int)(H)[(i) + 1] << 16) | \ + ((unsigned int)(H)[(i) + 2] << 8) | \ + ((unsigned int)(H)[(i) + 3])) + +#define GALOIS_UINT_TRANS_CHAR(src_addr) \ + do { \ + unsigned int temp = *(src_addr); \ + *(src_addr) = ((temp & 0xff) << 24) | ((temp & 0xff00) << 8) \ + | ((temp & 0xff0000) >> 8) | ((temp & 0xff000000) >> 24); \ + } while (0) + +static void galois_xtime_128(unsigned int *src, unsigned int *dst) +{ + unsigned int tmp; + __u8 i; + + /* Based the NIST Special Publication 800-38D */ + for (i = 0; i < GALOIS_UL_COUNT; i++) { + tmp = src[i] >> 0x1; + dst[i] = tmp | (src[i + 1] << (UINT_BITS - 1)); + if (i == GALOIS_UL_COUNT - 1) { + if (src[0] & GF_LSB1_MASK) + dst[i] = tmp ^ GF_R; + else + dst[i] = tmp; + } + } +} + +static void galois_multi(unsigned int *input_a, unsigned int *input_b, + unsigned int *mul, unsigned int array_size) +{ + /* 4 * (unsigned int), 4 * 32bit = 128bit */ + unsigned int gf_V[GALOIS_BITS][GALOIS_UL_COUNT] = {0}; + unsigned int *gf_Z = mul; + __u8 i, j, k; + + memcpy(gf_V[0], input_a, sizeof(unsigned int) * array_size); + + for (i = 1; i < GALOIS_BITS; i++) + galois_xtime_128(gf_V[i - 1], gf_V[i]); + + for (i = 0; i < GALOIS_BITS; i++) { + k = GALOIS_BITS - i - 1; + if ((input_b[(k / UINT_BITS)] >> (k % UINT_BITS)) & 0x1) { + for (j = 0; j < array_size; j++) + gf_Z[j] ^= gf_V[i][j]; + } + } +} + +void galois_compute(__u8 *S, __u8 *H, __u8 *g, __u32 len) +{ + unsigned int SL[GALOIS_UL_COUNT] = {0}; + unsigned int HL[GALOIS_UL_COUNT] = {0}; + unsigned int G[GALOIS_UL_COUNT] = {0}; + __u8 i, j; + + /* Do galois multiplication operation on blocks: G = S x H */ + for (i = 0; i < GALOIS_UL_COUNT; i++) { + j = i * GALOIS_UL_COUNT; + SL[i] = GALOIS_PARA_TRANS_S(S, j); + j = GALOIS_UL_COUNT_H - j; + HL[i] = GALOIS_PARA_TRANS_H(H, j); + } + + galois_multi(SL, HL, G, GALOIS_UL_COUNT); + + j = len - GALOIS_UL_COUNT; + for (i = 0; i < GALOIS_UL_COUNT; i++) { + GALOIS_UINT_TRANS_CHAR(&G[i]); + memcpy(&g[j], &G[i], sizeof(unsigned int)); + j -= GALOIS_UL_COUNT; + } +} diff --git a/wd_aead.c b/wd_aead.c index 38d3f8f..c1fc354 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -48,11 +48,17 @@ struct wd_aead_sess { enum wd_digest_mode dmode; unsigned char ckey[MAX_CIPHER_KEY_SIZE]; unsigned char akey[MAX_HMAC_KEY_SIZE]; + /* Mac data pointer for decrypto as stream mode */ + unsigned char mac_bak[WD_AEAD_CCM_GCM_MAX]; __u16 ckey_bytes; __u16 akey_bytes; __u16 auth_bytes; void *priv; void *sched_key; + /* Stored the counter for gcm stream mode */ + __u8 iv[MAX_IV_SIZE]; + /* Total of data for stream mode */ + __u64 long_data_len; }; struct wd_env_config wd_aead_env_config; @@ -485,6 +491,41 @@ void wd_aead_uninit(void) wd_alg_clear_init(&wd_aead_setting.status); } +static void fill_stream_msg(struct wd_aead_msg *msg, struct wd_aead_req *req, + struct wd_aead_sess *sess) +{ + switch (req->msg_state) { + case AEAD_MSG_FIRST: + /* Stream iv is extended to 16 bytes and last 4 bytes must be zero */ + memset(sess->iv, 0, MAX_IV_SIZE); + memcpy(sess->iv, req->iv, GCM_IV_SIZE); + + /* Store the original mac of first message to session */ + if (msg->op_type == WD_CIPHER_DECRYPTION_DIGEST) + memcpy(sess->mac_bak, req->mac, sess->auth_bytes); + break; + case AEAD_MSG_MIDDLE: + /* Middle messages need to store the stream's total length to session */ + sess->long_data_len += req->in_bytes; + + msg->long_data_len = sess->long_data_len; + break; + case AEAD_MSG_END: + /* Sets the original mac for final message */ + if (msg->op_type == WD_CIPHER_DECRYPTION_DIGEST) + memcpy(msg->mac_bak, sess->mac_bak, sess->auth_bytes); + + msg->long_data_len = sess->long_data_len + req->in_bytes; + /* Reset the session's long_data_len */ + sess->long_data_len = 0; + break; + default: + return; + } + + msg->iv = sess->iv; +} + static void fill_request_msg(struct wd_aead_msg *msg, struct wd_aead_req *req, struct wd_aead_sess *sess) { @@ -510,6 +551,9 @@ static void fill_request_msg(struct wd_aead_msg *msg, struct wd_aead_req *req, msg->mac = req->mac; msg->auth_bytes = sess->auth_bytes; msg->data_fmt = req->data_fmt; + + msg->msg_state = req->msg_state; + fill_stream_msg(msg, req, sess); } static int send_recv_sync(struct wd_ctx_internal *ctx, -- 2.30.0

1 10

AccLib SIG例会
by openEuler conference 16 May '23

16 May '23

您好！ sig-AccLib SIG 邀请您参加 2023-05-17 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议内容： https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/89840749174?pwd=MGl2VWkwOFVBOUsyRmg3UFNSbFJEQT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-05-17 11:00, The subject of the conference is AccLib SIG例会, Summary: https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/89840749174?pwd=MGl2VWkwOFVBOUsyRmg3UFNSbFJEQT09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

[PATCH] uadk: aead and digest support env init
by Wenkai Lin 08 May '23

08 May '23

aead and digest support env init for init2. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- include/wd_util.h | 2 ++ wd_aead.c | 8 ++++++-- wd_cipher.c | 19 +++++-------------- wd_comp.c | 20 +++++--------------- wd_dh.c | 18 +++++------------- wd_digest.c | 10 +++++++--- wd_ecc.c | 19 +++++-------------- wd_rsa.c | 18 +++++------------- wd_util.c | 17 ++++++++++++++++- 9 files changed, 56 insertions(+), 75 deletions(-) diff --git a/include/wd_util.h b/include/wd_util.h index ce76852..3265946 100644 --- a/include/wd_util.h +++ b/include/wd_util.h @@ -444,6 +444,8 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_alg_driver *driver, enum wd_type type, int max_op_type); +void wd_ctx_param_uninit(struct wd_ctx_params *ctx_params); + /** * wd_alg_attrs_init() - Request the ctxs and initialize the sched_domain * with the given devices list, ctxs number and numa mask. diff --git a/wd_aead.c b/wd_aead.c index 9db2480..1e6011d 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -599,8 +599,9 @@ res_retry: goto out_dlopen; } + aead_ctx_params.ctx_set_num = aead_ctx_num; ret = wd_ctx_param_init(&aead_ctx_params, ctx_params, - aead_ctx_num, wd_aead_setting.driver, + wd_aead_setting.driver, WD_AEAD_TYPE, WD_DIGEST_CIPHER_DECRYPTION + 1); if (ret) { if (ret == -WD_EAGAIN) { @@ -625,13 +626,16 @@ res_retry: goto res_retry; } WD_ERR("fail to init alg attrs.\n"); - goto out_driver; + goto out_ctx_uninit; } wd_alg_set_init(&wd_aead_setting.status); + wd_ctx_param_uninit(&aead_ctx_params); return 0; +out_ctx_uninit: + wd_ctx_param_uninit(&aead_ctx_params); out_driver: wd_alg_drv_unbind(wd_aead_setting.driver); out_dlopen: diff --git a/wd_cipher.c b/wd_cipher.c index e4f3d6b..7ba4de4 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -384,7 +384,6 @@ int wd_cipher_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_p { struct wd_ctx_nums cipher_ctx_num[WD_CIPHER_DECRYPTION + 1] = {0}; struct wd_ctx_params cipher_ctx_params = {0}; - struct bitmask *inner_bmp; int ret = 0; bool flag; @@ -412,15 +411,6 @@ int wd_cipher_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_p goto out_uninit; } - inner_bmp = numa_allocate_nodemask(); - if (!inner_bmp) { - WD_ERR("fail to allocate nodemask.\n"); - ret = -WD_ENOMEM; - goto out_dlopen; - } - - cipher_ctx_params.bmp = inner_bmp; - res_retry: memset(&wd_cipher_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -429,7 +419,7 @@ res_retry: if (!wd_cipher_setting.driver) { WD_ERR("fail to bind a valid driver.\n"); ret = -WD_EINVAL; - goto out_bmp; + goto out_dlopen; } cipher_ctx_params.ctx_set_num = cipher_ctx_num; @@ -459,17 +449,18 @@ res_retry: goto res_retry; } WD_ERR("fail to init alg attrs.\n"); - goto out_driver; + goto out_ctx_uninit; } wd_alg_set_init(&wd_cipher_setting.status); + wd_ctx_param_uninit(&cipher_ctx_params); return 0; +out_ctx_uninit: + wd_ctx_param_uninit(&cipher_ctx_params); out_driver: wd_alg_drv_unbind(wd_cipher_setting.driver); -out_bmp: - numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_cipher_setting.dlh_list); out_uninit: diff --git a/wd_comp.c b/wd_comp.c index 7b79864..3d3deae 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -206,7 +206,6 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par { struct wd_ctx_nums comp_ctx_num[WD_DIR_MAX] = {0}; struct wd_ctx_params comp_ctx_params; - struct bitmask *inner_bmp; int ret = 0; bool flag; @@ -234,14 +233,6 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par goto out_uninit; } - inner_bmp = numa_allocate_nodemask(); - if (!inner_bmp) { - WD_ERR("fail to allocate nodemask.\n"); - ret = -WD_ENOMEM; - goto out_dlopen; - } - comp_ctx_params.bmp = inner_bmp; - res_retry: memset(&wd_comp_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -249,7 +240,7 @@ res_retry: wd_comp_setting.driver = wd_alg_drv_bind(task_type, alg); if (!wd_comp_setting.driver) { WD_ERR("fail to bind a valid driver.\n"); - goto out_bmp; + goto out_dlopen; } comp_ctx_params.ctx_set_num = comp_ctx_num; @@ -278,19 +269,18 @@ res_retry: goto res_retry; } WD_ERR("fail to init alg attrs.\n"); - goto out_driver; + goto out_ctx_uninit; } wd_alg_set_init(&wd_comp_setting.status); - - numa_free_nodemask(inner_bmp); + wd_ctx_param_uninit(&comp_ctx_params); return 0; +out_ctx_uninit: + wd_ctx_param_uninit(&comp_ctx_params); out_driver: wd_alg_drv_unbind(wd_comp_setting.driver); -out_bmp: - numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_comp_setting.dlh_list); out_uninit: diff --git a/wd_dh.c b/wd_dh.c index 2f6978b..82e7624 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -197,7 +197,6 @@ int wd_dh_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_param { struct wd_ctx_nums dh_ctx_num[WD_DH_PHASE2] = {0}; struct wd_ctx_params dh_ctx_params = {0}; - struct bitmask *inner_bmp; bool flag; int ret; @@ -225,14 +224,6 @@ int wd_dh_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_param goto out_clear_init; } - inner_bmp = numa_allocate_nodemask(); - if (!inner_bmp) { - ret = -WD_ENOMEM; - WD_ERR("fail to allocate nodemask.\n"); - goto out_dlopen; - } - dh_ctx_params.bmp = inner_bmp; - res_retry: memset(&wd_dh_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -241,7 +232,7 @@ res_retry: if (!wd_dh_setting.driver) { WD_ERR("fail to bind a valid driver.\n"); ret = -WD_EINVAL; - goto out_bmp; + goto out_dlopen; } dh_ctx_params.ctx_set_num = dh_ctx_num; @@ -270,17 +261,18 @@ res_retry: goto res_retry; } WD_ERR("failed to init alg attrs!\n"); - goto out_driver; + goto out_ctx_uninit; } wd_alg_set_init(&wd_dh_setting.status); + wd_ctx_param_uninit(&dh_ctx_params); return 0; +out_ctx_uninit: + wd_ctx_param_uninit(&dh_ctx_params); out_driver: wd_alg_drv_unbind(wd_dh_setting.driver); -out_bmp: - numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_dh_setting.dlh_list); out_clear_init: diff --git a/wd_digest.c b/wd_digest.c index c57e7d6..2e70f27 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -340,8 +340,8 @@ static bool wd_digest_algs_check(const char *alg) int wd_digest_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_params *ctx_params) { - struct wd_ctx_nums digest_ctx_num[1] = {0}; struct wd_ctx_params digest_ctx_params = {0}; + struct wd_ctx_nums digest_ctx_num[1] = {0}; int ret = 0; bool flag; @@ -385,8 +385,9 @@ res_retry: goto out_dlopen; } + digest_ctx_params.ctx_set_num = digest_ctx_num; ret = wd_ctx_param_init(&digest_ctx_params, ctx_params, - digest_ctx_num, wd_digest_setting.driver, 1); + wd_digest_setting.driver, WD_DIGEST_TYPE, 1); if (ret) { if (ret == -WD_EAGAIN) { wd_disable_drv(wd_digest_setting.driver); @@ -410,13 +411,16 @@ res_retry: goto res_retry; } WD_ERR("fail to init alg attrs.\n"); - goto out_driver; + goto out_ctx_uninit; } wd_alg_set_init(&wd_digest_setting.status); + wd_ctx_param_uninit(&digest_ctx_params); return 0; +out_ctx_uninit: + wd_ctx_param_uninit(&digest_ctx_params); out_driver: wd_alg_drv_unbind(wd_digest_setting.driver); out_dlopen: diff --git a/wd_ecc.c b/wd_ecc.c index 183d2bd..21f7c30 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -253,7 +253,6 @@ int wd_ecc_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para { struct wd_ctx_nums ecc_ctx_num[WD_EC_OP_MAX] = {0}; struct wd_ctx_params ecc_ctx_params = {0}; - struct bitmask *inner_bmp; bool flag; int ret; @@ -281,14 +280,6 @@ int wd_ecc_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para goto out_clear_init; } - inner_bmp = numa_allocate_nodemask(); - if (!inner_bmp) { - WD_ERR("fail to allocate nodemask.\n"); - ret = -WD_ENOMEM; - goto out_dlopen; - } - ecc_ctx_params.bmp = inner_bmp; - res_retry: memset(&wd_ecc_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -297,7 +288,7 @@ res_retry: if (!wd_ecc_setting.driver) { WD_ERR("failed to bind a valid driver!\n"); ret = -WD_EINVAL; - goto out_bmp; + goto out_dlopen; } ecc_ctx_params.ctx_set_num = ecc_ctx_num; @@ -326,17 +317,17 @@ res_retry: goto res_retry; } WD_ERR("failed to init alg attrs!\n"); - goto out_driver; + goto out_ctx_uninit; } wd_alg_set_init(&wd_ecc_setting.status); + wd_ctx_param_uninit(&ecc_ctx_params); return 0; - +out_ctx_uninit: + wd_ctx_param_uninit(&ecc_ctx_params); out_driver: wd_alg_drv_unbind(wd_ecc_setting.driver); -out_bmp: - numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_ecc_setting.dlh_list); out_clear_init: diff --git a/wd_rsa.c b/wd_rsa.c index c51c7b1..e685628 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -238,7 +238,6 @@ int wd_rsa_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para { struct wd_ctx_nums rsa_ctx_num[WD_RSA_GENKEY] = {0}; struct wd_ctx_params rsa_ctx_params = {0}; - struct bitmask *inner_bmp; bool flag; int ret; @@ -266,14 +265,6 @@ int wd_rsa_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_para goto out_clear_init; } - inner_bmp = numa_allocate_nodemask(); - if (!inner_bmp) { - WD_ERR("fail to allocate nodemask.\n"); - ret = -WD_ENOMEM; - goto out_dlopen; - } - rsa_ctx_params.bmp = inner_bmp; - res_retry: memset(&wd_rsa_setting.config, 0, sizeof(struct wd_ctx_config_internal)); @@ -282,7 +273,7 @@ res_retry: if (!wd_rsa_setting.driver) { WD_ERR("failed to bind a valid driver!\n"); ret = -WD_EINVAL; - goto out_bmp; + goto out_dlopen; } rsa_ctx_params.ctx_set_num = rsa_ctx_num; @@ -311,17 +302,18 @@ res_retry: goto res_retry; } WD_ERR("failed to init alg attrs!\n"); - goto out_driver; + goto out_ctx_uninit; } wd_alg_set_init(&wd_rsa_setting.status); + wd_ctx_param_uninit(&rsa_ctx_params); return 0; +out_ctx_uninit: + wd_ctx_param_uninit(&rsa_ctx_params); out_driver: wd_alg_drv_unbind(wd_rsa_setting.driver); -out_bmp: - numa_free_nodemask(inner_bmp); out_dlopen: wd_dlclose_drv(wd_rsa_setting.dlh_list); out_clear_init: diff --git a/wd_util.c b/wd_util.c index 9b5486b..e80cca0 100644 --- a/wd_util.c +++ b/wd_util.c @@ -2084,6 +2084,11 @@ out_free_str: return ret; } +void wd_ctx_param_uninit(struct wd_ctx_params *ctx_params) +{ + numa_free_nodemask(ctx_params->bmp); +} + int wd_ctx_param_init(struct wd_ctx_params *ctx_params, struct wd_ctx_params *user_ctx_params, struct wd_alg_driver *driver, @@ -2093,22 +2098,30 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, const char *var_s; int i, ret; + ctx_params->bmp = numa_allocate_nodemask(); + if (!ctx_params->bmp) { + WD_ERR("fail to allocate nodemask.\n"); + return -WD_ENOMEM; + } + var_s = secure_getenv(env_name); if (var_s && strlen(var_s)) { /* environment variable has the highest priority */ ret = wd_env_set_ctx_nums(env_name, var_s, ctx_params, max_op_type); if (ret) { WD_ERR("fail to init ctx nums from %s!\n", env_name); + numa_free_nodemask(ctx_params->bmp); return -WD_EINVAL; } } else { /* environment variable is not set, try to use user_ctx_params first */ if (user_ctx_params) { - ctx_params->bmp = user_ctx_params->bmp; + copy_bitmask_to_bitmask(user_ctx_params->bmp, ctx_params->bmp); ctx_params->ctx_set_num = user_ctx_params->ctx_set_num; ctx_params->op_type_num = user_ctx_params->op_type_num; if (ctx_params->op_type_num > max_op_type) { WD_ERR("fail to check user op type numbers.\n"); + numa_free_nodemask(ctx_params->bmp); return -WD_EINVAL; } @@ -2116,6 +2129,7 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, } /* user_ctx_params is also not set, use driver's defalut queue_num */ + numa_free_nodemask(ctx_params->bmp); ctx_params->bmp = NULL; for (i = 0; i < driver->op_type_num; i++) { ctx_params->ctx_set_num[i].sync_ctx_num = driver->queue_num; @@ -2126,6 +2140,7 @@ int wd_ctx_param_init(struct wd_ctx_params *ctx_params, ctx_params->op_type_num = driver->op_type_num; if (ctx_params->op_type_num > max_op_type) { WD_ERR("fail to check driver op type numbers.\n"); + numa_free_nodemask(ctx_params->bmp); return -WD_EAGAIN; } -- 2.30.0

1 0

议题登记 // ODD AccLib SIG 开放会议
by shenyang (M) 19 Apr '23

19 Apr '23

Hi all, 请各位通过以下链接登记下 ODD AccLib SIG 开放会议议题。 https://etherpad.openeuler.org/p/sig-AccLib-23.09-planning Best Regards Yang Shen(沈旸) _________________________________ -----原始约会----- 发件人: openEuler conference <public(a)openeuler.org> 发送时间: 2023年4月18日 20:46 收件人: acc(a)openeuler.org 主题: [Acc] ODD AccLib SIG 开放会议时间: 2023年4月21日星期五 16:00-17:30(UTC+08:00) 北京，重庆，香港特别行政区，乌鲁木齐。地点: 您好！ sig-AccLib SIG 邀请您参加 2023-04-21 16:00 召开的Zoom会议(自动录制) 会议主题：ODD AccLib SIG 开放会议会议链接：https://us06web.zoom.us/j/83630355646?pwd=dnVna3JCK01yK3ZFMmxBMnl1TEpuQT09 会议纪要：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(auto recording) will be held at 2023-04-21 16:00, The subject of the conference is ODD AccLib SIG 开放会议, You can join the meeting at https://us06web.zoom.us/j/83630355646?pwd=dnVna3JCK01yK3ZFMmxBMnl1TEpuQT09. 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

一文解锁 → openEuler Developer Day 2023 游玩指南
by openEuler 19 Apr '23

19 Apr '23

1 0

ODD AccLib SIG 开放会议
by openEuler conference 18 Apr '23

18 Apr '23

您好！ sig-AccLib SIG 邀请您参加 2023-04-21 16:00 召开的Zoom会议(自动录制) 会议主题：ODD AccLib SIG 开放会议会议链接：https://us06web.zoom.us/j/83630355646?pwd=dnVna3JCK01yK3ZFMmxBMnl1TEpuQT09 会议纪要：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(auto recording) will be held at 2023-04-21 16:00, The subject of the conference is ODD AccLib SIG 开放会议, You can join the meeting at https://us06web.zoom.us/j/83630355646?pwd=dnVna3JCK01yK3ZFMmxBMnl1TEpuQT09. 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

AccLib SIG例会
by openEuler conference 18 Apr '23

18 Apr '23

您好！ sig-AccLib SIG 邀请您参加 2023-04-19 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议内容： https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/81046238791?pwd=QUtOUkdBN2JVUkRiaGdITDJlYzhIUT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-04-19 11:00, The subject of the conference is AccLib SIG例会, Summary: https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/81046238791?pwd=QUtOUkdBN2JVUkRiaGdITDJlYzhIUT09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

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

14 Apr '23

1 0

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

14 Apr '23

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

1 5

AccLib SIG 例会
by openEuler conference 11 Apr '23

11 Apr '23

您好！ sig-AccLib SIG 邀请您参加 2023-04-12 11:00 召开的Zoom会议会议主题：AccLib SIG 例会会议内容：会议链接 https://linaro-org.zoom.us/j/91879279131 会议链接：https://us06web.zoom.us/j/82243426609?pwd=elVBbUlIQUhYaWtxUmpnSGlYZzlZZz09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-04-12 11:00, The subject of the conference is AccLib SIG 例会, Summary: 会议链接 https://linaro-org.zoom.us/j/91879279131 You can join the meeting at https://us06web.zoom.us/j/82243426609?pwd=elVBbUlIQUhYaWtxUmpnSGlYZzlZZz09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

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

08 Apr '23

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

1 0

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

03 Apr '23

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

1 0

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

03 Apr '23

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

1 0

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

31 Mar '23

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

1 0

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

28 Mar '23

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

1 3

AccLib SIG例会
by openEuler conference 21 Mar '23

21 Mar '23

您好！ sig-AccLib SIG 邀请您参加 2023-03-22 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议内容：会议链接：https://linaro-org.zoom.us/j/91879279131 议题：加解密库适配鲲鹏硬件加速项目仓库创建会议链接：https://us06web.zoom.us/j/83342732272?pwd=SS9pOFJzdzNRdmx2TFd0OExEeXkyUT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-03-22 11:00, The subject of the conference is AccLib SIG例会, Summary: 会议链接：https://linaro-org.zoom.us/j/91879279131 议题：加解密库适配鲲鹏硬件加速项目仓库创建 You can join the meeting at https://us06web.zoom.us/j/83342732272?pwd=SS9pOFJzdzNRdmx2TFd0OExEeXkyUT09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

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

16 Mar '23

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

1 0

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

15 Mar '23

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

1 0

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

08 Mar '23

Hi all, 抱歉，在订阅会议时忘了添加备注，本次会议链接还是固定链接： https://linaro-org.zoom.us/j/91879279131请各位用此链接参与。 ------------------ 原始邮件 ------------------ 发件人:"openEuler conference"<public(a)openeuler.org>; 发送时间:2023年3月7日(星期二) 上午10:15 收件人:"acc"<acc(a)openeuler.org>; 主题:[Acc] AccLib SIG例会您好！ sig-AccLib SIG 邀请您参加 2023-03-08 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议链接：https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-03-08 11:00, The subject of the conference is AccLib SIG例会, You can join the meeting at https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/ _______________________________________________ Acc mailing list -- acc(a)openeuler.org To unsubscribe send an email to acc-leave(a)openeuler.org

1 0

AccLib SIG例会
by openEuler conference 07 Mar '23

07 Mar '23

您好！ sig-AccLib SIG 邀请您参加 2023-03-08 11:00 召开的Zoom会议会议主题：AccLib SIG例会会议链接：https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-03-08 11:00, The subject of the conference is AccLib SIG例会, You can join the meeting at https://us06web.zoom.us/j/89631834697?pwd=cXRzL3J1UjBHNlJpOTQ3WFoyY21Ldz09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

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

25 Feb '23

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

2 8

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

25 Feb '23

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

1 2

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

02 Feb '23

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

3 2

DOCUMENTS SENT VIA ONEDRIVE
by acc 30 Jan '23

30 Jan '23

1 0

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

19 Jan '23

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

1 2

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

18 Jan '23

您好！ sig-AccLib SIG 邀请您参加 2023-01-18 11:00 召开的Zoom会议会议主题：加速库技术例会会议内容： zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1、进展讨论 2、自由讨论会议链接：https://us06web.zoom.us/j/89073010256?pwd=TTJWM1l3RS95ZHVabVVVVzk3eENEQT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-01-18 11:00, The subject of the conference is 加速库技术例会, Summary: zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1、进展讨论 2、自由讨论 You can join the meeting at https://us06web.zoom.us/j/89073010256?pwd=TTJWM1l3RS95ZHVabVVVVzk3eENEQT09. Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

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

18 Jan '23

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

1 0

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

18 Jan '23

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

1 0

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

18 Jan '23

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

1 0

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

18 Jan '23

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

1 0

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

17 Jan '23

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

1 1

[PATCH] digest: add private variable values initialization
by y00501072 17 Jan '23

17 Jan '23

From: Kai Ye <yekai13(a)huawei.com> If use the 'digest_copy' in task, like sm2 signature and verification, the private variable values may not be updated. This will cause the sm2 verify failure. So add the value cleanup in the 'digest init'. Signed-off-by: Kai Ye <yekai13(a)huawei.com> --- src/uadk_digest.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/uadk_digest.c b/src/uadk_digest.c index 8ce9fd1..9df1349 100644 --- a/src/uadk_digest.c +++ b/src/uadk_digest.c @@ -496,6 +496,15 @@ static void digest_priv_ctx_setup(struct digest_priv_ctx *priv, priv->req.out_bytes = out_len; } +static void digest_priv_ctx_cleanup(struct digest_priv_ctx *priv) +{ + /* Ensure that private variable values are initialized */ + priv->state = SEC_DIGEST_INIT; + priv->last_update_bufflen = 0; + priv->switch_threshold = 0; + priv->switch_flag = 0; +} + static int uadk_e_digest_init(EVP_MD_CTX *ctx) { struct digest_priv_ctx *priv = @@ -510,7 +519,8 @@ static int uadk_e_digest_init(EVP_MD_CTX *ctx) priv->soft_ctx = EVP_MD_CTX_new(); priv->e_nid = nid; - priv->state = SEC_DIGEST_INIT; + digest_priv_ctx_cleanup(priv); + ret = uadk_e_init_digest(); if (unlikely(!ret)) { priv->switch_flag = UADK_DO_SOFT; @@ -761,7 +771,6 @@ static int uadk_e_digest_final(EVP_MD_CTX *ctx, unsigned char *digest) goto clear; } memcpy(digest, priv->req.out, priv->req.out_bytes); - priv->last_update_bufflen = 0; return 1; -- 2.30.0

1 0

[PATCH v7 0/6] add dynamic driver loading function
by Longfang Liu 07 Jan '23

07 Jan '23

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v6 -> v7: - Added dynamically loaded design documents. Changes v5 -> v6: - Rebase based on the patch of the zlib interface. Changes v4 -> v5: - Enhance the inclusiveness of the init2 interface. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (6): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk/doc: adding dynamically loaded design documents uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- ...sion_and_modular_dynamic_loading_design.md | 432 ++++++++++++++ drv/hisi_comp.c | 59 +- include/drv/wd_comp_drv.h | 27 - include/wd.h | 12 + include/wd_alg.h | 95 +++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 +- libwd.map | 8 + wd.c | 56 +- wd_alg.c | 265 +++++++++ wd_comp.c | 243 ++++---- wd_sched.c | 105 +++- wd_util.c | 549 +++++++++++++++++- 15 files changed, 1769 insertions(+), 166 deletions(-) create mode 100644 docs/UADK_framework_expansion_and_modular_dynamic_loading_design.md create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 6

sig-AccLib 双周例会
by openEuler conference 03 Jan '23

03 Jan '23

您好！ sig-AccLib SIG 邀请您参加 2023-01-04 11:00 召开的Zoom会议会议主题：sig-AccLib 双周例会会议内容： zoom固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.培训分享-open ssl 3.0 provider机制讲解（徐国栋）。会议链接：https://us06web.zoom.us/j/87633368438?pwd=d0p2UFc4M3o3QmFWS24wTHd3amxRQT09 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler sig-AccLib SIG invites you to attend the Zoom conference will be held at 2023-01-04 11:00, The subject of the conference is sig-AccLib 双周例会, Summary: zoom固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.培训分享-open ssl 3.0 provider机制讲解（徐国栋）。 You can join the meeting at https://us06web.zoom.us/j/87633368438?pwd=d0p2UFc4M3o3QmFWS24wTHd3amxRQT09. 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 v6 0/5] add dynamic driver loading function
by Longfang Liu 27 Dec '22

27 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v5 -> v6: - Rebase based on the patch of the zlib interface. Changes v4 -> v5: - Enhance the inclusiveness of the init2 interface. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 243 +++++++++-------- wd_sched.c | 105 +++++++- wd_util.c | 549 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1337 insertions(+), 166 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 5

sig-AccLib双周会
by openEuler conference 20 Dec '22

20 Dec '22

您好！ sig-AccLib SIG 邀请您参加 2022-12-21 11:00 召开的Zoom会议(自动录制) 会议主题：sig-AccLib双周会会议内容： zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论会议链接：https://us06web.zoom.us/j/84937793420?pwd=akJUMmF0eURmUWdPMFpVK1RuQU9wUT09 会议纪要：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(auto recording) will be held at 2022-12-21 11:00, The subject of the conference is sig-AccLib双周会, Summary: zoom会议，ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.进展讨论 2.自由讨论 You can join the meeting at https://us06web.zoom.us/j/84937793420?pwd=akJUMmF0eURmUWdPMFpVK1RuQU9wUT09. 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/2] uadk: update cipher function
by Longfang Liu 17 Dec '22

17 Dec '22

In order to simplify the calling logic of uadk, a new init2 interface is added to the cipher algorithm class, which includes hardware device resource initialization and scheduler initialization. Longfang Liu (2): uadk/cipher: add the init2 interface for cipher uadk/sec: adapt the sec module to the dynamic loading framework drv/hisi_sec.c | 102 ++++++++++-- include/drv/wd_aead_drv.h | 2 +- include/drv/wd_cipher_drv.h | 26 --- include/drv/wd_digest_drv.h | 2 +- include/wd_cipher.h | 29 ++++ libwd_crypto.map | 3 + wd_cipher.c | 305 +++++++++++++++++++++++++++--------- 7 files changed, 354 insertions(+), 115 deletions(-) -- 2.33.0

1 2

[PATCH v5 0/5] add dynamic driver loading function
by Longfang Liu 17 Dec '22

17 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v4 -> v5: - Enhance the inclusiveness of the init2 interface. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 293 +++++++++++--------- wd_sched.c | 105 +++++++- wd_util.c | 549 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1374 insertions(+), 179 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 5

Fw:Re: [Linaro-open-discussions] Re: Linaro-open-discussions Digest, Vol 25, Issue 3
by Zhangfei Gao 17 Dec '22

17 Dec '22

  ------------------ Original ------------------ From: "Lorenzo Pieralisi" <lorenzo.pieralisi(a)linaro.org>; Date: Sat, Dec 17, 2022 00:14 AM To: "Zhangfei Gao"<zhangfei.gao(a)linaro.org>; Cc: "Joyce Qi"<joyce.qi(a)linaro.org>;"jean-philippe"<jean-philippe(a)linaro.org>;"linaro-open-discussions"<linaro-open-discussions(a)op-lists.linaro.org>;"linux"<linux(a)armlinux.org.uk>; Subject: Re: [Linaro-open-discussions] Re: Linaro-open-discussions Digest, Vol 25, Issue 3 On Thu, Oct 27, 2022 at 12:06:59PM +0800, Zhangfei Gao wrote: > Hi, Lorenzo > > When we debug vsva, sva on guest with 2-stage translation, > we found tlb miss impact performance a lot, with Jean's help. > > Currently we are using huge page feature in glibc to overcome this issue. > With huge page, vsva in guest can achieve comparable performance as sva in > host. > > More details: https://docs.qq.com/doc/DRXlpQmpTSlBZTGZZ > Will do some > > Basically we are using two optimization methods/ > host sva: using memset fist to overcome io page fault, since cpu alloc > physical memory is much faster than smmu. > guest vsva: using huge page to overcome tlbmiss. > > The customer are asking whether (next version) silicon (smmu) can do some > help to concur tlb miss issue or io page fault issue. I can bring this up with the SMMU architect - thank you for taking time to describe the use cases and SW you are deploying. > If so, software can be simpler. > Any suggestions? Talking to SMMU architects - there is not much SW can do other than what you are doing already. Thanks, Lorenzo > Thanks > > > On 2022/10/20 下午8:47, Joyce Qi via Linaro-open-discussions wrote: > > Hi Jonathan,Lorenzo,all, > > > > Do we have any topic to sync on our LOD meeting next week? > > > > Thanks:) > > Joyce > > > > > > > 

1 0

[PATCH v4 0/5] Add dynamic driver loading function
by Longfang Liu 16 Dec '22

16 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 293 +++++++++++--------- wd_sched.c | 181 ++++++++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1448 insertions(+), 179 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

2 6

[PATCH v4 0/5] Add dynamic driver loading function
by Longfang Liu 16 Dec '22

16 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 293 +++++++++++--------- wd_sched.c | 105 +++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1372 insertions(+), 179 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 5

[PATCH v4 0/5] Add dynamic driver loading function
by Longfang Liu 16 Dec '22

16 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 293 +++++++++++--------- wd_sched.c | 181 ++++++++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1448 insertions(+), 179 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

2 6

[PATCH v2 0/2] support zlibwrapper for uadk compression
by Yang Shen 15 Dec '22

15 Dec '22

Add a set of zlibwrapper interfaces for users to fit uadk interfaces quickly. Changelog: v1->v2: - Fix fork dead lock problem. Yang Shen (2): uadk/comp - support reset session zlibwrapper: add zlibwrapper to adapt for zlib interface Makefile.am | 2 +- include/wd_comp.h | 9 +- libwd_comp.map | 11 ++ wd_comp.c | 15 ++ wd_zlibwrapper.c | 343 ++++++++++++++++++++++++++++++++++++++++++++++ wd_zlibwrapper.h | 112 +++++++++++++++ 6 files changed, 490 insertions(+), 2 deletions(-) create mode 100644 wd_zlibwrapper.c create mode 100644 wd_zlibwrapper.h -- 2.24.0

1 2

[PATCH] uadk: fix initialization failed in child process
by Yang Shen 15 Dec '22

15 Dec '22

The initialization status may be set in child process when the parent process has called the wd_alg_init. So need to register the callback for child process to clear the status. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- wd_aead.c | 7 +++++++ wd_cipher.c | 7 +++++++ wd_comp.c | 9 +++++++++ wd_dh.c | 7 +++++++ wd_digest.c | 7 +++++++ wd_ecc.c | 7 +++++++ wd_rsa.c | 7 +++++++ 7 files changed, 51 insertions(+) diff --git a/wd_aead.c b/wd_aead.c index 471cb65..7f0347c 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -389,12 +389,19 @@ static int wd_aead_param_check(struct wd_aead_sess *sess, return 0; } +static void wd_aead_clear_status() +{ + wd_alg_clear_init(&wd_aead_setting.status); +} + int wd_aead_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_aead_clear_status); + flag = wd_alg_try_init(&wd_aead_setting.status); if (!flag) return 0; diff --git a/wd_cipher.c b/wd_cipher.c index b627c0d..2eabb43 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -228,12 +228,19 @@ void wd_cipher_free_sess(handle_t h_sess) free(sess); } +static void wd_cipher_clear_status() +{ + wd_alg_clear_init(&wd_cipher_setting.status); +} + int wd_cipher_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_cipher_clear_status); + flag = wd_alg_try_init(&wd_cipher_setting.status); if (!flag) return 0; diff --git a/wd_comp.c b/wd_comp.c index b9c39f1..0e89304 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -94,6 +94,11 @@ void wd_comp_set_driver(struct wd_comp_driver *drv) wd_comp_setting.driver = drv; } +static void wd_comp_clear_status() +{ + wd_alg_clear_init(&wd_comp_setting.status); +} + static int wd_comp_init_nolock(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; @@ -187,6 +192,8 @@ int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) bool flag; int ret; + pthread_atfork(NULL, NULL, wd_comp_clear_status); + flag = wd_alg_try_init(&wd_comp_setting.status); if (!flag) return 0; @@ -214,6 +221,8 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par bool flag; int ret; + pthread_atfork(NULL, NULL, wd_comp_clear_status); + flag = wd_alg_try_init(&wd_comp_setting.status); if (!flag) return 0; diff --git a/wd_dh.c b/wd_dh.c index 74dbca0..7a96253 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -74,12 +74,19 @@ void wd_dh_set_driver(struct wd_dh_driver *drv) wd_dh_setting.driver = drv; } +static void wd_dh_clear_status() +{ + wd_alg_clear_init(&wd_dh_setting.status); +} + int wd_dh_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_dh_clear_status); + flag = wd_alg_try_init(&wd_dh_setting.status); if (!flag) return 0; diff --git a/wd_digest.c b/wd_digest.c index ceecb6a..04ac142 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -183,12 +183,19 @@ void wd_digest_free_sess(handle_t h_sess) free(sess); } +static void wd_digest_clear_status() +{ + wd_alg_clear_init(&wd_digest_setting.status); +} + int wd_digest_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_digest_clear_status); + flag = wd_alg_try_init(&wd_digest_setting.status); if (!flag) return 0; diff --git a/wd_ecc.c b/wd_ecc.c index 7fd632e..7b5654a 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -130,12 +130,19 @@ void wd_ecc_set_driver(struct wd_ecc_driver *drv) wd_ecc_setting.driver = drv; } +static void wd_ecc_clear_status() +{ + wd_alg_clear_init(&wd_ecc_setting.status); +} + int wd_ecc_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_ecc_clear_status); + flag = wd_alg_try_init(&wd_ecc_setting.status); if (!flag) return 0; diff --git a/wd_rsa.c b/wd_rsa.c index a3b856a..288b86f 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -115,12 +115,19 @@ void wd_rsa_set_driver(struct wd_rsa_driver *drv) wd_rsa_setting.driver = drv; } +static void wd_rsa_clear_status() +{ + wd_alg_clear_init(&wd_rsa_setting.status); +} + int wd_rsa_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_rsa_clear_status); + flag = wd_alg_try_init(&wd_rsa_setting.status); if (!flag) return 0; -- 2.24.0

1 0

[PATCH] uadk/comp: remove init_state2
by Yang Shen 15 Dec '22

15 Dec '22

Remove the useless state2 in wd_comp_config to make code clear. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- wd_comp.c | 63 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/wd_comp.c b/wd_comp.c index cd938d9..b9c39f1 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -94,28 +94,23 @@ void wd_comp_set_driver(struct wd_comp_driver *drv) wd_comp_setting.driver = drv; } -int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) +static int wd_comp_init_nolock(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; - bool flag; int ret; - flag = wd_alg_try_init(&wd_comp_setting.status); - if (!flag) - return 0; - ret = wd_init_param_check(config, sched); if (ret) - goto out_clear_init; + return ret; ret = wd_set_epoll_en("WD_COMP_EPOLL_EN", &wd_comp_setting.config.epoll_en); if (ret < 0) - goto out_clear_init; + return ret; ret = wd_init_ctx_config(&wd_comp_setting.config, config); if (ret < 0) - goto out_clear_init; + return ret; ret = wd_init_sched(&wd_comp_setting.sched, sched); if (ret < 0) @@ -154,8 +149,6 @@ int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) goto out_free_priv; } - wd_alg_set_init(&wd_comp_setting.status); - return 0; out_free_priv: @@ -167,12 +160,10 @@ out_clear_sched: wd_clear_sched(&wd_comp_setting.sched); out_clear_ctx_config: wd_clear_ctx_config(&wd_comp_setting.config); -out_clear_init: - wd_alg_clear_init(&wd_comp_setting.status); return ret; } -void wd_comp_uninit(void) +static void wd_comp_uninit_nolock(void) { void *priv = wd_comp_setting.priv; @@ -189,23 +180,41 @@ void wd_comp_uninit(void) /* unset config, sched, driver */ wd_clear_sched(&wd_comp_setting.sched); wd_clear_ctx_config(&wd_comp_setting.config); - - wd_alg_clear_init(&wd_comp_setting.status); } -int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_params *ctx_params) +int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) { - enum wd_status status; bool flag; int ret; - wd_alg_get_init(&wd_comp_setting.status, &status); - if (status == WD_INIT) { - WD_INFO("UADK comp has been initialized with wd_comp_init()!\n"); + flag = wd_alg_try_init(&wd_comp_setting.status); + if (!flag) return 0; + + ret = wd_comp_init_nolock(config, sched); + if (ret) { + wd_alg_clear_init(&wd_comp_setting.status); + goto out; } - flag = wd_alg_try_init(&wd_comp_setting.status2); + wd_alg_set_init(&wd_comp_setting.status); + +out: + return ret; +} + +void wd_comp_uninit(void) +{ + wd_comp_uninit_nolock(); + wd_alg_clear_init(&wd_comp_setting.status); +} + +int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_params *ctx_params) +{ + bool flag; + int ret; + + flag = wd_alg_try_init(&wd_comp_setting.status); if (!flag) return 0; @@ -234,11 +243,11 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par if (ret) goto out_freesched; - ret = wd_comp_init(&wd_comp_ctx, wd_comp_sched); + ret = wd_comp_init_nolock(&wd_comp_ctx, wd_comp_sched); if (ret) goto out_freesched; - wd_alg_set_init(&wd_comp_setting.status2); + wd_alg_set_init(&wd_comp_setting.status); return 0; @@ -246,7 +255,7 @@ out_freesched: wd_sched_rr_release(wd_comp_sched); out_uninit: - wd_alg_clear_init(&wd_comp_setting.status2); + wd_alg_clear_init(&wd_comp_setting.status); return ret; } @@ -255,7 +264,7 @@ void wd_comp_uninit2(void) { int i; - wd_comp_uninit(); + wd_comp_uninit_nolock(); for (i = 0; i < wd_comp_ctx.ctx_num; i++) if (wd_comp_ctx.ctxs[i].ctx) { @@ -264,7 +273,7 @@ void wd_comp_uninit2(void) } wd_sched_rr_release(wd_comp_sched); - wd_alg_clear_init(&wd_comp_setting.status2); + wd_alg_clear_init(&wd_comp_setting.status); } struct wd_comp_msg *wd_comp_get_msg(__u32 idx, __u32 tag) -- 2.24.0

1 0

[PATCH v3 0/5] Add dynamic driver loading function
by liulongfang 15 Dec '22

15 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading liulongfang (5): uadk: Add driver dynamic loading function uadk: added ability to query supported algorithms uadk: improve the dynamic loading public framework uadk/zip: Adapt the zip module to the dynamic loading framework uadk/sec: adapt the sec module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- drv/hisi_sec.c | 102 +++++-- include/drv/wd_aead_drv.h | 2 +- include/drv/wd_cipher_drv.h | 26 -- include/drv/wd_comp_drv.h | 27 -- include/drv/wd_digest_drv.h | 2 +- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + libwd_crypto.map | 3 + wd.c | 56 +++- wd_alg.c | 265 +++++++++++++++++ wd_cipher.c | 305 +++++++++++++++----- wd_comp.c | 293 ++++++++++--------- wd_sched.c | 105 ++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++- 20 files changed, 1697 insertions(+), 294 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 5

[PATCH] uadk/ecc: bugfix incorrect parameter length
by Zhiqi Song 14 Dec '22

14 Dec '22

When check whether a 'struct wd_dtb' type variable is all zero, the length of the data should be the value of 'bsize'. Directly using 'dsize' may truncate the data in some cases and cause erroneous judgement. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- drv/hisi_hpre.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drv/hisi_hpre.c b/drv/hisi_hpre.c index aec2f57..9da2bd7 100644 --- a/drv/hisi_hpre.c +++ b/drv/hisi_hpre.c @@ -1056,11 +1056,16 @@ static void ecc_get_io_len(__u32 atype, __u32 hsz, size_t *ilen, } } -static bool is_all_zero(struct wd_dtb *e, struct wd_ecc_msg *msg) +static bool is_all_zero(struct wd_dtb *e) { int i; - for (i = 0; i < e->dsize && i < msg->key_bytes; i++) { + if (!e || !e->data) { + WD_ERR("invalid: e or e->data is NULL\n"); + return true; + } + + for (i = 0; i < e->bsize; i++) { if (e->data[i]) return false; } @@ -1096,12 +1101,12 @@ static int ecc_prepare_sign_in(struct wd_ecc_msg *msg, return -WD_EINVAL; } hw_msg->sm2_ksel = 1; - } else if (is_all_zero(k, msg)) { + } else if (is_all_zero(k)) { WD_ERR("invalid: ecc sign in k all zero!\n"); return -WD_EINVAL; } - if (is_all_zero(e, msg)) { + if (is_all_zero(e)) { WD_ERR("invalid: ecc sign in e all zero!\n"); return -WD_EINVAL; } @@ -1143,7 +1148,7 @@ static int ecc_prepare_verf_in(struct wd_ecc_msg *msg, s = &vin->s; r = &vin->r; - if (is_all_zero(e, msg)) { + if (is_all_zero(e)) { WD_ERR("invalid: ecc verf in e all zero!\n"); return -WD_EINVAL; } @@ -1284,7 +1289,7 @@ static int u_is_in_p(struct wd_ecc_msg *msg) return -WD_EINVAL; } - if (is_all_zero(&pbk->x, msg)) { + if (is_all_zero(&pbk->x)) { WD_ERR("invalid: ux is zero!\n"); return -WD_EINVAL; } -- 2.30.0

1 0

[PATCH] uadk/v1/ecc: bugfix incorrect parameter length
by Zhiqi Song 14 Dec '22

14 Dec '22

In 'struct wd_dtb', the member 'bsize' indicates the whole buffer size of the data, the member 'dsize' indicates the valid size of the data. The 'bsize' is generally greater than or equal to 'dsize'. In some cases, the data will be filled with zero, the value of 'dsize' will not be updated, so directly using 'dsize' may truncate the data and cause erroneous judgement. The solution is when check whether a 'struct wd_dtb' type variable is all zero, if 'bsize' is larger than 'dsize', the length of the data should be the value of 'bsize'. And the key size value is redundant. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- v1/drv/hisi_hpre_udrv.c | 19 +++++++++---------- v1/wd_ecc.c | 14 +++++++------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/v1/drv/hisi_hpre_udrv.c b/v1/drv/hisi_hpre_udrv.c index 00ceec2..0eba2d6 100644 --- a/v1/drv/hisi_hpre_udrv.c +++ b/v1/drv/hisi_hpre_udrv.c @@ -1106,22 +1106,21 @@ static void correct_random(struct wd_dtb *k) k->data[lens] = 0; } -static bool is_all_zero(struct wd_dtb *e, struct wcrypto_ecc_msg *msg, - const char *p_name) +static bool is_all_zero(struct wd_dtb *e, const char *p_name) { int i; if (!e || !e->data) { - WD_ERR("%s: e or data NULL!\n", p_name); + WD_ERR("invalid: %s is NULL!\n", p_name); return true; } - for (i = 0; i < e->dsize && i < msg->key_bytes; i++) { + for (i = 0; i < e->bsize; i++) { if (e->data[i]) return false; } - WD_ERR("error: %s all zero!\n", p_name); + WD_ERR("invalid: %s all zero!\n", p_name); return true; } @@ -1144,15 +1143,15 @@ static int ecc_prepare_sign_in(struct wcrypto_ecc_msg *msg, e = &in->dgst; if (!in->k_set) { if (msg->op_type != WCRYPTO_SM2_SIGN) { - WD_ERR("random k not set!\n"); + WD_ERR("invalid: random k not set!\n"); return -WD_EINVAL; } hw_msg->sm2_ksel = 1; - } else if (is_all_zero(k, msg, "ecc sgn k")) { + } else if (is_all_zero(k, "ecc sgn k")) { return -WD_EINVAL; } - if (is_all_zero(e, msg, "ecc sgn e")) + if (is_all_zero(e, "ecc sgn e")) return -WD_EINVAL; ret = qm_crypto_bin_to_hpre_bin(e->data, (const char *)e->data, @@ -1192,7 +1191,7 @@ static int ecc_prepare_verf_in(struct wcrypto_ecc_msg *msg, void **data) s = &vin->s; r = &vin->r; - if (is_all_zero(e, msg, "ecc vrf e")) + if (is_all_zero(e, "ecc vrf e")) return -WD_EINVAL; ret = qm_crypto_bin_to_hpre_bin(e->data, (const char *)e->data, @@ -1274,7 +1273,7 @@ static int ecc_prepare_sm2_enc_in(struct wcrypto_ecc_msg *msg, int ret; if (ein->k_set) { - if (is_all_zero(k, msg, "sm2 enc k")) + if (is_all_zero(k, "sm2 enc k")) return -WD_EINVAL; ret = qm_crypto_bin_to_hpre_bin(k->data, (const char *)k->data, diff --git a/v1/wd_ecc.c b/v1/wd_ecc.c index e108051..e6b771a 100644 --- a/v1/wd_ecc.c +++ b/v1/wd_ecc.c @@ -544,6 +544,7 @@ static struct wcrypto_ecc_in *create_ecc_sign_in(struct wcrypto_ecc_ctx *ctx, { if (is_dgst) return create_ecc_in(ctx, ECC_SIGN_IN_PARAM_NUM); + return create_sm2_sign_in(ctx, m_len); } @@ -1489,7 +1490,6 @@ static int ecc_request_init(struct wcrypto_ecc_msg *req, if (req->op_type == WCRYPTO_ECXDH_GEN_KEY || req->op_type == WCRYPTO_SM2_KG) { struct wcrypto_ecc_point *g = NULL; - wcrypto_get_ecc_prikey_params((void *)key, NULL, NULL, NULL, NULL, &g, NULL); req->in = (void *)g; @@ -1715,11 +1715,11 @@ static bool less_than_latter(struct wd_dtb *d, struct wd_dtb *n) return ret < 0; } -static bool is_all_zero(struct wd_dtb *p, struct wcrypto_ecc_ctx *ctx) +static bool is_all_zero(struct wd_dtb *p) { int i; - for (i = 0; i < p->dsize && i < ctx->key_size; i++) { + for (i = 0; i < p->bsize; i++) { if (p->data[i]) return false; } @@ -1733,7 +1733,7 @@ static bool check_k_param(struct wd_dtb *k, struct wcrypto_ecc_ctx *ctx) int ret; if (unlikely(!k->data)) { - WD_ERR("error: k->data NULL!\n"); + WD_ERR("invalid: k->data NULL!\n"); return false; } @@ -1744,12 +1744,12 @@ static bool check_k_param(struct wd_dtb *k, struct wcrypto_ecc_ctx *ctx) } if (unlikely(!less_than_latter(k, &cv->n))) { - WD_ERR("error: k >= n\n"); + WD_ERR("invalid: k >= n!\n"); return false; } - if (unlikely(is_all_zero(k, ctx))) { - WD_ERR("error: k all zero\n"); + if (unlikely(is_all_zero(k))) { + WD_ERR("invalid: k all zero!\n"); return false; } -- 2.30.0

1 0

[PATCH] uadk/ecc: cleanup sm2 dec out code
by Zhiqi Song 14 Dec '22

14 Dec '22

Delete incorrect comments and use variable name that meet the algorithm criteria. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- drv/hisi_hpre.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drv/hisi_hpre.c b/drv/hisi_hpre.c index 877b2a5..aec2f57 100644 --- a/drv/hisi_hpre.c +++ b/drv/hisi_hpre.c @@ -2190,11 +2190,11 @@ static int sm2_convert_dec_out(struct wd_ecc_msg *src, struct wd_sm2_dec_out *dout = &out->param.dout; struct wd_ecc_in *in = (void *)src->req.src; struct wd_sm2_dec_in *din = &in->param.din; + char buff[MAX_HASH_LENS] = {0}; struct wd_ecc_dh_out *dh_out; __u32 ksz = dst->key_bytes; struct wd_ecc_point x2y2; - struct wd_dtb tmp = {0}; - char buff[64] = {0}; + struct wd_dtb u = {0}; int ret; /* @@ -2210,8 +2210,6 @@ static int sm2_convert_dec_out(struct wd_ecc_msg *src, x2y2.x.dsize = ksz; x2y2.y.dsize = ksz; - tmp.data = buff; - /* t = KDF(x2 || y2, klen) */ ret = sm2_kdf(&dout->plaintext, &x2y2, din->c2.dsize, &src->hash); if (unlikely(ret)) { @@ -2219,20 +2217,21 @@ static int sm2_convert_dec_out(struct wd_ecc_msg *src, return ret; } - /* M' = C2 XOR t */ + /* M' = c2 XOR t */ sm2_xor(&dout->plaintext, &din->c2); - /* u = hash(x2 || M' || y2), save u to din->c2 */ - ret = sm2_hash(&tmp, &x2y2, &dout->plaintext, &src->hash); + /* u = hash(x2 || M' || y2) */ + u.data = buff; + ret = sm2_hash(&u, &x2y2, &dout->plaintext, &src->hash); if (unlikely(ret)) { WD_ERR("failed to compute c3, ret = %d!\n", ret); return ret; } - /* u == c3 */ - ret = is_equal(&tmp, &din->c3); + /* Judge whether u == c3 */ + ret = is_equal(&u, &din->c3); if (ret) - WD_ERR("failed to decode sm2, u != C3!\n"); + WD_ERR("failed to decode sm2, u != c3!\n"); return ret; } -- 2.30.0

1 0

[PATCH] uadk/v1/ecc: bugfix buffer overwritten of sm2 decryption
by Zhiqi Song 14 Dec '22

14 Dec '22

Fix the problem that the input data field 'c1.x' is overwitten by the output data calculated by the hardware. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- v1/drv/hisi_hpre_udrv.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/v1/drv/hisi_hpre_udrv.c b/v1/drv/hisi_hpre_udrv.c index 0738f44..00ceec2 100644 --- a/v1/drv/hisi_hpre_udrv.c +++ b/v1/drv/hisi_hpre_udrv.c @@ -1969,7 +1969,6 @@ static int fill_sm2_dec_sqe(void *message, struct qm_queue_info *info, __u16 i) /* compute d * c1 */ memcpy(dst, req_src, sizeof(*dst)); - dst->op_type = HPRE_SM2_DEC; *(struct wcrypto_ecc_msg **)(dst + 1) = req_src; dst->in = (void *)&din->c1; @@ -2047,8 +2046,8 @@ static int qm_parse_ecc_sqe_general(void *msg, const struct qm_queue_info *info, dma_out = DMA_ADDR(hw_msg->hi_out, hw_msg->low_out); dma_key = DMA_ADDR(hw_msg->hi_key, hw_msg->low_key); - dma_in = DMA_ADDR(hw_msg->hi_in, hw_msg->hi_in); - drv_iova_unmap(q, NULL, (void *)(uintptr_t)dma_in, olen); + dma_in = DMA_ADDR(hw_msg->hi_in, hw_msg->low_in); + drv_iova_unmap(q, NULL, (void *)(uintptr_t)dma_in, ilen); drv_iova_unmap(q, NULL, (void *)(uintptr_t)dma_out, olen); drv_iova_unmap(q, NULL, (void *)(uintptr_t)dma_key, kbytes); @@ -2265,8 +2264,8 @@ static int is_equal(struct wd_dtb *src, struct wd_dtb *dst) static int sm2_hash(struct wd_dtb *out, struct wcrypto_ecc_point *x2y2, struct wd_dtb *msg, struct q_info *q_info) { - struct wcrypto_hash_mt *hash = &q_info->hash; __u64 lens = (__u64)msg->dsize + 2 * (__u64)x2y2->x.dsize; + struct wcrypto_hash_mt *hash = &q_info->hash; char hash_out[MAX_HASH_LENS] = {0}; __u64 in_len = 0; __u32 h_bytes; @@ -2353,8 +2352,10 @@ static int sm2_convert_dec_out(struct wcrypto_ecc_msg *src, struct wcrypto_sm2_dec_out *dout = &out->param.dout; struct wcrypto_ecc_in *in = (void *)src->in; struct wcrypto_sm2_dec_in *din = &in->param.din; + char buff[MAX_HASH_LENS] = {0}; struct wcrypto_ecc_point x2y2; __u32 ksz = dst->key_bytes; + struct wd_dtb u = {0}; int ret; /* dec origin out data fmt: @@ -2362,8 +2363,6 @@ static int sm2_convert_dec_out(struct wcrypto_ecc_msg *src, * final out data fmt: * | plaintext | */ - - /* x2y2 :copy x2y2 into din->c1 */ x2y2.x.data = (void *)dst->out; x2y2.y.data = (void *)(dst->out + ksz); x2y2.x.dsize = ksz; @@ -2376,20 +2375,21 @@ static int sm2_convert_dec_out(struct wcrypto_ecc_msg *src, return ret; } - /* M' = C2 XOR t */ + /* M' = c2 XOR t */ sm2_xor(&dout->plaintext, &din->c2); - /* u = hash(x2 || M' || y2), save u to din->c2 */ - ret = sm2_hash(&din->c1.x, &x2y2, &dout->plaintext, q_info); + /* u = hash(x2 || M' || y2) */ + u.data = buff; + ret = sm2_hash(&u, &x2y2, &dout->plaintext, q_info); if (unlikely(ret)) { WD_ERR("failed to compute c3, ret = %d!\n", ret); return ret; } - /* u == c3 */ - ret = is_equal(&din->c1.x, &din->c3); + /* Judge whether u == c3 */ + ret = is_equal(&u, &din->c3); if (ret) - WD_ERR("failed to dec sm2, u != C3!\n"); + WD_ERR("failed to dec sm2, u != c3!\n"); return ret; } -- 2.30.0

1 0

[PATCH 0/4] Add dynamic driver loading function
by liulongfang 12 Dec '22

12 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. liulongfang (4): uadk: Add driver dynamic loading function uadk: added ability to query supported algorithms uadk: improve the dynamic loading public framework uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 101 ++++++++- include/drv/wd_comp_drv.h | 27 --- include/wd.h | 12 + include/wd_alg.h | 85 ++++++++ include/wd_alg_common.h | 10 + include/wd_sched.h | 6 +- include/wd_util.h | 18 +- libwd.map | 8 + wd.c | 56 ++++- wd_alg.c | 265 ++++++++++++++++++++++ wd_comp.c | 160 +++++++------- wd_util.c | 447 +++++++++++++++++++++++++++++++++++++- 13 files changed, 1068 insertions(+), 131 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

3 17

[PATCH v2 0/5] Add dynamic driver loading function
by liulongfang 08 Dec '22

08 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading liulongfang (5): uadk: Add driver dynamic loading function uadk: added ability to query supported algorithms uadk: improve the dynamic loading public framework uadk/zip: Adapt the zip module to the dynamic loading framework uadk/sec: adapt the sec module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 ++++- drv/hisi_sec.c | 125 ++++++++-- include/drv/wd_cipher_drv.h | 26 -- include/drv/wd_comp_drv.h | 27 --- include/wd.h | 12 + include/wd_alg.h | 95 ++++++++ include/wd_alg_common.h | 10 + include/wd_sched.h | 6 +- include/wd_util.h | 19 +- libwd.map | 8 + libwd_crypto.map | 3 + wd.c | 56 ++++- wd_alg.c | 258 ++++++++++++++++++++ wd_cipher.c | 233 ++++++++++++++---- wd_comp.c | 188 ++++++++------- wd_sched.c | 57 +++++ wd_util.c | 463 +++++++++++++++++++++++++++++++++++- 18 files changed, 1419 insertions(+), 230 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 5

sig-AccLib 双周会
by openEuler conference 06 Dec '22

06 Dec '22

您好！ sig-AccLib SIG 邀请您参加 2022-12-07 11:00 召开的Zoom会议会议主题：sig-AccLib 双周会会议内容： zoom会议ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.zlib wrap方案 2.uadk 版本tag计划等会议链接：https://us06web.zoom.us/j/83035620320?pwd=cU9jSlBlRFFkVmc5QVM3K0xPUFl5dz09 会议纪要：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-12-07 11:00, The subject of the conference is sig-AccLib 双周会, Summary: zoom会议ID: 91879279131 固定的会议链接：https://linaro-org.zoom.us/j/91879279131 1.zlib wrap方案 2.uadk 版本tag计划等 You can join the meeting at https://us06web.zoom.us/j/83035620320?pwd=cU9jSlBlRFFkVmc5QVM3K0xPUFl5dz09. 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/5] bugfix and cleanup about uadk engine
by Zhiqi Song 06 Dec '22

06 Dec '22

This patch set contains some tiny bugfix and cleanup of ecc/rsa/cipher. Wenkai Lin (1): cipher: code clean for update iv and check length Zhiqi Song (4): rsa: fix wrong input parameters cipher: fix unused input parameter uadk_engine: bugfix null dereference in abnormal conditions ecc: bugfix potential null dereference problems -- 2.30.0

1 5