From owner-svn-src-all@FreeBSD.ORG Thu May 13 09:26:31 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D334F106566B; Thu, 13 May 2010 09:26:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C1D488FC0C; Thu, 13 May 2010 09:26:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4D9QVVq087487; Thu, 13 May 2010 09:26:31 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4D9QVIi087486; Thu, 13 May 2010 09:26:31 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201005130926.o4D9QVIi087486@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 13 May 2010 09:26:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208025 - stable/8/sys/vm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2010 09:26:31 -0000 Author: kib Date: Thu May 13 09:26:31 2010 New Revision: 208025 URL: http://svn.freebsd.org/changeset/base/208025 Log: MFC r207364: In swap pager, do not free the non-requested pages from the run if they are wired. Kstack pages are wired, this change prepares swap pager for handling of long runs of kstack pages. Modified: stable/8/sys/vm/swap_pager.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/vm/swap_pager.c ============================================================================== --- stable/8/sys/vm/swap_pager.c Thu May 13 03:56:57 2010 (r208024) +++ stable/8/sys/vm/swap_pager.c Thu May 13 09:26:31 2010 (r208025) @@ -374,6 +374,14 @@ static void swp_pager_meta_free(vm_objec static void swp_pager_meta_free_all(vm_object_t); static daddr_t swp_pager_meta_ctl(vm_object_t, vm_pindex_t, int); +static void +swp_pager_free_nrpage(vm_page_t m) +{ + + if (m->wire_count == 0) + vm_page_free(m); +} + /* * SWP_SIZECHECK() - update swap_pager_full indication * @@ -1128,9 +1136,9 @@ swap_pager_getpages(vm_object_t object, vm_page_lock_queues(); for (k = 0; k < i; ++k) - vm_page_free(m[k]); + swp_pager_free_nrpage(m[k]); for (k = j; k < count; ++k) - vm_page_free(m[k]); + swp_pager_free_nrpage(m[k]); vm_page_unlock_queues(); } @@ -1529,7 +1537,7 @@ swp_pager_async_iodone(struct buf *bp) */ m->valid = 0; if (i != bp->b_pager.pg_reqpage) - vm_page_free(m); + swp_pager_free_nrpage(m); else vm_page_flash(m); /*