2006-10-25 15:40:36 +02:00
|
|
|
/* This file contains the heart of the mechanism used to read (and write)
|
|
|
|
* files. Read and write requests are split up into chunks that do not cross
|
|
|
|
* block boundaries. Each chunk is then processed in turn. Reads on special
|
|
|
|
* files are also detected and handled.
|
|
|
|
*
|
|
|
|
* The entry points into this file are
|
|
|
|
* do_read: perform the READ system call by calling read_write
|
2006-11-09 17:22:54 +01:00
|
|
|
* do_getdents: read entries from a directory (GETDENTS)
|
2006-10-25 15:40:36 +02:00
|
|
|
* read_write: actually do the work of READ and WRITE
|
|
|
|
*
|
|
|
|
* Changes for VFS:
|
|
|
|
* Jul 2006 (Balazs Gerofi)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "fs.h"
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <minix/com.h>
|
2006-11-27 15:21:43 +01:00
|
|
|
#include <minix/u64.h>
|
2006-10-25 15:40:36 +02:00
|
|
|
#include "file.h"
|
|
|
|
#include "fproc.h"
|
|
|
|
#include "param.h"
|
|
|
|
#include <dirent.h>
|
Mostly bugfixes of bugs triggered by the test set.
bugfixes:
SYSTEM:
. removed
rc->p_priv->s_flags = 0;
for the priv struct shared by all user processes in get_priv(). this
should only be done once. doing a SYS_PRIV_USER in sys_privctl()
caused the flags of all user processes to be reset, so they were no
longer PREEMPTIBLE. this happened when RS executed a policy script.
(this broke test1 in the test set)
VFS/MFS:
. chown can change the mode of a file, and chmod arguments are only
part of the full file mode so the full filemode is slightly magic.
changed these calls so that the final modes are returned to VFS, so
that the vnode can be kept up-to-date.
(this broke test11 in the test set)
MFS:
. lookup() checked for sizeof(string) instead of sizeof(user_path),
truncating long path names
(caught by test 23)
. truncate functions neglected to update ctime
(this broke test16)
VFS:
. corner case of an empty filename lookup caused fields of a request
not to be filled in in the lookup functions, not making it clear
that the lookup had failed, causing messages to garbage processes,
causing strange failures.
(caught by test 30)
. trust v_size in vnode when doing reads or writes on non-special
files, truncating i/o where necessary; this is necessary for pipes,
as MFS can't tell when a pipe has been truncated without it being
told explicitly each time.
when the last reader/writer on a pipe closes, tell FS about
the new size using truncate_vn().
(this broke test 25, among others)
. permission check for chdir() had disappeared; added a
forbidden() call
(caught by test 23)
new code, shouldn't change anything:
. introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
LOCK variants. These macros set and clear the p_rts_flags field,
causing a lot of duplicated logic like
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
to change into the simpler
RTS_LOCK_UNSET(rp, NO_PRIV);
so the macros take care of calling dequeue() and enqueue() (or lock_*()),
as the case may be). This makes the code a bit more readable and a
bit less fragile.
. removed return code from do_clocktick in CLOCK as it currently
never replies
. removed some debug code from VFS
. fixed grant debug message in device.c
preemptive checks, tests, changes:
. added return code checks of receive() to SYSTEM and CLOCK
. O_TRUNC should never arrive at MFS (added sanity check and removed
O_TRUNC code)
. user_path declared with PATH_MAX+1 to let it be null-terminated
. checks in MFS to see if strings passed by VFS are null-terminated
IS:
. static irq name table thrown out
2007-02-01 18:50:02 +01:00
|
|
|
#include <assert.h>
|
2006-10-25 15:40:36 +02:00
|
|
|
|
|
|
|
#include <minix/vfsif.h>
|
|
|
|
#include "vnode.h"
|
|
|
|
#include "vmnt.h"
|
|
|
|
|
|
|
|
|
|
|
|
/*===========================================================================*
|
|
|
|
* do_read *
|
|
|
|
*===========================================================================*/
|
|
|
|
PUBLIC int do_read()
|
|
|
|
{
|
|
|
|
return(read_write(READING));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*===========================================================================*
|
|
|
|
* read_write *
|
|
|
|
*===========================================================================*/
|
|
|
|
PUBLIC int read_write(rw_flag)
|
|
|
|
int rw_flag; /* READING or WRITING */
|
|
|
|
{
|
|
|
|
/* Perform read(fd, buffer, nbytes) or write(fd, buffer, nbytes) call. */
|
|
|
|
register struct filp *f;
|
|
|
|
register struct vnode *vp;
|
Mostly bugfixes of bugs triggered by the test set.
bugfixes:
SYSTEM:
. removed
rc->p_priv->s_flags = 0;
for the priv struct shared by all user processes in get_priv(). this
should only be done once. doing a SYS_PRIV_USER in sys_privctl()
caused the flags of all user processes to be reset, so they were no
longer PREEMPTIBLE. this happened when RS executed a policy script.
(this broke test1 in the test set)
VFS/MFS:
. chown can change the mode of a file, and chmod arguments are only
part of the full file mode so the full filemode is slightly magic.
changed these calls so that the final modes are returned to VFS, so
that the vnode can be kept up-to-date.
(this broke test11 in the test set)
MFS:
. lookup() checked for sizeof(string) instead of sizeof(user_path),
truncating long path names
(caught by test 23)
. truncate functions neglected to update ctime
(this broke test16)
VFS:
. corner case of an empty filename lookup caused fields of a request
not to be filled in in the lookup functions, not making it clear
that the lookup had failed, causing messages to garbage processes,
causing strange failures.
(caught by test 30)
. trust v_size in vnode when doing reads or writes on non-special
files, truncating i/o where necessary; this is necessary for pipes,
as MFS can't tell when a pipe has been truncated without it being
told explicitly each time.
when the last reader/writer on a pipe closes, tell FS about
the new size using truncate_vn().
(this broke test 25, among others)
. permission check for chdir() had disappeared; added a
forbidden() call
(caught by test 23)
new code, shouldn't change anything:
. introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
LOCK variants. These macros set and clear the p_rts_flags field,
causing a lot of duplicated logic like
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
to change into the simpler
RTS_LOCK_UNSET(rp, NO_PRIV);
so the macros take care of calling dequeue() and enqueue() (or lock_*()),
as the case may be). This makes the code a bit more readable and a
bit less fragile.
. removed return code from do_clocktick in CLOCK as it currently
never replies
. removed some debug code from VFS
. fixed grant debug message in device.c
preemptive checks, tests, changes:
. added return code checks of receive() to SYSTEM and CLOCK
. O_TRUNC should never arrive at MFS (added sanity check and removed
O_TRUNC code)
. user_path declared with PATH_MAX+1 to let it be null-terminated
. checks in MFS to see if strings passed by VFS are null-terminated
IS:
. static irq name table thrown out
2007-02-01 18:50:02 +01:00
|
|
|
off_t bytes_left;
|
2006-11-27 15:21:43 +01:00
|
|
|
u64_t position;
|
2006-10-25 15:40:36 +02:00
|
|
|
unsigned int off, cum_io;
|
|
|
|
int op, oflags, r, chunk, usr, seg, block_spec, char_spec;
|
|
|
|
int regular, partial_pipe = 0, partial_cnt = 0;
|
|
|
|
mode_t mode_word;
|
|
|
|
struct filp *wf;
|
|
|
|
phys_bytes p;
|
|
|
|
struct dmap *dp;
|
|
|
|
|
|
|
|
/* Request and response structures */
|
|
|
|
struct readwrite_req req;
|
|
|
|
struct readwrite_res res;
|
|
|
|
|
|
|
|
/* For block spec files */
|
|
|
|
struct breadwrite_req breq;
|
|
|
|
|
|
|
|
/* PM loads segments by putting funny things in other bits of the
|
|
|
|
* message, indicated by a high bit in fd. */
|
|
|
|
if (who_e == PM_PROC_NR && (m_in.fd & _PM_SEG_FLAG)) {
|
|
|
|
seg = (int) m_in.m1_p2;
|
|
|
|
usr = (int) m_in.m1_p3;
|
|
|
|
m_in.fd &= ~(_PM_SEG_FLAG); /* get rid of flag bit */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
usr = who_e; /* normal case */
|
|
|
|
seg = D;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the file descriptor is valid, get the vnode, size and mode. */
|
|
|
|
if (m_in.nbytes < 0) return(EINVAL);
|
|
|
|
if ((f = get_filp(m_in.fd)) == NIL_FILP) return(err_code);
|
|
|
|
if (((f->filp_mode) & (rw_flag == READING ? R_BIT : W_BIT)) == 0) {
|
|
|
|
return(f->filp_mode == FILP_CLOSED ? EIO : EBADF);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (m_in.nbytes == 0)
|
|
|
|
return(0); /* so char special files need not check for 0*/
|
|
|
|
|
|
|
|
/* check if user process has the memory it needs.
|
|
|
|
* if not, copying will fail later.
|
|
|
|
* do this after 0-check above because umap doesn't want to map 0 bytes. */
|
2006-11-27 15:21:43 +01:00
|
|
|
if ((r = sys_umap(usr, seg, (vir_bytes) m_in.buffer, m_in.nbytes, &p)) != OK)
|
|
|
|
{
|
2006-10-25 15:40:36 +02:00
|
|
|
printf("VFS: read_write: umap failed for process %d\n", usr);
|
|
|
|
return r;
|
|
|
|
}
|
2006-11-27 15:21:43 +01:00
|
|
|
|
2006-10-25 15:40:36 +02:00
|
|
|
position = f->filp_pos;
|
|
|
|
oflags = f->filp_flags;
|
|
|
|
|
|
|
|
vp = f->filp_vno;
|
|
|
|
|
|
|
|
r = OK;
|
|
|
|
if (vp->v_pipe == I_PIPE) {
|
|
|
|
/* fp->fp_cum_io_partial is only nonzero when doing partial writes */
|
|
|
|
cum_io = fp->fp_cum_io_partial;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
cum_io = 0;
|
|
|
|
}
|
|
|
|
|
2007-02-07 17:22:19 +01:00
|
|
|
op = (rw_flag == READING ? VFS_DEV_READ : VFS_DEV_WRITE);
|
2006-10-25 15:40:36 +02:00
|
|
|
mode_word = vp->v_mode & I_TYPE;
|
|
|
|
regular = mode_word == I_REGULAR || mode_word == I_NAMED_PIPE;
|
|
|
|
|
|
|
|
if ((char_spec = (mode_word == I_CHAR_SPECIAL ? 1 : 0))) {
|
|
|
|
if (vp->v_sdev == NO_DEV)
|
|
|
|
panic(__FILE__,"read_write tries to read from "
|
|
|
|
"character device NO_DEV", NO_NUM);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((block_spec = (mode_word == I_BLOCK_SPECIAL ? 1 : 0))) {
|
|
|
|
if (vp->v_sdev == NO_DEV)
|
|
|
|
panic(__FILE__,"read_write tries to read from "
|
|
|
|
" block device NO_DEV", NO_NUM);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Character special files. */
|
|
|
|
if (char_spec) {
|
|
|
|
dev_t dev;
|
|
|
|
/*dev = (dev_t) f->filp_ino->i_zone[0];*/
|
|
|
|
dev = (dev_t) vp->v_sdev;
|
|
|
|
r = dev_io(op, dev, usr, m_in.buffer, position, m_in.nbytes, oflags);
|
|
|
|
if (r >= 0) {
|
|
|
|
cum_io = r;
|
2006-11-27 15:21:43 +01:00
|
|
|
position = add64ul(position, r);
|
2006-10-25 15:40:36 +02:00
|
|
|
r = OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Block special files. */
|
|
|
|
else if (block_spec) {
|
|
|
|
/* Fill in the fields of the request */
|
|
|
|
breq.rw_flag = rw_flag;
|
|
|
|
breq.fs_e = vp->v_bfs_e;
|
|
|
|
breq.blocksize = vp->v_blocksize;
|
|
|
|
breq.dev = vp->v_sdev;
|
|
|
|
breq.user_e = usr;
|
|
|
|
breq.pos = position;
|
|
|
|
breq.num_of_bytes = m_in.nbytes;
|
|
|
|
breq.user_addr = m_in.buffer;
|
|
|
|
|
|
|
|
/* Issue request */
|
|
|
|
r = req_breadwrite(&breq, &res);
|
|
|
|
|
|
|
|
position = res.new_pos;
|
|
|
|
cum_io += res.cum_io;
|
|
|
|
}
|
Mostly bugfixes of bugs triggered by the test set.
bugfixes:
SYSTEM:
. removed
rc->p_priv->s_flags = 0;
for the priv struct shared by all user processes in get_priv(). this
should only be done once. doing a SYS_PRIV_USER in sys_privctl()
caused the flags of all user processes to be reset, so they were no
longer PREEMPTIBLE. this happened when RS executed a policy script.
(this broke test1 in the test set)
VFS/MFS:
. chown can change the mode of a file, and chmod arguments are only
part of the full file mode so the full filemode is slightly magic.
changed these calls so that the final modes are returned to VFS, so
that the vnode can be kept up-to-date.
(this broke test11 in the test set)
MFS:
. lookup() checked for sizeof(string) instead of sizeof(user_path),
truncating long path names
(caught by test 23)
. truncate functions neglected to update ctime
(this broke test16)
VFS:
. corner case of an empty filename lookup caused fields of a request
not to be filled in in the lookup functions, not making it clear
that the lookup had failed, causing messages to garbage processes,
causing strange failures.
(caught by test 30)
. trust v_size in vnode when doing reads or writes on non-special
files, truncating i/o where necessary; this is necessary for pipes,
as MFS can't tell when a pipe has been truncated without it being
told explicitly each time.
when the last reader/writer on a pipe closes, tell FS about
the new size using truncate_vn().
(this broke test 25, among others)
. permission check for chdir() had disappeared; added a
forbidden() call
(caught by test 23)
new code, shouldn't change anything:
. introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
LOCK variants. These macros set and clear the p_rts_flags field,
causing a lot of duplicated logic like
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
to change into the simpler
RTS_LOCK_UNSET(rp, NO_PRIV);
so the macros take care of calling dequeue() and enqueue() (or lock_*()),
as the case may be). This makes the code a bit more readable and a
bit less fragile.
. removed return code from do_clocktick in CLOCK as it currently
never replies
. removed some debug code from VFS
. fixed grant debug message in device.c
preemptive checks, tests, changes:
. added return code checks of receive() to SYSTEM and CLOCK
. O_TRUNC should never arrive at MFS (added sanity check and removed
O_TRUNC code)
. user_path declared with PATH_MAX+1 to let it be null-terminated
. checks in MFS to see if strings passed by VFS are null-terminated
IS:
. static irq name table thrown out
2007-02-01 18:50:02 +01:00
|
|
|
/* Regular files (and pipes) */
|
2006-10-25 15:40:36 +02:00
|
|
|
else {
|
|
|
|
if (rw_flag == WRITING && block_spec == 0) {
|
2006-11-27 15:21:43 +01:00
|
|
|
/* Check for O_APPEND flag. */
|
Mostly bugfixes of bugs triggered by the test set.
bugfixes:
SYSTEM:
. removed
rc->p_priv->s_flags = 0;
for the priv struct shared by all user processes in get_priv(). this
should only be done once. doing a SYS_PRIV_USER in sys_privctl()
caused the flags of all user processes to be reset, so they were no
longer PREEMPTIBLE. this happened when RS executed a policy script.
(this broke test1 in the test set)
VFS/MFS:
. chown can change the mode of a file, and chmod arguments are only
part of the full file mode so the full filemode is slightly magic.
changed these calls so that the final modes are returned to VFS, so
that the vnode can be kept up-to-date.
(this broke test11 in the test set)
MFS:
. lookup() checked for sizeof(string) instead of sizeof(user_path),
truncating long path names
(caught by test 23)
. truncate functions neglected to update ctime
(this broke test16)
VFS:
. corner case of an empty filename lookup caused fields of a request
not to be filled in in the lookup functions, not making it clear
that the lookup had failed, causing messages to garbage processes,
causing strange failures.
(caught by test 30)
. trust v_size in vnode when doing reads or writes on non-special
files, truncating i/o where necessary; this is necessary for pipes,
as MFS can't tell when a pipe has been truncated without it being
told explicitly each time.
when the last reader/writer on a pipe closes, tell FS about
the new size using truncate_vn().
(this broke test 25, among others)
. permission check for chdir() had disappeared; added a
forbidden() call
(caught by test 23)
new code, shouldn't change anything:
. introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
LOCK variants. These macros set and clear the p_rts_flags field,
causing a lot of duplicated logic like
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
to change into the simpler
RTS_LOCK_UNSET(rp, NO_PRIV);
so the macros take care of calling dequeue() and enqueue() (or lock_*()),
as the case may be). This makes the code a bit more readable and a
bit less fragile.
. removed return code from do_clocktick in CLOCK as it currently
never replies
. removed some debug code from VFS
. fixed grant debug message in device.c
preemptive checks, tests, changes:
. added return code checks of receive() to SYSTEM and CLOCK
. O_TRUNC should never arrive at MFS (added sanity check and removed
O_TRUNC code)
. user_path declared with PATH_MAX+1 to let it be null-terminated
. checks in MFS to see if strings passed by VFS are null-terminated
IS:
. static irq name table thrown out
2007-02-01 18:50:02 +01:00
|
|
|
if (oflags & O_APPEND) position = cvul64(vp->v_size);
|
2006-11-27 15:21:43 +01:00
|
|
|
|
2006-10-25 15:40:36 +02:00
|
|
|
/* Check in advance to see if file will grow too big. */
|
2006-11-27 15:21:43 +01:00
|
|
|
if (cmp64ul(position, vp->v_vmnt->m_max_file_size - m_in.nbytes) > 0)
|
2006-10-25 15:40:36 +02:00
|
|
|
return(EFBIG);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Pipes are a little different. Check. */
|
|
|
|
if (vp->v_pipe == I_PIPE) {
|
|
|
|
r = pipe_check(vp, rw_flag, oflags,
|
|
|
|
m_in.nbytes, position, &partial_cnt, 0);
|
|
|
|
if (r <= 0) return(r);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (partial_cnt > 0) {
|
Mostly bugfixes of bugs triggered by the test set.
bugfixes:
SYSTEM:
. removed
rc->p_priv->s_flags = 0;
for the priv struct shared by all user processes in get_priv(). this
should only be done once. doing a SYS_PRIV_USER in sys_privctl()
caused the flags of all user processes to be reset, so they were no
longer PREEMPTIBLE. this happened when RS executed a policy script.
(this broke test1 in the test set)
VFS/MFS:
. chown can change the mode of a file, and chmod arguments are only
part of the full file mode so the full filemode is slightly magic.
changed these calls so that the final modes are returned to VFS, so
that the vnode can be kept up-to-date.
(this broke test11 in the test set)
MFS:
. lookup() checked for sizeof(string) instead of sizeof(user_path),
truncating long path names
(caught by test 23)
. truncate functions neglected to update ctime
(this broke test16)
VFS:
. corner case of an empty filename lookup caused fields of a request
not to be filled in in the lookup functions, not making it clear
that the lookup had failed, causing messages to garbage processes,
causing strange failures.
(caught by test 30)
. trust v_size in vnode when doing reads or writes on non-special
files, truncating i/o where necessary; this is necessary for pipes,
as MFS can't tell when a pipe has been truncated without it being
told explicitly each time.
when the last reader/writer on a pipe closes, tell FS about
the new size using truncate_vn().
(this broke test 25, among others)
. permission check for chdir() had disappeared; added a
forbidden() call
(caught by test 23)
new code, shouldn't change anything:
. introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
LOCK variants. These macros set and clear the p_rts_flags field,
causing a lot of duplicated logic like
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
to change into the simpler
RTS_LOCK_UNSET(rp, NO_PRIV);
so the macros take care of calling dequeue() and enqueue() (or lock_*()),
as the case may be). This makes the code a bit more readable and a
bit less fragile.
. removed return code from do_clocktick in CLOCK as it currently
never replies
. removed some debug code from VFS
. fixed grant debug message in device.c
preemptive checks, tests, changes:
. added return code checks of receive() to SYSTEM and CLOCK
. O_TRUNC should never arrive at MFS (added sanity check and removed
O_TRUNC code)
. user_path declared with PATH_MAX+1 to let it be null-terminated
. checks in MFS to see if strings passed by VFS are null-terminated
IS:
. static irq name table thrown out
2007-02-01 18:50:02 +01:00
|
|
|
/* So that we don't need to deal with partial count
|
|
|
|
* in the FS process.
|
|
|
|
*/
|
2006-10-25 15:40:36 +02:00
|
|
|
m_in.nbytes = MIN(m_in.nbytes, partial_cnt);
|
|
|
|
partial_pipe = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fill in request structure */
|
|
|
|
req.fs_e = vp->v_fs_e;
|
|
|
|
req.rw_flag = rw_flag;
|
|
|
|
req.inode_nr = vp->v_inode_nr;
|
|
|
|
req.user_e = usr;
|
|
|
|
req.seg = seg;
|
|
|
|
req.pos = position;
|
|
|
|
req.num_of_bytes = m_in.nbytes;
|
|
|
|
req.user_addr = m_in.buffer;
|
|
|
|
req.inode_index = vp->v_index;
|
|
|
|
|
Mostly bugfixes of bugs triggered by the test set.
bugfixes:
SYSTEM:
. removed
rc->p_priv->s_flags = 0;
for the priv struct shared by all user processes in get_priv(). this
should only be done once. doing a SYS_PRIV_USER in sys_privctl()
caused the flags of all user processes to be reset, so they were no
longer PREEMPTIBLE. this happened when RS executed a policy script.
(this broke test1 in the test set)
VFS/MFS:
. chown can change the mode of a file, and chmod arguments are only
part of the full file mode so the full filemode is slightly magic.
changed these calls so that the final modes are returned to VFS, so
that the vnode can be kept up-to-date.
(this broke test11 in the test set)
MFS:
. lookup() checked for sizeof(string) instead of sizeof(user_path),
truncating long path names
(caught by test 23)
. truncate functions neglected to update ctime
(this broke test16)
VFS:
. corner case of an empty filename lookup caused fields of a request
not to be filled in in the lookup functions, not making it clear
that the lookup had failed, causing messages to garbage processes,
causing strange failures.
(caught by test 30)
. trust v_size in vnode when doing reads or writes on non-special
files, truncating i/o where necessary; this is necessary for pipes,
as MFS can't tell when a pipe has been truncated without it being
told explicitly each time.
when the last reader/writer on a pipe closes, tell FS about
the new size using truncate_vn().
(this broke test 25, among others)
. permission check for chdir() had disappeared; added a
forbidden() call
(caught by test 23)
new code, shouldn't change anything:
. introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
LOCK variants. These macros set and clear the p_rts_flags field,
causing a lot of duplicated logic like
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
to change into the simpler
RTS_LOCK_UNSET(rp, NO_PRIV);
so the macros take care of calling dequeue() and enqueue() (or lock_*()),
as the case may be). This makes the code a bit more readable and a
bit less fragile.
. removed return code from do_clocktick in CLOCK as it currently
never replies
. removed some debug code from VFS
. fixed grant debug message in device.c
preemptive checks, tests, changes:
. added return code checks of receive() to SYSTEM and CLOCK
. O_TRUNC should never arrive at MFS (added sanity check and removed
O_TRUNC code)
. user_path declared with PATH_MAX+1 to let it be null-terminated
. checks in MFS to see if strings passed by VFS are null-terminated
IS:
. static irq name table thrown out
2007-02-01 18:50:02 +01:00
|
|
|
/* Truncate read request at size (mustn't do this for special files). */
|
|
|
|
if((rw_flag == READING) &&
|
|
|
|
cmp64ul(add64ul(position, req.num_of_bytes), vp->v_size) > 0) {
|
|
|
|
/* Position always should fit in an off_t (LONG_MAX). */
|
|
|
|
off_t pos32;
|
|
|
|
assert(cmp64ul(position, LONG_MAX) <= 0);
|
|
|
|
pos32 = cv64ul(position);
|
|
|
|
assert(pos32 >= 0);
|
|
|
|
assert(pos32 <= LONG_MAX);
|
|
|
|
req.num_of_bytes = vp->v_size - pos32;
|
|
|
|
assert(req.num_of_bytes >= 0);
|
2007-01-05 17:36:55 +01:00
|
|
|
}
|
|
|
|
|
2006-10-25 15:40:36 +02:00
|
|
|
/* Issue request */
|
|
|
|
r = req_readwrite(&req, &res);
|
|
|
|
|
2006-11-27 15:21:43 +01:00
|
|
|
if (r >= 0)
|
|
|
|
{
|
|
|
|
if (ex64hi(res.new_pos))
|
|
|
|
panic(__FILE__, "read_write: bad new pos", NO_NUM);
|
|
|
|
|
|
|
|
position = res.new_pos;
|
|
|
|
cum_io += res.cum_io;
|
|
|
|
}
|
2006-10-25 15:40:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* On write, update file size and access time. */
|
|
|
|
if (rw_flag == WRITING) {
|
|
|
|
if (regular || mode_word == I_DIRECTORY) {
|
Mostly bugfixes of bugs triggered by the test set.
bugfixes:
SYSTEM:
. removed
rc->p_priv->s_flags = 0;
for the priv struct shared by all user processes in get_priv(). this
should only be done once. doing a SYS_PRIV_USER in sys_privctl()
caused the flags of all user processes to be reset, so they were no
longer PREEMPTIBLE. this happened when RS executed a policy script.
(this broke test1 in the test set)
VFS/MFS:
. chown can change the mode of a file, and chmod arguments are only
part of the full file mode so the full filemode is slightly magic.
changed these calls so that the final modes are returned to VFS, so
that the vnode can be kept up-to-date.
(this broke test11 in the test set)
MFS:
. lookup() checked for sizeof(string) instead of sizeof(user_path),
truncating long path names
(caught by test 23)
. truncate functions neglected to update ctime
(this broke test16)
VFS:
. corner case of an empty filename lookup caused fields of a request
not to be filled in in the lookup functions, not making it clear
that the lookup had failed, causing messages to garbage processes,
causing strange failures.
(caught by test 30)
. trust v_size in vnode when doing reads or writes on non-special
files, truncating i/o where necessary; this is necessary for pipes,
as MFS can't tell when a pipe has been truncated without it being
told explicitly each time.
when the last reader/writer on a pipe closes, tell FS about
the new size using truncate_vn().
(this broke test 25, among others)
. permission check for chdir() had disappeared; added a
forbidden() call
(caught by test 23)
new code, shouldn't change anything:
. introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
LOCK variants. These macros set and clear the p_rts_flags field,
causing a lot of duplicated logic like
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
to change into the simpler
RTS_LOCK_UNSET(rp, NO_PRIV);
so the macros take care of calling dequeue() and enqueue() (or lock_*()),
as the case may be). This makes the code a bit more readable and a
bit less fragile.
. removed return code from do_clocktick in CLOCK as it currently
never replies
. removed some debug code from VFS
. fixed grant debug message in device.c
preemptive checks, tests, changes:
. added return code checks of receive() to SYSTEM and CLOCK
. O_TRUNC should never arrive at MFS (added sanity check and removed
O_TRUNC code)
. user_path declared with PATH_MAX+1 to let it be null-terminated
. checks in MFS to see if strings passed by VFS are null-terminated
IS:
. static irq name table thrown out
2007-02-01 18:50:02 +01:00
|
|
|
if (cmp64ul(position, vp->v_size) > 0)
|
2006-11-27 15:21:43 +01:00
|
|
|
{
|
|
|
|
if (ex64hi(position) != 0)
|
|
|
|
{
|
|
|
|
panic(__FILE__,
|
|
|
|
"read_write: file size too big for v_size",
|
|
|
|
NO_NUM);
|
|
|
|
}
|
|
|
|
vp->v_size = ex64lo(position);
|
|
|
|
}
|
2006-10-25 15:40:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (vp->v_pipe == I_PIPE) {
|
2006-11-27 15:21:43 +01:00
|
|
|
if (cmp64ul(position, vp->v_size) >= 0) {
|
2006-10-25 15:40:36 +02:00
|
|
|
/* Reset pipe pointers */
|
|
|
|
vp->v_size = 0;
|
2006-11-27 15:21:43 +01:00
|
|
|
position = cvu64(0);
|
2006-10-25 15:40:36 +02:00
|
|
|
wf = find_filp(vp, W_BIT);
|
2006-11-27 15:21:43 +01:00
|
|
|
if (wf != NIL_FILP) wf->filp_pos = cvu64(0);
|
2006-10-25 15:40:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
f->filp_pos = position;
|
|
|
|
|
|
|
|
if (r == OK) {
|
|
|
|
if (partial_pipe) {
|
|
|
|
partial_pipe = 0;
|
|
|
|
/* partial write on pipe with */
|
|
|
|
/* O_NONBLOCK, return write count */
|
|
|
|
if (!(oflags & O_NONBLOCK)) {
|
|
|
|
fp->fp_cum_io_partial = cum_io;
|
|
|
|
suspend(XPIPE); /* partial write on pipe with */
|
|
|
|
return(SUSPEND); /* nbyte > PIPE_SIZE - non-atomic */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fp->fp_cum_io_partial = 0;
|
|
|
|
return cum_io;
|
|
|
|
}
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Original "uncached" code for block spec files */
|
|
|
|
#if 0
|
|
|
|
else if (block_spec) {
|
|
|
|
char buf[_MIN_BLOCK_SIZE];
|
|
|
|
block_t b;
|
|
|
|
int bleft = m_in.nbytes;
|
|
|
|
dev_t dev = vp->v_sdev;
|
|
|
|
|
|
|
|
b = position / _MIN_BLOCK_SIZE;
|
|
|
|
off = position % _MIN_BLOCK_SIZE;
|
|
|
|
|
|
|
|
while (bleft) {
|
|
|
|
/* First read the whole block */
|
2007-02-07 17:22:19 +01:00
|
|
|
r = dev_bio(VFS_DEV_READ, dev, FS_PROC_NR, buf,
|
|
|
|
b * _MIN_BLOCK_SIZE, _MIN_BLOCK_SIZE);
|
2006-10-25 15:40:36 +02:00
|
|
|
|
|
|
|
if (r != _MIN_BLOCK_SIZE)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* How many bytes to copy? */
|
|
|
|
chunk = MIN(bleft, _MIN_BLOCK_SIZE - off);
|
|
|
|
|
|
|
|
if (rw_flag == READING) {
|
|
|
|
/* Copy a chunk from the buffer to user space. */
|
|
|
|
r = sys_vircopy(FS_PROC_NR, D, (phys_bytes) (&buf[off]),
|
|
|
|
usr, seg, (phys_bytes) m_in.buffer,
|
|
|
|
(phys_bytes) chunk);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Copy a chunk from user space to the buffer. */
|
|
|
|
r = sys_vircopy(usr, seg, (phys_bytes) m_in.buffer,
|
|
|
|
FS_PROC_NR, D, (phys_bytes) (&buf[off]),
|
|
|
|
(phys_bytes) chunk);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write back if WRITE */
|
|
|
|
if (rw_flag == WRITING) {
|
|
|
|
r = dev_bio(DEV_WRITE, dev, FS_PROC_NR, buf,
|
|
|
|
b * _MIN_BLOCK_SIZE, _MIN_BLOCK_SIZE);
|
|
|
|
|
|
|
|
if (r != _MIN_BLOCK_SIZE)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
bleft -= chunk;
|
|
|
|
m_in.buffer += chunk;
|
|
|
|
|
|
|
|
/* 0 offset in the next block */
|
|
|
|
b++;
|
|
|
|
off = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
cum_io = m_in.nbytes - bleft;
|
|
|
|
position += cum_io;
|
|
|
|
r = OK;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-11-09 17:22:54 +01:00
|
|
|
|
|
|
|
/*===========================================================================*
|
|
|
|
* do_getdents *
|
|
|
|
*===========================================================================*/
|
|
|
|
PUBLIC int do_getdents()
|
|
|
|
{
|
|
|
|
/* Perform the getdents(fd, buf, size) system call. */
|
|
|
|
int r;
|
|
|
|
off_t pos_change;
|
|
|
|
cp_grant_id_t gid;
|
|
|
|
register struct filp *rfilp;
|
|
|
|
|
|
|
|
/* Is the file descriptor valid? */
|
|
|
|
if ( (rfilp = get_filp(m_in.fd)) == NIL_FILP) {
|
|
|
|
return(err_code);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(rfilp->filp_mode & R_BIT))
|
|
|
|
return EBADF;
|
|
|
|
|
|
|
|
if ((rfilp->filp_vno->v_mode & I_TYPE) != I_DIRECTORY)
|
|
|
|
return EBADF;
|
|
|
|
|
|
|
|
gid=cpf_grant_magic(rfilp->filp_vno->v_fs_e, who_e, (vir_bytes) m_in.buffer,
|
|
|
|
m_in.nbytes, CPF_WRITE);
|
|
|
|
if (gid < 0) panic(__FILE__, "cpf_grant_magic failed", gid);
|
|
|
|
|
|
|
|
/* Issue request */
|
2006-11-27 15:21:43 +01:00
|
|
|
if (ex64hi(rfilp->filp_pos) != 0)
|
|
|
|
panic(__FILE__, "do_getdents: should handle large offsets", NO_NUM);
|
|
|
|
|
2006-11-09 17:22:54 +01:00
|
|
|
r= req_getdents(rfilp->filp_vno->v_fs_e, rfilp->filp_vno->v_inode_nr,
|
2006-11-27 15:21:43 +01:00
|
|
|
ex64lo(rfilp->filp_pos), gid, m_in.nbytes, &pos_change);
|
2006-11-09 17:22:54 +01:00
|
|
|
|
|
|
|
cpf_revoke(gid);
|
|
|
|
|
|
|
|
if (r > 0)
|
2006-11-27 15:21:43 +01:00
|
|
|
rfilp->filp_pos= add64ul(rfilp->filp_pos, pos_change);
|
2006-11-09 17:22:54 +01:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|