Module Name: src
Committed By: hannken
Date: Sun Jul 27 16:47:26 UTC 2014
Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_subr.c procfs_vfsops.c
procfs_vnops.c
Log Message:
Change procfs from hashlist to vcache.
- Key is (type, pid, fd)
- Remove argument "p" from procfs_allocvp(). It is only used
when "type == PFSfd". Lookup the proc with proc_find() when
procfs_loadvnode() needs it.
- Use a vfs_vnode_iterator for procfs_revoke_vnodes().
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.104 -r1.105 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.91 -r1.92 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.190 -r1.191 src/sys/miscfs/procfs/procfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.69 src/sys/miscfs/procfs/procfs.h:1.70
--- src/sys/miscfs/procfs/procfs.h:1.69 Sat Apr 5 18:42:32 2014
+++ src/sys/miscfs/procfs/procfs.h Sun Jul 27 16:47:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs.h,v 1.69 2014/04/05 18:42:32 christos Exp $ */
+/* $NetBSD: procfs.h,v 1.70 2014/07/27 16:47:26 hannken Exp $ */
/*
* Copyright (c) 1993
@@ -118,12 +118,17 @@ typedef enum {
/*
* control data for the proc file system.
*/
+struct pfskey {
+ pfstype pk_type; /* type of procfs node */
+ pid_t pk_pid; /* associated process */
+ int pk_fd; /* associated fd if not -1 */
+};
struct pfsnode {
- LIST_ENTRY(pfsnode) pfs_hash; /* hash chain */
struct vnode *pfs_vnode; /* vnode associated with this pfsnode */
- pfstype pfs_type; /* type of procfs node */
- pid_t pfs_pid; /* associated process */
- int pfs_fd; /* associated fd if not -1 */
+ struct pfskey pfs_key;
+#define pfs_type pfs_key.pk_type
+#define pfs_pid pfs_key.pk_pid
+#define pfs_fd pfs_key.pk_fd
mode_t pfs_mode; /* mode bits for stat() */
u_long pfs_flags; /* open flags */
u_long pfs_fileno; /* unique file id */
@@ -187,9 +192,7 @@ const vfs_namemap_t *vfs_findname(const
int procfs_proc_lock(int, struct proc **, int);
void procfs_proc_unlock(struct proc *);
-int procfs_freevp(struct vnode *);
-int procfs_allocvp(struct mount *, struct vnode **, pid_t, pfstype, int,
- struct proc *);
+int procfs_allocvp(struct mount *, struct vnode **, pid_t, pfstype, int);
int procfs_donote(struct lwp *, struct proc *, struct pfsnode *,
struct uio *);
int procfs_doregs(struct lwp *, struct lwp *, struct pfsnode *,
@@ -232,9 +235,6 @@ int procfs_doversion(struct lwp *, struc
struct uio *);
void procfs_revoke_vnodes(struct proc *, void *);
-void procfs_hashinit(void);
-void procfs_hashreinit(void);
-void procfs_hashdone(void);
int procfs_getfp(struct pfsnode *, struct proc *, struct file **);
/* functions to check whether or not files should be displayed */
Index: src/sys/miscfs/procfs/procfs_subr.c
diff -u src/sys/miscfs/procfs/procfs_subr.c:1.104 src/sys/miscfs/procfs/procfs_subr.c:1.105
--- src/sys/miscfs/procfs/procfs_subr.c:1.104 Fri Feb 7 15:29:22 2014
+++ src/sys/miscfs/procfs/procfs_subr.c Sun Jul 27 16:47:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_subr.c,v 1.104 2014/02/07 15:29:22 hannken Exp $ */
+/* $NetBSD: procfs_subr.c,v 1.105 2014/07/27 16:47:26 hannken Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.104 2014/02/07 15:29:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.105 2014/07/27 16:47:26 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,224 +118,22 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_subr.
#include <miscfs/procfs/procfs.h>
-void procfs_hashins(struct pfsnode *);
-void procfs_hashrem(struct pfsnode *);
-struct vnode *procfs_hashget(pid_t, pfstype, int, struct mount *);
-
-LIST_HEAD(pfs_hashhead, pfsnode) *pfs_hashtbl;
-u_long pfs_ihash; /* size of hash table - 1 */
-#define PFSPIDHASH(pid) ((pid) & pfs_ihash)
-
-kmutex_t pfs_hashlock;
-kmutex_t pfs_ihash_lock;
-
-#define ISSET(t, f) ((t) & (f))
-
/*
- * allocate a pfsnode/vnode pair. the vnode is
- * referenced, and locked.
- *
- * the pid, pfs_type, and mount point uniquely
- * identify a pfsnode. the mount point is needed
- * because someone might mount this filesystem
- * twice.
- *
- * all pfsnodes are maintained on a singly-linked
- * list. new nodes are only allocated when they cannot
- * be found on this list. entries on the list are
- * removed when the vfs reclaim entry is called.
- *
- * a single lock is kept for the entire list. this is
- * needed because the getnewvnode() function can block
- * waiting for a vnode to become free, in which case there
- * may be more than one process trying to get the same
- * vnode. this lock is only taken if we are going to
- * call getnewvnode, since the kernel itself is single-threaded.
- *
- * if an entry is found on the list, then call vget() to
- * take a reference. this is done because there may be
- * zero references to it and so it needs to removed from
- * the vnode free list.
+ * Allocate a pfsnode/vnode pair. The vnode is referenced.
+ * The pid, type, and file descriptor uniquely identify a pfsnode.
*/
int
procfs_allocvp(struct mount *mp, struct vnode **vpp, pid_t pid,
- pfstype pfs_type, int fd, struct proc *p)
+ pfstype type, int fd)
{
- struct pfsnode *pfs;
- struct vnode *vp;
- int error;
-
- *vpp = procfs_hashget(pid, pfs_type, fd, mp);
- if (*vpp != NULL)
- return (0);
+ struct pfskey key;
- error = getnewvnode(VT_PROCFS, mp, procfs_vnodeop_p, NULL, &vp);
- if (error) {
- *vpp = NULL;
- return (error);
- }
- pfs = malloc(sizeof(struct pfsnode), M_TEMP, M_WAITOK);
+ memset(&key, 0, sizeof(key));
+ key.pk_type = type;
+ key.pk_pid = pid;
+ key.pk_fd = fd;
- mutex_enter(&pfs_hashlock);
- if ((*vpp = procfs_hashget(pid, pfs_type, fd, mp)) != NULL) {
- mutex_exit(&pfs_hashlock);
- ungetnewvnode(vp);
- free(pfs, M_TEMP);
- return 0;
- }
-
- vp->v_data = pfs;
- pfs->pfs_pid = pid;
- pfs->pfs_type = pfs_type;
- pfs->pfs_vnode = vp;
- pfs->pfs_flags = 0;
- pfs->pfs_fileno = PROCFS_FILENO(pid, pfs_type, fd);
- pfs->pfs_fd = fd;
-
- switch (pfs_type) {
- case PFSroot: /* /proc = dr-xr-xr-x */
- vp->v_vflag |= VV_ROOT;
- /*FALLTHROUGH*/
- case PFSproc: /* /proc/N = dr-xr-xr-x */
- pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH;
- vp->v_type = VDIR;
- break;
-
- case PFStask: /* /proc/N/task = dr-xr-xr-x */
- if (fd == -1) {
- pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|
- S_IROTH|S_IXOTH;
- vp->v_type = VDIR;
- break;
- }
- /*FALLTHROUGH*/
- case PFScurproc: /* /proc/curproc = lr-xr-xr-x */
- case PFSself: /* /proc/self = lr-xr-xr-x */
- case PFScwd: /* /proc/N/cwd = lr-xr-xr-x */
- case PFSchroot: /* /proc/N/chroot = lr-xr-xr-x */
- case PFSexe: /* /proc/N/exe = lr-xr-xr-x */
- pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH;
- vp->v_type = VLNK;
- break;
-
- case PFSfd:
- if (fd == -1) { /* /proc/N/fd = dr-x------ */
- pfs->pfs_mode = S_IRUSR|S_IXUSR;
- vp->v_type = VDIR;
- } else { /* /proc/N/fd/M = [ps-]rw------- */
- file_t *fp;
- vnode_t *vxp;
-
- if ((fp = fd_getfile2(p, pfs->pfs_fd)) == NULL) {
- error = EBADF;
- goto bad;
- }
-
- pfs->pfs_mode = S_IRUSR|S_IWUSR;
- switch (fp->f_type) {
- case DTYPE_VNODE:
- vxp = fp->f_data;
-
- /*
- * We make symlinks for directories
- * to avoid cycles.
- */
- if (vxp->v_type == VDIR)
- goto symlink;
- vp->v_type = vxp->v_type;
- break;
- case DTYPE_PIPE:
- vp->v_type = VFIFO;
- break;
- case DTYPE_SOCKET:
- vp->v_type = VSOCK;
- break;
- case DTYPE_KQUEUE:
- case DTYPE_MISC:
- case DTYPE_SEM:
- symlink:
- pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|
- S_IXGRP|S_IROTH|S_IXOTH;
- vp->v_type = VLNK;
- break;
- default:
- error = EOPNOTSUPP;
- closef(fp);
- goto bad;
- }
- closef(fp);
- }
- break;
-
- case PFSfile: /* /proc/N/file = -rw------- */
- case PFSmem: /* /proc/N/mem = -rw------- */
- case PFSregs: /* /proc/N/regs = -rw------- */
- case PFSfpregs: /* /proc/N/fpregs = -rw------- */
- pfs->pfs_mode = S_IRUSR|S_IWUSR;
- vp->v_type = VREG;
- break;
-
- case PFSctl: /* /proc/N/ctl = --w------ */
- case PFSnote: /* /proc/N/note = --w------ */
- case PFSnotepg: /* /proc/N/notepg = --w------ */
- pfs->pfs_mode = S_IWUSR;
- vp->v_type = VREG;
- break;
-
- case PFSmap: /* /proc/N/map = -r--r--r-- */
- case PFSmaps: /* /proc/N/maps = -r--r--r-- */
- case PFSstatus: /* /proc/N/status = -r--r--r-- */
- case PFSstat: /* /proc/N/stat = -r--r--r-- */
- case PFScmdline: /* /proc/N/cmdline = -r--r--r-- */
- case PFSemul: /* /proc/N/emul = -r--r--r-- */
- case PFSmeminfo: /* /proc/meminfo = -r--r--r-- */
- case PFScpustat: /* /proc/stat = -r--r--r-- */
- case PFSdevices: /* /proc/devices = -r--r--r-- */
- case PFScpuinfo: /* /proc/cpuinfo = -r--r--r-- */
- case PFSuptime: /* /proc/uptime = -r--r--r-- */
- case PFSmounts: /* /proc/mounts = -r--r--r-- */
- case PFSloadavg: /* /proc/loadavg = -r--r--r-- */
- case PFSstatm: /* /proc/N/statm = -r--r--r-- */
- case PFSversion: /* /proc/version = -r--r--r-- */
- pfs->pfs_mode = S_IRUSR|S_IRGRP|S_IROTH;
- vp->v_type = VREG;
- break;
-
-#ifdef __HAVE_PROCFS_MACHDEP
- PROCFS_MACHDEP_NODETYPE_CASES
- procfs_machdep_allocvp(vp);
- break;
-#endif
-
- default:
- panic("procfs_allocvp");
- }
-
- procfs_hashins(pfs);
- uvm_vnp_setsize(vp, 0);
- mutex_exit(&pfs_hashlock);
-
- *vpp = vp;
- return (0);
-
- bad:
- mutex_exit(&pfs_hashlock);
- free(pfs, M_TEMP);
- vp->v_data = NULL;
- ungetnewvnode(vp);
- return (error);
-}
-
-int
-procfs_freevp(struct vnode *vp)
-{
- struct pfsnode *pfs = VTOPFS(vp);
-
- procfs_hashrem(pfs);
-
- free(vp->v_data, M_TEMP);
- vp->v_data = NULL;
- return (0);
+ return vcache_get(mp, &key, sizeof(key), vpp);
}
int
@@ -550,132 +348,34 @@ vfs_findname(const vfs_namemap_t *nm, co
return (0);
}
-/*
- * Initialize pfsnode hash table.
- */
-void
-procfs_hashinit(void)
-{
- mutex_init(&pfs_hashlock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&pfs_ihash_lock, MUTEX_DEFAULT, IPL_NONE);
- pfs_hashtbl = hashinit(desiredvnodes / 4, HASH_LIST, true, &pfs_ihash);
-}
-
-void
-procfs_hashreinit(void)
-{
- struct pfsnode *pp;
- struct pfs_hashhead *oldhash, *hash;
- u_long i, oldmask, mask, val;
-
- hash = hashinit(desiredvnodes / 4, HASH_LIST, true, &mask);
-
- mutex_enter(&pfs_ihash_lock);
- oldhash = pfs_hashtbl;
- oldmask = pfs_ihash;
- pfs_hashtbl = hash;
- pfs_ihash = mask;
- for (i = 0; i <= oldmask; i++) {
- while ((pp = LIST_FIRST(&oldhash[i])) != NULL) {
- LIST_REMOVE(pp, pfs_hash);
- val = PFSPIDHASH(pp->pfs_pid);
- LIST_INSERT_HEAD(&hash[val], pp, pfs_hash);
- }
- }
- mutex_exit(&pfs_ihash_lock);
- hashdone(oldhash, HASH_LIST, oldmask);
-}
-
-/*
- * Free pfsnode hash table.
- */
-void
-procfs_hashdone(void)
-{
- hashdone(pfs_hashtbl, HASH_LIST, pfs_ihash);
- mutex_destroy(&pfs_hashlock);
- mutex_destroy(&pfs_ihash_lock);
-}
-
-struct vnode *
-procfs_hashget(pid_t pid, pfstype type, int fd, struct mount *mp)
+static bool
+procfs_revoke_selector(void *arg, struct vnode *vp)
{
- struct pfs_hashhead *ppp;
- struct pfsnode *pp;
- struct vnode *vp;
-
-loop:
- mutex_enter(&pfs_ihash_lock);
- ppp = &pfs_hashtbl[PFSPIDHASH(pid)];
- LIST_FOREACH(pp, ppp, pfs_hash) {
- vp = PFSTOV(pp);
- if (pid == pp->pfs_pid && pp->pfs_type == type &&
- pp->pfs_fd == fd && vp->v_mount == mp) {
- mutex_enter(vp->v_interlock);
- mutex_exit(&pfs_ihash_lock);
- if (vget(vp, 0))
- goto loop;
- return (vp);
- }
- }
- mutex_exit(&pfs_ihash_lock);
- return (NULL);
-}
-
-/*
- * Insert the pfsnode into the hash table and lock it.
- */
-void
-procfs_hashins(struct pfsnode *pp)
-{
- struct pfs_hashhead *ppp;
+ struct proc *p = arg;
+ struct pfsnode *pfs = VTOPFS(vp);
- mutex_enter(&pfs_ihash_lock);
- ppp = &pfs_hashtbl[PFSPIDHASH(pp->pfs_pid)];
- LIST_INSERT_HEAD(ppp, pp, pfs_hash);
- mutex_exit(&pfs_ihash_lock);
-}
-
-/*
- * Remove the pfsnode from the hash table.
- */
-void
-procfs_hashrem(struct pfsnode *pp)
-{
- mutex_enter(&pfs_ihash_lock);
- LIST_REMOVE(pp, pfs_hash);
- mutex_exit(&pfs_ihash_lock);
+ return (pfs != NULL && pfs->pfs_pid == p->p_pid);
}
void
procfs_revoke_vnodes(struct proc *p, void *arg)
{
- struct pfsnode *pfs, *pnext;
struct vnode *vp;
+ struct vnode_iterator *marker;
struct mount *mp = (struct mount *)arg;
- struct pfs_hashhead *ppp;
if (!(p->p_flag & PK_SUGID))
return;
- mutex_enter(&pfs_ihash_lock);
- ppp = &pfs_hashtbl[PFSPIDHASH(p->p_pid)];
- for (pfs = LIST_FIRST(ppp); pfs; pfs = pnext) {
- vp = PFSTOV(pfs);
- pnext = LIST_NEXT(pfs, pfs_hash);
- if (pfs->pfs_pid != p->p_pid || vp->v_mount != mp)
- continue;
- mutex_enter(vp->v_interlock);
- mutex_exit(&pfs_ihash_lock);
- if (vget(vp, 0) != 0) {
- mutex_enter(&pfs_ihash_lock);
- continue;
- }
+ vfs_vnode_iterator_init(mp, &marker);
+
+ while ((vp = vfs_vnode_iterator_next(marker,
+ procfs_revoke_selector, p)) != NULL) {
VOP_REVOKE(vp, REVOKEALL);
vrele(vp);
- mutex_enter(&pfs_ihash_lock);
}
- mutex_exit(&pfs_ihash_lock);
+
+ vfs_vnode_iterator_destroy(marker);
}
int
Index: src/sys/miscfs/procfs/procfs_vfsops.c
diff -u src/sys/miscfs/procfs/procfs_vfsops.c:1.91 src/sys/miscfs/procfs/procfs_vfsops.c:1.92
--- src/sys/miscfs/procfs/procfs_vfsops.c:1.91 Wed Apr 16 18:55:19 2014
+++ src/sys/miscfs/procfs/procfs_vfsops.c Sun Jul 27 16:47:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.91 2014/04/16 18:55:19 maxv Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.92 2014/07/27 16:47:26 hannken Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.91 2014/04/16 18:55:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.92 2014/07/27 16:47:26 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -95,6 +95,8 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_vfsop
#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
+#include <sys/file.h>
+#include <sys/filedesc.h>
#include <sys/kauth.h>
#include <sys/module.h>
@@ -204,7 +206,7 @@ procfs_root(struct mount *mp, struct vno
{
int error;
- error = procfs_allocvp(mp, vpp, 0, PFSroot, -1, NULL);
+ error = procfs_allocvp(mp, vpp, 0, PFSroot, -1);
if (error == 0) {
error = vn_lock(*vpp, LK_EXCLUSIVE);
if (error != 0) {
@@ -263,22 +265,187 @@ procfs_vget(struct mount *mp, ino_t ino,
return (EOPNOTSUPP);
}
+int
+procfs_loadvnode(struct mount *mp, struct vnode *vp,
+ const void *key, size_t key_len, const void **new_key)
+{
+ int error;
+ struct pfskey pfskey;
+ struct pfsnode *pfs;
+
+ KASSERT(key_len == sizeof(pfskey));
+ memcpy(&pfskey, key, key_len);
+
+ pfs = kmem_alloc(sizeof(*pfs), KM_SLEEP);
+ pfs->pfs_pid = pfskey.pk_pid;
+ pfs->pfs_type = pfskey.pk_type;
+ pfs->pfs_fd = pfskey.pk_fd;
+ pfs->pfs_vnode = vp;
+ pfs->pfs_flags = 0;
+ pfs->pfs_fileno =
+ PROCFS_FILENO(pfs->pfs_pid, pfs->pfs_type, pfs->pfs_fd);
+ vp->v_tag = VT_PROCFS;
+ vp->v_op = procfs_vnodeop_p;
+ vp->v_data = pfs;
+
+ switch (pfs->pfs_type) {
+ case PFSroot: /* /proc = dr-xr-xr-x */
+ vp->v_vflag |= VV_ROOT;
+ /*FALLTHROUGH*/
+ case PFSproc: /* /proc/N = dr-xr-xr-x */
+ pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH;
+ vp->v_type = VDIR;
+ break;
+
+ case PFStask: /* /proc/N/task = dr-xr-xr-x */
+ if (pfs->pfs_fd == -1) {
+ pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|
+ S_IROTH|S_IXOTH;
+ vp->v_type = VDIR;
+ break;
+ }
+ /*FALLTHROUGH*/
+ case PFScurproc: /* /proc/curproc = lr-xr-xr-x */
+ case PFSself: /* /proc/self = lr-xr-xr-x */
+ case PFScwd: /* /proc/N/cwd = lr-xr-xr-x */
+ case PFSchroot: /* /proc/N/chroot = lr-xr-xr-x */
+ case PFSexe: /* /proc/N/exe = lr-xr-xr-x */
+ pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH;
+ vp->v_type = VLNK;
+ break;
+
+ case PFSfd:
+ if (pfs->pfs_fd == -1) { /* /proc/N/fd = dr-x------ */
+ pfs->pfs_mode = S_IRUSR|S_IXUSR;
+ vp->v_type = VDIR;
+ } else { /* /proc/N/fd/M = [ps-]rw------- */
+ file_t *fp;
+ vnode_t *vxp;
+ struct proc *p;
+
+ mutex_enter(proc_lock);
+ p = proc_find(pfs->pfs_pid);
+ mutex_exit(proc_lock);
+ if (p == NULL) {
+ error = ENOENT;
+ goto bad;
+ }
+ KASSERT(rw_read_held(&p->p_reflock));
+ if ((fp = fd_getfile2(p, pfs->pfs_fd)) == NULL) {
+ error = EBADF;
+ goto bad;
+ }
+
+ pfs->pfs_mode = S_IRUSR|S_IWUSR;
+ switch (fp->f_type) {
+ case DTYPE_VNODE:
+ vxp = fp->f_data;
+
+ /*
+ * We make symlinks for directories
+ * to avoid cycles.
+ */
+ if (vxp->v_type == VDIR)
+ goto symlink;
+ vp->v_type = vxp->v_type;
+ break;
+ case DTYPE_PIPE:
+ vp->v_type = VFIFO;
+ break;
+ case DTYPE_SOCKET:
+ vp->v_type = VSOCK;
+ break;
+ case DTYPE_KQUEUE:
+ case DTYPE_MISC:
+ case DTYPE_SEM:
+ symlink:
+ pfs->pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|
+ S_IXGRP|S_IROTH|S_IXOTH;
+ vp->v_type = VLNK;
+ break;
+ default:
+ error = EOPNOTSUPP;
+ closef(fp);
+ goto bad;
+ }
+ closef(fp);
+ }
+ break;
+
+ case PFSfile: /* /proc/N/file = -rw------- */
+ case PFSmem: /* /proc/N/mem = -rw------- */
+ case PFSregs: /* /proc/N/regs = -rw------- */
+ case PFSfpregs: /* /proc/N/fpregs = -rw------- */
+ pfs->pfs_mode = S_IRUSR|S_IWUSR;
+ vp->v_type = VREG;
+ break;
+
+ case PFSctl: /* /proc/N/ctl = --w------ */
+ case PFSnote: /* /proc/N/note = --w------ */
+ case PFSnotepg: /* /proc/N/notepg = --w------ */
+ pfs->pfs_mode = S_IWUSR;
+ vp->v_type = VREG;
+ break;
+
+ case PFSmap: /* /proc/N/map = -r--r--r-- */
+ case PFSmaps: /* /proc/N/maps = -r--r--r-- */
+ case PFSstatus: /* /proc/N/status = -r--r--r-- */
+ case PFSstat: /* /proc/N/stat = -r--r--r-- */
+ case PFScmdline: /* /proc/N/cmdline = -r--r--r-- */
+ case PFSemul: /* /proc/N/emul = -r--r--r-- */
+ case PFSmeminfo: /* /proc/meminfo = -r--r--r-- */
+ case PFScpustat: /* /proc/stat = -r--r--r-- */
+ case PFSdevices: /* /proc/devices = -r--r--r-- */
+ case PFScpuinfo: /* /proc/cpuinfo = -r--r--r-- */
+ case PFSuptime: /* /proc/uptime = -r--r--r-- */
+ case PFSmounts: /* /proc/mounts = -r--r--r-- */
+ case PFSloadavg: /* /proc/loadavg = -r--r--r-- */
+ case PFSstatm: /* /proc/N/statm = -r--r--r-- */
+ case PFSversion: /* /proc/version = -r--r--r-- */
+ pfs->pfs_mode = S_IRUSR|S_IRGRP|S_IROTH;
+ vp->v_type = VREG;
+ break;
+
+#ifdef __HAVE_PROCFS_MACHDEP
+ PROCFS_MACHDEP_NODETYPE_CASES
+ procfs_machdep_allocvp(vp);
+ break;
+#endif
+
+ default:
+ panic("procfs_allocvp");
+ }
+
+ uvm_vnp_setsize(vp, 0);
+ *new_key = &pfs->pfs_key;
+
+ return 0;
+
+bad:
+ vp->v_tag =VT_NON;
+ vp->v_type = VNON;
+ vp->v_op = NULL;
+ vp->v_data = NULL;
+ kmem_free(pfs, sizeof(*pfs));
+ return error;
+}
+
void
procfs_init(void)
{
- procfs_hashinit();
+
}
void
procfs_reinit(void)
{
- procfs_hashreinit();
+
}
void
procfs_done(void)
{
- procfs_hashdone();
+
}
extern const struct vnodeopv_desc procfs_vnodeop_opv_desc;
@@ -299,6 +466,7 @@ struct vfsops procfs_vfsops = {
.vfs_statvfs = procfs_statvfs,
.vfs_sync = procfs_sync,
.vfs_vget = procfs_vget,
+ .vfs_loadvnode = procfs_loadvnode,
.vfs_fhtovp = (void *)eopnotsupp,
.vfs_vptofh = (void *)eopnotsupp,
.vfs_init = procfs_init,
Index: src/sys/miscfs/procfs/procfs_vnops.c
diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.190 src/sys/miscfs/procfs/procfs_vnops.c:1.191
--- src/sys/miscfs/procfs/procfs_vnops.c:1.190 Fri Jul 25 08:20:52 2014
+++ src/sys/miscfs/procfs/procfs_vnops.c Sun Jul 27 16:47:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vnops.c,v 1.190 2014/07/25 08:20:52 dholland Exp $ */
+/* $NetBSD: procfs_vnops.c,v 1.191 2014/07/27 16:47:26 hannken Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.190 2014/07/25 08:20:52 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.191 2014/07/27 16:47:26 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -441,8 +441,18 @@ procfs_reclaim(void *v)
struct vop_reclaim_args /* {
struct vnode *a_vp;
} */ *ap = v;
+ struct vnode *vp = ap->a_vp;
+ struct pfsnode *pfs = VTOPFS(vp);
- return (procfs_freevp(ap->a_vp));
+ /*
+ * To interlock with procfs_revoke_vnodes().
+ */
+ mutex_enter(vp->v_interlock);
+ vp->v_data = NULL;
+ mutex_exit(vp->v_interlock);
+ vcache_remove(vp->v_mount, &pfs->pfs_key, sizeof(pfs->pfs_key));
+ kmem_free(pfs, sizeof(*pfs));
+ return 0;
}
/*
@@ -1037,7 +1047,7 @@ procfs_lookup(void *v)
if (i != nproc_root_targets) {
error = procfs_allocvp(dvp->v_mount, vpp, 0,
- pt->pt_pfstype, -1, NULL);
+ pt->pt_pfstype, -1);
return (error);
}
@@ -1057,14 +1067,14 @@ procfs_lookup(void *v)
if (procfs_proc_lock(pid, &p, ESRCH) != 0)
break;
- error = procfs_allocvp(dvp->v_mount, vpp, vnpid, type, -1, p);
+ error = procfs_allocvp(dvp->v_mount, vpp, vnpid, type, -1);
procfs_proc_unlock(p);
return (error);
case PFSproc:
if (cnp->cn_flags & ISDOTDOT) {
error = procfs_allocvp(dvp->v_mount, vpp, 0, PFSroot,
- -1, NULL);
+ -1);
return (error);
}
@@ -1112,7 +1122,7 @@ procfs_lookup(void *v)
}
error = procfs_allocvp(dvp->v_mount, vpp, pfs->pfs_pid,
- pt->pt_pfstype, -1, p);
+ pt->pt_pfstype, -1);
procfs_proc_unlock(p);
return (error);
@@ -1125,7 +1135,7 @@ procfs_lookup(void *v)
if (cnp->cn_flags & ISDOTDOT) {
error = procfs_allocvp(dvp->v_mount, vpp, pfs->pfs_pid,
- PFSproc, -1, p);
+ PFSproc, -1);
procfs_proc_unlock(p);
return (error);
}
@@ -1149,7 +1159,7 @@ procfs_lookup(void *v)
closef(fp);
error = procfs_allocvp(dvp->v_mount, vpp, pfs->pfs_pid,
- PFSfd, fd, p);
+ PFSfd, fd);
procfs_proc_unlock(p);
return error;
}
@@ -1161,7 +1171,7 @@ procfs_lookup(void *v)
if (cnp->cn_flags & ISDOTDOT) {
error = procfs_allocvp(dvp->v_mount, vpp, pfs->pfs_pid,
- PFSproc, -1, p);
+ PFSproc, -1);
procfs_proc_unlock(p);
return (error);
}
@@ -1172,7 +1182,7 @@ procfs_lookup(void *v)
return ENOENT;
}
error = procfs_allocvp(dvp->v_mount, vpp, pfs->pfs_pid,
- PFStask, 0, p);
+ PFStask, 0);
procfs_proc_unlock(p);
return error;
}
