From owner-svn-src-user@freebsd.org Mon Feb 19 21:58:13 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D911F02195 for ; Mon, 19 Feb 2018 21:58:13 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 23A7E6DA5E; Mon, 19 Feb 2018 21:58:13 +0000 (UTC) (envelope-from jeff@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A087203C4; Mon, 19 Feb 2018 21:58:13 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1JLwCSu067007; Mon, 19 Feb 2018 21:58:12 GMT (envelope-from jeff@FreeBSD.org) Received: (from jeff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JLwCgc067006; Mon, 19 Feb 2018 21:58:12 GMT (envelope-from jeff@FreeBSD.org) Message-Id: <201802192158.w1JLwCgc067006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jeff set sender to jeff@FreeBSD.org using -f From: Jeff Roberson Date: Mon, 19 Feb 2018 21:58:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r329604 - user/jeff/numa/sys/vm X-SVN-Group: user X-SVN-Commit-Author: jeff X-SVN-Commit-Paths: user/jeff/numa/sys/vm X-SVN-Commit-Revision: 329604 X-SVN-Commit-Repository: base 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.25 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: Mon, 19 Feb 2018 21:58:13 -0000 Author: jeff Date: Mon Feb 19 21:58:12 2018 New Revision: 329604 URL: https://svnweb.freebsd.org/changeset/base/329604 Log: Use vm_page_held() instead of a direct check for hold count. Fix and simply the count in vm_pageout_free_pages(). Modified: user/jeff/numa/sys/vm/vm_pageout.c Modified: user/jeff/numa/sys/vm/vm_pageout.c ============================================================================== --- user/jeff/numa/sys/vm/vm_pageout.c Mon Feb 19 19:55:29 2018 (r329603) +++ user/jeff/numa/sys/vm/vm_pageout.c Mon Feb 19 21:58:12 2018 (r329604) @@ -1139,7 +1139,7 @@ vm_pageout_free_pages(struct pgo_pglist *pglist, vm_ob int pcount, count; pcount = MAX(object->iosize / PAGE_SIZE, 1); - count = 0; + count = 1; if (pcount == 1 || vm_object_reserv(object)) { vm_page_free(m); vm_page_unlock(m); @@ -1156,8 +1156,7 @@ vm_pageout_free_pages(struct pgo_pglist *pglist, vm_ob mtx = vm_page_lockptr(m); if (p == m) p = vm_page_next(m); - if (vm_pageout_pglist_append(pglist, m)) - count++; + vm_pageout_pglist_append(pglist, m); /* Iterate through the block range and free compatible pages. */ for (m = p; m != NULL && m->pindex < start + pcount; m = p) { p = TAILQ_NEXT(m, listq); @@ -1166,7 +1165,7 @@ vm_pageout_free_pages(struct pgo_pglist *pglist, vm_ob mtx = vm_page_lockptr(m); mtx_lock(mtx); } - if (m->hold_count || vm_page_busied(m) || + if (vm_page_held(m) || vm_page_busied(m) || m->queue != PQ_INACTIVE) continue; if (m->valid == 0)