From d4cecb269f2acc61cc1adc11fec2aa690b9c553b Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Wed, 14 Oct 2020 20:03:14 -0400 Subject: kvmmake() makes a complete kernel page table, matching Figure 3.3 --- kernel/proc.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'kernel/proc.c') diff --git a/kernel/proc.c b/kernel/proc.c index 56314e5..d847c43 100644 --- a/kernel/proc.c +++ b/kernel/proc.c @@ -21,6 +21,23 @@ static void freeproc(struct proc *p); extern char trampoline[]; // trampoline.S + +// Allocate a page for each process's kernel stack. +// Map it high in memory, followed by an invalid +// guard page. +void +proc_mapstacks(pagetable_t kpgtbl) { + struct proc *p; + + for(p = proc; p < &proc[NPROC]; p++) { + char *pa = kalloc(); + if(pa == 0) + panic("kalloc"); + uint64 va = KSTACK((int) (p - proc)); + kvmmap(kpgtbl, va, (uint64)pa, PGSIZE, PTE_R | PTE_W); + } +} + // initialize the proc table at boot time. void procinit(void) @@ -30,18 +47,8 @@ procinit(void) initlock(&pid_lock, "nextpid"); for(p = proc; p < &proc[NPROC]; p++) { initlock(&p->lock, "proc"); - - // Allocate a page for the process's kernel stack. - // Map it high in memory, followed by an invalid - // guard page. - char *pa = kalloc(); - if(pa == 0) - panic("kalloc"); - uint64 va = KSTACK((int) (p - proc)); - kvmmap(va, (uint64)pa, PGSIZE, PTE_R | PTE_W); - p->kstack = va; + p->kstack = KSTACK((int) (p - proc)); } - kvminithart(); } // Must be called with interrupts disabled, -- cgit v1.2.3