mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-19 10:53:58 +00:00
The new contigmalloc(9) has a bad degenerate case where there were
many regions checked again and again despite knowing the pages contained were not usable and only satisfied the alignment constraints This case was compounded, especially for large allocations, by the practice of looping from the top of memory so as to keep out of the important low-memory regions. While the old contigmalloc(9) has the same problem, it is not as noticeable due to looping from the low memory to high. This degenerate case is fixed, as well as reversing the sense of the rest of the loops within it, to provide a tremendous speed increase. This makes the best case O(n * VM overhead) much more likely than the worst case O(4 * VM overhead). For comparison, the worst case for old contigmalloc would be O(5 * VM overhead) in addition to its strategy of turning used memory into free being highly pessimal. Also, fix a bug that in practice most likely couldn't have been triggered, int the new contigmalloc(9): it walked backwards from the end of memory without accounting for how many pages it needed. Potentially, nonexistant pages could have been mapped. This hasn't occurred because the kernel generally requests as its first contigmalloc(9) a single page. Reported by: Nicolas Dehaine <nicko@stbernard.com>, wes MFC After: 1 month More testing by: Nicolas Dehaine <nicko@stbernard.com>, wes
This commit is contained in:
parent
1026fbd360
commit
a534973af4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=147283
@ -393,7 +393,7 @@ vm_page_alloc_contig(vm_pindex_t npages, vm_paddr_t low, vm_paddr_t high,
|
||||
panic("vm_page_alloc_contig: boundary must be a power of 2");
|
||||
|
||||
for (pass = 0; pass < 2; pass++) {
|
||||
start = vm_page_array_size;
|
||||
start = vm_page_array_size - npages + 1;
|
||||
vm_page_lock_queues();
|
||||
retry:
|
||||
start--;
|
||||
@ -414,7 +414,7 @@ vm_page_alloc_contig(vm_pindex_t npages, vm_paddr_t low, vm_paddr_t high,
|
||||
if (phys >= low && phys + size <= high &&
|
||||
((phys & (alignment - 1)) == 0) &&
|
||||
((phys ^ (phys + size - 1)) & ~(boundary - 1)) == 0)
|
||||
break;
|
||||
break;
|
||||
}
|
||||
/* There are no candidates at all. */
|
||||
if (i == -1) {
|
||||
@ -425,20 +425,26 @@ vm_page_alloc_contig(vm_pindex_t npages, vm_paddr_t low, vm_paddr_t high,
|
||||
/*
|
||||
* Check successive pages for contiguous and free.
|
||||
*/
|
||||
for (i = start + 1; i < start + npages; i++) {
|
||||
for (i = start + npages - 1; i > start; i--) {
|
||||
pqtype = pga[i].queue - pga[i].pc;
|
||||
if (VM_PAGE_TO_PHYS(&pga[i]) !=
|
||||
VM_PAGE_TO_PHYS(&pga[i - 1]) + PAGE_SIZE)
|
||||
VM_PAGE_TO_PHYS(&pga[i - 1]) + PAGE_SIZE) {
|
||||
start = i - npages + 1;
|
||||
goto retry;
|
||||
}
|
||||
if (pass == 0) {
|
||||
if (pqtype != PQ_FREE && pqtype != PQ_CACHE)
|
||||
if (pqtype != PQ_FREE && pqtype != PQ_CACHE) {
|
||||
start = i - npages + 1;
|
||||
goto retry;
|
||||
}
|
||||
} else if (pqtype != PQ_FREE && pqtype != PQ_CACHE &&
|
||||
pga[i].queue != PQ_ACTIVE &&
|
||||
pga[i].queue != PQ_INACTIVE)
|
||||
pga[i].queue != PQ_INACTIVE) {
|
||||
start = i - npages + 1;
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
for (i = start; i < start + npages; i++) {
|
||||
for (i = start + npages - 1; i >= start; i--) {
|
||||
vm_page_t m = &pga[i];
|
||||
|
||||
retry_page:
|
||||
@ -456,19 +462,25 @@ vm_page_alloc_contig(vm_pindex_t npages, vm_paddr_t low, vm_paddr_t high,
|
||||
break;
|
||||
default:
|
||||
cleanup_freed:
|
||||
vm_page_release_contigl(&pga[start],
|
||||
i - start);
|
||||
vm_page_release_contigl(&pga[i + 1],
|
||||
start + npages - 1 - i);
|
||||
start = i - npages + 1;
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
if (pqtype == PQ_CACHE) {
|
||||
if (m->hold_count != 0)
|
||||
if (m->hold_count != 0) {
|
||||
start = i - npages + 1;
|
||||
goto retry;
|
||||
}
|
||||
object = m->object;
|
||||
if (!VM_OBJECT_TRYLOCK(object))
|
||||
if (!VM_OBJECT_TRYLOCK(object)) {
|
||||
start = i - npages + 1;
|
||||
goto retry;
|
||||
}
|
||||
if ((m->flags & PG_BUSY) || m->busy != 0) {
|
||||
VM_OBJECT_UNLOCK(object);
|
||||
start = i - npages + 1;
|
||||
goto retry;
|
||||
}
|
||||
vm_page_free(m);
|
||||
|
Loading…
Reference in New Issue
Block a user