Commit e88745dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'erofs-for-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs 

Pull erofs updates from Gao Xiang:
 "First of all, we'd like to add Yue Hu and Jeffle Xu as two new
  reviewers. Thank them for spending time working on EROFS!

  There is no major feature outstanding in this cycle, mainly a patchset
  I worked on to prepare for rolling hash deduplication and folios for
  compressed data as the next big features. It kills the unneeded
  PG_error flag dependency as well.

  Apart from that, there are bugfixes and cleanups as always. Details
  are listed below:

   - Add Yue Hu and Jeffle Xu as reviewers

   - Add the missing wake_up when updating lzma streams

   - Avoid consecutive detection for Highmem memory

   - Prepare for multi-reference pclusters and get rid of PG_error

   - Fix ctx->pos update for NFS export

   - minor cleanups"

* tag 'erofs-for-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs: (23 commits)
  erofs: update ctx->pos for every emitted dirent
  erofs: get rid of the leftover PAGE_SIZE in dir.c
  erofs: get rid of erofs_prepare_dio() helper
  erofs: introduce multi-reference pclusters (fully-referenced)
  erofs: record the longest decompressed size in this round
  erofs: introduce z_erofs_do_decompressed_bvec()
  erofs: try to leave (de)compressed_pages on stack if possible
  erofs: introduce struct z_erofs_decompress_backend
  erofs: get rid of `z_pagemap_global'
  erofs: clean up `enum z_erofs_collectmode'
  erofs: get rid of `enum z_erofs_page_type'
  erofs: rework online page handling
  erofs: switch compressed_pages[] to bufvec
  erofs: introduce `z_erofs_parse_in_bvecs'
  erofs: drop the old pagevec approach
  erofs: introduce bufvec to store decompressed buffers
  erofs: introduce `z_erofs_parse_out_bvecs()'
  erofs: clean up z_erofs_collector_begin()
  erofs: get rid of unneeded `inode', `map' and `sb'
  erofs: avoid consecutive detection for Highmem memory
  ...
parents bec14d79 ecce9212

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7485,6 +7485,8 @@ F: include/video/s1d13xxxfb.h 
EROFS FILE SYSTEM

M:	Gao Xiang <xiang@kernel.org>

M:	Chao Yu <chao@kernel.org>

R:	Yue Hu <huyue2@coolpad.com>

R:	Jeffle Xu <jefflexu@linux.alibaba.com>

L:	linux-erofs@lists.ozlabs.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git

fs/erofs/compress.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct z_erofs_decompress_req { 


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

	unsigned int alg;

	bool inplace_io, partial_decoding;

	bool inplace_io, partial_decoding, fillgaps;

};



struct z_erofs_decompressor {

fs/erofs/data.c

+15 −24
Original line number Diff line number Diff line
@@ -366,42 +366,33 @@ static sector_t erofs_bmap(struct address_space *mapping, sector_t block) 
	return iomap_bmap(mapping, block, &erofs_iomap_ops);

}



static int erofs_prepare_dio(struct kiocb *iocb, struct iov_iter *to)

static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)

{

	struct inode *inode = file_inode(iocb->ki_filp);

	loff_t align = iocb->ki_pos | iov_iter_count(to) |

		iov_iter_alignment(to);

	struct block_device *bdev = inode->i_sb->s_bdev;

	unsigned int blksize_mask;



	if (bdev)

		blksize_mask = (1 << ilog2(bdev_logical_block_size(bdev))) - 1;

	else

		blksize_mask = (1 << inode->i_blkbits) - 1;



	if (align & blksize_mask)

		return -EINVAL;

	return 0;

}



static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)

{

	/* no need taking (shared) inode lock since it's a ro filesystem */

	if (!iov_iter_count(to))

		return 0;



#ifdef CONFIG_FS_DAX

	if (IS_DAX(iocb->ki_filp->f_mapping->host))

	if (IS_DAX(inode))

		return dax_iomap_rw(iocb, to, &erofs_iomap_ops);

#endif

	if (iocb->ki_flags & IOCB_DIRECT) {

		int err = erofs_prepare_dio(iocb, to);

		struct block_device *bdev = inode->i_sb->s_bdev;

		unsigned int blksize_mask;



		if (bdev)

			blksize_mask = bdev_logical_block_size(bdev) - 1;

		else

			blksize_mask = (1 << inode->i_blkbits) - 1;



		if ((iocb->ki_pos | iov_iter_count(to) |

		     iov_iter_alignment(to)) & blksize_mask)

			return -EINVAL;



		if (!err)

		return iomap_dio_rw(iocb, to, &erofs_iomap_ops,

				    NULL, 0, NULL, 0);

		if (err < 0)

			return err;

	}

	return filemap_read(iocb, to, 0);

}

fs/erofs/decompressor.c

+11 −7
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx, 
			j = 0;



		/* 'valid' bounced can only be tested after a complete round */

		if (test_bit(j, bounced)) {

		if (!rq->fillgaps && test_bit(j, bounced)) {

			DBG_BUGON(i < lz4_max_distance_pages);

			DBG_BUGON(top >= lz4_max_distance_pages);

			availables[top++] = rq->out[i - lz4_max_distance_pages];
@@ -91,14 +91,18 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx, 


		if (page) {

			__clear_bit(j, bounced);

			if (kaddr) {

				if (kaddr + PAGE_SIZE == page_address(page))

					kaddr += PAGE_SIZE;

				else

					kaddr = NULL;

			} else if (!i) {

			if (!PageHighMem(page)) {

				if (!i) {

					kaddr = page_address(page);

					continue;

				}

				if (kaddr &&

				    kaddr + PAGE_SIZE == page_address(page)) {

					kaddr += PAGE_SIZE;

					continue;

				}

			}

			kaddr = NULL;

			continue;

		}

		kaddr = NULL;

fs/erofs/decompressor_lzma.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ int z_erofs_load_lzma_config(struct super_block *sb, 
	DBG_BUGON(z_erofs_lzma_head);

	z_erofs_lzma_head = head;

	spin_unlock(&z_erofs_lzma_lock);

	wake_up_all(&z_erofs_lzma_wq);



	z_erofs_lzma_max_dictsize = dict_size;

	mutex_unlock(&lzma_resize_mutex);