Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/miscfs/kernfs/kernfs_vnops.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/miscfs/kernfs/kernfs_vnops.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.46 retrieving revision 1.64 diff -u -p -r1.46 -r1.64 --- src/sys/miscfs/kernfs/kernfs_vnops.c 1996/10/10 22:54:08 1.46 +++ src/sys/miscfs/kernfs/kernfs_vnops.c 1999/07/08 01:26:27 1.64 @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vnops.c,v 1.46 1996/10/10 22:54:08 christos Exp $ */ +/* $NetBSD: kernfs_vnops.c,v 1.64 1999/07/08 01:26:27 wrstuden Exp $ */ /* * Copyright (c) 1992, 1993 @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)kernfs_vnops.c 8.9 (Berkeley) 6/15/94 + * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 */ /* @@ -62,6 +62,10 @@ #include #include +#include + +#include + #define KSTRING 256 /* Largest I/O available via this filesystem */ #define UIO_MX 32 @@ -69,23 +73,7 @@ #define WRITE_MODE (S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH) #define DIR_MODE (S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) -struct kern_target { - u_char kt_type; - u_char kt_namlen; - char *kt_name; - void *kt_data; -#define KTT_NULL 1 -#define KTT_TIME 5 -#define KTT_INT 17 -#define KTT_STRING 31 -#define KTT_HOSTNAME 47 -#define KTT_AVENRUN 53 -#define KTT_DEVICE 71 -#define KTT_MSGBUF 89 - u_char kt_tag; - u_char kt_vtype; - mode_t kt_mode; -} kern_targets[] = { +struct kern_target kern_targets[] = { /* NOTE: The name must be less than UIO_MX-16 chars in length */ #define N(s) sizeof(s)-1, s /* name data tag type ro/rw */ @@ -97,7 +85,7 @@ struct kern_target { { DT_REG, N("hz"), &hz, KTT_INT, VREG, READ_MODE }, { DT_REG, N("loadavg"), 0, KTT_AVENRUN, VREG, READ_MODE }, { DT_REG, N("msgbuf"), 0, KTT_MSGBUF, VREG, READ_MODE }, - { DT_REG, N("pagesize"), &cnt.v_page_size, KTT_INT, VREG, READ_MODE }, + { DT_REG, N("pagesize"), &uvmexp.pagesize, KTT_INT, VREG, READ_MODE }, { DT_REG, N("physmem"), &physmem, KTT_INT, VREG, READ_MODE }, #if 0 { DT_DIR, N("root"), 0, KTT_NULL, VDIR, DIR_MODE }, @@ -111,8 +99,8 @@ struct kern_target { static int nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]); int kernfs_lookup __P((void *)); -#define kernfs_create genfs_eopnotsupp -#define kernfs_mknod genfs_eopnotsupp +#define kernfs_create genfs_eopnotsupp_rele +#define kernfs_mknod genfs_eopnotsupp_rele #define kernfs_open genfs_nullop #define kernfs_close genfs_nullop int kernfs_access __P((void *)); @@ -120,30 +108,31 @@ int kernfs_getattr __P((void *)); int kernfs_setattr __P((void *)); int kernfs_read __P((void *)); int kernfs_write __P((void *)); -#define kernfs_ioctl genfs_eopnotsupp +#define kernfs_ioctl genfs_enoioctl #define kernfs_poll genfs_poll +#define kernfs_revoke genfs_revoke #define kernfs_mmap genfs_eopnotsupp #define kernfs_fsync genfs_nullop #define kernfs_seek genfs_nullop -#define kernfs_remove genfs_eopnotsupp +#define kernfs_remove genfs_eopnotsupp_rele int kernfs_link __P((void *)); -#define kernfs_rename genfs_eopnotsupp -#define kernfs_mkdir genfs_eopnotsupp -#define kernfs_rmdir genfs_eopnotsupp +#define kernfs_rename genfs_eopnotsupp_rele +#define kernfs_mkdir genfs_eopnotsupp_rele +#define kernfs_rmdir genfs_eopnotsupp_rele int kernfs_symlink __P((void *)); int kernfs_readdir __P((void *)); #define kernfs_readlink genfs_eopnotsupp #define kernfs_abortop genfs_abortop int kernfs_inactive __P((void *)); int kernfs_reclaim __P((void *)); -#define kernfs_lock genfs_nullop -#define kernfs_unlock genfs_nullop +#define kernfs_lock genfs_lock +#define kernfs_unlock genfs_unlock #define kernfs_bmap genfs_badop #define kernfs_strategy genfs_badop int kernfs_print __P((void *)); -#define kernfs_islocked genfs_nullop +#define kernfs_islocked genfs_islocked int kernfs_pathconf __P((void *)); -#define kernfs_advlock genfs_eopnotsupp +#define kernfs_advlock genfs_einval #define kernfs_blkatoff genfs_eopnotsupp #define kernfs_valloc genfs_eopnotsupp #define kernfs_vfree genfs_nullop @@ -169,6 +158,7 @@ struct vnodeopv_entry_desc kernfs_vnodeo { &vop_write_desc, kernfs_write }, /* write */ { &vop_ioctl_desc, kernfs_ioctl }, /* ioctl */ { &vop_poll_desc, kernfs_poll }, /* poll */ + { &vop_revoke_desc, kernfs_revoke }, /* revoke */ { &vop_mmap_desc, kernfs_mmap }, /* mmap */ { &vop_fsync_desc, kernfs_fsync }, /* fsync */ { &vop_seek_desc, kernfs_seek }, /* seek */ @@ -215,14 +205,14 @@ kernfs_xread(kt, off, bufp, len) struct timeval tv; microtime(&tv); - ksprintf(*bufp, "%ld %ld\n", tv.tv_sec, tv.tv_usec); + sprintf(*bufp, "%ld %ld\n", tv.tv_sec, tv.tv_usec); break; } case KTT_INT: { int *ip = kt->kt_data; - ksprintf(*bufp, "%d\n", *ip); + sprintf(*bufp, "%d\n", *ip); break; } @@ -234,15 +224,32 @@ kernfs_xread(kt, off, bufp, len) } case KTT_MSGBUF: { - extern struct msgbuf *msgbufp; long n; - if (off >= MSG_BSIZE) + /* + * deal with cases where the message buffer has + * become corrupted. + */ + if (!msgbufenabled || msgbufp->msg_magic != MSG_MAGIC) { + msgbufenabled = 0; + return (ENXIO); + } + + /* + * Note that reads of /kern/msgbuf won't necessarily yield + * consistent results, if the message buffer is modified + * while the read is in progress. The worst that can happen + * is that incorrect data will be read. There's no way + * that this can crash the system unless the values in the + * message buffer header are corrupted, but that'll cause + * the system to die anyway. + */ + if (off >= msgbufp->msg_bufs) return (0); n = msgbufp->msg_bufx + off; - if (n >= MSG_BSIZE) - n -= MSG_BSIZE; - len = min(MSG_BSIZE - n, MSG_BSIZE - off); + if (n >= msgbufp->msg_bufs) + n -= msgbufp->msg_bufs; + len = min(msgbufp->msg_bufs - n, msgbufp->msg_bufs - off); *bufp = msgbufp->msg_bufc + n; return (len); } @@ -254,7 +261,7 @@ kernfs_xread(kt, off, bufp, len) if (xlen >= (len-2)) return (EINVAL); - bcopy(cp, *bufp, xlen); + memcpy(*bufp, cp, xlen); (*bufp)[xlen] = '\n'; (*bufp)[xlen+1] = '\0'; break; @@ -262,7 +269,7 @@ kernfs_xread(kt, off, bufp, len) case KTT_AVENRUN: averunnable.fscale = FSCALE; - ksprintf(*bufp, "%d %d %d %ld\n", + sprintf(*bufp, "%d %d %d %ld\n", averunnable.ldavg[0], averunnable.ldavg[1], averunnable.ldavg[2], averunnable.fscale); break; @@ -289,7 +296,7 @@ kernfs_xwrite(kt, buf, len) case KTT_HOSTNAME: if (buf[len-1] == '\n') --len; - bcopy(buf, hostname, len); + memcpy(hostname, buf, len); hostname[len] = '\0'; hostnamelen = len; return (0); @@ -316,18 +323,19 @@ kernfs_lookup(v) struct componentname *cnp = ap->a_cnp; struct vnode **vpp = ap->a_vpp; struct vnode *dvp = ap->a_dvp; - char *pname = cnp->cn_nameptr; + const char *pname = cnp->cn_nameptr; struct kern_target *kt; struct vnode *fvp; - int error, i; + int error, i, wantpunlock; #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_lookup(%x)\n", ap); - kprintf("kernfs_lookup(dp = %x, vpp = %x, cnp = %x)\n", dvp, vpp, ap->a_cnp); - kprintf("kernfs_lookup(%s)\n", pname); + printf("kernfs_lookup(%p)\n", ap); + printf("kernfs_lookup(dp = %p, vpp = %p, cnp = %p)\n", dvp, vpp, ap->a_cnp); + printf("kernfs_lookup(%s)\n", pname); #endif *vpp = NULLVP; + cnp->cn_flags &= ~PDIRUNLOCK; if (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME) return (EROFS); @@ -335,27 +343,33 @@ kernfs_lookup(v) if (cnp->cn_namelen == 1 && *pname == '.') { *vpp = dvp; VREF(dvp); - /*VOP_LOCK(dvp);*/ return (0); } + /* + * This code only supports a flat directory, so we don't + * need to worry about .. + */ + #if 0 - if (cnp->cn_namelen == 4 && bcmp(pname, "root", 4) == 0) { + if (cnp->cn_namelen == 4 && memcmp(pname, "root", 4) == 0) { *vpp = rootdir; VREF(rootdir); - VOP_LOCK(rootdir); + vn_lock(rootdir, LK_SHARED | LK_RETRY); return (0); } #endif + wantpunlock = (~cnp->cn_flags & (LOCKPARENT | ISLASTCN)); + for (kt = kern_targets, i = 0; i < nkern_targets; kt++, i++) { if (cnp->cn_namelen == kt->kt_namlen && - bcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) + memcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) goto found; } #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_lookup: i = %d, failed", i); + printf("kernfs_lookup: i = %d, failed", i); #endif return (cnp->cn_nameiop == LOOKUP ? ENOENT : EROFS); @@ -364,30 +378,41 @@ found: if (kt->kt_tag == KTT_DEVICE) { dev_t *dp = kt->kt_data; loop: - if (*dp == NODEV || !vfinddev(*dp, kt->kt_vtype, &fvp)) + if (*dp == NODEV || !vfinddev(*dp, kt->kt_vtype, &fvp)) { return (ENOENT); + } *vpp = fvp; - if (vget(fvp, 1)) + if (vget(fvp, LK_EXCLUSIVE)) goto loop; + if (wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } return (0); } #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_lookup: allocate new vnode\n"); + printf("kernfs_lookup: allocate new vnode\n"); #endif error = getnewvnode(VT_KERNFS, dvp->v_mount, kernfs_vnodeop_p, &fvp); - if (error) + if (error) { return (error); + } MALLOC(fvp->v_data, void *, sizeof(struct kernfs_node), M_TEMP, M_WAITOK); VTOKERN(fvp)->kf_kt = kt; fvp->v_type = kt->kt_vtype; + vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY); *vpp = fvp; #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_lookup: newvp = %x\n", fvp); + printf("kernfs_lookup: newvp = %p\n", fvp); #endif + if (wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } return (0); } @@ -402,10 +427,17 @@ kernfs_access(v) struct proc *a_p; } */ *ap = v; struct vnode *vp = ap->a_vp; - mode_t fmode = - (vp->v_flag & VROOT) ? DIR_MODE : VTOKERN(vp)->kf_kt->kt_mode; + mode_t mode; - return (vaccess(fmode, (uid_t)0, (gid_t)0, ap->a_mode, ap->a_cred)); + if (vp->v_flag & VROOT) { + mode = DIR_MODE; + } else { + struct kern_target *kt = VTOKERN(vp)->kf_kt; + mode = kt->kt_mode; + } + + return (vaccess(vp->v_type, mode, (uid_t)0, (gid_t)0, ap->a_mode, + ap->a_cred)); } int @@ -424,7 +456,7 @@ kernfs_getattr(v) int error = 0; char strbuf[KSTRING], *buf; - bzero((caddr_t) vap, sizeof(*vap)); + memset((caddr_t) vap, 0, sizeof(*vap)); vattr_null(vap); vap->va_uid = 0; vap->va_gid = 0; @@ -442,7 +474,7 @@ kernfs_getattr(v) if (vp->v_flag & VROOT) { #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_getattr: stat rootdir\n"); + printf("kernfs_getattr: stat rootdir\n"); #endif vap->va_type = VDIR; vap->va_mode = DIR_MODE; @@ -453,12 +485,12 @@ kernfs_getattr(v) struct kern_target *kt = VTOKERN(vp)->kf_kt; int nbytes, total; #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_getattr: stat target %s\n", kt->kt_name); + printf("kernfs_getattr: stat target %s\n", kt->kt_name); #endif vap->va_type = kt->kt_vtype; vap->va_mode = kt->kt_mode; vap->va_nlink = 1; - vap->va_fileid = 3 + (kt - kern_targets); + vap->va_fileid = 1 + (kt - kern_targets); total = 0; while (buf = strbuf, nbytes = kernfs_xread(kt, total, &buf, sizeof(strbuf))) @@ -467,7 +499,7 @@ kernfs_getattr(v) } #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_getattr: return error %d\n", error); + printf("kernfs_getattr: return error %d\n", error); #endif return (error); } @@ -509,7 +541,7 @@ kernfs_read(v) kt = VTOKERN(vp)->kf_kt; #ifdef KERNFS_DIAGNOSTIC - kprintf("kern_read %s\n", kt->kt_name); + printf("kern_read %s\n", kt->kt_name); #endif off = uio->uio_offset; @@ -571,16 +603,16 @@ kernfs_readdir(v) struct uio *a_uio; struct ucred *a_cred; int *a_eofflag; - u_long *a_cookies; - int a_ncookies; + off_t **a_cookies; + int a_*ncookies; } */ *ap = v; struct uio *uio = ap->a_uio; struct dirent d; struct kern_target *kt; int i; int error; - u_long *cookies = ap->a_cookies; - int ncookies = ap->a_ncookies; + off_t *cookies = NULL; + int ncookies = 0, nc = 0; if (ap->a_vp->v_type != VDIR) return (ENOTDIR); @@ -592,13 +624,21 @@ kernfs_readdir(v) error = 0; i = uio->uio_offset; - bzero((caddr_t)&d, UIO_MX); + memset((caddr_t)&d, 0, UIO_MX); d.d_reclen = UIO_MX; + if (ap->a_ncookies) { + nc = uio->uio_resid / UIO_MX; + nc = min(nc, (nkern_targets - i)); + MALLOC(cookies, off_t *, nc * sizeof(off_t), M_TEMP, + M_WAITOK); + *ap->a_cookies = cookies; + } + for (kt = &kern_targets[i]; uio->uio_resid >= UIO_MX && i < nkern_targets; kt++, i++) { #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_readdir: i = %d\n", i); + printf("kernfs_readdir: i = %d\n", i); #endif if (kt->kt_tag == KTT_DEVICE) { @@ -611,13 +651,24 @@ kernfs_readdir(v) d.d_fileno = i + 3; d.d_namlen = kt->kt_namlen; - bcopy(kt->kt_name, d.d_name, kt->kt_namlen + 1); + memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); d.d_type = kt->kt_type; if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0) break; - if (ncookies-- > 0) + if (cookies) { *cookies++ = i + 1; + ncookies++; + } + } + + if (ap->a_ncookies) { + if (error) { + FREE(*ap->a_cookies, M_TEMP); + *ap->a_ncookies = 0; + *ap->a_cookies = NULL; + } else + *ap->a_ncookies = ncookies; } uio->uio_offset = i; @@ -630,16 +681,18 @@ kernfs_inactive(v) { struct vop_inactive_args /* { struct vnode *a_vp; + struct proc *a_p; } */ *ap = v; struct vnode *vp = ap->a_vp; #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_inactive(%x)\n", vp); + printf("kernfs_inactive(%p)\n", vp); #endif /* * Clear out the v_type field to avoid * nasty things happening in vgone(). */ + VOP_UNLOCK(vp, 0); vp->v_type = VNON; return (0); } @@ -654,7 +707,7 @@ kernfs_reclaim(v) struct vnode *vp = ap->a_vp; #ifdef KERNFS_DIAGNOSTIC - kprintf("kernfs_reclaim(%x)\n", vp); + printf("kernfs_reclaim(%p)\n", vp); #endif if (vp->v_data) { FREE(vp->v_data, M_TEMP); @@ -695,6 +748,9 @@ kernfs_pathconf(v) case _PC_VDISABLE: *ap->a_retval = _POSIX_VDISABLE; return (0); + case _PC_SYNC_IO: + *ap->a_retval = 1; + return (0); default: return (EINVAL); } @@ -710,7 +766,7 @@ kernfs_print(v) void *v; { - kprintf("tag VT_KERNFS, kernfs vnode\n"); + printf("tag VT_KERNFS, kernfs vnode\n"); return (0); }