dax: pass detailed error code from dax_iomap_fault() (c0b24625) · Commits · 戴 / test

fs/dax.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1096,7 +1096,7 @@ static bool dax_fault_is_synchronous(unsigned long flags,
		}

		static int dax_iomap_pte_fault(struct vm_fault vmf, pfn_t pfnp,
		const struct iomap_ops *ops)
		int iomap_errp, const struct iomap_ops ops)
		{
		struct vm_area_struct *vma = vmf->vma;
		struct address_space *mapping = vma->vm_file->f_mapping;
		@@ -1149,6 +1149,8 @@ static int dax_iomap_pte_fault(struct vm_fault vmf, pfn_t pfnp,
		* that we never have to deal with more than a single extent here.
		*/
		error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap);
		if (iomap_errp)
		*iomap_errp = error;
		if (error) {
		vmf_ret = dax_fault_return(error);
		goto unlock_entry;
		@@ -1488,6 +1490,7 @@ static int dax_iomap_pmd_fault(struct vm_fault vmf, pfn_t pfnp,
		* @vmf: The description of the fault
		* @pe_size: Size of the page to fault in
		* @pfnp: PFN to insert for synchronous faults if fsync is required
		* @iomap_errp: Storage for detailed error code in case of error
		* @ops: Iomap ops passed from the file system
		*
		* When a page fault occurs, filesystems may call this helper in
		@@ -1496,11 +1499,11 @@ static int dax_iomap_pmd_fault(struct vm_fault vmf, pfn_t pfnp,
		* successfully.
		*/
		int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
		pfn_t pfnp, const struct iomap_ops ops)
		pfn_t pfnp, int iomap_errp, const struct iomap_ops *ops)
		{
		switch (pe_size) {
		case PE_SIZE_PTE:
		return dax_iomap_pte_fault(vmf, pfnp, ops);
		return dax_iomap_pte_fault(vmf, pfnp, iomap_errp, ops);
		case PE_SIZE_PMD:
		return dax_iomap_pmd_fault(vmf, pfnp, ops);
		default:

fs/ext2/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ static int ext2_dax_fault(struct vm_fault *vmf)
		}
		down_read(&ei->dax_sem);

		ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, &ext2_iomap_ops);
		ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, NULL, &ext2_iomap_ops);

		up_read(&ei->dax_sem);
		if (vmf->flags & FAULT_FLAG_WRITE)

fs/ext4/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ static int ext4_dax_huge_fault(struct vm_fault *vmf,
		} else {
		down_read(&EXT4_I(inode)->i_mmap_sem);
		}
		result = dax_iomap_fault(vmf, pe_size, &pfn, &ext4_iomap_ops);
		result = dax_iomap_fault(vmf, pe_size, &pfn, NULL, &ext4_iomap_ops);
		if (write) {
		ext4_journal_stop(handle);
		/* Handling synchronous page fault? */

fs/xfs/xfs_file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1048,7 +1048,7 @@ __xfs_filemap_fault(
		if (IS_DAX(inode)) {
		pfn_t pfn;

		ret = dax_iomap_fault(vmf, pe_size, &pfn, &xfs_iomap_ops);
		ret = dax_iomap_fault(vmf, pe_size, &pfn, NULL, &xfs_iomap_ops);
		if (ret & VM_FAULT_NEEDDSYNC)
		ret = dax_finish_sync_fault(vmf, pe_size, pfn);
		} else {

include/linux/dax.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ bool dax_write_cache_enabled(struct dax_device *dax_dev);
		ssize_t dax_iomap_rw(struct kiocb iocb, struct iov_iter iter,
		const struct iomap_ops *ops);
		int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
		pfn_t pfnp, const struct iomap_ops ops);
		pfn_t pfnp, int errp, const struct iomap_ops *ops);
		int dax_finish_sync_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
		pfn_t pfn);
		int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index);

Admin message