From owner-svn-src-user@FreeBSD.ORG Tue Nov 3 03:20:13 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECAE8106566C; Tue, 3 Nov 2009 03:20:13 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C21E18FC0A; Tue, 3 Nov 2009 03:20:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA33KDaO078453; Tue, 3 Nov 2009 03:20:13 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA33KDRl078451; Tue, 3 Nov 2009 03:20:13 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911030320.nA33KDRl078451@svn.freebsd.org> From: Kip Macy Date: Tue, 3 Nov 2009 03:20:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198838 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2009 03:20:14 -0000 Author: kmacy Date: Tue Nov 3 03:20:13 2009 New Revision: 198838 URL: http://svn.freebsd.org/changeset/base/198838 Log: handle buf allocation in case where blkno is already cached for a previous birth transaction Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 3 01:49:06 2009 (r198837) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 3 03:20:13 2009 (r198838) @@ -1308,6 +1308,7 @@ arc_getblk(arc_buf_t *buf) struct buf *newbp, *bp; arc_buf_t *tbuf; struct vnode *vp; + struct bufobj *bo; int flags = 0; if (type == ARC_BUFC_METADATA) { @@ -1318,21 +1319,52 @@ arc_getblk(arc_buf_t *buf) atomic_add_64(&arc_size, size); } + vp = spa_get_vnode(spa); + bo = &vp->v_bufobj; if ((size < PAGE_SIZE) || (buf->b_hdr->b_flags & ARC_BUF_CLONING) || - BUF_EMPTY(buf->b_hdr)) + BUF_EMPTY(buf->b_hdr)) { + newbp = geteblk(size, flags); - else - newbp = getblk(spa_get_vnode(spa), blkno, - size, 0, 0, flags); + } else { + /* + * We need to be careful to handle the case where the buffer + * is already held in the ARC for a previous birth transaction + */ + BO_LOCK(bo); + bp = gbincore(bo, blkno); + if (bp != NULL) { + if (BUF_ISLOCKED(bp)) { + BO_UNLOCK(bo); + newbp = geteblk(size, flags); + arc_binval(buf, blkno, vp, size, newbp); + } else { + BUF_LOCK(bp, LK_EXCLUSIVE | LK_INTERLOCK, BO_MTX(bo)); + if (bp->b_flags & B_INVAL) + bp->b_flags &= ~B_CACHE; + else if ((bp->b_flags & (B_VMIO | B_INVAL)) == 0) + bp->b_flags |= B_CACHE; + bremfree(bp); + if (bp->b_bcount != size) { + bp->b_flags |= B_INVAL; + bp->b_flags &= ~B_CACHE; + brelse(bp); + newbp = getblk(vp, blkno, size, 0, 0, flags); + } else + newbp = bp; + } + + } + } - if (buf->b_hdr->b_flags & ARC_BUF_CLONING) { + if ((size >= PAGE_SIZE) && (buf->b_hdr->b_flags & ARC_BUF_CLONING)) { vp = spa_get_vnode(spa); bcopy(buf->b_next->b_data, newbp->b_data, size); arc_binval(buf, blkno, vp, size, newbp); buf->b_hdr->b_flags &= ~ARC_BUF_CLONING; } + #ifdef LOGALL /* * not useful for tracking down collisions @@ -1408,6 +1440,7 @@ arc_binval(arc_buf_t *buf, off_t blkno, BUF_LOCK(bp, LK_EXCLUSIVE | LK_INTERLOCK, BO_MTX(bo)); bp->b_flags |= B_INVAL; bp->b_flags &= ~B_CACHE; + bremfree(bp); brelse(bp); BO_LOCK(bo); }