Invalid pages should not appear on the inactive queue. Change the

check into an assertion.

Reviewed by:	alc
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
kib 2015-10-14 09:03:32 +00:00
parent ef127649af
commit 176234430e

View File

@ -1174,11 +1174,12 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
queues_locked = FALSE;
/*
* Invalid pages can be easily freed. They cannot be
* mapped, vm_page_free() asserts this.
* Invalid pages cannot appear on a queue. If
* vm_pageout_fallback_object_lock() allowed a window
* where the page could be invalidated, it should
* detect this.
*/
if (m->valid == 0)
goto free_page;
KASSERT(m->valid != 0, ("Invalid page %p on inact queue", m));
/*
* If the page has been referenced and the object is not dead,
@ -1231,7 +1232,6 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
/*
* Clean pages can be freed.
*/
free_page:
vm_page_free(m);
PCPU_INC(cnt.v_dfree);
--page_shortage;