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

contig allocs: Don't retry forever on M_WAITOK.

Browse Source 
This restores behavior from before domain iterators were added in
r327895 and r327896.

The vm_domainset_iter_policy() will do a vm_wait_doms() and then
restart its iterator when M_WAITOK is set.  It will also force
the containing loop to have M_NOWAIT.  So we get an unbounded
retry loop rather than the intended bounded retries that
kmem_alloc_contig_pages() already handles.

This also restores M_WAITOK to the vmem_alloc() call in
kmem_alloc_attr_domain() and kmem_alloc_contig_domain().

Reviewed by:	markj, kib
MFC after:	2 weeks
Sponsored by:	Dell EMC
Differential Revision:	https://reviews.freebsd.org/D27507
This commit is contained in:
Bryan Drewery 2020-12-10 20:44:29 +00:00
parent 1f67c37c1f
commit bbfec1633b
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/vm/vm_kern.c
View File

@ -264,9 +264,15 @@ kmem_alloc_attr_domainset(struct domainset *ds, vm_size_t size, int flags,
{
struct vm_domainset_iter di;
vm_offset_t addr;
int domain;
int domain, iflags;
vm_domainset_iter_policy_init(&di, ds, &domain, &flags);
/*
* Do not allow the domainset iterator to override wait flags. The
* contiguous memory allocator defines special semantics for M_WAITOK
* that do not match the iterator's implementation.
*/
iflags = (flags & ~M_WAITOK) | M_NOWAIT;
vm_domainset_iter_policy_init(&di, ds, &domain, &iflags);
do {
addr = kmem_alloc_attr_domain(domain, size, flags, low, high,
memattr);
@ -346,9 +352,15 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_size_t size, int flags,
{
struct vm_domainset_iter di;
vm_offset_t addr;
int domain;
int domain, iflags;
vm_domainset_iter_policy_init(&di, ds, &domain, &flags);
/*
* Do not allow the domainset iterator to override wait flags. The
* contiguous memory allocator defines special semantics for M_WAITOK
* that do not match the iterator's implementation.
*/
iflags = (flags & ~M_WAITOK) | M_NOWAIT;
vm_domainset_iter_policy_init(&di, ds, &domain, &iflags);
do {
addr = kmem_alloc_contig_domain(domain, size, flags, low, high,
alignment, boundary, memattr);