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

Commit 02fbd139 authored by Jan Kara's avatar Jan Kara Committed by Vishal Verma
Browse files

dax: Remove complete_unwritten argument 



Fault handlers currently take complete_unwritten argument to convert
unwritten extents after PTEs are updated. However no filesystem uses
this anymore as the code is racy. Remove the unused argument.

Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarVishal Verma <vishal.l.verma@intel.com>
parent e4b27491

fs/block_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -1746,7 +1746,7 @@ static const struct address_space_operations def_blk_aops = { 
 */

static int blkdev_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	return __dax_fault(vma, vmf, blkdev_get_block, NULL);

	return __dax_fault(vma, vmf, blkdev_get_block);

}



static int blkdev_dax_pfn_mkwrite(struct vm_area_struct *vma,
@@ -1758,7 +1758,7 @@ static int blkdev_dax_pfn_mkwrite(struct vm_area_struct *vma, 
static int blkdev_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,

		pmd_t *pmd, unsigned int flags)

{

	return __dax_pmd_fault(vma, addr, pmd, flags, blkdev_get_block, NULL);

	return __dax_pmd_fault(vma, addr, pmd, flags, blkdev_get_block);

}



static const struct vm_operations_struct blkdev_dax_vm_ops = {

fs/dax.c

+9 −34
Original line number Diff line number Diff line
@@ -612,19 +612,13 @@ static int dax_insert_mapping(struct inode *inode, struct buffer_head *bh, 
 * @vma: The virtual memory area where the fault occurred

 * @vmf: The description of the fault

 * @get_block: The filesystem method used to translate file offsets to blocks

 * @complete_unwritten: The filesystem method used to convert unwritten blocks

 *	to written so the data written to them is exposed. This is required for

 *	required by write faults for filesystems that will return unwritten

 *	extent mappings from @get_block, but it is optional for reads as

 *	dax_insert_mapping() will always zero unwritten blocks. If the fs does

 *	not support unwritten extents, the it should pass NULL.

 *

 * When a page fault occurs, filesystems may call this helper in their

 * fault handler for DAX files. __dax_fault() assumes the caller has done all

 * the necessary locking for the page fault to proceed successfully.

 */

int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf,

			get_block_t get_block, dax_iodone_t complete_unwritten)

			get_block_t get_block)

{

	struct file *file = vma->vm_file;

	struct address_space *mapping = file->f_mapping;
@@ -727,23 +721,9 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, 
		page = NULL;

	}



	/*

	 * If we successfully insert the new mapping over an unwritten extent,

	 * we need to ensure we convert the unwritten extent. If there is an

	 * error inserting the mapping, the filesystem needs to leave it as

	 * unwritten to prevent exposure of the stale underlying data to

	 * userspace, but we still need to call the completion function so

	 * the private resources on the mapping buffer can be released. We

	 * indicate what the callback should do via the uptodate variable, same

	 * as for normal BH based IO completions.

	 */

	/* Filesystem should not return unwritten buffers to us! */

	WARN_ON_ONCE(buffer_unwritten(&bh));

	error = dax_insert_mapping(inode, &bh, vma, vmf);

	if (buffer_unwritten(&bh)) {

		if (complete_unwritten)

			complete_unwritten(&bh, !error);

		else

			WARN_ON_ONCE(!(vmf->flags & FAULT_FLAG_WRITE));

	}



 out:

	if (error == -ENOMEM)
@@ -772,7 +752,7 @@ EXPORT_SYMBOL(__dax_fault); 
 * fault handler for DAX files.

 */

int dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf,

	      get_block_t get_block, dax_iodone_t complete_unwritten)

	      get_block_t get_block)

{

	int result;

	struct super_block *sb = file_inode(vma->vm_file)->i_sb;
@@ -781,7 +761,7 @@ int dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, 
		sb_start_pagefault(sb);

		file_update_time(vma->vm_file);

	}

	result = __dax_fault(vma, vmf, get_block, complete_unwritten);

	result = __dax_fault(vma, vmf, get_block);

	if (vmf->flags & FAULT_FLAG_WRITE)

		sb_end_pagefault(sb);
@@ -815,8 +795,7 @@ static void __dax_dbg(struct buffer_head *bh, unsigned long address, 
#define dax_pmd_dbg(bh, address, reason)	__dax_dbg(bh, address, reason, "dax_pmd")



int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,

		pmd_t *pmd, unsigned int flags, get_block_t get_block,

		dax_iodone_t complete_unwritten)

		pmd_t *pmd, unsigned int flags, get_block_t get_block)

