From owner-svn-src-user@freebsd.org Thu Feb 8 03:12:26 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 B3ECDEF3921 for ; Thu, 8 Feb 2018 03:12:26 +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 671526F249; Thu, 8 Feb 2018 03:12:26 +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 62153104E0; Thu, 8 Feb 2018 03:12:26 +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 w183CQWD011993; Thu, 8 Feb 2018 03:12:26 GMT (envelope-from jeff@FreeBSD.org) Received: (from jeff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w183CQ8n011992; Thu, 8 Feb 2018 03:12:26 GMT (envelope-from jeff@FreeBSD.org) Message-Id: <201802080312.w183CQ8n011992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jeff set sender to jeff@FreeBSD.org using -f From: Jeff Roberson Date: Thu, 8 Feb 2018 03:12:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r329012 - 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: 329012 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: Thu, 08 Feb 2018 03:12:26 -0000 Author: jeff Date: Thu Feb 8 03:12:25 2018 New Revision: 329012 URL: https://svnweb.freebsd.org/changeset/base/329012 Log: Don't attempt to batch frees for reservation holding objects at all. Don't hold the object lock while doing frees for other objects. 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 Thu Feb 8 02:50:47 2018 (r329011) +++ user/jeff/numa/sys/vm/vm_pageout.c Thu Feb 8 03:12:25 2018 (r329012) @@ -1138,11 +1138,9 @@ vm_pageout_free_pages(struct pgo_pglist *pglist, vm_ob pcount = MAX(object->iosize / PAGE_SIZE, 1); count = 0; - if (pcount == 1) { - if (vm_pageout_pglist_append(pglist, m)) - count = 1; + if (pcount == 1 || vm_object_reserv(object)) { + vm_page_free(m); vm_page_unlock(m); - vm_pageout_pglist_flush(pglist, vm_object_reserv(object)); VM_OBJECT_WUNLOCK(object); goto out; } @@ -1189,8 +1187,8 @@ free_page: count++; } mtx_unlock(mtx); - vm_pageout_pglist_flush(pglist, vm_object_reserv(object)); VM_OBJECT_WUNLOCK(object); + vm_pageout_pglist_flush(pglist, false); out: VM_CNT_ADD(v_dfree, count);