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

Commit f4200391 authored by Dave Jiang's avatar Dave Jiang Committed by Linus Torvalds
Browse files

mm, dax: change pmd_fault() to take only vmf parameter 

pmd_fault() and related functions really only need the vmf parameter since
the additional parameters are all included in the vmf struct.  Remove the
additional parameter and simplify pmd_fault() and friends.

Link: http://lkml.kernel.org/r/1484085142-2297-8-git-send-email-ross.zwisler@linux.intel.com


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d8a849e1

drivers/dax/dax.c

+9 −9
Original line number Diff line number Diff line
@@ -472,8 +472,7 @@ static int dax_dev_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	return rc;

}



static int __dax_dev_pmd_fault(struct dax_dev *dax_dev,

		struct vm_area_struct *vma, struct vm_fault *vmf)

static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, struct vm_fault *vmf)

{

	unsigned long pmd_addr = vmf->address & PMD_MASK;

	struct device *dev = &dax_dev->dev;
@@ -482,7 +481,7 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, 
	pgoff_t pgoff;

	pfn_t pfn;



	if (check_vma(dax_dev, vma, __func__))

	if (check_vma(dax_dev, vmf->vma, __func__))

		return VM_FAULT_SIGBUS;



	dax_region = dax_dev->region;
@@ -497,7 +496,7 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, 
		return VM_FAULT_SIGBUS;

	}



	pgoff = linear_page_index(vma, pmd_addr);

	pgoff = linear_page_index(vmf->vma, pmd_addr);

	phys = pgoff_to_phys(dax_dev, pgoff, PMD_SIZE);

	if (phys == -1) {

		dev_dbg(dev, "%s: phys_to_pgoff(%#lx) failed\n", __func__,
@@ -507,22 +506,23 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, 


	pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);



	return vmf_insert_pfn_pmd(vma, vmf->address, vmf->pmd, pfn,

	return vmf_insert_pfn_pmd(vmf->vma, vmf->address, vmf->pmd, pfn,

			vmf->flags & FAULT_FLAG_WRITE);

}



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

static int dax_dev_pmd_fault(struct vm_fault *vmf)

{

	int rc;

	struct file *filp = vma->vm_file;

	struct file *filp = vmf->vma->vm_file;

	struct dax_dev *dax_dev = filp->private_data;



	dev_dbg(&dax_dev->dev, "%s: %s: %s (%#lx - %#lx)\n", __func__,

			current->comm, (vmf->flags & FAULT_FLAG_WRITE)

			? "write" : "read", vma->vm_start, vma->vm_end);

			? "write" : "read",

			vmf->vma->vm_start, vmf->vma->vm_end);



	rcu_read_lock();

	rc = __dax_dev_pmd_fault(dax_dev, vma, vmf);

	rc = __dax_dev_pmd_fault(dax_dev, vmf);

	rcu_read_unlock();



	return rc;

fs/dax.c

+25 −29
Original line number Diff line number Diff line
@@ -1256,11 +1256,10 @@ EXPORT_SYMBOL_GPL(dax_iomap_fault); 
 */

#define PG_PMD_COLOUR	((PMD_SIZE >> PAGE_SHIFT) - 1)



static int dax_pmd_insert_mapping(struct vm_area_struct *vma, pmd_t *pmd,

		struct vm_fault *vmf, unsigned long address,

		struct iomap *iomap, loff_t pos, bool write, void **entryp)

static int dax_pmd_insert_mapping(struct vm_fault *vmf, struct iomap *iomap,

		loff_t pos, void **entryp)

{

	struct address_space *mapping = vma->vm_file->f_mapping;

	struct address_space *mapping = vmf->vma->vm_file->f_mapping;

	struct block_device *bdev = iomap->bdev;

	struct inode *inode = mapping->host;

	struct blk_dax_ctl dax = {
@@ -1287,31 +1286,30 @@ static int dax_pmd_insert_mapping(struct vm_area_struct *vma, pmd_t *pmd, 
		goto fallback;

	*entryp = ret;



	trace_dax_pmd_insert_mapping(inode, vma, address, write, length,

			dax.pfn, ret);

	return vmf_insert_pfn_pmd(vma, address, pmd, dax.pfn, write);

	trace_dax_pmd_insert_mapping(inode, vmf, length, dax.pfn, ret);

	return vmf_insert_pfn_pmd(vmf->vma, vmf->address, vmf->pmd,

			dax.pfn, vmf->flags & FAULT_FLAG_WRITE);



 unmap_fallback:

	dax_unmap_atomic(bdev, &dax);

fallback:

	trace_dax_pmd_insert_mapping_fallback(inode, vma, address, write,

			length, dax.pfn, ret);

	trace_dax_pmd_insert_mapping_fallback(inode, vmf, length,

			dax.pfn, ret);

	return VM_FAULT_FALLBACK;

}



static int dax_pmd_load_hole(struct vm_area_struct *vma, pmd_t *pmd,

		struct vm_fault *vmf, unsigned long address,

		struct iomap *iomap, void **entryp)

static int dax_pmd_load_hole(struct vm_fault *vmf, struct iomap *iomap,

		void **entryp)

{

	struct address_space *mapping = vma->vm_file->f_mapping;

	unsigned long pmd_addr = address & PMD_MASK;

	struct address_space *mapping = vmf->vma->vm_file->f_mapping;

	unsigned long pmd_addr = vmf->address & PMD_MASK;

	struct inode *inode = mapping->host;

	struct page *zero_page;

	void *ret = NULL;

	spinlock_t *ptl;

	pmd_t pmd_entry;



	zero_page = mm_get_huge_zero_page(vma->vm_mm);

	zero_page = mm_get_huge_zero_page(vmf->vma->vm_mm);



	if (unlikely(!zero_page))

		goto fallback;
@@ -1322,27 +1320,27 @@ static int dax_pmd_load_hole(struct vm_area_struct *vma, pmd_t *pmd, 
		goto fallback;

	*entryp = ret;



	ptl = pmd_lock(vma->vm_mm, pmd);

	if (!pmd_none(*pmd)) {

	ptl = pmd_lock(vmf->vma->vm_mm, vmf->pmd);

	if (!pmd_none(*(vmf->pmd))) {

		spin_unlock(ptl);

		goto fallback;

	}



	pmd_entry = mk_pmd(zero_page, vma->vm_page_prot);

	pmd_entry = mk_pmd(zero_page, vmf->vma->vm_page_prot);

	pmd_entry = pmd_mkhuge(pmd_entry);

	set_pmd_at(vma->vm_mm, pmd_addr, pmd, pmd_entry);

	set_pmd_at(vmf->vma->vm_mm, pmd_addr, vmf->pmd, pmd_entry);

	spin_unlock(ptl);

	trace_dax_pmd_load_hole(inode, vma, address, zero_page, ret);

	trace_dax_pmd_load_hole(inode, vmf, zero_page, ret);

	return VM_FAULT_NOPAGE;



fallback:

	trace_dax_pmd_load_hole_fallback(inode, vma, address, zero_page, ret);

	trace_dax_pmd_load_hole_fallback(inode, vmf, zero_page, ret);

	return VM_FAULT_FALLBACK;

}



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

		struct iomap_ops *ops)

int dax_iomap_pmd_fault(struct vm_fault *vmf, struct iomap_ops *ops)

{

	struct vm_area_struct *vma = vmf->vma;

	struct address_space *mapping = vma->vm_file->f_mapping;

	unsigned long pmd_addr = vmf->address & PMD_MASK;

	bool write = vmf->flags & FAULT_FLAG_WRITE;
@@ -1363,7 +1361,7 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf, 
	pgoff = linear_page_index(vma, pmd_addr);

	max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT;



	trace_dax_pmd_fault(inode, vma, vmf, max_pgoff, 0);

	trace_dax_pmd_fault(inode, vmf, max_pgoff, 0);



	/* Fall back to PTEs if we're going to COW */

	if (write && !(vma->vm_flags & VM_SHARED))
@@ -1409,15 +1407,13 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf, 


	switch (iomap.type) {

	case IOMAP_MAPPED:

		result = dax_pmd_insert_mapping(vma, vmf->pmd, vmf,

				vmf->address, &iomap, pos, write, &entry);

		result = dax_pmd_insert_mapping(vmf, &iomap, pos, &entry);

		break;

	case IOMAP_UNWRITTEN:

	case IOMAP_HOLE:

		if (WARN_ON_ONCE(write))

			goto unlock_entry;

		result = dax_pmd_load_hole(vma, vmf->pmd, vmf, vmf->address,

				&iomap, &entry);

		result = dax_pmd_load_hole(vmf, &iomap, &entry);

		break;

	default:

		WARN_ON_ONCE(1);
@@ -1447,7 +1443,7 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf, 
		count_vm_event(THP_FAULT_FALLBACK);

	}

out:

	trace_dax_pmd_fault_done(inode, vma, vmf, max_pgoff, result);

	trace_dax_pmd_fault_done(inode, vmf, max_pgoff, result);

	return result;

}

EXPORT_SYMBOL_GPL(dax_iomap_pmd_fault);

fs/ext4/file.c

+4 −4
Original line number Diff line number Diff line
@@ -274,19 +274,19 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
}



static int

ext4_dax_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

ext4_dax_pmd_fault(struct vm_fault *vmf)

{

	int result;

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

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

	struct super_block *sb = inode->i_sb;

	bool write = vmf->flags & FAULT_FLAG_WRITE;



	if (write) {

		sb_start_pagefault(sb);

		file_update_time(vma->vm_file);

		file_update_time(vmf->vma->vm_file);

	}

	down_read(&EXT4_I(inode)->i_mmap_sem);

	result = dax_iomap_pmd_fault(vma, vmf, &ext4_iomap_ops);

	result = dax_iomap_pmd_fault(vmf, &ext4_iomap_ops);

	up_read(&EXT4_I(inode)->i_mmap_sem);

	if (write)

		sb_end_pagefault(sb);

fs/xfs/xfs_file.c

+3 −4
Original line number Diff line number Diff line
@@ -1431,10 +1431,9 @@ xfs_filemap_fault( 
 */

STATIC int

xfs_filemap_pmd_fault(

	struct vm_area_struct	*vma,

	struct vm_fault		*vmf)

{

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

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

	struct xfs_inode	*ip = XFS_I(inode);

	int			ret;
@@ -1445,11 +1444,11 @@ xfs_filemap_pmd_fault( 


	if (vmf->flags & FAULT_FLAG_WRITE) {

		sb_start_pagefault(inode->i_sb);

		file_update_time(vma->vm_file);

		file_update_time(vmf->vma->vm_file);

	}



	xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);

	ret = dax_iomap_pmd_fault(vma, vmf, &xfs_iomap_ops);

	ret = dax_iomap_pmd_fault(vmf, &xfs_iomap_ops);

	xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);



	if (vmf->flags & FAULT_FLAG_WRITE)

include/linux/dax.h

+3 −4
Original line number Diff line number Diff line
@@ -71,15 +71,14 @@ static inline unsigned int dax_radix_order(void *entry) 
		return PMD_SHIFT - PAGE_SHIFT;

	return 0;

}

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

		struct iomap_ops *ops);

int dax_iomap_pmd_fault(struct vm_fault *vmf, struct iomap_ops *ops);

#else

static inline unsigned int dax_radix_order(void *entry)

{

	return 0;

}

static inline int dax_iomap_pmd_fault(struct vm_area_struct *vma,

		struct vm_fault *vmf, struct iomap_ops *ops)

static inline int dax_iomap_pmd_fault(struct vm_fault *vmf,

		struct iomap_ops *ops)

{

	return VM_FAULT_FALLBACK;

}