{

	struct file *file = vma->vm_file;

	struct address_space *mapping = file->f_mapping;
@@ -875,6 +854,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
		if (get_block(inode, block, &bh, 1) != 0)

			return VM_FAULT_SIGBUS;

		alloc = true;

		WARN_ON_ONCE(buffer_unwritten(&bh));

	}



	bdev = bh.b_bdev;
@@ -1020,9 +1000,6 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
 out:

	i_mmap_unlock_read(mapping);



	if (buffer_unwritten(&bh))

		complete_unwritten(&bh, !(result & VM_FAULT_ERROR));



	return result;



 fallback:
@@ -1042,8 +1019,7 @@ EXPORT_SYMBOL_GPL(__dax_pmd_fault); 
 * pmd_fault handler for DAX files.

 */

int dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,

			pmd_t *pmd, unsigned int flags, get_block_t get_block,

			dax_iodone_t complete_unwritten)

			pmd_t *pmd, unsigned int flags, get_block_t get_block)

{

	int result;

	struct super_block *sb = file_inode(vma->vm_file)->i_sb;
@@ -1052,8 +1028,7 @@ int dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
		sb_start_pagefault(sb);

		file_update_time(vma->vm_file);

	}

	result = __dax_pmd_fault(vma, address, pmd, flags, get_block,

				complete_unwritten);

	result = __dax_pmd_fault(vma, address, pmd, flags, get_block);

	if (flags & FAULT_FLAG_WRITE)

		sb_end_pagefault(sb);

fs/ext2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int ext2_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	}

	down_read(&ei->dax_sem);



	ret = __dax_fault(vma, vmf, ext2_get_block, NULL);

	ret = __dax_fault(vma, vmf, ext2_get_block);



	up_read(&ei->dax_sem);

	if (vmf->flags & FAULT_FLAG_WRITE)
@@ -72,7 +72,7 @@ static int ext2_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr, 
	}

	down_read(&ei->dax_sem);



	ret = __dax_pmd_fault(vma, addr, pmd, flags, ext2_get_block, NULL);

	ret = __dax_pmd_fault(vma, addr, pmd, flags, ext2_get_block);



	up_read(&ei->dax_sem);

	if (flags & FAULT_FLAG_WRITE)

fs/ext4/file.c

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	if (IS_ERR(handle))

		result = VM_FAULT_SIGBUS;

	else

		result = __dax_fault(vma, vmf, ext4_dax_get_block, NULL);

		result = __dax_fault(vma, vmf, ext4_dax_get_block);



	if (write) {

		if (!IS_ERR(handle))
@@ -243,7 +243,7 @@ static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr, 
		result = VM_FAULT_SIGBUS;

	else

		result = __dax_pmd_fault(vma, addr, pmd, flags,

					 ext4_dax_get_block, NULL);

					 ext4_dax_get_block);



	if (write) {

		if (!IS_ERR(handle))

fs/xfs/xfs_file.c

+3 −4
Original line number Diff line number Diff line
@@ -1558,7 +1558,7 @@ xfs_filemap_page_mkwrite( 
	xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);



	if (IS_DAX(inode)) {

		ret = __dax_mkwrite(vma, vmf, xfs_get_blocks_dax_fault, NULL);

		ret = __dax_mkwrite(vma, vmf, xfs_get_blocks_dax_fault);

	} else {

		ret = block_page_mkwrite(vma, vmf, xfs_get_blocks);

		ret = block_page_mkwrite_return(ret);
@@ -1592,7 +1592,7 @@ xfs_filemap_fault( 
		 * changes to xfs_get_blocks_direct() to map unwritten extent

		 * ioend for conversion on read-only mappings.

		 */

		ret = __dax_fault(vma, vmf, xfs_get_blocks_dax_fault, NULL);

		ret = __dax_fault(vma, vmf, xfs_get_blocks_dax_fault);

	} else

		ret = filemap_fault(vma, vmf);

	xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
@@ -1629,8 +1629,7 @@ xfs_filemap_pmd_fault( 
	}



	xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);

	ret = __dax_pmd_fault(vma, addr, pmd, flags, xfs_get_blocks_dax_fault,

			      NULL);

	ret = __dax_pmd_fault(vma, addr, pmd, flags, xfs_get_blocks_dax_fault);

	xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);



	if (flags & FAULT_FLAG_WRITE)