lkml.org 
[lkml]   [2020]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] crypto: hisilicon/sec2 - Use atomics instead of __sync
From
Date
Hi,

I will send out a patch set soon, which fixes this problem. Thanks.

cheers,

Zaibo

.


On 2020/1/8 4:08, Arnd Bergmann wrote:
> The use of __sync functions for atomic memory access is not
> supported in the kernel, and can result in a link error depending
> on configuration:
>
> ERROR: "__tsan_atomic32_compare_exchange_strong" [drivers/crypto/hisilicon/sec2/hisi_sec2.ko] undefined!
> ERROR: "__tsan_atomic64_fetch_add" [drivers/crypto/hisilicon/sec2/hisi_sec2.ko] undefined!
>
> Use the kernel's own atomic interfaces instead. This way the
> debugfs interface actually reads the counter atomically.
>
> Fixes: 416d82204df4 ("crypto: hisilicon - add HiSilicon SEC V2 driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/crypto/hisilicon/sec2/sec.h | 6 +++---
> drivers/crypto/hisilicon/sec2/sec_crypto.c | 12 ++++++------
> drivers/crypto/hisilicon/sec2/sec_main.c | 14 ++++++++++++--
> 3 files changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/crypto/hisilicon/sec2/sec.h b/drivers/crypto/hisilicon/sec2/sec.h
> index 26754d0570ba..b846d73d9a85 100644
> --- a/drivers/crypto/hisilicon/sec2/sec.h
> +++ b/drivers/crypto/hisilicon/sec2/sec.h
> @@ -40,7 +40,7 @@ struct sec_req {
> int req_id;
>
> /* Status of the SEC request */
> - int fake_busy;
> + atomic_t fake_busy;
> };
>
> /**
> @@ -132,8 +132,8 @@ struct sec_debug_file {
> };
>
> struct sec_dfx {
> - u64 send_cnt;
> - u64 recv_cnt;
> + atomic64_t send_cnt;
> + atomic64_t recv_cnt;
> };
>
> struct sec_debug {
> diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c
> index 62b04e19067c..0a5391fff485 100644
> --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c
> +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c
> @@ -120,7 +120,7 @@ static void sec_req_cb(struct hisi_qp *qp, void *resp)
> return;
> }
>
> - __sync_add_and_fetch(&req->ctx->sec->debug.dfx.recv_cnt, 1);
> + atomic64_inc(&req->ctx->sec->debug.dfx.recv_cnt);
>
> req->ctx->req_op->buf_unmap(req->ctx, req);
>
> @@ -135,13 +135,13 @@ static int sec_bd_send(struct sec_ctx *ctx, struct sec_req *req)
> mutex_lock(&qp_ctx->req_lock);
> ret = hisi_qp_send(qp_ctx->qp, &req->sec_sqe);
> mutex_unlock(&qp_ctx->req_lock);
> - __sync_add_and_fetch(&ctx->sec->debug.dfx.send_cnt, 1);
> + atomic64_inc(&ctx->sec->debug.dfx.send_cnt);
>
> if (ret == -EBUSY)
> return -ENOBUFS;
>
> if (!ret) {
> - if (req->fake_busy)
> + if (atomic_read(&req->fake_busy))
> ret = -EBUSY;
> else
> ret = -EINPROGRESS;
> @@ -641,7 +641,7 @@ static void sec_skcipher_callback(struct sec_ctx *ctx, struct sec_req *req)
> if (ctx->c_ctx.c_mode == SEC_CMODE_CBC && req->c_req.encrypt)
> sec_update_iv(req);
>
> - if (__sync_bool_compare_and_swap(&req->fake_busy, 1, 0))
> + if (atomic_cmpxchg(&req->fake_busy, 1, 0) != 1)
> sk_req->base.complete(&sk_req->base, -EINPROGRESS);
>
> sk_req->base.complete(&sk_req->base, req->err_type);
> @@ -672,9 +672,9 @@ static int sec_request_init(struct sec_ctx *ctx, struct sec_req *req)
> }
>
> if (ctx->fake_req_limit <= atomic_inc_return(&qp_ctx->pending_reqs))
> - req->fake_busy = 1;
> + atomic_set(&req->fake_busy, 1);
> else
> - req->fake_busy = 0;
> + atomic_set(&req->fake_busy, 0);
>
> ret = ctx->req_op->get_res(ctx, req);
> if (ret) {
> diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
> index 74f0654028c9..ab742dfbab99 100644
> --- a/drivers/crypto/hisilicon/sec2/sec_main.c
> +++ b/drivers/crypto/hisilicon/sec2/sec_main.c
> @@ -608,6 +608,14 @@ static const struct file_operations sec_dbg_fops = {
> .write = sec_debug_write,
> };
>
> +static int debugfs_atomic64_t_get(void *data, u64 *val)
> +{
> + *val = atomic64_read((atomic64_t *)data);
> + return 0;
> +}
> +DEFINE_DEBUGFS_ATTRIBUTE(fops_atomic64_t_ro, debugfs_atomic64_t_get, NULL,
> + "%lld\n");
> +
> static int sec_core_debug_init(struct sec_dev *sec)
> {
> struct hisi_qm *qm = &sec->qm;
> @@ -628,9 +636,11 @@ static int sec_core_debug_init(struct sec_dev *sec)
>
> debugfs_create_regset32("regs", 0444, tmp_d, regset);
>
> - debugfs_create_u64("send_cnt", 0444, tmp_d, &dfx->send_cnt);
> + debugfs_create_file("send_cnt", 0444, tmp_d, &dfx->send_cnt,
> + &fops_atomic64_t_ro);
>
> - debugfs_create_u64("recv_cnt", 0444, tmp_d, &dfx->recv_cnt);
> + debugfs_create_file("recv_cnt", 0444, tmp_d, &dfx->recv_cnt,
> + &fops_atomic64_t_ro);
>
> return 0;
> }


\
 
 \ /
  Last update: 2020-01-08 02:09    [W:0.051 / U:6.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site