From owner-svn-src-user@FreeBSD.ORG  Sat Jan  9 23:50:47 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 77E97106566C;
	Sat,  9 Jan 2010 23:50:47 +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 66F558FC19;
	Sat,  9 Jan 2010 23:50:47 +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 o09Nolr3053101;
	Sat, 9 Jan 2010 23:50:47 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o09NolPd053099;
	Sat, 9 Jan 2010 23:50:47 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201001092350.o09NolPd053099@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 9 Jan 2010 23:50:47 +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: r201964 - user/kmacy/releng_8_fcs_buf_xen/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jan 2010 23:50:47 -0000

Author: kmacy
Date: Sat Jan  9 23:50:47 2010
New Revision: 201964
URL: http://svn.freebsd.org/changeset/base/201964

Log:
  repeatedly invoke lowmem handler if buffer request can't be satisfied

Modified:
  user/kmacy/releng_8_fcs_buf_xen/sys/kern/vfs_bio.c

Modified: user/kmacy/releng_8_fcs_buf_xen/sys/kern/vfs_bio.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf_xen/sys/kern/vfs_bio.c	Sat Jan  9 23:43:22 2010	(r201963)
+++ user/kmacy/releng_8_fcs_buf_xen/sys/kern/vfs_bio.c	Sat Jan  9 23:50:47 2010	(r201964)
@@ -1268,6 +1268,7 @@ brelse(struct buf *bp)
 	 * background write.
 	 */
 	if ((bp->b_flags & B_VMIO)
+	    && (bp->b_vp != NULL)
 	    && !(bp->b_vp->v_mount != NULL &&
 		 (bp->b_vp->v_mount->mnt_vfc->vfc_flags & VFCF_NETWORK) != 0 &&
 		 !vn_isdisk(bp->b_vp, NULL) &&
@@ -1730,7 +1731,7 @@ getnewbuf(struct vnode *vp, int slpflag,
 	struct thread *td;
 	struct buf *bp;
 	struct buf *nbp;
-	int defrag = 0;
+	int defrag = 0, retrying = 0;
 	int nqindex;
 	static int flushingbufs;
 
@@ -1995,10 +1996,16 @@ restart:
 		if (gbflags & GB_NOWAIT_BD)
 			return (NULL);
 
+		EVENTHANDLER_INVOKE(vm_lowmem, 0);
+		if (!retrying) {
+			retrying = 1;
+			goto restart;
+		}
 		mtx_lock(&nblock);
 		while (needsbuffer & flags) {
 			if (vp != NULL && (td->td_pflags & TDP_BUFNEED) == 0) {
 				mtx_unlock(&nblock);
+				EVENTHANDLER_INVOKE(vm_lowmem, 0);
 				/*
 				 * getblk() is called with a vnode
 				 * locked, and some majority of the