From owner-svn-src-user@freebsd.org  Fri Oct 16 08:22:23 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07C1AA16C79
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 16 Oct 2015 08:22:23 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C99C7889;
 Fri, 16 Oct 2015 08:22:22 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9G8ML1t042967;
 Fri, 16 Oct 2015 08:22:21 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9G8MLvd042966;
 Fri, 16 Oct 2015 08:22:21 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201510160822.t9G8MLvd042966@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org
 using -f
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 16 Oct 2015 08:22:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r289414 - user/alc/PQ_LAUNDRY/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Oct 2015 08:22:23 -0000

Author: alc
Date: Fri Oct 16 08:22:21 2015
New Revision: 289414
URL: https://svnweb.freebsd.org/changeset/base/289414

Log:
  Revert r289357.

Modified:
  user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c

Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Fri Oct 16 08:06:28 2015	(r289413)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Fri Oct 16 08:22:21 2015	(r289414)
@@ -1080,12 +1080,11 @@ vm_pageout_launder1(struct vm_domain *vm
 		queues_locked = FALSE;
 
 		/*
-		 * Invalid pages cannot appear on a queue.  If
-		 * vm_pageout_fallback_object_lock() allowed a window
-		 * where the page could be invalidated, it should
-		 * detect this.
+		 * Invalid pages can be easily freed.  They cannot be
+		 * mapped; vm_page_free() asserts this.
 		 */
-		KASSERT(m->valid != 0, ("invalid page %p in laundry queue", m));
+		if (m->valid == 0)
+			goto free_page;
 
 		/*
 		 * If the page has been referenced and the object is not dead,
@@ -1144,6 +1143,7 @@ vm_pageout_launder1(struct vm_domain *vm
 		 * destroyed the object.
 		 */
 		if (m->dirty == 0) {
+free_page:
 			vm_page_free(m);
 			PCPU_INC(cnt.v_dfree);
 		} else if ((object->flags & OBJ_DEAD) == 0) {