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

Turn pmap_growkernel() into a critical section. While here, initialize

Browse Source 
kernel_vm_end in pmap_bootstrap. Don't delay the initialization until
we need to grow the kernel VM space. This BTW happens twice before
we enter either single- or multi-user mode. Don't adjust kernel_vm_end
while growing based on whether the KPT contains a non-NULL entry. We
trust kernel_vm_end to be correct and we make sure it's still correct
after growing.
Define virtual_avail and virtual_end in terms of VM_MIN_KERNEL_ADDRESS
and VM_MAX_KERNEL_ADDRESS (resp). Don't hardcode region knowledge.
This commit is contained in:
Marcel Moolenaar 2003-05-16 07:03:15 +00:00
parent 8cc31ae5be
commit 164d4986fd
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/ia64/ia64/pmap.c
View File

@ -374,6 +374,7 @@ pmap_bootstrap()
kptdir[i] = (struct ia64_lpte *) pmap_steal_memory(PAGE_SIZE); kptdir[i] = (struct ia64_lpte *) pmap_steal_memory(PAGE_SIZE);
} }
nkpt = NKPT; nkpt = NKPT;
kernel_vm_end = NKPT * PAGE_SIZE * NKPTEPG + VM_MIN_KERNEL_ADDRESS;
avail_start = phys_avail[0]; avail_start = phys_avail[0];
for (i = 0; phys_avail[i+2]; i+= 2) ; for (i = 0; phys_avail[i+2]; i+= 2) ;
@ -448,8 +449,8 @@ pmap_bootstrap()
__asm __volatile("mov cr.pta=%0;; srlz.i;;" __asm __volatile("mov cr.pta=%0;; srlz.i;;"
:: "r" (vhpt_base + (1<<8) + (vhpt_size<<2) + 1)); :: "r" (vhpt_base + (1<<8) + (vhpt_size<<2) + 1));
virtual_avail = IA64_RR_BASE(5); virtual_avail = VM_MIN_KERNEL_ADDRESS;
virtual_end = IA64_RR_BASE(6)-1; virtual_end = VM_MAX_KERNEL_ADDRESS;
/* /*
* Initialize protection array. * Initialize protection array.
@ -919,40 +920,31 @@ pmap_growkernel(vm_offset_t addr)
struct ia64_lpte *ptepage; struct ia64_lpte *ptepage;
vm_page_t nkpg; vm_page_t nkpg;
if (kernel_vm_end == 0) { if (kernel_vm_end >= addr)
kernel_vm_end = nkpt * PAGE_SIZE * NKPTEPG return;
+ IA64_RR_BASE(5);
}
addr = (addr + PAGE_SIZE * NKPTEPG) & ~(PAGE_SIZE * NKPTEPG - 1);
while (kernel_vm_end < addr) {
if (kptdir[KPTE_DIR_INDEX(kernel_vm_end)]) {
kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NKPTEPG)
& ~(PAGE_SIZE * NKPTEPG - 1);
continue;
}
/* critical_enter();
* We could handle more by increasing the size of kptdir.
*/ while (kernel_vm_end < addr) {
/* We could handle more by increasing the size of kptdir. */
if (nkpt == MAXKPT) if (nkpt == MAXKPT)
panic("pmap_growkernel: out of kernel address space"); panic("pmap_growkernel: out of kernel address space");
/*
* This index is bogus, but out of the way
*/
nkpg = vm_page_alloc(NULL, nkpt, nkpg = vm_page_alloc(NULL, nkpt,
VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED);
if (!nkpg) if (!nkpg)
panic("pmap_growkernel: no memory to grow kernel"); panic("pmap_growkernel: no memory to grow kernel");
nkpt++;
ptepage = (struct ia64_lpte *) ptepage = (struct ia64_lpte *)
IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(nkpg)); IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(nkpg));
bzero(ptepage, PAGE_SIZE); bzero(ptepage, PAGE_SIZE);
kptdir[KPTE_DIR_INDEX(kernel_vm_end)] = ptepage; kptdir[KPTE_DIR_INDEX(kernel_vm_end)] = ptepage;
kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NKPTEPG) & ~(PAGE_SIZE * NKPTEPG - 1); nkpt++;
kernel_vm_end += PAGE_SIZE * NKPTEPG;
} }
critical_exit();
} }
/*************************************************** /***************************************************