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

Commit 11bd1a9e authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

ext4: huge page fault support 



Use DAX to provide support for huge pages.

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7b1ea2a

fs/ext4/file.c

+9 −1
Original line number Diff line number Diff line
@@ -211,6 +211,13 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
					/* Is this the right get_block? */

}



static int ext4_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, ext4_get_block_write,

				ext4_end_io_unwritten);

}



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

{

	return dax_mkwrite(vma, vmf, ext4_get_block, ext4_end_io_unwritten);
@@ -218,6 +225,7 @@ static int ext4_dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 


static const struct vm_operations_struct ext4_dax_vm_ops = {

	.fault		= ext4_dax_fault,

	.pmd_fault	= ext4_dax_pmd_fault,

	.page_mkwrite	= ext4_dax_mkwrite,

	.pfn_mkwrite	= dax_pfn_mkwrite,

};
@@ -245,7 +253,7 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) 
	file_accessed(file);

	if (IS_DAX(file_inode(file))) {

		vma->vm_ops = &ext4_dax_vm_ops;

		vma->vm_flags |= VM_MIXEDMAP;

		vma->vm_flags |= VM_MIXEDMAP | VM_HUGEPAGE;

	} else {

		vma->vm_ops = &ext4_file_vm_ops;

	}