Page MenuHomeFreeBSD
Files F153172743

D21035.id60041.diff
No OneTemporary
Actions

D21035.id60041.diff
View Options

Index: sys/powerpc/aim/mmu_oea64.c
===================================================================
--- sys/powerpc/aim/mmu_oea64.c
+++ sys/powerpc/aim/mmu_oea64.c
@@ -371,14 +371,20 @@
}
static struct pvo_entry *
-alloc_pvo_entry(int bootstrap)
+alloc_pvo_entry(int bootstrap, int flags)
{
struct pvo_entry *pvo;
+ KASSERT(bootstrap || (flags & M_WAITOK) || (flags & M_NOWAIT),
+ ("Either M_WAITOK or M_NOWAIT flag must be specified "
+ "when bootstrap is 0"));
+ KASSERT(!bootstrap || !(flags & M_WAITOK),
+ ("M_WAITOK can't be used with bootstrap"));
+
if (!moea64_initialized || bootstrap) {
if (moea64_bpvo_pool_index >= moea64_bpvo_pool_size) {
panic("moea64_enter: bpvo pool exhausted, %d, %d, %zd",
- moea64_bpvo_pool_index, moea64_bpvo_pool_size,
+ moea64_bpvo_pool_index, moea64_bpvo_pool_size,
moea64_bpvo_pool_size * sizeof(struct pvo_entry));
}
pvo = &moea64_bpvo_pool[
@@ -386,8 +392,13 @@
bzero(pvo, sizeof(*pvo));
pvo->pvo_vaddr = PVO_BOOTSTRAP;
} else {
- pvo = uma_zalloc(moea64_pvo_zone, M_NOWAIT);
- bzero(pvo, sizeof(*pvo));
+ for (;;) {
+ pvo = uma_zalloc(moea64_pvo_zone, flags | M_ZERO);
+
+ if (pvo != NULL || (flags & M_NOWAIT))
+ break;
+ vm_wait(NULL);
+ }
}
return (pvo);
@@ -656,7 +667,7 @@
pregions[i].mr_size; pa += moea64_large_page_size) {
pte_lo = LPTE_M;
- pvo = alloc_pvo_entry(1 /* bootstrap */);
+ pvo = alloc_pvo_entry(1 /* bootstrap */, 0);
pvo->pvo_vaddr |= PVO_WIRED | PVO_LARGE;
init_pvo_entry(pvo, kernel_pmap, PHYS_TO_DMAP(pa));
@@ -1397,7 +1408,9 @@
if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
VM_OBJECT_ASSERT_LOCKED(m->object);
- pvo = alloc_pvo_entry(0);
+ pvo = alloc_pvo_entry(0, M_NOWAIT);
+ if (pvo == NULL)
+ return (KERN_RESOURCE_SHORTAGE);
pvo->pvo_pmap = NULL; /* to be filled in later */
pvo->pvo_pte.prot = prot;
@@ -1413,61 +1426,53 @@
pvo_head = &m->md.mdpg_pvoh;
pvo->pvo_vaddr |= PVO_MANAGED;
}
-
- for (;;) {
- PV_PAGE_LOCK(m);
- PMAP_LOCK(pmap);
- if (pvo->pvo_pmap == NULL)
- init_pvo_entry(pvo, pmap, va);
- if (prot & VM_PROT_WRITE)
- if (pmap_bootstrapped &&
- (m->oflags & VPO_UNMANAGED) == 0)
- vm_page_aflag_set(m, PGA_WRITEABLE);
-
- error = moea64_pvo_enter(mmu, pvo, pvo_head, &oldpvo);
- if (error == EEXIST) {
- if (oldpvo->pvo_vaddr == pvo->pvo_vaddr &&
- oldpvo->pvo_pte.pa == pvo->pvo_pte.pa &&
- oldpvo->pvo_pte.prot == prot) {
- /* Identical mapping already exists */
- error = 0;
-
- /* If not in page table, reinsert it */
- if (MOEA64_PTE_SYNCH(mmu, oldpvo) < 0) {
- moea64_pte_overflow--;
- MOEA64_PTE_INSERT(mmu, oldpvo);
- }
-
- /* Then just clean up and go home */
- PV_PAGE_UNLOCK(m);
- PMAP_UNLOCK(pmap);
- free_pvo_entry(pvo);
- break;
+
+ PV_PAGE_LOCK(m);
+ PMAP_LOCK(pmap);
+ if (pvo->pvo_pmap == NULL)
+ init_pvo_entry(pvo, pmap, va);
+ if (prot & VM_PROT_WRITE)
+ if (pmap_bootstrapped &&
+ (m->oflags & VPO_UNMANAGED) == 0)
+ vm_page_aflag_set(m, PGA_WRITEABLE);
+
+ error = moea64_pvo_enter(mmu, pvo, pvo_head, &oldpvo);
+ if (error == EEXIST) {
+ if (oldpvo->pvo_vaddr == pvo->pvo_vaddr &&
+ oldpvo->pvo_pte.pa == pvo->pvo_pte.pa &&
+ oldpvo->pvo_pte.prot == prot) {
+ /* Identical mapping already exists */
+ error = 0;
+
+ /* If not in page table, reinsert it */
+ if (MOEA64_PTE_SYNCH(mmu, oldpvo) < 0) {
+ moea64_pte_overflow--;
+ MOEA64_PTE_INSERT(mmu, oldpvo);
}
+ /* Then just clean up and go home */
+ PV_PAGE_UNLOCK(m);
+ PMAP_UNLOCK(pmap);
+ free_pvo_entry(pvo);
+ goto out;
+ } else {
/* Otherwise, need to kill it first */
KASSERT(oldpvo->pvo_pmap == pmap, ("pmap of old "
"mapping does not match new mapping"));
moea64_pvo_remove_from_pmap(mmu, oldpvo);
moea64_pvo_enter(mmu, pvo, pvo_head, NULL);
}
- PV_PAGE_UNLOCK(m);
- PMAP_UNLOCK(pmap);
-
- /* Free any dead pages */
- if (error == EEXIST) {
- moea64_pvo_remove_from_page(mmu, oldpvo);
- free_pvo_entry(oldpvo);
- }
+ }
+ PV_PAGE_UNLOCK(m);
+ PMAP_UNLOCK(pmap);
- if (error != ENOMEM)
- break;
- if ((flags & PMAP_ENTER_NOSLEEP) != 0)
- return (KERN_RESOURCE_SHORTAGE);
- VM_OBJECT_ASSERT_UNLOCKED(m->object);
- vm_wait(NULL);
+ /* Free any dead pages */
+ if (error == EEXIST) {
+ moea64_pvo_remove_from_page(mmu, oldpvo);
+ free_pvo_entry(oldpvo);
}
+out:
/*
* Flush the page from the instruction cache if this page is
* mapped executable and cacheable.
@@ -1630,7 +1635,7 @@
va = VM_PAGE_TO_PHYS(m);
- pvo = alloc_pvo_entry(1 /* bootstrap */);
+ pvo = alloc_pvo_entry(1 /* bootstrap */, 0);
pvo->pvo_pte.prot = VM_PROT_READ | VM_PROT_WRITE;
pvo->pvo_pte.pa = VM_PAGE_TO_PHYS(m) | LPTE_M;
@@ -1862,7 +1867,9 @@
int error;
struct pvo_entry *pvo, *oldpvo;
- pvo = alloc_pvo_entry(0);
+ pvo = alloc_pvo_entry(0, M_NOWAIT);
+ if (pvo == NULL)
+ panic("moea64_kenter_attr: failed to alloc pvo");
pvo->pvo_pte.prot = VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE;
pvo->pvo_pte.pa = (pa & ~ADDR_POFF) | moea64_calc_wimg(pa, ma);
pvo->pvo_vaddr |= PVO_WIRED;

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 2:35 PM (9 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31826395
Default Alt Text
D21035.id60041.diff (5 KB)

Event Timeline