From owner-svn-src-user@freebsd.org Sun Oct 18 09:02:19 2015 Return-Path: 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 34147A18994 for ; Sun, 18 Oct 2015 09:02:19 +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 010B5E7E; Sun, 18 Oct 2015 09:02:18 +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 t9I92Iqx095398; Sun, 18 Oct 2015 09:02:18 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I92INQ095397; Sun, 18 Oct 2015 09:02:18 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201510180902.t9I92INQ095397@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sun, 18 Oct 2015 09:02:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289495 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 09:02:19 -0000 Author: alc Date: Sun Oct 18 09:02:17 2015 New Revision: 289495 URL: https://svnweb.freebsd.org/changeset/base/289495 Log: Deal with an XXX comment: A dirty but weakly referenced page should remain in the laundry queue, not move to the inactive queue. Update a comment. 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 Sun Oct 18 08:13:51 2015 (r289494) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Sun Oct 18 09:02:17 2015 (r289495) @@ -1113,10 +1113,8 @@ vm_pageout_launder1(struct vm_domain *vm */ m->act_count += act_delta + ACT_ADVANCE; goto drop_page; - } else if ((object->flags & OBJ_DEAD) == 0) { - vm_page_deactivate(m); // XXX - goto drop_page; - } + } else if ((object->flags & OBJ_DEAD) == 0) + goto requeue_page; } /* @@ -1134,11 +1132,10 @@ vm_pageout_launder1(struct vm_domain *vm } /* - * Clean pages can be freed, but dirty pages must be sent back - * to the laundry, unless they belong to a dead object. - * Requeueing dirty pages from dead objects is pointless, as - * they are being paged out and freed by the thread that - * destroyed the object. + * Clean pages are freed, and dirty pages are paged out unless + * they belong to a dead object. Requeueing dirty pages from + * dead objects is pointless, as they are being paged out and + * freed by the thread that destroyed the object. */ if (m->dirty == 0) { free_page: @@ -1153,6 +1150,7 @@ free_page: else pageout_ok = TRUE; if (!pageout_ok) { +requeue_page: vm_pagequeue_lock(pq); queues_locked = TRUE; vm_page_requeue_locked(m);