jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 22:23:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

swap_pager: fix seek_data with invalid first page

Browse Source 
Correct swap_pager_seek_data so that, when the first lookup finds no
valid pages, second and subsequent lookups are attempted anyway.

This was broken by db08b0b04d.

Reported by:	marklmi@yahoo.com
Reviewed by:	kib
Tested by:	marklmi@yahoo.com
Fixes:	db08b0b04d tmpfs_vnops: move swap work to swap_pager
Differential Revision:	https://reviews.freebsd.org/D47767
This commit is contained in:
Doug Moore 2024-11-26 12:12:08 -06:00
parent f2233ac33a
commit 40c1672e88
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/vm/swap_pager.c
View File

@ -2503,26 +2503,23 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex)
VM_OBJECT_ASSERT_RLOCKED(object);
vm_page_iter_init(&pages, object);
m = vm_page_iter_lookup_ge(&pages, pindex);
if (m != NULL) {
if (!vm_page_any_valid(m))
m = NULL;
else if (pages.index == pindex)
return (pages.index);
}
if (m != NULL && pages.index == pindex && vm_page_any_valid(m))
return (pages.index);
swblk_iter_init_only(&blks, object);
swap_index = swap_pager_iter_find_least(&blks, pindex);
if (swap_index == pindex)
return (swap_index);
if (swap_index == OBJ_MAX_SIZE)
swap_index = object->size;
if (m == NULL)
return (swap_index);
while ((m = vm_radix_iter_step(&pages)) != NULL &&
pages.index < swap_index) {
/*
* Find the first resident page after m, before swap_index.
*/
while (m != NULL && pages.index < swap_index) {
if (vm_page_any_valid(m))
return (pages.index);
m = vm_radix_iter_step(&pages);
}
if (swap_index == OBJ_MAX_SIZE)
swap_index = object->size;
return (swap_index);
}