crypto: hisilicon - Kunpeng916 crypto driver don't sleep when in softirq

When kunpeng916 encryption driver is used to deencrypt and decrypt
packets during the softirq, it is not allowed to use mutex lock.

Fixes: 915e4e8413da ("crypto: hisilicon - SEC security accelerator driver")
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c b/drivers/crypto/hisilicon/sec/sec_algs.c
index 0a3c8f019b02518ff108492bd87ddcb9fe8cc056..490e1542305e16fb30ab31eab6b0cf484aa90047 100644 (file)
--- a/drivers/crypto/hisilicon/sec/sec_algs.c
+++ b/drivers/crypto/hisilicon/sec/sec_algs.c
@@ -449,7 +449,7 @@ static void sec_skcipher_alg_callback(struct sec_bd_info *sec_resp,
                 */
        }
 
-       mutex_lock(&ctx->queue->queuelock);
+       spin_lock_bh(&ctx->queue->queuelock);
        /* Put the IV in place for chained cases */
        switch (ctx->cipher_alg) {
        case SEC_C_AES_CBC_128:
@@ -509,7 +509,7 @@ static void sec_skcipher_alg_callback(struct sec_bd_info *sec_resp,
                        list_del(&backlog_req->backlog_head);
                }
        }
-       mutex_unlock(&ctx->queue->queuelock);
+       spin_unlock_bh(&ctx->queue->queuelock);
 
        mutex_lock(&sec_req->lock);
        list_del(&sec_req_el->head);
@@ -798,7 +798,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq,
         */
 
        /* Grab a big lock for a long time to avoid concurrency issues */
-       mutex_lock(&queue->queuelock);
+       spin_lock_bh(&queue->queuelock);
 
        /*
         * Can go on to queue if we have space in either:
@@ -814,15 +814,15 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq,
                ret = -EBUSY;
                if ((skreq->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)) {
                        list_add_tail(&sec_req->backlog_head, &ctx->backlog);
-                       mutex_unlock(&queue->queuelock);
+                       spin_unlock_bh(&queue->queuelock);
                        goto out;
                }
 
-               mutex_unlock(&queue->queuelock);
+               spin_unlock_bh(&queue->queuelock);
                goto err_free_elements;
        }
        ret = sec_send_request(sec_req, queue);
-       mutex_unlock(&queue->queuelock);
+       spin_unlock_bh(&queue->queuelock);
        if (ret)
                goto err_free_elements;
 
@@ -881,7 +881,7 @@ static int sec_alg_skcipher_init(struct crypto_skcipher *tfm)
        if (IS_ERR(ctx->queue))
                return PTR_ERR(ctx->queue);
 
-       mutex_init(&ctx->queue->queuelock);
+       spin_lock_init(&ctx->queue->queuelock);
        ctx->queue->havesoftqueue = false;
 
        return 0;

diff --git a/drivers/crypto/hisilicon/sec/sec_drv.h b/drivers/crypto/hisilicon/sec/sec_drv.h
index 179a8250d691c46c87ca411d56c76603463a7727..e2a50bf2234b9d89de0fc6c09d5563f118f7a8d1 100644 (file)
--- a/drivers/crypto/hisilicon/sec/sec_drv.h
+++ b/drivers/crypto/hisilicon/sec/sec_drv.h
@@ -347,7 +347,7 @@ struct sec_queue {
        DECLARE_BITMAP(unprocessed, SEC_QUEUE_LEN);
        DECLARE_KFIFO_PTR(softqueue, typeof(struct sec_request_el *));
        bool havesoftqueue;
-       struct mutex queuelock;
+       spinlock_t queuelock;
        void *shadow[SEC_QUEUE_LEN];
 };