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.62 retrieving revision 1.85 diff -u -p -r1.62 -r1.85 --- src/sys/miscfs/kernfs/kernfs_vnops.c 1998/08/13 10:06:33 1.62 +++ src/sys/miscfs/kernfs/kernfs_vnops.c 2003/04/10 21:53:33 1.85 @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vnops.c,v 1.62 1998/08/13 10:06:33 kleink Exp $ */ +/* $NetBSD: kernfs_vnops.c,v 1.85 2003/04/10 21:53:33 jdolecek Exp $ */ /* * Copyright (c) 1992, 1993 @@ -42,15 +42,13 @@ * Kernel parameter filesystem (/kern) */ -#if defined(_KERNEL) && !defined(_LKM) -#include "opt_uvm.h" -#endif +#include +__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.85 2003/04/10 21:53:33 jdolecek Exp $"); #include #include #include #include -#include #include #include #include @@ -66,10 +64,7 @@ #include #include -#if defined(UVM) -#include #include -#endif #define KSTRING 256 /* Largest I/O available via this filesystem */ #define UIO_MX 32 @@ -78,23 +73,21 @@ #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 kern_targets[] = { +const 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 */ { DT_DIR, N("."), 0, KTT_NULL, VDIR, DIR_MODE }, { DT_DIR, N(".."), 0, KTT_NULL, VDIR, DIR_MODE }, { DT_REG, N("boottime"), &boottime.tv_sec, KTT_INT, VREG, READ_MODE }, - { DT_REG, N("copyright"), copyright, KTT_STRING, VREG, READ_MODE }, + /* XXX cast away const */ + { DT_REG, N("copyright"), (void *)copyright, + KTT_STRING, VREG, READ_MODE }, { DT_REG, N("hostname"), 0, KTT_HOSTNAME, VREG, WRITE_MODE }, { 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 }, -#if defined(UVM) { DT_REG, N("pagesize"), &uvmexp.pagesize, KTT_INT, VREG, READ_MODE }, -#else - { DT_REG, N("pagesize"), &cnt.v_page_size, KTT_INT, VREG, READ_MODE }, -#endif { DT_REG, N("physmem"), &physmem, KTT_INT, VREG, READ_MODE }, #if 0 { DT_DIR, N("root"), 0, KTT_NULL, VDIR, DIR_MODE }, @@ -102,7 +95,9 @@ struct kern_target kern_targets[] = { { DT_BLK, N("rootdev"), &rootdev, KTT_DEVICE, VBLK, READ_MODE }, { DT_CHR, N("rrootdev"), &rrootdev, KTT_DEVICE, VCHR, READ_MODE }, { DT_REG, N("time"), 0, KTT_TIME, VREG, READ_MODE }, - { DT_REG, N("version"), version, KTT_STRING, VREG, READ_MODE }, + /* XXX cast away const */ + { DT_REG, N("version"), (void *)version, + KTT_STRING, VREG, READ_MODE }, #undef N }; static int nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]); @@ -117,10 +112,10 @@ int kernfs_getattr __P((void *)); int kernfs_setattr __P((void *)); int kernfs_read __P((void *)); int kernfs_write __P((void *)); +#define kernfs_fcntl genfs_fcntl #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 @@ -134,12 +129,12 @@ int kernfs_readdir __P((void *)); #define kernfs_abortop genfs_abortop int kernfs_inactive __P((void *)); int kernfs_reclaim __P((void *)); -#define kernfs_lock genfs_nolock -#define kernfs_unlock genfs_nounlock +#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_noislocked +#define kernfs_islocked genfs_islocked int kernfs_pathconf __P((void *)); #define kernfs_advlock genfs_einval #define kernfs_blkatoff genfs_eopnotsupp @@ -148,12 +143,13 @@ int kernfs_pathconf __P((void *)); #define kernfs_truncate genfs_eopnotsupp #define kernfs_update genfs_nullop #define kernfs_bwrite genfs_eopnotsupp +#define kernfs_putpages genfs_putpages -int kernfs_xread __P((struct kern_target *, int, char **, int)); -int kernfs_xwrite __P((struct kern_target *, char *, int)); +static int kernfs_xread __P((const struct kern_target *, int, char **, size_t, size_t *)); +static int kernfs_xwrite __P((const struct kern_target *, char *, size_t)); int (**kernfs_vnodeop_p) __P((void *)); -struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { +const struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, kernfs_lookup }, /* lookup */ { &vop_create_desc, kernfs_create }, /* create */ @@ -165,10 +161,10 @@ struct vnodeopv_entry_desc kernfs_vnodeo { &vop_setattr_desc, kernfs_setattr }, /* setattr */ { &vop_read_desc, kernfs_read }, /* read */ { &vop_write_desc, kernfs_write }, /* write */ + { &vop_fcntl_desc, kernfs_fcntl }, /* fcntl */ { &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 */ { &vop_remove_desc, kernfs_remove }, /* remove */ @@ -196,17 +192,19 @@ struct vnodeopv_entry_desc kernfs_vnodeo { &vop_truncate_desc, kernfs_truncate }, /* truncate */ { &vop_update_desc, kernfs_update }, /* update */ { &vop_bwrite_desc, kernfs_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL } + { &vop_putpages_desc, kernfs_putpages }, /* putpages */ + { NULL, NULL } }; -struct vnodeopv_desc kernfs_vnodeop_opv_desc = +const struct vnodeopv_desc kernfs_vnodeop_opv_desc = { &kernfs_vnodeop_p, kernfs_vnodeop_entries }; -int -kernfs_xread(kt, off, bufp, len) - struct kern_target *kt; +static int +kernfs_xread(kt, off, bufp, len, wrlen) + const struct kern_target *kt; int off; char **bufp; - int len; + size_t len; + size_t *wrlen; { switch (kt->kt_tag) { @@ -253,14 +251,17 @@ kernfs_xread(kt, off, bufp, len) * message buffer header are corrupted, but that'll cause * the system to die anyway. */ - if (off >= msgbufp->msg_bufs) + if (off >= msgbufp->msg_bufs) { + *wrlen = 0; return (0); + } n = msgbufp->msg_bufx + 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); + *wrlen = len; + return (0); } case KTT_HOSTNAME: { @@ -284,21 +285,25 @@ kernfs_xread(kt, off, bufp, len) break; default: + *wrlen = 0; return (0); } len = strlen(*bufp); if (len <= off) - return (0); - *bufp += off; - return (len - off); + *wrlen = 0; + else { + *bufp += off; + *wrlen = len - off; + } + return (0); } -int +static int kernfs_xwrite(kt, buf, len) - struct kern_target *kt; + const struct kern_target *kt; char *buf; - int len; + size_t len; { switch (kt->kt_tag) { @@ -307,7 +312,7 @@ kernfs_xwrite(kt, buf, len) --len; memcpy(hostname, buf, len); hostname[len] = '\0'; - hostnamelen = len; + hostnamelen = (size_t) len; return (0); default: @@ -333,9 +338,9 @@ kernfs_lookup(v) struct vnode **vpp = ap->a_vpp; struct vnode *dvp = ap->a_dvp; const char *pname = cnp->cn_nameptr; - struct kern_target *kt; + const struct kern_target *kt; struct vnode *fvp; - int error, i; + int error, i, wantpunlock; #ifdef KERNFS_DIAGNOSTIC printf("kernfs_lookup(%p)\n", ap); @@ -344,18 +349,22 @@ kernfs_lookup(v) #endif *vpp = NULLVP; + cnp->cn_flags &= ~PDIRUNLOCK; if (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME) return (EROFS); - VOP_UNLOCK(dvp, 0); if (cnp->cn_namelen == 1 && *pname == '.') { *vpp = dvp; VREF(dvp); - vn_lock(dvp, LK_SHARED | LK_RETRY); return (0); } + /* + * This code only supports a flat directory, so we don't + * need to worry about .. + */ + #if 0 if (cnp->cn_namelen == 4 && memcmp(pname, "root", 4) == 0) { *vpp = rootdir; @@ -365,6 +374,8 @@ kernfs_lookup(v) } #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 && memcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) @@ -375,7 +386,6 @@ kernfs_lookup(v) printf("kernfs_lookup: i = %d, failed", i); #endif - vn_lock(dvp, LK_SHARED | LK_RETRY); return (cnp->cn_nameiop == LOOKUP ? ENOENT : EROFS); found: @@ -383,12 +393,15 @@ found: dev_t *dp = kt->kt_data; loop: if (*dp == NODEV || !vfinddev(*dp, kt->kt_vtype, &fvp)) { - vn_lock(dvp, LK_SHARED | LK_RETRY); return (ENOENT); } *vpp = fvp; if (vget(fvp, LK_EXCLUSIVE)) goto loop; + if (wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } return (0); } @@ -397,7 +410,6 @@ found: #endif error = getnewvnode(VT_KERNFS, dvp->v_mount, kernfs_vnodeop_p, &fvp); if (error) { - vn_lock(dvp, LK_SHARED | LK_RETRY); return (error); } @@ -405,12 +417,16 @@ found: M_WAITOK); VTOKERN(fvp)->kf_kt = kt; fvp->v_type = kt->kt_vtype; - vn_lock(fvp, LK_SHARED | LK_RETRY); + vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY); *vpp = fvp; #ifdef KERNFS_DIAGNOSTIC printf("kernfs_lookup: newvp = %p\n", fvp); #endif + if (wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } return (0); } @@ -430,7 +446,7 @@ kernfs_access(v) if (vp->v_flag & VROOT) { mode = DIR_MODE; } else { - struct kern_target *kt = VTOKERN(vp)->kf_kt; + const struct kern_target *kt = VTOKERN(vp)->kf_kt; mode = kt->kt_mode; } @@ -450,7 +466,6 @@ kernfs_getattr(v) } */ *ap = v; struct vnode *vp = ap->a_vp; struct vattr *vap = ap->a_vap; - struct timeval tv; int error = 0; char strbuf[KSTRING], *buf; @@ -461,10 +476,13 @@ kernfs_getattr(v) vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0]; vap->va_size = 0; vap->va_blocksize = DEV_BSIZE; - microtime(&tv); - TIMEVAL_TO_TIMESPEC(&tv, &vap->va_atime); - vap->va_mtime = vap->va_atime; - vap->va_ctime = vap->va_ctime; + /* + * Make all times be current TOD. Avoid microtime(9), it's slow. + * We don't guard the read from time(9) with splclock(9) since we + * don't actually need to be THAT sure the access is atomic. + */ + TIMEVAL_TO_TIMESPEC(&time, &vap->va_ctime); + vap->va_atime = vap->va_mtime = vap->va_ctime; vap->va_gen = 0; vap->va_flags = 0; vap->va_rdev = 0; @@ -480,8 +498,8 @@ kernfs_getattr(v) vap->va_fileid = 2; vap->va_size = DEV_BSIZE; } else { - struct kern_target *kt = VTOKERN(vp)->kf_kt; - int nbytes, total; + const struct kern_target *kt = VTOKERN(vp)->kf_kt; + size_t nread, total; #ifdef KERNFS_DIAGNOSTIC printf("kernfs_getattr: stat target %s\n", kt->kt_name); #endif @@ -490,9 +508,12 @@ kernfs_getattr(v) vap->va_nlink = 1; vap->va_fileid = 1 + (kt - kern_targets); total = 0; - while (buf = strbuf, - nbytes = kernfs_xread(kt, total, &buf, sizeof(strbuf))) - total += nbytes; + do { + buf = strbuf; + error = kernfs_xread(kt, total, &buf, + sizeof(strbuf), &nread); + total += nread; + } while (error == 0 && nread != 0); vap->va_size = total; } @@ -528,9 +549,10 @@ kernfs_read(v) } */ *ap = v; struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; - struct kern_target *kt; + const struct kern_target *kt; char strbuf[KSTRING], *buf; - int off, len; + off_t off; + size_t len; int error; if (vp->v_type == VDIR) @@ -543,17 +565,10 @@ kernfs_read(v) #endif off = uio->uio_offset; -#if 0 - while (buf = strbuf, -#else - if (buf = strbuf, -#endif - len = kernfs_xread(kt, off, &buf, sizeof(strbuf))) { - if ((error = uiomove(buf, len, uio)) != 0) - return (error); - off += len; - } - return (0); + buf = strbuf; + if ((error = kernfs_xread(kt, off, &buf, sizeof(strbuf), &len)) == 0) + error = uiomove(buf, len, uio); + return (error); } int @@ -568,7 +583,7 @@ kernfs_write(v) } */ *ap = v; struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; - struct kern_target *kt; + const struct kern_target *kt; int error, xlen; char strbuf[KSTRING]; @@ -606,8 +621,8 @@ kernfs_readdir(v) } */ *ap = v; struct uio *uio = ap->a_uio; struct dirent d; - struct kern_target *kt; - int i; + const struct kern_target *kt; + off_t i; int error; off_t *cookies = NULL; int ncookies = 0, nc = 0; @@ -622,21 +637,24 @@ kernfs_readdir(v) error = 0; i = uio->uio_offset; + + if (i >= nkern_targets) + return 0; + 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); + cookies = malloc(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 - printf("kernfs_readdir: i = %d\n", i); + printf("kernfs_readdir: i = %d\n", (int)i); #endif if (kt->kt_tag == KTT_DEVICE) { @@ -662,7 +680,7 @@ kernfs_readdir(v) if (ap->a_ncookies) { if (error) { - FREE(*ap->a_cookies, M_TEMP); + free(*ap->a_cookies, M_TEMP); *ap->a_ncookies = 0; *ap->a_cookies = NULL; } else