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

Revert r289302, invalid pages can be queued, e.g. by vfs_vmio_unwire().

Browse Source 
Found by:	alc
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2015-10-15 19:07:38 +00:00
parent 041b03daab
commit 8748f58cde
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=289377
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/vm/vm_pageout.c
View File

@ -1174,12 +1174,11 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
queues_locked = FALSE;
/*
* 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.
* Invalid pages can be easily freed. They cannot be
* mapped, vm_page_free() asserts this.
*/
KASSERT(m->valid != 0, ("Invalid page %p on inact queue", m));
if (m->valid == 0)
goto free_page;
/*
* If the page has been referenced and the object is not dead,
@ -1232,6 +1231,7 @@ 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;