Unverified Commit f1e6c574 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4930 erofs: fix lz4 inplace decompression 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2HKG5FIB6BO2MZCIDKIYFQNH6BFGOKVM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I956BV 
 
Link:https://gitee.com/openeuler/kernel/pulls/4930

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents f44547cb cec85eb3

fs/erofs/decompressor.c

+16 −15
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx, 
}



static void *z_erofs_lz4_handle_overlap(struct z_erofs_lz4_decompress_ctx *ctx,

			void *inpage, unsigned int *inputmargin, int *maptype,

			bool may_inplace)

			void *inpage, void *out, unsigned int *inputmargin,

			int *maptype, bool may_inplace)

{

	struct z_erofs_decompress_req *rq = ctx->rq;

	unsigned int omargin, total, i, j;

	unsigned int omargin, total, i;

	struct page **in;

	void *src, *tmp;
@@ -136,12 +136,13 @@ static void *z_erofs_lz4_handle_overlap(struct z_erofs_lz4_decompress_ctx *ctx, 
		    omargin < LZ4_DECOMPRESS_INPLACE_MARGIN(rq->inputsize))

			goto docopy;



		for (i = 0; i < ctx->inpages; ++i) {

			DBG_BUGON(rq->in[i] == NULL);

			for (j = 0; j < ctx->outpages - ctx->inpages + i; ++j)

				if (rq->out[j] == rq->in[i])

		for (i = 0; i < ctx->inpages; ++i)

			if (rq->out[ctx->outpages - ctx->inpages + i] !=

			    rq->in[i])

				goto docopy;

		}

		kunmap_local(inpage);

		*maptype = 3;

		return out + ((ctx->outpages - ctx->inpages) << PAGE_SHIFT);

	}



	if (ctx->inpages <= 1) {
@@ -149,7 +150,6 @@ static void *z_erofs_lz4_handle_overlap(struct z_erofs_lz4_decompress_ctx *ctx, 
		return inpage;

	}

	kunmap_local(inpage);

	might_sleep();

	src = erofs_vm_map_ram(rq->in, ctx->inpages);

	if (!src)

		return ERR_PTR(-ENOMEM);
@@ -205,12 +205,12 @@ int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf, 
}



static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx,

				      u8 *out)

				      u8 *dst)

{

	struct z_erofs_decompress_req *rq = ctx->rq;

	bool support_0padding = false, may_inplace = false;

	unsigned int inputmargin;

	u8 *headpage, *src;

	u8 *out, *headpage, *src;

	int ret, maptype;



	DBG_BUGON(*rq->in == NULL);
@@ -231,11 +231,12 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx, 
	}



	inputmargin = rq->pageofs_in;

	src = z_erofs_lz4_handle_overlap(ctx, headpage, &inputmargin,

	src = z_erofs_lz4_handle_overlap(ctx, headpage, dst, &inputmargin,

					 &maptype, may_inplace);

	if (IS_ERR(src))

		return PTR_ERR(src);



	out = dst + rq->pageofs_out;

	/* legacy format could compress extra data in a pcluster. */

	if (rq->partial_decoding || !support_0padding)

		ret = LZ4_decompress_safe_partial(src + inputmargin, out,
@@ -266,7 +267,7 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx, 
		vm_unmap_ram(src, ctx->inpages);

	} else if (maptype == 2) {

		erofs_put_pcpubuf(src);

	} else {

	} else if (maptype != 3) {

		DBG_BUGON(1);

		return -EFAULT;

	}
@@ -309,7 +310,7 @@ static int z_erofs_lz4_decompress(struct z_erofs_decompress_req *rq, 
	}



dstmap_out:

	ret = z_erofs_lz4_decompress_mem(&ctx, dst + rq->pageofs_out);

	ret = z_erofs_lz4_decompress_mem(&ctx, dst);

	if (!dst_maptype)

		kunmap_local(dst);

	else if (dst_maptype == 2)