Commit d0217ac0 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

mm: fault feedback #1 



Change ->fault prototype.  We now return an int, which contains
VM_FAULT_xxx code in the low byte, and FAULT_RET_xxx code in the next byte.
 FAULT_RET_ code tells the VM whether a page was found, whether it has been
locked, and potentially other things.  This is not quite the way he wanted
it yet, but that's changed in the next patch (which requires changes to
arch code).

This means we no longer set VM_CAN_INVALIDATE in the vma in order to say
that a page is locked which requires filemap_nopage to go away (because we
can no longer remain backward compatible without that flag), but we were
going to do that anyway.

struct fault_data is renamed to struct vm_fault as Linus asked. address
is now a void __user * that we should firmly encourage drivers not to use
without really good reason.

The page is now returned via a page pointer in the vm_fault struct.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ed2f2f9b

Documentation/feature-removal-schedule.txt

+1 −19
Original line number Diff line number Diff line
@@ -135,26 +135,8 @@ Who: Greg Kroah-Hartman <gregkh@suse.de> 


---------------------------



What:	filemap_nopage, filemap_populate

When:	April 2007

Why:	These legacy interfaces no longer have any callers in the kernel and

	any functionality provided can be provided with filemap_fault. The

	removal schedule is short because they are a big maintainence burden

	and have some bugs.

Who:	Nick Piggin <npiggin@suse.de>



---------------------------



What:	vm_ops.populate, install_page

When:	April 2007

Why:	These legacy interfaces no longer have any callers in the kernel and

	any functionality provided can be provided with vm_ops.fault.

Who:	Nick Piggin <npiggin@suse.de>



---------------------------



What:	vm_ops.nopage

When:	February 2008, provided in-kernel callers have been converted

When:	Soon, provided in-kernel callers have been converted

Why:	This interface is replaced by vm_ops.fault, but it has been around

	forever, is used by a lot of drivers, and doesn't cost much to

	maintain.

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ More details about quota locking can be found in fs/dquot.c. 
prototypes:

	void (*open)(struct vm_area_struct*);

	void (*close)(struct vm_area_struct*);

	struct page *(*fault)(struct vm_area_struct*, struct fault_data *);

	int (*fault)(struct vm_area_struct*, struct vm_fault *);

	struct page *(*nopage)(struct vm_area_struct*, unsigned long, int *);

	int (*page_mkwrite)(struct vm_area_struct *, struct page *);

fs/gfs2/ops_file.c

+0 −2
Original line number Diff line number Diff line
@@ -364,8 +364,6 @@ static int gfs2_mmap(struct file *file, struct vm_area_struct *vma) 
	else

		vma->vm_ops = &gfs2_vm_ops_private;



	vma->vm_flags |= VM_CAN_INVALIDATE|VM_CAN_NONLINEAR;



	gfs2_glock_dq_uninit(&i_gh);



	return error;

fs/gfs2/ops_vm.c

+23 −24
Original line number Diff line number Diff line
@@ -27,13 +27,12 @@ 
#include "trans.h"

#include "util.h"



static struct page *gfs2_private_fault(struct vm_area_struct *vma,

					struct fault_data *fdata)

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

{

	struct gfs2_inode *ip = GFS2_I(vma->vm_file->f_mapping->host);



	set_bit(GIF_PAGED, &ip->i_flags);

	return filemap_fault(vma, fdata);

	return filemap_fault(vma, vmf);

}



static int alloc_page_backing(struct gfs2_inode *ip, struct page *page)
@@ -104,55 +103,55 @@ out: 
	return error;

}



static struct page *gfs2_sharewrite_fault(struct vm_area_struct *vma,

						struct fault_data *fdata)

static int gfs2_sharewrite_fault(struct vm_area_struct *vma,

						struct vm_fault *vmf)

{

	struct file *file = vma->vm_file;

