Commit ddd0855f authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: deflate - Make the acomp walk atomic 



Add an atomic flag to the acomp walk and use that in deflate.
Due to the use of a per-cpu context, it is impossible to sleep
during the walk in deflate.

Reported-by: default avatarkernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202504151654.4c3b6393-lkp@intel.com


Fixes: 08cabc7d ("crypto: deflate - Convert to acomp")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2f5f3cd0

crypto/acompress.c

+2 −2
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ int acomp_walk_next_dst(struct acomp_walk *walk) 
EXPORT_SYMBOL_GPL(acomp_walk_next_dst);



int acomp_walk_virt(struct acomp_walk *__restrict walk,

		    struct acomp_req *__restrict req)

		    struct acomp_req *__restrict req, bool atomic)

{

	struct scatterlist *src = req->src;

	struct scatterlist *dst = req->dst;
@@ -548,7 +548,7 @@ int acomp_walk_virt(struct acomp_walk *__restrict walk, 
		return -EINVAL;



	walk->flags = 0;

	if ((req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP))

	if ((req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) && !atomic)

		walk->flags |= ACOMP_WALK_SLEEP;

	if ((req->base.flags & CRYPTO_ACOMP_REQ_SRC_VIRT))

		walk->flags |= ACOMP_WALK_SRC_LINEAR;

crypto/deflate.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int deflate_compress_one(struct acomp_req *req, 
	struct acomp_walk walk;

	int ret;



	ret = acomp_walk_virt(&walk, req);

	ret = acomp_walk_virt(&walk, req, true);

	if (ret)

		return ret;
@@ -140,7 +140,7 @@ static int deflate_decompress_one(struct acomp_req *req, 
	struct acomp_walk walk;

	int ret;



	ret = acomp_walk_virt(&walk, req);

	ret = acomp_walk_virt(&walk, req, true);

	if (ret)

		return ret;

include/crypto/internal/acompress.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ void acomp_walk_done_dst(struct acomp_walk *walk, int used); 
int acomp_walk_next_src(struct acomp_walk *walk);

int acomp_walk_next_dst(struct acomp_walk *walk);

int acomp_walk_virt(struct acomp_walk *__restrict walk,

		    struct acomp_req *__restrict req);

		    struct acomp_req *__restrict req, bool atomic);



static inline bool acomp_walk_more_src(const struct acomp_walk *walk, int cur)

{