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

vm_page: Break reservations to handle noobj allocations

Browse Source 
vm_reserv_reclaim_*() will release pages to the default freepool, not
the direct freepool from which noobj allocations are drawn.  But if both
pools are empty, the noobj allocator variants must break reservations to
make progress.

Reported by:	cy
Reviewed by:	kib (previous version)
Fixes:	b498f71bc5 ("vm_page: Add a new page allocator interface for unnamed pages")
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D32592
This commit is contained in:
Mark Johnston 2021-10-21 11:46:25 -04:00
parent 4e4c84f8d1
commit d7acbe481d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/vm/vm_page.c
View File

@ -2409,8 +2409,14 @@ _vm_page_alloc_noobj_domain(int domain, const int freelist, int req)
m = vm_phys_alloc_freelist_pages(domain, freelist,
VM_FREEPOOL_DIRECT, 0);
vm_domain_free_unlock(vmd);
if (m == NULL)
if (m == NULL) {
vm_domain_freecnt_inc(vmd, 1);
#if VM_NRESERVLEVEL > 0
if (freelist == VM_NFREELIST &&
vm_reserv_reclaim_inactive(domain))
goto again;
#endif
}
}
if (m == NULL) {
if (vm_domain_alloc_fail(vmd, NULL, req))
@ -2540,6 +2546,11 @@ vm_page_alloc_noobj_contig_domain(int domain, int req, u_long npages,
vm_domain_free_unlock(vmd);
if (m_ret == NULL) {
vm_domain_freecnt_inc(vmd, npages);
#if VM_NRESERVLEVEL > 0
if (vm_reserv_reclaim_contig(domain, npages, low,
high, alignment, boundary))
goto again;
#endif
}
}
if (m_ret == NULL) {