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.79 retrieving revision 1.103 diff -u -p -r1.79 -r1.103 --- src/sys/miscfs/kernfs/kernfs_vnops.c 2001/12/06 04:27:42 1.79 +++ src/sys/miscfs/kernfs/kernfs_vnops.c 2004/05/12 02:07:37 1.103 @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vnops.c,v 1.79 2001/12/06 04:27:42 chs Exp $ */ +/* $NetBSD: kernfs_vnops.c,v 1.103 2004/05/12 02:07:37 jrf Exp $ */ /* * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.79 2001/12/06 04:27:42 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.103 2004/05/12 02:07:37 jrf Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_ipsec.h" +#endif #include #include @@ -64,6 +64,14 @@ __KERNEL_RCSID(0, "$NetBSD: kernfs_vnops #include #include +#ifdef IPSEC +#include +#include +#include +#include +#include +#endif + #include #define KSTRING 256 /* Largest I/O available via this filesystem */ @@ -71,58 +79,118 @@ __KERNEL_RCSID(0, "$NetBSD: kernfs_vnops #define READ_MODE (S_IRUSR|S_IRGRP|S_IROTH) #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) +#define UREAD_MODE (S_IRUSR) +#define DIR_MODE (S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) +#define UDIR_MODE (S_IRUSR|S_IXUSR) +#define N(s) sizeof(s)-1, s 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_DIR, N("."), 0, KFSkern, VDIR, DIR_MODE }, + { DT_DIR, N(".."), 0, KFSroot, VDIR, DIR_MODE }, + { DT_REG, N("boottime"), &boottime.tv_sec, KFSint, 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 }, - { DT_REG, N("pagesize"), &uvmexp.pagesize, KTT_INT, VREG, READ_MODE }, - { DT_REG, N("physmem"), &physmem, KTT_INT, VREG, READ_MODE }, + KFSstring, VREG, READ_MODE }, + { DT_REG, N("hostname"), 0, KFShostname, VREG, WRITE_MODE }, + { DT_REG, N("hz"), &hz, KFSint, VREG, READ_MODE }, +#ifdef IPSEC + { DT_DIR, N("ipsecsa"), 0, KFSipsecsadir, VDIR, UDIR_MODE }, + { DT_DIR, N("ipsecsp"), 0, KFSipsecspdir, VDIR, UDIR_MODE }, +#endif + { DT_REG, N("loadavg"), 0, KFSavenrun, VREG, READ_MODE }, + { DT_REG, N("msgbuf"), 0, KFSmsgbuf, VREG, READ_MODE }, + { DT_REG, N("pagesize"), &uvmexp.pagesize, KFSint, VREG, READ_MODE }, + { DT_REG, N("physmem"), &physmem, KFSint, VREG, READ_MODE }, #if 0 - { DT_DIR, N("root"), 0, KTT_NULL, VDIR, DIR_MODE }, + { DT_DIR, N("root"), 0, KFSnull, VDIR, DIR_MODE }, #endif - { 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_BLK, N("rootdev"), &rootdev, KFSdevice, VBLK, READ_MODE }, + { DT_CHR, N("rrootdev"), &rrootdev, KFSdevice, VCHR, READ_MODE }, + { DT_REG, N("time"), 0, KFStime, VREG, READ_MODE }, /* XXX cast away const */ { DT_REG, N("version"), (void *)version, - KTT_STRING, VREG, READ_MODE }, + KFSstring, VREG, READ_MODE }, +}; +const struct kern_target subdir_targets[] = { +/* NOTE: The name must be less than UIO_MX-16 chars in length */ + /* name data tag type ro/rw */ + { DT_DIR, N("."), 0, KFSsubdir, VDIR, DIR_MODE }, + { DT_DIR, N(".."), 0, KFSkern, VDIR, DIR_MODE }, +}; +#ifdef IPSEC +const struct kern_target ipsecsa_targets[] = { +/* NOTE: The name must be less than UIO_MX-16 chars in length */ + /* name data tag type ro/rw */ + { DT_DIR, N("."), 0, KFSipsecsadir, VDIR, DIR_MODE }, + { DT_DIR, N(".."), 0, KFSkern, VDIR, DIR_MODE }, +}; +const struct kern_target ipsecsp_targets[] = { +/* NOTE: The name must be less than UIO_MX-16 chars in length */ + /* name data tag type ro/rw */ + { DT_DIR, N("."), 0, KFSipsecspdir, VDIR, DIR_MODE }, + { DT_DIR, N(".."), 0, KFSkern, VDIR, DIR_MODE }, +}; +const struct kern_target ipsecsa_kt = + { DT_DIR, N(""), 0, KFSipsecsa, VREG, UREAD_MODE }; +const struct kern_target ipsecsp_kt = + { DT_DIR, N(""), 0, KFSipsecsp, VREG, UREAD_MODE }; +#endif #undef N +SIMPLEQ_HEAD(,dyn_kern_target) dyn_kern_targets = + SIMPLEQ_HEAD_INITIALIZER(dyn_kern_targets); +int nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]); +const int static_nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]); +#ifdef IPSEC +int nipsecsa_targets = sizeof(ipsecsa_targets) / sizeof(ipsecsa_targets[0]); +int nipsecsp_targets = sizeof(ipsecsp_targets) / sizeof(ipsecsp_targets[0]); +int nkern_dirs = 4; /* 2 extra subdirs */ +#else +int nkern_dirs = 2; +#endif + +int kernfs_try_fileop(kfstype, kfsfileop, void *, int); +int kernfs_try_xwrite(kfstype, const struct kernfs_node *, char *, + size_t, int); + +static int kernfs_default_xwrite(void *v); +static int kernfs_default_fileop_getattr(void *); + +/* must include all fileop's */ +const struct kernfs_fileop kernfs_default_fileops[] = { + { .kf_fileop = KERNFS_XWRITE }, + { .kf_fileop = KERNFS_FILEOP_OPEN }, + { .kf_fileop = KERNFS_FILEOP_GETATTR, + .kf_vop = kernfs_default_fileop_getattr }, + { .kf_fileop = KERNFS_FILEOP_IOCTL }, + { .kf_fileop = KERNFS_FILEOP_MMAP }, + { .kf_fileop = KERNFS_FILEOP_CLOSE }, + { .kf_fileop = KERNFS_FILEOP_WRITE, .kf_vop = kernfs_default_xwrite }, }; -static int nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]); int kernfs_lookup __P((void *)); -#define kernfs_create genfs_eopnotsupp_rele -#define kernfs_mknod genfs_eopnotsupp_rele -#define kernfs_open genfs_nullop -#define kernfs_close genfs_nullop +#define kernfs_create genfs_eopnotsupp +#define kernfs_mknod genfs_eopnotsupp +int kernfs_open __P((void *)); +int kernfs_close __P((void *)); int kernfs_access __P((void *)); 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 +int kernfs_ioctl __P((void *)); #define kernfs_poll genfs_poll #define kernfs_revoke genfs_revoke +int kernfs_mmap __P((void *)); #define kernfs_fsync genfs_nullop #define kernfs_seek genfs_nullop -#define kernfs_remove genfs_eopnotsupp_rele +#define kernfs_remove genfs_eopnotsupp int kernfs_link __P((void *)); -#define kernfs_rename genfs_eopnotsupp_rele -#define kernfs_mkdir genfs_eopnotsupp_rele -#define kernfs_rmdir genfs_eopnotsupp_rele +#define kernfs_rename genfs_eopnotsupp +#define kernfs_mkdir genfs_eopnotsupp +#define kernfs_rmdir genfs_eopnotsupp int kernfs_symlink __P((void *)); int kernfs_readdir __P((void *)); #define kernfs_readlink genfs_eopnotsupp @@ -145,8 +213,8 @@ int kernfs_pathconf __P((void *)); #define kernfs_bwrite genfs_eopnotsupp #define kernfs_putpages genfs_putpages -int kernfs_xread __P((const struct kern_target *, int, char **, int)); -int kernfs_xwrite __P((const struct kern_target *, char *, int)); +static int kernfs_xread __P((struct kernfs_node *, int, char **, size_t, size_t *)); +static int kernfs_xwrite __P((const struct kernfs_node *, char *, size_t)); int (**kernfs_vnodeop_p) __P((void *)); const struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { @@ -165,6 +233,7 @@ const struct vnodeopv_entry_desc kernfs_ { &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 */ @@ -198,38 +267,148 @@ const struct vnodeopv_entry_desc kernfs_ const struct vnodeopv_desc kernfs_vnodeop_opv_desc = { &kernfs_vnodeop_p, kernfs_vnodeop_entries }; +static __inline int +kernfs_fileop_compare(struct kernfs_fileop *a, struct kernfs_fileop *b) +{ + if (a->kf_type < b->kf_type) + return -1; + if (a->kf_type > b->kf_type) + return 1; + if (a->kf_fileop < b->kf_fileop) + return -1; + if (a->kf_fileop > b->kf_fileop) + return 1; + return (0); +} + +SPLAY_HEAD(kfsfileoptree, kernfs_fileop) kfsfileoptree = + SPLAY_INITIALIZER(kfsfileoptree); +SPLAY_PROTOTYPE(kfsfileoptree, kernfs_fileop, kf_node, kernfs_fileop_compare); +SPLAY_GENERATE(kfsfileoptree, kernfs_fileop, kf_node, kernfs_fileop_compare); + +kfstype +kernfs_alloctype(int nkf, const struct kernfs_fileop *kf) +{ + static u_char nextfreetype = KFSlasttype; + struct kernfs_fileop *dkf, *fkf, skf; + int i; + + /* XXX need to keep track of dkf's memory if we support + deallocating types */ + dkf = malloc(sizeof(kernfs_default_fileops), M_TEMP, M_WAITOK); + memcpy(dkf, kernfs_default_fileops, sizeof(kernfs_default_fileops)); + + for (i = 0; i < sizeof(kernfs_default_fileops) / + sizeof(kernfs_default_fileops[0]); i++) { + dkf[i].kf_type = nextfreetype; + SPLAY_INSERT(kfsfileoptree, &kfsfileoptree, &dkf[i]); + } + + for (i = 0; i < nkf; i++) { + skf.kf_type = nextfreetype; + skf.kf_fileop = kf[i].kf_fileop; + if ((fkf = SPLAY_FIND(kfsfileoptree, &kfsfileoptree, &skf))) + fkf->kf_genop = kf[i].kf_genop; + } + + return nextfreetype++; +} + int -kernfs_xread(kt, off, bufp, len) - const struct kern_target *kt; +kernfs_try_fileop(kfstype type, kfsfileop fileop, void *v, int error) +{ + struct kernfs_fileop *kf, skf; + + skf.kf_type = type; + skf.kf_fileop = fileop; + if ((kf = SPLAY_FIND(kfsfileoptree, &kfsfileoptree, &skf))) + if (kf->kf_vop) + return kf->kf_vop(v); + return error; +} + +int +kernfs_try_xwrite(kfstype type, const struct kernfs_node *kfs, char *buf, + size_t len, int error) +{ + struct kernfs_fileop *kf, skf; + + skf.kf_type = type; + skf.kf_fileop = KERNFS_XWRITE; + if ((kf = SPLAY_FIND(kfsfileoptree, &kfsfileoptree, &skf))) + if (kf->kf_xwrite) + return kf->kf_xwrite(kfs, buf, len); + return error; +} + +int +kernfs_addentry(kernfs_parentdir_t *pkt, kernfs_entry_t *dkt) +{ + struct kernfs_subdir *ks, *parent; + + if (pkt == NULL) { + SIMPLEQ_INSERT_TAIL(&dyn_kern_targets, dkt, dkt_queue); + nkern_targets++; + if (dkt->dkt_kt.kt_vtype == VDIR) + nkern_dirs++; + } else { + parent = (struct kernfs_subdir *)pkt->kt_data; + SIMPLEQ_INSERT_TAIL(&parent->ks_entries, dkt, dkt_queue); + parent->ks_nentries++; + if (dkt->dkt_kt.kt_vtype == VDIR) + parent->ks_dirs++; + } + if (dkt->dkt_kt.kt_vtype == VDIR && dkt->dkt_kt.kt_data == NULL) { + ks = malloc(sizeof(struct kernfs_subdir), + M_TEMP, M_WAITOK); + SIMPLEQ_INIT(&ks->ks_entries); + ks->ks_nentries = 2; /* . and .. */ + ks->ks_dirs = 2; + ks->ks_parent = pkt ? pkt : &kern_targets[0]; + dkt->dkt_kt.kt_data = ks; + } + return 0; +} + +static int +kernfs_xread(kfs, off, bufp, len, wrlen) + struct kernfs_node *kfs; int off; char **bufp; - int len; + size_t len; + size_t *wrlen; { + const struct kern_target *kt; +#ifdef IPSEC + struct mbuf *m; +#endif - switch (kt->kt_tag) { - case KTT_TIME: { + kt = kfs->kfs_kt; + + switch (kfs->kfs_type) { + case KFStime: { struct timeval tv; microtime(&tv); - sprintf(*bufp, "%ld %ld\n", tv.tv_sec, tv.tv_usec); + snprintf(*bufp, len, "%ld %ld\n", tv.tv_sec, tv.tv_usec); break; } - case KTT_INT: { + case KFSint: { int *ip = kt->kt_data; - sprintf(*bufp, "%d\n", *ip); + snprintf(*bufp, len, "%d\n", *ip); break; } - case KTT_STRING: { + case KFSstring: { char *cp = kt->kt_data; *bufp = cp; break; } - case KTT_MSGBUF: { + case KFSmsgbuf: { long n; /* @@ -250,65 +429,125 @@ 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: { + case KFShostname: { char *cp = hostname; int xlen = hostnamelen; - if (xlen >= (len-2)) + if (xlen >= (len - 2)) return (EINVAL); memcpy(*bufp, cp, xlen); (*bufp)[xlen] = '\n'; (*bufp)[xlen+1] = '\0'; + len = strlen(*bufp); break; } - case KTT_AVENRUN: + case KFSavenrun: averunnable.fscale = FSCALE; - sprintf(*bufp, "%d %d %d %ld\n", + snprintf(*bufp, len, "%d %d %d %ld\n", averunnable.ldavg[0], averunnable.ldavg[1], averunnable.ldavg[2], averunnable.fscale); break; +#ifdef IPSEC + case KFSipsecsa: + /* + * Note that SA configuration could be changed during the + * read operation, resulting in garbled output. + */ + m = key_setdumpsa_spi(htonl(kfs->kfs_value)); + if (!m) + return (ENOBUFS); + if (off >= m->m_pkthdr.len) { + *wrlen = 0; + m_freem(m); + return (0); + } + if (len > m->m_pkthdr.len - off) + len = m->m_pkthdr.len - off; + m_copydata(m, off, len, *bufp); + *wrlen = len; + m_freem(m); + return (0); + + case KFSipsecsp: + /* + * Note that SP configuration could be changed during the + * read operation, resulting in garbled output. + */ + if (!kfs->kfs_v) { + struct secpolicy *sp; + + sp = key_getspbyid(kfs->kfs_value); + if (sp) + kfs->kfs_v = sp; + else + return (ENOENT); + } + m = key_setdumpsp((struct secpolicy *)kfs->kfs_v, + SADB_X_SPDGET, 0, 0); + if (!m) + return (ENOBUFS); + if (off >= m->m_pkthdr.len) { + *wrlen = 0; + m_freem(m); + return (0); + } + if (len > m->m_pkthdr.len - off) + len = m->m_pkthdr.len - off; + m_copydata(m, off, len, *bufp); + *wrlen = len; + m_freem(m); + return (0); +#endif + 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 -kernfs_xwrite(kt, buf, len) - const struct kern_target *kt; +static int +kernfs_xwrite(kfs, buf, len) + const struct kernfs_node *kfs; char *buf; - int len; + size_t len; { - switch (kt->kt_tag) { - case KTT_HOSTNAME: + switch (kfs->kfs_type) { + case KFShostname: if (buf[len-1] == '\n') --len; memcpy(hostname, buf, len); hostname[len] = '\0'; - hostnamelen = len; + hostnamelen = (size_t) len; return (0); default: - return (EIO); + return kernfs_try_xwrite(kfs->kfs_type, kfs, buf, len, EIO); } } @@ -330,14 +569,14 @@ kernfs_lookup(v) struct vnode **vpp = ap->a_vpp; struct vnode *dvp = ap->a_dvp; const char *pname = cnp->cn_nameptr; + const struct kernfs_node *kfs; const struct kern_target *kt; - struct vnode *fvp; + const struct dyn_kern_target *dkt; + const struct kernfs_subdir *ks; int error, i, wantpunlock; - -#ifdef KERNFS_DIAGNOSTIC - 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); +#ifdef IPSEC + char *ep; + u_int32_t id; #endif *vpp = NULLVP; @@ -352,73 +591,179 @@ kernfs_lookup(v) return (0); } - /* - * This code only supports a flat directory, so we don't - * need to worry about .. - */ + wantpunlock = (~cnp->cn_flags & (LOCKPARENT | ISLASTCN)); + kfs = VTOKERN(dvp); + switch (kfs->kfs_type) { + case KFSkern: + /* + * Shouldn't get here with .. in the root node. + */ + if (cnp->cn_flags & ISDOTDOT) + return (EIO); -#if 0 - if (cnp->cn_namelen == 4 && memcmp(pname, "root", 4) == 0) { - *vpp = rootdir; - VREF(rootdir); - vn_lock(rootdir, LK_SHARED | LK_RETRY); - return (0); - } -#endif + for (i = 0; i < static_nkern_targets; i++) { + kt = &kern_targets[i]; + if (cnp->cn_namelen == kt->kt_namlen && + memcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) + goto found; + } + SIMPLEQ_FOREACH(dkt, &dyn_kern_targets, dkt_queue) { + if (cnp->cn_namelen == dkt->dkt_kt.kt_namlen && + memcmp(dkt->dkt_kt.kt_name, pname, cnp->cn_namelen) == 0) { + kt = &dkt->dkt_kt; + goto found; + } + } + break; - wantpunlock = (~cnp->cn_flags & (LOCKPARENT | ISLASTCN)); + found: + error = kernfs_allocvp(dvp->v_mount, vpp, kt->kt_tag, kt, 0); + if ((error == 0) && wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } + return (error); - 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) + case KFSsubdir: + ks = (struct kernfs_subdir *)kfs->kfs_kt->kt_data; + if (cnp->cn_flags & ISDOTDOT) { + kt = ks->ks_parent; goto found; - } + } -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_lookup: i = %d, failed", i); -#endif + SIMPLEQ_FOREACH(dkt, &ks->ks_entries, dkt_queue) { + if (cnp->cn_namelen == dkt->dkt_kt.kt_namlen && + memcmp(dkt->dkt_kt.kt_name, pname, cnp->cn_namelen) == 0) { + kt = &dkt->dkt_kt; + goto found; + } + } + break; - return (cnp->cn_nameiop == LOOKUP ? ENOENT : EROFS); +#ifdef IPSEC + case KFSipsecsadir: + if (cnp->cn_flags & ISDOTDOT) { + kt = &kern_targets[0]; + goto found; + } -found: - if (kt->kt_tag == KTT_DEVICE) { - dev_t *dp = kt->kt_data; - loop: - if (*dp == NODEV || !vfinddev(*dp, kt->kt_vtype, &fvp)) { - return (ENOENT); + for (i = 2; i < nipsecsa_targets; i++) { + kt = &ipsecsa_targets[i]; + if (cnp->cn_namelen == kt->kt_namlen && + memcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) + goto found; } - *vpp = fvp; - if (vget(fvp, LK_EXCLUSIVE)) - goto loop; - if (wantpunlock) { + + ep = NULL; + id = strtoul(pname, &ep, 10); + if (!ep || *ep || ep == pname) + break; + + error = kernfs_allocvp(dvp->v_mount, vpp, KFSipsecsa, &ipsecsa_kt, id); + if ((error == 0) && wantpunlock) { VOP_UNLOCK(dvp, 0); cnp->cn_flags |= PDIRUNLOCK; } - return (0); + return (error); + + case KFSipsecspdir: + if (cnp->cn_flags & ISDOTDOT) { + kt = &kern_targets[0]; + goto found; + } + + for (i = 2; i < nipsecsp_targets; i++) { + kt = &ipsecsp_targets[i]; + if (cnp->cn_namelen == kt->kt_namlen && + memcmp(kt->kt_name, pname, cnp->cn_namelen) == 0) + goto found; + } + + ep = NULL; + id = strtoul(pname, &ep, 10); + if (!ep || *ep || ep == pname) + break; + + error = kernfs_allocvp(dvp->v_mount, vpp, KFSipsecsp, &ipsecsp_kt, id); + if ((error == 0) && wantpunlock) { + VOP_UNLOCK(dvp, 0); + cnp->cn_flags |= PDIRUNLOCK; + } + return (error); +#endif + + default: + return (ENOTDIR); } -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_lookup: allocate new vnode\n"); + return (cnp->cn_nameiop == LOOKUP ? ENOENT : EROFS); +} + +int +kernfs_open(v) + void *v; +{ + struct vop_open_args /* { + struct vnode *a_vp; + int a_mode; + struct ucred *a_cred; + struct proc *a_p; + } */ *ap = v; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); +#ifdef IPSEC + struct mbuf *m; + struct secpolicy *sp; #endif - error = getnewvnode(VT_KERNFS, dvp->v_mount, kernfs_vnodeop_p, &fvp); - if (error) { - return (error); + + switch (kfs->kfs_type) { +#ifdef IPSEC + case KFSipsecsa: + m = key_setdumpsa_spi(htonl(kfs->kfs_value)); + if (m) { + m_freem(m); + return (0); + } else + return (ENOENT); + + case KFSipsecsp: + sp = key_getspbyid(kfs->kfs_value); + if (sp) { + kfs->kfs_v = sp; + return (0); + } else + return (ENOENT); +#endif + + default: + return kernfs_try_fileop(kfs->kfs_type, KERNFS_FILEOP_OPEN, + v, 0); } +} - 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 - printf("kernfs_lookup: newvp = %p\n", fvp); -#endif - if (wantpunlock) { - VOP_UNLOCK(dvp, 0); - cnp->cn_flags |= PDIRUNLOCK; +int +kernfs_close(v) + void *v; +{ + struct vop_close_args /* { + struct vnode *a_vp; + int a_fflag; + struct ucred *a_cred; + struct proc *a_p; + } */ *ap = v; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); + + switch (kfs->kfs_type) { +#ifdef IPSEC + case KFSipsecsp: + key_freesp((struct secpolicy *)kfs->kfs_v); + break; +#endif + + default: + return kernfs_try_fileop(kfs->kfs_type, KERNFS_FILEOP_CLOSE, + v, 0); } + return (0); } @@ -432,18 +777,32 @@ kernfs_access(v) struct ucred *a_cred; struct proc *a_p; } */ *ap = v; - struct vnode *vp = ap->a_vp; - mode_t mode; + struct vattr va; + int error; - if (vp->v_flag & VROOT) { - mode = DIR_MODE; - } else { - const struct kern_target *kt = VTOKERN(vp)->kf_kt; - mode = kt->kt_mode; - } + if ((error = VOP_GETATTR(ap->a_vp, &va, ap->a_cred, ap->a_p)) != 0) + return (error); - return (vaccess(vp->v_type, mode, (uid_t)0, (gid_t)0, ap->a_mode, - ap->a_cred)); + return (vaccess(va.va_type, va.va_mode, va.va_uid, va.va_gid, + ap->a_mode, ap->a_cred)); +} + +static int +kernfs_default_fileop_getattr(v) + void *v; +{ + struct vop_getattr_args /* { + struct vnode *a_vp; + struct vattr *a_vap; + struct ucred *a_cred; + struct proc *a_p; + } */ *ap = v; + struct vattr *vap = ap->a_vap; + + vap->va_nlink = 1; + vap->va_bytes = vap->va_size = 0; + + return 0; } int @@ -456,57 +815,94 @@ kernfs_getattr(v) struct ucred *a_cred; struct proc *a_p; } */ *ap = v; - struct vnode *vp = ap->a_vp; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); + struct kernfs_subdir *ks; struct vattr *vap = ap->a_vap; - struct timeval tv; int error = 0; char strbuf[KSTRING], *buf; + size_t nread, total; - memset((caddr_t) vap, 0, sizeof(*vap)); - vattr_null(vap); + VATTR_NULL(vap); + vap->va_type = ap->a_vp->v_type; vap->va_uid = 0; vap->va_gid = 0; - vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0]; + vap->va_mode = kfs->kfs_mode; + vap->va_fileid = kfs->kfs_fileno; + vap->va_flags = 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, except for the "boottime" node. + * 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. + */ + if (kfs->kfs_kt && kfs->kfs_kt->kt_namlen == 8 && + !memcmp(kfs->kfs_kt->kt_name, "boottime", 8)) { + TIMEVAL_TO_TIMESPEC(&boottime, &vap->va_ctime); + } else { + 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; vap->va_bytes = 0; - if (vp->v_flag & VROOT) { -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_getattr: stat rootdir\n"); -#endif - vap->va_type = VDIR; - vap->va_mode = DIR_MODE; - vap->va_nlink = 2; - vap->va_fileid = 2; - vap->va_size = DEV_BSIZE; - } else { - const struct kern_target *kt = VTOKERN(vp)->kf_kt; - int nbytes, total; -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_getattr: stat target %s\n", kt->kt_name); + switch (kfs->kfs_type) { + case KFSkern: + vap->va_nlink = nkern_dirs; + vap->va_bytes = vap->va_size = DEV_BSIZE; + break; + + case KFSroot: + vap->va_nlink = 1; + vap->va_bytes = vap->va_size = DEV_BSIZE; + break; + + case KFSsubdir: + ks = (struct kernfs_subdir *)kfs->kfs_kt->kt_data; + vap->va_nlink = ks->ks_dirs; + vap->va_bytes = vap->va_size = DEV_BSIZE; + break; + + case KFSnull: + case KFStime: + case KFSint: + case KFSstring: + case KFShostname: + case KFSavenrun: + case KFSdevice: + case KFSmsgbuf: +#ifdef IPSEC + case KFSipsecsa: + case KFSipsecsp: #endif - vap->va_type = kt->kt_vtype; - vap->va_mode = kt->kt_mode; 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; - vap->va_size = total; - } + do { + buf = strbuf; + error = kernfs_xread(kfs, total, &buf, + sizeof(strbuf), &nread); + total += nread; + } while (error == 0 && nread != 0); + vap->va_bytes = vap->va_size = total; + break; -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_getattr: return error %d\n", error); +#ifdef IPSEC + case KFSipsecsadir: + case KFSipsecspdir: + vap->va_nlink = 2; + vap->va_bytes = vap->va_size = DEV_BSIZE; + break; #endif + + default: + error = kernfs_try_fileop(kfs->kfs_type, + KERNFS_FILEOP_GETATTR, v, EINVAL); + break; + } + return (error); } @@ -515,6 +911,7 @@ int kernfs_setattr(v) void *v; { + /* * Silently ignore attribute changes. * This allows for open with truncate to have no @@ -534,38 +931,25 @@ kernfs_read(v) int a_ioflag; struct ucred *a_cred; } */ *ap = v; - struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; - const struct kern_target *kt; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); char strbuf[KSTRING], *buf; - int off, len; + off_t off; + size_t len; int error; - if (vp->v_type == VDIR) + if (ap->a_vp->v_type == VDIR) return (EOPNOTSUPP); - kt = VTOKERN(vp)->kf_kt; - -#ifdef KERNFS_DIAGNOSTIC - printf("kern_read %s\n", kt->kt_name); -#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(kfs, off, &buf, sizeof(strbuf), &len)) == 0) + error = uiomove(buf, len, uio); + return (error); } -int -kernfs_write(v) +static int +kernfs_default_xwrite(v) void *v; { struct vop_write_args /* { @@ -574,17 +958,11 @@ kernfs_write(v) int a_ioflag; struct ucred *a_cred; } */ *ap = v; - struct vnode *vp = ap->a_vp; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); struct uio *uio = ap->a_uio; - const struct kern_target *kt; int error, xlen; char strbuf[KSTRING]; - if (vp->v_type == VDIR) - return (EOPNOTSUPP); - - kt = VTOKERN(vp)->kf_kt; - if (uio->uio_offset != 0) return (EINVAL); @@ -597,7 +975,110 @@ kernfs_write(v) strbuf[xlen] = '\0'; xlen = strlen(strbuf); - return (kernfs_xwrite(kt, strbuf, xlen)); + return (kernfs_xwrite(kfs, strbuf, xlen)); +} + +int +kernfs_write(v) + void *v; +{ + struct vop_write_args /* { + struct vnode *a_vp; + struct uio *a_uio; + int a_ioflag; + struct ucred *a_cred; + } */ *ap = v; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); + + return kernfs_try_fileop(kfs->kfs_type, KERNFS_FILEOP_WRITE, v, 0); +} + +int +kernfs_ioctl(v) + void *v; +{ + struct vop_ioctl_args /* { + const struct vnodeop_desc *a_desc; + struct vnode *a_vp; + u_long a_command; + void *a_data; + int a_fflag; + struct ucred *a_cred; + struct proc *a_p; + } */ *ap = v; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); + + return kernfs_try_fileop(kfs->kfs_type, KERNFS_FILEOP_IOCTL, v, + EPASSTHROUGH); +} + +int +kernfs_mmap(v) + void *v; +{ + struct vop_mmap_args /* { + const struct vnodeop_desc *a_desc; + struct vnode *a_vp; + int a_fflags; + struct ucred *a_cred; + struct proc *a_p; + } */ *ap = v; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); + + return kernfs_try_fileop(kfs->kfs_type, KERNFS_FILEOP_MMAP, v, 0); +} + +static int +kernfs_setdirentfileno_kt(struct dirent *d, const struct kern_target *kt, + u_int32_t value, struct vop_readdir_args *ap) +{ + struct kernfs_node *kfs; + struct vnode *vp; + int error; + + if ((error = kernfs_allocvp(ap->a_vp->v_mount, &vp, kt->kt_tag, kt, + value)) != 0) + return error; + if (kt->kt_tag == KFSdevice) { + struct vattr va; + if ((error = VOP_GETATTR(vp, &va, ap->a_cred, + ap->a_uio->uio_segflg == UIO_USERSPACE ? + ap->a_uio->uio_procp : &proc0)) != 0) + return (error); + d->d_fileno = va.va_fileid; + } else { + kfs = VTOKERN(vp); + d->d_fileno = kfs->kfs_fileno; + } + vput(vp); + return 0; +} + +static int +kernfs_setdirentfileno(struct dirent *d, off_t entry, + struct kernfs_node *thisdir_kfs, const struct kern_target *parent_kt, + const struct kern_target *kt, struct vop_readdir_args *ap) +{ + const struct kern_target *ikt; + int error; + + switch (entry) { + case 0: + d->d_fileno = thisdir_kfs->kfs_fileno; + return 0; + case 1: + ikt = parent_kt; + break; + default: + ikt = kt; + break; + } + if (ikt != thisdir_kfs->kfs_kt) { + if ((error = kernfs_setdirentfileno_kt(d, ikt, 0, ap)) != 0) + return error; + } else + d->d_fileno = thisdir_kfs->kfs_fileno; + return 0; } int @@ -614,14 +1095,18 @@ kernfs_readdir(v) } */ *ap = v; struct uio *uio = ap->a_uio; struct dirent d; + struct kernfs_node *kfs = VTOKERN(ap->a_vp); const struct kern_target *kt; - off_t i; + const struct dyn_kern_target *dkt = NULL; + const struct kernfs_subdir *ks; + off_t i, j; int error; off_t *cookies = NULL; - int ncookies = 0, nc = 0; - - if (ap->a_vp->v_type != VDIR) - return (ENOTDIR); + int ncookies = 0, n; +#ifdef IPSEC + struct secasvar *sav, *sav2; + struct secpolicy *sp; +#endif if (uio->uio_resid < UIO_MX) return (EINVAL); @@ -630,50 +1115,281 @@ kernfs_readdir(v) error = 0; i = uio->uio_offset; - - if (i >= nkern_targets) - return 0; - - memset((caddr_t)&d, 0, UIO_MX); + memset(&d, 0, sizeof(d)); d.d_reclen = UIO_MX; + ncookies = uio->uio_resid / UIO_MX; - if (ap->a_ncookies) { - nc = uio->uio_resid / UIO_MX; - nc = min(nc, (nkern_targets - i)); - cookies = malloc(nc * sizeof(off_t), M_TEMP, M_WAITOK); - *ap->a_cookies = cookies; - } + switch (kfs->kfs_type) { + case KFSkern: + if (i >= nkern_targets) + return (0); - for (kt = &kern_targets[i]; - uio->uio_resid >= UIO_MX && i < nkern_targets; kt++, i++) { -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_readdir: i = %d\n", (int)i); -#endif + if (ap->a_ncookies) { + ncookies = min(ncookies, (nkern_targets - i)); + cookies = malloc(ncookies * sizeof(off_t), M_TEMP, + M_WAITOK); + *ap->a_cookies = cookies; + } - if (kt->kt_tag == KTT_DEVICE) { - dev_t *dp = kt->kt_data; - struct vnode *fvp; + n = 0; + for (; i < nkern_targets && uio->uio_resid >= UIO_MX; i++) { + if (i < static_nkern_targets) + kt = &kern_targets[i]; + else { + if (dkt == NULL) { + dkt = SIMPLEQ_FIRST(&dyn_kern_targets); + for (j = static_nkern_targets; j < i && + dkt != NULL; j++) + dkt = SIMPLEQ_NEXT(dkt, dkt_queue); + if (j != i) + break; + } else { + dkt = SIMPLEQ_NEXT(dkt, dkt_queue); + if (dkt == NULL) + break; + } + kt = &dkt->dkt_kt; + } + if (kt->kt_tag == KFSdevice) { + dev_t *dp = kt->kt_data; + struct vnode *fvp; + + if (*dp == NODEV || + !vfinddev(*dp, kt->kt_vtype, &fvp)) + continue; + } + d.d_namlen = kt->kt_namlen; + if ((error = kernfs_setdirentfileno(&d, i, kfs, + &kern_targets[0], kt, ap)) != 0) + break; + memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); + d.d_type = kt->kt_type; + if ((error = uiomove(&d, UIO_MX, uio)) != 0) + break; + if (cookies) + *cookies++ = i + 1; + n++; + } + ncookies = n; + break; - if (*dp == NODEV || !vfinddev(*dp, kt->kt_vtype, &fvp)) + case KFSroot: + if (i >= 2) + return 0; + + if (ap->a_ncookies) { + ncookies = min(ncookies, (2 - i)); + cookies = malloc(ncookies * sizeof(off_t), M_TEMP, + M_WAITOK); + *ap->a_cookies = cookies; + } + + n = 0; + for (; i < 2 && uio->uio_resid >= UIO_MX; i++) { + kt = &kern_targets[i]; + d.d_namlen = kt->kt_namlen; + d.d_fileno = KERNFS_FILENO(kt, kt->kt_tag, 0); + memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); + d.d_type = kt->kt_type; + if ((error = uiomove(&d, UIO_MX, uio)) != 0) + break; + if (cookies) + *cookies++ = i + 1; + n++; + } + ncookies = n; + break; + + case KFSsubdir: + ks = (struct kernfs_subdir *)kfs->kfs_kt->kt_data; + if (i >= ks->ks_nentries) + return (0); + + if (ap->a_ncookies) { + ncookies = min(ncookies, (ks->ks_nentries - i)); + cookies = malloc(ncookies * sizeof(off_t), M_TEMP, + M_WAITOK); + *ap->a_cookies = cookies; + } + + dkt = SIMPLEQ_FIRST(&ks->ks_entries); + for (j = 0; j < i && dkt != NULL; j++) + dkt = SIMPLEQ_NEXT(dkt, dkt_queue); + n = 0; + for (; i < ks->ks_nentries && uio->uio_resid >= UIO_MX; i++) { + if (i < 2) + kt = &subdir_targets[i]; + else { + /* check if ks_nentries lied to us */ + if (dkt == NULL) + break; + kt = &dkt->dkt_kt; + dkt = SIMPLEQ_NEXT(dkt, dkt_queue); + } + if (kt->kt_tag == KFSdevice) { + dev_t *dp = kt->kt_data; + struct vnode *fvp; + + if (*dp == NODEV || + !vfinddev(*dp, kt->kt_vtype, &fvp)) + continue; + } + d.d_namlen = kt->kt_namlen; + if ((error = kernfs_setdirentfileno(&d, i, kfs, + ks->ks_parent, kt, ap)) != 0) + break; + memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); + d.d_type = kt->kt_type; + if ((error = uiomove(&d, UIO_MX, uio)) != 0) + break; + if (cookies) + *cookies++ = i + 1; + n++; + } + ncookies = n; + break; + +#ifdef IPSEC + case KFSipsecsadir: + /* count SA in the system */ + n = 0; + TAILQ_FOREACH(sav, &satailq, tailq) { + for (sav2 = TAILQ_FIRST(&satailq); + sav2 != sav; + sav2 = TAILQ_NEXT(sav2, tailq)) { + if (sav->spi == sav2->spi) { + /* multiple SA with same SPI */ + break; + } + } + if (sav == sav2 || sav->spi != sav2->spi) + n++; + } + + if (i >= nipsecsa_targets + n) + return (0); + + if (ap->a_ncookies) { + ncookies = min(ncookies, (n - i)); + cookies = malloc(ncookies * sizeof(off_t), M_TEMP, + M_WAITOK); + *ap->a_cookies = cookies; + } + + n = 0; + for (; i < nipsecsa_targets && uio->uio_resid >= UIO_MX; i++) { + kt = &ipsecsa_targets[i]; + d.d_namlen = kt->kt_namlen; + if ((error = kernfs_setdirentfileno(&d, i, kfs, + &kern_targets[0], kt, ap)) != 0) + break; + memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); + d.d_type = kt->kt_type; + if ((error = uiomove(&d, UIO_MX, uio)) != 0) + break; + if (cookies) + *cookies++ = i + 1; + n++; + } + if (error) { + ncookies = n; + break; + } + + TAILQ_FOREACH(sav, &satailq, tailq) { + for (sav2 = TAILQ_FIRST(&satailq); + sav2 != sav; + sav2 = TAILQ_NEXT(sav2, tailq)) { + if (sav->spi == sav2->spi) { + /* multiple SA with same SPI */ + break; + } + } + if (sav != sav2 && sav->spi == sav2->spi) continue; + if (uio->uio_resid < UIO_MX) + break; + if ((error = kernfs_setdirentfileno_kt(&d, &ipsecsa_kt, + sav->spi, ap)) != 0) + break; + d.d_namlen = snprintf(d.d_name, sizeof(d.d_name), + "%u", ntohl(sav->spi)); + d.d_type = DT_REG; + if ((error = uiomove(&d, UIO_MX, uio)) != 0) + break; + if (cookies) + *cookies++ = i + 1; + n++; + i++; } + ncookies = n; + break; + + case KFSipsecspdir: + /* count SP in the system */ + n = 0; + TAILQ_FOREACH(sp, &sptailq, tailq) + n++; + + if (i >= nipsecsp_targets + n) + return (0); - d.d_fileno = i + 3; - d.d_namlen = kt->kt_namlen; - memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); - d.d_type = kt->kt_type; + if (ap->a_ncookies) { + ncookies = min(ncookies, (n - i)); + cookies = malloc(ncookies * sizeof(off_t), M_TEMP, + M_WAITOK); + *ap->a_cookies = cookies; + } - if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0) + n = 0; + for (; i < nipsecsp_targets && uio->uio_resid >= UIO_MX; i++) { + kt = &ipsecsp_targets[i]; + d.d_namlen = kt->kt_namlen; + if ((error = kernfs_setdirentfileno(&d, i, kfs, + &kern_targets[0], kt, ap)) != 0) + break; + memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1); + d.d_type = kt->kt_type; + if ((error = uiomove(&d, UIO_MX, uio)) != 0) + break; + if (cookies) + *cookies++ = i + 1; + n++; + } + if (error) { + ncookies = n; break; - if (cookies) { - *cookies++ = i + 1; - ncookies++; } + + TAILQ_FOREACH(sp, &sptailq, tailq) { + if (uio->uio_resid < UIO_MX) + break; + if ((error = kernfs_setdirentfileno_kt(&d, &ipsecsp_kt, + sp->id, ap)) != 0) + break; + d.d_namlen = snprintf(d.d_name, sizeof(d.d_name), + "%u", sp->id); + d.d_type = DT_REG; + if ((error = uiomove(&d, UIO_MX, uio)) != 0) + break; + if (cookies) + *cookies++ = i + 1; + n++; + i++; + } + ncookies = n; + break; +#endif + + default: + error = ENOTDIR; + break; } if (ap->a_ncookies) { if (error) { - free(*ap->a_cookies, M_TEMP); + if (cookies) + free(*ap->a_cookies, M_TEMP); *ap->a_ncookies = 0; *ap->a_cookies = NULL; } else @@ -693,16 +1409,35 @@ kernfs_inactive(v) struct proc *a_p; } */ *ap = v; struct vnode *vp = ap->a_vp; - -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_inactive(%p)\n", vp); + const struct kernfs_node *kfs = VTOKERN(ap->a_vp); +#ifdef IPSEC + struct mbuf *m; + struct secpolicy *sp; #endif - /* - * Clear out the v_type field to avoid - * nasty things happening in vgone(). - */ + VOP_UNLOCK(vp, 0); - vp->v_type = VNON; + switch (kfs->kfs_type) { +#ifdef IPSEC + case KFSipsecsa: + m = key_setdumpsa_spi(htonl(kfs->kfs_value)); + if (m) + m_freem(m); + else + vgone(vp); + break; + case KFSipsecsp: + sp = key_getspbyid(kfs->kfs_value); + if (sp) + key_freesp(sp); + else { + /* should never happen as we hold a refcnt */ + vgone(vp); + } + break; +#endif + default: + break; + } return (0); } @@ -713,16 +1448,8 @@ kernfs_reclaim(v) struct vop_reclaim_args /* { struct vnode *a_vp; } */ *ap = v; - struct vnode *vp = ap->a_vp; -#ifdef KERNFS_DIAGNOSTIC - printf("kernfs_reclaim(%p)\n", vp); -#endif - if (vp->v_data) { - FREE(vp->v_data, M_TEMP); - vp->v_data = 0; - } - return (0); + return (kernfs_freevp(ap->a_vp)); } /*