From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 20 07:38:39 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 23AB14FD; Sun, 20 Jan 2013 07:38:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 153433D4; Sun, 20 Jan 2013 07:38:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0K7ccxO075482; Sun, 20 Jan 2013 07:38:38 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0K7ccH6075481; Sun, 20 Jan 2013 07:38:38 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201301200738.r0K7ccH6075481@svn.freebsd.org> From: Gleb Smirnoff Date: Sun, 20 Jan 2013 07:38:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245682 - stable/9/sbin/route X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 07:38:39 -0000 Author: glebius Date: Sun Jan 20 07:38:38 2013 New Revision: 245682 URL: http://svnweb.freebsd.org/changeset/base/245682 Log: Merge r243860 from head: Flush stdout after RTM_IFANNOUNCE message. PR: bin/151600 Submitted by: Eric van Gyzen Modified: stable/9/sbin/route/route.c Directory Properties: stable/9/sbin/route/ (props changed) Modified: stable/9/sbin/route/route.c ============================================================================== --- stable/9/sbin/route/route.c Sun Jan 20 04:04:37 2013 (r245681) +++ stable/9/sbin/route/route.c Sun Jan 20 07:38:38 2013 (r245682) @@ -1413,6 +1413,7 @@ print_rtmsg(struct rt_msghdr *rtm, size_ break; } printf("\n"); + fflush(stdout); break; default: From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 20 07:45:05 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3B89B6A4; Sun, 20 Jan 2013 07:45:05 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2D8FD3F9; Sun, 20 Jan 2013 07:45:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0K7j5eH077956; Sun, 20 Jan 2013 07:45:05 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0K7j5bh077955; Sun, 20 Jan 2013 07:45:05 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201301200745.r0K7j5bh077955@svn.freebsd.org> From: Gleb Smirnoff Date: Sun, 20 Jan 2013 07:45:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245683 - stable/9/etc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 07:45:05 -0000 Author: glebius Date: Sun Jan 20 07:45:04 2013 New Revision: 245683 URL: http://svnweb.freebsd.org/changeset/base/245683 Log: Merge r243568 from head: Fix typo in weekly line which made it to rotated after reaching > 1 Kb. PR: conf/173857 Submitted by: Matt Smith Modified: stable/9/etc/newsyslog.conf Directory Properties: stable/9/etc/ (props changed) Modified: stable/9/etc/newsyslog.conf ============================================================================== --- stable/9/etc/newsyslog.conf Sun Jan 20 07:38:38 2013 (r245682) +++ stable/9/etc/newsyslog.conf Sun Jan 20 07:45:04 2013 (r245683) @@ -34,5 +34,5 @@ /var/log/security 600 10 100 * JC /var/log/sendmail.st 640 10 * 168 BN /var/log/utx.log 644 3 * @01T05 B -/var/log/weekly.log 640 5 1 $W6D0 JN +/var/log/weekly.log 640 5 * $W6D0 JN /var/log/xferlog 600 7 100 * JC From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 20 14:22:22 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3A10E8E5; Sun, 20 Jan 2013 14:22:22 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 118F3678; Sun, 20 Jan 2013 14:22:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KEMLr6097065; Sun, 20 Jan 2013 14:22:21 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KEMLLe097063; Sun, 20 Jan 2013 14:22:21 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201301201422.r0KEMLLe097063@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 20 Jan 2013 14:22:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245690 - in stable/9: bin/sh tools/regression/bin/sh/parser X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 14:22:22 -0000 Author: jilles Date: Sun Jan 20 14:22:21 2013 New Revision: 245690 URL: http://svnweb.freebsd.org/changeset/base/245690 Log: MFC r245382: sh: Fix crash when parsing '{ } &'. Added: stable/9/tools/regression/bin/sh/parser/empty-braces1.0 - copied unchanged from r245382, head/tools/regression/bin/sh/parser/empty-braces1.0 Modified: stable/9/bin/sh/parser.c Directory Properties: stable/9/bin/sh/ (props changed) stable/9/tools/regression/bin/sh/ (props changed) Modified: stable/9/bin/sh/parser.c ============================================================================== --- stable/9/bin/sh/parser.c Sun Jan 20 12:44:50 2013 (r245689) +++ stable/9/bin/sh/parser.c Sun Jan 20 14:22:21 2013 (r245690) @@ -240,9 +240,9 @@ list(int nlflag, int erflag) n2 = andor(); tok = readtoken(); if (tok == TBACKGND) { - if (n2->type == NPIPE) { + if (n2 != NULL && n2->type == NPIPE) { n2->npipe.backgnd = 1; - } else if (n2->type == NREDIR) { + } else if (n2 != NULL && n2->type == NREDIR) { n2->type = NBACKGND; } else { n3 = (union node *)stalloc(sizeof (struct nredir)); Copied: stable/9/tools/regression/bin/sh/parser/empty-braces1.0 (from r245382, head/tools/regression/bin/sh/parser/empty-braces1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/bin/sh/parser/empty-braces1.0 Sun Jan 20 14:22:21 2013 (r245690, copy of r245382, head/tools/regression/bin/sh/parser/empty-braces1.0) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# Unfortunately, some scripts depend on the extension of allowing an empty +# pair of braces. + +{ } & +wait $! From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 20 16:03:51 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ED29E1F0; Sun, 20 Jan 2013 16:03:51 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D00CE999; Sun, 20 Jan 2013 16:03:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KG3pZU027345; Sun, 20 Jan 2013 16:03:51 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KG3pCj027344; Sun, 20 Jan 2013 16:03:51 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201301201603.r0KG3pCj027344@svn.freebsd.org> From: Andriy Gapon Date: Sun, 20 Jan 2013 16:03:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245691 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 16:03:52 -0000 Author: avg Date: Sun Jan 20 16:03:51 2013 New Revision: 245691 URL: http://svnweb.freebsd.org/changeset/base/245691 Log: MFC r243517: zfs_getpages: optimize for large block sizes Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Jan 20 14:22:21 2013 (r245690) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Jan 20 16:03:51 2013 (r245691) @@ -5574,34 +5574,61 @@ zfs_getpages(struct vnode *vp, vm_page_t znode_t *zp = VTOZ(vp); zfsvfs_t *zfsvfs = zp->z_zfsvfs; objset_t *os = zp->z_zfsvfs->z_os; - vm_page_t mreq; + vm_page_t mfirst, mlast, mreq; vm_object_t object; caddr_t va; struct sf_buf *sf; + off_t startoff, endoff; int i, error; - int pcount, size; + vm_pindex_t reqstart, reqend; + int pcount, lsize, reqsize, size; ZFS_ENTER(zfsvfs); ZFS_VERIFY_ZP(zp); - pcount = round_page(count) / PAGE_SIZE; + pcount = OFF_TO_IDX(round_page(count)); mreq = m[reqpage]; object = mreq->object; error = 0; KASSERT(vp->v_object == object, ("mismatching object")); + if (pcount > 1 && zp->z_blksz > PAGESIZE) { + startoff = rounddown(IDX_TO_OFF(mreq->pindex), zp->z_blksz); + reqstart = OFF_TO_IDX(round_page(startoff)); + if (reqstart < m[0]->pindex) + reqstart = 0; + else + reqstart = reqstart - m[0]->pindex; + endoff = roundup(IDX_TO_OFF(mreq->pindex) + PAGE_SIZE, + zp->z_blksz); + reqend = OFF_TO_IDX(trunc_page(endoff)) - 1; + if (reqend > m[pcount - 1]->pindex) + reqend = m[pcount - 1]->pindex; + reqsize = reqend - m[reqstart]->pindex + 1; + KASSERT(reqstart <= reqpage && reqpage < reqstart + reqsize, + ("reqpage beyond [reqstart, reqstart + reqsize[ bounds")); + } else { + reqstart = reqpage; + reqsize = 1; + } + mfirst = m[reqstart]; + mlast = m[reqstart + reqsize - 1]; + VM_OBJECT_LOCK(object); - for (i = 0; i < pcount; i++) { - if (i != reqpage) { - vm_page_lock(m[i]); - vm_page_free(m[i]); - vm_page_unlock(m[i]); - } + for (i = 0; i < reqstart; i++) { + vm_page_lock(m[i]); + vm_page_free(m[i]); + vm_page_unlock(m[i]); + } + for (i = reqstart + reqsize; i < pcount; i++) { + vm_page_lock(m[i]); + vm_page_free(m[i]); + vm_page_unlock(m[i]); } - if (mreq->valid) { + if (mreq->valid && reqsize == 1) { if (mreq->valid != VM_PAGE_BITS_ALL) vm_page_zero_invalid(mreq, TRUE); VM_OBJECT_UNLOCK(object); @@ -5610,30 +5637,66 @@ zfs_getpages(struct vnode *vp, vm_page_t } PCPU_INC(cnt.v_vnodein); - PCPU_INC(cnt.v_vnodepgsin); + PCPU_ADD(cnt.v_vnodepgsin, reqsize); if (IDX_TO_OFF(mreq->pindex) >= object->un_pager.vnp.vnp_size) { + for (i = reqstart; i < reqstart + reqsize; i++) { + if (i != reqpage) { + vm_page_lock(m[i]); + vm_page_free(m[i]); + vm_page_unlock(m[i]); + } + } VM_OBJECT_UNLOCK(object); ZFS_EXIT(zfsvfs); return (VM_PAGER_BAD); } - size = PAGE_SIZE; - if (IDX_TO_OFF(mreq->pindex) + size > object->un_pager.vnp.vnp_size) - size = object->un_pager.vnp.vnp_size - IDX_TO_OFF(mreq->pindex); + lsize = PAGE_SIZE; + if (IDX_TO_OFF(mlast->pindex) + lsize > object->un_pager.vnp.vnp_size) + lsize = object->un_pager.vnp.vnp_size - IDX_TO_OFF(mlast->pindex); VM_OBJECT_UNLOCK(object); - va = zfs_map_page(mreq, &sf); - error = dmu_read(os, zp->z_id, IDX_TO_OFF(mreq->pindex), - size, va, DMU_READ_PREFETCH); - if (size != PAGE_SIZE) - bzero(va + size, PAGE_SIZE - size); - zfs_unmap_page(sf); + + for (i = reqstart; i < reqstart + reqsize; i++) { + size = PAGE_SIZE; + if (i == (reqstart + reqsize - 1)) + size = lsize; + va = zfs_map_page(m[i], &sf); + error = dmu_read(os, zp->z_id, IDX_TO_OFF(m[i]->pindex), + size, va, DMU_READ_PREFETCH); + if (size != PAGE_SIZE) + bzero(va + size, PAGE_SIZE - size); + zfs_unmap_page(sf); + if (error != 0) + break; + } + VM_OBJECT_LOCK(object); - if (!error) - mreq->valid = VM_PAGE_BITS_ALL; - KASSERT(mreq->dirty == 0, ("zfs_getpages: page %p is dirty", mreq)); + for (i = reqstart; i < reqstart + reqsize; i++) { + m[i]->valid = VM_PAGE_BITS_ALL; + KASSERT(m[i]->dirty == 0, ("zfs_getpages: page %p is dirty", m[i])); + if (i != reqpage) { + if (!error) { + if (m[i]->oflags & VPO_WANTED) { + vm_page_lock(m[i]); + vm_page_activate(m[i]); + vm_page_unlock(m[i]); + } else { + vm_page_lock(m[i]); + vm_page_deactivate(m[i]); + vm_page_unlock(m[i]); + } + vm_page_wakeup(m[i]); + } else { + vm_page_lock(m[i]); + vm_page_free(m[i]); + vm_page_unlock(m[i]); + } + } + + } VM_OBJECT_UNLOCK(object); From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 20 16:07:01 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ADB1446F; Sun, 20 Jan 2013 16:07:01 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 893EF9C9; Sun, 20 Jan 2013 16:07:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KG71oa027922; Sun, 20 Jan 2013 16:07:01 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KG71Ad027921; Sun, 20 Jan 2013 16:07:01 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201301201607.r0KG71Ad027921@svn.freebsd.org> From: Andriy Gapon Date: Sun, 20 Jan 2013 16:07:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245692 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 16:07:01 -0000 Author: avg Date: Sun Jan 20 16:07:00 2013 New Revision: 245692 URL: http://svnweb.freebsd.org/changeset/base/245692 Log: MFC r243763: zfs_getpages: make use of vm_page_readahead_finish Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Jan 20 16:03:51 2013 (r245691) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Jan 20 16:07:00 2013 (r245692) @@ -5675,27 +5675,11 @@ zfs_getpages(struct vnode *vp, vm_page_t VM_OBJECT_LOCK(object); for (i = reqstart; i < reqstart + reqsize; i++) { - m[i]->valid = VM_PAGE_BITS_ALL; + if (!error) + m[i]->valid = VM_PAGE_BITS_ALL; KASSERT(m[i]->dirty == 0, ("zfs_getpages: page %p is dirty", m[i])); - if (i != reqpage) { - if (!error) { - if (m[i]->oflags & VPO_WANTED) { - vm_page_lock(m[i]); - vm_page_activate(m[i]); - vm_page_unlock(m[i]); - } else { - vm_page_lock(m[i]); - vm_page_deactivate(m[i]); - vm_page_unlock(m[i]); - } - vm_page_wakeup(m[i]); - } else { - vm_page_lock(m[i]); - vm_page_free(m[i]); - vm_page_unlock(m[i]); - } - } - + if (i != reqpage) + vm_page_readahead_finish(m[i]); } VM_OBJECT_UNLOCK(object); From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 20 16:15:31 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 71B4D801; Sun, 20 Jan 2013 16:15:31 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 64176A10; Sun, 20 Jan 2013 16:15:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KGFVWi031079; Sun, 20 Jan 2013 16:15:31 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KGFVLt031078; Sun, 20 Jan 2013 16:15:31 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201301201615.r0KGFVLt031078@svn.freebsd.org> From: Andriy Gapon Date: Sun, 20 Jan 2013 16:15:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245693 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 16:15:31 -0000 Author: avg Date: Sun Jan 20 16:15:30 2013 New Revision: 245693 URL: http://svnweb.freebsd.org/changeset/base/245693 Log: MFC r243518: add zfs_bmap to aid vnode_pager_haspage Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Jan 20 16:07:00 2013 (r245692) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Jan 20 16:15:30 2013 (r245693) @@ -5704,6 +5704,30 @@ zfs_freebsd_getpages(ap) } static int +zfs_freebsd_bmap(ap) + struct vop_bmap_args /* { + struct vnode *a_vp; + daddr_t a_bn; + struct bufobj **a_bop; + daddr_t *a_bnp; + int *a_runp; + int *a_runb; + } */ *ap; +{ + + if (ap->a_bop != NULL) + *ap->a_bop = &ap->a_vp->v_bufobj; + if (ap->a_bnp != NULL) + *ap->a_bnp = ap->a_bn; + if (ap->a_runp != NULL) + *ap->a_runp = 0; + if (ap->a_runb != NULL) + *ap->a_runb = 0; + + return (0); +} + +static int zfs_freebsd_open(ap) struct vop_open_args /* { struct vnode *a_vp; @@ -6758,7 +6782,7 @@ struct vop_vector zfs_vnodeops = { .vop_remove = zfs_freebsd_remove, .vop_rename = zfs_freebsd_rename, .vop_pathconf = zfs_freebsd_pathconf, - .vop_bmap = VOP_EOPNOTSUPP, + .vop_bmap = zfs_freebsd_bmap, .vop_fid = zfs_freebsd_fid, .vop_getextattr = zfs_getextattr, .vop_deleteextattr = zfs_deleteextattr, From owner-svn-src-stable-9@FreeBSD.ORG Sun Jan 20 16:23:38 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7644BADB; Sun, 20 Jan 2013 16:23:38 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5C076A53; Sun, 20 Jan 2013 16:23:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KGNcpu033840; Sun, 20 Jan 2013 16:23:38 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KGNcFr033839; Sun, 20 Jan 2013 16:23:38 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201301201623.r0KGNcFr033839@svn.freebsd.org> From: Andriy Gapon Date: Sun, 20 Jan 2013 16:23:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245694 - stable/9/share/man/man9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2013 16:23:38 -0000 Author: avg Date: Sun Jan 20 16:23:37 2013 New Revision: 245694 URL: http://svnweb.freebsd.org/changeset/base/245694 Log: MFC r244627: lock.9: fix incorrect descriptions of LK_SHARED and LK_DOWNGRADE behavior Modified: stable/9/share/man/man9/lock.9 Directory Properties: stable/9/share/man/man9/ (props changed) Modified: stable/9/share/man/man9/lock.9 ============================================================================== --- stable/9/share/man/man9/lock.9 Sun Jan 20 16:15:30 2013 (r245693) +++ stable/9/share/man/man9/lock.9 Sun Jan 20 16:23:37 2013 (r245694) @@ -148,7 +148,9 @@ Flags indicating what action is to be ta .Bl -tag -width ".Dv LK_CANRECURSE" .It Dv LK_SHARED Acquire a shared lock. -If an exclusive lock is currently held, it will be downgraded. +If an exclusive lock is currently held, +.Dv EDEADLK +will be returned. .It Dv LK_EXCLUSIVE Acquire an exclusive lock. If an exclusive lock is already held, and @@ -158,7 +160,8 @@ is not set, the system will .It Dv LK_DOWNGRADE Downgrade exclusive lock to a shared lock. Downgrading a shared lock is not permitted. -If an exclusive lock has been recursed, all references will be downgraded. +If an exclusive lock has been recursed, the system will +.Xr panic 9 . .It Dv LK_UPGRADE Upgrade a shared lock to an exclusive lock. If this call fails, the shared lock is lost. From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 21 07:10:28 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9AE975F6; Mon, 21 Jan 2013 07:10:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7064EE9A; Mon, 21 Jan 2013 07:10:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L7ASRL002241; Mon, 21 Jan 2013 07:10:28 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L7ASIv002239; Mon, 21 Jan 2013 07:10:28 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301210710.r0L7ASIv002239@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 21 Jan 2013 07:10:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245727 - in stable/9/sys/dev/usb: . serial X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:10:28 -0000 Author: hselasky Date: Mon Jan 21 07:10:27 2013 New Revision: 245727 URL: http://svnweb.freebsd.org/changeset/base/245727 Log: MFC r244837 and r245427: Add new USB IDs. PR: usb/174814 Submitted by: Andy Balholm, Lowell Gilbert Modified: stable/9/sys/dev/usb/serial/u3g.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/serial/u3g.c ============================================================================== --- stable/9/sys/dev/usb/serial/u3g.c Mon Jan 21 07:03:13 2013 (r245726) +++ stable/9/sys/dev/usb/serial/u3g.c Mon Jan 21 07:10:27 2013 (r245727) @@ -342,6 +342,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(NOVATEL, MC760, 0), U3G_DEV(NOVATEL, MC547, 0), U3G_DEV(NOVATEL, MC950D, 0), + U3G_DEV(NOVATEL, MIFI2200, U3GINIT_SCSIEJECT), U3G_DEV(NOVATEL, U720, 0), U3G_DEV(NOVATEL, U727, 0), U3G_DEV(NOVATEL, U727_2, 0), @@ -355,6 +356,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(NOVATEL, V740, 0), U3G_DEV(NOVATEL, X950D, 0), U3G_DEV(NOVATEL, XU870, 0), + U3G_DEV(MOTOROLA2, MB886, U3GINIT_SCSIEJECT), U3G_DEV(OPTION, E6500, 0), U3G_DEV(OPTION, E6501, 0), U3G_DEV(OPTION, E6601, 0), Modified: stable/9/sys/dev/usb/usbdevs ============================================================================== --- stable/9/sys/dev/usb/usbdevs Mon Jan 21 07:03:13 2013 (r245726) +++ stable/9/sys/dev/usb/usbdevs Mon Jan 21 07:10:27 2013 (r245727) @@ -2936,6 +2936,7 @@ product MOTOROLA2 A41XV32X 0x2a22 A41x/V product MOTOROLA2 E398 0x4810 E398 Mobile Phone product MOTOROLA2 USBLAN 0x600c USBLAN product MOTOROLA2 USBLAN2 0x6027 USBLAN +product MOTOROLA2 MB886 0x710f MB886 Mobile Phone (Atria HD) product MOTOROLA4 RT2770 0x9031 RT2770 product MOTOROLA4 RT3070 0x9032 RT3070 @@ -3055,6 +3056,7 @@ product NOVATEL U727 0x4100 Merlin U727 product NOVATEL MC950D 0x4400 Novatel MC950D HSUPA product NOVATEL ZEROCD 0x5010 Novatel ZeroCD product NOVATEL ZEROCD2 0x5030 Novatel ZeroCD +product NOVATEL MIFI2200 0x5041 Novatel MiFi 2200 CDMA product NOVATEL U727_2 0x5100 Merlin U727 CDMA product NOVATEL U760 0x6000 Novatel U760 product NOVATEL MC760 0x6002 Novatel MC760 From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 21 07:14:06 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A712278C; Mon, 21 Jan 2013 07:14:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 93BA5EBE; Mon, 21 Jan 2013 07:14:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L7E6qe004231; Mon, 21 Jan 2013 07:14:06 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L7E6xI004229; Mon, 21 Jan 2013 07:14:06 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301210714.r0L7E6xI004229@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 21 Jan 2013 07:14:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245728 - stable/9/sys/conf X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:14:06 -0000 Author: hselasky Date: Mon Jan 21 07:14:06 2013 New Revision: 245728 URL: http://svnweb.freebsd.org/changeset/base/245728 Log: MFC r244957: Add missing dependancy. Submitted by: Michael Butler Modified: stable/9/sys/conf/files Modified: stable/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Mon Jan 21 07:10:27 2013 (r245727) +++ stable/9/sys/conf/files Mon Jan 21 07:14:06 2013 (r245728) @@ -1987,7 +1987,7 @@ dev/usb/net/if_udav.c optional udav dev/usb/net/if_usie.c optional usie dev/usb/net/ruephy.c optional rue dev/usb/net/usb_ethernet.c optional aue | axe | cdce | cue | kue | mos | \ - rue | udav + rue | udav | ipheth dev/usb/net/uhso.c optional uhso # # USB WLAN drivers From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 21 07:16:29 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ECF7391A; Mon, 21 Jan 2013 07:16:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DAB49EDC; Mon, 21 Jan 2013 07:16:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L7GTQU004587; Mon, 21 Jan 2013 07:16:29 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L7GTko004586; Mon, 21 Jan 2013 07:16:29 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301210716.r0L7GTko004586@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 21 Jan 2013 07:16:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245729 - stable/9/sys/dev/usb/wlan X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:16:30 -0000 Author: hselasky Date: Mon Jan 21 07:16:29 2013 New Revision: 245729 URL: http://svnweb.freebsd.org/changeset/base/245729 Log: MFC r245047: Fix for "run0: wcid=xx out of range" error message. PR: usb/174963 Submitted by: PseudoCylon Modified: stable/9/sys/dev/usb/wlan/if_run.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/wlan/if_run.c ============================================================================== --- stable/9/sys/dev/usb/wlan/if_run.c Mon Jan 21 07:14:06 2013 (r245728) +++ stable/9/sys/dev/usb/wlan/if_run.c Mon Jan 21 07:16:29 2013 (r245729) @@ -2019,7 +2019,8 @@ run_key_set_cb(void *arg) wcid = 0; /* NB: update WCID0 for group keys */ base = RT2860_SKEY(RUN_VAP(vap)->rvp_id, k->wk_keyix); } else { - wcid = RUN_AID2WCID(associd); + wcid = (vap->iv_opmode == IEEE80211_M_STA) ? + 1 : RUN_AID2WCID(associd); base = RT2860_PKEY(wcid); } @@ -2374,9 +2375,12 @@ run_newassoc(struct ieee80211_node *ni, struct run_softc *sc = ic->ic_ifp->if_softc; uint8_t rate; uint8_t ridx; - uint8_t wcid = RUN_AID2WCID(ni->ni_associd); + uint8_t wcid; int i, j; + wcid = (vap->iv_opmode == IEEE80211_M_STA) ? + 1 : RUN_AID2WCID(ni->ni_associd); + if (wcid > RT2870_WCID_MAX) { device_printf(sc->sc_dev, "wcid=%d out of range\n", wcid); return; @@ -3044,8 +3048,12 @@ run_tx(struct run_softc *sc, struct mbuf txd->flags = qflags; txwi = (struct rt2860_txwi *)(txd + 1); txwi->xflags = xflags; - txwi->wcid = IEEE80211_IS_MULTICAST(wh->i_addr1) ? - 0 : RUN_AID2WCID(ni->ni_associd); + if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { + txwi->wcid = 0; + } else { + txwi->wcid = (vap->iv_opmode == IEEE80211_M_STA) ? + 1 : RUN_AID2WCID(ni->ni_associd); + } /* clear leftover garbage bits */ txwi->flags = 0; txwi->txop = 0; From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 21 07:22:46 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8352EC4A; Mon, 21 Jan 2013 07:22:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5C017F17; Mon, 21 Jan 2013 07:22:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L7Mkuw007062; Mon, 21 Jan 2013 07:22:46 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L7MkTs007057; Mon, 21 Jan 2013 07:22:46 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301210722.r0L7MkTs007057@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 21 Jan 2013 07:22:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245731 - stable/9/sys/dev/usb/controller X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:22:46 -0000 Author: hselasky Date: Mon Jan 21 07:22:45 2013 New Revision: 245731 URL: http://svnweb.freebsd.org/changeset/base/245731 Log: MFC r243780: - Add support for Etron EJ168 USB 3.0 Host Controllers. This brand of controllers expects that the number of contexts specified in the input slot context points to an active endpoint context, else it refuses to operate. - Wrap one or two long lines. Tested by: Markus Pfeiffer (DragonFlyBSD) Modified: stable/9/sys/dev/usb/controller/xhci.c stable/9/sys/dev/usb/controller/xhci.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/9/sys/dev/usb/controller/xhci.c Mon Jan 21 07:19:02 2013 (r245730) +++ stable/9/sys/dev/usb/controller/xhci.c Mon Jan 21 07:22:45 2013 (r245731) @@ -2044,7 +2044,9 @@ xhci_configure_mask(struct usb_device *u struct xhci_softc *sc = XHCI_BUS2SC(udev->bus); struct usb_page_search buf_inp; struct xhci_input_dev_ctx *pinp; + uint32_t temp; uint8_t index; + uint8_t x; index = udev->controller_slot_id; @@ -2059,6 +2061,24 @@ xhci_configure_mask(struct usb_device *u } else { xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx0, 0); xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx1, mask); + + /* find most significant set bit */ + for (x = 31; x != 1; x--) { + if (mask & (1 << x)) + break; + } + + /* adjust */ + x--; + + /* figure out maximum */ + if (x > sc->sc_hw.devs[index].context_num) { + sc->sc_hw.devs[index].context_num = x; + temp = xhci_ctx_get_le32(sc, &pinp->ctx_slot.dwSctx0); + temp &= ~XHCI_SCTX_0_CTX_NUM_SET(31); + temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1); + xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx0, temp); + } } return (0); } @@ -2280,16 +2300,9 @@ xhci_configure_device(struct usb_device DPRINTF("Route=0x%08x\n", route); - temp = XHCI_SCTX_0_ROUTE_SET(route); - - switch (sc->sc_hw.devs[index].state) { - case XHCI_ST_CONFIGURED: - temp |= XHCI_SCTX_0_CTX_NUM_SET(XHCI_MAX_ENDPOINTS - 1); - break; - default: - temp |= XHCI_SCTX_0_CTX_NUM_SET(1); - break; - } + temp = XHCI_SCTX_0_ROUTE_SET(route) | + XHCI_SCTX_0_CTX_NUM_SET( + sc->sc_hw.devs[index].context_num + 1); switch (udev->speed) { case USB_SPEED_LOW: @@ -2433,8 +2446,9 @@ xhci_alloc_device_ext(struct usb_device if (usb_pc_alloc_mem(pc, pg, sc->sc_ctx_is_64_byte ? (2 * sizeof(struct xhci_input_dev_ctx)) : - sizeof(struct xhci_input_dev_ctx), XHCI_PAGE_SIZE)) + sizeof(struct xhci_input_dev_ctx), XHCI_PAGE_SIZE)) { goto error; + } pc = &sc->sc_hw.devs[index].endpoint_pc; pg = &sc->sc_hw.devs[index].endpoint_pg; @@ -2442,15 +2456,18 @@ xhci_alloc_device_ext(struct usb_device /* need to initialize the page cache */ pc->tag_parent = sc->sc_bus.dma_parent_tag; - if (usb_pc_alloc_mem(pc, pg, sizeof(struct xhci_dev_endpoint_trbs), XHCI_PAGE_SIZE)) + if (usb_pc_alloc_mem(pc, pg, + sizeof(struct xhci_dev_endpoint_trbs), XHCI_PAGE_SIZE)) { goto error; + } /* initialise all endpoint LINK TRBs */ for (i = 0; i != XHCI_MAX_ENDPOINTS; i++) { /* lookup endpoint TRB ring */ - usbd_get_page(pc, (uintptr_t)&((struct xhci_dev_endpoint_trbs *)0)->trb[i][0], &buf_ep); + usbd_get_page(pc, (uintptr_t)& + ((struct xhci_dev_endpoint_trbs *)0)->trb[i][0], &buf_ep); /* get TRB pointer */ trb = buf_ep.buffer; @@ -2536,8 +2553,10 @@ xhci_endpoint_doorbell(struct usb_xfer * epno = XHCI_EPNO2EPID(epno); index = xfer->xroot->udev->controller_slot_id; - if (xfer->xroot->udev->flags.self_suspended == 0) - XWRITE4(sc, door, XHCI_DOORBELL(index), epno | XHCI_DB_SID_SET(0)); + if (xfer->xroot->udev->flags.self_suspended == 0) { + XWRITE4(sc, door, XHCI_DOORBELL(index), + epno | XHCI_DB_SID_SET(/*xfer->stream_id*/ 0)); + } } static void @@ -3539,7 +3558,7 @@ xhci_configure_reset_endpoint(struct usb * endpoint context state diagram in the XHCI specification: */ - xhci_configure_mask(udev, 1U << epno, 0); + xhci_configure_mask(udev, (1U << epno) | 1U, 0); err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index); @@ -3815,6 +3834,7 @@ xhci_device_resume(struct usb_device *ud struct xhci_softc *sc = XHCI_BUS2SC(udev->bus); uint8_t index; uint8_t n; + uint8_t p; DPRINTF("\n"); @@ -3830,8 +3850,12 @@ xhci_device_resume(struct usb_device *ud USB_BUS_LOCK(udev->bus); - for (n = 1; n != XHCI_MAX_ENDPOINTS; n++) - XWRITE4(sc, door, XHCI_DOORBELL(index), n | XHCI_DB_SID_SET(0)); + for (n = 1; n != XHCI_MAX_ENDPOINTS; n++) { + for (p = 0; p != 1 /*XHCI_MAX_STREAMS*/; p++) { + XWRITE4(sc, door, XHCI_DOORBELL(index), + n | XHCI_DB_SID_SET(p)); + } + } USB_BUS_UNLOCK(udev->bus); @@ -3905,8 +3929,12 @@ xhci_device_state_change(struct usb_devi if (sc->sc_hw.devs[index].state == XHCI_ST_DEFAULT) break; + /* set default state */ sc->sc_hw.devs[index].state = XHCI_ST_DEFAULT; + /* reset number of contexts */ + sc->sc_hw.devs[index].context_num = 0; + err = xhci_cmd_reset_dev(sc, index); if (err != 0) { @@ -3933,11 +3961,15 @@ xhci_device_state_change(struct usb_devi if (sc->sc_hw.devs[index].state == XHCI_ST_CONFIGURED) break; + /* set configured state */ sc->sc_hw.devs[index].state = XHCI_ST_CONFIGURED; + /* reset number of contexts */ + sc->sc_hw.devs[index].context_num = 0; + usbd_get_page(&sc->sc_hw.devs[index].input_pc, 0, &buf_inp); - xhci_configure_mask(udev, 1, 0); + xhci_configure_mask(udev, 3, 0); err = xhci_configure_device(udev); if (err != 0) { Modified: stable/9/sys/dev/usb/controller/xhci.h ============================================================================== --- stable/9/sys/dev/usb/controller/xhci.h Mon Jan 21 07:19:02 2013 (r245730) +++ stable/9/sys/dev/usb/controller/xhci.h Mon Jan 21 07:22:45 2013 (r245731) @@ -385,7 +385,7 @@ struct xhci_hw_dev { uint8_t state; uint8_t nports; uint8_t tt; - uint8_t reserved; + uint8_t context_num; }; struct xhci_hw_softc { From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 21 07:25:38 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DF025E73; Mon, 21 Jan 2013 07:25:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B477FF34; Mon, 21 Jan 2013 07:25:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L7Pcki007522; Mon, 21 Jan 2013 07:25:38 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L7Pc3T007521; Mon, 21 Jan 2013 07:25:38 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301210725.r0L7Pc3T007521@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 21 Jan 2013 07:25:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245732 - stable/9/sys/dev/usb/controller X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:25:39 -0000 Author: hselasky Date: Mon Jan 21 07:25:38 2013 New Revision: 245732 URL: http://svnweb.freebsd.org/changeset/base/245732 Log: MFC r245132 and r245175: Optimise the XHCI interrupt handling. This patch will save CPU time when the XHCI interrupt is shared with other devices. Only check event rings when interrupt bits are set. Otherwise would indicate hiding possible hardware fault(s). Tested by: sos @ Submitted by: sos @ Modified: stable/9/sys/dev/usb/controller/xhci.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/9/sys/dev/usb/controller/xhci.c Mon Jan 21 07:22:45 2013 (r245731) +++ stable/9/sys/dev/usb/controller/xhci.c Mon Jan 21 07:25:38 2013 (r245732) @@ -1440,26 +1440,37 @@ void xhci_interrupt(struct xhci_softc *sc) { uint32_t status; - uint32_t temp; + uint32_t iman; USB_BUS_LOCK(&sc->sc_bus); status = XREAD4(sc, oper, XHCI_USBSTS); + if (status == 0) + goto done; /* acknowledge interrupts */ XWRITE4(sc, oper, XHCI_USBSTS, status); - temp = XREAD4(sc, runt, XHCI_IMAN(0)); - - /* acknowledge pending event */ - - XWRITE4(sc, runt, XHCI_IMAN(0), temp); + DPRINTFN(16, "real interrupt (status=0x%08x)\n", status); + + if (status & XHCI_STS_EINT) { + + /* acknowledge pending event */ + iman = XREAD4(sc, runt, XHCI_IMAN(0)); + + /* reset interrupt */ + XWRITE4(sc, runt, XHCI_IMAN(0), iman); + + DPRINTFN(16, "real interrupt (iman=0x%08x)\n", iman); + + /* check for event(s) */ + xhci_interrupt_poll(sc); + } - DPRINTFN(16, "real interrupt (sts=0x%08x, " - "iman=0x%08x)\n", status, temp); + if (status & (XHCI_STS_PCD | XHCI_STS_HCH | + XHCI_STS_HSE | XHCI_STS_HCE)) { - if (status != 0) { if (status & XHCI_STS_PCD) { xhci_root_intr(sc); } @@ -1479,9 +1490,7 @@ xhci_interrupt(struct xhci_softc *sc) __FUNCTION__); } } - - xhci_interrupt_poll(sc); - +done: USB_BUS_UNLOCK(&sc->sc_bus); } From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 21 07:28:48 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4240795; Mon, 21 Jan 2013 07:28:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 280E8F59; Mon, 21 Jan 2013 07:28:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L7SmG8007971; Mon, 21 Jan 2013 07:28:48 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L7Slfw007965; Mon, 21 Jan 2013 07:28:47 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301210728.r0L7Slfw007965@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 21 Jan 2013 07:28:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245733 - in stable/9/sys/dev/usb: . input X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:28:48 -0000 Author: hselasky Date: Mon Jan 21 07:28:46 2013 New Revision: 245733 URL: http://svnweb.freebsd.org/changeset/base/245733 Log: MFC r245248: Fix detection of Razer Copperhead as a USB mouse. Factor out USB mouse and keyboard detection logic. Reject USB keyboards which have mouse alike HID items in their HID descriptors. Submitted by: Matthew W Modified: stable/9/sys/dev/usb/input/ukbd.c stable/9/sys/dev/usb/input/ums.c stable/9/sys/dev/usb/usb_hid.c stable/9/sys/dev/usb/usbhid.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/input/ukbd.c ============================================================================== --- stable/9/sys/dev/usb/input/ukbd.c Mon Jan 21 07:25:38 2013 (r245732) +++ stable/9/sys/dev/usb/input/ukbd.c Mon Jan 21 07:28:46 2013 (r245733) @@ -995,13 +995,12 @@ ukbd_probe(device_t dev) if (uaa->info.bInterfaceClass != UICLASS_HID) return (ENXIO); + if (usb_test_quirk(uaa, UQ_KBD_IGNORE)) + return (ENXIO); + if ((uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) && - (uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD)) { - if (usb_test_quirk(uaa, UQ_KBD_IGNORE)) - return (ENXIO); - else - return (BUS_PROBE_DEFAULT); - } + (uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD)) + return (BUS_PROBE_DEFAULT); error = usbd_req_get_hid_desc(uaa->device, NULL, &d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex); @@ -1009,23 +1008,20 @@ ukbd_probe(device_t dev) if (error) return (ENXIO); - /* - * NOTE: we currently don't support USB mouse and USB keyboard - * on the same USB endpoint. - */ - if (hid_is_collection(d_ptr, d_len, - HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE))) { - /* most likely a mouse */ - error = ENXIO; - } else if (hid_is_collection(d_ptr, d_len, - HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_KEYBOARD))) { - if (usb_test_quirk(uaa, UQ_KBD_IGNORE)) + if (hid_is_keyboard(d_ptr, d_len)) { + if (hid_is_mouse(d_ptr, d_len)) { + /* + * NOTE: We currently don't support USB mouse + * and USB keyboard on the same USB endpoint. + * Let "ums" driver win. + */ error = ENXIO; - else + } else { error = BUS_PROBE_DEFAULT; - } else + } + } else { error = ENXIO; - + } free(d_ptr, M_TEMP); return (error); } Modified: stable/9/sys/dev/usb/input/ums.c ============================================================================== --- stable/9/sys/dev/usb/input/ums.c Mon Jan 21 07:25:38 2013 (r245732) +++ stable/9/sys/dev/usb/input/ums.c Mon Jan 21 07:28:46 2013 (r245733) @@ -368,9 +368,7 @@ ums_probe(device_t dev) { struct usb_attach_arg *uaa = device_get_ivars(dev); void *d_ptr; - struct hid_data *hd; - struct hid_item hi; - int error, mdepth, found; + int error; uint16_t d_len; DPRINTFN(11, "\n"); @@ -394,44 +392,13 @@ ums_probe(device_t dev) if (error) return (ENXIO); - hd = hid_start_parse(d_ptr, d_len, 1 << hid_input); - if (hd == NULL) - return (0); - mdepth = 0; - found = 0; - while (hid_get_item(hd, &hi)) { - switch (hi.kind) { - case hid_collection: - if (mdepth != 0) - mdepth++; - else if (hi.collection == 1 && - hi.usage == - HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)) - mdepth++; - break; - case hid_endcollection: - if (mdepth != 0) - mdepth--; - break; - case hid_input: - if (mdepth == 0) - break; - if (hi.usage == - HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X) && - (hi.flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) - found++; - if (hi.usage == - HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y) && - (hi.flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) - found++; - break; - default: - break; - } - } - hid_end_parse(hd); + if (hid_is_mouse(d_ptr, d_len)) + error = BUS_PROBE_DEFAULT; + else + error = ENXIO; + free(d_ptr, M_TEMP); - return (found ? BUS_PROBE_DEFAULT : ENXIO); + return (error); } static void Modified: stable/9/sys/dev/usb/usb_hid.c ============================================================================== --- stable/9/sys/dev/usb/usb_hid.c Mon Jan 21 07:25:38 2013 (r245732) +++ stable/9/sys/dev/usb/usb_hid.c Mon Jan 21 07:28:46 2013 (r245733) @@ -845,3 +845,79 @@ usbd_req_get_hid_desc(struct usb_device } return (USB_ERR_NORMAL_COMPLETION); } + +/*------------------------------------------------------------------------* + * hid_is_mouse + * + * This function will decide if a USB descriptor belongs to a USB mouse. + * + * Return values: + * Zero: Not a USB mouse. + * Else: Is a USB mouse. + *------------------------------------------------------------------------*/ +int +hid_is_mouse(const void *d_ptr, uint16_t d_len) +{ + struct hid_data *hd; + struct hid_item hi; + int mdepth; + int found; + + hd = hid_start_parse(d_ptr, d_len, 1 << hid_input); + if (hd == NULL) + return (0); + + mdepth = 0; + found = 0; + + while (hid_get_item(hd, &hi)) { + switch (hi.kind) { + case hid_collection: + if (mdepth != 0) + mdepth++; + else if (hi.collection == 1 && + hi.usage == + HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)) + mdepth++; + break; + case hid_endcollection: + if (mdepth != 0) + mdepth--; + break; + case hid_input: + if (mdepth == 0) + break; + if (hi.usage == + HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X) && + (hi.flags & (HIO_CONST|HIO_RELATIVE)) == HIO_RELATIVE) + found++; + if (hi.usage == + HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y) && + (hi.flags & (HIO_CONST|HIO_RELATIVE)) == HIO_RELATIVE) + found++; + break; + default: + break; + } + } + hid_end_parse(hd); + return (found); +} + +/*------------------------------------------------------------------------* + * hid_is_keyboard + * + * This function will decide if a USB descriptor belongs to a USB keyboard. + * + * Return values: + * Zero: Not a USB keyboard. + * Else: Is a USB keyboard. + *------------------------------------------------------------------------*/ +int +hid_is_keyboard(const void *d_ptr, uint16_t d_len) +{ + if (hid_is_collection(d_ptr, d_len, + HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_KEYBOARD))) + return (1); + return (0); +} Modified: stable/9/sys/dev/usb/usbhid.h ============================================================================== --- stable/9/sys/dev/usb/usbhid.h Mon Jan 21 07:25:38 2013 (r245732) +++ stable/9/sys/dev/usb/usbhid.h Mon Jan 21 07:28:46 2013 (r245733) @@ -242,5 +242,7 @@ struct usb_hid_descriptor *hid_get_descr usb_error_t usbd_req_get_hid_desc(struct usb_device *udev, struct mtx *mtx, void **descp, uint16_t *sizep, struct malloc_type *mem, uint8_t iface_index); +int hid_is_mouse(const void *d_ptr, uint16_t d_len); +int hid_is_keyboard(const void *d_ptr, uint16_t d_len); #endif /* _KERNEL */ #endif /* _USB_HID_H_ */ From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 21 07:31:16 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A4CB2219; Mon, 21 Jan 2013 07:31:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7DA39F66; Mon, 21 Jan 2013 07:31:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L7VGSw009959; Mon, 21 Jan 2013 07:31:16 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L7VGHx009958; Mon, 21 Jan 2013 07:31:16 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201301210731.r0L7VGHx009958@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 21 Jan 2013 07:31:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245734 - stable/9/sys/dev/usb/quirk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:31:16 -0000 Author: hselasky Date: Mon Jan 21 07:31:15 2013 New Revision: 245734 URL: http://svnweb.freebsd.org/changeset/base/245734 Log: MFC r245249: Bugfix: Fix sizeof() argument. Found by: Haakon Loevdal Modified: stable/9/sys/dev/usb/quirk/usb_quirk.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/quirk/usb_quirk.c ============================================================================== --- stable/9/sys/dev/usb/quirk/usb_quirk.c Mon Jan 21 07:28:46 2013 (r245733) +++ stable/9/sys/dev/usb/quirk/usb_quirk.c Mon Jan 21 07:31:15 2013 (r245734) @@ -798,7 +798,7 @@ usb_quirk_ioctl(unsigned long cmd, caddr } if (x == USB_SUB_QUIRKS_MAX) { /* all quirk entries are unused - release */ - memset(pqe, 0, sizeof(pqe)); + memset(pqe, 0, sizeof(*pqe)); } mtx_unlock(&usb_quirk_mtx); return (0); /* success */ From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 03:32:13 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E6F7EDF8; Tue, 22 Jan 2013 03:32:13 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C044D7A; Tue, 22 Jan 2013 03:32:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M3WDN8078525; Tue, 22 Jan 2013 03:32:13 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M3WDVr078524; Tue, 22 Jan 2013 03:32:13 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201301220332.r0M3WDVr078524@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Tue, 22 Jan 2013 03:32:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245762 - stable/9/sys/fs/ext2fs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 03:32:14 -0000 Author: pfg Date: Tue Jan 22 03:32:13 2013 New Revision: 245762 URL: http://svnweb.freebsd.org/changeset/base/245762 Log: MFC r245612: ext2fs: Add some DOINGASYNC checks to match ffs. This is mostly cosmetical. Reviewed by: bde Modified: stable/9/sys/fs/ext2fs/ext2_inode.c Modified: stable/9/sys/fs/ext2fs/ext2_inode.c ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_inode.c Tue Jan 22 03:23:14 2013 (r245761) +++ stable/9/sys/fs/ext2fs/ext2_inode.c Tue Jan 22 03:32:13 2013 (r245762) @@ -180,7 +180,7 @@ ext2_truncate(vp, length, flags, cred, t else bawrite(bp); oip->i_flag |= IN_CHANGE | IN_UPDATE; - return (ext2_update(ovp, 1)); + return (ext2_update(ovp, !DOINGASYNC(ovp))); } /* * Shorten the size of the file. If the file is not being @@ -238,7 +238,7 @@ ext2_truncate(vp, length, flags, cred, t for (i = NDADDR - 1; i > lastblock; i--) oip->i_db[i] = 0; oip->i_flag |= IN_CHANGE | IN_UPDATE; - allerror = ext2_update(ovp, 1); + allerror = ext2_update(ovp, !DOINGASYNC(ovp)); /* * Having written the new inode to disk, save its new configuration @@ -421,9 +421,13 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, le (u_int)(NINDIR(fs) - (last + 1)) * sizeof(int32_t)); if (last == -1) bp->b_flags |= B_INVAL; - error = bwrite(bp); - if (error) - allerror = error; + if (DOINGASYNC(vp)) { + bdwrite(bp); + } else { + error = bwrite(bp); + if (error) + allerror = error; + } bap = copy; /* From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 03:39:56 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4B525F9B; Tue, 22 Jan 2013 03:39:56 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 23C1AA3; Tue, 22 Jan 2013 03:39:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M3duDm079530; Tue, 22 Jan 2013 03:39:56 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M3dupN079529; Tue, 22 Jan 2013 03:39:56 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201301220339.r0M3dupN079529@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Tue, 22 Jan 2013 03:39:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245763 - stable/9/sbin/newfs_msdos X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 03:39:56 -0000 Author: pfg Date: Tue Jan 22 03:39:55 2013 New Revision: 245763 URL: http://svnweb.freebsd.org/changeset/base/245763 Log: MFC r245648: newfs_msdos: cosmetical cleanups - Simplify diagnostic messages. - Adopt lowercase first letters to make the messages more canonical. PR: bin/175404 Submitted by: Christoph Mallon Reviewed by: bde Modified: stable/9/sbin/newfs_msdos/newfs_msdos.c Modified: stable/9/sbin/newfs_msdos/newfs_msdos.c ============================================================================== --- stable/9/sbin/newfs_msdos/newfs_msdos.c Tue Jan 22 03:32:13 2013 (r245762) +++ stable/9/sbin/newfs_msdos/newfs_msdos.c Tue Jan 22 03:39:55 2013 (r245763) @@ -808,7 +808,7 @@ getdiskinfo(int fd, const char *fname, c struct stat st; if (fstat(fd, &st)) - err(1, "Cannot get disk size"); + err(1, "cannot get disk size"); /* create a fake geometry for a file image */ ms = st.st_size; dlp.d_secsize = 512; @@ -832,18 +832,18 @@ getdiskinfo(int fd, const char *fname, c if (ioctl(fd, DIOCGDINFO, &dlp) == -1) { if (bpb->bpbBytesPerSec == 0 && ioctl(fd, DIOCGSECTORSIZE, &dlp.d_secsize) == -1) - errx(1, "Cannot get sector size, %s", strerror(errno)); + err(1, "cannot get sector size"); dlp.d_secperunit = ms / dlp.d_secsize; if (bpb->bpbSecPerTrack == 0 && ioctl(fd, DIOCGFWSECTORS, &dlp.d_nsectors) == -1) { - warnx("Cannot get number of sectors per track, %s", strerror(errno)); + warn("cannot get number of sectors per track"); dlp.d_nsectors = 63; } if (bpb->bpbHeads == 0 && ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks) == -1) { - warnx("Cannot get number of heads, %s", strerror(errno)); + warn("cannot get number of heads"); if (dlp.d_secperunit <= 63*1*1024) dlp.d_ntracks = 1; else if (dlp.d_secperunit <= 63*16*1024) From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 07:10:27 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 51D05B4E; Tue, 22 Jan 2013 07:10:27 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2B6D98EF; Tue, 22 Jan 2013 07:10:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7ARR3052799; Tue, 22 Jan 2013 07:10:27 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7ARVU052788; Tue, 22 Jan 2013 07:10:27 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201301220710.r0M7ARVU052788@svn.freebsd.org> From: Scott Long Date: Tue, 22 Jan 2013 07:10:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245774 - stable/9/sys/ufs/ffs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 07:10:27 -0000 Author: scottl Date: Tue Jan 22 07:10:26 2013 New Revision: 245774 URL: http://svnweb.freebsd.org/changeset/base/245774 Log: MFC r242492: - In cancel_mkdir_dotdot don't panic if the inodedep is not available. If the previous diradd had already finished it could have been reclaimed already. This would only happen under heavy dependency pressure. Modified: stable/9/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 06:32:46 2013 (r245773) +++ stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 07:10:26 2013 (r245774) @@ -8584,7 +8584,7 @@ cancel_mkdir_dotdot(ip, dirrem, jremref) if (inodedep_lookup(UFSTOVFS(ip->i_ump), ip->i_number, 0, &inodedep) == 0) - panic("cancel_mkdir_dotdot: Lost inodedep"); + return (jremref); dap = inodedep->id_mkdiradd; if (dap == NULL || (dap->da_state & MKDIR_PARENT) == 0) return (jremref); From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 07:18:34 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A8044EFC; Tue, 22 Jan 2013 07:18:34 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7FE0A944; Tue, 22 Jan 2013 07:18:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7IY0c054339; Tue, 22 Jan 2013 07:18:34 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7IYEG054338; Tue, 22 Jan 2013 07:18:34 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201301220718.r0M7IYEG054338@svn.freebsd.org> From: Scott Long Date: Tue, 22 Jan 2013 07:18:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245775 - stable/9/sys/ufs/ffs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 07:18:34 -0000 Author: scottl Date: Tue Jan 22 07:18:33 2013 New Revision: 245775 URL: http://svnweb.freebsd.org/changeset/base/245775 Log: MFC r242734, 242815: - Implement BIO_FLUSH support around journal entries. This will not 100% solve power loss problems with dishonest write caches. However, it should improve the situation and force a full fsck when it is unable to resolve with the journal. - Resolve a case where the journal could wrap in an unsafe way causing us to prematurely lose journal entries in very specific scenarios. - Correct rev 242734, segments can sometimes get stuck. Be a bit more defensive with segment state. Modified: stable/9/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 07:10:26 2013 (r245774) +++ stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 07:18:33 2013 (r245775) @@ -88,6 +88,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #ifndef SOFTUPDATES @@ -801,6 +803,7 @@ static void handle_written_jnewblk(struc static void handle_written_jblkdep(struct jblkdep *); static void handle_written_jfreefrag(struct jfreefrag *); static void complete_jseg(struct jseg *); +static void complete_jsegs(struct jseg *); static void jseg_write(struct ufsmount *ump, struct jseg *, uint8_t *); static void jaddref_write(struct jaddref *, struct jseg *, uint8_t *); static void jremref_write(struct jremref *, struct jseg *, uint8_t *); @@ -1226,6 +1229,7 @@ static struct callout softdep_callout; static int req_pending; static int req_clear_inodedeps; /* syncer process flush some inodedeps */ static int req_clear_remove; /* syncer process flush some freeblks */ +static int softdep_flushcache = 0; /* Should we do BIO_FLUSH? */ /* * runtime statistics @@ -1309,6 +1313,8 @@ SYSCTL_INT(_debug_softdep, OID_AUTO, cle &stat_cleanup_retries, 0, ""); SYSCTL_INT(_debug_softdep, OID_AUTO, cleanup_failures, CTLFLAG_RW, &stat_cleanup_failures, 0, ""); +SYSCTL_INT(_debug_softdep, OID_AUTO, flushcache, CTLFLAG_RW, + &softdep_flushcache, 0, ""); SYSCTL_DECL(_vfs_ffs); @@ -3083,6 +3089,67 @@ softdep_flushjournal(mp) FREE_LOCK(&lk); } +static void softdep_synchronize_completed(struct bio *); +static void softdep_synchronize(struct bio *, struct ufsmount *, void *); + +static void +softdep_synchronize_completed(bp) + struct bio *bp; +{ + struct jseg *oldest; + struct jseg *jseg; + + /* + * caller1 marks the last segment written before we issued the + * synchronize cache. + */ + jseg = bp->bio_caller1; + oldest = NULL; + ACQUIRE_LOCK(&lk); + /* + * Mark all the journal entries waiting on the synchronize cache + * as completed so they may continue on. + */ + while (jseg != NULL && (jseg->js_state & COMPLETE) == 0) { + jseg->js_state |= COMPLETE; + oldest = jseg; + jseg = TAILQ_PREV(jseg, jseglst, js_next); + } + /* + * Restart deferred journal entry processing from the oldest + * completed jseg. + */ + if (oldest) + complete_jsegs(oldest); + + FREE_LOCK(&lk); + g_destroy_bio(bp); +} + +/* + * Send BIO_FLUSH/SYNCHRONIZE CACHE to the device to enforce write ordering + * barriers. The journal must be written prior to any blocks that depend + * on it and the journal can not be released until the blocks have be + * written. This code handles both barriers simultaneously. + */ +static void +softdep_synchronize(bp, ump, caller1) + struct bio *bp; + struct ufsmount *ump; + void *caller1; +{ + + bp->bio_cmd = BIO_FLUSH; + bp->bio_flags |= BIO_ORDERED; + bp->bio_data = NULL; + bp->bio_offset = ump->um_cp->provider->mediasize; + bp->bio_length = 0; + bp->bio_done = softdep_synchronize_completed; + bp->bio_caller1 = caller1; + g_io_request(bp, + (struct g_consumer *)ump->um_devvp->v_bufobj.bo_private); +} + /* * Flush some journal records to disk. */ @@ -3097,8 +3164,10 @@ softdep_process_journal(mp, needwk, flag struct worklist *wk; struct jseg *jseg; struct buf *bp; + struct bio *bio; uint8_t *data; struct fs *fs; + int shouldflush; int segwritten; int jrecmin; /* Minimum records per block. */ int jrecmax; /* Maximum records per block. */ @@ -3109,6 +3178,9 @@ softdep_process_journal(mp, needwk, flag if (MOUNTEDSUJ(mp) == 0) return; + shouldflush = softdep_flushcache; + bio = NULL; + jseg = NULL; ump = VFSTOUFS(mp); fs = ump->um_fs; jblocks = ump->softdep_jblocks; @@ -3157,6 +3229,10 @@ softdep_process_journal(mp, needwk, flag LIST_INIT(&jseg->js_entries); LIST_INIT(&jseg->js_indirs); jseg->js_state = ATTACHED; + if (shouldflush == 0) + jseg->js_state |= COMPLETE; + else if (bio == NULL) + bio = g_alloc_bio(); jseg->js_jblocks = jblocks; bp = geteblk(fs->fs_bsize, 0); ACQUIRE_LOCK(&lk); @@ -3289,6 +3365,17 @@ softdep_process_journal(mp, needwk, flag ACQUIRE_LOCK(&lk); } /* + * If we wrote a segment issue a synchronize cache so the journal + * is reflected on disk before the data is written. Since reclaiming + * journal space also requires writing a journal record this + * process also enforces a barrier before reclamation. + */ + if (segwritten && shouldflush) { + softdep_synchronize(bio, ump, + TAILQ_LAST(&jblocks->jb_segs, jseglst)); + } else if (bio) + g_destroy_bio(bio); + /* * If we've suspended the filesystem because we ran out of journal * space either try to sync it here to make some progress or * unsuspend it if we already have. @@ -3371,25 +3458,17 @@ complete_jseg(jseg) } /* - * Mark a jseg as DEPCOMPLETE and throw away the buffer. Handle jseg - * completions in order only. + * Determine which jsegs are ready for completion processing. Waits for + * synchronize cache to complete as well as forcing in-order completion + * of journal entries. */ static void -handle_written_jseg(jseg, bp) +complete_jsegs(jseg) struct jseg *jseg; - struct buf *bp; { struct jblocks *jblocks; struct jseg *jsegn; - if (jseg->js_refs == 0) - panic("handle_written_jseg: No self-reference on %p", jseg); - jseg->js_state |= DEPCOMPLETE; - /* - * We'll never need this buffer again, set flags so it will be - * discarded. - */ - bp->b_flags |= B_INVAL | B_NOCACHE; jblocks = jseg->js_jblocks; /* * Don't allow out of order completions. If this isn't the first @@ -3398,12 +3477,12 @@ handle_written_jseg(jseg, bp) if (jseg != jblocks->jb_writeseg) return; /* Iterate through available jsegs processing their entries. */ - do { + while (jseg && (jseg->js_state & ALLCOMPLETE) == ALLCOMPLETE) { jblocks->jb_oldestwrseq = jseg->js_oldseq; jsegn = TAILQ_NEXT(jseg, js_next); complete_jseg(jseg); jseg = jsegn; - } while (jseg && jseg->js_state & DEPCOMPLETE); + } jblocks->jb_writeseg = jseg; /* * Attempt to free jsegs now that oldestwrseq may have advanced. @@ -3411,6 +3490,27 @@ handle_written_jseg(jseg, bp) free_jsegs(jblocks); } +/* + * Mark a jseg as DEPCOMPLETE and throw away the buffer. Attempt to handle + * the final completions. + */ +static void +handle_written_jseg(jseg, bp) + struct jseg *jseg; + struct buf *bp; +{ + + if (jseg->js_refs == 0) + panic("handle_written_jseg: No self-reference on %p", jseg); + jseg->js_state |= DEPCOMPLETE; + /* + * We'll never need this buffer again, set flags so it will be + * discarded. + */ + bp->b_flags |= B_INVAL | B_NOCACHE; + complete_jsegs(jseg); +} + static inline struct jsegdep * inoref_jseg(inoref) struct inoref *inoref; @@ -4196,8 +4296,16 @@ free_jsegs(jblocks) jblocks->jb_oldestseg = jseg; return; } - if (!LIST_EMPTY(&jseg->js_indirs) && - jseg->js_seq >= jblocks->jb_oldestwrseq) + if ((jseg->js_state & ALLCOMPLETE) != ALLCOMPLETE) + break; + if (jseg->js_seq > jblocks->jb_oldestwrseq) + break; + /* + * We can free jsegs that didn't write entries when + * oldestwrseq == js_seq. + */ + if (jseg->js_seq == jblocks->jb_oldestwrseq && + jseg->js_cnt != 0) break; free_jseg(jseg, jblocks); } From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 07:22:58 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CD7571E2; Tue, 22 Jan 2013 07:22:58 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A6CA4963; Tue, 22 Jan 2013 07:22:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7MwTg056592; Tue, 22 Jan 2013 07:22:58 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7Mw81056591; Tue, 22 Jan 2013 07:22:58 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201301220722.r0M7Mw81056591@svn.freebsd.org> From: Scott Long Date: Tue, 22 Jan 2013 07:22:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245776 - stable/9/sys/ufs/ffs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 07:22:58 -0000 Author: scottl Date: Tue Jan 22 07:22:58 2013 New Revision: 245776 URL: http://svnweb.freebsd.org/changeset/base/245776 Log: MFC r242924: - Fix a bug that has existed since the original softdep implementation. When a background copy of a cg is written we complete any work associated with that bmsafemap. If new work has been added to the non-background copy of the buffer it will be completed before the next write happens. The solution is to do the rollbacks when we make the copy so only those dependencies that were present at the time of writing will be completed when the background write completes. This would've resulted in various bitmap related corruptions and panics. It also would've expired journal entries early causing journal replay to miss some records. Modified: stable/9/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 07:18:33 2013 (r245775) +++ stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 07:22:58 2013 (r245776) @@ -976,7 +976,7 @@ static struct freework *newfreework(stru struct freework *, ufs_lbn_t, ufs2_daddr_t, int, int, int); static int jwait(struct worklist *, int); static struct inodedep *inodedep_lookup_ip(struct inode *); -static int bmsafemap_rollbacks(struct bmsafemap *); +static int bmsafemap_backgroundwrite(struct bmsafemap *, struct buf *); static struct freefile *handle_bufwait(struct inodedep *, struct workhead *); static void handle_jwork(struct workhead *); static struct mkdir *setup_newdir(struct diradd *, ino_t, ino_t, struct buf *, @@ -1800,7 +1800,7 @@ softdep_move_dependencies(oldbp, newbp) while ((wk = LIST_FIRST(&oldbp->b_dep)) != NULL) { LIST_REMOVE(wk, wk_list); if (wk->wk_type == D_BMSAFEMAP && - bmsafemap_rollbacks(WK_BMSAFEMAP(wk))) + bmsafemap_backgroundwrite(WK_BMSAFEMAP(wk), newbp)) dirty = 1; if (wktail == 0) LIST_INSERT_HEAD(&newbp->b_dep, wk, wk_list); @@ -5178,9 +5178,15 @@ jnewblk_merge(new, old, wkhd) return (new); /* Replace a jfreefrag with a jnewblk. */ if (new->wk_type == D_JFREEFRAG) { + if (WK_JNEWBLK(old)->jn_blkno != WK_JFREEFRAG(new)->fr_blkno) + panic("jnewblk_merge: blkno mismatch: %p, %p", + old, new); cancel_jfreefrag(WK_JFREEFRAG(new)); return (old); } + if (old->wk_type != D_JNEWBLK || new->wk_type != D_JNEWBLK) + panic("jnewblk_merge: Bad type: old %d new %d\n", + old->wk_type, new->wk_type); /* * Handle merging of two jnewblk records that describe * different sets of fragments in the same block. @@ -10507,7 +10513,7 @@ initiate_write_bmsafemap(bmsafemap, bp) ino_t ino; if (bmsafemap->sm_state & IOSTARTED) - panic("initiate_write_bmsafemap: Already started\n"); + return; bmsafemap->sm_state |= IOSTARTED; /* * Clear any inode allocations which are pending journal writes. @@ -10518,10 +10524,6 @@ initiate_write_bmsafemap(bmsafemap, bp) inosused = cg_inosused(cgp); LIST_FOREACH(jaddref, &bmsafemap->sm_jaddrefhd, ja_bmdeps) { ino = jaddref->ja_ino % fs->fs_ipg; - /* - * If this is a background copy the inode may not - * be marked used yet. - */ if (isset(inosused, ino)) { if ((jaddref->ja_mode & IFMT) == IFDIR) cgp->cg_cs.cs_ndir--; @@ -10530,7 +10532,7 @@ initiate_write_bmsafemap(bmsafemap, bp) jaddref->ja_state &= ~ATTACHED; jaddref->ja_state |= UNDONE; stat_jaddref++; - } else if ((bp->b_xflags & BX_BKGRDMARKER) == 0) + } else panic("initiate_write_bmsafemap: inode %d " "marked free", jaddref->ja_ino); } @@ -10545,9 +10547,8 @@ initiate_write_bmsafemap(bmsafemap, bp) LIST_FOREACH(jnewblk, &bmsafemap->sm_jnewblkhd, jn_deps) { if (jnewblk_rollback(jnewblk, fs, cgp, blksfree)) continue; - if ((bp->b_xflags & BX_BKGRDMARKER) == 0) - panic("initiate_write_bmsafemap: block %jd " - "marked free", jnewblk->jn_blkno); + panic("initiate_write_bmsafemap: block %jd " + "marked free", jnewblk->jn_blkno); } } /* @@ -11282,12 +11283,24 @@ diradd_inode_written(dap, inodedep) * only be called with lk and the buf lock on the cg held. */ static int -bmsafemap_rollbacks(bmsafemap) +bmsafemap_backgroundwrite(bmsafemap, bp) struct bmsafemap *bmsafemap; + struct buf *bp; { + int dirty; - return (!LIST_EMPTY(&bmsafemap->sm_jaddrefhd) | - !LIST_EMPTY(&bmsafemap->sm_jnewblkhd)); + dirty = !LIST_EMPTY(&bmsafemap->sm_jaddrefhd) | + !LIST_EMPTY(&bmsafemap->sm_jnewblkhd); + /* + * If we're initiating a background write we need to process the + * rollbacks as they exist now, not as they exist when IO starts. + * No other consumers will look at the contents of the shadowed + * buf so this is safe to do here. + */ + if (bp->b_xflags & BX_BKGRDMARKER) + initiate_write_bmsafemap(bmsafemap, bp); + + return (dirty); } /* From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 07:32:28 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BB7A36A6; Tue, 22 Jan 2013 07:32:28 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A865F9D5; Tue, 22 Jan 2013 07:32:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7WSkr059483; Tue, 22 Jan 2013 07:32:28 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7WR1J059476; Tue, 22 Jan 2013 07:32:27 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201301220732.r0M7WR1J059476@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 22 Jan 2013 07:32:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245777 - in stable/9/lib/csu: amd64 arm i386-elf mips powerpc powerpc64 sparc64 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 07:32:28 -0000 Author: kib Date: Tue Jan 22 07:32:26 2013 New Revision: 245777 URL: http://svnweb.freebsd.org/changeset/base/245777 Log: MFC r245133: Only assign the environ in the startup code when environ is NULL. Note that this is not the merge, but a reimplementation of the fix, done for the not-consolidated code in the stable/9. Modified: stable/9/lib/csu/amd64/crt1.c stable/9/lib/csu/arm/crt1.c stable/9/lib/csu/i386-elf/crt1_c.c stable/9/lib/csu/mips/crt1.c stable/9/lib/csu/powerpc/crt1.c stable/9/lib/csu/powerpc64/crt1.c stable/9/lib/csu/sparc64/crt1.c Directory Properties: stable/9/lib/csu/ (props changed) Modified: stable/9/lib/csu/amd64/crt1.c ============================================================================== --- stable/9/lib/csu/amd64/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/amd64/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -71,7 +71,8 @@ _start(char **ap, void (*cleanup)(void)) argc = *(long *)(void *)ap; argv = ap + 1; env = ap + 2 + argc; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; for (s = __progname; *s != '\0'; s++) Modified: stable/9/lib/csu/arm/crt1.c ============================================================================== --- stable/9/lib/csu/arm/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/arm/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -106,7 +106,8 @@ __start(int argc, char **argv, char **en { const char *s; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; Modified: stable/9/lib/csu/i386-elf/crt1_c.c ============================================================================== --- stable/9/lib/csu/i386-elf/crt1_c.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/i386-elf/crt1_c.c Tue Jan 22 07:32:26 2013 (r245777) @@ -70,7 +70,8 @@ _start1(fptr cleanup, int argc, char *ar const char *s; env = argv + argc + 1; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; for (s = __progname; *s != '\0'; s++) Modified: stable/9/lib/csu/mips/crt1.c ============================================================================== --- stable/9/lib/csu/mips/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/mips/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -82,7 +82,8 @@ __start(char **ap, argc = * (long *) ap; argv = ap + 1; env = ap + 2 + argc; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { const char *s; __progname = argv[0]; Modified: stable/9/lib/csu/powerpc/crt1.c ============================================================================== --- stable/9/lib/csu/powerpc/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/powerpc/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -90,7 +90,8 @@ _start(int argc, char **argv, char **env { const char *s; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; Modified: stable/9/lib/csu/powerpc64/crt1.c ============================================================================== --- stable/9/lib/csu/powerpc64/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/powerpc64/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -89,7 +89,8 @@ _start(int argc, char **argv, char **env { const char *s; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; Modified: stable/9/lib/csu/sparc64/crt1.c ============================================================================== --- stable/9/lib/csu/sparc64/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/sparc64/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -94,7 +94,8 @@ _start(char **ap, void (*cleanup)(void), argc = *(long *)(void *)ap; argv = ap + 1; env = ap + 2 + argc; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; for (s = __progname; *s != '\0'; s++) From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 07:38:44 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 59E2CB85; Tue, 22 Jan 2013 07:38:44 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 337C0A20; Tue, 22 Jan 2013 07:38:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7cisT060336; Tue, 22 Jan 2013 07:38:44 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7cil7060334; Tue, 22 Jan 2013 07:38:44 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201301220738.r0M7cil7060334@svn.freebsd.org> From: Scott Long Date: Tue, 22 Jan 2013 07:38:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245778 - stable/9/sbin/fsck_ffs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 07:38:44 -0000 Author: scottl Date: Tue Jan 22 07:38:43 2013 New Revision: 245778 URL: http://svnweb.freebsd.org/changeset/base/245778 Log: MFC r243017: - blk_equals() is too strict. If the journal entry defines more frags than we're claiming it should still be considered an exact match. This would previously leak frags that had been extended. - If there is a sequence number problem in the journal print the sequence numbers we've seen so far for debugging. - Clean up the block mask related debuging printfs. Some are redundant. Modified: stable/9/sbin/fsck_ffs/suj.c Directory Properties: stable/9/sbin/fsck_ffs/ (props changed) Modified: stable/9/sbin/fsck_ffs/suj.c ============================================================================== --- stable/9/sbin/fsck_ffs/suj.c Tue Jan 22 07:32:26 2013 (r245777) +++ stable/9/sbin/fsck_ffs/suj.c Tue Jan 22 07:38:43 2013 (r245778) @@ -504,7 +504,7 @@ blk_equals(struct jblkrec *brec, ino_t i return (0); if (brec->jb_blkno + brec->jb_oldfrags != start) return (0); - if (brec->jb_frags != frags) + if (brec->jb_frags < frags) return (0); return (1); } @@ -551,7 +551,6 @@ blk_freemask(ufs2_daddr_t blk, ino_t ino brec = (struct jblkrec *)srec->sr_rec; /* * If the block overlaps but does not match - * exactly it's a new allocation. If it matches * exactly this record refers to the current * location. */ @@ -648,7 +647,8 @@ blk_free(ufs2_daddr_t bno, int mask, int uint8_t *blksfree; if (debug) - printf("Freeing %d frags at blk %jd\n", frags, bno); + printf("Freeing %d frags at blk %jd mask 0x%x\n", + frags, bno, mask); cg = dtog(fs, bno); sc = cg_lookup(cg); cgp = sc->sc_cgp; @@ -1140,12 +1140,8 @@ ino_adjblks(struct suj_ino *sino) static void blk_free_visit(ino_t ino, ufs_lbn_t lbn, ufs2_daddr_t blk, int frags) { - int mask; - mask = blk_freemask(blk, ino, lbn, frags); - if (debug) - printf("blk %jd freemask 0x%X\n", blk, mask); - blk_free(blk, mask, frags); + blk_free(blk, blk_freemask(blk, ino, lbn, frags), frags); } /* @@ -1160,8 +1156,6 @@ blk_free_lbn(ufs2_daddr_t blk, ino_t ino int mask; mask = blk_freemask(blk, ino, lbn, frags); - if (debug) - printf("blk %jd freemask 0x%X\n", blk, mask); resid = 0; if (lbn <= -NDADDR && follow && mask == 0) indir_visit(ino, lbn, blk, &resid, blk_free_visit, VISIT_INDIR); @@ -2328,6 +2322,10 @@ suj_prune(void) } if (newseq != oldseq) { + TAILQ_FOREACH(seg, &allsegs, ss_next) { + printf("%jd, ", seg->ss_rec.jsr_seq); + } + printf("\n"); err_suj("Journal file sequence mismatch %jd != %jd\n", newseq, oldseq); } From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 07:40:38 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D6E27D1A; Tue, 22 Jan 2013 07:40:38 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C85A4A3B; Tue, 22 Jan 2013 07:40:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7eckH060797; Tue, 22 Jan 2013 07:40:38 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7ecXj060796; Tue, 22 Jan 2013 07:40:38 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201301220740.r0M7ecXj060796@svn.freebsd.org> From: Scott Long Date: Tue, 22 Jan 2013 07:40:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245779 - stable/9/sys/ufs/ffs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 07:40:38 -0000 Author: scottl Date: Tue Jan 22 07:40:38 2013 New Revision: 245779 URL: http://svnweb.freebsd.org/changeset/base/245779 Log: MFC r243018: - Fix a truncation bug with softdep journaling that could leak blocks on crash. When truncating a file that never made it to disk we use the canceled allocation dependencies to hold the journal records until the truncation completes. Previously allocdirect dependencies on the id_bufwait list were not considered and their journal space could expire before the bitmaps were written. Cancel them and attach them to the freeblks as we do for other allocdirects. - Add KTR traces that were used to debug this problem. - When adding jsegdeps, always use jwork_insert() so we don't have more than one segdep on a given jwork list. Modified: stable/9/sys/ufs/ffs/ffs_softdep.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 07:38:43 2013 (r245778) +++ stable/9/sys/ufs/ffs/ffs_softdep.c Tue Jan 22 07:40:38 2013 (r245779) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -92,6 +93,8 @@ __FBSDID("$FreeBSD$"); #include +#define KTR_SUJ 0 /* Define to KTR_SPARE. */ + #ifndef SOFTUPDATES int @@ -769,6 +772,34 @@ struct pagedep_hashhead; struct bmsafemap_hashhead; /* + * Private journaling structures. + */ +struct jblocks { + struct jseglst jb_segs; /* TAILQ of current segments. */ + struct jseg *jb_writeseg; /* Next write to complete. */ + struct jseg *jb_oldestseg; /* Oldest segment with valid entries. */ + struct jextent *jb_extent; /* Extent array. */ + uint64_t jb_nextseq; /* Next sequence number. */ + uint64_t jb_oldestwrseq; /* Oldest written sequence number. */ + uint8_t jb_needseg; /* Need a forced segment. */ + uint8_t jb_suspended; /* Did journal suspend writes? */ + int jb_avail; /* Available extents. */ + int jb_used; /* Last used extent. */ + int jb_head; /* Allocator head. */ + int jb_off; /* Allocator extent offset. */ + int jb_blocks; /* Total disk blocks covered. */ + int jb_free; /* Total disk blocks free. */ + int jb_min; /* Minimum free space. */ + int jb_low; /* Low on space. */ + int jb_age; /* Insertion time of oldest rec. */ +}; + +struct jextent { + ufs2_daddr_t je_daddr; /* Disk block address. */ + int je_blocks; /* Disk block count. */ +}; + +/* * Internal function prototypes. */ static void softdep_error(char *, int); @@ -2273,19 +2304,15 @@ static void indirblk_insert(freework) struct freework *freework; { - struct freeblks *freeblks; - struct jsegdep *jsegdep; - struct worklist *wk; + struct jblocks *jblocks; + struct jseg *jseg; - freeblks = freework->fw_freeblks; - LIST_FOREACH(wk, &freeblks->fb_jwork, wk_list) - if (wk->wk_type == D_JSEGDEP) - break; - if (wk == NULL) + jblocks = VFSTOUFS(freework->fw_list.wk_mp)->softdep_jblocks; + jseg = TAILQ_LAST(&jblocks->jb_segs, jseglst); + if (jseg == NULL) return; - jsegdep = WK_JSEGDEP(wk); - LIST_INSERT_HEAD(&jsegdep->jd_seg->js_indirs, freework, fw_segs); + LIST_INSERT_HEAD(&jseg->js_indirs, freework, fw_segs); TAILQ_INSERT_HEAD(INDIR_HASH(freework->fw_list.wk_mp, freework->fw_blkno), freework, fw_next); freework->fw_state &= ~DEPCOMPLETE; @@ -2438,31 +2465,6 @@ softdep_unmount(mp) journal_unmount(mp); } -struct jblocks { - struct jseglst jb_segs; /* TAILQ of current segments. */ - struct jseg *jb_writeseg; /* Next write to complete. */ - struct jseg *jb_oldestseg; /* Oldest segment with valid entries. */ - struct jextent *jb_extent; /* Extent array. */ - uint64_t jb_nextseq; /* Next sequence number. */ - uint64_t jb_oldestwrseq; /* Oldest written sequence number. */ - uint8_t jb_needseg; /* Need a forced segment. */ - uint8_t jb_suspended; /* Did journal suspend writes? */ - int jb_avail; /* Available extents. */ - int jb_used; /* Last used extent. */ - int jb_head; /* Allocator head. */ - int jb_off; /* Allocator extent offset. */ - int jb_blocks; /* Total disk blocks covered. */ - int jb_free; /* Total disk blocks free. */ - int jb_min; /* Minimum free space. */ - int jb_low; /* Low on space. */ - int jb_age; /* Insertion time of oldest rec. */ -}; - -struct jextent { - ufs2_daddr_t je_daddr; /* Disk block address. */ - int je_blocks; /* Disk block count. */ -}; - static struct jblocks * jblocks_create(void) { @@ -3668,7 +3670,7 @@ handle_written_jnewblk(jnewblk) */ freefrag = WK_FREEFRAG(jnewblk->jn_dep); freefrag->ff_jdep = NULL; - WORKLIST_INSERT(&freefrag->ff_jwork, &jsegdep->jd_list); + jwork_insert(&freefrag->ff_jwork, jsegdep); break; case D_FREEWORK: /* @@ -3676,8 +3678,7 @@ handle_written_jnewblk(jnewblk) */ freework = WK_FREEWORK(jnewblk->jn_dep); freework->fw_jnewblk = NULL; - WORKLIST_INSERT(&freework->fw_freeblks->fb_jwork, - &jsegdep->jd_list); + jwork_insert(&freework->fw_freeblks->fb_jwork, jsegdep); break; default: panic("handle_written_jnewblk: Unknown type %d.", @@ -3707,6 +3708,7 @@ cancel_jfreefrag(jfreefrag) jfreefrag->fr_freefrag = NULL; free_jfreefrag(jfreefrag); freefrag->ff_state |= DEPCOMPLETE; + CTR1(KTR_SUJ, "cancel_jfreefrag: blkno %jd", freefrag->ff_blkno); } /* @@ -3770,7 +3772,7 @@ handle_written_jblkdep(jblkdep) jblkdep->jb_jsegdep = NULL; freeblks = jblkdep->jb_freeblks; LIST_REMOVE(jblkdep, jb_deps); - WORKLIST_INSERT(&freeblks->fb_jwork, &jsegdep->jd_list); + jwork_insert(&freeblks->fb_jwork, jsegdep); /* * If the freeblks is all journaled, we can add it to the worklist. */ @@ -3973,6 +3975,7 @@ cancel_jfreeblk(freeblks, blkno) } if (jblkdep == NULL) return; + CTR1(KTR_SUJ, "cancel_jfreeblk: blkno %jd", blkno); free_jsegdep(jblkdep->jb_jsegdep); LIST_REMOVE(jblkdep, jb_deps); WORKITEM_FREE(jfreeblk, D_JFREEBLK); @@ -4213,6 +4216,7 @@ cancel_jnewblk(jnewblk, wkhd) { struct jsegdep *jsegdep; + CTR1(KTR_SUJ, "cancel_jnewblk: blkno %jd", jnewblk->jn_blkno); jsegdep = jnewblk->jn_jsegdep; if (jnewblk->jn_jsegdep == NULL || jnewblk->jn_dep == NULL) panic("cancel_jnewblk: Invalid state"); @@ -4904,6 +4908,10 @@ softdep_setup_blkmapdep(bp, mp, newblkno } #endif } + + CTR3(KTR_SUJ, + "softdep_setup_blkmapdep: blkno %jd frags %d oldfrags %d", + newblkno, frags, oldfrags); ACQUIRE_LOCK(&lk); if (newblk_lookup(mp, newblkno, DEPALLOC, &newblk) != 0) panic("softdep_setup_blkmapdep: found block"); @@ -5065,6 +5073,10 @@ softdep_setup_allocdirect(ip, off, newbl else freefrag = NULL; + CTR6(KTR_SUJ, + "softdep_setup_allocdirect: ino %d blkno %jd oldblkno %jd " + "off %jd newsize %ld oldsize %d", + ip->i_number, newblkno, oldblkno, off, newsize, oldsize); ACQUIRE_LOCK(&lk); if (off >= NDADDR) { if (lbn > 0) @@ -5343,6 +5355,8 @@ newfreefrag(ip, blkno, size, lbn) struct freefrag *freefrag; struct fs *fs; + CTR4(KTR_SUJ, "newfreefrag: ino %d blkno %jd size %ld lbn %jd", + ip->i_number, blkno, size, lbn); fs = ip->i_fs; if (fragnum(fs, blkno) + numfrags(fs, size) > fs->fs_frag) panic("newfreefrag: frag size"); @@ -5378,6 +5392,9 @@ handle_workitem_freefrag(freefrag) struct ufsmount *ump = VFSTOUFS(freefrag->ff_list.wk_mp); struct workhead wkhd; + CTR3(KTR_SUJ, + "handle_workitem_freefrag: ino %d blkno %jd size %ld", + freefrag->ff_inum, freefrag->ff_blkno, freefrag->ff_fragsize); /* * It would be illegal to add new completion items to the * freefrag after it was schedule to be done so it must be @@ -5596,6 +5613,9 @@ softdep_setup_allocindir_page(ip, lbn, b if (lbn != nbp->b_lblkno) panic("softdep_setup_allocindir_page: lbn %jd != lblkno %jd", lbn, bp->b_lblkno); + CTR4(KTR_SUJ, + "softdep_setup_allocindir_page: ino %d blkno %jd oldblkno %jd " + "lbn %jd", ip->i_number, newblkno, oldblkno, lbn); ASSERT_VOP_LOCKED(ITOV(ip), "softdep_setup_allocindir_page"); mp = UFSTOVFS(ip->i_ump); aip = newallocindir(ip, ptrno, newblkno, oldblkno, lbn); @@ -5634,6 +5654,9 @@ softdep_setup_allocindir_meta(nbp, ip, b ufs_lbn_t lbn; int dflags; + CTR3(KTR_SUJ, + "softdep_setup_allocindir_meta: ino %d blkno %jd ptrno %d", + ip->i_number, newblkno, ptrno); lbn = nbp->b_lblkno; ASSERT_VOP_LOCKED(ITOV(ip), "softdep_setup_allocindir_meta"); aip = newallocindir(ip, ptrno, newblkno, 0, lbn); @@ -6238,6 +6261,7 @@ softdep_journal_freeblocks(ip, cred, len int flags; /* IO_EXT and/or IO_NORMAL */ { struct freeblks *freeblks, *fbn; + struct worklist *wk, *wkn; struct inodedep *inodedep; struct jblkdep *jblkdep; struct allocdirect *adp, *adpn; @@ -6272,6 +6296,8 @@ softdep_journal_freeblocks(ip, cred, len if ((inodedep->id_state & (UNLINKED | DEPCOMPLETE)) == UNLINKED && length == 0) needj = 0; + CTR3(KTR_SUJ, "softdep_journal_freeblks: ip %d length %ld needj %d", + ip->i_number, length, needj); FREE_LOCK(&lk); /* * Calculate the lbn that we are truncating to. This results in -1 @@ -6425,6 +6451,21 @@ softdep_journal_freeblocks(ip, cred, len cancel_allocdirect(&inodedep->id_extupdt, adp, freeblks); /* + * Scan the bufwait list for newblock dependencies that will never + * make it to disk. + */ + LIST_FOREACH_SAFE(wk, &inodedep->id_bufwait, wk_list, wkn) { + if (wk->wk_type != D_ALLOCDIRECT) + continue; + adp = WK_ALLOCDIRECT(wk); + if (((flags & IO_NORMAL) != 0 && (adp->ad_offset > iboff)) || + ((flags & IO_EXT) != 0 && (adp->ad_state & EXTDATA))) { + cancel_jfreeblk(freeblks, adp->ad_newblkno); + cancel_newblk(WK_NEWBLK(wk), NULL, &freeblks->fb_jwork); + WORKLIST_INSERT(&freeblks->fb_freeworkhd, wk); + } + } + /* * Add journal work. */ LIST_FOREACH(jblkdep, &freeblks->fb_jblkdephd, jb_deps) @@ -6563,6 +6604,8 @@ softdep_setup_freeblocks(ip, length, fla ufs_lbn_t tmpval; ufs_lbn_t lbn; + CTR2(KTR_SUJ, "softdep_setup_freeblks: ip %d length %ld", + ip->i_number, length); fs = ip->i_fs; mp = UFSTOVFS(ip->i_ump); if (length != 0) @@ -7088,6 +7131,8 @@ cancel_newblk(newblk, wk, wkhd) { struct jnewblk *jnewblk; + CTR1(KTR_SUJ, "cancel_newblk: blkno %jd", newblk->nb_newblkno); + newblk->nb_state |= GOINGAWAY; /* * Previously we traversed the completedhd on each indirdep @@ -7456,6 +7501,9 @@ freework_freeblock(freework) } FREE_LOCK(&lk); freeblks_free(ump, freeblks, btodb(bsize)); + CTR4(KTR_SUJ, + "freework_freeblock: ino %d blkno %jd lbn %jd size %ld", + freeblks->fb_inum, freework->fw_blkno, freework->fw_lbn, bsize); ffs_blkfree(ump, fs, freeblks->fb_devvp, freework->fw_blkno, bsize, freeblks->fb_inum, freeblks->fb_vtype, &wkhd); ACQUIRE_LOCK(&lk); @@ -7889,6 +7937,9 @@ indir_trunc(freework, dbn, lbn) &freedep->fd_list); freedeps++; } + CTR3(KTR_SUJ, + "indir_trunc: ino %d blkno %jd size %ld", + freeblks->fb_inum, nb, fs->fs_bsize); ffs_blkfree(ump, fs, freeblks->fb_devvp, nb, fs->fs_bsize, freeblks->fb_inum, freeblks->fb_vtype, &wkhd); @@ -7924,6 +7975,9 @@ indir_trunc(freework, dbn, lbn) * If we're not journaling we can free the indirect now. */ dbn = dbtofsb(fs, dbn); + CTR3(KTR_SUJ, + "indir_trunc 2: ino %d blkno %jd size %ld", + freeblks->fb_inum, dbn, fs->fs_bsize); ffs_blkfree(ump, fs, freeblks->fb_devvp, dbn, fs->fs_bsize, freeblks->fb_inum, freeblks->fb_vtype, NULL); /* Non SUJ softdep does single-threaded truncations. */ @@ -10359,6 +10413,10 @@ softdep_setup_blkfree(mp, bp, blkno, fra int i; #endif + CTR3(KTR_SUJ, + "softdep_setup_blkfree: blkno %jd frags %d wk head %p", + blkno, frags, wkhd); + ACQUIRE_LOCK(&lk); /* Lookup the bmsafemap so we track when it is dirty. */ fs = VFSTOUFS(mp)->um_fs; @@ -10370,6 +10428,9 @@ softdep_setup_blkfree(mp, bp, blkno, fra */ if (wkhd) { while ((wk = LIST_FIRST(wkhd)) != NULL) { + CTR2(KTR_SUJ, + "softdep_setup_blkfree: blkno %jd wk type %d", + blkno, wk->wk_type); WORKLIST_REMOVE(wk); if (wk->wk_type != D_JNEWBLK) { WORKLIST_INSERT(&bmsafemap->sm_freehd, wk); From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 12:05:55 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 270947EE; Tue, 22 Jan 2013 12:05:55 +0000 (UTC) (envelope-from zont@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 18ACFD99; Tue, 22 Jan 2013 12:05:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MC5sPC041942; Tue, 22 Jan 2013 12:05:54 GMT (envelope-from zont@svn.freebsd.org) Received: (from zont@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MC5sUs041938; Tue, 22 Jan 2013 12:05:54 GMT (envelope-from zont@svn.freebsd.org) Message-Id: <201301221205.r0MC5sUs041938@svn.freebsd.org> From: Andrey Zonov Date: Tue, 22 Jan 2013 12:05:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245787 - stable/9/sys/vm X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 12:05:55 -0000 Author: zont Date: Tue Jan 22 12:05:53 2013 New Revision: 245787 URL: http://svnweb.freebsd.org/changeset/base/245787 Log: MFC r240145: - Simplify VM code by using vmspace_wired_count() for counting wired memory of a process. MFC r245255: - Reduce kernel size by removing unnecessary pointer indirections. GENERIC kernel size reduced in 16 bytes and RACCT kernel in 336 bytes. MFC r245296: - Improve readability of sys_obreak(). MFC r245421: - Get rid of unused function vmspace_wired_count(). Modified: stable/9/sys/vm/vm_map.c stable/9/sys/vm/vm_map.h stable/9/sys/vm/vm_mmap.c stable/9/sys/vm/vm_unix.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/vm/vm_map.c ============================================================================== --- stable/9/sys/vm/vm_map.c Tue Jan 22 11:43:00 2013 (r245786) +++ stable/9/sys/vm/vm_map.c Tue Jan 22 12:05:53 2013 (r245787) @@ -726,12 +726,6 @@ vmspace_resident_count(struct vmspace *v return pmap_resident_count(vmspace_pmap(vmspace)); } -long -vmspace_wired_count(struct vmspace *vmspace) -{ - return pmap_wired_count(vmspace_pmap(vmspace)); -} - /* * vm_map_create: * @@ -3281,8 +3275,7 @@ vm_map_stack(vm_map_t map, vm_offset_t a } if (!old_mlock && map->flags & MAP_WIREFUTURE) { - if (ptoa(vmspace_wired_count(curproc->p_vmspace)) + - init_ssize > lmemlim) { + if (ptoa(pmap_wired_count(map->pmap)) + init_ssize > lmemlim) { vm_map_unlock(map); return (KERN_NO_SPACE); } @@ -3505,8 +3498,7 @@ Retry: grow_amount = limit - ctob(vm->vm_ssize); #endif if (!old_mlock && map->flags & MAP_WIREFUTURE) { - if (ptoa(vmspace_wired_count(p->p_vmspace)) + grow_amount > - lmemlim) { + if (ptoa(pmap_wired_count(map->pmap)) + grow_amount > lmemlim) { vm_map_unlock_read(map); rv = KERN_NO_SPACE; goto out; @@ -3514,7 +3506,7 @@ Retry: #ifdef RACCT PROC_LOCK(p); if (racct_set(p, RACCT_MEMLOCK, - ptoa(vmspace_wired_count(p->p_vmspace)) + grow_amount)) { + ptoa(pmap_wired_count(map->pmap)) + grow_amount)) { PROC_UNLOCK(p); vm_map_unlock_read(map); rv = KERN_NO_SPACE; @@ -3645,7 +3637,7 @@ out: KASSERT(error == 0, ("decreasing RACCT_VMEM failed")); if (!old_mlock) { error = racct_set(p, RACCT_MEMLOCK, - ptoa(vmspace_wired_count(p->p_vmspace))); + ptoa(pmap_wired_count(map->pmap))); KASSERT(error == 0, ("decreasing RACCT_MEMLOCK failed")); } error = racct_set(p, RACCT_STACK, ctob(vm->vm_ssize)); Modified: stable/9/sys/vm/vm_map.h ============================================================================== --- stable/9/sys/vm/vm_map.h Tue Jan 22 11:43:00 2013 (r245786) +++ stable/9/sys/vm/vm_map.h Tue Jan 22 12:05:53 2013 (r245787) @@ -298,7 +298,6 @@ void vm_map_wait_busy(vm_map_t map); _vm_map_lock_downgrade(map, LOCK_FILE, LOCK_LINE) long vmspace_resident_count(struct vmspace *vmspace); -long vmspace_wired_count(struct vmspace *vmspace); #endif /* _KERNEL */ Modified: stable/9/sys/vm/vm_mmap.c ============================================================================== --- stable/9/sys/vm/vm_mmap.c Tue Jan 22 11:43:00 2013 (r245786) +++ stable/9/sys/vm/vm_mmap.c Tue Jan 22 12:05:53 2013 (r245787) @@ -1041,6 +1041,7 @@ sys_mlock(td, uap) struct proc *proc; vm_offset_t addr, end, last, start; vm_size_t npages, size; + vm_map_t map; unsigned long nsize; int error; @@ -1058,9 +1059,9 @@ sys_mlock(td, uap) if (npages > vm_page_max_wired) return (ENOMEM); proc = td->td_proc; + map = &proc->p_vmspace->vm_map; PROC_LOCK(proc); - nsize = ptoa(npages + - pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map))); + nsize = ptoa(npages + pmap_wired_count(map->pmap)); if (nsize > lim_cur(proc, RLIMIT_MEMLOCK)) { PROC_UNLOCK(proc); return (ENOMEM); @@ -1075,13 +1076,13 @@ sys_mlock(td, uap) if (error != 0) return (ENOMEM); #endif - error = vm_map_wire(&proc->p_vmspace->vm_map, start, end, + error = vm_map_wire(map, start, end, VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES); #ifdef RACCT if (error != KERN_SUCCESS) { PROC_LOCK(proc); racct_set(proc, RACCT_MEMLOCK, - ptoa(pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map)))); + ptoa(pmap_wired_count(map->pmap))); PROC_UNLOCK(proc); } #endif @@ -1155,7 +1156,7 @@ sys_mlockall(td, uap) if (error != KERN_SUCCESS) { PROC_LOCK(td->td_proc); racct_set(td->td_proc, RACCT_MEMLOCK, - ptoa(pmap_wired_count(vm_map_pmap(&td->td_proc->p_vmspace->vm_map)))); + ptoa(pmap_wired_count(map->pmap))); PROC_UNLOCK(td->td_proc); } #endif @@ -1488,16 +1489,15 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, if (td->td_proc->p_vmspace->vm_map.size + size > lim_cur(td->td_proc, RLIMIT_VMEM)) { if (!old_mlock && map->flags & MAP_WIREFUTURE) { - if (ptoa(vmspace_wired_count(td->td_proc->p_vmspace)) + - size > lim_cur(td->td_proc, RLIMIT_MEMLOCK)) { + if (ptoa(pmap_wired_count(map->pmap)) + size > + lim_cur(td->td_proc, RLIMIT_MEMLOCK)) { racct_set_force(td->td_proc, RACCT_VMEM, map->size); PROC_UNLOCK(td->td_proc); return (ENOMEM); } error = racct_set(td->td_proc, RACCT_MEMLOCK, - ptoa(vmspace_wired_count(td->td_proc->p_vmspace)) + - size); + ptoa(pmap_wired_count(map->pmap)) + size); if (error != 0) { racct_set_force(td->td_proc, RACCT_VMEM, map->size); Modified: stable/9/sys/vm/vm_unix.c ============================================================================== --- stable/9/sys/vm/vm_unix.c Tue Jan 22 11:43:00 2013 (r245786) +++ stable/9/sys/vm/vm_unix.c Tue Jan 22 12:05:53 2013 (r245787) @@ -76,6 +76,7 @@ sys_obreak(td, uap) struct obreak_args *uap; { struct vmspace *vm = td->td_proc->p_vmspace; + vm_map_t map = &vm->vm_map; vm_offset_t new, old, base; rlim_t datalim, lmemlim, vmemlim; int prot, rv; @@ -90,7 +91,7 @@ sys_obreak(td, uap) do_map_wirefuture = FALSE; new = round_page((vm_offset_t)uap->nsize); - vm_map_lock(&vm->vm_map); + vm_map_lock(map); base = round_page((vm_offset_t) vm->vm_daddr); old = base + ctob(vm->vm_dsize); @@ -103,7 +104,7 @@ sys_obreak(td, uap) error = ENOMEM; goto done; } - if (new > vm_map_max(&vm->vm_map)) { + if (new > vm_map_max(map)) { error = ENOMEM; goto done; } @@ -117,14 +118,14 @@ sys_obreak(td, uap) goto done; } if (new > old) { - if (!old_mlock && vm->vm_map.flags & MAP_WIREFUTURE) { - if (ptoa(vmspace_wired_count(td->td_proc->p_vmspace)) + + if (!old_mlock && map->flags & MAP_WIREFUTURE) { + if (ptoa(pmap_wired_count(map->pmap)) + (new - old) > lmemlim) { error = ENOMEM; goto done; } } - if (vm->vm_map.size + (new - old) > vmemlim) { + if (map->size + (new - old) > vmemlim) { error = ENOMEM; goto done; } @@ -137,22 +138,21 @@ sys_obreak(td, uap) goto done; } error = racct_set(td->td_proc, RACCT_VMEM, - vm->vm_map.size + (new - old)); + map->size + (new - old)); if (error != 0) { racct_set_force(td->td_proc, RACCT_DATA, old - base); PROC_UNLOCK(td->td_proc); error = ENOMEM; goto done; } - if (!old_mlock && vm->vm_map.flags & MAP_WIREFUTURE) { + if (!old_mlock && map->flags & MAP_WIREFUTURE) { error = racct_set(td->td_proc, RACCT_MEMLOCK, - ptoa(vmspace_wired_count(td->td_proc->p_vmspace)) + - (new - old)); + ptoa(pmap_wired_count(map->pmap)) + (new - old)); if (error != 0) { racct_set_force(td->td_proc, RACCT_DATA, old - base); racct_set_force(td->td_proc, RACCT_VMEM, - vm->vm_map.size); + map->size); PROC_UNLOCK(td->td_proc); error = ENOMEM; goto done; @@ -167,17 +167,15 @@ sys_obreak(td, uap) prot |= VM_PROT_EXECUTE; #endif #endif - rv = vm_map_insert(&vm->vm_map, NULL, 0, old, new, - prot, VM_PROT_ALL, 0); + rv = vm_map_insert(map, NULL, 0, old, new, prot, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { #ifdef RACCT PROC_LOCK(td->td_proc); racct_set_force(td->td_proc, RACCT_DATA, old - base); - racct_set_force(td->td_proc, RACCT_VMEM, vm->vm_map.size); - if (!old_mlock && vm->vm_map.flags & MAP_WIREFUTURE) { + racct_set_force(td->td_proc, RACCT_VMEM, map->size); + if (!old_mlock && map->flags & MAP_WIREFUTURE) { racct_set_force(td->td_proc, RACCT_MEMLOCK, - ptoa(vmspace_wired_count( - td->td_proc->p_vmspace))); + ptoa(pmap_wired_count(map->pmap))); } PROC_UNLOCK(td->td_proc); #endif @@ -194,13 +192,13 @@ sys_obreak(td, uap) * * XXX If the pages cannot be wired, no error is returned. */ - if ((vm->vm_map.flags & MAP_WIREFUTURE) == MAP_WIREFUTURE) { + if ((map->flags & MAP_WIREFUTURE) == MAP_WIREFUTURE) { if (bootverbose) printf("obreak: MAP_WIREFUTURE set\n"); do_map_wirefuture = TRUE; } } else if (new < old) { - rv = vm_map_delete(&vm->vm_map, new, old); + rv = vm_map_delete(map, new, old); if (rv != KERN_SUCCESS) { error = ENOMEM; goto done; @@ -209,19 +207,19 @@ sys_obreak(td, uap) #ifdef RACCT PROC_LOCK(td->td_proc); racct_set_force(td->td_proc, RACCT_DATA, new - base); - racct_set_force(td->td_proc, RACCT_VMEM, vm->vm_map.size); - if (!old_mlock && vm->vm_map.flags & MAP_WIREFUTURE) { + racct_set_force(td->td_proc, RACCT_VMEM, map->size); + if (!old_mlock && map->flags & MAP_WIREFUTURE) { racct_set_force(td->td_proc, RACCT_MEMLOCK, - ptoa(vmspace_wired_count(td->td_proc->p_vmspace))); + ptoa(pmap_wired_count(map->pmap))); } PROC_UNLOCK(td->td_proc); #endif } done: - vm_map_unlock(&vm->vm_map); + vm_map_unlock(map); if (do_map_wirefuture) - (void) vm_map_wire(&vm->vm_map, old, new, + (void) vm_map_wire(map, old, new, VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES); return (error); From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 12:09:44 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2E7CE9A9; Tue, 22 Jan 2013 12:09:44 +0000 (UTC) (envelope-from zont@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1636EDCE; Tue, 22 Jan 2013 12:09:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MC9hn0042648; Tue, 22 Jan 2013 12:09:43 GMT (envelope-from zont@svn.freebsd.org) Received: (from zont@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MC9h6x042647; Tue, 22 Jan 2013 12:09:43 GMT (envelope-from zont@svn.freebsd.org) Message-Id: <201301221209.r0MC9h6x042647@svn.freebsd.org> From: Andrey Zonov Date: Tue, 22 Jan 2013 12:09:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245788 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 12:09:44 -0000 Author: zont Date: Tue Jan 22 12:09:43 2013 New Revision: 245788 URL: http://svnweb.freebsd.org/changeset/base/245788 Log: MFC r245458: - Use standard RETURN VALUES section. Modified: stable/9/lib/libc/sys/chroot.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/chroot.2 ============================================================================== --- stable/9/lib/libc/sys/chroot.2 Tue Jan 22 12:05:53 2013 (r245787) +++ stable/9/lib/libc/sys/chroot.2 Tue Jan 22 12:09:43 2013 (r245788) @@ -92,12 +92,8 @@ system call. Any other value for .Ql kern.chroot_allow_open_directories will bypass the check for open directories -.Pp -Upon successful completion, a value of 0 is returned. -Otherwise, -a value of -1 is returned and -.Va errno -is set to indicate an error. +.Sh RETURN VALUES +.Rv -std .Sh ERRORS The .Fn chroot From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 17:05:27 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 24566861; Tue, 22 Jan 2013 17:05:27 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 16200376; Tue, 22 Jan 2013 17:05:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MH5QYX039872; Tue, 22 Jan 2013 17:05:26 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MH5QaF039871; Tue, 22 Jan 2013 17:05:26 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201301221705.r0MH5QaF039871@svn.freebsd.org> From: Alexander Motin Date: Tue, 22 Jan 2013 17:05:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245795 - stable/9/sys/dev/ata X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 17:05:27 -0000 Author: mav Date: Tue Jan 22 17:05:26 2013 New Revision: 245795 URL: http://svnweb.freebsd.org/changeset/base/245795 Log: MFC r241402: Add checks for ata_sata_scr_read() return statuses. It is mostly to silence Clang Static Analyzer warnings as errors there are usually unlikely. Modified: stable/9/sys/dev/ata/ata-sata.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/ata/ata-sata.c ============================================================================== --- stable/9/sys/dev/ata/ata-sata.c Tue Jan 22 16:52:04 2013 (r245794) +++ stable/9/sys/dev/ata/ata-sata.c Tue Jan 22 17:05:26 2013 (r245795) @@ -53,7 +53,8 @@ ata_sata_phy_check_events(device_t dev, struct ata_channel *ch = device_get_softc(dev); u_int32_t error, status; - ata_sata_scr_read(ch, port, ATA_SERROR, &error); + if (ata_sata_scr_read(ch, port, ATA_SERROR, &error)) + return; /* Check that SError value is sane. */ if (error == 0xffffffff) @@ -66,8 +67,9 @@ ata_sata_phy_check_events(device_t dev, /* if we have a connection event deal with it */ if ((error & ATA_SE_PHY_CHANGED) && (ch->pm_level == 0)) { if (bootverbose) { - ata_sata_scr_read(ch, port, ATA_SSTATUS, &status); - if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) && + if (ata_sata_scr_read(ch, port, ATA_SSTATUS, &status)) { + device_printf(dev, "PHYRDY change\n"); + } else if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) && ((status & ATA_SS_SPD_MASK) != ATA_SS_SPD_NO_SPEED) && ((status & ATA_SS_IPM_MASK) == ATA_SS_IPM_ACTIVE)) { device_printf(dev, "CONNECT requested\n"); From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 17:06:43 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 583C3B51; Tue, 22 Jan 2013 17:06:43 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3C8A838C; Tue, 22 Jan 2013 17:06:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MH6h1K040174; Tue, 22 Jan 2013 17:06:43 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MH6gHq040170; Tue, 22 Jan 2013 17:06:42 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201301221706.r0MH6gHq040170@svn.freebsd.org> From: Alexander Motin Date: Tue, 22 Jan 2013 17:06:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245797 - in stable/9/sys/dev: ahci ata ata/chipsets X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 17:06:43 -0000 Author: mav Date: Tue Jan 22 17:06:42 2013 New Revision: 245797 URL: http://svnweb.freebsd.org/changeset/base/245797 Log: MFC r244146: Add IDs for SATA controllers on AMD Hudson-2 series chipsets. I am not exactly sure about the naming due to lack of specs on AMD site, but it is better to have some identification then none at all. Modified: stable/9/sys/dev/ahci/ahci.c stable/9/sys/dev/ata/ata-pci.h stable/9/sys/dev/ata/chipsets/ata-ati.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/ahci/ahci.c ============================================================================== --- stable/9/sys/dev/ahci/ahci.c Tue Jan 22 17:06:28 2013 (r245796) +++ stable/9/sys/dev/ahci/ahci.c Tue Jan 22 17:06:42 2013 (r245797) @@ -128,6 +128,11 @@ static struct { {0x43931002, 0x00, "ATI IXP700", 0}, {0x43941002, 0x00, "ATI IXP800", 0}, {0x43951002, 0x00, "ATI IXP800", 0}, + {0x78001022, 0x00, "AMD Hudson-2", 0}, + {0x78011022, 0x00, "AMD Hudson-2", 0}, + {0x78021022, 0x00, "AMD Hudson-2", 0}, + {0x78031022, 0x00, "AMD Hudson-2", 0}, + {0x78041022, 0x00, "AMD Hudson-2", 0}, {0x06121b21, 0x00, "ASMedia ASM1061", 0}, {0x26528086, 0x00, "Intel ICH6", AHCI_Q_NOFORCE}, {0x26538086, 0x00, "Intel ICH6M", AHCI_Q_NOFORCE}, Modified: stable/9/sys/dev/ata/ata-pci.h ============================================================================== --- stable/9/sys/dev/ata/ata-pci.h Tue Jan 22 17:06:28 2013 (r245796) +++ stable/9/sys/dev/ata/ata-pci.h Tue Jan 22 17:06:42 2013 (r245797) @@ -101,6 +101,12 @@ struct ata_pci_controller { #define ATA_AMD768 0x74411022 #define ATA_AMD8111 0x74691022 #define ATA_AMD5536 0x209a1022 +#define ATA_AMD_HUDSON2_S1 0x78001022 +#define ATA_AMD_HUDSON2_S2 0x78011022 +#define ATA_AMD_HUDSON2_S3 0x78021022 +#define ATA_AMD_HUDSON2_S4 0x78031022 +#define ATA_AMD_HUDSON2_S5 0x78041022 +#define ATA_AMD_HUDSON2 0x780c1022 #define ATA_ADAPTEC_ID 0x9005 #define ATA_ADAPTEC_1420 0x02419005 Modified: stable/9/sys/dev/ata/chipsets/ata-ati.c ============================================================================== --- stable/9/sys/dev/ata/chipsets/ata-ati.c Tue Jan 22 17:06:28 2013 (r245796) +++ stable/9/sys/dev/ata/chipsets/ata-ati.c Tue Jan 22 17:06:42 2013 (r245797) @@ -91,6 +91,12 @@ ata_ati_probe(device_t dev) { ATA_ATI_IXP700_S4, 0x00, ATI_AHCI, 0, ATA_SA300, "IXP700/800" }, { ATA_ATI_IXP800_S1, 0x00, ATI_AHCI, 0, ATA_SA300, "IXP800" }, { ATA_ATI_IXP800_S2, 0x00, ATI_AHCI, 0, ATA_SA300, "IXP800" }, + { ATA_AMD_HUDSON2, 0x00, ATI_PATA, 0, ATA_UDMA6, "Hudson-2" }, + { ATA_AMD_HUDSON2_S1, 0x00, ATI_AHCI, 0, ATA_SA300, "Hudson-2" }, + { ATA_AMD_HUDSON2_S2, 0x00, ATI_AHCI, 0, ATA_SA300, "Hudson-2" }, + { ATA_AMD_HUDSON2_S3, 0x00, ATI_AHCI, 0, ATA_SA300, "Hudson-2" }, + { ATA_AMD_HUDSON2_S4, 0x00, ATI_AHCI, 0, ATA_SA300, "Hudson-2" }, + { ATA_AMD_HUDSON2_S5, 0x00, ATI_AHCI, 0, ATA_SA300, "Hudson-2" }, { 0, 0, 0, 0, 0, 0}}; if (pci_get_vendor(dev) != ATA_ATI_ID) From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 17:08:10 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8C6AFD72; Tue, 22 Jan 2013 17:08:10 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 73CD03DD; Tue, 22 Jan 2013 17:08:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MH8Aor040473; Tue, 22 Jan 2013 17:08:10 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MH8Ax5040472; Tue, 22 Jan 2013 17:08:10 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201301221708.r0MH8Ax5040472@svn.freebsd.org> From: Alexander Motin Date: Tue, 22 Jan 2013 17:08:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245798 - stable/9/sys/dev/ata X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 17:08:10 -0000 Author: mav Date: Tue Jan 22 17:08:09 2013 New Revision: 245798 URL: http://svnweb.freebsd.org/changeset/base/245798 Log: MFC r245446: In case somebody still use it, fix legacy ataraid(4) to work on combined PATA+AHCI controllers, such as JMicron JMB363. PR: kern/159271 Modified: stable/9/sys/dev/ata/ata-raid.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/ata/ata-raid.c ============================================================================== --- stable/9/sys/dev/ata/ata-raid.c Tue Jan 22 17:06:42 2013 (r245797) +++ stable/9/sys/dev/ata/ata-raid.c Tue Jan 22 17:08:09 2013 (r245798) @@ -1351,10 +1351,11 @@ static int ata_raid_read_metadata(device_t subdisk) { devclass_t pci_devclass = devclass_find("pci"); + devclass_t atapci_devclass = devclass_find("atapci"); devclass_t devclass=device_get_devclass(GRANDPARENT(GRANDPARENT(subdisk))); /* prioritize vendor native metadata layout if possible */ - if (devclass == pci_devclass) { + if (devclass == pci_devclass || devclass == atapci_devclass) { switch (pci_get_vendor(GRANDPARENT(device_get_parent(subdisk)))) { case ATA_HIGHPOINT_ID: if (ata_raid_hptv3_read_meta(subdisk, ata_raid_arrays)) From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 20:45:44 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E12E9549; Tue, 22 Jan 2013 20:45:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 54914276; Tue, 22 Jan 2013 20:45:44 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.6/8.14.6) with ESMTP id r0MKjYgu051962; Tue, 22 Jan 2013 22:45:34 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.7.4 kib.kiev.ua r0MKjYgu051962 Received: (from kostik@localhost) by tom.home (8.14.6/8.14.6/Submit) id r0MKjYUc051960; Tue, 22 Jan 2013 22:45:34 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 22 Jan 2013 22:45:34 +0200 From: Konstantin Belousov To: "Pedro F. Giffuni" Subject: Re: svn commit: r245763 - stable/9/sbin/newfs_msdos Message-ID: <20130122204534.GR2522@kib.kiev.ua> References: <201301220339.r0M3dupN079529@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZGw25I70SdcL9+dm" Content-Disposition: inline In-Reply-To: <201301220339.r0M3dupN079529@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 20:45:45 -0000 --ZGw25I70SdcL9+dm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 22, 2013 at 03:39:55AM +0000, Pedro F. Giffuni wrote: > Author: pfg > Date: Tue Jan 22 03:39:55 2013 > New Revision: 245763 > URL: http://svnweb.freebsd.org/changeset/base/245763 >=20 > Log: > MFC r245648: > =20 > newfs_msdos: cosmetical cleanups > =20 > - Simplify diagnostic messages. > - Adopt lowercase first letters to make the messages > more canonical. > =20 > PR: bin/175404 > Submitted by: Christoph Mallon > Reviewed by: bde >=20 > Modified: > stable/9/sbin/newfs_msdos/newfs_msdos.c It seems that this commit, as well as the same merge to stable/8, missed the mergeinfo. --ZGw25I70SdcL9+dm Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQIcBAEBAgAGBQJQ/vptAAoJEJDCuSvBvK1Bl4AQAKbWxGuXZVHTggA0savxdAsI 4zd3bL7yY/M7/wlUy25Gt0+eln/VmzYCfMdIzoKMF9UP7XbzdkiuGtfksgwgc3+O RvdU/bTrNJJz+iqYyTt5V3XmrFaZTaBv+lE5sm+EWzIG+28hbJMABv4v3jBeRrQI /Z7LGf+KC0BcSvJkqUOsCaocpIGUYd2zGIfXTlJ3pnxZDdkmXypnK003XzNrYTIZ SF5GnSK2DuRgRHUF/FyY3+78pJ/xU1PSW3smtkNGR9QbcW71YIK+tWY1W96p0Pv7 eU6BAr1xoUWbmX1ok7+5N+eZmh5JEugt7ubZ37R/BOGEBvs0uNJzcrxvZTBkKSba Z6tAS7AzozqIF5zXDrsBPpJVx8pTwBZpKQ5celklTCsg8jndjWj1Vjm2ePD6qliA CdWX0kD7YQLaM3JHB17i/BQUAcCpL93t935TZID5D/fDH4UMIXivir5TXxmXNEKm dR1cdlzGPSMbFzHAko2idoYR2ENy0xvbmUi3sSgAJUaLGytYsOPWW+QNf1004vN1 DN6waQVQTUNtfp+u80gC/ZrQyPzDXlKN2575Kczx5hogGS1wkthuWbxa1NKF/Uoy niUizsVA6ZD9dZD6zhUxq8zS6/ntENmK+x66i/5B+/wieHNZ0CmfVgh5tSOPCq20 R1TFusXDq/Z1ESgp0G1G =LfE+ -----END PGP SIGNATURE----- --ZGw25I70SdcL9+dm-- From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 22:30:18 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 48ACB67D; Tue, 22 Jan 2013 22:30:18 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1DF46A24; Tue, 22 Jan 2013 22:30:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MMUH0p038692; Tue, 22 Jan 2013 22:30:17 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MMUHSO038691; Tue, 22 Jan 2013 22:30:17 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201301222230.r0MMUHSO038691@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Tue, 22 Jan 2013 22:30:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245826 - stable/9/sbin/newfs_msdos X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 22:30:18 -0000 Author: pfg Date: Tue Jan 22 22:30:17 2013 New Revision: 245826 URL: http://svnweb.freebsd.org/changeset/base/245826 Log: MFC r245648; Missing mergeinfo. Noticed by: kib Modified: Directory Properties: stable/9/sbin/newfs_msdos/ (props changed) From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 22 22:32:34 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 63D75970 for ; Tue, 22 Jan 2013 22:32:34 +0000 (UTC) (envelope-from giffunip@yahoo.com) Received: from nm15.bullet.mail.bf1.yahoo.com (nm15.bullet.mail.bf1.yahoo.com [98.139.212.174]) by mx1.freebsd.org (Postfix) with SMTP id CB91CA43 for ; Tue, 22 Jan 2013 22:32:33 +0000 (UTC) Received: from [98.139.212.153] by nm15.bullet.mail.bf1.yahoo.com with NNFMP; 22 Jan 2013 22:32:32 -0000 Received: from [98.139.212.225] by tm10.bullet.mail.bf1.yahoo.com with NNFMP; 22 Jan 2013 22:32:32 -0000 Received: from [127.0.0.1] by omp1034.mail.bf1.yahoo.com with NNFMP; 22 Jan 2013 22:32:32 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 251899.31360.bm@omp1034.mail.bf1.yahoo.com Received: (qmail 38483 invoked by uid 60001); 22 Jan 2013 22:32:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1358893952; bh=ynKdFAgjDZjXyx9NO9bINK93aM2CGp1Z7tAtdYxDxMU=; h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-RocketYMMF:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=B2Bm3n80U5Ku0myfHi859vkYPTADDZDYH37nUlKBRtGaVdW/VPCv3x15sCF3lkUsmGFfM/X7uZTRnmAwu2EKLysVaWq9nu73yn2jStEz2cCC3UFCrZnKYJ7NbRLdjGnAYXDrWK3l/wDrLYCgWXEPIZQLezcKih9D1NK+DmKOWC0= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-RocketYMMF:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=0x0EAIel1El/rGaFEY1j7L7ofG4HMeSQ6xWVUDQviRCKjApTYIEDc7iP72P8I0wLdl5/HLcPk7yCYkM5MjACiaUo2rJ8g0MiKC9mijy+ptDMSNXviWNhBf0ayMtrPpiMxaiaj9swQoknek1wQr+rhUEGngKKRnanSzvf9otK6xQ=; X-YMail-OSG: UVzZLo4VM1nuzZkqV5UPVS0pmWq.Il.unbUzNv5BWoI2Qf7 bQxatCgqnDAovhj1HZddq Received: from [200.118.157.7] by web162101.mail.bf1.yahoo.com via HTTP; Tue, 22 Jan 2013 14:32:32 PST X-Rocket-MIMEInfo: 001.001, CgoKCi0tLS0tIE1lc3NhZ2dpbyBvcmlnaW5hbGUgLS0tLS0KPiBEYTogS29uc3RhbnRpbiBCZWxvdXNvdsKgCj4gCj4gT24gVHVlLCBKYW4gMjIsIDIwMTMgYXQgMDM6Mzk6NTVBTSArMDAwMCwgUGVkcm8gRi4gR2lmZnVuaSB3cm90ZToKPj4gIEF1dGhvcjogcGZnCj4.ICBEYXRlOiBUdWUgSmFuIDIyIDAzOjM5OjU1IDIwMTMKPj4gIE5ldyBSZXZpc2lvbjogMjQ1NzYzCj4.ICBVUkw6IGh0dHA6Ly9zdm53ZWIuZnJlZWJzZC5vcmcvY2hhbmdlc2V0L2Jhc2UvMjQ1NzYzCj4.IAo.PiAgTG9nOgo.PiDCoCAgTUYBMAEBAQE- X-RocketYMMF: giffunip X-Mailer: YahooMailWebService/0.8.130.496 References: <201301220339.r0M3dupN079529@svn.freebsd.org> <20130122204534.GR2522@kib.kiev.ua> Message-ID: <1358893952.58516.YahooMailNeo@web162101.mail.bf1.yahoo.com> Date: Tue, 22 Jan 2013 14:32:32 -0800 (PST) From: Pedro Giffuni Subject: Re: svn commit: r245763 - stable/9/sbin/newfs_msdos To: Konstantin Belousov In-Reply-To: <20130122204534.GR2522@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Cc: "svn-src-stable@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , "svn-src-stable-9@freebsd.org" X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Pedro Giffuni List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 22:32:34 -0000 =0A=0A=0A=0A----- Messaggio originale -----=0A> Da: Konstantin Belousov=A0= =0A> =0A> On Tue, Jan 22, 2013 at 03:39:55AM +0000, Pedro F. Giffuni wrote:= =0A>> Author: pfg=0A>> Date: Tue Jan 22 03:39:55 2013=0A>> New Revision:= 245763=0A>> URL: http://svnweb.freebsd.org/changeset/base/245763=0A>> =0A= >> Log:=0A>> =A0 MFC=A0=A0=A0 r245648:=0A>> =A0 =0A>> =A0 newfs_msdos: c= osmetical cleanups=0A>> =A0 =0A>> =A0 - Simplify diagnostic messages.=0A>>= =A0 - Adopt lowercase first letters to make the messages=0A>> =A0 =A0 mo= re canonical.=0A>> =A0 =0A>> =A0 PR:=A0=A0=A0 =A0=A0=A0 bin/175404=0A>> = =A0 Submitted by:=A0=A0=A0 Christoph Mallon=0A>> =A0 Reviewed by:=A0=A0= =A0 bde=0A>> =0A>> Modified:=0A>> =A0 stable/9/sbin/newfs_msdos/newfs_msd= os.c=0A> =0A> It seems that this commit, as well as the same merge to stabl= e/8, missed=0A> the mergeinfo.=0A> =0A=0ASorry, fixed.=0A=0APedro. From owner-svn-src-stable-9@FreeBSD.ORG Wed Jan 23 10:52:37 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1B892DEC; Wed, 23 Jan 2013 10:52:37 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0348194E; Wed, 23 Jan 2013 10:52:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0NAqaWZ062728; Wed, 23 Jan 2013 10:52:36 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0NAqa3v062727; Wed, 23 Jan 2013 10:52:36 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201301231052.r0NAqa3v062727@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 23 Jan 2013 10:52:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245842 - stable/9/lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2013 10:52:37 -0000 Author: glebius Date: Wed Jan 23 10:52:36 2013 New Revision: 245842 URL: http://svnweb.freebsd.org/changeset/base/245842 Log: Merge r245841: posix_fadvise(2) first appeared in FreeBSD 9.1 Modified: stable/9/lib/libc/sys/posix_fadvise.2 Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/lib/libc/sys/posix_fadvise.2 ============================================================================== --- stable/9/lib/libc/sys/posix_fadvise.2 Wed Jan 23 10:50:52 2013 (r245841) +++ stable/9/lib/libc/sys/posix_fadvise.2 Wed Jan 23 10:52:36 2013 (r245842) @@ -135,4 +135,4 @@ interface conforms to The .Fn posix_fadvise system call first appeared in -.Fx 10.0 . +.Fx 9.1 . From owner-svn-src-stable-9@FreeBSD.ORG Wed Jan 23 22:56:04 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6779A14C; Wed, 23 Jan 2013 22:56:04 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 59DE673B; Wed, 23 Jan 2013 22:56:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0NMu4J8085635; Wed, 23 Jan 2013 22:56:04 GMT (envelope-from scottl@svn.freebsd.org) Received: (from scottl@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0NMu4OO085634; Wed, 23 Jan 2013 22:56:04 GMT (envelope-from scottl@svn.freebsd.org) Message-Id: <201301232256.r0NMu4OO085634@svn.freebsd.org> From: Scott Long Date: Wed, 23 Jan 2013 22:56:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245851 - stable/9/sys/geom X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2013 22:56:04 -0000 Author: scottl Date: Wed Jan 23 22:56:03 2013 New Revision: 245851 URL: http://svnweb.freebsd.org/changeset/base/245851 Log: MFC r239132: Clone BIO_ORDERED flag, for disk drivers (namely CAM) that try to consume it. Modified: stable/9/sys/geom/geom_io.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/geom/geom_io.c ============================================================================== --- stable/9/sys/geom/geom_io.c Wed Jan 23 22:52:20 2013 (r245850) +++ stable/9/sys/geom/geom_io.c Wed Jan 23 22:56:03 2013 (r245851) @@ -177,6 +177,12 @@ g_clone_bio(struct bio *bp) if (bp2 != NULL) { bp2->bio_parent = bp; bp2->bio_cmd = bp->bio_cmd; + /* + * BIO_ORDERED flag may be used by disk drivers to enforce + * ordering restrictions, so this flag needs to be cloned. + * Other bio flags are not suitable for cloning. + */ + bp2->bio_flags = bp->bio_flags & BIO_ORDERED; bp2->bio_length = bp->bio_length; bp2->bio_offset = bp->bio_offset; bp2->bio_data = bp->bio_data; From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 24 00:42:53 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4DBFA96D; Thu, 24 Jan 2013 00:42:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from onyx.glenbarber.us (onyx.glenbarber.us [IPv6:2607:fc50:1000:c200::face]) by mx1.freebsd.org (Postfix) with ESMTP id D412AAC8; Thu, 24 Jan 2013 00:42:52 +0000 (UTC) Received: from glenbarber.us (kaos.glenbarber.us [71.224.221.174]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: gjb) by onyx.glenbarber.us (Postfix) with ESMTPSA id 319C723F654; Wed, 23 Jan 2013 19:42:51 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.7.4 onyx.glenbarber.us 319C723F654 Authentication-Results: onyx.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none (insecure policy) Date: Wed, 23 Jan 2013 19:42:49 -0500 From: Glen Barber To: Eitan Adler Subject: Re: svn commit: r240545 - in stable/9/share/examples: . cvsup etc Message-ID: <20130124004249.GB1304@glenbarber.us> References: <201209160035.q8G0Z9q6067523@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="aVD9QWMuhilNxW9f" Content-Disposition: inline In-Reply-To: <201209160035.q8G0Z9q6067523@svn.freebsd.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 00:42:53 -0000 --aVD9QWMuhilNxW9f Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable FYI, this commit entirely missed the merge to make.conf.5 ... Glen On Sun, Sep 16, 2012 at 12:35:09AM +0000, Eitan Adler wrote: > Author: eadler > Date: Sun Sep 16 00:35:09 2012 > New Revision: 240545 > URL: http://svn.freebsd.org/changeset/base/240545 >=20 > Log: > MFC r240252,r240253: > Remove documentation and www cvsup files as they are no longer useful > with the switch to subversion. > Specifically document that an incomplete ports tree is not supported. > Remove useless comment about sendmail. > =20 > Approved by: cperciva (implicit) >=20 > Deleted: > stable/9/share/examples/cvsup/doc-supfile > stable/9/share/examples/cvsup/www-supfile > Modified: > stable/9/share/examples/Makefile > stable/9/share/examples/cvsup/cvs-supfile > stable/9/share/examples/cvsup/refuse > stable/9/share/examples/cvsup/refuse.README > stable/9/share/examples/cvsup/stable-supfile > stable/9/share/examples/etc/make.conf > Directory Properties: > stable/9/share/examples/ (props changed) > stable/9/share/examples/cvsup/ (props changed) > stable/9/share/examples/etc/ (props changed) > stable/9/share/man/man5/ (props changed) >=20 > Modified: stable/9/share/examples/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/9/share/examples/Makefile Sun Sep 16 00:35:09 2012 (r240544) > +++ stable/9/share/examples/Makefile Sun Sep 16 00:35:09 2012 (r240545) > @@ -53,14 +53,12 @@ XFILES=3D BSD_daemon/FreeBSD.pfa \ > csh/dot.cshrc \ > cvsup/README \ > cvsup/cvs-supfile \ > - cvsup/doc-supfile \ > cvsup/gnats-supfile \ > cvsup/ports-supfile \ > cvsup/refuse \ > cvsup/refuse.README \ > cvsup/stable-supfile \ > cvsup/standard-supfile \ > - cvsup/www-supfile \ > diskless/ME \ > diskless/README.BOOTP \ > diskless/README.TEMPLATING \ >=20 > Modified: stable/9/share/examples/cvsup/cvs-supfile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/9/share/examples/cvsup/cvs-supfile Sun Sep 16 00:35:09 2012 (r= 240544) > +++ stable/9/share/examples/cvsup/cvs-supfile Sun Sep 16 00:35:09 2012 (r= 240545) > @@ -169,19 +169,6 @@ ports-all > #ports-x11-toolkits > #ports-x11-wm > =20 > -## Documentation > -# > -# The easiest way to get the doc tree is to use the "doc-all" > -# mega-collection. It includes all of the individual "doc-*" > -# collections, > -doc-all > - > -## Website > -# > -# This collection retrieves the www tree of the FreeBSD > -# repository > -www > - > ## Projects > # > # This collection retrieves the projects tree of the FreeBSD > @@ -200,4 +187,3 @@ cvsroot-all > #cvsroot-common > #cvsroot-src > #cvsroot-ports > -#cvsroot-doc >=20 > Modified: stable/9/share/examples/cvsup/refuse > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/9/share/examples/cvsup/refuse Sun Sep 16 00:35:09 2012 (r24054= 4) > +++ stable/9/share/examples/cvsup/refuse Sun Sep 16 00:35:09 2012 (r24054= 5) > @@ -1,23 +1,3 @@ > -doc/bn_* > -doc/da_* > -doc/de_* > -doc/el_* > -doc/es_* > -doc/fr_* > -doc/hu_* > -doc/id_* > -doc/it_* > -doc/ja_* > -doc/mn_* > -doc/nl_* > -doc/no_* > -doc/pl_* > -doc/pt_* > -doc/ro_* > -doc/ru_* > -doc/sr_* > -doc/tr_* > -doc/zh_* > ports/arabic > ports/chinese > ports/french >=20 > Modified: stable/9/share/examples/cvsup/refuse.README > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/9/share/examples/cvsup/refuse.README Sun Sep 16 00:35:09 2012 = (r240544) > +++ stable/9/share/examples/cvsup/refuse.README Sun Sep 16 00:35:09 2012 = (r240545) > @@ -16,33 +16,9 @@ CVSup's base directory to "/var/db". Th > directory; i.e., it is "/var/db/sup". If you have changed your base > directory, your sup directory is /path/to/base/sup. > =20 > -This file used to contain /usr/src/etc/sendmail/freebsd.mc in case > -you modified that file. However, this was removed as it can break > -buildworld. Modify /etc/mail/`hostname`.mc instead. > - > If you are an English speaker and don't wish to receive the > -foreign-language documentation or ports, use the following patterns: > +non-English ports, use the following patterns: > =20 > - doc/bn_* > - doc/da_* > - doc/de_* > - doc/el_* > - doc/es_* > - doc/fr_* > - doc/hu_* > - doc/id_* > - doc/it_* > - doc/ja_* > - doc/mn_* > - doc/nl_* > - doc/no_* > - doc/pl_* > - doc/pt_* > - doc/ro_* > - doc/ru_* > - doc/sr_* > - doc/tr_* > - doc/zh_* > ports/arabic > ports/chinese > ports/french > @@ -57,6 +33,9 @@ foreign-language documentation or ports, > ports/ukrainian > ports/vietnamese > =20 > +Note that this is *not* a supported configuration and may result > +in ports builds breaking. > + > Use refuse files with care. Some parts of the src distribution > depend on files in completely different parts. > =20 >=20 > Modified: stable/9/share/examples/cvsup/stable-supfile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/9/share/examples/cvsup/stable-supfile Sun Sep 16 00:35:09 2012= (r240544) > +++ stable/9/share/examples/cvsup/stable-supfile Sun Sep 16 00:35:09 2012= (r240545) > @@ -43,14 +43,13 @@ > # > # DANGER! WARNING! LOOK OUT! VORSICHT! > # > -# If you add any of the ports or doc collections to this file, be sure to > +# If you add any of the ports collections to this file, be sure to > # specify them with a "tag" value set to ".", like this: > # > # ports-all tag=3D. > -# doc-all tag=3D. > # > # If you leave out the "tag=3D." portion, CVSup will delete all of > -# the files in your ports or doc tree. That is because the ports and doc > +# the files in your ports. That is because the ports > # collections do not use the same tags as the main part of the FreeBSD= =20 > # source tree. > # >=20 > Modified: stable/9/share/examples/etc/make.conf > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/9/share/examples/etc/make.conf Sun Sep 16 00:35:09 2012 (r2405= 44) > +++ stable/9/share/examples/etc/make.conf Sun Sep 16 00:35:09 2012 (r2405= 45) > @@ -187,8 +187,6 @@ > #SUPHOST=3D cvsup.uk.FreeBSD.org > #SUPFILE=3D /usr/share/examples/cvsup/standard-supfile > #PORTSSUPFILE=3D /usr/share/examples/cvsup/ports-supfile > -#DOCSUPFILE=3D /usr/share/examples/cvsup/doc-supfile > -#WWWSUPFILE=3D /usr/share/examples/cvsup/www-supfile > # > # top(1) uses a hash table for the user names. The size of this hash > # can be tuned to match the number of local users. The table size should > _______________________________________________ > svn-src-stable-9@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9 > To unsubscribe, send any mail to "svn-src-stable-9-unsubscribe@freebsd.or= g" --aVD9QWMuhilNxW9f Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJRAIOJAAoJEFJPDDeguUajAtwIAI1T3EkkhSuStLS6EXykH0Vg dck6VG8eydSw6wJkGeIKntwn2Ve9hrJVsx85KVKKDrxLHHGgga94wsDv7gp14r47 s589OCdgaz4VZK2aAOq1Wq1aTpHEt4BAxqBo3lifsctaiHym9rBhTJhM6n34cpor KPVJg1RSiYZA5Fxdo5C6lCHYDZEQQV6jslg1xahHKOAPGT4/c3QRSQEF9NeHADtc I12mpJvdNYl/bYMCU3+u9V31NJGgKkNB7DcGTEz1A1mZt2GHfawGxXJRigocakDU E7jR7V2x1ZMtfzTXhpkQqu1SP73eg537X71gUiHHAjSICSSBsUTX+KwW9qG42kI= =5CuE -----END PGP SIGNATURE----- --aVD9QWMuhilNxW9f-- From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 24 00:45:54 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A55CCB01; Thu, 24 Jan 2013 00:45:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 66913AE1; Thu, 24 Jan 2013 00:45:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0O0jse6018777; Thu, 24 Jan 2013 00:45:54 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0O0jswB018776; Thu, 24 Jan 2013 00:45:54 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201301240045.r0O0jswB018776@svn.freebsd.org> From: Glen Barber Date: Thu, 24 Jan 2013 00:45:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245855 - stable/9/share/man/man5 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 00:45:54 -0000 Author: gjb (doc,ports committer) Date: Thu Jan 24 00:45:53 2013 New Revision: 245855 URL: http://svnweb.freebsd.org/changeset/base/245855 Log: Remove bogus mergeinfo introduced with r240545. Modified: Directory Properties: stable/9/share/man/man5/ (props changed) From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 24 01:07:35 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B29DB22F; Thu, 24 Jan 2013 01:07:35 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD90BE2; Thu, 24 Jan 2013 01:07:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0O17ZvV025322; Thu, 24 Jan 2013 01:07:35 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0O17Zgq025318; Thu, 24 Jan 2013 01:07:35 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201301240107.r0O17Zgq025318@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 24 Jan 2013 01:07:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245857 - stable/9/sys/pci X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 01:07:35 -0000 Author: yongari Date: Thu Jan 24 01:07:34 2013 New Revision: 245857 URL: http://svnweb.freebsd.org/changeset/base/245857 Log: MFC r245485: Add D-Link DFE-520TX rev C1. Modified: stable/9/sys/pci/if_rl.c stable/9/sys/pci/if_rlreg.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/pci/if_rl.c ============================================================================== --- stable/9/sys/pci/if_rl.c Thu Jan 24 00:46:49 2013 (r245856) +++ stable/9/sys/pci/if_rl.c Thu Jan 24 01:07:34 2013 (r245857) @@ -148,6 +148,8 @@ static const struct rl_type rl_devs[] = "Delta Electronics 8139 10/100BaseTX" }, { ADDTRON_VENDORID, ADDTRON_DEVICEID_8139, RL_8139, "Addtron Technology 8139 10/100BaseTX" }, + { DLINK_VENDORID, DLINK_DEVICEID_520TX_REVC1, RL_8139, + "D-Link DFE-520TX (rev. C1) 10/100BaseTX" }, { DLINK_VENDORID, DLINK_DEVICEID_530TXPLUS, RL_8139, "D-Link DFE-530TX+ 10/100BaseTX" }, { DLINK_VENDORID, DLINK_DEVICEID_690TXD, RL_8139, Modified: stable/9/sys/pci/if_rlreg.h ============================================================================== --- stable/9/sys/pci/if_rlreg.h Thu Jan 24 00:46:49 2013 (r245856) +++ stable/9/sys/pci/if_rlreg.h Thu Jan 24 01:07:34 2013 (r245857) @@ -1048,6 +1048,11 @@ struct rl_softc { #define DLINK_DEVICEID_530TXPLUS 0x1300 /* + * D-Link DFE-520TX rev. C1 device ID + */ +#define DLINK_DEVICEID_520TX_REVC1 0x4200 + +/* * D-Link DFE-5280T device ID */ #define DLINK_DEVICEID_528T 0x4300 From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 24 01:12:56 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 93A44550; Thu, 24 Jan 2013 01:12:56 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7B719C17; Thu, 24 Jan 2013 01:12:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0O1Cum7027901; Thu, 24 Jan 2013 01:12:56 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0O1CuiB027900; Thu, 24 Jan 2013 01:12:56 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201301240112.r0O1CuiB027900@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 24 Jan 2013 01:12:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245859 - stable/9/share/man/man4 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 01:12:56 -0000 Author: yongari Date: Thu Jan 24 01:12:55 2013 New Revision: 245859 URL: http://svnweb.freebsd.org/changeset/base/245859 Log: MFC r245487: Add D-Link DFE-520TX (rev. C1) to HARDWARE section. Modified: stable/9/share/man/man4/rl.4 Directory Properties: stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/rl.4 ============================================================================== --- stable/9/share/man/man4/rl.4 Thu Jan 24 01:10:15 2013 (r245858) +++ stable/9/share/man/man4/rl.4 Thu Jan 24 01:12:55 2013 (r245859) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 22, 2010 +.Dd January 16, 2013 .Dt RL 4 .Os .Sh NAME @@ -155,6 +155,8 @@ Corega FEther CB-TXD .It Corega FEtherII CB-TXD .It +D-Link DFE-520TX (rev. C1) +.It D-Link DFE-528TX .It D-Link DFE-530TX+ From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 24 01:31:22 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C101195F; Thu, 24 Jan 2013 01:31:22 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B33AED25; Thu, 24 Jan 2013 01:31:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0O1VMRI033589; Thu, 24 Jan 2013 01:31:22 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0O1VMmw033588; Thu, 24 Jan 2013 01:31:22 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201301240131.r0O1VMmw033588@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 24 Jan 2013 01:31:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245861 - stable/9/sys/dev/mii X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 01:31:22 -0000 Author: yongari Date: Thu Jan 24 01:31:22 2013 New Revision: 245861 URL: http://svnweb.freebsd.org/changeset/base/245861 Log: MFC r244481: For fiber PHYs, BRGPHY_MII_1000CTL register is not defined at all so do not touch it. Modified: stable/9/sys/dev/mii/brgphy.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/mii/brgphy.c ============================================================================== --- stable/9/sys/dev/mii/brgphy.c Thu Jan 24 01:13:13 2013 (r245860) +++ stable/9/sys/dev/mii/brgphy.c Thu Jan 24 01:31:22 2013 (r245861) @@ -608,6 +608,11 @@ brgphy_mii_phy_auto(struct mii_softc *sc (sc->mii_flags & MIIF_FORCEPAUSE) != 0) anar |= BRGPHY_ANAR_PC | BRGPHY_ANAR_ASP; PHY_WRITE(sc, BRGPHY_MII_ANAR, anar); + ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD; + if (sc->mii_mpd_model == MII_MODEL_BROADCOM_BCM5701) + ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC; + PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr); + PHY_READ(sc, BRGPHY_MII_1000CTL); } else { anar = BRGPHY_SERDES_ANAR_FDX | BRGPHY_SERDES_ANAR_HDX; if ((media & IFM_FLOW) != 0 || @@ -616,12 +621,6 @@ brgphy_mii_phy_auto(struct mii_softc *sc PHY_WRITE(sc, BRGPHY_SERDES_ANAR, anar); } - ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD; - if (sc->mii_mpd_model == MII_MODEL_BROADCOM_BCM5701) - ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC; - PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr); - ktcr = PHY_READ(sc, BRGPHY_MII_1000CTL); - PHY_WRITE(sc, BRGPHY_MII_BMCR, BRGPHY_BMCR_AUTOEN | BRGPHY_BMCR_STARTNEG); PHY_WRITE(sc, BRGPHY_MII_IMR, 0xFF00); From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 24 01:40:48 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A2021E2C; Thu, 24 Jan 2013 01:40:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7E2BCD81; Thu, 24 Jan 2013 01:40:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0O1em9t036431; Thu, 24 Jan 2013 01:40:48 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0O1emCm036429; Thu, 24 Jan 2013 01:40:48 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201301240140.r0O1emCm036429@svn.freebsd.org> From: Glen Barber Date: Thu, 24 Jan 2013 01:40:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245863 - stable/9/share/man/man5 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 01:40:48 -0000 Author: gjb (doc,ports committer) Date: Thu Jan 24 01:40:47 2013 New Revision: 245863 URL: http://svnweb.freebsd.org/changeset/base/245863 Log: MFC r240252, r241541, r241543, r245756: r240252: (eadler) - Remove documentation and www cvsup files as they are no longer useful with the switch to subversion. r241541: (joel) - Minor mdoc improvements. Also remove unnecessary csup reference. r241543: (eadler) - Bump .Dd r245756: - Mark SUP_UPDATE as deprecated in make.conf(5), providing instructions to use SVN_UPDATE or freebsd-update(8). - While here, remove bogus NO_WWWUPDATE. Modified: stable/9/share/man/man5/make.conf.5 stable/9/share/man/man5/portindex.5 Directory Properties: stable/9/share/man/man5/ (props changed) Modified: stable/9/share/man/man5/make.conf.5 ============================================================================== --- stable/9/share/man/man5/make.conf.5 Thu Jan 24 01:32:17 2013 (r245862) +++ stable/9/share/man/man5/make.conf.5 Thu Jan 24 01:40:47 2013 (r245863) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 02, 2012 +.Dd January 21, 2013 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -200,14 +200,6 @@ value, use .Dq Li += instead of .Dq Li = . -.It Va DOCSUPFILE -.Pq Vt str -The documentation -.Ar supfile -to use when doing a -.Dq Li "make update" . -For example, -.Pa /usr/share/examples/cvsup/doc-supfile . .It Va INSTALL .Pq Vt str the default install command. @@ -263,10 +255,6 @@ Set this to not update the doc tree duri .Pq Vt bool Set this to not update the ports tree during .Dq Li "make update" . -.It Va NO_WWWUPDATE -.Pq Vt bool -Set this to not update the www tree during -.Dq Li "make update" . .It Va SUP .Pq Vt str The location of the @@ -312,11 +300,16 @@ The hostname of the sup server to use wh Set this to use .Xr csup 1 to update your -.Pa src , ports , doc +.Pa src , and -.Pa www +.Pa ports trees with .Dq Li "make update" . +This option is deprecated. +Please use +.Va SVN_UPDATE +or +.Xr freebsd-update 8 . .It Va SVN_UPDATE .Pq Vt bool Set this to use @@ -331,14 +324,6 @@ you will need to set to the full path of a .Xr svn 1 binary. -.It Va WWWSUPFILE -.Pq Vt str -The www -.Ar supfile -to use when doing a -.Dq Li "make update" . -For example, -.Pa /usr/share/examples/cvsup/www-supfile . .El .Ss "BUILDING THE KERNEL" The following list provides a name and short description for variables Modified: stable/9/share/man/man5/portindex.5 ============================================================================== --- stable/9/share/man/man5/portindex.5 Thu Jan 24 01:32:17 2013 (r245862) +++ stable/9/share/man/man5/portindex.5 Thu Jan 24 01:40:47 2013 (r245863) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2012 +.Dd October 14, 2012 .Dt PORTINDEX 5 .Os .Sh NAME @@ -48,7 +48,7 @@ branch, i.e.: .Pa INDEX-7 , or .Pa INDEX-8 . -.Bl -tag -compact -width indent +.Bl -tag -width XXXXXXXXXX .It Cm \&name The name of the package. .It Cm \&path @@ -77,7 +77,7 @@ Ports that may be required to patch this Ports that may be required to fetch this port. .El .Sh FILES -.Bl -tag -width /usr/ports/INDEX-8 +.Bl -tag -width /usr/ports/INDEX-8XX .It Pa /usr/ports/INDEX- Ns Ar N where .Ar N @@ -91,7 +91,6 @@ vim-6.3.15|/usr/ports/editors/vim|/usr/l .Ed .Sh SEE ALSO .Xr build 7 , -.Xr csup 1 , .Xr ports 7 .Sh AUTHORS .An -nosplit From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 24 02:19:39 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3944B477; Thu, 24 Jan 2013 02:19:39 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EF1C1E9F; Thu, 24 Jan 2013 02:19:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0O2JcMA046993; Thu, 24 Jan 2013 02:19:38 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0O2JcSd046990; Thu, 24 Jan 2013 02:19:38 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201301240219.r0O2JcSd046990@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 24 Jan 2013 02:19:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245865 - stable/9/sys/dev/mii X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2013 02:19:39 -0000 Author: yongari Date: Thu Jan 24 02:19:38 2013 New Revision: 245865 URL: http://svnweb.freebsd.org/changeset/base/245865 Log: MFC r244482: Recognize 5720S PHY and treat it as 5708S PHY. Unfortunately 5720S uses 5709S PHY id so add a hack to detect 5720S PHY by checking parent device name. 5720S PHY does not support 2500SX. Modified: stable/9/sys/dev/mii/brgphy.c stable/9/sys/dev/mii/miidevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/mii/brgphy.c ============================================================================== --- stable/9/sys/dev/mii/brgphy.c Thu Jan 24 01:41:11 2013 (r245864) +++ stable/9/sys/dev/mii/brgphy.c Thu Jan 24 02:19:38 2013 (r245865) @@ -204,6 +204,13 @@ brgphy_attach(device_t dev) &brgphy_funcs, 0); bsc->serdes_flags = 0; + ifp = sc->mii_pdata->mii_ifp; + + /* Find the MAC driver associated with this PHY. */ + if (strcmp(ifp->if_dname, "bge") == 0) + bge_sc = ifp->if_softc; + else if (strcmp(ifp->if_dname, "bce") == 0) + bce_sc = ifp->if_softc; /* Handle any special cases based on the PHY ID */ switch (sc->mii_mpd_oui) { @@ -235,22 +242,21 @@ brgphy_attach(device_t dev) sc->mii_flags |= MIIF_HAVEFIBER; break; case MII_MODEL_BROADCOM2_BCM5709S: - bsc->serdes_flags |= BRGPHY_5709S; + /* + * XXX + * 5720S and 5709S shares the same PHY id. + * Assume 5720S PHY if parent device is bge(4). + */ + if (bge_sc != NULL) + bsc->serdes_flags |= BRGPHY_5708S; + else + bsc->serdes_flags |= BRGPHY_5709S; sc->mii_flags |= MIIF_HAVEFIBER; break; } break; } - ifp = sc->mii_pdata->mii_ifp; - - /* Find the MAC driver associated with this PHY. */ - if (strcmp(ifp->if_dname, "bge") == 0) { - bge_sc = ifp->if_softc; - } else if (strcmp(ifp->if_dname, "bce") == 0) { - bce_sc = ifp->if_softc; - } - PHY_RESET(sc); /* Read the PHY's capabilities. */ Modified: stable/9/sys/dev/mii/miidevs ============================================================================== --- stable/9/sys/dev/mii/miidevs Thu Jan 24 01:41:11 2013 (r245864) +++ stable/9/sys/dev/mii/miidevs Thu Jan 24 02:19:38 2013 (r245865) @@ -178,7 +178,7 @@ model BROADCOM2 BCM5722 0x002d BCM5722 model BROADCOM2 BCM5784 0x003a BCM5784 10/100/1000baseT PHY model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY model BROADCOM2 BCM5761 0x003d BCM5761 10/100/1000baseT PHY -model BROADCOM2 BCM5709S 0x003f BCM5709S 1000/2500baseSX PHY +model BROADCOM2 BCM5709S 0x003f BCM5709S/5720S 1000/2500baseSX PHY model BROADCOM3 BCM57780 0x0019 BCM57780 1000BASE-T media interface model BROADCOM3 BCM5717C 0x0020 BCM5717C 1000BASE-T media interface model BROADCOM3 BCM5719C 0x0022 BCM5719C 1000BASE-T media interface From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 25 00:45:47 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6BAFED61; Fri, 25 Jan 2013 00:45:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2CC0D10D; Fri, 25 Jan 2013 00:45:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0P0jl3V050570; Fri, 25 Jan 2013 00:45:47 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0P0jlRS050569; Fri, 25 Jan 2013 00:45:47 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201301250045.r0P0jlRS050569@svn.freebsd.org> From: Glen Barber Date: Fri, 25 Jan 2013 00:45:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245895 - stable/9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 00:45:47 -0000 Author: gjb (doc,ports committer) Date: Fri Jan 25 00:45:46 2013 New Revision: 245895 URL: http://svnweb.freebsd.org/changeset/base/245895 Log: MFC r245757: - If update method is SUP_UPDATE or CVS, warn that those update methods are deprecated. - While here, remove bogus NO_WWWUPDATE. Modified: stable/9/Makefile.inc1 (contents, props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Thu Jan 24 23:11:51 2013 (r245894) +++ stable/9/Makefile.inc1 Fri Jan 25 00:45:46 2013 (r245895) @@ -12,7 +12,6 @@ # -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update -# -DNO_WWWUPDATE do not update www in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # TARGET="machine" to crossbuild world for a different machine type @@ -943,6 +942,13 @@ update: @echo "--------------------------------------------------------------" @echo ">>> Running ${SUP}" @echo "--------------------------------------------------------------" + @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" + @echo "!! Update methods with ${SUP} are deprecated." + @echo "!! Please see http://www.freebsd.org/handbook/svn.html" + @echo "!! and convert your update method to SVN_UPDATE or" + @echo "!! freebsd-update(8)." + @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" + @sleep 5 .if defined(SUPFILE) @${SUP} ${SUPFLAGS} ${SUPFILE} .endif @@ -958,9 +964,6 @@ update: .if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE) @${SUP} ${SUPFLAGS} ${DOCSUPFILE} .endif -.if defined(WWWSUPFILE) && !defined(NO_WWWUPDATE) - @${SUP} ${SUPFLAGS} ${WWWSUPFILE} -.endif .endif .if defined(CVS_UPDATE) @cd ${.CURDIR} ; \ @@ -968,6 +971,13 @@ update: echo "--------------------------------------------------------------" ; \ echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \ echo "--------------------------------------------------------------" ; \ + echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ + echo "!! Update methods with ${SUP} are deprecated." ; \ + echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \ + echo "!! and convert your update method to SVN_UPDATE or" ; \ + echo "!! freebsd-update(8)." ; \ + echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ + sleep 5 ; \ echo ${CVS} -R -q update ${CVSFLAGS} ; \ ${CVS} -R -q update ${CVSFLAGS} ; \ fi From owner-svn-src-stable-9@FreeBSD.ORG Fri Jan 25 03:38:03 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A53EB64A; Fri, 25 Jan 2013 03:38:03 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 95BA1979; Fri, 25 Jan 2013 03:38:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0P3c3jE002628; Fri, 25 Jan 2013 03:38:03 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0P3c37p002627; Fri, 25 Jan 2013 03:38:03 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201301250338.r0P3c37p002627@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Fri, 25 Jan 2013 03:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245897 - stable/9/sys/fs/ext2fs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 03:38:03 -0000 Author: pfg Date: Fri Jan 25 03:38:02 2013 New Revision: 245897 URL: http://svnweb.freebsd.org/changeset/base/245897 Log: MFC r245612: ext2fs: temporarily disable the reallocation code. Testing with fsx has revealed problems and in order to hunt the bugs properly we need reduce the complexity. This seems to help but doesn't work around all the issues. While here add missing merginfo for r245762 which somehow got lost. Modified: stable/9/sys/fs/ext2fs/ext2_alloc.c Directory Properties: stable/9/sys/fs/ (props changed) Modified: stable/9/sys/fs/ext2fs/ext2_alloc.c ============================================================================== --- stable/9/sys/fs/ext2fs/ext2_alloc.c Fri Jan 25 00:46:02 2013 (r245896) +++ stable/9/sys/fs/ext2fs/ext2_alloc.c Fri Jan 25 03:38:02 2013 (r245897) @@ -151,11 +151,11 @@ nospace: SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RW, 0, "EXT2FS filesystem"); -static int doasyncfree = 1; +static int doasyncfree = 0; SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, "Use asychronous writes to update block pointers when freeing blocks"); -static int doreallocblks = 1; +static int doreallocblks = 0; SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doreallocblks, CTLFLAG_RW, &doreallocblks, 0, ""); int From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 26 00:39:52 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B57FE50F; Sat, 26 Jan 2013 00:39:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A805A32E; Sat, 26 Jan 2013 00:39:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0Q0dqxD082623; Sat, 26 Jan 2013 00:39:52 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0Q0dqWv082622; Sat, 26 Jan 2013 00:39:52 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201301260039.r0Q0dqWv082622@svn.freebsd.org> From: Glen Barber Date: Sat, 26 Jan 2013 00:39:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245929 - stable/9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2013 00:39:52 -0000 Author: gjb (doc,ports committer) Date: Sat Jan 26 00:39:52 2013 New Revision: 245929 URL: http://svnweb.freebsd.org/changeset/base/245929 Log: MFC r245918: - Fix update method (s/SUP/CVS) warning. Modified: stable/9/Makefile.inc1 (contents, props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Sat Jan 26 00:37:54 2013 (r245928) +++ stable/9/Makefile.inc1 Sat Jan 26 00:39:52 2013 (r245929) @@ -972,7 +972,7 @@ update: echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \ echo "--------------------------------------------------------------" ; \ echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ - echo "!! Update methods with ${SUP} are deprecated." ; \ + echo "!! Update methods with CVS are deprecated." ; \ echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \ echo "!! and convert your update method to SVN_UPDATE or" ; \ echo "!! freebsd-update(8)." ; \ From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 26 05:20:11 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 08A9E46A; Sat, 26 Jan 2013 05:20:11 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DEDACF73; Sat, 26 Jan 2013 05:20:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0Q5KAMx067556; Sat, 26 Jan 2013 05:20:10 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0Q5K9no067549; Sat, 26 Jan 2013 05:20:09 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201301260520.r0Q5K9no067549@svn.freebsd.org> From: Xin LI Date: Sat, 26 Jan 2013 05:20:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245938 - in stable/9/sys: conf dev/hpt27xx modules/hpt27xx X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2013 05:20:11 -0000 Author: delphij Date: Sat Jan 26 05:20:09 2013 New Revision: 245938 URL: http://svnweb.freebsd.org/changeset/base/245938 Log: MFC r245768: - Don't include date and time the driver is built, this is useful for generating binary diffs. - Constify a few strings used in the driver. - Style changes to make the driver compile with default clang settings. Approved by: HighPoint Technologies Modified: stable/9/sys/conf/files.amd64 stable/9/sys/conf/files.i386 stable/9/sys/dev/hpt27xx/hpt27xx_config.c stable/9/sys/dev/hpt27xx/os_bsd.h stable/9/sys/dev/hpt27xx/osm_bsd.c stable/9/sys/modules/hpt27xx/Makefile Directory Properties: stable/9/sys/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/conf/files.amd64 ============================================================================== --- stable/9/sys/conf/files.amd64 Sat Jan 26 03:23:28 2013 (r245937) +++ stable/9/sys/conf/files.amd64 Sat Jan 26 05:20:09 2013 (r245938) @@ -192,8 +192,7 @@ dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc pccard dev/hpt27xx/os_bsd.c optional hpt27xx -dev/hpt27xx/osm_bsd.c optional hpt27xx \ - compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}" +dev/hpt27xx/osm_bsd.c optional hpt27xx dev/hpt27xx/hpt27xx_config.c optional hpt27xx dev/hptmv/entry.c optional hptmv dev/hptmv/mv.c optional hptmv Modified: stable/9/sys/conf/files.i386 ============================================================================== --- stable/9/sys/conf/files.i386 Sat Jan 26 03:23:28 2013 (r245937) +++ stable/9/sys/conf/files.i386 Sat Jan 26 05:20:09 2013 (r245938) @@ -180,8 +180,7 @@ dev/glxiic/glxiic.c optional glxiic dev/glxsb/glxsb.c optional glxsb dev/glxsb/glxsb_hash.c optional glxsb dev/hpt27xx/os_bsd.c optional hpt27xx -dev/hpt27xx/osm_bsd.c optional hpt27xx \ - compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}" +dev/hpt27xx/osm_bsd.c optional hpt27xx dev/hpt27xx/hpt27xx_config.c optional hpt27xx dev/hptmv/entry.c optional hptmv dev/hptmv/mv.c optional hptmv Modified: stable/9/sys/dev/hpt27xx/hpt27xx_config.c ============================================================================== --- stable/9/sys/dev/hpt27xx/hpt27xx_config.c Sat Jan 26 03:23:28 2013 (r245937) +++ stable/9/sys/dev/hpt27xx/hpt27xx_config.c Sat Jan 26 05:20:09 2013 (r245938) @@ -58,9 +58,9 @@ int init_config(void) return 0; } -char driver_name[] = "hpt27xx"; -char driver_name_long[] = "RocketRAID 27xx controller driver"; -char driver_ver[] = "v1.0 (" __DATE__ " " __TIME__ ")"; +const char driver_name[] = "hpt27xx"; +const char driver_name_long[] = "RocketRAID 27xx controller driver"; +const char driver_ver[] = "v1.0"; int osm_max_targets = 0xff; Modified: stable/9/sys/dev/hpt27xx/os_bsd.h ============================================================================== --- stable/9/sys/dev/hpt27xx/os_bsd.h Sat Jan 26 03:23:28 2013 (r245937) +++ stable/9/sys/dev/hpt27xx/os_bsd.h Sat Jan 26 05:20:09 2013 (r245938) @@ -135,9 +135,9 @@ INQUIRYDATA, *PINQUIRYDATA; #include /* driver parameters */ -extern char driver_name[]; -extern char driver_name_long[]; -extern char driver_ver[]; +extern const char driver_name[]; +extern const char driver_name_long[]; +extern const char driver_ver[]; extern int osm_max_targets; /* Modified: stable/9/sys/dev/hpt27xx/osm_bsd.c ============================================================================== --- stable/9/sys/dev/hpt27xx/osm_bsd.c Sat Jan 26 03:23:28 2013 (r245937) +++ stable/9/sys/dev/hpt27xx/osm_bsd.c Sat Jan 26 05:20:09 2013 (r245938) @@ -167,7 +167,8 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ HPT_ASSERT((f->size & (f->alignment-1))==0); - for (order=0, size=PAGE_SIZE; sizesize; order++, size<<=1) ; + for (order=0, size=PAGE_SIZE; sizesize; order++, size<<=1) + ; KdPrint(("%s: %d*%d=%d bytes, order %d", f->tag, f->count, f->size, f->count*f->size, order)); @@ -1036,6 +1037,7 @@ static void hpt_final_init(void *dummy) } if (!i) { + if (bootverbose) os_printk("no controller detected."); return; } @@ -1177,7 +1179,7 @@ static void hpt_final_init(void *dummy) } make_dev(&hpt_cdevsw, DRIVER_MINOR, UID_ROOT, GID_OPERATOR, - S_IRUSR | S_IWUSR, driver_name); + S_IRUSR | S_IWUSR, "%s", driver_name); } #if defined(KLD_MODULE) && (__FreeBSD_version >= 503000) @@ -1224,6 +1226,7 @@ static void override_kernel_driver(void) static void hpt_init(void *dummy) { + if (bootverbose) os_printk("%s %s", driver_name_long, driver_ver); override_kernel_driver(); Modified: stable/9/sys/modules/hpt27xx/Makefile ============================================================================== --- stable/9/sys/modules/hpt27xx/Makefile Sat Jan 26 03:23:28 2013 (r245937) +++ stable/9/sys/modules/hpt27xx/Makefile Sat Jan 26 05:20:09 2013 (r245938) @@ -12,6 +12,3 @@ hpt27xx_lib.o: uudecode -p < ${HPT27XX}/$(MACHINE_ARCH)-elf.hpt27xx_lib.o.uu > ${.TARGET} .include - -CWARNFLAGS.osm_bsd.c= ${NO_WFORMAT_SECURITY} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 26 05:23:18 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 169845E7; Sat, 26 Jan 2013 05:23:18 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 07CF6F88; Sat, 26 Jan 2013 05:23:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0Q5NH4n069435; Sat, 26 Jan 2013 05:23:17 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0Q5NH1n069431; Sat, 26 Jan 2013 05:23:17 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201301260523.r0Q5NH1n069431@svn.freebsd.org> From: Xin LI Date: Sat, 26 Jan 2013 05:23:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245939 - in stable/9/sys: amd64/conf i386/conf X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2013 05:23:18 -0000 Author: delphij Date: Sat Jan 26 05:23:17 2013 New Revision: 245939 URL: http://svnweb.freebsd.org/changeset/base/245939 Log: MFC r240104: Add hpt27xx to GENERIC kernel for amd64 and i386 systems. Modified: stable/9/sys/amd64/conf/GENERIC stable/9/sys/i386/conf/GENERIC Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Sat Jan 26 05:20:09 2013 (r245938) +++ stable/9/sys/amd64/conf/GENERIC Sat Jan 26 05:23:17 2013 (r245939) @@ -132,6 +132,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx +device hpt27xx # Highpoint RocketRAID 27xx device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID Modified: stable/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Sat Jan 26 05:20:09 2013 (r245938) +++ stable/9/sys/i386/conf/GENERIC Sat Jan 26 05:23:17 2013 (r245939) @@ -138,6 +138,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx +device hpt27xx # Highpoint RocketRAID 27xx device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID From owner-svn-src-stable-9@FreeBSD.ORG Sat Jan 26 09:55:52 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DAFC2517; Sat, 26 Jan 2013 09:55:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C21C784A; Sat, 26 Jan 2013 09:55:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0Q9tqMq049019; Sat, 26 Jan 2013 09:55:52 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0Q9tp8u049018; Sat, 26 Jan 2013 09:55:51 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201301260955.r0Q9tp8u049018@svn.freebsd.org> From: Andriy Gapon Date: Sat, 26 Jan 2013 09:55:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245943 - stable/9/sys/boot/sparc64/loader X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2013 09:55:52 -0000 Author: avg Date: Sat Jan 26 09:55:51 2013 New Revision: 245943 URL: http://svnweb.freebsd.org/changeset/base/245943 Log: MFC r245697: zfs/sparc64 boot: fix booting after r242230 Modified: stable/9/sys/boot/sparc64/loader/main.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/boot/ (props changed) Modified: stable/9/sys/boot/sparc64/loader/main.c ============================================================================== --- stable/9/sys/boot/sparc64/loader/main.c Sat Jan 26 08:55:04 2013 (r245942) +++ stable/9/sys/boot/sparc64/loader/main.c Sat Jan 26 09:55:51 2013 (r245943) @@ -142,6 +142,10 @@ static vm_offset_t heapva; static char bootpath[64]; static phandle_t root; +#ifdef LOADER_ZFS_SUPPORT +static struct zfs_devdesc zfs_currdev; +#endif + /* * Machine dependent structures that the machine independent * loader part uses. @@ -732,7 +736,6 @@ static void sparc64_zfs_probe(void) { struct vtoc8 vtoc; - struct zfs_devdesc zfs_currdev; char alias[64], devname[sizeof(alias) + sizeof(":x") - 1]; char type[sizeof("device_type")]; char *bdev, *dev, *odev; @@ -805,9 +808,6 @@ sparc64_zfs_probe(void) zfs_currdev.root_guid = 0; zfs_currdev.d_dev = &zfs_dev; zfs_currdev.d_type = zfs_currdev.d_dev->dv_type; - (void)strncpy(bootpath, zfs_fmtdev(&zfs_currdev), - sizeof(bootpath) - 1); - bootpath[sizeof(bootpath) - 1] = '\0'; } } #endif /* LOADER_ZFS_SUPPORT */ @@ -878,10 +878,14 @@ main(int (*openfirm)(void *)) if ((*dp)->dv_init != 0) (*dp)->dv_init(); - /* - * Now that sparc64_zfs_probe() might have altered bootpath, - * export it. - */ +#ifdef LOADER_ZFS_SUPPORT + if (zfs_currdev.pool_guid != 0) { + (void)strncpy(bootpath, zfs_fmtdev(&zfs_currdev), + sizeof(bootpath) - 1); + bootpath[sizeof(bootpath) - 1] = '\0'; + } +#endif + env_setenv("currdev", EV_VOLATILE, bootpath, ofw_setcurrdev, env_nounset); env_setenv("loaddev", EV_VOLATILE, bootpath,