Commit 1bbb19b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'erofs-for-6.8-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs 

Pull erofs fixes from Gao Xiang:

 - fix an infinite loop issue of sub-page compressed data support found
   with lengthy stress tests on a 64k-page arm64 VM

 - optimize the temporary buffer allocation for low-memory scenarios,
   which can reduce 20.21% on average under a heavy multi-app launch
   benchmark workload

 - get rid of unnecessary GFP_NOFS

* tag 'erofs-for-6.8-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  erofs: relaxed temporary buffers allocation on readahead
  erofs: fix infinite loop due to a race of filling compressed_bvecs
  erofs: get rid of unneeded GFP_NOFS
parents 2a6526c4 d9281660

fs/erofs/compress.h

+2 −3
Original line number Diff line number Diff line
@@ -11,13 +11,12 @@ 
struct z_erofs_decompress_req {

	struct super_block *sb;

	struct page **in, **out;



	unsigned short pageofs_in, pageofs_out;

	unsigned int inputsize, outputsize;



	/* indicate the algorithm will be used for decompression */

	unsigned int alg;

	unsigned int alg;       /* the algorithm for decompression */

	bool inplace_io, partial_decoding, fillgaps;

	gfp_t gfp;      /* allocation flags for extra temporary buffers */

};



struct z_erofs_decompressor {

fs/erofs/decompressor.c

+3 −2
Original line number Diff line number Diff line
@@ -111,8 +111,9 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx, 
			victim = availables[--top];

			get_page(victim);

		} else {

			victim = erofs_allocpage(pagepool,

						 GFP_KERNEL | __GFP_NOFAIL);

			victim = erofs_allocpage(pagepool, rq->gfp);

			if (!victim)

				return -ENOMEM;

			set_page_private(victim, Z_EROFS_SHORTLIVED_PAGE);

		}

		rq->out[i] = victim;

fs/erofs/decompressor_deflate.c

+13 −6
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int z_erofs_load_deflate_config(struct super_block *sb, 
}



int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,

			       struct page **pagepool)

			       struct page **pgpl)

{

	const unsigned int nrpages_out =

		PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
@@ -158,8 +158,12 @@ int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq, 
			strm->z.avail_out = min_t(u32, outsz, PAGE_SIZE - pofs);

			outsz -= strm->z.avail_out;

			if (!rq->out[no]) {

				rq->out[no] = erofs_allocpage(pagepool,

						GFP_KERNEL | __GFP_NOFAIL);

				rq->out[no] = erofs_allocpage(pgpl, rq->gfp);

				if (!rq->out[no]) {

					kout = NULL;

					err = -ENOMEM;

					break;

				}

				set_page_private(rq->out[no],

						 Z_EROFS_SHORTLIVED_PAGE);

			}
@@ -211,8 +215,11 @@ int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq, 


			DBG_BUGON(erofs_page_is_managed(EROFS_SB(sb),

							rq->in[j]));

			tmppage = erofs_allocpage(pagepool,

						  GFP_KERNEL | __GFP_NOFAIL);

			tmppage = erofs_allocpage(pgpl, rq->gfp);

			if (!tmppage) {

				err = -ENOMEM;

				goto failed;

			}

			set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);

			copy_highpage(tmppage, rq->in[j]);

			rq->in[j] = tmppage;
@@ -230,7 +237,7 @@ int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq, 
			break;

		}

	}



failed:

	if (zlib_inflateEnd(&strm->z) != Z_OK && !err)

		err = -EIO;

	if (kout)

fs/erofs/decompressor_lzma.c

+12 −5
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int z_erofs_load_lzma_config(struct super_block *sb, 
}



int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,

			    struct page **pagepool)

			    struct page **pgpl)

{

	const unsigned int nrpages_out =

		PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
@@ -215,8 +215,11 @@ int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq, 
						   PAGE_SIZE - pageofs);

			outlen -= strm->buf.out_size;

			if (!rq->out[no] && rq->fillgaps) {	/* deduped */

				rq->out[no] = erofs_allocpage(pagepool,

						GFP_KERNEL | __GFP_NOFAIL);

				rq->out[no] = erofs_allocpage(pgpl, rq->gfp);

				if (!rq->out[no]) {

					err = -ENOMEM;

					break;

				}

				set_page_private(rq->out[no],

						 Z_EROFS_SHORTLIVED_PAGE);

			}
@@ -258,8 +261,11 @@ int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq, 


			DBG_BUGON(erofs_page_is_managed(EROFS_SB(rq->sb),

							rq->in[j]));

			tmppage = erofs_allocpage(pagepool,

						  GFP_KERNEL | __GFP_NOFAIL);

			tmppage = erofs_allocpage(pgpl, rq->gfp);

			if (!tmppage) {

				err = -ENOMEM;

				goto failed;

			}

			set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);

			copy_highpage(tmppage, rq->in[j]);

			rq->in[j] = tmppage;
@@ -277,6 +283,7 @@ int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq, 
			break;

		}

	}

failed:

	if (no < nrpages_out && strm->buf.out)

		kunmap(rq->out[no]);

	if (ni < nrpages_in)

fs/erofs/fscache.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static struct erofs_fscache *erofs_fscache_acquire_cookie(struct super_block *sb 


	inode->i_size = OFFSET_MAX;

	inode->i_mapping->a_ops = &erofs_fscache_meta_aops;

	mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);

	mapping_set_gfp_mask(inode->i_mapping, GFP_KERNEL);

	inode->i_blkbits = EROFS_SB(sb)->blkszbits;

	inode->i_private = ctx;