lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 153/599] crypto: sun8i-ce - call finalize with bh disabled
    Date
    From: Corentin Labbe <clabbe@baylibre.com>

    [ Upstream commit f75a749b6d78aeae2ce90e14fcc4b7b3ba46126d ]

    Doing ipsec produces a spinlock recursion warning.
    This is due to not disabling BH during crypto completion function.

    Fixes: 06f751b61329 ("crypto: allwinner - Add sun8i-ce Crypto Engine")
    Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 3 +++
    drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 3 +++
    2 files changed, 6 insertions(+)

    diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
    index 33707a2e55ff..64133d4da3d5 100644
    --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
    +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
    @@ -11,6 +11,7 @@
    * You could find a link for the datasheet in Documentation/arm/sunxi.rst
    */

    +#include <linux/bottom_half.h>
    #include <linux/crypto.h>
    #include <linux/dma-mapping.h>
    #include <linux/io.h>
    @@ -280,7 +281,9 @@ static int sun8i_ce_cipher_run(struct crypto_engine *engine, void *areq)

    flow = rctx->flow;
    err = sun8i_ce_run_task(ce, flow, crypto_tfm_alg_name(breq->base.tfm));
    + local_bh_disable();
    crypto_finalize_skcipher_request(engine, breq, err);
    + local_bh_enable();
    return 0;
    }

    diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
    index 4c5a2c11d714..62c07a724d40 100644
    --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
    +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
    @@ -9,6 +9,7 @@
    *
    * You could find the datasheet in Documentation/arm/sunxi.rst
    */
    +#include <linux/bottom_half.h>
    #include <linux/dma-mapping.h>
    #include <linux/pm_runtime.h>
    #include <linux/scatterlist.h>
    @@ -412,6 +413,8 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
    theend:
    kfree(buf);
    kfree(result);
    + local_bh_disable();
    crypto_finalize_hash_request(engine, breq, err);
    + local_bh_enable();
    return 0;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-06 02:37    [W:4.106 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site