v9fs: zero copy implementation
Latchesar Ionkov
maintainerPATCH 3/3 v9fs: zero copy implementation
Performance enhancement reducing the number of copies in the data and stat paths.
---
fs/9p/9p.c | 302 ++++++++++-------- fs/9p/9p.h | 75 +++- fs/9p/Makefile | 10 - fs/9p/conv.c | 895 ++++++++++++++++++++++++++++++---------------------- fs/9p/conv.h | 30 +- fs/9p/debug.h | 23 + fs/9p/error.c | 10 - fs/9p/error.h | 3 fs/9p/fid.c | 3 fs/9p/mux.c | 157 +++++---- fs/9p/trans_sock.c | 1 fs/9p/v9fs.c | 3 fs/9p/v9fs_vfs.h | 5 fs/9p/vfs_dentry.c | 4 fs/9p/vfs_dir.c | 31 +- fs/9p/vfs_file.c | 25 - fs/9p/vfs_inode.c | 545 ++++++++++---------------------- fs/9p/vfs_super.c | 10 - 18 files changed, 1084 insertions(+), 1048 deletions(-)
af748019fb2545d38422bd4338c96677769abab9
fs/9p/9p.c +176 -126
@@ -1,8 +1,9 @@/* * linux/fs/9p/9p.c * -* This file contains functions 9P2000 functions +* This file contains functions to perform synchronous 9P calls * +* Copyright (C) 2004 by Latchesar Ionkov <[email protected]> * Copyright (C) 2004 by Eric Van Hensbergen <[email protected]> * Copyright (C) 2002 by Ron Minnich <[email protected]> *
@@ -33,6 +34,7 @@#include "debug.h" #include "v9fs.h" #include "9p.h" +#include "conv.h" #include "mux.h" /**
@@ -46,17 +48,21 @@int v9fs_t_version (struct v9fs_session_info *v9ses,u32 msize, -char *version,struct v9fs_fcall **fcall) +char *version,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall *tc;dprintk (DEBUG_9P ,"msize: %d version: %s\n" , msize, version); - msg.id =TVERSION ; - msg.tag = ~0 ; - msg.params.tversion.msize = msize; - msg.params.tversion.version = version; + tc =v9fs_create_tversion (msize, version); -return v9fs_mux_rpc (v9ses->mux, &msg, fcall); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); + +return ret; }/**
@@ -72,19 +78,23 @@ v9fs_t_version(struct v9fs_session_infoint v9fs_t_attach (struct v9fs_session_info *v9ses,char *uname,char *aname, -u32 fid,u32 afid,struct v9fs_fcall **fcall) +u32 fid,u32 afid,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall * tc;dprintk (DEBUG_9P ,"uname '%s' aname '%s' fid %d afid %d\n" , uname, aname, fid, afid); - msg.id =TATTACH ; - msg.params.tattach.fid = fid; - msg.params.tattach.afid = afid; - msg.params.tattach.uname = uname; - msg.params.tattach.aname = aname; -return v9fs_mux_rpc (v9ses->mux, &msg, fcall); + ret = -ENOMEM ; + tc =v9fs_create_tattach (fid, afid, uname, aname); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); + +return ret; } static void v9fs_t_clunk_cb(void *a, struct v9fs_fcall *tc,
@@ -117,24 +127,28 @@ static void v9fs_t_clunk_cb(void *a, str* @fcall: pointer to response fcall pointer * */ +int v9fs_t_clunk (struct v9fs_session_info *v9ses,u32 fid) { -int err; +int ret;struct v9fs_fcall *tc, *rc; - tc =kmalloc (sizeof (struct v9fs_fcall ),GFP_KERNEL ); -dprintk (DEBUG_9P ,"fid %d\n" , fid); - tc->id =TCLUNK ; - tc->params.tclunk.fid = fid; - err =v9fs_mux_rpc (v9ses->mux, tc, &rc); -if (err >=0 ) { -v9fs_t_clunk_cb (v9ses, tc, rc,0 ); - } + ret = -ENOMEM ; + rc =NULL ; + tc =v9fs_create_tclunk (fid); +if (!IS_ERR (tc)) + ret =v9fs_mux_rpc (v9ses->mux, tc, &rc); +else + ret =PTR_ERR (tc); + +if (ret) +dprintk (DEBUG_ERROR ,"failed fid %d err %d\n" , fid, ret); -return err; +v9fs_t_clunk_cb (v9ses, tc, rc, ret); +return ret; }/**
@@ -144,14 +158,22 @@ v9fs_t_clunk(struct v9fs_session_info *v* */ -int v9fs_t_flush (struct v9fs_session_info *v9ses,u16 tag) +int v9fs_t_flush (struct v9fs_session_info *v9ses,u16 oldtag) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall *tc; -dprintk (DEBUG_9P ,"oldtag %d\n" , tag); - msg.id =TFLUSH ; - msg.params.tflush.oldtag = tag; -return v9fs_mux_rpc (v9ses->mux, &msg,NULL ); +dprintk (DEBUG_9P ,"oldtag %d\n" , oldtag); + + ret = -ENOMEM ; + tc =v9fs_create_tflush (oldtag); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc,NULL ); +kfree (tc); + }else + ret =PTR_ERR (tc); + +return ret; }/**
@@ -163,17 +185,22 @@ int v9fs_t_flush(struct v9fs_session_inf*/ int -v9fs_t_stat (struct v9fs_session_info *v9ses,u32 fid,struct v9fs_fcall **fcall) +v9fs_t_stat (struct v9fs_session_info *v9ses,u32 fid,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall *tc;dprintk (DEBUG_9P ,"fid %d\n" , fid); -if (fcall) - *fcall =NULL ; - msg.id =TSTAT ; - msg.params.tstat.fid = fid; -return v9fs_mux_rpc (v9ses->mux, &msg, fcall); + ret = -ENOMEM ; + tc =v9fs_create_tstat (fid); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); + +return ret; }/**
@@ -187,16 +214,22 @@ v9fs_t_stat(struct v9fs_session_info *v9int v9fs_t_wstat (struct v9fs_session_info *v9ses,u32 fid, -struct v9fs_stat *stat,struct v9fs_fcall **fcall) +struct v9fs_wstat *wstat,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall *tc; -dprintk (DEBUG_9P ,"fid %d length %d\n" , fid, (int )stat->length); - msg.id =TWSTAT ; - msg.params.twstat.fid = fid; - msg.params.twstat.stat = stat; +dprintk (DEBUG_9P ,"fid %d\n" , fid); + + ret = -ENOMEM ; + tc =v9fs_create_twstat (fid, wstat, v9ses->extended); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); -return v9fs_mux_rpc (v9ses->mux, &msg, fcall); +return ret; }/**
@@ -213,23 +246,28 @@ v9fs_t_wstat(struct v9fs_session_info *vint v9fs_t_walk (struct v9fs_session_info *v9ses,u32 fid,u32 newfid, -char *name,struct v9fs_fcall **fcall) +char *name,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall *tc; +int nwname;dprintk (DEBUG_9P ,"fid %d newfid %d wname '%s'\n" , fid, newfid, name); - msg.id =TWALK ; - msg.params.twalk.fid = fid; - msg.params.twalk.newfid = newfid; - -if (name) { - msg.params.twalk.nwname =1 ; - msg.params.twalk.wnames = &name; - }else { - msg.params.twalk.nwname =0 ; - } -return v9fs_mux_rpc (v9ses->mux, &msg, fcall); +if (name) + nwname =1 ; +else + nwname =0 ; + + ret = -ENOMEM ; + tc =v9fs_create_twalk (fid, newfid, nwname, &name); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); + +return ret; }/**
@@ -244,19 +282,22 @@ v9fs_t_walk(struct v9fs_session_info *v9int v9fs_t_open (struct v9fs_session_info *v9ses,u32 fid,u8 mode, -struct v9fs_fcall **fcall) +struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; -int errorno =-1 ; +int ret; +struct v9fs_fcall *tc;dprintk (DEBUG_9P ,"fid %d mode %d\n" , fid, mode); - msg.id =TOPEN ; - msg.params.topen.fid = fid; - msg.params.topen.mode = mode; - errorno =v9fs_mux_rpc (v9ses->mux, &msg, fcall); + ret = -ENOMEM ; + tc =v9fs_create_topen (fid, mode); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); -return errorno; +return ret; }/**
@@ -269,14 +310,22 @@ v9fs_t_open(struct v9fs_session_info *v9int v9fs_t_remove (struct v9fs_session_info *v9ses,u32 fid, -struct v9fs_fcall **fcall) +struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall *tc;dprintk (DEBUG_9P ,"fid %d\n" , fid); - msg.id =TREMOVE ; - msg.params.tremove.fid = fid; -return v9fs_mux_rpc (v9ses->mux, &msg, fcall); + + ret = -ENOMEM ; + tc =v9fs_create_tremove (fid); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); + +return ret; }/**
@@ -292,20 +341,23 @@ v9fs_t_remove(struct v9fs_session_info *int v9fs_t_create (struct v9fs_session_info *v9ses,u32 fid,char *name, -u32 perm,u8 mode,struct v9fs_fcall **fcall) +u32 perm,u8 mode,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; +int ret; +struct v9fs_fcall *tc;dprintk (DEBUG_9P ,"fid %d name '%s' perm %x mode %d\n" , fid, name, perm, mode); - msg.id =TCREATE ; - msg.params.tcreate.fid = fid; - msg.params.tcreate.name = name; - msg.params.tcreate.perm = perm; - msg.params.tcreate.mode = mode; + ret = -ENOMEM ; + tc =v9fs_create_tcreate (fid, name, perm, mode); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc); -return v9fs_mux_rpc (v9ses->mux, &msg, fcall); +return ret; }/**
@@ -320,31 +372,30 @@ v9fs_t_create(struct v9fs_session_info *int v9fs_t_read (struct v9fs_session_info *v9ses,u32 fid,u64 offset, -u32 count,struct v9fs_fcall **fcall) +u32 count,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; -struct v9fs_fcall *rc =NULL ; -long errorno =-1 ; - -dprintk (DEBUG_9P ,"fid %d offset 0x%lx count 0x%x\n" , fid, - (long unsigned int )offset, count); - msg.id =TREAD ; - msg.params.tread.fid = fid; - msg.params.tread.offset = offset; - msg.params.tread.count = count; - errorno =v9fs_mux_rpc (v9ses->mux, &msg, &rc); - -if (!errorno) { - errorno = rc->params.rread.count; -dump_data (rc->params.rread.data, rc->params.rread.count); - } +int ret; +struct v9fs_fcall *tc, *rc; -if (fcall) - *fcall = rc; -else -kfree (rc); +dprintk (DEBUG_9P ,"fid %d offset 0x%llux count 0x%x\n" , fid, + (long long unsigned ) offset, count); -return errorno; + ret = -ENOMEM ; + tc =v9fs_create_tread (fid, offset, count); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, &rc); +if (!ret) + ret = rc->params.rread.count; +if (rcp) + *rcp = rc; +else +kfree (rc); + +kfree (tc); + }else + ret =PTR_ERR (tc); + +return ret; }/**
@@ -358,32 +409,31 @@ v9fs_t_read(struct v9fs_session_info *v9*/ int -v9fs_t_write (struct v9fs_session_info *v9ses,u32 fid, -u64 offset,u32 count,void *data,struct v9fs_fcall **fcall) +v9fs_t_write (struct v9fs_session_info *v9ses,u32 fid,u64 offset,u32 count, +const char __user *data,struct v9fs_fcall **rcp) { -struct v9fs_fcall msg; -struct v9fs_fcall *rc =NULL ; -long errorno =-1 ; - -dprintk (DEBUG_9P ,"fid %d offset 0x%llx count 0x%x\n" , fid, - (unsigned long long )offset, count); -dump_data (data, count); - - msg.id =TWRITE ; - msg.params.twrite.fid = fid; - msg.params.twrite.offset = offset; - msg.params.twrite.count = count; - msg.params.twrite.data = data; +int ret; +struct v9fs_fcall *tc, *rc; - errorno =v9fs_mux_rpc (v9ses->mux, &msg, &rc); +dprintk (DEBUG_9P ,"fid %d offset 0x%llux count 0x%x\n" , fid, + (long long unsigned ) offset, count); -if (!errorno) - errorno = rc->params.rwrite.count; + ret = -ENOMEM ; + tc =v9fs_create_twrite (fid, offset, count, data); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, &rc); + +if (!ret) + ret = rc->params.rwrite.count; +if (rcp) + *rcp = rc; +else +kfree (rc); + +kfree (tc); + }else + ret =PTR_ERR (tc); -if (fcall) - *fcall = rc; -else -kfree (rc); - -return errorno; +return ret; } +
fs/9p/9p.h +54 -21
180 lines not on this page · raw message
fs/9p/Makefile +5 -5
@@ -1,17 +1,17 @@ obj-$(CONFIG_9P_FS) := 9p2000.o 9p2000-objs := \ + trans_fd.o \ + trans_sock.o \ + mux.o \ + 9p.o \ + conv.o \ vfs_super.o \ vfs_inode.o \ vfs_file.o \ vfs_dir.o \ vfs_dentry.o \ error.o \ - mux.o \ - trans_fd.o \ - trans_sock.o \ - 9p.o \ - conv.o \ v9fs.o \ fid.o
fs/9p/conv.c +518 -377
1,055 lines not on this page · raw message
fs/9p/conv.h +23 -7
@@ -1,8 +1,9 @@/* * linux/fs/9p/conv.h * -* 9P protocol conversion definitions +* 9P protocol conversion definitions. * +* Copyright (C) 2005 by Latchesar Ionkov <[email protected]> * Copyright (C) 2004 by Eric Van Hensbergen <[email protected]> * Copyright (C) 2002 by Ron Minnich <[email protected]> *
@@ -25,11 +26,26 @@*/ int v9fs_deserialize_stat (void *buf,u32 buflen,struct v9fs_stat *stat, -u32 statlen,int extended); -int v9fs_serialize_fcall (struct v9fs_fcall *tcall,void *buf,u32 buflen,int extended); -int v9fs_deserialize_fcall (void *buf,u32 buflen,struct v9fs_fcall *rcall, -int rcalllen,int extended); +int v9fs_deserialize_fcall (void *buf,u32 buflen,struct v9fs_fcall *rcall, +int extended); + +void v9fs_set_tag (struct v9fs_fcall *fc,u16 tag); -/* this one is actually in error.c right now */ -int v9fs_errstr2errno (char *errstr); +struct v9fs_fcall *v9fs_create_tversion (u32 msize,char *version); +struct v9fs_fcall *v9fs_create_tauth (u32 afid,char *uname,char *aname); +struct v9fs_fcall *v9fs_create_tattach (u32 fid,u32 afid,char *uname, +char *aname); +struct v9fs_fcall *v9fs_create_tflush (u16 oldtag); +struct v9fs_fcall *v9fs_create_twalk (u32 fid,u32 newfid,u16 nwname, +char **wnames); +struct v9fs_fcall *v9fs_create_topen (u32 fid,u8 mode); +struct v9fs_fcall *v9fs_create_tcreate (u32 fid,char *name,u32 perm,u8 mode); +struct v9fs_fcall *v9fs_create_tread (u32 fid,u64 offset,u32 count); +struct v9fs_fcall *v9fs_create_twrite (u32 fid,u64 offset,u32 count, +const char __user *data); +struct v9fs_fcall *v9fs_create_tclunk (u32 fid); +struct v9fs_fcall *v9fs_create_tremove (u32 fid); +struct v9fs_fcall *v9fs_create_tstat (u32 fid); +struct v9fs_fcall *v9fs_create_twstat (u32 fid,struct v9fs_wstat *wstat, +int extended);
fs/9p/debug.h +15 -8
@@ -51,16 +51,23 @@ do { \#if DEBUG_DUMP_PKT static inline void dump_data (const unsigned char *data,unsigned int datalen) { -int i, j; -int len = datalen; +int i, n; +char buf[5 *8 ]; -printk (KERN_DEBUG "data " ); -for (i =0 ; i < len; i +=4 ) { -for (j =0 ; (j <4 ) && (i + j < len); j++) -printk (KERN_DEBUG "%02x" , data[i + j]); -printk (KERN_DEBUG " " ); + n =0 ; + i =0 ; +while (i < datalen) { + n +=snprintf (buf+n,sizeof (buf)-n,"%02x" , data[i++]); +if (i%4 ==0 ) + n +=snprintf (buf+n,sizeof (buf)-n," " ); + +if (i%16 ==0 ) { +dprintk (DEBUG_ERROR ,"%s\n" , buf); + n =0 ; + } } -printk (KERN_DEBUG "\n" ); + +dprintk (DEBUG_ERROR ,"%s\n" , buf); }#else /* DEBUG_DUMP_PKT */ static inline void dump_data (const unsigned char *data,unsigned int datalen)
fs/9p/error.c +5 -5
@@ -33,7 +33,6 @@#include <linux/list.h> #include <linux/jhash.h> -#include <linux/string.h> #include "debug.h" #include "error.h"
@@ -55,7 +54,8 @@ int v9fs_error_init(void)/* load initial error map into hash table */ for (c = errmap; c->name !=NULL ; c++) { - bucket =jhash (c->name,strlen (c->name),0 ) %ERRHASHSZ ; + c->namelen =strlen (c->name); + bucket =jhash (c->name, c->namelen,0 ) %ERRHASHSZ ;INIT_HLIST_NODE (&c->list);hlist_add_head (&c->list, &hash_errmap[bucket]); }
@@ -69,15 +69,15 @@ int v9fs_error_init(void)* */ -int v9fs_errstr2errno (char *errstr) +int v9fs_errstr2errno (char *errstr,int len) {int errno =0 ;struct hlist_node *p =NULL ;struct errormap *c =NULL ; -int bucket =jhash (errstr,strlen (errstr),0 ) %ERRHASHSZ ; +int bucket =jhash (errstr, len,0 ) %ERRHASHSZ ;hlist_for_each_entry (c, p, &hash_errmap[bucket], list) { -if (!strcmp (c->name, errstr)) { +if (c->namelen==len && !memcmp (c->name, errstr, len)) { errno = c->val;break ; }
fs/9p/error.h +2 -1
@@ -36,6 +36,7 @@ struct errormap {char *name;int val; +int namelen;struct hlist_node list; };
@@ -175,4 +176,4 @@ static struct errormap errmap[] = { };extern int v9fs_error_init (void ); -extern int v9fs_errstr2errno (char *errstr); +extern int v9fs_errstr2errno (char *errstr,int len);
fs/9p/fid.c +0 -3
@@ -31,9 +31,6 @@#include "v9fs.h" #include "9p.h" #include "v9fs_vfs.h" -#include "transport.h" -#include "mux.h" -#include "conv.h" #include "fid.h" /**
fs/9p/mux.c +86 -71
308 lines not on this page · raw message
fs/9p/trans_sock.c +0 -1
@@ -109,7 +109,6 @@ static int v9fs_sock_send(struct v9fs_trif (!(ts->filp->f_flags &O_NONBLOCK ))dprintk (DEBUG_ERROR ,"blocking write ...\n" ); -dump_data (v, len); oldfs =get_fs ();set_fs (get_ds ()); ret =vfs_write (ts->filp, (void __user *)v, len, &ts->filp->f_pos);
fs/9p/v9fs.c +1 -2
@@ -37,7 +37,6 @@#include "v9fs_vfs.h" #include "transport.h" #include "mux.h" -#include "conv.h" /* TODO: sysfs or debugfs interface */ int v9fs_debug_level =0 ;/* feature-rific global debug level */
@@ -353,7 +352,7 @@ v9fs_session_init(struct v9fs_session_in }/* Really should check for 9P1 and report error */ -if (!strcmp (fcall->params.rversion.version,"9P2000.u" )) { +if (!v9fs_str_compare ("9P2000.u" , &fcall->params.rversion.version)) {dprintk (DEBUG_9P ,"9P2000 UNIX extensions enabled\n" ); v9ses->extended =1 ; }else {
fs/9p/v9fs_vfs.h +2 -3
@@ -45,9 +45,8 @@ extern struct dentry_operations v9fs_denstruct inode *v9fs_get_inode (struct super_block *sb,int mode);ino_t v9fs_qid2ino (struct v9fs_qid *qid); -void v9fs_mistat2inode (struct v9fs_stat *,struct inode *, -struct super_block *); +void v9fs_stat2inode (struct v9fs_stat *,struct inode *,struct super_block *);int v9fs_dir_release (struct inode *inode,struct file *filp);int v9fs_file_open (struct inode *inode,struct file *file); -void v9fs_inode2mistat (struct inode *inode,struct v9fs_stat *mistat); +void v9fs_inode2stat (struct inode *inode,struct v9fs_stat *stat);void v9fs_dentry_release (struct dentry *);
fs/9p/vfs_dentry.c +2 -2
@@ -40,7 +40,6 @@#include "v9fs.h" #include "9p.h" #include "v9fs_vfs.h" -#include "conv.h" #include "fid.h" /**
@@ -108,7 +107,8 @@ void v9fs_dentry_release(struct dentry * err =v9fs_t_clunk (current_fid->v9ses, current_fid->fid);if (err <0 ) -dprintk (DEBUG_ERROR ,"clunk failed: %d\n" , err); +dprintk (DEBUG_ERROR ,"clunk failed: %d name %s\n" , + err, dentry->d_iname);v9fs_fid_destroy (current_fid); }
fs/9p/vfs_dir.c +13 -18
@@ -37,8 +37,8 @@#include "debug.h" #include "v9fs.h" #include "9p.h" -#include "v9fs_vfs.h" #include "conv.h" +#include "v9fs_vfs.h" #include "fid.h" /**
@@ -77,17 +77,13 @@ static int v9fs_dir_readdir(struct fileunsigned int i, n, s;int fid =-1 ;int ret =0 ; -struct v9fs_stat *mi =NULL ; +struct v9fs_stat stat;int over =0 ;dprintk (DEBUG_VFS ,"name %s\n" , filp->f_dentry->d_name.name); fid = file->fid; - mi =kmalloc (v9ses->maxdata,GFP_KERNEL ); -if (!mi) -return -ENOMEM ; -if (file->rdir_fcall && (filp->f_pos != file->rdir_pos)) {kfree (file->rdir_fcall); file->rdir_fcall =NULL ;
@@ -99,18 +95,18 @@ static int v9fs_dir_readdir(struct filewhile (i < n) { s =v9fs_deserialize_stat ( file->rdir_fcall->params.rread.data + i, - n - i, mi, v9ses->maxdata, v9ses->extended); + n - i, &stat, v9ses->extended);if (s ==0 ) {dprintk (DEBUG_ERROR , -"error while deserializing mistat\n" ); +"error while deserializing stat\n" ); ret = -EIO ; goto FreeStructs; } - over =filldir (dirent, mi->name,strlen (mi->name), - filp->f_pos,v9fs_qid2ino (&mi->qid), -dt_type (mi)); + over =filldir (dirent, stat.name.str, stat.name.len, + filp->f_pos,v9fs_qid2ino (&stat.qid), +dt_type (&stat));if (over) { file->rdir_fpos = i;
@@ -130,7 +126,7 @@ static int v9fs_dir_readdir(struct filewhile (!over) { ret =v9fs_t_read (v9ses, fid, filp->f_pos, - v9ses->maxdata-V9FS_IOHDRSZ , &fcall); + v9ses->maxdata-V9FS_IOHDRSZ , &fcall);if (ret <0 ) {dprintk (DEBUG_ERROR ,"error while reading: %d: %p\n" , ret, fcall);
@@ -142,17 +138,17 @@ static int v9fs_dir_readdir(struct file i =0 ;while (i < n) { s =v9fs_deserialize_stat (fcall->params.rread.data + i, - n - i, mi, v9ses->maxdata, v9ses->extended); + n - i, &stat, v9ses->extended);if (s ==0 ) {dprintk (DEBUG_ERROR , -"error while deserializing mistat\n" ); +"error while deserializing stat\n" );return -EIO ; } - over =filldir (dirent, mi->name,strlen (mi->name), - filp->f_pos,v9fs_qid2ino (&mi->qid), -dt_type (mi)); + over =filldir (dirent, stat.name.str, stat.name.len, + filp->f_pos,v9fs_qid2ino (&stat.qid), +dt_type (&stat));if (over) { file->rdir_fcall = fcall;
@@ -171,7 +167,6 @@ static int v9fs_dir_readdir(struct file FreeStructs:kfree (fcall); -kfree (mi);return ret; }
fs/9p/vfs_file.c +4 -21
@@ -32,6 +32,7 @@#include <linux/string.h> #include <linux/smp_lock.h> #include <linux/inet.h> +#include <linux/version.h> #include <linux/list.h> #include <asm/uaccess.h> #include <linux/idr.h>
@@ -117,9 +118,7 @@ int v9fs_file_open(struct inode *inode, result =v9fs_t_open (v9ses, newfid, open_mode, &fcall);if (result <0 ) { -dprintk (DEBUG_ERROR , -"open failed, open_mode 0x%x: %s\n" , open_mode, -FCALL_ERROR (fcall)); +PRINT_FCALL_ERROR ("open failed" , fcall);kfree (fcall);return result; }
@@ -257,7 +256,6 @@ v9fs_file_write(struct file *filp, constint result = -EIO ;int rsize =0 ;int total =0 ; -char *buf;dprintk (DEBUG_VFS ,"data %p count %d offset %x\n" , data, (int )count, (int )*offset);
@@ -265,28 +263,14 @@ v9fs_file_write(struct file *filp, constif (v9fid->iounit !=0 && rsize > v9fid->iounit) rsize = v9fid->iounit; - buf =kmalloc (v9ses->maxdata -V9FS_IOHDRSZ ,GFP_KERNEL ); -if (!buf) -return -ENOMEM ; - do { if (count < rsize) rsize = count; - result = copy_from_user(buf, data, rsize); - if (result) { - dprintk(DEBUG_ERROR, "Problem copying from user\n"); - kfree(buf); - return -EFAULT; - } - - dump_data(buf, rsize); - result = v9fs_t_write(v9ses, fid, *offset, rsize, buf, &fcall); + result = v9fs_t_write(v9ses, fid, *offset, rsize, data, &fcall); if (result < 0) { - eprintk(KERN_ERR, "error while writing: %s(%d)\n", - FCALL_ERROR(fcall), result); + PRINT_FCALL_ERROR("error while writing", fcall); kfree(fcall); - kfree(buf); return result; } else *offset += result;
@@ -306,7 +290,6 @@ v9fs_file_write(struct file *filp, const total += result; }while (count); -kfree (buf);return total; }
fs/9p/vfs_inode.c +173 -372
674 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.0.6
Part of the diff is not shown here. View the raw message.
Quoted 28 lines · Latchesar Ionkov
Performance enhancement reducing the number of copies in the data and stat paths.
...
fs/9p/mux.c +2
-1@@ -35,8 +35,8 @@#include "debug.h" #include "v9fs.h" #include "9p.h" -#include "transport.h" #include "conv.h" +#include "transport.h" #include "mux.h" #define NELEM (x) (sizeof(x) / sizeof((x)[0]))@@ -76,6 +76,7 @@ struct v9fs_mux_data {wait_queue_head_t equeue;struct list_head req_list;struct list_head unsent_req_list; +struct v9fs_fcall *rcall;int rpos;char *rbuf;int wpos;
fs/9p/mux.c struct v9fs_mux_rpc { · line 108
Quoted 5 lines
fs/9p/mux.c +2
-0@@ -103,11 +104,15 @@ struct v9fs_mux_rpc {wait_queue_head_t wqueue; }; +extern int v9fs_errstr2errno (char *str,int len); +
Please don't put extern declarations in .c files. This declaraton is already in error.h so I suspect it can just be axed.
Quoted 11 lines
fs/9p/mux.c +2
-0static int v9fs_poll_proc (void *);static void v9fs_read_work (void *);static void v9fs_write_work (void *);static void v9fs_pollwait (struct file *filp,wait_queue_head_t * wait_address,poll_table * p); +static u16 v9fs_mux_get_tag (struct v9fs_mux_data *); +static void v9fs_mux_put_tag (struct v9fs_mux_data *,u16 );static DECLARE_MUTEX (v9fs_mux_task_lock);static struct workqueue_struct *v9fs_mux_wq;
fs/9p/mux.c static void v9fs_mux_poll_start(struct v · line 178
Quoted 8 lines
fs/9p/mux.c +3
-2@@ -168,8 +173,9 @@ static void v9fs_mux_poll_start(struct vif (v9fs_mux_poll_tasks[i].task ==NULL ) { vpt = &v9fs_mux_poll_tasks[i];dprintk (DEBUG_MUX ,"create proc %p\n" , vpt); - vpt->task =kthread_create (v9fs_poll_proc, - vpt,"v9fs-poll" ); + vpt->task = +kthread_create (v9fs_poll_proc, vpt, +"v9fs-poll" );
What happens if kthread_create() fails?
fs/9p/mux.c
Quoted 8 lines
fs/9p/mux.c +1
-1dprintk (DEBUG_VFS ," \n" ); - v9ses =kcalloc (1 ,sizeof (struct v9fs_session_info ),GFP_KERNEL ); + v9ses =kmalloc (sizeof (struct v9fs_session_info ),GFP_KERNEL );fs/9p/mux.c +1
-0if (!v9ses)return ERR_PTR (-ENOMEM ); +memset (v9ses,0 ,sizeof (struct v9fs_session_info ));
We have nice kzalloc() which does this. (If/when this is changed, please convert all of v9fs in one patch).
Quoted 4 lines · Latchesar Ionkov
v9fs_t_attach(struct
v9fs_session_info*v9ses, char *uname, char *aname,fs/9p/9p.c +1
-1- u32 fid, u32 afid, struct v9fs_fcall **fcall) + u32 fid, u32 afid, struct v9fs_fcall **rcp) {
[snip]
Review
Quoted 3 lines
(quoted diff) +1
-1- return v9fs_mux_rpc(v9ses->mux, &msg, fcall); + ret = -ENOMEM;
This assignment is redundant. You always override it below.
fs/9p/9p.c v9fs_t_version(struct v9fs_session_info · line 95
Quoted 6 lines
fs/9p/9p.c +6
-0+ tc =v9fs_create_tattach (fid, afid, uname, aname); +if (!IS_ERR (tc)) { + ret =v9fs_mux_rpc (v9ses->mux, tc, rcp); +kfree (tc); + }else + ret =PTR_ERR (tc);
[seen in various other places as well]
Quoted 6 lines
fs/9p/9p.h +4
-0+struct v9fs_str { +u16 len; +char *str; +};
[snip]
Quoted 20 lines
fs/9p/9p.h +20
-0+char *v9fs_str_copy (char *buf,int buflen,struct v9fs_str *str) +{ +int n; + +if (buflen < str->len) + n = buflen; +else + n = str->len; + +memmove (buf, str->str, n -1 ); + +return buf; +} + +int v9fs_str_compare (char *buf,struct v9fs_str *str) +{ +int n, ret; + + ret =strncmp (buf, str->str, str->len); +
fs/9p/9p.h
Quoted 10 lines
fs/9p/9p.h +10
-0+if (!ret) { + n =strlen (buf); +if (n < str->len) + ret =-1 ; +else if (n > str->len) + ret =1 ; + } + +return ret; +}
Do you really need these? If yes, could you please put them in lib/?
Pekka
fs/9p/conv.c struct cbuf { · line 60
Quoted 13 lines
fs/9p/conv.c +13
-0+char *v9fs_str_copy (char *buf,int buflen,struct v9fs_str *str) +{ +int n; + +if (buflen < str->len) + n = buflen; +else + n = str->len; + +memmove (buf, str->str, n -1 ); + +return buf; +}
The above is wrong. You'll chop the end of the string off when str->len <= buflen.
n = str->len;
if (n > buflen-1)
n = buflen-1;
memmove(buf, str->str, n);
buf[n] = 0;
Quoted 6 lines
fs/9p/conv.c +6
-0+int v9fs_str_compare (char *buf,struct v9fs_str *str) +{ +int n, ret; + + ret =strncmp (buf, str->str, str->len); +
fs/9p/conv.c struct cbuf { · line 77
Quoted 10 lines
fs/9p/conv.c +10
-0+if (!ret) { + n =strlen (buf); +if (n < str->len) + ret =-1 ; +else if (n > str->len) + ret =1 ; + } + +return ret; +}
You go through all this work to avoid copying the strings, which has questionable benefit, and then this routine walks the length of the string twice, unnecessarily. Also if strlen(buf) < str->len, then strncmp can't return 0.
ret = strncmp(buf, str->str, str->len);
if (!ret && buf[str->len])
ret = 1;
return ret;
Quoted 2 lines
static inline int
buf_check_size(struct cbuf *buf, int len){
[snip deleted lines]
fs/9p/conv.c static inline int buf_check_overflow(str · line 100
Quoted 9 lines
fs/9p/conv.c +6
-0+if (buf->p + len > buf->ep && buf->p < buf->ep) { +eprintk (KERN_ERR ,"buffer overflow: want %d has %d\n" , + len, (int )(buf->ep - buf->p)); +dump_stack (); + buf->p = buf->ep +1 ; +return 0 ; }return 1 ;
I think it's weird that you return 1 when you've already overflowed. It's fine that you don't print more than once, but what's the harm in returning 0 always when buf->p + len > buf->ep?
Russ
Latchesar Ionkov
maintainerQuoted 9 lines · Russ Cox
Quoted 9 lines
fs/9p/conv.c +9
-0+char *v9fs_str_copy (char *buf,int buflen,struct v9fs_str *str) +{ +int n; + +if (buflen < str->len) + n = buflen; +else + n = str->len; +
Quoted 8 lines
fs/9p/conv.c struct cbuf { · line 60
Quoted 4 lines
fs/9p/conv.c +4
-0+memmove (buf, str->str, n -1 ); + +return buf; +}The above is wrong. You'll chop the end of the string off when
str->len<= buflen.
You are right.
Quoted 20 lines
n =
str->len;
if (n > buflen-1)n = buflen-1;
memmove(buf, str->str, n);
buf[n] = 0;Quoted 13 lines
fs/9p/conv.c +13
-0+int v9fs_str_compare (char *buf,struct v9fs_str *str) +{ +int n, ret; + + ret =strncmp (buf, str->str, str->len); + +if (!ret) { + n =strlen (buf); +if (n < str->len) + ret =-1 ; +else if (n > str->len) + ret =1 ; + }
Quoted 8 lines
fs/9p/conv.c struct cbuf { · line 77
Quoted 3 lines
fs/9p/conv.c +3
-0+ +return ret; +}You go through all this work to avoid copying the strings, which has questionable benefit, and then this routine walks the length of the string twice, unnecessarily. Also if strlen(buf) <
str->len, then strncmp can't return 0.
I avoid copying the strings not because of the copy itself, but to not bother freeing them when v9fs_fcall structure is freed. You are right, the logic is wrong. I was trying (obviously unsuccessfully) to match strcmp semantics, although I only use the function to check for equality of the strings.
Quoted 17 lines
ret =
strncmp(buf, str->str, str->len);
if (!ret && buf[str->len])ret = 1;return ret;
Quoted 2 lines
static inline int
buf_check_size(struct cbuf *buf, int len){[snip deleted lines]
Quoted 8 lines
fs/9p/conv.c +6
-0+if (buf->p + len > buf->ep && buf->p < buf->ep) { +eprintk (KERN_ERR ,"buffer overflow: want %d has %d\n" , + len, (int )(buf->ep - buf->p)); +dump_stack (); + buf->p = buf->ep +1 ; +return 0 ; }
Quoted 5 lines
Quoted 1 line
return 1;I think it's weird that you return 1 when you've already overflowed. It's fine that you don't print more than once, but what's the harm in returning 0 always when
buf->p+ len >buf->ep?
It is not just weird, it is wrong and can lead to writing outside of the buffer.
Thanks for reviewing the code.
Lucho