From owner-svn-src-user@freebsd.org Tue Aug 2 02:29:50 2016 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 2140FBAB38B for ; Tue, 2 Aug 2016 02:29:50 +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 CC4691B7C; Tue, 2 Aug 2016 02:29:49 +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 u722TnN1008258; Tue, 2 Aug 2016 02:29:49 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u722Tnas008257; Tue, 2 Aug 2016 02:29:49 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201608020229.u722Tnas008257@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 2 Aug 2016 02:29:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r303653 - 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.22 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: Tue, 02 Aug 2016 02:29:50 -0000 Author: markj Date: Tue Aug 2 02:29:48 2016 New Revision: 303653 URL: https://svnweb.freebsd.org/changeset/base/303653 Log: Add a parameter to vm_pageout_launder() to indicate shortfall. Otherwise vm_pageout_launder() is repeating a computation of its caller. Suggested 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 Tue Aug 2 00:15:08 2016 (r303652) +++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c Tue Aug 2 02:29:48 2016 (r303653) @@ -249,7 +249,8 @@ SYSCTL_INT(_vm, OID_AUTO, max_wired, CTLFLAG_RW, &vm_page_max_wired, 0, "System-wide limit to wired page count"); static boolean_t vm_pageout_fallback_object_lock(vm_page_t, vm_page_t *); -static int vm_pageout_launder(struct vm_domain *vmd, int launder); +static int vm_pageout_launder(struct vm_domain *vmd, int launder, + bool shortfall); static void vm_pageout_laundry_worker(void *arg); #if !defined(NO_SWAPPING) static void vm_pageout_map_deactivate_pages(vm_map_t, long); @@ -892,14 +893,14 @@ unlock_mp: * Returns the number of pages successfully laundered. */ static int -vm_pageout_launder(struct vm_domain *vmd, int launder) +vm_pageout_launder(struct vm_domain *vmd, int launder, bool shortfall) { vm_page_t m, next; struct vm_pagequeue *pq; vm_object_t object; int act_delta, error, maxscan, numpagedout, starting_target; int vnodes_skipped; - boolean_t pageout_ok, queue_locked, shortfall; + boolean_t pageout_ok, queue_locked; starting_target = launder; vnodes_skipped = 0; @@ -916,7 +917,6 @@ vm_pageout_launder(struct vm_domain *vmd */ pq = &vmd->vmd_pagequeues[PQ_LAUNDRY]; maxscan = pq->pq_cnt; - shortfall = vm_laundry_target() > 0; vm_pagequeue_lock(pq); queue_locked = TRUE; @@ -1191,8 +1191,8 @@ vm_pageout_laundry_worker(void *arg) dolaundry: if (launder > 0) - target -= min(vm_pageout_launder(domain, launder), - target); + target -= min(vm_pageout_launder(domain, launder, + shortfall > 0), target); tsleep(&vm_cnt.v_laundry_count, PVM, "laundr", hz / VM_LAUNDER_INTERVAL);