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

Unverified Commit 91041fcd authored by Gao Xiang's avatar Gao Xiang Committed by Sebastiano Barezzi
Browse files

erofs: fix compact 4B support for 16k block size 



commit 001b8ccd0650727e54ec16ef72bf1b8eeab7168e upstream.

In compact 4B, two adjacent lclusters are packed together as a unit to
form on-disk indexes for effective random access, as below:

(amortized = 4, vcnt = 2)
       _____________________________________________
      |___@_____ encoded bits __________|_ blkaddr _|
      0        .                                    amortized * vcnt = 8
      .             .
      .                  .              amortized * vcnt - 4 = 4
      .                        .
      .____________________________.
      |_type (2 bits)_|_clusterofs_|

Therefore, encoded bits for each pack are 32 bits (4 bytes). IOWs,
since each lcluster can get 16 bits for its type and clusterofs, the
maximum supported lclustersize for compact 4B format is 16k (14 bits).

Fix this to enable compact 4B format for 16k lclusters (blocks), which
is tested on an arm64 server with 16k page size.

Fixes: 152a333a5895 ("staging: erofs: add compacted compression indexes support")
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20230601112341.56960-1-hsiangkao@linux.alibaba.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: If1c45681c60f6897bb9d83662e379951084b7a32
parent 786f883c

fs/erofs/zmap.c

+1 −5
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int unpack_compacted_index(struct z_erofs_maprecorder *m, 
	u8 *in, type;

	bool big_pcluster;



	if (1 << amortizedshift == 4)

	if (1 << amortizedshift == 4 && lclusterbits <= 14)

		vcnt = 2;

	else if (1 << amortizedshift == 2 && lclusterbits == 12)

		vcnt = 16;
@@ -321,7 +321,6 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, 
{

	struct inode *const inode = m->inode;

	struct erofs_inode *const vi = EROFS_I(inode);

	const unsigned int lclusterbits = vi->z_logical_clusterbits;

	const erofs_off_t ebase = ALIGN(iloc(EROFS_I_SB(inode), vi->nid) +

					vi->inode_isize + vi->xattr_isize, 8) +

		sizeof(struct z_erofs_map_header);
@@ -331,9 +330,6 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, 
	erofs_off_t pos;

	int err;



	if (lclusterbits != 12)

		return -EOPNOTSUPP;



	if (lcn >= totalidx)

		return -EINVAL;