summaryrefslogtreecommitdiffstats
path: root/sys/vm
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2010-05-13 09:26:31 +0000
committerkib <kib@FreeBSD.org>2010-05-13 09:26:31 +0000
commitbf4665f521f033bf4c1d38df9590bdd244eb2fb3 (patch)
treee7d8bfc945a62fc2f7e0c98de859cca4cbb6fd75 /sys/vm
parent5fe3ed2b2fb8b3e34762e72a41f084b38aa15edd (diff)
downloadFreeBSD-src-bf4665f521f033bf4c1d38df9590bdd244eb2fb3.zip
FreeBSD-src-bf4665f521f033bf4c1d38df9590bdd244eb2fb3.tar.gz
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.
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/swap_pager.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 229dac8..1725df7 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -374,6 +374,14 @@ static void swp_pager_meta_free(vm_object_t, vm_pindex_t, daddr_t);
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_t *m, int count, int reqpage)
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);
/*
OpenPOWER on IntegriCloud