Unverified Commit d9bc0d11 authored by Eric Van Hensbergen's avatar Eric Van Hensbergen
Browse files

fs/9p: Consolidate file operations and add readahead and writeback 



We had 3 different sets of file operations across 2 different protocol
variants differentiated by cache which really only changed 3
functions.  But the real problem is that certain file modes, mount
options, and other factors weren't being considered when we
decided whether or not to use caches.

This consolidates all the operations and switches
to conditionals within a common set to decide whether or not
to do different aspects of caching.

Signed-off-by: default avatarEric Van Hensbergen <ericvh@kernel.org>
Reviewed-by: default avatarDominique Martinet <asmadeus@codewreck.org>
parent fe15c26e

fs/9p/v9fs.c

+12 −18
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ enum { 
	Opt_uname, Opt_remotename, Opt_cache, Opt_cachetag,

	/* Options that take no arguments */

	Opt_nodevmap,

	/* Cache options */

	Opt_cache_loose, Opt_fscache, Opt_mmap,

	/* Access options */

	Opt_access, Opt_posixacl,

	/* Lock timeout option */
@@ -58,9 +56,6 @@ static const match_table_t tokens = { 
	{Opt_remotename, "aname=%s"},

	{Opt_nodevmap, "nodevmap"},

	{Opt_cache, "cache=%s"},

	{Opt_cache_loose, "loose"},

	{Opt_fscache, "fscache"},

	{Opt_mmap, "mmap"},

	{Opt_cachetag, "cachetag=%s"},

	{Opt_access, "access=%s"},

	{Opt_posixacl, "posixacl"},
@@ -70,6 +65,8 @@ static const match_table_t tokens = { 


static const char *const v9fs_cache_modes[nr__p9_cache_modes] = {

	[CACHE_NONE]		= "none",

	[CACHE_READAHEAD]	= "readahead",

	[CACHE_WRITEBACK]	= "writeback",

	[CACHE_MMAP]		= "mmap",

	[CACHE_LOOSE]		= "loose",

	[CACHE_FSCACHE]		= "fscache",
@@ -89,6 +86,12 @@ static int get_cache_mode(char *s) 
	} else if (!strcmp(s, "mmap")) {

		version = CACHE_MMAP;

		p9_debug(P9_DEBUG_9P, "Cache mode: mmap\n");

	} else if (!strcmp(s, "writeback")) {

		version = CACHE_WRITEBACK;

		p9_debug(P9_DEBUG_9P, "Cache mode: writeback\n");

	} else if (!strcmp(s, "readahead")) {

		version = CACHE_READAHEAD;

		p9_debug(P9_DEBUG_9P, "Cache mode: readahead\n");

	} else if (!strcmp(s, "none")) {

		version = CACHE_NONE;

		p9_debug(P9_DEBUG_9P, "Cache mode: none\n");
@@ -266,15 +269,6 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts) 
		case Opt_nodevmap:

			v9ses->nodev = 1;

			break;

		case Opt_cache_loose:

			v9ses->cache = CACHE_LOOSE;

			break;

		case Opt_fscache:

			v9ses->cache = CACHE_FSCACHE;

			break;

		case Opt_mmap:

			v9ses->cache = CACHE_MMAP;

			break;

		case Opt_cachetag:

#ifdef CONFIG_9P_FSCACHE

			kfree(v9ses->cachetag);

fs/9p/v9fs.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ enum p9_session_flags { 


enum p9_cache_modes {

	CACHE_NONE,

	CACHE_READAHEAD,

	CACHE_WRITEBACK,

	CACHE_MMAP,

	CACHE_LOOSE,

	CACHE_FSCACHE,

fs/9p/v9fs_vfs.h

+0 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ extern const struct file_operations v9fs_dir_operations; 
extern const struct file_operations v9fs_dir_operations_dotl;

extern const struct dentry_operations v9fs_dentry_operations;

extern const struct dentry_operations v9fs_cached_dentry_operations;

extern const struct file_operations v9fs_cached_file_operations;

extern const struct file_operations v9fs_cached_file_operations_dotl;

extern const struct file_operations v9fs_mmap_file_operations;

extern const struct file_operations v9fs_mmap_file_operations_dotl;

extern struct kmem_cache *v9fs_inode_cache;



struct inode *v9fs_alloc_inode(struct super_block *sb);

fs/9p/vfs_dir.c

+7 −3
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ static int v9fs_dir_readdir_dotl(struct file *file, struct dir_context *ctx) 




/**

 * v9fs_dir_release - called on a close of a file or directory

 * @inode: inode of the directory

 * @filp: file pointer to a directory

 * v9fs_dir_release - close a directory or a file

 * @inode: inode of the directory or file

 * @filp: file pointer to a directory or file

 *

 */
@@ -214,7 +214,11 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 
	fid = filp->private_data;

	p9_debug(P9_DEBUG_VFS, "inode: %p filp: %p fid: %d\n",

		 inode, filp, fid ? fid->fid : -1);



	if (fid) {

		if ((S_ISREG(inode->i_mode)) && (filp->f_mode & FMODE_WRITE))

			retval = filemap_fdatawrite(inode->i_mapping);



		spin_lock(&inode->i_lock);

		hlist_del(&fid->ilist);

		spin_unlock(&inode->i_lock);

fs/9p/vfs_file.c

+20 −111
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "fid.h"

#include "cache.h"



static const struct vm_operations_struct v9fs_file_vm_ops;

static const struct vm_operations_struct v9fs_mmap_file_vm_ops;



/**
@@ -74,7 +73,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
	}



	mutex_lock(&v9inode->v_mutex);

	if ((v9ses->cache) && !v9inode->writeback_fid &&

	if ((v9ses->cache >= CACHE_WRITEBACK) && !v9inode->writeback_fid &&

	    ((file->f_flags & O_ACCMODE) != O_RDONLY)) {

		/*

		 * clone a fid and add it to writeback_fid
@@ -368,10 +367,15 @@ v9fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
{

	struct p9_fid *fid = iocb->ki_filp->private_data;

	int ret, err = 0;

	struct inode *inode = file_inode(iocb->ki_filp);

	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);



	p9_debug(P9_DEBUG_VFS, "count %zu offset %lld\n",

		 iov_iter_count(to), iocb->ki_pos);



	if (v9ses->cache > CACHE_MMAP)

		return generic_file_read_iter(iocb, to);



	if (iocb->ki_filp->f_flags & O_NONBLOCK)

		ret = p9_client_read_once(fid, iocb->ki_pos, to, &err);

	else
@@ -396,6 +400,11 @@ v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	ssize_t retval;

	loff_t origin;

	int err = 0;

	struct inode *inode = file_inode(iocb->ki_filp);

	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);



	if (v9ses->cache >= CACHE_WRITEBACK)

		return generic_file_write_iter(iocb, from);



	retval = generic_write_checks(iocb, from);

	if (retval <= 0)
@@ -478,25 +487,16 @@ static int 
v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma)

{

	int retval;

	struct inode *inode = file_inode(filp);

	struct v9fs_inode *v9inode = V9FS_I(inode);

	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);

	struct p9_fid *fid;





	retval = generic_file_mmap(filp, vma);

	if (!retval)

		vma->vm_ops = &v9fs_file_vm_ops;



	return retval;

	if (v9ses->cache < CACHE_MMAP) {

		invalidate_inode_pages2(filp->f_mapping);

		return generic_file_readonly_mmap(filp, vma);

	}



static int

v9fs_mmap_file_mmap(struct file *filp, struct vm_area_struct *vma)

{

	int retval;

	struct inode *inode;

	struct v9fs_inode *v9inode;

	struct p9_fid *fid;



	inode = file_inode(filp);

	v9inode = V9FS_I(inode);

	mutex_lock(&v9inode->v_mutex);

	if (!v9inode->writeback_fid &&

	    (vma->vm_flags & VM_SHARED) &&
@@ -564,35 +564,6 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf) 
	return VM_FAULT_NOPAGE;

}



/**

 * v9fs_mmap_file_read_iter - read from a file

 * @iocb: The operation parameters

 * @to: The buffer to read into

 *

 */

static ssize_t

v9fs_mmap_file_read_iter(struct kiocb *iocb, struct iov_iter *to)

{

	/* TODO: Check if there are dirty pages */

	return v9fs_file_read_iter(iocb, to);

}



/**

 * v9fs_mmap_file_write_iter - write to a file

 * @iocb: The operation parameters

 * @from: The data to write

 *

 */

static ssize_t

v9fs_mmap_file_write_iter(struct kiocb *iocb, struct iov_iter *from)

{

	/*

	 * TODO: invalidate mmaps on filp's inode between

	 * offset and offset+count

	 */

	return v9fs_file_write_iter(iocb, from);

}



static void v9fs_mmap_vm_close(struct vm_area_struct *vma)

{

	struct inode *inode;
@@ -615,13 +586,6 @@ static void v9fs_mmap_vm_close(struct vm_area_struct *vma) 
	filemap_fdatawrite_wbc(inode->i_mapping, &wbc);

}





static const struct vm_operations_struct v9fs_file_vm_ops = {

	.fault = filemap_fault,

	.map_pages = filemap_map_pages,

	.page_mkwrite = v9fs_vm_page_mkwrite,

};



static const struct vm_operations_struct v9fs_mmap_file_vm_ops = {

	.close = v9fs_mmap_vm_close,

	.fault = filemap_fault,
@@ -629,34 +593,6 @@ static const struct vm_operations_struct v9fs_mmap_file_vm_ops = { 
	.page_mkwrite = v9fs_vm_page_mkwrite,

};





const struct file_operations v9fs_cached_file_operations = {

	.llseek = generic_file_llseek,

	.read_iter = generic_file_read_iter,

	.write_iter = generic_file_write_iter,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,

	.lock = v9fs_file_lock,

	.mmap = v9fs_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync,

};



const struct file_operations v9fs_cached_file_operations_dotl = {

	.llseek = generic_file_llseek,

	.read_iter = generic_file_read_iter,

	.write_iter = generic_file_write_iter,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,

	.lock = v9fs_file_lock_dotl,

	.flock = v9fs_file_flock_dotl,

	.mmap = v9fs_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync_dotl,

};



const struct file_operations v9fs_file_operations = {

	.llseek = generic_file_llseek,

	.read_iter = v9fs_file_read_iter,
@@ -678,34 +614,7 @@ const struct file_operations v9fs_file_operations_dotl = { 
	.release = v9fs_dir_release,

	.lock = v9fs_file_lock_dotl,

	.flock = v9fs_file_flock_dotl,

	.mmap = generic_file_readonly_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync_dotl,

};



const struct file_operations v9fs_mmap_file_operations = {

	.llseek = generic_file_llseek,

	.read_iter = v9fs_mmap_file_read_iter,

	.write_iter = v9fs_mmap_file_write_iter,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,

	.lock = v9fs_file_lock,

	.mmap = v9fs_mmap_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync,

};



const struct file_operations v9fs_mmap_file_operations_dotl = {

	.llseek = generic_file_llseek,

	.read_iter = v9fs_mmap_file_read_iter,

	.write_iter = v9fs_mmap_file_write_iter,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,

	.lock = v9fs_file_lock_dotl,

	.flock = v9fs_file_flock_dotl,

	.mmap = v9fs_mmap_file_mmap,

	.mmap = v9fs_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync_dotl,