Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725d21c4 authored by Gao Xiang's avatar Gao Xiang Committed by Gao Xiang
Browse files

erofs: adjust per-CPU buffers according to max_pclusterblks 

Adjust per-CPU buffers on demand since big pcluster definition is
available. Also, bail out unsupported pcluster size according to
Z_EROFS_PCLUSTER_MAX_SIZE.

Link: https://lore.kernel.org/r/20210407043927.10623-7-xiang@kernel.org


Acked-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarGao Xiang <hsiangkao@redhat.com>
parent 850be2e6

fs/erofs/decompressor.c

+16 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ int z_erofs_load_lz4_config(struct super_block *sb, 
			    struct erofs_super_block *dsb,

			    struct z_erofs_lz4_cfgs *lz4, int size)

{

	struct erofs_sb_info *sbi = EROFS_SB(sb);

	u16 distance;



	if (lz4) {
@@ -39,16 +40,27 @@ int z_erofs_load_lz4_config(struct super_block *sb, 
			return -EINVAL;

		}

		distance = le16_to_cpu(lz4->max_distance);



		sbi->lz4.max_pclusterblks = le16_to_cpu(lz4->max_pclusterblks);

		if (!sbi->lz4.max_pclusterblks) {

			sbi->lz4.max_pclusterblks = 1;	/* reserved case */

		} else if (sbi->lz4.max_pclusterblks >

			   Z_EROFS_PCLUSTER_MAX_SIZE / EROFS_BLKSIZ) {

			erofs_err(sb, "too large lz4 pclusterblks %u",

				  sbi->lz4.max_pclusterblks);

			return -EINVAL;

		} else if (sbi->lz4.max_pclusterblks >= 2) {

			erofs_info(sb, "EXPERIMENTAL big pcluster feature in use. Use at your own risk!");

		}

	} else {

		distance = le16_to_cpu(dsb->u1.lz4_max_distance);

		sbi->lz4.max_pclusterblks = 1;

	}



	EROFS_SB(sb)->lz4.max_distance_pages = distance ?

	sbi->lz4.max_distance_pages = distance ?

					DIV_ROUND_UP(distance, PAGE_SIZE) + 1 :

					LZ4_MAX_DISTANCE_PAGES;



	/* TODO: use max pclusterblks after bigpcluster is enabled */

	return erofs_pcpubuf_growsize(1);

	return erofs_pcpubuf_growsize(sbi->lz4.max_pclusterblks);

}



static int z_erofs_lz4_prepare_destpages(struct z_erofs_decompress_req *rq,

fs/erofs/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ typedef u32 erofs_blk_t; 
struct erofs_sb_lz4_info {

	/* # of pages needed for EROFS lz4 rolling decompression */

	u16 max_distance_pages;

	/* maximum possible blocks for pclusters in the filesystem */

	u16 max_pclusterblks;

};



struct erofs_sb_info {