Make the maintenance of a page's valid bits by contigmalloc() more like
kmem_alloc() and kmem_malloc(). Specifically, defer the setting of the page's valid bits until contigmapping() when the mapping is known to be successful.
This commit is contained in:
parent
615f88eca6
commit
ead1d027bd
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=194331
@ -218,6 +218,7 @@ contigmapping(vm_page_t m, vm_pindex_t npages, int flags)
|
||||
OFF_TO_IDX(tmp_addr - VM_MIN_KERNEL_ADDRESS));
|
||||
if ((flags & M_ZERO) && !(m[i].flags & PG_ZERO))
|
||||
pmap_zero_page(&m[i]);
|
||||
m[i].valid = VM_PAGE_BITS_ALL;
|
||||
tmp_addr += PAGE_SIZE;
|
||||
}
|
||||
VM_OBJECT_UNLOCK(object);
|
||||
|
@ -691,14 +691,16 @@ vm_phys_alloc_contig(unsigned long npages, vm_paddr_t low, vm_paddr_t high,
|
||||
("vm_phys_alloc_contig: page %p has unexpected queue %d",
|
||||
m, m->queue));
|
||||
m_object = m->object;
|
||||
if ((m->flags & PG_CACHED) != 0)
|
||||
if ((m->flags & PG_CACHED) != 0) {
|
||||
m->valid = 0;
|
||||
vm_page_cache_remove(m);
|
||||
else {
|
||||
} else {
|
||||
KASSERT(VM_PAGE_IS_FREE(m),
|
||||
("vm_phys_alloc_contig: page %p is not free", m));
|
||||
KASSERT(m->valid == 0,
|
||||
("vm_phys_alloc_contig: free page %p is valid", m));
|
||||
cnt.v_free_count--;
|
||||
}
|
||||
m->valid = VM_PAGE_BITS_ALL;
|
||||
if (m->flags & PG_ZERO)
|
||||
vm_page_zero_count--;
|
||||
/* Don't clear the PG_ZERO flag; we'll need it later. */
|
||||
|
Loading…
Reference in New Issue
Block a user