Commit 3b266a52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull iomap updates from Darrick Wong:
 "In this release, we hoisted as much of XFS' writeback code into iomap
  as was practicable, refactored the unshare file data function, added
  the ability to perform buffered io copy on write, and tweaked various
  parts of the directio implementation as needed to port ext4's directio
  code (that will be a separate pull).

  Summary:

   - Make iomap_dio_rw callers explicitly tell us if they want us to
     wait

   - Port the xfs writeback code to iomap to complete the buffered io
     library functions

   - Refactor the unshare code to share common pieces

   - Add support for performing copy on write with buffered writes

   - Other minor fixes

   - Fix unchecked return in iomap_bmap

   - Fix a type casting bug in a ternary statement in
     iomap_dio_bio_actor

   - Improve tracepoints for easier diagnostic ability

   - Fix pipe page leakage in directio reads"

* tag 'iomap-5.5-merge-11' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (31 commits)
  iomap: Fix pipe page leakage during splicing
  iomap: trace iomap_appply results
  iomap: fix return value of iomap_dio_bio_actor on 32bit systems
  iomap: iomap_bmap should check iomap_apply return value
  iomap: Fix overflow in iomap_page_mkwrite
  fs/iomap: remove redundant check in iomap_dio_rw()
  iomap: use a srcmap for a read-modify-write I/O
  iomap: renumber IOMAP_HOLE to 0
  iomap: use write_begin to read pages to unshare
  iomap: move the zeroing case out of iomap_read_page_sync
  iomap: ignore non-shared or non-data blocks in xfs_file_dirty
  iomap: always use AOP_FLAG_NOFS in iomap_write_begin
  iomap: remove the unused iomap argument to __iomap_write_end
  iomap: better document the IOMAP_F_* flags
  iomap: enhance writeback error message
  iomap: pass a struct page to iomap_finish_page_writeback
  iomap: cleanup iomap_ioend_compare
  iomap: move struct iomap_page out of iomap.h
  iomap: warn on inline maps in iomap_writepage_map
  iomap: lift the xfs writeback code to iomap
  ...
parents aa32f116 419e9c38

fs/dax.c

+8 −5
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ EXPORT_SYMBOL_GPL(__dax_zero_page_range); 


static loff_t

dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,

		struct iomap *iomap)

		struct iomap *iomap, struct iomap *srcmap)

{

	struct block_device *bdev = iomap->bdev;

	struct dax_device *dax_dev = iomap->dax_dev;
@@ -1248,7 +1248,8 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	struct inode *inode = mapping->host;

	unsigned long vaddr = vmf->address;

	loff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT;

	struct iomap iomap = { 0 };

	struct iomap iomap = { .type = IOMAP_HOLE };

	struct iomap srcmap = { .type = IOMAP_HOLE };

	unsigned flags = IOMAP_FAULT;

	int error, major = 0;

	bool write = vmf->flags & FAULT_FLAG_WRITE;
@@ -1293,7 +1294,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	 * the file system block size to be equal the page size, which means

	 * that we never have to deal with more than a single extent here.

	 */

	error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap);

	error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap, &srcmap);

	if (iomap_errp)

		*iomap_errp = error;

	if (error) {
@@ -1472,7 +1473,8 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	unsigned int iomap_flags = (write ? IOMAP_WRITE : 0) | IOMAP_FAULT;

	struct inode *inode = mapping->host;

	vm_fault_t result = VM_FAULT_FALLBACK;

	struct iomap iomap = { 0 };

	struct iomap iomap = { .type = IOMAP_HOLE };

	struct iomap srcmap = { .type = IOMAP_HOLE };

	pgoff_t max_pgoff;

	void *entry;

	loff_t pos;
@@ -1547,7 +1549,8 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	 * to look up our filesystem block.

	 */

	pos = (loff_t)xas.xa_index << PAGE_SHIFT;

	error = ops->iomap_begin(inode, pos, PMD_SIZE, iomap_flags, &iomap);

	error = ops->iomap_begin(inode, pos, PMD_SIZE, iomap_flags, &iomap,

			&srcmap);

	if (error)

		goto unlock_entry;

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ int ext2_get_block(struct inode *inode, sector_t iblock, 


#ifdef CONFIG_FS_DAX

static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,

		unsigned flags, struct iomap *iomap)

		unsigned flags, struct iomap *iomap, struct iomap *srcmap)

{

	unsigned int blkbits = inode->i_blkbits;

	unsigned long first_block = offset >> blkbits;

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3407,7 +3407,7 @@ static bool ext4_inode_datasync_dirty(struct inode *inode) 
}



static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,

			    unsigned flags, struct iomap *iomap)

		unsigned flags, struct iomap *iomap, struct iomap *srcmap)

{

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	unsigned int blkbits = inode->i_blkbits;

fs/gfs2/bmap.c

+2 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,8 @@ static inline bool gfs2_iomap_need_write_lock(unsigned flags) 
}



static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,

			    unsigned flags, struct iomap *iomap)

			    unsigned flags, struct iomap *iomap,

			    struct iomap *srcmap)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct metapath mp = { .mp_aheight = 1, };

fs/gfs2/file.c

+4 −2
Original line number Diff line number Diff line
@@ -732,7 +732,8 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to) 
	if (ret)

		goto out_uninit;



	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL);

	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));



	gfs2_glock_dq(&gh);

out_uninit:
@@ -767,7 +768,8 @@ static ssize_t gfs2_file_direct_write(struct kiocb *iocb, struct iov_iter *from) 
	if (offset + len > i_size_read(&ip->i_inode))

		goto out;



	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL);

	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));



out:

	gfs2_glock_dq(&gh);

CRA Git | Maintained and supported by SUSTech CRA and CCSE