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

Revert r368523 which fixed contig allocs waiting forever.

Browse Source 
This needs to account for empty NUMA domains or domains which do not
satisfy the requested range.

Discussed with:	markj
This commit is contained in:
Bryan Drewery 2020-12-15 19:38:16 +00:00
parent cb4ff25c8a
commit 5fee468e83
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=368673
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/vm/vm_kern.c
View File

@ -264,15 +264,9 @@ kmem_alloc_attr_domainset(struct domainset *ds, vm_size_t size, int flags,
{
struct vm_domainset_iter di;
vm_offset_t addr;
int domain, iflags;
int domain;
/*
* 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);
vm_domainset_iter_policy_init(&di, ds, &domain, &flags);
do {
addr = kmem_alloc_attr_domain(domain, size, flags, low, high,
memattr);
@ -352,15 +346,9 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_size_t size, int flags,
{
struct vm_domainset_iter di;
vm_offset_t addr;
int domain, iflags;
int domain;
/*
* 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);
vm_domainset_iter_policy_init(&di, ds, &domain, &flags);
do {
addr = kmem_alloc_contig_domain(domain, size, flags, low, high,
alignment, boundary, memattr);