d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove vm_page_remque().

Browse Source 
Testing m->queue != PQ_NONE is not sufficient; see the commit log
message for r338276.  As of r332974 vm_page_dequeue() handles
already-dequeued pages, so just replace vm_page_remque() calls with
vm_page_dequeue() calls.

Reviewed by:	kib
Tested by:	pho
Approved by:	re (marius)
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D17025
This commit is contained in:
markj 2018-09-06 16:17:45 +00:00
parent d24fb55973
commit e2dd7215d6
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/vm/vm_fault.c
View File

@ -1124,7 +1124,7 @@ readrest:
*/
fs.object == fs.first_object->backing_object) {
vm_page_lock(fs.m);
vm_page_remque(fs.m);
vm_page_dequeue(fs.m);
vm_page_remove(fs.m);
vm_page_unlock(fs.m);
vm_page_lock(fs.first_m);

19
sys/vm/vm_page.c
View File

@ -2627,7 +2627,7 @@ retry:
m_new->dirty = m->dirty;
m->flags &= ~PG_ZERO;
vm_page_xbusy(m);
vm_page_remque(m);
vm_page_dequeue(m);
vm_page_replace_checked(m_new, object,
m->pindex, m);
if (vm_page_free_prep(m))
@ -2642,7 +2642,7 @@ retry:
vm_page_deactivate(m_new);
} else {
m->flags &= ~PG_ZERO;
vm_page_remque(m);
vm_page_dequeue(m);
vm_page_remove(m);
if (vm_page_free_prep(m))
SLIST_INSERT_HEAD(&free, m,
@ -3404,7 +3404,7 @@ vm_page_activate(vm_page_t m)
return;
}
vm_page_remque(m);
vm_page_dequeue(m);
if (m->act_count < ACT_INIT)
m->act_count = ACT_INIT;
vm_page_enqueue(m, PQ_ACTIVE);
@ -3676,7 +3676,7 @@ vm_page_deactivate(vm_page_t m)
return;
if (!vm_page_inactive(m)) {
vm_page_remque(m);
vm_page_dequeue(m);
vm_page_enqueue(m, PQ_INACTIVE);
} else
vm_page_requeue(m);
@ -3699,9 +3699,10 @@ vm_page_deactivate_noreuse(vm_page_t m)
if (m->wire_count > 0 || (m->oflags & VPO_UNMANAGED) != 0)
return;
if (!vm_page_inactive(m))
vm_page_remque(m);
m->queue = PQ_INACTIVE;
if (!vm_page_inactive(m)) {
vm_page_dequeue(m);
m->queue = PQ_INACTIVE;
}
if ((m->aflags & PGA_REQUEUE_HEAD) == 0)
vm_page_aflag_set(m, PGA_REQUEUE_HEAD);
vm_pqbatch_submit_page(m, PQ_INACTIVE);
@ -3723,7 +3724,7 @@ vm_page_launder(vm_page_t m)
if (vm_page_in_laundry(m))
vm_page_requeue(m);
else {
vm_page_remque(m);
vm_page_dequeue(m);
vm_page_enqueue(m, PQ_LAUNDRY);
}
}
@ -3741,7 +3742,7 @@ vm_page_unswappable(vm_page_t m)
KASSERT(m->wire_count == 0 && (m->oflags & VPO_UNMANAGED) == 0,
("page %p already unswappable", m));
vm_page_remque(m);
vm_page_dequeue(m);
vm_page_enqueue(m, PQ_UNSWAPPABLE);
}

16
sys/vm/vm_page.h
View File

@ -739,22 +739,6 @@ vm_page_dirty(vm_page_t m)
#endif
}
/*
* vm_page_remque:
*
* If the given page is in a page queue, then remove it from that page
* queue.
*
* The page must be locked.
*/
static inline void
vm_page_remque(vm_page_t m)
{
if (m->queue != PQ_NONE)
vm_page_dequeue(m);
}
/*
* vm_page_undirty:
*