	struct gfs2_file *gf = file->private_data;

	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);

	struct gfs2_holder i_gh;

	struct page *result = NULL;

	int alloc_required;

	int error;

	int ret = VM_FAULT_MINOR;



	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh);

	if (error)

		return NULL;

		goto out;



	set_bit(GIF_PAGED, &ip->i_flags);

	set_bit(GIF_SW_PAGED, &ip->i_flags);



	error = gfs2_write_alloc_required(ip,

					(u64)fdata->pgoff << PAGE_CACHE_SHIFT,

					(u64)vmf->pgoff << PAGE_CACHE_SHIFT,

					PAGE_CACHE_SIZE, &alloc_required);

	if (error) {

		fdata->type = VM_FAULT_OOM; /* XXX: are these right? */

		goto out;

		ret = VM_FAULT_OOM; /* XXX: are these right? */

		goto out_unlock;

	}



	set_bit(GFF_EXLOCK, &gf->f_flags);

	result = filemap_fault(vma, fdata);

	ret = filemap_fault(vma, vmf);

	clear_bit(GFF_EXLOCK, &gf->f_flags);

	if (!result)

		goto out;

	if (ret & (VM_FAULT_ERROR | FAULT_RET_NOPAGE))

		goto out_unlock;



	if (alloc_required) {

		error = alloc_page_backing(ip, result);

		/* XXX: do we need to drop page lock around alloc_page_backing?*/

		error = alloc_page_backing(ip, vmf->page);

		if (error) {

			if (vma->vm_flags & VM_CAN_INVALIDATE)

				unlock_page(result);

			page_cache_release(result);

			fdata->type = VM_FAULT_OOM;

			result = NULL;

			goto out;

			if (ret & FAULT_RET_LOCKED)

				unlock_page(vmf->page);

			page_cache_release(vmf->page);

			ret = VM_FAULT_OOM;

			goto out_unlock;

		}

		set_page_dirty(result);

		set_page_dirty(vmf->page);

	}



out:

out_unlock:

	gfs2_glock_dq_uninit(&i_gh);



	return result;

out:

	return ret;

}



struct vm_operations_struct gfs2_vm_ops_private = {

fs/ncpfs/mmap.c

+19 −19
Original line number Diff line number Diff line
@@ -24,33 +24,35 @@ 


/*

 * Fill in the supplied page for mmap

 * XXX: how are we excluding truncate/invalidate here? Maybe need to lock

 * page?

 */

static struct page* ncp_file_mmap_fault(struct vm_area_struct *area,

						struct fault_data *fdata)

static int ncp_file_mmap_fault(struct vm_area_struct *area,

					struct vm_fault *vmf)

{

	struct file *file = area->vm_file;

	struct dentry *dentry = file->f_path.dentry;

	struct inode *inode = dentry->d_inode;

	struct page* page;

	char *pg_addr;

	unsigned int already_read;

	unsigned int count;

	int bufsize;

	int pos;

	int pos; /* XXX: loff_t ? */



	page = alloc_page(GFP_HIGHUSER); /* ncpfs has nothing against high pages

	           as long as recvmsg and memset works on it */

	if (!page) {

		fdata->type = VM_FAULT_OOM;

		return NULL;

	}

	pg_addr = kmap(page);

	pos = fdata->pgoff << PAGE_SHIFT;

	/*

	 * ncpfs has nothing against high pages as long

	 * as recvmsg and memset works on it

	 */

	vmf->page = alloc_page(GFP_HIGHUSER);

	if (!vmf->page)

		return VM_FAULT_OOM;

	pg_addr = kmap(vmf->page);

	pos = vmf->pgoff << PAGE_SHIFT;



	count = PAGE_SIZE;

	if (fdata->address + PAGE_SIZE > area->vm_end) {

	if ((unsigned long)vmf->virtual_address + PAGE_SIZE > area->vm_end) {

		WARN_ON(1); /* shouldn't happen? */

		count = area->vm_end - fdata->address;

		count = area->vm_end - (unsigned long)vmf->virtual_address;

	}

	/* what we can read in one go */

	bufsize = NCP_SERVER(inode)->buffer_size;
@@ -85,17 +87,16 @@ static struct page* ncp_file_mmap_fault(struct vm_area_struct *area, 


	if (already_read < PAGE_SIZE)

		memset(pg_addr + already_read, 0, PAGE_SIZE - already_read);

	flush_dcache_page(page);

	kunmap(page);

	flush_dcache_page(vmf->page);

	kunmap(vmf->page);



	/*

	 * If I understand ncp_read_kernel() properly, the above always

	 * fetches from the network, here the analogue of disk.

	 * -- wli

	 */

	fdata->type = VM_FAULT_MAJOR;

	count_vm_event(PGMAJFAULT);

	return page;

	return VM_FAULT_MAJOR;

}



static struct vm_operations_struct ncp_file_mmap =
@@ -124,7 +125,6 @@ int ncp_mmap(struct file *file, struct vm_area_struct *vma) 
		return -EFBIG;



	vma->vm_ops = &ncp_file_mmap;

	vma->vm_flags |= VM_CAN_INVALIDATE;

	file_accessed(file);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE