Page MenuHomeFreeBSD
Files F107161309

D22674.id65438.diff
No OneTemporary
Actions

D22674.id65438.diff
View Options

Index: sys/vm/vm_swapout.c
===================================================================
--- sys/vm/vm_swapout.c
+++ sys/vm/vm_swapout.c
@@ -173,51 +173,26 @@
static void
vm_swapout_object_deactivate_page(pmap_t pmap, vm_page_t m, bool unmap)
{
- int act_delta;
-
- if (vm_page_tryxbusy(m) == 0)
- return;
- VM_CNT_INC(v_pdpages);
/*
- * The page may acquire a wiring after this check.
- * The page daemon handles wired pages, so there is
- * no harm done if a wiring appears while we are
- * attempting to deactivate the page.
+ * Ignore unreclaimable wired pages. Repeat the check after busying
+ * since a busy holder may wire the page.
*/
+ if (vm_page_wired(m) || !vm_page_tryxbusy(m))
+ return;
+
if (vm_page_wired(m) || !pmap_page_exists_quick(pmap, m)) {
vm_page_xunbusy(m);
return;
}
- act_delta = pmap_ts_referenced(m);
- vm_page_lock(m);
- if ((m->a.flags & PGA_REFERENCED) != 0) {
- if (act_delta == 0)
- act_delta = 1;
- vm_page_aflag_clear(m, PGA_REFERENCED);
+ if (!pmap_is_referenced(m)) {
+ vm_page_lock(m);
+ if (!vm_page_active(m))
+ (void)vm_page_try_remove_all(m);
+ else if (unmap && vm_page_try_remove_all(m))
+ vm_page_deactivate(m);
+ vm_page_unlock(m);
}
- if (!vm_page_active(m) && act_delta != 0) {
- vm_page_activate(m);
- m->a.act_count += act_delta;
- } else if (vm_page_active(m)) {
- /*
- * The page daemon does not requeue pages
- * after modifying their activation count.
- */
- if (act_delta == 0) {
- m->a.act_count -= min(m->a.act_count, ACT_DECLINE);
- if (unmap && m->a.act_count == 0) {
- (void)vm_page_try_remove_all(m);
- vm_page_deactivate(m);
- }
- } else {
- vm_page_activate(m);
- if (m->a.act_count < ACT_MAX - ACT_ADVANCE)
- m->a.act_count += ACT_ADVANCE;
- }
- } else if (vm_page_inactive(m))
- (void)vm_page_try_remove_all(m);
- vm_page_unlock(m);
vm_page_xunbusy(m);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 12, 1:49 AM (11 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15759762
Default Alt Text
D22674.id65438.diff (1 KB)

Event Timeline