Skip to content

L
linux
Commit 3cf6429a authored by Latchesar Ionkov's avatar Latchesar Ionkov Committed by Linus Torvalds
Browse files
Options

[PATCH] v9fs: new multiplexer implementation 

New multiplexer implementation. Decreases the number of kernel threads
required. Better handling when the user process receives a signal.
Signed-off-by: default avatarLatchesar Ionkov <lucho@ionkov.net>
Cc: Eric Van Hensbergen <ericvh@ericvh.myip.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f5ef3c10
Hide whitespace changes
Inline Side-by-side
Showing with 1172 additions and 562 deletions
fs/9p/9p.c
View file @ 3cf6429a
...@@ -52,10 +52,11 @@ v9fs_t_version(struct v9fs_session_info *v9ses, u32 msize, ...@@ -52,10 +52,11 @@ v9fs_t_version(struct v9fs_session_info *v9ses, u32 msize,
dprintk(DEBUG_9P, "msize: %d version: %s\n", msize, version); dprintk(DEBUG_9P, "msize: %d version: %s\n", msize, version);
msg.id = TVERSION; msg.id = TVERSION;
msg.tag = ~0;
msg.params.tversion.msize = msize; msg.params.tversion.msize = msize;
msg.params.tversion.version = version; msg.params.tversion.version = version;
return v9fs_mux_rpc(v9ses, &msg, fcall); return v9fs_mux_rpc(v9ses->mux, &msg, fcall);
} }
/** /**
...@@ -83,7 +84,30 @@ v9fs_t_attach(struct v9fs_session_info *v9ses, char *uname, char *aname, ...@@ -83,7 +84,30 @@ v9fs_t_attach(struct v9fs_session_info *v9ses, char *uname, char *aname,
msg.params.tattach.uname = uname; msg.params.tattach.uname = uname;
msg.params.tattach.aname = aname; msg.params.tattach.aname = aname;
return v9fs_mux_rpc(v9ses, &msg, fcall); return v9fs_mux_rpc(v9ses->mux, &msg, fcall);
}
static void v9fs_t_clunk_cb(void *a, struct v9fs_fcall *tc,
struct v9fs_fcall *rc, int err)
{
int fid;
struct v9fs_session_info *v9ses;
if (err)
return;
fid = tc->params.tclunk.fid;
kfree(tc);
if (!rc)
return;
dprintk(DEBUG_9P, "tcall id %d rcall id %d\n", tc->id, rc->id);
v9ses = a;
if (rc->id == RCLUNK)
v9fs_put_idpool(fid, &v9ses->fidpool);
kfree(rc);
} }
/** /**
...@@ -93,18 +117,24 @@ v9fs_t_attach(struct v9fs_session_info *v9ses, char *uname, char *aname, ...@@ -93,18 +117,24 @@ v9fs_t_attach(struct v9fs_session_info *v9ses, char *uname, char *aname,
* @fcall: pointer to response fcall pointer * @fcall: pointer to response fcall pointer
* *
*/ */
int int
v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid, v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid)
struct v9fs_fcall **fcall)
{ {
struct v9fs_fcall msg; int err;
struct v9fs_fcall *tc, *rc;
tc = kmalloc(sizeof(struct v9fs_fcall), GFP_KERNEL);
dprintk(DEBUG_9P, "fid %d\n", fid); dprintk(DEBUG_9P, "fid %d\n", fid);
msg.id = TCLUNK; tc->id = TCLUNK;
msg.params.tclunk.fid = fid; tc->params.tclunk.fid = fid;
return v9fs_mux_rpc(v9ses, &msg, fcall); err = v9fs_mux_rpc(v9ses->mux, tc, &rc);
if (err >= 0) {
v9fs_t_clunk_cb(v9ses, tc, rc, 0);
}
return err;
} }
/** /**
...@@ -121,7 +151,7 @@ int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 tag) ...@@ -121,7 +151,7 @@ int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 tag)
dprintk(DEBUG_9P, "oldtag %d\n", tag); dprintk(DEBUG_9P, "oldtag %d\n", tag);
msg.id = TFLUSH; msg.id = TFLUSH;
msg.params.tflush.oldtag = tag; msg.params.tflush.oldtag = tag;
return v9fs_mux_rpc(v9ses, &msg, NULL); return v9fs_mux_rpc(v9ses->mux, &msg, NULL);
} }
/** /**
...@@ -143,7 +173,7 @@ v9fs_t_stat(struct v9fs_session_info *v9ses, u32 fid, struct v9fs_fcall **fcall) ...@@ -143,7 +173,7 @@ v9fs_t_stat(struct v9fs_session_info *v9ses, u32 fid, struct v9fs_fcall **fcall)
msg.id = TSTAT; msg.id = TSTAT;
msg.params.tstat.fid = fid; msg.params.tstat.fid = fid;
return v9fs_mux_rpc(v9ses, &msg, fcall); return v9fs_mux_rpc(v9ses->mux, &msg, fcall);
} }
/** /**
...@@ -166,7 +196,7 @@ v9fs_t_wstat(struct v9fs_session_info *v9ses, u32 fid, ...@@ -166,7 +196,7 @@ v9fs_t_wstat(struct v9fs_session_info *v9ses, u32 fid,
msg.params.twstat.fid = fid; msg.params.twstat.fid = fid;
msg.params.twstat.stat = stat; msg.params.twstat.stat = stat;
return v9fs_mux_rpc(v9ses, &msg, fcall); return v9fs_mux_rpc(v9ses->mux, &msg, fcall);
} }
/** /**
...@@ -199,7 +229,7 @@ v9fs_t_walk(struct v9fs_session_info *v9ses, u32 fid, u32 newfid, ...@@ -199,7 +229,7 @@ v9fs_t_walk(struct v9fs_session_info *v9ses, u32 fid, u32 newfid,
msg.params.twalk.nwname = 0; msg.params.twalk.nwname = 0;
} }
return v9fs_mux_rpc(v9ses, &msg, fcall); return v9fs_mux_rpc(v9ses->mux, &msg, fcall);
} }
/** /**
...@@ -217,14 +247,14 @@ v9fs_t_open(struct v9fs_session_info *v9ses, u32 fid, u8 mode, ...@@ -217,14 +247,14 @@ v9fs_t_open(struct v9fs_session_info *v9ses, u32 fid, u8 mode,
struct v9fs_fcall **fcall) struct v9fs_fcall **fcall)
{ {
struct v9fs_fcall msg; struct v9fs_fcall msg;
long errorno = -1; int errorno = -1;
dprintk(DEBUG_9P, "fid %d mode %d\n", fid, mode); dprintk(DEBUG_9P, "fid %d mode %d\n", fid, mode);
msg.id = TOPEN; msg.id = TOPEN;
msg.params.topen.fid = fid; msg.params.topen.fid = fid;
msg.params.topen.mode = mode; msg.params.topen.mode = mode;
errorno = v9fs_mux_rpc(v9ses, &msg, fcall); errorno = v9fs_mux_rpc(v9ses->mux, &msg, fcall);
return errorno; return errorno;
} }
...@@ -246,7 +276,7 @@ v9fs_t_remove(struct v9fs_session_info *v9ses, u32 fid, ...@@ -246,7 +276,7 @@ v9fs_t_remove(struct v9fs_session_info *v9ses, u32 fid,
dprintk(DEBUG_9P, "fid %d\n", fid); dprintk(DEBUG_9P, "fid %d\n", fid);
msg.id = TREMOVE; msg.id = TREMOVE;
msg.params.tremove.fid = fid; msg.params.tremove.fid = fid;
return v9fs_mux_rpc(v9ses, &msg, fcall); return v9fs_mux_rpc(v9ses->mux, &msg, fcall);
} }
/** /**
...@@ -275,7 +305,7 @@ v9fs_t_create(struct v9fs_session_info *v9ses, u32 fid, char *name, ...@@ -275,7 +305,7 @@ v9fs_t_create(struct v9fs_session_info *v9ses, u32 fid, char *name,
msg.params.tcreate.perm = perm; msg.params.tcreate.perm = perm;
msg.params.tcreate.mode = mode; msg.params.tcreate.mode = mode;
return v9fs_mux_rpc(v9ses, &msg, fcall); return v9fs_mux_rpc(v9ses->mux, &msg, fcall);
} }
/** /**
...@@ -302,7 +332,7 @@ v9fs_t_read(struct v9fs_session_info *v9ses, u32 fid, u64 offset, ...@@ -302,7 +332,7 @@ v9fs_t_read(struct v9fs_session_info *v9ses, u32 fid, u64 offset,
msg.params.tread.fid = fid; msg.params.tread.fid = fid;
msg.params.tread.offset = offset; msg.params.tread.offset = offset;
msg.params.tread.count = count; msg.params.tread.count = count;
errorno = v9fs_mux_rpc(v9ses, &msg, &rc); errorno = v9fs_mux_rpc(v9ses->mux, &msg, &rc);
if (!errorno) { if (!errorno) {
errorno = rc->params.rread.count; errorno = rc->params.rread.count;
...@@ -345,7 +375,7 @@ v9fs_t_write(struct v9fs_session_info *v9ses, u32 fid, ...@@ -345,7 +375,7 @@ v9fs_t_write(struct v9fs_session_info *v9ses, u32 fid,
msg.params.twrite.count = count; msg.params.twrite.count = count;
msg.params.twrite.data = data; msg.params.twrite.data = data;
errorno = v9fs_mux_rpc(v9ses, &msg, &rc); errorno = v9fs_mux_rpc(v9ses->mux, &msg, &rc);
if (!errorno) if (!errorno)
errorno = rc->params.rwrite.count; errorno = rc->params.rwrite.count;
......
fs/9p/9p.h
View file @ 3cf6429a
...@@ -100,6 +100,9 @@ enum { ...@@ -100,6 +100,9 @@ enum {
V9FS_QTFILE = 0x00, V9FS_QTFILE = 0x00,
}; };
#define V9FS_NOTAG (u16)(~0)
#define V9FS_NOFID (u32)(~0)
/* ample room for Twrite/Rread header (iounit) */ /* ample room for Twrite/Rread header (iounit) */
#define V9FS_IOHDRSZ 24 #define V9FS_IOHDRSZ 24
...@@ -303,6 +306,9 @@ struct v9fs_fcall { ...@@ -303,6 +306,9 @@ struct v9fs_fcall {
} params; } params;
}; };
#define V9FS_FCALLHDRSZ (sizeof(struct v9fs_fcall) + \
sizeof(struct v9fs_stat) + 16*sizeof(struct v9fs_qid) + 16)
#define FCALL_ERROR(fcall) (fcall ? fcall->params.rerror.error : "") #define FCALL_ERROR(fcall) (fcall ? fcall->params.rerror.error : "")
int v9fs_t_version(struct v9fs_session_info *v9ses, u32 msize, int v9fs_t_version(struct v9fs_session_info *v9ses, u32 msize,
...@@ -311,8 +317,7 @@ int v9fs_t_version(struct v9fs_session_info *v9ses, u32 msize, ...@@ -311,8 +317,7 @@ int v9fs_t_version(struct v9fs_session_info *v9ses, u32 msize,
int v9fs_t_attach(struct v9fs_session_info *v9ses, char *uname, char *aname, int v9fs_t_attach(struct v9fs_session_info *v9ses, char *uname, char *aname,
u32 fid, u32 afid, struct v9fs_fcall **rcall); u32 fid, u32 afid, struct v9fs_fcall **rcall);
int v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid, int v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid);
struct v9fs_fcall **rcall);
int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 oldtag); int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 oldtag);
......
fs/9p/conv.c
View file @ 3cf6429a
...@@ -208,7 +208,7 @@ static inline char *buf_get_stringb(struct cbuf *buf, struct cbuf *sbuf) ...@@ -208,7 +208,7 @@ static inline char *buf_get_stringb(struct cbuf *buf, struct cbuf *sbuf)
len = buf_get_int16(buf); len = buf_get_int16(buf);
if (!buf_check_overflow(buf) && buf_check_size(buf, len) && if (!buf_check_overflow(buf) && buf_check_size(buf, len) &&
buf_check_size(sbuf, len+1)) { buf_check_size(sbuf, len + 1)) {
memcpy(sbuf->p, buf->p, len); memcpy(sbuf->p, buf->p, len);
sbuf->p[len] = 0; sbuf->p[len] = 0;
...@@ -252,13 +252,12 @@ static inline void *buf_get_datab(struct cbuf *buf, struct cbuf *dbuf, ...@@ -252,13 +252,12 @@ static inline void *buf_get_datab(struct cbuf *buf, struct cbuf *dbuf,
/** /**
* v9fs_size_stat - calculate the size of a variable length stat struct * v9fs_size_stat - calculate the size of a variable length stat struct
* @v9ses: session information
* @stat: metadata (stat) structure * @stat: metadata (stat) structure
* @extended: non-zero if 9P2000.u
* *
*/ */
static int v9fs_size_stat(struct v9fs_session_info *v9ses, static int v9fs_size_stat(struct v9fs_stat *stat, int extended)
struct v9fs_stat *stat)
{ {
int size = 0; int size = 0;
...@@ -288,7 +287,7 @@ static int v9fs_size_stat(struct v9fs_session_info *v9ses, ...@@ -288,7 +287,7 @@ static int v9fs_size_stat(struct v9fs_session_info *v9ses,
if (stat->muid) if (stat->muid)
size += strlen(stat->muid); size += strlen(stat->muid);
if (v9ses->extended) { if (extended) {
size += 4 + /* n_uid[4] */ size += 4 + /* n_uid[4] */
4 + /* n_gid[4] */ 4 + /* n_gid[4] */
4 + /* n_muid[4] */ 4 + /* n_muid[4] */
...@@ -302,15 +301,14 @@ static int v9fs_size_stat(struct v9fs_session_info *v9ses, ...@@ -302,15 +301,14 @@ static int v9fs_size_stat(struct v9fs_session_info *v9ses,
/** /**
* serialize_stat - safely format a stat structure for transmission * serialize_stat - safely format a stat structure for transmission
* @v9ses: session info
* @stat: metadata (stat) structure * @stat: metadata (stat) structure
* @bufp: buffer to serialize structure into * @bufp: buffer to serialize structure into
* @extended: non-zero if 9P2000.u
* *
*/ */
static int static int
serialize_stat(struct v9fs_session_info *v9ses, struct v9fs_stat *stat, serialize_stat(struct v9fs_stat *stat, struct cbuf *bufp, int extended)
struct cbuf *bufp)
{ {
buf_put_int16(bufp, stat->size); buf_put_int16(bufp, stat->size);
buf_put_int16(bufp, stat->type); buf_put_int16(bufp, stat->type);
...@@ -328,7 +326,7 @@ serialize_stat(struct v9fs_session_info *v9ses, struct v9fs_stat *stat, ...@@ -328,7 +326,7 @@ serialize_stat(struct v9fs_session_info *v9ses, struct v9fs_stat *stat,
buf_put_string(bufp, stat->gid); buf_put_string(bufp, stat->gid);
buf_put_string(bufp, stat->muid); buf_put_string(bufp, stat->muid);
if (v9ses->extended) { if (extended) {
buf_put_string(bufp, stat->extension); buf_put_string(bufp, stat->extension);
buf_put_int32(bufp, stat->n_uid); buf_put_int32(bufp, stat->n_uid);
buf_put_int32(bufp, stat->n_gid); buf_put_int32(bufp, stat->n_gid);
...@@ -343,16 +341,16 @@ serialize_stat(struct v9fs_session_info *v9ses, struct v9fs_stat *stat, ...@@ -343,16 +341,16 @@ serialize_stat(struct v9fs_session_info *v9ses, struct v9fs_stat *stat,
/** /**
* deserialize_stat - safely decode a recieved metadata (stat) structure * deserialize_stat - safely decode a recieved metadata (stat) structure
* @v9ses: session info
* @bufp: buffer to deserialize * @bufp: buffer to deserialize
* @stat: metadata (stat) structure * @stat: metadata (stat) structure
* @dbufp: buffer to deserialize variable strings into * @dbufp: buffer to deserialize variable strings into
* @extended: non-zero if 9P2000.u
* *
*/ */
static inline int static inline int
deserialize_stat(struct v9fs_session_info *v9ses, struct cbuf *bufp, deserialize_stat(struct cbuf *bufp, struct v9fs_stat *stat,
struct v9fs_stat *stat, struct cbuf *dbufp) struct cbuf *dbufp, int extended)
{ {
stat->size = buf_get_int16(bufp); stat->size = buf_get_int16(bufp);
...@@ -370,7 +368,7 @@ deserialize_stat(struct v9fs_session_info *v9ses, struct cbuf *bufp, ...@@ -370,7 +368,7 @@ deserialize_stat(struct v9fs_session_info *v9ses, struct cbuf *bufp,
stat->gid = buf_get_stringb(bufp, dbufp); stat->gid = buf_get_stringb(bufp, dbufp);
stat->muid = buf_get_stringb(bufp, dbufp); stat->muid = buf_get_stringb(bufp, dbufp);
if (v9ses->extended) { if (extended) {
stat->extension = buf_get_stringb(bufp, dbufp); stat->extension = buf_get_stringb(bufp, dbufp);
stat->n_uid = buf_get_int32(bufp); stat->n_uid = buf_get_int32(bufp);
stat->n_gid = buf_get_int32(bufp); stat->n_gid = buf_get_int32(bufp);
...@@ -385,20 +383,20 @@ deserialize_stat(struct v9fs_session_info *v9ses, struct cbuf *bufp, ...@@ -385,20 +383,20 @@ deserialize_stat(struct v9fs_session_info *v9ses, struct cbuf *bufp,
/** /**
* deserialize_statb - wrapper for decoding a received metadata structure * deserialize_statb - wrapper for decoding a received metadata structure
* @v9ses: session info
* @bufp: buffer to deserialize * @bufp: buffer to deserialize
* @dbufp: buffer to deserialize variable strings into * @dbufp: buffer to deserialize variable strings into
* @extended: non-zero if 9P2000.u
* *
*/ */
static inline struct v9fs_stat *deserialize_statb(struct v9fs_session_info static inline struct v9fs_stat *deserialize_statb(struct cbuf *bufp,
*v9ses, struct cbuf *bufp, struct cbuf *dbufp,
struct cbuf *dbufp) int extended)
{ {
struct v9fs_stat *ret = buf_alloc(dbufp, sizeof(struct v9fs_stat)); struct v9fs_stat *ret = buf_alloc(dbufp, sizeof(struct v9fs_stat));
if (ret) { if (ret) {
int n = deserialize_stat(v9ses, bufp, ret, dbufp); int n = deserialize_stat(bufp, ret, dbufp, extended);
if (n <= 0) if (n <= 0)
return NULL; return NULL;
} }
...@@ -408,17 +406,16 @@ static inline struct v9fs_stat *deserialize_statb(struct v9fs_session_info ...@@ -408,17 +406,16 @@ static inline struct v9fs_stat *deserialize_statb(struct v9fs_session_info
/** /**
* v9fs_deserialize_stat - decode a received metadata structure * v9fs_deserialize_stat - decode a received metadata structure
* @v9ses: session info
* @buf: buffer to deserialize * @buf: buffer to deserialize
* @buflen: length of received buffer * @buflen: length of received buffer
* @stat: metadata structure to decode into * @stat: metadata structure to decode into
* @statlen: length of destination metadata structure * @statlen: length of destination metadata structure
* @extended: non-zero if 9P2000.u
* *
*/ */
int int v9fs_deserialize_stat(void *buf, u32 buflen, struct v9fs_stat *stat,
v9fs_deserialize_stat(struct v9fs_session_info *v9ses, void *buf, u32 statlen, int extended)
u32 buflen, struct v9fs_stat *stat, u32 statlen)
{ {
struct cbuf buffer; struct cbuf buffer;
struct cbuf *bufp = &buffer; struct cbuf *bufp = &buffer;
...@@ -429,11 +426,10 @@ v9fs_deserialize_stat(struct v9fs_session_info *v9ses, void *buf, ...@@ -429,11 +426,10 @@ v9fs_deserialize_stat(struct v9fs_session_info *v9ses, void *buf,
buf_init(dbufp, (char *)stat + sizeof(struct v9fs_stat), buf_init(dbufp, (char *)stat + sizeof(struct v9fs_stat),
statlen - sizeof(struct v9fs_stat)); statlen - sizeof(struct v9fs_stat));
return deserialize_stat(v9ses, bufp, stat, dbufp); return deserialize_stat(bufp, stat, dbufp, extended);
} }
static inline int static inline int v9fs_size_fcall(struct v9fs_fcall *fcall, int extended)
v9fs_size_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall)
{ {
int size = 4 + 1 + 2; /* size[4] msg[1] tag[2] */ int size = 4 + 1 + 2; /* size[4] msg[1] tag[2] */
int i = 0; int i = 0;
...@@ -485,7 +481,7 @@ v9fs_size_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall) ...@@ -485,7 +481,7 @@ v9fs_size_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall)
break; break;
case TWSTAT: /* fid[4] stat[n] */ case TWSTAT: /* fid[4] stat[n] */
fcall->params.twstat.stat->size = fcall->params.twstat.stat->size =
v9fs_size_stat(v9ses, fcall->params.twstat.stat); v9fs_size_stat(fcall->params.twstat.stat, extended);
size += 4 + 2 + 2 + fcall->params.twstat.stat->size; size += 4 + 2 + 2 + fcall->params.twstat.stat->size;
} }
return size; return size;
...@@ -493,16 +489,16 @@ v9fs_size_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall) ...@@ -493,16 +489,16 @@ v9fs_size_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall)
/* /*
* v9fs_serialize_fcall - marshall fcall struct into a packet * v9fs_serialize_fcall - marshall fcall struct into a packet
* @v9ses: session information
* @fcall: structure to convert * @fcall: structure to convert
* @data: buffer to serialize fcall into * @data: buffer to serialize fcall into
* @datalen: length of buffer to serialize fcall into * @datalen: length of buffer to serialize fcall into
* @extended: non-zero if 9P2000.u
* *
*/ */
int int
v9fs_serialize_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall, v9fs_serialize_fcall(struct v9fs_fcall *fcall, void *data, u32 datalen,
void *data, u32 datalen) int extended)
{ {
int i = 0; int i = 0;
struct v9fs_stat *stat = NULL; struct v9fs_stat *stat = NULL;
...@@ -516,7 +512,7 @@ v9fs_serialize_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall, ...@@ -516,7 +512,7 @@ v9fs_serialize_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall,
return -EINVAL; return -EINVAL;
} }
fcall->size = v9fs_size_fcall(v9ses, fcall); fcall->size = v9fs_size_fcall(fcall, extended);
buf_put_int32(bufp, fcall->size); buf_put_int32(bufp, fcall->size);
buf_put_int8(bufp, fcall->id); buf_put_int8(bufp, fcall->id);
...@@ -591,31 +587,31 @@ v9fs_serialize_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall, ...@@ -591,31 +587,31 @@ v9fs_serialize_fcall(struct v9fs_session_info *v9ses, struct v9fs_fcall *fcall,
stat = fcall->params.twstat.stat; stat = fcall->params.twstat.stat;
buf_put_int16(bufp, stat->size + 2); buf_put_int16(bufp, stat->size + 2);
serialize_stat(v9ses, stat, bufp); serialize_stat(stat, bufp, extended);
break; break;
} }
if (buf_check_overflow(bufp)) if (buf_check_overflow(bufp)) {
dprintk(DEBUG_ERROR, "buffer overflow\n");
return -EIO; return -EIO;
}
return fcall->size; return fcall->size;
} }
/** /**
* deserialize_fcall - unmarshal a response * deserialize_fcall - unmarshal a response
* @v9ses: session information
* @msgsize: size of rcall message
* @buf: recieved buffer * @buf: recieved buffer
* @buflen: length of received buffer * @buflen: length of received buffer
* @rcall: fcall structure to populate * @rcall: fcall structure to populate
* @rcalllen: length of fcall structure to populate * @rcalllen: length of fcall structure to populate
* @extended: non-zero if 9P2000.u
* *
*/ */
int int
v9fs_deserialize_fcall(struct v9fs_session_info *v9ses, u32 msgsize, v9fs_deserialize_fcall(void *buf, u32 buflen, struct v9fs_fcall *rcall,
void *buf, u32 buflen, struct v9fs_fcall *rcall, int rcalllen, int extended)
int rcalllen)
{ {
struct cbuf buffer; struct cbuf buffer;
...@@ -628,7 +624,7 @@ v9fs_deserialize_fcall(struct v9fs_session_info *v9ses, u32 msgsize, ...@@ -628,7 +624,7 @@ v9fs_deserialize_fcall(struct v9fs_session_info *v9ses, u32 msgsize,
buf_init(dbufp, (char *)rcall + sizeof(struct v9fs_fcall), buf_init(dbufp, (char *)rcall + sizeof(struct v9fs_fcall),
rcalllen - sizeof(struct v9fs_fcall)); rcalllen - sizeof(struct v9fs_fcall));
rcall->size = msgsize; rcall->size = buf_get_int32(bufp);
rcall->id = buf_get_int8(bufp); rcall->id = buf_get_int8(bufp);
rcall->tag = buf_get_int16(bufp); rcall->tag = buf_get_int16(bufp);
...@@ -651,6 +647,12 @@ v9fs_deserialize_fcall(struct v9fs_session_info *v9ses, u32 msgsize, ...@@ -651,6 +647,12 @@ v9fs_deserialize_fcall(struct v9fs_session_info *v9ses, u32 msgsize,
break; break;
case RWALK: case RWALK:
rcall->params.rwalk.nwqid = buf_get_int16(bufp); rcall->params.rwalk.nwqid = buf_get_int16(bufp);
if (rcall->params.rwalk.nwqid > 16) {
eprintk(KERN_ERR, "Rwalk with more than 16 qids: %d\n",
rcall->params.rwalk.nwqid);
return -EPROTO;
}
rcall->params.rwalk.wqids = buf_alloc(dbufp, rcall->params.rwalk.wqids = buf_alloc(dbufp,
rcall->params.rwalk.nwqid * sizeof(struct v9fs_qid)); rcall->params.rwalk.nwqid * sizeof(struct v9fs_qid));
if (rcall->params.rwalk.wqids) if (rcall->params.rwalk.wqids)
...@@ -690,19 +692,21 @@ v9fs_deserialize_fcall(struct v9fs_session_info *v9ses, u32 msgsize, ...@@ -690,19 +692,21 @@ v9fs_deserialize_fcall(struct v9fs_session_info *v9ses, u32 msgsize,
case RSTAT: case RSTAT:
buf_get_int16(bufp); buf_get_int16(bufp);
rcall->params.rstat.stat = rcall->params.rstat.stat =
deserialize_statb(v9ses, bufp, dbufp); deserialize_statb(bufp, dbufp, extended);
break; break;
case RWSTAT: case RWSTAT:
break; break;
case RERROR: case RERROR:
rcall->params.rerror.error = buf_get_stringb(bufp, dbufp); rcall->params.rerror.error = buf_get_stringb(bufp, dbufp);
if (v9ses->extended) if (extended)
rcall->params.rerror.errno = buf_get_int16(bufp); rcall->params.rerror.errno = buf_get_int16(bufp);
break; break;
} }
if (buf_check_overflow(bufp) || buf_check_overflow(dbufp)) if (buf_check_overflow(bufp) || buf_check_overflow(dbufp)) {
dprintk(DEBUG_ERROR, "buffer overflow\n");
return -EIO; return -EIO;
}
return rcall->size; return rcall->size;
} }
fs/9p/conv.h
View file @ 3cf6429a
...@@ -24,13 +24,12 @@ ...@@ -24,13 +24,12 @@
* *
*/ */
int v9fs_deserialize_stat(struct v9fs_session_info *, void *buf, int v9fs_deserialize_stat(void *buf, u32 buflen, struct v9fs_stat *stat,
u32 buflen, struct v9fs_stat *stat, u32 statlen); u32 statlen, int extended);
int v9fs_serialize_fcall(struct v9fs_session_info *, struct v9fs_fcall *tcall, int v9fs_serialize_fcall(struct v9fs_fcall *tcall, void *buf, u32 buflen,
void *buf, u32 buflen); int extended);
int v9fs_deserialize_fcall(struct v9fs_session_info *, u32 msglen, int v9fs_deserialize_fcall(void *buf, u32 buflen, struct v9fs_fcall *rcall,
void *buf, u32 buflen, struct v9fs_fcall *rcall, int rcalllen, int extended);
int rcalllen);
/* this one is actually in error.c right now */ /* this one is actually in error.c right now */
int v9fs_errstr2errno(char *errstr); int v9fs_errstr2errno(char *errstr);
fs/9p/fid.c
View file @ 3cf6429a
...@@ -164,7 +164,7 @@ static struct v9fs_fid *v9fs_fid_walk_up(struct dentry *dentry) ...@@ -164,7 +164,7 @@ static struct v9fs_fid *v9fs_fid_walk_up(struct dentry *dentry)
return v9fs_fid_create(dentry, v9ses, fidnum, 0); return v9fs_fid_create(dentry, v9ses, fidnum, 0);
clunk_fid: clunk_fid:
v9fs_t_clunk(v9ses, fidnum, NULL); v9fs_t_clunk(v9ses, fidnum);
return ERR_PTR(err); return ERR_PTR(err);
} }
......
fs/9p/mux.c
View file @ 3cf6429a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Protocol Multiplexer * Protocol Multiplexer
* *
* Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com> * Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
* Copyright (C) 2004 by Latchesar Ionkov <lucho@ionkov.net> * Copyright (C) 2004-2005 by Latchesar Ionkov <lucho@ionkov.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/poll.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/idr.h> #include <linux/idr.h>
...@@ -38,438 +39,903 @@ ...@@ -38,438 +39,903 @@
#include "conv.h" #include "conv.h"
#include "mux.h" #include "mux.h"
/** #define ERREQFLUSH 1
* dprintcond - print condition of session info #define SCHED_TIMEOUT 10
* @v9ses: session info structure #define MAXPOLLWADDR 2
* @req: RPC request structure
* enum {
*/ Rworksched = 1, /* read work scheduled or running */
Rpending = 2, /* can read */
Wworksched = 4, /* write work scheduled or running */
Wpending = 8, /* can write */
};
struct v9fs_mux_poll_task;
struct v9fs_req {
int tag;
struct v9fs_fcall *tcall;
struct v9fs_fcall *rcall;
int err;
v9fs_mux_req_callback cb;
void *cba;
struct list_head req_list;
};
struct v9fs_mux_data {
spinlock_t lock;
struct list_head mux_list;
struct v9fs_mux_poll_task *poll_task;
int msize;
unsigned char *extended;
struct v9fs_transport *trans;
struct v9fs_idpool tidpool;
int err;
wait_queue_head_t equeue;
struct list_head req_list;
struct list_head unsent_req_list;
int rpos;
char *rbuf;
int wpos;
int wsize;
char *wbuf;
wait_queue_t poll_wait[MAXPOLLWADDR];
wait_queue_head_t *poll_waddr[MAXPOLLWADDR];
poll_table pt;
struct work_struct rq;
struct work_struct wq;
unsigned long wsched;
};
struct v9fs_mux_poll_task {
struct task_struct *task;
struct list_head mux_list;
int muxnum;
};
struct v9fs_mux_rpc {
struct v9fs_mux_data *m;
struct v9fs_req *req;
int err;
struct v9fs_fcall *rcall;
wait_queue_head_t wqueue;
};
static 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 DECLARE_MUTEX(v9fs_mux_task_lock);
static struct workqueue_struct *v9fs_mux_wq;
static int v9fs_mux_num;
static int v9fs_mux_poll_task_num;
static struct v9fs_mux_poll_task v9fs_mux_poll_tasks[100];
void v9fs_mux_global_init(void)
{
int i;
for (i = 0; i < ARRAY_SIZE(v9fs_mux_poll_tasks); i++)
v9fs_mux_poll_tasks[i].task = NULL;
v9fs_mux_wq = create_workqueue("v9fs");
}
static inline int void v9fs_mux_global_exit(void)
dprintcond(struct v9fs_session_info *v9ses, struct v9fs_rpcreq *req)
{ {
dprintk(DEBUG_MUX, "condition: %d, %p\n", v9ses->transport->status, destroy_workqueue(v9fs_mux_wq);
req->rcall);
return 0;
} }
/** /**
* xread - force read of a certain number of bytes * v9fs_mux_calc_poll_procs - calculates the number of polling procs
* @v9ses: session info structure * based on the number of mounted v9fs filesystems.
* @ptr: pointer to buffer
* @sz: number of bytes to read
* *
* Chuck Cranor CS-533 project1 * The current implementation returns sqrt of the number of mounts.
*/ */
inline int v9fs_mux_calc_poll_procs(int muxnum)
{
int n;
if (v9fs_mux_poll_task_num)
n = muxnum / v9fs_mux_poll_task_num +
(muxnum % v9fs_mux_poll_task_num ? 1 : 0);
else
n = 1;
if (n > ARRAY_SIZE(v9fs_mux_poll_tasks))
n = ARRAY_SIZE(v9fs_mux_poll_tasks);
static int xread(struct v9fs_session_info *v9ses, void *ptr, unsigned long sz) return n;
}
static void v9fs_mux_poll_start(struct v9fs_mux_data *m)
{ {
int rd = 0; int i, n;
int ret = 0; struct v9fs_mux_poll_task *vpt, *vptlast;
while (rd < sz) {
ret = v9ses->transport->read(v9ses->transport, ptr, sz - rd); dprintk(DEBUG_MUX, "mux %p muxnum %d procnum %d\n", m, v9fs_mux_num,
if (ret <= 0) { v9fs_mux_poll_task_num);
dprintk(DEBUG_ERROR, "xread errno %d\n", ret); up(&v9fs_mux_task_lock);
return ret;
n = v9fs_mux_calc_poll_procs(v9fs_mux_num + 1);
if (n > v9fs_mux_poll_task_num) {
for (i = 0; i < ARRAY_SIZE(v9fs_mux_poll_tasks); i++) {
if (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");
INIT_LIST_HEAD(&vpt->mux_list);
vpt->muxnum = 0;
v9fs_mux_poll_task_num++;
wake_up_process(vpt->task);
break;
}
} }
rd += ret;
ptr += ret;
}
return (rd);
}
/** if (i >= ARRAY_SIZE(v9fs_mux_poll_tasks))
* read_message - read a full 9P2000 fcall packet dprintk(DEBUG_ERROR, "warning: no free poll slots\n");
* @v9ses: session info structure }
* @rcall: fcall structure to read into
* @rcalllen: size of fcall buffer
*
*/
static int n = (v9fs_mux_num + 1) / v9fs_mux_poll_task_num +
read_message(struct v9fs_session_info *v9ses, ((v9fs_mux_num + 1) % v9fs_mux_poll_task_num ? 1 : 0);
struct v9fs_fcall *rcall, int rcalllen)
{ vptlast = NULL;
unsigned char buf[4]; for (i = 0; i < ARRAY_SIZE(v9fs_mux_poll_tasks); i++) {
void *data; vpt = &v9fs_mux_poll_tasks[i];
int size = 0; if (vpt->task != NULL) {
int res = 0; vptlast = vpt;
if (vpt->muxnum < n) {
res = xread(v9ses, buf, sizeof(buf)); dprintk(DEBUG_MUX, "put in proc %d\n", i);
if (res < 0) { list_add(&m->mux_list, &vpt->mux_list);
dprintk(DEBUG_ERROR, vpt->muxnum++;
"Reading of count field failed returned: %d\n", res); m->poll_task = vpt;
return res; memset(&m->poll_waddr, 0, sizeof(m->poll_waddr));
init_poll_funcptr(&m->pt, v9fs_pollwait);
break;
}
}
} }
if (res < 4) { if (i >= ARRAY_SIZE(v9fs_mux_poll_tasks)) {
dprintk(DEBUG_ERROR, dprintk(DEBUG_MUX, "put in proc %d\n", i);
"Reading of count field failed returned: %d\n", res); list_add(&m->mux_list, &vptlast->mux_list);
return -EIO; vptlast->muxnum++;
m->poll_task = vpt;
memset(&m->poll_waddr, 0, sizeof(m->poll_waddr));
init_poll_funcptr(&m->pt, v9fs_pollwait);
} }
size = buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); v9fs_mux_num++;
dprintk(DEBUG_MUX, "got a packet count: %d\n", size); down(&v9fs_mux_task_lock);
}
/* adjust for the four bytes of size */ static void v9fs_mux_poll_stop(struct v9fs_mux_data *m)
size -= 4; {
int i;
struct v9fs_mux_poll_task *vpt;
up(&v9fs_mux_task_lock);
vpt = m->poll_task;
list_del(&m->mux_list);
for(i = 0; i < ARRAY_SIZE(m->poll_waddr); i++) {
if (m->poll_waddr[i] != NULL) {
remove_wait_queue(m->poll_waddr[i], &m->poll_wait[i]);
m->poll_waddr[i] = NULL;
}
}
vpt->muxnum--;
if (!vpt->muxnum) {
dprintk(DEBUG_MUX, "destroy proc %p\n", vpt);
send_sig(SIGKILL, vpt->task, 1);
vpt->task = NULL;
v9fs_mux_poll_task_num--;
}
v9fs_mux_num--;
down(&v9fs_mux_task_lock);
}
if (size > v9ses->maxdata) { /**
dprintk(DEBUG_ERROR, "packet too big: %d\n", size); * v9fs_mux_init - allocate and initialize the per-session mux data
return -E2BIG; * Creates the polling task if this is the first session.
*
* @trans - transport structure
* @msize - maximum message size
* @extended - pointer to the extended flag
*/
struct v9fs_mux_data *v9fs_mux_init(struct v9fs_transport *trans, int msize,
unsigned char *extended)
{
int i, n;
struct v9fs_mux_data *m, *mtmp;
dprintk(DEBUG_MUX, "transport %p msize %d\n", trans, msize);
m = kmalloc(sizeof(struct v9fs_mux_data) + 2 * msize, GFP_KERNEL);
if (!m)
return ERR_PTR(-ENOMEM);
spin_lock_init(&m->lock);
INIT_LIST_HEAD(&m->mux_list);
m->msize = msize;
m->extended = extended;
m->trans = trans;
idr_init(&m->tidpool.pool);
init_MUTEX(&m->tidpool.lock);
m->err = 0;
init_waitqueue_head(&m->equeue);
INIT_LIST_HEAD(&m->req_list);
INIT_LIST_HEAD(&m->unsent_req_list);
m->rpos = 0;
m->rbuf = (char *)m + sizeof(struct v9fs_mux_data);
m->wpos = m->wsize = 0;
m->wbuf = m->rbuf + msize;
INIT_WORK(&m->rq, v9fs_read_work, m);
INIT_WORK(&m->wq, v9fs_write_work, m);
m->wsched = 0;
memset(&m->poll_waddr, 0, sizeof(m->poll_waddr));
v9fs_mux_poll_start(m);
n = trans->poll(trans, &m->pt);
if (n & POLLIN) {
dprintk(DEBUG_MUX, "mux %p can read\n", m);
set_bit(Rpending, &m->wsched);
} }
data = kmalloc(size, GFP_KERNEL); if (n & POLLOUT) {
if (!data) { dprintk(DEBUG_MUX, "mux %p can write\n", m);
eprintk(KERN_WARNING, "out of memory\n"); set_bit(Wpending, &m->wsched);
return -ENOMEM;
} }
res = xread(v9ses, data, size); for(i = 0; i < ARRAY_SIZE(m->poll_waddr); i++) {
if (res < size) { if (IS_ERR(m->poll_waddr[i])) {
dprintk(DEBUG_ERROR, "Reading of fcall failed returned: %d\n", v9fs_mux_poll_stop(m);
res); mtmp = (void *)m->poll_waddr; /* the error code */
kfree(data); kfree(m);
return res; m = mtmp;
break;
}
} }
/* we now have an in-memory string that is the reply. return m;
* deserialize it. There is very little to go wrong at this point }
* save for v9fs_alloc errors.
*/
res = v9fs_deserialize_fcall(v9ses, size, data, v9ses->maxdata,
rcall, rcalllen);
kfree(data); /**
* v9fs_mux_destroy - cancels all pending requests and frees mux resources
*/
void v9fs_mux_destroy(struct v9fs_mux_data *m)
{
dprintk(DEBUG_MUX, "mux %p prev %p next %p\n", m,
m->mux_list.prev, m->mux_list.next);
v9fs_mux_cancel(m, -ECONNRESET);
if (!list_empty(&m->req_list)) {
/* wait until all processes waiting on this session exit */
dprintk(DEBUG_MUX, "mux %p waiting for empty request queue\n",
m);
wait_event_timeout(m->equeue, (list_empty(&m->req_list)), 5000);
dprintk(DEBUG_MUX, "mux %p request queue empty: %d\n", m,
list_empty(&m->req_list));
}
if (res < 0) v9fs_mux_poll_stop(m);
return res; m->trans = NULL;
return 0; kfree(m);
} }
/** /**
* v9fs_recv - receive an RPC response for a particular tag * v9fs_pollwait - called by files poll operation to add v9fs-poll task
* @v9ses: session info structure * to files wait queue
* @req: RPC request structure
*
*/ */
static void
static int v9fs_recv(struct v9fs_session_info *v9ses, struct v9fs_rpcreq *req) v9fs_pollwait(struct file *filp, wait_queue_head_t * wait_address,
poll_table * p)
{ {
int ret = 0; int i;
struct v9fs_mux_data *m;
dprintk(DEBUG_MUX, "waiting for response: %d\n", req->tcall->tag);
ret = wait_event_interruptible(v9ses->read_wait,
((v9ses->transport->status != Connected) ||
(req->rcall != 0) || (req->err < 0) ||
dprintcond(v9ses, req)));
dprintk(DEBUG_MUX, "got it: rcall %p\n", req->rcall); m = container_of(p, struct v9fs_mux_data, pt);
for(i = 0; i < ARRAY_SIZE(m->poll_waddr); i++)
if (m->poll_waddr[i] == NULL)
break;
spin_lock(&v9ses->muxlock); if (i >= ARRAY_SIZE(m->poll_waddr)) {
list_del(&req->next); dprintk(DEBUG_ERROR, "not enough wait_address slots\n");
spin_unlock(&v9ses->muxlock); return;
}
if (req->err < 0) m->poll_waddr[i] = wait_address;
return req->err;
if (v9ses->transport->status == Disconnected) if (!wait_address) {
return -ECONNRESET; dprintk(DEBUG_ERROR, "no wait_address\n");
m->poll_waddr[i] = ERR_PTR(-EIO);
return;
}
return ret; init_waitqueue_entry(&m->poll_wait[i], m->poll_task->task);
add_wait_queue(wait_address, &m->poll_wait[i]);
} }
/** /**
* v9fs_send - send a 9P request * v9fs_poll_mux - polls a mux and schedules read or write works if necessary
* @v9ses: session info structure
* @req: RPC request to send
*
*/ */
static inline void v9fs_poll_mux(struct v9fs_mux_data *m)
static int v9fs_send(struct v9fs_session_info *v9ses, struct v9fs_rpcreq *req)
{ {
int ret = -1; int n;
void *data = NULL;
struct v9fs_fcall *tcall = req->tcall;
data = kmalloc(v9ses->maxdata + V9FS_IOHDRSZ, GFP_KERNEL);
if (!data)
return -ENOMEM;
tcall->size = 0; /* enforce size recalculation */
ret =
v9fs_serialize_fcall(v9ses, tcall, data,
v9ses->maxdata + V9FS_IOHDRSZ);
if (ret < 0)
goto free_data;
spin_lock(&v9ses->muxlock);
list_add(&req->next, &v9ses->mux_fcalls);
spin_unlock(&v9ses->muxlock);
dprintk(DEBUG_MUX, "sending message: tag %d size %d\n", tcall->tag,
tcall->size);
ret = v9ses->transport->write(v9ses->transport, data, tcall->size);
if (ret != tcall->size) {
spin_lock(&v9ses->muxlock);
list_del(&req->next);
kfree(req->rcall);
spin_unlock(&v9ses->muxlock); if (m->err < 0)
if (ret >= 0) return;
ret = -EREMOTEIO;
} else n = m->trans->poll(m->trans, NULL);
ret = 0; if (n < 0 || n & (POLLERR | POLLHUP | POLLNVAL)) {
dprintk(DEBUG_MUX, "error mux %p err %d\n", m, n);
if (n >= 0)
n = -ECONNRESET;
v9fs_mux_cancel(m, n);
}
if (n & POLLIN) {
set_bit(Rpending, &m->wsched);
dprintk(DEBUG_MUX, "mux %p can read\n", m);
if (!test_and_set_bit(Rworksched, &m->wsched)) {
dprintk(DEBUG_MUX, "schedule read work mux %p\n", m);
queue_work(v9fs_mux_wq, &m->rq);
}
}
free_data: if (n & POLLOUT) {
kfree(data); set_bit(Wpending, &m->wsched);
return ret; dprintk(DEBUG_MUX, "mux %p can write\n", m);
if ((m->wsize || !list_empty(&m->unsent_req_list))
&& !test_and_set_bit(Wworksched, &m->wsched)) {
dprintk(DEBUG_MUX, "schedule write work mux %p\n", m);
queue_work(v9fs_mux_wq, &m->wq);
}
}
} }
/** /**
* v9fs_mux_rpc - send a request, receive a response * v9fs_poll_proc - polls all v9fs transports for new events and queues
* @v9ses: session info structure * the appropriate work to the work queue
* @tcall: fcall to send
* @rcall: buffer to place response into
*
*/ */
static int v9fs_poll_proc(void *a)
long
v9fs_mux_rpc(struct v9fs_session_info *v9ses, struct v9fs_fcall *tcall,
struct v9fs_fcall **rcall)
{ {
int tid = -1; struct v9fs_mux_data *m, *mtmp;
struct v9fs_fcall *fcall = NULL; struct v9fs_mux_poll_task *vpt;
struct v9fs_rpcreq req;
int ret = -1;
if (!v9ses) vpt = a;
return -EINVAL; dprintk(DEBUG_MUX, "start %p %p\n", current, vpt);
allow_signal(SIGKILL);
while (!kthread_should_stop()) {
set_current_state(TASK_INTERRUPTIBLE);
if (signal_pending(current))
break;
if (!v9ses->transport || v9ses->transport->status != Connected) list_for_each_entry_safe(m, mtmp, &vpt->mux_list, mux_list) {
return -EIO; v9fs_poll_mux(m);
}
dprintk(DEBUG_MUX, "sleeping...\n");
schedule_timeout(SCHED_TIMEOUT * HZ);
}
if (rcall) __set_current_state(TASK_RUNNING);
*rcall = NULL; dprintk(DEBUG_MUX, "finish\n");
return 0;
}
if (tcall->id != TVERSION) { static inline int v9fs_write_req(struct v9fs_mux_data *m, struct v9fs_req *req)
tid = v9fs_get_idpool(&v9ses->tidpool); {
if (tid < 0) int n;
return -ENOMEM;
list_move_tail(&req->req_list, &m->req_list);
n = v9fs_serialize_fcall(req->tcall, m->wbuf, m->msize, *m->extended);
if (n < 0) {
req->err = n;
list_del(&req->req_list);
if (req->cb) {
spin_unlock(&m->lock);
(*req->cb) (req->cba, req->tcall, req->rcall, req->err);
req->cb = NULL;
spin_lock(&m->lock);
} else
kfree(req->rcall);
kfree(req);
} }
tcall->tag = tid; return n;
}
req.tcall = tcall; /**
req.err = 0; * v9fs_write_work - called when a transport can send some data
req.rcall = NULL; */
static void v9fs_write_work(void *a)
{
int n, err;
struct v9fs_mux_data *m;
struct v9fs_req *req, *rtmp;
ret = v9fs_send(v9ses, &req); m = a;
if (ret < 0) { if (m->err < 0) {
if (tcall->id != TVERSION) clear_bit(Wworksched, &m->wsched);
v9fs_put_idpool(tid, &v9ses->tidpool); return;
dprintk(DEBUG_MUX, "error %d\n", ret);
return ret;
} }
ret = v9fs_recv(v9ses, &req); if (!m->wsize) {
if (list_empty(&m->unsent_req_list)) {
fcall = req.rcall; clear_bit(Wworksched, &m->wsched);
return;
dprintk(DEBUG_MUX, "received: tag=%x, ret=%d\n", tcall->tag, ret);
if (ret == -ERESTARTSYS) {
if (v9ses->transport->status != Disconnected
&& tcall->id != TFLUSH) {
unsigned long flags;
dprintk(DEBUG_MUX, "flushing the tag: %d\n",
tcall->tag);
clear_thread_flag(TIF_SIGPENDING);
v9fs_t_flush(v9ses, tcall->tag);
spin_lock_irqsave(&current->sighand->siglock, flags);
recalc_sigpending();
spin_unlock_irqrestore(&current->sighand->siglock,
flags);
dprintk(DEBUG_MUX, "flushing done\n");
} }
goto release_req; err = 0;
} else if (ret < 0) spin_lock(&m->lock);
goto release_req; list_for_each_entry_safe(req, rtmp, &m->unsent_req_list,
req_list) {
if (!fcall) err = v9fs_write_req(m, req);
ret = -EIO; if (err > 0)
else { break;
if (fcall->id == RERROR) {
ret = v9fs_errstr2errno(fcall->params.rerror.error);
if (ret == 0) { /* string match failed */
if (fcall->params.rerror.errno)
ret = -(fcall->params.rerror.errno);
else
ret = -ESERVERFAULT;
}
} else if (fcall->id != tcall->id + 1) {
dprintk(DEBUG_ERROR,
"fcall mismatch: expected %d, got %d\n",
tcall->id + 1, fcall->id);
ret = -EIO;
} }
m->wsize = err;
m->wpos = 0;
spin_unlock(&m->lock);
} }
release_req: dprintk(DEBUG_MUX, "mux %p pos %d size %d\n", m, m->wpos, m->wsize);
if (tcall->id != TVERSION) clear_bit(Wpending, &m->wsched);
v9fs_put_idpool(tid, &v9ses->tidpool); err = m->trans->write(m->trans, m->wbuf + m->wpos, m->wsize - m->wpos);
if (rcall) dprintk(DEBUG_MUX, "mux %p sent %d bytes\n", m, err);
*rcall = fcall; if (err == -EAGAIN) {
else clear_bit(Wworksched, &m->wsched);
kfree(fcall); return;
}
if (err <= 0)
goto error;
m->wpos += err;
if (m->wpos == m->wsize)
m->wpos = m->wsize = 0;
if (m->wsize == 0 && !list_empty(&m->unsent_req_list)) {
if (test_and_clear_bit(Wpending, &m->wsched))
n = POLLOUT;
else
n = m->trans->poll(m->trans, NULL);
if (n & POLLOUT) {
dprintk(DEBUG_MUX, "schedule write work mux %p\n", m);
queue_work(v9fs_mux_wq, &m->wq);
} else
clear_bit(Wworksched, &m->wsched);
} else
clear_bit(Wworksched, &m->wsched);
return ret; return;
error:
v9fs_mux_cancel(m, err);
clear_bit(Wworksched, &m->wsched);
} }
/** static void process_request(struct v9fs_mux_data *m, struct v9fs_req *req)
* v9fs_mux_cancel_requests - cancels all pending requests
*
* @v9ses: session info structure
* @err: error code to return to the requests
*/
void v9fs_mux_cancel_requests(struct v9fs_session_info *v9ses, int err)
{ {
struct v9fs_rpcreq *rptr; int ecode, tag;
struct v9fs_rpcreq *rreq; char *ename;
tag = req->tag;
if (req->rcall->id == RERROR && !req->err) {
ecode = req->rcall->params.rerror.errno;
ename = req->rcall->params.rerror.error;
dprintk(DEBUG_MUX, " %d\n", err); dprintk(DEBUG_MUX, "Rerror %s\n", ename);
spin_lock(&v9ses->muxlock);
list_for_each_entry_safe(rreq, rptr, &v9ses->mux_fcalls, next) { if (*m->extended)
rreq->err = err; req->err = -ecode;
if (!req->err) {
req->err = v9fs_errstr2errno(ename);
if (!req->err) { /* string match failed */
dprintk(DEBUG_ERROR, "unknown error: %s\n",
ename);
}
if (!req->err)
req->err = -ESERVERFAULT;
}
} else if (req->tcall && req->rcall->id != req->tcall->id + 1) {
dprintk(DEBUG_ERROR, "fcall mismatch: expected %d, got %d\n",
req->tcall->id + 1, req->rcall->id);
if (!req->err)
req->err = -EIO;
} }
spin_unlock(&v9ses->muxlock);
wake_up_all(&v9ses->read_wait); if (req->cb && req->err != ERREQFLUSH) {
dprintk(DEBUG_MUX, "calling callback tcall %p rcall %p\n",
req->tcall, req->rcall);
(*req->cb) (req->cba, req->tcall, req->rcall, req->err);
req->cb = NULL;
} else
kfree(req->rcall);
if (tag != V9FS_NOTAG)
v9fs_put_idpool(tag, &m->tidpool);
wake_up(&m->equeue);
kfree(req);
} }
/** /**
* v9fs_recvproc - kproc to handle demultiplexing responses * v9fs_read_work - called when there is some data to be read from a transport
* @data: session info structure
*
*/ */
static void v9fs_read_work(void *a)
static int v9fs_recvproc(void *data)
{ {
struct v9fs_session_info *v9ses = (struct v9fs_session_info *)data; int n, err, rcallen;
struct v9fs_fcall *rcall = NULL; struct v9fs_mux_data *m;
struct v9fs_rpcreq *rptr; struct v9fs_req *req, *rptr, *rreq;
struct v9fs_rpcreq *req; struct v9fs_fcall *rcall;
struct v9fs_rpcreq *rreq;
int err = 0; m = a;
if (m->err < 0)
return;
rcall = NULL;
dprintk(DEBUG_MUX, "start mux %p pos %d\n", m, m->rpos);
clear_bit(Rpending, &m->wsched);
err = m->trans->read(m->trans, m->rbuf + m->rpos, m->msize - m->rpos);
dprintk(DEBUG_MUX, "mux %p got %d bytes\n", m, err);
if (err == -EAGAIN) {
clear_bit(Rworksched, &m->wsched);
return;
}
allow_signal(SIGKILL); if (err <= 0)
set_current_state(TASK_INTERRUPTIBLE); goto error;
complete(&v9ses->proccmpl);
while (!kthread_should_stop() && err >= 0) {
req = rptr = rreq = NULL;
rcall = kmalloc(v9ses->maxdata + V9FS_IOHDRSZ, GFP_KERNEL); m->rpos += err;
if (!rcall) { while (m->rpos > 4) {
eprintk(KERN_ERR, "no memory for buffers\n"); n = le32_to_cpu(*(__le32 *) m->rbuf);
if (n >= m->msize) {
dprintk(DEBUG_ERROR,
"requested packet size too big: %d\n", n);
err = -EIO;
goto error;
}
if (m->rpos < n)
break; break;
rcallen = n + V9FS_FCALLHDRSZ;
rcall = kmalloc(rcallen, GFP_KERNEL);
if (!rcall) {
err = -ENOMEM;
goto error;
} }
err = read_message(v9ses, rcall, v9ses->maxdata + V9FS_IOHDRSZ); dump_data(m->rbuf, n);
spin_lock(&v9ses->muxlock); err = v9fs_deserialize_fcall(m->rbuf, n, rcall, rcallen,
*m->extended);
if (err < 0) { if (err < 0) {
list_for_each_entry_safe(rreq, rptr, &v9ses->mux_fcalls, next) { kfree(rcall);
rreq->err = err; goto error;
}
if(err != -ERESTARTSYS)
eprintk(KERN_ERR,
"Transport error while reading message %d\n", err);
} else {
list_for_each_entry_safe(rreq, rptr, &v9ses->mux_fcalls, next) {
if (rreq->tcall->tag == rcall->tag) {
req = rreq;
req->rcall = rcall;
break;
}
}
} }
if (req && (req->tcall->id == TFLUSH)) { dprintk(DEBUG_MUX, "mux %p fcall id %d tag %d\n", m, rcall->id,
struct v9fs_rpcreq *treq = NULL; rcall->tag);
list_for_each_entry_safe(treq, rptr, &v9ses->mux_fcalls, next) {
if (treq->tcall->tag == req = NULL;
req->tcall->params.tflush.oldtag) { spin_lock(&m->lock);
list_del(&rptr->next); list_for_each_entry_safe(rreq, rptr, &m->req_list, req_list) {
kfree(treq->rcall); if (rreq->tag == rcall->tag) {
break; req = rreq;
} req->rcall = rcall;
list_del(&req->req_list);
spin_unlock(&m->lock);
process_request(m, req);
break;
} }
} }
spin_unlock(&v9ses->muxlock);
if (!req) { if (!req) {
if (err >= 0) spin_unlock(&m->lock);
if (err >= 0 && rcall->id != RFLUSH)
dprintk(DEBUG_ERROR, dprintk(DEBUG_ERROR,
"unexpected response: id %d tag %d\n", "unexpected response mux %p id %d tag %d\n",
rcall->id, rcall->tag); m, rcall->id, rcall->tag);
kfree(rcall); kfree(rcall);
} }
wake_up_all(&v9ses->read_wait); if (m->rpos > n)
set_current_state(TASK_INTERRUPTIBLE); memmove(m->rbuf, m->rbuf + n, m->rpos - n);
m->rpos -= n;
} }
v9ses->transport->close(v9ses->transport); if (!list_empty(&m->req_list)) {
if (test_and_clear_bit(Rpending, &m->wsched))
/* Inform all pending processes about the failure */ n = POLLIN;
wake_up_all(&v9ses->read_wait); else
n = m->trans->poll(m->trans, NULL);
if (signal_pending(current))
complete(&v9ses->proccmpl); if (n & POLLIN) {
dprintk(DEBUG_MUX, "schedule read work mux %p\n", m);
queue_work(v9fs_mux_wq, &m->rq);
} else
clear_bit(Rworksched, &m->wsched);
} else
clear_bit(Rworksched, &m->wsched);
dprintk(DEBUG_MUX, "recvproc: end\n"); return;
v9ses->recvproc = NULL;
return err >= 0; error:
v9fs_mux_cancel(m, err);
clear_bit(Rworksched, &m->wsched);
} }
/** /**
* v9fs_mux_init - initialize multiplexer (spawn kproc) * v9fs_send_request - send 9P request
* @v9ses: session info structure * The function can sleep until the request is scheduled for sending.
* @dev_name: mount device information (to create unique kproc) * The function can be interrupted. Return from the function is not
* a guarantee that the request is sent succesfully. Can return errors
* that can be retrieved by PTR_ERR macros.
* *
* @m: mux data
* @tc: request to be sent
* @cb: callback function to call when response is received
* @cba: parameter to pass to the callback function
*/ */
static struct v9fs_req *v9fs_send_request(struct v9fs_mux_data *m,
struct v9fs_fcall *tc,
v9fs_mux_req_callback cb, void *cba)
{
int n;
struct v9fs_req *req;
dprintk(DEBUG_MUX, "mux %p task %p tcall %p id %d\n", m, current,
tc, tc->id);
if (m->err < 0)
return ERR_PTR(m->err);
req = kmalloc(sizeof(struct v9fs_req), GFP_KERNEL);
if (!req)
return ERR_PTR(-ENOMEM);
int v9fs_mux_init(struct v9fs_session_info *v9ses, const char *dev_name) if (tc->id == TVERSION)
n = V9FS_NOTAG;
else
n = v9fs_get_idpool(&m->tidpool);
if (n < 0)
return ERR_PTR(-ENOMEM);
tc->tag = n;
req->tag = n;
req->tcall = tc;
req->rcall = NULL;
req->err = 0;
req->cb = cb;
req->cba = cba;
spin_lock(&m->lock);
list_add_tail(&req->req_list, &m->unsent_req_list);
spin_unlock(&m->lock);
if (test_and_clear_bit(Wpending, &m->wsched))
n = POLLOUT;
else
n = m->trans->poll(m->trans, NULL);
if (n & POLLOUT && !test_and_set_bit(Wworksched, &m->wsched))
queue_work(v9fs_mux_wq, &m->wq);
return req;
}
static inline void
v9fs_mux_flush_cb(void *a, struct v9fs_fcall *tc, struct v9fs_fcall *rc,
int err)
{ {
char procname[60]; v9fs_mux_req_callback cb;
int tag;
strncpy(procname, dev_name, sizeof(procname)); struct v9fs_mux_data *m;
procname[sizeof(procname) - 1] = 0; struct v9fs_req *req, *rptr;
init_waitqueue_head(&v9ses->read_wait); m = a;
init_completion(&v9ses->fcread); dprintk(DEBUG_MUX, "mux %p tc %p rc %p err %d oldtag %d\n", m, tc,
init_completion(&v9ses->proccmpl); rc, err, tc->params.tflush.oldtag);
spin_lock_init(&v9ses->muxlock);
INIT_LIST_HEAD(&v9ses->mux_fcalls); spin_lock(&m->lock);
v9ses->recvproc = NULL; cb = NULL;
v9ses->curfcall = NULL; tag = tc->params.tflush.oldtag;
list_for_each_entry_safe(req, rptr, &m->req_list, req_list) {
v9ses->recvproc = kthread_create(v9fs_recvproc, v9ses, if (req->tag == tag) {
"v9fs_recvproc %s", procname); list_del(&req->req_list);
if (req->cb) {
if (IS_ERR(v9ses->recvproc)) { cb = req->cb;
eprintk(KERN_ERR, "cannot create receiving thread\n"); req->cb = NULL;
v9fs_session_close(v9ses); spin_unlock(&m->lock);
return -ECONNABORTED; (*cb) (req->cba, req->tcall, req->rcall,
req->err);
}
kfree(req);
wake_up(&m->equeue);
break;
}
}
if (!cb)
spin_unlock(&m->lock);
if (v9fs_check_idpool(tag, &m->tidpool))
v9fs_put_idpool(tag, &m->tidpool);
kfree(tc);
kfree(rc);
}
static void
v9fs_mux_flush_request(struct v9fs_mux_data *m, struct v9fs_req *req)
{
struct v9fs_fcall *fc;
dprintk(DEBUG_MUX, "mux %p req %p tag %d\n", m, req, req->tag);
fc = kmalloc(sizeof(struct v9fs_fcall), GFP_KERNEL);
fc->id = TFLUSH;
fc->params.tflush.oldtag = req->tag;
v9fs_send_request(m, fc, v9fs_mux_flush_cb, m);
}
static void
v9fs_mux_rpc_cb(void *a, struct v9fs_fcall *tc, struct v9fs_fcall *rc, int err)
{
struct v9fs_mux_rpc *r;
if (err == ERREQFLUSH) {
dprintk(DEBUG_MUX, "err req flush\n");
return;
}
r = a;
dprintk(DEBUG_MUX, "mux %p req %p tc %p rc %p err %d\n", r->m, r->req,
tc, rc, err);
r->rcall = rc;
r->err = err;
wake_up(&r->wqueue);
}
/**
* v9fs_mux_rpc - sends 9P request and waits until a response is available.
* The function can be interrupted.
* @m: mux data
* @tc: request to be sent
* @rc: pointer where a pointer to the response is stored
*/
int
v9fs_mux_rpc(struct v9fs_mux_data *m, struct v9fs_fcall *tc,
struct v9fs_fcall **rc)
{
int err;
unsigned long flags;
struct v9fs_req *req;
struct v9fs_mux_rpc r;
r.err = 0;
r.rcall = NULL;
r.m = m;
init_waitqueue_head(&r.wqueue);
if (rc)
*rc = NULL;
req = v9fs_send_request(m, tc, v9fs_mux_rpc_cb, &r);
if (IS_ERR(req)) {
err = PTR_ERR(req);
dprintk(DEBUG_MUX, "error %d\n", err);
return PTR_ERR(req);
}
r.req = req;
dprintk(DEBUG_MUX, "mux %p tc %p tag %d rpc %p req %p\n", m, tc,
req->tag, &r, req);
err = wait_event_interruptible(r.wqueue, r.rcall != NULL || r.err < 0);
if (r.err < 0)
err = r.err;
if (err == -ERESTARTSYS && m->trans->status == Connected && m->err == 0) {
spin_lock(&m->lock);
req->tcall = NULL;
req->err = ERREQFLUSH;
spin_unlock(&m->lock);
clear_thread_flag(TIF_SIGPENDING);
v9fs_mux_flush_request(m, req);
spin_lock_irqsave(&current->sighand->siglock, flags);
recalc_sigpending();
spin_unlock_irqrestore(&current->sighand->siglock, flags);
} }
wake_up_process(v9ses->recvproc); if (!err) {
wait_for_completion(&v9ses->proccmpl); if (r.rcall)
dprintk(DEBUG_MUX, "got response id %d tag %d\n",
r.rcall->id, r.rcall->tag);
if (rc)
*rc = r.rcall;
else
kfree(r.rcall);
} else {
kfree(r.rcall);
dprintk(DEBUG_MUX, "got error %d\n", err);
if (err > 0)
err = -EIO;
}
return err;
}
/**
* v9fs_mux_rpcnb - sends 9P request without waiting for response.
* @m: mux data
* @tc: request to be sent
* @cb: callback function to be called when response arrives
* @cba: value to pass to the callback function
*/
int v9fs_mux_rpcnb(struct v9fs_mux_data *m, struct v9fs_fcall *tc,
v9fs_mux_req_callback cb, void *a)
{
int err;
struct v9fs_req *req;
req = v9fs_send_request(m, tc, cb, a);
if (IS_ERR(req)) {
err = PTR_ERR(req);
dprintk(DEBUG_MUX, "error %d\n", err);
return PTR_ERR(req);
}
dprintk(DEBUG_MUX, "mux %p tc %p tag %d\n", m, tc, req->tag);
return 0; return 0;
} }
/**
* v9fs_mux_cancel - cancel all pending requests with error
* @m: mux data
* @err: error code
*/
void v9fs_mux_cancel(struct v9fs_mux_data *m, int err)
{
struct v9fs_req *req, *rtmp;
LIST_HEAD(cancel_list);
dprintk(DEBUG_MUX, "mux %p err %d\n", m, err);
m->err = err;
spin_lock(&m->lock);
list_for_each_entry_safe(req, rtmp, &m->req_list, req_list) {
list_move(&req->req_list, &cancel_list);
}
spin_unlock(&m->lock);
list_for_each_entry_safe(req, rtmp, &cancel_list, req_list) {
list_del(&req->req_list);
if (!req->err)
req->err = err;
if (req->cb)
(*req->cb) (req->cba, req->tcall, req->rcall, req->err);
else
kfree(req->rcall);
kfree(req);
}
wake_up(&m->equeue);
}
fs/9p/mux.h
View file @ 3cf6429a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* Multiplexer Definitions * Multiplexer Definitions
* *
* Copyright (C) 2005 by Latchesar Ionkov <lucho@ionkov.net>
* Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com> * Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -23,19 +24,34 @@ ...@@ -23,19 +24,34 @@
* *
*/ */
/* structure to manage each RPC transaction */ struct v9fs_mux_data;
struct v9fs_rpcreq { /**
struct v9fs_fcall *tcall; * v9fs_mux_req_callback - callback function that is called when the
struct v9fs_fcall *rcall; * response of a request is received. The callback is called from
int err; /* error code if response failed */ * a workqueue and shouldn't block.
*
* @a - the pointer that was specified when the request was send to be
* passed to the callback
* @tc - request call
* @rc - response call
* @err - error code (non-zero if error occured)
*/
typedef void (*v9fs_mux_req_callback)(void *a, struct v9fs_fcall *tc,
struct v9fs_fcall *rc, int err);
void v9fs_mux_global_init(void);
void v9fs_mux_global_exit(void);
/* XXX - could we put scatter/gather buffers here? */ struct v9fs_mux_data *v9fs_mux_init(struct v9fs_transport *trans, int msize,
unsigned char *extended);
void v9fs_mux_destroy(struct v9fs_mux_data *);
struct list_head next; int v9fs_mux_send(struct v9fs_mux_data *m, struct v9fs_fcall *tc);
}; struct v9fs_fcall *v9fs_mux_recv(struct v9fs_mux_data *m);
int v9fs_mux_rpc(struct v9fs_mux_data *m, struct v9fs_fcall *tc, struct v9fs_fcall **rc);
int v9fs_mux_rpcnb(struct v9fs_mux_data *m, struct v9fs_fcall *tc,
v9fs_mux_req_callback cb, void *a);
int v9fs_mux_init(struct v9fs_session_info *v9ses, const char *dev_name); void v9fs_mux_flush(struct v9fs_mux_data *m, int sendflush);
long v9fs_mux_rpc(struct v9fs_session_info *v9ses, void v9fs_mux_cancel(struct v9fs_mux_data *m, int err);
struct v9fs_fcall *tcall, struct v9fs_fcall **rcall);
void v9fs_mux_cancel_requests(struct v9fs_session_info *v9ses, int err);
fs/9p/trans_fd.c
View file @ 3cf6429a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* File Descriptor Transport Layer * File Descriptor Transport Layer
* *
* Copyright (C) 2005 by Latchesar Ionkov <lucho@ionkov.net>
* Copyright (C) 2005 by Eric Van Hensbergen <ericvh@gmail.com> * Copyright (C) 2005 by Eric Van Hensbergen <ericvh@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -106,9 +107,6 @@ v9fs_fd_init(struct v9fs_session_info *v9ses, const char *addr, char *data) ...@@ -106,9 +107,6 @@ v9fs_fd_init(struct v9fs_session_info *v9ses, const char *addr, char *data)
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
sema_init(&trans->writelock, 1);
sema_init(&trans->readlock, 1);
ts = kmalloc(sizeof(struct v9fs_trans_fd), GFP_KERNEL); ts = kmalloc(sizeof(struct v9fs_trans_fd), GFP_KERNEL);
if (!ts) if (!ts)
...@@ -163,10 +161,55 @@ static void v9fs_fd_close(struct v9fs_transport *trans) ...@@ -163,10 +161,55 @@ static void v9fs_fd_close(struct v9fs_transport *trans)
kfree(ts); kfree(ts);
} }
static unsigned int
v9fs_fd_poll(struct v9fs_transport *trans, struct poll_table_struct *pt)
{
int ret, n;
struct v9fs_trans_fd *ts;
mm_segment_t oldfs;
if (!trans)
return -EIO;
ts = trans->priv;
if (trans->status != Connected || !ts)
return -EIO;
oldfs = get_fs();
set_fs(get_ds());
if (!ts->in_file->f_op || !ts->in_file->f_op->poll) {
ret = -EIO;
goto end;
}
ret = ts->in_file->f_op->poll(ts->in_file, pt);
if (ts->out_file != ts->in_file) {
if (!ts->out_file->f_op || !ts->out_file->f_op->poll) {
ret = -EIO;
goto end;
}
n = ts->out_file->f_op->poll(ts->out_file, pt);
ret &= ~POLLOUT;
n &= ~POLLIN;
ret |= n;
}
end:
set_fs(oldfs);
return ret;
}
struct v9fs_transport v9fs_trans_fd = { struct v9fs_transport v9fs_trans_fd = {
.init = v9fs_fd_init, .init = v9fs_fd_init,
.write = v9fs_fd_send, .write = v9fs_fd_send,
.read = v9fs_fd_recv, .read = v9fs_fd_recv,
.close = v9fs_fd_close, .close = v9fs_fd_close,
.poll = v9fs_fd_poll,
}; };
fs/9p/trans_sock.c
View file @ 3cf6429a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* Socket Transport Layer * Socket Transport Layer
* *
* Copyright (C) 2004-2005 by Latchesar Ionkov <lucho@ionkov.net>
* Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com> * Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
* Copyright (C) 1997-2002 by Ron Minnich <rminnich@sarnoff.com> * Copyright (C) 1997-2002 by Ron Minnich <rminnich@sarnoff.com>
* Copyright (C) 1995, 1996 by Olaf Kirch <okir@monad.swb.de> * Copyright (C) 1995, 1996 by Olaf Kirch <okir@monad.swb.de>
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/file.h>
#include "debug.h" #include "debug.h"
#include "v9fs.h" #include "v9fs.h"
...@@ -45,6 +47,7 @@ ...@@ -45,6 +47,7 @@
struct v9fs_trans_sock { struct v9fs_trans_sock {
struct socket *s; struct socket *s;
struct file *filp;
}; };
/** /**
...@@ -57,41 +60,26 @@ struct v9fs_trans_sock { ...@@ -57,41 +60,26 @@ struct v9fs_trans_sock {
static int v9fs_sock_recv(struct v9fs_transport *trans, void *v, int len) static int v9fs_sock_recv(struct v9fs_transport *trans, void *v, int len)
{ {
struct msghdr msg; int ret;
struct kvec iov; struct v9fs_trans_sock *ts;
int result;
mm_segment_t oldfs;
struct v9fs_trans_sock *ts = trans ? trans->priv : NULL;
if (trans->status == Disconnected) if (!trans || trans->status == Disconnected) {
dprintk(DEBUG_ERROR, "disconnected ...\n");
return -EREMOTEIO; return -EREMOTEIO;
}
result = -EINVAL; ts = trans->priv;
oldfs = get_fs();
set_fs(get_ds());
iov.iov_base = v;
iov.iov_len = len;
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iovlen = 1;
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_namelen = 0;
msg.msg_flags = MSG_NOSIGNAL;
result = kernel_recvmsg(ts->s, &msg, &iov, 1, len, 0);
dprintk(DEBUG_TRANS, "socket state %d\n", ts->s->state); if (!(ts->filp->f_flags & O_NONBLOCK))
set_fs(oldfs); dprintk(DEBUG_ERROR, "blocking read ...\n");
if (result <= 0) { ret = kernel_read(ts->filp, ts->filp->f_pos, v, len);
if (result != -ERESTARTSYS) if (ret <= 0) {
if (ret != -ERESTARTSYS && ret != -EAGAIN)
trans->status = Disconnected; trans->status = Disconnected;
} }
return result; return ret;
} }
/** /**
...@@ -104,40 +92,73 @@ static int v9fs_sock_recv(struct v9fs_transport *trans, void *v, int len) ...@@ -104,40 +92,73 @@ static int v9fs_sock_recv(struct v9fs_transport *trans, void *v, int len)
static int v9fs_sock_send(struct v9fs_transport *trans, void *v, int len) static int v9fs_sock_send(struct v9fs_transport *trans, void *v, int len)
{ {
struct kvec iov; int ret;
struct msghdr msg;
int result = -1;
mm_segment_t oldfs; mm_segment_t oldfs;
struct v9fs_trans_sock *ts = trans ? trans->priv : NULL; struct v9fs_trans_sock *ts;
dprintk(DEBUG_TRANS, "Sending packet size %d (%x)\n", len, len); if (!trans || trans->status == Disconnected) {
dump_data(v, len); dprintk(DEBUG_ERROR, "disconnected ...\n");
return -EREMOTEIO;
}
ts = trans->priv;
if (!ts) {
dprintk(DEBUG_ERROR, "no transport ...\n");
return -EREMOTEIO;
}
down(&trans->writelock); if (!(ts->filp->f_flags & O_NONBLOCK))
dprintk(DEBUG_ERROR, "blocking write ...\n");
dump_data(v, len);
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(get_ds());
iov.iov_base = v; ret = vfs_write(ts->filp, (void __user *)v, len, &ts->filp->f_pos);
iov.iov_len = len;
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iovlen = 1;
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_namelen = 0;
msg.msg_flags = MSG_NOSIGNAL;
result = kernel_sendmsg(ts->s, &msg, &iov, 1, len);
set_fs(oldfs); set_fs(oldfs);
if (result < 0) { if (ret < 0) {
if (result != -ERESTARTSYS) if (ret != -ERESTARTSYS)
trans->status = Disconnected; trans->status = Disconnected;
} }
up(&trans->writelock); return ret;
return result; }
static unsigned int v9fs_sock_poll(struct v9fs_transport *trans,
struct poll_table_struct *pt) {
int ret;
struct v9fs_trans_sock *ts;
mm_segment_t oldfs;
if (!trans) {
dprintk(DEBUG_ERROR, "no transport\n");
return -EIO;
}
ts = trans->priv;
if (trans->status != Connected || !ts) {
dprintk(DEBUG_ERROR, "transport disconnected: %d\n", trans->status);
return -EIO;
}
oldfs = get_fs();
set_fs(get_ds());
if (!ts->filp->f_op || !ts->filp->f_op->poll) {
dprintk(DEBUG_ERROR, "no poll operation\n");
ret = -EIO;
goto end;
}
ret = ts->filp->f_op->poll(ts->filp, pt);
end:
set_fs(oldfs);
return ret;
} }
/** /**
* v9fs_tcp_init - initialize TCP socket * v9fs_tcp_init - initialize TCP socket
* @v9ses: session information * @v9ses: session information
...@@ -154,9 +175,9 @@ v9fs_tcp_init(struct v9fs_session_info *v9ses, const char *addr, char *data) ...@@ -154,9 +175,9 @@ v9fs_tcp_init(struct v9fs_session_info *v9ses, const char *addr, char *data)
int rc = 0; int rc = 0;
struct v9fs_trans_sock *ts = NULL; struct v9fs_trans_sock *ts = NULL;
struct v9fs_transport *trans = v9ses->transport; struct v9fs_transport *trans = v9ses->transport;
int fd;
sema_init(&trans->writelock, 1); trans->status = Disconnected;
sema_init(&trans->readlock, 1);
ts = kmalloc(sizeof(struct v9fs_trans_sock), GFP_KERNEL); ts = kmalloc(sizeof(struct v9fs_trans_sock), GFP_KERNEL);
...@@ -165,6 +186,7 @@ v9fs_tcp_init(struct v9fs_session_info *v9ses, const char *addr, char *data) ...@@ -165,6 +186,7 @@ v9fs_tcp_init(struct v9fs_session_info *v9ses, const char *addr, char *data)
trans->priv = ts; trans->priv = ts;
ts->s = NULL; ts->s = NULL;
ts->filp = NULL;
if (!addr) if (!addr)
return -EINVAL; return -EINVAL;
...@@ -185,7 +207,18 @@ v9fs_tcp_init(struct v9fs_session_info *v9ses, const char *addr, char *data) ...@@ -185,7 +207,18 @@ v9fs_tcp_init(struct v9fs_session_info *v9ses, const char *addr, char *data)
return rc; return rc;
} }
csocket->sk->sk_allocation = GFP_NOIO; csocket->sk->sk_allocation = GFP_NOIO;
fd = sock_map_fd(csocket);
if (fd < 0) {
sock_release(csocket);
kfree(ts);
trans->priv = NULL;
return fd;
}
ts->s = csocket; ts->s = csocket;
ts->filp = fget(fd);
ts->filp->f_flags |= O_NONBLOCK;
trans->status = Connected; trans->status = Connected;
return 0; return 0;
...@@ -203,7 +236,7 @@ static int ...@@ -203,7 +236,7 @@ static int
v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name, v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name,
char *data) char *data)
{ {
int rc; int rc, fd;
struct socket *csocket; struct socket *csocket;
struct sockaddr_un sun_server; struct sockaddr_un sun_server;
struct v9fs_transport *trans; struct v9fs_transport *trans;
...@@ -213,6 +246,8 @@ v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name, ...@@ -213,6 +246,8 @@ v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name,
csocket = NULL; csocket = NULL;
trans = v9ses->transport; trans = v9ses->transport;
trans->status = Disconnected;
if (strlen(dev_name) > UNIX_PATH_MAX) { if (strlen(dev_name) > UNIX_PATH_MAX) {
eprintk(KERN_ERR, "v9fs_trans_unix: address too long: %s\n", eprintk(KERN_ERR, "v9fs_trans_unix: address too long: %s\n",
dev_name); dev_name);
...@@ -225,9 +260,7 @@ v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name, ...@@ -225,9 +260,7 @@ v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name,
trans->priv = ts; trans->priv = ts;
ts->s = NULL; ts->s = NULL;
ts->filp = NULL;
sema_init(&trans->writelock, 1);
sema_init(&trans->readlock, 1);
sun_server.sun_family = PF_UNIX; sun_server.sun_family = PF_UNIX;
strcpy(sun_server.sun_path, dev_name); strcpy(sun_server.sun_path, dev_name);
...@@ -241,7 +274,18 @@ v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name, ...@@ -241,7 +274,18 @@ v9fs_unix_init(struct v9fs_session_info *v9ses, const char *dev_name,
return rc; return rc;
} }
csocket->sk->sk_allocation = GFP_NOIO; csocket->sk->sk_allocation = GFP_NOIO;
fd = sock_map_fd(csocket);
if (fd < 0) {
sock_release(csocket);
kfree(ts);
trans->priv = NULL;
return fd;
}
ts->s = csocket; ts->s = csocket;
ts->filp = fget(fd);
ts->filp->f_flags |= O_NONBLOCK;
trans->status = Connected; trans->status = Connected;
return 0; return 0;
...@@ -262,12 +306,11 @@ static void v9fs_sock_close(struct v9fs_transport *trans) ...@@ -262,12 +306,11 @@ static void v9fs_sock_close(struct v9fs_transport *trans)
ts = trans->priv; ts = trans->priv;
if ((ts) && (ts->s)) { if ((ts) && (ts->filp)) {
dprintk(DEBUG_TRANS, "closing the socket %p\n", ts->s); fput(ts->filp);
sock_release(ts->s); ts->filp = NULL;
ts->s = NULL; ts->s = NULL;
trans->status = Disconnected; trans->status = Disconnected;
dprintk(DEBUG_TRANS, "socket closed\n");
} }
kfree(ts); kfree(ts);
...@@ -280,6 +323,7 @@ struct v9fs_transport v9fs_trans_tcp = { ...@@ -280,6 +323,7 @@ struct v9fs_transport v9fs_trans_tcp = {
.write = v9fs_sock_send, .write = v9fs_sock_send,
.read = v9fs_sock_recv, .read = v9fs_sock_recv,
.close = v9fs_sock_close, .close = v9fs_sock_close,
.poll = v9fs_sock_poll,
}; };
struct v9fs_transport v9fs_trans_unix = { struct v9fs_transport v9fs_trans_unix = {
...@@ -287,4 +331,5 @@ struct v9fs_transport v9fs_trans_unix = { ...@@ -287,4 +331,5 @@ struct v9fs_transport v9fs_trans_unix = {
.write = v9fs_sock_send, .write = v9fs_sock_send,
.read = v9fs_sock_recv, .read = v9fs_sock_recv,
.close = v9fs_sock_close, .close = v9fs_sock_close,
.poll = v9fs_sock_poll,
}; };
fs/9p/transport.h
View file @ 3cf6429a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* Transport Definition * Transport Definition
* *
* Copyright (C) 2005 by Latchesar Ionkov <lucho@ionkov.net>
* Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com> * Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -31,14 +32,13 @@ enum v9fs_transport_status { ...@@ -31,14 +32,13 @@ enum v9fs_transport_status {
struct v9fs_transport { struct v9fs_transport {
enum v9fs_transport_status status; enum v9fs_transport_status status;
struct semaphore writelock;
struct semaphore readlock;
void *priv; void *priv;
int (*init) (struct v9fs_session_info *, const char *, char *); int (*init) (struct v9fs_session_info *, const char *, char *);
int (*write) (struct v9fs_transport *, void *, int); int (*write) (struct v9fs_transport *, void *, int);
int (*read) (struct v9fs_transport *, void *, int); int (*read) (struct v9fs_transport *, void *, int);
void (*close) (struct v9fs_transport *); void (*close) (struct v9fs_transport *);
unsigned int (*poll)(struct v9fs_transport *, struct poll_table_struct *);
}; };
extern struct v9fs_transport v9fs_trans_tcp; extern struct v9fs_transport v9fs_trans_tcp;
......
fs/9p/v9fs.c
View file @ 3cf6429a
...@@ -213,7 +213,8 @@ int v9fs_get_idpool(struct v9fs_idpool *p) ...@@ -213,7 +213,8 @@ int v9fs_get_idpool(struct v9fs_idpool *p)
return -1; return -1;
} }
error = idr_get_new(&p->pool, NULL, &i); /* no need to store exactly p, we just need something non-null */
error = idr_get_new(&p->pool, p, &i);
up(&p->lock); up(&p->lock);
if (error == -EAGAIN) if (error == -EAGAIN)
...@@ -242,6 +243,16 @@ void v9fs_put_idpool(int id, struct v9fs_idpool *p) ...@@ -242,6 +243,16 @@ void v9fs_put_idpool(int id, struct v9fs_idpool *p)
up(&p->lock); up(&p->lock);
} }
/**
* v9fs_check_idpool - check if the specified id is available
* @id - id to check
* @p - pool
*/
int v9fs_check_idpool(int id, struct v9fs_idpool *p)
{
return idr_find(&p->pool, id) != NULL;
}
/** /**
* v9fs_session_init - initialize session * v9fs_session_init - initialize session
* @v9ses: session information structure * @v9ses: session information structure
...@@ -281,9 +292,6 @@ v9fs_session_init(struct v9fs_session_info *v9ses, ...@@ -281,9 +292,6 @@ v9fs_session_init(struct v9fs_session_info *v9ses,
/* id pools that are session-dependent: FIDs and TIDs */ /* id pools that are session-dependent: FIDs and TIDs */
idr_init(&v9ses->fidpool.pool); idr_init(&v9ses->fidpool.pool);
init_MUTEX(&v9ses->fidpool.lock); init_MUTEX(&v9ses->fidpool.lock);
idr_init(&v9ses->tidpool.pool);
init_MUTEX(&v9ses->tidpool.lock);
switch (v9ses->proto) { switch (v9ses->proto) {
case PROTO_TCP: case PROTO_TCP:
...@@ -320,7 +328,12 @@ v9fs_session_init(struct v9fs_session_info *v9ses, ...@@ -320,7 +328,12 @@ v9fs_session_init(struct v9fs_session_info *v9ses,
v9ses->shutdown = 0; v9ses->shutdown = 0;
v9ses->session_hung = 0; v9ses->session_hung = 0;
if ((retval = v9fs_mux_init(v9ses, dev_name)) < 0) { v9ses->mux = v9fs_mux_init(v9ses->transport, v9ses->maxdata + V9FS_IOHDRSZ,
&v9ses->extended);
if (IS_ERR(v9ses->mux)) {
retval = PTR_ERR(v9ses->mux);
v9ses->mux = NULL;
dprintk(DEBUG_ERROR, "problem initializing mux\n"); dprintk(DEBUG_ERROR, "problem initializing mux\n");
goto SessCleanUp; goto SessCleanUp;
} }
...@@ -381,7 +394,7 @@ v9fs_session_init(struct v9fs_session_info *v9ses, ...@@ -381,7 +394,7 @@ v9fs_session_init(struct v9fs_session_info *v9ses,
} }
if (v9ses->afid != ~0) { if (v9ses->afid != ~0) {
if (v9fs_t_clunk(v9ses, v9ses->afid, NULL)) if (v9fs_t_clunk(v9ses, v9ses->afid))
dprintk(DEBUG_ERROR, "clunk failed\n"); dprintk(DEBUG_ERROR, "clunk failed\n");
} }
...@@ -403,13 +416,16 @@ v9fs_session_init(struct v9fs_session_info *v9ses, ...@@ -403,13 +416,16 @@ v9fs_session_init(struct v9fs_session_info *v9ses,
void v9fs_session_close(struct v9fs_session_info *v9ses) void v9fs_session_close(struct v9fs_session_info *v9ses)
{ {
if (v9ses->recvproc) { if (v9ses->mux) {
send_sig(SIGKILL, v9ses->recvproc, 1); v9fs_mux_destroy(v9ses->mux);
wait_for_completion(&v9ses->proccmpl); v9ses->mux = NULL;
} }
if (v9ses->transport) if (v9ses->transport) {
v9ses->transport->close(v9ses->transport); v9ses->transport->close(v9ses->transport);
kfree(v9ses->transport);
v9ses->transport = NULL;
}
__putname(v9ses->name); __putname(v9ses->name);
__putname(v9ses->remotename); __putname(v9ses->remotename);
...@@ -420,8 +436,9 @@ void v9fs_session_close(struct v9fs_session_info *v9ses) ...@@ -420,8 +436,9 @@ void v9fs_session_close(struct v9fs_session_info *v9ses)
* and cancel all pending requests. * and cancel all pending requests.
*/ */
void v9fs_session_cancel(struct v9fs_session_info *v9ses) { void v9fs_session_cancel(struct v9fs_session_info *v9ses) {
dprintk(DEBUG_ERROR, "cancel session %p\n", v9ses);
v9ses->transport->status = Disconnected; v9ses->transport->status = Disconnected;
v9fs_mux_cancel_requests(v9ses, -EIO); v9fs_mux_cancel(v9ses->mux, -EIO);
} }
extern int v9fs_error_init(void); extern int v9fs_error_init(void);
...@@ -437,6 +454,7 @@ static int __init init_v9fs(void) ...@@ -437,6 +454,7 @@ static int __init init_v9fs(void)
printk(KERN_INFO "Installing v9fs 9P2000 file system support\n"); printk(KERN_INFO "Installing v9fs 9P2000 file system support\n");
v9fs_mux_global_init();
return register_filesystem(&v9fs_fs_type); return register_filesystem(&v9fs_fs_type);
} }
...@@ -447,6 +465,7 @@ static int __init init_v9fs(void) ...@@ -447,6 +465,7 @@ static int __init init_v9fs(void)
static void __exit exit_v9fs(void) static void __exit exit_v9fs(void)
{ {
v9fs_mux_global_exit();
unregister_filesystem(&v9fs_fs_type); unregister_filesystem(&v9fs_fs_type);
} }
......
fs/9p/v9fs.h
View file @ 3cf6429a
...@@ -57,24 +57,14 @@ struct v9fs_session_info { ...@@ -57,24 +57,14 @@ struct v9fs_session_info {
/* book keeping */ /* book keeping */
struct v9fs_idpool fidpool; /* The FID pool for file descriptors */ struct v9fs_idpool fidpool; /* The FID pool for file descriptors */
struct v9fs_idpool tidpool; /* The TID pool for transactions ids */
/* transport information */
struct v9fs_transport *transport; struct v9fs_transport *transport;
struct v9fs_mux_data *mux;
int inprogress; /* session in progress => true */ int inprogress; /* session in progress => true */
int shutdown; /* session shutting down. no more attaches. */ int shutdown; /* session shutting down. no more attaches. */
unsigned char session_hung; unsigned char session_hung;
struct dentry *debugfs_dir;
/* mux private data */
struct v9fs_fcall *curfcall;
wait_queue_head_t read_wait;
struct completion fcread;
struct completion proccmpl;
struct task_struct *recvproc;
spinlock_t muxlock;
struct list_head mux_fcalls;
}; };
/* possible values of ->proto */ /* possible values of ->proto */
...@@ -84,11 +74,14 @@ enum { ...@@ -84,11 +74,14 @@ enum {
PROTO_FD, PROTO_FD,
}; };
extern struct dentry *v9fs_debugfs_root;
int v9fs_session_init(struct v9fs_session_info *, const char *, char *); int v9fs_session_init(struct v9fs_session_info *, const char *, char *);
struct v9fs_session_info *v9fs_inode2v9ses(struct inode *); struct v9fs_session_info *v9fs_inode2v9ses(struct inode *);
void v9fs_session_close(struct v9fs_session_info *v9ses); void v9fs_session_close(struct v9fs_session_info *v9ses);
int v9fs_get_idpool(struct v9fs_idpool *p); int v9fs_get_idpool(struct v9fs_idpool *p);
void v9fs_put_idpool(int id, struct v9fs_idpool *p); void v9fs_put_idpool(int id, struct v9fs_idpool *p);
int v9fs_check_idpool(int id, struct v9fs_idpool *p);
void v9fs_session_cancel(struct v9fs_session_info *v9ses); void v9fs_session_cancel(struct v9fs_session_info *v9ses);
#define V9FS_MAGIC 0x01021997 #define V9FS_MAGIC 0x01021997
......
fs/9p/vfs_dentry.c
View file @ 3cf6429a
...@@ -95,24 +95,21 @@ static int v9fs_dentry_validate(struct dentry *dentry, struct nameidata *nd) ...@@ -95,24 +95,21 @@ static int v9fs_dentry_validate(struct dentry *dentry, struct nameidata *nd)
void v9fs_dentry_release(struct dentry *dentry) void v9fs_dentry_release(struct dentry *dentry)
{ {
int err;
dprintk(DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); dprintk(DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
if (dentry->d_fsdata != NULL) { if (dentry->d_fsdata != NULL) {
struct list_head *fid_list = dentry->d_fsdata; struct list_head *fid_list = dentry->d_fsdata;
struct v9fs_fid *temp = NULL; struct v9fs_fid *temp = NULL;
struct v9fs_fid *current_fid = NULL; struct v9fs_fid *current_fid = NULL;
struct v9fs_fcall *fcall = NULL;
list_for_each_entry_safe(current_fid, temp, fid_list, list) { list_for_each_entry_safe(current_fid, temp, fid_list, list) {
if (v9fs_t_clunk err = v9fs_t_clunk(current_fid->v9ses, current_fid->fid);
(current_fid->v9ses, current_fid->fid, &fcall))
dprintk(DEBUG_ERROR, "clunk failed: %s\n",
FCALL_ERROR(fcall));
v9fs_put_idpool(current_fid->fid, if (err < 0)
&current_fid->v9ses->fidpool); dprintk(DEBUG_ERROR, "clunk failed: %d\n", err);
kfree(fcall);
v9fs_fid_destroy(current_fid); v9fs_fid_destroy(current_fid);
} }
......
fs/9p/vfs_dir.c
View file @ 3cf6429a
...@@ -74,7 +74,7 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) ...@@ -74,7 +74,7 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
struct inode *inode = filp->f_dentry->d_inode; struct inode *inode = filp->f_dentry->d_inode;
struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);
struct v9fs_fid *file = filp->private_data; struct v9fs_fid *file = filp->private_data;
unsigned int i, n; unsigned int i, n, s;
int fid = -1; int fid = -1;
int ret = 0; int ret = 0;
struct v9fs_stat *mi = NULL; struct v9fs_stat *mi = NULL;
...@@ -97,9 +97,9 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) ...@@ -97,9 +97,9 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
n = file->rdir_fcall->params.rread.count; n = file->rdir_fcall->params.rread.count;
i = file->rdir_fpos; i = file->rdir_fpos;
while (i < n) { while (i < n) {
int s = v9fs_deserialize_stat(v9ses, s = v9fs_deserialize_stat(
file->rdir_fcall->params.rread.data + i, file->rdir_fcall->params.rread.data + i,
n - i, mi, v9ses->maxdata); n - i, mi, v9ses->maxdata, v9ses->extended);
if (s == 0) { if (s == 0) {
dprintk(DEBUG_ERROR, dprintk(DEBUG_ERROR,
...@@ -141,9 +141,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) ...@@ -141,9 +141,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
n = ret; n = ret;
i = 0; i = 0;
while (i < n) { while (i < n) {
int s = v9fs_deserialize_stat(v9ses, s = v9fs_deserialize_stat(fcall->params.rread.data + i,
fcall->params.rread.data + i, n - i, mi, n - i, mi, v9ses->maxdata, v9ses->extended);
v9ses->maxdata);
if (s == 0) { if (s == 0) {
dprintk(DEBUG_ERROR, dprintk(DEBUG_ERROR,
...@@ -199,11 +198,9 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) ...@@ -199,11 +198,9 @@ int v9fs_dir_release(struct inode *inode, struct file *filp)
dprintk(DEBUG_VFS, "fidopen: %d v9f->fid: %d\n", fid->fidopen, dprintk(DEBUG_VFS, "fidopen: %d v9f->fid: %d\n", fid->fidopen,
fid->fid); fid->fid);
if (v9fs_t_clunk(v9ses, fidnum, NULL)) if (v9fs_t_clunk(v9ses, fidnum))
dprintk(DEBUG_ERROR, "clunk failed\n"); dprintk(DEBUG_ERROR, "clunk failed\n");
v9fs_put_idpool(fid->fid, &v9ses->fidpool);
kfree(fid->rdir_fcall); kfree(fid->rdir_fcall);
kfree(fid); kfree(fid);
......
fs/9p/vfs_inode.c
View file @ 3cf6429a
...@@ -318,6 +318,7 @@ v9fs_create(struct inode *dir, ...@@ -318,6 +318,7 @@ v9fs_create(struct inode *dir,
int result = 0; int result = 0;
unsigned int iounit = 0; unsigned int iounit = 0;
int wfidno = -1; int wfidno = -1;
int err;
perm = unixmode2p9mode(v9ses, perm); perm = unixmode2p9mode(v9ses, perm);
...@@ -356,6 +357,7 @@ v9fs_create(struct inode *dir, ...@@ -356,6 +357,7 @@ v9fs_create(struct inode *dir,
} }
kfree(fcall); kfree(fcall);
fcall = NULL;
result = v9fs_t_create(v9ses, newfid, (char *)file_dentry->d_name.name, result = v9fs_t_create(v9ses, newfid, (char *)file_dentry->d_name.name,
perm, open_mode, &fcall); perm, open_mode, &fcall);
...@@ -369,16 +371,23 @@ v9fs_create(struct inode *dir, ...@@ -369,16 +371,23 @@ v9fs_create(struct inode *dir,
iounit = fcall->params.rcreate.iounit; iounit = fcall->params.rcreate.iounit;
qid = fcall->params.rcreate.qid; qid = fcall->params.rcreate.qid;
kfree(fcall); kfree(fcall);
fcall = NULL;
fid = v9fs_fid_create(file_dentry, v9ses, newfid, 1); if (!(perm&V9FS_DMDIR)) {
dprintk(DEBUG_VFS, "fid %p %d\n", fid, fid->fidcreate); fid = v9fs_fid_create(file_dentry, v9ses, newfid, 1);
if (!fid) { dprintk(DEBUG_VFS, "fid %p %d\n", fid, fid->fidcreate);
result = -ENOMEM; if (!fid) {
goto CleanUpFid; result = -ENOMEM;
} goto CleanUpFid;
}
fid->qid = qid; fid->qid = qid;
fid->iounit = iounit; fid->iounit = iounit;
} else {
err = v9fs_t_clunk(v9ses, newfid);
if (err < 0)
dprintk(DEBUG_ERROR, "clunk for mkdir failed: %d\n", err);
}
/* walk to the newly created file and put the fid in the dentry */ /* walk to the newly created file and put the fid in the dentry */
wfidno = v9fs_get_idpool(&v9ses->fidpool); wfidno = v9fs_get_idpool(&v9ses->fidpool);
...@@ -388,18 +397,19 @@ v9fs_create(struct inode *dir, ...@@ -388,18 +397,19 @@ v9fs_create(struct inode *dir,
} }
result = v9fs_t_walk(v9ses, dirfidnum, wfidno, result = v9fs_t_walk(v9ses, dirfidnum, wfidno,
(char *) file_dentry->d_name.name, NULL); (char *) file_dentry->d_name.name, &fcall);
if (result < 0) { if (result < 0) {
dprintk(DEBUG_ERROR, "clone error: %s\n", FCALL_ERROR(fcall)); dprintk(DEBUG_ERROR, "clone error: %s\n", FCALL_ERROR(fcall));
v9fs_put_idpool(wfidno, &v9ses->fidpool); v9fs_put_idpool(wfidno, &v9ses->fidpool);
wfidno = -1; wfidno = -1;
goto CleanUpFid; goto CleanUpFid;
} }
kfree(fcall);
fcall = NULL;
if (!v9fs_fid_create(file_dentry, v9ses, wfidno, 0)) { if (!v9fs_fid_create(file_dentry, v9ses, wfidno, 0)) {
if (!v9fs_t_clunk(v9ses, newfid, &fcall)) { v9fs_t_clunk(v9ses, newfid);
v9fs_put_idpool(wfidno, &v9ses->fidpool); v9fs_put_idpool(wfidno, &v9ses->fidpool);
}
goto CleanUpFid; goto CleanUpFid;
} }
...@@ -431,40 +441,21 @@ v9fs_create(struct inode *dir, ...@@ -431,40 +441,21 @@ v9fs_create(struct inode *dir,
file_dentry->d_op = &v9fs_dentry_operations; file_dentry->d_op = &v9fs_dentry_operations;
d_instantiate(file_dentry, file_inode); d_instantiate(file_dentry, file_inode);
if (perm & V9FS_DMDIR) {
if (!v9fs_t_clunk(v9ses, newfid, &fcall))
v9fs_put_idpool(newfid, &v9ses->fidpool);
else
dprintk(DEBUG_ERROR, "clunk for mkdir failed: %s\n",
FCALL_ERROR(fcall));
kfree(fcall);
fid->fidopen = 0;
fid->fidcreate = 0;
d_drop(file_dentry);
}
return 0; return 0;
CleanUpFid: CleanUpFid:
kfree(fcall); kfree(fcall);
fcall = NULL;
if (newfid >= 0) { if (newfid >= 0) {
if (!v9fs_t_clunk(v9ses, newfid, &fcall)) err = v9fs_t_clunk(v9ses, newfid);
v9fs_put_idpool(newfid, &v9ses->fidpool); if (err < 0)
else dprintk(DEBUG_ERROR, "clunk failed: %d\n", err);
dprintk(DEBUG_ERROR, "clunk failed: %s\n",
FCALL_ERROR(fcall));
kfree(fcall);
} }
if (wfidno >= 0) { if (wfidno >= 0) {
if (!v9fs_t_clunk(v9ses, wfidno, &fcall)) err = v9fs_t_clunk(v9ses, wfidno);
v9fs_put_idpool(wfidno, &v9ses->fidpool); if (err < 0)
else dprintk(DEBUG_ERROR, "clunk failed: %d\n", err);
dprintk(DEBUG_ERROR, "clunk failed: %s\n",
FCALL_ERROR(fcall));
kfree(fcall);
} }
return result; return result;
} }
...@@ -972,6 +963,7 @@ v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) ...@@ -972,6 +963,7 @@ v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
struct v9fs_session_info *v9ses = v9fs_inode2v9ses(dir); struct v9fs_session_info *v9ses = v9fs_inode2v9ses(dir);
struct v9fs_fcall *fcall = NULL; struct v9fs_fcall *fcall = NULL;
struct v9fs_stat *mistat = kmalloc(v9ses->maxdata, GFP_KERNEL); struct v9fs_stat *mistat = kmalloc(v9ses->maxdata, GFP_KERNEL);
int err;
dprintk(DEBUG_VFS, " %lu,%s,%s\n", dir->i_ino, dentry->d_name.name, dprintk(DEBUG_VFS, " %lu,%s,%s\n", dir->i_ino, dentry->d_name.name,
symname); symname);
...@@ -1004,9 +996,9 @@ v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) ...@@ -1004,9 +996,9 @@ v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
kfree(fcall); kfree(fcall);
if (v9fs_t_clunk(v9ses, newfid->fid, &fcall)) { err = v9fs_t_clunk(v9ses, newfid->fid);
dprintk(DEBUG_ERROR, "clunk for symlink failed: %s\n", if (err < 0) {
FCALL_ERROR(fcall)); dprintk(DEBUG_ERROR, "clunk for symlink failed: %d\n", err);
goto FreeFcall; goto FreeFcall;
} }
...@@ -1180,6 +1172,7 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir, ...@@ -1180,6 +1172,7 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
struct v9fs_fid *oldfid = v9fs_fid_lookup(old_dentry); struct v9fs_fid *oldfid = v9fs_fid_lookup(old_dentry);
struct v9fs_fid *newfid = NULL; struct v9fs_fid *newfid = NULL;
char *symname = __getname(); char *symname = __getname();
int err;
dprintk(DEBUG_VFS, " %lu,%s,%s\n", dir->i_ino, dentry->d_name.name, dprintk(DEBUG_VFS, " %lu,%s,%s\n", dir->i_ino, dentry->d_name.name,
old_dentry->d_name.name); old_dentry->d_name.name);
...@@ -1216,9 +1209,10 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir, ...@@ -1216,9 +1209,10 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
kfree(fcall); kfree(fcall);
if (v9fs_t_clunk(v9ses, newfid->fid, &fcall)) { err = v9fs_t_clunk(v9ses, newfid->fid);
dprintk(DEBUG_ERROR, "clunk for symlink failed: %s\n",
FCALL_ERROR(fcall)); if (err < 0) {
dprintk(DEBUG_ERROR, "clunk for symlink failed: %d\n", err);
goto FreeMem; goto FreeMem;
} }
...@@ -1252,6 +1246,7 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev) ...@@ -1252,6 +1246,7 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
struct v9fs_fcall *fcall = NULL; struct v9fs_fcall *fcall = NULL;
struct v9fs_stat *mistat = kmalloc(v9ses->maxdata, GFP_KERNEL); struct v9fs_stat *mistat = kmalloc(v9ses->maxdata, GFP_KERNEL);
char *symname = __getname(); char *symname = __getname();
int err;
dprintk(DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n", dir->i_ino, dprintk(DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n", dir->i_ino,
dentry->d_name.name, mode, MAJOR(rdev), MINOR(rdev)); dentry->d_name.name, mode, MAJOR(rdev), MINOR(rdev));
...@@ -1310,9 +1305,9 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev) ...@@ -1310,9 +1305,9 @@ v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
/* need to update dcache so we show up */ /* need to update dcache so we show up */
kfree(fcall); kfree(fcall);
if (v9fs_t_clunk(v9ses, newfid->fid, &fcall)) { err = v9fs_t_clunk(v9ses, newfid->fid);
dprintk(DEBUG_ERROR, "clunk for symlink failed: %s\n", if (err < 0) {
FCALL_ERROR(fcall)); dprintk(DEBUG_ERROR, "clunk for symlink failed: %d\n", err);
goto FreeMem; goto FreeMem;
} }
......
fs/9p/vfs_super.c
View file @ 3cf6429a
...@@ -129,6 +129,7 @@ static struct super_block *v9fs_get_sb(struct file_system_type ...@@ -129,6 +129,7 @@ static struct super_block *v9fs_get_sb(struct file_system_type
if ((newfid = v9fs_session_init(v9ses, dev_name, data)) < 0) { if ((newfid = v9fs_session_init(v9ses, dev_name, data)) < 0) {
dprintk(DEBUG_ERROR, "problem initiating session\n"); dprintk(DEBUG_ERROR, "problem initiating session\n");
kfree(v9ses);
return ERR_PTR(newfid); return ERR_PTR(newfid);
} }
...@@ -157,7 +158,7 @@ static struct super_block *v9fs_get_sb(struct file_system_type ...@@ -157,7 +158,7 @@ static struct super_block *v9fs_get_sb(struct file_system_type
stat_result = v9fs_t_stat(v9ses, newfid, &fcall); stat_result = v9fs_t_stat(v9ses, newfid, &fcall);
if (stat_result < 0) { if (stat_result < 0) {
dprintk(DEBUG_ERROR, "stat error\n"); dprintk(DEBUG_ERROR, "stat error\n");
v9fs_t_clunk(v9ses, newfid, NULL); v9fs_t_clunk(v9ses, newfid);
v9fs_put_idpool(newfid, &v9ses->fidpool); v9fs_put_idpool(newfid, &v9ses->fidpool);
} else { } else {
/* Setup the Root Inode */ /* Setup the Root Inode */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7