From owner-svn-src-user@freebsd.org Thu Dec 17 01:16:34 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 C46B7A4996B for ; Thu, 17 Dec 2015 01:16:34 +0000 (UTC) (envelope-from markj@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 7A9CE12A5; Thu, 17 Dec 2015 01:16:34 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBH1GXuJ049752; Thu, 17 Dec 2015 01:16:33 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBH1GXgn049751; Thu, 17 Dec 2015 01:16:33 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512170116.tBH1GXgn049751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 17 Dec 2015 01:16:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292391 - 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: Thu, 17 Dec 2015 01:16:34 -0000 Author: markj Date: Thu Dec 17 01:16:33 2015 New Revision: 292391 URL: https://svnweb.freebsd.org/changeset/base/292391 Log: - Add some constants for the pagedaemon thread sleep intervals, and use them when computing the laundering target. - Add a comment explaining the laundry target computation. Reviewed by: alc 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 Thu Dec 17 01:13:06 2015 (r292390) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Thu Dec 17 01:16:33 2015 (r292391) @@ -155,6 +155,11 @@ static struct kproc_desc vm_kp = { SYSINIT(vmdaemon, SI_SUB_KTHREAD_VM, SI_ORDER_FIRST, kproc_start, &vm_kp); #endif +/* Sleep intervals for pagedaemon threads, in subdivisions of one second. */ +#define VM_LAUNDER_INTERVAL 10 +#define VM_INACT_SCAN_INTERVAL 2 + +#define VM_LAUNDER_RATE (VM_LAUNDER_INTERVAL / VM_INACT_SCAN_INTERVAL) int vm_pages_needed; /* Event on which pageout daemon sleeps */ int vm_pageout_deficit; /* Estimated number of pages deficit */ @@ -1042,13 +1047,19 @@ vm_pageout_launder1(struct vm_domain *vm boolean_t pageout_ok, queues_locked; /* - * XXX + * Compute the number of pages we want to move from the laundry queue to + * the inactive queue. If there is no shortage of clean, inactive + * pages, we allow laundering to proceed at a trickle to ensure that + * dirty pages will eventually be reused. Otherwise, the inactive queue + * target is scaled by the ratio of the sleep intervals of the laundry + * queue and inactive queue worker threads. */ launder = vm_cnt.v_inactive_target - vm_cnt.v_inactive_count + vm_paging_target() + vm_pageout_deficit; if (launder < 0) - launder = 5; - launder /= 5; + launder = 1; + else + launder /= VM_LAUNDER_RATE; vnodes_skipped = 0; @@ -1223,7 +1234,8 @@ vm_pageout_laundry_worker(void *arg) * The pageout laundry worker is never done, so loop forever. */ for (;;) { - tsleep(&vm_cnt.v_laundry_count, PVM, "laundr", hz / 10); + tsleep(&vm_cnt.v_laundry_count, PVM, "laundr", + hz / VM_LAUNDER_INTERVAL); vm_pageout_launder1(domain); } } @@ -1872,7 +1884,7 @@ vm_pageout_worker(void *arg) if (domain->vmd_pass > 0) msleep(&vm_pages_needed, &vm_page_queue_free_mtx, PVM, "psleep", - hz / 2); + hz / VM_INACT_SCAN_INTERVAL); } else { /* * Good enough, sleep until required to refresh