From owner-p4-projects@FreeBSD.ORG Thu Oct 13 14:34:57 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E1CE1065675; Thu, 13 Oct 2011 14:34:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6104F106564A for ; Thu, 13 Oct 2011 14:34:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 35AA38FC14 for ; Thu, 13 Oct 2011 14:34:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9DEYvf3078190 for ; Thu, 13 Oct 2011 14:34:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9DEYvop078187 for perforce@freebsd.org; Thu, 13 Oct 2011 14:34:57 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Oct 2011 14:34:57 GMT Message-Id: <201110131434.p9DEYvop078187@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 14:34:57 -0000 http://p4web.freebsd.org/@@200151?ac=10 Change 200151 by jhb@jhb_jhbbsd on 2011/10/13 14:34:24 First cut at implement fadvise() for read. This works by adjusting the behavior in IO flag. I should do at least some of this in the write case as well. Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_vnops.c#2 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_vnops.c#2 (text+ko) ==== @@ -518,7 +518,7 @@ struct vnode *vp; int error, ioflag; struct mtx *mtxp; - int vfslocked; + int advice, vfslocked; KASSERT(uio->uio_td == td, ("uio_td %p is not td %p", uio->uio_td, td)); @@ -529,27 +529,48 @@ ioflag |= IO_NDELAY; if (fp->f_flag & O_DIRECT) ioflag |= IO_DIRECT; + advice = FADV_NORMAL; vfslocked = VFS_LOCK_GIANT(vp->v_mount); /* * According to McKusick the vn lock was protecting f_offset here. * It is now protected by the FOFFSET_LOCKED flag. */ - if ((flags & FOF_OFFSET) == 0) { + if ((flags & FOF_OFFSET) == 0 || fp->f_advice != FADV_NORMAL) { mtxp = mtx_pool_find(mtxpool_sleep, fp); mtx_lock(mtxp); - while(fp->f_vnread_flags & FOFFSET_LOCKED) { - fp->f_vnread_flags |= FOFFSET_LOCK_WAITING; - msleep(&fp->f_vnread_flags, mtxp, PUSER -1, - "vnread offlock", 0); + if ((flags & FOF_OFFSET) == 0) { + while (fp->f_vnread_flags & FOFFSET_LOCKED) { + fp->f_vnread_flags |= FOFFSET_LOCK_WAITING; + msleep(&fp->f_vnread_flags, mtxp, PUSER -1, + "vnread offlock", 0); + } + fp->f_vnread_flags |= FOFFSET_LOCKED; + uio->uio_offset = fp->f_offset; } - fp->f_vnread_flags |= FOFFSET_LOCKED; + if (fp->f_advice != FADV_NORMAL && + uio->uio_offset >= fp->f_advstart && + uio->uio_offset + uio->uio_resid <= fp->f_advend) + advice = fp->f_advice; mtx_unlock(mtxp); - vn_lock(vp, LK_SHARED | LK_RETRY); - uio->uio_offset = fp->f_offset; - } else - vn_lock(vp, LK_SHARED | LK_RETRY); + } + vn_lock(vp, LK_SHARED | LK_RETRY); - ioflag |= sequential_heuristic(uio, fp); + switch (advice) { + case FADV_NORMAL: + case FADV_SEQUENTIAL: + ioflag |= sequential_heuristic(uio, fp); + break; + case FADV_RANDOM: + /* Do no read-ahead for random I/O. */ + break; + case FADV_NOREUSE: + /* + * Request the underlying FS to discard the pages + * after the I/O is complete. + */ + ioflag |= IO_DIRECT; + break; + } #ifdef MAC error = mac_vnode_check_read(active_cred, fp->f_cred, vp);