Commit 0ee7c3e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iomap-5.15-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull iomap updates from Darrick Wong:
 "The most notable externally visible change for this cycle is the
  addition of support for reads to inline tail fragments of files, which
  was requested by the erofs developers; and a correction for a kernel
  memory corruption bug if the sysadmin tries to activate a swapfile
  with more pages than the swapfile header suggests.

  We also now report writeback completion errors to the file mapping
  correctly, instead of munging all errors into EIO.

  Internally, the bulk of the changes are Christoph's patchset to reduce
  the indirect function call count by a third to a half by converting
  iomap iteration from a loop pattern to a generator/consumer pattern.
  As an added bonus, fsdax no longer open-codes iomap apply loops.

  Summary:

   - Simplify the bio_end_page usage in the buffered IO code.

   - Support reading inline data at nonzero offsets for erofs.

   - Fix some typos and bad grammar.

   - Convert kmap_atomic usage in the inline data read path.

   - Add some extra inline data input checking.

   - Fix a memory corruption bug stemming from iomap_swapfile_activate
     trying to activate more pages than mm was expecting.

   - Pass errnos through the page writeback code so that writeback
     errors are reported correctly instead of being munged to EIO.

   - Replace iomap_apply with a open-coded iterator loops to reduce the
     number of indirect calls by a third to a half.

   - Refactor the fsdax code to use iomap iterators instead of the
     open-coded iomap_apply code that it had before.

   - Format file range iomap tracepoint data in hexadecimal and
     standardize the names used in the pretty-print string"

* tag 'iomap-5.15-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (41 commits)
  iomap: standardize tracepoint formatting and storage
  mm/swap: consider max pages in iomap_swapfile_add_extent
  iomap: move loop control code to iter.c
  iomap: constify iomap_iter_srcmap
  fsdax: switch the fault handlers to use iomap_iter
  fsdax: factor out a dax_fault_actor() helper
  fsdax: factor out helpers to simplify the dax fault code
  iomap: rework unshare flag
  iomap: pass an iomap_iter to various buffered I/O helpers
  iomap: remove iomap_apply
  fsdax: switch dax_iomap_rw to use iomap_iter
  iomap: switch iomap_swapfile_activate to use iomap_iter
  iomap: switch iomap_seek_data to use iomap_iter
  iomap: switch iomap_seek_hole to use iomap_iter
  iomap: switch iomap_bmap to use iomap_iter
  iomap: switch iomap_fiemap to use iomap_iter
  iomap: switch __iomap_dio_rw to use iomap_iter
  iomap: switch iomap_page_mkwrite to use iomap_iter
  iomap: switch iomap_zero_range to use iomap_iter
  iomap: switch iomap_file_unshare to use iomap_iter
  ...
parents 916d636e 03b8df8d

fs/btrfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -8247,9 +8247,10 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio, 
	return dip;

}



static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap,

static blk_qc_t btrfs_submit_direct(const struct iomap_iter *iter,

		struct bio *dio_bio, loff_t file_offset)

{

	struct inode *inode = iter->inode;

	const bool write = (btrfs_op(dio_bio) == BTRFS_MAP_WRITE);

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	const bool raid56 = (btrfs_data_alloc_profile(fs_info) &
@@ -8265,7 +8266,7 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap, 
	int ret;

	blk_status_t status;

	struct btrfs_io_geometry geom;

	struct btrfs_dio_data *dio_data = iomap->private;

	struct btrfs_dio_data *dio_data = iter->iomap.private;

	struct extent_map *em = NULL;



	dip = btrfs_create_dio_private(dio_bio, inode, file_offset);

fs/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1912,7 +1912,7 @@ EXPORT_SYMBOL(page_zero_new_buffers); 


static void

iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh,

		struct iomap *iomap)

		const struct iomap *iomap)

{

	loff_t offset = block << inode->i_blkbits;
@@ -1966,7 +1966,7 @@ iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh, 
}



int __block_write_begin_int(struct page *page, loff_t pos, unsigned len,

		get_block_t *get_block, struct iomap *iomap)

		get_block_t *get_block, const struct iomap *iomap)

{

	unsigned from = pos & (PAGE_SIZE - 1);

	unsigned to = from + len;

fs/dax.c

+275 −303

File changed.

Preview size limit exceeded, changes collapsed.

fs/gfs2/bmap.c

+2 −3
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static void gfs2_write_unlock(struct inode *inode) 
}



static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos,

				   unsigned len, struct iomap *iomap)

				   unsigned len)

{

	unsigned int blockmask = i_blocksize(inode) - 1;

	struct gfs2_sbd *sdp = GFS2_SB(inode);
@@ -1013,8 +1013,7 @@ static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, 
}



static void gfs2_iomap_page_done(struct inode *inode, loff_t pos,

				 unsigned copied, struct page *page,

				 struct iomap *iomap)

				 unsigned copied, struct page *page)

{

	struct gfs2_trans *tr = current->journal_info;

	struct gfs2_inode *ip = GFS2_I(inode);

fs/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ static inline int emergency_thaw_bdev(struct super_block *sb) 
/*

 * buffer.c

 */

extern int __block_write_begin_int(struct page *page, loff_t pos, unsigned len,

		get_block_t *get_block, struct iomap *iomap);

int __block_write_begin_int(struct page *page, loff_t pos, unsigned len,

		get_block_t *get_block, const struct iomap *iomap);



/*

 * char_dev.c