packages/libwd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
libwd/0032-Revert-uadk-v1-replace-wd_spinlock-to-pthread_spin_l.patch
JangShui Yang 7623e3ac16 libwd: update the source code
2024-11-19 11:51:09 +08:00

289 lines
8.1 KiB
Diff
Raw Permalink Blame History

From ff746e0ed02fdd0f547b4e62d89377efba7f9302 Mon Sep 17 00:00:00 2001
From: Weili Qian <qianweili@huawei.com>
Date: Sat, 12 Oct 2024 11:03:18 +0800
Subject: [PATCH 32/39] Revert "uadk/v1: replace wd_spinlock to
pthread_spin_lock"
This reverts commit f7c2a7a3e5116dc0ce4af539070f2ed93bb18af8.
Signed-off-by: Weili Qian <qianweili@huawei.com>
Signed-off-by: Qi Tao <taoqi10@huawei.com>
---
v1/drv/hisi_qm_udrv.c | 51 +++++++++++++-----------------------------
v1/drv/hisi_qm_udrv.h | 4 ++--
v1/drv/hisi_rng_udrv.c | 25 ++++++---------------
v1/drv/hisi_rng_udrv.h | 2 +-
4 files changed, 26 insertions(+), 56 deletions(-)
diff --git a/v1/drv/hisi_qm_udrv.c b/v1/drv/hisi_qm_udrv.c
index 1d4f1d8..175a5c4 100644
--- a/v1/drv/hisi_qm_udrv.c
+++ b/v1/drv/hisi_qm_udrv.c
@@ -20,7 +20,6 @@
#include <sys/mman.h>
#include <string.h>
#include <stdint.h>
-#include <pthread.h>
#include <sys/ioctl.h>
#include <sys/epoll.h>
#include <sys/eventfd.h>
@@ -459,11 +458,6 @@ static int qm_init_queue_info(struct wd_queue *q)
struct hisi_qp_ctx qp_ctx = {0};
int ret;
- if (!info->sqe_size) {
- WD_ERR("invalid: sqe size is 0!\n");
- return -WD_EINVAL;
- }
-
info->sq_tail_index = 0;
info->cq_head_index = 0;
info->cqc_phase = 1;
@@ -508,6 +502,11 @@ static int qm_set_queue_info(struct wd_queue *q)
ret = qm_set_queue_regions(q);
if (ret)
return -WD_EINVAL;
+ if (!info->sqe_size) {
+ WD_ERR("sqe size =%d err!\n", info->sqe_size);
+ ret = -WD_EINVAL;
+ goto err_with_regions;
+ }
info->cq_base = (void *)((uintptr_t)info->sq_base +
info->sqe_size * info->sq_depth);
@@ -535,24 +534,8 @@ static int qm_set_queue_info(struct wd_queue *q)
goto err_with_regions;
}
- ret = pthread_spin_init(&info->sd_lock, PTHREAD_PROCESS_PRIVATE);
- if (ret) {
- WD_ERR("failed to init qinfo sd_lock!\n");
- goto free_cache;
- }
-
- ret = pthread_spin_init(&info->rc_lock, PTHREAD_PROCESS_PRIVATE);
- if (ret) {
- WD_ERR("failed to init qinfo rc_lock!\n");
- goto uninit_lock;
- }
-
return 0;
-uninit_lock:
- pthread_spin_destroy(&info->sd_lock);
-free_cache:
- free(info->req_cache);
err_with_regions:
qm_unset_queue_regions(q);
return ret;
@@ -593,10 +576,8 @@ void qm_uninit_queue(struct wd_queue *q)
struct q_info *qinfo = q->qinfo;
struct qm_queue_info *info = qinfo->priv;
- pthread_spin_destroy(&info->rc_lock);
- pthread_spin_destroy(&info->sd_lock);
- free(info->req_cache);
qm_unset_queue_regions(q);
+ free(info->req_cache);
free(qinfo->priv);
qinfo->priv = NULL;
}
@@ -624,10 +605,10 @@ int qm_send(struct wd_queue *q, void **req, __u32 num)
int ret;
__u32 i;
- pthread_spin_lock(&info->sd_lock);
+ wd_spinlock(&info->sd_lock);
if (unlikely((__u32)__atomic_load_n(&info->used, __ATOMIC_RELAXED) >
info->sq_depth - num - 1)) {
- pthread_spin_unlock(&info->sd_lock);
+ wd_unspinlock(&info->sd_lock);
WD_ERR("queue is full!\n");
return -WD_EBUSY;
}
@@ -636,7 +617,7 @@ int qm_send(struct wd_queue *q, void **req, __u32 num)
ret = info->sqe_fill[qinfo->atype](req[i], qinfo->priv,
info->sq_tail_index);
if (unlikely(ret != WD_SUCCESS)) {
- pthread_spin_unlock(&info->sd_lock);
+ wd_unspinlock(&info->sd_lock);
WD_ERR("sqe fill error, ret %d!\n", ret);
return -WD_EINVAL;
}
@@ -648,7 +629,7 @@ int qm_send(struct wd_queue *q, void **req, __u32 num)
}
ret = qm_tx_update(info, num);
- pthread_spin_unlock(&info->sd_lock);
+ wd_unspinlock(&info->sd_lock);
return ret;
}
@@ -681,9 +662,9 @@ static int check_ds_rx_base(struct qm_queue_info *info,
return 0;
if (before) {
- pthread_spin_lock(&info->rc_lock);
+ wd_spinlock(&info->rc_lock);
qm_rx_from_cache(info, resp, num);
- pthread_spin_unlock(&info->rc_lock);
+ wd_unspinlock(&info->rc_lock);
WD_ERR("wd queue hw error happened before qm receive!\n");
} else {
WD_ERR("wd queue hw error happened after qm receive!\n");
@@ -724,7 +705,7 @@ int qm_recv(struct wd_queue *q, void **resp, __u32 num)
if (unlikely(ret))
return ret;
- pthread_spin_lock(&info->rc_lock);
+ wd_spinlock(&info->rc_lock);
for (i = 0; i < num; i++) {
cqe = info->cq_base + info->cq_head_index * sizeof(struct cqe);
if (info->cqc_phase != CQE_PHASE(cqe))
@@ -733,7 +714,7 @@ int qm_recv(struct wd_queue *q, void **resp, __u32 num)
mb(); /* make sure the data is all in memory before read */
sq_head = CQE_SQ_HEAD_INDEX(cqe);
if (unlikely(sq_head >= info->sq_depth)) {
- pthread_spin_unlock(&info->rc_lock);
+ wd_unspinlock(&info->rc_lock);
WD_ERR("CQE_SQ_HEAD_INDEX(%u) error\n", sq_head);
return -WD_EIO;
}
@@ -745,7 +726,7 @@ int qm_recv(struct wd_queue *q, void **resp, __u32 num)
if (!ret) {
break;
} else if (ret < 0) {
- pthread_spin_unlock(&info->rc_lock);
+ wd_unspinlock(&info->rc_lock);
WD_ERR("recv sqe error %u\n", sq_head);
return ret;
}
@@ -766,7 +747,7 @@ int qm_recv(struct wd_queue *q, void **resp, __u32 num)
ret = i;
}
- pthread_spin_unlock(&info->rc_lock);
+ wd_unspinlock(&info->rc_lock);
return ret;
}
diff --git a/v1/drv/hisi_qm_udrv.h b/v1/drv/hisi_qm_udrv.h
index 06ac66a..4d54cf6 100644
--- a/v1/drv/hisi_qm_udrv.h
+++ b/v1/drv/hisi_qm_udrv.h
@@ -166,8 +166,8 @@ struct qm_queue_info {
qm_sqe_parse sqe_parse[WCRYPTO_MAX_ALG];
hisi_qm_sqe_fill_priv sqe_fill_priv;
hisi_qm_sqe_parse_priv sqe_parse_priv;
- pthread_spinlock_t sd_lock;
- pthread_spinlock_t rc_lock;
+ struct wd_lock sd_lock;
+ struct wd_lock rc_lock;
struct wd_queue *q;
int (*sgl_info)(struct hw_sgl_info *info);
int (*sgl_init)(void *pool, struct wd_sgl *sgl);
diff --git a/v1/drv/hisi_rng_udrv.c b/v1/drv/hisi_rng_udrv.c
index 605ef27..86a20cb 100644
--- a/v1/drv/hisi_rng_udrv.c
+++ b/v1/drv/hisi_rng_udrv.c
@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
-#include <pthread.h>
#include <sys/mman.h>
#include <string.h>
#include <stdint.h>
@@ -35,7 +34,6 @@ int rng_init_queue(struct wd_queue *q)
{
struct q_info *qinfo = q->qinfo;
struct rng_queue_info *info;
- int ret;
info = calloc(1, sizeof(*info));
if (!info) {
@@ -43,20 +41,12 @@ int rng_init_queue(struct wd_queue *q)
return -ENOMEM;
}
- ret = pthread_spin_init(&info->lock, PTHREAD_PROCESS_PRIVATE);
- if (ret) {
- free(info);
- WD_ERR("failed to init rng qinfo lock!\n");
- return ret;
- }
-
qinfo->priv = info;
info->mmio_base = wd_drv_mmap_qfr(q, WD_UACCE_QFRT_MMIO, 0);
if (info->mmio_base == MAP_FAILED) {
info->mmio_base = NULL;
+ free(qinfo->priv);
qinfo->priv = NULL;
- pthread_spin_destroy(&info->lock);
- free(info);
WD_ERR("mmap trng mmio fail\n");
return -ENOMEM;
}
@@ -73,7 +63,6 @@ void rng_uninit_queue(struct wd_queue *q)
free(qinfo->priv);
qinfo->priv = NULL;
- pthread_spin_destroy(&info->lock);
}
int rng_send(struct wd_queue *q, void **req, __u32 num)
@@ -81,14 +70,14 @@ int rng_send(struct wd_queue *q, void **req, __u32 num)
struct q_info *qinfo = q->qinfo;
struct rng_queue_info *info = qinfo->priv;
- pthread_spin_lock(&info->lock);
+ wd_spinlock(&info->lock);
if (!info->req_cache[info->send_idx]) {
info->req_cache[info->send_idx] = req[0];
info->send_idx++;
- pthread_spin_unlock(&info->lock);
+ wd_unspinlock(&info->lock);
return 0;
}
- pthread_spin_unlock(&info->lock);
+ wd_unspinlock(&info->lock);
WD_ERR("queue is full!\n");
return -WD_EBUSY;
@@ -139,16 +128,16 @@ int rng_recv(struct wd_queue *q, void **resp, __u32 num)
struct wcrypto_cb_tag *tag;
__u32 currsize = 0;
- pthread_spin_lock(&info->lock);
+ wd_spinlock(&info->lock);
msg = info->req_cache[info->recv_idx];
if (!msg) {
- pthread_spin_unlock(&info->lock);
+ wd_unspinlock(&info->lock);
return 0;
}
info->req_cache[info->recv_idx] = NULL;
info->recv_idx++;
- pthread_spin_unlock(&info->lock);
+ wd_unspinlock(&info->lock);
tag = (void *)(uintptr_t)msg->usr_tag;
if (usr && tag->ctx_id != usr)
diff --git a/v1/drv/hisi_rng_udrv.h b/v1/drv/hisi_rng_udrv.h
index 3efa10e..56814a4 100644
--- a/v1/drv/hisi_rng_udrv.h
+++ b/v1/drv/hisi_rng_udrv.h
@@ -29,7 +29,7 @@ struct rng_queue_info {
void *req_cache[TRNG_Q_DEPTH];
__u8 send_idx;
__u8 recv_idx;
- pthread_spinlock_t lock;
+ struct wd_lock lock;
};
int rng_init_queue(struct wd_queue *q);
--
2.25.1
Reference in New Issue View Git Blame Copy Permalink