summaryrefslogtreecommitdiff
path: root/kernel/vm.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-07-19 08:38:51 -0400
committerFrans Kaashoek <[email protected]>2019-07-19 08:38:51 -0400
commit91566327012cad2ca99df47f9321dfc012d8a7ff (patch)
treee9cb082d502a9f56857270264bea254149a3318d /kernel/vm.c
parentb924e44f06c9c0882a2cffe6c9215b12c5aee2e6 (diff)
downloadxv6-labs-91566327012cad2ca99df47f9321dfc012d8a7ff.tar.gz
xv6-labs-91566327012cad2ca99df47f9321dfc012d8a7ff.tar.bz2
xv6-labs-91566327012cad2ca99df47f9321dfc012d8a7ff.zip
One way of supporting a guard page below kstack: allocate kstacks in
procinit() and map them high up (below TRAMPOLNE) with an empty mapping below each stack. Never free a kernel stack. Another way would be to allocate and map them dynamically, but then we need to reload page table when switching processes in scheduler() and/or have a kernel pagetable per proc (if we want k->stack to be the same virtual address in each process). One gotcha: kernel addresses are not equal to physical addresses for stack addresses. A stack address must be translated if we need its physical address (e.g., virtio passes a stack address to the disk).
Diffstat (limited to 'kernel/vm.c')
-rw-r--r--kernel/vm.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/kernel/vm.c b/kernel/vm.c
index 412ec8c..d42e719 100644
--- a/kernel/vm.c
+++ b/kernel/vm.c
@@ -404,3 +404,34 @@ copyinstr(pagetable_t pagetable, char *dst, uint64 srcva, uint64 max)
return -1;
}
}
+
+char *map_kstack(uint64 kstack)
+{
+ char *k = kalloc();
+ if(k == 0) {
+ return 0;
+ }
+ if (mappages(kernel_pagetable, (uint64) kstack, PGSIZE,
+ (uint64) k, PTE_R | PTE_W) == 0) {
+ kvminithart();
+ return (char *) kstack;
+ }
+ kfree(k);
+ return 0;
+}
+
+// assumes va is page aligned
+uint64
+kernelpa(uint64 va) {
+ uint64 off = va % PGSIZE;
+ pte_t *pte;
+ uint64 pa;
+
+ pte = walk(kernel_pagetable, va, 0);
+ if(pte == 0)
+ panic("kernelpa");
+ if((*pte & PTE_V) == 0)
+ panic("kernelpa");
+ pa = PTE2PA(*pte);
+ return pa+off;
+}