Commit a2f6d9c4 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

Merge branch 'dax-4.10-iomap-pmd' into origin

parents bc33b0ca 9484ab1b

fs/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ config FS_DAX_PMD 
	depends on FS_DAX

	depends on ZONE_DEVICE

	depends on TRANSPARENT_HUGEPAGE

	depends on BROKEN



endif # BLOCK

fs/dax.c

+464 −364

File changed.

Preview size limit exceeded, changes collapsed.

fs/ext2/file.c

+9 −26
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static ssize_t ext2_dax_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		return 0; /* skip atime */



	inode_lock_shared(inode);

	ret = iomap_dax_rw(iocb, to, &ext2_iomap_ops);

	ret = dax_iomap_rw(iocb, to, &ext2_iomap_ops);

	inode_unlock_shared(inode);



	file_accessed(iocb->ki_filp);
@@ -62,7 +62,7 @@ static ssize_t ext2_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (ret)

		goto out_unlock;



	ret = iomap_dax_rw(iocb, from, &ext2_iomap_ops);

	ret = dax_iomap_rw(iocb, from, &ext2_iomap_ops);

	if (ret > 0 && iocb->ki_pos > i_size_read(inode)) {

		i_size_write(inode, iocb->ki_pos);

		mark_inode_dirty(inode);
@@ -99,7 +99,7 @@ static int ext2_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	}

	down_read(&ei->dax_sem);



	ret = iomap_dax_fault(vma, vmf, &ext2_iomap_ops);

	ret = dax_iomap_fault(vma, vmf, &ext2_iomap_ops);



	up_read(&ei->dax_sem);

	if (vmf->flags & FAULT_FLAG_WRITE)
@@ -107,27 +107,6 @@ static int ext2_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	return ret;

}



static int ext2_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,

						pmd_t *pmd, unsigned int flags)

{

	struct inode *inode = file_inode(vma->vm_file);

	struct ext2_inode_info *ei = EXT2_I(inode);

	int ret;



	if (flags & FAULT_FLAG_WRITE) {

		sb_start_pagefault(inode->i_sb);

		file_update_time(vma->vm_file);

	}

	down_read(&ei->dax_sem);



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



	up_read(&ei->dax_sem);

	if (flags & FAULT_FLAG_WRITE)

		sb_end_pagefault(inode->i_sb);

	return ret;

}



static int ext2_dax_pfn_mkwrite(struct vm_area_struct *vma,

		struct vm_fault *vmf)

{
@@ -154,7 +133,11 @@ static int ext2_dax_pfn_mkwrite(struct vm_area_struct *vma, 


static const struct vm_operations_struct ext2_dax_vm_ops = {

	.fault		= ext2_dax_fault,

	.pmd_fault	= ext2_dax_pmd_fault,

	/*

	 * .pmd_fault is not supported for DAX because allocation in ext2

	 * cannot be reliably aligned to huge page sizes and so pmd faults

	 * will always fail and fail back to regular faults.

	 */

	.page_mkwrite	= ext2_dax_fault,

	.pfn_mkwrite	= ext2_dax_pfn_mkwrite,

};
@@ -166,7 +149,7 @@ static int ext2_file_mmap(struct file *file, struct vm_area_struct *vma) 


	file_accessed(file);

	vma->vm_ops = &ext2_dax_vm_ops;

	vma->vm_flags |= VM_MIXEDMAP | VM_HUGEPAGE;

	vma->vm_flags |= VM_MIXEDMAP;

	return 0;

}

#else

fs/ext4/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -767,6 +767,9 @@ static int _ext4_get_block(struct inode *inode, sector_t iblock, 
		ext4_update_bh_state(bh, map.m_flags);

		bh->b_size = inode->i_sb->s_blocksize * map.m_len;

		ret = 0;

	} else if (ret == 0) {

		/* hole case, need to fill in bh->b_size */

		bh->b_size = inode->i_sb->s_blocksize * map.m_len;

	}

	return ret;

}

fs/iomap.c

+3 −2
Original line number Diff line number Diff line
@@ -467,8 +467,9 @@ int iomap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, 


	offset = page_offset(page);

	while (length > 0) {

		ret = iomap_apply(inode, offset, length, IOMAP_WRITE,

				ops, page, iomap_page_mkwrite_actor);

		ret = iomap_apply(inode, offset, length,

				IOMAP_WRITE | IOMAP_FAULT, ops, page,

				iomap_page_mkwrite_actor);

		if (unlikely(ret <= 0))

			goto out_unlock;

		offset += ret;