From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:32:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CA991065677; Sun, 19 Jun 2011 09:32:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11AC5106566B for ; Sun, 19 Jun 2011 09:32:18 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F2BEB8FC14 for ; Sun, 19 Jun 2011 09:32:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9WHrB070346 for ; Sun, 19 Jun 2011 09:32:17 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9WHwb070343 for perforce@freebsd.org; Sun, 19 Jun 2011 09:32:17 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:32:17 GMT Message-Id: <201106190932.p5J9WHwb070343@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:32:18 -0000 http://p4web.freebsd.org/@@194955?ac=10 Change 194955 by ilya@ilya_triton2011 on 2011/06/19 09:31:44 Enable commented sysctls Fix fuse_device_clone rename Add missing isbzero function Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#7 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#3 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#8 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#4 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#5 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#3 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#5 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#14 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#7 (text+ko) ==== @@ -225,10 +225,6 @@ void fprettyprint(struct fuse_iov *fiov, size_t dlen); #endif -#if _DEBUG || _DEBUG2G || _DEBUG3G || defined(INVARIANTS) || FUSELIB_CONFORM_BIOREAD -int isbzero(void *buf, size_t len); -#endif - #if _DEBUG || _DEBUG2G || _DEBUG3G #include ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#3 (text+ko) ==== @@ -29,6 +29,10 @@ #include "fuse_ipc.h" #include "fuse_node.h" +static uint64_t fuse_fh_upcall_count = 0; +SYSCTL_QUAD(_vfs_fuse, OID_AUTO, fh_upcall_count, CTLFLAG_RD, + &fuse_fh_upcall_count, 0, ""); + int fuse_filehandle_get(struct vnode *vp, struct thread *td, struct ucred *cred, fufh_type_t fufh_type) { ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#8 (text+ko) ==== @@ -39,9 +39,11 @@ #include "fuse_ipc.h" #include "fuse_node.h" #include "fuse_file.h" -// #include "fuse_nodehash.h" #include "fuse_param.h" -// #include "fuse_sysctl.h" + +#ifdef ZERO_PAD_INCOMPLETE_BUFS +static int isbzero(void *buf, size_t len); +#endif /* access */ @@ -358,7 +360,7 @@ break; } -#if FUSELIB_CONFORM_BIOREAD +#ifdef ZERO_PAD_INCOMPLETE_BUFS if (isbzero(buf, FUSE_NAME_OFFSET)) { err = -1; break; @@ -711,3 +713,19 @@ fuse_insert_callback(fdi.tick, fuse_internal_init_callback); fuse_insert_message(fdi.tick); } + +#ifdef ZERO_PAD_INCOMPLETE_BUFS +static int +isbzero(void *buf, size_t len) +{ + int i; + + for (i = 0; i < len; i++) + { + if (((char *)buf)[i]) + return (0); + } + + return (1); +} +#endif ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#4 (text+ko) ==== @@ -52,9 +52,9 @@ SYSCTL_NODE(_vfs, OID_AUTO, fuse, CTLFLAG_RW, 0, "FUSE tunables"); SYSCTL_STRING(_vfs_fuse, OID_AUTO, fuse4bsd_version, CTLFLAG_RD, FUSE4BSD_VERSION, 0, "fuse4bsd version"); -static int maxfreetickets = 1024; -SYSCTL_INT(_vfs_fuse, OID_AUTO, maxfreetickets, CTLFLAG_RW, - &maxfreetickets, 0, "limit for number of free tickets kept"); +static int fuse_max_freetickets = 1024; +SYSCTL_INT(_vfs_fuse, OID_AUTO, max_freetickets, CTLFLAG_RW, + &fuse_max_freetickets, 0, "limit for number of free tickets kept"); static long fuse_iov_permanent_bufsize = 1 << 19; SYSCTL_LONG(_vfs_fuse, OID_AUTO, iov_permanent_bufsize, CTLFLAG_RW, &fuse_iov_permanent_bufsize, 0, @@ -121,10 +121,6 @@ fiov_adjust(fiov, 0); } -/* <== fuse_iov methods */ - -/* fuse_ticket methods ==> */ - /* * Tickets are carriers of communication with a fuse daemon. * Tickets have a unique id, which should be kept unique @@ -150,7 +146,6 @@ * cache) */ - static struct fuse_ticket * fticket_alloc(struct fuse_data *data) { @@ -488,8 +483,8 @@ mtx_lock(&tick->tk_data->ticket_mtx); - if (maxfreetickets >= 0 && - maxfreetickets <= tick->tk_data->freeticket_counter) { + if (fuse_max_freetickets >= 0 && + fuse_max_freetickets <= tick->tk_data->freeticket_counter) { die = 1; } else { mtx_unlock(&tick->tk_data->ticket_mtx); @@ -753,12 +748,6 @@ ihead->gid = cred->cr_rgid; } -/******************** - * - * >>> Callback handlers - * - ********************/ - /* * fuse_standard_handler just pulls indata and wakes up pretender. * Doesn't try to interpret data, that's left for the pretender. ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ #endif -extern void fusedev_clone(void *arg, struct ucred *cred, char *name, +extern void fuse_device_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev); extern struct vfsops fuse_vfsops; @@ -86,7 +86,7 @@ #ifdef USE_FUSE_LOCK mtx_init(&fuse_mtx, "fuse_mtx", NULL, MTX_DEF); #endif - eh_tag = EVENTHANDLER_REGISTER(dev_clone, fusedev_clone, 0, + eh_tag = EVENTHANDLER_REGISTER(dev_clone, fuse_device_clone, 0, 1000); if (eh_tag == NULL) { clone_cleanup(&fuseclones); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#3 (text+ko) ==== @@ -34,6 +34,8 @@ #include #include +MALLOC_DEFINE(M_FUSEVN, "fuse_vnode", "fuse vnode private data"); + static void fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, uint64_t nodeid, enum vtype vtyp) ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#5 (text+ko) ==== @@ -68,8 +68,6 @@ } } -MALLOC_DECLARE(M_FUSEVN); - struct get_filehandle_param { enum fuse_opcode opcode; uint8_t do_gc:1; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#14 (text+ko) ==== @@ -105,8 +105,13 @@ .vop_unlock = fuse_vnop_unlock, }; -MALLOC_DEFINE(M_FUSEVN, "fuse_vnode", "fuse vnode private data"); -MALLOC_DEFINE(M_FUSEFH, "fuse_filehandles", "buffer for fuse filehandles"); +static uint64_t fuse_lookup_cache_hits = 0; +SYSCTL_QUAD(_vfs_fuse, OID_AUTO, lookup_cache_hits, CTLFLAG_RD, + &fuse_lookup_cache_hits, 0, ""); + +static uint64_t fuse_lookup_cache_misses = 0; +SYSCTL_QUAD(_vfs_fuse, OID_AUTO, lookup_cache_misses, CTLFLAG_RD, + &fuse_lookup_cache_misses, 0, ""); int fuse_pbuf_freecnt = -1; @@ -650,15 +655,11 @@ switch (err) { case -1: /* positive match */ -#ifdef XXXIP fuse_lookup_cache_hits++; -#endif return 0; case 0: /* no match in cache */ -#ifdef XXXIP fuse_lookup_cache_misses++; -#endif break; case ENOENT: /* negative match */ @@ -1240,13 +1241,12 @@ return EBADF; } -#ifdef XXXIP + /* Sanity check the uio data. */ - if ((uio_iovcnt(uio) > 1) || + if ( /* XXXIP (uio_iovcnt(uio) > 1) || */ (uio_resid(uio) < (int)sizeof(struct dirent))) { return (EINVAL); } -#endif fvdat = VTOFUD(vp); @@ -1363,7 +1363,6 @@ } cache_purge(vp); - /* XXXIP TODO */ vfs_hash_remove(vp); vnode_destroy_vobject(vp); fuse_vnode_destroy(vp); @@ -1620,7 +1619,7 @@ facp.facc_flags &= ~FACCESS_XQUERIES; - if (err && ! (fsai->valid & ~(FATTR_ATIME | FATTR_MTIME)) && + if (err && !(fsai->valid & ~(FATTR_ATIME | FATTR_MTIME)) && vap->va_vaflags & VA_UTIMES_NULL) { err = fuse_internal_access(vp, VWRITE, cred, td, &facp); } From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:33:24 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 545401065673; Sun, 19 Jun 2011 09:33:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15ADB106566B for ; Sun, 19 Jun 2011 09:33:24 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 028E78FC0C for ; Sun, 19 Jun 2011 09:33:24 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9XNf3070395 for ; Sun, 19 Jun 2011 09:33:23 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9XNit070392 for perforce@freebsd.org; Sun, 19 Jun 2011 09:33:23 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:33:23 GMT Message-Id: <201106190933.p5J9XNit070392@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:33:24 -0000 http://p4web.freebsd.org/@@194956?ac=10 Change 194956 by ilya@ilya_triton2011 on 2011/06/19 09:32:34 Merge fuse_internal_access, change arguments order Change fdisp_make arguments order to same as macfuse Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#9 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#5 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#7 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#15 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#9 (text+ko) ==== @@ -47,154 +47,112 @@ /* access */ -static __inline int fuse_check_spyable(struct fuse_dispatcher *fdip, - struct mount *mp, struct thread *td, - struct ucred *cred); static __inline int fuse_match_cred(struct ucred *daemoncred, struct ucred *usercred); int fuse_internal_access(struct vnode *vp, mode_t mode, - struct ucred *cred, + struct fuse_access_param *facp, struct thread *td, - struct fuse_access_param *facp) + struct ucred *cred) { int err = 0; + uint32_t mask = 0; + int dataflag; + int vtype; + struct mount *mp; struct fuse_dispatcher fdi; + struct fuse_access_in *fai; + struct fuse_data *data; - /* - * Disallow write attempts on read-only file systems; unless the file - * is a socket, fifo, or a block or character device resident on the - * file system. - */ + /* NOT YET DONE */ + /* If this vnop gives you trouble, just return 0 here for a lazy kludge. */ + // return 0; - DEBUG("ro? %#x vp #%llu mode %#x\n", - vp->v_mount->mnt_flag & MNT_RDONLY, VTOILLU(vp), mode); + fuse_trace_printf_func(); - RECTIFY_TDCR(td, cred); + mp = vnode_mount(vp); + vtype = vnode_vtype(vp); - if (mode & VWRITE) { - switch (vp->v_type) { - case VDIR: - case VLNK: - case VREG: - if (vp->v_mount->mnt_flag & MNT_RDONLY) { - DEBUG("no write access (read-only fs)\n"); - return (EROFS); - } - break; - default: - break; - } - } + data = fusefs_get_data(mp); + dataflag = data->dataflag; - bzero(&fdi, sizeof(fdi)); - if (vp->v_vflag & VV_ROOT && ! (facp->facc_flags & FACCESS_NOCHECKSPY)) { - if ((err = fuse_check_spyable(&fdi, vp->v_mount, td, cred))) - return (err); - facp->facc_flags |= FACCESS_NOCHECKSPY; + if ((mode & VWRITE) && vfs_isrdonly(mp)) { + return EACCES; } - if (fusefs_get_data(vp->v_mount)->dataflag & FSESS_DEFAULT_PERMISSIONS || - /* - * According to Linux code, we fall back to in-kernel check - * when it comes to executing a file - */ - (vp->v_type == VREG && mode == VEXEC)) { - /* We are to do the check in-kernel */ - - if (! (facp->facc_flags & FACCESS_VA_VALID)) { - err = VOP_GETATTR(vp, VTOVA(vp), cred); - if (err) - return (err); - facp->facc_flags |= FACCESS_VA_VALID; + // Unless explicitly permitted, deny everyone except the fs owner. + if (vnode_isvroot(vp) && !(facp->facc_flags & FACCESS_NOCHECKSPY)) { + if (!(dataflag & FSESS_DAEMON_CAN_SPY)) { + int denied = fuse_match_cred(data->daemoncred, + cred); + if (denied) { + return EACCES; } + } + facp->facc_flags |= FACCESS_NOCHECKSPY; + } - err = vaccess(VTOVA(vp)->va_type, - VTOVA(vp)->va_mode, - VTOVA(vp)->va_uid, - VTOVA(vp)->va_gid, - mode, cred, NULL); + if (!(facp->facc_flags & FACCESS_DO_ACCESS)) { + return 0; + } - if (err) - return (err); + if (((vtype == VREG) && (mode & VEXEC))) { +#ifdef NEED_MOUNT_ARGUMENT_FOR_THIS + // Let the kernel handle this through open/close heuristics. + return ENOTSUP; +#else + // Let the kernel handle this. + return 0; +#endif + } - if (facp->facc_flags & FACCESS_STICKY) { - if (vp->v_type == VDIR && VTOVA(vp)->va_mode & S_ISTXT && - mode == VWRITE) { - if (cred->cr_uid != facp->xuid && - cred->cr_uid != VTOVA(vp)->va_uid) - err = priv_check_cred(cred, - PRIV_VFS_ADMIN, - 0); - } - /* - * We return here because this flags is exlusive - * with the others - */ - KASSERT(facp->facc_flags == FACCESS_STICKY, - ("sticky access check comes in mixed")); - return (err); - } + if (fusefs_get_data(mp)->dataflag & FSESS_NOACCESS) { + // Let the kernel handle this. + return 0; + } - if (mode != VADMIN) - return (err); + if (dataflag & FSESS_DEFAULT_PERMISSIONS) { + // Let the kernel handle this. + return 0; + } - if (facp->facc_flags & FACCESS_CHOWN) { - if ((cred->cr_uid != facp->xuid && - facp->xuid != (uid_t)VNOVAL) || - (cred->cr_gid != facp->xgid && - facp->xgid != (gid_t)VNOVAL && - ! groupmember(facp->xgid, cred))) - err = priv_check_cred(cred, PRIV_VFS_CHOWN, 0); - if (err) - return (err); - } + if ((mode & VADMIN) != 0) { + err = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); + if (err) { + return err; + } + } - if (facp->facc_flags & FACCESS_SETGID) { - gid_t sgid = facp->xgid; + if ((mode & (VWRITE | VAPPEND | VADMIN)) != 0) { + mask |= W_OK; + } + if ((mode & VREAD) != 0) { + mask |= R_OK; + } + if ((mode & VEXEC) != 0) { + mask |= X_OK; + } - if (sgid == (gid_t)VNOVAL) - sgid = VTOVA(vp)->va_gid; + bzero(&fdi, sizeof(fdi)); - if (! groupmember(sgid, cred)) - err = priv_check_cred(cred, PRIV_VFS_SETGID, 0); - return (err); - } + fdisp_init(&fdi, sizeof(*fai)); + fdisp_make_vp(&fdi, FUSE_ACCESS, vp, td, cred); - } else { -#if FUSE_HAS_ACCESS - struct fuse_access_in *fai; + fai = fdi.indata; + fai->mask = F_OK; + fai->mask |= mask; - if (! (facp->facc_flags & FACCESS_DO_ACCESS)) - return (0); + if (!(err = fdisp_wait_answ(&fdi))) { + fuse_ticket_drop(fdi.tick); + } - if (fusefs_get_data(vp->v_mount)->dataflag & FSESS_NOACCESS) - return (0); - - fdisp_init(&fdi, sizeof(*fai)); - fdisp_make_vp(&fdi, FUSE_ACCESS, vp, td, cred); - - fai = fdi.indata; - - fai->mask = F_OK; - if (mode & VREAD) - fai->mask |= R_OK; - if (mode & VWRITE) - fai->mask |= W_OK; - if (mode & VEXEC) - fai->mask |= X_OK; + if (err == ENOSYS) { + fusefs_get_data(mp)->dataflag |= FSESS_NOACCESS; + err = 0; // ENOTSUP; + } - if (! (err = fdisp_wait_answ(&fdi))) - fuse_ticket_drop(fdi.tick); - - if (err == ENOSYS) { - fusefs_get_data(vp->v_mount)->dataflag |= FSESS_NOACCESS; - err = 0; - } -#endif - } return err; } @@ -220,14 +178,6 @@ return (EPERM); } - -static __inline int -fuse_check_spyable(struct fuse_dispatcher *fdip, struct mount *mp, - struct thread *td, struct ucred *cred) -{ - return (0); -} - /* fsync */ int @@ -487,7 +437,7 @@ int err = 0; fdisp_init(&fdi, sizeof(*fri) + fcnp->cn_namelen + tcnp->cn_namelen + 2); - fdisp_make_vp(&fdi, FUSE_RENAME, fdvp, curthread, NULL); + fdisp_make_vp(&fdi, FUSE_RENAME, fdvp, tcnp->cn_thread, tcnp->cn_cred); fri = fdi.indata; fri->newdir = VTOI(tdvp); @@ -528,9 +478,8 @@ fdip->iosize = bufsize + cnp->cn_namelen + 1; - fdisp_make(fdip, mp, op, dnid, curthread, NULL); + fdisp_make(fdip, op, mp, dnid, curthread, NULL); memcpy(fdip->indata, buf, bufsize); - memcpy((char *)fdip->indata + bufsize, cnp->cn_nameptr, cnp->cn_namelen); ((char *)fdip->indata)[bufsize + cnp->cn_namelen] = '\0'; @@ -632,7 +581,7 @@ */ fdisp_init(fdip, sizeof(*ffi)); - fdisp_make(fdip, mp, FUSE_FORGET, nodeid, td, cred); + fdisp_make(fdip, FUSE_FORGET, mp, nodeid, td, cred); ffi = fdip->indata; ffi->nlookup = nlookup; @@ -703,7 +652,7 @@ struct fuse_dispatcher fdi; fdisp_init(&fdi, sizeof(*fiii)); - fdisp_make(&fdi, data->mp, FUSE_INIT, 0, td, NULL); + fdisp_make(&fdi, FUSE_INIT, data->mp, 0, td, NULL); fiii = fdi.indata; fiii->major = FUSE_KERNEL_VERSION; fiii->minor = FUSE_KERNEL_MINOR_VERSION; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#10 (text+ko) ==== @@ -102,9 +102,9 @@ int fuse_internal_access(struct vnode *vp, mode_t mode, - struct ucred *cred, + struct fuse_access_param *facp, struct thread *td, - struct fuse_access_param *facp); + struct ucred *cred); /* attributes */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#5 (text+ko) ==== @@ -789,8 +789,8 @@ void fdisp_make_pid(struct fuse_dispatcher *fdip, + enum fuse_opcode op, struct mount *mp, - enum fuse_opcode op, uint64_t nid, pid_t pid, struct ucred *cred) @@ -818,15 +818,15 @@ void fdisp_make(struct fuse_dispatcher *fdip, + enum fuse_opcode op, struct mount *mp, - enum fuse_opcode op, uint64_t nid, struct thread *td, struct ucred *cred) { RECTIFY_TDCR(td, cred); - return (fdisp_make_pid(fdip, mp, op, nid, td->td_proc->p_pid, cred)); + return (fdisp_make_pid(fdip, op, mp, nid, td->td_proc->p_pid, cred)); } void @@ -838,7 +838,7 @@ { debug_printf("fdip=%p, op=%d, vp=%p, context=%p\n", fdip, op, vp, context); RECTIFY_TDCR(td, cred); - return (fdisp_make_pid(fdip, vnode_mount(vp), op, VTOI(vp), + return (fdisp_make_pid(fdip, op, vnode_mount(vp), VTOI(vp), td->td_proc->p_pid, cred)); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#7 (text+ko) ==== @@ -279,12 +279,12 @@ } -void fdisp_make(struct fuse_dispatcher *fdip, struct mount *mp, - enum fuse_opcode op, uint64_t nid, struct thread *td, +void fdisp_make(struct fuse_dispatcher *fdip, enum fuse_opcode op, + struct mount *mp, uint64_t nid, struct thread *td, struct ucred *cred); -void fdisp_make_pid(struct fuse_dispatcher *fdip, struct mount *mp, - enum fuse_opcode op, uint64_t nid, pid_t pid, +void fdisp_make_pid(struct fuse_dispatcher *fdip, enum fuse_opcode op, + struct mount *mp, uint64_t nid, pid_t pid, struct ucred *cred); void fdisp_make_vp(struct fuse_dispatcher *fdip, enum fuse_opcode op, @@ -307,7 +307,7 @@ struct mount *mp) { fdisp_init(fdip, 0); - fdisp_make(fdip, mp, FUSE_STATFS, FUSE_ROOT_ID, NULL, NULL); + fdisp_make(fdip, FUSE_STATFS, mp, FUSE_ROOT_ID, NULL, NULL); return (fdisp_wait_answ(fdip)); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#12 (text+ko) ==== @@ -303,7 +303,7 @@ } fdisp_init(&fdi, 0); - fdisp_make(&fdi, mp, FUSE_DESTROY, 0, td, NULL); + fdisp_make(&fdi, FUSE_DESTROY, mp, 0, td, NULL); err = fdisp_wait_answ(&fdi); if (!err) { fuse_ticket_drop(fdi.tick); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#15 (text+ko) ==== @@ -151,7 +151,7 @@ facp.facc_flags |= FACCESS_DO_ACCESS; } - return fuse_internal_access(vp, ap->a_accmode, ap->a_cred, ap->a_td, &facp); + return fuse_internal_access(vp, ap->a_accmode, &facp, ap->a_td, ap->a_cred); } /* @@ -250,7 +250,7 @@ goto good_old; } - fdisp_make(fdip, vnode_mount(dvp), FUSE_CREATE, parentnid, td, cred); + fdisp_make(fdip, FUSE_CREATE, vnode_mount(dvp), parentnid, td, cred); foi = fdip->indata; foi->mode = mode; @@ -308,7 +308,7 @@ uint64_t fh_id = ((struct fuse_open_out *)(feo + 1))->fh; fdisp_init(fdip, sizeof(*fri)); - fdisp_make(fdip, mp, FUSE_RELEASE, nodeid, td, cred); + fdisp_make(fdip, FUSE_RELEASE, mp, nodeid, td, cred); fri = fdip->indata; fri->fh = fh_id; fri->flags = OFLAGS(mode); @@ -632,7 +632,7 @@ bzero(&facp, sizeof(facp)); if (vnode_isvroot(dvp)) { /* early permission check hack */ - if ((err = fuse_internal_access(dvp, VEXEC, cred, td, &facp))) { + if ((err = fuse_internal_access(dvp, VEXEC, &facp, td, cred))) { return err; } } @@ -675,7 +675,7 @@ op = FUSE_LOOKUP; calldaemon: - fdisp_make(&fdi, vnode_mount(dvp), op, nid, td, cred); + fdisp_make(&fdi, op, vnode_mount(dvp), nid, td, cred); if (op == FUSE_LOOKUP) { memcpy(fdi.indata, cnp->cn_nameptr, cnp->cn_namelen); @@ -781,7 +781,7 @@ */ facp.xuid = fattr->uid; facp.facc_flags |= FACCESS_STICKY; - err = fuse_internal_access(dvp, VWRITE, cred, td, &facp); + err = fuse_internal_access(dvp, VWRITE, &facp, td, cred); facp.facc_flags &= ~FACCESS_XQUERIES; if (err) { @@ -973,7 +973,7 @@ err = ENOTDIR; if (!err && !vnode_mountedhere(*vpp)) { - err = fuse_internal_access(*vpp, VEXEC, cred, td, &facp); + err = fuse_internal_access(*vpp, VEXEC, &facp, td, cred); } if (err) { @@ -1621,7 +1621,7 @@ if (err && !(fsai->valid & ~(FATTR_ATIME | FATTR_MTIME)) && vap->va_vaflags & VA_UTIMES_NULL) { - err = fuse_internal_access(vp, VWRITE, cred, td, &facp); + err = fuse_internal_access(vp, VWRITE, &facp, td, cred); } if (err) { From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:35:35 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B5871065672; Sun, 19 Jun 2011 09:35:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DD2B106566C for ; Sun, 19 Jun 2011 09:35:35 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 21F048FC12 for ; Sun, 19 Jun 2011 09:35:35 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9ZZjD070454 for ; Sun, 19 Jun 2011 09:35:35 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9ZYKQ070451 for perforce@freebsd.org; Sun, 19 Jun 2011 09:35:34 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:35:34 GMT Message-Id: <201106190935.p5J9ZYKQ070451@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:35:35 -0000 http://p4web.freebsd.org/@@194957?ac=10 Change 194957 by ilya@ilya_triton2011 on 2011/06/19 09:35:01 Create vobject. Fix typo in fuse_io_dispatch While faking vfs_getattr(), changed to return a non-zero block size. (macfuse rev 63) Use cnp->cn_thread and cnp->cn_cred when available Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#9 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#16 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#10 (text+ko) ==== @@ -393,7 +393,7 @@ debug_printf("dvp=%p, cnp=%p, op=%d\n", vp, cnp, op); fdisp_init(&fdi, cnp->cn_namelen + 1); - fdisp_make_vp(&fdi, op, dvp, curthread, NULL); + fdisp_make_vp(&fdi, op, dvp, cnp->cn_thread, cnp->cn_cred); memcpy(fdi.indata, cnp->cn_nameptr, cnp->cn_namelen); ((char *)fdi.indata)[cnp->cn_namelen] = '\0'; @@ -478,7 +478,7 @@ fdip->iosize = bufsize + cnp->cn_namelen + 1; - fdisp_make(fdip, op, mp, dnid, curthread, NULL); + fdisp_make(fdip, op, mp, dnid, cnp->cn_thread, cnp->cn_cred); memcpy(fdip->indata, buf, bufsize); memcpy((char *)fdip->indata + bufsize, cnp->cn_nameptr, cnp->cn_namelen); ((char *)fdip->indata)[bufsize + cnp->cn_namelen] = '\0'; @@ -512,7 +512,7 @@ err = fuse_vnode_get(mp, feo->nodeid, dvp, vpp, cnp, vtyp, 0); if (err) { - fuse_internal_forget_send(mp, curthread, NULL, feo->nodeid, 1, fdip); + fuse_internal_forget_send(mp, cnp->cn_thread, cnp->cn_cred, feo->nodeid, 1, fdip); return err; } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#9 (text+ko) ==== @@ -112,7 +112,7 @@ err = fuse_io_filehandle_get(vp, (uio->uio_rw == UIO_READ), cred, &fufh); - if (!err) + if (err) return (err); bzero(&fioda, sizeof(fioda)); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#13 (text+ko) ==== @@ -21,6 +21,7 @@ #include #include "fuse.h" +#include "fuse_param.h" #include "fuse_node.h" #include "fuse_ipc.h" #include "fuse_internal.h" @@ -394,7 +395,7 @@ sbp->f_files = 0; sbp->f_ffree = 0; sbp->f_namemax = 0; - sbp->f_bsize = 0; + sbp->f_bsize = FUSE_DEFAULT_BLOCKSIZE; return (0); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#16 (text+ko) ==== @@ -1169,6 +1169,11 @@ } ok: + if (vnode_vtype(vp) == VREG) { + /* XXXIP prevent getattr, by using cached node size */ + vnode_create_vobject(vp, 0, td); + } + { /* * Doing this here because when a vnode goes inactive, no-cache and From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:36:41 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F5201065673; Sun, 19 Jun 2011 09:36:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 012AB106566B for ; Sun, 19 Jun 2011 09:36:41 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E33568FC08 for ; Sun, 19 Jun 2011 09:36:40 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9aems070486 for ; Sun, 19 Jun 2011 09:36:40 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9aemB070483 for perforce@freebsd.org; Sun, 19 Jun 2011 09:36:40 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:36:40 GMT Message-Id: <201106190936.p5J9aemB070483@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:36:41 -0000 http://p4web.freebsd.org/@@194958?ac=10 Change 194958 by ilya@ilya_triton2011 on 2011/06/19 09:36:00 Remove parent vnode reference from fuse node Set parent_nid in fuse_vnode_get Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#4 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#6 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#17 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#4 (text+ko) ==== @@ -160,6 +160,11 @@ return err; } + if (dvp != NULL && vnode_vtype(*vpp) == VDIR) { + MPASS((cnp->cn_flags & ISDOTDOT) == 0); + MPASS(!(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')); + VTOFUD(*vpp)->parent_nid = VTOI(dvp); + } if (cnp != NULL) { cache_enter(dvp, *vpp, cnp); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#6 (text+ko) ==== @@ -41,9 +41,6 @@ */ struct sx truncatelock; - struct vnode *c_vp; - /* XXXIP reference is very likely to be stale, it's not updated in rename() */ - struct vnode *parent; off_t filesize; off_t newfilesize; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#17 (text+ko) ==== @@ -601,11 +601,10 @@ int err = 0; int lookup_err = 0; struct vnode *vp = NULL; - struct vnode *pdp = NULL; struct fuse_attr *fattr = NULL; struct fuse_dispatcher fdi; enum fuse_opcode op; - uint64_t nid, parent_nid; + uint64_t nid; struct fuse_access_param facp; uint64_t size = 0; @@ -638,15 +637,15 @@ } if (flags & ISDOTDOT) { - pdp = VTOFUD(dvp)->parent; - nid = VTOI(pdp); - parent_nid = VTOFUD(dvp)->parent_nid; + nid = VTOFUD(dvp)->parent_nid; + if (nid == 0) { + return ENOENT; + } fdisp_init(&fdi, 0); op = FUSE_GETATTR; goto calldaemon; } else if (cnp->cn_namelen == 1 && *(cnp->cn_nameptr) == '.') { nid = VTOI(dvp); - parent_nid = VTOFUD(dvp)->parent_nid; fdisp_init(&fdi, 0); op = FUSE_GETATTR; goto calldaemon; @@ -670,7 +669,6 @@ } nid = VTOI(dvp); - parent_nid = VTOI(dvp); fdisp_init(&fdi, cnp->cn_namelen + 1); op = FUSE_LOOKUP; @@ -867,8 +865,20 @@ } if (flags & ISDOTDOT) { - vref(pdp); - *vpp = pdp; + int ltype; + + ltype = VOP_ISLOCKED(dvp); + VOP_UNLOCK(dvp, 0); + err = fuse_vnode_get(vnode_mount(dvp), + nid, + NULL, + &vp, + cnp, + IFTOVT(fattr->mode), + 0); + vn_lock(dvp, ltype | LK_RETRY); + vref(vp); + *vpp = vp; } else if (nid == VTOI(dvp)) { vref(dvp); *vpp = dvp; @@ -884,7 +894,7 @@ goto out; } if (vnode_vtype(vp) == VDIR) { - VTOFUD(vp)->parent = dvp; + VTOFUD(vp)->parent_nid = VTOI(dvp); //SETPARENT(vp, dvp); } *vpp = vp; From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:37:48 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E786C106567A; Sun, 19 Jun 2011 09:37:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 914C41065672 for ; Sun, 19 Jun 2011 09:37:47 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7781C8FC12 for ; Sun, 19 Jun 2011 09:37:47 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9blD6070533 for ; Sun, 19 Jun 2011 09:37:47 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9blAV070530 for perforce@freebsd.org; Sun, 19 Jun 2011 09:37:47 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:37:47 GMT Message-Id: <201106190937.p5J9blAV070530@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:37:48 -0000 http://p4web.freebsd.org/@@194960?ac=10 Change 194960 by ilya@ilya_triton2011 on 2011/06/19 09:37:19 Change node creator to thread id, use &fvdat->creator as msleep ident Set create flags to O_CREAT | O_RDWR Cache name if MAKEENTRY flag set Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#5 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#7 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#18 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#5 (text+ko) ==== @@ -46,6 +46,7 @@ } vp->v_type = vtyp; vp->v_data = fvdat; + fvdat->creator = curthread->td_tid; mtx_init(&fvdat->createlock, "fuse node create mutex", NULL, MTX_DEF); sx_init(&fvdat->nodelock, "fuse node sx lock"); sx_init(&fvdat->truncatelock, "fuse node truncate sx lock"); @@ -165,10 +166,9 @@ MPASS(!(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')); VTOFUD(*vpp)->parent_nid = VTOI(dvp); } - if (cnp != NULL) { + if (cnp != NULL && (cnp->cn_flags & MAKEENTRY) != 0) { cache_enter(dvp, *vpp, cnp); } - VTOFUD(*vpp)->nlookup++; return 0; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#7 (text+ko) ==== @@ -21,7 +21,7 @@ uint64_t parent_nid; struct mtx createlock; - void *creator; + lwpid_t creator; /* XXX: Clean up this multi-flag nonsense. Really. */ int flag; int flags; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#18 (text+ko) ==== @@ -254,7 +254,7 @@ foi = fdip->indata; foi->mode = mode; - foi->flags = O_RDWR; // XXX: We /always/ creat() like this. + foi->flags = O_CREAT | O_RDWR; memcpy((char *)fdip->indata + sizeof(*foi), cnp->cn_nameptr, cnp->cn_namelen); @@ -342,8 +342,6 @@ #endif } - cache_enter(dvp, *vpp, cnp); - return (0); undo: @@ -1114,7 +1112,7 @@ mtx_lock(&fvdat->createlock); if (fvdat->flag & FN_CREATING) { // check again - if (fvdat->creator == curthread) { + if (fvdat->creator == curthread->td_tid) { /* * For testing the race condition we want to prevent here, @@ -1141,11 +1139,11 @@ fvdat->flag &= ~FN_CREATING; mtx_unlock(&fvdat->createlock); - wakeup((caddr_t)fvdat->creator); // wake up all + wakeup((caddr_t)&fvdat->creator); // wake up all goto ok; /* return 0 */ } else { printf("contender going to sleep\n"); - error = msleep(fvdat->creator, &fvdat->createlock, + error = msleep(&fvdat->creator, &fvdat->createlock, PDROP | PINOD | PCATCH, "fuse_open", 0); /* * msleep will drop the mutex. since we have PDROP specified, From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:38:53 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DAA81065670; Sun, 19 Jun 2011 09:38:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21F4E106564A for ; Sun, 19 Jun 2011 09:38:53 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 101408FC12 for ; Sun, 19 Jun 2011 09:38:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9cq4w070573 for ; Sun, 19 Jun 2011 09:38:52 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9cqgG070570 for perforce@freebsd.org; Sun, 19 Jun 2011 09:38:52 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:38:52 GMT Message-Id: <201106190938.p5J9cqgG070570@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:38:53 -0000 http://p4web.freebsd.org/@@194961?ac=10 Change 194961 by ilya@ilya_triton2011 on 2011/06/19 09:38:00 Correct vflush, there is no additional root vnode references Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#14 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#14 (text+ko) ==== @@ -293,7 +293,7 @@ } /* There is 1 extra root vnode reference (mp->mnt_data). */ - err = vflush(mp, 1, flags, td); + err = vflush(mp, 0, flags, td); if (err) { debug_printf("vflush failed"); return (err); From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:39:59 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D303A1065675; Sun, 19 Jun 2011 09:39:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 876E41065672 for ; Sun, 19 Jun 2011 09:39:58 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7401F8FC1D for ; Sun, 19 Jun 2011 09:39:58 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9dwBe070612 for ; Sun, 19 Jun 2011 09:39:58 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9dwq0070609 for perforce@freebsd.org; Sun, 19 Jun 2011 09:39:58 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:39:58 GMT Message-Id: <201106190939.p5J9dwq0070609@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:39:59 -0000 http://p4web.freebsd.org/@@194962?ac=10 Change 194962 by ilya@ilya_triton2011 on 2011/06/19 09:39:00 Add per-module debugging. Fix debug format strings Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/Makefile#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#8 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#6 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#4 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#6 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#8 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#6 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#6 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#15 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#19 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/Makefile#11 (text+ko) ==== @@ -21,6 +21,7 @@ vnode_if.h CFLAGS+= -I../include +DEBUG_FLAGS+= -g -DFUSE_DEBUG_VNOPS=1 .if defined(KERNCONF) KERNCONF1!= echo ${KERNCONF} | sed -e 's/ .*//g' @@ -32,10 +33,6 @@ CFLAGS+= -DKERNCONFDIR="\"${KERNCONFDIR}\"" -I${KERNCONFDIR} .endif -.if defined(DEBUG_MSG) -DEBUG_FLAGS+= -D_DEBUG_MSG -.endif - KMOD=fuse .include ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#8 (text+ko) ==== @@ -122,113 +122,39 @@ /* Debug related stuff */ -#ifndef DEBUGTOLOG -#define DEBUGTOLOG 0 +#ifndef FUSE_DEBUG_DEVICE +#define FUSE_DEBUG_DEVICE 0 #endif -#if DEBUGTOLOG -#define dprintf(args ...) log(LOG_DEBUG, args) -#else -#define dprintf(args ...) printf(args) -#endif -#define DEBLABEL "[fuse-debug] " -#ifndef _DEBUG -#define _DEBUG 0 +#ifndef FUSE_DEBUG_FILE +#define FUSE_DEBUG_FILE 0 #endif -#if _DEBUG -#ifndef _DEBUG2G -#define _DEBUG2G 1 -#endif -#define DEBUG(args, ...) \ - printf(DEBLABEL "%s <%s@%d>: " args, __func__, __FILE__, __LINE__, ## __VA_ARGS__) -#else -#define DEBUG(args ...) -#endif -#ifndef _DEBUG2G -#define _DEBUG2G 0 +#ifndef FUSE_DEBUG_INTERNAL +#define FUSE_DEBUG_INTERNAL 0 #endif -#if _DEBUG2G -#ifndef _DEBUG3G -#define _DEBUG3G 1 -#endif -#define DEBUG2G(args, ...) \ - printf(DEBLABEL "%s <%s@%d>: " args, __func__, __FILE__, __LINE__, ## __VA_ARGS__) -#else -#define DEBUG2G(args ...) -#endif -#ifndef _DEBUG3G -#define _DEBUG3G 0 -#endif -#if _DEBUG3G -#define DEBUG3G(args, ...) \ - printf(DEBLABEL "%s <%s@%d>: " args, __func__, __FILE__, __LINE__, ## __VA_ARGS__) -#else -#define DEBUG3G(args ...) +#ifndef FUSE_DEBUG_IO +#define FUSE_DEBUG_IO 0 #endif -#ifndef FMASTER -#define FMASTER 0 +#ifndef FUSE_DEBUG_IPC +#define FUSE_DEBUG_IPC 0 #endif -#if FMASTER -#ifndef _DEBUG_MSG -#define _DEBUG_MSG 1 -#endif -#endif -#ifndef _DEBUG_MSG -#define _DEBUG_MSG 0 -#endif -#if _DEBUG_MSG -#define DEBUG_MSG(args, ...) \ - printf(DEBLABEL "%s <%s@%d>: " args, __func__, __FILE__, __LINE__, ## __VA_ARGS__) -#else -#define DEBUG_MSG(args...) +#ifndef FUSE_DEBUG_VFSOPS +#define FUSE_DEBUG_VFSOPS 0 #endif -#ifndef _DEBUG_UNIQUE -#if _DEBUG || _DEBUG2G || _DEBUG3G || _DEBUG_MSG -#define _DEBUG_UNIQUE 1 -#else -#define _DEBUG_UNIQUE 0 +#ifndef FUSE_DEBUG_VNOPS +#define FUSE_DEBUG_VNOPS 0 #endif -#endif -#ifdef FUSE_TRACE -#define fuse_trace_printf(fmt, ...) printf(fmt, ## __VA_ARGS__) -#define fuse_trace_printf_func() printf("%s\n", __FUNCTION__) -#else -#define fuse_trace_printf(fmt, ...) {} -#define fuse_trace_printf_func() {} +#ifndef FUSE_TRACE +#define FUSE_TRACE 0 #endif -#ifdef FUSE_TRACE_OP -#define fuse_trace_printf_vfsop() printf("%s\n", __FUNCTION__) -#define fuse_trace_printf_vnop() printf("%s\n", __FUNCTION__) -#else -#define fuse_trace_printf_vfsop() {} -#define fuse_trace_printf_vnop() {} -#endif - -#define debug_printf(fmt, ...) DEBUG(fmt, ## __VA_ARGS__) -#define kdebug_printf(fmt, ...) DEBUG(fmt, ## __VA_ARGS__) - -#if _DEBUG || _DEBUG2G || _DEBUG3G || FMASTER -extern char *fuse_opnames[]; -extern int fuse_opnames_entries; - -struct fuse_iov; - -void uprettyprint(char *buf, size_t len); -void prettyprint(char *buf, size_t len); -void fprettyprint(struct fuse_iov *fiov, size_t dlen); -#endif - -#if _DEBUG || _DEBUG2G || _DEBUG3G -#include - -#define bp_print(bp) \ -printf("b_bcount %d, b_data %p, b_error %#x, b_iocmd %#x, b_ioflags %#x, b_iooffset %lld, b_resid %d, b_blkno %d, b_offset %lld, b_flags %#x, b_bufsize %d, b_lblkno %d, b_vp %p, b_vp_ino %llu, b_dirtyoff %d, b_dirtyend %d, b_npages %d\n", \ -(int)(bp)->b_bcount, (bp)->b_data, (bp)->b_error, (bp)->b_iocmd, (bp)->b_ioflags, (long long)(bp)->b_iooffset, (int)(bp)->b_resid, (int)(bp)->b_blkno, (long long)(bp)->b_offset, (bp)->b_flags, (int)(bp)->b_bufsize, (int)(bp)->b_lblkno, (bp)->b_vp, VTOILLU((bp)->b_vp), (int)(bp)->b_dirtyoff, (int)(bp)->b_dirtyend, (int)(bp)->b_npages) -#endif +#define DEBUGX(cond, fmt, ...) do { \ + if (((cond))) { \ + printf("%s: " fmt, __func__, ## __VA_ARGS__); \ + } } while (0) ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#6 (text+ko) ==== @@ -28,6 +28,9 @@ #include "fuse.h" #include "fuse_ipc.h" +#define FUSE_DEBUG_MODULE DEVICE +#include "fuse_debug.h" + static __inline int fuse_ohead_audit(struct fuse_out_header *ohead, struct uio *uio); @@ -104,7 +107,7 @@ #if DO_GIANT_MANUALLY mtx_unlock(&Giant); #endif - DEBUG2G("caught in the middle of unload\n"); + DEBUG("caught in the middle of unload\n"); return (ENOENT); } #if DO_GIANT_MANUALLY && USE_FUSE_LOCK @@ -115,7 +118,7 @@ if (dev->si_usecount > 1) goto busy; - DEBUG2G("device %p\n", dev); + DEBUG("device %p\n", dev); fdata = fdata_alloc(dev, td->td_ucred); @@ -136,7 +139,7 @@ mtx_unlock(&Giant); #endif - DEBUG("Opened device \"fuse\" (that of minor %d) successfully on thread %d.\n", minor(dev), td->td_tid); + DEBUG("%s: device opened by thread %d.\n", dev->si_name, td->td_tid); return(0); @@ -172,7 +175,7 @@ /* wakup poll()ers */ selwakeuppri(&data->ks_rsel, PZERO + 1); - DEBUG2G("mntco %d\n", data->mntco); + DEBUG("mntco %d\n", data->mntco); if (data->mntco > 0) { struct fuse_ticket *tick; @@ -200,7 +203,7 @@ #endif fuse_useco--; - DEBUG("Closing device \"fuse\" (that of minor %d) on thread %d.\n", minor(dev), td->td_tid); + DEBUG("%s: device closed by thread %d.\n", dev->si_name, td->td_tid); return(0); } @@ -245,7 +248,7 @@ data = fusedev_get_data(dev); - DEBUG_MSG("fuse device being read on thread %d\n", uio->uio_td->td_tid); + DEBUG("fuse device being read on thread %d\n", uio->uio_td->td_tid); mtx_lock(&data->ms_mtx); again: @@ -351,17 +354,17 @@ static __inline int fuse_ohead_audit(struct fuse_out_header *ohead, struct uio *uio) { - DEBUG_MSG("Out header -- len: %i, error: %i, unique: %llu; iovecs: %d\n", + DEBUG("Out header -- len: %i, error: %i, unique: %llu; iovecs: %d\n", ohead->len, ohead->error, (unsigned long long)ohead->unique, uio->uio_iovcnt); if (uio->uio_resid + sizeof(struct fuse_out_header) != ohead->len) { - DEBUG_MSG("Format error: body size differs from size claimed by header\n"); + DEBUG("Format error: body size differs from size claimed by header\n"); return (EINVAL); } if (uio->uio_resid && ohead->error) { - DEBUG_MSG("Format error: non zero error but message had a body\n"); + DEBUG("Format error: non zero error but message had a body\n"); return (EINVAL); } @@ -380,22 +383,19 @@ static int fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) { -#if _DEBUG_MSG - static int counter=0; -#endif struct fuse_out_header ohead; int err = 0; struct fuse_data *data; struct fuse_ticket *tick, *x_tick; int found = 0; - DEBUG_MSG("Fuse write -- No: %d, resid: %d, iovcnt: %d, thread: %d\n", - ++counter, uio->uio_resid, uio->uio_iovcnt, uio->uio_td->td_tid); + DEBUG("Fuse write -- resid: %zd, iovcnt: %d, thread: %d\n", + uio->uio_resid, uio->uio_iovcnt, uio->uio_td->td_tid); data = fusedev_get_data(dev); if (uio->uio_resid < sizeof(struct fuse_out_header)) { - DEBUG_MSG("got less than a header!\n"); + DEBUG("got less than a header!\n"); fdata_kick_set(data); return (EINVAL); } @@ -421,7 +421,7 @@ mtx_lock(&data->aw_mtx); TAILQ_FOREACH_SAFE(tick, &data->aw_head, tk_aw_link, x_tick) { - DEBUG_MSG("bumped into callback #%llu\n", + DEBUG("bumped into callback #%llu\n", (unsigned long long)tick->tk_unique); if (tick->tk_unique == ohead.unique) { found = 1; @@ -442,10 +442,10 @@ */ memcpy(&tick->tk_aw_ohead, &ohead, sizeof(ohead)); err = tick->tk_aw_handler(tick, uio); - DEBUG_MSG("stuff been passed over to a callback\n"); + DEBUG("stuff been passed over to a callback\n"); } else { /* pretender doesn't wanna do anything with answer */ - DEBUG_MSG("stuff devalidated, so we drop it\n"); + DEBUG("stuff devalidated, so we drop it\n"); fuse_ticket_drop(tick); return (err); } @@ -471,7 +471,7 @@ * would be the place for such a thing), * which is just nonsense. */ - DEBUG_MSG("erhm, no handler for this response\n"); + DEBUG("erhm, no handler for this response\n"); fdata_kick_set(data); return (EINVAL); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#4 (text+ko) ==== @@ -29,6 +29,9 @@ #include "fuse_ipc.h" #include "fuse_node.h" +#define FUSE_DEBUG_MODULE FILE +#include "fuse_debug.h" + static uint64_t fuse_fh_upcall_count = 0; SYSCTL_QUAD(_vfs_fuse, OID_AUTO, fh_upcall_count, CTLFLAG_RD, &fuse_fh_upcall_count, 0, ""); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#11 (text+ko) ==== @@ -41,6 +41,9 @@ #include "fuse_file.h" #include "fuse_param.h" +#define FUSE_DEBUG_MODULE INTERNAL +#include "fuse_debug.h" + #ifdef ZERO_PAD_INCOMPLETE_BUFS static int isbzero(void *buf, size_t len); #endif @@ -474,7 +477,7 @@ size_t bufsize, struct fuse_dispatcher *fdip) { - debug_printf("fdip=%p, context=%p\n", fdip, context); + debug_printf("fdip=%p\n", fdip); fdip->iosize = bufsize + cnp->cn_namelen + 1; @@ -572,8 +575,8 @@ { struct fuse_forget_in *ffi; - debug_printf("mp=%p, nodeid=%llx, nlookup=%lld, fdip=%p\n", - mp, nodeid, nlookup, fdip); + debug_printf("mp=%p, nodeid=%jd, nlookup=%jd, fdip=%p\n", + mp, (uintmax_t)nodeid, (uintmax_t)nlookup, fdip); /* * KASSERT(nlookup > 0, ("zero-times forget for vp #%llu", ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#11 (text+ko) ==== @@ -114,7 +114,8 @@ struct fuse_attr *fat, struct vattr *vap) { - DEBUG("node #%llu, mode 0%o\n", (unsigned long long)fat->ino, fat->mode); + DEBUGX(FUSE_DEBUG_INTERNAL, + "node #%ju, mode 0%o\n", (uintmax_t)fat->ino, fat->mode); vattr_null(vap); @@ -222,20 +223,24 @@ int fuse_internal_checkentry(struct fuse_entry_out *feo, enum vtype vtyp) { - debug_printf("feo=%p, vtype=%d\n", feo, vtyp); + DEBUGX(FUSE_DEBUG_INTERNAL, + "feo=%p, vtype=%d\n", feo, vtyp); if (vtyp != IFTOVT(feo->attr.mode)) { - debug_printf("EINVAL -- %x != %x\n", vtype, IFTOVT(feo->attr.mode)); + DEBUGX(FUSE_DEBUG_INTERNAL, + "EINVAL -- %x != %x\n", vtyp, IFTOVT(feo->attr.mode)); return (EINVAL); } if (feo->nodeid == FUSE_NULL_ID) { - debug_printf("EINVAL -- feo->nodeid is NULL\n"); + DEBUGX(FUSE_DEBUG_INTERNAL, + "EINVAL -- feo->nodeid is NULL\n"); return (EINVAL); } if (feo->nodeid == FUSE_ROOT_ID) { - debug_printf("EINVAL -- feo->nodeid is FUSE_ROOT_ID\n"); + DEBUGX(FUSE_DEBUG_INTERNAL, + "EINVAL -- feo->nodeid is FUSE_ROOT_ID\n"); return (EINVAL); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#10 (text+ko) ==== @@ -41,6 +41,9 @@ #include "fuse_ipc.h" #include "fuse_io.h" +#define FUSE_DEBUG_MODULE IO +#include "fuse_debug.h" + static int fuse_read_directbackend(struct fuse_io_data *fioda); static int fuse_io_p2p(struct fuse_io_data *fioda, struct fuse_dispatcher *fdip); static int fuse_read_biobackend(struct fuse_io_data *fioda); @@ -140,21 +143,21 @@ fioda.buffeater = fuse_std_buffeater; if (directio) { - DEBUG2G("direct read of vnode %llu via file handle %llu\n", - VTOILLU(vp), (unsigned long long)fufh->fh_id); + DEBUG2G("direct read of vnode %ju via file handle %ju\n", + (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); err = fuse_read_directbackend(&fioda); } else { - DEBUG2G("buffered read of vnode %llu\n", VTOILLU(vp)); + DEBUG2G("buffered read of vnode %ju\n", (uintmax_t)VTOILLU(vp)); err = fuse_read_biobackend(&fioda); } break; case UIO_WRITE: if (directio) { - DEBUG2G("direct write of vnode %llu via file handle %llu\n", - VTOILLU(vp), (unsigned long long)fufh->fh_id); + DEBUG2G("direct write of vnode %ju via file handle %ju\n", + (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); err = fuse_write_directbackend(&fioda); } else { - DEBUG2G("buffered write of vnode %llu\n", VTOILLU(vp)); + DEBUG2G("buffered write of vnode %ju\n", (uintmax_t)VTOILLU(vp)); err = fuse_write_biobackend(&fioda); } break; @@ -249,12 +252,6 @@ bp->b_iocmd = BIO_READ; vfs_busy_pages(bp, 0); err = fuse_io_strategy(vp, bp, fufh, op); -#if _DEBUG - prettyprint(bp->b_data, 48); - printf("\n"); - prettyprint(bp->b_data + PAGE_SIZE, 48); - printf("\n"); -#endif if (err) { brelse(bp); return (err); @@ -288,7 +285,7 @@ param); } brelse(bp); - DEBUG2G("end of turn, err %d, uio->uio_resid %d, n %d\n", + DEBUG2G("end of turn, err %d, uio->uio_resid %zd, n %d\n", err, uio->uio_resid, n); } while (err == 0 && uio->uio_resid > 0 && n > 0); @@ -342,13 +339,13 @@ fri->size = MIN(uio->uio_resid, fusefs_get_data(vp->v_mount)->max_read); - DEBUG2G("fri->fh %llu, fri->offset %d, fri->size %d\n", - (unsigned long long)fri->fh, (int)fri->offset, fri->size); + DEBUG2G("fri->fh %ju, fri->offset %ju, fri->size %ju\n", + (uintmax_t)fri->fh, (uintmax_t)fri->offset, (uintmax_t)fri->size); if ((err = fdisp_wait_answ(&fdi))) goto out; - DEBUG2G("%d bytes asked for from offset %d, passing on the %d we got\n", - uio->uio_resid, (int)uio->uio_offset, (int)fdi.iosize); + DEBUG2G("%zd bytes asked for from offset %ju, passing on the %jd we got\n", + uio->uio_resid, (uintmax_t)uio->uio_offset, (uintmax_t)fdi.iosize); if ((err = buffe(uio, fri->size, fdi.answ, fdi.iosize, param))) break; @@ -433,9 +430,9 @@ iov++; uio->uio_iovcnt--; } - DEBUG2G("resid %d, offset %llu, iovcnt %d, iov_len %d, " + DEBUG2G("resid %zd, offset %ju, iovcnt %d, iov_len %zd, " "transfersize %d\n", - uio->uio_resid, (long long unsigned)uio->uio_offset, + uio->uio_resid, (uintmax_t)uio->uio_offset, uio->uio_iovcnt, iov->iov_len, transfersize); if (transfersize < chunksize) @@ -558,8 +555,8 @@ on = uio->uio_offset & (biosize-1); n = MIN((unsigned)(biosize - on), uio->uio_resid); - DEBUG2G("lbn %d, on %d, n %d, uio offset %d, uio resid %d\n", - (int)lbn, on, n, (int)uio->uio_offset, uio->uio_resid); + DEBUG2G("lbn %ju, on %d, n %d, uio offset %ju, uio resid %zd\n", + (uintmax_t)lbn, on, n, (uintmax_t)uio->uio_offset, uio->uio_resid); again: /* @@ -756,14 +753,14 @@ int biosize = vp->v_mount->mnt_stat.f_iosize; if (! (vp->v_type == VREG || vp->v_type == VDIR)) { - DEBUG("for vnode #%llu v_type is %d, dropping\n", - VTOILLU(vp), vp->v_type); + DEBUG("for vnode #%ju v_type is %d, dropping\n", + (uintmax_t)VTOILLU(vp), vp->v_type); return (EOPNOTSUPP); } if (bp->b_iocmd != BIO_READ && bp->b_iocmd != BIO_WRITE) { - DEBUG("for vnode #%llu bio tried with biocmd %#x, dropping\n", - VTOILLU(vp), bp->b_iocmd); + DEBUG("for vnode #%ju bio tried with biocmd %#x, dropping\n", + (uintmax_t)VTOILLU(vp), bp->b_iocmd); return (EOPNOTSUPP); } @@ -791,7 +788,8 @@ } fufh->fufh_flags |= FUFH_STRATEGY; - DEBUG2G("vp #%llu, fufh #%llu\n", VTOILLU(vp), (unsigned long long)fufh->fh_id); + DEBUG2G("vp #%ju, fufh #%ju\n", + (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); fdisp_init(&fdi, 0); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#6 (text+ko) ==== @@ -28,6 +28,9 @@ #include "fuse_ipc.h" #include "fuse_internal.h" +#define FUSE_DEBUG_MODULE IPC +#include "fuse_debug.h" + static struct fuse_ticket *fticket_alloc(struct fuse_data *data); static void fticket_refresh(struct fuse_ticket *tick); static void fticket_destroy(struct fuse_ticket *tick); @@ -73,7 +76,7 @@ void fiov_init(struct fuse_iov *fiov, size_t size) { - debug_printf("fiov=%p, size=%x\n", fiov, size); + debug_printf("fiov=%p, size=%zd\n", fiov, size); fiov->len = 0; fiov->base = malloc(FU_AT_LEAST(size), M_FUSEMSG, M_WAITOK | M_ZERO); @@ -92,7 +95,7 @@ void fiov_adjust(struct fuse_iov *fiov, size_t size) { - debug_printf("fiov=%p, size=%x\n", fiov, size); + debug_printf("fiov=%p, size=%zd\n", fiov, size); if (fiov->allocated_size < size || (fuse_iov_permanent_bufsize >= 0 && @@ -248,7 +251,7 @@ fiov_adjust(fticket_resp(tick), len); err = uiomove(fticket_resp(tick)->base, len, uio); if (err) { - debug_printf("FT_A_FIOV: error is %d (%p, %d, %p)\n", + debug_printf("FT_A_FIOV: error is %d (%p, %zd, %p)\n", err, fticket_resp(tick)->base, len, uio); } break; @@ -257,7 +260,7 @@ tick->tk_aw_bufsize = len; err = uiomove(tick->tk_aw_bufdata, len, uio); if (err) { - debug_printf("FT_A_BUF: error is %d (%p, %d, %p)\n", + debug_printf("FT_A_BUF: error is %d (%p, %zd, %p)\n", err, tick->tk_aw_bufdata, len, uio); } break; @@ -294,7 +297,7 @@ { struct fuse_data *data; - debug_printf("fdev=%p, p=%p\n", fdev, p); + debug_printf("fdev=%p\n", fdev); data = malloc(sizeof(struct fuse_data), M_FUSEMSG, M_WAITOK | M_ZERO); @@ -304,7 +307,7 @@ mtx_init(&data->ms_mtx, "fuse message list mutex", NULL, MTX_DEF); STAILQ_INIT(&data->ms_head); mtx_init(&data->ticket_mtx, "fuse ticketer mutex", NULL, MTX_DEF); - debug_printf("ALLOC_INIT data=%p ticket_mtx=%p\n", data, data->ticket_mtx); + debug_printf("ALLOC_INIT data=%p ticket_mtx=%p\n", data, &data->ticket_mtx); STAILQ_INIT(&data->freetickets_head); TAILQ_INIT(&data->alltickets_head); mtx_init(&data->aw_mtx, "fuse answer list mutex", NULL, MTX_DEF); @@ -558,7 +561,7 @@ int err = 0; enum fuse_opcode opcode; - debug_printf("tick=%p, blen = %x\n", tick, blen); + debug_printf("tick=%p, blen = %zu\n", tick, blen); opcode = fticket_opcode(tick); @@ -740,8 +743,8 @@ ihead->nodeid = nid; ihead->opcode = op; - debug_printf("ihead=%p, tick=%p, nid=%llx, op=%d, blen=%x, context=%p\n", - ihead, tick, nid, op, blen, context); + debug_printf("ihead=%p, tick=%p, nid=%ju, op=%d, blen=%zu\n", + ihead, tick, (uintmax_t)nid, op, blen); ihead->pid = pid; ihead->uid = cred->cr_uid; @@ -797,8 +800,8 @@ { struct fuse_data *data = fusefs_get_data(mp); - debug_printf("fdip=%p, op=%d, mp=%p, nid=%llx, context=%p\n", - op, mp, nid, context); + debug_printf("fdip=%p, op=%d, mp=%p, nid=%ju\n", + fdip, op, mp, (uintmax_t)nid); if (fdip->tick) { fticket_refresh(fdip->tick); @@ -836,7 +839,7 @@ struct thread *td, struct ucred *cred) { - debug_printf("fdip=%p, op=%d, vp=%p, context=%p\n", fdip, op, vp, context); + debug_printf("fdip=%p, op=%d, vp=%p\n", fdip, op, vp); RECTIFY_TDCR(td, cred); return (fdisp_make_pid(fdip, op, vnode_mount(vp), VTOI(vp), td->td_proc->p_pid, cred)); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#8 (text+ko) ==== @@ -69,35 +69,35 @@ static __inline struct fuse_iov * fticket_resp(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); return (&tick->tk_aw_fiov); } static __inline int fticket_answered(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); return (tick->tk_flag & FT_ANSW); } static __inline void fticket_set_answered(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); tick->tk_flag |= FT_ANSW; } static __inline enum fuse_opcode fticket_opcode(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); return (((struct fuse_in_header *)(tick->tk_ms_fiov.base))->opcode); } static __inline void fticket_invalidate(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); tick->tk_flag |= FT_INVAL; } @@ -171,14 +171,14 @@ fusefs_get_data(struct mount *mp) { struct fuse_data *data = mp->mnt_data; - kdebug_printf("-> mp=%p\n", mp); + DEBUGX(FUSE_DEBUG_IPC, "-> mp=%p\n", mp); return (data->mpri == FM_PRIMARY ? data : NULL); } static __inline void fuse_ms_push(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); STAILQ_INSERT_TAIL(&tick->tk_data->ms_head, tick, tk_ms_link); } @@ -187,7 +187,7 @@ { struct fuse_ticket *tick; - kdebug_printf("-> data=%p\n", data); + DEBUGX(FUSE_DEBUG_IPC, "-> data=%p\n", data); if ((tick = STAILQ_FIRST(&data->ms_head))) { STAILQ_REMOVE_HEAD(&data->ms_head, tk_ms_link); @@ -199,14 +199,14 @@ static __inline void fuse_aw_push(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); TAILQ_INSERT_TAIL(&tick->tk_data->aw_head, tick, tk_aw_link); } static __inline void fuse_aw_remove(struct fuse_ticket *tick) { - kdebug_printf("-> tick=%p\n", tick); + DEBUGX(FUSE_DEBUG_IPC, "-> tick=%p\n", tick); TAILQ_REMOVE(&tick->tk_data->aw_head, tick, tk_aw_link); } @@ -215,7 +215,7 @@ { struct fuse_ticket *tick; - kdebug_printf("-> data=%p\n", data); + DEBUGX(FUSE_DEBUG_IPC, "-> data=%p\n", data); if ((tick = TAILQ_FIRST(&data->aw_head))) { fuse_aw_remove(tick); @@ -273,7 +273,7 @@ static __inline void fdisp_init(struct fuse_dispatcher *fdisp, size_t iosize) { - kdebug_printf("-> fdisp=%p, iosize=%x\n", fdisp, iosize); + DEBUGX(FUSE_DEBUG_IPC, "-> fdisp=%p, iosize=%zx\n", fdisp, iosize); fdisp->iosize = iosize; fdisp->tick = NULL; } @@ -296,7 +296,7 @@ fdisp_simple_putget_vp(struct fuse_dispatcher *fdip, enum fuse_opcode op, struct vnode *vp, struct thread *td, struct ucred *cred) { - kdebug_printf("-> fdip=%p, opcode=%d, vp=%p\n", fdip, op, vp); + DEBUGX(FUSE_DEBUG_IPC, "-> fdip=%p, opcode=%d, vp=%p\n", fdip, op, vp); fdisp_init(fdip, 0); fdisp_make_vp(fdip, op, vp, td, cred); return (fdisp_wait_answ(fdip)); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#6 (text+ko) ==== @@ -115,7 +115,8 @@ KASSERT(fuse_useco >= 0, ("fuse_useco is negative: %d", fuse_useco)); if (fuse_useco > 0) { - DEBUG2G("fuse_useco %d\n", fuse_useco); + DEBUGX(FUSE_DEBUG_INTERNAL, + "fuse_useco %d\n", fuse_useco); return (EBUSY); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#6 (text+ko) ==== @@ -34,6 +34,9 @@ #include #include +#define FUSE_DEBUG_MODULE VNOPS +#include "fuse_debug.h" + MALLOC_DEFINE(M_FUSEVN, "fuse_vnode", "fuse vnode private data"); static void ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#15 (text+ko) ==== @@ -29,6 +29,8 @@ #include #include +#define FUSE_DEBUG_MODULE VFSOPS +#include "fuse_debug.h" /* This will do for privilege types for now */ #ifndef PRIV_VFS_FUSE_ALLOWOTHER ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#19 (text+ko) ==== @@ -46,6 +46,9 @@ #include +#define FUSE_DEBUG_MODULE VNOPS +#include "fuse_debug.h" + /* vnode ops */ static vop_access_t fuse_vnop_access; static vop_close_t fuse_vnop_close; @@ -242,7 +245,7 @@ goto good_old; } - debug_printf("parent nid = %llu, mode = %x\n", parentnid, mode); + debug_printf("parent nid = %ju, mode = %x\n", (uintmax_t)parentnid, mode); fdisp_init(fdip, sizeof(*foi) + cnp->cn_namelen + 1); if (fusefs_get_data(vnode_mount(dvp))->dataflag & FSESS_NOCREATE) { From owner-p4-projects@FreeBSD.ORG Sun Jun 19 09:39:59 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A66671065773; Sun, 19 Jun 2011 09:39:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A87301065673 for ; Sun, 19 Jun 2011 09:39:58 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 967798FC21 for ; Sun, 19 Jun 2011 09:39:58 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J9dwLj070618 for ; Sun, 19 Jun 2011 09:39:58 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5J9dwcN070615 for perforce@freebsd.org; Sun, 19 Jun 2011 09:39:58 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 19 Jun 2011 09:39:58 GMT Message-Id: <201106190939.p5J9dwcN070615@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 09:39:59 -0000 http://p4web.freebsd.org/@@194963?ac=10 Change 194963 by ilya@ilya_triton2011 on 2011/06/19 09:39:49 Release and unlock vnodes in rename, check cross fs rename. Don't check if target directory is not under the source directory, patching fuse sould be easier. Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#20 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#20 (text+ko) ==== @@ -1442,18 +1442,38 @@ panic("fuse_vnop_rename(): called on a dead file system"); } + if (fvp->v_mount != tdvp->v_mount || + (tvp && fvp->v_mount != tvp->v_mount)) { + DEBUG("cross-device rename: %s -> %s\n", + fcnp->cn_nameptr, (tcnp != NULL ? tcnp->cn_nameptr : "(NULL)")); + err = EXDEV; + goto out; + } + cache_purge(fvp); + /* + * FUSE library is expected to check if target directory is not + * under the source directory in the file system tree. + * Linux performs this check at VFS level. + */ err = fuse_internal_rename(fdvp, fcnp, tdvp, tcnp); - if (tvp != NULLVP) { - if (tvp != fvp) { - cache_purge(tvp); - } - if (err == 0) { - vrecycle(tvp, tcnp->cn_thread); - } + if (tvp != NULL && tvp != fvp) { + cache_purge(tvp); + } + +out: + if (tdvp == tvp) { + vrele(tdvp); + } else { + vput(tdvp); + } + if (tvp != NULL) { + vput(tvp); } + vrele(fdvp); + vrele(fvp); return err; } From owner-p4-projects@FreeBSD.ORG Sun Jun 19 13:06:24 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9180106566C; Sun, 19 Jun 2011 13:06:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B0F4106564A for ; Sun, 19 Jun 2011 13:06:24 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 66CF08FC0A for ; Sun, 19 Jun 2011 13:06:24 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5JD6O4M012978 for ; Sun, 19 Jun 2011 13:06:24 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5JD6N7K012975 for perforce@freebsd.org; Sun, 19 Jun 2011 13:06:23 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Jun 2011 13:06:23 GMT Message-Id: <201106191306.p5JD6N7K012975@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 13:06:25 -0000 http://p4web.freebsd.org/@@194971?ac=10 Change 194971 by rene@rene_acer on 2011/06/19 13:05:51 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#40 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#93 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#62 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/hubs/article.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#35 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#37 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#27 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#21 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#38 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#27 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#107 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#56 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#41 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#28 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#23 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#20 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#60 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#20 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#40 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#21 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/teams.ent#6 integrate .. //depot/projects/docproj_nl/share/pgpkeys/brix.key#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/erwin.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/jlaffaye.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#55 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#52 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ray.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/stephen.key#1 branch .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#30 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#26 integrate .. //depot/projects/docproj_nl/www/en/FAQ/index.html#2 integrate .. //depot/projects/docproj_nl/www/en/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#57 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#27 integrate .. //depot/projects/docproj_nl/www/en/handbook/index.html#2 integrate .. //depot/projects/docproj_nl/www/en/index.xsl#8 integrate .. //depot/projects/docproj_nl/www/en/ipv6/IPv6-badge-blue-128-trans.png#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/IPv6-badge-blue-256-trans.png#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/Makefile#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/Makefile.inc#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/index.sgml#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/ipv6.ent#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/ipv6only.sgml#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/w6d-www-stats-large.png#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/w6d-www-stats-v6-large.png#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/w6d-www-stats-v6.png#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/w6d-www-stats.png#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/w6d-www-stats.sgml#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/w6d.sgml#1 branch .. //depot/projects/docproj_nl/www/en/java/install.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/layout/css/layout.css#2 integrate .. //depot/projects/docproj_nl/www/en/multimedia/multimedia-input.xml#8 integrate .. //depot/projects/docproj_nl/www/en/news/2000/press.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/2001/news.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/2001/press.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2001-07.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2002-11-2002-12.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2003-03-2003-09.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2004-07-2004-12.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2005-03-2005-06.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2005-07-2005-10.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2005-10-2005-12.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2006-01-2006-03.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2006-04-2006-06.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2006-06-2006-10.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2007-04-2007-06.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2007-07-2007-10.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2007-10-2007-12.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2008-01-2008-03.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2008-04-2008-06.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2009-04-2009-09.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2009-10-2009-12.xml#5 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2010-01-2010-03.xml#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2010-04-2010-06.xml#2 integrate .. //depot/projects/docproj_nl/www/en/platforms/ia64/todo.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies_eol.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/projects/c99/index.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/projects/cvsweb.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#13 integrate .. //depot/projects/docproj_nl/www/en/projects/summerofcode-2007.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/projects/summerofcode-2008.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/projects/summerofcode.xsl#9 integrate .. //depot/projects/docproj_nl/www/en/releases/7.0R/relnotes.html#2 integrate .. //depot/projects/docproj_nl/www/en/search/web.atoz#6 integrate .. //depot/projects/docproj_nl/www/nl/Makefile#15 integrate .. //depot/projects/docproj_nl/www/nl/administration.sgml#32 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#22 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#29 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#40 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#110 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#23 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#40 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.299 2011/05/14 20:44:31 hrs Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.300 2011/06/16 19:40:12 simon Exp $ 1999 @@ -60,52 +60,44 @@ + + - Main CVS Repository Host - ncvs.FreeBSD.org - - - - Main Subversion Repository Host - svn.FreeBSD.org - - - Login Methods &man.ssh.1;, protocol 2 only - Main CVSROOT - - ncvs.FreeBSD.org:/home/ncvs (although also see ). - + Main Shell Host + freefall.FreeBSD.org Main Subversion Root - svn+ssh://svn.FreeBSD.org/base (although also see ). + svn+ssh://svn.FreeBSD.org/base (see also ). - Main &a.cvsadm; - &a.peter; and &a.simon;, as well as &a.joe; and &a.marcus; for - ports/ + Main CVSROOT's + + + dcvs.FreeBSD.org:/home/dcvs, + pcvs.FreeBSD.org:/home/pcvs + (see also ). + + - &a.bugmeister; - &a.gavin; &a.linimon;, &a.remko;, and &a.vwe . - + Internal Mailing Lists - - Mailing Lists - &a.doc-developers;, &a.doc-committers;; - &a.ports-developers;, &a.ports-committers;; - &a.src-developers;, &a.src-committers;. (Each project + developers (technically called all-developers), + doc-developers, doc-committers, ports-developers, + ports-committers, src-developers, src-committers. + (Each project repository has its own -developers and -committers mailing lists. Archives for these lists may be found in files /home/mail/repository-name-developers-archive @@ -125,11 +117,10 @@ - Noteworthy CVSup Tags - - RELENG_7 (7.X-STABLE), - RELENG_8 (8.X-STABLE), - HEAD (-CURRENT) + Ports Management Team monthly + reports + /home/portmgr/public/monthly-reports + on the FreeBSD.org cluster. @@ -146,16 +137,24 @@ - It is required that you use &man.ssh.1; or &man.telnet.1; - with Kerberos 5 to connect to the project hosts. For - &man.ssh.1; only protocol 2 is allowed. - These are generally more secure than plain &man.telnet.1; or - &man.rlogin.1; since credential negotiation will always be - encrypted. All traffic is encrypted by default with &man.ssh.1;. - With utilities like &man.ssh-agent.1; and &man.scp.1; also - available, &man.ssh.1; is also far more convenient. If you do + It is required that you use &man.ssh.1; + to connect to the project hosts. + If you do not know anything about &man.ssh.1;, please see . + + Useful links: + + + FreeBSD + Project Internal Pages + + FreeBSD + Project Hosts + + FreeBSD + Project Administrative Groups + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#93 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -252,30 +252,27 @@ A number of strategies may be applied in clustered applications to separate site-wide configuration from system-specific configuration in order to keep administration - overhead down. The recommended approach is to place site-wide - configuration into another file, - such as /etc/rc.conf.site, and then include - this file into /etc/rc.conf, which will - contain only system-specific information. + overhead down. The recommended approach is to place + system-specific configuration into the + /etc/rc.conf.local file. For + example: + + + /etc/rc.conf: + + sshd_enable="YES" +keyrate="fast" +defaultrouter="10.1.1.254" - As rc.conf is read by &man.sh.1; it is - trivial to achieve this. For example: + /etc/rc.conf.local: - - rc.conf: - . /etc/rc.conf.site - hostname="node15.example.com" - network_interfaces="fxp0 lo0" - ifconfig_fxp0="inet 10.1.1.1" - rc.conf.site: - defaultrouter="10.1.1.254" - saver="daemon" - blanktime="100" +hostname="node1.example.org" +ifconfig_fxp0="inet 10.1.1.1/8" - The rc.conf.site file can then be + The rc.conf file can then be distributed to every system using rsync or a - similar program, while the rc.conf file + similar program, while the rc.conf.local file remains unique. Upgrading the system using &man.sysinstall.8; @@ -283,6 +280,13 @@ rc.conf file, so system configuration information will not be lost. + + The /etc/rc.conf configuration file + is parsed by &man.sh.1;. This allows system operators to + add a certain amount of logic to this file, which may help to + create very complex configuration scenarios. Please see + &man.rc.conf.5; for further information on this topic. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -302,18 +302,18 @@ load the new binaries into memory. The freebsd-update utility can - automatically update the GENERIC kernel only. + automatically update the GENERIC kernel only. If a custom kernel is in use, it will have to be rebuilt and reinstalled after freebsd-update finishes installing the rest of the updates. However, freebsd-update will detect and update the - GENERIC kernel in GENERIC kernel in /boot/GENERIC (if it exists), even if it is not the current (running) kernel of the system. It is a good idea to always keep a copy of the - GENERIC kernel in GENERIC kernel in /boot/GENERIC. It will be helpful in diagnosing a variety of problems, and in performing version upgrades using freebsd-update as described in @@ -366,24 +366,24 @@ manual intervention during the build process. If a custom kernel is in use, the upgrade process is slightly - more involved. A copy of the GENERIC kernel is + more involved. A copy of the GENERIC kernel is needed, and it should be placed in /boot/GENERIC. If the - GENERIC kernel is not already present in the + GENERIC kernel is not already present in the system, it may be obtained using one of the following methods: If a custom kernel has only been built once, the kernel in /boot/kernel.old is - actually the GENERIC one. Simply rename this + actually the GENERIC one. Simply rename this directory to /boot/GENERIC. Assuming physical access to the machine is possible, a copy - of the GENERIC kernel can be installed from + of the GENERIC kernel can be installed from the CD-ROM media. Insert your installation disc and use the following commands: @@ -394,12 +394,12 @@ Replace X.Y-RELEASE with the actual version of the release you are using. The - GENERIC kernel will be installed in GENERIC kernel will be installed in /boot/GENERIC by default. - Failing all the above, the GENERIC kernel + Failing all the above, the GENERIC kernel may be rebuilt and installed from the sources: &prompt.root; cd /usr/src @@ -407,16 +407,16 @@ &prompt.root; mv /boot/GENERIC/boot/kernel/* /boot/GENERIC &prompt.root; rm -rf /boot/GENERIC/boot - For this kernel to be picked up as GENERIC + For this kernel to be picked up as GENERIC by freebsd-update, the - GENERIC configuration file must not have been + GENERIC configuration file must not have been modified in any way. It is also suggested that it is built without any other special options (preferably with an empty /etc/make.conf). - Rebooting to the GENERIC kernel is not + Rebooting to the GENERIC kernel is not required at this stage. Major and minor version updates may be performed by @@ -464,7 +464,7 @@ before running "/usr/sbin/freebsd-update install" This warning may be safely ignored at this point. The updated - GENERIC kernel will be used as an intermediate + GENERIC kernel will be used as an intermediate step in the upgrade process. After all patches have been downloaded to the local @@ -504,13 +504,13 @@ &prompt.root; nextboot -k GENERIC - Before rebooting with the GENERIC kernel, + Before rebooting with the GENERIC kernel, make sure it contains all drivers required for your system to boot properly (and connect to the network, if the machine that is being updated is accessed remotely). In particular, if the previously running custom kernel contained built-in functionality usually provided by kernel modules, make sure to temporarily load these - modules into the GENERIC kernel using the + modules into the GENERIC kernel using the /boot/loader.conf facility. You may also wish to disable non-essential services, disk and network mounts, etc. until the upgrade process is complete. @@ -557,7 +557,7 @@ &prompt.root; freebsd-update install - If the GENERIC kernel was temporarily used, + If the GENERIC kernel was temporarily used, this is the time to build and install a new custom kernel in the usual way. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#21 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -200,8 +200,9 @@ 2^32-1 and a length of no more than 2^32-1, limiting partitions to 2TB and disks to 4TB in most cases. The &man.sunlabel.8; format is limited to 2^32-1 sectors per partition and 8 partitions for - a total of 16TB. For larger disks, &man.gpt.8; partitions may be - used. + a total of 16TB. For larger disks, &man.gpart.8; may be used to + create GPT partitions. GPT + has the added benefit of not being limited to 4 slices. Using &man.sysinstall.8; @@ -3024,7 +3025,7 @@ Some administrators will use a snapshot file for backup purposes, - because the snapshot can be transfered to CDs or tape. + because the snapshot can be transferred to CDs or tape. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1494,10 +1494,8 @@ the &os; boot loader. You can access this when the system boot menu appears. Select the Escape to a loader prompt option, number six. At the prompt, type - unload kernel - and then type - boot /boot/kernel.old/kernel, - or the filename of any other kernel that will boot properly. + boot kernel.old, + or the name of any other kernel that will boot properly. When reconfiguring a kernel, it is always a good idea to keep a kernel that is known to work on hand. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -321,6 +321,10 @@ courier-imap; + + + dovecot; + @@ -345,8 +349,9 @@ username and password credentials in clear-text. This means that if you wish to secure the transmission of information across these protocols, you should consider tunneling - sessions over &man.ssh.1;. Tunneling sessions is - described in . + sessions over &man.ssh.1; or using SSL. Tunneling sessions is + described in and SSL is + described in . ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#38 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -232,12 +232,6 @@ mirror site (especially if you decide to set up some sort of mirror site). - The &os; mirror - sites database is more accurate than the mirror listing in the - Handbook, as it gets its information from the DNS rather than relying on - static lists of hosts. - Additionally, &os; is available via anonymous FTP from the following mirror sites. If you choose to obtain &os; via anonymous FTP, please try to use a site near you. The mirror sites listed as @@ -3221,6 +3215,20 @@ + Sweden + + + rsync://ftp4.se.freebsd.org/ + + Available collections: + + &os;: A full mirror of the &os; FTP + server. + + + + + Taiwan ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -353,6 +353,47 @@ + + Another issue is that modern graphics cards often come with their + own sound driver, for use with HDMI and similar. + This sound device will sometimes be enumerated before the actual + soundcard and the soundcard will subsequently not be used as the + default playback device. To check if this is the case, run + dmesg and look for pcm. + The output looks something like this: + +... +hdac0: HDA Driver Revision: 20100226_0142 +hdac1: HDA Driver Revision: 20100226_0142 +hdac0: HDA Codec #0: NVidia (Unknown) +hdac0: HDA Codec #1: NVidia (Unknown) +hdac0: HDA Codec #2: NVidia (Unknown) +hdac0: HDA Codec #3: NVidia (Unknown) +pcm0: <HDA NVidia (Unknown) PCM #0 DisplayPort> at cad 0 nid 1 on hdac0 +pcm1: <HDA NVidia (Unknown) PCM #0 DisplayPort> at cad 1 nid 1 on hdac0 +pcm2: <HDA NVidia (Unknown) PCM #0 DisplayPort> at cad 2 nid 1 on hdac0 +pcm3: <HDA NVidia (Unknown) PCM #0 DisplayPort> at cad 3 nid 1 on hdac0 +hdac1: HDA Codec #2: Realtek ALC889 +pcm4: <HDA Realtek ALC889 PCM #0 Analog> at cad 2 nid 1 on hdac1 +pcm5: <HDA Realtek ALC889 PCM #1 Analog> at cad 2 nid 1 on hdac1 +pcm6: <HDA Realtek ALC889 PCM #2 Digital> at cad 2 nid 1 on hdac1 +pcm7: <HDA Realtek ALC889 PCM #3 Digital> at cad 2 nid 1 on hdac1 +... + + Here the graphics card (NVidia) has been + enumerated before the sound card (Realtek ALC889). + To use the sound card as default playback device, change + hw.snd.default_unit to the unit that should be used + for playback, enter the following: + + &prompt.root; sysctl hw.snd.default_unit=n + + Here, n is the number of the sound device to + use, in this example 4. You can make this change + permanent by adding the following line to + /etc/sysctl.conf: + + hw.snd.default_unit=4 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3643,7 +3643,7 @@ 10800 ; Refresh 3600 ; Retry 604800 ; Expire - 300 ; Negative Reponse TTL + 300 ; Negative Response TTL ) ; DNS Servers @@ -3727,7 +3727,7 @@ 10800 ; Refresh after 3 hours 3600 ; Retry after 1 hour 604800 ; Expire after 1 week - 300 ) ; Negative Reponse TTL + 300 ) ; Negative Response TTL @@ -3839,7 +3839,7 @@ 10800 ; Refresh 3600 ; Retry 604800 ; Expire - 300 ) ; Negative Reponse TTL + 300 ) ; Negative Response TTL IN NS ns1.example.org. IN NS ns2.example.org. @@ -3872,6 +3872,333 @@ + <acronym + role="Doman Name Security Extensions">DNSSEC</acronym> + + BIND + DNS security extensions + + + Domain Name System Security Extensions, or DNSSEC for short, is a + suite of specifications to protect resolving name servers from forged + DNS data, such as spoofed DNS + records. By using digital signatures, a resolver can verify the + integrity of the record. Note that DNSSEC only provides + integrity via digitally signing the Resource Records (RRs). It provides neither + confidentiality nor protection against false end-user assumptions. + This means that it cannot protect against people going to example.net instead of example.com. The only thing + DNSSEC does is authenticate that the data has not + been compromised in transit. The security of DNS is >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 19 13:47:12 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 958831065673; Sun, 19 Jun 2011 13:47:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5880C106566C for ; Sun, 19 Jun 2011 13:47:12 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4661D8FC0C for ; Sun, 19 Jun 2011 13:47:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5JDlCTx021150 for ; Sun, 19 Jun 2011 13:47:12 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5JDlCKu021147 for perforce@freebsd.org; Sun, 19 Jun 2011 13:47:12 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Jun 2011 13:47:12 GMT Message-Id: <201106191347.p5JDlCKu021147@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 13:47:12 -0000 http://p4web.freebsd.org/@@194974?ac=10 Change 194974 by rene@rene_acer on 2011/06/19 13:46:15 MFen: www/nl/index.xsl 1.170 -> 1.172 (SRCID bump only) Affected files ... .. //depot/projects/docproj_nl/www/nl/index.xsl#16 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/index.xsl#16 (text+ko) ==== @@ -1,7 +1,7 @@ Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED59F1065672; Sun, 19 Jun 2011 14:43:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF876106566C for ; Sun, 19 Jun 2011 14:43:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9C7888FC0C for ; Sun, 19 Jun 2011 14:43:05 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5JEh5qZ033295 for ; Sun, 19 Jun 2011 14:43:05 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5JEh5GB033292 for perforce@freebsd.org; Sun, 19 Jun 2011 14:43:05 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Jun 2011 14:43:05 GMT Message-Id: <201106191443.p5JEh5GB033292@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 14:43:06 -0000 http://p4web.freebsd.org/@@194978?ac=10 Change 194978 by rene@rene_acer on 2011/06/19 14:42:52 MFen the Handbook: - config 1.246 -> 1.247 - mirrors 1.496 -> 1.497 - ports 1.291 -> 1.292 - security 1.339 -> 1.340 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#25 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#61 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#21 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#22 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#25 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.25 2011/05/11 18:58:09 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.sgml - %SRCID% 1.246 + %SRCID% 1.247 --> @@ -292,43 +292,43 @@ In een clusterscenario is het nuttig om systeemspecifieke instellingen te scheiden van algemene instellingen die voor het hele cluster gelden. Hiervoor kunnen een aantal strategieën - worden gebruikt. De aanbevolen benadering is om gedeelde - instellingen in een ander bestand te plaatsen, zoals - /etc/rc.conf.site en dit in te voegen in - /etc/rc.conf, wat verder alleen - systeemspecifieke informatie bevat. + worden gebruikt. De aanbevolen benadering is om systeem-specifieke + instellingen in het bestand /etc/rc.conf.local te + plaatsen. Een voorbeeld: - Aangezien rc.conf gelezen wordt door - &man.sh.1; is dit eenvoudig te bereiken: - - rc.conf: + /etc/rc.conf: - . /etc/rc.conf.site - hostname="node15.example.com" - network_interfaces="fxp0 lo0" - ifconfig_fxp0="inet 10.1.1.1" + sshd_enable="YES" +keyrate="fast" +defaultrouter="10.1.1.254" - rc.conf.site: + /etc/rc.conf.local: - defaultrouter="10.1.1.254" -saver="daemon" -blanktime="100" - + hostname="node1.voorbeeld.org" +ifconfig_fxp0="inet 10.1.1.1/8" - rc.conf.site kan dan naar elk systeem + rc.conf kan naar elk systeem gedistribueerd worden met rsync of een - gelijksoortig programma, terwijl rc.conf + gelijksoortig programma, terwijl rc.conf.local uniek blijft. Het actualiseren van het systeem met &man.sysinstall.8; of make world overschrijft rc.conf niet, zodat de bestaande systeeminstellingen niet verloren gaan. + + + Het instellingenbestand /etc/rc.conf wordt + gelezen door &man.sh.1;. Dit stelt systeembeheerders in staat om een + zekere hoeveelheid logica aan dit bestand toe te voegen, dat kan helpen + in het creëren van zeer ingewikkelde configuratiescenario's. + Bekijk &man.rc.conf.5; voor meer informatie over dit onderwerp. + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#61 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.496 + %SRCID% 1.497 --> @@ -249,12 +249,6 @@ dichterbij is (zeker als het doel is ook een soort mirrorsite op te zetten). - De &os; mirrorsites - database is beter bijgewerkt dan die in het - Handboek omdat die lijst uit DNS komt in plaats van een met de - hand ingevoerde lijst. - &os; is beschikbaar via de onderstaande anonieme FTP mirror sites. Bij het kiezen van anonieme FTP voor het verkrijgen van &os; wordt aangeraden een site die dichtbij ligt te kiezen. De ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#21 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.22 2011/02/02 09:45:07 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.291 + %SRCID% 1.292 --> @@ -1660,11 +1660,10 @@ role="fqdn">ftp.FreeBSD.org in de map pakketten, maar het is van belang dat er - eerst in de buurt - wordt gekeken! Dat het pakket werkt is waarschijnlijker dan - wanneer uit de broncode wordt gecompileerd en het is nog - sneller ook. Een pakket kan met &man.pkg.add.1; + eerst in de + buurt wordt gekeken! Dat het pakket werkt is + waarschijnlijker dan wanneer uit de broncode wordt gecompileerd en + het is nog sneller ook. Een pakket kan met &man.pkg.add.1; geïnstalleerd worden. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#22 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.22 2011/05/28 09:38:37 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml - %SRCID% 1.339 + %SRCID% 1.340 --> @@ -4053,15 +4053,15 @@ mailinglijst komt. ============================================================================= -&os;-SA-XX:XX.UTIL Security Advisory - The &os; Project +FreeBSD-SA-XX:XX.UTIL Security Advisory + The FreeBSD Project Topic: denial of service due to some problem Category: core Module: sys Announced: 2003-09-23 -Credits: Person@EMAIL-ADDRESS +Credits: Person Affects: All releases of &os; &os; 4-STABLE prior to the correction date Corrected: 2003-09-23 16:42:59 UTC (RELENG_4, 4.9-PRERELEASE) From owner-p4-projects@FreeBSD.ORG Sun Jun 19 17:56:46 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2164D1065672; Sun, 19 Jun 2011 17:56:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFCFB1065670 for ; Sun, 19 Jun 2011 17:56:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A5E998FC1A for ; Sun, 19 Jun 2011 17:56:45 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5JHujPr070270 for ; Sun, 19 Jun 2011 17:56:45 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5JHujS2070267 for perforce@freebsd.org; Sun, 19 Jun 2011 17:56:45 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Jun 2011 17:56:45 GMT Message-Id: <201106191756.p5JHujS2070267@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 194985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 17:56:46 -0000 http://p4web.freebsd.org/@@194985?ac=10 Change 194985 by rene@rene_acer on 2011/06/19 17:55:44 MFen (wip): handbook/network-servers 1.130 -> 1.134 (sect2 about DNSSEC not yet done) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#41 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#41 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.32 2011/05/28 09:38:36 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.130 + %SRCID% 1.134 --> @@ -4210,11 +4210,12 @@ - + Verder lezen BIND/named hulppagina's: - &man.rndc.8;, &man.named.8;, &man.named.conf.5; + &man.rndc.8;, &man.named.8;, &man.named.conf.5; &man.nsupdate.8; + &man.dnssec-signzone.8; &man.dnssec-keygen.8; @@ -4233,17 +4234,55 @@ O'Reilly DNS en BIND 5e Editie + + + + Root + DNSSEC + + RFC1034 - + url="http://data.iana.org/root-anchors/draft-icann-dnssec-trust-anchor.html"> + DNSSEC Trust Anchor Publication for the Root + Zone + + + + RFC1034 - Domeinnamen - Concepten en Faciliteiten - RFC1035 - + RFC1035 - Domeinnamen - Implementatie en Specificatie + + + RFC4033 - + DNS Beveiligingsintroductie en Benodigdheden + + + + RFC4034 - + Resource Records voorde DNS-beveiligingsuitbreidingen + + + + RFC4035 - + Protocolwijzigingen voor de DNS-beveiligingsuitbreidingen + + + + RFC4641 - + Operationeel gebruik van DNSSEC + + + + RFC5011 - + Geautomatiseerde updates van DNS-beveiliging ( + DNSSEC Trust Anchors) + From owner-p4-projects@FreeBSD.ORG Mon Jun 20 00:53:59 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EB281065677; Mon, 20 Jun 2011 00:53:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4B561065675 for ; Mon, 20 Jun 2011 00:53:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C15628FC1E for ; Mon, 20 Jun 2011 00:53:58 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5K0rwOx052928 for ; Mon, 20 Jun 2011 00:53:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5K0rw6D052925 for perforce@freebsd.org; Mon, 20 Jun 2011 00:53:58 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Jun 2011 00:53:58 GMT Message-Id: <201106200053.p5K0rw6D052925@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 00:53:59 -0000 http://p4web.freebsd.org/@@195000?ac=10 Change 195000 by jhb@jhb_jhbbsd on 2011/06/20 00:53:15 IFC @194999 Affected files ... .. //depot/projects/pci/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/pci/sys/boot/common/load_elf_obj.c#3 integrate .. //depot/projects/pci/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/pci/sys/cam/ata/ata_da.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 integrate .. //depot/projects/pci/sys/conf/files.powerpc#4 integrate .. //depot/projects/pci/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/pci/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/pci/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/pci/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#4 integrate .. //depot/projects/pci/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/pci/sys/fs/nfs/nfsproto.h#3 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clkdtrace.c#1 branch .. //depot/projects/pci/sys/fs/nfsclient/nfs_clkrpc.c#3 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#5 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdcache.c#2 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/pci/sys/kern/sys_process.c#3 integrate .. //depot/projects/pci/sys/kgssapi/gss_impl.c#2 integrate .. //depot/projects/pci/sys/modules/Makefile#5 integrate .. //depot/projects/pci/sys/modules/dtrace/Makefile#3 integrate .. //depot/projects/pci/sys/modules/dtrace/dtnfscl/Makefile#1 branch .. //depot/projects/pci/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/pci/sys/modules/kgssapi_krb5/Makefile#2 integrate .. //depot/projects/pci/sys/net/if_gre.c#2 integrate .. //depot/projects/pci/sys/net/if_gre.h#2 integrate .. //depot/projects/pci/sys/netinet/if_ether.c#3 integrate .. //depot/projects/pci/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/pci/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/pci/sys/powerpc/ps3/ohci_ps3.c#1 branch .. //depot/projects/pci/sys/powerpc/ps3/ps3bus.c#3 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3bus.h#2 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3disk.c#1 branch .. //depot/projects/pci/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/pci/sys/rpc/rpcsec_gss.h#2 integrate .. //depot/projects/pci/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/pci/sys/sys/diskpc98.h#2 integrate .. //depot/projects/pci/sys/sys/dtrace_bsd.h#3 integrate .. //depot/projects/pci/sys/sys/param.h#5 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/pci/sys/vm/vm_fault.c#3 integrate .. //depot/projects/pci/sys/vm/vm_page.c#4 integrate .. //depot/projects/pci/sys/vm/vm_page.h#4 integrate .. //depot/projects/pci/sys/x86/x86/tsc.c#6 integrate Differences ... ==== //depot/projects/pci/sys/amd64/ia32/ia32_sigtramp.S#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_sigtramp.S,v 1.6 2011/04/01 11:16:29 kib Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_sigtramp.S,v 1.7 2011/06/18 12:13:28 kib Exp $ */ #include "opt_compat.h" @@ -79,8 +79,20 @@ jmp 1b +/* + * The lcall $7,$0 emulator cannot use the call gate that does an + * inter-privilege transition. The reason is that the call gate + * does not disable interrupts, and, before the swapgs is + * executed, we would have a window where the ring 0 code is + * executed with the wrong gsbase. + * + * Instead, reflect the lcall $7,$0 back to ring 3 trampoline + * which sets up the frame for int $0x80. + */ ALIGN_TEXT lcall_tramp: + cmpl $SYS_vfork,%eax + je 2f pushl %ebp movl %esp,%ebp pushl 0x24(%ebp) /* arg 6 */ @@ -91,8 +103,19 @@ pushl 0x10(%ebp) /* arg 1 */ pushl 0xc(%ebp) /* gap */ int $0x80 - leave + leavel +1: lretl +2: + /* + * vfork handling is special and relies on the libc stub saving + * the return ip in %ecx. If vfork failed, then there is no + * child which can corrupt the frame created by call gate. + */ + int $0x80 + jb 1b + addl $8,%esp + jmpl *%ecx #endif ALIGN_TEXT ==== //depot/projects/pci/sys/boot/common/load_elf_obj.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/load_elf_obj.c,v 1.4 2011/04/03 22:31:51 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/load_elf_obj.c,v 1.5 2011/06/19 13:35:41 kan Exp $"); #include #include @@ -196,7 +196,7 @@ __elfN(obj_loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off) { Elf_Ehdr *hdr; - Elf_Shdr *shdr; + Elf_Shdr *shdr, *cshdr, *lshdr; vm_offset_t firstaddr, lastaddr; int i, nsym, res, ret, shdrbytes, symstrindex; @@ -294,12 +294,35 @@ /* Clear the whole area, including bss regions. */ kern_bzero(firstaddr, lastaddr - firstaddr); - /* Now read it all in. */ - for (i = 0; i < hdr->e_shnum; i++) { - if (shdr[i].sh_addr == 0 || shdr[i].sh_type == SHT_NOBITS) - continue; - if (kern_pread(ef->fd, (vm_offset_t)shdr[i].sh_addr, - shdr[i].sh_size, (off_t)shdr[i].sh_offset) != 0) { + /* Figure section with the lowest file offset we haven't loaded yet. */ + for (cshdr = NULL; /* none */; /* none */) + { + /* + * Find next section to load. The complexity of this loop is + * O(n^2), but with the number of sections being typically + * small, we do not care. + */ + lshdr = cshdr; + + for (i = 0; i < hdr->e_shnum; i++) { + if (shdr[i].sh_addr == 0 || + shdr[i].sh_type == SHT_NOBITS) + continue; + /* Skip sections that were loaded already. */ + if (lshdr != NULL && + lshdr->sh_offset >= shdr[i].sh_offset) + continue; + /* Find section with smallest offset. */ + if (cshdr == lshdr || + cshdr->sh_offset > shdr[i].sh_offset) + cshdr = &shdr[i]; + } + + if (cshdr == lshdr) + break; + + if (kern_pread(ef->fd, (vm_offset_t)cshdr->sh_addr, + cshdr->sh_size, (off_t)cshdr->sh_offset) != 0) { printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_obj_loadimage: read failed\n"); goto out; ==== //depot/projects/pci/sys/boot/i386/libi386/biosacpi.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.15 2010/11/08 21:50:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.16 2011/06/18 13:56:33 benl Exp $"); #include #include @@ -61,7 +61,7 @@ return; /* export values from the RSDP */ - sprintf(buf, "%p", VTOP(rsdp)); + sprintf(buf, "%u", VTOP(rsdp)); setenv("hint.acpi.0.rsdp", buf, 1); revision = rsdp->Revision; if (revision == 0) ==== //depot/projects/pci/sys/cam/ata/ata_da.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.34 2011/06/14 17:10:32 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.35 2011/06/18 22:26:58 kib Exp $"); #include "opt_ada.h" #include "opt_ata.h" @@ -818,7 +818,7 @@ int ret = -1; struct cam_periph *periph; - if (bp->bio_disk == NULL || bp->bio_disk->d_drv1) + if (bp->bio_disk == NULL || bp->bio_disk->d_drv1 == NULL) return ENXIO; periph = (struct cam_periph *)bp->bio_disk->d_drv1; if (periph->path == NULL) ==== //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 (text+ko) ==== @@ -65,7 +65,7 @@ * filling in ctf_sect_t structures and passing them to ctf_bufopen(): */ typedef struct ctf_sect { - char *cts_name; /* section name (if any) */ + const char *cts_name; /* section name (if any) */ ulong_t cts_type; /* section type (ELF SHT_... value) */ ulong_t cts_flags; /* section flags (ELF SHF_... value) */ #if defined(sun) ==== //depot/projects/pci/sys/conf/files.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.130 2011/06/04 15:17:35 andreast Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.132 2011/06/20 00:46:07 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -203,11 +203,13 @@ powerpc/powerpc/sys_machdep.c standard powerpc/powerpc/uio_machdep.c standard powerpc/ps3/ehci_ps3.c optional ps3 ehci +powerpc/ps3/ohci_ps3.c optional ps3 ohci powerpc/ps3/if_glc.c optional ps3 glc powerpc/ps3/mmu_ps3.c optional ps3 powerpc/ps3/platform_ps3.c optional ps3 powerpc/ps3/ps3ata.c optional ps3 ps3ata powerpc/ps3/ps3bus.c optional ps3 +powerpc/ps3/ps3disk.c optional ps3 powerpc/ps3/ps3pic.c optional ps3 powerpc/ps3/ps3_syscons.c optional ps3 sc powerpc/ps3/ps3-hvcall.S optional ps3 sc ==== //depot/projects/pci/sys/dev/acpica/acpi.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.302 2011/06/10 12:30:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.303 2011/06/17 21:19:01 jhb Exp $"); #include "opt_acpi.h" #include ==== //depot/projects/pci/sys/dev/acpica/acpi_pci.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.38 2011/01/18 14:58:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.39 2011/06/17 21:19:01 jhb Exp $"); #include #include ==== //depot/projects/pci/sys/dev/pccbb/pccbb.c#2 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.184 2011/01/12 19:53:56 mdf Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.186 2011/06/18 03:16:51 imp Exp $"); #include #include @@ -800,24 +800,36 @@ * We have a shortish timeout of 500ms here. Some bridges do * not generate a POWER_CYCLE event for 16-bit cards. In * those cases, we have to cope the best we can, and having - * only a short delay is better than the alternatives. + * only a short delay is better than the alternatives. Others + * raise the power cycle a smidge before it is really ready. + * We deal with those below. */ sane = 10; while (!(cbb_get(sc, CBB_SOCKET_STATE) & CBB_STATE_POWER_CYCLE) && cnt == sc->powerintr && sane-- > 0) msleep(&sc->powerintr, &sc->mtx, 0, "-", hz / 20); mtx_unlock(&sc->mtx); + + /* + * Relax for 100ms. Some bridges appear to assert this signal + * right away, but before the card has stabilized. Other + * cards need need more time to cope up reliabily. + * Experiments with troublesome setups show this to be a + * "cheap" way to enhance reliabilty. We need not do this for + * "off" since we don't touch the card after we turn it off. + */ + pause("cbbPwr", min(hz / 10, 1)); + /* * The TOPIC95B requires a little bit extra time to get its * act together, so delay for an additional 100ms. Also as * documented below, it doesn't seem to set the POWER_CYCLE * bit, so don't whine if it never came on. */ - if (sc->chipset == CB_TOPIC95) { + if (sc->chipset == CB_TOPIC95) pause("cbb95B", hz / 10); - } else if (sane <= 0) { + else if (sane <= 0) device_printf(sc->dev, "power timeout, doom?\n"); - } } /* ==== //depot/projects/pci/sys/dev/usb/net/if_udav.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ -/* $FreeBSD: src/sys/dev/usb/net/if_udav.c,v 1.17 2011/05/03 19:51:29 marius Exp $ */ +/* $FreeBSD: src/sys/dev/usb/net/if_udav.c,v 1.18 2011/06/19 08:34:10 hselasky Exp $ */ /*- * Copyright (c) 2003 * Shingo WATANABE . All rights reserved. @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_udav.c,v 1.17 2011/05/03 19:51:29 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_udav.c,v 1.18 2011/06/19 08:34:10 hselasky Exp $"); #include #include @@ -210,6 +210,7 @@ {USB_VPI(USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ADM8515, 0)}, /* Kontron AG USB Ethernet */ {USB_VPI(USB_VENDOR_KONTRON, USB_PRODUCT_KONTRON_DM9601, 0)}, + {USB_VPI(USB_VENDOR_KONTRON, USB_PRODUCT_KONTRON_JP1082, 0)}, }; static void ==== //depot/projects/pci/sys/dev/usb/usbdevs#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.511 2011/06/01 17:58:27 hselasky Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.512 2011/06/19 08:34:10 hselasky Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -2014,6 +2014,7 @@ /* Kontron AG products */ product KONTRON DM9601 0x8101 USB Ethernet +product KONTRON JP1082 0x9700 USB Ethernet /* Konica Corp. Products */ product KONICA CAMERA 0x0720 Digital Color Camera ==== //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#4 (text+ko) ==== @@ -32,13 +32,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonkrpc.c,v 1.11 2011/05/15 20:52:43 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonkrpc.c,v 1.13 2011/06/19 22:08:55 rmacklem Exp $"); /* * Socket operations for use by nfs */ #include "opt_inet6.h" +#include "opt_kdtrace.h" #include "opt_kgssapi.h" #include "opt_nfs.h" @@ -64,6 +65,28 @@ #include +#ifdef KDTRACE_HOOKS +#include + +dtrace_nfsclient_nfs23_start_probe_func_t + dtrace_nfscl_nfs234_start_probe; + +dtrace_nfsclient_nfs23_done_probe_func_t + dtrace_nfscl_nfs234_done_probe; + +/* + * Registered probes by RPC type. + */ +uint32_t nfscl_nfs2_start_probes[NFS_NPROCS + 1]; +uint32_t nfscl_nfs2_done_probes[NFS_NPROCS + 1]; + +uint32_t nfscl_nfs3_start_probes[NFS_NPROCS + 1]; +uint32_t nfscl_nfs3_done_probes[NFS_NPROCS + 1]; + +uint32_t nfscl_nfs4_start_probes[NFS_NPROCS + 1]; +uint32_t nfscl_nfs4_done_probes[NFS_NPROCS + 1]; +#endif + NFSSTATESPINLOCK; NFSREQSPINLOCK; extern struct nfsstats newnfsstats; @@ -300,9 +323,7 @@ client = nrp->nr_client; nrp->nr_client = NULL; mtx_unlock(&nrp->nr_mtx); -#ifdef KGSSAPI - rpc_gss_secpurge(client); -#endif + rpc_gss_secpurge_call(client); CLNT_CLOSE(client); CLNT_RELEASE(client); } else { @@ -314,21 +335,18 @@ nfs_getauth(struct nfssockreq *nrp, int secflavour, char *clnt_principal, char *srv_principal, gss_OID mech_oid, struct ucred *cred) { -#ifdef KGSSAPI rpc_gss_service_t svc; AUTH *auth; #ifdef notyet rpc_gss_options_req_t req_options; #endif -#endif switch (secflavour) { -#ifdef KGSSAPI case RPCSEC_GSS_KRB5: case RPCSEC_GSS_KRB5I: case RPCSEC_GSS_KRB5P: if (!mech_oid) { - if (!rpc_gss_mech_to_oid("kerberosv5", &mech_oid)) + if (!rpc_gss_mech_to_oid_call("kerberosv5", &mech_oid)) return (NULL); } if (secflavour == RPCSEC_GSS_KRB5) @@ -344,7 +362,7 @@ req_options.input_channel_bindings = NULL; req_options.enc_type = nfs_keytab_enctype; - auth = rpc_gss_secfind(nrp->nr_client, cred, + auth = rpc_gss_secfind_call(nrp->nr_client, cred, clnt_principal, srv_principal, mech_oid, svc, &req_options); #else @@ -354,7 +372,7 @@ * principals. As such, that case cannot yet be handled. */ if (clnt_principal == NULL) - auth = rpc_gss_secfind(nrp->nr_client, cred, + auth = rpc_gss_secfind_call(nrp->nr_client, cred, srv_principal, mech_oid, svc); else auth = NULL; @@ -362,7 +380,6 @@ if (auth != NULL) return (auth); /* fallthrough */ -#endif /* KGSSAPI */ case AUTH_SYS: default: return (authunix_create(cred)); @@ -568,6 +585,29 @@ if ((nd->nd_flag & ND_NFSV4) && procnum == NFSV4PROC_COMPOUND) MALLOC(rep, struct nfsreq *, sizeof(struct nfsreq), M_NFSDREQ, M_WAITOK); +#ifdef KDTRACE_HOOKS + if (dtrace_nfscl_nfs234_start_probe != NULL) { + uint32_t probe_id; + int probe_procnum; + + if (nd->nd_flag & ND_NFSV4) { + probe_id = + nfscl_nfs4_start_probes[nd->nd_procnum]; + probe_procnum = nd->nd_procnum; + } else if (nd->nd_flag & ND_NFSV3) { + probe_id = nfscl_nfs3_start_probes[procnum]; + probe_procnum = procnum; + } else { + probe_id = + nfscl_nfs2_start_probes[nd->nd_procnum]; + probe_procnum = procnum; + } + if (probe_id != 0) + (dtrace_nfscl_nfs234_start_probe) + (probe_id, vp, nd->nd_mreq, cred, + probe_procnum); + } +#endif } trycnt = 0; tryagain: @@ -762,6 +802,27 @@ } } +#ifdef KDTRACE_HOOKS + if (nmp != NULL && dtrace_nfscl_nfs234_done_probe != NULL) { + uint32_t probe_id; + int probe_procnum; + + if (nd->nd_flag & ND_NFSV4) { + probe_id = nfscl_nfs4_done_probes[nd->nd_procnum]; + probe_procnum = nd->nd_procnum; + } else if (nd->nd_flag & ND_NFSV3) { + probe_id = nfscl_nfs3_done_probes[procnum]; + probe_procnum = procnum; + } else { + probe_id = nfscl_nfs2_done_probes[nd->nd_procnum]; + probe_procnum = procnum; + } + if (probe_id != 0) + (dtrace_nfscl_nfs234_done_probe)(probe_id, vp, + nd->nd_mreq, cred, probe_procnum, 0); + } +#endif + m_freem(nd->nd_mreq); AUTH_DESTROY(auth); if (rep != NULL) ==== //depot/projects/pci/sys/fs/nfs/nfsport.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nfs/nfsport.h,v 1.23 2011/04/25 13:09:32 rmacklem Exp $ + * $FreeBSD: src/sys/fs/nfs/nfsport.h,v 1.24 2011/06/18 23:02:53 rmacklem Exp $ */ #ifndef _NFS_NFSPORT_H_ @@ -267,6 +267,7 @@ * NFS_V3NPROCS is one greater than the last V3 op and NFS_NPROCS is * one greater than the last number. */ +#ifndef NFS_V3NPROCS #define NFS_V3NPROCS 22 #define NFSPROC_LOOKUPP 22 @@ -293,6 +294,7 @@ * Must be defined as one higher than the last Proc# above. */ #define NFSV4_NPROCS 41 +#endif /* NFS_V3NPROCS */ /* * Stats structure @@ -358,7 +360,9 @@ /* * Define NFS_NPROCS as NFSV4_NPROCS for the experimental kernel code. */ +#ifndef NFS_NPROCS #define NFS_NPROCS NFSV4_NPROCS +#endif #include #include ==== //depot/projects/pci/sys/fs/nfs/nfsproto.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nfs/nfsproto.h,v 1.3 2011/05/04 22:02:33 rmacklem Exp $ + * $FreeBSD: src/sys/fs/nfs/nfsproto.h,v 1.4 2011/06/18 23:02:53 rmacklem Exp $ */ #ifndef _NFS_NFSPROTO_H_ @@ -226,6 +226,48 @@ #define NFSPROC_COMMIT 21 /* + * The lower numbers -> 21 are used by NFSv2 and v3. These define higher + * numbers used by NFSv4. + * NFS_V3NPROCS is one greater than the last V3 op and NFS_NPROCS is + * one greater than the last number. + */ +#ifndef NFS_V3NPROCS +#define NFS_V3NPROCS 22 + +#define NFSPROC_LOOKUPP 22 +#define NFSPROC_SETCLIENTID 23 +#define NFSPROC_SETCLIENTIDCFRM 24 +#define NFSPROC_LOCK 25 +#define NFSPROC_LOCKU 26 +#define NFSPROC_OPEN 27 +#define NFSPROC_CLOSE 28 +#define NFSPROC_OPENCONFIRM 29 +#define NFSPROC_LOCKT 30 +#define NFSPROC_OPENDOWNGRADE 31 +#define NFSPROC_RENEW 32 +#define NFSPROC_PUTROOTFH 33 +#define NFSPROC_RELEASELCKOWN 34 +#define NFSPROC_DELEGRETURN 35 +#define NFSPROC_RETDELEGREMOVE 36 +#define NFSPROC_RETDELEGRENAME1 37 +#define NFSPROC_RETDELEGRENAME2 38 +#define NFSPROC_GETACL 39 +#define NFSPROC_SETACL 40 + +/* + * Must be defined as one higher than the last Proc# above. + */ +#define NFSV4_NPROCS 41 +#endif /* NFS_V3NPROCS */ + +/* + * Define NFS_NPROCS as NFSV4_NPROCS for the experimental kernel code. + */ +#ifndef NFS_NPROCS +#define NFS_NPROCS NFSV4_NPROCS +#endif + +/* * NFSPROC_NOOP is a fake op# that can't be the same as any V2/3/4 Procedure * or Operation#. Since the NFS V4 Op #s go higher, use NFSV4OP_NOPS, which * is one greater than the highest Op#. ==== //depot/projects/pci/sys/fs/nfsclient/nfs_clbio.c#4 (text+ko) ==== @@ -33,7 +33,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clbio.c,v 1.23 2011/06/01 21:00:28 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clbio.c,v 1.24 2011/06/18 23:02:53 rmacklem Exp $"); + +#include "opt_kdtrace.h" #include #include @@ -55,6 +57,7 @@ #include #include #include +#include extern int newnfs_directio_allow_mmap; extern struct nfsstats newnfsstats; @@ -399,6 +402,7 @@ goto out; } np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); error = VOP_GETATTR(vp, &vattr, cred); if (error) goto out; @@ -915,6 +919,7 @@ #endif flush_and_restart: np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); error = ncl_vinvalbuf(vp, V_SAVE, td, 1); if (error) return (error); @@ -928,6 +933,7 @@ */ if (ioflag & IO_APPEND) { np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); error = VOP_GETATTR(vp, &vattr, cred); if (error) return (error); @@ -1748,6 +1754,7 @@ mtx_lock(&np->n_mtx); np->n_flag |= NWRITEERR; np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); mtx_unlock(&np->n_mtx); } bp->b_dirtyoff = bp->b_dirtyend = 0; ==== //depot/projects/pci/sys/fs/nfsclient/nfs_clkrpc.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clkrpc.c,v 1.5 2011/05/15 20:52:43 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clkrpc.c,v 1.6 2011/06/19 22:08:55 rmacklem Exp $"); #include "opt_inet6.h" #include "opt_kgssapi.h" @@ -215,12 +215,9 @@ int nfscbd_nfsd(struct thread *td, struct nfsd_nfscbd_args *args) { -#ifdef KGSSAPI char principal[128]; int error; -#endif -#ifdef KGSSAPI if (args != NULL) { error = copyinstr(args->principal, principal, sizeof(principal), NULL); @@ -229,7 +226,6 @@ } else { principal[0] = '\0'; } -#endif /* * Only the first nfsd actually does any work. The RPC code @@ -244,20 +240,16 @@ NFSD_UNLOCK(); -#ifdef KGSSAPI if (principal[0] != '\0') - rpc_gss_set_svc_name(principal, "kerberosv5", + rpc_gss_set_svc_name_call(principal, "kerberosv5", GSS_C_INDEFINITE, NFS_CALLBCKPROG, NFSV4_CBVERS); -#endif nfscbd_pool->sp_minthreads = 4; nfscbd_pool->sp_maxthreads = 4; svc_run(nfscbd_pool); -#ifdef KGSSAPI - rpc_gss_clear_svc_name(NFS_CALLBCKPROG, NFSV4_CBVERS); -#endif + rpc_gss_clear_svc_name_call(NFS_CALLBCKPROG, NFSV4_CBVERS); NFSD_LOCK(); nfs_numnfscbd--; ==== //depot/projects/pci/sys/fs/nfsclient/nfs_clnode.c#3 (text+ko) ==== @@ -33,7 +33,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clnode.c,v 1.13 2011/04/16 23:20:21 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clnode.c,v 1.14 2011/06/18 23:02:53 rmacklem Exp $"); + +#include "opt_kdtrace.h" #include #include @@ -53,6 +55,7 @@ #include #include #include +#include #include @@ -300,7 +303,9 @@ mtx_lock(&np->n_mtx); for (i = 0; i < NFS_ACCESSCACHESIZE; i++) np->n_accesscache[i].stamp = 0; + KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp); np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); mtx_unlock(&np->n_mtx); } ==== //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#5 (text+ko) ==== @@ -32,7 +32,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clport.c,v 1.24 2011/06/05 20:22:56 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clport.c,v 1.25 2011/06/18 23:02:53 rmacklem Exp $"); + +#include "opt_kdtrace.h" /* * generally, I don't like #includes inside .h files, but it seems to @@ -43,6 +45,26 @@ #include #include +#include + +#ifdef KDTRACE_HOOKS +dtrace_nfsclient_attrcache_flush_probe_func_t + dtrace_nfscl_attrcache_flush_done_probe; +uint32_t nfscl_attrcache_flush_done_id; + +dtrace_nfsclient_attrcache_get_hit_probe_func_t + dtrace_nfscl_attrcache_get_hit_probe; +uint32_t nfscl_attrcache_get_hit_id; + +dtrace_nfsclient_attrcache_get_miss_probe_func_t + dtrace_nfscl_attrcache_get_miss_probe; +uint32_t nfscl_attrcache_get_miss_id; + +dtrace_nfsclient_attrcache_load_probe_func_t + dtrace_nfscl_attrcache_load_done_probe; +uint32_t nfscl_attrcache_load_done_id; +#endif /* !KDTRACE_HOOKS */ + extern u_int32_t newnfs_true, newnfs_false, newnfs_xdrneg1; extern struct vop_vector newnfs_vnodeops; extern struct vop_vector newnfs_fifoops; @@ -407,6 +429,7 @@ */ vap->va_size = np->n_size; np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); } else if (np->n_flag & NMODIFIED) { /* * We've modified the file: Use the larger @@ -439,9 +462,11 @@ * We detect this by for the mtime moving back. We invalidate the * attrcache when this happens. */ - if (timespeccmp(&mtime_save, &vap->va_mtime, >)) + if (timespeccmp(&mtime_save, &vap->va_mtime, >)) { /* Size changed or mtime went backwards */ np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); + } if (vaper != NULL) { NFSBCOPY((caddr_t)vap, (caddr_t)vaper, sizeof(*vap)); if (np->n_flag & NCHG) { @@ -451,6 +476,10 @@ vaper->va_mtime = np->n_mtim; } } +#ifdef KDTRACE_HOOKS + if (np->n_attrstamp != 0) + KDTRACE_NFS_ATTRCACHE_LOAD_DONE(vp, vap, 0); +#endif NFSUNLOCKNODE(np); return (0); } ==== //depot/projects/pci/sys/fs/nfsclient/nfs_clsubs.c#4 (text+ko) ==== @@ -33,7 +33,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clsubs.c,v 1.13 2011/05/15 20:52:43 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clsubs.c,v 1.14 2011/06/18 23:02:53 rmacklem Exp $"); + +#include "opt_kdtrace.h" /* * These functions support the macros and help fiddle mbuf chains for @@ -68,6 +70,7 @@ #include #include #include +#include #include @@ -238,6 +241,7 @@ #ifdef NFS_ACDEBUG mtx_unlock(&Giant); /* ncl_printf() */ #endif + KDTRACE_NFS_ATTRCACHE_GET_MISS(vp); return( ENOENT); } newnfsstats.attrcache_hits++; @@ -267,6 +271,7 @@ #ifdef NFS_ACDEBUG mtx_unlock(&Giant); /* ncl_printf() */ #endif + KDTRACE_NFS_ATTRCACHE_GET_HIT(vp, vap); return (0); } ==== //depot/projects/pci/sys/fs/nfsclient/nfs_clvnops.c#4 (text+ko) ==== @@ -33,12 +33,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvnops.c,v 1.44 2011/06/05 20:22:56 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvnops.c,v 1.45 2011/06/18 23:02:53 rmacklem Exp $"); /* * vnode op calls for Sun NFS version 2, 3 and 4 */ +#include "opt_kdtrace.h" #include "opt_inet.h" #include @@ -70,6 +71,7 @@ #include #include #include +#include #include #include @@ -77,6 +79,24 @@ #include +#ifdef KDTRACE_HOOKS +#include + +dtrace_nfsclient_accesscache_flush_probe_func_t + dtrace_nfscl_accesscache_flush_done_probe; +uint32_t nfscl_accesscache_flush_done_id; + +dtrace_nfsclient_accesscache_get_probe_func_t + dtrace_nfscl_accesscache_get_hit_probe, + dtrace_nfscl_accesscache_get_miss_probe; +uint32_t nfscl_accesscache_get_hit_id; +uint32_t nfscl_accesscache_get_miss_id; + +dtrace_nfsclient_accesscache_load_probe_func_t + dtrace_nfscl_accesscache_load_done_probe; +uint32_t nfscl_accesscache_load_done_id; +#endif /* !KDTRACE_HOOKS */ + /* Defs */ #define TRUE 1 #define FALSE 0 @@ -298,9 +318,15 @@ mtx_unlock(&np->n_mtx); if (retmode != NULL) *retmode = rmode; + KDTRACE_NFS_ACCESSCACHE_LOAD_DONE(vp, cred->cr_uid, rmode, 0); } else if (NFS_ISV4(vp)) { error = nfscl_maperr(td, error, (uid_t)0, (gid_t)0); } +#ifdef KDTRACE_HOOKS + if (error != 0) + KDTRACE_NFS_ACCESSCACHE_LOAD_DONE(vp, cred->cr_uid, 0, + error); +#endif return (error); } @@ -397,6 +423,14 @@ } } mtx_unlock(&np->n_mtx); +#ifdef KDTRACE_HOOKS + if (gotahit != 0) + KDTRACE_NFS_ACCESSCACHE_GET_HIT(vp, + ap->a_cred->cr_uid, mode); + else + KDTRACE_NFS_ACCESSCACHE_GET_MISS(vp, + ap->a_cred->cr_uid, mode); +#endif if (gotahit == 0) { /* * Either a no, or a don't know. Go to the wire. @@ -507,6 +541,7 @@ } mtx_lock(&np->n_mtx); np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); if (vp->v_type == VDIR) np->n_direofoffset = 0; mtx_unlock(&np->n_mtx); @@ -692,8 +727,10 @@ * is the cause of some caching/coherency issue that might * crop up.) */ - if (VFSTONFS(vp->v_mount)->nm_negnametimeo == 0) + if (VFSTONFS(vp->v_mount)->nm_negnametimeo == 0) { np->n_attrstamp = 0; + KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); + } if (np->n_flag & NWRITEERR) { np->n_flag &= ~NWRITEERR; error = np->n_error; @@ -949,6 +986,7 @@ np->n_accesscache[i].stamp = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 20 00:59:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DBB51065678; Mon, 20 Jun 2011 00:59:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F4101065670 for ; Mon, 20 Jun 2011 00:59:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0B6E48FC0C for ; Mon, 20 Jun 2011 00:59:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5K0xTtR053094 for ; Mon, 20 Jun 2011 00:59:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5K0xRIX053089 for perforce@freebsd.org; Mon, 20 Jun 2011 00:59:27 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Jun 2011 00:59:27 GMT Message-Id: <201106200059.p5K0xRIX053089@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 00:59:30 -0000 http://p4web.freebsd.org/@@195001?ac=10 Change 195001 by jhb@jhb_jhbbsd on 2011/06/20 00:58:40 IFC @194999 Affected files ... .. //depot/projects/smpng/share/man/man9/LOCK_PROFILING.9#3 integrate .. //depot/projects/smpng/share/man/man9/Makefile#24 integrate .. //depot/projects/smpng/share/man/man9/bus_adjust_resource.9#2 integrate .. //depot/projects/smpng/share/man/man9/devfs_set_cdevpriv.9#4 integrate .. //depot/projects/smpng/share/man/man9/device_get_sysctl.9#2 integrate .. //depot/projects/smpng/share/man/man9/hhook.9#3 integrate .. //depot/projects/smpng/share/man/man9/khelp.9#3 integrate .. //depot/projects/smpng/share/man/man9/pseudofs.9#2 integrate .. //depot/projects/smpng/share/man/man9/sbuf.9#6 integrate .. //depot/projects/smpng/share/man/man9/zone.9#3 integrate .. //depot/projects/smpng/sys/Makefile#26 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#42 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#105 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#77 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#116 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#53 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#96 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_sigtramp.S#8 integrate .. //depot/projects/smpng/sys/amd64/include/_types.h#9 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#40 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#27 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#63 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#10 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#34 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#16 integrate .. //depot/projects/smpng/sys/boot/common/load_elf_obj.c#5 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#15 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th.8#1 branch .. //depot/projects/smpng/sys/boot/forth/brand.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/brand.4th.8#1 branch .. //depot/projects/smpng/sys/boot/forth/check-password.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/check-password.4th.8#1 branch .. //depot/projects/smpng/sys/boot/forth/color.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/color.4th.8#1 branch .. //depot/projects/smpng/sys/boot/forth/delay.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/delay.4th.8#1 branch .. //depot/projects/smpng/sys/boot/forth/loader.4th#6 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#15 integrate .. //depot/projects/smpng/sys/boot/forth/loader.rc#3 integrate .. //depot/projects/smpng/sys/boot/forth/menu-commands.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/menu.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/menu.4th.8#1 branch .. //depot/projects/smpng/sys/boot/forth/menu.rc#1 branch .. //depot/projects/smpng/sys/boot/forth/shortcuts.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/support.4th#8 integrate .. //depot/projects/smpng/sys/boot/forth/version.4th#1 branch .. //depot/projects/smpng/sys/boot/forth/version.4th.8#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#15 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#31 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/ia64/common/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/ia64/common/exec.c#5 integrate .. //depot/projects/smpng/sys/boot/ia64/common/icache.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/common/libia64.h#4 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/efimd.c#5 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/main.c#5 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/version#6 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#23 integrate .. //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#21 integrate .. //depot/projects/smpng/sys/cam/ata/ata_all.c#7 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#13 integrate .. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#13 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#21 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#43 integrate .. //depot/projects/smpng/sys/cam/cam_periph.h#11 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#75 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#10 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_internal.h#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#33 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#99 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#28 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.h#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_xpt.c#8 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris.c#6 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c#2 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#5 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#10 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#6 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/taskq.h#6 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/time.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 integrate .. //depot/projects/smpng/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#5 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#8 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dtrace_subr.c#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#75 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#66 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#65 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#65 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#66 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#70 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#91 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#37 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#37 integrate .. //depot/projects/smpng/sys/conf/NOTES#192 integrate .. //depot/projects/smpng/sys/conf/files#272 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#67 integrate .. //depot/projects/smpng/sys/conf/kern.mk#33 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#69 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#83 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#32 integrate .. //depot/projects/smpng/sys/conf/options#189 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbexec.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbinput.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbutils.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbxface.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acconfig.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdebug.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpiosxf.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpredef.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbinstal.c#5 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#42 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#37 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#16 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#48 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#76 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#38 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#132 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#27 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#18 integrate .. //depot/projects/smpng/sys/dev/alc/if_alcreg.h#5 integrate .. //depot/projects/smpng/sys/dev/ale/if_alereg.h#2 integrate .. //depot/projects/smpng/sys/dev/amdsbwd/amdsbwd.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-sata.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#16 integrate .. //depot/projects/smpng/sys/dev/ath/ath_dfs/null/dfs_null.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#14 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.h#12 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_desc.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_devid.h#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom.h#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_9287.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#13 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212.h#10 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#10 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416.h#8 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#15 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#8 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287.h#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287.ini#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_olc.h#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287_reset.h#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287an.h#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar9002/ar9287phy.h#1 branch .. //depot/projects/smpng/sys/dev/ath/if_ath.c#95 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_ahb.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_tx_ht.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_athdfs.h#1 branch .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#54 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#10 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdreg.h#2 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_debug.h#2 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_link.c#2 integrate .. //depot/projects/smpng/sys/dev/bxe/if_bxe.c#2 integrate .. //depot/projects/smpng/sys/dev/bxe/if_bxe.h#2 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#34 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_dev.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgbe/adapter.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/common/common.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/common/jhash.h#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/common/t4fw_interface.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/offload.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/osdep.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_ioctl.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_l2t.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/t4_l2t.h#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_sge.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#32 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.h#15 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#47 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#38 integrate .. //depot/projects/smpng/sys/dev/iicbus/ad7417.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/ds1775.c#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/max6690.c#3 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#25 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#38 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#23 integrate .. //depot/projects/smpng/sys/dev/ixgbe/LICENSE#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/README#3 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#26 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixv.c#3 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#32 integrate .. //depot/projects/smpng/sys/dev/mfi/mfireg.h#13 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#17 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcvar.h#7 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#32 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#16 integrate .. //depot/projects/smpng/sys/dev/mvs/mvs.c#7 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#26 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#49 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#75 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#125 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#46 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#33 integrate .. //depot/projects/smpng/sys/dev/puc/puc_bfe.h#3 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#55 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#15 integrate .. //depot/projects/smpng/sys/dev/sdhci/sdhci.c#9 integrate .. //depot/projects/smpng/sys/dev/siis/siis.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#50 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#46 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umcs.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/umcs.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_device.h#19 integrate .. //depot/projects/smpng/sys/dev/usb/usb_freebsd.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.h#12 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#167 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#34 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#32 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#21 integrate .. //depot/projects/smpng/sys/dev/xen/blkback/blkback.c#7 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#12 integrate .. //depot/projects/smpng/sys/dev/xen/control/control.c#2 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#20 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#16 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#42 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#67 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonkrpc.c#7 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonsubs.c#10 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_var.h#17 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsport.h#15 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsproto.h#4 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#13 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clcomsubs.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clkdtrace.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clkrpc.c#6 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnode.c#11 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#12 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clrpcops.c#12 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#15 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clsubs.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#14 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#20 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdcache.c#5 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdkrpc.c#9 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#21 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsocket.c#9 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#17 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#43 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#32 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#29 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#37 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#49 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#42 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#34 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#21 integrate .. //depot/projects/smpng/sys/geom/geom.h#59 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#58 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#62 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#12 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#65 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#36 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#14 integrate .. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#15 integrate .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#15 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#26 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_events.c#5 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#10 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#126 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#42 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#170 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#137 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#156 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#101 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#14 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#57 integrate .. //depot/projects/smpng/sys/i386/include/sf_buf.h#5 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#34 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#40 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#22 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#21 integrate .. //depot/projects/smpng/sys/ia64/acpica/acpi_machdep.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#35 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#132 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#52 integrate .. //depot/projects/smpng/sys/ia64/ia64/pal.S#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#102 integrate .. //depot/projects/smpng/sys/ia64/include/_types.h#10 integrate .. //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#18 integrate .. //depot/projects/smpng/sys/ia64/include/smp.h#15 integrate .. //depot/projects/smpng/sys/kern/device_if.m#6 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#154 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_pmc.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_racct.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_rctl.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_rmlock.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#86 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#163 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#133 integrate .. //depot/projects/smpng/sys/kern/ksched.c#6 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#56 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#102 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#117 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_msgbuf.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#60 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#42 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#68 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#76 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#142 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#134 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#138 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#71 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#163 integrate .. //depot/projects/smpng/sys/kgssapi/gss_impl.c#2 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_ebt3000_cf.c#4 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_mp.c#6 integrate .. //depot/projects/smpng/sys/mips/include/_types.h#6 integrate .. //depot/projects/smpng/sys/mips/include/atomic.h#5 integrate .. //depot/projects/smpng/sys/mips/include/hwfunc.h#5 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/mips/include/smp.h#11 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#17 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#30 integrate .. //depot/projects/smpng/sys/mips/rmi/xlr_machdep.c#11 integrate .. //depot/projects/smpng/sys/mips/sibyte/sb_scd.c#5 integrate .. //depot/projects/smpng/sys/modules/Makefile#183 integrate .. //depot/projects/smpng/sys/modules/ath/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/cxgbe/if_cxgbe/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/dtrace/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/dtrace/dtnfscl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/dtrace/dtraceall/dtraceall.c#6 integrate .. //depot/projects/smpng/sys/modules/kgssapi_krb5/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#25 integrate .. //depot/projects/smpng/sys/modules/usb/umcs/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan/Makefile#18 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#32 integrate .. //depot/projects/smpng/sys/net/bridgestp.h#10 integrate .. //depot/projects/smpng/sys/net/if.h#48 integrate .. //depot/projects/smpng/sys/net/if_epair.c#8 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#110 integrate .. //depot/projects/smpng/sys/net/if_gre.c#46 integrate .. //depot/projects/smpng/sys/net/if_gre.h#12 integrate .. //depot/projects/smpng/sys/net/if_llatbl.c#15 integrate .. //depot/projects/smpng/sys/net/if_llatbl.h#10 integrate .. //depot/projects/smpng/sys/net/if_tun.c#72 integrate .. //depot/projects/smpng/sys/net/netisr.c#26 integrate .. //depot/projects/smpng/sys/net/netisr.h#18 integrate .. //depot/projects/smpng/sys/net/netisr_internal.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_acl.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#54 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#50 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#50 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#43 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_pipe.c#9 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#19 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#91 integrate .. //depot/projects/smpng/sys/netinet/in.c#73 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#110 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#71 integrate .. //depot/projects/smpng/sys/netinet/in_pcbgroup.c#1 branch .. //depot/projects/smpng/sys/netinet/in_proto.c#42 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#30 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#78 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#117 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#23 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#16 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw2.c#17 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_dynamic.c#7 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_nat.c#11 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_sockopt.c#6 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.h#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_sctp.h#4 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#97 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#18 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#23 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#39 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.h#12 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#46 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#46 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#26 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#30 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#39 integrate .. //depot/projects/smpng/sys/netinet/sctp_var.h#17 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#47 integrate .. //depot/projects/smpng/sys/netinet/sctputil.h#23 integrate .. //depot/projects/smpng/sys/netinet/siftr.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#141 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#72 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#131 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#84 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#56 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#91 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#104 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#74 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#28 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#70 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#19 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcbgroup.c#1 branch .. //depot/projects/smpng/sys/netinet6/in6_proto.c#40 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#51 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#78 integrate .. //depot/projects/smpng/sys/netinet6/ip6_ipsec.c#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#36 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#71 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#21 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#45 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#43 integrate .. //depot/projects/smpng/sys/netinet6/send.h#2 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#64 integrate .. //depot/projects/smpng/sys/nfs/nfs_kdtrace.h#2 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#68 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_krpc.c#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#84 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#105 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#12 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#55 integrate .. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#13 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/list.h#2 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#95 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#50 integrate .. //depot/projects/smpng/sys/powerpc/aim/interrupt.c#6 integrate .. //depot/projects/smpng/sys/powerpc/aim/locore32.S#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/locore64.S#3 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#29 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#20 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#19 integrate .. //depot/projects/smpng/sys/powerpc/aim/moea64_native.c#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/mp_cpudep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/aim/ofwmagic.S#3 delete .. //depot/projects/smpng/sys/powerpc/aim/slb.c#7 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr64.S#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/locore.S#9 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#24 integrate .. //depot/projects/smpng/sys/powerpc/booke/platform_bare.c#8 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#25 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#73 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC64#8 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#22 integrate .. //depot/projects/smpng/sys/powerpc/include/_types.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/atomic.h#23 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#22 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#34 integrate .. //depot/projects/smpng/sys/powerpc/include/rtas.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/slb.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/smp.h#12 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#23 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/mpc85xx.c#6 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/mpc85xx.h#4 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/openpic_fdt.c#3 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_machdep.c#3 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_real.c#9 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofwcall32.S#1 branch .. //depot/projects/smpng/sys/powerpc/ofw/ofwcall64.S#1 branch .. //depot/projects/smpng/sys/powerpc/ofw/ofwmagic.S#1 branch .. //depot/projects/smpng/sys/powerpc/ofw/rtas.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/fcu.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/powermac_thermal.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/powermac_thermal.h#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/smu.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powermac/smusat.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/windtunnel.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#27 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#24 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#21 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pic_if.m#8 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ohci_ps3.c#1 branch .. //depot/projects/smpng/sys/powerpc/ps3/ps3bus.c#2 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3bus.h#2 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3disk.c#1 branch .. //depot/projects/smpng/sys/rpc/rpc_generic.c#7 integrate .. //depot/projects/smpng/sys/rpc/rpcsec_gss.h#2 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#109 integrate .. //depot/projects/smpng/sys/sparc64/include/_types.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/ktr.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#41 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#33 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#52 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#37 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#48 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#96 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#14 integrate .. //depot/projects/smpng/sys/sys/_cpuset.h#1 branch .. //depot/projects/smpng/sys/sys/_rmlock.h#3 integrate .. //depot/projects/smpng/sys/sys/_stdint.h#2 integrate .. //depot/projects/smpng/sys/sys/conf.h#69 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#7 integrate .. //depot/projects/smpng/sys/sys/disk.h#20 integrate .. //depot/projects/smpng/sys/sys/diskpc98.h#10 integrate .. //depot/projects/smpng/sys/sys/dtrace_bsd.h#7 integrate .. //depot/projects/smpng/sys/sys/ktr.h#31 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#88 integrate .. //depot/projects/smpng/sys/sys/mount.h#83 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#15 integrate .. //depot/projects/smpng/sys/sys/param.h#171 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#38 integrate .. //depot/projects/smpng/sys/sys/pmckern.h#8 integrate .. //depot/projects/smpng/sys/sys/proc.h#216 integrate .. //depot/projects/smpng/sys/sys/racct.h#2 integrate .. //depot/projects/smpng/sys/sys/smp.h#27 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#17 integrate .. //depot/projects/smpng/sys/sys/types.h#42 integrate .. //depot/projects/smpng/sys/sys/vnode.h#115 integrate .. //depot/projects/smpng/sys/teken/libteken/teken.3#2 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#58 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#23 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#29 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#36 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#77 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#88 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#125 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#70 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#28 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#13 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#22 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#22 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#43 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#47 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#29 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#87 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#23 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#87 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#37 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#87 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#120 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#121 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#55 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#79 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.h#8 integrate .. //depot/projects/smpng/sys/x86/x86/local_apic.c#13 integrate .. //depot/projects/smpng/sys/x86/x86/tsc.c#4 integrate .. //depot/projects/smpng/sys/xen/interface/io/xenbus.h#4 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus.c#2 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_if.m#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusb.c#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusb.h#2 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusb_back.c#2 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusb_front.c#2 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusb_if.m#2 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusvar.h#4 integrate .. //depot/projects/smpng/sys/xen/xenstore/xenstorevar.h#2 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/LOCK_PROFILING.9#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav .\" Copyright (c) 2005 Robert N. M. Watson .\" Copyright (c) 2006 Kip Macy .\" All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/LOCK_PROFILING.9,v 1.3 2009/12/16 19:37:38 julian Exp $ +.\" $FreeBSD: src/share/man/man9/LOCK_PROFILING.9,v 1.4 2011/05/22 14:03:30 uqs Exp $ .\" .Dd November 11, 2006 .Dt LOCK_PROFILING 9 ==== //depot/projects/smpng/share/man/man9/Makefile#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.390 2011/05/05 14:13:08 ae Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.391 2011/06/18 13:08:46 bz Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -860,6 +860,22 @@ mbuf.9 mtod.9 \ mbuf.9 M_TRAILINGSPACE.9 \ mbuf.9 M_WRITABLE.9 +MLINKS+=\ + mbuf_tags.9 m_tag_alloc.9 \ + mbuf_tags.9 m_tag_copy.9 \ + mbuf_tags.9 m_tag_copy_chain.9 \ + mbuf_tags.9 m_tag_delete.9 \ + mbuf_tags.9 m_tag_delete_chain.9 \ + mbuf_tags.9 m_tag_delete_nonpersistent.9 \ + mbuf_tags.9 m_tag_find.9 \ + mbuf_tags.9 m_tag_first.9 \ + mbuf_tags.9 m_tag_free.9 \ + mbuf_tags.9 m_tag_get.9 \ + mbuf_tags.9 m_tag_init.9 \ + mbuf_tags.9 m_tag_locate.9 \ + mbuf_tags.9 m_tag_next.9 \ + mbuf_tags.9 m_tag_prepend.9 \ + mbuf_tags.9 m_tag_unlink.9 MLINKS+=MD5.9 MD5Init.9 \ MD5.9 MD5Transform.9 MLINKS+=mdchain.9 md_append_record.9 \ ==== //depot/projects/smpng/share/man/man9/bus_adjust_resource.9#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_adjust_resource.9,v 1.2 2011/05/04 18:16:05 gjb Exp $ +.\" $FreeBSD: src/share/man/man9/bus_adjust_resource.9,v 1.3 2011/06/02 09:56:53 uqs Exp $ .\" .Dd April 29, 2011 .Dt BUS_ADJUST_RESOURCE 9 @@ -67,6 +67,15 @@ The .Fn bus_adjust_resource method returns zero on success or an error code on failure. +.Sh EXAMPLES +Grow an existing memory resource by 4096 bytes. +.Bd -literal + struct resource *res; + int error; + + error = bus_adjust_resource(dev, SYS_RES_MEMORY, res, + rman_get_start(res), rman_get_end(res) + 0x1000); +.Ed .Sh ERRORS .Fn bus_adjust_resource will fail if: @@ -85,15 +94,6 @@ .It Bq Er EBUSY The new address range conflicts with another allocated resource. .El -.Sh EXAMPLES -Grow an existing memory resource by 4096 bytes. -.Bd -literal - struct resource *res; - int error; - - error = bus_adjust_resource(dev, SYS_RES_MEMORY, res, - rman_get_start(res), rman_get_end(res) + 0x1000); -.Ed .Sh SEE ALSO .Xr bus_alloc_resource 9 , .Xr bus_release_resource 9 , ==== //depot/projects/smpng/share/man/man9/devfs_set_cdevpriv.9#4 (text+ko) ==== @@ -22,10 +22,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/devfs_set_cdevpriv.9,v 1.4 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/share/man/man9/devfs_set_cdevpriv.9,v 1.5 2011/05/25 14:13:53 ru Exp $ .\" .Dd September 8, 2008 -.Dt DEVFS_CDEVPRIV +.Dt DEVFS_CDEVPRIV 9 .Os .Sh NAME .Nm devfs_set_cdevpriv , ==== //depot/projects/smpng/share/man/man9/device_get_sysctl.9#2 (text) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_get_sysctl.9,v 1.2 2006/09/30 17:09:59 ru Exp $ +.\" $FreeBSD: src/share/man/man9/device_get_sysctl.9,v 1.3 2011/06/18 13:03:06 bz Exp $ .\" -.Dd May 23, 2006 +.Dd June 18, 2011 .Dt DEVICE_GET_SYSCTL 9 .Os .Sh NAME @@ -49,7 +49,7 @@ .Fn device_get_sysctl_tree function. The context for the node can be obtained with the -.Fn device_get_sysctl_ctl +.Fn device_get_sysctl_ctx function. .Sh SEE ALSO .Xr device 9 ==== //depot/projects/smpng/share/man/man9/hhook.9#3 (text+ko) ==== @@ -28,10 +28,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/hhook.9,v 1.2 2011/04/12 08:13:18 lstewart Exp $ +.\" $FreeBSD: src/share/man/man9/hhook.9,v 1.3 2011/05/25 14:13:53 ru Exp $ .\" .Dd February 15, 2011 -.Dt hhook 9 +.Dt HHOOK 9 .Os .Sh NAME .Nm hhook , ==== //depot/projects/smpng/share/man/man9/khelp.9#3 (text+ko) ==== @@ -28,10 +28,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/khelp.9,v 1.2 2011/04/12 08:13:18 lstewart Exp $ +.\" $FreeBSD: src/share/man/man9/khelp.9,v 1.3 2011/05/25 14:13:53 ru Exp $ .\" .Dd February 15, 2011 -.Dt khelp 9 +.Dt KHELP 9 .Os .Sh NAME .Nm khelp , ==== //depot/projects/smpng/share/man/man9/pseudofs.9#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/pseudofs.9,v 1.7 2008/11/05 15:07:42 des Exp $ +.\" $FreeBSD: src/share/man/man9/pseudofs.9,v 1.8 2011/05/22 14:03:30 uqs Exp $ .\" .Dd April 20, 2007 .Dt PSEUDOFS 9 ==== //depot/projects/smpng/share/man/man9/sbuf.9#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sbuf.9,v 1.34 2011/05/17 18:24:59 phk Exp $ +.\" $FreeBSD: src/share/man/man9/sbuf.9,v 1.36 2011/05/22 14:03:30 uqs Exp $ .\" .Dd January 25, 2011 .Dt SBUF 9 @@ -492,13 +492,13 @@ struct sbuf *sb; sb = sbuf_new_auto(); -sbuf_cat("Customers found:\en"); +sbuf_cat(sb, "Customers found:\en"); TAILQ_FOREACH(foo, &foolist, list) { - sbuf_printf(" %4d %s\en", foo->index, foo->name); - sbuf_printf(" Address: %s\en", foo->address); - sbuf_printf(" Zip: %s\en", foo->zipcode); + sbuf_printf(sb, " %4d %s\en", foo->index, foo->name); + sbuf_printf(sb, " Address: %s\en", foo->address); + sbuf_printf(sb, " Zip: %s\en", foo->zipcode); } -if (sbuf_finish(sb)) +if (sbuf_finish(sb)) /* Check for any and all errors */ err(1,"Could not generate message"); transmit_msg(sbuf_data(sb), sbuf_len(sb)); sbuf_delete(sb); ==== //depot/projects/smpng/share/man/man9/zone.9#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/zone.9,v 1.32 2010/10/19 16:06:00 mdf Exp $ +.\" $FreeBSD: src/share/man/man9/zone.9,v 1.33 2011/05/22 14:03:30 uqs Exp $ .\" .Dd October 9, 2010 .Dt ZONE 9 ==== //depot/projects/smpng/sys/Makefile#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.58 2011/05/14 01:53:38 attilio Exp $ +# $FreeBSD: src/sys/Makefile,v 1.59 2011/06/10 20:51:41 gibbs Exp $ .include @@ -12,7 +12,7 @@ geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfsclient nfsserver nlm opencrypto \ - pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} + pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86 .else ==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.40 2010/11/23 16:12:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.41 2011/06/07 08:46:13 attilio Exp $"); #include #include @@ -78,7 +78,7 @@ #ifdef SMP static int acpi_wakeup_ap(struct acpi_softc *, int); -static void acpi_wakeup_cpus(struct acpi_softc *, cpumask_t); +static void acpi_wakeup_cpus(struct acpi_softc *, const cpuset_t *); #endif #define WAKECODE_VADDR(sc) ((sc)->acpi_wakeaddr + (3 * PAGE_SIZE)) @@ -173,7 +173,7 @@ #define BIOS_WARM (0x0a) static void -acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus) +acpi_wakeup_cpus(struct acpi_softc *sc, const cpuset_t *wakeup_cpus) { uint32_t mpbioswarmvec; int cpu; @@ -192,7 +192,7 @@ /* Wake up each AP. */ for (cpu = 1; cpu < mp_ncpus; cpu++) { - if ((wakeup_cpus & (1 << cpu)) == 0) + if (!CPU_ISSET(cpu, wakeup_cpus)) continue; if (acpi_wakeup_ap(sc, cpu) == 0) { /* restore the warmstart vector */ @@ -214,7 +214,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) { #ifdef SMP - cpumask_t wakeup_cpus; + cpuset_t wakeup_cpus; #endif register_t cr3, rf; ACPI_STATUS status; @@ -244,10 +244,9 @@ if (savectx(susppcbs[0])) { #ifdef SMP - if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) { - device_printf(sc->acpi_dev, - "Failed to suspend APs: CPU mask = 0x%jx\n", - (uintmax_t)(wakeup_cpus & ~stopped_cpus)); + if (!CPU_EMPTY(&wakeup_cpus) && + suspend_cpus(wakeup_cpus) == 0) { + device_printf(sc->acpi_dev, "Failed to suspend APs\n"); goto out; } #endif @@ -282,8 +281,8 @@ PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); #ifdef SMP - if (wakeup_cpus != 0) - acpi_wakeup_cpus(sc, wakeup_cpus); + if (!CPU_EMPTY(&wakeup_cpus)) + acpi_wakeup_cpus(sc, &wakeup_cpus); #endif acpi_resync_clock(sc); ret = 0; @@ -291,7 +290,7 @@ out: #ifdef SMP - if (wakeup_cpus != 0) + if (!CPU_EMPTY(&wakeup_cpus)) restart_cpus(wakeup_cpus); #endif ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#42 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.52 2010/10/28 13:44:19 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.53 2011/06/07 08:46:13 attilio Exp $ */ /* @@ -443,8 +443,7 @@ * allocate CPUs round-robin. */ -/* The BSP is always a valid target. */ -static cpumask_t intr_cpus = (1 << 0); +static cpuset_t intr_cpus; static int current_cpu; /* @@ -466,7 +465,7 @@ current_cpu++; if (current_cpu > mp_maxid) current_cpu = 0; - } while (!(intr_cpus & (1 << current_cpu))); + } while (!CPU_ISSET(current_cpu, &intr_cpus)); mtx_unlock_spin(&icu_lock); return (apic_id); } @@ -497,7 +496,7 @@ printf("INTR: Adding local APIC %d as a target\n", cpu_apic_ids[cpu]); - intr_cpus |= (1 << cpu); + CPU_SET(cpu, &intr_cpus); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 20 05:59:02 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 292A11065673; Mon, 20 Jun 2011 05:59:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE37A106564A for ; Mon, 20 Jun 2011 05:59:01 +0000 (UTC) (envelope-from waz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BBFAA8FC12 for ; Mon, 20 Jun 2011 05:59:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5K5x13D012791 for ; Mon, 20 Jun 2011 05:59:01 GMT (envelope-from waz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5K5x1fe012788 for perforce@freebsd.org; Mon, 20 Jun 2011 05:59:01 GMT (envelope-from waz@FreeBSD.org) Date: Mon, 20 Jun 2011 05:59:01 GMT Message-Id: <201106200559.p5K5x1fe012788@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to waz@FreeBSD.org using -f From: Walter Artica To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 05:59:02 -0000 http://p4web.freebsd.org/@@195015?ac=10 Change 195015 by waz@waz_vm1 on 2011/06/20 05:58:41 Added tree for smbfs v2 Affected files ... .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/include/llvm/ADT/PackedVector.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/include/llvm/DefaultPasses.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/include/llvm/MC/MCWin64EH.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/include/llvm/Support/BranchProbability.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/include/llvm/Support/PassManagerBuilder.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/include/llvm/Support/Win64EH.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/CodeGen/RegisterClassInfo.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/CodeGen/RegisterClassInfo.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/MC/MCWin64EH.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/Support/BranchProbability.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/lib/Target/Mips/MipsEmitGPRestore.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/utils/TableGen/CodeGenRegisters.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/utils/TableGen/SetTheory.cpp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/llvm/utils/TableGen/SetTheory.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/sendmail/cf/ostype/solaris11.m4#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/COPYING#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/ChangeLog#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/FreeBSD-patchset#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/INSTALL#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/Makefile.in#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/NEWS#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/README#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/THANKS#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/acconfig.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/aclocal.m4#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/config.h.in#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/configure#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/configure.in#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/diffout#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/install-sh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/lukemftp.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/Makefile.in#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/cmds.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/cmdtab.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/complete.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/domacro.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/fetch.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/ftp.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/ftp.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/ftp_var.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/main.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/progressbar.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/progressbar.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/ruserpass.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/util.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/src/version.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/contrib/tnftp/todo#1 branch .. //depot/projects/soc2011/waz_smbfs/src/etc/rc.d/kld#1 branch .. //depot/projects/soc2011/waz_smbfs/src/etc/rc.d/netwait#1 branch .. //depot/projects/soc2011/waz_smbfs/src/lib/libthr/arch/sparc64/sparc64/_umtx_op_err.S#1 branch .. //depot/projects/soc2011/waz_smbfs/src/sys/fs/nfsclient/nfs_clkdtrace.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/sys/fs/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/sys/modules/dtrace/dtnfscl/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/sys/powerpc/ps3/ohci_ps3.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/sys/powerpc/ps3/ps3disk.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/build/options/WITHOUT_UTMPX#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/builtins/case6.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/builtins/case7.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/builtins/case8.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/builtins/case9.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/builtins/export1.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/builtins/set2.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/execution/bg4.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/execution/set-x1.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/execution/set-x2.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/execution/set-x3.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/expansion/cmdsubst11.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/regression/bin/sh/parameters/env1.0#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/tools/cxgbetool/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/tools/cxgbetool/cxgbetool.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/tools/cxgbetool/reg_defs_t4.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/tools/tools/cxgbetool/reg_defs_t4vf.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/usr.sbin/bsdinstall/bsdinstall.8#1 branch .. //depot/projects/soc2011/waz_smbfs/src/usr.sbin/makefs/mtree.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 20 07:38:55 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFF3B1065675; Mon, 20 Jun 2011 07:38:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B2C6106564A for ; Mon, 20 Jun 2011 07:38:54 +0000 (UTC) (envelope-from waz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 778D58FC08 for ; Mon, 20 Jun 2011 07:38:54 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5K7csq1032760 for ; Mon, 20 Jun 2011 07:38:54 GMT (envelope-from waz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5K7crtZ032757 for perforce@freebsd.org; Mon, 20 Jun 2011 07:38:53 GMT (envelope-from waz@FreeBSD.org) Date: Mon, 20 Jun 2011 07:38:53 GMT Message-Id: <201106200738.p5K7crtZ032757@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to waz@FreeBSD.org using -f From: Walter Artica To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 07:38:55 -0000 http://p4web.freebsd.org/@@195018?ac=10 Change 195018 by waz@waz_vm1 on 2011/06/20 07:38:47 Added source tree for smbfs v2 Affected files ... .. //depot/projects/soc2011/waz_smbfs/src/COPYRIGHT#1 branch .. //depot/projects/soc2011/waz_smbfs/src/LOCKS#1 branch .. //depot/projects/soc2011/waz_smbfs/src/MAINTAINERS#1 branch .. //depot/projects/soc2011/waz_smbfs/src/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/Makefile.inc1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/Makefile.mips#1 branch .. //depot/projects/soc2011/waz_smbfs/src/ObsoleteFiles.inc#1 branch .. //depot/projects/soc2011/waz_smbfs/src/README#1 branch .. //depot/projects/soc2011/waz_smbfs/src/UPDATING#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/Makefile.inc#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cat/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cat/cat.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cat/cat.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chflags/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chio/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chio/chio.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chio/chio.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chio/defs.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chmod/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cp/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cp/cp.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cp/cp.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cp/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/cp/utils.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/csh/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/csh/config.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/csh/config_p.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/csh/host.defs#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/csh/iconv_stub.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/date/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/date/date.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/date/date.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/date/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/date/netdate.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/date/vary.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/date/vary.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/args.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/conv.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/dd.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/dd.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/dd.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/gen.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/misc.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/position.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.parset#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.swab#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/df/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/df/df.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/df/df.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/domainname/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/echo/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/echo/echo.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/echo/echo.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/POSIX#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/README#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/buf.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/cbc.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/ed.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/ed.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/glbl.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/io.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/main.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/re.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/sub.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/=.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/README#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/TODO#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/a.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/a.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/a.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/c.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/c.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/c.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/d.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/d.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/d.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/d.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/h.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/i.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/i.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/i.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/j.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/j.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/j.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/k.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/k.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/k.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/l.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/l.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/l.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/m.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/m.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/m.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/m.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/n.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/n.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/n.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/p.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/p.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/p.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/q.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/q.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/q.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/u.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/u.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/u.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/u.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/v.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/v.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/v.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/w.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/w.r#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/w.t#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/x.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/test/z.err#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ed/undo.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/expr/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/expr/expr.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/expr/expr.y#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/hostname/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/kenv/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/kill/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/kill/kill.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/kill/kill.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ln/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ln/ln.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ln/ln.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ln/symlink.7#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/cmp.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/ls.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/ls.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/ls.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/print.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ls/util.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/mv/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/mv/mv.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/mv/mv.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/cache.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/cache.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/cpio.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/cpio.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/ftree.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/ftree.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/options.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/options.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/pax.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/pax.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/pax.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/tables.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/tables.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/tar.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/tar.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pkill/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pkill/pkill.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pkill/pkill.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/fmt.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/keyword.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/nlist.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/print.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/ps.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/ps.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/ps/ps.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pwait/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pwait/pwait.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pwait/pwait.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pwd/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rcp/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rcp/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rcp/util.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/realpath/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rm/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rm/rm.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rm/rm.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rmail/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/file.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/setfacl/util.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/TOUR#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/alias.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/alias.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/arith.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/arith_yacc.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/arith_yacc.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/arith_yylex.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/builtins.def#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/cd.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/cd.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/error.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/error.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/eval.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/eval.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/exec.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/exec.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/expand.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/expand.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/login#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/histedit.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/init.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/input.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/input.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/jobs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/jobs.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mail.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mail.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/main.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/main.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mktokens#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mystring.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/mystring.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/nodetypes#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/options.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/options.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/output.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/output.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/parser.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/parser.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/redir.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/redir.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/sh.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/shell.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/show.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/show.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/trap.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/trap.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/var.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sh/var.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sleep/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/cchar.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/extern.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/key.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/modes.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/print.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/stty.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/stty.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/stty.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/stty/util.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sync/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sync/sync.8#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/sync/sync.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/test/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/test/test.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/test/test.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/Makefile#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/Makefile.inc#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/sha2.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/thread_pool.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/dtracetoolkit/dtruss#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.lowfrequency.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.malformedoverflow.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.nonexistentevent.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cpcvscpustatpart1.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cpcvscpustatpart2.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cputrackfailtostart.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cputrackterminates.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.toomanyenablings.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.allcpus.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.genericevent.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.platformevent.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/soc2011/waz_smbfs/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 20 15:08:25 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D9471065675; Mon, 20 Jun 2011 15:08:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B7F1106564A for ; Mon, 20 Jun 2011 15:08:25 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 211DB8FC08 for ; Mon, 20 Jun 2011 15:08:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KF8Pev030023 for ; Mon, 20 Jun 2011 15:08:25 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KF8Ohe030020 for perforce@freebsd.org; Mon, 20 Jun 2011 15:08:25 GMT (envelope-from remko@freebsd.org) Date: Mon, 20 Jun 2011 15:08:25 GMT Message-Id: <201106201508.p5KF8Ohe030020@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 15:08:25 -0000 http://p4web.freebsd.org/@@195036?ac=10 Change 195036 by remko@remko_nakur on 2011/06/20 15:07:45 Seems we had a local breakage due to incomplete changes. Integrate the latest version from the original tree. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#26 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#62 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#22 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#23 integrate .. //depot/projects/docproj_nl/share/pgpkeys/crees.key#1 branch .. //depot/projects/docproj_nl/www/nl/index.xsl#17 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#26 (text+ko) ==== @@ -1,7 +1,7 @@ + From owner-p4-projects@FreeBSD.ORG Mon Jun 20 16:16:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B704A1065675; Mon, 20 Jun 2011 16:16:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 613A0106564A for ; Mon, 20 Jun 2011 16:16:18 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4E8608FC0A for ; Mon, 20 Jun 2011 16:16:18 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KGGIMs044588 for ; Mon, 20 Jun 2011 16:16:18 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KGGIec044585 for perforce@freebsd.org; Mon, 20 Jun 2011 16:16:18 GMT (envelope-from syuu@FreeBSD.org) Date: Mon, 20 Jun 2011 16:16:18 GMT Message-Id: <201106201616.p5KGGIec044585@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 16:16:19 -0000 http://p4web.freebsd.org/@@195038?ac=10 Change 195038 by syuu@kikurage on 2011/06/20 16:15:36 mbuf.h and priv.h aren't commited on previous commit mistakenly, so added them SOFTRSS MQ-BPF TX Handling, MQ BPF on igb bug fix Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/amd64/conf/GENERIC#2 edit .. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#6 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#8 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/if.h#3 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#3 edit .. //depot/projects/soc2011/mq_bpf/src/sys/sys/mbuf.h#3 edit .. //depot/projects/soc2011/mq_bpf/src/sys/sys/priv.h#2 edit .. //depot/projects/soc2011/mq_bpf/tests/queue_affinity.c#3 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/amd64/conf/GENERIC#2 (text+ko) ==== ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#6 (text+ko) ==== @@ -655,15 +655,15 @@ adapter->ifp->if_rxq_num = adapter->num_queues; adapter->ifp->if_txq_num = adapter->num_queues; adapter->ifp->if_rxq_affinity = - (u_long *)malloc(sizeof(u_long) * adapter->num_queues, + (u_long *)malloc(sizeof(u_long) * adapter->ifp->if_rxq_num, M_DEVBUF, M_NOWAIT); adapter->ifp->if_txq_affinity = - (u_long *)malloc(sizeof(u_long) * adapter->num_queues, + (u_long *)malloc(sizeof(u_long) * adapter->ifp->if_txq_num, M_DEVBUF, M_NOWAIT); - for (i = 0; i < adapter->num_queues; i++) { + for (i = 0; i < adapter->ifp->if_rxq_num; i++) adapter->ifp->if_rxq_affinity[i] = i; - adapter->ifp->if_rxq_affinity[i] = i; - } + for (i = 0; i < adapter->ifp->if_txq_num; i++) + adapter->ifp->if_txq_affinity[i] = i; INIT_DEBUGOUT("igb_attach: end"); return (0); ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#8 (text+ko) ==== @@ -1615,6 +1615,8 @@ case BIOCTXQAFFINITY: { u_long index; + struct ifnet *ifp; + if (d->bd_bif == NULL) { log(LOG_ERR, "d->bd_bif == NULL\n"); /* @@ -1624,7 +1626,7 @@ SDT_PROBE2(bpf, functions, bpfioctl_bioctxqaffinity, entry, -1, -1); break; } - struct ifnet *const ifp = d->bd_bif->bif_ifp; + ifp = d->bd_bif->bif_ifp; index = *(u_long *)addr; if (index > ifp->if_txq_num) { log(LOG_ERR, "BIOCTXQAFFINITY: index too large index:%lx txq_num:%x\n", index, ifp->if_txq_num); @@ -1645,6 +1647,7 @@ case BIOCENAQMASK: { + int i; struct ifnet *ifp; if (d->bd_bif == NULL) { @@ -1663,20 +1666,30 @@ break; } ifp = d->bd_bif->bif_ifp; + if (!(ifp->if_capenable & IFCAP_MULTIQUEUE)) { #ifdef SOFTRSS - if (!(ifp->if_capenable & IFCAP_MULTIQUEUE)) { ifp->if_rxq_num = netisr_get_cpucount(); - ifp->if_capabilities |= IFCAP_MULTIQUEUE; - ifp->if_capenable |= IFCAP_MULTIQUEUE; - } + ifp->if_txq_num = 1; + ifp->if_capabilities |= IFCAP_SOFT_MULTIQUEUE; + ifp->if_capenable |= IFCAP_SOFT_MULTIQUEUE; + ifp->if_rxq_affinity = + (u_long *)malloc(sizeof(u_long) * ifp->if_rxq_num, + M_DEVBUF, M_NOWAIT); + ifp->if_txq_affinity = + (u_long *)malloc(sizeof(u_long) * ifp->if_txq_num, + M_DEVBUF, M_NOWAIT); + for (i = 0; i < ifp->if_rxq_num; i++) + ifp->if_rxq_affinity[i] = i; + for (i = 0; i < ifp->if_txq_num; i++) + ifp->if_txq_affinity[i] = i; #else - if (!(ifp->if_capenable & IFCAP_MULTIQUEUE)) { log(LOG_ERR, "if doesn't support multiqueue"); error = EINVAL; SDT_PROBE1(bpf, functions, bpfioctl_biocenaqmask, entry, -1); break; +#endif } -#endif + log(LOG_DEBUG, "if_rxq_num:%d\n", ifp->if_rxq_num); log(LOG_DEBUG, "if_txq_num:%d\n", ifp->if_txq_num); d->bd_qmask.qm_enabled = TRUE; ==== //depot/projects/soc2011/mq_bpf/src/sys/net/if.h#3 (text+ko) ==== @@ -221,6 +221,7 @@ #define IFCAP_VLAN_HWTSO 0x40000 /* can do IFCAP_TSO on VLANs */ #define IFCAP_LINKSTATE 0x80000 /* the runtime link state is dynamic */ #define IFCAP_MULTIQUEUE 0x100000 +#define IFCAP_SOFT_MULTIQUEUE 0x200000 #define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM) #define IFCAP_TSO (IFCAP_TSO4 | IFCAP_TSO6) ==== //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -445,6 +445,13 @@ } #endif +#ifdef SOFTRSS + if (ifp->if_capenable & IFCAP_SOFT_MULTIQUEUE) { + m->m_pkthdr.rxqid = (uint32_t)-1; + m->m_pkthdr.txqid = 0; + } +#endif + /* * Queue message on interface, update output statistics if * successful, and start output if interface not yet active. ==== //depot/projects/soc2011/mq_bpf/src/sys/sys/mbuf.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.239 2010/08/19 11:31:03 anchie Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.241 2011/06/05 10:07:12 rwatson Exp $ */ #ifndef _SYS_MBUF_H_ @@ -118,8 +118,8 @@ uint32_t flowid; /* packet's 4-tuple system * flow identifier */ - uint32_t rxqid; - uint32_t txqid; + uint32_t rxqid; + uint32_t txqid; /* variables for hardware checksum */ int csum_flags; /* flags regarding checksum */ int csum_data; /* data field used by csum routines */ @@ -201,7 +201,10 @@ #define M_PROTO6 0x00080000 /* protocol-specific */ #define M_PROTO7 0x00100000 /* protocol-specific */ #define M_PROTO8 0x00200000 /* protocol-specific */ -#define M_FLOWID 0x00400000 /* flowid is valid */ +#define M_FLOWID 0x00400000 /* deprecated: flowid is valid */ +#define M_DISTRIBUTED 0x00800000 /* at least one layer has load balanced */ +#define M_HASHTYPEBITS 0x0F000000 /* mask of bits holding flowid hash type */ + /* * For RELENG_{6,7} steal these flags for limited multiple routing table * support. In RELENG_8 and beyond, use just one flag and a tag. @@ -217,11 +220,45 @@ (M_PROTO1|M_PROTO2|M_PROTO3|M_PROTO4|M_PROTO5|M_PROTO6|M_PROTO7|M_PROTO8) /* + * Network interface cards are able to hash protocol fields (such as IPv4 + * addresses and TCP port numbers) classify packets into flows. These flows + * can then be used to maintain ordering while delivering packets to the OS + * via parallel input queues, as well as to provide a stateless affinity + * model. NIC drivers can pass up the hash via m->m_pkthdr.flowid, and set + * m_flag fields to indicate how the hash should be interpreted by the + * network stack. + * + * Most NICs support RSS, which provides ordering and explicit affinity, and + * use the hash m_flag bits to indicate what header fields were covered by + * the hash. M_HASHTYPE_OPAQUE can be set by non-RSS cards or configurations + * that provide an opaque flow identifier, allowing for ordering and + * distribution without explicit affinity. + */ +#define M_HASHTYPE_SHIFT 24 +#define M_HASHTYPE_NONE 0x0 +#define M_HASHTYPE_RSS_IPV4 0x1 /* IPv4 2-tuple */ +#define M_HASHTYPE_RSS_TCP_IPV4 0x2 /* TCPv4 4-tuple */ +#define M_HASHTYPE_RSS_IPV6 0x3 /* IPv6 2-tuple */ +#define M_HASHTYPE_RSS_TCP_IPV6 0x4 /* TCPv6 4-tuple */ +#define M_HASHTYPE_RSS_IPV6_EX 0x5 /* IPv6 2-tuple + ext hdrs */ +#define M_HASHTYPE_RSS_TCP_IPV6_EX 0x6 /* TCPv6 4-tiple + ext hdrs */ +#define M_HASHTYPE_OPAQUE 0xf /* ordering, not affinity */ + +#define M_HASHTYPE_CLEAR(m) (m)->m_flags &= ~(M_HASHTYPEBITS) +#define M_HASHTYPE_GET(m) (((m)->m_flags & M_HASHTYPEBITS) >> \ + M_HASHTYPE_SHIFT) +#define M_HASHTYPE_SET(m, v) do { \ + (m)->m_flags &= ~M_HASHTYPEBITS; \ + (m)->m_flags |= ((v) << M_HASHTYPE_SHIFT); \ +} while (0) +#define M_HASHTYPE_TEST(m, v) (M_HASHTYPE_GET(m) == (v)) + +/* * Flags preserved when copying m_pkthdr. */ #define M_COPYFLAGS \ (M_PKTHDR|M_EOR|M_RDONLY|M_PROTOFLAGS|M_SKIP_FIREWALL|M_BCAST|M_MCAST|\ - M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_VLANTAG|M_PROMISC|M_FIB) + M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_VLANTAG|M_PROMISC|M_FIB|M_HASHTYPEBITS) /* * External buffer types: identify ext_buf type. ==== //depot/projects/soc2011/mq_bpf/src/sys/sys/priv.h#2 (text+ko) ==== @@ -388,6 +388,7 @@ #define PRIV_NETINET_REUSEPORT 504 /* Allow [rapid] port/address reuse. */ #define PRIV_NETINET_SETHDROPTS 505 /* Set certain IPv4/6 header options. */ #define PRIV_NETINET_BINDANY 506 /* Allow bind to any address. */ +#define PRIV_NETINET_HASHKEY 507 /* Get and set hash keys for IPv4/6 */ /* * IPX/SPX privileges. ==== //depot/projects/soc2011/mq_bpf/tests/queue_affinity.c#3 (text+ko) ==== @@ -48,23 +48,23 @@ printf("rxq affinity: "); for (i = 0; i < rxqlen; i++) { - int val = i; + u_long val = (u_long)i; if ((err = ioctl(bpf, BIOCRXQAFFINITY, &val)) > 0) { fprintf(stderr, "ioctl failed\n"); return err; } - printf("%d:%d ", i, val); + printf("%d:%lu ", i, val); } printf("\n"); printf("txq affinity: "); for (i = 0; i < txqlen; i++) { - int val = i; + u_long val = (u_long)i; if ((err = ioctl(bpf, BIOCTXQAFFINITY, &val)) > 0) { fprintf(stderr, "ioctl failed\n"); return err; } - printf("%d:%d ", i, val); + printf("%d:%lu ", i, val); } printf("\n"); } From owner-p4-projects@FreeBSD.ORG Mon Jun 20 18:16:56 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9A6E1065670; Mon, 20 Jun 2011 18:16:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E705106566C for ; Mon, 20 Jun 2011 18:16:56 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6BFF78FC12 for ; Mon, 20 Jun 2011 18:16:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KIGuNI069263 for ; Mon, 20 Jun 2011 18:16:56 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KIGuow069260 for perforce@freebsd.org; Mon, 20 Jun 2011 18:16:56 GMT (envelope-from syuu@FreeBSD.org) Date: Mon, 20 Jun 2011 18:16:56 GMT Message-Id: <201106201816.p5KIGuow069260@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 18:16:57 -0000 http://p4web.freebsd.org/@@195044?ac=10 Change 195044 by syuu@kikurage on 2011/06/20 18:16:04 rmlock on BPFIF_LOCK looks working now Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#9 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.h#5 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#4 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#9 (text+ko) ==== @@ -603,12 +603,12 @@ * Finally, point the driver's bpf cookie at the interface so * it will divert packets to bpf. */ - BPFIF_LOCK(bp); + BPFIF_WLOCK(bp); d->bd_bif = bp; LIST_INSERT_HEAD(&bp->bif_dlist, d, bd_next); bpf_bpfd_cnt++; - BPFIF_UNLOCK(bp); + BPFIF_WUNLOCK(bp); EVENTHANDLER_INVOKE(bpf_track, bp->bif_ifp, bp->bif_dlt, 1); } @@ -624,7 +624,7 @@ struct ifnet *ifp; bp = d->bd_bif; - BPFIF_LOCK(bp); + BPFIF_WLOCK(bp); BPFD_LOCK(d); ifp = d->bd_bif->bif_ifp; @@ -636,7 +636,7 @@ bpf_bpfd_cnt--; d->bd_bif = NULL; BPFD_UNLOCK(d); - BPFIF_UNLOCK(bp); + BPFIF_WUNLOCK(bp); EVENTHANDLER_INVOKE(bpf_track, ifp, bp->bif_dlt, 0); @@ -2249,9 +2249,10 @@ #endif u_int slen; int gottime; + struct rm_priotracker tracker; gottime = BPF_TSTAMP_NONE; - BPFIF_LOCK(bp); + BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { if (d->bd_qmask.qm_enabled) { SDT_PROBE2(bpf, functions, bpf_tap, entry, d, d->bd_qmask.qm_other_mask); @@ -2286,7 +2287,7 @@ } BPFD_UNLOCK(d); } - BPFIF_UNLOCK(bp); + BPFIF_RUNLOCK(bp, &tracker); } #define BPF_CHECK_DIRECTION(d, r, i) \ @@ -2303,6 +2304,7 @@ #endif u_int pktlen, slen; int gottime; + struct rm_priotracker tracker; /* Skip outgoing duplicate packets. */ if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) { @@ -2313,7 +2315,7 @@ pktlen = m_length(m, NULL); gottime = BPF_TSTAMP_NONE; - BPFIF_LOCK(bp); + BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { if (d->bd_qmask.qm_enabled) { if (!(m->m_flags & M_FLOWID)) { @@ -2365,7 +2367,7 @@ } BPFD_UNLOCK(d); } - BPFIF_UNLOCK(bp); + BPFIF_RUNLOCK(bp, &tracker); } /* @@ -2380,6 +2382,7 @@ struct bpf_d *d; u_int pktlen, slen; int gottime; + struct rm_priotracker tracker; /* Skip outgoing duplicate packets. */ if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) { @@ -2399,7 +2402,7 @@ pktlen += dlen; gottime = BPF_TSTAMP_NONE; - BPFIF_LOCK(bp); + BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { if (d->bd_qmask.qm_enabled) { SDT_PROBE3(bpf, functions, bpf_mtap2_rx, entry, d, m->m_pkthdr.rxqid, bp->bif_ifp->if_rxq_num); @@ -2429,7 +2432,7 @@ } BPFD_UNLOCK(d); } - BPFIF_UNLOCK(bp); + BPFIF_RUNLOCK(bp, &tracker); } #undef BPF_CHECK_DIRECTION @@ -2706,7 +2709,7 @@ LIST_INIT(&bp->bif_dlist); bp->bif_ifp = ifp; bp->bif_dlt = dlt; - mtx_init(&bp->bif_mtx, "bpf interface lock", NULL, MTX_DEF); + BPFIF_LOCK_INIT(bp, "bpf interface lock"); KASSERT(*driverp == NULL, ("bpfattach2: driverp already initialized")); *driverp = bp; @@ -2756,7 +2759,7 @@ BPFD_UNLOCK(d); } - mtx_destroy(&bp->bif_mtx); + BPFIF_LOCK_DESTROY(bp); free(bp, M_BPF); } @@ -2854,10 +2857,11 @@ { struct bpf_if *bp; struct bpf_d *bd; + struct rm_priotracker tracker; mtx_lock(&bpf_mtx); LIST_FOREACH(bp, &bpf_iflist, bif_next) { - BPFIF_LOCK(bp); + BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(bd, &bp->bif_dlist, bd_next) { BPFD_LOCK(bd); bd->bd_rcount = 0; @@ -2868,7 +2872,7 @@ bd->bd_zcopy = 0; BPFD_UNLOCK(bd); } - BPFIF_UNLOCK(bp); + BPFIF_RUNLOCK(bp, &tracker); } mtx_unlock(&bpf_mtx); } @@ -2911,6 +2915,7 @@ int index, error; struct bpf_if *bp; struct bpf_d *bd; + struct rm_priotracker tracker; /* * XXX This is not technically correct. It is possible for non @@ -2949,14 +2954,14 @@ } index = 0; LIST_FOREACH(bp, &bpf_iflist, bif_next) { - BPFIF_LOCK(bp); + BPFIF_RLOCK(bp, &tracker); LIST_FOREACH(bd, &bp->bif_dlist, bd_next) { xbd = &xbdbuf[index++]; BPFD_LOCK(bd); bpfstats_fill_xbpf(xbd, bd); BPFD_UNLOCK(bd); } - BPFIF_UNLOCK(bp); + BPFIF_RUNLOCK(bp, &tracker); } mtx_unlock(&bpf_mtx); error = SYSCTL_OUT(req, xbdbuf, index * sizeof(*xbd)); ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.h#5 (text+ko) ==== @@ -40,6 +40,9 @@ #ifndef _NET_BPF_H_ #define _NET_BPF_H_ +#include +#include + /* BSD style release date */ #define BPF_RELEASE 199606 @@ -1114,7 +1117,7 @@ u_int bif_dlt; /* link layer type */ u_int bif_hdrlen; /* length of link header */ struct ifnet *bif_ifp; /* corresponding interface */ - struct mtx bif_mtx; /* mutex for interface */ + struct rmlock bif_lock; /* rmlock for interface */ }; void bpf_bufheld(struct bpf_d *d); ==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpfdesc.h#4 (text+ko) ==== @@ -152,7 +152,12 @@ u_int64_t bd_spare[4]; }; -#define BPFIF_LOCK(bif) mtx_lock(&(bif)->bif_mtx) -#define BPFIF_UNLOCK(bif) mtx_unlock(&(bif)->bif_mtx) +#define BPFIF_LOCK_INIT(bif, d) \ + rm_init_flags(&(bif)->bif_lock, (d), RM_NOWITNESS | RM_RECURSE); +#define BPFIF_LOCK_DESTROY(bif) rm_destroy(&(bif)->bif_lock) +#define BPFIF_RLOCK(bif, tracker) rm_rlock(&(bif)->bif_lock, tracker) +#define BPFIF_RUNLOCK(bif, tracker) rm_runlock(&(bif)->bif_lock, tracker) +#define BPFIF_WLOCK(bif) rm_wlock(&(bif)->bif_lock) +#define BPFIF_WUNLOCK(bif) rm_wunlock(&(bif)->bif_lock) #endif From owner-p4-projects@FreeBSD.ORG Mon Jun 20 18:30:07 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1CAA106567D; Mon, 20 Jun 2011 18:30:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64891106567B for ; Mon, 20 Jun 2011 18:30:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 491208FC14 for ; Mon, 20 Jun 2011 18:30:07 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KIU7qu071299 for ; Mon, 20 Jun 2011 18:30:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KIU7NI071296 for perforce@freebsd.org; Mon, 20 Jun 2011 18:30:07 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Jun 2011 18:30:07 GMT Message-Id: <201106201830.p5KIU7NI071296@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 18:30:07 -0000 http://p4web.freebsd.org/@@195046?ac=10 Change 195046 by jhb@jhb_jhbbsd on 2011/06/20 18:30:03 Style fixes and make pci_clear_bars actually do something. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci.c#21 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci.c#21 (text+ko) ==== @@ -2494,7 +2494,8 @@ pci_write_config(dev, pm->pm_reg + 4, base >> 32, 4); pm->pm_value = pci_read_config(dev, pm->pm_reg, 4); if (ln2range == 64) - pm->pm_value |= (pci_addr_t)pci_read_config(dev, pm->pm_reg + 4, 4) << 32; + pm->pm_value |= (pci_addr_t)pci_read_config(dev, + pm->pm_reg + 4, 4) << 32; } struct pci_map * @@ -2690,9 +2691,9 @@ } count = (pci_addr_t)1 << mapsize; - if (basezero || base == pci_mapbase(testval)) { + if (basezero || base == pci_mapbase(testval) || pci_clear_bars) { start = 0; /* Let the parent decide. */ - end = ~0ULL; + end = ~0ul; } else { start = base; end = base + count - 1; From owner-p4-projects@FreeBSD.ORG Mon Jun 20 19:17:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C0D01065675; Mon, 20 Jun 2011 19:17:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E9DA1065672 for ; Mon, 20 Jun 2011 19:17:20 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 132938FC21 for ; Mon, 20 Jun 2011 19:17:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KJHJU4081078 for ; Mon, 20 Jun 2011 19:17:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KJHJMA081075 for perforce@freebsd.org; Mon, 20 Jun 2011 19:17:19 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Jun 2011 19:17:19 GMT Message-Id: <201106201917.p5KJHJMA081075@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 19:17:20 -0000 http://p4web.freebsd.org/@@195050?ac=10 Change 195050 by jhb@jhb_pipkin on 2011/06/20 19:16:50 Compile fixes on i386. Affected files ... .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#20 edit .. //depot/projects/pci/sys/dev/acpica/acpi_resource.c#6 edit .. //depot/projects/pci/sys/x86/x86/mptable.c#8 edit Differences ... ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#20 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -254,7 +255,7 @@ } if (max > ULONG_MAX) { device_printf(sc->ap_dev, - "Truncating end of range above 4GB (%#jx-%#jx)\n", + "Truncating end of %d range above 4GB (%#jx-%#jx)\n", type, (uintmax_t)min, (uintmax_t)max); max = ULONG_MAX; } @@ -262,8 +263,8 @@ error = pcib_host_res_decodes(&sc->ap_host_res, type, min, max, flags); if (error) - panic("Failed to manage %d range (%#jx-%#jx): %d", type, - (uintmax_t)min, (uintmax_t)max, error); + panic("Failed to manage %d range (%#jx-%#jx): %d", + type, (uintmax_t)min, (uintmax_t)max, error); break; default: break; ==== //depot/projects/pci/sys/dev/acpica/acpi_resource.c#6 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -330,8 +331,8 @@ } #ifdef __i386__ - if (min > ULONG_MAX || res->Data.Address.MaxAddressFixed && max > - ULONG_MAX) { + if (min > ULONG_MAX || (res->Data.Address.MaxAddressFixed && max > + ULONG_MAX)) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "ignored %s above 4G\n", name)); break; ==== //depot/projects/pci/sys/x86/x86/mptable.c#8 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #ifdef NEW_PCIB #include @@ -1148,7 +1149,7 @@ } if (end > ULONG_MAX) { device_printf(args->dev, - "Truncating end of range above 4GB (%#jx-%#jx)\n", + "Truncating end of %d range above 4GB (%#jx-%#jx)\n", type, (uintmax_t)start, (uintmax_t)end); end = ULONG_MAX; } @@ -1156,8 +1157,8 @@ error = pcib_host_res_decodes(&args->sc->sc_host_res, type, start, end, flags); if (error) - panic("Failed to manage %d range (%#jx-%#jx): %d", type, - (uintmax_t)start, (uintmax_t)end, error); + panic("Failed to manage %d range (%#jx-%#jx): %d", + type, (uintmax_t)start, (uintmax_t)end, error); break; case MPCT_EXTENTRY_CBASM: cbasm = (cbasm_entry_ptr)entry; From owner-p4-projects@FreeBSD.ORG Mon Jun 20 20:48:26 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 280BE1065675; Mon, 20 Jun 2011 20:48:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF0E9106566B for ; Mon, 20 Jun 2011 20:48:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CD4A38FC08 for ; Mon, 20 Jun 2011 20:48:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KKmPUd099010 for ; Mon, 20 Jun 2011 20:48:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KKmP5b099007 for perforce@freebsd.org; Mon, 20 Jun 2011 20:48:25 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Jun 2011 20:48:25 GMT Message-Id: <201106202048.p5KKmP5b099007@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 20:48:26 -0000 http://p4web.freebsd.org/@@195053?ac=10 Change 195053 by jhb@jhb_jhbbsd on 2011/06/20 20:47:23 80 cols. Affected files ... .. //depot/projects/pci/sys/x86/x86/mptable_pci.c#12 edit Differences ... ==== //depot/projects/pci/sys/x86/x86/mptable_pci.c#12 (text+ko) ==== @@ -147,8 +147,8 @@ case -1: return (NULL); case 1: - return (bus_generic_alloc_resource(dev, child, type, rid, - start, end, count, flags)); + return (bus_generic_alloc_resource(dev, child, + type, rid, start, end, count, flags)); default: break; } @@ -158,8 +158,8 @@ case -1: return (NULL); case 1: - return (bus_generic_alloc_resource(dev, child, type, rid, - start, end, count, flags)); + return (bus_generic_alloc_resource(dev, child, + type, rid, start, end, count, flags)); default: break; } From owner-p4-projects@FreeBSD.ORG Mon Jun 20 20:49:32 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D6531065672; Mon, 20 Jun 2011 20:49:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C452B106566C for ; Mon, 20 Jun 2011 20:49:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B29188FC15 for ; Mon, 20 Jun 2011 20:49:31 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KKnVY9099051 for ; Mon, 20 Jun 2011 20:49:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KKnVqD099048 for perforce@freebsd.org; Mon, 20 Jun 2011 20:49:31 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Jun 2011 20:49:31 GMT Message-Id: <201106202049.p5KKnVqD099048@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 20:49:32 -0000 http://p4web.freebsd.org/@@195054?ac=10 Change 195054 by jhb@jhb_jhbbsd on 2011/06/20 20:48:48 Oops, allocate the full softc. Affected files ... .. //depot/projects/pci/sys/x86/x86/mptable_pci.c#13 edit Differences ... ==== //depot/projects/pci/sys/x86/x86/mptable_pci.c#13 (text+ko) ==== @@ -223,7 +223,8 @@ static devclass_t hostb_devclass; -DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); +DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, + sizeof(struct mptable_hostb_softc)); DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); /* PCI to PCI bridge driver. */ From owner-p4-projects@FreeBSD.ORG Mon Jun 20 21:52:02 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC3851065674; Mon, 20 Jun 2011 21:52:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF122106566B for ; Mon, 20 Jun 2011 21:52:01 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9CA2F8FC16 for ; Mon, 20 Jun 2011 21:52:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KLq1Fk012905 for ; Mon, 20 Jun 2011 21:52:01 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KLq1nr012902 for perforce@freebsd.org; Mon, 20 Jun 2011 21:52:01 GMT (envelope-from jceel@freebsd.org) Date: Mon, 20 Jun 2011 21:52:01 GMT Message-Id: <201106202152.p5KLq1nr012902@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 21:52:02 -0000 http://p4web.freebsd.org/@@195059?ac=10 Change 195059 by jceel@jceel_cyclone on 2011/06/20 21:51:11 Switch to new NFS client. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#3 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#3 (text+ko) ==== @@ -16,7 +16,7 @@ options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem -options NFSCLIENT #Network Filesystem Client +options NFSCL #Network Filesystem Client options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT options BOOTP From owner-p4-projects@FreeBSD.ORG Mon Jun 20 21:52:02 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85ACC1065745; Mon, 20 Jun 2011 21:52:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFB611065672 for ; Mon, 20 Jun 2011 21:52:01 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BE2AD8FC17 for ; Mon, 20 Jun 2011 21:52:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KLq1qo012911 for ; Mon, 20 Jun 2011 21:52:01 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KLq1kY012908 for perforce@freebsd.org; Mon, 20 Jun 2011 21:52:01 GMT (envelope-from jceel@freebsd.org) Date: Mon, 20 Jun 2011 21:52:01 GMT Message-Id: <201106202152.p5KLq1kY012908@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 21:52:02 -0000 http://p4web.freebsd.org/@@195060?ac=10 Change 195060 by jceel@jceel_cyclone on 2011/06/20 21:51:26 Fix board reset. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_machdep.c#2 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_machdep.c#2 (text+ko) ==== @@ -675,7 +675,7 @@ { /* Enable WDT */ bus_space_write_4(fdtbus_bs_tag, - LPC_CLKPWR_BASE, LPC_CLKPWR_PWMCLK_CTRL, + LPC_CLKPWR_BASE, LPC_CLKPWR_TIMCLK_CTRL, LPC_CLKPWR_TIMCLK_CTRL_WATCHDOG); /* Instant assert of RESETOUT_N with pulse length 1ms */ From owner-p4-projects@FreeBSD.ORG Mon Jun 20 21:54:14 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FFB31065673; Mon, 20 Jun 2011 21:54:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D69F0106566B for ; Mon, 20 Jun 2011 21:54:13 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C4B8D8FC19 for ; Mon, 20 Jun 2011 21:54:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KLsDGG013090 for ; Mon, 20 Jun 2011 21:54:13 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KLsDSh013087 for perforce@freebsd.org; Mon, 20 Jun 2011 21:54:13 GMT (envelope-from jceel@freebsd.org) Date: Mon, 20 Jun 2011 21:54:13 GMT Message-Id: <201106202154.p5KLsDSh013087@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 21:54:14 -0000 http://p4web.freebsd.org/@@195061?ac=10 Change 195061 by jceel@jceel_cyclone on 2011/06/20 21:54:10 Add working RTC driver. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_rtc.c#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#2 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#2 (text+ko) ==== @@ -8,6 +8,7 @@ arm/lpc/lpc_pwr.c standard arm/lpc/lpc_intc.c standard arm/lpc/lpc_timer.c standard +arm/lpc/lpc_rtc.c standard arm/lpc/if_lpe.c optional lpe dev/uart/uart_dev_ns8250.c optional uart kern/kern_clocksource.c standard ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_rtc.c#2 (text+ko) ==== @@ -38,15 +38,20 @@ #include #include +#include +#include +#include + #include #include "clock_if.h" struct lpc_rtc_softc { + device_t lr_dev; struct resource * lr_mem_res; - struct bus_space_tag_t lr_tag; - struct bus_space_handle_t lr_handle + bus_space_tag_t lr_bst; + bus_space_handle_t lr_bsh; }; static int lpc_rtc_probe(device_t dev); @@ -58,16 +63,77 @@ lpc_rtc_probe(device_t dev) { + if (!ofw_bus_is_compatible(dev, "lpc,rtc")) + return (ENXIO); + + device_set_desc(dev, "LPC32x0 real time clock"); + return (BUS_PROBE_DEFAULT); } static int lpc_rtc_attach(device_t dev) { + struct lpc_rtc_softc *sc = device_get_softc(dev); + int rid = 0; + + sc->lr_dev = dev; + + clock_register(dev, 1000000); + + sc->lr_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (!sc->lr_mem_res) { + device_printf(dev, "cannot allocate memory window\n"); + return (ENXIO); + } + + sc->lr_bst = rman_get_bustag(sc->lr_mem_res); + sc->lr_bsh = rman_get_bushandle(sc->lr_mem_res); + + return (0); +} + +static int +lpc_rtc_gettime(device_t dev, struct timespec *ts) +{ + struct lpc_rtc_softc *sc = device_get_softc(dev); + + ts->tv_sec = bus_space_read_4(sc->lr_bst, sc->lr_bsh, LPC_RTC_UCOUNT); + ts->tv_nsec = 0; + + return (0); +} + +static int +lpc_rtc_settime(device_t dev, struct timespec *ts) +{ + struct lpc_rtc_softc *sc = device_get_softc(dev); + uint32_t ctrl; + + /* Stop RTC */ + ctrl = bus_space_read_4(sc->lr_bst, sc->lr_bsh, LPC_RTC_CTRL); + bus_space_write_4(sc->lr_bst, sc->lr_bsh, LPC_RTC_CTRL, ctrl | LPC_RTC_CTRL_DISABLE); + /* Write actual value */ + bus_space_write_4(sc->lr_bst, sc->lr_bsh, LPC_RTC_UCOUNT, ts->tv_sec); + + /* Start RTC */ + ctrl = bus_space_read_4(sc->lr_bst, sc->lr_bsh, LPC_RTC_CTRL); + bus_space_write_4(sc->lr_bst, sc->lr_bsh, LPC_RTC_CTRL, ctrl & ~LPC_RTC_CTRL_DISABLE); + + return (0); } static device_method_t lpc_rtc_methods[] = { - + /* Device interface */ + DEVMETHOD(device_probe, lpc_rtc_probe), + DEVMETHOD(device_attach, lpc_rtc_attach), + + /* Clock interface */ + DEVMETHOD(clock_gettime, lpc_rtc_gettime), + DEVMETHOD(clock_settime, lpc_rtc_settime), + + { 0, 0 }, }; static driver_t lpc_rtc_driver = { ==== //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#2 (text+ko) ==== @@ -91,6 +91,13 @@ interrupt-parent = <&PIC>; }; + rtc@24000 { + compatible = "lpc,rtc"; + reg = <0x24000 0x4000>; + interrupts = <52>; + interrupt-parent = <&PIC>; + }; + serial0: serial@14000 { compatible = "ns16550"; status = "disabled"; From owner-p4-projects@FreeBSD.ORG Mon Jun 20 21:56:25 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B52C91065676; Mon, 20 Jun 2011 21:56:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76EF0106566B for ; Mon, 20 Jun 2011 21:56:25 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 659FC8FC1C for ; Mon, 20 Jun 2011 21:56:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5KLuPQL013152 for ; Mon, 20 Jun 2011 21:56:25 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KLuPGB013149 for perforce@freebsd.org; Mon, 20 Jun 2011 21:56:25 GMT (envelope-from jceel@freebsd.org) Date: Mon, 20 Jun 2011 21:56:25 GMT Message-Id: <201106202156.p5KLuPGB013149@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2011 21:56:25 -0000 http://p4web.freebsd.org/@@195062?ac=10 Change 195062 by jceel@jceel_cyclone on 2011/06/20 21:55:28 Temporary workaround for broken link status reporting in if_lpe. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/net/route.h#2 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/net/route.h#2 (text+ko) ==== @@ -319,8 +319,11 @@ #ifdef _KERNEL +#if 0 #define RT_LINK_IS_UP(ifp) (!((ifp)->if_capabilities & IFCAP_LINKSTATE) \ || (ifp)->if_link_state == LINK_STATE_UP) +#endif +#define RT_LINK_IS_UP(ifp) (1) #define RT_LOCK_INIT(_rt) \ mtx_init(&(_rt)->rt_mtx, "rtentry", NULL, MTX_DEF | MTX_DUPOK) From owner-p4-projects@FreeBSD.ORG Tue Jun 21 07:23:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5859C1065674; Tue, 21 Jun 2011 07:23:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 121B7106566C for ; Tue, 21 Jun 2011 07:23:20 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DABA08FC08 for ; Tue, 21 Jun 2011 07:23:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5L7NJ6Z027123 for ; Tue, 21 Jun 2011 07:23:19 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5L7NJBP027120 for perforce@freebsd.org; Tue, 21 Jun 2011 07:23:19 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 21 Jun 2011 07:23:19 GMT Message-Id: <201106210723.p5L7NJBP027120@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 07:23:20 -0000 http://p4web.freebsd.org/@@195083?ac=10 Change 195083 by cnicutar@cnicutar_cronos on 2011/06/21 07:23:07 Record the received UTO for a connection. The value can be retrieved using TCP_RCVUTO_TIMEOUT. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_input.c#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_input.c#2 (text+ko) ==== @@ -1082,12 +1082,26 @@ * SYN appears to be valid. Create compressed TCP state * for syncache. */ + #ifdef TCPDEBUG if (so->so_options & SO_DEBUG) tcp_trace(TA_INPUT, ostate, tp, (void *)tcp_saveipgen, &tcp_savetcp, 0); #endif tcp_dooptions(&to, optp, optlen, TO_SYN); + + if (to.to_flags & TOF_UTO) { + if (tp->t_flags & TF_RCV_UTO) + tp->rcv_uto = (to.to_uto & 0x8000) ? + (to.to_uto & 0x7FFF) * 60 : to.to_uto; + + /* + * XXX-CN Using option both for send and receive. + * Clear it for syncache. + */ + to.to_flags &= ~TOF_UTO; + } + syncache_add(&inc, &to, th, inp, &so, m); /* * Entry added to syncache and mbuf consumed. @@ -1270,6 +1284,11 @@ (th->th_off << 2) - sizeof(struct tcphdr), (thflags & TH_SYN) ? TO_SYN : 0); + /* Processing received UTO. */ + if ((to.to_flags & TOF_UTO) && (tp->t_flags & TF_RCV_UTO)) + tp->rcv_uto = (to.to_uto & 0x8000) ? + (to.to_uto & 0x7FFF) * 60 : to.to_uto; + /* * If echoed timestamp is later than the current time, * fall back to non RFC1323 RTT calculation. Normalize @@ -3029,6 +3048,17 @@ to->to_sacks = cp + 2; TCPSTAT_INC(tcps_sack_rcv_blocks); break; + case TCPOPT_UTO: + if (optlen != TCPOLEN_UTO) + continue; + if (!V_uto_enable) + continue; + to->to_flags |= TOF_UTO; + bcopy((char *)cp + 2, + (char *)&to->to_uto, sizeof(to->to_uto)); + to->to_uto = htons(to->to_uto); + /* Avoid converting to seconds: it might overflow. */ + break; default: continue; } From owner-p4-projects@FreeBSD.ORG Tue Jun 21 07:24:24 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 802331065670; Tue, 21 Jun 2011 07:24:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42BB0106566B for ; Tue, 21 Jun 2011 07:24:24 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 175588FC08 for ; Tue, 21 Jun 2011 07:24:24 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5L7ONrh027158 for ; Tue, 21 Jun 2011 07:24:23 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5L7ONoM027155 for perforce@freebsd.org; Tue, 21 Jun 2011 07:24:23 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 21 Jun 2011 07:24:23 GMT Message-Id: <201106210724.p5L7ONoM027155@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195084 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 07:24:24 -0000 http://p4web.freebsd.org/@@195084?ac=10 Change 195084 by cnicutar@cnicutar_cronos on 2011/06/21 07:24:09 Send UTO when sending SYN-ACK Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_syncache.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_syncache.h#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_syncache.c#2 (text+ko) ==== @@ -1045,6 +1045,12 @@ win = sbspace(&so->so_rcv); sb_hiwat = so->so_rcv.sb_hiwat; ltflags = (tp->t_flags & (TF_NOOPT | TF_SIGNATURE)); + + /* Set User Timeout to send in SYN-ACK. */ + if (tp->t_flags & TF_SND_UTO) { + to->to_uto = tp->snd_uto; + to->to_flags |= TOF_UTO; + } /* By the time we drop the lock these should no longer be used. */ so = NULL; @@ -1250,6 +1256,10 @@ sc->sc_flags |= SCF_NOOPT; if ((th->th_flags & (TH_ECE|TH_CWR)) && V_tcp_do_ecn) sc->sc_flags |= SCF_ECN; + if (to->to_flags & TOF_UTO) { + sc->sc_uto = to->to_uto; + sc->sc_flags |= SCF_UTO; + } if (V_tcp_syncookies) { syncookie_generate(sch, sc, &flowtmp); @@ -1412,6 +1422,10 @@ } if (sc->sc_flags & SCF_SACK) to.to_flags |= TOF_SACKPERM; + if (sc->sc_flags & SCF_UTO) { + to.to_uto = sc->sc_uto; + to.to_flags |= TOF_UTO; + } #ifdef TCP_SIGNATURE if (sc->sc_flags & SCF_SIGNATURE) to.to_flags |= TOF_SIGNATURE; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_syncache.h#2 (text+ko) ==== @@ -74,6 +74,7 @@ u_int8_t sc_ip_tos; /* IPv4 TOS */ u_int8_t sc_requested_s_scale:4, sc_requested_r_scale:4; + u_int16_t sc_uto; /* user timeout to send */ u_int16_t sc_flags; #ifndef TCP_OFFLOAD_DISABLE struct toe_usrreqs *sc_tu; /* TOE operations */ @@ -94,6 +95,7 @@ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ #define SCF_ECN 0x100 /* send ECN setup packet */ +#define SCF_UTO 0x200 /* send UTO */ #define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ #define SYNCOOKIE_LIFETIME 16 /* seconds */ From owner-p4-projects@FreeBSD.ORG Tue Jun 21 07:25:29 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E501065670; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76A83106564A for ; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 621A98FC0A for ; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5L7PT5q027192 for ; Tue, 21 Jun 2011 07:25:29 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5L7PTX3027189 for perforce@freebsd.org; Tue, 21 Jun 2011 07:25:29 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 21 Jun 2011 07:25:29 GMT Message-Id: <201106210725.p5L7PTX3027189@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 07:25:30 -0000 http://p4web.freebsd.org/@@195085?ac=10 Change 195085 by cnicutar@cnicutar_cronos on 2011/06/21 07:24:32 Fix ABI compatibility (broken in 194756) Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_var.h#3 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_var.h#3 (text+ko) ==== @@ -198,14 +198,15 @@ int t_sndzerowin; /* zero-window updates sent */ - uint32_t snd_uto; /* sent timeout */ - uint32_t rcv_uto; /* received suggestion from peer */ void *t_pspare2[6]; /* 2 CC / 4 TBD */ - uint64_t _pad[9]; /* 6 UTO, 3 TBD (1-2 CC/RTT?) */ + uint64_t _pad[8]; /* 5 UTO, 3 TBD (1-2 CC/RTT?) */ uint64_t t_sndrexmitpack;/* retransmit packets sent */ uint64_t t_rcvoopack; /* out-of-order packets received */ + + uint64_t snd_uto; /* sent timeout */ + uint64_t rcv_uto; /* received suggestion from peer */ }; /* @@ -575,6 +576,7 @@ VNET_DECLARE(int, path_mtu_discovery); VNET_DECLARE(int, ss_fltsz); VNET_DECLARE(int, ss_fltsz_local); +VNET_DECLARE(int, uto_enable); VNET_DECLARE(int, uto_min_timeout); VNET_DECLARE(int, uto_max_timeout); VNET_DECLARE(int, uto_def_timeout); @@ -591,6 +593,7 @@ #define V_path_mtu_discovery VNET(path_mtu_discovery) #define V_ss_fltsz VNET(ss_fltsz) #define V_ss_fltsz_local VNET(ss_fltsz_local) +#define V_uto_enable VNET(uto_enable) #define V_uto_min_timeout VNET(uto_min_timeout) #define V_uto_max_timeout VNET(uto_max_timeout) #define V_uto_def_timeout VNET(uto_def_timeout) From owner-p4-projects@FreeBSD.ORG Tue Jun 21 07:25:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CDE8106576D; Tue, 21 Jun 2011 07:25:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DE35106566B for ; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 838F68FC19 for ; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5L7PTAa027198 for ; Tue, 21 Jun 2011 07:25:29 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5L7PTgY027195 for perforce@freebsd.org; Tue, 21 Jun 2011 07:25:29 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 21 Jun 2011 07:25:29 GMT Message-Id: <201106210725.p5L7PTgY027195@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 07:25:30 -0000 http://p4web.freebsd.org/@@195086?ac=10 Change 195086 by cnicutar@cnicutar_cronos on 2011/06/21 07:24:52 Cleanup style (broken in previous changelist) Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_output.c#3 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_usrreq.c#3 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_output.c#3 (text+ko) ==== @@ -1375,21 +1375,6 @@ bcopy((u_char *)&to->to_mss, optp, sizeof(to->to_mss)); optp += sizeof(to->to_mss); break; - case TOF_UTO: - while (optlen % 4) { - optlen += TCPOLEN_NOP; - *optp++ = TCPOPT_NOP; - } - if (TCP_MAXOLEN - optlen < TCPOLEN_UTO) - continue; - optlen += TCPOLEN_UTO; - *optp++ = TCPOPT_UTO; - *optp++ = TCPOLEN_UTO; - - to->to_uto = htons(to->to_uto); - bcopy((u_char *)&to->to_uto, optp, sizeof(to->to_uto)); - optp += sizeof(to->to_uto); - break; case TOF_SCALE: while (!optlen || optlen % 2 != 1) { optlen += TCPOLEN_NOP; @@ -1478,6 +1463,21 @@ TCPSTAT_INC(tcps_sack_send_blocks); break; } + case TOF_UTO: + while (optlen % 4) { + optlen += TCPOLEN_NOP; + *optp++ = TCPOPT_NOP; + } + if (TCP_MAXOLEN - optlen < TCPOLEN_UTO) + continue; + optlen += TCPOLEN_UTO; + *optp++ = TCPOPT_UTO; + *optp++ = TCPOLEN_UTO; + + to->to_uto = htons(to->to_uto); + bcopy((u_char *)&to->to_uto, optp, sizeof(to->to_uto)); + optp += sizeof(to->to_uto); + break; default: panic("%s: unknown TCP option type", __func__); break; ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_usrreq.c#3 (text+ko) ==== @@ -1305,22 +1305,26 @@ INP_WLOCK_RECHECK(inp); if (optval == 0) { - /* disable sending the option */ + /* Disable sending the option. */ tp->t_flags &= ~TF_SND_UTO; tp->snd_uto = 0; - } - else if (optval >= V_uto_min_timeout && - optval <= V_uto_max_timeout) { - /* acceptable timeout */ - /* - * TODO set granularity - */ + } else if (optval >= V_uto_min_timeout && + optval <= V_uto_max_timeout) { + /* The timeout is acceptable. */ + tp->snd_uto = optval; + if (tp->snd_uto > 3600) { + /* + * If the timeout is larger than 3600 + * we'll specify minutes. + * XXX-CN 3600 is arbitrary. + */ + tp->snd_uto /= 60; + tp->snd_uto |= 0x8000; + } tp->t_flags |= TF_SND_UTO; - tp->snd_uto = optval; - } - else { + } else error = EINVAL; - } + INP_WUNLOCK(inp); break; @@ -1332,13 +1336,11 @@ return (error); INP_WLOCK_RECHECK(inp); - if (optval <= 0) { - /* this connection will disregard suggestions */ + if (optval <= 0) + /* This connection will ignore suggestions. */ tp->t_flags &= ~TF_RCV_UTO; - } - else { + else tp->t_flags |= TF_RCV_UTO; - } INP_WUNLOCK(inp); break; From owner-p4-projects@FreeBSD.ORG Tue Jun 21 14:08:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 778381065675; Tue, 21 Jun 2011 14:08:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DEF3106564A for ; Tue, 21 Jun 2011 14:08:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1BDF38FC15 for ; Tue, 21 Jun 2011 14:08:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5LE8TG4011908 for ; Tue, 21 Jun 2011 14:08:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5LE8TYD011905 for perforce@freebsd.org; Tue, 21 Jun 2011 14:08:29 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Jun 2011 14:08:29 GMT Message-Id: <201106211408.p5LE8TYD011905@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 14:08:30 -0000 http://p4web.freebsd.org/@@195096?ac=10 Change 195096 by jhb@jhb_jhbbsd on 2011/06/21 14:07:54 Be lenient if the length is wrong, but warn about it. Affected files ... .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#21 edit Differences ... ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#21 (text+ko) ==== @@ -211,7 +211,10 @@ res->Data.Address.MinAddressFixed != ACPI_ADDRESS_FIXED || res->Data.Address.MaxAddressFixed != ACPI_ADDRESS_FIXED) break; - KASSERT(min + length - 1 == max, ("invalid range")); + if (min + length - 1 == max) + device_printf(sc->ap_dev, + "Length mismatch for %d range: %jx vs %jx\n", + (uintmax_t)max - min + 1, (uintmax_t)length); flags = 0; switch (res->Data.Address.ResourceType) { case ACPI_MEMORY_RANGE: From owner-p4-projects@FreeBSD.ORG Tue Jun 21 14:42:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C92E1065675; Tue, 21 Jun 2011 14:42:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9AA81065672 for ; Tue, 21 Jun 2011 14:42:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D7AF58FC0A for ; Tue, 21 Jun 2011 14:42:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5LEgTsN020335 for ; Tue, 21 Jun 2011 14:42:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5LEgTp1020332 for perforce@freebsd.org; Tue, 21 Jun 2011 14:42:29 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Jun 2011 14:42:29 GMT Message-Id: <201106211442.p5LEgTp1020332@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 14:42:30 -0000 http://p4web.freebsd.org/@@195098?ac=10 Change 195098 by jhb@jhb_pipkin on 2011/06/21 14:42:04 Compile. Affected files ... .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#22 edit Differences ... ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#22 (text+ko) ==== @@ -211,10 +211,6 @@ res->Data.Address.MinAddressFixed != ACPI_ADDRESS_FIXED || res->Data.Address.MaxAddressFixed != ACPI_ADDRESS_FIXED) break; - if (min + length - 1 == max) - device_printf(sc->ap_dev, - "Length mismatch for %d range: %jx vs %jx\n", - (uintmax_t)max - min + 1, (uintmax_t)length); flags = 0; switch (res->Data.Address.ResourceType) { case ACPI_MEMORY_RANGE: @@ -249,6 +245,10 @@ type, (uintmax_t)min, (uintmax_t)max); break; } + if (min + length - 1 == max) + device_printf(sc->ap_dev, + "Length mismatch for %d range: %jx vs %jx\n", type, + (uintmax_t)max - min + 1, (uintmax_t)length); #ifdef __i386__ if (min > ULONG_MAX) { device_printf(sc->ap_dev, From owner-p4-projects@FreeBSD.ORG Tue Jun 21 14:51:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80AB4106567B; Tue, 21 Jun 2011 14:51:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4256B1065679 for ; Tue, 21 Jun 2011 14:51:18 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 306D08FC22 for ; Tue, 21 Jun 2011 14:51:18 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5LEpHEH022025 for ; Tue, 21 Jun 2011 14:51:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5LEpHnT022021 for perforce@freebsd.org; Tue, 21 Jun 2011 14:51:17 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Jun 2011 14:51:17 GMT Message-Id: <201106211451.p5LEpHnT022021@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 14:51:18 -0000 http://p4web.freebsd.org/@@195099?ac=10 Change 195099 by jhb@jhb_jhbbsd on 2011/06/21 14:50:25 Bah! Affected files ... .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#23 edit Differences ... ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#23 (text+ko) ==== @@ -245,7 +245,7 @@ type, (uintmax_t)min, (uintmax_t)max); break; } - if (min + length - 1 == max) + if (min + length - 1 != max) device_printf(sc->ap_dev, "Length mismatch for %d range: %jx vs %jx\n", type, (uintmax_t)max - min + 1, (uintmax_t)length); From owner-p4-projects@FreeBSD.ORG Tue Jun 21 16:07:22 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ED071065676; Tue, 21 Jun 2011 16:07:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 314E61065673 for ; Tue, 21 Jun 2011 16:07:22 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1F9928FC0A for ; Tue, 21 Jun 2011 16:07:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5LG7M2G035596 for ; Tue, 21 Jun 2011 16:07:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5LG7LJC035593 for perforce@freebsd.org; Tue, 21 Jun 2011 16:07:21 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Jun 2011 16:07:21 GMT Message-Id: <201106211607.p5LG7LJC035593@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 16:07:22 -0000 http://p4web.freebsd.org/@@195101?ac=10 Change 195101 by jhb@jhb_jhbbsd on 2011/06/21 16:06:25 This is no longer used. Affected files ... .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#24 edit Differences ... ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#24 (text+ko) ==== @@ -540,9 +540,6 @@ return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data)); } -static u_long acpi_host_mem_start = 0x80000000; -TUNABLE_ULONG("hw.acpi.host_mem_start", &acpi_host_mem_start); - struct resource * acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) From owner-p4-projects@FreeBSD.ORG Wed Jun 22 16:26:29 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FD3D1065677; Wed, 22 Jun 2011 16:26:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21CF81065675 for ; Wed, 22 Jun 2011 16:26:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0E2888FC0C for ; Wed, 22 Jun 2011 16:26:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5MGQSwS028516 for ; Wed, 22 Jun 2011 16:26:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5MGQSZX028513 for perforce@freebsd.org; Wed, 22 Jun 2011 16:26:28 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Jun 2011 16:26:28 GMT Message-Id: <201106221626.p5MGQSZX028513@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2011 16:26:29 -0000 http://p4web.freebsd.org/@@195152?ac=10 Change 195152 by jhb@jhb_jhbbsd on 2011/06/22 16:25:39 IFC @195151 Affected files ... .. //depot/projects/pci/sys/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#25 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_resource.c#7 integrate .. //depot/projects/pci/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/pci/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/pci/sys/dev/cardbus/cardbus_cis.c#5 integrate .. //depot/projects/pci/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/pci/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/pci/sys/dev/e1000/if_igb.h#5 integrate .. //depot/projects/pci/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/pci/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/pci/sys/dev/pci/pci.c#22 integrate .. //depot/projects/pci/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/pci/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/pci/sys/dev/xl/if_xl.c#4 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate .. //depot/projects/pci/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/pci/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/pci/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/pci/sys/net/route.c#3 integrate .. //depot/projects/pci/sys/net/route.h#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/pci/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/pci/sys/netinet/ipfw/ip_dn_io.c#3 integrate .. //depot/projects/pci/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate .. //depot/projects/pci/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/pci/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/pci/sys/powerpc/ps3/if_glc.c#2 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3bus.c#4 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3disk.c#2 integrate .. //depot/projects/pci/sys/sparc64/include/tsb.h#2 integrate .. //depot/projects/pci/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/pci/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/pci/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/pci/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_softdep.c#5 integrate Differences ... ==== //depot/projects/pci/sys/amd64/pci/pci_bus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.126 2011/05/03 17:37:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.127 2011/06/22 16:15:15 jhb Exp $"); #include "opt_cpu.h" @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -303,6 +302,39 @@ return ENOENT; } +/* + * Helper routine for x86 Host-PCI bridge driver resource allocation. + * This is used to adjust the start address of wildcard allocation + * requests to avoid low addresses that are known to be problematic. + * + * If no memory preference is given, use upper 32MB slot most BIOSes + * use for their memory window. This is typically only used on older + * laptops that don't have PCI busses behind a PCI bridge, so assuming + * > 32MB is likely OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. + */ +SYSCTL_DECL(_hw_pci); + +static unsigned long host_mem_start = 0x80000000; +TUNABLE_ULONG("hw.pci.host_mem_start", &host_mem_start); +SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &host_mem_start, + 0, "Limit the host bridge memory to being above this address."); + +u_long +hostb_alloc_start(int type, u_long start, u_long end, u_long count) +{ + + if (start + count - 1 != end) { + if (type == SYS_RES_MEMORY && start < host_mem_start) + start = host_mem_start; + if (type == SYS_RES_IOPORT && start < 0x1000) + start = 0x1000; + } + return (start); +} + struct resource * legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#25 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.65 2011/05/03 17:37:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.66 2011/06/22 16:15:15 jhb Exp $"); #include "opt_acpi.h" #include ==== //depot/projects/pci/sys/dev/acpica/acpi_resource.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.43 2011/02/14 20:05:37 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.45 2011/06/21 21:30:20 jhb Exp $"); #include "opt_acpi.h" #include @@ -343,22 +343,23 @@ if (res->Data.Address.MinAddressFixed == ACPI_ADDRESS_FIXED && res->Data.Address.MaxAddressFixed == ACPI_ADDRESS_FIXED) { if (res->Data.Address.ResourceType == ACPI_MEMORY_RANGE) { - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/Memory 0x%x/%d\n", - name, min, length)); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/Memory 0x%jx/%ju\n", + name, (uintmax_t)min, (uintmax_t)length)); set->set_memory(dev, arc->context, min, length); } else { - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%x/%d\n", name, - min, length)); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%jx/%ju\n", name, + (uintmax_t)min, (uintmax_t)length)); set->set_ioport(dev, arc->context, min, length); } } else { if (res->Data.Address32.ResourceType == ACPI_MEMORY_RANGE) { - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/Memory 0x%x-0x%x/%d\n", - name, min, max, length)); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, + "%s/Memory 0x%jx-0x%jx/%ju\n", name, (uintmax_t)min, + (uintmax_t)max, (uintmax_t)length)); set->set_memoryrange(dev, arc->context, min, max, length, gran); } else { - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%x-0x%x/%d\n", - name, min, max, length)); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%jx-0x%jx/%ju\n", + name, (uintmax_t)min, (uintmax_t)max, (uintmax_t)length)); set->set_iorange(dev, arc->context, min, max, length, gran); } } ==== //depot/projects/pci/sys/dev/acpica/acpivar.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.124 2011/04/04 18:39:04 jkim Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.125 2011/06/21 19:29:27 jhb Exp $ */ #ifndef _ACPIVAR_H_ ==== //depot/projects/pci/sys/dev/atkbdc/atkbd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.65 2011/06/11 01:19:19 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.66 2011/06/20 16:42:20 delphij Exp $"); #include "opt_compat.h" #include "opt_kbd.h" @@ -1100,7 +1100,7 @@ /* * Traditional entry points of int 0x15 and 0x16 are fixed * and later BIOSes follow them. (U)EFI CSM specification - * also mandate these fixed entry points. + * also mandates these fixed entry points. * * Validate the entry points here before we proceed further. * It's known that some recent laptops does not have the ==== //depot/projects/pci/sys/dev/cardbus/cardbus_cis.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.71 2011/06/06 13:21:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.72 2011/06/21 22:45:31 imp Exp $"); /* * CIS Handling for the Cardbus Bus @@ -369,6 +369,14 @@ * Functions to read the a tuple from the card */ +/* + * Read CIS bytes out of the config space. We have to read it 4 bytes at a + * time and do the usual mask and shift to return the bytes. The standard + * defines the byte order to be little endian. pci_read_config converts it to + * host byte order. This is why we have no endian conversion functions: the + * shifts wind up being endian neutral. This is also why we avoid the obvious + * memcpy optimization. + */ static int cardbus_read_tuple_conf(device_t cbdev, device_t child, uint32_t start, uint32_t *off, int *tupleid, int *len, uint8_t *tupledata) @@ -379,12 +387,11 @@ loc = start + *off; - e = pci_read_config(child, loc - loc % 4, 4); - for (j = loc % 4; j > 0; j--) - e >>= 8; + e = pci_read_config(child, loc & ~0x3, 4); + e >>= 8 * (loc & 0x3); *len = 0; for (i = loc, j = -2; j < *len; j++, i++) { - if (i % 4 == 0) + if ((i & 0x3) == 0) e = pci_read_config(child, i, 4); if (j == -2) *tupleid = 0xff & e; @@ -398,6 +405,10 @@ return (0); } +/* + * Read the CIS data out of memroy. We indirect through the bus space + * routines to ensure proper byte ordering conversions when necessary. + */ static int cardbus_read_tuple_mem(device_t cbdev, struct resource *res, uint32_t start, uint32_t *off, int *tupleid, int *len, uint8_t *tupledata) @@ -580,7 +591,7 @@ expect_linktarget = TRUE; if ((start = pci_read_config(child, PCIR_CIS, 4)) == 0) { DEVPRINTF((cbdev, "Warning: CIS pointer is 0: (no CIS)\n")); - return (ENXIO); + return (0); } DEVPRINTF((cbdev, "CIS pointer is %#x\n", start)); off = 0; ==== //depot/projects/pci/sys/dev/dc/if_dc.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.224 2011/03/28 19:08:53 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.225 2011/06/21 20:52:55 imp Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -1385,7 +1385,7 @@ break; DELAY(10); } - if (i == DC_TIMEOUT) { + if (i == DC_TIMEOUT && bus_child_present(sc->dc_dev)) { if (!(isr & DC_ISR_TX_IDLE) && !DC_IS_ASIX(sc)) device_printf(sc->dc_dev, "%s: failed to force tx to idle state\n", __func__); ==== //depot/projects/pci/sys/dev/e1000/if_igb.c#5 (text+ko) ==== @@ -30,12 +30,13 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.69 2011/06/17 20:06:52 jhb Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.70 2011/06/20 22:59:29 jfv Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" #include "opt_inet.h" +#include "opt_inet6.h" #include "opt_altq.h" #endif @@ -99,7 +100,7 @@ /********************************************************************* * Driver version: *********************************************************************/ -char igb_driver_version[] = "version - 2.2.3"; +char igb_driver_version[] = "version - 2.2.5"; /********************************************************************* @@ -265,6 +266,7 @@ static void igb_set_sysctl_value(struct adapter *, const char *, const char *, int *, int); static int igb_set_flowcntl(SYSCTL_HANDLER_ARGS); +static int igb_sysctl_dmac(SYSCTL_HANDLER_ARGS); #ifdef DEVICE_POLLING static poll_handler_t igb_poll; @@ -344,25 +346,6 @@ static int igb_num_queues = 0; TUNABLE_INT("hw.igb.num_queues", &igb_num_queues); -/* How many packets rxeof tries to clean at a time */ -static int igb_rx_process_limit = 100; -TUNABLE_INT("hw.igb.rx_process_limit", &igb_rx_process_limit); - -/* Flow control setting - default to FULL */ -static int igb_fc_setting = e1000_fc_full; -TUNABLE_INT("hw.igb.fc_setting", &igb_fc_setting); - -/* Energy Efficient Ethernet - default to off */ -static int igb_eee_disabled = TRUE; -TUNABLE_INT("hw.igb.eee_disabled", &igb_eee_disabled); - -/* -** DMA Coalescing, only for i350 - default to off, -** this feature is for power savings -*/ -static int igb_dma_coalesce = FALSE; -TUNABLE_INT("hw.igb.dma_coalesce", &igb_dma_coalesce); - /********************************************************************* * Device identification routine * @@ -433,6 +416,11 @@ INIT_DEBUGOUT("igb_attach: begin"); + if (resource_disabled("igb", device_get_unit(dev))) { + device_printf(dev, "Disabled by device hint\n"); + return (ENXIO); + } + adapter = device_get_softc(dev); adapter->dev = adapter->osdep.dev = dev; IGB_CORE_LOCK_INIT(adapter, device_get_nameunit(dev)); @@ -450,7 +438,7 @@ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "flow_control", CTLTYPE_INT|CTLFLAG_RW, + OID_AUTO, "fc", CTLTYPE_INT|CTLFLAG_RW, adapter, 0, igb_set_flowcntl, "I", "Flow Control"); callout_init_mtx(&adapter->timer, &adapter->core_mtx, 0); @@ -476,8 +464,8 @@ /* Sysctl for limiting the amount of work done in the taskqueue */ igb_set_sysctl_value(adapter, "rx_processing_limit", - "max number of rx packets to process", &adapter->rx_process_limit, - igb_rx_process_limit); + "max number of rx packets to process", + &adapter->rx_process_limit, 100); /* * Validate number of transmit and receive descriptors. It @@ -552,13 +540,14 @@ /* Some adapter-specific advanced features */ if (adapter->hw.mac.type >= e1000_i350) { - igb_set_sysctl_value(adapter, "dma_coalesce", - "configure dma coalesce", - &adapter->dma_coalesce, igb_dma_coalesce); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "dmac", CTLTYPE_INT|CTLFLAG_RW, + adapter, 0, igb_sysctl_dmac, "I", "DMA Coalesce"); igb_set_sysctl_value(adapter, "eee_disabled", "enable Energy Efficient Ethernet", &adapter->hw.dev_spec._82575.eee_disable, - igb_eee_disabled); + TRUE); e1000_set_eee_i350(&adapter->hw); } @@ -658,6 +647,7 @@ return (0); err_late: + igb_detach(dev); igb_free_transmit_structures(adapter); igb_free_receive_structures(adapter); igb_release_hw_control(adapter); @@ -736,7 +726,8 @@ igb_free_transmit_structures(adapter); igb_free_receive_structures(adapter); - free(adapter->mta, M_DEVBUF); + if (adapter->mta != NULL) + free(adapter->mta, M_DEVBUF); IGB_CORE_LOCK_DESTROY(adapter); @@ -1025,11 +1016,12 @@ igb_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct adapter *adapter = ifp->if_softc; - struct ifreq *ifr = (struct ifreq *)data; -#ifdef INET - struct ifaddr *ifa = (struct ifaddr *)data; + struct ifreq *ifr = (struct ifreq *)data; +#if defined(INET) || defined(INET6) + struct ifaddr *ifa = (struct ifaddr *)data; + bool avoid_reset = FALSE; #endif - int error = 0; + int error = 0; if (adapter->in_detach) return (error); @@ -1037,20 +1029,22 @@ switch (command) { case SIOCSIFADDR: #ifdef INET - if (ifa->ifa_addr->sa_family == AF_INET) { - /* - * XXX - * Since resetting hardware takes a very long time - * and results in link renegotiation we only - * initialize the hardware only when it is absolutely - * required. - */ + if (ifa->ifa_addr->sa_family == AF_INET) + avoid_reset = TRUE; +#endif +#ifdef INET6 + if (ifa->ifa_addr->sa_family == AF_INET6) + avoid_reset = TRUE; +#endif +#if defined(INET) || defined(INET6) + /* + ** Calling init results in link renegotiation, + ** so we avoid doing it when possible. + */ + if (avoid_reset) { ifp->if_flags |= IFF_UP; - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { - IGB_CORE_LOCK(adapter); - igb_init_locked(adapter); - IGB_CORE_UNLOCK(adapter); - } + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) + igb_init(adapter); if (!(ifp->if_flags & IFF_NOARP)) arp_ifinit(ifp, ifa); } else @@ -1175,6 +1169,10 @@ ifp->if_capenable ^= IFCAP_VLAN_HWFILTER; reinit = 1; } + if (mask & IFCAP_VLAN_HWTSO) { + ifp->if_capenable ^= IFCAP_VLAN_HWTSO; + reinit = 1; + } if (mask & IFCAP_LRO) { ifp->if_capenable ^= IFCAP_LRO; reinit = 1; @@ -2721,6 +2719,12 @@ fc->pause_time = IGB_FC_PAUSE_TIME; fc->send_xon = TRUE; + if (fc->requested_mode) + fc->current_mode = fc->requested_mode; + else + fc->current_mode = e1000_fc_full; + + adapter->fc = fc->current_mode; /* Issue a global reset */ e1000_reset_hw(hw); @@ -2730,9 +2734,13 @@ device_printf(dev, "Hardware Initialization Failed\n"); /* Setup DMA Coalescing */ - if ((hw->mac.type == e1000_i350) && - (adapter->dma_coalesce == TRUE)) { - u32 reg; + if (hw->mac.type == e1000_i350) { + u32 reg = ~E1000_DMACR_DMAC_EN; + + if (adapter->dmac == 0) { /* Disabling it */ + E1000_WRITE_REG(hw, E1000_DMACR, reg); + goto reset_out; + } hwm = (pba - 4) << 10; reg = (((pba-6) << E1000_DMACR_DMACTHR_SHIFT) @@ -2741,8 +2749,8 @@ /* transition to L0x or L1 if available..*/ reg |= (E1000_DMACR_DMAC_EN | E1000_DMACR_DMAC_LX_MASK); - /* timer = +-1000 usec in 32usec intervals */ - reg |= (1000 >> 5); + /* timer = value in adapter->dmac in 32usec intervals */ + reg |= (adapter->dmac >> 5); E1000_WRITE_REG(hw, E1000_DMACR, reg); /* No lower threshold */ @@ -2767,6 +2775,7 @@ device_printf(dev, "DMA Coalescing enabled\n"); } +reset_out: E1000_WRITE_REG(&adapter->hw, E1000_VET, ETHERTYPE_VLAN); e1000_get_phy_info(hw); e1000_check_for_link(hw); @@ -2827,15 +2836,19 @@ * support full VLAN capability. */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); - ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; - ifp->if_capenable |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; + ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING + | IFCAP_VLAN_HWTSO + | IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_HWTAGGING + | IFCAP_VLAN_HWTSO + | IFCAP_VLAN_MTU; /* - ** Dont turn this on by default, if vlans are + ** Don't turn this on by default, if vlans are ** created on another pseudo device (eg. lagg) ** then vlan events are not passed thru, breaking ** operation, but with HW FILTER off it works. If - ** using vlans directly on the em driver you can + ** using vlans directly on the igb driver you can ** enable this and get full hardware tag filtering. */ ifp->if_capabilities |= IFCAP_VLAN_HWFILTER; @@ -5595,19 +5608,18 @@ igb_set_flowcntl(SYSCTL_HANDLER_ARGS) { int error; - struct adapter *adapter; + struct adapter *adapter = (struct adapter *) arg1; - error = sysctl_handle_int(oidp, &igb_fc_setting, 0, req); + error = sysctl_handle_int(oidp, &adapter->fc, 0, req); - if (error) + if ((error) || (req->newptr == NULL)) return (error); - adapter = (struct adapter *) arg1; - switch (igb_fc_setting) { + switch (adapter->fc) { case e1000_fc_rx_pause: case e1000_fc_tx_pause: case e1000_fc_full: - adapter->hw.fc.requested_mode = igb_fc_setting; + adapter->hw.fc.requested_mode = adapter->fc; break; case e1000_fc_none: default: @@ -5616,5 +5628,54 @@ adapter->hw.fc.current_mode = adapter->hw.fc.requested_mode; e1000_force_mac_fc(&adapter->hw); - return error; + return (error); +} + +/* +** Manage DMA Coalesce: +** Control values: +** 0/1 - off/on +** Legal timer values are: +** 250,500,1000-10000 in thousands +*/ +static int +igb_sysctl_dmac(SYSCTL_HANDLER_ARGS) +{ + struct adapter *adapter = (struct adapter *) arg1; + int error; + + error = sysctl_handle_int(oidp, &adapter->dmac, 0, req); + + if ((error) || (req->newptr == NULL)) + return (error); + + switch (adapter->dmac) { + case 0: + /*Disabling */ + break; + case 1: /* Just enable and use default */ + adapter->dmac = 1000; + break; + case 250: + case 500: + case 1000: + case 2000: + case 3000: + case 4000: + case 5000: + case 6000: + case 7000: + case 8000: + case 9000: + case 10000: + /* Legal values - allow */ + break; + default: + /* Do nothing, illegal value */ + adapter->dmac = 0; + return (error); + } + /* Reinit the interface */ + igb_init(adapter); + return (error); } ==== //depot/projects/pci/sys/dev/e1000/if_igb.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_igb.h,v 1.22 2011/06/17 20:06:52 jhb Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_igb.h,v 1.23 2011/06/20 22:59:29 jfv Exp $*/ #ifndef _IGB_H_DEFINED_ #define _IGB_H_DEFINED_ @@ -396,11 +396,12 @@ u32 shadow_vfta[IGB_VFTA_SIZE]; /* Info about the interface */ - u8 link_active; + u16 link_active; + u16 fc; u16 link_speed; u16 link_duplex; u32 smartspeed; - u32 dma_coalesce; + u32 dmac; /* Interface queues */ struct igb_queue *queues; ==== //depot/projects/pci/sys/dev/firewire/fwohci.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.100 2011/03/11 22:19:49 marius Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.101 2011/06/21 03:07:59 imp Exp $ * */ @@ -2072,8 +2072,9 @@ FW_GLOCK_ASSERT(&sc->fc); stat = OREAD(sc, FWOHCI_INTSTAT); if (stat == 0xffffffff) { - device_printf(sc->fc.dev, - "device physically ejected?\n"); + if (!bus_child_present(sc->fc.dev)) + return (FILTER_HANDLED); + device_printf(sc->fc.dev, "device physically ejected?\n"); return (FILTER_STRAY); } if (stat) ==== //depot/projects/pci/sys/dev/pccbb/pccbb_pci.c#2 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.36 2009/04/10 04:08:34 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.37 2011/06/21 03:05:17 imp Exp $"); #include #include @@ -658,6 +658,12 @@ struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(brdev); /* + * We're about to pull the rug out from the card, so mark it as + * gone to prevent harm. + */ + sc->cardok = 0; + + /* * Place the cards in reset, turn off the interrupts and power * down the socket. */ ==== //depot/projects/pci/sys/dev/pci/pci.c#22 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.421 2011/06/06 13:21:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.422 2011/06/21 19:31:31 jhb Exp $"); #include "opt_bus.h" ==== //depot/projects/pci/sys/dev/vr/if_vr.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vr/if_vr.c,v 1.141 2011/05/03 19:51:29 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vr/if_vr.c,v 1.142 2011/06/22 02:18:45 yongari Exp $"); /* * VIA Rhine fast ethernet PCI NIC driver @@ -185,7 +185,6 @@ static int vr_miibus_writereg(device_t, int, int, int); static void vr_miibus_statchg(device_t); -static void vr_link_task(void *, int); static void vr_cam_mask(struct vr_softc *, uint32_t, int); static int vr_cam_data(struct vr_softc *, int, int, uint8_t *); static void vr_set_filter(struct vr_softc *); @@ -226,7 +225,6 @@ DEVMETHOD(miibus_readreg, vr_miibus_readreg), DEVMETHOD(miibus_writereg, vr_miibus_writereg), DEVMETHOD(miibus_statchg, vr_miibus_statchg), - DEVMETHOD(miibus_linkchg, vr_miibus_statchg), { NULL, NULL } }; @@ -290,22 +288,13 @@ return (0); } -static void -vr_miibus_statchg(device_t dev) -{ - struct vr_softc *sc; - - sc = device_get_softc(dev); - taskqueue_enqueue(taskqueue_swi, &sc->vr_link_task); -} - /* * In order to fiddle with the * 'full-duplex' and '100Mbps' bits in the netconfig register, we * first have to put the transmit and/or receive logic in the idle state. */ static void -vr_link_task(void *arg, int pending) +vr_miibus_statchg(device_t dev) { struct vr_softc *sc; struct mii_data *mii; @@ -313,22 +302,25 @@ int lfdx, mfdx; uint8_t cr0, cr1, fc; - sc = (struct vr_softc *)arg; - - VR_LOCK(sc); + sc = device_get_softc(dev); mii = device_get_softc(sc->vr_miibus); ifp = sc->vr_ifp; if (mii == NULL || ifp == NULL || - (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { - VR_UNLOCK(sc); + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) return; - } - if (mii->mii_media_status & IFM_ACTIVE) { - if (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) + sc->vr_link = 0; + if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) == + (IFM_ACTIVE | IFM_AVALID)) { + switch (IFM_SUBTYPE(mii->mii_media_active)) { + case IFM_10_T: + case IFM_100_TX: sc->vr_link = 1; - } else - sc->vr_link = 0; + break; + default: + break; + } + } if (sc->vr_link != 0) { cr0 = CSR_READ_1(sc, VR_CR0); @@ -384,11 +376,8 @@ "%s: Tx/Rx shutdown error -- resetting\n", __func__); sc->vr_flags |= VR_F_RESTART; - VR_UNLOCK(sc); - return; } } - VR_UNLOCK(sc); } @@ -621,7 +610,6 @@ mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); callout_init_mtx(&sc->vr_stat_callout, &sc->vr_mtx, 0); - TASK_INIT(&sc->vr_link_task, 0, vr_link_task, sc); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "stats", CTLTYPE_INT | CTLFLAG_RW, sc, 0, @@ -841,7 +829,6 @@ vr_stop(sc); VR_UNLOCK(sc); callout_drain(&sc->vr_stat_callout); - taskqueue_drain(taskqueue_swi, &sc->vr_link_task); ether_ifdetach(ifp); } if (sc->vr_miibus) @@ -1559,6 +1546,8 @@ mii = device_get_softc(sc->vr_miibus); mii_tick(mii); + if (sc->vr_link == 0) + vr_miibus_statchg(sc->vr_dev); vr_watchdog(sc); callout_reset(&sc->vr_stat_callout, hz, vr_tick, sc); } @@ -2161,6 +2150,10 @@ sc = ifp->if_softc; mii = device_get_softc(sc->vr_miibus); VR_LOCK(sc); + if ((ifp->if_flags & IFF_UP) == 0) { + VR_UNLOCK(sc); + return; + } mii_pollstat(mii); VR_UNLOCK(sc); ifmr->ifm_active = mii->mii_media_active; ==== //depot/projects/pci/sys/dev/vr/if_vrreg.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/vr/if_vrreg.h,v 1.39 2010/10/15 14:52:11 marius Exp $ + * $FreeBSD: src/sys/dev/vr/if_vrreg.h,v 1.40 2011/06/22 02:18:45 yongari Exp $ */ /* @@ -723,7 +723,6 @@ uint8_t vr_flags; /* See VR_F_* below */ #define VR_F_RESTART 0x01 /* Restart unit on next tick */ int vr_if_flags; - struct task vr_link_task; struct vr_chain_data vr_cdata; struct vr_ring_data vr_rdata; struct vr_statistics vr_stat; ==== //depot/projects/pci/sys/dev/xl/if_xl.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/xl/if_xl.c,v 1.31 2011/05/07 04:40:44 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xl/if_xl.c,v 1.34 2011/06/21 22:17:28 imp Exp $"); /* * 3Com 3c90x Etherlink XL PCI NIC driver @@ -334,7 +334,7 @@ * only a finite amount of time to avoid getting caught in an * infinite loop. Normally this delay routine would be a macro, * but it isn't called during normal operation so we can afford - * to make it a function. + * to make it a function. Suppress warning when card gone. */ static void xl_wait(struct xl_softc *sc) @@ -346,7 +346,7 @@ break; } - if (i == XL_TIMEOUT) + if (i == XL_TIMEOUT && bus_child_present(sc->xl_dev)) device_printf(sc->xl_dev, "command never completed!\n"); } ==== //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdserv.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsserver/nfs_nfsdserv.c,v 1.17 2011/04/14 23:46:15 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsserver/nfs_nfsdserv.c,v 1.19 2011/06/21 19:58:29 rmacklem Exp $"); /* * nfs version 2, 3 and 4 server calls to vnode ops @@ -172,11 +172,12 @@ fhandle_t fh; int at_root = 0, error = 0, supports_nfsv4acls; struct nfsreferral *refp; - nfsattrbit_t attrbits; + nfsattrbit_t attrbits, tmpbits; struct mount *mp; struct vnode *tvp = NULL; struct vattr va; uint64_t mounted_on_fileno = 0; + accmode_t accmode; if (nd->nd_repstat) return (0); @@ -197,11 +198,20 @@ vput(vp); return (0); } - if (!nd->nd_repstat) - nd->nd_repstat = nfsvno_accchk(vp, - VREAD_ATTRIBUTES, - nd->nd_cred, exp, p, NFSACCCHK_NOOVERRIDE, - NFSACCCHK_VPISLOCKED, NULL); + if (nd->nd_repstat == 0) { + accmode = 0; + NFSSET_ATTRBIT(&tmpbits, &attrbits); + if (NFSISSET_ATTRBIT(&tmpbits, NFSATTRBIT_ACL)) { + NFSCLRBIT_ATTRBIT(&tmpbits, NFSATTRBIT_ACL); + accmode |= VREAD_ACL; + } + if (NFSNONZERO_ATTRBIT(&tmpbits)) + accmode |= VREAD_ATTRIBUTES; + if (accmode != 0) + nd->nd_repstat = nfsvno_accchk(vp, accmode, + nd->nd_cred, exp, p, NFSACCCHK_NOOVERRIDE, + NFSACCCHK_VPISLOCKED, NULL); + } } if (!nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, &nva, nd->nd_cred, p, 1); @@ -454,7 +464,7 @@ APPLESTATIC int nfsrvd_lookup(struct nfsrv_descript *nd, __unused int isdgram, vnode_t dp, vnode_t *vpp, fhandle_t *fhp, NFSPROC_T *p, - __unused struct nfsexstuff *exp) + struct nfsexstuff *exp) { struct nameidata named; vnode_t vp, dirp = NULL; @@ -508,7 +518,15 @@ vrele(named.ni_startdir); nfsvno_relpathbuf(&named); vp = named.ni_vp; - nd->nd_repstat = nfsvno_getfh(vp, fhp, p); + if ((nd->nd_flag & ND_NFSV4) != 0 && !NFSVNO_EXPORTED(exp) && + vp->v_type != VDIR && vp->v_type != VLNK) + /* + * Only allow lookup of VDIR and VLNK for traversal of + * non-exported volumes during NFSv4 mounting. + */ + nd->nd_repstat = ENOENT; + if (nd->nd_repstat == 0) + nd->nd_repstat = nfsvno_getfh(vp, fhp, p); if (!(nd->nd_flag & ND_NFSV4) && !nd->nd_repstat) nd->nd_repstat = nfsvno_getattr(vp, &nva, nd->nd_cred, p, 1); if (vpp != NULL && nd->nd_repstat == 0) ==== //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdsocket.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsserver/nfs_nfsdsocket.c,v 1.13 2011/05/27 22:05:10 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsserver/nfs_nfsdsocket.c,v 1.14 2011/06/20 21:57:26 rmacklem Exp $"); /* * Socket operations for use by the nfs server. @@ -786,6 +786,8 @@ op != NFSV4OP_LOOKUP && op != NFSV4OP_GETATTR && op != NFSV4OP_GETFH && + op != NFSV4OP_ACCESS && + op != NFSV4OP_READLINK && op != NFSV4OP_SECINFO) nd->nd_repstat = NFSERR_NOFILEHANDLE; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 22 16:27:35 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79CC71065675; Wed, 22 Jun 2011 16:27:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C9BF1065674 for ; Wed, 22 Jun 2011 16:27:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 11E4E8FC19 for ; Wed, 22 Jun 2011 16:27:35 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5MGRYca028567 for ; Wed, 22 Jun 2011 16:27:34 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5MGRY7U028564 for perforce@freebsd.org; Wed, 22 Jun 2011 16:27:34 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Jun 2011 16:27:34 GMT Message-Id: <201106221627.p5MGRY7U028564@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2011 16:27:35 -0000 http://p4web.freebsd.org/@@195153?ac=10 Change 195153 by jhb@jhb_jhbbsd on 2011/06/22 16:26:52 Don't need this now. Affected files ... .. //depot/projects/pci/sys/x86/x86/mptable_pci.c#14 edit Differences ... ==== //depot/projects/pci/sys/x86/x86/mptable_pci.c#14 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Jun 22 16:29:47 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 692C01065673; Wed, 22 Jun 2011 16:29:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BC3C106566B for ; Wed, 22 Jun 2011 16:29:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F17FC8FC12 for ; Wed, 22 Jun 2011 16:29:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5MGTkKC028636 for ; Wed, 22 Jun 2011 16:29:46 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5MGTkjf028633 for perforce@freebsd.org; Wed, 22 Jun 2011 16:29:46 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Jun 2011 16:29:46 GMT Message-Id: <201106221629.p5MGTkjf028633@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2011 16:29:47 -0000 http://p4web.freebsd.org/@@195154?ac=10 Change 195154 by jhb@jhb_jhbbsd on 2011/06/22 16:29:35 This moved elsewhere. Affected files ... .. //depot/projects/pci/sys/x86/include/bus.h#3 edit Differences ... ==== //depot/projects/pci/sys/x86/include/bus.h#3 (text+ko) ==== @@ -1095,6 +1095,4 @@ #define bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \ bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c)) -u_long hostb_alloc_start(int type, u_long start, u_long end, u_long count); - #endif /* _X86_BUS_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 22 16:30:53 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6643E1065673; Wed, 22 Jun 2011 16:30:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28B64106566C for ; Wed, 22 Jun 2011 16:30:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 16FA08FC18 for ; Wed, 22 Jun 2011 16:30:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5MGUqkH029157 for ; Wed, 22 Jun 2011 16:30:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5MGUq7Y029154 for perforce@freebsd.org; Wed, 22 Jun 2011 16:30:52 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Jun 2011 16:30:52 GMT Message-Id: <201106221630.p5MGUq7Y029154@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2011 16:30:53 -0000 http://p4web.freebsd.org/@@195155?ac=10 Change 195155 by jhb@jhb_jhbbsd on 2011/06/22 16:30:51 This moved elsewhere, too. Affected files ... .. //depot/projects/pci/sys/x86/x86/nexus.c#10 edit Differences ... ==== //depot/projects/pci/sys/x86/x86/nexus.c#10 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include #include -#include #include #include @@ -857,37 +856,3 @@ DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass, 0, 0); #endif /* DEV_ISA */ - - -/* - * Helper routine for x86 Host-PCI bridge driver resource allocation. - * This is used to adjust the start address of wildcard allocation - * requests to avoid low addresses that are known to be problematic. - * - * If no memory preference is given, use upper 32MB slot most BIOSes - * use for their memory window. This is typically only used on older - * laptops that don't have PCI busses behind a PCI bridge, so assuming - * > 32MB is likely OK. - * - * However, this can cause problems for other chipsets, so we make - * this tunable by hw.pci.host_mem_start. - */ -SYSCTL_DECL(_hw_pci); - -static unsigned long host_mem_start = 0x80000000; -TUNABLE_ULONG("hw.pci.host_mem_start", &host_mem_start); -SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &host_mem_start, - 0, "Limit the host bridge memory to being above this address."); - -u_long -hostb_alloc_start(int type, u_long start, u_long end, u_long count) -{ - - if (start + count - 1 != end) { - if (type == SYS_RES_MEMORY && start < host_mem_start) - start = host_mem_start; - if (type == SYS_RES_IOPORT && start < 0x1000) - start = 0x1000; - } - return (start); -} From owner-p4-projects@FreeBSD.ORG Wed Jun 22 21:33:39 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2DA6106566C; Wed, 22 Jun 2011 21:33:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D04C106564A for ; Wed, 22 Jun 2011 21:33:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7F9A68FC15 for ; Wed, 22 Jun 2011 21:33:38 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5MLXcRX096202 for ; Wed, 22 Jun 2011 21:33:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5MLXcgV096199 for perforce@freebsd.org; Wed, 22 Jun 2011 21:33:38 GMT (envelope-from jhb@freebsd.org) Date: Wed, 22 Jun 2011 21:33:38 GMT Message-Id: <201106222133.p5MLXcgV096199@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2011 21:33:39 -0000 http://p4web.freebsd.org/@@195169?ac=10 Change 195169 by jhb@jhb_jhbbsd on 2011/06/22 21:33:14 Some cleanups. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_domain.c#12 edit .. //depot/projects/pci/sys/dev/pci/pci_private.h#6 edit .. //depot/projects/pci/sys/dev/pci/pcib_private.h#17 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_domain.c#12 (text+ko) ==== @@ -1,7 +1,8 @@ /*- - * XXX: Rename this file to something else, maybe pcib_subr.c? + * XXX: Rename this file to something else, maybe pci_subr.c? * - * Support utilities for Host to PCI bridge drivers. + * Support APIs for Host to PCI bridge drivers and drivers that + * provide PCI domains. */ #include @@ -11,8 +12,10 @@ #include #include #include +#include #include +#ifdef PCI_RES_BUS struct pci_domain { int pd_domain; struct rman pd_bus_rman; @@ -105,7 +108,9 @@ #endif return (rman_release_resource(r)); } +#endif /* PCI_RES_BUS */ +#ifdef NEW_PCIB /* * Some Host-PCI bridge drivers know which resource ranges they can * decode and should only allocate subranges to child PCI devices. @@ -240,3 +245,4 @@ } return (ERANGE); } +#endif /* NEW_PCIB */ ==== //depot/projects/pci/sys/dev/pci/pci_private.h#6 (text+ko) ==== @@ -124,4 +124,13 @@ */ void pci_cfg_save(device_t, struct pci_devinfo *, int); +#ifdef PCI_RES_BUS +struct resource *pci_domain_alloc_bus(int domain, device_t dev, int *rid, + u_long start, u_long end, u_long count, u_int flags); +int pci_domain_adjust_bus(int domain, device_t dev, + struct resource *r, u_long start, u_long end); +int pci_domain_release_bus(int domain, device_t dev, int rid, + struct resource *r); +#endif + #endif /* _PCI_PRIVATE_H_ */ ==== //depot/projects/pci/sys/dev/pci/pcib_private.h#17 (text+ko) ==== @@ -43,6 +43,19 @@ device_t hr_pcib; struct resource_list hr_rl; }; + +int pcib_host_res_init(device_t pcib, + struct pcib_host_resources *hr); +int pcib_host_res_free(device_t pcib, + struct pcib_host_resources *hr); +int pcib_host_res_decodes(struct pcib_host_resources *hr, int type, + u_long start, u_long end, u_int flags); +struct resource *pcib_host_res_alloc(struct pcib_host_resources *hr, + device_t dev, int type, int *rid, u_long start, u_long end, + u_long count, u_int flags); +int pcib_host_res_adjust(struct pcib_host_resources *hr, + device_t dev, int type, struct resource *r, u_long start, + u_long end); #endif /* @@ -104,24 +117,6 @@ #ifdef NEW_PCIB const char *pcib_child_name(device_t child); -int pcib_host_res_init(device_t pcib, - struct pcib_host_resources *hr); -int pcib_host_res_free(device_t pcib, - struct pcib_host_resources *hr); -int pcib_host_res_decodes(struct pcib_host_resources *hr, int type, - u_long start, u_long end, u_int flags); -struct resource *pcib_host_res_alloc(struct pcib_host_resources *hr, - device_t dev, int type, int *rid, u_long start, u_long end, - u_long count, u_int flags); -int pcib_host_res_adjust(struct pcib_host_resources *hr, - device_t dev, int type, struct resource *r, u_long start, - u_long end); -struct resource *pci_domain_alloc_bus(int domain, device_t dev, int *rid, - u_long start, u_long end, u_long count, u_int flags); -int pci_domain_adjust_bus(int domain, device_t dev, - struct resource *r, u_long start, u_long end); -int pci_domain_release_bus(int domain, device_t dev, int rid, - struct resource *r); #endif int host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, uint8_t *busnum); From owner-p4-projects@FreeBSD.ORG Thu Jun 23 05:28:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37A6F1065672; Thu, 23 Jun 2011 05:28:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E18CF106564A for ; Thu, 23 Jun 2011 05:28:29 +0000 (UTC) (envelope-from goda@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7DDB28FC0A for ; Thu, 23 Jun 2011 05:28:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5N5STm2090216 for ; Thu, 23 Jun 2011 05:28:29 GMT (envelope-from goda@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5N5STFu090213 for perforce@freebsd.org; Thu, 23 Jun 2011 05:28:29 GMT (envelope-from goda@FreeBSD.org) Date: Thu, 23 Jun 2011 05:28:29 GMT Message-Id: <201106230528.p5N5STFu090213@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to goda@FreeBSD.org using -f From: Kazuya Goda To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2011 05:28:30 -0000 http://p4web.freebsd.org/@@195190?ac=10 Change 195190 by goda@hassaku on 2011/06/23 05:27:37 Support UDP. Netisr policy on IP is changed "hybride". Affected files ... .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/if_ethersubr.c#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/netisr.c#2 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/ip_input.c#2 edit Differences ... ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -78,6 +78,7 @@ #include #include #include +#include #include #endif @@ -912,19 +913,32 @@ { struct ip *ip = NULL; struct tcphdr *th = NULL; + struct udphdr *uh = NULL; + uint16_t sport, dport; - if ( m->m_flags & M_FLOWID ) + if (m->m_flags & M_FLOWID) goto not_rps; ip = mtod(m, struct ip *); - if( ip->ip_p != IPPROTO_TCP ) + + switch (ip->ip_p){ + case IPPROTO_TCP: + th = (struct tcphdr *)((caddr_t)ip + (ip->ip_hl << 2)); + sport = th->th_sport; + dport = th->th_dport; + break; + case IPPROTO_UDP: + uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2)); + sport = uh->uh_sport; + dport = uh->uh_dport; + break; + default: goto not_rps; + } - th = (struct tcphdr *)((caddr_t)ip + ( ip->ip_hl << 2 ) ); - m->m_flags |= M_FLOWID; - m->m_pkthdr.flowid = rss_hash_ip4_4tuple(ip->ip_src, th->th_sport, ip->ip_dst, th->th_dport); - + m->m_pkthdr.flowid = rss_hash_ip4_4tuple(ip->ip_src, sport, ip->ip_dst, dport); + M_HASHTYPE_SET(m, M_HASHTYPE_RSS_4TUPLE); } not_rps: ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/netisr.c#2 (text+ko) ==== @@ -1073,6 +1073,7 @@ sched_pin(); m = netisr_select_cpuid(&netisr_proto[proto], NETISR_DISPATCH_HYBRID, source, m, &cpuid); + if (m == NULL) { error = ENOBUFS; goto out_unpin; ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/ip_input.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include "opt_ipstealth.h" #include "opt_ipsec.h" #include "opt_route.h" +#include "opt_rps.h" #include #include @@ -144,6 +145,9 @@ .nh_handler = ip_input, .nh_proto = NETISR_IP, .nh_policy = NETISR_POLICY_FLOW, +#ifdef RPS + .nh_dispatch = NETISR_DISPATCH_HYBRID, +#endif }; extern struct domain inetdomain; From owner-p4-projects@FreeBSD.ORG Thu Jun 23 21:30:22 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D5B0106567B; Thu, 23 Jun 2011 21:30:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 603101065679 for ; Thu, 23 Jun 2011 21:30:22 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3C58FC0A for ; Thu, 23 Jun 2011 21:30:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5NLUMfo082513 for ; Thu, 23 Jun 2011 21:30:22 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5NLUMTE082509 for perforce@freebsd.org; Thu, 23 Jun 2011 21:30:22 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 23 Jun 2011 21:30:22 GMT Message-Id: <201106232130.p5NLUMTE082509@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2011 21:30:22 -0000 http://p4web.freebsd.org/@@195226?ac=10 Change 195226 by rene@rene_acer on 2011/06/23 21:29:42 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#94 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#94 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -403,6 +403,7 @@ Login class [default]: Shell (sh csh tcsh zsh nologin) [sh]: zsh Home directory [/home/jru]: +Home directory permissions (Leave empty for default): Use password-based authentication? [yes]: Use an empty password? (yes/no) [no]: Use a random password? (yes/no) [no]: From owner-p4-projects@FreeBSD.ORG Thu Jun 23 21:40:16 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D86C1065670; Thu, 23 Jun 2011 21:40:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB9CC106564A for ; Thu, 23 Jun 2011 21:40:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id A8C9B8FC13 for ; Thu, 23 Jun 2011 21:40:15 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5NLeFEF084255 for ; Thu, 23 Jun 2011 21:40:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5NLeFhX084252 for perforce@freebsd.org; Thu, 23 Jun 2011 21:40:15 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 23 Jun 2011 21:40:15 GMT Message-Id: <201106232140.p5NLeFhX084252@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2011 21:40:16 -0000 http://p4web.freebsd.org/@@195228?ac=10 Change 195228 by rene@rene_acer on 2011/06/23 21:39:13 MFen handbook/users 1.59 -> 1.60 and remove ancient FreeBSDnl tag Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/users/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/users/chapter.sgml#5 (text+ko) ==== @@ -2,10 +2,9 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/users/chapter.sgml,v 1.9 2008/09/15 19:30:44 remko Exp $ - $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/users/chapter.sgml,v 1.16 2005/10/31 19:27:20 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/users/chapter.sgml - %SRCID% 1.59 + %SRCID% 1.60 --> @@ -474,6 +473,7 @@ Login class [default]: Shell (sh csh tcsh zsh nologin) [sh]: zsh Home directory [/home/jru]: +Home directory permissions (Leave empty for default): Use password-based authentication? [yes]: Use an empty password? (yes/no) [no]: Use a random password? (yes/no) [no]: From owner-p4-projects@FreeBSD.ORG Sat Jun 25 12:05:54 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64D221065676; Sat, 25 Jun 2011 12:05:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2670C1065670 for ; Sat, 25 Jun 2011 12:05:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1363B8FC0C for ; Sat, 25 Jun 2011 12:05:54 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5PC5r1J054249 for ; Sat, 25 Jun 2011 12:05:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5PC5rsI054245 for perforce@freebsd.org; Sat, 25 Jun 2011 12:05:53 GMT (envelope-from jhb@freebsd.org) Date: Sat, 25 Jun 2011 12:05:53 GMT Message-Id: <201106251205.p5PC5rsI054245@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2011 12:05:54 -0000 http://p4web.freebsd.org/@@195297?ac=10 Change 195297 by jhb@jhb_kavik on 2011/06/25 12:05:19 IFC @195296 Affected files ... .. //depot/projects/pci/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/pci/sys/amd64/pci/pci_bus.c#9 delete .. //depot/projects/pci/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/pci/sys/boot/i386/zfsboot/zfsldr.S#4 integrate .. //depot/projects/pci/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/pci/sys/conf/files#6 integrate .. //depot/projects/pci/sys/conf/files.amd64#3 integrate .. //depot/projects/pci/sys/conf/files.i386#4 integrate .. //depot/projects/pci/sys/conf/files.ia64#4 integrate .. //depot/projects/pci/sys/conf/files.pc98#3 integrate .. //depot/projects/pci/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/pci/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ah_osdep.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_internal.h#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar2133.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#2 integrate .. //depot/projects/pci/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/pci/sys/dev/ath/if_ath_sysctl.c#5 integrate .. //depot/projects/pci/sys/dev/ath/if_ath_sysctl.h#2 integrate .. //depot/projects/pci/sys/dev/e1000/if_igb.c#6 integrate .. //depot/projects/pci/sys/dev/pci/pci_pci.c#24 integrate .. //depot/projects/pci/sys/dev/pci/pci_subr.c#1 branch .. //depot/projects/pci/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/pci/sys/dev/usb/input/atp.c#2 integrate .. //depot/projects/pci/sys/dev/usb/input/uep.c#2 integrate .. //depot/projects/pci/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/pci/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/pci/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/pci/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/pci/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/pci/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/pci/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/pci/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/pci/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/pci/sys/dev/usb/net/if_ipheth.c#2 integrate .. //depot/projects/pci/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/pci/sys/dev/usb/net/if_mos.c#3 integrate .. //depot/projects/pci/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/pci/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/pci/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/umcs.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/pci/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/pci/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/pci/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/pci/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/pci/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/pci/sys/dev/usb/template/usb_template_audio.c#1 branch .. //depot/projects/pci/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/pci/sys/dev/usb/template/usb_template_kbd.c#1 branch .. //depot/projects/pci/sys/dev/usb/template/usb_template_modem.c#1 branch .. //depot/projects/pci/sys/dev/usb/template/usb_template_mouse.c#1 branch .. //depot/projects/pci/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/pci/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/pci/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/pci/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/pci/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/pci/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/pci/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/pci/sys/dev/usb/usbdi.h#4 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#5 integrate .. //depot/projects/pci/sys/i386/include/param.h#2 integrate .. //depot/projects/pci/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/pci/sys/i386/pci/pci_bus.c#9 delete .. //depot/projects/pci/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/pci/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/pci/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/pci/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/pci/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/pci/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/pci/sys/ia64/include/smp.h#4 integrate .. //depot/projects/pci/sys/kern/kern_clocksource.c#3 integrate .. //depot/projects/pci/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/pci/sys/kern/subr_smp.c#3 integrate .. //depot/projects/pci/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/pci/sys/modules/cxgbe/if_cxgbe/Makefile#3 integrate .. //depot/projects/pci/sys/modules/nfscl/Makefile#3 integrate .. //depot/projects/pci/sys/modules/nfscommon/Makefile#2 integrate .. //depot/projects/pci/sys/modules/usb/template/Makefile#2 integrate .. //depot/projects/pci/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/pci/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/pci/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/pci/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/pci/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/pci/sys/powerpc/aim/locore32.S#3 integrate .. //depot/projects/pci/sys/powerpc/aim/locore64.S#3 integrate .. //depot/projects/pci/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/pci/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/pci/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/pci/sys/powerpc/aim/swtch32.S#2 integrate .. //depot/projects/pci/sys/powerpc/aim/swtch64.S#2 integrate .. //depot/projects/pci/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/pci/sys/powerpc/aim/trap_subr32.S#2 integrate .. //depot/projects/pci/sys/powerpc/aim/trap_subr64.S#3 integrate .. //depot/projects/pci/sys/powerpc/booke/copyinout.c#2 integrate .. //depot/projects/pci/sys/powerpc/booke/interrupt.c#2 integrate .. //depot/projects/pci/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/pci/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/pci/sys/powerpc/ofw/ofwcall32.S#2 integrate .. //depot/projects/pci/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/pci/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3-hvcall.h#2 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3-hvcall.master#2 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3bus.c#5 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3disk.c#3 integrate .. //depot/projects/pci/sys/powerpc/ps3/ps3pic.c#2 integrate .. //depot/projects/pci/sys/sys/systm.h#5 integrate .. //depot/projects/pci/sys/vm/vm_fault.c#4 integrate .. //depot/projects/pci/sys/vm/vm_page.c#5 integrate .. //depot/projects/pci/sys/x86/include/pci_cfgreg.h#1 branch .. //depot/projects/pci/sys/x86/pci/pci_bus.c#1 branch .. //depot/projects/pci/sys/x86/x86/tsc.c#7 integrate Differences ... ==== //depot/projects/pci/sys/amd64/include/pci_cfgreg.h#2 (text+ko) ==== @@ -1,43 +1,6 @@ /*- - * Copyright (c) 1997, Stefan Esser - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice unmodified, this list of conditions, and the following - * disclaimer. - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $ - * + * This file is in the public domain. */ +/* $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.17 2011/06/22 21:04:13 jhb Exp $ */ -#define CONF1_ADDR_PORT 0x0cf8 -#define CONF1_DATA_PORT 0x0cfc - -#define CONF1_ENABLE 0x80000000ul -#define CONF1_ENABLE_CHK 0x80000000ul -#define CONF1_ENABLE_MSK 0x7f000000ul -#define CONF1_ENABLE_CHK1 0xff000001ul -#define CONF1_ENABLE_MSK1 0x80000001ul -#define CONF1_ENABLE_RES1 0x80000000ul - -int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); -int pci_cfgregopen(void); -u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); -void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); +#include ==== //depot/projects/pci/sys/arm/conf/CAMBRIA#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.22 2011/04/29 14:01:49 jhb Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.23 2011/06/24 23:26:45 cognet Exp $ ident CAMBRIA @@ -130,7 +130,7 @@ #options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -options AH_DEBUG +#options AH_DEBUG #options AH_ASSERT options AH_PRIVATE_DIAG #device ath_ar5210 ==== //depot/projects/pci/sys/boot/i386/zfsboot/zfsldr.S#4 (text+ko) ==== @@ -12,11 +12,10 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/zfsboot/zfsldr.S,v 1.4 2011/04/28 17:44:24 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/zfsboot/zfsldr.S,v 1.5 2011/06/23 15:53:17 jhb Exp $ */ /* Memory Locations */ - .set MEM_REL,0x700 # Relocation address .set MEM_ARG,0x900 # Arguments .set MEM_ORG,0x7c00 # Origin .set MEM_BUF,0x8000 # Load area @@ -91,26 +90,18 @@ mov %cx,%ss # Set up mov $start,%sp # stack /* - * Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets - * %cx == 0x100. - */ - mov %sp,%si # Source - mov $MEM_REL,%di # Destination - incb %ch # Word count - rep # Copy - movsw # code -/* * If we are on a hard drive, then load the MBR and look for the first * FreeBSD slice. We use the fake partition entry below that points to * the MBR when we call nread. The first pass looks for the first active * FreeBSD slice. The second pass looks for the first non-active FreeBSD * slice if the first one fails. */ - mov $part4,%si # Partition + mov $part4,%si # Dummy partition cmpb $0x80,%dl # Hard drive? jb main.4 # No - movb $0x1,%dh # Block count - callw nread # Read MBR + xor %eax,%eax # Read MBR + movl $MEM_BUF,%ebx # from first + callw nread # sector mov $0x1,%cx # Two passes main.1: mov $MEM_BUF+PRT_OFF,%si # Partition table movb $0x1,%dh # Partition @@ -139,52 +130,51 @@ /* * Ok, we have a slice and drive in %dx now, so use that to locate and * load boot2. %si references the start of the slice we are looking - * for, so go ahead and load up the 64 sectors starting at sector 1024 + * for, so go ahead and load up the 128 sectors starting at sector 1024 * (i.e. after the two vdev labels). We don't have do anything fancy * here to allow for an extra copy of boot1 and a partition table * (compare to this section of the UFS bootstrap) so we just load it - * all at 0x8000. The first part of boot2 is BTX, which wants to run + * all at 0x9000. The first part of boot2 is BTX, which wants to run * at 0x9000. The boot2.bin binary starts right after the end of BTX, * so we have to figure out where the start of it is and then move the - * binary to 0xc000. After we have moved the client, we relocate BTX - * itself to 0x9000 - doing it in this order means that none of the - * memcpy regions overlap which would corrupt the copy. Normally, BTX - * clients start at MEM_USR, or 0xa000, but when we use btxld to - * create zfsboot2, we use an entry point of 0x2000. That entry point is - * relative to MEM_USR; thus boot2.bin starts at 0xc000. + * binary to 0xc000. Normally, BTX clients start at MEM_USR, or 0xa000, + * but when we use btxld to create zfsboot2, we use an entry point of + * 0x2000. That entry point is relative to MEM_USR; thus boot2.bin + * starts at 0xc000. * * The load area and the target area for the client overlap so we have * to use a decrementing string move. We also play segment register * games with the destination address for the move so that the client * can be larger than 16k (which would overflow the zero segment since - * the client starts at 0xc000). Relocating BTX is easy since the load - * area and target area do not overlap. + * the client starts at 0xc000). */ main.5: mov %dx,MEM_ARG # Save args - movb $NSECT,%dh # Sector count + mov $NSECT,%cx # Sector count movl $1024,%eax # Offset to boot2 - callw nread.1 # Read disk -main.6: mov $MEM_BUF,%si # BTX (before reloc) - mov 0xa(%si),%bx # Get BTX length and set + mov $MEM_BTX,%ebx # Destination buffer +main.6: pushal # Save params + callw nread # Read disk + popal # Restore + incl %eax # Advance to + add $SIZ_SEC,%ebx # next sector + loop main.6 # If not last, read another + mov MEM_BTX+0xa,%bx # Get BTX length mov $NSECT*SIZ_SEC-1,%di # Size of load area (less one) - mov %di,%si # End of load - add $MEM_BUF,%si # area + mov %di,%si # End of load area, 0x9000 rel sub %bx,%di # End of client, 0xc000 rel mov %di,%cx # Size of inc %cx # client + mov $(MEM_BTX)>>4,%dx # Segment + mov %dx,%ds # addressing 0x9000 mov $(MEM_USR+2*SIZ_PAG)>>4,%dx # Segment mov %dx,%es # addressing 0xc000 std # Move with decrement rep # Relocate movsb # client - mov %ds,%dx # Back to - mov %dx,%es # zero segment - mov $MEM_BUF,%si # BTX (before reloc) - mov $MEM_BTX,%di # BTX - mov %bx,%cx # Get BTX length - cld # Increment this time - rep # Relocate - movsb # BTX + cld # Back to increment + xor %dx,%dx # Back + mov %ds,%dx # to zero + mov %dx,%es # segment /* * Enable A20 so we can access memory above 1 meg. @@ -211,32 +201,35 @@ /* * Trampoline used to call read from within zfsldr. Sets up an EDD - * packet on the stack and passes it to read. + * packet on the stack and passes it to read. We assume that the + * destination address is always segment-aligned. * * %eax - int - LBA to read in relative to partition start + * %ebx - ptr - destination address * %dl - byte - drive to read from - * %dh - byte - num sectors to read * %si - ptr - MBR partition entry */ -nread: xor %eax,%eax # Sector offset in partition -nread.1: xor %ecx,%ecx # Get +nread: xor %ecx,%ecx # Get addl 0x8(%si),%eax # LBA adc $0,%ecx pushl %ecx # Starting absolute block pushl %eax # block number - push %es # Address of - push $MEM_BUF # transfer buffer - xor %ax,%ax # Number of - movb %dh,%al # blocks to - push %ax # transfer + shr $4,%ebx # Convert to segment + push %bx # Address of + push $0 # transfer buffer + push $0x1 # Read 1 sector push $0x10 # Size of packet mov %sp,%bp # Packet pointer callw read # Read from disk + jc nread.1 # If error, fail lea 0x10(%bp),%sp # Clear stack - jnc return # If success, return - mov $msg_read,%si # Otherwise, set the error - # message and fall through to - # the error routine + ret # If success, return +nread.1: mov %ah,%al # Format + mov $read_err,%di # error + call hex8 # code + mov $msg_read,%si # Set the error message and + # fall through to the error + # routine /* * Print out the error message pointed to by %ds:(%si) followed * by a prompt, wait for a keypress, and then reboot the machine. @@ -259,14 +252,6 @@ jne putstr.0 # No /* - * Overused return code. ereturn is used to return an error from the - * read function. Since we assume putstr succeeds, we (ab)use the - * same code when we return from putstr. - */ -ereturn: movb $0x1,%ah # Invalid - stc # argument -return: retw # To caller -/* * Reads sectors from the disk. If EDD is enabled, then check if it is * installed and use it if it is. If it is not installed or not enabled, then * fall back to using CHS. Since we use a LBA, if we are using CHS, we have to @@ -294,14 +279,30 @@ retw # To caller read.1: mov $msg_chs,%si jmp error -msg_chs: .asciz "CHS not supported" + +/* + * AL to hex, saving the result to [EDI]. + */ +hex8: push %ax # Save + shrb $0x4,%al # Do upper + call hex8.1 # 4 + pop %ax # Restore +hex8.1: andb $0xf,%al # Get lower 4 + cmpb $0xa,%al # Convert + sbbb $0x69,%al # to hex + das # digit + orb $0x20,%al # To lower case + stosb # Save char + ret # (Recursive) /* Messages */ -msg_read: .asciz "Read" -msg_part: .asciz "Boot" +msg_chs: .asciz "CHS not supported" +msg_read: .ascii "Read error: " +read_err: .asciz "XX" +msg_part: .asciz "Boot error" -prompt: .asciz " error\r\n" +prompt: .asciz "\r\n" .org PRT_OFF,0x90 ==== //depot/projects/pci/sys/cam/ata/ata_xpt.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.41 2011/06/12 18:52:39 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.43 2011/06/23 15:10:44 mav Exp $"); #include #include @@ -1601,6 +1601,34 @@ } static void +ata_dev_advinfo(union ccb *start_ccb) +{ + struct cam_ed *device; + struct ccb_dev_advinfo *cdai; + off_t amt; + + start_ccb->ccb_h.status = CAM_REQ_INVALID; + device = start_ccb->ccb_h.path->device; + cdai = &start_ccb->cdai; + switch(cdai->buftype) { + case CDAI_TYPE_SERIAL_NUM: + if (cdai->flags & CDAI_FLAG_STORE) + break; + start_ccb->ccb_h.status = CAM_REQ_CMP; + cdai->provsiz = device->serial_num_len; + if (device->serial_num_len == 0) + break; + amt = device->serial_num_len; + if (cdai->provsiz > cdai->bufsiz) + amt = cdai->bufsiz; + memcpy(cdai->buf, device->serial_num, amt); + break; + default: + break; + } +} + +static void ata_action(union ccb *start_ccb) { @@ -1650,7 +1678,13 @@ xpt_done(start_ccb); break; } - /* FALLTHROUGH */ + xpt_action_default(start_ccb); + break; + } + case XPT_DEV_ADVINFO: + { + ata_dev_advinfo(start_ccb); + break; } default: xpt_action_default(start_ccb); ==== //depot/projects/pci/sys/cam/scsi/scsi_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.14 2011/06/14 14:53:17 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.15 2011/06/22 22:55:51 will Exp $"); #include #include @@ -2440,12 +2440,13 @@ struct ccb_dev_advinfo *cdai; off_t amt; + start_ccb->ccb_h.status = CAM_REQ_INVALID; device = start_ccb->ccb_h.path->device; cdai = &start_ccb->cdai; switch(cdai->buftype) { case CDAI_TYPE_SCSI_DEVID: if (cdai->flags & CDAI_FLAG_STORE) - break; + return; cdai->provsiz = device->device_id_len; if (device->device_id_len == 0) break; @@ -2456,7 +2457,7 @@ break; case CDAI_TYPE_SERIAL_NUM: if (cdai->flags & CDAI_FLAG_STORE) - break; + return; cdai->provsiz = device->serial_num_len; if (device->serial_num_len == 0) break; @@ -2490,7 +2491,7 @@ } break; default: - break; + return; } start_ccb->ccb_h.status = CAM_REQ_CMP; ==== //depot/projects/pci/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1606 2011/06/10 22:38:31 jeff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1608 2011/06/24 21:39:38 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1553,6 +1553,7 @@ dev/pci/pci_domain.c optional pci new_pcib dev/pci/pci_if.m standard dev/pci/pci_pci.c optional pci +dev/pci/pci_subr.c optional pci dev/pci/pci_user.c optional pci dev/pci/pcib_if.m standard dev/pci/vga_pci.c optional pci @@ -1992,8 +1993,12 @@ # # USB templates # -dev/usb/template/usb_template.c optional usb_template +dev/usb/template/usb_template.c optional usb_template +dev/usb/template/usb_template_audio.c optional usb_template dev/usb/template/usb_template_cdce.c optional usb_template +dev/usb/template/usb_template_kbd.c optional usb_template +dev/usb/template/usb_template_modem.c optional usb_template +dev/usb/template/usb_template_mouse.c optional usb_template dev/usb/template/usb_template_msc.c optional usb_template dev/usb/template/usb_template_mtp.c optional usb_template # ==== //depot/projects/pci/sys/conf/files.amd64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.180 2011/04/20 12:58:30 bz Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.181 2011/06/22 21:04:13 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -128,7 +128,6 @@ amd64/amd64/uio_machdep.c standard amd64/amd64/uma_machdep.c standard amd64/amd64/vm_machdep.c standard -amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci crypto/aesni/aesencdec_amd64.S optional aesni crypto/aesni/aeskeys_amd64.S optional aesni @@ -315,7 +314,8 @@ x86/isa/isa_dma.c standard x86/isa/nmi.c standard x86/isa/orm.c optional isa -x86/pci/qpi.c standard +x86/pci/pci_bus.c optional pci +x86/pci/qpi.c optional pci x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/io_apic.c standard ==== //depot/projects/pci/sys/conf/files.i386#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.665 2011/05/15 14:01:23 brix Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.666 2011/06/22 21:04:13 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -352,7 +352,6 @@ dependency "linux_assym.h" i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux -i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ @@ -405,7 +404,8 @@ x86/isa/isa_dma.c optional isa x86/isa/nmi.c standard x86/isa/orm.c optional isa -x86/pci/qpi.c standard +x86/pci/pci_bus.c optional pci +x86/pci/qpi.c optional pci x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/io_apic.c optional apic ==== //depot/projects/pci/sys/conf/files.ia64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.109 2011/04/30 20:49:00 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.110 2011/06/25 02:15:14 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -120,6 +120,7 @@ isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_elf32.c optional compat_freebsd32 +kern/kern_clocksource.c standard libkern/bcmp.c standard libkern/ffsl.c standard libkern/fls.c standard ==== //depot/projects/pci/sys/conf/files.pc98#3 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.397 2011/04/20 12:58:30 bz Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.398 2011/06/22 21:04:13 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -199,7 +199,6 @@ dependency "linux_assym.h" i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux -i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ @@ -249,6 +248,7 @@ x86/isa/atpic.c optional atpic x86/isa/clock.c standard x86/isa/isa.c optional isa +x86/pci/pci_bus.c optional pci x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/io_apic.c optional apic ==== //depot/projects/pci/sys/dev/acpica/acpi.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.303 2011/06/17 21:19:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.304 2011/06/24 13:58:56 jhb Exp $"); #include "opt_acpi.h" #include @@ -1244,7 +1244,7 @@ /* * First attempt at allocating the resource. For direct children, * use resource_list_alloc() to handle reserved resources. For - * other dveices, pass the request up to our parent. + * other devices, pass the request up to our parent. */ if (bus == device_get_parent(child)) { ad = device_get_ivars(child); ==== //depot/projects/pci/sys/dev/acpica/acpi_cpu.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.96 2011/04/07 23:28:28 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.99 2011/06/25 02:49:47 marcel Exp $"); #include "opt_acpi.h" #include @@ -856,6 +856,8 @@ sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat); if (sc->cpu_cx_states[i].type < ACPI_STATE_C3) sc->cpu_non_c3 = i; + else + cpu_can_deep_sleep = 1; } sbuf_trim(&sb); sbuf_finish(&sb); @@ -925,11 +927,9 @@ /* Find the lowest state that has small enough latency. */ cx_next_idx = 0; -#ifndef __ia64__ if (cpu_disable_deep_sleep) i = min(sc->cpu_cx_lowest, sc->cpu_non_c3); else -#endif i = sc->cpu_cx_lowest; for (; i >= 0; i--) { if (sc->cpu_cx_states[i].trans_lat * 3 <= sc->cpu_prev_sleep) { ==== //depot/projects/pci/sys/dev/ath/ah_osdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.18 2011/05/17 16:30:34 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.20 2011/06/25 00:34:40 adrian Exp $ */ #include "opt_ah.h" @@ -81,29 +81,10 @@ #ifdef AH_DEBUG int ath_hal_debug = 0; SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug, CTLFLAG_RW, &ath_hal_debug, - 0, "Atheros HAL debugging printfs"); + 0, "Atheros HAL debugging printfs"); TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug); #endif /* AH_DEBUG */ -int ath_hal_ar5416_biasadj = 0; -SYSCTL_INT(_hw_ath_hal, OID_AUTO, ar5416_biasadj, CTLFLAG_RW, - &ath_hal_ar5416_biasadj, 0, "Enable 2ghz AR5416 direction sensitivity" - " bias adjust"); - -/* NB: these are deprecated; they exist for now for compatibility */ -int ath_hal_dma_beacon_response_time = 2; /* in TU's */ -SYSCTL_INT(_hw_ath_hal, OID_AUTO, dma_brt, CTLFLAG_RW, - &ath_hal_dma_beacon_response_time, 0, - "Atheros HAL DMA beacon response time"); -int ath_hal_sw_beacon_response_time = 10; /* in TU's */ -SYSCTL_INT(_hw_ath_hal, OID_AUTO, sw_brt, CTLFLAG_RW, - &ath_hal_sw_beacon_response_time, 0, - "Atheros HAL software beacon response time"); -int ath_hal_additional_swba_backoff = 0; /* in TU's */ -SYSCTL_INT(_hw_ath_hal, OID_AUTO, swba_backoff, CTLFLAG_RW, - &ath_hal_additional_swba_backoff, 0, - "Atheros HAL additional SWBA backoff time"); - MALLOC_DEFINE(M_ATH_HAL, "ath_hal", "ath hal data"); void* @@ -146,7 +127,7 @@ void DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...) { - if ((mask == HAL_DEBUG_UNMASKABLE) || (ath_hal_debug & mask)) { + if ((mask == HAL_DEBUG_UNMASKABLE) || (ah->ah_config.ah_debug & mask)) { __va_list ap; va_start(ap, fmt); ath_hal_vprintf(ah, fmt, ap); ==== //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#5 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.38 2011/06/07 09:03:28 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.39 2011/06/23 02:38:36 adrian Exp $ */ #ifndef _ATH_AH_H_ @@ -756,6 +756,17 @@ }; typedef struct dfs_event HAL_DFS_EVENT; +typedef struct +{ + int ah_debug; /* only used if AH_DEBUG is defined */ + int ah_ar5416_biasadj; /* enable AR2133 radio specific bias fiddling */ + + /* NB: these are deprecated; they exist for now for compatibility */ + int ah_dma_beacon_response_time;/* in TU's */ + int ah_sw_beacon_response_time; /* in TU's */ + int ah_additional_swba_backoff; /* in TU's */ +}HAL_OPS_CONFIG; + /* * Hardware Access Layer (HAL) API. * @@ -784,6 +795,7 @@ uint16_t *ah_eepromdata; /* eeprom buffer, if needed */ + HAL_OPS_CONFIG ah_config; const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *, u_int mode); void __ahdecl(*ah_detach)(struct ath_hal*); ==== //depot/projects/pci/sys/dev/ath/ath_hal/ah_internal.h#5 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.40 2011/06/01 20:01:02 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.44 2011/06/24 23:59:14 adrian Exp $ */ #ifndef _ATH_AH_INTERAL_H_ #define _ATH_AH_INTERAL_H_ @@ -475,12 +475,6 @@ #define OS_A_REG_RMW_FIELD(_a, _r, _f, _v) \ do { OS_REG_WRITE(_a, _r, (OS_REG_READ(_a, _r) &~ (_f)) | (((_v) << _f##_S) & (_f))) ; OS_DELAY(100); } while (0) -/* system-configurable parameters */ -extern int ath_hal_dma_beacon_response_time; /* in TU's */ -extern int ath_hal_sw_beacon_response_time; /* in TU's */ -extern int ath_hal_additional_swba_backoff; /* in TU's */ -extern int ath_hal_ar5416_biasadj; /* 1 or 0 */ - /* wait for the register contents to have the specified value */ extern HAL_BOOL ath_hal_wait(struct ath_hal *, u_int reg, uint32_t mask, uint32_t val); @@ -504,11 +498,29 @@ /* common debugging interfaces */ #ifdef AH_DEBUG #include "ah_debug.h" -extern int ath_hal_debug; +extern int ath_hal_debug; /* Global debug flags */ + +/* + * This is used for global debugging, when ahp doesn't yet have the + * related debugging state. For example, during probe/attach. + */ +#define HALDEBUG_G(_ah, __m, ...) \ + do { \ + if ((__m) == HAL_DEBUG_UNMASKABLE || \ + ath_hal_debug & (__m)) { \ + DO_HALDEBUG((_ah), (__m), __VA_ARGS__); \ + } \ + } while (0); + +/* + * This is used for local debugging, when ahp isn't NULL and + * thus may have debug flags set. + */ #define HALDEBUG(_ah, __m, ...) \ do { \ if ((__m) == HAL_DEBUG_UNMASKABLE || \ - (ath_hal_debug & (__m))) { \ + ath_hal_debug & (__m) || \ + (_ah)->ah_config.ah_debug & (__m)) { \ DO_HALDEBUG((_ah), (__m), __VA_ARGS__); \ } \ } while(0); @@ -516,7 +528,8 @@ extern void DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...) __printflike(3,4); #else -#define HALDEBUG(_ah, __m, _fmt, ...) +#define HALDEBUG(_ah, __m, ...) +#define HALDEBUG_G(_ah, __m, ...) #endif /* AH_DEBUG */ /* ==== //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah_regdomain.c,v 1.11 2011/03/10 03:13:56 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_regdomain.c,v 1.12 2011/06/23 06:55:29 adrian Exp $ */ #include "opt_ah.h" @@ -167,7 +167,7 @@ if (regDomainPairs[i].regDmnEnum == rd) return AH_TRUE; } - HALDEBUG(ah, HAL_DEBUG_REGDOMAIN, + HALDEBUG_G(ah, HAL_DEBUG_REGDOMAIN, "%s: invalid regulatory domain/country code 0x%x\n", __func__, rd); return AH_FALSE; } @@ -609,7 +609,7 @@ return 1544 + freq; if (sku == SKU_SR9) return 3344 - freq; - HALDEBUG(AH_NULL, HAL_DEBUG_ANY, + HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY, "%s: cannot map freq %u unknown gsm sku %u\n", __func__, freq, sku); return freq; ==== //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c,v 1.12 2011/04/04 14:52:31 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c,v 1.13 2011/06/23 06:55:29 adrian Exp $ */ #include "opt_ah.h" @@ -181,14 +181,14 @@ HAL_STATUS ecode; int i; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, + HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: devid 0x%x sc %p st %p sh %p\n", __func__, devid, sc, (void*) st, (void*) sh); /* NB: memory is returned zero'd */ ahp = ath_hal_malloc(sizeof (struct ath_hal_5210)); if (ahp == AH_NULL) { - HALDEBUG(AH_NULL, HAL_DEBUG_ANY, + HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY, "%s: no memory for state block\n", __func__); ecode = HAL_ENOMEM; goto bad; ==== //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c,v 1.2 2010/03/03 17:32:32 rpaulo Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c,v 1.3 2011/06/23 02:38:36 adrian Exp $ */ #include "opt_ah.h" @@ -56,9 +56,9 @@ if (AH_PRIVATE(ah)->ah_opmode != HAL_M_STA) { bt.bt_nextdba = (next_beacon - - ath_hal_dma_beacon_response_time) << 3; /* 1/8 TU */ + ah->ah_config.ah_dma_beacon_response_time) << 3; /* 1/8 TU */ bt.bt_nextswba = (next_beacon - - ath_hal_sw_beacon_response_time) << 3; /* 1/8 TU */ + ah->ah_config.ah_sw_beacon_response_time) << 3; /* 1/8 TU */ /* * The SWBA interrupt is not used for beacons in ad hoc mode * as we don't yet support ATIMs. So since the beacon never >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 25 12:10:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18177106566C; Sat, 25 Jun 2011 12:10:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0948106564A for ; Sat, 25 Jun 2011 12:10:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BE5878FC12 for ; Sat, 25 Jun 2011 12:10:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5PCAHB2054465 for ; Sat, 25 Jun 2011 12:10:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5PCAHcX054461 for perforce@freebsd.org; Sat, 25 Jun 2011 12:10:17 GMT (envelope-from jhb@freebsd.org) Date: Sat, 25 Jun 2011 12:10:17 GMT Message-Id: <201106251210.p5PCAHcX054461@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2011 12:10:18 -0000 http://p4web.freebsd.org/@@195298?ac=10 Change 195298 by jhb@jhb_kavik on 2011/06/25 12:09:14 Move pcib_host_res_* to pci_subr.c. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_domain.c#13 edit .. //depot/projects/pci/sys/dev/pci/pci_subr.c#2 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_domain.c#13 (text+ko) ==== @@ -109,140 +109,3 @@ return (rman_release_resource(r)); } #endif /* PCI_RES_BUS */ - -#ifdef NEW_PCIB -/* - * Some Host-PCI bridge drivers know which resource ranges they can - * decode and should only allocate subranges to child PCI devices. - * This API provides a way to manage this. The bridge drive should - * initialize this structure during attach and call - * pcib_host_res_decodes() on each resource range it decodes. It can - * then use pcib_host_res_alloc() and pcib_host_res_adjust() as helper - * routines for BUS_ALLOC_RESOURCE() and BUS_ADJUST_RESOURCE(). This - * API assumes that resources for any decoded ranges can be safely - * allocated from the parent via bus_generic_alloc_resource(). - */ -int -pcib_host_res_init(device_t pcib, struct pcib_host_resources *hr) -{ - - hr->hr_pcib = pcib; - resource_list_init(&hr->hr_rl); - return (0); -} - -int -pcib_host_res_free(device_t pcib, struct pcib_host_resources *hr) -{ - - resource_list_free(&hr->hr_rl); - return (0); -} - -int -pcib_host_res_decodes(struct pcib_host_resources *hr, int type, u_long start, - u_long end, u_int flags) -{ - struct resource_list_entry *rle; - int rid; - - if (bootverbose) - device_printf(hr->hr_pcib, "decoding %d %srange %#lx-%#lx\n", - type, flags & RF_PREFETCHABLE ? "prefetchable ": "", start, - end); - rid = resource_list_add_next(&hr->hr_rl, type, start, end, - end - start + 1); - if (flags & RF_PREFETCHABLE) { - KASSERT(type == SYS_RES_MEMORY, - ("only memory is prefetchable")); - rle = resource_list_find(&hr->hr_rl, type, rid); - rle->flags = RLE_PREFETCH; - } - return (0); -} - -struct resource * -pcib_host_res_alloc(struct pcib_host_resources *hr, device_t dev, int type, - int *rid, u_long start, u_long end, u_long count, u_int flags) -{ - struct resource_list_entry *rle; - struct resource *r; - u_long new_start, new_end; - - if (flags & RF_PREFETCHABLE) - KASSERT(type == SYS_RES_MEMORY, - ("only memory is prefetchable")); - - rle = resource_list_find(&hr->hr_rl, type, 0); - if (rle == NULL) { - /* - * No decoding ranges for this resource type, just pass - * the request up to the parent. - */ - return (bus_generic_alloc_resource(hr->hr_pcib, dev, type, rid, - start, end, count, flags)); - } - -restart: - /* Try to allocate from each decoded range. */ - for (; rle != NULL; rle = STAILQ_NEXT(rle, link)) { - if (rle->type != type) - continue; - if (((flags & RF_PREFETCHABLE) != 0) != - ((rle->flags & RLE_PREFETCH) != 0)) - continue; - new_start = ulmax(start, rle->start); - new_end = ulmin(end, rle->end); - if (new_start > new_end || - new_start + count - 1 > new_end || - new_start + count < new_start) - continue; - r = bus_generic_alloc_resource(hr->hr_pcib, dev, type, rid, - new_start, new_end, count, flags); - if (r != NULL) { - if (bootverbose) - device_printf(hr->hr_pcib, - "allocated type %d (%#lx-%#lx) for rid %x of %s\n", - type, rman_get_start(r), rman_get_end(r), - *rid, pcib_child_name(dev)); - return (r); - } - } - - /* - * If we failed to find a prefetch range for a memory - * resource, try again without prefetch. - */ - if (flags & RF_PREFETCHABLE) { - flags &= ~RF_PREFETCHABLE; - rle = resource_list_find(&hr->hr_rl, type, 0); - goto restart; - } - return (NULL); -} - -int -pcib_host_res_adjust(struct pcib_host_resources *hr, device_t dev, int type, - struct resource *r, u_long start, u_long end) -{ - struct resource_list_entry *rle; - - rle = resource_list_find(&hr->hr_rl, type, 0); - if (rle == NULL) { - /* - * No decoding ranges for this resource type, just pass - * the request up to the parent. - */ - return (bus_generic_adjust_resource(hr->hr_pcib, dev, type, r, - start, end)); - } - - /* Only allow adjustments that stay within a decoded range. */ - for (; rle != NULL; rle = STAILQ_NEXT(rle, link)) { - if (rle->start <= start && rle->end >= end) - return (bus_generic_adjust_resource(hr->hr_pcib, dev, - type, r, start, end)); - } - return (ERANGE); -} -#endif /* NEW_PCIB */ ==== //depot/projects/pci/sys/dev/pci/pci_subr.c#2 (text+ko) ==== @@ -33,9 +33,10 @@ * provide PCI domains. */ -#include +#include #include #include +#include #include #include @@ -128,3 +129,140 @@ return 1; } + +#ifdef NEW_PCIB +/* + * Some Host-PCI bridge drivers know which resource ranges they can + * decode and should only allocate subranges to child PCI devices. + * This API provides a way to manage this. The bridge drive should + * initialize this structure during attach and call + * pcib_host_res_decodes() on each resource range it decodes. It can + * then use pcib_host_res_alloc() and pcib_host_res_adjust() as helper + * routines for BUS_ALLOC_RESOURCE() and BUS_ADJUST_RESOURCE(). This + * API assumes that resources for any decoded ranges can be safely + * allocated from the parent via bus_generic_alloc_resource(). + */ +int +pcib_host_res_init(device_t pcib, struct pcib_host_resources *hr) +{ + + hr->hr_pcib = pcib; + resource_list_init(&hr->hr_rl); + return (0); +} + +int +pcib_host_res_free(device_t pcib, struct pcib_host_resources *hr) +{ + + resource_list_free(&hr->hr_rl); + return (0); +} + +int +pcib_host_res_decodes(struct pcib_host_resources *hr, int type, u_long start, + u_long end, u_int flags) +{ + struct resource_list_entry *rle; + int rid; + + if (bootverbose) + device_printf(hr->hr_pcib, "decoding %d %srange %#lx-%#lx\n", + type, flags & RF_PREFETCHABLE ? "prefetchable ": "", start, + end); + rid = resource_list_add_next(&hr->hr_rl, type, start, end, + end - start + 1); + if (flags & RF_PREFETCHABLE) { + KASSERT(type == SYS_RES_MEMORY, + ("only memory is prefetchable")); + rle = resource_list_find(&hr->hr_rl, type, rid); + rle->flags = RLE_PREFETCH; + } + return (0); +} + +struct resource * +pcib_host_res_alloc(struct pcib_host_resources *hr, device_t dev, int type, + int *rid, u_long start, u_long end, u_long count, u_int flags) +{ + struct resource_list_entry *rle; + struct resource *r; + u_long new_start, new_end; + + if (flags & RF_PREFETCHABLE) + KASSERT(type == SYS_RES_MEMORY, + ("only memory is prefetchable")); + + rle = resource_list_find(&hr->hr_rl, type, 0); + if (rle == NULL) { + /* + * No decoding ranges for this resource type, just pass + * the request up to the parent. + */ + return (bus_generic_alloc_resource(hr->hr_pcib, dev, type, rid, + start, end, count, flags)); + } + +restart: + /* Try to allocate from each decoded range. */ + for (; rle != NULL; rle = STAILQ_NEXT(rle, link)) { + if (rle->type != type) + continue; + if (((flags & RF_PREFETCHABLE) != 0) != + ((rle->flags & RLE_PREFETCH) != 0)) + continue; + new_start = ulmax(start, rle->start); + new_end = ulmin(end, rle->end); + if (new_start > new_end || + new_start + count - 1 > new_end || + new_start + count < new_start) + continue; + r = bus_generic_alloc_resource(hr->hr_pcib, dev, type, rid, + new_start, new_end, count, flags); + if (r != NULL) { + if (bootverbose) + device_printf(hr->hr_pcib, + "allocated type %d (%#lx-%#lx) for rid %x of %s\n", + type, rman_get_start(r), rman_get_end(r), + *rid, pcib_child_name(dev)); + return (r); + } + } + + /* + * If we failed to find a prefetch range for a memory + * resource, try again without prefetch. + */ + if (flags & RF_PREFETCHABLE) { + flags &= ~RF_PREFETCHABLE; + rle = resource_list_find(&hr->hr_rl, type, 0); + goto restart; + } + return (NULL); +} + +int +pcib_host_res_adjust(struct pcib_host_resources *hr, device_t dev, int type, + struct resource *r, u_long start, u_long end) +{ + struct resource_list_entry *rle; + + rle = resource_list_find(&hr->hr_rl, type, 0); + if (rle == NULL) { + /* + * No decoding ranges for this resource type, just pass + * the request up to the parent. + */ + return (bus_generic_adjust_resource(hr->hr_pcib, dev, type, r, + start, end)); + } + + /* Only allow adjustments that stay within a decoded range. */ + for (; rle != NULL; rle = STAILQ_NEXT(rle, link)) { + if (rle->start <= start && rle->end >= end) + return (bus_generic_adjust_resource(hr->hr_pcib, dev, + type, r, start, end)); + } + return (ERANGE); +} +#endif /* NEW_PCIB */ From owner-p4-projects@FreeBSD.ORG Sat Jun 25 12:25:37 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D865E1065672; Sat, 25 Jun 2011 12:25:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B287106566C for ; Sat, 25 Jun 2011 12:25:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 70B538FC19 for ; Sat, 25 Jun 2011 12:25:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5PCPah3058786 for ; Sat, 25 Jun 2011 12:25:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5PCPaiC058783 for perforce@freebsd.org; Sat, 25 Jun 2011 12:25:36 GMT (envelope-from jhb@freebsd.org) Date: Sat, 25 Jun 2011 12:25:36 GMT Message-Id: <201106251225.p5PCPaiC058783@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2011 12:25:37 -0000 http://p4web.freebsd.org/@@195299?ac=10 Change 195299 by jhb@jhb_kavik on 2011/06/25 12:24:50 Use pci_printf(). Affected files ... .. //depot/projects/pci/sys/dev/pci/pci.c#23 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci.c#23 (text+ko) ==== @@ -871,10 +871,9 @@ remain |= byte2 << 8; if (remain > (0x7f*4 - vrs.off)) { state = -1; - printf( - "pci%d:%d:%d:%d: invalid VPD data, remain %#x\n", - cfg->domain, cfg->bus, cfg->slot, - cfg->func, remain); + pci_printf(cfg, + "invalid VPD data, remain %#x\n", + remain); } name = byte & 0x7f; } else { @@ -946,10 +945,8 @@ * if this happens, we can't trust the rest * of the VPD. */ - printf( - "pci%d:%d:%d:%d: bad keyword length: %d\n", - cfg->domain, cfg->bus, cfg->slot, - cfg->func, dflen); + pci_printf(cfg, "bad keyword length: %d\n", + dflen); cksumvalid = 0; state = -1; break; @@ -982,10 +979,8 @@ cksumvalid = 1; else { if (bootverbose) - printf( - "pci%d:%d:%d:%d: bad VPD cksum, remain %hhu\n", - cfg->domain, cfg->bus, - cfg->slot, cfg->func, + pci_printf(cfg, + "bad VPD cksum, remain %hhu\n", vrs.cksum); cksumvalid = 0; state = -1; @@ -1063,9 +1058,7 @@ break; default: - printf("pci%d:%d:%d:%d: invalid state: %d\n", - cfg->domain, cfg->bus, cfg->slot, cfg->func, - state); + pci_printf(cfg, "invalid state: %d\n", state); state = -1; break; } @@ -1082,8 +1075,7 @@ } if (state < -1) { /* I/O error, clean up */ - printf("pci%d:%d:%d:%d: failed to read VPD data.\n", - cfg->domain, cfg->bus, cfg->slot, cfg->func); + pci_printf(cfg, "failed to read VPD data.\n"); if (cfg->vpd.vpd_ident != NULL) { free(cfg->vpd.vpd_ident, M_DEVBUF); cfg->vpd.vpd_ident = NULL; From owner-p4-projects@FreeBSD.ORG Sat Jun 25 12:26:43 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9B53106566C; Sat, 25 Jun 2011 12:26:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C4E0106564A for ; Sat, 25 Jun 2011 12:26:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8B2FC8FC0C for ; Sat, 25 Jun 2011 12:26:42 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5PCQgHk058883 for ; Sat, 25 Jun 2011 12:26:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5PCQgTC058880 for perforce@freebsd.org; Sat, 25 Jun 2011 12:26:42 GMT (envelope-from jhb@freebsd.org) Date: Sat, 25 Jun 2011 12:26:42 GMT Message-Id: <201106251226.p5PCQgTC058880@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2011 12:26:43 -0000 http://p4web.freebsd.org/@@195300?ac=10 Change 195300 by jhb@jhb_kavik on 2011/06/25 12:25:54 Move pcib_child_name() to pci_subr.c. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#25 edit .. //depot/projects/pci/sys/dev/pci/pci_subr.c#3 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#25 (text+ko) ==== @@ -788,18 +788,6 @@ } #ifdef NEW_PCIB -const char * -pcib_child_name(device_t child) -{ - static char buf[64]; - - if (device_get_nameunit(child) != NULL) - return (device_get_nameunit(child)); - snprintf(buf, sizeof(buf), "pci%d:%d:%d:%d", pci_get_domain(child), - pci_get_bus(child), pci_get_slot(child), pci_get_function(child)); - return (buf); -} - /* * Attempt to allocate a resource from the existing resources assigned * to a window. ==== //depot/projects/pci/sys/dev/pci/pci_subr.c#3 (text+ko) ==== @@ -132,6 +132,23 @@ #ifdef NEW_PCIB /* + * Return a pointer to a pretty name for a PCI device. If the device + * has a driver attached, the device's name is used, otherwise a name + * is generated from the device's PCI address. + */ +const char * +pcib_child_name(device_t child) +{ + static char buf[64]; + + if (device_get_nameunit(child) != NULL) + return (device_get_nameunit(child)); + snprintf(buf, sizeof(buf), "pci%d:%d:%d:%d", pci_get_domain(child), + pci_get_bus(child), pci_get_slot(child), pci_get_function(child)); + return (buf); +} + +/* * Some Host-PCI bridge drivers know which resource ranges they can * decode and should only allocate subranges to child PCI devices. * This API provides a way to manage this. The bridge drive should From owner-p4-projects@FreeBSD.ORG Sat Jun 25 12:31:06 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E3511065670; Sat, 25 Jun 2011 12:31:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40C31106564A for ; Sat, 25 Jun 2011 12:31:06 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2FAC48FC1A for ; Sat, 25 Jun 2011 12:31:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5PCV6Jk059892 for ; Sat, 25 Jun 2011 12:31:06 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5PCV6AD059888 for perforce@freebsd.org; Sat, 25 Jun 2011 12:31:06 GMT (envelope-from jhb@freebsd.org) Date: Sat, 25 Jun 2011 12:31:06 GMT Message-Id: <201106251231.p5PCV6AD059888@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2011 12:31:06 -0000 http://p4web.freebsd.org/@@195301?ac=10 Change 195301 by jhb@jhb_kavik on 2011/06/25 12:30:21 Sort. Affected files ... .. //depot/projects/pci/sys/dev/pci/pcib_private.h#18 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pcib_private.h#18 (text+ko) ==== @@ -115,13 +115,13 @@ typedef uint32_t pci_read_config_fn(int b, int s, int f, int reg, int width); -#ifdef NEW_PCIB -const char *pcib_child_name(device_t child); -#endif int host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, uint8_t *busnum); int pcib_attach(device_t dev); void pcib_attach_common(device_t dev); +#ifdef NEW_PCIB +const char *pcib_child_name(device_t child); +#endif int pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result); int pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value); struct resource *pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,