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

mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf 

->fault(), ->page_mkwrite(), and ->pfn_mkwrite() calls do not need to
take a vma and vmf parameter when the vma already resides in vmf.

Remove the vma parameter to simplify things.

[arnd@arndb.de: fix ARM build]
  Link: http://lkml.kernel.org/r/20170125223558.1451224-1-arnd@arndb.de
Link: http://lkml.kernel.org/r/148521301778.19116.10840599906674778980.stgit@djiang5-desk3.ch.intel.com


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Darrick J. Wong <darrick.wong@oracle.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@suse.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 374ad05a

arch/powerpc/kvm/book3s_64_vio.c

+2 −2
Original line number Diff line number Diff line
@@ -102,9 +102,9 @@ static void release_spapr_tce_table(struct rcu_head *head) 
	kfree(stt);

}



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

static int kvm_spapr_tce_fault(struct vm_fault *vmf)

{

	struct kvmppc_spapr_tce_table *stt = vma->vm_file->private_data;

	struct kvmppc_spapr_tce_table *stt = vmf->vma->vm_file->private_data;

	struct page *page;



	if (vmf->pgoff >= kvmppc_tce_pages(stt->size))

arch/powerpc/platforms/cell/spufs/file.c

+19 −20
Original line number Diff line number Diff line
@@ -233,8 +233,9 @@ spufs_mem_write(struct file *file, const char __user *buffer, 
}



static int

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

spufs_mem_mmap_fault(struct vm_fault *vmf)

{

	struct vm_area_struct *vma = vmf->vma;

	struct spu_context *ctx	= vma->vm_file->private_data;

	unsigned long pfn, offset;
@@ -311,12 +312,11 @@ static const struct file_operations spufs_mem_fops = { 
	.mmap			= spufs_mem_mmap,

};



static int spufs_ps_fault(struct vm_area_struct *vma,

				    struct vm_fault *vmf,

static int spufs_ps_fault(struct vm_fault *vmf,

				    unsigned long ps_offs,

				    unsigned long ps_size)

{

	struct spu_context *ctx = vma->vm_file->private_data;

	struct spu_context *ctx = vmf->vma->vm_file->private_data;

	unsigned long area, offset = vmf->pgoff << PAGE_SHIFT;

	int ret = 0;
@@ -354,7 +354,7 @@ static int spufs_ps_fault(struct vm_area_struct *vma, 
		down_read(&current->mm->mmap_sem);

	} else {

		area = ctx->spu->problem_phys + ps_offs;

		vm_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT);

		vm_insert_pfn(vmf->vma, vmf->address, (area + offset) >> PAGE_SHIFT);

		spu_context_trace(spufs_ps_fault__insert, ctx, ctx->spu);

	}
@@ -367,10 +367,9 @@ refault: 
}



#if SPUFS_MMAP_4K

static int spufs_cntl_mmap_fault(struct vm_area_struct *vma,

					   struct vm_fault *vmf)

static int spufs_cntl_mmap_fault(struct vm_fault *vmf)

{

	return spufs_ps_fault(vma, vmf, 0x4000, SPUFS_CNTL_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x4000, SPUFS_CNTL_MAP_SIZE);

}



static const struct vm_operations_struct spufs_cntl_mmap_vmops = {
@@ -1067,15 +1066,15 @@ static ssize_t spufs_signal1_write(struct file *file, const char __user *buf, 
}



static int

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

spufs_signal1_mmap_fault(struct vm_fault *vmf)

{

#if SPUFS_SIGNAL_MAP_SIZE == 0x1000

	return spufs_ps_fault(vma, vmf, 0x14000, SPUFS_SIGNAL_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x14000, SPUFS_SIGNAL_MAP_SIZE);

#elif SPUFS_SIGNAL_MAP_SIZE == 0x10000

	/* For 64k pages, both signal1 and signal2 can be used to mmap the whole

	 * signal 1 and 2 area

	 */

	return spufs_ps_fault(vma, vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);

#else

#error unsupported page size

#endif
@@ -1205,15 +1204,15 @@ static ssize_t spufs_signal2_write(struct file *file, const char __user *buf, 


#if SPUFS_MMAP_4K

static int

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

spufs_signal2_mmap_fault(struct vm_fault *vmf)

{

#if SPUFS_SIGNAL_MAP_SIZE == 0x1000

	return spufs_ps_fault(vma, vmf, 0x1c000, SPUFS_SIGNAL_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x1c000, SPUFS_SIGNAL_MAP_SIZE);

#elif SPUFS_SIGNAL_MAP_SIZE == 0x10000

	/* For 64k pages, both signal1 and signal2 can be used to mmap the whole

	 * signal 1 and 2 area

	 */

	return spufs_ps_fault(vma, vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);

#else

#error unsupported page size

#endif
@@ -1334,9 +1333,9 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get, 


#if SPUFS_MMAP_4K

static int

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

spufs_mss_mmap_fault(struct vm_fault *vmf)

{

	return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_MSS_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x0000, SPUFS_MSS_MAP_SIZE);

}



static const struct vm_operations_struct spufs_mss_mmap_vmops = {
@@ -1396,9 +1395,9 @@ static const struct file_operations spufs_mss_fops = { 
};



static int

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

spufs_psmap_mmap_fault(struct vm_fault *vmf)

{

	return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_PS_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x0000, SPUFS_PS_MAP_SIZE);

}



static const struct vm_operations_struct spufs_psmap_mmap_vmops = {
@@ -1456,9 +1455,9 @@ static const struct file_operations spufs_psmap_fops = { 


#if SPUFS_MMAP_4K

static int

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

spufs_mfc_mmap_fault(struct vm_fault *vmf)

{

	return spufs_ps_fault(vma, vmf, 0x3000, SPUFS_MFC_MAP_SIZE);

	return spufs_ps_fault(vmf, 0x3000, SPUFS_MFC_MAP_SIZE);

}



static const struct vm_operations_struct spufs_mfc_mmap_vmops = {

drivers/android/binder.c

+1 −1
Original line number Diff line number Diff line
@@ -3342,7 +3342,7 @@ static void binder_vma_close(struct vm_area_struct *vma) 
	binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);

}



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

static int binder_vm_fault(struct vm_fault *vmf)

{

	return VM_FAULT_SIGBUS;

}

drivers/char/agp/alpha-agp.c

+2 −3
Original line number Diff line number Diff line
@@ -11,15 +11,14 @@ 


#include "agp.h"



static int alpha_core_agp_vm_fault(struct vm_area_struct *vma,

					struct vm_fault *vmf)

static int alpha_core_agp_vm_fault(struct vm_fault *vmf)

{

	alpha_agp_info *agp = agp_bridge->dev_private_data;

	dma_addr_t dma_addr;

	unsigned long pa;

	struct page *page;



	dma_addr = vmf->address - vma->vm_start + agp->aperture.bus_base;

	dma_addr = vmf->address - vmf->vma->vm_start + agp->aperture.bus_base;

	pa = agp->ops->translate(agp, dma_addr);



	if (pa == (unsigned long)-EINVAL)

drivers/char/mspec.c

+3 −3
Original line number Diff line number Diff line
@@ -191,12 +191,12 @@ mspec_close(struct vm_area_struct *vma) 
 * Creates a mspec page and maps it to user space.

 */

static int

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

mspec_fault(struct vm_fault *vmf)

{

	unsigned long paddr, maddr;

	unsigned long pfn;

	pgoff_t index = vmf->pgoff;

	struct vma_data *vdata = vma->vm_private_data;

	struct vma_data *vdata = vmf->vma->vm_private_data;



	maddr = (volatile unsigned long) vdata->maddr[index];

	if (maddr == 0) {
@@ -227,7 +227,7 @@ mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	 * be because another thread has installed the pte first, so it

	 * is no problem.

	 */

	vm_insert_pfn(vma, vmf->address, pfn);

	vm_insert_pfn(vmf->vma, vmf->address, pfn);



	return VM_FAULT_NOPAGE;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE