95a99bb0f2
This series backport upstream 8 patches, it also fix spec file error by removing wrong changelog and fixing wrong date. Signed-off-by: Zhao Mengmeng <zhaomengmeng@kylinos.cn>
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 4d8e10590405e7ed30a241202624146b18635030 Mon Sep 17 00:00:00 2001
|
|
From: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
Date: Fri, 29 Mar 2024 08:54:32 +0000
|
|
Subject: [PATCH 09/15] uadk_prov_cipher: dec and enc use same op
|
|
|
|
Cipher can use same op for dec and enc, so alloc 1 op.
|
|
|
|
Otherwise, there maybe issue in env case, where
|
|
driver->op_type_num is used,
|
|
drv/hisi_sec.c:621: .op_type_num = 1,
|
|
|
|
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
---
|
|
src/uadk_prov_cipher.c | 10 ++++------
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/uadk_prov_cipher.c b/src/uadk_prov_cipher.c
|
|
index fc41104..91e60d8 100644
|
|
--- a/src/uadk_prov_cipher.c
|
|
+++ b/src/uadk_prov_cipher.c
|
|
@@ -420,14 +420,13 @@ static void uadk_prov_cipher_ctx_init(struct cipher_priv_ctx *priv)
|
|
struct wd_ctx_nums *ctx_set_num;
|
|
struct wd_ctx_params cparams = {0};
|
|
|
|
- /* 0: enc, 1: dec */
|
|
- ctx_set_num = calloc(2, sizeof(*ctx_set_num));
|
|
+ ctx_set_num = calloc(1, sizeof(*ctx_set_num));
|
|
if (!ctx_set_num) {
|
|
fprintf(stderr, "failed to alloc ctx_set_size!\n");
|
|
return;
|
|
}
|
|
|
|
- cparams.op_type_num = 2;
|
|
+ cparams.op_type_num = 1;
|
|
cparams.ctx_set_num = ctx_set_num;
|
|
cparams.bmp = numa_allocate_nodemask();
|
|
if (!cparams.bmp) {
|
|
@@ -440,8 +439,6 @@ static void uadk_prov_cipher_ctx_init(struct cipher_priv_ctx *priv)
|
|
|
|
ctx_set_num[0].sync_ctx_num = 2;
|
|
ctx_set_num[0].async_ctx_num = 2;
|
|
- ctx_set_num[1].sync_ctx_num = 2;
|
|
- ctx_set_num[1].async_ctx_num = 2;
|
|
|
|
ret = wd_cipher_init2_(priv->alg_name, 0, 0, &cparams);
|
|
numa_free_nodemask(cparams.bmp);
|
|
@@ -458,7 +455,8 @@ static void uadk_prov_cipher_ctx_init(struct cipher_priv_ctx *priv)
|
|
}
|
|
pthread_mutex_unlock(&cipher_mutex);
|
|
|
|
- params.type = priv->req.op_type;
|
|
+ /* dec and enc use the same op */
|
|
+ params.type = 0;
|
|
/* Use the default numa parameters */
|
|
params.numa_id = -1;
|
|
priv->setup.sched_param = ¶ms;
|
|
--
|
|
2.43.0
|
|
|